From 18aae01362a1dfecb94c84234eaccd68e398855f Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Wed, 10 Jan 2024 10:48:03 -0800 Subject: [PATCH] Suppresses size coercion for Titan 12 (#1476) * Suppresses size coercion for Titan 12 * Typo --- lispusers/NSDISPLAYSIZES | 49 +++++++++++++++++----------------- lispusers/NSDISPLAYSIZES.LCOM | Bin 3282 -> 3172 bytes 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/lispusers/NSDISPLAYSIZES b/lispusers/NSDISPLAYSIZES index 48f7ba0c..1a3a1c4f 100644 --- a/lispusers/NSDISPLAYSIZES +++ b/lispusers/NSDISPLAYSIZES @@ -1,15 +1,13 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "14-Sep-96 09:32:32" {DSK}medley2.0>lispusers>NSDISPLAYSIZES.;13 8499 - changes to%: (FNS NSDISPLAYSIZE PURGENSFONTS) - (VARS NSDISPLAYSIZESCOMS) +(FILECREATED "26-Dec-2023 21:17:15" {WMEDLEY}NSDISPLAYSIZES.;3 8449 - previous date%: "16-Nov-95 10:10:26" {DSK}medley2.0>lispusers>NSDISPLAYSIZES.;9) + :EDIT-BY rmk + :CHANGES-TO (FNS NSDISPLAYSIZE) + + :PREVIOUS-DATE "24-Dec-2023 13:50:41" {WMEDLEY}NSDISPLAYSIZES.;2) -(* ; " -Copyright (c) 1985, 1986, 1987, 1988, 1993, 1995, 1996 by Xerox Corporation. All rights reserved. -") (PRETTYCOMPRINT NSDISPLAYSIZESCOMS) @@ -17,8 +15,8 @@ Copyright (c) 1985, 1986, 1987, 1988, 1993, 1995, 1996 by Xerox Corporation. Al [(FNS NSDISPLAYSIZE NS\FONTFILENAME NS\FONTFILENAME.OLD PURGENSFONTS) (ADDVARS (NSFONTFAMILIES CLASSIC MODERN TERMINAL OPTIMA TITAN)) (INITVARS (*SMALLSCREEN* (ILESSP SCREENWIDTH 700))) - [COMS (* ; - "VirtualKeyboard font needs adjusting so that real Classic 12 still appears") + [COMS (* ; + "VirtualKeyboard font needs adjusting so that real Classic 12 still appears") (FNS VKBD.FIX.FONT) (DECLARE%: EVAL@COMPILE DONTCOPY (P (OR (RECLOOK 'KEYBOARDCONFIGURATION) (LOADDEF 'KEYBOARDCONFIGURATION 'RECORDS @@ -32,31 +30,33 @@ Copyright (c) 1985, 1986, 1987, 1988, 1993, 1995, 1996 by Xerox Corporation. Al (DEFINEQ (NSDISPLAYSIZE - [LAMBDA (FAMILY SIZE FACE EXTENSION) (* ; "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:") + [LAMBDA (FAMILY SIZE FACE EXTENSION) (* ; "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:") - (* ;; "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.") + (* ;; "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) - (* ; - " Small screen, shrink non-NS fonts ") + (* ; + " Small screen, shrink non-NS fonts ") (SELECTQ SIZE (12 10) (10 8) (8 6) NIL))) ((CL:MEMBER FAMILY NSFONTFAMILIES :TEST 'STRING-EQUAL) - (* ; "Large screen, enlarge NS fonts") + (* ; "Large screen, enlarge NS fonts") (AND (SELECTQ SIZE (12 (COND - ((STRING-EQUAL FAMILY 'TERMINAL) - (* ; "Until Terminal 14 exists") + ((CL:MEMBER FAMILY '(TERMINAL TITAN) + :TEST + 'STRING-EQUAL) (* ; "Until these exist in size 14") 12) (T 14))) (10 12) @@ -64,8 +64,8 @@ Copyright (c) 1985, 1986, 1987, 1988, 1993, 1995, 1996 by Xerox Corporation. Al (6 8) NIL))) ((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") + (STRING-EQUAL FAMILY 'SYMBOL)) (* ; + "Fake NS size on Interpress printing, even tho display fonts don't exist") 10))) SIZE]) @@ -159,9 +159,8 @@ Copyright (c) 1985, 1986, 1987, 1988, 1993, 1995, 1996 by Xerox Corporation. Al (VKBD.FIX.FONT) ) -(PUTPROPS NSDISPLAYSIZES COPYRIGHT ("Xerox Corporation" 1985 1986 1987 1988 1993 1995 1996)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1696 6738 (NSDISPLAYSIZE 1706 . 4036) (NS\FONTFILENAME 4038 . 4279) ( -NS\FONTFILENAME.OLD 4281 . 4530) (PURGENSFONTS 4532 . 6736)) (6950 7988 (VKBD.FIX.FONT 6960 . 7986)))) + (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)))) ) STOP diff --git a/lispusers/NSDISPLAYSIZES.LCOM b/lispusers/NSDISPLAYSIZES.LCOM index a062d636c45abc12c07339cc24068c50062b9122..f49b6a26a88457865edaa1c3de4bc4e8c70f0207 100644 GIT binary patch delta 922 zcmaKqOHUI~6vta0LNB;*LwqfcgO8b-Y32o;4#qI;+$mRQrgdft)(|PS<)H-(xHE>G zYs0Kv=+3x7jEM^q62F0d0vE1KjC=s2o)#>O8t>wld+vGvb3dN?eDX%px~NEs3W{vVSwkMDEoApl`4T~p-iZf zcBqo98e@{7$sCY)s}V&Y@kI?wCwz3GFRg(M5~KsybesUSr(Rls#LGl7(O0M?@GN#Q z+`c`3mDnmr8$F}+Zlgu^wsyB`t--yWxz@4m>eBY~WUU+CN$lk8m}a9jyti|1cXI6y zcl4p>@}{an!7*Iw=BW>|q#Us{{fMDRhXzV6D>?+B&%B~YZ&XYNWc(>cNP`e^*|;aC z960nW3Tl_U&^BG>FdBfS^6^+zKZwP#;<3@2UPUB4$g&Q6NPU-i*fnIK=?QItXFG-Q z4|}Fdp)GOrv-fGT&6SAsi%IfY@Bfm-htYv|$WH_F$oyap$iDP5%nGLy}iBfpcY$cdp0@>^;g`D{q*+|NXB$?@pN k&`9U)ELw1$@a2kMr288NDChL`yp^%p%}jd>T!%U27f_Yx-v9sr delta 1080 zcmaJ=PiWI%6mPfb);~F@h!Z_LGRE3UVv=S}lS*0Erd?Rl)+C*q3~g=WR_T_~c0&;< z-UY{U_9A%S=2h9zqu^P@gC_;q)tfK%&(<=9@Z){od*93N{oZ?DCO=%>$@hpzPSuo* zp~#k!1rm}}&b~*90z&zn!IAFw-u94aZv(Dj-j%4jS_ia1qrh=2@<+JFLiUK4h_s) zl8p?QmZIy50lK`12*MveG)gJl=0ix?nOYT$ug&vg3MqVkHxnjXGqYzn=4HE_n&lGj^wA%J| z!`bTe$xll_vI(l-Y*XSaut=SeI23|7UDSV5o1{}>loZh2%XRjD_FN4tl6OU;R+gL3oiUU7X-o9p|B-W>>Xy%|0_xO6zz z_XORyBiDMI02xh^OjR#w3T0Y`TF6t%&9bavX$jA#EBZXPah5xA;F#kBwvFXDuoOdA z3;ky-PQZyg*g(lrObbL7)%C>A$-1hkiV3_V494=@@7TC79LtFiGj&q=ik_xtDzKY_U6{urbD#Os+eU;TJ-e*6vM`|&CwJ5d4RSF&4b z)>;68VWLr-1Fz{2i9reocYmUWp%(*p5w`;O5kCg*Af|$=i08uB-FLw$w7vz?h_Mij z_$iP;+zIi0`-=NH