1
0
mirror of synced 2026-02-02 07:01:24 +00:00

TEDIT, TEXTOFD: String TEXT is filename

Adds TEXTSTRING as a separate entry to be used when strings are not names but characters to be edited
This commit is contained in:
rmkaplan
2022-05-21 23:56:03 -07:00
parent 48ebc675a7
commit 107ea72a67
4 changed files with 190 additions and 167 deletions

View File

@@ -1,11 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "30-Dec-2021 20:50:54" {DSK}<Users>kaplan>Local>medley3.5>my-medley>library>TEDIT.;30 142870
(FILECREATED "19-May-2022 22:46:25" 
{DSK}<Users>kaplan>Local>medley3.5>working-medley>library>TEDIT.;37 143285
:CHANGES-TO (FNS TEDIT TEDIT-SEE)
:CHANGES-TO (FNS TEDITSTRING)
:PREVIOUS-DATE "28-Dec-2021 11:02:43"
{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>TEDIT.;24)
:PREVIOUS-DATE " 5-May-2022 15:19:42"
{DSK}<Users>kaplan>Local>medley3.5>working-medley>library>TEDIT.;34)
(* ; "
@@ -31,12 +32,12 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
 "Changed by yabu.fx, for SUNLOADUP without DWIM.")
)
(GLOBALVARS TEDIT.TENTATIVE TEDIT.DEFAULT.PROPS)
(FNS \TEDIT2 COERCETEXTOBJ TEDIT TEDIT-SEE TEDIT.CHARWIDTH TEDIT.COPY TEDIT.DELETE
TEDIT.DO.BLUEPENDINGDELETE TEDIT.INSERT TEDIT.KILL TEDIT.MAPLINES TEDIT.MAPPIECES
TEDIT.MOVE TEDIT.QUIT TEDIT.STRINGWIDTH TEDIT.\INSERT TEXTOBJ TEXTSTREAM \TEDIT.INCLUDE
\TEDIT.INSERT.PIECES \TEDIT.MOVE.PIECEMAPFN \TEDIT.OBJECT.SHOWSEL \TEDIT.RESTARTFN
\TEDIT.CHARDELETE \TEDIT.COPY.PIECEMAPFN \TEDIT.DELETE \TEDIT.DIFFUSE.PARALOOKS
\TEDIT.FOREIGN.COPY? \TEDIT.QUIT \TEDIT.WORDDELETE \TEDIT1)
(FNS \TEDIT2 COERCETEXTOBJ TEDIT TEDITSTRING TEDIT-SEE TEDIT.CHARWIDTH TEDIT.COPY
TEDIT.DELETE TEDIT.DO.BLUEPENDINGDELETE TEDIT.INSERT TEDIT.KILL TEDIT.MAPLINES
TEDIT.MAPPIECES TEDIT.MOVE TEDIT.QUIT TEDIT.STRINGWIDTH TEDIT.\INSERT TEXTOBJ TEXTSTREAM
\TEDIT.INCLUDE \TEDIT.INSERT.PIECES \TEDIT.MOVE.PIECEMAPFN \TEDIT.OBJECT.SHOWSEL
\TEDIT.RESTARTFN \TEDIT.CHARDELETE \TEDIT.COPY.PIECEMAPFN \TEDIT.DELETE
\TEDIT.DIFFUSE.PARALOOKS \TEDIT.FOREIGN.COPY? \TEDIT.QUIT \TEDIT.WORDDELETE \TEDIT1)
(P (MOVD? 'NILL 'OBJECTOUTOFTEDIT))
(* ;
 "HOOK for looked-string copy, etc. Used in \TEDIT.FOREIGN.COPY?.")
