From d00a9c4367ce8bf2a0d4607dda80c84cf78e0fc9 Mon Sep 17 00:00:00 2001
From: Matt Heffron <heffron@alumni.caltech.edu>
Date: Fri, 8 Aug 2025 21:54:11 -0700
Subject: [PATCH] Add fi and fl ligature glyphs

---
 library/POSTSCRIPTSTREAM      |  83 +++++++++++++++++-----------------
 library/POSTSCRIPTSTREAM.LCOM | Bin 92949 -> 92524 bytes
 2 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/library/POSTSCRIPTSTREAM b/library/POSTSCRIPTSTREAM
index ab44fd30..bae3da02 100644
--- a/library/POSTSCRIPTSTREAM
+++ b/library/POSTSCRIPTSTREAM
@@ -1,16 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 5-Jun-2025 16:12:21" {DSK}<home>matt>Interlisp>medley>library>POSTSCRIPTSTREAM.;5
 258146 
+
(FILECREATED " 3-Aug-2025 22:51:35" {DSK}<home>matt>Interlisp>medley>library>POSTSCRIPTSTREAM.;8
 258064 
 
       :EDIT-BY "mth"
 
-      :CHANGES-TO (FNS \BLTSHADE.PSC \PSC.COLOR.TO.RGB \DRAWLINE.PSC \DRAWARC.PSC POSTSCRIPTSEND 
-                       \TERPRI.PSC POSTSCRIPT.PUTCOMMAND POSTSCRIPT.PUTRGBCOLOR \DSPCOLOR.PSC 
-                       \DRAWCIRCLE.PSC \DRAWELLIPSE.PSC \DRAWPOINT.PSC \DRAWPOLYGON.PSC 
-                       \FILLCIRCLE.PSC \FILLPOLYGON.PSC POSTSCRIPT.TEDIT \BITBLT.PSC)
+      :CHANGES-TO (VARS *POSTSCRIPT-NS-TRANSLATIONS*)
 
-      :PREVIOUS-DATE "28-Apr-2025 00:17:24" 
-{DSK}<home>matt>Interlisp>medley>library>POSTSCRIPTSTREAM.;1)
+      :PREVIOUS-DATE " 5-Jun-2025 16:12:21" 
+{DSK}<home>matt>Interlisp>medley>library>POSTSCRIPTSTREAM.;6)
 
 
 (PRETTYCOMPRINT POSTSCRIPTSTREAMCOMS)
@@ -3574,6 +3571,10 @@
         ("^V" NIL "2,261")
                                                              (* ; "pressfont en dash")

         ("^G" NIL "0,140")
+        ("360,44" NIL "2,256")
+                                                             (* ; "fi ligature")

+        ("360,45" NIL "2,257")
+                                                             (* ; "fl ligature")

         ("0,244" NIL "2,250")
                                                              (* ; "generic currency symbol")

         ("0,251" NIL "2,140")
