From 312f4f389f3189bcba9e8ff702d188168208b118 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Mon, 6 Oct 2025 21:05:18 -0700 Subject: [PATCH] TEDIT-LOOKS: Bug fix to MCCS code translator --- library/tedit/TEDIT-LOOKS | 49 +++++++++++++++++---------------- library/tedit/TEDIT-LOOKS.LCOM | Bin 38352 -> 38350 bytes 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/library/tedit/TEDIT-LOOKS b/library/tedit/TEDIT-LOOKS index 222dc512..426d99ab 100644 --- a/library/tedit/TEDIT-LOOKS +++ b/library/tedit/TEDIT-LOOKS @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 5-Oct-2025 10:57:43" {WMEDLEY}TEDIT>TEDIT-LOOKS.;457 155388 +(FILECREATED " 6-Oct-2025 20:50:59" {WMEDLEY}TEDIT>TEDIT-LOOKS.;459 155349 :EDIT-BY rmk :CHANGES-TO (FNS \TEDIT.MCCS.TRANSLATE) - :PREVIOUS-DATE "25-Sep-2025 21:32:46" {WMEDLEY}TEDIT>TEDIT-LOOKS.;456) + :PREVIOUS-DATE " 5-Oct-2025 10:57:43" {WMEDLEY}TEDIT>TEDIT-LOOKS.;457) (PRETTYCOMPRINT TEDIT-LOOKSCOMS) @@ -925,7 +925,8 @@ (DEFINEQ (\TEDIT.MCCS.TRANSLATE - [LAMBDA (TSTREAM) (* ; "Edited 5-Oct-2025 10:57 by rmk") + [LAMBDA (TSTREAM) (* ; "Edited 6-Oct-2025 20:50 by rmk") + (* ; "Edited 5-Oct-2025 10:57 by rmk") (* ; "Edited 25-Sep-2025 21:30 by rmk") (* ; "Edited 9-Sep-2025 21:48 by rmk") (* ; "Edited 7-Sep-2025 22:42 by rmk") @@ -954,7 +955,7 @@ (SETQ CLOOKS (PCHARLOOKS PC)) CLFONT] - do [for OFFSET OLDCODE STRING FAT from 1 to (PLEN PC) eachtime (SETQ OLDCODE + do (for OFFSET OLDCODE STRING FAT from 1 to (PLEN PC) eachtime (SETQ OLDCODE ( \TEDIT.PIECE.NTHCHARCODE PC OFFSET)) @@ -987,17 +988,17 @@  "Can't stay with this font (SYMBOL), find the coercion that was used for its characters.") (FSETPC PC PCHARLOOKS (\TEDIT.MCCS.TRANSLATE.CHARLOOKS TEXTOBJ CLOOKS - CLFONT)))] finally + CLFONT))) + (RETURN)) finally (* ;; "CLOOKSLIST maps any old charlooks to the new ones that we might have created for them, because of font coercion for non-MCCS fonts. The stream must know about the changes. ") - (CL:WHEN CLOOKSLIST + (CL:WHEN CLOOKSLIST - (* ;; - "Discard orphan old looks and uniquify what's left.") + (* ;; + "Discard orphan old looks and uniquify what's left.") - (\TEDIT.UNIQUIFY.ALL - TEXTOBJ)))) + (\TEDIT.UNIQUIFY.ALL TEXTOBJ)))) (PUTMULTI (FGETTOBJ TEXTOBJ DOCPROPS) 'CHARENCODING 'MCCS]) @@ -2468,18 +2469,18 @@ \TEDIT.UNPARSE.CHARLOOKS.LIST 41031 . 44525) (\TEDIT.MODIFYLOOKS 44527 . 46687) (TEDIT.NEW.FONT 46689 . 47136) (\TEDIT.CARETLOOKS.VERIFY 47138 . 47975) (\TEDIT.CARETPIECE 47977 . 48282) ( \TEDIT.GET.INSERT.CHARLOOKS 48284 . 51331) (\TEDIT.GET.TERMSA.WIDTHS 51333 . 51749) ( -\TEDIT.PARSE.CHARLOOKS.LIST 51751 . 52951)) (52954 65120 (\TEDIT.MCCS.TRANSLATE 52964 . 58856) ( -\TEDIT.CONVERT.TO.FORMATTED 58858 . 65118)) (65992 73329 (\TEDIT.UNIQUIFY.CHARLOOKS 66002 . 67662) ( -\TEDIT.UNIQUIFY.PARALOOKS 67664 . 68931) (\TEDIT.UNIQUIFY.ALL 68933 . 71021) ( -\TEDIT.FLUSH.UNUSED.LOOKS 71023 . 73327)) (73362 85320 (TEDIT.LOOKS 73372 . 75761) (TEDIT.GET.LOOKS -75763 . 78098) (TEDIT.SUBLOOKS 78100 . 82480) (TEDIT.FINDLOOKS 82482 . 85318)) (85389 115039 ( -\TEDIT.CHANGE.CHARLOOKS 85399 . 94177) (\TEDIT.CHANGE.CHARLOOKS.NEW 94179 . 97994) ( -\TEDIT.CHARLOOKS.CHANGE.FONT 97996 . 106303) (\TEDIT.FONT.NEXTSIZE 106305 . 107926) (\TEDIT.LOOKS -107928 . 111257) (\TEDIT.FONTCOPY 111259 . 112760) (\TEDIT.COERCE.FONTCLASS 112762 . 113913) ( -\TEDIT.FONTCLASS.TO.FONT 113915 . 115037)) (115082 146730 (\TEDIT.EQFMTSPEC 115092 . 118307) ( -TEDIT.GET.PARALOOKS 118309 . 122356) (\TEDIT.PARSE.PARALOOKS.LIST 122358 . 130391) (TEDIT.PARALOOKS -130393 . 131433) (\TEDIT.CHANGE.PARALOOKS 131435 . 138403) (\TEDIT.CHANGE.PARALOOKS.NEW 138405 . -142388) (TEDIT.COPY.PARALOOKS 142390 . 145064) (\TEDIT.PARABOUNDS 145066 . 146728)) (146790 154506 ( -TEDIT.SUBPARALOOKS 146800 . 150902) (SAMEPARALOOKS 150904 . 154504)) (154507 155194 ( -\TEDIT.MARK.REVISION 154517 . 155192))))) +\TEDIT.PARSE.CHARLOOKS.LIST 51751 . 52951)) (52954 65081 (\TEDIT.MCCS.TRANSLATE 52964 . 58817) ( +\TEDIT.CONVERT.TO.FORMATTED 58819 . 65079)) (65953 73290 (\TEDIT.UNIQUIFY.CHARLOOKS 65963 . 67623) ( +\TEDIT.UNIQUIFY.PARALOOKS 67625 . 68892) (\TEDIT.UNIQUIFY.ALL 68894 . 70982) ( +\TEDIT.FLUSH.UNUSED.LOOKS 70984 . 73288)) (73323 85281 (TEDIT.LOOKS 73333 . 75722) (TEDIT.GET.LOOKS +75724 . 78059) (TEDIT.SUBLOOKS 78061 . 82441) (TEDIT.FINDLOOKS 82443 . 85279)) (85350 115000 ( +\TEDIT.CHANGE.CHARLOOKS 85360 . 94138) (\TEDIT.CHANGE.CHARLOOKS.NEW 94140 . 97955) ( +\TEDIT.CHARLOOKS.CHANGE.FONT 97957 . 106264) (\TEDIT.FONT.NEXTSIZE 106266 . 107887) (\TEDIT.LOOKS +107889 . 111218) (\TEDIT.FONTCOPY 111220 . 112721) (\TEDIT.COERCE.FONTCLASS 112723 . 113874) ( +\TEDIT.FONTCLASS.TO.FONT 113876 . 114998)) (115043 146691 (\TEDIT.EQFMTSPEC 115053 . 118268) ( +TEDIT.GET.PARALOOKS 118270 . 122317) (\TEDIT.PARSE.PARALOOKS.LIST 122319 . 130352) (TEDIT.PARALOOKS +130354 . 131394) (\TEDIT.CHANGE.PARALOOKS 131396 . 138364) (\TEDIT.CHANGE.PARALOOKS.NEW 138366 . +142349) (TEDIT.COPY.PARALOOKS 142351 . 145025) (\TEDIT.PARABOUNDS 145027 . 146689)) (146751 154467 ( +TEDIT.SUBPARALOOKS 146761 . 150863) (SAMEPARALOOKS 150865 . 154465)) (154468 155155 ( +\TEDIT.MARK.REVISION 154478 . 155153))))) STOP diff --git a/library/tedit/TEDIT-LOOKS.LCOM b/library/tedit/TEDIT-LOOKS.LCOM index 586f558e54140adda766741b085bfc36e7e88df0..802c0d03f298ed9f38e77b6a681a2f4f58a379fc 100644 GIT binary patch delta 358 zcmcbxn(5qXrU?7#${GC>5K0UO}AKNicxdgOdRWHZp2% z{;Z(L$S&+JbdqDM=VTQnI|+Z4>?`pq`#0#Zft17xonm0lVf(Oo+2lec5zUD}g>2b^ zMxy>g{wiEx1#0{KRs5AcPulpu#9u8X+h2m8@5AP`lQ$^IFa}IMtE3`mtPm97&gCAvliMy3je23Dr#RwgDBvn?gfH5Is&6pRs)Mn+bKCRQfK z6Ze`0A_?p1=_x6sB$lM6U{!Bwq@>BE;pXY%>Kx?i7~<-pprn9lqw&OQO%8JfLsL^@ z3yaC6jP4>vrn4(2P+s` L7;Y9<*