From f940246eb1bd9f078c30d1f5f110ed02b1883c69 Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Thu, 24 Feb 2022 17:51:37 -0800 Subject: [PATCH] Change OPENTEXTSTREAM to not error when finding display font (for hardcopy) --- library/TEDITFILE | 143 +++++++++++++++++++++-------------------- library/TEDITFILE.LCOM | Bin 60632 -> 60574 bytes 2 files changed, 74 insertions(+), 69 deletions(-) diff --git a/library/TEDITFILE b/library/TEDITFILE index 945a911e..8a81864b 100644 --- a/library/TEDITFILE +++ b/library/TEDITFILE @@ -1,15 +1,14 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "30-Apr-2021 14:46:41"  -{DSK}kaplan>Local>medley3.5>git-medley>library>TEDITFILE.;8 246290 - changes to%: (FNS TEDIT.PUT.PCTB) +(FILECREATED "20-Feb-2022 12:43:03" {DSK}larry>medley>library>TEDITFILE.;2 247023 - previous date%: "30-Apr-2021 13:43:24" -{DSK}kaplan>Local>medley3.5>git-medley>library>TEDITFILE.;7) + :CHANGES-TO (FNS \TEDIT.GET.SINGLE.CHARLOOKS) + + :PREVIOUS-DATE "30-Apr-2021 14:46:41" {DSK}larry>medley>library>TEDITFILE.;1) (* ; " -Copyright (c) 1983-1994, 1999-2001, 2021 by Venue & Xerox Corporation. +Copyright (c) 1983-1994, 1999-2001, 2021-2022 by Venue & Xerox Corporation. ") (PRETTYCOMPRINT TEDITFILECOMS) @@ -20,17 +19,17 @@ Copyright (c) 1983-1994, 1999-2001, 2021 by Venue & Xerox Corporation. (FILES (LOADCOMP) TEDITDCL)) (COMS - (* ;; "GETting a file") + (* ;; "GETting a file") (FNS TEDIT.BUILD.PCTB \TEDIT.CONVERT.FOREIGN.FORMAT TEDIT.FORMATTEDFILEP TEDIT.GET TEDIT.PARSE.PAGEFRAMES1 \ARBIN \ATMIN \DWIN \STRINGIN \TEDIT.FORMATTEDP1 \TEDIT.SET.WINDOW)) (COMS - (* ;; "INCLUDEing a file") + (* ;; "INCLUDEing a file") (FNS TEDIT.INCLUDE TEDIT.RAW.INCLUDE)) (COMS - (* ;; "PUTting a file:") + (* ;; "PUTting a file:") (FNS TEDIT.PUT TEDIT.PUT.PCTB \TEDIT.PUTRESET TEDIT.PUT.PIECE.DESCRIPTOR \ARBOUT \ATMOUT \DWOUT \STRINGOUT \TEDIT-OPEN-FONT-FILE)) @@ -41,24 +40,24 @@ Copyright (c) 1983-1994, 1999-2001, 2021 by Venue & Xerox Corporation. (GLOBALVARS TEDIT.INPUT.FORMATS *TEDIT-FILE-READTABLE*) (INITVARS (TEDIT.INPUT.FORMATS NIL) (*TEDIT-FILE-READTABLE* (COPYREADTABLE \ORIGREADTABLE)) - (* ; - "For consistent reading and writing of info on TEdit files.") + (* ; + "For consistent reading and writing of info on TEdit files.") ) (COMS - (* ;; - "For converting old incoming format. Cutover 5/22/85 to permit looks changes in the future.") + (* ;; + "For converting old incoming format. Cutover 5/22/85 to permit looks changes in the future.") (FNS TEDIT.BUILD.PCTB2 \TEDIT.GET.CHARLOOKS.LIST2 \TEDIT.GET.SINGLE.CHARLOOKS2 \TEDIT.PUT.SINGLE.PARALOOKS2 \TEDIT.PUT.SINGLE.CHARLOOKS2 \TEDIT.GET.PARALOOKS.LIST2 \TEDIT.GET.SINGLE.PARALOOKS2 TEDIT.PUT.PCTB2 \TEDIT.PUT.CHARLOOKS.LIST2 \TEDIT.PUT.PARALOOKS.LIST2)) (COMS - (* ;; "For converting incoming old-format files (1/27/85 cutover)") + (* ;; "For converting incoming old-format files (1/27/85 cutover)") (FNS TEDIT.BUILD.PCTB1 TEDIT.GET.PAGEFRAMES1 \TEDIT.GET.CHARLOOKS1 \TEDIT.GET.PARALOOKS1 TEDIT.GET.OBJECT1)) (COMS - (* ;; "VERSION 0 Compatibility reading functions") + (* ;; "VERSION 0 Compatibility reading functions") (FNS TEDIT.BUILD.PCTB0 TEDIT.GET.CHARLOOKS0 TEDIT.GET.OBJECT0 TEDIT.GET.PARALOOKS0)))) @@ -1858,49 +1857,55 @@ Copyright (c) 1983-1994, 1999-2001, 2021 by Venue & Xerox Corporation. (for I from 1 to (\SMALLPIN FILE) collect (\TEDIT.GET.SINGLE.CHARLOOKS FILE]) (\TEDIT.GET.SINGLE.CHARLOOKS - [LAMBDA (FILE) (* ; "Edited 30-May-91 20:25 by jds") + [LAMBDA (FILE) (* ; "Edited 20-Feb-2022 12:42 by larry") + (* ; "Edited 30-May-91 20:25 by jds") (* Read a set of CHARLOOKS from FILE) (PROG* ((LOOKS (create CHARLOOKS)) (FILEPOS (GETFILEPTR FILE)) (LOOKSLEN (\SMALLPIN FILE)) FONT STR NAME NAMELEN SIZE SUPER SUB PROPS STYLESTR USERSTR) - (SETQ NAME (\ARBIN FILE)) (* The font name) + (SETQ NAME (\ARBIN FILE)) (* The font name) (SETQ SIZE (\SMALLPIN FILE)) (* Size of the type, in points) (SETQ SUPER (\SMALLPIN FILE)) (* Superscripting distance) (replace (CHARLOOKS CLSTYLE) of LOOKS with (OR (\ARBIN FILE) - 0)) + 0)) (replace (CHARLOOKS CLUSERINFO) of LOOKS with (\ARBIN FILE)) (SETQ PROPS (\SMALLPIN FILE)) (with CHARLOOKS LOOKS [SETQ CLLEADER (NOT (ZEROP (LOGAND 2048 PROPS] - [SETQ CLINVERTED (NOT (ZEROP (LOGAND 1024 PROPS] - [SETQ CLBOLD (NOT (ZEROP (LOGAND 512 PROPS] - [SETQ CLITAL (NOT (ZEROP (LOGAND 256 PROPS] - [SETQ CLULINE (NOT (ZEROP (LOGAND 128 PROPS] - [SETQ CLOLINE (NOT (ZEROP (LOGAND 64 PROPS] - [SETQ CLSTRIKE (NOT (ZEROP (LOGAND 32 PROPS] - [SETQ CLSMALLCAP (NOT (ZEROP (LOGAND 16 PROPS] - [SETQ CLPROTECTED (NOT (ZEROP (LOGAND 8 PROPS] - [SETQ CLINVISIBLE (NOT (ZEROP (LOGAND 4 PROPS] - [SETQ CLSELHERE (NOT (ZEROP (LOGAND 2 PROPS] - [SETQ CLCANCOPY (NOT (ZEROP (LOGAND 1 PROPS] - (SETQ CLSIZE SIZE) - (SETQ CLOFFSET SUPER)) - [replace (CHARLOOKS CLFONT) of LOOKS - with (COND - ((LISTP NAME) (* This was a font class. - Restore it.) - (FONTCLASS (pop NAME) - NAME)) - ((AND NAME (NOT (ZEROP SIZE))) - (FONTCREATE NAME SIZE (COND - ((AND (fetch (CHARLOOKS CLBOLD) of LOOKS) - (fetch (CHARLOOKS CLITAL) of LOOKS) - ) - 'BOLDITALIC) - ((fetch (CHARLOOKS CLBOLD) of LOOKS) - 'BOLD) - ((fetch (CHARLOOKS CLITAL) of LOOKS) - 'ITALIC] + [SETQ CLINVERTED (NOT (ZEROP (LOGAND 1024 PROPS] + [SETQ CLBOLD (NOT (ZEROP (LOGAND 512 PROPS] + [SETQ CLITAL (NOT (ZEROP (LOGAND 256 PROPS] + [SETQ CLULINE (NOT (ZEROP (LOGAND 128 PROPS] + [SETQ CLOLINE (NOT (ZEROP (LOGAND 64 PROPS] + [SETQ CLSTRIKE (NOT (ZEROP (LOGAND 32 PROPS] + [SETQ CLSMALLCAP (NOT (ZEROP (LOGAND 16 PROPS] + [SETQ CLPROTECTED (NOT (ZEROP (LOGAND 8 PROPS] + [SETQ CLINVISIBLE (NOT (ZEROP (LOGAND 4 PROPS] + [SETQ CLSELHERE (NOT (ZEROP (LOGAND 2 PROPS] + [SETQ CLCANCOPY (NOT (ZEROP (LOGAND 1 PROPS] + (SETQ CLSIZE SIZE) + (SETQ CLOFFSET SUPER)) + [replace (CHARLOOKS CLFONT) of LOOKS with (COND + ((LISTP NAME) + (* This was a font class. + Restore it.) + (FONTCLASS (pop NAME) + NAME)) + ((AND NAME (NOT (ZEROP SIZE))) + (FONTCREATE NAME SIZE + (COND + ((AND (fetch (CHARLOOKS CLBOLD) + of LOOKS) + (fetch (CHARLOOKS CLITAL) + of LOOKS)) + 'BOLDITALIC) + ((fetch (CHARLOOKS CLBOLD) + of LOOKS) + 'BOLD) + ((fetch (CHARLOOKS CLITAL) + of LOOKS) + 'ITALIC)) + NIL NIL T NIL] (SETFILEPTR FILE (IPLUS FILEPOS LOOKSLEN)) (RETURN LOOKS]) @@ -3650,27 +3655,27 @@ Copyright (c) 1983-1994, 1999-2001, 2021 by Venue & Xerox Corporation. (RPLACD TABSPEC TABS]) ) (PUTPROPS TEDITFILE COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 -1991 1992 1993 1994 1999 2000 2001 2021)) +1991 1992 1993 1994 1999 2000 2001 2021 2022)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (3052 57958 (TEDIT.BUILD.PCTB 3062 . 37515) (\TEDIT.CONVERT.FOREIGN.FORMAT 37517 . 38958 -) (TEDIT.FORMATTEDFILEP 38960 . 42824) (TEDIT.GET 42826 . 51642) (TEDIT.PARSE.PAGEFRAMES1 51644 . -53350) (\ARBIN 53352 . 53973) (\ATMIN 53975 . 54304) (\DWIN 54306 . 54584) (\STRINGIN 54586 . 55183) ( -\TEDIT.FORMATTEDP1 55185 . 57449) (\TEDIT.SET.WINDOW 57451 . 57956)) (57994 78522 (TEDIT.INCLUDE 58004 - . 69391) (TEDIT.RAW.INCLUDE 69393 . 78520)) (78556 122796 (TEDIT.PUT 78566 . 88939) (TEDIT.PUT.PCTB -88941 . 116532) (\TEDIT.PUTRESET 116534 . 116780) (TEDIT.PUT.PIECE.DESCRIPTOR 116782 . 119245) ( -\ARBOUT 119247 . 120447) (\ATMOUT 120449 . 120964) (\DWOUT 120966 . 121249) (\STRINGOUT 121251 . -121703) (\TEDIT-OPEN-FONT-FILE 121705 . 122794)) (122797 133309 (\TEDIT.GET.CHARLOOKS.LIST 122807 . -123212) (\TEDIT.GET.SINGLE.CHARLOOKS 123214 . 126259) (\TEDIT.PUT.CHARLOOKS.LIST 126261 . 128056) ( -\TEDIT.PUT.SINGLE.CHARLOOKS 128058 . 133307)) (133310 147589 (\TEDIT.GET.PARALOOKS.LIST 133320 . -133733) (\TEDIT.GET.SINGLE.PARALOOKS 133735 . 140129) (\TEDIT.PUT.PARALOOKS.LIST 140131 . 141125) ( -\TEDIT.PUT.SINGLE.PARALOOKS 141127 . 147587)) (147897 209158 (TEDIT.BUILD.PCTB2 147907 . 161263) ( -\TEDIT.GET.CHARLOOKS.LIST2 161265 . 161672) (\TEDIT.GET.SINGLE.CHARLOOKS2 161674 . 164586) ( -\TEDIT.PUT.SINGLE.PARALOOKS2 164588 . 169302) (\TEDIT.PUT.SINGLE.CHARLOOKS2 169304 . 173800) ( -\TEDIT.GET.PARALOOKS.LIST2 173802 . 174209) (\TEDIT.GET.SINGLE.PARALOOKS2 174211 . 178799) ( -TEDIT.PUT.PCTB2 178801 . 206462) (\TEDIT.PUT.CHARLOOKS.LIST2 206464 . 208261) ( -\TEDIT.PUT.PARALOOKS.LIST2 208263 . 209156)) (209235 230359 (TEDIT.BUILD.PCTB1 209245 . 219435) ( -TEDIT.GET.PAGEFRAMES1 219437 . 219692) (\TEDIT.GET.CHARLOOKS1 219694 . 223244) (\TEDIT.GET.PARALOOKS1 -223246 . 227827) (TEDIT.GET.OBJECT1 227829 . 230357)) (230419 246125 (TEDIT.BUILD.PCTB0 230429 . -236136) (TEDIT.GET.CHARLOOKS0 236138 . 240157) (TEDIT.GET.OBJECT0 240159 . 242687) ( -TEDIT.GET.PARALOOKS0 242689 . 246123))))) + (FILEMAP (NIL (3026 57932 (TEDIT.BUILD.PCTB 3036 . 37489) (\TEDIT.CONVERT.FOREIGN.FORMAT 37491 . 38932 +) (TEDIT.FORMATTEDFILEP 38934 . 42798) (TEDIT.GET 42800 . 51616) (TEDIT.PARSE.PAGEFRAMES1 51618 . +53324) (\ARBIN 53326 . 53947) (\ATMIN 53949 . 54278) (\DWIN 54280 . 54558) (\STRINGIN 54560 . 55157) ( +\TEDIT.FORMATTEDP1 55159 . 57423) (\TEDIT.SET.WINDOW 57425 . 57930)) (57968 78496 (TEDIT.INCLUDE 57978 + . 69365) (TEDIT.RAW.INCLUDE 69367 . 78494)) (78530 122770 (TEDIT.PUT 78540 . 88913) (TEDIT.PUT.PCTB +88915 . 116506) (\TEDIT.PUTRESET 116508 . 116754) (TEDIT.PUT.PIECE.DESCRIPTOR 116756 . 119219) ( +\ARBOUT 119221 . 120421) (\ATMOUT 120423 . 120938) (\DWOUT 120940 . 121223) (\STRINGOUT 121225 . +121677) (\TEDIT-OPEN-FONT-FILE 121679 . 122768)) (122771 134037 (\TEDIT.GET.CHARLOOKS.LIST 122781 . +123186) (\TEDIT.GET.SINGLE.CHARLOOKS 123188 . 126987) (\TEDIT.PUT.CHARLOOKS.LIST 126989 . 128784) ( +\TEDIT.PUT.SINGLE.CHARLOOKS 128786 . 134035)) (134038 148317 (\TEDIT.GET.PARALOOKS.LIST 134048 . +134461) (\TEDIT.GET.SINGLE.PARALOOKS 134463 . 140857) (\TEDIT.PUT.PARALOOKS.LIST 140859 . 141853) ( +\TEDIT.PUT.SINGLE.PARALOOKS 141855 . 148315)) (148625 209886 (TEDIT.BUILD.PCTB2 148635 . 161991) ( +\TEDIT.GET.CHARLOOKS.LIST2 161993 . 162400) (\TEDIT.GET.SINGLE.CHARLOOKS2 162402 . 165314) ( +\TEDIT.PUT.SINGLE.PARALOOKS2 165316 . 170030) (\TEDIT.PUT.SINGLE.CHARLOOKS2 170032 . 174528) ( +\TEDIT.GET.PARALOOKS.LIST2 174530 . 174937) (\TEDIT.GET.SINGLE.PARALOOKS2 174939 . 179527) ( +TEDIT.PUT.PCTB2 179529 . 207190) (\TEDIT.PUT.CHARLOOKS.LIST2 207192 . 208989) ( +\TEDIT.PUT.PARALOOKS.LIST2 208991 . 209884)) (209963 231087 (TEDIT.BUILD.PCTB1 209973 . 220163) ( +TEDIT.GET.PAGEFRAMES1 220165 . 220420) (\TEDIT.GET.CHARLOOKS1 220422 . 223972) (\TEDIT.GET.PARALOOKS1 +223974 . 228555) (TEDIT.GET.OBJECT1 228557 . 231085)) (231147 246853 (TEDIT.BUILD.PCTB0 231157 . +236864) (TEDIT.GET.CHARLOOKS0 236866 . 240885) (TEDIT.GET.OBJECT0 240887 . 243415) ( +TEDIT.GET.PARALOOKS0 243417 . 246851))))) STOP diff --git a/library/TEDITFILE.LCOM b/library/TEDITFILE.LCOM index 3d3b21b6f9560d49d144e9bc674f4136add32bdb..3f0181064450f7ddc3711f9d064912aac6570452 100644 GIT binary patch delta 434 zcma)&%}T>S6h^`B1|Px2Wk5(42{V&eb<{v;5*rMuG>QBC3{4Q_t!^ovR^`5EPgfg$Tf zz8ScAnYIh@c*>#eR%O*Lppqsp2?F@JN!N7@MY@tp{=|;4`hSsh4+S@eBmgtd2{V9C zrgnJiMp`@r1$klg{_=K`sKD>%?t?!|BF&Ls1Z)t^UiSMZQlKU`$K0eC(BM2kNk5FE P?boqPXG~R5=m+Q@h6;v8RtCma#->UN8cNCe zxdoXysVNHic?wDjT-7eY-nBNN#i>QbcG-yqIf;38KKaRsId-|JDLJW?#(Ji9>6sW`>orkLHL$cYF|;xkjD0Cb6Gh+aS_5IcuBDP#hz zbPM(I0XhibI6XZ*C54p45}=b%9St8ZsECHX+NX}I|Xqd8Dhp`a+WEHl5f80;XRA|+!3UB`kVXfPUEnHXCc g0X<`axkM9qxt49jPqWxYie@&dHQex0GjZCM*si-