From c9ed0b88172326eb7a55f06c2de383dc21e846bb Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Sun, 5 Oct 2025 21:40:53 -0700 Subject: [PATCH] Fix bug in SHOWCHARS utility --- library/UNICODE | 57 ++++++++++++++++++++++--------------------- library/UNICODE.LCOM | Bin 34301 -> 34232 bytes 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/library/UNICODE b/library/UNICODE index ef8e809b..446779af 100644 --- a/library/UNICODE +++ b/library/UNICODE @@ -1,13 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 9-Sep-2025 08:59:44" {WMEDLEY}UNICODE.;171 111736 +(FILECREATED " 5-Oct-2025 17:44:17" {WMEDLEY}UNICODE.;174 111834 :EDIT-BY rmk - :CHANGES-TO (FNS MTOUTF8STRING N-MCHARS UTF8TOMSTRING) - (VARS UNICODECOMS) + :CHANGES-TO (FNS SHOWCHARS) - :PREVIOUS-DATE " 7-Sep-2025 20:30:24" {WMEDLEY}UNICODE.;170) + :PREVIOUS-DATE " 9-Sep-2025 08:59:44" {WMEDLEY}UNICODE.;171) (PRETTYCOMPRINT UNICODECOMS) @@ -1934,7 +1933,8 @@ (DEFINEQ (SHOWCHARS - [LAMBDA (FONT FROMCHAR TOCHAR ONELINE) (* ; "Edited 7-Sep-2025 20:29 by rmk") + [LAMBDA (FONT FROMCHAR TOCHAR ONELINE) (* ; "Edited 5-Oct-2025 17:41 by rmk") + (* ; "Edited 7-Sep-2025 20:29 by rmk") (* ; "Edited 2-Sep-2025 10:26 by rmk") (* ; "Edited 24-Jul-2025 11:30 by rmk") (* ; "Edited 8-Jun-2025 20:05 by rmk") @@ -1947,9 +1947,10 @@ (CL:UNLESS (CHARCODEP FROMCHAR) (SETQ FROMCHAR (OR (CHARCODE.DECODE FROMCHAR T) FROMCHAR))) - (SETQ CHARS (if (CHARCODEP FROMCHAR) + (SETQ CHARS (if (LISTP FROMCHAR) + elseif (CHARCODEP FROMCHAR) then (CL:UNLESS (CHARCODEP TOCHAR) - (SETQ TOCHAR (OR (CHARCODE.DECODE FROMCHAR) + (SETQ TOCHAR (OR (CHARCODE.DECODE TOCHAR) FROMCHAR))) (for C from FROMCHAR to TOCHAR collect C) else (CHCON FROMCHAR))) @@ -1982,25 +1983,25 @@ (PUTPROPS UNICODE FILETYPE :TCOMPL) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4433 19681 (UTF8.OUTCHARFN 4443 . 7459) (UTF8.SLUG.OUTCHARFN 7461 . 8125) ( -UTF8.INCCODEFN 8127 . 13848) (UTF8.PEEKCCODEFN 13850 . 18699) (\UTF8.BACKCCODEFN 18701 . 19679)) ( -19682 24372 (UTF16BE.OUTCHARFN 19692 . 20711) (UTF16BE.INCCODEFN 20713 . 21838) (UTF16BE.PEEKCCODEFN -21840 . 23180) (\UTF16BE.BACKCCODEFN 23182 . 24370)) (24373 29096 (UTF16LE.OUTCHARFN 24383 . 25499) ( -UTF16LE.INCCODEFN 25501 . 26626) (UTF16LE.PEEKCCODEFN 26628 . 27904) (\UTF16LE.BACKCCODEFN 27906 . -29094)) (29097 32144 (READBOM 29107 . 31176) (WRITEBOM 31178 . 32142)) (32174 35739 ( -MAKE-UNICODE-FORMATS 32184 . 35737)) (35836 40330 (UTF8.BINCODE 35846 . 38534) (\UTF8.FETCHCODE 38536 - . 40328)) (40331 45958 (UTF8.VALIDATE 40341 . 42938) (NUTF8-BYTE1-BYTES 42940 . 43677) ( -NUTF8-CODE-BYTES 43679 . 44736) (NUTF8-STRING-BYTES 44738 . 45634) (N-MCHARS 45636 . 45956)) (47686 -56555 (MTOUCODE 47696 . 48083) (UTOMCODE 48085 . 48475) (MTOUCODE? 48477 . 49510) (UTOMCODE? 49512 . -50476) (MTOUSTRING 50478 . 51063) (UTOMSTRING 51065 . 51650) (MTOUTF8STRING 51652 . 55658) ( -UTF8TOMSTRING 55660 . 56553)) (56556 62258 (XTOUCODE 56566 . 57084) (UTOXCODE 57086 . 57594) ( -XTOUCODE? 57596 . 58657) (UTOXCODE? 58659 . 59742) (XTOUSTRING 59744 . 60437) (UTOXSTRING 60439 . -61180) (XTOUTF8STRING 61182 . 62256)) (63495 71791 (READ-UNICODE-MAPPING-FILENAMES 63505 . 67302) ( -READ-UNICODE-MAPPING 67304 . 71789)) (71858 84200 (MAKE-UNICODE-TRANSLATION-TABLES 71868 . 75178) ( -MERGE-UNICODE-TRANSLATION-TABLES 75180 . 77724) (UNICODE.UNMAPPED 77726 . 81050) ( -UNICODE-EXTEND-TRANSLATION? 81052 . 84198)) (84201 91037 (ALL-UNICODE-MAPPINGS 84211 . 89700) ( -XCCSJAPANESECHARSETS 89702 . 91035)) (92628 103896 (WRITE-UNICODE-MAPPING 92638 . 96388) ( -WRITE-UNICODE-INCLUDED 96390 . 101112) (WRITE-UNICODE-MAPPING-HEADER 101114 . 102362) ( -WRITE-UNICODE-MAPPING-FILENAME 102364 . 103894)) (103897 104573 (XCCS-UTF8-AFTER-OPEN 103907 . 104571) -) (107098 109315 (UTF8HEXSTRING 107108 . 109313)) (109342 111222 (SHOWCHARS 109352 . 111220))))) + (FILEMAP (NIL (4369 19617 (UTF8.OUTCHARFN 4379 . 7395) (UTF8.SLUG.OUTCHARFN 7397 . 8061) ( +UTF8.INCCODEFN 8063 . 13784) (UTF8.PEEKCCODEFN 13786 . 18635) (\UTF8.BACKCCODEFN 18637 . 19615)) ( +19618 24308 (UTF16BE.OUTCHARFN 19628 . 20647) (UTF16BE.INCCODEFN 20649 . 21774) (UTF16BE.PEEKCCODEFN +21776 . 23116) (\UTF16BE.BACKCCODEFN 23118 . 24306)) (24309 29032 (UTF16LE.OUTCHARFN 24319 . 25435) ( +UTF16LE.INCCODEFN 25437 . 26562) (UTF16LE.PEEKCCODEFN 26564 . 27840) (\UTF16LE.BACKCCODEFN 27842 . +29030)) (29033 32080 (READBOM 29043 . 31112) (WRITEBOM 31114 . 32078)) (32110 35675 ( +MAKE-UNICODE-FORMATS 32120 . 35673)) (35772 40266 (UTF8.BINCODE 35782 . 38470) (\UTF8.FETCHCODE 38472 + . 40264)) (40267 45894 (UTF8.VALIDATE 40277 . 42874) (NUTF8-BYTE1-BYTES 42876 . 43613) ( +NUTF8-CODE-BYTES 43615 . 44672) (NUTF8-STRING-BYTES 44674 . 45570) (N-MCHARS 45572 . 45892)) (47622 +56491 (MTOUCODE 47632 . 48019) (UTOMCODE 48021 . 48411) (MTOUCODE? 48413 . 49446) (UTOMCODE? 49448 . +50412) (MTOUSTRING 50414 . 50999) (UTOMSTRING 51001 . 51586) (MTOUTF8STRING 51588 . 55594) ( +UTF8TOMSTRING 55596 . 56489)) (56492 62194 (XTOUCODE 56502 . 57020) (UTOXCODE 57022 . 57530) ( +XTOUCODE? 57532 . 58593) (UTOXCODE? 58595 . 59678) (XTOUSTRING 59680 . 60373) (UTOXSTRING 60375 . +61116) (XTOUTF8STRING 61118 . 62192)) (63431 71727 (READ-UNICODE-MAPPING-FILENAMES 63441 . 67238) ( +READ-UNICODE-MAPPING 67240 . 71725)) (71794 84136 (MAKE-UNICODE-TRANSLATION-TABLES 71804 . 75114) ( +MERGE-UNICODE-TRANSLATION-TABLES 75116 . 77660) (UNICODE.UNMAPPED 77662 . 80986) ( +UNICODE-EXTEND-TRANSLATION? 80988 . 84134)) (84137 90973 (ALL-UNICODE-MAPPINGS 84147 . 89636) ( +XCCSJAPANESECHARSETS 89638 . 90971)) (92564 103832 (WRITE-UNICODE-MAPPING 92574 . 96324) ( +WRITE-UNICODE-INCLUDED 96326 . 101048) (WRITE-UNICODE-MAPPING-HEADER 101050 . 102298) ( +WRITE-UNICODE-MAPPING-FILENAME 102300 . 103830)) (103833 104509 (XCCS-UTF8-AFTER-OPEN 103843 . 104507) +) (107034 109251 (UTF8HEXSTRING 107044 . 109249)) (109278 111320 (SHOWCHARS 109288 . 111318))))) STOP diff --git a/library/UNICODE.LCOM b/library/UNICODE.LCOM index c9729778b2089dba3498b0258dc44b0abc8b3723..ed84d6ea58b1b14e1673309ba1bee564c559d548 100644 GIT binary patch delta 524 zcmZut%Sr=55H#_kf+7lv2cZ}c4VajoosGK-9@gDS46K>BI~uQ|IYeV3>cNwKKtPoJ z4lf455Ac8d01=!7pWs}&i=M8kuJ>N{xtG1$pSAPq@G{Sf+yt(=2bkL6xf?I!uqkfc0Q>Q82! zn}^19dfk4x5dRA^!cgg78QMVeS9Qv7q${F69@#4VB1xFl}J5yX0^wr}oQ% zIpbXrk0^+`+{Dr3)8TAB-Jk4Y@_BxAycwae2g%#GtT0e=qSGLzij=Q z8b9mbdoMN~KG5Ux_0Ho3xY${*!~L66$Ac2(u*|@@2R#?05ku2ZoaiNRavE0jMNbwA zoVif(8&K#jw^I-xkwp?KP~bo&D$bWJk{ABRX;q8dcenQBbWsVV