From 19015712de3ecd4f319903fbd5981ef503222e92 Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Thu, 11 Jul 2024 15:59:22 -0700 Subject: [PATCH] Fix hardcopy under XCL exec #1781 (#1782) * TEDIT-FILE fixes #1781 * TEDIT-FILE fixes #1781 --- library/tedit/TEDIT-FILE | 59 ++++++++++++++++++---------------- library/tedit/TEDIT-FILE.LCOM | Bin 38737 -> 38701 bytes 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/library/tedit/TEDIT-FILE b/library/tedit/TEDIT-FILE index 333be147..922ab551 100644 --- a/library/tedit/TEDIT-FILE +++ b/library/tedit/TEDIT-FILE @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 7-Apr-2024 17:22:52" {WMEDLEY}TEDIT>TEDIT-FILE.;531 155019 +(FILECREATED "11-Jul-2024 14:26:05" {MEDLEY}TEDIT>TEDIT-FILE.;23 155256 :EDIT-BY rmk - :CHANGES-TO (FNS \TEDIT.GET.CHARLOOKS.LIST \TEDIT.GET.SINGLE.CHARLOOKS \TEDIT.GET.PIECES3) + :CHANGES-TO (FNS \TEDIT.GET.PIECES3) - :PREVIOUS-DATE " 2-Apr-2024 12:15:23" {WMEDLEY}TEDIT>TEDIT-FILE.;529) + :PREVIOUS-DATE " 7-Apr-2024 17:22:52" {MEDLEY}TEDIT>TEDIT-FILE.;20) (PRETTYCOMPRINT TEDIT-FILECOMS) @@ -855,7 +855,8 @@ (DEFINEQ (\TEDIT.GET.PIECES3 - [LAMBDA (TEXT TEXTOBJ PCCOUNT CURFILEBYTE# END) (* ; "Edited 7-Apr-2024 17:20 by rmk") + [LAMBDA (TEXT TEXTOBJ PCCOUNT CURFILEBYTE# END) (* ; "Edited 11-Jul-2024 14:20 by rmk") + (* ; "Edited 7-Apr-2024 17:20 by rmk") (* ; "Edited 20-Mar-2024 10:59 by rmk") (* ; "Edited 15-Mar-2024 14:37 by rmk") (* ; "Edited 14-Jan-2024 00:22 by rmk") @@ -939,7 +940,9 @@ (\TEDIT.GET.SINGLE.CHARLOOKS TEXT TEXTOBJ)))) (\PieceDescriptorPAGEFRAME (* ;  "This is page layout info for the file") - (FSETTOBJ TEXTOBJ TXTPAGEFRAMES (\TEDIT.PARSE.PAGEFRAMES (READ TEXT)))) + (FSETTOBJ TEXTOBJ TXTPAGEFRAMES (\TEDIT.PARSE.PAGEFRAMES (READ TEXT + *TEDIT-FILE-READTABLE* + )))) (\PieceDescriptorCHARLOOKSLIST (* ;  "Read the list of CHARLOOKSs used in this document.") (add PCNO -1) (* ; @@ -2449,27 +2452,27 @@ (RPAQ? *TEDIT-FILE-READTABLE* (COPYREADTABLE \ORIGREADTABLE)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4804 30415 (TEDIT.GET 4814 . 9656) (TEDIT.FORMATTEDFILEP 9658 . 10974) (TEDIT.FILEDATE -10976 . 12147) (TEDIT.INCLUDE 12149 . 19117) (TEDIT.RAW.INCLUDE 19119 . 19927) (TEDIT.PUT 19929 . -26872) (TEDIT.PUT.STREAM 26874 . 30413)) (30416 49580 (\TEDIT.GET.FOREIGN.FILE 30426 . 33611) ( -\TEDIT.GET.UNFORMATTED.FILE 33613 . 37487) (\TEDIT.GET.FORMATTED.FILE 37489 . 40277) ( -\TEDIT.FORMATTEDSTREAMP 40279 . 43179) (\ARBIN 43181 . 43901) (\ATMIN 43903 . 44440) (\DWIN 44442 . -44821) (\STRINGIN 44823 . 45531) (\TEDIT.GET.TRAILER 45533 . 48049) (\TEDIT.CACHEFILE 48051 . 49578)) -(49746 62858 (\TEDIT.GET.PIECES3 49756 . 59620) (\TEDIT.GET.IDATE3 59622 . 61017) ( -\TEDIT.MAKE.STRINGPIECE 61019 . 62856)) (62859 74802 (\TEDIT.GET.UNFORMATTED.FILE.XCCS 62869 . 68985) -(\TEDIT.INTERPRET.XCCS.SHIFTS 68987 . 74800)) (74824 80846 (\TEDIT.GET.UNFORMATTED.FILE.UTF8 74834 . -80844)) (80869 89373 (\TEDIT.GET.CHARLOOKS.LIST 80879 . 81610) (\TEDIT.GET.SINGLE.CHARLOOKS 81612 . -86185) (\TEDIT.GET.CHARLOOKS 86187 . 87517) (\TEDIT.GET.PARALOOKS.INDEX 87519 . 88063) ( -\TEDIT.GET.CHARLOOKS.INDEX 88065 . 89371)) (89374 97612 (\TEDIT.GET.PARALOOKS.LIST 89384 . 90006) ( -\TEDIT.GET.SINGLE.PARALOOKS 90008 . 97020) (\TEDIT.GET.PARALOOKS 97022 . 97610)) (97613 101012 ( -\TEDIT.GET.OBJECT 97623 . 101010)) (101074 133645 (\TEDIT.PUT.PCTB 101084 . 115087) ( -\TEDIT.PUT.TRAILER 115089 . 115856) (\TEDIT.PUT.PCTB.MERGEABLE 115858 . 119376) ( -\TEDIT.PUT.UTF8.SPLITPIECES 119378 . 124465) (\TEDIT.PUT.PCTB.NEXTNEW 124467 . 128242) ( -\TEDIT.INSERT.NEWPIECES 128244 . 131243) (\TEDIT.PUTRESET 131245 . 131487) (\ARBOUT 131489 . 132213) ( -\ATMOUT 132215 . 132820) (\DWOUT 132822 . 133101) (\STRINGOUT 133103 . 133643)) (133646 145039 ( -\TEDIT.PUT.CHARLOOKS.LIST 133656 . 135328) (\TEDIT.PUT.SINGLE.CHARLOOKS 135330 . 140574) ( -\TEDIT.PUT.CHARLOOKS 140576 . 141720) (\TEDIT.PUT.CHARLOOKS1 141722 . 142773) (\TEDIT.PUT.OBJECT -142775 . 145037)) (145040 153078 (\TEDIT.PUT.PARALOOKS.LIST 145050 . 145952) ( -\TEDIT.PUT.SINGLE.PARALOOKS 145954 . 152003) (\TEDIT.PUT.PARALOOKS 152005 . 153076)) (153173 154855 ( -TEDITFROMLISPSOURCE 153183 . 154853))))) + (FILEMAP (NIL (4746 30357 (TEDIT.GET 4756 . 9598) (TEDIT.FORMATTEDFILEP 9600 . 10916) (TEDIT.FILEDATE +10918 . 12089) (TEDIT.INCLUDE 12091 . 19059) (TEDIT.RAW.INCLUDE 19061 . 19869) (TEDIT.PUT 19871 . +26814) (TEDIT.PUT.STREAM 26816 . 30355)) (30358 49522 (\TEDIT.GET.FOREIGN.FILE 30368 . 33553) ( +\TEDIT.GET.UNFORMATTED.FILE 33555 . 37429) (\TEDIT.GET.FORMATTED.FILE 37431 . 40219) ( +\TEDIT.FORMATTEDSTREAMP 40221 . 43121) (\ARBIN 43123 . 43843) (\ATMIN 43845 . 44382) (\DWIN 44384 . +44763) (\STRINGIN 44765 . 45473) (\TEDIT.GET.TRAILER 45475 . 47991) (\TEDIT.CACHEFILE 47993 . 49520)) +(49688 63095 (\TEDIT.GET.PIECES3 49698 . 59857) (\TEDIT.GET.IDATE3 59859 . 61254) ( +\TEDIT.MAKE.STRINGPIECE 61256 . 63093)) (63096 75039 (\TEDIT.GET.UNFORMATTED.FILE.XCCS 63106 . 69222) +(\TEDIT.INTERPRET.XCCS.SHIFTS 69224 . 75037)) (75061 81083 (\TEDIT.GET.UNFORMATTED.FILE.UTF8 75071 . +81081)) (81106 89610 (\TEDIT.GET.CHARLOOKS.LIST 81116 . 81847) (\TEDIT.GET.SINGLE.CHARLOOKS 81849 . +86422) (\TEDIT.GET.CHARLOOKS 86424 . 87754) (\TEDIT.GET.PARALOOKS.INDEX 87756 . 88300) ( +\TEDIT.GET.CHARLOOKS.INDEX 88302 . 89608)) (89611 97849 (\TEDIT.GET.PARALOOKS.LIST 89621 . 90243) ( +\TEDIT.GET.SINGLE.PARALOOKS 90245 . 97257) (\TEDIT.GET.PARALOOKS 97259 . 97847)) (97850 101249 ( +\TEDIT.GET.OBJECT 97860 . 101247)) (101311 133882 (\TEDIT.PUT.PCTB 101321 . 115324) ( +\TEDIT.PUT.TRAILER 115326 . 116093) (\TEDIT.PUT.PCTB.MERGEABLE 116095 . 119613) ( +\TEDIT.PUT.UTF8.SPLITPIECES 119615 . 124702) (\TEDIT.PUT.PCTB.NEXTNEW 124704 . 128479) ( +\TEDIT.INSERT.NEWPIECES 128481 . 131480) (\TEDIT.PUTRESET 131482 . 131724) (\ARBOUT 131726 . 132450) ( +\ATMOUT 132452 . 133057) (\DWOUT 133059 . 133338) (\STRINGOUT 133340 . 133880)) (133883 145276 ( +\TEDIT.PUT.CHARLOOKS.LIST 133893 . 135565) (\TEDIT.PUT.SINGLE.CHARLOOKS 135567 . 140811) ( +\TEDIT.PUT.CHARLOOKS 140813 . 141957) (\TEDIT.PUT.CHARLOOKS1 141959 . 143010) (\TEDIT.PUT.OBJECT +143012 . 145274)) (145277 153315 (\TEDIT.PUT.PARALOOKS.LIST 145287 . 146189) ( +\TEDIT.PUT.SINGLE.PARALOOKS 146191 . 152240) (\TEDIT.PUT.PARALOOKS 152242 . 153313)) (153410 155092 ( +TEDITFROMLISPSOURCE 153420 . 155090))))) STOP diff --git a/library/tedit/TEDIT-FILE.LCOM b/library/tedit/TEDIT-FILE.LCOM index c1d43b62e1452c53d5e54226f43f602fab44ab19..c8ad84b48ef47cb70dd0f0e59fd3c160d8fdd268 100644 GIT binary patch delta 745 zcmZuuO-~a+7-qMoN)HAVn`$w>T@TWbt~+15+chSv?JTrz+0E`CV324;69NhcjR!HF zyj#XU;17@li8m7BFChE@ubzk;jmGFKSS5zJywA-0JnuZu%qmY;wDFS@Ucis^G;5 zzuk%^(^^yMCDKZIAtUS9+PtQ(q6!3nEl{Id!ff)upA3Z=bVM5SMium(K}~Lux;`~5 zzmgH{hb+?>cs;+Q?|(41qthRYqy2qqZTb1EEbe%H8`>lJmM&`F*I21=VcQ?QmvsvA z68ob6{3Y}D%d-r4D8P2C!%8s7@wFiYHgX{qDrhH8q8ONCL&`;#J{Acuo5I+Ut%_MW zbM7v~^^D~Mt=r%yi9e$df{;&)iE*H=1+$0Yl-7*>#1EtBR%(W=Q~;&UA1xw1t>yN# zr0#Tg%Q@m;x#E6Qr3)0t&3?nEHX#=c+zy6?riQykcbK>ofYa8D?-PHcp%zOXxr2I|4>3_!MSN3?C z0B;DeENAeOqFlAWv>+C0re+ugAuyXl%tbP2C?a4MhU$@&QMq~iRE}XgVfjE^3Vsy% zZJ>?|4Su~Ut^&0kIW03eO4*Qw(1=yEMl9ko`N^J5E|Ma4QP%CuX$Hzj83?gqsdAGi zhKQ1qTJ_vn>^iWd7GD#la%2Wq>bxY>eT#C_&T3TkIut z;ZdY?hCGbGTP&4gu$0$I5H)?(+i^hfMWLhsQw+WF)B#(xLw=#Br0st&!p