@@ -4401,38 +4402,38 @@
 (ADDTOVAR LAMA
 POSTSCRIPT.PUTCOMMAND)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (22736 33232 (POSTSCRIPT.INIT 22746 . 29838) (POSTSCRIPT.PUTRGBCOLOR 29840 . 30862) (
-\PSC.COLOR.TO.RGB 30864 . 33230)) (34218 69002 (PSCFONT.READFONT 34228 . 36136) (PSCFONT.SPELLFILE 
-36138 . 36716) (PSCFONT.COERCEFILE 36718 . 38290) (PSCFONTFROMCACHE.SPELLFILE 38292 . 39277) (
-PSCFONTFROMCACHE.COERCEFILE 39279 . 40931) (PSCFONT.WRITEFONT 40933 . 41948) (READ-AFM-FILE 41950 . 
-47821) (CONVERT-AFM-FILES 47823 . 49035) (POSTSCRIPT.GETFONTID 49037 . 50432) (POSTSCRIPT.FONTCREATE 
-50434 . 62833) (\POSTSCRIPT.SPECIALFONT.SCALEDWIDTHS 62835 . 65232) (POSTSCRIPT.FONTSAVAILABLE 65234
- . 69000)) (69557 78842 (OPENPOSTSCRIPTSTREAM 69567 . 78508) (CLOSEPOSTSCRIPTSTREAM 78510 . 78840)) (
-78887 84941 (POSTSCRIPT.HARDCOPYW 78897 . 82004) (POSTSCRIPT.TEDIT 82006 . 82490) (POSTSCRIPT.TEXT 
-82492 . 82783) (POSTSCRIPTFILEP 82785 . 83892) (MAKEEPSFILE 83894 . 84939)) (84942 128516 (
-POSTSCRIPT.BITMAPSCALE 84952 . 87408) (POSTSCRIPT.CLOSESTRING 87410 . 87963) (POSTSCRIPT.ENDPAGE 87965
- . 88856) (POSTSCRIPT.OUTSTR 88858 . 90075) (POSTSCRIPT.PUTBITMAPBYTES 90077 . 98548) (
-POSTSCRIPT.PUTCOMMAND 98550 . 99539) (POSTSCRIPT.SET-FAKE-LANDSCAPE 99541 . 104061) (
-POSTSCRIPT.SHOWACCUM 104063 . 106218) (POSTSCRIPT.STARTPAGE 106220 . 108752) (\POSTSCRIPTTAB 108754 . 
-109551) (\PS.BOUTFIXP 109553 . 110833) (\PS.SCALEHACK 110835 . 113478) (\PS.SCALEREGION 113480 . 
-114040) (\SCALEDBITBLT.PSC 114042 . 118352) (\SETPOS.PSC 118354 . 118835) (\SETXFORM.PSC 118837 . 
-121421) (\STRINGWIDTH.PSC 121423 . 121896) (\SWITCHFONTS.PSC 121898 . 127390) (\TERPRI.PSC 127392 . 
-128514)) (128551 182631 (\BITBLT.PSC 128561 . 129113) (\BLTSHADE.PSC 129115 . 133776) (\CHARWIDTH.PSC 
-133778 . 134285) (\CREATECHARSET.PSC 134287 . 135985) (\DRAWARC.PSC 135987 . 138365) (\DRAWCIRCLE.PSC 
-138367 . 140618) (\DRAWCURVE.PSC 140620 . 144464) (\DRAWELLIPSE.PSC 144466 . 146830) (\DRAWLINE.PSC 
-146832 . 149572) (\DRAWPOINT.PSC 149574 . 150150) (\DRAWPOLYGON.PSC 150152 . 153281) (
-\DSPBOTTOMMARGIN.PSC 153283 . 153970) (\DSPCLIPPINGREGION.PSC 153972 . 155347) (\DSPCOLOR.PSC 155349
- . 156280) (\DSPFONT.PSC 156282 . 159801) (\DSPLEFTMARGIN.PSC 159803 . 160489) (\DSPLINEFEED.PSC 
-160491 . 161081) (\DSPPUSHSTATE.PSC 161083 . 162543) (\DSPPOPSTATE.PSC 162545 . 166030) (\DSPRESET.PSC
- 166032 . 166697) (\DSPRIGHTMARGIN.PSC 166699 . 167388) (\DSPROTATE.PSC 167390 . 168389) (
-\DSPSCALE.PSC 168391 . 169343) (\DSPSCALE2.PSC 169345 . 170185) (\DSPSPACEFACTOR.PSC 170187 . 171108) 
-(\DSPTOPMARGIN.PSC 171110 . 171681) (\DSPTRANSLATE.PSC 171683 . 173714) (\DSPXPOSITION.PSC 173716 . 
-174280) (\DSPYPOSITION.PSC 174282 . 174873) (\FILLCIRCLE.PSC 174875 . 177100) (\FILLPOLYGON.PSC 177102
- . 180339) (\FIXLINELENGTH.PSC 180341 . 181660) (\MOVETO.PSC 181662 . 182432) (\NEWPAGE.PSC 182434 . 
-182629)) (182687 204710 (\POSTSCRIPT.CHANGECHARSET 182697 . 183434) (\POSTSCRIPT.OUTCHARFN 183436 . 
-195564) (\POSTSCRIPT.PRINTSLUG 195566 . 197290) (\POSTSCRIPT.SPECIALOUTCHARFN 197292 . 199643) (
-\UPDATE.PSC 199645 . 200891) (\POSTSCRIPT.ACCENTFN 200893 . 201835) (\POSTSCRIPT.ACCENTPAIR 201837 . 
-204708)) (204808 206453 (\PSC.SPACEDISP 204818 . 205097) (\PSC.SPACEWID 205099 . 205718) (\PSC.SYMBOLS
- 205720 . 206451)) (206562 209553 (\POSTSCRIPT.NSHASH 206572 . 209551)) (254327 255033 (POSTSCRIPTSEND
- 254337 . 255031)))))
+  (FILEMAP (NIL (22422 32918 (POSTSCRIPT.INIT 22432 . 29524) (POSTSCRIPT.PUTRGBCOLOR 29526 . 30548) (
+\PSC.COLOR.TO.RGB 30550 . 32916)) (33904 68688 (PSCFONT.READFONT 33914 . 35822) (PSCFONT.SPELLFILE 
+35824 . 36402) (PSCFONT.COERCEFILE 36404 . 37976) (PSCFONTFROMCACHE.SPELLFILE 37978 . 38963) (
+PSCFONTFROMCACHE.COERCEFILE 38965 . 40617) (PSCFONT.WRITEFONT 40619 . 41634) (READ-AFM-FILE 41636 . 
+47507) (CONVERT-AFM-FILES 47509 . 48721) (POSTSCRIPT.GETFONTID 48723 . 50118) (POSTSCRIPT.FONTCREATE 
+50120 . 62519) (\POSTSCRIPT.SPECIALFONT.SCALEDWIDTHS 62521 . 64918) (POSTSCRIPT.FONTSAVAILABLE 64920
+ . 68686)) (69243 78528 (OPENPOSTSCRIPTSTREAM 69253 . 78194) (CLOSEPOSTSCRIPTSTREAM 78196 . 78526)) (
+78573 84627 (POSTSCRIPT.HARDCOPYW 78583 . 81690) (POSTSCRIPT.TEDIT 81692 . 82176) (POSTSCRIPT.TEXT 
+82178 . 82469) (POSTSCRIPTFILEP 82471 . 83578) (MAKEEPSFILE 83580 . 84625)) (84628 128202 (
+POSTSCRIPT.BITMAPSCALE 84638 . 87094) (POSTSCRIPT.CLOSESTRING 87096 . 87649) (POSTSCRIPT.ENDPAGE 87651
+ . 88542) (POSTSCRIPT.OUTSTR 88544 . 89761) (POSTSCRIPT.PUTBITMAPBYTES 89763 . 98234) (
+POSTSCRIPT.PUTCOMMAND 98236 . 99225) (POSTSCRIPT.SET-FAKE-LANDSCAPE 99227 . 103747) (
+POSTSCRIPT.SHOWACCUM 103749 . 105904) (POSTSCRIPT.STARTPAGE 105906 . 108438) (\POSTSCRIPTTAB 108440 . 
+109237) (\PS.BOUTFIXP 109239 . 110519) (\PS.SCALEHACK 110521 . 113164) (\PS.SCALEREGION 113166 . 
+113726) (\SCALEDBITBLT.PSC 113728 . 118038) (\SETPOS.PSC 118040 . 118521) (\SETXFORM.PSC 118523 . 
+121107) (\STRINGWIDTH.PSC 121109 . 121582) (\SWITCHFONTS.PSC 121584 . 127076) (\TERPRI.PSC 127078 . 
+128200)) (128237 182317 (\BITBLT.PSC 128247 . 128799) (\BLTSHADE.PSC 128801 . 133462) (\CHARWIDTH.PSC 
+133464 . 133971) (\CREATECHARSET.PSC 133973 . 135671) (\DRAWARC.PSC 135673 . 138051) (\DRAWCIRCLE.PSC 
+138053 . 140304) (\DRAWCURVE.PSC 140306 . 144150) (\DRAWELLIPSE.PSC 144152 . 146516) (\DRAWLINE.PSC 
+146518 . 149258) (\DRAWPOINT.PSC 149260 . 149836) (\DRAWPOLYGON.PSC 149838 . 152967) (
+\DSPBOTTOMMARGIN.PSC 152969 . 153656) (\DSPCLIPPINGREGION.PSC 153658 . 155033) (\DSPCOLOR.PSC 155035
+ . 155966) (\DSPFONT.PSC 155968 . 159487) (\DSPLEFTMARGIN.PSC 159489 . 160175) (\DSPLINEFEED.PSC 
+160177 . 160767) (\DSPPUSHSTATE.PSC 160769 . 162229) (\DSPPOPSTATE.PSC 162231 . 165716) (\DSPRESET.PSC
+ 165718 . 166383) (\DSPRIGHTMARGIN.PSC 166385 . 167074) (\DSPROTATE.PSC 167076 . 168075) (
+\DSPSCALE.PSC 168077 . 169029) (\DSPSCALE2.PSC 169031 . 169871) (\DSPSPACEFACTOR.PSC 169873 . 170794) 
+(\DSPTOPMARGIN.PSC 170796 . 171367) (\DSPTRANSLATE.PSC 171369 . 173400) (\DSPXPOSITION.PSC 173402 . 
+173966) (\DSPYPOSITION.PSC 173968 . 174559) (\FILLCIRCLE.PSC 174561 . 176786) (\FILLPOLYGON.PSC 176788
+ . 180025) (\FIXLINELENGTH.PSC 180027 . 181346) (\MOVETO.PSC 181348 . 182118) (\NEWPAGE.PSC 182120 . 
+182315)) (182373 204396 (\POSTSCRIPT.CHANGECHARSET 182383 . 183120) (\POSTSCRIPT.OUTCHARFN 183122 . 
+195250) (\POSTSCRIPT.PRINTSLUG 195252 . 196976) (\POSTSCRIPT.SPECIALOUTCHARFN 196978 . 199329) (
+\UPDATE.PSC 199331 . 200577) (\POSTSCRIPT.ACCENTFN 200579 . 201521) (\POSTSCRIPT.ACCENTPAIR 201523 . 
+204394)) (204494 206139 (\PSC.SPACEDISP 204504 . 204783) (\PSC.SPACEWID 204785 . 205404) (\PSC.SYMBOLS
+ 205406 . 206137)) (206248 209239 (\POSTSCRIPT.NSHASH 206258 . 209237)) (254245 254951 (POSTSCRIPTSEND
+ 254255 . 254949)))))
 STOP
