From d5cc2198957692bbcfca60977d1da4515a7cfc42 Mon Sep 17 00:00:00 2001
From: rmkaplan <69548581+rmkaplan@users.noreply.github.com>
Date: Mon, 8 Apr 2024 16:32:33 -0700
Subject: [PATCH] NSDISPLAYSIZES:  A better attempt at TERMINAL and TITAN
 (#1655)

This now builds in knowledge of which Titan and Terminal fonts actually exist, so it doesn't try to increase the size to a black hole.  Still a hack, but there are so many MOVD's involved that it is really hard to see how to do it with a generic FIND-NEXT-LARGEST-FONT.
---
 lispusers/NSDISPLAYSIZES      |  39 ++++++++++++++++++++--------------
 lispusers/NSDISPLAYSIZES.LCOM | Bin 3172 -> 3177 bytes
 2 files changed, 23 insertions(+), 16 deletions(-)

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

-  [LAMBDA (FAMILY SIZE FACE EXTENSION)
                       (* ; "Edited 26-Dec-2023 21:15 by rmk")


+  [LAMBDA (FAMILY SIZE FACE EXTENSION)
                       (* ; "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:")

                                                              (* ; "Edited 16-Nov-95 10:08 by ")

                                                              (* ; "Edited  5-Mar-93 18:12 by kaplan")

                                                              (* ; "Edited 15-Jan-87 15:22 by bvm:")

 
+    (* ;; "What we really want for small NS font sizes (12 or below) is the next larger existing font, not a built-in knowledge here of what exists.")

+
     (* ;; "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))
@@ -52,17 +55,21 @@
                                        NIL)))
                 ((CL:MEMBER FAMILY NSFONTFAMILIES :TEST 'STRING-EQUAL)
                                                              (* ; "Large screen, enlarge  NS fonts")

-                 (AND (SELECTQ SIZE
-                          (12 (COND
-                                 ((CL:MEMBER FAMILY '(TERMINAL TITAN)
-                                         :TEST
-                                         'STRING-EQUAL)      (* ; "Until these exist in size 14")

-                                  12)
-                                 (T 14)))
-                          (10 12)
-                          (8 10)
-                          (6 8)
-                          NIL)))
+                 (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")

@@ -160,7 +167,7 @@
 (VKBD.FIX.FONT
)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1522 6781 (NSDISPLAYSIZE 1532 . 4079) (NS\FONTFILENAME 4081 . 4322) (
-NS\FONTFILENAME.OLD 4324 . 4573) (PURGENSFONTS 4575 . 6779)) (6993 8031 (VKBD.FIX.FONT 7003 . 8029))))
+  (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))))
 )
 STOP
diff --git a/lispusers/NSDISPLAYSIZES.LCOM b/lispusers/NSDISPLAYSIZES.LCOM
index f49b6a26a88457865edaa1c3de4bc4e8c70f0207..ac13e6dc910f4afa5388368f6976599e37ac7d35 100644
GIT binary patch
delta 494
zcmaDN@ls+!xQK#<u46%wu91O}iGrb_m5GIwfziZlGi?)11ui9INdp5bV>2sbLnVcz
zqSWO4+=9%U)D(r(ih`nv=cI#>RqE;KDJi5RmH?%(8eyiS$)(}u>Er4g<mwpW>Y{*R
z57ZHc6RXu&O%yCF4JW5DI*OU;x}+w9TxqOeWN2k*Ze?hyq`)<?R&DZQ#^Cxx42%pc
z&It@akPat!K&(X@8CC{tvUW&-3xgGa<u)rirsVK^n7TiQYa>HrN)FeDDf@FcHk9RX
zeArZ+!?qzeV?!2JjhjLpI6>xtiIjAPBq004wEaNSxHg!8&Hu1T1IS|o8OXUoEr;{N
zWT2FsBhZS;IXoLgbJ!d|PRe2Ha_j)P;NzkkrW;$C9R(OP3=J(5LUo-TgI$4<VXWZm
z?HJ<kt6*qgI{62ahLN#_LWpOGqo0ByFtS2igM2;x9DRVY1`5F;L7sl@x~_qtKmkir
X1*;I(;1C5%gUO-Hd7E!A_iz9JMwfwa

delta 474
zcmaDU@kC-mxQLONu1jjNu91O}v4WAIm7%$nq3OhIGhJg%1ui9YNkc0G6D5VDqSWO4
z+=9%U)D(r}jKsY3)QM-LgOJtg>FFscq$HLA6<{^QQc06b!_Cvj)j7!3F~rqH0mCM+
zGpf~CjTJ0ROeUu=I*OSf+-YcRWolq$VyL9RHL+HO(P;7m#*pyU42%pc&It@akPat!
zK&(X@872j6vT#U%3xgGa<u=PXrsVK^n6f{IYeQB_4%dfC`!^)yaD3PlpTo8xGGjy7
z<US^`P)D$$O^W*+^0AmPIfrM1Y!2TBNs#s&o_?TWjt`T8Cbs6VeVClXv6b0TfI-91
z*jT~Y$I92$*U2?V!O*~HvM95LsgZ?3a7d7+pS!MWV5p;yf*~*(tU_FaLli8{QDrQR
npb{45lk=JLL=_ATEfh3DT!VZ){eT)nJVPA)G&kR6?%@Ccxtw~J