From 3564f502e40f87ca6bacfd9f49e12eb432a007ed Mon Sep 17 00:00:00 2001
From: rmkaplan <69548581+rmkaplan@users.noreply.github.com>
Date: Tue, 16 Apr 2024 12:29:38 -0700
Subject: [PATCH] Fixed a missed case in NSDISPLAYSIZES (#1658)

FONTSAVAILABLE calls with SIZE = *
---
 lispusers/NSDISPLAYSIZES      |  71 ++++++++++++++++++----------------
 lispusers/NSDISPLAYSIZES.LCOM | Bin 3177 -> 3131 bytes
 2 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/lispusers/NSDISPLAYSIZES b/lispusers/NSDISPLAYSIZES
index 6e5ff908..6e54589e 100644
--- a/lispusers/NSDISPLAYSIZES
+++ b/lispusers/NSDISPLAYSIZES
@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 8-Apr-2024 11:48:01" {WMEDLEY}<lispusers>NSDISPLAYSIZES.;4
 8919   
+
(FILECREATED "10-Apr-2024 09:49:11" {WMEDLEY}<lispusers>NSDISPLAYSIZES.;5
 9232   
 
       :EDIT-BY rmk
 
       :CHANGES-TO (FNS NSDISPLAYSIZE)
 
-      :PREVIOUS-DATE "26-Dec-2023 21:17:15" {WMEDLEY}<lispusers>NSDISPLAYSIZES.;3)
+      :PREVIOUS-DATE " 8-Apr-2024 11:48:01" {WMEDLEY}<lispusers>NSDISPLAYSIZES.;4)
 
 
 (PRETTYCOMPRINT NSDISPLAYSIZESCOMS)
