Some initial work on adding support for Japanese glyphs.

(At this point I'm not sure this is the right approach, but I don't want to lose this work. Just in case it's useful.)

library/POSTSCRIPTSTREAM

@@ -1,12 +1,14 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "21-Nov-2023 17:06:12" {WMEDLEY}<library>POSTSCRIPTSTREAM.;12
 258100 
+
(FILECREATED "28-Jan-2024 19:48:39" {LIB}POSTSCRIPTSTREAM.;4
 261407 
 
-      :EDIT-BY rmk
+      :EDIT-BY "mth"
 
-      :CHANGES-TO (FNS POSTSCRIPTFILEP)
+      :CHANGES-TO (FNS READ-ADOBE-GLYPH-FILE)
+                  (VARS POSTSCRIPTSTREAMCOMS)
+                  (FILES UNICODE)
 
-      :PREVIOUS-DATE "21-Jun-2021 20:29:32" {WMEDLEY}<library>POSTSCRIPTSTREAM.;11)
+      :PREVIOUS-DATE "21-Nov-2023 17:06:12" {LIB}POSTSCRIPTSTREAM.;1)
 
 
 (PRETTYCOMPRINT POSTSCRIPTSTREAMCOMS)
@@ -17,7 +19,7 @@
 
         (DECLARE%: EVAL@COMPILE DONTCOPY (RECORDS FONTID PSCFONT \POSTSCRIPTDATA POSTSCRIPTXFORM))
         (INITRECORDS \POSTSCRIPTDATA)
-        (FNS POSTSCRIPT.INIT)
+        (FNS POSTSCRIPT.INIT READ-ADOBE-GLYPH-FILE)
         (ADDVARS (DEFAULTFILETYPELIST (PS . TEXT)
                         (PSC . TEXT)
                         (PSF . BINARY)
@@ -68,6 +70,8 @@
         (COMS 
               (* ;; "Character-output, plus special-cases:")

 
+              (FILES (SYSLOAD)
+                     UNICODE)
               (FNS \POSTSCRIPT.CHANGECHARSET \POSTSCRIPT.OUTCHARFN \POSTSCRIPT.PRINTSLUG 
                    \POSTSCRIPT.SPECIALOUTCHARFN \UPDATE.PSC \POSTSCRIPT.ACCENTFN 
                    \POSTSCRIPT.ACCENTPAIR)
@@ -481,6 +485,65 @@
                                      IMPOPSTATE _ (FUNCTION \DSPPOPSTATE.PSC)))
     (SETQ *POSTSCRIPT-NS-HASH* (HARRAY 255))
     (\POSTSCRIPT.NSHASH
 *POSTSCRIPT-NS-TRANSLATIONS*])
