Fixed a missed case in NSDISPLAYSIZES (#1658)

FONTSAVAILABLE calls with SIZE = *

Author: rmkaplan

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