@@ -30,7 +30,8 @@
 (DEFINEQ
 
 (NSDISPLAYSIZE

-  [LAMBDA (FAMILY SIZE FACE EXTENSION)
                       (* ; "Edited  8-Apr-2024 11:47 by rmk")


+  [LAMBDA (FAMILY SIZE FACE EXTENSION)
                       (* ; "Edited 10-Apr-2024 09:48 by rmk")


+                                                             (* ; "Edited  8-Apr-2024 11:47 by rmk")


                                                              (* ; "Edited 26-Dec-2023 21:15 by rmk")


                                                              (* ; "Edited 24-Dec-2023 13:49 by rmk")


                                                              (* ; "Edited 14-Sep-96 09:32 by rmk:")

@@ -42,39 +43,41 @@
 
     (* ;; "Returns size that we would prefer to see the font of requested family, size, face, extension.  Used to make bigger ns display fonts than you would get by default.  Don't do it for small screens, as on DOS and laptops.")

 
-    (DECLARE
 (GLOBALVARS DISPLAYFONTEXTENSIONS NSFONTFAMILIES))
-    (OR (AND (CL:MEMBER EXTENSION DISPLAYFONTEXTENSIONS :TEST 'STRING-EQUAL)
-             (COND
-                (*SMALLSCREEN* (CL:UNLESS (CL:MEMBER FAMILY NSFONTFAMILIES :TEST 'STRING-EQUAL)
+    (if
 (NOT (FIXP SIZE))
+        then
                                                 (* ; "Could be *")

+             SIZE
+      elseif
 (AND (CL:MEMBER EXTENSION DISPLAYFONTEXTENSIONS :TEST 'STRING-EQUAL)
+                  (COND
+                     (*SMALLSCREEN* (CL:UNLESS (CL:MEMBER FAMILY NSFONTFAMILIES :TEST 'STRING-EQUAL)
                                                              (* ; 
 
                                                             " Small screen, shrink non-NS fonts ")

-                                   (SELECTQ SIZE
-                                       (12 10)
-                                       (10 8)
-                                       (8 6)
-                                       NIL)))
-                ((CL:MEMBER FAMILY NSFONTFAMILIES :TEST 'STRING-EQUAL)
+                                        (SELECTQ SIZE
+                                            (12 10)
+                                            (10 8)
+                                            (8 6)
+                                            NIL)))
+                     ((CL:MEMBER FAMILY NSFONTFAMILIES :TEST 'STRING-EQUAL)
                                                              (* ; "Large screen, enlarge  NS fonts")

-                 (SELECTQ (U-CASE (MKATOM FAMILY))
-                     (TERMINAL                               (* ; "14 doesn't exist, oh well.")

-                               (CL:IF (ILEQ SIZE 10)
-                                   (IPLUS SIZE 2)
-                                   SIZE))
-                     (TITAN (SELECTQ SIZE
-                                (6 9)
-                                (9 10)
-                                (10 12)
-                                (CL:IF (ILESSP SIZE 6)
-                                    6
-                                    SIZE)))
-                     (CL:IF (ILEQ SIZE 12)
-                         (IPLUS SIZE 2)
-                         SIZE)))
-                ((AND NIL (CL:MEMBER EXTENSION INTERPRESSFONTEXTENSIONS :TEST 'STRING-EQUAL)
-                      (STRING-EQUAL FAMILY 'SYMBOL))         (* ; 
+                      (SELECTQ (U-CASE (MKATOM FAMILY))
+                          (TERMINAL                          (* ; "14 doesn't exist, oh well.")

+                                    (CL:IF (ILEQ SIZE 10)
+                                        (IPLUS SIZE 2)
+                                        SIZE))
+                          (TITAN (SELECTQ SIZE
+                                     (6 9)
+                                     (9 10)
+                                     (10 12)
+                                     (CL:IF (ILESSP SIZE 6)
+                                         6
+                                         SIZE)))
+                          (CL:IF (ILEQ SIZE 12)
+                              (IPLUS SIZE 2)
+                              SIZE)))
+                     ((AND NIL (CL:MEMBER EXTENSION INTERPRESSFONTEXTENSIONS :TEST 'STRING-EQUAL)
+                           (STRING-EQUAL FAMILY 'SYMBOL))    (* ; 
 
                            "Fake NS size on Interpress printing, even tho display fonts don't exist")

-                 10)))
-        SIZE])
+                      10)))
+      else
 SIZE])
 
 (NS\FONTFILENAME

   [LAMBDA (FAMILY SIZE FACE EXTENSION CHARACTERSET)          (* ; "Edited 15-Jan-87 15:23 by bvm:")

@@ -167,7 +170,7 @@
 (VKBD.FIX.FONT
)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1522 7251 (NSDISPLAYSIZE 1532 . 4549) (NS\FONTFILENAME 4551 . 4792) (
-NS\FONTFILENAME.OLD 4794 . 5043) (PURGENSFONTS 5045 . 7249)) (7463 8501 (VKBD.FIX.FONT 7473 . 8499))))
+  (FILEMAP (NIL (1522 7564 (NSDISPLAYSIZE 1532 . 4862) (NS\FONTFILENAME 4864 . 5105) (
+NS\FONTFILENAME.OLD 5107 . 5356) (PURGENSFONTS 5358 . 7562)) (7776 8814 (VKBD.FIX.FONT 7786 . 8812))))
 )
 STOP
diff --git a/lispusers/NSDISPLAYSIZES.LCOM b/lispusers/NSDISPLAYSIZES.LCOM
index ac13e6dc910f4afa5388368f6976599e37ac7d35..b77f701e9655530c6a0854cd98d0017242cd3ca8 100644
GIT binary patch
delta 728
zcmZuuL2uJA6mGkAtD+r|nAXc963|Sv#7W#PxiBwvCaa0l#qKsFE{F~olrhjaATjkX
zP-PMlH{cJH?E*rm|AQMx#HBw0X9KmH@WJ-?eb0X1d+*oMx23n+SCCmF2QO=uX*poJ
z9&UKp9zJahumPG5?o>psXJgMoIvhTD{_LQCvj=<opa<PBgxR=yy{<#={^4#9{`Vg1
zhE@$&Nd1HoNn4;_a^ScgLi+H{^?3}gWn1ZP{?1icoiTzuXVo*65p8&MBmJ582V4X(
zmjQ`b$f$q-5VV-+gye3<(;Z2<U@^}W3syu#!ceIEl&=_&8|UV7Mbfk3<LBI$vA_8!
zr`FlFnB5fnAvtNTbuRIz*GR9wI5{5owaVzIuT9c^dGtzg<;ls5aesca_jvSht&<)X
zo(wQ_Yd#Sa5HcZZ6B$Q<Obh(bi)ge?6L8!aVBslH-9k17$t2-`ECiA!5#uBTw+TWf
zjBnKFW;eqYc#;YUj&o74!TqaP=0yeJb0PgP_pYpQ7HU;POJ5h?PeG+rTh7|ngo{l!
zATO5-DKAwD+l_R;#Pgrh@1@^uq-<q1fsM{jmGicsQpTMv5~^w%_P^Nx#_CgWtg{{N
zWwR2D`*A{5oH9~c7~E3jH(;y1-m3dC57<UGAu=1Kihw3m{g4R3eAP|E&`w7SUyFYL
D-uAgi

delta 765
zcmZuu&ubGw6y9x<8Wsa8{wSWF(Mq-$-PvE+tcY$mlXl4LChklcl@_9H(ALz36vSK6
zzreDJ;K_;?4?<e;ARY=HJbUwR5JCDUIBTPA#5ufqZ|0lteeau3<KM@hHjjf-@VdQ%
zuIVNq<eHAF=^OX$8B+x%ckoivT*Gz^l!H6H_QL8)cd64}g!ZFuZ*9Vbkd+CmQ|~4t
zw=gU{fLx_PDS)%_^~9C`64^Ob$yW%)euO=a%P`b!AVqYGH|2>mI3-kytMb)Tx?L!@
z7ZSY&=*UGy7g;$_;xqC&*@(Z$<>Dj@JW83M#o?q1(q~DQQhrMk>+auhILTgbNpI`h
zm#?*wB3>OidG`5EN7<4dFLspOXFHut|6wPyyS>&K>#yAFFAs2UMwZtdXcT;pVPTm8
zLDl260FY*ZPu&0qQ#b<CIZ)`@ej%nth69{%F9al9=Qs*T=uttS0pk$~rwjOcLmZSW
za5-iiN}4dZQVV&-3kW56o`Go$V+G|N)-Z;#43ISpMcM#r!Qj&pYJ7v^kda!*;&-Dj
zGTD&OY+lXAH1%@7_?ar4S3z!`mL>VOnN9QP?Xj8B4+=S^BrYD2=j2wB#8EnwU&Wj0
zAM?7HD{%!3b8i=RTw<8>T7A}|YBq1%e}sVL2=!oENz_aKPGZ7bB9)QQuSHnA6#Bl6
stzXFIkqxuesq#g?7FNh~Bl37Mi9kRR@;>z#Bfc<LRkQD(9Qv601v-bm761SM