Skip to content

Commit 68138c4

Browse files
rmkaplanrmkaplan
committed
Tedit compatibility adjustments and small fixups
1 parent 00a8f0e commit 68138c4

File tree

13 files changed

+514
-598
lines changed

13 files changed

+514
-598
lines changed

‎library/tedit/TEDIT‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
22

3-
(FILECREATED " 6-Sep-2025 09:54:48" {WMEDLEY}<library>TEDIT>TEDIT.;837 145260
3+
(FILECREATED " 8-Sep-2025 22:10:20" {WMEDLEY}<library>TEDIT>TEDIT.;838 145349
44

55
:EDIT-BY rmk
66

7-
:CHANGES-TO (FNS \TEDIT.REPLACE.SELPIECES TEDIT.INSERT.OBJECT)
7+
:CHANGES-TO (FNS TEDIT.NTHCHARCODE)
88

9-
:PREVIOUS-DATE " 1-Aug-2025 14:50:15" {WMEDLEY}<library>TEDIT>TEDIT.;835)
9+
:PREVIOUS-DATE " 6-Sep-2025 09:54:48" {WMEDLEY}<library>TEDIT>TEDIT.;837)
1010

1111

1212
(PRETTYCOMPRINT TEDITCOMS)
@@ -1162,7 +1162,8 @@
11621162
(\TEDIT.RPLCHARCODE TSTREAM N NEWCHARCODE NEWCHARLOOKS DONTDISPLAY])
11631163

