1
0
mirror of synced 2026-05-05 07:34:31 +00:00

Tedit: eliminate some CHARLOOKS fields, change Charlooks menu, add pagenum object, a few cleanups (#2004)

* CHARLOOKS fields, Charlooks menu, pagenum object, a few cleanups

* Add TEDIT-DEBUG

* Glitch in redo

* Select left of EOL
This commit is contained in:
rmkaplan
2025-02-03 12:14:49 -08:00
committed by GitHub
parent fc36176134
commit 86f5aadf95
29 changed files with 1791 additions and 1661 deletions

View File

@@ -1,12 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "12-Jan-2025 12:16:57" {MEDLEY}<library>tedit>TEDIT-STREAM.;8 172473
(FILECREATED "30-Jan-2025 11:15:51" {WMEDLEY}<library>TEDIT>TEDIT-STREAM.;840 173255
:EDIT-BY rmk
:CHANGES-TO (FNS COPYTEXTSTREAM)
:CHANGES-TO (FNS OPENTEXTSTREAM)
:PREVIOUS-DATE "22-Dec-2024 00:24:17" {MEDLEY}<library>tedit>TEDIT-STREAM.;7)
:PREVIOUS-DATE "12-Jan-2025 12:30:12" {WMEDLEY}<library>TEDIT>TEDIT-STREAM.;839)
(PRETTYCOMPRINT TEDIT-STREAMCOMS)
@@ -102,7 +102,7 @@
NEXTPIECE (* ; "-> Next piece in this textobj.")
(PREVPIECE FULLXPOINTER) (* ;
 "-> Prior piece in this text object.")
PLOOKS (* ; "Character formatting info ")
PCHARLOOKS (* ; "Character formatting info ")
PBYTESPERCHAR (* ;
 "The number of bytes per character, given that all characters in a piece are the same length.")