+
+(READ-ADOBE-GLYPH-FILE

+  [LAMBDA (FILESPEC)
                                         (* ; "Edited 28-Jan-2024 19:46 by mth")

+
+    (* ;; "Read the file of PostScript glyphs as provided by Adobe at ")

+
+    (* ;; "         https://github.com/adobe-type-tools/agl-aglfn/glyphlist.txt")

+
+    (* ;; " The file is assumed to be local. (i.e., this does not fetch the file from github.com)")

+
+    (* ;; "")

+
+    (* ;; "The file format is:")

+
+    (* ;; "Comment lines begin with #, ignore these lines (as well as blank lines)")

+
+    (* ;; "Glyph lines consist of two semicolon delimited fields")

+
+    (* ;; "  (1)  glyph name -- upper/lowercase letters and digits")

+
+    (* ;; "  (2) Unicode scalar value -- four uppercase hexadecimal digits")

+
+    (* ;; "* Note that some entries have multiple Unicode values. ")

+
+    (* ;; "   These are cases of a single glyph name for composite character. ")

+
+    (* ;; "      These must be handled separately. ")

+
+    (* ;; 
+
    "      (It might work just to ignore them as the composite characters may just work separately.)")

+
+    (* ;; "")

+
+    (* ;; "Result is a list of (glyph-name-string  Unicode-values)")

+
+    (CL:WITH-OPEN-FILE (STREAM FILESPEC :DIRECTION :INPUT :EXTERNAL-FORMAT :UTF-8-RAW)
+           (bind
 LINE NAME CODE SPLIT START [SEPBITTABLE _ (MAKEBITTABLE (CHARCODE (TAB SPACE]
+              while
 (AND (SETQ LINE (CL:READ-LINE STREAM NIL NIL))
+                         (SETQ LINE (CL:STRING-TRIM " " LINE)))
+              when
 (SETQ START (STRPOSL SEPBITTABLE LINE 1 T))
+              unless
 [OR (STREQUAL LINE "")
+                         (EQ (CHARCODE %#)
+                             (NTHCHARCODE LINE START))
+                         (NOT (SETQ SPLIT (STRPOS ";" LINE]
+              collect
                                        (* (PROGN (SETQ NAME
+
                                                             (CL:STRING-RIGHT-TRIM " "
+
                                                             (SUBSTRING LINE START
+
                                                             (SUB1 SPLIT)))) (SETQ CODE
+
                                                             (HEXNUM? (SUBSTRING LINE
+
                                                             (ADD1 SPLIT)))) (LIST CODE NAME)))

+                    (CONS (PROG1 (CL:STRING-RIGHT-TRIM " " (SUBSTRING LINE START (SUB1 SPLIT)))
+                              (SETQ START (ADD1 SPLIT)))
+                          (bind
 END while
 [SETQ END (OR (STRPOSL SEPBITTABLE LINE START)
+                                                        (ADD1 (NCHARS LINE]
+                             collect
 [HEXNUM? (SUBSTRING LINE START (SUB1 END)
+                                                     (CONSTANT (CONCAT]
+                             repeatwhile
 (AND (SETQ START (STRPOSL SEPBITTABLE LINE END T))
+                                              (NEQ (CHARCODE %#)
+                                                   (NTHCHARCODE LINE START])
 )
 
 (ADDTOVAR DEFAULTFILETYPELIST
 (PS . TEXT)
@@ -3071,6 +3134,9 @@
 
 (* ;; "Character-output, plus special-cases:")

 
+
+(FILESLOAD (SYSLOAD)
+       UNICODE)
 (DEFINEQ
 
 (\POSTSCRIPT.CHANGECHARSET

@@ -4382,39 +4448,40 @@
 
 (ADDTOVAR LAMA
 POSTSCRIPT.PUTCOMMAND)
 )
+(PUTPROPS POSTSCRIPTSTREAM COPYRIGHT (NONE))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (22199 29303 (POSTSCRIPT.INIT 22209 . 29301)) (30283 65067 (PSCFONT.READFONT 30293 . 
-32201) (PSCFONT.SPELLFILE 32203 . 32781) (PSCFONT.COERCEFILE 32783 . 34355) (
-PSCFONTFROMCACHE.SPELLFILE 34357 . 35342) (PSCFONTFROMCACHE.COERCEFILE 35344 . 36996) (
-PSCFONT.WRITEFONT 36998 . 38013) (READ-AFM-FILE 38015 . 43886) (CONVERT-AFM-FILES 43888 . 45100) (
-POSTSCRIPT.GETFONTID 45102 . 46497) (POSTSCRIPT.FONTCREATE 46499 . 58898) (
-\POSTSCRIPT.SPECIALFONT.SCALEDWIDTHS 58900 . 61297) (POSTSCRIPT.FONTSAVAILABLE 61299 . 65065)) (65622 
-74768 (OPENPOSTSCRIPTSTREAM 65632 . 74434) (CLOSEPOSTSCRIPTSTREAM 74436 . 74766)) (74813 81105 (
-POSTSCRIPT.HARDCOPYW 74823 . 78172) (POSTSCRIPT.TEDIT 78174 . 78654) (POSTSCRIPT.TEXT 78656 . 78947) (
-POSTSCRIPTFILEP 78949 . 80056) (MAKEEPSFILE 80058 . 81103)) (81106 125992 (POSTSCRIPT.BITMAPSCALE 
-81116 . 83572) (POSTSCRIPT.CLOSESTRING 83574 . 84108) (POSTSCRIPT.ENDPAGE 84110 . 84981) (
-POSTSCRIPT.OUTSTR 84983 . 86004) (POSTSCRIPT.PUTBITMAPBYTES 86006 . 94477) (POSTSCRIPT.PUTCOMMAND 
-94479 . 95528) (POSTSCRIPT.SET-FAKE-LANDSCAPE 95530 . 100978) (POSTSCRIPT.SHOWACCUM 100980 . 103218) (
-POSTSCRIPT.STARTPAGE 103220 . 105799) (\POSTSCRIPTTAB 105801 . 106672) (\PS.BOUTFIXP 106674 . 108024) 
-(\PS.SCALEHACK 108026 . 110855) (\PS.SCALEREGION 110857 . 111417) (\SCALEDBITBLT.PSC 111419 . 115719) 
-(\SETPOS.PSC 115721 . 116183) (\SETXFORM.PSC 116185 . 118004) (\STRINGWIDTH.PSC 118006 . 118460) (
-\SWITCHFONTS.PSC 118462 . 124619) (\TERPRI.PSC 124621 . 125990)) (126027 181747 (\BITBLT.PSC 126037 . 
-126590) (\BLTSHADE.PSC 126592 . 130874) (\CHARWIDTH.PSC 130876 . 131643) (\CREATECHARSET.PSC 131645 . 
-133343) (\DRAWARC.PSC 133345 . 135825) (\DRAWCIRCLE.PSC 135827 . 138236) (\DRAWCURVE.PSC 138238 . 
-142259) (\DRAWELLIPSE.PSC 142261 . 144738) (\DRAWLINE.PSC 144740 . 147090) (\DRAWPOINT.PSC 147092 . 
-147680) (\DRAWPOLYGON.PSC 147682 . 150796) (\DSPBOTTOMMARGIN.PSC 150798 . 151363) (
-\DSPCLIPPINGREGION.PSC 151365 . 152808) (\DSPCOLOR.PSC 152810 . 153651) (\DSPFONT.PSC 153653 . 157863)
- (\DSPLEFTMARGIN.PSC 157865 . 158434) (\DSPLINEFEED.PSC 158436 . 159012) (\DSPPUSHSTATE.PSC 159014 . 
-160777) (\DSPPOPSTATE.PSC 160779 . 163288) (\DSPRESET.PSC 163290 . 163936) (\DSPRIGHTMARGIN.PSC 163938
- . 164510) (\DSPROTATE.PSC 164512 . 165535) (\DSPSCALE.PSC 165537 . 166468) (\DSPSCALE2.PSC 166470 . 
-167289) (\DSPSPACEFACTOR.PSC 167291 . 168263) (\DSPTOPMARGIN.PSC 168265 . 168982) (\DSPTRANSLATE.PSC 
-168984 . 171558) (\DSPXPOSITION.PSC 171560 . 172159) (\DSPYPOSITION.PSC 172161 . 172733) (
-\FILLCIRCLE.PSC 172735 . 175381) (\FILLPOLYGON.PSC 175383 . 179299) (\FIXLINELENGTH.PSC 179301 . 
-180795) (\MOVETO.PSC 180797 . 181548) (\NEWPAGE.PSC 181550 . 181745)) (181803 204955 (
-\POSTSCRIPT.CHANGECHARSET 181813 . 182617) (\POSTSCRIPT.OUTCHARFN 182619 . 195476) (
-\POSTSCRIPT.PRINTSLUG 195478 . 197445) (\POSTSCRIPT.SPECIALOUTCHARFN 197447 . 199879) (\UPDATE.PSC 
-199881 . 201104) (\POSTSCRIPT.ACCENTFN 201106 . 202048) (\POSTSCRIPT.ACCENTPAIR 202050 . 204953)) (
-205053 206698 (\PSC.SPACEDISP 205063 . 205342) (\PSC.SPACEWID 205344 . 205963) (\PSC.SYMBOLS 205965 . 
-206696)) (206807 209798 (\POSTSCRIPT.NSHASH 206817 . 209796)) (254273 254987 (POSTSCRIPTSEND 254283 . 
-254985)))))
+  (FILEMAP (NIL (22342 32527 (POSTSCRIPT.INIT 22352 . 29444) (READ-ADOBE-GLYPH-FILE 29446 . 32525)) (
+33507 68291 (PSCFONT.READFONT 33517 . 35425) (PSCFONT.SPELLFILE 35427 . 36005) (PSCFONT.COERCEFILE 
+36007 . 37579) (PSCFONTFROMCACHE.SPELLFILE 37581 . 38566) (PSCFONTFROMCACHE.COERCEFILE 38568 . 40220) 
+(PSCFONT.WRITEFONT 40222 . 41237) (READ-AFM-FILE 41239 . 47110) (CONVERT-AFM-FILES 47112 . 48324) (
+POSTSCRIPT.GETFONTID 48326 . 49721) (POSTSCRIPT.FONTCREATE 49723 . 62122) (
+\POSTSCRIPT.SPECIALFONT.SCALEDWIDTHS 62124 . 64521) (POSTSCRIPT.FONTSAVAILABLE 64523 . 68289)) (68846 
+77992 (OPENPOSTSCRIPTSTREAM 68856 . 77658) (CLOSEPOSTSCRIPTSTREAM 77660 . 77990)) (78037 84329 (
+POSTSCRIPT.HARDCOPYW 78047 . 81396) (POSTSCRIPT.TEDIT 81398 . 81878) (POSTSCRIPT.TEXT 81880 . 82171) (
+POSTSCRIPTFILEP 82173 . 83280) (MAKEEPSFILE 83282 . 84327)) (84330 129216 (POSTSCRIPT.BITMAPSCALE 
+84340 . 86796) (POSTSCRIPT.CLOSESTRING 86798 . 87332) (POSTSCRIPT.ENDPAGE 87334 . 88205) (
+POSTSCRIPT.OUTSTR 88207 . 89228) (POSTSCRIPT.PUTBITMAPBYTES 89230 . 97701) (POSTSCRIPT.PUTCOMMAND 
+97703 . 98752) (POSTSCRIPT.SET-FAKE-LANDSCAPE 98754 . 104202) (POSTSCRIPT.SHOWACCUM 104204 . 106442) (
+POSTSCRIPT.STARTPAGE 106444 . 109023) (\POSTSCRIPTTAB 109025 . 109896) (\PS.BOUTFIXP 109898 . 111248) 
+(\PS.SCALEHACK 111250 . 114079) (\PS.SCALEREGION 114081 . 114641) (\SCALEDBITBLT.PSC 114643 . 118943) 
+(\SETPOS.PSC 118945 . 119407) (\SETXFORM.PSC 119409 . 121228) (\STRINGWIDTH.PSC 121230 . 121684) (
+\SWITCHFONTS.PSC 121686 . 127843) (\TERPRI.PSC 127845 . 129214)) (129251 184971 (\BITBLT.PSC 129261 . 
+129814) (\BLTSHADE.PSC 129816 . 134098) (\CHARWIDTH.PSC 134100 . 134867) (\CREATECHARSET.PSC 134869 . 
+136567) (\DRAWARC.PSC 136569 . 139049) (\DRAWCIRCLE.PSC 139051 . 141460) (\DRAWCURVE.PSC 141462 . 
+145483) (\DRAWELLIPSE.PSC 145485 . 147962) (\DRAWLINE.PSC 147964 . 150314) (\DRAWPOINT.PSC 150316 . 
+150904) (\DRAWPOLYGON.PSC 150906 . 154020) (\DSPBOTTOMMARGIN.PSC 154022 . 154587) (
+\DSPCLIPPINGREGION.PSC 154589 . 156032) (\DSPCOLOR.PSC 156034 . 156875) (\DSPFONT.PSC 156877 . 161087)
+ (\DSPLEFTMARGIN.PSC 161089 . 161658) (\DSPLINEFEED.PSC 161660 . 162236) (\DSPPUSHSTATE.PSC 162238 . 
+164001) (\DSPPOPSTATE.PSC 164003 . 166512) (\DSPRESET.PSC 166514 . 167160) (\DSPRIGHTMARGIN.PSC 167162
+ . 167734) (\DSPROTATE.PSC 167736 . 168759) (\DSPSCALE.PSC 168761 . 169692) (\DSPSCALE2.PSC 169694 . 
+170513) (\DSPSPACEFACTOR.PSC 170515 . 171487) (\DSPTOPMARGIN.PSC 171489 . 172206) (\DSPTRANSLATE.PSC 
+172208 . 174782) (\DSPXPOSITION.PSC 174784 . 175383) (\DSPYPOSITION.PSC 175385 . 175957) (
+\FILLCIRCLE.PSC 175959 . 178605) (\FILLPOLYGON.PSC 178607 . 182523) (\FIXLINELENGTH.PSC 182525 . 
+184019) (\MOVETO.PSC 184021 . 184772) (\NEWPAGE.PSC 184774 . 184969)) (185065 208217 (
+\POSTSCRIPT.CHANGECHARSET 185075 . 185879) (\POSTSCRIPT.OUTCHARFN 185881 . 198738) (
+\POSTSCRIPT.PRINTSLUG 198740 . 200707) (\POSTSCRIPT.SPECIALOUTCHARFN 200709 . 203141) (\UPDATE.PSC 
+203143 . 204366) (\POSTSCRIPT.ACCENTFN 204368 . 205310) (\POSTSCRIPT.ACCENTPAIR 205312 . 208215)) (
+208315 209960 (\PSC.SPACEDISP 208325 . 208604) (\PSC.SPACEWID 208606 . 209225) (\PSC.SYMBOLS 209227 . 
+209958)) (210069 213060 (\POSTSCRIPT.NSHASH 210079 . 213058)) (257535 258249 (POSTSCRIPTSEND 257545 . 
+258247)))))
 STOP

sources/FILEPKG

@@ -1,15 +1,18 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "18-Apr-2024 12:53:26" {DSK}<home>larry>il>medley>sources>FILEPKG.;53
 273166 
+
(FILECREATED "18-Jul-2023 23:40:13" {WMEDLEY}<sources>FILEPKG.;50
 274539 
 
-      :EDIT-BY "lmm"
+      :EDIT-BY rmk
 
-      :CHANGES-TO (VARS FILEPKGCOMS)
-                  (FNS MAKEFILE)
+      :CHANGES-TO (FNS GATHEREXPORTS)
 
-      :PREVIOUS-DATE "18-Apr-2024 12:33:38" {DSK}<home>larry>il>medley>sources>FILEPKG.;52)
+      :PREVIOUS-DATE "13-Jul-2023 14:56:21" {WMEDLEY}<sources>FILEPKG.;48)
 
 
+(* ; "
+Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation.
+")
+
 (PRETTYCOMPRINT FILEPKGCOMS)
 
 (RPAQQ FILEPKGCOMS

@@ -397,13 +400,13 @@
        (T (COMPILEFILES0
 FILES])
 
 (COMPILEFILES0

-  [LAMBDA (FILES OPTIONS)
                                    (* ; "Edited 30-Jan-2024 15:03 by lmm")

-                                                             (* rmk%: "19-FEB-83 21:59")

-    (for
 X OPTS RCFLG on
 (OR FILES NOTCOMPILEDFILES) first
 (SETQ OPTS (SELECTQ (CAR (LISTP OPTIONS))
-                                                                          (C (SETQ RCFLG NIL)
-                                                                             (CDR OPTIONS))
-                                                                          (RC (CDR OPTIONS))
-                                                                          OPTIONS))
+  [LAMBDA (FILES OPTIONS)                                    (* rmk%: "19-FEB-83 21:59")

+    (for
 X OPTS (RCFLG _ T) on
 (OR FILES NOTCOMPILEDFILES) first
 (SETQ OPTS
+                                                                  (SELECTQ (CAR (LISTP OPTIONS))
+                                                                      (C (SETQ RCFLG NIL)
+                                                                         (CDR OPTIONS))
+                                                                      (RC (CDR OPTIONS))
+                                                                      OPTIONS))
        do
 (MAKEFILE1
 (OR (MISSPELLED? (CAR X)
                                 70 FILELST NIL X)
                          (CAR X))
@@ -434,8 +437,7 @@
           (RETURN FILE])
 
 (MAKEFILE

-  [LAMBDA (FILE OPTIONS REPRINTFNS SOURCEFILE)
               (* ; "Edited 30-Jan-2024 12:50 by lmm")


-                                                            (* ; "Edited 10-Oct-2021 20:36 by rmk:")


+  [LAMBDA (FILE OPTIONS REPRINTFNS SOURCEFILE)
              (* ; "Edited 10-Oct-2021 20:36 by rmk:")


                                                             (* ; "Edited 29-Jun-2021 17:24 by rmk:")

 
     (* ;; "OPTIONS: FAST means dump with PRETTYFLG set to NIL;  LIST means list the FILE;  RC means RECOMPILE, C means COMPILEL;  --- for C AND RC assume ST unless next option is F.")

@@ -460,14 +462,35 @@
           (SETQ CHANGES (fetch
 TOBEDUMPED of
 FILEPROP))
           (SETQ FILEDATES (LISTP (fetch
 FILEDATES of
 ROOTNAME)))
           (SETQ FILETYPE (GETPROP ROOTNAME 'FILETYPE))
-          (if
 (AND (NULL (fetch
 LOADTYPE of
 FILEPROP))
+      LP0 (if
 (AND (NULL (fetch
 LOADTYPE of
 FILEPROP))
                    (NULL FILEDATES))
               then
                                           (* ; 
 
                     "File has never been loaded and never dumped i.e. user just set up COMS in core")

-            elseif
 [OR (MEMB 'NEW OPTIONS)
+            elseif
 [OR (EQMEMB 'NEW OPTIONS)
                        (AND (NULL MAKEFILEREMAKEFLG)
                             (NOT (MEMB 'REMAKE OPTIONS]
-              then
 (RETURN (MAKEFILE-NEW
 FILE OPTIONS))
+              then
 (COND
+                      ((AND (fetch
 LOADTYPE of
 FILEPROP)
+                            (NEQ T (fetch
 LOADTYPE of
 FILEPROP)))
+                       (LISPXPRIN2 FILE T T)
+                       (LISPXPRIN1 (SELECTQ (fetch
 LOADTYPE of
 FILEPROP)
+                                       (LOADCOMP "the file was loaded for compilation purposes only")
+                                       ((compiled Compiled COMPILED) 
+                                            " -- only the compiled file has been loaded
+")
+                                       ((loadfns LOADFNS) 
+                                            " -- only some of its symbolics have been loaded
+")
+                                       (SHOULDNT))
+                              T)
+                       (COND
+                          ((NEQ (ASKUSER DWIMWAIT 'Y "Go ahead and MAKEFILE anyway? ")
+                                'Y)                          (* ; 
+
              "E.g. user loads a .com file and then resets the COMS or defines the functons by hand.")

+                           (GO OUT)))
+                       (/replace
 LOADTYPE of
 FILEPROP with
 NIL)))
+                   (SETQ SOURCEFILE NIL)
+                   (SETQ REPRINTFNS NIL)
             elseif
 SOURCEFILE
               then
                                           (* ; "source file given")

             elseif
 [AND FILEDATES (OR [AND (SETQ SOURCEFILE (FINDFILE ROOTNAME T))
@@ -496,7 +519,11 @@
                  (LISPXPRIN2 FILE T T)
                  (LISPXPRIN1 '", so it will have to be written anew
 " T)
-                 (RETURN (MAKEFILE-NEW
 FILE OPTIONS)))
+                 (SETQ SOURCEFILE NIL)
+                 (SETQ REPRINTFNS NIL)
+                 (push
 OPTIONS 'NEW)
+                 (SETQ CHANGES (fetch
 FILECHANGES of
 ROOTNAME))
+                 (GO LP0))
           (COND
              ((AND SOURCEFILE (SETQ Z (SELECTQ (fetch
 LOADTYPE of
 FILEPROP)
                                           (LOADCOMP          (* ; 
@@ -4831,47 +4858,49 @@ compiling " T)
 
 (ADDTOVAR LAMA
 FILEPKGTYPE FILEPKGCOM FILEPKGCHANGES)
 )
+(PUTPROPS FILEPKG COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1989 1990 
+1991 1992 1993 1995 2018 2022))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (18960 20633 (SEARCHPRETTYTYPELST 18970 . 19939) (PRETTYDEFMACROS 19941 . 20377) (
-FILEPKGCOMPROPS 20379 . 20631)) (21446 54515 (CLEANUP 21456 . 22846) (COMPILEFILES 22848 . 23124) (
-COMPILEFILES0 23126 . 23992) (CONTINUEDIT 23994 . 25371) (MAKEFILE 25373 . 35823) (FILECHANGES 35825
- . 38589) (FILEPKG.MERGECHANGES 38591 . 39226) (FILEPKG.CHANGEDFNS 39228 . 39540) (MAKEFILE1 39542 . 
-43754) (COMPILE-FILE? 43756 . 45343) (MAKEFILES 45345 . 46873) (ADDFILE 46875 . 49418) (ADDFILE0 49420
- . 53544) (LISTFILES 53546 . 54513)) (55187 88773 (FILEPKGCHANGES 55197 . 56376) (GETFILEPKGTYPE 56378
- . 59328) (MARKASCHANGED 59330 . 60961) (FILECOMS 60963 . 61347) (WHEREIS 61349 . 62878) (
-SMASHFILECOMS 62880 . 63108) (FILEFNSLST 63110 . 63276) (FILECOMSLST 63278 . 63764) (UPDATEFILES 63766
- . 68264) (INFILECOMS? 68266 . 70109) (INFILECOMTAIL 70111 . 71229) (INFILECOMS 71231 . 71392) (
-INFILECOM 71394 . 81412) (INFILECOMSVALS 81414 . 81721) (INFILECOMSVAL 81723 . 82731) (INFILECOMSPROP 
-82733 . 83526) (IFCPROPS 83528 . 84608) (IFCEXPRTYPE 84610 . 85226) (IFCPROPSCAN 85228 . 86189) (
-IFCDECLARE 86191 . 87450) (INFILEPAIRS 87452 . 87751) (INFILECOMSMACRO 87753 . 88771)) (88808 119494 (
-FILES? 88818 . 90929) (FILES?1 90931 . 91633) (FILES?PRINTLST 91635 . 92417) (ADDTOFILES? 92419 . 
-102962) (ADDTOFILE 102964 . 103880) (WHATIS 103882 . 105858) (ADDTOCOMS 105860 . 107398) (ADDTOCOM 
-107400 . 113887) (ADDTOCOM1 113889 . 115060) (ADDNEWCOM 115062 . 116112) (MAKENEWCOM 116114 . 117961) 
-(DEFAULTMAKENEWCOM 117963 . 119492)) (119564 122381 (MERGEINSERT 119574 . 121917) (MERGEINSERT1 121919
- . 122379)) (122535 123896 (ADDTOFILEKEYLST 122545 . 123894)) (124013 134814 (DELFROMFILES 124023 . 
-124853) (DELFROMCOMS 124855 . 126534) (DELFROMCOM 126536 . 132301) (DELFROMCOM1 132303 . 133102) (
-REMOVEITEM 133104 . 133980) (MOVETOFILE 133982 . 134812)) (135028 137399 (SAVEPUT 135038 . 137397)) (
-137524 145767 (UNMARKASCHANGED 137534 . 139018) (PREEDITFN 139020 . 141501) (POSTEDITPROPS 141503 . 
-143797) (POSTEDITALISTS 143799 . 145765)) (145912 165382 (ALISTS.GETDEF 145922 . 146301) (
-ALISTS.WHENCHANGED 146303 . 146949) (CLEARCLISPARRAY 146951 . 148129) (EXPRESSIONS.WHENCHANGED 148131
- . 148509) (MAKEALISTCOMS 148511 . 149526) (MAKEFILESCOMS 149528 . 150858) (MAKELISPXMACROSCOMS 150860
- . 152878) (MAKEPROPSCOMS 152880 . 153506) (MAKEUSERMACROSCOMS 153508 . 155325) (PROPS.WHENCHANGED 
-155327 . 155948) (FILEGETDEF.LISPXMACROS 155950 . 157249) (FILEGETDEF.ALISTS 157251 . 157842) (
-FILEGETDEF.RECORDS 157844 . 158771) (FILEGETDEF.PROPS 158773 . 159568) (FILEGETDEF.MACROS 159570 . 
-160452) (FILEGETDEF.VARS 160454 . 161057) (FILEGETDEF.FNS 161059 . 162299) (FILEPKGCOMS.PUTDEF 162301
- . 164243) (FILES.PUTDEF 164245 . 165113) (VARS.PUTDEF 165115 . 165258) (FILES.WHENCHANGED 165260 . 
-165380)) (167404 174635 (RENAME 167414 . 168859) (CHANGECALLERS 168861 . 174633)) (174636 222545 (
-SHOWDEF 174646 . 175843) (COPYDEF 175845 . 178593) (GETDEF 178595 . 181138) (GETDEFCOM 181140 . 182106
-) (GETDEFCOM0 182108 . 183301) (GETDEFCURRENT 183303 . 189615) (GETDEFERR 189617 . 190887) (
-GETDEFFROMFILE 190889 . 195118) (GETDEFSAVED 195120 . 196208) (PUTDEF 196210 . 196917) (EDITDEF 196919
- . 197902) (DEFAULT.EDITDEF 197904 . 200742) (EDITDEF.FILES 200744 . 200949) (LOADDEF 200951 . 201127)
- (DWIMDEF 201129 . 201983) (DELDEF 201985 . 204879) (DELFROMLIST 204881 . 205385) (HASDEF 205387 . 
-211624) (GETFILEDEF 211626 . 212138) (SAVEDEF 212140 . 213828) (UNSAVEDEF 213830 . 214726) (
-COMPAREDEFS 214728 . 218534) (COMPARE 218536 . 219240) (TYPESOF 219242 . 222543)) (222695 230943 (
-FILEPKGCOM 222705 . 227481) (FILEPKGTYPE 227483 . 230941)) (242976 260451 (FINDCALLERS 242986 . 243616
-) (EDITCALLERS 243618 . 254335) (EDITFROMFILE 254337 . 259766) (FINDATS 259768 . 260040) (LOOKIN 
-260042 . 260449)) (260452 262123 (SEPRCASE 260462 . 262121)) (262640 267643 (IMPORTFILE 262650 . 
-263620) (IMPORTEVAL 263622 . 264508) (IMPORTFILESCAN 264510 . 264923) (CHECKIMPORTS 264925 . 266181) (
-GATHEREXPORTS 266183 . 267051) (\DUMPEXPORTS 267053 . 267641)) (267981 270051 (CLEARFILEPKG 267991 . 
-270049)))))
+  (FILEMAP (NIL (18975 20648 (SEARCHPRETTYTYPELST 18985 . 19954) (PRETTYDEFMACROS 19956 . 20392) (
+FILEPKGCOMPROPS 20394 . 20646)) (21461 55753 (CLEANUP 21471 . 22861) (COMPILEFILES 22863 . 23139) (
+COMPILEFILES0 23141 . 23954) (CONTINUEDIT 23956 . 25333) (MAKEFILE 25335 . 37061) (FILECHANGES 37063
+ . 39827) (FILEPKG.MERGECHANGES 39829 . 40464) (FILEPKG.CHANGEDFNS 40466 . 40778) (MAKEFILE1 40780 . 
+44992) (COMPILE-FILE? 44994 . 46581) (MAKEFILES 46583 . 48111) (ADDFILE 48113 . 50656) (ADDFILE0 50658
+ . 54782) (LISTFILES 54784 . 55751)) (56425 90011 (FILEPKGCHANGES 56435 . 57614) (GETFILEPKGTYPE 57616
+ . 60566) (MARKASCHANGED 60568 . 62199) (FILECOMS 62201 . 62585) (WHEREIS 62587 . 64116) (
+SMASHFILECOMS 64118 . 64346) (FILEFNSLST 64348 . 64514) (FILECOMSLST 64516 . 65002) (UPDATEFILES 65004
+ . 69502) (INFILECOMS? 69504 . 71347) (INFILECOMTAIL 71349 . 72467) (INFILECOMS 72469 . 72630) (
+INFILECOM 72632 . 82650) (INFILECOMSVALS 82652 . 82959) (INFILECOMSVAL 82961 . 83969) (INFILECOMSPROP 
+83971 . 84764) (IFCPROPS 84766 . 85846) (IFCEXPRTYPE 85848 . 86464) (IFCPROPSCAN 86466 . 87427) (
+IFCDECLARE 87429 . 88688) (INFILEPAIRS 88690 . 88989) (INFILECOMSMACRO 88991 . 90009)) (90046 120732 (
+FILES? 90056 . 92167) (FILES?1 92169 . 92871) (FILES?PRINTLST 92873 . 93655) (ADDTOFILES? 93657 . 
+104200) (ADDTOFILE 104202 . 105118) (WHATIS 105120 . 107096) (ADDTOCOMS 107098 . 108636) (ADDTOCOM 
+108638 . 115125) (ADDTOCOM1 115127 . 116298) (ADDNEWCOM 116300 . 117350) (MAKENEWCOM 117352 . 119199) 
+(DEFAULTMAKENEWCOM 119201 . 120730)) (120802 123619 (MERGEINSERT 120812 . 123155) (MERGEINSERT1 123157
+ . 123617)) (123773 125134 (ADDTOFILEKEYLST 123783 . 125132)) (125251 136052 (DELFROMFILES 125261 . 
+126091) (DELFROMCOMS 126093 . 127772) (DELFROMCOM 127774 . 133539) (DELFROMCOM1 133541 . 134340) (
+REMOVEITEM 134342 . 135218) (MOVETOFILE 135220 . 136050)) (136266 138637 (SAVEPUT 136276 . 138635)) (
+138762 147005 (UNMARKASCHANGED 138772 . 140256) (PREEDITFN 140258 . 142739) (POSTEDITPROPS 142741 . 
+145035) (POSTEDITALISTS 145037 . 147003)) (147150 166620 (ALISTS.GETDEF 147160 . 147539) (
+ALISTS.WHENCHANGED 147541 . 148187) (CLEARCLISPARRAY 148189 . 149367) (EXPRESSIONS.WHENCHANGED 149369
+ . 149747) (MAKEALISTCOMS 149749 . 150764) (MAKEFILESCOMS 150766 . 152096) (MAKELISPXMACROSCOMS 152098
+ . 154116) (MAKEPROPSCOMS 154118 . 154744) (MAKEUSERMACROSCOMS 154746 . 156563) (PROPS.WHENCHANGED 
+156565 . 157186) (FILEGETDEF.LISPXMACROS 157188 . 158487) (FILEGETDEF.ALISTS 158489 . 159080) (
+FILEGETDEF.RECORDS 159082 . 160009) (FILEGETDEF.PROPS 160011 . 160806) (FILEGETDEF.MACROS 160808 . 
+161690) (FILEGETDEF.VARS 161692 . 162295) (FILEGETDEF.FNS 162297 . 163537) (FILEPKGCOMS.PUTDEF 163539
+ . 165481) (FILES.PUTDEF 165483 . 166351) (VARS.PUTDEF 166353 . 166496) (FILES.WHENCHANGED 166498 . 
+166618)) (168642 175873 (RENAME 168652 . 170097) (CHANGECALLERS 170099 . 175871)) (175874 223783 (
+SHOWDEF 175884 . 177081) (COPYDEF 177083 . 179831) (GETDEF 179833 . 182376) (GETDEFCOM 182378 . 183344
+) (GETDEFCOM0 183346 . 184539) (GETDEFCURRENT 184541 . 190853) (GETDEFERR 190855 . 192125) (
+GETDEFFROMFILE 192127 . 196356) (GETDEFSAVED 196358 . 197446) (PUTDEF 197448 . 198155) (EDITDEF 198157
+ . 199140) (DEFAULT.EDITDEF 199142 . 201980) (EDITDEF.FILES 201982 . 202187) (LOADDEF 202189 . 202365)
+ (DWIMDEF 202367 . 203221) (DELDEF 203223 . 206117) (DELFROMLIST 206119 . 206623) (HASDEF 206625 . 
+212862) (GETFILEDEF 212864 . 213376) (SAVEDEF 213378 . 215066) (UNSAVEDEF 215068 . 215964) (
+COMPAREDEFS 215966 . 219772) (COMPARE 219774 . 220478) (TYPESOF 220480 . 223781)) (223933 232181 (
+FILEPKGCOM 223943 . 228719) (FILEPKGTYPE 228721 . 232179)) (244214 261689 (FINDCALLERS 244224 . 244854
+) (EDITCALLERS 244856 . 255573) (EDITFROMFILE 255575 . 261004) (FINDATS 261006 . 261278) (LOOKIN 
+261280 . 261687)) (261690 263361 (SEPRCASE 261700 . 263359)) (263878 268881 (IMPORTFILE 263888 . 
+264858) (IMPORTEVAL 264860 . 265746) (IMPORTFILESCAN 265748 . 266161) (CHECKIMPORTS 266163 . 267419) (
+GATHEREXPORTS 267421 . 268289) (\DUMPEXPORTS 268291 . 268879)) (269219 271289 (CLEARFILEPKG 269229 . 
+271287)))))
 STOP