1
0
mirror of synced 2026-01-26 20:31:53 +00:00

Rmk50: TERMINAL fonts plus fixed masterscope conflicts (#806)

* EDITFONT:  CHARSET in  interface

* IDLEHAX, LIFE, TMAX-ENDNOTE:  Clean up conflicts in making full masterscope DB

* FONT:  Add charset coercion for TERMINAL

* TERMINAL fonts:  Remove bogus character set files

so that better coercions can take place
This commit is contained in:
rmkaplan
2022-06-27 11:49:36 -07:00
committed by GitHub
parent 13e2b5cda6
commit 9660232d6e
34 changed files with 754 additions and 745 deletions

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@@ -1,11 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED " 9-Feb-2022 13:53:05" {DSK}<home>larry>medley>lispusers>IDLEHAX.;3 26245
(FILECREATED "26-Jun-2022 18:21:17" 
{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>IDLEHAX.;4 26796
:CHANGES-TO (FNS IDLE-DRAIN)
(VARS IDLEHAXCOMS)
:CHANGES-TO (FNS KAL.ADVANCE)
:PREVIOUS-DATE "15-Jan-2022 15:31:21" {DSK}<home>larry>medley>lispusers>IDLEHAX.;1)
:PREVIOUS-DATE " 9-Feb-2022 13:53:05"
{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>IDLEHAX.;3)
(* ; "
@@ -194,8 +195,17 @@ Copyright (c) 1985-1988, 1991, 2022 by Xerox Corporation.
)
(KAL.ADVANCE
(LAMBDA (STATE) (* lmm "30-Jul-85 20:16") (freplace A of STATE with (KAL.ORAND (ffetch A of STATE) (ffetch B of STATE))) (freplace PERIODCOUNT of STATE with (SUB1 (ffetch PERIODCOUNT of STATE))) (COND ((EQ (ffetch PERIODCOUNT of STATE) 0) (freplace B of STATE with (KAL.ORAND (ffetch B of STATE) (ffetch C of STATE))) (freplace PERIODCOUNT of STATE with (ffetch PERIOD of STATE)))))
)
[LAMBDA (STATE) (* ; "Edited 26-Jun-2022 18:20 by rmk")
(* lmm "30-Jul-85 20:16")
(freplace (KALSTATE A) of STATE with (KAL.ORAND (ffetch (KALSTATE A) of STATE)
(ffetch (KALSTATE B) of STATE)))
(freplace (KALSTATE PERIODCOUNT) of STATE with (SUB1 (ffetch (KALSTATE PERIODCOUNT) of STATE)))
(COND
((EQ (ffetch (KALSTATE PERIODCOUNT) of STATE)
0)
(freplace (KALSTATE B) of STATE with (KAL.ORAND (ffetch (KALSTATE B) of STATE)
(ffetch (KALSTATE C) of STATE)))
(freplace (KALSTATE PERIODCOUNT) of STATE with (ffetch (KALSTATE PERIOD) of STATE])
(KAL.SPOTS
(LAMBDA (X Y WINDOWSIDE W BLACK XOFFSET) (* lmm " 3-Aug-85 21:59") (PROG ((X0 (LRSH X 7)) (Y0 (LRSH Y 7)) X1 Y1 C) (COND ((ILESSP X0 Y0) (SETQ X1 (IDIFFERENCE (SUB1 WINDOWSIDE) X0)) (SETQ Y1 (IDIFFERENCE (SUB1 WINDOWSIDE) Y0)) (SETQ C (LOGAND X 1)) (KAL.BMS W X0 Y0 X1 Y1 (if BLACK then (DIFFERENCE 1 C) else C) XOFFSET)))))
@@ -470,12 +480,12 @@ Copyright (c) 1985-1988, 1991, 2022 by Xerox Corporation.
(ADDTOVAR IDLE.FUNCTIONS ("Swap" 'IDLE-SWAP))
(PUTPROPS IDLEHAX COPYRIGHT ("Xerox Corporation" 1985 1986 1987 1988 1991 2022))
(DECLARE%: DONTCOPY
(FILEMAP (NIL (3794 7834 (POLYGONSDEMO 3804 . 3974) (POLYGONS 3976 . 4340) (CONNECTPOLYS 4342 . 6740)
(DRAWPOLY1 6742 . 7379) (RANDOMPT 7381 . 7832)) (8471 11453 (KALDEMO 8481 . 9892) (KAL.ADVANCE 9894 .
10295) (KAL.SPOTS 10297 . 10638) (KAL.BMS 10640 . 11127) (KAL.ORAND 11129 . 11451)) (11490 12976 (
BUBBLES 11500 . 12606) (BUBBLE.CREATE 12608 . 12974)) (13003 13988 (IDLE-WINDOWS 13013 . 13986)) (
14023 16294 (LINES 14033 . 15092) (LINES1 15094 . 15504) (LINES2 15506 . 15817) (LINES3 15819 . 16292)
) (16354 17567 (WALKINGSPOKE 16364 . 17145) (WARP 17147 . 17565)) (17592 21875 (IDLE-MELT 17602 .
20118) (IDLE-SLIDE 20120 . 21873)) (22046 22292 (DEMOWINDOW 22056 . 22290)) (22704 24577 (IDLE-DRAIN
22714 . 24575)) (24609 26090 (IDLE-SWAP 24619 . 26088)))))
(FILEMAP (NIL (3812 7852 (POLYGONSDEMO 3822 . 3992) (POLYGONS 3994 . 4358) (CONNECTPOLYS 4360 . 6758)
(DRAWPOLY1 6760 . 7397) (RANDOMPT 7399 . 7850)) (8489 12004 (KALDEMO 8499 . 9910) (KAL.ADVANCE 9912 .
10846) (KAL.SPOTS 10848 . 11189) (KAL.BMS 11191 . 11678) (KAL.ORAND 11680 . 12002)) (12041 13527 (
BUBBLES 12051 . 13157) (BUBBLE.CREATE 13159 . 13525)) (13554 14539 (IDLE-WINDOWS 13564 . 14537)) (
14574 16845 (LINES 14584 . 15643) (LINES1 15645 . 16055) (LINES2 16057 . 16368) (LINES3 16370 . 16843)
) (16905 18118 (WALKINGSPOKE 16915 . 17696) (WARP 17698 . 18116)) (18143 22426 (IDLE-MELT 18153 .
20669) (IDLE-SLIDE 20671 . 22424)) (22597 22843 (DEMOWINDOW 22607 . 22841)) (23255 25128 (IDLE-DRAIN
23265 . 25126)) (25160 26641 (IDLE-SWAP 25170 . 26639)))))
STOP

Binary file not shown.

View File

@@ -1,11 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
(FILECREATED " 6-Dec-2021 15:21:48" |{DSK}<home>medley>medley>lispusers>LIFE.;3| 9875
(FILECREATED "26-Jun-2022 18:34:22" 
|{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>LIFE.;3| 10394
|changes| |to:| (VARS LIFECOMS)
(FNS EXPAND.BITMAP.VERTICALLY)
:CHANGES-TO (FNS EXPAND.BITMAP.VERTICALLY EXPAND.BITMAP.HORIZONTALLY)
|previous| |date:| "20-Aug-88 12:18:43" |{DSK}<home>medley>medley>lispusers>LIFE.;1|)
:PREVIOUS-DATE " 6-Dec-2021 15:21:48"
|{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>LIFE.;2|)
; Copyright (c) 1987-1988 by Xerox Corporation.
@@ -43,7 +44,7 @@
PBT TEMP)
(|if| (NEQ N 1)
|then| (SETQ TEMP (BITMAPCREATE (IQUOTIENT W N)
H))
H))
(SETQ PBT (|create| PILOTBBT))
(BITBLT WIN 0 0 TEMP 0 0)
(EXPAND.BITMAP.HORIZONTALLY TEMP N A PBT)
@@ -63,13 +64,13 @@
(SHUFFLE (INHI LO HORIZ?)
`(PROGN ,@(|if| HORIZ?
|then| `((BITBLTBITMAP ,INHI N 0 ,LO 0 0 W1 H)
(BITBLTBITMAP ,INHI 0 0 ,LO W1 0 N H)
(BITBLTBITMAP ,INHI 0 0 C N 0 W1 H)
(BITBLTBITMAP ,INHI W1 0 C 0 0 N H))
(BITBLTBITMAP ,INHI 0 0 ,LO W1 0 N H)
(BITBLTBITMAP ,INHI 0 0 C N 0 W1 H)
(BITBLTBITMAP ,INHI W1 0 C 0 0 N H))
|else| `((BITBLTBITMAP ,INHI 0 1 ,LO 0 0 W H1)
(BITBLTBITMAP ,INHI 0 0 ,LO 0 H1 W 1)
(BITBLTBITMAP ,INHI 0 0 C 0 1 W H1)
(BITBLTBITMAP ,INHI 0 H1 C 0 0 W 1)))
(BITBLTBITMAP ,INHI 0 0 ,LO 0 H1 W 1)
(BITBLTBITMAP ,INHI 0 0 C 0 1 W H1)
(BITBLTBITMAP ,INHI 0 H1 C 0 0 W 1)))
(BITBLTBITMAP C 0 0 ,LO 0 0 W H 'INPUT 'INVERT)
(BITBLTBITMAP ,LO 0 0 C 0 0 W H 'INPUT 'ERASE)
(BITBLTBITMAP ,INHI 0 0 ,LO 0 0 W H 'INPUT 'INVERT)
@@ -103,22 +104,26 @@
(DEFINEQ
(EXPAND.BITMAP.VERTICALLY
(LAMBDA (BITMAP M BM2 PBT) (* \;
 "Edited 6-Dec-2021 15:04 by medley")
(* \;
 "Edited 6-Dec-2021 14:47 by medley")
(* \;
 "Edited 6-Dec-2021 13:54 by medley")
(* \;
 "Edited 6-Dec-2021 13:51 by medley")
(* \;
 "Edited 6-Dec-2021 13:11 by medley")
(* \;
 "Edited 6-Mar-87 15:02 by Masinter")
(LAMBDA (BITMAP M BM2 PBT)
(* |;;| "Edited 26-Jun-2022 18:29 by rmk: Change (add ... to (SETQ xx (PLUS xxx ..)) because \"with\" gets confused")
(* |;;| "Edited 6-Dec-2021 15:04 by medley")
(* |;;| "Edited 6-Dec-2021 14:47 by medley")
(* |;;| "Edited 6-Dec-2021 13:54 by medley")
(* |;;| "Edited 6-Dec-2021 13:51 by medley")
(* |;;| "Edited 6-Dec-2021 13:11 by medley")
(* |;;| "Edited 6-Mar-87 15:02 by Masinter")
(OR BM2 (SETQ BM2 (BITMAPCREATE (|fetch| BITMAPWIDTH BITMAP)
(TIMES M (|fetch| BITMAPHEIGHT BITMAP)))))
(OR PBT (SETQ PBT (|create| PILOTBBT)))
(|with| PILOTBBT PBT (*)
(|with| PILOTBBT PBT (*)
(SETQ PBTDESTHI (|ffetch| |BitMapHiLoc| BM2))
(SETQ PBTDESTLO (|ffetch| |BitMapLoLoc| BM2))
(SETQ PBTSOURCEHI (|ffetch| |BitMapHiLoc| BITMAP))
@@ -130,15 +135,49 @@
(SETQ PBTFLAGS 16384)
(SETQ PBTHEIGHT (|fetch| BITMAPHEIGHT BITMAP))
(SETQ PBTWIDTH (|fetch| BITMAPWIDTH BITMAP))
(|for| I |from| 1 |to| M |do| (\\PILOTBITBLT PBT 0)
(|add| PBTDESTLO (|fetch|
BITMAPRASTERWIDTH
|of| BM2))))
(|for| I |from| 1 |to| M |do| (\\PILOTBITBLT PBT 0)
(* \;
 "RMK: Can't use add here, expansion setf expansion gets confused")
(SETQ PBTDESTLO (PLUS PBTDESTLO (|fetch| BITMAPRASTERWIDTH
|of| BM2)))
\n))
BM2))
(expand.bitmap.horizontally
(lambda (bitmap n bm2 pbt) (* \; "Edited 6-Mar-87 17:08 by Masinter") (or bm2 (setq bm2 (bitmapcreate (times n (|fetch| bitmapwidth bitmap)) (|fetch| bitmapheight bitmap)))) (or pbt (setq pbt (|create| pilotbbt))) (let ((sourcebase (|fetch| bitmapbase bitmap)) (destbase (|fetch| bitmapbase bm2))) (|with| pilotbbt pbt (setq pbtdestbpl n) (setq pbtsourcebpl 1) (setq pbtsourcebit 0) (setq pbtflags 16384) (setq pbtwidth 1) (let ((ht (times (|fetch| bitmapwidth bitmap) (|fetch| bitmapheight bitmap)))) (|do| (setq pbtdest destbase) (setq pbtsource sourcebase) (setq pbtheight (min (times 1024 16) ht)) (setq pbtdestbit 0) (|for| i |from| 0 |while| (lessp i n) |do| (\\pilotbitblt pbt 0) (|add| pbtdestbit 1)) (setq ht (- ht (times 1024 16))) (|if| (leq ht 0) |then| (return)) (setq destbase (\\addbase destbase (times n 1024))) (setq sourcebase (\\addbase sourcebase 1024)))))) bm2)
)
(EXPAND.BITMAP.HORIZONTALLY
(LAMBDA (BITMAP N BM2 PBT)
(* |;;| "Edited 26-Jun-2022 18:34 by rmk: ADD doesn't expand properly under WITH, at least masterscope complains. So expanded it here")
(* |;;| "Edited 26-Jun-2022 18:30 by rmk")
(* |;;| "Edited 6-Mar-87 17:08 by Masinter")
(OR BM2 (SETQ BM2 (BITMAPCREATE (TIMES N (|fetch| BITMAPWIDTH BITMAP))
(|fetch| BITMAPHEIGHT BITMAP))))
(OR PBT (SETQ PBT (|create| PILOTBBT)))
(LET ((SOURCEBASE (|fetch| BITMAPBASE BITMAP))
(DESTBASE (|fetch| BITMAPBASE BM2)))
(|with| PILOTBBT PBT (SETQ PBTDESTBPL N)
(SETQ PBTSOURCEBPL 1)
(SETQ PBTSOURCEBIT 0)
(SETQ PBTFLAGS 16384)
(SETQ PBTWIDTH 1)
(LET ((HT (TIMES (|fetch| BITMAPWIDTH BITMAP)
(|fetch| BITMAPHEIGHT BITMAP))))
(|do| (SETQ PBTDEST DESTBASE)
(SETQ PBTSOURCE SOURCEBASE)
(SETQ PBTHEIGHT (MIN (TIMES 1024 16)
HT))
(SETQ PBTDESTBIT 0)
(|for| I |from| 0 |while| (LESSP I N) |do| (\\PILOTBITBLT PBT 0)
(SETQ PBTDESTBIT
(PLUS PBTDESTBIT 1)))
(SETQ HT (- HT (TIMES 1024 16)))
(|if| (LEQ HT 0)
|then| (RETURN))
(SETQ DESTBASE (\\ADDBASE DESTBASE (TIMES N 1024)))
(SETQ SOURCEBASE (\\ADDBASE SOURCEBASE 1024))))))
BM2))
)
(ADDTOVAR IDLE.FUNCTIONS
@@ -151,6 +190,6 @@
(|LifeIdle| \w 8))))))
(PUTPROPS LIFE COPYRIGHT ("Xerox Corporation" 1987 1988))
(DECLARE\: DONTCOPY
(FILEMAP (NIL (1557 5825 (|Life| 1557 . 5825)) (5827 5955 (|LifeIdle| 5827 . 5955)) (5956 9223 (
EXPAND.BITMAP.VERTICALLY 5966 . 8302) (EXPAND.BITMAP.HORIZONTALLY 8304 . 9221)))))
(FILEMAP (NIL (1590 5830 (|Life| 1590 . 5830)) (5832 5960 (|LifeIdle| 5832 . 5960)) (5961 9742 (
EXPAND.BITMAP.VERTICALLY 5971 . 7898) (EXPAND.BITMAP.HORIZONTALLY 7900 . 9740)))))
STOP

Binary file not shown.

View File

@@ -1,12 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
(FILECREATED "18-Mar-2022 07:12:34" 
|{DSK}<Users>kaplan>Local>medley3.5>my-medley>lispusers>TMAX-ENDNOTE.;4| 23444
(FILECREATED "26-Jun-2022 18:15:33" 
|{DSK}<users>kaplan>local>medley3.5>working-medley>lispusers>TMAX>TMAX-ENDNOTE.;3| 23863
:CHANGES-TO (VARS TMAX-ENDNOTECOMS)
:CHANGES-TO (FNS REGMARK.PUTFN REGMARK.BUTTONEVENTINFN)
:PREVIOUS-DATE "17-Mar-2022 23:10:26"
|{DSK}<Users>kaplan>Local>medley3.5>my-medley>lispusers>TMAX-ENDNOTE.;2|)
:PREVIOUS-DATE "18-Mar-2022 07:12:34"
|{DSK}<users>kaplan>local>medley3.5>working-medley>lispusers>TMAX>TMAX-ENDNOTE.;2|)
; Copyright (c) 1987 by Xerox Corporation.
@@ -381,11 +381,12 @@
ydesc _ 0
xkern _ 0)))
(regmark.putfn
(lambda (markobj stream) (* |fsg| "23-Jul-87 14:02")
(prin2 (list '|Region| (|fetch| region.use |of| (|fetch| objectdatum |of| markobj))
(|fetch| marking |of| (|fetch| objectdatum |of| markobj)))
stream)))
(REGMARK.PUTFN
(LAMBDA (MARKOBJ STREAM) (* \; "Edited 26-Jun-2022 18:12 by rmk")
(* |fsg| "23-Jul-87 14:02")
(PRIN2 (LIST '|Region| (|fetch| (REGMARKOBJ REGION.USE) |of| (|fetch| OBJECTDATUM |of| MARKOBJ))
(|fetch| (REGMARKOBJ MARKING) |of| (|fetch| OBJECTDATUM |of| MARKOBJ)))
STREAM)))
(regmark.getfn
(lambda (stream copy.object) (* |fsg| "20-Aug-87 14:58")
@@ -405,22 +406,25 @@
(|fetch| objectdatum |of| image.obj))))
(error "Unknown TARGET stream type" (imagestreamtype target.stream)))))
(regmark.buttoneventinfn
(lambda (markobj stream) (* |fsg| "18-Feb-87 10:07")
(* * |This| |function| |is| |never| |called| |because| |the| regmark
 |ImageObjects| |are| |protected| |after| |they| |are| |inserted| |and|
 |anything| |protected| |can't| |be| |selected.|)
(REGMARK.BUTTONEVENTINFN
(LAMBDA (MARKOBJ STREAM) (* \; "Edited 26-Jun-2022 18:13 by rmk")
(* |fsg| "18-Feb-87 10:07")
(and (mousestate middle)
(let ((markdatum (|fetch| objectdatum |of| markobj)))
(tedit.promptprint stream (concat "Region used for " (|fetch| region.use |of| markdatum
)
(cond
((|fetch| marking |of| markdatum)
(concat ", Marker is " (|fetch| marking
|of| markdatum)))
(t "")))
t)))))
(* * |This| |function| |is| |never| |called| |because| |the| REGMARK
 |ImageObjects| |are| |protected| |after| |they| |are| |inserted| |and| |anything|
 |protected| |can't| |be| |selected.|)
(AND (MOUSESTATE MIDDLE)
(LET ((MARKDATUM (|fetch| OBJECTDATUM |of| MARKOBJ)))
(TEDIT.PROMPTPRINT STREAM (CONCAT "Region used for " (|fetch| (REGMARKOBJ REGION.USE)
|of| MARKDATUM)
(COND
((|fetch| (REGMARKOBJ MARKING) |of| MARKDATUM)
(CONCAT ", Marker is " (|fetch| (REGMARKOBJ
MARKING)
|of| MARKDATUM)))
(T "")))
T)))))
)
(RPAQ? \\REGMARKOBJ.IMAGEFNS
@@ -445,13 +449,13 @@
)
(PUTPROPS TMAX-ENDNOTE COPYRIGHT ("Xerox Corporation" 1987))
(DECLARE\: DONTCOPY
(FILEMAP (NIL (2489 12116 (ADD.ENDNOTE 2499 . 3167) (INSERT.ENDNOTES 3169 . 5372) (
INSERT.ENDNOTES.TEXT 5374 . 6803) (DELETE.ENDNOTES 6805 . 7796) (NOTESREGIONP 7798 . 8060) (
SET.ENDNOTE.STYLE 8062 . 10735) (MAP.ENDNOTE.LOOKS 10737 . 11504) (GET.ENDNOTE.FONTS 11506 . 12114)) (
12117 16032 (ENDNOTEP 12127 . 12468) (NOTE.PUTFN 12470 . 13122) (NOTE.GETFN 13124 . 13704) (
NOTE.BUTTONEVENTINFN 13706 . 14486) (NOTE.WHENSELECTEDFN 14488 . 16030)) (16790 19194 (AUX.TEDIT 16800
. 17762) (AUX.TEDIT.AFTERQUITFN 17764 . 18207) (AUX.TEDIT.TITLEMENUFN 18209 . 19192)) (19279 22743 (
REGMARKOBJ 19289 . 19696) (REGMARKOBJP 19698 . 19892) (REGMARK.DISPLAYFN 19894 . 20140) (
REGMARK.IMAGEBOXFN 20142 . 20493) (REGMARK.PUTFN 20495 . 20827) (REGMARK.GETFN 20829 . 21128) (
REGMARK.COPYFN 21130 . 21668) (REGMARK.BUTTONEVENTINFN 21670 . 22741)))))
(FILEMAP (NIL (2529 12156 (ADD.ENDNOTE 2539 . 3207) (INSERT.ENDNOTES 3209 . 5412) (
INSERT.ENDNOTES.TEXT 5414 . 6843) (DELETE.ENDNOTES 6845 . 7836) (NOTESREGIONP 7838 . 8100) (
SET.ENDNOTE.STYLE 8102 . 10775) (MAP.ENDNOTE.LOOKS 10777 . 11544) (GET.ENDNOTE.FONTS 11546 . 12154)) (
12157 16072 (ENDNOTEP 12167 . 12508) (NOTE.PUTFN 12510 . 13162) (NOTE.GETFN 13164 . 13744) (
NOTE.BUTTONEVENTINFN 13746 . 14526) (NOTE.WHENSELECTEDFN 14528 . 16070)) (16830 19234 (AUX.TEDIT 16840
. 17802) (AUX.TEDIT.AFTERQUITFN 17804 . 18247) (AUX.TEDIT.TITLEMENUFN 18249 . 19232)) (19319 23162 (
REGMARKOBJ 19329 . 19736) (REGMARKOBJP 19738 . 19932) (REGMARK.DISPLAYFN 19934 . 20180) (
REGMARK.IMAGEBOXFN 20182 . 20533) (REGMARK.PUTFN 20535 . 21006) (REGMARK.GETFN 21008 . 21307) (
REGMARK.COPYFN 21309 . 21847) (REGMARK.BUTTONEVENTINFN 21849 . 23160)))))
STOP

Binary file not shown.