1
0
mirror of synced 2026-03-05 19:19:56 +00:00

Minor Tedit tweaks to help Notecards get rid of TEXTOBJs (#1586)

This commit is contained in:
Frank Halasz
2024-03-18 17:22:37 -07:00
committed by GitHub
parent fcd0206611
commit 220c995cda
4 changed files with 75 additions and 70 deletions

View File

@@ -1,12 +1,11 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED " 4-Mar-2024 22:50:23" {WMEDLEY}<library>tedit>TEDIT-LOOKS.;219 152365
(FILECREATED "17-Mar-2024 23:34:23" {DSK}<home>frank>il>ncmedley>library>tedit>TEDIT-LOOKS.;5 152055
:EDIT-BY rmk
:CHANGES-TO (FNS TEDIT.PARALOOKS)
:CHANGES-TO (FNS \TEDIT.CHANGE.LOOKS TEDIT.PARALOOKS \TEDIT.UNDO.LOOKS \TEDIT.UNDO.PARALOOKS)
:PREVIOUS-DATE "24-Feb-2024 12:34:14" {WMEDLEY}<library>tedit>TEDIT-LOOKS.;218)
:PREVIOUS-DATE " 4-Mar-2024 22:50:23" {DSK}<home>frank>il>ncmedley>library>tedit>TEDIT-LOOKS.;3
)
(PRETTYCOMPRINT TEDIT-LOOKSCOMS)
@@ -354,15 +353,6 @@
'46)
(DEFPRINT 'FMTSPEC (FUNCTION \TEDIT.FMTSPEC.DEFPRINT))
(/DECLAREDATATYPE 'PENDINGTAB '(POINTER POINTER POINTER POINTER FULLXPOINTER POINTER)
'((PENDINGTAB 0 POINTER)
(PENDINGTAB 2 POINTER)
(PENDINGTAB 4 POINTER)
(PENDINGTAB 6 POINTER)
(PENDINGTAB 8 FULLXPOINTER)
(PENDINGTAB 10 POINTER))
'12)
(DEFINEQ
(\TEDIT.CHARLOOKS.DEFPRINT
@@ -1799,6 +1789,7 @@ CONS pair of default width and LIST of TAB record instances")
(* ;; "Apply a given format spec to the paragraphs which are included in this guy. This assumes that paragraph boundaries are aligned with piece boundaries, so no splitting is needed. If we are given a FMTSPEC we replace the FMTSPEC of all pieces in all selected paragraphs. Otherwise, we just override particular values in the selected-paragraph looks.")
(SETQ TEXTOBJ (TEXTOBJ TEXTOBJ))
(CL:UNLESS (type? SELECTION SEL)
(SETQ SEL (CL:IF (FIXP SEL)
(TEDIT.SETSEL TEXTOBJ SEL LEN 'RIGHT)
@@ -1864,7 +1855,7 @@ CONS pair of default width and LIST of TAB record instances")
(* ;; "Presumably all the pieces within a paragraph have the same looks, and maybe a sequence of paragraphs will have the same looks. Testing LASTFMTSPEC will typically avoid repeated calculation of the same NEWFMTSPEC")
(for PC LASTFMTSPEC NEWFMTSPEC inselpieces PARAPIECES
(for PC LASTFMTSPEC NEWFMTSPEC inselpieces PARAPIECES
do (push OLDLOOKSLIST (PPARALOOKS PC)) (* ;
 "Save the old looks of each piece for undoing.")
(if (type? FMTSPEC NEWLOOKS)
@@ -2410,25 +2401,25 @@ CONS pair of default width and LIST of TAB record instances")
(GLOBALVARS *TEDIT-PARASTYLE-CACHE* *TEDIT-CURRENTPARA-CACHE* *TEDIT-STYLESHEET-SAVE-LIST*)
)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (21037 22798 (\TEDIT.CHARLOOKS.DEFPRINT 21047 . 22178) (\TEDIT.FMTSPEC.DEFPRINT 22180 .
22796)) (23908 50243 (CHARLOOKS.FROM.FONT 23918 . 25286) (EQCLOOKS 25288 . 28339) (SAMECLOOKS 28341 .
32493) (TEDIT.CARETLOOKS 32495 . 33537) (TEDIT.COPY.LOOKS 33539 . 35524) (
\TEDIT.UNPARSE.CHARLOOKS.LIST 35526 . 38129) (TEDIT.MODIFYLOOKS 38131 . 40124) (TEDIT.NEW.FONT 40126
. 40546) (\TEDIT.CARETLOOKS.VERIFY 40548 . 41385) (\TEDIT.CARETPIECE 41387 . 41577) (
\TEDIT.GET.INSERT.CHARLOOKS 41579 . 43091) (\TEDIT.GET.TERMSA.WIDTHS 43093 . 43509) (
\TEDIT.PARSE.CHARLOOKS.LIST 43511 . 50241)) (50244 64418 (\TEDIT.TRANSLATE.ASCIICHARS 50254 . 60265) (
\TEDIT.CONVERT.TO.FORMATTED 60267 . 64416)) (65608 72323 (\TEDIT.UNIQUIFY.CHARLOOKS 65618 . 67162) (
\TEDIT.UNIQUIFY.PARALOOKS 67164 . 68315) (\TEDIT.UNIQUIFY.ALL 68317 . 70019) (
\TEDIT.FLUSH.UNUSED.LOOKS 70021 . 72321)) (72371 77760 (TEDIT.SUBLOOKS 72381 . 75285) (TEDIT.FINDLOOKS
75287 . 77758)) (77761 98634 (\TEDIT.CHANGE.LOOKS 77771 . 90595) (TEDIT.LOOKS 90597 . 92444) (
\TEDIT.LOOKS 92446 . 95344) (\TEDIT.FONTCOPY 95346 . 96544) (TEDIT.GET.LOOKS 96546 . 98632)) (98677
130558 (EQFMTSPEC 98687 . 102188) (TEDIT.GET.PARALOOKS 102190 . 105819) (\TEDIT.PARSE.PARALOOKS.LIST
105821 . 113739) (TEDIT.PARALOOKS 113741 . 127047) (TEDIT.COPY.PARALOOKS 127049 . 129007) (
\TEDIT.PARABOUNDS 129009 . 130556)) (130618 136661 (TEDIT.SUBPARALOOKS 130628 . 133262) (SAMEPARALOOKS
133264 . 136659)) (136704 140615 (\TEDIT.UNDO.LOOKS 136714 . 138876) (\TEDIT.UNDO.PARALOOKS 138878 .
140613)) (140654 141232 (\TEDIT.MARK.REVISION 140664 . 141230)) (141294 142119 (
\CREATE.TEDIT.DEFAULT.FMTSPEC 141304 . 141741) (\CREATE.TEDIT.FACE.MENU 141743 . 141915) (
\CREATE.TEDIT.SIZE.MENU 141917 . 142117)) (142156 151061 (\TEDIT.APPLY.STYLES 142166 . 145731) (
\TEDIT.APPLY.PARASTYLES 145733 . 147935) (TEDIT.STYLESHEET 147937 . 149004) (TEDIT.POP.STYLESHEET
149006 . 149674) (TEDIT.PUSH.STYLESHEET 149676 . 150416) (TEDIT.ADD.STYLESHEET 150418 . 151059)))))
(FILEMAP (NIL (20694 22455 (\TEDIT.CHARLOOKS.DEFPRINT 20704 . 21835) (\TEDIT.FMTSPEC.DEFPRINT 21837 .
22453)) (23565 49900 (CHARLOOKS.FROM.FONT 23575 . 24943) (EQCLOOKS 24945 . 27996) (SAMECLOOKS 27998 .
32150) (TEDIT.CARETLOOKS 32152 . 33194) (TEDIT.COPY.LOOKS 33196 . 35181) (
\TEDIT.UNPARSE.CHARLOOKS.LIST 35183 . 37786) (TEDIT.MODIFYLOOKS 37788 . 39781) (TEDIT.NEW.FONT 39783
. 40203) (\TEDIT.CARETLOOKS.VERIFY 40205 . 41042) (\TEDIT.CARETPIECE 41044 . 41234) (
\TEDIT.GET.INSERT.CHARLOOKS 41236 . 42748) (\TEDIT.GET.TERMSA.WIDTHS 42750 . 43166) (
\TEDIT.PARSE.CHARLOOKS.LIST 43168 . 49898)) (49901 64075 (\TEDIT.TRANSLATE.ASCIICHARS 49911 . 59922) (
\TEDIT.CONVERT.TO.FORMATTED 59924 . 64073)) (65265 71980 (\TEDIT.UNIQUIFY.CHARLOOKS 65275 . 66819) (
\TEDIT.UNIQUIFY.PARALOOKS 66821 . 67972) (\TEDIT.UNIQUIFY.ALL 67974 . 69676) (
\TEDIT.FLUSH.UNUSED.LOOKS 69678 . 71978)) (72028 77417 (TEDIT.SUBLOOKS 72038 . 74942) (TEDIT.FINDLOOKS
74944 . 77415)) (77418 98291 (\TEDIT.CHANGE.LOOKS 77428 . 90252) (TEDIT.LOOKS 90254 . 92101) (
\TEDIT.LOOKS 92103 . 95001) (\TEDIT.FONTCOPY 95003 . 96201) (TEDIT.GET.LOOKS 96203 . 98289)) (98334
130248 (EQFMTSPEC 98344 . 101845) (TEDIT.GET.PARALOOKS 101847 . 105476) (\TEDIT.PARSE.PARALOOKS.LIST
105478 . 113396) (TEDIT.PARALOOKS 113398 . 126737) (TEDIT.COPY.PARALOOKS 126739 . 128697) (
\TEDIT.PARABOUNDS 128699 . 130246)) (130308 136351 (TEDIT.SUBPARALOOKS 130318 . 132952) (SAMEPARALOOKS
132954 . 136349)) (136394 140305 (\TEDIT.UNDO.LOOKS 136404 . 138566) (\TEDIT.UNDO.PARALOOKS 138568 .
140303)) (140344 140922 (\TEDIT.MARK.REVISION 140354 . 140920)) (140984 141809 (
\CREATE.TEDIT.DEFAULT.FMTSPEC 140994 . 141431) (\CREATE.TEDIT.FACE.MENU 141433 . 141605) (
\CREATE.TEDIT.SIZE.MENU 141607 . 141807)) (141846 150751 (\TEDIT.APPLY.STYLES 141856 . 145421) (
\TEDIT.APPLY.PARASTYLES 145423 . 147625) (TEDIT.STYLESHEET 147627 . 148694) (TEDIT.POP.STYLESHEET
148696 . 149364) (TEDIT.PUSH.STYLESHEET 149366 . 150106) (TEDIT.ADD.STYLESHEET 150108 . 150749)))))
STOP

Binary file not shown.

View File

@@ -1,11 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED " 4-Mar-2024 15:15:31" {DSK}<home>frank>il>medley>ncmedley>library>tedit>TEDIT-WINDOW.;2 195339
(FILECREATED "17-Mar-2024 23:43:56" {DSK}<home>frank>il>ncmedley>library>tedit>TEDIT-WINDOW.;7 195743
:CHANGES-TO (FNS TEDIT.NORMALIZECARET)
:CHANGES-TO (VARS TEDIT-WINDOWCOMS)
(FNS TEDIT.PROMPTWINDOW)
:PREVIOUS-DATE "29-Feb-2024 17:04:41"
{DSK}<home>frank>il>medley>ncmedley>library>tedit>TEDIT-WINDOW.;1)
:PREVIOUS-DATE " 4-Mar-2024 15:15:31" {DSK}<home>frank>il>ncmedley>library>tedit>TEDIT-WINDOW.;6
)
(PRETTYCOMPRINT TEDIT-WINDOWCOMS)
@@ -41,7 +42,8 @@
(COMS (* ; "User-typein support")
(FNS TEDIT.GETINPUT \TEDIT.MAKEFILENAME))
(COMS (* ; "Attached Prompt window support.")
(FNS TEDIT.PROMPTPRINT TEDIT.PROMPTCLEAR TEDIT.PROMPTFLASH \TEDIT.PROMPT.PAGEFULLFN)
(FNS TEDIT.PROMPTWINDOW TEDIT.PROMPTPRINT TEDIT.PROMPTCLEAR TEDIT.PROMPTFLASH
\TEDIT.PROMPT.PAGEFULLFN)
(INITVARS (TEDIT.PROMPT.FONT (FONTCREATE 'TERMINAL 10))
(TEDIT.PROMPTWINDOW.HEIGHT NIL))
(GLOBALVARS TEDIT.PROMPT.FONT TEDIT.PROMPTWINDOW.HEIGHT))
@@ -1581,6 +1583,17 @@
(DEFINEQ
(TEDIT.PROMPTWINDOW
[LAMBDA (TEDIT.THING)
(* ;;
 " Return the TEdit promptwindow, if any, from a TEdit thing (textstream, textobj, or TEdit window).")
(LET ((TEXTOBJ (TEXTOBJ TEDIT.THING)))
(if TEXTOBJ
then (fetch (TEXTOBJ PROMPTWINDOW) of TEXTOBJ)
else NIL])
(TEDIT.PROMPTPRINT
[LAMBDA (TEXTSTREAM MSG CLEAR? FLASH?) (* ; "Edited 26-Nov-2023 10:10 by rmk")
(* ; "Edited 10-Sep-2023 00:27 by rmk")
@@ -3160,33 +3173,34 @@
(RPAQ? TEDIT.TITLED.ICON.TEMPLATE (create TITLEDICON ICON _ TEDITICON MASK _ TEDITMASK TITLEREG _
TEDIT.ICON.TITLE.REGION))
(DECLARE%: DONTCOPY
(FILEMAP (NIL (12950 32526 (\TEDIT.CREATEW 12960 . 19335) (\TEDIT.WINDOW.SETUP 19337 . 22026) (
\TEDIT.MINIMAL.WINDOW.SETUP 22028 . 30449) (\TEDIT.ADD.CARET 30451 . 31915) (\TEDIT.CLEARPANE 31917 .
32524)) (32527 53583 (\TEDIT.CURSORMOVEDFN 32537 . 36345) (\TEDIT.CURSOROUTFN 36347 . 36792) (
\TEDIT.ACTIVE.WINDOWP 36794 . 37920) (\TEDIT.EXPANDFN 37922 . 38485) (\TEDIT.MAINW 38487 . 40627) (
\TEDIT.PRIMARYW 40629 . 41269) (\TEDIT.NEWREGIONFN 41271 . 43787) (\TEDIT.SET.WINDOW.EXTENT 43789 .
48652) (\TEDIT.SHRINK.ICONCREATE 48654 . 51077) (\TEDIT.SHRINKFN 51079 . 51488) (\TEDIT.PANEREGION
51490 . 53581)) (53584 77349 (\TEDIT.BUTTONEVENTFN 53594 . 68649) (\TEDIT.DO.SELOPERATION 68651 .
70933) (\TEDIT.TTY.TEXTOBJP 70935 . 71359) (\TEDIT.BUTTONEVENTFN.SELOPERATION 71361 . 72750) (
\TEDIT.BUTTONEVENTFN.INACTIVE 72752 . 74778) (\TEDIT.BUTTONEVENTFN.INTITLE 74780 . 76299) (
\TEDIT.COPYINSERT 76301 . 77347)) (77384 92113 (\TEDIT.PANE.SPLIT 77394 . 81614) (\TEDIT.SPLITW 81616
. 87949) (\TEDIT.UNSPLITW 87951 . 92111)) (93469 94254 (TEDITWINDOWP 93479 . 94252)) (94291 97279 (
TEDIT.GETINPUT 94301 . 96744) (\TEDIT.MAKEFILENAME 96746 . 97277)) (97328 104978 (TEDIT.PROMPTPRINT
97338 . 99774) (TEDIT.PROMPTCLEAR 99776 . 101495) (TEDIT.PROMPTFLASH 101497 . 103406) (
\TEDIT.PROMPT.PAGEFULLFN 103408 . 104976)) (105216 113095 (\TEXTSTREAM.TITLE 105226 . 105916) (
\TEDIT.DEFAULT.TITLE 105918 . 108297) (\TEDIT.WINDOW.TITLE 108299 . 110356) (\TEXTSTREAM.FILENAME
110358 . 112028) (\TEDIT.UPDATE.TITLE 112030 . 113093)) (113138 128179 (TEDIT.DEACTIVATE.WINDOW 113148
. 119570) (\TEDIT.REPAINTFN 119572 . 121147) (\TEDIT.AFTERMOVEFN 121149 . 121903) (OFFSCREENP 121905
. 123110) (\TEDIT.RESHAPEFN 123112 . 127001) (\TEDIT.PANEWITHINSCREEN? 127003 . 128177)) (128180
155813 (\TEDIT.SCROLLFN 128190 . 129877) (\TEDIT.SCROLLFLOAT 129879 . 134465) (\TEDIT.SCROLLUP 134467
. 141843) (\TEDIT.SCROLL.SHOWSEL 141845 . 144469) (\TEDIT.SCROLLDOWN 144471 . 149687) (
\TEDIT.OFFSCREEN.SCROLL 149689 . 151804) (\TEDIT.WHERE.SEL 151806 . 153026) (\TEDIT.WHERE.SEL1 153028
. 155811)) (155814 160936 (\TEDIT.ONSCREEN 155824 . 157279) (\TEDIT.ONSCREEN? 157281 . 159594) (
\TEDIT.PANE.SCREENREGION 159596 . 160934)) (160978 163223 (\TEDIT.PROCIDLEFN 160988 . 162397) (
\TEDIT.PROCENTRYFN 162399 . 162844) (\TEDIT.PROCEXITFN 162846 . 163221)) (163302 176029 (
\TEDIT.DOWNCARET 163312 . 164105) (\TEDIT.FLASHCARET 164107 . 165924) (\TEDIT.UPCARET 165926 . 167030)
(TEDIT.NORMALIZECARET 167032 . 171760) (\TEDIT.SETCARET 171762 . 175602) (\TEDIT.CARET 175604 .
176027)) (176063 189309 (TEDIT.ADD.MENUITEM 176073 . 178364) (TEDIT.DEFAULT.MENUFN 178366 . 186649) (
TEDIT.REMOVE.MENUITEM 186651 . 187648) (\TEDIT.CREATEMENU 187650 . 188087) (\TEDIT.MENU.WHENHELDFN
188089 . 188994) (\TEDIT.MENU.WHENSELECTEDFN 188996 . 189307)))))
(FILEMAP (NIL (13015 32591 (\TEDIT.CREATEW 13025 . 19400) (\TEDIT.WINDOW.SETUP 19402 . 22091) (
\TEDIT.MINIMAL.WINDOW.SETUP 22093 . 30514) (\TEDIT.ADD.CARET 30516 . 31980) (\TEDIT.CLEARPANE 31982 .
32589)) (32592 53648 (\TEDIT.CURSORMOVEDFN 32602 . 36410) (\TEDIT.CURSOROUTFN 36412 . 36857) (
\TEDIT.ACTIVE.WINDOWP 36859 . 37985) (\TEDIT.EXPANDFN 37987 . 38550) (\TEDIT.MAINW 38552 . 40692) (
\TEDIT.PRIMARYW 40694 . 41334) (\TEDIT.NEWREGIONFN 41336 . 43852) (\TEDIT.SET.WINDOW.EXTENT 43854 .
48717) (\TEDIT.SHRINK.ICONCREATE 48719 . 51142) (\TEDIT.SHRINKFN 51144 . 51553) (\TEDIT.PANEREGION
51555 . 53646)) (53649 77414 (\TEDIT.BUTTONEVENTFN 53659 . 68714) (\TEDIT.DO.SELOPERATION 68716 .
70998) (\TEDIT.TTY.TEXTOBJP 71000 . 71424) (\TEDIT.BUTTONEVENTFN.SELOPERATION 71426 . 72815) (
\TEDIT.BUTTONEVENTFN.INACTIVE 72817 . 74843) (\TEDIT.BUTTONEVENTFN.INTITLE 74845 . 76364) (
\TEDIT.COPYINSERT 76366 . 77412)) (77449 92178 (\TEDIT.PANE.SPLIT 77459 . 81679) (\TEDIT.SPLITW 81681
. 88014) (\TEDIT.UNSPLITW 88016 . 92176)) (93534 94319 (TEDITWINDOWP 93544 . 94317)) (94356 97344 (
TEDIT.GETINPUT 94366 . 96809) (\TEDIT.MAKEFILENAME 96811 . 97342)) (97393 105382 (TEDIT.PROMPTWINDOW
97403 . 97740) (TEDIT.PROMPTPRINT 97742 . 100178) (TEDIT.PROMPTCLEAR 100180 . 101899) (
TEDIT.PROMPTFLASH 101901 . 103810) (\TEDIT.PROMPT.PAGEFULLFN 103812 . 105380)) (105620 113499 (
\TEXTSTREAM.TITLE 105630 . 106320) (\TEDIT.DEFAULT.TITLE 106322 . 108701) (\TEDIT.WINDOW.TITLE 108703
. 110760) (\TEXTSTREAM.FILENAME 110762 . 112432) (\TEDIT.UPDATE.TITLE 112434 . 113497)) (113542
128583 (TEDIT.DEACTIVATE.WINDOW 113552 . 119974) (\TEDIT.REPAINTFN 119976 . 121551) (
\TEDIT.AFTERMOVEFN 121553 . 122307) (OFFSCREENP 122309 . 123514) (\TEDIT.RESHAPEFN 123516 . 127405) (
\TEDIT.PANEWITHINSCREEN? 127407 . 128581)) (128584 156217 (\TEDIT.SCROLLFN 128594 . 130281) (
\TEDIT.SCROLLFLOAT 130283 . 134869) (\TEDIT.SCROLLUP 134871 . 142247) (\TEDIT.SCROLL.SHOWSEL 142249 .
144873) (\TEDIT.SCROLLDOWN 144875 . 150091) (\TEDIT.OFFSCREEN.SCROLL 150093 . 152208) (
\TEDIT.WHERE.SEL 152210 . 153430) (\TEDIT.WHERE.SEL1 153432 . 156215)) (156218 161340 (\TEDIT.ONSCREEN
156228 . 157683) (\TEDIT.ONSCREEN? 157685 . 159998) (\TEDIT.PANE.SCREENREGION 160000 . 161338)) (
161382 163627 (\TEDIT.PROCIDLEFN 161392 . 162801) (\TEDIT.PROCENTRYFN 162803 . 163248) (
\TEDIT.PROCEXITFN 163250 . 163625)) (163706 176433 (\TEDIT.DOWNCARET 163716 . 164509) (
\TEDIT.FLASHCARET 164511 . 166328) (\TEDIT.UPCARET 166330 . 167434) (TEDIT.NORMALIZECARET 167436 .
172164) (\TEDIT.SETCARET 172166 . 176006) (\TEDIT.CARET 176008 . 176431)) (176467 189713 (
TEDIT.ADD.MENUITEM 176477 . 178768) (TEDIT.DEFAULT.MENUFN 178770 . 187053) (TEDIT.REMOVE.MENUITEM
187055 . 188052) (\TEDIT.CREATEMENU 188054 . 188491) (\TEDIT.MENU.WHENHELDFN 188493 . 189398) (
\TEDIT.MENU.WHENSELECTEDFN 189400 . 189711)))))
STOP

Binary file not shown.