Skip to content

Commit 2249ec0

Browse files
rmkaplanrmkaplan
committed
More SKETCH cleanup
Better integration with TEDIT bindings.
1 parent e7048a2 commit 2249ec0

File tree

9 files changed

+546
-531
lines changed

9 files changed

+546
-531
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ loadups/whereis.hash
3131
loadups/apps.sysout
3232
loadups/fuller.database
3333
loadups/build/
34-
loadups/branches
34+
loadups/tagged
3535
loadups/gitinfo
3636

3737

‎library/sketch/SKETCH‎

Lines changed: 187 additions & 159 deletions
Large diffs are not rendered by default.

‎library/sketch/SKETCH-EDIT‎

Lines changed: 142 additions & 154 deletions
Large diffs are not rendered by default.

‎library/sketch/SKETCH-EDIT.LCOM‎

-281 Bytes
Binary file not shown.

‎library/sketch/SKETCH-ELEMENTS‎

Lines changed: 166 additions & 164 deletions
Large diffs are not rendered by default.

‎library/sketch/SKETCH-ELEMENTS.LCOM‎

-221 Bytes
Binary file not shown.

‎library/sketch/SKETCH.LCOM‎

537 Bytes
Binary file not shown.

‎library/tedit/TEDIT-FNKEYS‎

Lines changed: 50 additions & 53 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 "12-Nov-2025 16:24:23" {WMEDLEY}<library>tedit>TEDIT-FNKEYS.;315 109327
3+
(FILECREATED "24-Nov-2025 08:40:56" {WMEDLEY}<library>TEDIT>TEDIT-FNKEYS.;317 109076
44

55
:EDIT-BY rmk
66

7-
:CHANGES-TO (VARS ORIG.TEDIT.CHARACTIONS)
7+
:CHANGES-TO (VARS TEDIT.BASIC.CHARBINDINGS)
88

9-
:PREVIOUS-DATE "12-Nov-2025 16:14:42" {WMEDLEY}<library>tedit>TEDIT-FNKEYS.;314)
9+
:PREVIOUS-DATE "24-Nov-2025 00:38:18" {WMEDLEY}<library>TEDIT>TEDIT-FNKEYS.;316)
1010

1111