(PPARALAST FLAG) (* ; "This piece ends paragraph")
@@ -121,10 +121,12 @@
[ACCESSFNS ((POBJ (AND (EQ OBJECT.PTYPE (PTYPE DATUM))
(type? IMAGEOBJ (PCONTENTS DATUM))
(PCONTENTS DATUM)))
(PCHARLOOKS (PLOOKS DATUM)
(STANDARD (replace (PIECE PLOOKS) of DATUM with NEWVALUE)
(PLOOKS (STANDARD (fetch (PIECE PCHARLOOKS) of DATUM)
FAST
(fetch (PIECE PCHARLOOKS) of DATUM))
(STANDARD (replace (PIECE PCHARLOOKS) of DATUM with NEWVALUE)
FAST
(freplace (PIECE PLOOKS) of DATUM with NEWVALUE]
(freplace (PIECE PCHARLOOKS) of DATUM with NEWVALUE]
PFPOS _ 0 PLEN _ 0 PBYTELEN _ 0 PPARALOOKS _ TEDIT.DEFAULT.FMTSPEC)
(DATATYPE TEXTOBJ
@@ -400,10 +402,10 @@
(ffetch (PIECE PCONTENTS) of PC)))
(PUTPROPS PLOOKS MACRO ((PC)
(ffetch (PIECE PLOOKS) of PC)))
(ffetch (PIECE PCHARLOOKS) of PC)))
(PUTPROPS PCHARLOOKS MACRO ((PC)
(PLOOKS PC)))
(ffetch (PIECE PCHARLOOKS) of PC)))
(PUTPROPS PCHARSET MACRO ((PC)
(ffetch (PIECE PCHARSET) of PC)))
@@ -1225,7 +1227,11 @@
(DEFINEQ
(OPENTEXTSTREAM
[LAMBDA (TEXT WINDOW START END PROPS)
[LAMBDA (TEXT WINDOW START/PROPS END PROPS)
(* ;; "Edited 30-Jan-2025 11:15 by rmk")
(* ;; "Edited 10-Jan-2025 11:17 by rmk")
(* ;; "Edited 21-Nov-2024 00:18 by rmk")
@@ -1287,10 +1293,16 @@
 "Empty string means empty document, not illegal file name")
(SETQ TEXT NIL))
(RESETLST
(LET ((TSTREAM (TEXTSTREAMP TEXT))
TEXTOBJ TEDIT.GET.FINISHEDFORMS PRIMPANE)
(LET ((TSTREAM (TEXTSTREAM TEXT T))
TEXTOBJ TEDIT.GET.FINISHEDFORMS PRIMPANE START)
(DECLARE (SPECVARS TEDIT.GET.FINISHEDFORMS)) (* ;
 "Undocumented, but available for special-purpose actions specified somewhere below.")
(SETQ START (if (FIXP START/PROPS)
then START/PROPS
elseif (AND (LISTP START/PROPS)
(NOT (LISTP PROPS)))
then (SETQ PROPS START/PROPS)
NIL))
(if TSTREAM
then (SETQ TEXTOBJ (TEXTOBJ TSTREAM))
(CL:WHEN (OR START END) (* ; "Do the end first")
@@ -1605,7 +1617,8 @@
WINDOW])
(\TEDIT.OPENTEXTSTREAM.DEFAULTLOOKS
[LAMBDA (TEXTOBJ) (* ; "Edited 20-Dec-2024 11:56 by rmk")
[LAMBDA (TEXTOBJ) (* ; "Edited 29-Dec-2024 20:37 by rmk")
(* ; "Edited 20-Dec-2024 11:56 by rmk")
(* ; "Edited 16-Dec-2024 13:14 by rmk")
(* ; "Edited 21-Nov-2024 14:35 by rmk")
(* ; "Edited 29-Aug-2024 09:46 by rmk")
@@ -1624,7 +1637,7 @@
(* ;; "Find the default font for this TEXTOBJ -- either what the guy tells us, the one from TEDIT.DEFAULT.PROPS, or his DEFAULTFONT.")
(SETQ FONT (OR (GETTEXTPROP TEXTOBJ 'FONT)
DEFAULTFONT))
(FONTCREATE DEFAULTFONT)))
(SETQ CHARLOOKS (GETTEXTPROP TEXTOBJ 'LOOKS))
(SETQ CHARLOOKS (OR (AND CHARLOOKS (\TEDIT.PARSE.CHARLOOKS.LIST CHARLOOKS NIL TEXTOBJ))
(AND (type? CHARLOOKS FONT)
@@ -2843,31 +2856,31 @@
(ADDTOVAR LAMA TEXTPROP)
)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (36650 67251 (\TEDIT.TEXTBIN 36660 . 47410) (\TEDIT.TEXTPEEKBIN 47412 . 52962) (
\TEDIT.TEXTBACKFILEPTR 52964 . 58637) (\TEDIT.TEXTBOUT 58639 . 63041) (\TEDIT.INSTALL.FILEBUFFER 63043
. 67249)) (68149 72197 (\TEDIT.TEXTOUTCHARFN 68159 . 69715) (\TEDIT.TEXTINCCODEFN 69717 . 70456) (
\TEDIT.TEXTBACKCCODEFN 70458 . 71050) (\TEDIT.TEXTFORMATBYTESTREAM 71052 . 71755) (
\TEDIT.TEXTFORMATBYTESTRING 71757 . 72195)) (72244 83103 (OPENTEXTSTREAM 72254 . 78671) (
COPYTEXTSTREAM 78673 . 82326) (TEDIT.STREAMCHANGEDP 82328 . 82630) (TXTFILE 82632 . 83101)) (83104
112259 (\TEDIT.REOPENTEXTSTREAM 83114 . 84466) (\TEDIT.OPENTEXTSTREAM.PIECES 84468 . 88898) (
\TEDIT.OPENTEXTSTREAM.PROPS 88900 . 90002) (\TEDIT.OPENTEXTSTREAM.SETUP.SEL 90004 . 94939) (
\TEDIT.OPENTEXTSTREAM.WINDOW 94941 . 97622) (\TEDIT.OPENTEXTSTREAM.DEFAULTLOOKS 97624 . 100151) (
\TEDIT.OPENTEXTFILE 100153 . 101866) (\TEDIT.CREATE.TEXTSTREAM 101868 . 102802) (\TEDIT.REOPEN.STREAM
102804 . 105140) (\TEDIT.TEXTINIT 105142 . 112257)) (112297 113485 (\TEDIT.TTYBOUT 112307 . 113483)) (
113603 131980 (\TEDIT.TEXTCLOSEF 113613 . 114937) (\TEDIT.TEXTDSPFONT 114939 . 115909) (
\TEDIT.TEXTEOFP 115911 . 117666) (\TEDIT.TEXTGETEOFPTR 117668 . 117991) (\TEDIT.TEXTSETEOFPTR 117993
. 119083) (\TEDIT.TEXTGETFILEPTR 119085 . 121807) (\TEDIT.TEXTSETFILEINFO 121809 . 122317) (
\TEDIT.TEXTOPENF 122319 . 123250) (\TEDIT.TEXTSETEOF 123252 . 123868) (\TEDIT.TEXTSETFILEPTR 123870 .
125911) (\TEDIT.TEXTDSPXPOSITION 125913 . 126930) (\TEDIT.TEXTDSPYPOSITION 126932 . 127673) (
\TEDIT.TEXTLEFTMARGIN 127675 . 128052) (\TEDIT.TEXTRIGHTMARGIN 128054 . 131129) (
\TEDIT.TEXTDSPCHARWIDTH 131131 . 131435) (\TEDIT.TEXTDSPSTRINGWIDTH 131437 . 131743) (
\TEDIT.TEXTDSPLINEFEED 131745 . 131978)) (133027 153678 (\TEDIT.DELETE.SELPIECES 133037 . 136464) (
\TEDIT.INSERTCH 136466 . 144260) (\TEDIT.INSERTCH.HISTORY 144262 . 147726) (\TEDIT.INSERTEOL 147728 .
149553) (\TEDIT.INSERTCH.INSERTION 149555 . 152392) (\TEDIT.INSERTCH.EXTEND 152394 . 153676)) (153679
155183 (\TEDIT.NEXTCHANGEABLE.CHNO 153689 . 154404) (\TEDIT.LASTCHANGEABLE.CHNO 154406 . 155181)) (
155184 156888 (\SETUPGETCH 155194 . 156886)) (156946 161404 (\TEDIT.INSTALL.PIECE 156956 . 161402)) (
161442 169654 (TEXTPROP 161452 . 161799) (GETTEXTPROP 161801 . 162045) (PUTTEXTPROP 162047 . 162304) (
GETTEXTPROPS 162306 . 162750) (PUTTEXTPROPS 162752 . 163656) (\TEDIT.TEXTPROP 163658 . 169652)) (
169655 171725 (\TEDIT.TEXTOBJ.PROPNAMES 169665 . 170617) (\TEDIT.TEXTOBJ.PROPFETCHFN 170619 . 171135)
(\TEDIT.TEXTOBJ.PROPSTOREFN 171137 . 171723)))))
(FILEMAP (NIL (36869 67470 (\TEDIT.TEXTBIN 36879 . 47629) (\TEDIT.TEXTPEEKBIN 47631 . 53181) (
\TEDIT.TEXTBACKFILEPTR 53183 . 58856) (\TEDIT.TEXTBOUT 58858 . 63260) (\TEDIT.INSTALL.FILEBUFFER 63262
. 67468)) (68368 72416 (\TEDIT.TEXTOUTCHARFN 68378 . 69934) (\TEDIT.TEXTINCCODEFN 69936 . 70675) (
\TEDIT.TEXTBACKCCODEFN 70677 . 71269) (\TEDIT.TEXTFORMATBYTESTREAM 71271 . 71974) (
\TEDIT.TEXTFORMATBYTESTRING 71976 . 72414)) (72463 83763 (OPENTEXTSTREAM 72473 . 79331) (
COPYTEXTSTREAM 79333 . 82986) (TEDIT.STREAMCHANGEDP 82988 . 83290) (TXTFILE 83292 . 83761)) (83764
113041 (\TEDIT.REOPENTEXTSTREAM 83774 . 85126) (\TEDIT.OPENTEXTSTREAM.PIECES 85128 . 89558) (
\TEDIT.OPENTEXTSTREAM.PROPS 89560 . 90662) (\TEDIT.OPENTEXTSTREAM.SETUP.SEL 90664 . 95599) (
\TEDIT.OPENTEXTSTREAM.WINDOW 95601 . 98282) (\TEDIT.OPENTEXTSTREAM.DEFAULTLOOKS 98284 . 100933) (
\TEDIT.OPENTEXTFILE 100935 . 102648) (\TEDIT.CREATE.TEXTSTREAM 102650 . 103584) (\TEDIT.REOPEN.STREAM
103586 . 105922) (\TEDIT.TEXTINIT 105924 . 113039)) (113079 114267 (\TEDIT.TTYBOUT 113089 . 114265)) (
114385 132762 (\TEDIT.TEXTCLOSEF 114395 . 115719) (\TEDIT.TEXTDSPFONT 115721 . 116691) (
\TEDIT.TEXTEOFP 116693 . 118448) (\TEDIT.TEXTGETEOFPTR 118450 . 118773) (\TEDIT.TEXTSETEOFPTR 118775
. 119865) (\TEDIT.TEXTGETFILEPTR 119867 . 122589) (\TEDIT.TEXTSETFILEINFO 122591 . 123099) (
\TEDIT.TEXTOPENF 123101 . 124032) (\TEDIT.TEXTSETEOF 124034 . 124650) (\TEDIT.TEXTSETFILEPTR 124652 .
126693) (\TEDIT.TEXTDSPXPOSITION 126695 . 127712) (\TEDIT.TEXTDSPYPOSITION 127714 . 128455) (
\TEDIT.TEXTLEFTMARGIN 128457 . 128834) (\TEDIT.TEXTRIGHTMARGIN 128836 . 131911) (
\TEDIT.TEXTDSPCHARWIDTH 131913 . 132217) (\TEDIT.TEXTDSPSTRINGWIDTH 132219 . 132525) (
\TEDIT.TEXTDSPLINEFEED 132527 . 132760)) (133809 154460 (\TEDIT.DELETE.SELPIECES 133819 . 137246) (
\TEDIT.INSERTCH 137248 . 145042) (\TEDIT.INSERTCH.HISTORY 145044 . 148508) (\TEDIT.INSERTEOL 148510 .
150335) (\TEDIT.INSERTCH.INSERTION 150337 . 153174) (\TEDIT.INSERTCH.EXTEND 153176 . 154458)) (154461
155965 (\TEDIT.NEXTCHANGEABLE.CHNO 154471 . 155186) (\TEDIT.LASTCHANGEABLE.CHNO 155188 . 155963)) (
155966 157670 (\SETUPGETCH 155976 . 157668)) (157728 162186 (\TEDIT.INSTALL.PIECE 157738 . 162184)) (
162224 170436 (TEXTPROP 162234 . 162581) (GETTEXTPROP 162583 . 162827) (PUTTEXTPROP 162829 . 163086) (
GETTEXTPROPS 163088 . 163532) (PUTTEXTPROPS 163534 . 164438) (\TEDIT.TEXTPROP 164440 . 170434)) (
170437 172507 (\TEDIT.TEXTOBJ.PROPNAMES 170447 . 171399) (\TEDIT.TEXTOBJ.PROPFETCHFN 171401 . 171917)
(\TEDIT.TEXTOBJ.PROPSTOREFN 171919 . 172505)))))
STOP