@@ -250,22 +251,30 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
NIL])
(TEDIT
[LAMBDA (TEXT WINDOW DONTSPAWN PROPS) (* ; "Edited 30-Dec-2021 20:50 by rmk")
(* ; "Edited 28-Dec-2021 00:12 by rmk")
(* ; "Edited 24-Dec-2021 19:21 by rmk")
(* ; "Edited 11-Jun-99 14:14 by rmk:")
(* ; "Edited 3-Jun-88 14:27 by jds")
[LAMBDA (TEXT WINDOW DONTSPAWN PROPS)
(* ;; "Edited 31-Jan-2022 17:19 by rmk: String TEXT is a file name")
(* ;; "Edited 30-Dec-2021 20:50 by rmk")
(* ;; "Edited 28-Dec-2021 00:12 by rmk")
(* ;; "Edited 24-Dec-2021 19:21 by rmk")
(* ;; "Edited 11-Jun-99 14:14 by rmk:")
(* ;; "Edited 3-Jun-88 14:27 by jds")
(* ;; "User entry to the text editor. Takes an optional window to be used for editing")
(* ;; "DONTSPAWN => Don't try to create a new process for this edit.")
(PROG (PROC TEDITCREATEDWINDOW) (* ;
 "Include the default properties in the list.")
(PROG (PROC TEDITCREATEDWINDOW)
[COND
((AND TEXT (ATOM TEXT)) (* ;
((AND TEXT (OR (LITATOM TEXT)
(STRINGP TEXT))) (* ;
 "Make sure the file exists before trying to open the window.")
(SETQ TEXT (OPENFILE TEXT 'INPUT 'OLD '((TYPE TEXT]
(SETQ TEXT (OPENSTREAM TEXT 'INPUT 'OLD '((TYPE TEXT]
(CL:WHEN (AND WINDOW (OR (LITATOM WINDOW)
(REGIONP WINDOW)))
@@ -284,10 +293,9 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
(NOT TEDIT.DEFAULT.WINDOW)
(\TEDIT.ACTIVE.WINDOWP TEDIT.DEFAULT.WINDOW))
(TEDIT.CREATEW (COND
((AND TEXT (ATOM TEXT))
(CONCAT
(TEXT (CONCAT
"Please specify an editing window for "
TEXT))
TEXT))
(T
"Please specify a region for the editing window."
))
@@ -336,11 +344,24 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
(TTY.PROCESS PROC)))
(RETURN PROC])
(TEDITSTRING
[LAMBDA (TEXT WINDOW DONTSPAWN PROPS)
(* ;;; "Edited 19-May-2022 22:46 by rmk: An interface function to replace calls to TEDIT when the text argument may be the string to be edited rather than the name of a file. This enables the transition that gets TEDIT aligned with the convention that strings, as well as litatoms, are file names")
(TEDIT (IF (STRINGP TEXT)
THEN (LET ((TSTRM (OPENTEXTSTREAM NIL NIL NIL PROPS)))
(PRIN3 TEXT TSTRM)
TSTRM)
ELSE TEXT)
WINDOW DONTSPAWN PROPS])
(TEDIT-SEE
[LAMBDA (FILE WINDOW FORMAT TITLE) (* ; "Edited 30-Dec-2021 18:03 by rmk")
(* ; "Edited 16-Dec-2021 12:33 by rmk")
(* ; "Edited 13-Oct-2021 10:00 by rmk:")
(* ; "Edited 27-Feb-2021 20:07 by rmk:")
[LAMBDA (FILE WINDOW FORMAT TITLE) (* ; "Edited 5-May-2022 15:18 by rmk")
(* ; "Edited 30-Dec-2021 18:03 by rmk")
(* ; "Edited 16-Dec-2021 12:33 by rmk")
(* ; "Edited 13-Oct-2021 10:00 by rmk:")
(* ; "Edited 27-Feb-2021 20:07 by rmk:")
(* ; "Edited 1-Feb-88 19:00 by bvm:")
(* ;; "See FILE in a scrollable READONLY TEDIT window. If FILE is a LISP source file, copy first to a temporary NODIRCORE image file that interpretes the fontchange characters rather than showing black boxes.")
@@ -359,8 +380,8 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
(* ;; "Lisp source file")
(SETQ SEESTREAM (OPENTEXTSTREAM))
(DSPFONT DEFAULTFONT SEESTREAM)
(COPY.TEXT.TO.IMAGE STREAM SEESTREAM)
(APPLY* (FUNCTION SEE)
STREAM SEESTREAM)
ELSE
(* ;; "Not a Lisp source file and not a Tedit file. If it is not random access, we copy it so we can scroll around.")
@@ -2243,7 +2264,7 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
(* ; "TEDIT Support information")
(RPAQQ TEDITSYSTEMDATE "30-Dec-2021 20:50:54")
(RPAQQ TEDITSYSTEMDATE "19-May-2022 22:46:25")
(RPAQ TEDITSUPPORT "TEditSupport.PA")
(DEFINEQ
@@ -2269,19 +2290,20 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
(PUTPROPS TEDIT COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 1991
1992 1993 1995 1999 2018 2021))
(DECLARE%: DONTCOPY
(FILEMAP (NIL (4336 118040 (\TEDIT2 4346 . 7097) (COERCETEXTOBJ 7099 . 15875) (TEDIT 15877 . 21230) (
TEDIT-SEE 21232 . 23716) (TEDIT.CHARWIDTH 23718 . 25742) (TEDIT.COPY 25744 . 34180) (TEDIT.DELETE
34182 . 34872) (TEDIT.DO.BLUEPENDINGDELETE 34874 . 37941) (TEDIT.INSERT 37943 . 43473) (TEDIT.KILL
43475 . 45032) (TEDIT.MAPLINES 45034 . 46433) (TEDIT.MAPPIECES 46435 . 47391) (TEDIT.MOVE 47393 .
57177) (TEDIT.QUIT 57179 . 59179) (TEDIT.STRINGWIDTH 59181 . 59852) (TEDIT.\INSERT 59854 . 61879) (
TEXTOBJ 61881 . 63006) (TEXTSTREAM 63008 . 64623) (\TEDIT.INCLUDE 64625 . 68525) (\TEDIT.INSERT.PIECES
68527 . 78442) (\TEDIT.MOVE.PIECEMAPFN 78444 . 80523) (\TEDIT.OBJECT.SHOWSEL 80525 . 84154) (
\TEDIT.RESTARTFN 84156 . 86151) (\TEDIT.CHARDELETE 86153 . 90115) (\TEDIT.COPY.PIECEMAPFN 90117 .
93342) (\TEDIT.DELETE 93344 . 100862) (\TEDIT.DIFFUSE.PARALOOKS 100864 . 103628) (\TEDIT.FOREIGN.COPY?
103630 . 107357) (\TEDIT.QUIT 107359 . 110505) (\TEDIT.WORDDELETE 110507 . 115340) (\TEDIT1 115342 .
118038)) (118154 118270 (\CREATE.TEDIT.RESTART.MENU 118164 . 118268)) (118369 122058 (PLCHAIN 118379
. 118653) (PRINTLINE 118655 . 121419) (SEEFILE 121421 . 122056)) (122099 141742 (TEDIT.INSERT.OBJECT
122109 . 131186) (TEDIT.EDIT.OBJECT 131188 . 133444) (TEDIT.FIND.OBJECT 133446 . 134339) (
TEDIT.FIND.OBJECT.SUBTREE 134341 . 135147) (TEDIT.PUT.OBJECT 135149 . 136808) (TEDIT.GET.OBJECT 136810
. 140009) (TEDIT.OBJECT.CHANGED 140011 . 141740)) (142020 142383 (MAKETEDITFORM 142030 . 142381)))))
(FILEMAP (NIL (4355 118455 (\TEDIT2 4365 . 7116) (COERCETEXTOBJ 7118 . 15894) (TEDIT 15896 . 20924) (
TEDITSTRING 20926 . 21540) (TEDIT-SEE 21542 . 24131) (TEDIT.CHARWIDTH 24133 . 26157) (TEDIT.COPY 26159
. 34595) (TEDIT.DELETE 34597 . 35287) (TEDIT.DO.BLUEPENDINGDELETE 35289 . 38356) (TEDIT.INSERT 38358
. 43888) (TEDIT.KILL 43890 . 45447) (TEDIT.MAPLINES 45449 . 46848) (TEDIT.MAPPIECES 46850 . 47806) (
TEDIT.MOVE 47808 . 57592) (TEDIT.QUIT 57594 . 59594) (TEDIT.STRINGWIDTH 59596 . 60267) (TEDIT.\INSERT
60269 . 62294) (TEXTOBJ 62296 . 63421) (TEXTSTREAM 63423 . 65038) (\TEDIT.INCLUDE 65040 . 68940) (
\TEDIT.INSERT.PIECES 68942 . 78857) (\TEDIT.MOVE.PIECEMAPFN 78859 . 80938) (\TEDIT.OBJECT.SHOWSEL
80940 . 84569) (\TEDIT.RESTARTFN 84571 . 86566) (\TEDIT.CHARDELETE 86568 . 90530) (
\TEDIT.COPY.PIECEMAPFN 90532 . 93757) (\TEDIT.DELETE 93759 . 101277) (\TEDIT.DIFFUSE.PARALOOKS 101279
. 104043) (\TEDIT.FOREIGN.COPY? 104045 . 107772) (\TEDIT.QUIT 107774 . 110920) (\TEDIT.WORDDELETE
110922 . 115755) (\TEDIT1 115757 . 118453)) (118569 118685 (\CREATE.TEDIT.RESTART.MENU 118579 . 118683
)) (118784 122473 (PLCHAIN 118794 . 119068) (PRINTLINE 119070 . 121834) (SEEFILE 121836 . 122471)) (
122514 142157 (TEDIT.INSERT.OBJECT 122524 . 131601) (TEDIT.EDIT.OBJECT 131603 . 133859) (
TEDIT.FIND.OBJECT 133861 . 134754) (TEDIT.FIND.OBJECT.SUBTREE 134756 . 135562) (TEDIT.PUT.OBJECT
135564 . 137223) (TEDIT.GET.OBJECT 137225 . 140424) (TEDIT.OBJECT.CHANGED 140426 . 142155)) (142435
142798 (MAKETEDITFORM 142445 . 142796)))))
STOP