1212
(PRETTYCOMPRINT TEDIT-FNKEYSCOMS)
@@ -72,9 +72,10 @@
7272
(DECLARE%: EVAL@COMPILE DONTCOPY (EXPORT (CONSTANTS \TEDIT.TTCCODES)
7373
(MACROS \TEDIT.TTC)))
7474
(FNS \TEDIT.TTCCLASS)
75-
(VARS ORIG.TEDIT.CHARACTIONS TEDIT.BASIC.CHARBINDINGS TEDIT.DORADO.CHARBINDINGS)
76-
(INITVARS (TEDIT.CHARBINDINGS (APPEND TEDIT.BASIC.CHARBINDINGS TEDIT.DORADO.CHARBINDINGS))
77-
(TEDIT.CHARACTIONS (APPEND ORIG.TEDIT.CHARACTIONS)))
75+
(VARS ORIG.TEDIT.CHARACTIONS)
76+
(INITVARS (TEDIT.CHARACTIONS (APPEND ORIG.TEDIT.CHARACTIONS)))
77+
(VARS TEDIT.BASIC.CHARBINDINGS TEDIT.DORADO.CHARBINDINGS)
78+
(INITVARS (TEDIT.CHARBINDINGS (APPEND TEDIT.BASIC.CHARBINDINGS TEDIT.DORADO.CHARBINDINGS)))
7879
(GLOBALVARS TEDIT.CHARBINDINGS TEDIT.CHARACTIONS)
7980
(* ; "Installation")
8081
(DECLARE%: DONTEVAL@LOAD DOCOPY (VARS (TEDIT.READTABLE (\TEDIT.READTABLE))
@@ -87,7 +88,8 @@
8788
(DEFINEQ
8889

8990
(TEDIT.INSTALL.CHARBINDINGS
90-
[LAMBDA (CHARBINDINGS RDTBL CHARACTIONS) (* ; "Edited 10-Nov-2025 16:47 by rmk")
91+
[LAMBDA (CHARBINDINGS RDTBL CHARACTIONS) (* ; "Edited 24-Nov-2025 00:10 by rmk")
92+
(* ; "Edited 10-Nov-2025 16:47 by rmk")
9193
(* ; "Edited 7-Apr-2025 20:01 by rmk")
9294
(* ; "Edited 5-Apr-2025 11:36 by rmk")
9395
(* ; "Edited 1-Apr-2025 00:19 by rmk")
@@ -114,17 +116,12 @@
114116
TEDIT.READTABLE)
115117
else (\ILLEGAL.ARG RDTBL))))
116118
(TEDIT.CONFLICTING.CHARBINDINGS (APPEND CHARBINDINGS (TEDIT.GET.ALL.CHARBINDINGS RDTBL)))
117-
(for CB ACTION in CHARBINDINGS first (TEDIT.CONFLICTING.CHARBINDINGS (APPEND CHARBINDINGS
118-
(
119-
 TEDIT.GET.ALL.CHARBINDINGS
120-
RDTBL)))
121-
when (LISTP CB) unless (EQ '* (CAR CB)) when (SETQ ACTION (CADR (ASSOC (CAR CB)
122-
CHARACTIONS)))
123-
do (CL:WHEN (EQ (CAR CB)
124-
'WORDDELETE.BACKWARD))
125-
(for CHAR in (CDR CB) do (CL:UNLESS (CHARCODEP CHAR)
126-
(SETQ CHAR (CHARCODE.DECODE CHAR)))
127-
(TEDIT.SETFUNCTION CHAR ACTION RDTBL)))
119+
(for CB ACTION in CHARBINDINGS when (LISTP CB) unless (EQ '* (CAR CB))
120+
when (SETQ ACTION (CADR (ASSOC (CAR CB)
121+
CHARACTIONS))) do (for CHAR in (CDR CB)
122+
do (CL:UNLESS (CHARCODEP CHAR)
123+
(SETQ CHAR (CHARCODE.DECODE CHAR)))
124+
(TEDIT.SETFUNCTION CHAR ACTION RDTBL)))
128125
(* ; "Set the method")
129126
RDTBL])
130127

@@ -1407,7 +1404,8 @@
14071404
[CAR (FETCH MACROFN OF (GETHASH CHARCODE (fetch READMACRODEFS of RDTBL])])
14081405

14091406
(TEDIT.SETFUNCTION
1410-
[LAMBDA (CHARCODE FN RDTBL) (* ; "Edited 12-Nov-2025 14:44 by rmk")
1407+
[LAMBDA (CHARCODE FN RDTBL) (* ; "Edited 24-Nov-2025 00:36 by rmk")
1408+
(* ; "Edited 12-Nov-2025 14:44 by rmk")
14111409
(* ; "Edited 8-Nov-2025 10:02 by rmk")
14121410
(* ; "Edited 13-Mar-2025 22:51 by rmk")
14131411
(* ; "Edited 7-Mar-2025 12:03 by rmk")
@@ -1425,8 +1423,7 @@
14251423
then (OR (GETTOBJ (TEXTOBJ RDTBL)
14261424
TXTRTBL)
14271425
TEDIT.READTABLE)
1428-
else RDTBL)) (* ;
1429-
 "Mark the character as invoking a function")
1426+
else RDTBL))
14301427
(\SETSYNCODE (fetch READSA of RDTBL)
14311428
CHARCODE
14321429
(CL:IF FN
@@ -1810,6 +1807,8 @@
18101807
(:WHEELSCROLL-LEFT (WHEELSCROLL 'HORIZONTAL))
18111808
(:WHEELSCROLL-RIGHT (WHEELSCROLL 'HORIZONTAL T))))
18121809

1810+
(RPAQ? TEDIT.CHARACTIONS (APPEND ORIG.TEDIT.CHARACTIONS))
1811+
18131812
(RPAQQ TEDIT.BASIC.CHARBINDINGS
18141813
(
18151814
(* ;; "Establishes key bindings for particular Tedit key actions. Function,xxx roughly correspond to Koto release notes, but this preserves the immediately preceding assignments if those drifted away from the Koto notes. There is no obvious way of typing Function. Maybe Meta,^xxx instead, as in DORADO.KEYBINDINGS. (But CTRL collapses upper and lower case).")
@@ -1899,10 +1898,10 @@
18991898
(:CHARDELETE.BACKWARD "BS" "^A")
19001899
(:CHARDELETE.FORWARD RUBOUT)
19011900
(:WORDDELETE.BACKWARD "^W")
1902-
(:WORDDELETE.FORWARD)
1901+
(:WORDDELETE.FORWARD "^U")
19031902
(:LINEDELETE.FORWARD)
19041903
(:LINEDELETE.BACKWARD)
1905-
(:LINEDELETE "^U")
1904+
(:LINEDELETE)
19061905

19071906
(* ;; "")
19081907

@@ -1941,8 +1940,8 @@
19411940
(:DEFAULTS "Meta,^V")
19421941
(:BOLD.ON "Meta,^B" "Meta,b")
19431942
(:BOLD.OFF "Meta,^N" "Meta,B")
1944-
(:ITALIC.ON "Meta,^I")
1945-
(:ITALIC.OFF "Meta,^O")
1943+
(:ITALIC.ON "Meta,^I" "Meta,i")
1944+
(:ITALIC.OFF "Meta,^O" "Meta,I")
19461945
(:OVERLINE.ON "Meta,^D")
19471946
(:OVERLINE.OFF "Meta,^F")
19481947
(:STRIKEOUT.ON "Meta,^G" "Meta,=")
@@ -1971,8 +1970,6 @@
19711970
(:WRAP.REAL.DOUBLEQUOTES "Meta,'")))
19721971

19731972
(RPAQ? TEDIT.CHARBINDINGS (APPEND TEDIT.BASIC.CHARBINDINGS TEDIT.DORADO.CHARBINDINGS))
1974-
1975-
(RPAQ? TEDIT.CHARACTIONS (APPEND ORIG.TEDIT.CHARACTIONS))
19761973
(DECLARE%: DOEVAL@COMPILE DONTCOPY
19771974

19781975
(GLOBALVARS TEDIT.CHARBINDINGS TEDIT.CHARACTIONS)
@@ -1989,30 +1986,30 @@
19891986
(RPAQ TEDIT.WORDBOUND.READTABLE (\TEDIT.WORDBOUND.READTABLE))
19901987
)
19911988
(DECLARE%: DONTCOPY
1992-
(FILEMAP (NIL (5010 23527 (TEDIT.INSTALL.CHARBINDINGS 5020 . 8123) (TEDIT.CLEAR.CHARBINDINGS 8125 .
1993-
11145) (TEDIT.GET.CHARACTION 11147 . 13928) (TEDIT.GET.CHARBINDING 13930 . 16107) (
1994-
TEDIT.GET.ALL.CHARBINDINGS 16109 . 18608) (TEDIT.CHARBINDINGS.INVERT 18610 . 19889) (
1995-
TEDIT.GET.ALL.CHARACTIONS 19891 . 22213) (TEDIT.CONFLICTING.CHARBINDINGS 22215 . 23525)) (23587 33642
1996-
(\TEDIT.KEY.CHARLOOKS 23597 . 24789) (\TEDIT.KEY.QUAD 24791 . 26884) (\TEDIT.DEFAULTSSEL 26886 . 27497
1997-
) (\TEDIT.SETDEFAULT.FROM.SEL 27499 . 28176) (\TEDIT.KEY.SIZE 28178 . 29374) (\TEDIT.SUBSCRIPTSEL
1998-
29376 . 29579) (\TEDIT.SUPERSCRIPTSEL 29581 . 29785) (\TEDIT.KEY.TRANSFORM 29787 . 31784) (
1999-
\TEDIT.KEY.OPENLINE 31786 . 32240) (\TEDIT.KEY.FAMILYN 32242 . 33640)) (33643 33932 (CAP-CASECODE
2000-
33653 . 33930)) (33966 37398 (\TEDIT.SHOWCARETLOOKS 33976 . 36491) (\TEDIT.DESCRIBEFONT 36493 . 37396)
2001-
) (37429 52402 (\TEDIT.ONECHAR.BACKWARD 37439 . 38586) (\TEDIT.ONECHAR.FORWARD 38588 . 39824) (
2002-
\TEDIT.ONELINE.UP 39826 . 42787) (\TEDIT.ONELINE.DOWN 42789 . 44446) (\TEDIT.ONELINE.MOVE 44448 .
2003-
46735) (\TEDIT.ONEWORD.BACKWARD 46737 . 47925) (\TEDIT.ONEWORD.FORWARD 47927 . 49114) (
2004-
\TEDIT.LINE.BEGIN 49116 . 50195) (\TEDIT.LINE.END 50197 . 51434) (\TEDIT.DOCUMENT.BEGIN 51436 . 51795)
2005-
(\TEDIT.DOCUMENT.END 51797 . 52400)) (52403 55711 (\TEDIT.LINEDELETE.FORWARD 52413 . 53522) (
2006-
\TEDIT.LINEDELETE.BACKWARD 53524 . 54663) (\TEDIT.LINEDELETE 54665 . 55709)) (55712 58240 (
2007-
\TEDIT.KEY.NEST 55722 . 58238)) (58241 59523 (\TEDIT.KEY.WRAP 58251 . 59521)) (59614 67662 (
2008-
\TEDIT.KEY.FIND 59624 . 64802) (\TEDIT.KEY.FIND.SEARCHSTRING 64804 . 65944) (\TEDIT.GET.TARGET.STRING
2009-
65946 . 67660)) (67693 70325 (\TEDIT.KEY.SUBSTITUTE 67703 . 67924) (\TEDIT.MANPAGE 67926 . 69173) (
2010-
\TEDIT.CALL.ED 69175 . 70005) (\TEDIT.SELECT.ALL 70007 . 70323)) (70352 76042 (\TEDIT.CLIPBOARD 70362
2011-
. 72117) (\TEDIT.COPYTOCLIPBOARD 72119 . 72899) (\TEDIT.EXTRACTTOCLIPBOARD 72901 . 73096) (
2012-
\TEDIT.WRITE.SEL 73098 . 76040)) (76208 88753 (\TEDIT.READTABLE 76218 . 77154) (
2013-
\TEDIT.WORDBOUND.READTABLE 77156 . 80204) (TEDIT.GETSYNTAX 80206 . 81435) (TEDIT.SETSYNTAX 81437 .
2014-
82751) (TEDIT.GETFUNCTION 82753 . 84226) (TEDIT.SETFUNCTION 84228 . 86422) (TEDIT.WORDGET 86424 .
2015-
86685) (TEDIT.WORDSET 86687 . 87427) (TEDIT.ATOMBOUND.READTABLE 87429 . 88751)) (88854 95842 (
2016-
TEDIT.BUTTONS.BUILD 88864 . 94110) (TEDIT.BUTTONBITMAP.FILL 94112 . 95840)) (98307 98895 (
2017-
\TEDIT.TTCCLASS 98317 . 98893)))))
1989+
(FILEMAP (NIL (5031 23296 (TEDIT.INSTALL.CHARBINDINGS 5041 . 7892) (TEDIT.CLEAR.CHARBINDINGS 7894 .
1990+
10914) (TEDIT.GET.CHARACTION 10916 . 13697) (TEDIT.GET.CHARBINDING 13699 . 15876) (
1991+
TEDIT.GET.ALL.CHARBINDINGS 15878 . 18377) (TEDIT.CHARBINDINGS.INVERT 18379 . 19658) (
1992+
TEDIT.GET.ALL.CHARACTIONS 19660 . 21982) (TEDIT.CONFLICTING.CHARBINDINGS 21984 . 23294)) (23356 33411
1993+
(\TEDIT.KEY.CHARLOOKS 23366 . 24558) (\TEDIT.KEY.QUAD 24560 . 26653) (\TEDIT.DEFAULTSSEL 26655 . 27266
1994+
) (\TEDIT.SETDEFAULT.FROM.SEL 27268 . 27945) (\TEDIT.KEY.SIZE 27947 . 29143) (\TEDIT.SUBSCRIPTSEL
1995+
29145 . 29348) (\TEDIT.SUPERSCRIPTSEL 29350 . 29554) (\TEDIT.KEY.TRANSFORM 29556 . 31553) (
1996+
\TEDIT.KEY.OPENLINE 31555 . 32009) (\TEDIT.KEY.FAMILYN 32011 . 33409)) (33412 33701 (CAP-CASECODE
1997+
33422 . 33699)) (33735 37167 (\TEDIT.SHOWCARETLOOKS 33745 . 36260) (\TEDIT.DESCRIBEFONT 36262 . 37165)
1998+
) (37198 52171 (\TEDIT.ONECHAR.BACKWARD 37208 . 38355) (\TEDIT.ONECHAR.FORWARD 38357 . 39593) (
1999+
\TEDIT.ONELINE.UP 39595 . 42556) (\TEDIT.ONELINE.DOWN 42558 . 44215) (\TEDIT.ONELINE.MOVE 44217 .
2000+
46504) (\TEDIT.ONEWORD.BACKWARD 46506 . 47694) (\TEDIT.ONEWORD.FORWARD 47696 . 48883) (
2001+
\TEDIT.LINE.BEGIN 48885 . 49964) (\TEDIT.LINE.END 49966 . 51203) (\TEDIT.DOCUMENT.BEGIN 51205 . 51564)
2002+
(\TEDIT.DOCUMENT.END 51566 . 52169)) (52172 55480 (\TEDIT.LINEDELETE.FORWARD 52182 . 53291) (
2003+
\TEDIT.LINEDELETE.BACKWARD 53293 . 54432) (\TEDIT.LINEDELETE 54434 . 55478)) (55481 58009 (
2004+
\TEDIT.KEY.NEST 55491 . 58007)) (58010 59292 (\TEDIT.KEY.WRAP 58020 . 59290)) (59383 67431 (
2005+
\TEDIT.KEY.FIND 59393 . 64571) (\TEDIT.KEY.FIND.SEARCHSTRING 64573 . 65713) (\TEDIT.GET.TARGET.STRING
2006+
65715 . 67429)) (67462 70094 (\TEDIT.KEY.SUBSTITUTE 67472 . 67693) (\TEDIT.MANPAGE 67695 . 68942) (
2007+
\TEDIT.CALL.ED 68944 . 69774) (\TEDIT.SELECT.ALL 69776 . 70092)) (70121 75811 (\TEDIT.CLIPBOARD 70131
2008+
. 71886) (\TEDIT.COPYTOCLIPBOARD 71888 . 72668) (\TEDIT.EXTRACTTOCLIPBOARD 72670 . 72865) (
2009+
\TEDIT.WRITE.SEL 72867 . 75809)) (75977 88484 (\TEDIT.READTABLE 75987 . 76923) (
2010+
\TEDIT.WORDBOUND.READTABLE 76925 . 79973) (TEDIT.GETSYNTAX 79975 . 81204) (TEDIT.SETSYNTAX 81206 .
2011+
82520) (TEDIT.GETFUNCTION 82522 . 83995) (TEDIT.SETFUNCTION 83997 . 86153) (TEDIT.WORDGET 86155 .
2012+
86416) (TEDIT.WORDSET 86418 . 87158) (TEDIT.ATOMBOUND.READTABLE 87160 . 88482)) (88585 95573 (
2013+
TEDIT.BUTTONS.BUILD 88595 . 93841) (TEDIT.BUTTONBITMAP.FILL 93843 . 95571)) (98038 98626 (
2014+
\TEDIT.TTCCLASS 98048 . 98624)))))
20182015
STOP

‎library/tedit/TEDIT-FNKEYS.LCOM‎

-59 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)