1
0
mirror of synced 2026-01-26 12:21:52 +00:00

copying format info to match the ultimate destination doesn't work for displaystreams (#875)

This commit is contained in:
Larry Masinter
2022-08-09 12:44:35 -07:00
committed by GitHub
parent 27a6063ce9
commit 43e6801341
2 changed files with 56 additions and 76 deletions

View File

@@ -1,20 +1,15 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "17-Oct-2021 13:54:11" {DSK}<home>larry>medley>sources>HPRINT.;2 59850
(FILECREATED " 3-Aug-2022 21:31:57" {DSK}<home>larry>medley>sources>HPRINT.;3 58021
changes to%: (VARS HPRINTCOMS)
(FNS MAKEHVPRETTYCOMS READVARS HPRINT0 READVAR-FROM-STRING READVARS-FROM-STRING
HPRINT-TO-STRING HPRINT-TO-STRINGS HPRINT HPRINT1 HPRINTEND RPTPRINT RPTEND
RPTPUT HPRINTSP HPERR HVFWDCDREAD HVBAKREAD HVREADCHECKGETFN HVREADEND
HVRPTREAD HVFWDREAD HREAD HPINITRDTBL HVREADERR HPRINSP COPYALL
\COPYDATATYPE HCOPYALL HCOPYALL1 EQUALALL EQUALHASH)
(FILEPKGCOMS HORRIBLEVARS UGLYVARS)
:CHANGES-TO (VARS HPRINTCOMS)
(FNS HPRINT)
previous date%: "28-Sep-2021 10:44:11" {DSK}<home>larry>medley>sources>HPRINT.;1)
:PREVIOUS-DATE "17-Oct-2021 13:54:11" {DSK}<home>larry>medley>sources>HPRINT.;1)
(* ; "
Copyright (c) 1982-1988, 1990-1991, 1993-1994 by Venue & Xerox Corporation.
Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2022 by Venue & Xerox Corporation.
")
(PRETTYCOMPRINT HPRINTCOMS)
@@ -54,12 +49,12 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994 by Venue & Xerox Corporation.
HPFINALCHAR (HPFILLSTRING (PACKC (LIST HPBAKCHAR
HPFILLCHAR]
(PROP MACRO HPRINTSTRING HPRINTENDSTR))
(VARS (HPRINTMACROS)
(HPRINTHASHARRAY)
(HPRINTRDTBL)
(HPRPTSTRING "<repeat>")
(DONTCOPYDATATYPES)
ORIGDELETECONTROL ORIGTERMSYNTAX ORIGECHOCONTROL)
(INITVARS (HPRINTMACROS)
(HPRINTHASHARRAY)
(HPRINTRDTBL)
(HPRPTSTRING "<repeat>")
(DONTCOPYDATATYPES))
(VARS ORIGDELETECONTROL ORIGTERMSYNTAX ORIGECHOCONTROL)
(ADDVARS (HPRINTREADFNS READBITMAP))
[ADDVARS (GAINSPACEFORMS ((OR HPRINTHASHARRAY HPRINTRDTBL)
"discard HPRINT initialization"
@@ -189,22 +184,8 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994 by Venue & Xerox Corporation.
(HPRINT
[LAMBDA (EXPR FILE UNCIRCULAR DATATYPESEEN)
(DECLARE (SPECVARS DATATYPESEEN UNCIRCULAR)) (* ;
 "Edited 17-Oct-2021 13:06 by larry")
(* ;
 "Edited 17-Oct-2021 13:02 by larry")
(* ;
 "Edited 17-Oct-2021 12:52 by larry")
(* ;
 "Edited 17-Oct-2021 12:46 by larry")
(* ;
 "Edited 17-Oct-2021 12:42 by larry")
(* ;
 "Edited 17-Oct-2021 12:42 by larry")
(* ;
 "Edited 17-Oct-2021 12:41 by larry")
(* ;
 "Edited 17-Oct-2021 12:39 by larry")
(DECLARE (SPECVARS DATATYPESEEN UNCIRCULAR)) (* ; "Edited 3-Aug-2022 21:26 by lmm")
(* ; "Edited 17-Oct-2021 13:06 by larry")
(* ; "Edited 10-Feb-87 15:52 by Pavel")
(RESETLST
(PROG (BACKREFS (CELLCOUNT 0)
@@ -227,9 +208,8 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994 by Venue & Xerox Corporation.
(HPRINT1 EXPR)
(HPRINTEND))
(T (* ;
 "If the byte pointer cannot be reset, want to output to temp file and copy it back")
(LET [(NDC (OPENSTREAM "{NODIRCORE}" 'BOTH 'NEW
`((FORMAT ,(STREAMPROP *STANDARD-OUTPUT* 'FORMAT]
 "If the byte pointer cannot be reset, want to output to temp file and copy it back")
(LET [(NDC (OPENSTREAM "{NODIRCORE}" 'BOTH 'NEW]
(CL:UNWIND-PROTECT
[LET ((OS *STANDARD-OUTPUT*)
(*STANDARD-OUTPUT* NDC))
@@ -1075,56 +1055,56 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994 by Venue & Xerox Corporation.
(PUTPROPS HPRINTSTRING MACRO [X (LIST 'PRIN1 (KWOTE (CONCAT (CHARACTER HPBAKCHAR)
(CAR X])
(CAR X])
(PUTPROPS HPRINTENDSTR MACRO [X (COND
[(CAR X)
'(PRIN3 (CONSTANT (CHARACTER HPFINALCHAR]
(T '(PRIN1 (CONSTANT (CHARACTER HPFINALCHAR])
[(CAR X)
'(PRIN3 (CONSTANT (CHARACTER HPFINALCHAR]
(T '(PRIN1 (CONSTANT (CHARACTER HPFINALCHAR])
)
(RPAQQ HPRINTMACROS NIL)
(RPAQ? HPRINTMACROS )
(RPAQQ HPRINTHASHARRAY NIL)
(RPAQ? HPRINTHASHARRAY )
(RPAQQ HPRINTRDTBL NIL)
(RPAQ? HPRINTRDTBL )
(RPAQ HPRPTSTRING "<repeat>")
(RPAQ? HPRPTSTRING "<repeat>")
(RPAQQ DONTCOPYDATATYPES NIL)
(RPAQ? DONTCOPYDATATYPES )
(RPAQQ ORIGDELETECONTROL ((DELETELINE . "##
")
(1STCHDEL . "\")
(NTHCHDEL . "")
(POSTCHDEL . "\")
(EMPTYCHDEL . "##
(1STCHDEL . "\")
(NTHCHDEL . "")
(POSTCHDEL . "\")
(EMPTYCHDEL . "##
")))
(RPAQQ ORIGTERMSYNTAX ((CTRLV 22)
(RETYPE 18)
(LINEDELETE 17)
(CHARDELETE 1)
(EOL 31)))
(RETYPE 18)
(LINEDELETE 17)
(CHARDELETE 1)
(EOL 31)))
(RPAQQ ORIGECHOCONTROL ((0 . IGNORE)
(1 . IGNORE)
(7 . REAL)
(8 . UPARROW)
(9 . SIMULATE)
(10 . REAL)
(13 . REAL)
(17 . IGNORE)
(18 . IGNORE)
(27 . SIMULATE)
(31 . REAL)))
(1 . IGNORE)
(7 . REAL)
(8 . UPARROW)
(9 . SIMULATE)
(10 . REAL)
(13 . REAL)
(17 . IGNORE)
(18 . IGNORE)
(27 . SIMULATE)
(31 . REAL)))
(ADDTOVAR HPRINTREADFNS READBITMAP)
(ADDTOVAR GAINSPACEFORMS [(OR HPRINTHASHARRAY HPRINTRDTBL)
"discard HPRINT initialization"
(PROGN (CLRHASH HPRINTHASHARRAY)
(SETQ HPRINTHASHARRAY (SETQ HPRINTRDTBL])
"discard HPRINT initialization"
(PROGN (CLRHASH HPRINTHASHARRAY)
(SETQ HPRINTHASHARRAY (SETQ HPRINTRDTBL])
(PUTPROPS HPRINT FILETYPE CL:COMPILE-FILE)
(DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS
@@ -1136,16 +1116,16 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994 by Venue & Xerox Corporation.
(ADDTOVAR LAMA )
)
(PUTPROPS HPRINT COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1990 1991
1993 1994))
1993 1994 2022))
(DECLARE%: DONTCOPY
(FILEMAP (NIL (4174 6712 (MAKEHVPRETTYCOMS 4184 . 5471) (READVARS 5473 . 6039) (HPRINT0 6041 . 6710))
(6714 7047 (READVARS-FROM-STRINGS 6714 . 7047)) (7049 7436 (READVARS-FROM-STREAM 7049 . 7436)) (7437
9365 (READVAR-FROM-STRING 7447 . 7853) (READVARS-FROM-STRING 7855 . 8091) (HPRINT-TO-STRING 8093 .
8299) (HPRINT-TO-STRINGS 8301 . 9363)) (10176 39996 (HPRINT 10186 . 13404) (HPRINT1 13406 . 24908) (
HPRINTEND 24910 . 25946) (RPTPRINT 25948 . 26186) (RPTEND 26188 . 26347) (RPTPUT 26349 . 26847) (
HPRINTSP 26849 . 26913) (HPERR 26915 . 27012) (HVFWDCDREAD 27014 . 27393) (HVBAKREAD 27395 . 35440) (
HVREADCHECKGETFN 35442 . 36841) (HVREADEND 36843 . 37195) (HVRPTREAD 37197 . 37723) (HVFWDREAD 37725
. 38579) (HREAD 38581 . 38903) (HPINITRDTBL 38905 . 39739) (HVREADERR 39741 . 39854) (HPRINSP 39856
. 39994)) (39997 48879 (COPYALL 40007 . 43910) (\COPYDATATYPE 43912 . 44601) (HCOPYALL 44603 . 44913)
(HCOPYALL1 44915 . 48877)) (48880 56227 (EQUALALL 48890 . 54548) (EQUALHASH 54550 . 56225)))))
(FILEMAP (NIL (3694 6232 (MAKEHVPRETTYCOMS 3704 . 4991) (READVARS 4993 . 5559) (HPRINT0 5561 . 6230))
(6234 6567 (READVARS-FROM-STRINGS 6234 . 6567)) (6569 6956 (READVARS-FROM-STREAM 6569 . 6956)) (6957
8885 (READVAR-FROM-STRING 6967 . 7373) (READVARS-FROM-STRING 7375 . 7611) (HPRINT-TO-STRING 7613 .
7819) (HPRINT-TO-STRINGS 7821 . 8883)) (9696 38289 (HPRINT 9706 . 11697) (HPRINT1 11699 . 23201) (
HPRINTEND 23203 . 24239) (RPTPRINT 24241 . 24479) (RPTEND 24481 . 24640) (RPTPUT 24642 . 25140) (
HPRINTSP 25142 . 25206) (HPERR 25208 . 25305) (HVFWDCDREAD 25307 . 25686) (HVBAKREAD 25688 . 33733) (
HVREADCHECKGETFN 33735 . 35134) (HVREADEND 35136 . 35488) (HVRPTREAD 35490 . 36016) (HVFWDREAD 36018
. 36872) (HREAD 36874 . 37196) (HPINITRDTBL 37198 . 38032) (HVREADERR 38034 . 38147) (HPRINSP 38149
. 38287)) (38290 47172 (COPYALL 38300 . 42203) (\COPYDATATYPE 42205 . 42894) (HCOPYALL 42896 . 43206)
(HCOPYALL1 43208 . 47170)) (47173 54520 (EQUALALL 47183 . 52841) (EQUALHASH 52843 . 54518)))))
STOP

Binary file not shown.