diff --git a/library/POSTSCRIPTSTREAM.LCOM b/library/POSTSCRIPTSTREAM.LCOM
index 6466f5df94c48bb50c263fe79e0680c9214cb164..cf3e9881f7fb301e72b484b059b107109e19b450 100644
GIT binary patch
delta 692
zcmZvaPiqrF7{+-^syIs0W<y)0#n(AClEmHFKUvaKnm@8}yNTINQ1BASUtJQLZtx&@
z5j-1;%tibF-aHk&`4Qs5lixr;gE+gfZG_%l-uXSxJo7LgeysogzW)A+q-Kk=L6*r(
zN5%@eQc(5z3unhnBUR;WZRRh}6r-S+1zDLdcDmz9FdU5sI2t3Zwrm?$!CWp!vD*oH
z-Kz|kNz-J%YT1=ivr_abWu$mT0*doD2RBS4OgCjiJN>w}7i$-rF8^~2_L6BVG@6yR
zRd2c3vM@n%T3l;_@m7nSX)!?3Rt-6$X%rpHM#?fwH)tC7@8bc|{s{fipcBldy>Le(
zR9`{!m#F_AO1K+`#y0hP{Qyry0e%mUXOkfEA^d9`tX(>L*_lo!uOe$Xx)|N3M~8JA
z3BQ|w8h@UET_F5jI4=@#N6fzxV5iQr%GyN$!XIrweVbxmVR(^BdBDP%@Gl$CkisX(
z8I`H@@}ATtJl+ab=Bi3GFEYH|gnBYmsCkOjmQ(Vqx+C^KBaNs^?9Z$6hLh=-5?)FQ
zKP+3$!^5J7LaZqA5+eL_5}d7YWhfM%HQZ8e`CM0c#wDoTrepCNPKF^*RXv~4{&h|G
mu>=lB39jEf5<PahAwu{<g4Q*p!j14x65NZ3GcN_-+J6BGo1*Ig

delta 791
zcmZvZ&ubGw6vuhRf{vzjx7xI{!eb8FlqT+vB#jY-WOq|Xw!7=@rW(nm&{RWzX&VI*
z1o0m*E;1lqEO;v7&0h89!HYe3^B|rCOUZxWB-`35-o7*Q{l52kZ+`9czxdk!>}K=>
zWYF46&PXnWR9Dlp^AFRSqUBJ{7nMR$SK41jq9?DC(dVBMV6?J39=)xdr1jA9J)dQ~
zz(7(jv#@N3y+d7y;A+XVqNTkH(dJ%ijMPoPbi;G)+KlVO9y9O^*LMAAsB^yRxj`5h
zKJ&uBa!hQlBB7P4ZR1gzOeRBdVZPN^_#b8N5>1hb3bQT4w@RU9V)PyS6FDSWuApY~
zQ5()l6(_(ybX|_9^JXaDgR_}q?UM=Al5g}5<R7vlGe@s$$?jGr>j$G8#tr5hc3dtV
z-Lh@w1<`x4kI@bqhgCCzl!broFNH<Vx8|5z4brBV1gTa?m+r2|f1)Twb-Ji!+mEh*
z`ZU|Oo$Ui8eCrgrNkW$!i!Iz}uHIg5;Jy26tp-iu1eX%Pfbd%h7~>BTa82kB2^i<!
zgdQW4co}J{xzgC^nyE6S<)<k+%tl@w0Q(H-X{t>r+3BvM>*t#T;EFPx0T|}T2f-U6
zaaPxKia~9*?27o(AY30N6c^P39we!Hu^=?x83b1*qMNRZZk4KIgv@o2>!*7eZAugO
z``u`GXKj6z@|V3gG?_C~E`=z<s;a~$4iY#5$d%wMe=fr)e=LD2F5XEn!as>enZ)RH
bR%~W|p&R29GE|Qdq$)4UFuA=Y!^gSb^!(5{