11641164
(TEDIT.NTHCHARCODE
1165-
[LAMBDA (TSTREAM N) (* ; "Edited 28-Mar-2025 14:10 by rmk")
1165+
[LAMBDA (TSTREAM N) (* ; "Edited 8-Sep-2025 22:09 by rmk")
1166+
(* ; "Edited 28-Mar-2025 14:10 by rmk")
11661167
(* ; "Edited 7-Jul-2024 11:09 by rmk")
11671168
(* ; "Edited 29-Apr-2024 13:06 by rmk")
11681169
(* ; "Edited 17-Mar-2024 00:27 by rmk")
@@ -1185,7 +1186,7 @@
11851186
(* ;; "Out of the selection: force NIL")
11861187

11871188
(SETQ N 0)))
1188-
(SETQ TSTREAM (TSTREAM TSTREAM))
1189+
(SETQ TSTREAM (TEXTSTREAM TSTREAM))
11891190
else (SETQ TSTREAM (TEXTSTREAM TSTREAM))
11901191
(CL:WHEN (ILESSP N 0)
11911192
(SETQ N (IPLUS (TEDIT.NCHARS TSTREAM)
@@ -2325,26 +2326,26 @@
23252326
(ADDTOVAR PRINTFILETYPES (TEDIT (TEST \TEDIT.GET.TRAILER)
23262327
(EXTENSION (TEDIT))))
23272328
(DECLARE%: DONTCOPY
2328-
(FILEMAP (NIL (4850 7244 (MAKE-TEDIT-EXPORTS.ALL 4860 . 5406) (UPDATE-TEDIT 5408 . 6337) (EDIT-TEDIT
2329-
6339 . 7242)) (8674 36732 (TEDIT 8684 . 11298) (TEXTSTREAM 11300 . 13189) (TEXTSTREAMP 13191 . 13575)
2330-
(COERCETEXTSTREAM 13577 . 17788) (TEDIT.CONCAT 17790 . 21092) (TEDITSTRING 21094 . 22008) (TEDIT-SEE
2331-
22010 . 22569) (TEDIT.COPY 22571 . 24716) (TEDIT.DELETE 24718 . 26079) (TEDIT.INSERT 26081 . 29455) (
2332-
TEDIT.TERPRI 29457 . 30571) (TEDIT.KILL 30573 . 31555) (TEDIT.QUIT 31557 . 32923) (TEDIT.MOVE 32925 .
2333-
33813) (TEDIT.STRINGWIDTH 33815 . 34486) (TEDIT.CHARWIDTH 34488 . 36730)) (36733 38674 (TEXTOBJ 36743
2334-
. 37208) (COERCETEXTOBJ 37210 . 38672)) (40074 41724 (TDRIBBLE 40084 . 41722)) (41765 53661 (
2335-
TEDIT.INSERT.OBJECT 41775 . 45482) (TEDIT.EDIT.OBJECT 45484 . 48424) (TEDIT.OBJECT.CHANGED 48426 .
2336-
51616) (TEDIT.MAP.OBJECTS 51618 . 53189) (\TEDIT.FIRST.OBJPIECE 53191 . 53424) (\TEDIT.NEXT.OBJPIECE
2337-
53426 . 53659)) (53684 61127 (\TEDIT.CONCAT.PAGEFRAMES 53694 . 58761) (\TEDIT.GET.PAGE.HEADINGS 58763
2338-
. 59792) (\TEDIT.CONCAT.INSTALL.HEADINGS 59794 . 61125)) (61128 64735 (\TEDIT.MOVE.MSG 61138 . 63219)
2339-
(\TEDIT.READONLY 63221 . 64733)) (64736 70511 (TEDIT.NCHARS 64746 . 65119) (TEDIT.RPLCHARCODE 65121
2340-
. 68111) (TEDIT.NTHCHARCODE 68113 . 70040) (TEDIT.NTHCHAR 70042 . 70509)) (70557 127586 (\TEDIT1
2341-
70567 . 72644) (\TEDIT.INSERT 72646 . 79011) (\TEDIT.MOVE 79013 . 86919) (\TEDIT.COPY 86921 . 91452) (
2342-
\TEDIT.REPLACE.SELPIECES 91454 . 95990) (\TEDIT.INSERT.SELPIECES 95992 . 98989) (\TEDIT.RESTARTFN
2343-
98991 . 101496) (\TEDIT.CHARDELETE 101498 . 104427) (\TEDIT.COPYPIECE 104429 . 109591) (
2344-
\TEDIT.APPLY.OBJFN 109593 . 112679) (\TEDIT.DELETE 112681 . 117049) (\TEDIT.DIFFUSE.PARALOOKS 117051
2345-
. 119322) (\TEDIT.WORDDELETE 119324 . 120939) (\TEDIT.WORDDELETE.FORWARD 120941 . 122730) (
2346-
\TEDIT.FINISHEDIT? 122732 . 127584)) (127587 128246 (\TEDIT.THELP 127597 . 128244)) (128280 137411 (
2347-
\TEDIT.PARAPIECES 128290 . 130264) (\TEDIT.PARACHNOS 130266 . 131158) (\TEDIT.PARA.FIRST 131160 .
2348-
134261) (\TEDIT.PARA.LAST 134263 . 137409)) (137412 144507 (\TEDIT.WORD.FIRST 137422 . 141426) (
2349-
\TEDIT.WORD.LAST 141428 . 144505)) (144708 144985 (TEDITSYSTEMDATE 144718 . 144983)))))
2329+
(FILEMAP (NIL (4823 7217 (MAKE-TEDIT-EXPORTS.ALL 4833 . 5379) (UPDATE-TEDIT 5381 . 6310) (EDIT-TEDIT
2330+
6312 . 7215)) (8647 36705 (TEDIT 8657 . 11271) (TEXTSTREAM 11273 . 13162) (TEXTSTREAMP 13164 . 13548)
2331+
(COERCETEXTSTREAM 13550 . 17761) (TEDIT.CONCAT 17763 . 21065) (TEDITSTRING 21067 . 21981) (TEDIT-SEE
2332+
21983 . 22542) (TEDIT.COPY 22544 . 24689) (TEDIT.DELETE 24691 . 26052) (TEDIT.INSERT 26054 . 29428) (
2333+
TEDIT.TERPRI 29430 . 30544) (TEDIT.KILL 30546 . 31528) (TEDIT.QUIT 31530 . 32896) (TEDIT.MOVE 32898 .
2334+
33786) (TEDIT.STRINGWIDTH 33788 . 34459) (TEDIT.CHARWIDTH 34461 . 36703)) (36706 38647 (TEXTOBJ 36716
2335+
. 37181) (COERCETEXTOBJ 37183 . 38645)) (40047 41697 (TDRIBBLE 40057 . 41695)) (41738 53634 (
2336+
TEDIT.INSERT.OBJECT 41748 . 45455) (TEDIT.EDIT.OBJECT 45457 . 48397) (TEDIT.OBJECT.CHANGED 48399 .
2337+
51589) (TEDIT.MAP.OBJECTS 51591 . 53162) (\TEDIT.FIRST.OBJPIECE 53164 . 53397) (\TEDIT.NEXT.OBJPIECE
2338+
53399 . 53632)) (53657 61100 (\TEDIT.CONCAT.PAGEFRAMES 53667 . 58734) (\TEDIT.GET.PAGE.HEADINGS 58736
2339+
. 59765) (\TEDIT.CONCAT.INSTALL.HEADINGS 59767 . 61098)) (61101 64708 (\TEDIT.MOVE.MSG 61111 . 63192)
2340+
(\TEDIT.READONLY 63194 . 64706)) (64709 70600 (TEDIT.NCHARS 64719 . 65092) (TEDIT.RPLCHARCODE 65094
2341+
. 68084) (TEDIT.NTHCHARCODE 68086 . 70129) (TEDIT.NTHCHAR 70131 . 70598)) (70646 127675 (\TEDIT1
2342+
70656 . 72733) (\TEDIT.INSERT 72735 . 79100) (\TEDIT.MOVE 79102 . 87008) (\TEDIT.COPY 87010 . 91541) (
2343+
\TEDIT.REPLACE.SELPIECES 91543 . 96079) (\TEDIT.INSERT.SELPIECES 96081 . 99078) (\TEDIT.RESTARTFN
2344+
99080 . 101585) (\TEDIT.CHARDELETE 101587 . 104516) (\TEDIT.COPYPIECE 104518 . 109680) (
2345+
\TEDIT.APPLY.OBJFN 109682 . 112768) (\TEDIT.DELETE 112770 . 117138) (\TEDIT.DIFFUSE.PARALOOKS 117140
2346+
. 119411) (\TEDIT.WORDDELETE 119413 . 121028) (\TEDIT.WORDDELETE.FORWARD 121030 . 122819) (
2347+
\TEDIT.FINISHEDIT? 122821 . 127673)) (127676 128335 (\TEDIT.THELP 127686 . 128333)) (128369 137500 (
2348+
\TEDIT.PARAPIECES 128379 . 130353) (\TEDIT.PARACHNOS 130355 . 131247) (\TEDIT.PARA.FIRST 131249 .
2349+
134350) (\TEDIT.PARA.LAST 134352 . 137498)) (137501 144596 (\TEDIT.WORD.FIRST 137511 . 141515) (
2350+
\TEDIT.WORD.LAST 141517 . 144594)) (144797 145074 (TEDITSYSTEMDATE 144807 . 145072)))))
23502351
STOP

‎library/tedit/TEDIT-ABBREV‎

Lines changed: 139 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,75 @@
11
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
22

3-
(FILECREATED "11-Aug-2025 14:40:45" {WMEDLEY}<library>tedit>TEDIT-ABBREV.;25 16417
3+
(FILECREATED " 5-Sep-2025 18:50:19" 
4+
{DSK}<Users>kaplan>Local>medley3.5>working-medley>library>tedit>TEDIT-ABBREV.;29 17935
45

56
:EDIT-BY rmk
67

7-
:CHANGES-TO (FNS \TEDIT.ABBREV.PARSE)
8+
:CHANGES-TO (VARS TEDIT-ABBREVCOMS)
89

9-
:PREVIOUS-DATE " 7-Aug-2025 12:50:55" {WMEDLEY}<library>tedit>TEDIT-ABBREV.;24)
10+
:PREVIOUS-DATE " 5-Sep-2025 12:24:55"
11+
{DSK}<Users>kaplan>Local>medley3.5>working-medley>library>tedit>TEDIT-ABBREV.;28)
1012

1113

1214
(PRETTYCOMPRINT TEDIT-ABBREVCOMS)
1315

1416
(RPAQQ TEDIT-ABBREVCOMS
1517
[(FNS \TEDIT.ABBREV.EXPAND \TEDIT.ABBREV.PARSE \TEDIT.EXPAND.DATE \TEDIT.TRY.ABBREV)
1618
(GLOBALVARS TEDIT.ABBREVS)
17-
(INITVARS (TEDIT.ABBREVS '(("b" . "357,146")
18-
("n" . "357,44")
19-
("m" . "357,45")
20-
("T" . "357,57")
21-
("d" . "357,60")
22-
("D" . "357,61")
23-
("s" . "0,247")
24-
("'" . "0,271")
25-
("`" . "0,251")
26-
("%"" . "0,252")
27-
("~" . "0,272")
28-
("1/4" . "0,274")
29-
("1/2" . "0,275")
30-
("3/4" . "0,276")
31-
("1/3" . "357,375")
32-
("2/3" . "357,376")
33-
("c" . "0,323")
34-
("c/o" . "357,100")
35-
("%%" . "357,100")
36-
("->" . "0,256")
37-
("ra" . "0,256")
38-
("|" . "0,257")
39-
("da" . "0,257")
40-
("^" . "0,255")
41-
("ua" . "0,255")
42-
("<-" . "0,254")
43-
("la" . "0,254")
44-
("_" . "0,254")
45-
("L" . "0,243")
46-
("o" . "0,260")
47-
("Y" . "0,245")
48-
("+" . "0,261")
49-
("x" . "0,264")
50-
("/" . "0,270")
51-
("=" . "357,121")
52-
("p" . "0,266")
53-
("r" . "0,322")
54-
("t" . "0,324")
55-
("tm" . "0,324")
56-
("box" . "42,42")
57-
("cbox" . "42,61")
58-
("-" . "357,43")
59-
("=" . "357,42")
60-
(" " . "357,41")
61-
("DATE" . \TEDIT.EXPAND.DATE)
62-
(">>DATE<<" . \TEDIT.EXPAND.DATE])
19+
(INITVARS (TEDIT.ABBREVS '(("b" "357,146" Bullet)
20+
("n" "357,44" Endash)
21+
("--" "357,44" Endash)
22+
("m" EMDASH)
23+
("---" EMDASH)
24+
("T" THINSPACE)
25+
("d" "357,60" Dagger)
26+
("D" "357,61" DoubleDagger)
27+
("s" "0,247" Section)
28+
("'" "0,271" RSQ)
29+
("`" "0,251" LSQ)
30+
("%"" LEFT-DOUBLEQUOTE)
31+
("~" RIGHT-DOUBLEQUOTE)
32+
("1/4" "0,274")
33+
("1/2" "0,275")
34+
("3/4" "0,276")
35+
("1/3" "357,375")
36+
("2/3" "357,376")
37+
("c" "0,323" Copyright)
38+
("c/o" "357,100" c/o)
39+
("%%" "357,100" c/o)
40+
("->" "0,256" Rightarrow)
41+
("ra" "0,256" Rightarrow)
42+
("|" "0,257" Downarrow)
43+
("da" "0,257" Downarrow)
44+
("L" "0,243" English-pound)
45+
("o" "0,260" Degree)
46+
("Y" "0,245" Yen)
47+
("+" "0,261" PlusMinus)
48+
("x" "0,264" Times)
49+
("/" "0,270" Divide)
50+
("=" "357,121")
51+
("p" "0,266" Paragraph)
52+
("r" "0,322" Register)
53+
("t" "0,324" Trademark)
54+
("tm" "0,324" Trademark)
55+
("bbox" "42,43" Blackbox)
56+
("wbox" "43,42" Whitebox)
57+
("-" SOFT-HYPHEN)
58+
("=" NONBREAKING-HYPHEN)
59+
(" " NONBREAKING-SPACE)
60+
("un" "357,127")
61+
("int" "357,126")
62+
("subset" "357,131")
63+
("superset" "357,130")
64+
("&" "357,266")
65+
("or" "357,267")
66+
("not" "357,152")
67+
("all" "357,265")
68+
("exist" "357,264")
69+
("def" "357,162")
70+
("compose" "357,147")
71+
("DATE" \TEDIT.EXPAND.DATE)
72+
(">>DATE<<" \TEDIT.EXPAND.DATE])
6373
(DEFINEQ
6474

6575
(\TEDIT.ABBREV.EXPAND
@@ -224,92 +234,108 @@
224234
" " DAY ", " YEAR])
225235

226236
(\TEDIT.TRY.ABBREV
227-
[LAMBDA (KEY TSTREAM) (* ; "Edited 20-Mar-2025 21:52 by rmk")
237+
[LAMBDA (KEY TSTREAM) (* ; "Edited 5-Sep-2025 12:24 by rmk")
238+
(* ; "Edited 20-Mar-2025 21:52 by rmk")
228239
(* ; "Edited 6-Aug-2020 14:41 by rmk:")
229240
(* jds "11-Jul-85 12:46")
230241

231242
(* ;; "Decode the expansion. A string may be a character name, otherwise itself. A litatom is a function to be applied, anything else is evaled. ")
232243

233-
(LET ((ABBREV (SASSOC KEY TEDIT.ABBREVS)))
244+
(LET [(ABBREV (CDR (SASSOC KEY TEDIT.ABBREVS]
245+
(CL:WHEN (LISTP ABBREV) (* ; "Originally stored in the CDR")
246+
(SETQ ABBREV (CAR ABBREV)))
234247
(if (NULL ABBREV)
235248
then (CL:WHEN (CHARCODE.DECODE KEY T)
236249
(CHARACTER (CHARCODE.DECODE KEY T)))
237-
elseif (STRINGP (CDR ABBREV))
250+
elseif (STRINGP ABBREV)
238251
then
239252
(* ;; "Could be a character code")
240253

241-
(LET ((CH (CHARCODE.DECODE (CDR ABBREV)
242-
T)))
254+
(LET ((CH (CHARCODE.DECODE ABBREV T)))
243255
(CL:IF CH
244256
(CHARACTER CH)
245-
(CDR ABBREV)))
246-
elseif (SMALLP (CDR ABBREV))
257+
ABBREV))
258+
elseif (SMALLP ABBREV)
247259
then
248260
(* ;; "Treat a number as a character code.")
249261

250-
(CHARACTER (CDR ABBREV))
251-
elseif (AND (LITATOM (CDR ABBREV))
252-
(GETD (CDR ABBREV)))
253-
then (* ; "It's a function to be called.")
254-
(APPLY* (CDR ABBREV)
255-
TSTREAM
256-
(CAR ABBREV))
257-
else (* ; "Anything else is a form to EVAL.")
258-
(EVAL (CDR ABBREV])
262+
(CHARACTER ABBREV)
263+
elseif (AND (LITATOM ABBREV)
264+
(GETD ABBREV))
265+
then (* ; " A function to be applied.")
266+
(APPLY* ABBREV TSTREAM KEY)
267+
elseif (LISTP ABBREV)
268+
then (* ; "Form in the CADR, now")
269+
(EVAL ABBREV)
270+
elseif (AND (SETQ ABBREV (CDR (SASSOC KEY TEDIT.ABBREVS)))
271+
(LITATOM (CAR ABBREV))
272+
(GETD (CAR ABBREV)))
273+
then
274+
(* ;; "Form in the CDR, originally")
275+
276+
(EVAL ABBREV])
259277
)
260278
(DECLARE%: DOEVAL@COMPILE DONTCOPY
261279

262280
(GLOBALVARS TEDIT.ABBREVS)
263281
)
264282

265283
(RPAQ? TEDIT.ABBREVS
266-
'(("b" . "357,146")
267-
("n" . "357,44")
268-
("m" . "357,45")
269-
("T" . "357,57")
270-
("d" . "357,60")
271-
("D" . "357,61")
272-
("s" . "0,247")
273-
("'" . "0,271")
274-
("`" . "0,251")
275-
("%"" . "0,252")
276-
("~" . "0,272")
277-
("1/4" . "0,274")
278-
("1/2" . "0,275")
279-
("3/4" . "0,276")
280-
("1/3" . "357,375")
281-
("2/3" . "357,376")
282-
("c" . "0,323")
283-
("c/o" . "357,100")
284-
("%%" . "357,100")
285-
("->" . "0,256")
286-
("ra" . "0,256")
287-
("|" . "0,257")
288-
("da" . "0,257")
289-
("^" . "0,255")
290-
("ua" . "0,255")
291-
("<-" . "0,254")
292-
("la" . "0,254")
293-
("_" . "0,254")
294-
("L" . "0,243")
295-
("o" . "0,260")
296-
("Y" . "0,245")
297-
("+" . "0,261")
298-
("x" . "0,264")
299-
("/" . "0,270")
300-
("=" . "357,121")
301-
("p" . "0,266")
302-
("r" . "0,322")
303-
("t" . "0,324")
304-
("tm" . "0,324")
305-
("box" . "42,42")
306-
("cbox" . "42,61")
307-
("-" . "357,43")
308-
("=" . "357,42")
309-
(" " . "357,41")
310-
("DATE" . \TEDIT.EXPAND.DATE)
311-
(">>DATE<<" . \TEDIT.EXPAND.DATE)))
284+
'(("b" "357,146" Bullet)
285+
("n" "357,44" Endash)
286+
("--" "357,44" Endash)
287+
("m" EMDASH)
288+
("---" EMDASH)
289+
("T" THINSPACE)
290+
("d" "357,60" Dagger)
291+
("D" "357,61" DoubleDagger)
292+
("s" "0,247" Section)
293+
("'" "0,271" RSQ)
294+
("`" "0,251" LSQ)
295+
("%"" LEFT-DOUBLEQUOTE)
296+
("~" RIGHT-DOUBLEQUOTE)
297+
("1/4" "0,274")
298+
("1/2" "0,275")
299+
("3/4" "0,276")
300+
("1/3" "357,375")
301+
("2/3" "357,376")
302+
("c" "0,323" Copyright)
303+
("c/o" "357,100" c/o)
304+
("%%" "357,100" c/o)
305+
("->" "0,256" Rightarrow)
306+
("ra" "0,256" Rightarrow)
307+
("|" "0,257" Downarrow)
308+
("da" "0,257" Downarrow)
309+
("L" "0,243" English-pound)
310+
("o" "0,260" Degree)
311+
("Y" "0,245" Yen)
312+
("+" "0,261" PlusMinus)
313+
("x" "0,264" Times)
314+
("/" "0,270" Divide)
315+
("=" "357,121")
316+
("p" "0,266" Paragraph)
317+
("r" "0,322" Register)
318+
("t" "0,324" Trademark)
319+
("tm" "0,324" Trademark)
320+
("bbox" "42,43" Blackbox)
321+
("wbox" "43,42" Whitebox)
322+
("-" SOFT-HYPHEN)
323+
("=" NONBREAKING-HYPHEN)
324+
(" " NONBREAKING-SPACE)
325+
("un" "357,127")
326+
("int" "357,126")
327+
("subset" "357,131")
328+
("superset" "357,130")
329+
("&" "357,266")
330+
("or" "357,267")
331+
("not" "357,152")
332+
("all" "357,265")
333+
("exist" "357,264")
334+
("def" "357,162")
335+
("compose" "357,147")
336+
("DATE" \TEDIT.EXPAND.DATE)
337+
(">>DATE<<" \TEDIT.EXPAND.DATE)))
312338
(DECLARE%: DONTCOPY
313-
(FILEMAP (NIL (2933 15073 (\TEDIT.ABBREV.EXPAND 2943 . 5163) (\TEDIT.ABBREV.PARSE 5165 . 12775) (
314-
\TEDIT.EXPAND.DATE 12777 . 13410) (\TEDIT.TRY.ABBREV 13412 . 15071)))))
339+
(FILEMAP (NIL (3630 16182 (\TEDIT.ABBREV.EXPAND 3640 . 5860) (\TEDIT.ABBREV.PARSE 5862 . 13472) (
340+
\TEDIT.EXPAND.DATE 13474 . 14107) (\TEDIT.TRY.ABBREV 14109 . 16180)))))
315341
STOP

‎library/tedit/TEDIT-ABBREV.LCOM‎

843 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)