diff --git a/.gitignore b/.gitignore index 9d7492cd..4d31807c 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,9 @@ loadups/build/ loadups/tagged loadups/gitinfo +# font-importing working directories +internal/fonts/** + # manual cross-reference files @@ -43,6 +46,12 @@ loadups/gitinfo *.sysout *.SYSOUT +# GITFNS deleted subdirectory +deleted/** + +# local font construction +internal/fonts/** + #compiled code -- leave in for now # *.lcom diff --git a/CLTL2/.skip b/CLTL2/.skip new file mode 100644 index 00000000..e69de29b diff --git a/docs/dinfo/.skip b/docs/dinfo/.skip new file mode 100644 index 00000000..e69de29b diff --git a/docs/internal/FONTCODECHANGES.tedit b/docs/internal/FONTCODECHANGES.tedit index b551332e..fefa7ddc 100644 Binary files a/docs/internal/FONTCODECHANGES.tedit and b/docs/internal/FONTCODECHANGES.tedit differ diff --git a/docs/internal/MCCS.TEDIT b/docs/internal/MCCS.TEDIT index 60c35031..f0568196 100644 Binary files a/docs/internal/MCCS.TEDIT and b/docs/internal/MCCS.TEDIT differ diff --git a/docs/internal/MEDLEYFONTFORMAT.TEDIT b/docs/internal/MEDLEYFONTFORMAT.TEDIT index 5862edc9..7d0a35e0 100644 Binary files a/docs/internal/MEDLEYFONTFORMAT.TEDIT and b/docs/internal/MEDLEYFONTFORMAT.TEDIT differ diff --git a/doctools/IMNAME.TEDIT b/doctools/IMNAME.TXT similarity index 100% rename from doctools/IMNAME.TEDIT rename to doctools/IMNAME.TXT diff --git a/fonts/medleydisplayfonts/AMTEX10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/AMTEX10-MRR.MEDLEYDISPLAYFONT index 7e097410..29fac787 100644 Binary files a/fonts/medleydisplayfonts/AMTEX10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/AMTEX10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/APL14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/APL14-MRR.MEDLEYDISPLAYFONT index bf0ff5ca..f97890b2 100644 Binary files a/fonts/medleydisplayfonts/APL14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/APL14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/ARROWS10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/ARROWS10-MRR.MEDLEYDISPLAYFONT index ad3c04a9..5e1beeee 100644 Binary files a/fonts/medleydisplayfonts/ARROWS10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/ARROWS10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/ARROWSTWO10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/ARROWSTWO10-MRR.MEDLEYDISPLAYFONT index 9a675e6e..e3651170 100644 Binary files a/fonts/medleydisplayfonts/ARROWSTWO10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/ARROWSTWO10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/ASTERISK10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/ASTERISK10-MRR.MEDLEYDISPLAYFONT index 4e42bf3e..6cdbed7e 100644 Binary files a/fonts/medleydisplayfonts/ASTERISK10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/ASTERISK10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/BLOCKFONT10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/BLOCKFONT10-MRR.MEDLEYDISPLAYFONT index c7d70781..33f60077 100644 Binary files a/fonts/medleydisplayfonts/BLOCKFONT10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/BLOCKFONT10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/BOLDPS10-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/BOLDPS10-BIR.MEDLEYDISPLAYFONT index 0ddaa3e2..5d6749ff 100644 Binary files a/fonts/medleydisplayfonts/BOLDPS10-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/BOLDPS10-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/BOLDPS10-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/BOLDPS10-BRR.MEDLEYDISPLAYFONT index 686ab999..34408957 100644 Binary files a/fonts/medleydisplayfonts/BOLDPS10-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/BOLDPS10-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/BOLDPS10-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/BOLDPS10-MIR.MEDLEYDISPLAYFONT index 937e5ec9..9a59f476 100644 Binary files a/fonts/medleydisplayfonts/BOLDPS10-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/BOLDPS10-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/BOLDPS10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/BOLDPS10-MRR.MEDLEYDISPLAYFONT index f66b84d2..b4bb5110 100644 Binary files a/fonts/medleydisplayfonts/BOLDPS10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/BOLDPS10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/BRAVOX12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/BRAVOX12-MRR.MEDLEYDISPLAYFONT index 3f42b67a..ac1432e4 100644 Binary files a/fonts/medleydisplayfonts/BRAVOX12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/BRAVOX12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CARDSTWO12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CARDSTWO12-MRR.MEDLEYDISPLAYFONT index c77aec9a..428d4c7f 100644 Binary files a/fonts/medleydisplayfonts/CARDSTWO12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CARDSTWO12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CARDSZERO12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CARDSZERO12-MRR.MEDLEYDISPLAYFONT index 6d2afa99..2b005161 100644 Binary files a/fonts/medleydisplayfonts/CARDSZERO12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CARDSZERO12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CHINESE12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CHINESE12-MRR.MEDLEYDISPLAYFONT index 13d8deb3..062e37b7 100644 Binary files a/fonts/medleydisplayfonts/CHINESE12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CHINESE12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLARITY12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLARITY12-MRR.MEDLEYDISPLAYFONT index 69e2f79a..3533e867 100644 Binary files a/fonts/medleydisplayfonts/CLARITY12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLARITY12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLARITY14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLARITY14-MRR.MEDLEYDISPLAYFONT index 6910398c..f00d0db9 100644 Binary files a/fonts/medleydisplayfonts/CLARITY14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLARITY14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC06-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC06-BRR.MEDLEYDISPLAYFONT index e1fd46a5..cba3d531 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC06-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC06-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC06-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC06-MIR.MEDLEYDISPLAYFONT index d7899b11..4645dc51 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC06-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC06-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC06-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC06-MRR.MEDLEYDISPLAYFONT index 935417cf..e81035b2 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC06-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC06-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC08-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC08-BRR.MEDLEYDISPLAYFONT index b6cb0eb9..c318f8b7 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC08-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC08-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC08-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC08-MIR.MEDLEYDISPLAYFONT index 91cbdf1a..03461db2 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC08-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC08-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC08-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC08-MRR.MEDLEYDISPLAYFONT index f1c486a5..c623c4f6 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC08-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC08-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC10-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC10-BRR.MEDLEYDISPLAYFONT index 69071ab5..1e191280 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC10-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC10-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC10-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC10-MIR.MEDLEYDISPLAYFONT index ab4b66c0..5d0ecf2c 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC10-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC10-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC10-MRR.MEDLEYDISPLAYFONT index b73e8f8f..4a4de2a7 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC12-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC12-BRR.MEDLEYDISPLAYFONT index bfae6477..01356b28 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC12-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC12-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC12-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC12-MIR.MEDLEYDISPLAYFONT index 7582fcfe..1e1294f6 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC12-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC12-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC12-MRR.MEDLEYDISPLAYFONT index 7a6c26c5..618f6910 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC14-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC14-BRR.MEDLEYDISPLAYFONT index 5a9f8db1..00a88410 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC14-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC14-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC14-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC14-MIR.MEDLEYDISPLAYFONT index 5bab2758..9b791696 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC14-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC14-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC14-MRR.MEDLEYDISPLAYFONT index 602378a4..13ef5bb5 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC18-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC18-BRR.MEDLEYDISPLAYFONT index 05f0cb03..fe9125ad 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC18-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC18-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC18-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC18-MIR.MEDLEYDISPLAYFONT index f57be8b7..8848c29c 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC18-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC18-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC18-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC18-MRR.MEDLEYDISPLAYFONT index bef29c47..a21ca793 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC18-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC18-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC24-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC24-BRR.MEDLEYDISPLAYFONT index b39546e0..7e0107b4 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC24-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC24-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC24-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC24-MIR.MEDLEYDISPLAYFONT index 38fa036e..53944a3b 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC24-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC24-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC24-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC24-MRR.MEDLEYDISPLAYFONT index d0adb6e8..0ff3544d 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC24-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC24-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC48-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC48-BRR.MEDLEYDISPLAYFONT index 2fc103e5..cc2a960c 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC48-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC48-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC48-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC48-MIR.MEDLEYDISPLAYFONT index 84d2f90b..2d4b8aaf 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC48-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC48-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC48-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC48-MRR.MEDLEYDISPLAYFONT index ea61ba75..6fcf22dc 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC48-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC48-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC72-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC72-BRR.MEDLEYDISPLAYFONT index 657c1a6a..20bb6ef1 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC72-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC72-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC72-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC72-MIR.MEDLEYDISPLAYFONT index ae19e6c5..5864e3e9 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC72-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC72-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSIC72-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSIC72-MRR.MEDLEYDISPLAYFONT index 1780022d..1b32d1e0 100644 Binary files a/fonts/medleydisplayfonts/CLASSIC72-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSIC72-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSICPIONE08-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSICPIONE08-MRR.MEDLEYDISPLAYFONT index 2a26521f..61541677 100644 Binary files a/fonts/medleydisplayfonts/CLASSICPIONE08-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSICPIONE08-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSICPIONE10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSICPIONE10-MRR.MEDLEYDISPLAYFONT index 6dcb0f0b..61ecf472 100644 Binary files a/fonts/medleydisplayfonts/CLASSICPIONE10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSICPIONE10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSICPIONE12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSICPIONE12-MRR.MEDLEYDISPLAYFONT index 22381a5b..d15d5f41 100644 Binary files a/fonts/medleydisplayfonts/CLASSICPIONE12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSICPIONE12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSICPIONE14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSICPIONE14-MRR.MEDLEYDISPLAYFONT index 0155a1f6..7ef2bd8c 100644 Binary files a/fonts/medleydisplayfonts/CLASSICPIONE14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSICPIONE14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSICTHIN16-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSICTHIN16-BRR.MEDLEYDISPLAYFONT index 31273373..74654bf3 100644 Binary files a/fonts/medleydisplayfonts/CLASSICTHIN16-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSICTHIN16-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSICTHIN16-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSICTHIN16-MRR.MEDLEYDISPLAYFONT index 65323aff..30c52112 100644 Binary files a/fonts/medleydisplayfonts/CLASSICTHIN16-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSICTHIN16-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSICTHIN20-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSICTHIN20-BRR.MEDLEYDISPLAYFONT index 76bba70a..2209c15d 100644 Binary files a/fonts/medleydisplayfonts/CLASSICTHIN20-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSICTHIN20-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSICTHIN20-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSICTHIN20-MRR.MEDLEYDISPLAYFONT index d30310da..1f4f3d01 100644 Binary files a/fonts/medleydisplayfonts/CLASSICTHIN20-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSICTHIN20-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSICTHIN26-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSICTHIN26-BRR.MEDLEYDISPLAYFONT index 6a074ab1..31df1b2a 100644 Binary files a/fonts/medleydisplayfonts/CLASSICTHIN26-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSICTHIN26-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSICTHIN26-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSICTHIN26-MRR.MEDLEYDISPLAYFONT index 595cd1b6..e7eaeff7 100644 Binary files a/fonts/medleydisplayfonts/CLASSICTHIN26-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSICTHIN26-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSICTHIN30-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSICTHIN30-BRR.MEDLEYDISPLAYFONT index c5fb32ea..ce0cb4fd 100644 Binary files a/fonts/medleydisplayfonts/CLASSICTHIN30-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSICTHIN30-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CLASSICTHIN30-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CLASSICTHIN30-MRR.MEDLEYDISPLAYFONT index 2f3e4e30..b01cebd5 100644 Binary files a/fonts/medleydisplayfonts/CLASSICTHIN30-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CLASSICTHIN30-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CREAM10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CREAM10-MRR.MEDLEYDISPLAYFONT index 3113db1a..e93572bd 100644 Binary files a/fonts/medleydisplayfonts/CREAM10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CREAM10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CREAM12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CREAM12-MRR.MEDLEYDISPLAYFONT index c3842790..7ef7b50e 100644 Binary files a/fonts/medleydisplayfonts/CREAM12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CREAM12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CYRILLIC10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CYRILLIC10-MRR.MEDLEYDISPLAYFONT index 2f109992..4c164d88 100644 Binary files a/fonts/medleydisplayfonts/CYRILLIC10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CYRILLIC10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/CYRILLIC12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/CYRILLIC12-MRR.MEDLEYDISPLAYFONT index 6a294d9b..d6705f72 100644 Binary files a/fonts/medleydisplayfonts/CYRILLIC12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/CYRILLIC12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/DANATEN10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/DANATEN10-MRR.MEDLEYDISPLAYFONT index 63d5a043..1ce0fe4c 100644 Binary files a/fonts/medleydisplayfonts/DANATEN10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/DANATEN10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/DANATWELVE12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/DANATWELVE12-MRR.MEDLEYDISPLAYFONT index 941c2342..a215cafa 100644 Binary files a/fonts/medleydisplayfonts/DANATWELVE12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/DANATWELVE12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/DANATWELVE14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/DANATWELVE14-MRR.MEDLEYDISPLAYFONT index ec96a35a..24d1f394 100644 Binary files a/fonts/medleydisplayfonts/DANATWELVE14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/DANATWELVE14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/DANCER10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/DANCER10-MRR.MEDLEYDISPLAYFONT index 54766a90..18c26eeb 100644 Binary files a/fonts/medleydisplayfonts/DANCER10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/DANCER10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/DANCER12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/DANCER12-MRR.MEDLEYDISPLAYFONT index fb79d651..2df453d0 100644 Binary files a/fonts/medleydisplayfonts/DANCER12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/DANCER12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/ELITE10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/ELITE10-MRR.MEDLEYDISPLAYFONT index 009c0b89..02057418 100644 Binary files a/fonts/medleydisplayfonts/ELITE10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/ELITE10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/GACHA08-MRC.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/GACHA08-MRC.MEDLEYDISPLAYFONT index cfe6f2ae..2525767c 100644 Binary files a/fonts/medleydisplayfonts/GACHA08-MRC.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/GACHA08-MRC.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/GACHA08-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/GACHA08-MRR.MEDLEYDISPLAYFONT index a02573ed..2ecfe75d 100644 Binary files a/fonts/medleydisplayfonts/GACHA08-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/GACHA08-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/GACHA10-MRC.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/GACHA10-MRC.MEDLEYDISPLAYFONT index 65b5386e..cfcadc0f 100644 Binary files a/fonts/medleydisplayfonts/GACHA10-MRC.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/GACHA10-MRC.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/GACHA10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/GACHA10-MRR.MEDLEYDISPLAYFONT index 6cfa533f..a54cba0c 100644 Binary files a/fonts/medleydisplayfonts/GACHA10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/GACHA10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/GACHA12-MRC.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/GACHA12-MRC.MEDLEYDISPLAYFONT index c264951c..d8327fd1 100644 Binary files a/fonts/medleydisplayfonts/GACHA12-MRC.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/GACHA12-MRC.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/GACHA12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/GACHA12-MRR.MEDLEYDISPLAYFONT index b38ff0cc..59ca3a1d 100644 Binary files a/fonts/medleydisplayfonts/GACHA12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/GACHA12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/GATES10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/GATES10-MRR.MEDLEYDISPLAYFONT index 4bf1da56..a54dd837 100644 Binary files a/fonts/medleydisplayfonts/GATES10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/GATES10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/GATES32-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/GATES32-MRR.MEDLEYDISPLAYFONT index 85824628..6a7097fd 100644 Binary files a/fonts/medleydisplayfonts/GATES32-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/GATES32-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA03-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA03-MRR.MEDLEYDISPLAYFONT index 86700494..da0d5327 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA03-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA03-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA04-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA04-MRR.MEDLEYDISPLAYFONT index 0eba79fa..7bda9ca6 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA04-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA04-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA05-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA05-MRR.MEDLEYDISPLAYFONT index 100e6705..6aa2868e 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA05-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA05-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA07-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA07-MIR.MEDLEYDISPLAYFONT index 09380969..b28feedd 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA07-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA07-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA07-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA07-MRR.MEDLEYDISPLAYFONT index e142a0ff..3eb1351d 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA07-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA07-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA08-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA08-BRR.MEDLEYDISPLAYFONT index 35352708..52474303 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA08-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA08-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA08-MRC.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA08-MRC.MEDLEYDISPLAYFONT index 582b838e..117c5a2a 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA08-MRC.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA08-MRC.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA08-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA08-MRR.MEDLEYDISPLAYFONT index 757c9677..f5c76540 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA08-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA08-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA09-MRC.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA09-MRC.MEDLEYDISPLAYFONT index 28b59dd9..c79f1645 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA09-MRC.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA09-MRC.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA09-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA09-MRR.MEDLEYDISPLAYFONT index 3150b898..16680330 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA09-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA09-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA10-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA10-BRR.MEDLEYDISPLAYFONT index 84e45f41..dc077048 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA10-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA10-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA10-MRC.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA10-MRC.MEDLEYDISPLAYFONT index ba3894c8..108d601c 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA10-MRC.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA10-MRC.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA10-MRR.MEDLEYDISPLAYFONT index eddb73c2..e25587ed 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA11-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA11-MRR.MEDLEYDISPLAYFONT index 997d07fa..958193f2 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA11-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA11-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA12-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA12-BRR.MEDLEYDISPLAYFONT index da96ebb3..fefcb78e 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA12-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA12-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA12-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA12-MIR.MEDLEYDISPLAYFONT index 6aa28f62..2e9447a2 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA12-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA12-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA12-MRC.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA12-MRC.MEDLEYDISPLAYFONT index 4a8b3e8f..f9da7c09 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA12-MRC.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA12-MRC.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA12-MRR.MEDLEYDISPLAYFONT index 209e302f..00c2a345 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA13-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA13-MRR.MEDLEYDISPLAYFONT index 0c1e1b21..d3f62062 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA13-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA13-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA14-MRC.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA14-MRC.MEDLEYDISPLAYFONT index 6cc841cc..0d4a2fb3 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA14-MRC.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA14-MRC.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA14-MRR.MEDLEYDISPLAYFONT index 6c765132..ef9720d2 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA16-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA16-MRR.MEDLEYDISPLAYFONT index fcd6f98a..8c195fd1 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA16-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA16-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA18-BRC.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA18-BRC.MEDLEYDISPLAYFONT index 3d805194..ecad4861 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA18-BRC.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA18-BRC.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA18-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA18-BRR.MEDLEYDISPLAYFONT new file mode 100644 index 00000000..08ae605c Binary files /dev/null and b/fonts/medleydisplayfonts/HELVETICA18-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA18-LRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA18-LRR.MEDLEYDISPLAYFONT index 92c61f01..e129c8c2 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA18-LRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA18-LRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA18-MRC.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA18-MRC.MEDLEYDISPLAYFONT index 57e14507..fd525dba 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA18-MRC.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA18-MRC.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA18-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA18-MRR.MEDLEYDISPLAYFONT index ef591039..df14c505 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA18-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA18-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA24-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA24-MRR.MEDLEYDISPLAYFONT index e360e8dc..9baf3c8d 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA24-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA24-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA30-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA30-MRR.MEDLEYDISPLAYFONT index dedb5a78..f1f80a75 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA30-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA30-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA32-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA32-MRR.MEDLEYDISPLAYFONT index 0ae39c69..e4e3fc92 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA32-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA32-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICA36-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICA36-MRR.MEDLEYDISPLAYFONT index 370f5e1a..ed64bc23 100644 Binary files a/fonts/medleydisplayfonts/HELVETICA36-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICA36-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HELVETICAD24-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HELVETICAD24-MRR.MEDLEYDISPLAYFONT index b39098e9..564949e6 100644 Binary files a/fonts/medleydisplayfonts/HELVETICAD24-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HELVETICAD24-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HIPPO08-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HIPPO08-MRR.MEDLEYDISPLAYFONT index 3677b2f4..b4a7eea0 100644 Binary files a/fonts/medleydisplayfonts/HIPPO08-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HIPPO08-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HIPPO10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HIPPO10-MRR.MEDLEYDISPLAYFONT index 4395de50..5644fafd 100644 Binary files a/fonts/medleydisplayfonts/HIPPO10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HIPPO10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HIPPO12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HIPPO12-MRR.MEDLEYDISPLAYFONT index 5e951aa2..6c4a2276 100644 Binary files a/fonts/medleydisplayfonts/HIPPO12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HIPPO12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/HIPPO18-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/HIPPO18-MRR.MEDLEYDISPLAYFONT index b9066bc0..b309c5a5 100644 Binary files a/fonts/medleydisplayfonts/HIPPO18-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/HIPPO18-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/IBM-US14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/IBM-US14-MRR.MEDLEYDISPLAYFONT index d1806732..c254931e 100644 Binary files a/fonts/medleydisplayfonts/IBM-US14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/IBM-US14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/IBM-US16-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/IBM-US16-MRR.MEDLEYDISPLAYFONT index afee037a..08d3b01f 100644 Binary files a/fonts/medleydisplayfonts/IBM-US16-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/IBM-US16-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/IBM14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/IBM14-MRR.MEDLEYDISPLAYFONT index 5de7a734..6a280afa 100644 Binary files a/fonts/medleydisplayfonts/IBM14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/IBM14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/IBM16-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/IBM16-MRR.MEDLEYDISPLAYFONT index 14c2849d..ed5cd66b 100644 Binary files a/fonts/medleydisplayfonts/IBM16-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/IBM16-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/IBMREV14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/IBMREV14-MRR.MEDLEYDISPLAYFONT index 06dc993a..f53ec4f4 100644 Binary files a/fonts/medleydisplayfonts/IBMREV14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/IBMREV14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/IBMREV16-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/IBMREV16-MRR.MEDLEYDISPLAYFONT index ed130af7..89e59231 100644 Binary files a/fonts/medleydisplayfonts/IBMREV16-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/IBMREV16-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/LETTERGOTHIC10-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/LETTERGOTHIC10-BRR.MEDLEYDISPLAYFONT index 7a6d6017..0e721682 100644 Binary files a/fonts/medleydisplayfonts/LETTERGOTHIC10-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/LETTERGOTHIC10-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/LETTERGOTHIC10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/LETTERGOTHIC10-MRR.MEDLEYDISPLAYFONT index a09b820a..a38ab1e6 100644 Binary files a/fonts/medleydisplayfonts/LETTERGOTHIC10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/LETTERGOTHIC10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/LETTERGOTHIC12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/LETTERGOTHIC12-MRR.MEDLEYDISPLAYFONT index b07cff62..77c2aa02 100644 Binary files a/fonts/medleydisplayfonts/LETTERGOTHIC12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/LETTERGOTHIC12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/LOGO12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/LOGO12-MRR.MEDLEYDISPLAYFONT index 7635574d..d1b2e5b9 100644 Binary files a/fonts/medleydisplayfonts/LOGO12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/LOGO12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/LOGO14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/LOGO14-MRR.MEDLEYDISPLAYFONT index 12f0ebd3..5224bee9 100644 Binary files a/fonts/medleydisplayfonts/LOGO14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/LOGO14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/LOGO18-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/LOGO18-MRR.MEDLEYDISPLAYFONT index 174d6f8f..1a3f9333 100644 Binary files a/fonts/medleydisplayfonts/LOGO18-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/LOGO18-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/LOGO20-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/LOGO20-MRR.MEDLEYDISPLAYFONT index cf3abcdc..51674120 100644 Binary files a/fonts/medleydisplayfonts/LOGO20-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/LOGO20-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/LOGO24-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/LOGO24-MRR.MEDLEYDISPLAYFONT index eb3d292b..08d6ff51 100644 Binary files a/fonts/medleydisplayfonts/LOGO24-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/LOGO24-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/LOGO26-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/LOGO26-MRR.MEDLEYDISPLAYFONT index 00e8b68a..2c716040 100644 Binary files a/fonts/medleydisplayfonts/LOGO26-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/LOGO26-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MATH08-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MATH08-MRR.MEDLEYDISPLAYFONT index 4d38bf9b..2145cbb2 100644 Binary files a/fonts/medleydisplayfonts/MATH08-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MATH08-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MATH10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MATH10-MRR.MEDLEYDISPLAYFONT index f0da3b4c..5189c2b6 100644 Binary files a/fonts/medleydisplayfonts/MATH10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MATH10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MATH12-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MATH12-BRR.MEDLEYDISPLAYFONT index 76834e15..f6d371fa 100644 Binary files a/fonts/medleydisplayfonts/MATH12-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MATH12-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MATH12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MATH12-MRR.MEDLEYDISPLAYFONT index a3a3fe0a..3f9f66a6 100644 Binary files a/fonts/medleydisplayfonts/MATH12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MATH12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN06-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN06-BIR.MEDLEYDISPLAYFONT index 061e0acf..ee0bce61 100644 Binary files a/fonts/medleydisplayfonts/MODERN06-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN06-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN06-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN06-BRR.MEDLEYDISPLAYFONT index 68e33e30..f720fb0f 100644 Binary files a/fonts/medleydisplayfonts/MODERN06-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN06-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN06-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN06-MIR.MEDLEYDISPLAYFONT index 9b07379a..c29cd1e3 100644 Binary files a/fonts/medleydisplayfonts/MODERN06-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN06-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN06-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN06-MRR.MEDLEYDISPLAYFONT index a0ef4568..4f7ae150 100644 Binary files a/fonts/medleydisplayfonts/MODERN06-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN06-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN08-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN08-BIR.MEDLEYDISPLAYFONT index 434744e8..9bfb5d3b 100644 Binary files a/fonts/medleydisplayfonts/MODERN08-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN08-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN08-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN08-BRR.MEDLEYDISPLAYFONT index 06cc06f1..21569a28 100644 Binary files a/fonts/medleydisplayfonts/MODERN08-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN08-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN08-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN08-MIR.MEDLEYDISPLAYFONT index 3ece2bb8..1c98a8b4 100644 Binary files a/fonts/medleydisplayfonts/MODERN08-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN08-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN08-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN08-MRR.MEDLEYDISPLAYFONT index 4794c0d7..bb5ada93 100644 Binary files a/fonts/medleydisplayfonts/MODERN08-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN08-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN10-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN10-BIR.MEDLEYDISPLAYFONT index 1684628c..702c290c 100644 Binary files a/fonts/medleydisplayfonts/MODERN10-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN10-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN10-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN10-BRR.MEDLEYDISPLAYFONT index 85702654..03fbf37f 100644 Binary files a/fonts/medleydisplayfonts/MODERN10-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN10-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN10-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN10-MIR.MEDLEYDISPLAYFONT index 3514c1d1..5b9d3baf 100644 Binary files a/fonts/medleydisplayfonts/MODERN10-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN10-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN10-MRR.MEDLEYDISPLAYFONT index d7049b38..2a66a9bb 100644 Binary files a/fonts/medleydisplayfonts/MODERN10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN12-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN12-BIR.MEDLEYDISPLAYFONT index a203b4dc..788b1eec 100644 Binary files a/fonts/medleydisplayfonts/MODERN12-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN12-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN12-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN12-BRR.MEDLEYDISPLAYFONT index ec037e6a..5b663b84 100644 Binary files a/fonts/medleydisplayfonts/MODERN12-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN12-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN12-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN12-MIR.MEDLEYDISPLAYFONT index 2da2adec..1caf09bb 100644 Binary files a/fonts/medleydisplayfonts/MODERN12-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN12-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN12-MRR.MEDLEYDISPLAYFONT index 4024b5c7..e19ce4d1 100644 Binary files a/fonts/medleydisplayfonts/MODERN12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN14-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN14-BIR.MEDLEYDISPLAYFONT index acf6dfee..260e5bc2 100644 Binary files a/fonts/medleydisplayfonts/MODERN14-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN14-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN14-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN14-BRR.MEDLEYDISPLAYFONT index 31caeada..3f725940 100644 Binary files a/fonts/medleydisplayfonts/MODERN14-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN14-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN14-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN14-MIR.MEDLEYDISPLAYFONT index b6c03d6d..c8ae78b9 100644 Binary files a/fonts/medleydisplayfonts/MODERN14-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN14-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN14-MRR.MEDLEYDISPLAYFONT index 227a575a..ab3bfefe 100644 Binary files a/fonts/medleydisplayfonts/MODERN14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN18-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN18-BIR.MEDLEYDISPLAYFONT index 683a48a4..a47035ec 100644 Binary files a/fonts/medleydisplayfonts/MODERN18-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN18-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN18-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN18-BRR.MEDLEYDISPLAYFONT index 23247993..78ec0e18 100644 Binary files a/fonts/medleydisplayfonts/MODERN18-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN18-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN18-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN18-MIR.MEDLEYDISPLAYFONT index 7b3b444f..f5906daa 100644 Binary files a/fonts/medleydisplayfonts/MODERN18-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN18-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN18-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN18-MRR.MEDLEYDISPLAYFONT index 3297fff3..626a42b7 100644 Binary files a/fonts/medleydisplayfonts/MODERN18-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN18-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN24-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN24-BIR.MEDLEYDISPLAYFONT index 23bb4146..7a4afafb 100644 Binary files a/fonts/medleydisplayfonts/MODERN24-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN24-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN24-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN24-BRR.MEDLEYDISPLAYFONT index 14c5e271..a3446411 100644 Binary files a/fonts/medleydisplayfonts/MODERN24-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN24-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN24-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN24-MIR.MEDLEYDISPLAYFONT index 14f75684..5365620c 100644 Binary files a/fonts/medleydisplayfonts/MODERN24-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN24-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN24-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN24-MRR.MEDLEYDISPLAYFONT index 32cad1a9..4e91b535 100644 Binary files a/fonts/medleydisplayfonts/MODERN24-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN24-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN30-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN30-BIR.MEDLEYDISPLAYFONT index 17515bca..f4b0a7bd 100644 Binary files a/fonts/medleydisplayfonts/MODERN30-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN30-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN30-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN30-BRR.MEDLEYDISPLAYFONT index 3df06e8c..56d23f23 100644 Binary files a/fonts/medleydisplayfonts/MODERN30-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN30-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN30-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN30-MIR.MEDLEYDISPLAYFONT index fd8f923f..e36d05a4 100644 Binary files a/fonts/medleydisplayfonts/MODERN30-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN30-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN30-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN30-MRR.MEDLEYDISPLAYFONT index 32265288..67e01094 100644 Binary files a/fonts/medleydisplayfonts/MODERN30-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN30-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN36-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN36-BIR.MEDLEYDISPLAYFONT index 29bbf403..486af530 100644 Binary files a/fonts/medleydisplayfonts/MODERN36-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN36-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN36-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN36-BRR.MEDLEYDISPLAYFONT index fa6cdb7f..1db25d21 100644 Binary files a/fonts/medleydisplayfonts/MODERN36-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN36-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN36-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN36-MIR.MEDLEYDISPLAYFONT index eba69c23..bd91ad8c 100644 Binary files a/fonts/medleydisplayfonts/MODERN36-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN36-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN36-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN36-MRR.MEDLEYDISPLAYFONT index 4c227188..26f19daf 100644 Binary files a/fonts/medleydisplayfonts/MODERN36-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN36-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN48-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN48-BRR.MEDLEYDISPLAYFONT index 0fbf0029..f9bc3b70 100644 Binary files a/fonts/medleydisplayfonts/MODERN48-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN48-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN48-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN48-MIR.MEDLEYDISPLAYFONT index eb5237a8..1f2ae0be 100644 Binary files a/fonts/medleydisplayfonts/MODERN48-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN48-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN48-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN48-MRR.MEDLEYDISPLAYFONT index fe01c5c1..1548c041 100644 Binary files a/fonts/medleydisplayfonts/MODERN48-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN48-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN72-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN72-BIR.MEDLEYDISPLAYFONT index 6614fad9..cf0ad88d 100644 Binary files a/fonts/medleydisplayfonts/MODERN72-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN72-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN72-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN72-BRR.MEDLEYDISPLAYFONT index db20313d..7468c5c7 100644 Binary files a/fonts/medleydisplayfonts/MODERN72-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN72-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN72-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN72-MIR.MEDLEYDISPLAYFONT index 2ffbde84..f704b67c 100644 Binary files a/fonts/medleydisplayfonts/MODERN72-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN72-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MODERN72-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MODERN72-MRR.MEDLEYDISPLAYFONT index 30ce68e1..570e3222 100644 Binary files a/fonts/medleydisplayfonts/MODERN72-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MODERN72-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MUSIC08-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MUSIC08-MRR.MEDLEYDISPLAYFONT index 2081f3c9..6ee2cd11 100644 Binary files a/fonts/medleydisplayfonts/MUSIC08-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MUSIC08-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MUSIC09-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MUSIC09-MRR.MEDLEYDISPLAYFONT index 0d2092ee..7cc2765d 100644 Binary files a/fonts/medleydisplayfonts/MUSIC09-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MUSIC09-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MUSIC10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MUSIC10-MRR.MEDLEYDISPLAYFONT index e103896e..b5fa6cdf 100644 Binary files a/fonts/medleydisplayfonts/MUSIC10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MUSIC10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MUSIC12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MUSIC12-MRR.MEDLEYDISPLAYFONT index 4c5ce497..20a7f41a 100644 Binary files a/fonts/medleydisplayfonts/MUSIC12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MUSIC12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MUSIC14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MUSIC14-MRR.MEDLEYDISPLAYFONT index 02f2655c..21e5e085 100644 Binary files a/fonts/medleydisplayfonts/MUSIC14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MUSIC14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/MUSICFONT10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/MUSICFONT10-MRR.MEDLEYDISPLAYFONT index 89143a4b..ef404596 100644 Binary files a/fonts/medleydisplayfonts/MUSICFONT10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/MUSICFONT10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OLDENGLISH10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OLDENGLISH10-MRR.MEDLEYDISPLAYFONT index 6d380404..a05ba1b8 100644 Binary files a/fonts/medleydisplayfonts/OLDENGLISH10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OLDENGLISH10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OLDENGLISH18-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OLDENGLISH18-MRR.MEDLEYDISPLAYFONT index 976e8574..6cee6dbf 100644 Binary files a/fonts/medleydisplayfonts/OLDENGLISH18-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OLDENGLISH18-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA06-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA06-BIR.MEDLEYDISPLAYFONT index 371aa640..0e61adbb 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA06-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA06-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA06-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA06-BRR.MEDLEYDISPLAYFONT index 109dc7a2..f09b841c 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA06-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA06-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA06-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA06-MIR.MEDLEYDISPLAYFONT index bac61e3b..c525e384 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA06-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA06-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA06-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA06-MRR.MEDLEYDISPLAYFONT index 62ce7106..9265692a 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA06-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA06-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA07-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA07-BIR.MEDLEYDISPLAYFONT index 5dce481b..4debef3f 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA07-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA07-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA07-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA07-BRR.MEDLEYDISPLAYFONT index 2da9f706..187c1cd5 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA07-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA07-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA07-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA07-MIR.MEDLEYDISPLAYFONT index cdb26c38..83c5d748 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA07-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA07-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA07-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA07-MRR.MEDLEYDISPLAYFONT index 9e2be3b3..524135a8 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA07-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA07-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA08-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA08-BIR.MEDLEYDISPLAYFONT index f2595ad4..9642a7db 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA08-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA08-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA08-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA08-BRR.MEDLEYDISPLAYFONT index ca7bbf79..16e25c5b 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA08-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA08-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA08-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA08-MIR.MEDLEYDISPLAYFONT index 72649022..ae06799a 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA08-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA08-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA08-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA08-MRR.MEDLEYDISPLAYFONT index 6ccaaa1b..48d3931d 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA08-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA08-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA09-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA09-BIR.MEDLEYDISPLAYFONT index 879d8f98..f3de6e8b 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA09-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA09-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA09-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA09-BRR.MEDLEYDISPLAYFONT index e40b3317..02301193 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA09-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA09-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA09-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA09-MIR.MEDLEYDISPLAYFONT index 668b67ed..4e5e0659 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA09-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA09-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA09-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA09-MRR.MEDLEYDISPLAYFONT index 8a37a21e..f498a53a 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA09-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA09-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA10-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA10-BIR.MEDLEYDISPLAYFONT index 813319ef..7d6db09e 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA10-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA10-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA10-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA10-BRR.MEDLEYDISPLAYFONT index 5344b462..48206af1 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA10-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA10-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA10-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA10-MIR.MEDLEYDISPLAYFONT index 35cc9938..69a3b0cb 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA10-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA10-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA10-MRR.MEDLEYDISPLAYFONT index 7bd96de2..bc88af66 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA11-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA11-BIR.MEDLEYDISPLAYFONT index 55557aba..be9eb6cb 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA11-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA11-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA11-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA11-BRR.MEDLEYDISPLAYFONT index 52e9d680..92e34ab9 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA11-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA11-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA11-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA11-MIR.MEDLEYDISPLAYFONT index c29eb4b2..60e85e57 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA11-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA11-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA11-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA11-MRR.MEDLEYDISPLAYFONT index 2e38763b..359bec45 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA11-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA11-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA12-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA12-BIR.MEDLEYDISPLAYFONT index 6a821f07..9e8220d6 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA12-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA12-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA12-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA12-BRR.MEDLEYDISPLAYFONT index 057ef5a4..02a98454 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA12-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA12-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA12-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA12-MIR.MEDLEYDISPLAYFONT index 0bf77789..4067aaed 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA12-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA12-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA12-MRR.MEDLEYDISPLAYFONT index 4333fee4..32894128 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA14-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA14-BIR.MEDLEYDISPLAYFONT index 982cf494..9c0ceb6c 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA14-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA14-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA14-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA14-BRR.MEDLEYDISPLAYFONT index b7dd890c..d438f962 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA14-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA14-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA14-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA14-MIR.MEDLEYDISPLAYFONT index 83c96acf..6bcb0d87 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA14-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA14-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA14-MRR.MEDLEYDISPLAYFONT index 75fc5dcd..db45bbf5 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA18-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA18-BIR.MEDLEYDISPLAYFONT index 738b4062..fbe52278 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA18-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA18-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA18-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA18-BRR.MEDLEYDISPLAYFONT index a4c0a42a..9efa309b 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA18-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA18-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA18-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA18-MIR.MEDLEYDISPLAYFONT index 44d84023..540ede91 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA18-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA18-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA18-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA18-MRR.MEDLEYDISPLAYFONT index 68a8ddfe..3113d84a 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA18-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA18-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA24-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA24-BIR.MEDLEYDISPLAYFONT index 58bdacf3..1ffd4e71 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA24-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA24-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA24-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA24-BRR.MEDLEYDISPLAYFONT index 5e16f67a..47a91ae5 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA24-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA24-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA24-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA24-MIR.MEDLEYDISPLAYFONT index 2c97f591..b446d462 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA24-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA24-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/OPTIMA24-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/OPTIMA24-MRR.MEDLEYDISPLAYFONT index 08cf7bf5..42216f28 100644 Binary files a/fonts/medleydisplayfonts/OPTIMA24-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/OPTIMA24-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO10-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO10-BIR.MEDLEYDISPLAYFONT index bcb48dfa..5765c14c 100644 Binary files a/fonts/medleydisplayfonts/PALATINO10-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO10-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO10-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO10-BRR.MEDLEYDISPLAYFONT index bba53d34..63005c6e 100644 Binary files a/fonts/medleydisplayfonts/PALATINO10-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO10-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO10-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO10-MIR.MEDLEYDISPLAYFONT index 565b4ca5..9b2c8015 100644 Binary files a/fonts/medleydisplayfonts/PALATINO10-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO10-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO10-MRR.MEDLEYDISPLAYFONT index 112fda5b..e97bf08c 100644 Binary files a/fonts/medleydisplayfonts/PALATINO10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO12-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO12-BIR.MEDLEYDISPLAYFONT index 2791a46e..c9cc18a7 100644 Binary files a/fonts/medleydisplayfonts/PALATINO12-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO12-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO12-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO12-BRR.MEDLEYDISPLAYFONT index 4161e3cc..df0e8133 100644 Binary files a/fonts/medleydisplayfonts/PALATINO12-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO12-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO12-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO12-MIR.MEDLEYDISPLAYFONT index 7882febd..78f65780 100644 Binary files a/fonts/medleydisplayfonts/PALATINO12-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO12-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO12-MRR.MEDLEYDISPLAYFONT index bdc564a5..c49f6666 100644 Binary files a/fonts/medleydisplayfonts/PALATINO12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO14-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO14-BIR.MEDLEYDISPLAYFONT index 140cd7f3..0e3a4476 100644 Binary files a/fonts/medleydisplayfonts/PALATINO14-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO14-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO14-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO14-BRR.MEDLEYDISPLAYFONT index 5b3c4b28..a6ba92f7 100644 Binary files a/fonts/medleydisplayfonts/PALATINO14-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO14-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO14-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO14-MIR.MEDLEYDISPLAYFONT index 9e92e11b..79d844a7 100644 Binary files a/fonts/medleydisplayfonts/PALATINO14-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO14-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO14-MRR.MEDLEYDISPLAYFONT index 54939d69..b0ad0a36 100644 Binary files a/fonts/medleydisplayfonts/PALATINO14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO18-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO18-BIR.MEDLEYDISPLAYFONT index bd5bb2df..eaa7c45d 100644 Binary files a/fonts/medleydisplayfonts/PALATINO18-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO18-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO18-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO18-BRR.MEDLEYDISPLAYFONT index 2a34f2dc..adbc9378 100644 Binary files a/fonts/medleydisplayfonts/PALATINO18-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO18-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO18-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO18-MIR.MEDLEYDISPLAYFONT index 80fa3524..eeac5dcc 100644 Binary files a/fonts/medleydisplayfonts/PALATINO18-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO18-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO18-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO18-MRR.MEDLEYDISPLAYFONT index fc7ef985..7c5d8155 100644 Binary files a/fonts/medleydisplayfonts/PALATINO18-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO18-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO24-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO24-BIR.MEDLEYDISPLAYFONT index b32bc387..8ebbbed5 100644 Binary files a/fonts/medleydisplayfonts/PALATINO24-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO24-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO24-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO24-BRR.MEDLEYDISPLAYFONT index b6a02188..004e3f0b 100644 Binary files a/fonts/medleydisplayfonts/PALATINO24-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO24-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO24-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO24-MIR.MEDLEYDISPLAYFONT index 5a5a47dc..5adf6485 100644 Binary files a/fonts/medleydisplayfonts/PALATINO24-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO24-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PALATINO24-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PALATINO24-MRR.MEDLEYDISPLAYFONT index 80811492..262ee029 100644 Binary files a/fonts/medleydisplayfonts/PALATINO24-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PALATINO24-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PCTERMINAL12-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PCTERMINAL12-BRR.MEDLEYDISPLAYFONT index 4e2a59e8..34f4b64d 100644 Binary files a/fonts/medleydisplayfonts/PCTERMINAL12-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PCTERMINAL12-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PCTERMINAL12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PCTERMINAL12-MRR.MEDLEYDISPLAYFONT index d8949ed2..665b18b1 100644 Binary files a/fonts/medleydisplayfonts/PCTERMINAL12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PCTERMINAL12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PCTERMINAL14-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PCTERMINAL14-BRR.MEDLEYDISPLAYFONT index e7b786cb..49e38622 100644 Binary files a/fonts/medleydisplayfonts/PCTERMINAL14-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PCTERMINAL14-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PCTERMINAL14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PCTERMINAL14-MRR.MEDLEYDISPLAYFONT index e252c0a7..a48d162a 100644 Binary files a/fonts/medleydisplayfonts/PCTERMINAL14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PCTERMINAL14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/PHONETICTR12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/PHONETICTR12-MRR.MEDLEYDISPLAYFONT index e3c75b95..97c0f8ff 100644 Binary files a/fonts/medleydisplayfonts/PHONETICTR12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/PHONETICTR12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/ROMANPS10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/ROMANPS10-MRR.MEDLEYDISPLAYFONT index 9f3a1c33..7a27b845 100644 Binary files a/fonts/medleydisplayfonts/ROMANPS10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/ROMANPS10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/ROMANPS12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/ROMANPS12-MRR.MEDLEYDISPLAYFONT index f65434d8..615b2138 100644 Binary files a/fonts/medleydisplayfonts/ROMANPS12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/ROMANPS12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/SAIL10-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/SAIL10-BRR.MEDLEYDISPLAYFONT index 7fc4a650..d4751fde 100644 Binary files a/fonts/medleydisplayfonts/SAIL10-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/SAIL10-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/SAIL10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/SAIL10-MRR.MEDLEYDISPLAYFONT index 965f0fbb..f90d6679 100644 Binary files a/fonts/medleydisplayfonts/SAIL10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/SAIL10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/SAIL12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/SAIL12-MRR.MEDLEYDISPLAYFONT index b8cf422e..b71e7cb5 100644 Binary files a/fonts/medleydisplayfonts/SAIL12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/SAIL12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/SIGMA20-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/SIGMA20-MRR.MEDLEYDISPLAYFONT index 37e61038..24b45edc 100644 Binary files a/fonts/medleydisplayfonts/SIGMA20-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/SIGMA20-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/SMALLTALK10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/SMALLTALK10-MRR.MEDLEYDISPLAYFONT index 81116f3a..89e397c1 100644 Binary files a/fonts/medleydisplayfonts/SMALLTALK10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/SMALLTALK10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/SNAIL10-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/SNAIL10-BRR.MEDLEYDISPLAYFONT index 139ab7c0..9d1aae3e 100644 Binary files a/fonts/medleydisplayfonts/SNAIL10-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/SNAIL10-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/SNAIL10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/SNAIL10-MRR.MEDLEYDISPLAYFONT index 94621017..c81127cb 100644 Binary files a/fonts/medleydisplayfonts/SNAIL10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/SNAIL10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/SNAIL12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/SNAIL12-MRR.MEDLEYDISPLAYFONT index 76b36917..57c464cf 100644 Binary files a/fonts/medleydisplayfonts/SNAIL12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/SNAIL12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/SYMBOL10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/SYMBOL10-MRR.MEDLEYDISPLAYFONT index 3bb4f000..ae27b12f 100644 Binary files a/fonts/medleydisplayfonts/SYMBOL10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/SYMBOL10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TEMPLATE10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TEMPLATE10-MRR.MEDLEYDISPLAYFONT index 5fb575fb..fd12e988 100644 Binary files a/fonts/medleydisplayfonts/TEMPLATE10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TEMPLATE10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TEMPLATE64-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TEMPLATE64-MRR.MEDLEYDISPLAYFONT index f69385b5..e6c433b1 100644 Binary files a/fonts/medleydisplayfonts/TEMPLATE64-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TEMPLATE64-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TERMINAL06-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TERMINAL06-BRR.MEDLEYDISPLAYFONT index 361fd9be..32f3b861 100644 Binary files a/fonts/medleydisplayfonts/TERMINAL06-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TERMINAL06-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TERMINAL06-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TERMINAL06-MRR.MEDLEYDISPLAYFONT index 158a9589..41d627ef 100644 Binary files a/fonts/medleydisplayfonts/TERMINAL06-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TERMINAL06-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TERMINAL08-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TERMINAL08-BRR.MEDLEYDISPLAYFONT index 0eb8291e..f6c771fe 100644 Binary files a/fonts/medleydisplayfonts/TERMINAL08-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TERMINAL08-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TERMINAL08-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TERMINAL08-MRR.MEDLEYDISPLAYFONT index da159397..5b7b9df4 100644 Binary files a/fonts/medleydisplayfonts/TERMINAL08-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TERMINAL08-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TERMINAL10-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TERMINAL10-BRR.MEDLEYDISPLAYFONT index 804d9253..8f12eabe 100644 Binary files a/fonts/medleydisplayfonts/TERMINAL10-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TERMINAL10-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TERMINAL10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TERMINAL10-MRR.MEDLEYDISPLAYFONT index 44ce64f4..591165e2 100644 Binary files a/fonts/medleydisplayfonts/TERMINAL10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TERMINAL10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TERMINAL12-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TERMINAL12-BRR.MEDLEYDISPLAYFONT index a8838eb5..1045cacf 100644 Binary files a/fonts/medleydisplayfonts/TERMINAL12-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TERMINAL12-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TERMINAL12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TERMINAL12-MRR.MEDLEYDISPLAYFONT index 1433f6d4..e2707bd2 100644 Binary files a/fonts/medleydisplayfonts/TERMINAL12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TERMINAL12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TESTFONT12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TESTFONT12-MRR.MEDLEYDISPLAYFONT index 906f6164..1f22e1c0 100644 Binary files a/fonts/medleydisplayfonts/TESTFONT12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TESTFONT12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN06-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN06-MRR.MEDLEYDISPLAYFONT index c0f9260e..49bcae8c 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN06-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN06-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN08-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN08-BRR.MEDLEYDISPLAYFONT index 56621117..2d63bf20 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN08-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN08-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN08-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN08-MIR.MEDLEYDISPLAYFONT index 984f1eb1..cf578e34 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN08-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN08-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN08-MRC.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN08-MRC.MEDLEYDISPLAYFONT index c50de730..a07b6f2c 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN08-MRC.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN08-MRC.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN08-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN08-MRR.MEDLEYDISPLAYFONT index 841213b4..31edaacc 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN08-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN08-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN09-MRC.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN09-MRC.MEDLEYDISPLAYFONT index eb0d3a4c..539ea1ee 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN09-MRC.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN09-MRC.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN09-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN09-MRR.MEDLEYDISPLAYFONT index c2f6e204..992ac377 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN09-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN09-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN10-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN10-BRR.MEDLEYDISPLAYFONT index 286dd663..ad6e3490 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN10-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN10-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN10-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN10-MIR.MEDLEYDISPLAYFONT index fe30c703..947a43a5 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN10-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN10-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN10-MRC.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN10-MRC.MEDLEYDISPLAYFONT index db5f35a0..b35c312b 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN10-MRC.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN10-MRC.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN10-MRR.MEDLEYDISPLAYFONT index 2dec349b..adbe84da 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN11-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN11-MRR.MEDLEYDISPLAYFONT index 37388286..bfef0b9f 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN11-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN11-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN12-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN12-BRR.MEDLEYDISPLAYFONT index 108249f2..fb9a0863 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN12-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN12-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN12-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN12-MIR.MEDLEYDISPLAYFONT index fa0d85df..92e48391 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN12-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN12-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN12-MRC.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN12-MRC.MEDLEYDISPLAYFONT index d344204e..fed45f32 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN12-MRC.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN12-MRC.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN12-MRR.MEDLEYDISPLAYFONT index f3b67660..cfaf98fe 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN13-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN13-MRR.MEDLEYDISPLAYFONT index 04dc1c2f..9588aa43 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN13-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN13-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN14-MRC.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN14-MRC.MEDLEYDISPLAYFONT index e9038580..72a09963 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN14-MRC.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN14-MRC.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN14-MRR.MEDLEYDISPLAYFONT index 57afd0a7..5c0127b8 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN16-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN16-MRR.MEDLEYDISPLAYFONT index 63fc17ae..61e61d16 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN16-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN16-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN18-MRC.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN18-MRC.MEDLEYDISPLAYFONT index 4f227a00..cdf6e840 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN18-MRC.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN18-MRC.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN18-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN18-MRR.MEDLEYDISPLAYFONT index 1b69a883..824c5d98 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN18-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN18-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAN36-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAN36-MRR.MEDLEYDISPLAYFONT index f3f398bf..f638517c 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAN36-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAN36-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAND24-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAND24-MRR.MEDLEYDISPLAYFONT index cce65430..010bd05f 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAND24-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAND24-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAND30-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAND30-MRR.MEDLEYDISPLAYFONT index 9e1ac57c..f6a4836e 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAND30-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAND30-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAND36-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAND36-MRR.MEDLEYDISPLAYFONT index 4753c507..6b25f35c 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAND36-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAND36-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TIMESROMAND72-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TIMESROMAND72-MRR.MEDLEYDISPLAYFONT index 1a3abf24..c3f99048 100644 Binary files a/fonts/medleydisplayfonts/TIMESROMAND72-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TIMESROMAND72-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TITAN10-BIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TITAN10-BIR.MEDLEYDISPLAYFONT index 5682c241..bec58a72 100644 Binary files a/fonts/medleydisplayfonts/TITAN10-BIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TITAN10-BIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TITAN10-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TITAN10-BRR.MEDLEYDISPLAYFONT index 396235c1..13471565 100644 Binary files a/fonts/medleydisplayfonts/TITAN10-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TITAN10-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TITAN10-MIR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TITAN10-MIR.MEDLEYDISPLAYFONT index 2609a021..9acbbc2b 100644 Binary files a/fonts/medleydisplayfonts/TITAN10-MIR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TITAN10-MIR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TITAN10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TITAN10-MRR.MEDLEYDISPLAYFONT index 8f83544c..b2365c9e 100644 Binary files a/fonts/medleydisplayfonts/TITAN10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TITAN10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TITAN12-BRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TITAN12-BRR.MEDLEYDISPLAYFONT index 39864870..6a985074 100644 Binary files a/fonts/medleydisplayfonts/TITAN12-BRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TITAN12-BRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TITAN12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TITAN12-MRR.MEDLEYDISPLAYFONT index cf3ab299..f17a0264 100644 Binary files a/fonts/medleydisplayfonts/TITAN12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TITAN12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TITAN14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TITAN14-MRR.MEDLEYDISPLAYFONT index 08343668..9fc3968f 100644 Binary files a/fonts/medleydisplayfonts/TITAN14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TITAN14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TITANLEGAL12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TITANLEGAL12-MRR.MEDLEYDISPLAYFONT index 631932c1..63bfb81c 100644 Binary files a/fonts/medleydisplayfonts/TITANLEGAL12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TITANLEGAL12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TITANLEGAL14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TITANLEGAL14-MRR.MEDLEYDISPLAYFONT index 7fb98080..a3d7073e 100644 Binary files a/fonts/medleydisplayfonts/TITANLEGAL14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TITANLEGAL14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/TONTO14-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/TONTO14-MRR.MEDLEYDISPLAYFONT index 8455c394..f211680b 100644 Binary files a/fonts/medleydisplayfonts/TONTO14-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/TONTO14-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/VISIBLE10-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/VISIBLE10-MRR.MEDLEYDISPLAYFONT index c5227622..adc95620 100644 Binary files a/fonts/medleydisplayfonts/VISIBLE10-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/VISIBLE10-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/XEROXBOOK12-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/XEROXBOOK12-MRR.MEDLEYDISPLAYFONT index cf847707..dbe2e7a7 100644 Binary files a/fonts/medleydisplayfonts/XEROXBOOK12-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/XEROXBOOK12-MRR.MEDLEYDISPLAYFONT differ diff --git a/fonts/medleydisplayfonts/XEROXLOGO48-MRR.MEDLEYDISPLAYFONT b/fonts/medleydisplayfonts/XEROXLOGO48-MRR.MEDLEYDISPLAYFONT index 107951a5..d8081c52 100644 Binary files a/fonts/medleydisplayfonts/XEROXLOGO48-MRR.MEDLEYDISPLAYFONT and b/fonts/medleydisplayfonts/XEROXLOGO48-MRR.MEDLEYDISPLAYFONT differ diff --git a/internal/MEDLEY-UTILS b/internal/MEDLEY-UTILS index 8f32114e..81c138f5 100644 --- a/internal/MEDLEY-UTILS +++ b/internal/MEDLEY-UTILS @@ -1,27 +1,28 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "28-Jan-2026 11:03:17" {DSK}larry>il>medley>internal>MEDLEY-UTILS.;3 26880 +(FILECREATED " 8-May-2026 10:41:23" {DSK}larry>il>MEDLEY>INTERNAL>MEDLEY-UTILS.;2 30963 :EDIT-BY "lmm" - :CHANGES-TO (FNS MAKE-INDEX-HTMLS GATHER-INFO MAKE-FULLER-DB MEDLEY-FIX-LINKS MEDLEY-FIX-DATES - MAKE-EXPORTS-ALL MAKE-WHEREIS-HASH MAKE-WHEREIS-LOOPS HCFILES RECOMPILE-ONE + :CHANGES-TO (ADVICE TEDIT.PROMPTPRINT) + (FNS GATHER-INFO MAKE-FULLER-DB MEDLEY-FIX-LINKS MEDLEY-FIX-DATES MAKE-EXPORTS-ALL + MAKE-WHEREIS-HASH MAKE-WHEREIS-LOOPS HCFILES MAKE-INDEX-HTMLS RECOMPILE-ONE RECMPL COMPILE-SETUP REMAKEFILES) - (ADVICE TEDIT.PROMPTPRINT) - :PREVIOUS-DATE "28-Jan-2026 10:46:02" {DSK}larry>il>medley>internal>MEDLEY-UTILS.;1) + :PREVIOUS-DATE " 4-May-2026 19:19:00" {DSK}larry>il>MEDLEY>INTERNAL>MEDLEY-UTILS.;1) (PRETTYCOMPRINT MEDLEY-UTILSCOMS) (RPAQQ MEDLEY-UTILSCOMS [(FNS GATHER-INFO MAKE-FULLER-DB MEDLEY-FIX-LINKS MEDLEY-FIX-DATES) - (VARS MEDLEY-FIX-DIRS OKSOURCES OKLIBRARY OKLISPUSERS OKINTERNAL) + (VARS HC-SKIP-EXTENSIONS MEDLEY-FIX-DIRS OKSOURCES OKLIBRARY OKLISPUSERS OKINTERNAL) (FNS MAKE-EXPORTS-ALL MAKE-WHEREIS-HASH MAKE-WHEREIS-LOOPS) (FNS HCFILES MAKE-INDEX-HTMLS) (PROP FILETYPE MEDLEY-UTILS) (ADVISE TEDIT.PROMPTPRINT) (FNS RECOMPILE-ONE RECMPL COMPILE-SETUP REMAKEFILES) + (FUNCTIONS REPORT-AND-GO) (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDVARS (NLAMA) (NLAML) (LAMA]) @@ -140,6 +141,12 @@ (for X in (OR DIRS MEDLEY-FIX-DIRS) join (FIX-DIRECTORY-DATES (MEDLEYDIR (PRINT X T]) ) +(RPAQQ HC-SKIP-EXTENSIONS + (PDF SKIP HTML LCOM DFASL SH SYSOUT DRIBBLE IMPTR DISPLAYFONT WD WIDTHS MEDLEYDISPLAYFONT + PSCFONT ALL DATABASE 1 MD GZ PRESS IP BITMAP EL ELC XFORMS BUGREPORTS SUITE LISTING AWK + DINFOGRAPH HASHFILE BLTCHAR DOC DOCPOINTERS STATUS NOTEFILE ICO ISS BMP PNG PS1 + VENUESYSOUT ACE FMC HKB LGC CMD COMMAND HTM SVG XML EXE)) + (RPAQQ MEDLEY-FIX-DIRS ("sources" "library" "lispusers" "internal" "greetfiles" "doctools")) (RPAQQ OKSOURCES (RENAMEFNS VMEM READSYS CASH-FILE HASH-FILE MEDLEYDIR MAKEINIT)) @@ -162,15 +169,18 @@ (DEFINEQ (MAKE-EXPORTS-ALL - [LAMBDA (OUTFILE) (* ; "Edited 3-Aug-2023 18:34 by frank") + [LAMBDA (OUTFILE) (* ; "Edited 15-Apr-2026 16:42 by mth") + (* ; "Edited 3-Aug-2023 18:34 by frank") (* ; "Edited 9-Mar-2021 16:11 by larry") - (* "Edited May 3, 2018 by Ron Kaplan--relative to MEDLEYDIR/lispcore/. Don't know why it does the CORE/RENAME") - (* - "Edited Aug 17 94 by Sybalsky -- point it to /king/export/lispcore as the truth directory.") - (* - "Edited July 5, 1990 by Sybalsky -- point it to Pele as the truth directory.") - (* - "Edited September 29, 1986 by van Melle") + + (* ;; "Edited May 3, 2018 by Ron Kaplan--relative to MEDLEYDIR/lispcore/. Don't know why it does the CORE/RENAME") + + (* ;; "Edited Aug 17 94 by Sybalsky -- point it to /king/export/lispcore as the truth directory.") + + (* ;; "Edited July 5, 1990 by Sybalsky -- point it to Pele as the truth directory.") + + (* ;; "Edited September 29, 1986 by van Melle") + (CNDIR (MEDLEYDIR "sources")) (LOAD 'FILESETS) (GATHEREXPORTS EXPORTFILES (OR OUTFILE "exports.all"]) @@ -204,7 +214,10 @@ (DEFINEQ (HCFILES - [LAMBDA (BASE REDO SUBSETS) (* ; "Edited 30-Jun-2024 08:27 by lmm") + [LAMBDA (BASE REDO SUBSETS) (* ; "Edited 8-May-2026 10:39 by lmm") + (* ; "Edited 4-May-2026 19:18 by lmm") + (* ; "Edited 16-Apr-2026 22:42 by mth") + (* ; "Edited 30-Jun-2024 08:27 by lmm") (* ; "Edited 23-Apr-2024 23:15 by lmm") (* ; "Edited 22-Apr-2024 13:22 by lmm") (* ; "Edited 5-Feb-2024 12:16 by lmm") @@ -213,74 +226,118 @@ (* ;;;; "BASE is the root directory. Doesn't replace PDF files except when REDO") -(* ;;; " SUBSETS is some combinsyion og (:YRDY :HYML :PRETTY and INDEX") +(* ;;; " SUBSETS is some combination of (:YRDY :HYML :PRETTY and INDEX") - (LET - [[DIRLIST (LIST (OR BASE (PSEUDOFILENAME (MEDLEYDIR] - (PHASES (OR SUBSETS '(TEDIT PRETTY INDEX HRULE] - (FILESLOAD PDFSTREAM SKETCH) - (FONTSET 'STANDARD) - (while DIRLIST - do - (SETQ BASE (pop DIRLIST)) - (for SRCPATH in (DIRECTORY (CONCAT BASE "*.*;")) - do (PROG* [(SRC (UNPACKFILENAME SRCPATH)) - [EXT (U-CASE (LISTGET SRC 'EXTENSION] - (DIR (LISTGET SRC 'DIRECTORY)) - FRDY LDGP DEST (NOV (PACKFILENAME `(VERSION NIL ,@SRC] - (CL:FORMAT T "Starting on ~a :~%%" SRCPATH) - (CL:WHEN (DIRECTORYNAMEP SRCPATH) + (LET* ([DIRLIST (LIST (OR BASE (PSEUDOFILENAME (MEDLEYDIR] + [PHASES (OR SUBSETS '(TEDIT PRETTY INDEX HRULE] + (DOTEDIT (MEMB 'TEDIT PHASES)) + (DOPRETTY (MEMB 'PRETTY PHASES))) + (FILESLOAD PDFSTREAM SKETCH) + (FONTSET 'STANDARD) + (while DIRLIST + do (SETQ BASE (pop DIRLIST)) - (* ;; "any directory names, push them off and do them in another phase") + (* ;; "Breadth-first processing") - (CL:UNLESS (OR (STRPOS ">." NOV) - (INFILEP (CONCAT NOV ".skip"))) - (SETQ DIRLIST (NCONC1 DIRLIST SRCPATH))) - (RETURN)) - (CL:WHEN - (MEMB EXT - '(PDF SKIP HTML LCOM DFASL SH SYSOUT DRIBBLE IMPTR DISPLAYFONT ALL - DATABASE)) + (for SRCPATH in (DIRECTORY (CONCAT BASE "*.*;")) + do (PROG* ((SRC (UNPACKFILENAME SRCPATH)) + [EXT (U-CASE (LISTGET SRC 'EXTENSION] + (DIR (LISTGET SRC 'DIRECTORY)) + [NAME (U-CASE (LISTGET SRC 'NAME] + [NOV (PACKFILENAME.STRING `(VERSION NIL ,@SRC] + LSFP DEST) + (CL:WHEN (DIRECTORYNAMEP SRCPATH) - (* ;; "ignore any of these extensions") + (* ;; + "any directory names, push them off and do them in another phase") - (RETURN)) + (if [NOT (OR (STRPOS "<." NOV) + (CL:SEARCH "" NOV :TEST #'CL:CHAR-EQUAL) + (STRPOS ">." NOV) + (INFILEP (CONCAT NOV ".skip"] + then (SETQ DIRLIST (NCONC1 DIRLIST SRCPATH)) + (CL:FORMAT T "~&Deferring to later ~a~%%" SRCPATH) + else (CL:FORMAT T "~&Skipping ~a~%%" SRCPATH)) + (RETURN)) - (* ;; - " doesnt (yet) implement / to - translattion. .readme should show up as -.readme.") + (* ;; "Fixup files that start with . and have no other extension") - (SETQ DEST (CONCAT NOV ".pdf")) - (CL:WHEN (AND (NOT REDO) - (INFILEP DEST)) - (CL:FORMAT T "~a already there~%%" DEST) - (RETURN)) - (CL:WHEN (INFILEP (CONCAT DEST ".skip")) - (PRINTOUT T "Explicit .skip " DEST T) - (RETURN)) - (if (MEMB 'TEDIT PHASES) - then (CL:WHEN [OR (MEMB EXT '(TEDIT TED SKETCH BRAVO)) - (CAR (NLSETQ (TEDIT.FORMATTEDFILEP SRCPATH] - (if (EQ REDO 'TEST) - then (CL:FORMAT T "Testing open ~a..." SRCPATH) - (CLOSEF? (OPENTEXTSTREAM SRCPATH)) - else (OR [NLSETQ (CL:WITH-OPEN-STREAM (S (OPENTEXTSTREAM SRCPATH) - ) - (TEDIT.FORMAT.HARDCOPY S DEST T NIL NIL - NIL 'PDF] - (PRINT 'FAIL T))) - (CL:FORMAT T "DONE"))) - (CL:WHEN (AND (MEMB 'PRETTY PHASES) - (MEMB EXT '(NIL IL)) - [SETQ LSFP (CAR (NLSETQ (LISPSOURCEFILEP SRCPATH] - (NEQ LSFP *COMMON-LISP-READ-ENVIRONMENT*)) - (PRINTOUT T "PDF printing " " to " DEST "...") - (OR (NLSETQ (CL:WITH-OPEN-STREAM (STR (OPEN-PDF-STREAM DEST)) - (PRETTYFILEINDEX SRCPATH NIL STR))) - (PRINT 'FAIL T)) - (PRINTOUT T "DONE" T))]) + (CL:WHEN (AND (NULL EXT) + (EQ (CHCON1 NAME) + (CHARCODE %.))) + (SETQ EXT (SUBATOM NAME 2))) + (CL:WHEN (MEMB EXT HC-SKIP-EXTENSIONS) + + (* ;; "ignore any of these extensions") + + (CL:FORMAT T "~&Ignoring (on extension): ~a~%%" SRCPATH) + (RETURN)) + + (* ;; + " doesn't (yet) implement / to - translation. .readme should show up as -.readme.") + + (SETQ DEST (CONCAT NOV ".pdf")) + (CL:WHEN (AND (NOT REDO) + (INFILEP DEST)) + (CL:FORMAT T "~a is already there~%%" DEST) + (RETURN)) + (CL:WHEN (INFILEP (CONCAT DEST ".skip")) + (CL:FORMAT T "Explicit .skip ~a~%%" DEST) + (RETURN)) + (CL:FORMAT T "~&Starting on ~a:~%%" SRCPATH) + (CL:WHEN [AND DOTEDIT (OR (MEMB EXT '(TEDIT TED SKETCH BRAVO)) + (CAR (REPORT-AND-GO (TEDIT.FORMATTEDFILEP + SRCPATH) + (CL:FORMAT NIL + "~~%%~S TEDIT.FORMATTEDFILEP of ~A -- Condition: ~~A" + 'FAIL SRCPATH] + (if (EQ REDO 'TEST) + then (CL:FORMAT T "Testing open ~a..." SRCPATH) + (CLOSEF? (OPENTEXTSTREAM SRCPATH)) + else + (* ;; "ADDED HERE") + + (SETQ NLSETQGAG NIL) + (SETQ \TEDIT.THELPFLG T) + (REPORT-AND-GO (TEDIT.TO.IMAGEFILE SRCPATH DEST 'PDF) + (CL:FORMAT NIL + "~~%%~S TEDIT.TO.IMAGEFILE of ~A -- Condition: ~~A" + 'FAIL SRCPATH))) + (PRIN3 " DONE" T) + (TERPRI T) + (RETURN)) + (CL:WHEN (AND DOPRETTY (OR (NULL EXT) + (EQ EXT 'IL)) + [SETQ LSFP (CAR (REPORT-AND-GO (LISPSOURCEFILEP SRCPATH) + (CL:FORMAT NIL + "~~%%~S LISPSOURCEFILEP of ~A -- Condition: ~~A" + 'FAIL SRCPATH] + (NEQ LSFP *COMMON-LISP-READ-ENVIRONMENT*)) + + (* ;; "Why the check for NEQ *COMMON-LISP-READ-ENVIRONMENT* ??") + + (PRIN3 "PDF printing " T) + (PRIN3 SRCPATH T) + (PRIN3 " to " T) + (PRIN3 DEST T) + (PRIN3 " ..." T) + (REPORT-AND-GO (CL:WITH-OPEN-STREAM (STR (OPEN-PDF-STREAM DEST)) + (PRETTYFILEINDEX SRCPATH NIL STR)) + (CL:FORMAT NIL + "~~%%~S PRETTYFILEINDEX of ~A -- Condition: ~~A" + 'FAIL SRCPATH)) + (PRIN3 " DONE" T) + (TERPRI T) + (RETURN)) + + (* ;; "Everything else") + + (PRIN3 "No processing." T) + (TERPRI T]) (MAKE-INDEX-HTMLS - [LAMBDA (BASE TOP LEVEL ROOT.NAME) (* ; "Edited 28-Jan-2026 11:01 by lmm") + [LAMBDA (BASE TOP LEVEL ROOT.NAME) (* ; "Edited 15-Apr-2026 16:33 by mth") + (* ; "Edited 28-Jan-2026 11:01 by lmm") (* ; "Edited 27-Jan-2026 10:50 by lmm") (* ; "Edited 23-Jan-2026 11:59 by lmm") (* ; "Edited 29-Apr-2024 14:18 by lmm") @@ -339,8 +396,8 @@ then 2 else 1)) -2))) - (CL:UNLESS (OR (MEMB SHORTNAME '(.git)) - (MEMB SHORTNAME '(.GIT)) + (CL:UNLESS (OR (EQ SHORTNAME '.git) + (EQ SHORTNAME '.GIT) [AND (STRPOS ".git" (L-CASE FULLNAME)) (NOT (STRPOS ".github" (L-CASE FULLNAME] (INFILEP (CONCAT FULLNAME ".skip"))) @@ -372,7 +429,8 @@ (PUTPROPS MEDLEY-UTILS FILETYPE :COMPILE-FILE) -[XCL:REINSTALL-ADVICE 'TEDIT.PROMPTPRINT :BEFORE '((:LAST (PRIN1 MSG T))) +[XCL:REINSTALL-ADVICE 'TEDIT.PROMPTPRINT :BEFORE '[(:LAST (PROGN (PRIN3 " " T) + (PRIN3 MSG T] :AFTER '((:LAST (AND (STRPOS "GETFN" MSG) (HELP MSG] @@ -463,6 +521,17 @@ (SETQ DIFF (COMPARESOURCES X DESTFILE NIL)) (TERPRI]) ) + +(DEFMACRO REPORT-AND-GO (FORM REPORT-FORMAT) (* ; "Edited 4-May-2026 19:02 by lmm") + (* ; "Edited 16-Apr-2026 16:02 by mth") + `[CL:MULTIPLE-VALUE-BIND (FORM-RESULT ERROR-CONDITION) + (IGNORE-ERRORS (CL:VALUES ,FORM)) (* ; "Only the first value") + (COND + (ERROR-CONDITION (BAKTRACE 'BAKTRACE NIL NIL 1 T) + (PRIN3 (CL:FORMAT NIL ,REPORT-FORMAT ERROR-CONDITION) + T) + NIL) + (T (LIST FORM-RESULT]) (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDTOVAR NLAMA ) @@ -472,9 +541,10 @@ (ADDTOVAR LAMA ) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1312 8246 (GATHER-INFO 1322 . 6704) (MAKE-FULLER-DB 6706 . 7615) (MEDLEY-FIX-LINKS 7617 - . 8010) (MEDLEY-FIX-DATES 8012 . 8244)) (9425 12213 (MAKE-EXPORTS-ALL 9435 . 10494) ( -MAKE-WHEREIS-HASH 10496 . 11685) (MAKE-WHEREIS-LOOPS 11687 . 12211)) (12214 21862 (HCFILES 12224 . -16487) (MAKE-INDEX-HTMLS 16489 . 21860)) (22112 26724 (RECOMPILE-ONE 22122 . 24019) (RECMPL 24021 . -24624) (COMPILE-SETUP 24626 . 25250) (REMAKEFILES 25252 . 26722))))) + (FILEMAP (NIL (1365 8299 (GATHER-INFO 1375 . 6757) (MAKE-FULLER-DB 6759 . 7668) (MEDLEY-FIX-LINKS 7670 + . 8063) (MEDLEY-FIX-DATES 8065 . 8297)) (9871 12447 (MAKE-EXPORTS-ALL 9881 . 10728) ( +MAKE-WHEREIS-HASH 10730 . 11919) (MAKE-WHEREIS-LOOPS 11921 . 12445)) (12448 25236 (HCFILES 12458 . +19760) (MAKE-INDEX-HTMLS 19762 . 25234)) (25570 30182 (RECOMPILE-ONE 25580 . 27477) (RECMPL 27479 . +28082) (COMPILE-SETUP 28084 . 28708) (REMAKEFILES 28710 . 30180)) (30184 30807 (REPORT-AND-GO 30184 . +30807))))) STOP diff --git a/internal/MEDLEY-UTILS.DFASL b/internal/MEDLEY-UTILS.DFASL index 00401e75..b4e245e6 100644 Binary files a/internal/MEDLEY-UTILS.DFASL and b/internal/MEDLEY-UTILS.DFASL differ diff --git a/internal/envos/unixmail.tedit b/internal/envos/unixmail.tedit index d0edeeb2..709c98f1 100644 Binary files a/internal/envos/unixmail.tedit and b/internal/envos/unixmail.tedit differ diff --git a/internal/loadups/LOADUP-FULL b/internal/loadups/LOADUP-FULL index f6289eff..00240f7e 100644 --- a/internal/loadups/LOADUP-FULL +++ b/internal/loadups/LOADUP-FULL @@ -1,12 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "14-Feb-2026 00:42:39" {WMEDLEY}loadups>LOADUP-FULL.;38 5967 +(FILECREATED "28-Apr-2026 10:01:06" {WMEDLEY}loadups>LOADUP-FULL.;47 5896 :EDIT-BY rmk :CHANGES-TO (FNS LOADUP-FULL) - :PREVIOUS-DATE "13-Feb-2026 00:47:52" {WMEDLEY}loadups>LOADUP-FULL.;37) + :PREVIOUS-DATE "16-Apr-2026 09:37:27" {WMEDLEY}loadups>LOADUP-FULL.;46) (PRETTYCOMPRINT LOADUP-FULLCOMS) @@ -16,7 +16,8 @@ (DEFINEQ (LOADFULLFONTS - [LAMBDA NIL (* ; "Edited 20-Sep-2025 14:17 by rmk") + [LAMBDA NIL (* ; "Edited 16-Apr-2026 09:37 by rmk") + (* ; "Edited 20-Sep-2025 14:17 by rmk") (* ; "Edited 2-Sep-2025 20:06 by rmk") (* ; "Edited 13-Jul-2025 11:40 by rmk") (* ; "Edited 30-Jun-2025 00:04 by rmk") @@ -27,11 +28,8 @@ (* ;; " Don't do Interpress. Do character set 0 and the symbol character sets 41Q, 42Q, 356Q, 357Q and extended and accented Latin 43Q and 361Q") - (PRINTOUT T "Loading FULL fonts..." T) + (PRINTOUT T T "Loading FULL fonts..." T) (SETQ *POSTSCRIPT-FILE-TYPE* 'TEXT) - - (* ;; "Previous code reset the coercion variables to NIL, which would have resulted in glyph-incomplete charsets. With Medley-formatted fonts, the completions have already been installed in the files and there is no need to deal with those variables.") - (for FAMILY in '(CLASSIC MODERN TERMINAL) do (PRINTOUT T " Loading " FAMILY " ") [for SIZE in '(8 10 12) @@ -47,7 +45,8 @@ (PRINTOUT T "FULL fonts loaded" T]) (LOADUP-FULL - [LAMBDA (DRIBBLEFILE) (* ; "Edited 14-Feb-2026 00:42 by rmk") + [LAMBDA (DRIBBLEFILE) (* ; "Edited 28-Apr-2026 10:00 by rmk") + (* ; "Edited 14-Feb-2026 00:42 by rmk") (* ; "Edited 5-Feb-2026 10:26 by rmk") (* ; "Edited 28-Dec-2025 12:06 by rmk") (* ; "Edited 1-Sep-2025 11:59 by rmk") @@ -86,8 +85,7 @@ (LOADUP '(CHAT INTERPRESS TEDIT HRULE TEDIT-CHAT READNUMBER EDITBITMAP FILEBROWSER THINFILES GRAPHER SPY WHERE-IS COPYFILES MSANALYZE MSPARSE MASTERSCOPE UNIXPRINT HELPSYS - DINFO CLIPBOARD MODERNIZE WHEELSCROLL PRETTYFILEINDEX WHO-LINE UNIXCOMM UNIXCHAT - UNIXYCD)) + DINFO CLIPBOARD MODERNIZE WHEELSCROLL PRETTYFILEINDEX WHO-LINE UNIXCOMM UNIXCHAT)) (LOADFULLFONTS) (COND ((WINDOWP *WHO-LINE*) @@ -103,5 +101,5 @@ (FIXMETA) (DECLARE%: DONTCOPY - (FILEMAP (NIL (456 5929 (LOADFULLFONTS 466 . 2601) (LOADUP-FULL 2603 . 5679) (FIXMETA 5681 . 5927))))) + (FILEMAP (NIL (456 5858 (LOADFULLFONTS 466 . 2449) (LOADUP-FULL 2451 . 5608) (FIXMETA 5610 . 5856))))) STOP diff --git a/internal/loadups/LOADUP-FULL.LCOM b/internal/loadups/LOADUP-FULL.LCOM index b6d976e2..e2f4fb9e 100644 Binary files a/internal/loadups/LOADUP-FULL.LCOM and b/internal/loadups/LOADUP-FULL.LCOM differ diff --git a/internal/loadups/LOADUP-LISP b/internal/loadups/LOADUP-LISP index 9497dd39..b681d3ac 100644 --- a/internal/loadups/LOADUP-LISP +++ b/internal/loadups/LOADUP-LISP @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "XCL" :BASE 10) -(FILECREATED "17-May-2026 12:28:45"  -|{DSK}briggs>projects>medley>internal>loadups>LOADUP-LISP.;16| 7600 +(FILECREATED "16-Apr-2026 09:06:26" |{WMEDLEY}loadups>LOADUP-LISP.;32| 7864 + + :EDIT-BY |rmk| :CHANGES-TO (FNS LOADUP-LISP) - :PREVIOUS-DATE "26-Mar-2026 18:38:22" -|{DSK}briggs>projects>medley>internal>loadups>LOADUP-LISP.;15|) + :PREVIOUS-DATE "15-Apr-2026 23:27:22" |{WMEDLEY}loadups>LOADUP-LISP.;31|) (PRETTYCOMPRINT LOADUP-LISPCOMS) @@ -19,7 +19,9 @@ (DEFINEQ (LOADUP-LISP - (LAMBDA (DRIBBLEFILE) (* \; "Edited 26-Mar-2026 18:38 by briggs") + (LAMBDA (DRIBBLEFILE) (* \; "Edited 16-Apr-2026 09:06 by rmk") + (* \; "Edited 5-Apr-2026 21:35 by rmk") + (* \; "Edited 26-Mar-2026 18:38 by briggs") (* \; "Edited 22-Feb-2026 14:15 by rmk") (* \; "Edited 28-Jan-2026 14:30 by lmm") (* \; "Edited 27-Dec-2025 15:02 by rmk") @@ -36,15 +38,15 @@ (* \; "Edited 13-Jul-2022 14:09 by rmk") (* \; "Edited 4-Mar-2022 19:13 by larry") (* \; "Edited 29-Apr-2021 22:30 by rmk:") - (SETQQ COMPILE.EXT LCOM) - (MEDLEY-INIT-VARS) (* \; "should be set earlier") + (SETQQ COMPILE.EXT LCOM) (* (MEDLEY-INIT-VARS) + (* \; "should be set earlier")) (DRIBBLE DRIBBLEFILE) (FOR X IN BOOTLOADEDFILES DO (CL:UNLESS (MEMB X SYSFILES) (PRINTOUT T X " bootloaded" T) (SETQ SYSFILES (CONS X SYSFILES)))) (SETQ BOOTLOADEDFILES NIL) (IF (NOT (BOUNDP 'DIRECTORIES)) - THEN (SETQ DIRECTORIES LOADUPDIRECTORIES)) + THEN (SETQ DIRECTORIES LOADUPDIRECTORIES)) (* (LOADUP (QUOTE (PSEUDOHOSTS)))) (* |;;| "following files are really loaded earlier, this call to LOADUP just cleans up") @@ -73,7 +75,7 @@ (LOADUP '(STACKFNS CMLMVS MACROS MACROAUX UNWINDMACROS)) (LOADUP '(COMMON XCLC-RUNTIME CMLTYPES CL-ERROR)) - (LOADUP '(AFONT EDIT WEDIT PRETTY DSPRINTDEF NEWPRINTDEF SPELLFILE PRINTFN LOADFNS DMISC + (LOADUP '(ACFONT EDIT WEDIT PRETTY DSPRINTDEF NEWPRINTDEF SPELLFILE PRINTFN LOADFNS DMISC DIRECTORY FILEPKG RESOURCE)) (* |;;| "needed for makesys") @@ -108,7 +110,7 @@ (LOADUP '(DSK UFS UFSCALLC MAIKOBITBLT)) (LOADUP '(TIME)) (LOADUP '(BRKDWN)) - (LOADUP '(LOGOW IDLER UNIXUTILS PSEUDOHOSTS HARDCOPY ICONW FREEMENU SEDIT)) + (LOADUP '(LOGOW IDLER UNIXUTILS HARDCOPY ICONW FREEMENU SEDIT)) (LOADUP '(XCL-EXTRAS)) (* |;;| "CMLPACKAGE pushes onto INSPECTMACROS") @@ -136,7 +138,6 @@ (LOADUP '(PUP 10MBDRIVER LEAF LLETHER DPUPFTP LOCALFILE DSKDISPLAY COURIER LLNS TRSERVER SPP NSPRINT AUTHENTICATION BSP CLEARINGHOUSE NSFILING MAIKOETHER)) - (SETQ \\NSFLG T) (RESTART.ETHER) (DRIBBLE) (SETQ MAKESYSNAME :MEDLEY))) @@ -150,5 +151,5 @@ (GLOBALVARS MAKESYSFILENAME MEDLEY-INIT-VARS MEDLEYDIR SYSTEMINITVARS USERRECLST) ) (DECLARE\: DONTCOPY - (FILEMAP (NIL (670 7394 (LOADUP-LISP 680 . 7392))))) + (FILEMAP (NIL (640 7658 (LOADUP-LISP 650 . 7656))))) STOP diff --git a/internal/loadups/LOADUP-LISP.LCOM b/internal/loadups/LOADUP-LISP.LCOM index 6bb5db27..e13f8ab0 100644 Binary files a/internal/loadups/LOADUP-LISP.LCOM and b/internal/loadups/LOADUP-LISP.LCOM differ diff --git a/library/DATABASEFNS b/library/DATABASEFNS index e25c5366..8d6b805f 100644 --- a/library/DATABASEFNS +++ b/library/DATABASEFNS @@ -1,18 +1,15 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "20-Feb-2024 23:45:56" {DSK}e>Interlisp>medley>library>DATABASEFNS.;4 18445 +(FILECREATED "12-May-2026 15:33:42" {DSK}matt>Interlisp>medley>library>DATABASEFNS.;5 19557 :EDIT-BY "mth" :CHANGES-TO (FNS DUMPDB) - :PREVIOUS-DATE "19-Feb-2024 16:29:44" {DSK}e>Interlisp>medley>library>DATABASEFNS.;1) + :PREVIOUS-DATE "12-May-2026 12:45:18" {DSK}matt>Interlisp>medley>library>DATABASEFNS.;4 +) -(* ; " -Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. -") - (PRETTYCOMPRINT DATABASEFNSCOMS) (RPAQQ DATABASEFNSCOMS @@ -61,7 +58,8 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (DEFINEQ (DBFILE - [LAMBDA (FILE ASKFLAG) (* ; "Edited 24-Oct-2021 16:50 by rmk:") + [LAMBDA (FILE ASKFLAG) (* ; "Edited 11-May-2026 14:35 by mth") + (* ; "Edited 24-Oct-2021 16:50 by rmk:") (* lmm "29-APR-81 20:27") (* ;; "Finds a database file that corresponds to the contents of FILE. Looks in directory of FILE, and also in the directory that file originally came from, if it was copied. Returns NIL if no database file is found, else (fulldbfilename . filedates), where filedates identifies the name under which the file that the database corresponds to is currently known.") @@ -72,13 +70,13 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. [COND ((NULL FILE) (SETQ FILE (INPUT))) - ((MEMB (FILENAMEFIELD FILE 'EXTENSION) + ((MEMB (U-CASE (FILENAMEFIELD FILE 'EXTENSION)) *COMPILED-EXTENSIONS*) (* ; - "Map compiled file into symbolic name") + "Map compiled file into symbolic name") (SETQ FILE (PACKFILENAME 'EXTENSION NIL 'VERSION NIL 'BODY FILE] (LET [(FILEDATES (COND [(AND (NULL (FILENAMEFIELD FILE 'VERSION)) - (CAR (GETPROP (NAMEFIELD FILE) + (CAR (GETPROP (ROOTFILENAME FILE) 'FILEDATES] ([SETQ FILE (COND (ASKFLAG (INFILEP FILE)) @@ -164,12 +162,22 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (DEFINEQ (DUMPDB - [LAMBDA (FILE PROPFLG) (* ; "Edited 20-Feb-2024 23:45 by mth") + [LAMBDA (FILE PROPFLG) (* ; "Edited 12-May-2026 15:31 by mth") + (* ; "Edited 12-May-2026 12:45 by rmk") + (* ; "Edited 11-May-2026 14:41 by mth") + (* ; "Edited 8-May-2026 16:18 by mth") + (* ; "Edited 2-May-2026 17:32 by mth") + (* ; "Edited 29-Apr-2026 17:42 by mth") + (* ; "Edited 20-Feb-2024 23:45 by mth") (* ; "Edited 7-Feb-2024 18:26 by mth") (* ; "Edited 27-Oct-2021 10:51 by larry") (* ; "Edited 24-Oct-2021 16:24 by rmk:") - (* ;; "Dumps a Masterscope database for functions in FILE. Checks the DATABASE property if PROPFLG=T which is how the MAKEFILE advice calls it. A user-level call would default PROPFLG to NIL.") + (* ;; "Dumps a Masterscope database for functions in FILE. ") + + (* ;; "Checks the DATABASE property if PROPFLG=T which is how the MAKEFILE advice calls it. ") + + (* ;; "A user-level call would default PROPFLG to NIL.") (* ;; "The FILE check is because MAKEFILE returns a list when it doesn't understand the options") @@ -180,72 +188,73 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (LET ((SAVEDCOPYRIGHTFLG COPYRIGHTFLG) (SAVEDDEFAULTCOPYRIGHTOWNER DEFAULTCOPYRIGHTOWNER)) (CL:UNWIND-PROTECT - (PROG (DBFILE DBFN DBROOTFN FLCPR (FL (NAMEFIELD FILE)) - (FNS (FILEFNSLST FILE))) - (SETQ DBFN (PACKFILENAME 'EXTENSION 'DATABASE 'VERSION NIL 'BODY FILE)) - (SETQ DBROOTFN (ROOTFILENAME DBFN)) - (CL:UNLESS (OR (EQ COPYRIGHTFLG 'NEVER) - (NULL DEFAULTDATABASECOPYRIGHTOWNER) - (GETPROP DBROOTFN 'COPYRIGHT)) - (SELECTQ DEFAULTDATABASECOPYRIGHTOWNER - ((NONE NEVER) - (* ;; + (PROG* (DBFILE DBFN DBROOTFN FLCPR (FL (ROOTFILENAME FILE)) + (FNS (FILEFNSLST FL))) + (SETQ DBFN (PACKFILENAME 'EXTENSION 'DATABASE 'VERSION NIL 'BODY FILE)) + (SETQ DBROOTFN (ROOTFILENAME DBFN)) + (CL:UNLESS (OR (EQ COPYRIGHTFLG 'NEVER) + (NULL DEFAULTDATABASECOPYRIGHTOWNER) + (GETPROP DBROOTFN 'COPYRIGHT)) + (SELECTQ DEFAULTDATABASECOPYRIGHTOWNER + ((NONE NEVER) + (* ;;  "Set the COPYRIGHT to NONE (I.e., never mention it again.)") - (/PUT DBROOTFN 'COPYRIGHT (LIST 'NONE))) - (SAME - (* ;; + (/PUT DBROOTFN 'COPYRIGHT (LIST 'NONE))) + (SAME + (* ;;  "Same as the source file. If it doesn't have one, then just normal handling") - (CL:WHEN (SETQ FLCPR (GETPROP FL 'COPYRIGHT)) - (/PUT DBROOTFN 'COPYRIGHT (LIST (CAR FLCPR))))) - (DEFAULT - (* ;; "Use the general default for copyright") + (CL:WHEN (SETQ FLCPR (GETPROP FL 'COPYRIGHT)) + (/PUT DBROOTFN 'COPYRIGHT (LIST (CAR FLCPR))))) + (DEFAULT + (* ;; "Use the general default for copyright") - (SETQ COPYRIGHTFLG 'DEFAULT)) - (PROGN (SETQ COPYRIGHTFLG 'DEFAULT) + (SETQ COPYRIGHTFLG 'DEFAULT)) + (PROGN (SETQ COPYRIGHTFLG 'DEFAULT) - (* ;; + (* ;;  "Hopefully, DEFAULTDATABASECOPYRIGHTOWNER is one of the COPYRIGHTOWNERS keys") - (SETQ DEFAULTCOPYRIGHTOWNER DEFAULTDATABASECOPYRIGHTOWNER)))) - (COND - (FNS) - ((AND MSFILETABLE (TESTTABLE FL (CADR MSFILETABLE))) + (SETQ DEFAULTCOPYRIGHTOWNER DEFAULTDATABASECOPYRIGHTOWNER)))) + (COND + (FNS) + ((AND MSFILETABLE (TESTTABLE FL (CADR MSFILETABLE))) (* ;  "Always dump if this is a known file") - (SETQ PROPFLG NIL)) - (T (COND - (PROPFLG (/REMPROP FL 'DATABASE)) - (T (printout T T FILE " has no functions." T))) - (RETURN))) - (CL:WHEN [OR (NULL PROPFLG) - (EQ (GETPROP FL 'DATABASE) - 'YES) - (EQ SAVEDBFLG 'YES) - (AND MSFILETABLE (TESTTABLE FL (CADR MSFILETABLE] - (CL:WHEN MSFILETABLE - [STORETABLE FL MSFILETABLE (CAR (GETPROP FL 'FILEDATES]) - [SETQ DBFILE - (PRETTYDEF NIL DBFN - `((P (PROGN (PRIN1 "Use LOADDB to load database files!" T) - (ERROR!))) - (E [PRINT (CAR (GETPROP ',FILE 'FILEDATES] - (DUMPDATABASE ',FNS] - [COND - (PROPFLG (PRINT (FULLNAME DBFILE) - T)) - (T (/PUT FL 'DATABASEFILENAME DBFILE) + (SETQ PROPFLG NIL)) + (T (COND + (PROPFLG (/REMPROP FL 'DATABASE)) + (T (printout T T FILE " has no functions." T))) + (RETURN))) + (CL:WHEN [OR (NULL PROPFLG) + (EQ (GETPROP FL 'DATABASE) + 'YES) + (EQ SAVEDBFLG 'YES) + (AND MSFILETABLE (TESTTABLE FL (CADR MSFILETABLE] + (CL:WHEN MSFILETABLE + [STORETABLE FL MSFILETABLE (CAR (GETPROP FL 'FILEDATES]) + [SETQ DBFILE + (PRETTYDEF NIL DBFN + `((P (PROGN (PRIN1 "Use LOADDB to load database files!" T) + (ERROR!))) + (E [PRINT (CAR (GETPROP ',FL 'FILEDATES] + (DUMPDATABASE ',FNS] + [COND + (PROPFLG (PRINT (FULLNAME DBFILE) + T)) + (T (/PUT FL 'DATABASEFILENAME DBFILE) (* ;  "Remember that we have this file valid already.") - (/PUT FL 'DATABASE 'YES] (* ; + (/PUT FL 'DATABASE 'YES] (* ;  "Take future note of the database on a user call") - (RETURN DBFILE)))) + (RETURN DBFILE)))) (SETQ COPYRIGHTFLG SAVEDCOPYRIGHTFLG) (SETQ DEFAULTCOPYRIGHTOWNER SAVEDDEFAULTCOPYRIGHTOWNER)))]) (LOADDB - [LAMBDA (FILE ASKFLAG) (* ; "Edited 24-Oct-2021 17:44 by rmk:") + [LAMBDA (FILE ASKFLAG) (* ; "Edited 11-May-2026 14:37 by mth") + (* ; "Edited 24-Oct-2021 17:44 by rmk:") (* ; "Edited 7-Jul-92 09:57 by rmk:") (* ;; "Loads the database file corresponding to FILE, asking for confirmation only if ASKFLAG is T, which is the case from the advice on LOAD but not from usual user-level calls. Before asking, it looks around first to see whether a database file of the appropriate name really exists.") @@ -254,7 +263,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (RESETLST [PROG* [TEM FORFILE (*READTABLE* (FIND-READTABLE "INTERLISP")) (*PACKAGE* (CL:FIND-PACKAGE "INTERLISP")) - (NF (NAMEFIELD FILE)) + (NF (ROOTFILENAME FILE)) (DBSTREAM (DBFILE FILE ASKFLAG)) (DBFILE (FULLNAME (CAR DBSTREAM] (COND @@ -262,14 +271,15 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (SETQ DBSTREAM (CAR DBSTREAM))) (T (COND ((NULL ASKFLAG) - (PRINTOUT T "no database file found for " NF T))) + (PRINTOUT T "no database file found for " (NAMEFIELD FILE) + T))) (RETURN))) (COND ([COND [ASKFLAG (COND ((EQ (GETPROP NF 'DATABASEFILENAME) DBFILE) (* ; - "If the database for this very file has already been loaded, don't bother doing it again.") + "If the database for this very file has already been loaded, don't bother doing it again.") (PRINTOUT T "Database " DBFILE " already loaded." T) NIL) (T (SELECTQ (GETPROP NF 'DATABASE) @@ -310,28 +320,30 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (READATABASE))) (AND MSFILETABLE (STORETABLE NF MSFILETABLE FORFILE)) (* ; - "This is done whether or not there is a hashfile.") + "This is done whether or not there is a hashfile.") (UPDATEFILES) (* ; - "Mark any edited fns as needing to be reanalyzed.") - (FOR FN IN (CDR (GETP NF 'FILE)) - WHEN (OR (EXPRP FN) - (GETP FN 'EXPR)) DO (MSMARKCHANGED FN))) + "Mark any edited fns as needing to be reanalyzed.") + (FOR FN IN (CDR (GETP NF 'FILE)) WHEN (OR (EXPRP FN) + (GETP FN 'EXPR)) + DO (MSMARKCHANGED FN))) (T (PRINTOUT T T DBFILE " is not a database file!" T) (* ; "So that value of LOADDB is NIL") (SETQ DBFILE NIL))) (/PUT NF 'DATABASEFILENAME DBFILE) (* ; - "Remember the name of the database we just loaded.") + "Remember the name of the database we just loaded.") (RETURN (FULLNAME DBFILE])]) (MAKEDB [LAMBDA (F) (* DECLARATIONS%: UNDOABLE) + (* ; "Edited 12-May-2026 12:37 by rmk") + (* ; "Edited 11-May-2026 14:38 by mth") (* rmk%: " 9-NOV-83 02:56") (DECLARE (GLOBALVARS SAVEDBFLG MSFILETABLE DWIMWAIT)) - (SETQ F (NAMEFIELD F)) - - (* The extension is stripped off for purposes of the DATABASE. - This maps compiled files into the root name, but means that we can't have - multiple-extension files with different database status) + (SETQ F (ROOTFILENAME F)) + + (* The extension is stripped off for purposes of the DATABASE. + This maps compiled files into the root name, but means that we can't have + multiple-extension files with different database status) (COND ((INFILECOMS? T 'FNS (FILECOMS F)) @@ -375,9 +387,8 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (RESETSAVE DWIMIFYCOMPFLG T) ) -(PUTPROPS DATABASEFNS COPYRIGHT ("Xerox Corporation" 1986 1990 1991 1992 1993 2024)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1768 6793 (DBFILE 1778 . 3423) (DBFILE1 3425 . 4935) (DBFILE2 4937 . 6159) (LOAD 6161 - . 6391) (LOADFROM 6393 . 6581) (MAKEFILE 6583 . 6791)) (6849 17838 (DUMPDB 6859 . 11873) (LOADDB -11875 . 16750) (MAKEDB 16752 . 17836))))) + (FILEMAP (NIL (1708 6856 (DBFILE 1718 . 3486) (DBFILE1 3488 . 4998) (DBFILE2 5000 . 6222) (LOAD 6224 + . 6454) (LOADFROM 6456 . 6644) (MAKEFILE 6646 . 6854)) (6912 19035 (DUMPDB 6922 . 12674) (LOADDB +12676 . 17747) (MAKEDB 17749 . 19033))))) STOP diff --git a/library/DATABASEFNS.LCOM b/library/DATABASEFNS.LCOM index aa806c4c..7f92393e 100644 Binary files a/library/DATABASEFNS.LCOM and b/library/DATABASEFNS.LCOM differ diff --git a/library/GRAPHER b/library/GRAPHER index 6a3331bf..4ec08f14 100644 --- a/library/GRAPHER +++ b/library/GRAPHER @@ -1,21 +1,18 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "14-Mar-2021 20:40:30"  -{DSK}kaplan>Local>medley3.5>git-medley>library>GRAPHER.;5 214171 +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) - changes to%: (VARS GRAPHERCOMS) +(FILECREATED "14-Apr-2026 22:19:19" {DSK}frank>il>medley>library>GRAPHER.;3 215302 - previous date%: "14-May-2018 10:24:38" -{DSK}kaplan>Local>medley3.5>git-medley>library>GRAPHER.;4) + :EDIT-BY "FGH" + :CHANGES-TO (FNS DISPLAYLINK/RL DISPLAYLINK/LR DISPLAYLINK/BT DISPLAYLINK/TB) + + :PREVIOUS-DATE "14-Mar-2021 20:40:30" {DSK}frank>il>medley>library>GRAPHER.;1) -(* ; " -Copyright (c) 1983-1994, 2018, 2021 by Venue & Xerox Corporation. -") (PRETTYCOMPRINT GRAPHERCOMS) (RPAQQ GRAPHERCOMS - [(COMS (* ; "Graph Editing") + [(COMS (* ; "Graph Editing") (FNS ADD/AND/DISPLAY/LINK APPLYTOSELECTEDNODE CALL.MOVENODEFN CHANGE.NODEFONT.SIZE DEFAULT.ADDNODEFN DELETE/AND/DISPLAY/LINK DISPLAY/NAME DISPLAYGRAPH DISPLAYLINK DISPLAYLINK/BT DISPLAYLINK/LR DISPLAYLINK/RL DISPLAYLINK/TB DISPLAYNODE @@ -38,18 +35,18 @@ Copyright (c) 1983-1994, 2018, 2021 by Venue & Xerox Corporation. (CL:WHEN (GETD 'MODERNWINDOW.SETUP) (MODERNWINDOW.SETUP 'APPLYTOSELECTEDNODE))] - (* ;; "Support for EDITSUBGRAPH and EDITREGION") + (* ;; "Support for EDITSUBGRAPH and EDITREGION") (FNS EDITMOVEREGION EDITMOVESUBTREE NOT.TRACKCURSOR RECURSIVE.COLLECTDESCENDENTS MOVEDESCENDENTS COLLECT.CHILD.NODES CREATE.NEW.NODEPOSITION GETBOXPOSITION.FROMINITIALREGION COLLECTDESCENDENTS)) - (COMS (* ; - "functions for finding larger and smaller fonts") + (COMS (* ; + "functions for finding larger and smaller fonts") (FNS NEXTSIZEFONT DECREASING.FONT.LIST SCALE.FONT) [DECLARE%: DONTEVAL@LOAD DOCOPY (VARS (DECREASING.FONT.LIST (DECREASING.FONT.LIST] (GLOBALVARS DECREASING.FONT.LIST)) - (* ; - "functions for LAYOUTGRAPH And LAYOUTLATTICE") + (* ; + "functions for LAYOUTGRAPH And LAYOUTLATTICE") (FNS BRH/LAYOUT BRH/LAYOUT/DAUGHTERS BRH/OFFSET BRHC/INTERTREE/SPACE BRHC/LAYOUT BRHC/LAYOUT/DAUGHTERS BRHC/LAYOUT/TERMINAL BRHC/OFFSET BRHL/LAYOUT BRHL/LAYOUT/DAUGHTERS BRHL/MOVE/RIGHT BROWSE/LAYOUT/HORIZ BROWSE/LAYOUT/HORIZ/COMPACTLY BROWSE/LAYOUT/LATTICE @@ -95,7 +92,7 @@ Copyright (c) 1983-1994, 2018, 2021 by Venue & Xerox Corporation. (LOCALVARS . T) (RECORDS GRAPHNODE GRAPH) (DECLARE%: DONTCOPY (MACROS HALF)) - (COMS (* ; "Grapher image objects") + (COMS (* ; "Grapher image objects") (FNS GRAPHERIMAGEFNS) (FNS GRAPHERCOPYBUTTONEVENTFN GRAPHOBJ.FINDGRAPH) (FNS ALIGNMENTNODE GRAPHOBJ.CHECKALIGN) @@ -303,96 +300,112 @@ Copyright (c) 1983-1994, 2018, 2021 by Venue & Xerox Corporation. NIL]) (DISPLAYLINK/BT - [LAMBDA (TRANS GNB GNT WIDTH OPERATION STREAM PARAMS) + [LAMBDA (TRANS GNB GNT WIDTH OPERATION STREAM PARAMS) (* ; "Edited 14-Apr-2026 22:08 by FGH") (* ; "Edited 29-Apr-94 13:59 by sybalsky") - (* draws a line from the bottom edge of GNB to the top edge of GNT translated - by TRANS) + (* draws a line from the bottom edge of GNB to the top edge of GNT translated by + TRANS) - (APPLY* (OR (LISTGET PARAMS 'DRAWLINKFN) - 'DRAWLINE) - (IPLUS (fetch XCOORD of TRANS) - (fetch XCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNB))) - (IPLUS (fetch YCOORD of TRANS) - (SUB1 (GN/BOTTOM GNB))) - (IPLUS (fetch XCOORD of TRANS) - (fetch XCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNT))) - (IPLUS (fetch YCOORD of TRANS) - (ADD1 (GN/TOP GNT))) - (OR (LISTGET PARAMS 'LINEWIDTH) - WIDTH 1) - OPERATION STREAM (LISTGET PARAMS 'COLOR) - (LISTGET PARAMS 'DASHING) - PARAMS]) + (LET* [(FN (LISTGET PARAMS 'DRAWLINKFN)) + (DFN (AND FN (GETD FN] + (if (AND FN (NOT DFN)) + then (PROMPTPRINT (CONCAT "DISPLAYLINK: DRAWLINKFN " FN " NOT FOUND"))) + (APPLY* (OR (AND DFN FN) + 'DRAWLINE) + (IPLUS (fetch XCOORD of TRANS) + (fetch XCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNB))) + (IPLUS (fetch YCOORD of TRANS) + (SUB1 (GN/BOTTOM GNB))) + (IPLUS (fetch XCOORD of TRANS) + (fetch XCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNT))) + (IPLUS (fetch YCOORD of TRANS) + (ADD1 (GN/TOP GNT))) + (OR (LISTGET PARAMS 'LINEWIDTH) + WIDTH 1) + OPERATION STREAM (LISTGET PARAMS 'COLOR) + (LISTGET PARAMS 'DASHING) + PARAMS]) (DISPLAYLINK/LR - [LAMBDA (TRANS GNL GNR WIDTH OPERATION STREAM PARAMS) + [LAMBDA (TRANS GNL GNR WIDTH OPERATION STREAM PARAMS) (* ; "Edited 14-Apr-2026 22:09 by FGH") (* ; "Edited 29-Apr-94 13:59 by sybalsky") - (* draws a line from the left edge of GNL to the right edge of GNR, translated - by TRANS) + (* draws a line from the left edge of GNL to the right edge of GNR, translated by + TRANS) - (APPLY* (OR (LISTGET PARAMS 'DRAWLINKFN) - 'DRAWLINE) - (IPLUS (fetch XCOORD of TRANS) - (SUB1 (GN/LEFT GNL))) - (IPLUS (fetch YCOORD of TRANS) - (fetch YCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNL))) - (IPLUS (fetch XCOORD of TRANS) - (ADD1 (GN/RIGHT GNR))) - (IPLUS (fetch YCOORD of TRANS) - (fetch YCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNR))) - (OR (LISTGET PARAMS 'LINEWIDTH) - WIDTH 1) - OPERATION STREAM (LISTGET PARAMS 'COLOR) - (LISTGET PARAMS 'DASHING) - PARAMS]) + (LET* [(FN (LISTGET PARAMS 'DRAWLINKFN)) + (DFN (AND FN (GETD FN] + (if (AND FN (NOT DFN)) + then (PROMPTPRINT (CONCAT "DISPLAYLINK: DRAWLINKFN " FN " NOT FOUND"))) + (APPLY* (OR (AND DFN FN) + 'DRAWLINE) + (IPLUS (fetch XCOORD of TRANS) + (SUB1 (GN/LEFT GNL))) + (IPLUS (fetch YCOORD of TRANS) + (fetch YCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNL))) + (IPLUS (fetch XCOORD of TRANS) + (ADD1 (GN/RIGHT GNR))) + (IPLUS (fetch YCOORD of TRANS) + (fetch YCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNR))) + (OR (LISTGET PARAMS 'LINEWIDTH) + WIDTH 1) + OPERATION STREAM (LISTGET PARAMS 'COLOR) + (LISTGET PARAMS 'DASHING) + PARAMS]) (DISPLAYLINK/RL - [LAMBDA (TRANS GNR GNL WIDTH OPERATION STREAM PARAMS) + [LAMBDA (TRANS GNR GNL WIDTH OPERATION STREAM PARAMS) (* ; "Edited 14-Apr-2026 22:09 by FGH") (* ; "Edited 29-Apr-94 13:59 by sybalsky") - (* draws a line from the right edge of GNR, to the left edge of GNL translated - by TRANS) + (* draws a line from the right edge of GNR, to the left edge of GNL translated by + TRANS) - (APPLY* (OR (LISTGET PARAMS 'DRAWLINKFN) - 'DRAWLINE) - (IPLUS (fetch XCOORD of TRANS) - (ADD1 (GN/RIGHT GNR))) - (IPLUS (fetch YCOORD of TRANS) - (fetch YCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNR))) - (IPLUS (fetch XCOORD of TRANS) - (SUB1 (GN/LEFT GNL))) - (IPLUS (fetch YCOORD of TRANS) - (fetch YCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNL))) - (OR (LISTGET PARAMS 'LINEWIDTH) - WIDTH 1) - OPERATION STREAM (LISTGET PARAMS 'COLOR) - (LISTGET PARAMS 'DASHING) - PARAMS]) + (LET* [(FN (LISTGET PARAMS 'DRAWLINKFN)) + (DFN (AND FN (GETD FN] + (if (AND FN (NOT DFN)) + then (PROMPTPRINT (CONCAT "DISPLAYLINK: DRAWLINKFN " FN " NOT FOUND"))) + (APPLY* (OR (AND DFN FN) + 'DRAWLINE) + (IPLUS (fetch XCOORD of TRANS) + (ADD1 (GN/RIGHT GNR))) + (IPLUS (fetch YCOORD of TRANS) + (fetch YCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNR))) + (IPLUS (fetch XCOORD of TRANS) + (SUB1 (GN/LEFT GNL))) + (IPLUS (fetch YCOORD of TRANS) + (fetch YCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNL))) + (OR (LISTGET PARAMS 'LINEWIDTH) + WIDTH 1) + OPERATION STREAM (LISTGET PARAMS 'COLOR) + (LISTGET PARAMS 'DASHING) + PARAMS]) (DISPLAYLINK/TB - [LAMBDA (TRANS GNT GNB WIDTH OPERATION STREAM PARAMS) + [LAMBDA (TRANS GNT GNB WIDTH OPERATION STREAM PARAMS) (* ; "Edited 14-Apr-2026 22:09 by FGH") (* ; "Edited 29-Apr-94 13:59 by sybalsky") - (* draws a line from the top edge of GNT to the bottom edge of GNR, translated - by TRANS) + (* draws a line from the top edge of GNT to the bottom edge of GNR, translated by + TRANS) - (APPLY* (OR (LISTGET PARAMS 'DRAWLINKFN) - 'DRAWLINE) - (IPLUS (fetch XCOORD of TRANS) - (fetch XCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNT))) - (IPLUS (fetch YCOORD of TRANS) - (ADD1 (GN/TOP GNT))) - (IPLUS (fetch XCOORD of TRANS) - (fetch XCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNB))) - (IPLUS (fetch YCOORD of TRANS) - (SUB1 (GN/BOTTOM GNB))) - (OR (LISTGET PARAMS 'LINEWIDTH) - WIDTH 1) - OPERATION STREAM (LISTGET PARAMS 'COLOR) - (LISTGET PARAMS 'DASHING) - PARAMS]) + (LET* [(FN (LISTGET PARAMS 'DRAWLINKFN)) + (DFN (AND FN (GETD FN] + (if (AND FN (NOT DFN)) + then (PROMPTPRINT (CONCAT "DISPLAYLINK: DRAWLINKFN " FN " NOT FOUND"))) + (APPLY* (OR (AND DFN FN) + 'DRAWLINE) + (IPLUS (fetch XCOORD of TRANS) + (fetch XCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNT))) + (IPLUS (fetch YCOORD of TRANS) + (ADD1 (GN/TOP GNT))) + (IPLUS (fetch XCOORD of TRANS) + (fetch XCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNB))) + (IPLUS (fetch YCOORD of TRANS) + (SUB1 (GN/BOTTOM GNB))) + (OR (LISTGET PARAMS 'LINEWIDTH) + WIDTH 1) + OPERATION STREAM (LISTGET PARAMS 'COLOR) + (LISTGET PARAMS 'DASHING) + PARAMS]) (DISPLAYNODE [LAMBDA (NODE TRANS STREAM G TOSONLY) (* kvl "10-Aug-84 19:08") @@ -2014,7 +2027,7 @@ Copyright (c) 1983-1994, 2018, 2021 by Venue & Xerox Corporation. of N]) ) - (* Was MODERNIZE loaded before?) + (* Was MODERNIZE loaded before?) (CL:WHEN (GETD 'MODERNWINDOW.SETUP) (MODERNWINDOW.SETUP 'APPLYTOSELECTEDNODE)) @@ -3075,7 +3088,7 @@ Copyright (c) 1983-1994, 2018, 2021 by Venue & Xerox Corporation. (RPAQQ GRAPH/HARDCOPY/FORMAT (MODE PORTRAIT PAGENUMBERS T TRANS NIL)) (RPAQ? DEFAULT.GRAPH.WINDOWSIZE (LIST (TIMES SCREENWIDTH 0.7) - (TIMES SCREENHEIGHT 0.4))) + (TIMES SCREENHEIGHT 0.4))) (RPAQ? EDITGRAPHMENUCOMMANDS '((Move% Node 'MOVENODE "Moves a single node in the graph." (SUBITEMS (|Move Single Node| @@ -3113,19 +3126,19 @@ Copyright (c) 1983-1994, 2018, 2021 by Venue & Xerox Corporation. (DECLARE%: EVAL@COMPILE (RECORD GRAPHNODE (NODEID NODEPOSITION NODELABELBITMAP NIL NODELABELSHADE NODEWIDTH NODEHEIGHT - TONODES FROMNODES NODEFONT NODELABEL NODEBORDER) - NODEBORDER _ DEFAULT.GRAPH.NODEBORDER NODELABELSHADE _ - DEFAULT.GRAPH.NODELABELSHADE NODEFONT _ DEFAULT.GRAPH.NODEFONT) + TONODES FROMNODES NODEFONT NODELABEL NODEBORDER) + NODEBORDER _ DEFAULT.GRAPH.NODEBORDER NODELABELSHADE _ DEFAULT.GRAPH.NODELABELSHADE + NODEFONT _ DEFAULT.GRAPH.NODEFONT) -(RECORD GRAPH (GRAPHNODES SIDESFLG DIRECTEDFLG GRAPH.MOVENODEFN GRAPH.ADDNODEFN - GRAPH.DELETENODEFN GRAPH.ADDLINKFN GRAPH.DELETELINKFN GRAPH.FONTCHANGEFN - GRAPH.INVERTBORDERFN GRAPH.INVERTLABELFN GRAPH.CHANGELABELFN . GRAPH.PROPS)) +(RECORD GRAPH (GRAPHNODES SIDESFLG DIRECTEDFLG GRAPH.MOVENODEFN GRAPH.ADDNODEFN GRAPH.DELETENODEFN + GRAPH.ADDLINKFN GRAPH.DELETELINKFN GRAPH.FONTCHANGEFN GRAPH.INVERTBORDERFN + GRAPH.INVERTLABELFN GRAPH.CHANGELABELFN . GRAPH.PROPS)) ) (DECLARE%: DONTCOPY (DECLARE%: EVAL@COMPILE (PUTPROPS HALF MACRO ((X) - (LRSH X 1))) + (LRSH X 1))) ) ) @@ -3789,61 +3802,59 @@ Copyright (c) 1983-1994, 2018, 2021 by Venue & Xerox Corporation. ) (ADDTOVAR IMAGEOBJGETFNS (GRAPHOBJ.GETFN)) -(PUTPROPS GRAPHER COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 1991 -1992 1993 1994 2018 2021)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (7195 111244 (ADD/AND/DISPLAY/LINK 7205 . 7907) (APPLYTOSELECTEDNODE 7909 . 8397) ( -CALL.MOVENODEFN 8399 . 8748) (CHANGE.NODEFONT.SIZE 8750 . 10062) (DEFAULT.ADDNODEFN 10064 . 10862) ( -DELETE/AND/DISPLAY/LINK 10864 . 12431) (DISPLAY/NAME 12433 . 12604) (DISPLAYGRAPH 12606 . 14977) ( -DISPLAYLINK 14979 . 17532) (DISPLAYLINK/BT 17534 . 18556) (DISPLAYLINK/LR 18558 . 19581) ( -DISPLAYLINK/RL 19583 . 20606) (DISPLAYLINK/TB 20608 . 21631) (DISPLAYNODE 21633 . 21981) ( -ERASE/GRAPHNODE 21983 . 23090) (DISPLAYNODE 23092 . 23440) (DISPLAYNODELINKS 23442 . 24586) ( -DRAW/GRAPHNODE/BORDER 24588 . 25507) (DRAWAREABOX 25509 . 26710) (EDITADDLINK 26712 . 27110) ( -EDITADDNODE 27112 . 29201) (EDITAPPLYTOLINK 29203 . 31282) (EDITCHANGEFONT 31284 . 32456) ( -EDITCHANGELABEL 32458 . 33999) (EDITDELETELINK 34001 . 34407) (EDITDELETENODE 34409 . 37110) ( -EDITGRAPH 37112 . 37179) (EDITGRAPH1 37181 . 37939) (EDITGRAPH2 37941 . 39672) (EDITMOVENODE 39674 . -41251) (EDITTOGGLEBORDER 41253 . 42549) (EDITTOGGLELABEL 42551 . 43848) (FILL/GRAPHNODE/LABEL 43850 . -44678) (FIX/SCALE 44680 . 45236) (FLIPNODE 45238 . 45842) (FONTNAMELIST 45844 . 46063) (FROMLINKS -46065 . 46235) (GETNODEFROMID 46237 . 47256) (GN/BOTTOM 47258 . 47534) (GN/LEFT 47536 . 47809) ( -GN/RIGHT 47811 . 48202) (GN/TOP 48204 . 48628) (GRAPHADDLINK 48630 . 49189) (GRAPHADDNODE 49191 . -49980) (GRAPHBUTTONEVENTFN 49982 . 52162) (GRAPHCHANGELABEL 52164 . 52607) (GRAPHDELETELINK 52609 . -53917) (GRAPHDELETENODE 53919 . 54451) (GRAPHEDITCOMMANDFN 54453 . 55837) (GRAPHEDITEVENTFN 55839 . -56550) (GRAPHER/CENTERPRINTINAREA 56552 . 57316) (GRAPHERPROP 57318 . 57862) (GRAPHNODE/BORDER/WIDTH -57864 . 58385) (GRAPHREGION 58387 . 59556) (HARDCOPYGRAPH 59558 . 66940) (INTERSECT/REGIONP/LBWH 66942 - . 68218) (INVERTED/GRAPHNODE/BORDER 68220 . 68804) (INVERTED/SHADE/FOR/GRAPHER 68806 . 69438) ( -LAYOUT/POSITION 69440 . 69619) (LINKPARAMETERS 69621 . 70073) (MAX/RIGHT 70075 . 70277) (MAX/TOP 70279 - . 70477) (MEASUREGRAPHNODE 70479 . 70928) (MEMBTONODES 70930 . 71455) (MIN/BOTTOM 71457 . 71838) ( -MIN/LEFT 71840 . 72215) (MOVENODE 72217 . 73460) (NODECREATE 73462 . 74242) (NODELST/AS/MENU 74244 . -75844) (NODEREGION 75846 . 76306) (PRINTDISPLAYNODE 76308 . 81366) (PROMPTINWINDOW 81368 . 84177) ( -READ/NODE 84179 . 85293) (REDISPLAYGRAPH 85295 . 85737) (REMOVETONODES 85739 . 86260) ( -RESET/NODE/BORDER 86262 . 88049) (RESET/NODE/LABELSHADE 88051 . 89566) (SCALE/GRAPH 89568 . 95854) ( -SCALE/GRAPHNODE/BORDER 95856 . 96551) (SCALE/TONODES 96553 . 97434) (SET/LABEL/SIZE 97436 . 100382) ( -SET/LAYOUT/POSITION 100384 . 100869) (SHOWGRAPH 100871 . 102670) (SIZE/GRAPH/WINDOW 102672 . 106156) ( -TOGGLE/DIRECTEDFLG 106158 . 106788) (TOGGLE/SIDESFLG 106790 . 107278) (TOLINKS 107280 . 107446) ( -TRACKCURSOR 107448 . 108855) (TRACKNODE 108857 . 109493) (TRANSGRAPH 109495 . 111242)) (111485 128102 -(EDITMOVEREGION 111495 . 115298) (EDITMOVESUBTREE 115300 . 117077) (NOT.TRACKCURSOR 117079 . 120057) ( -RECURSIVE.COLLECTDESCENDENTS 120059 . 121547) (MOVEDESCENDENTS 121549 . 123611) (COLLECT.CHILD.NODES -123613 . 124729) (CREATE.NEW.NODEPOSITION 124731 . 125271) (GETBOXPOSITION.FROMINITIALREGION 125273 . -126745) (COLLECTDESCENDENTS 126747 . 128100)) (128166 130455 (NEXTSIZEFONT 128176 . 129366) ( -DECREASING.FONT.LIST 129368 . 129694) (SCALE.FONT 129696 . 130453)) (130679 169831 (BRH/LAYOUT 130689 - . 132433) (BRH/LAYOUT/DAUGHTERS 132435 . 133381) (BRH/OFFSET 133383 . 134061) (BRHC/INTERTREE/SPACE -134063 . 135381) (BRHC/LAYOUT 135383 . 137239) (BRHC/LAYOUT/DAUGHTERS 137241 . 140195) ( -BRHC/LAYOUT/TERMINAL 140197 . 140878) (BRHC/OFFSET 140880 . 141776) (BRHL/LAYOUT 141778 . 144002) ( -BRHL/LAYOUT/DAUGHTERS 144004 . 145762) (BRHL/MOVE/RIGHT 145764 . 146907) (BROWSE/LAYOUT/HORIZ 146909 - . 147633) (BROWSE/LAYOUT/HORIZ/COMPACTLY 147635 . 150441) (BROWSE/LAYOUT/LATTICE 150443 . 151299) ( -BRV/OFFSET 151301 . 152164) (EXTEND/TRANSITION/CHAIN 152166 . 153437) (FOREST/BREAK/CYCLES 153439 . -154369) (INIT/NODES/FOR/LAYOUT 154371 . 155866) (INTERPRET/MARK/FORMAT 155868 . 157135) ( -LATTICE/BREAK/CYCLES 157137 . 157841) (LAYOUTFOREST 157843 . 158544) (LAYOUTGRAPH 158546 . 162013) ( -LAYOUTLATTICE 162015 . 163468) (LAYOUTSEXPR 163470 . 164541) (LAYOUTSEXPR1 164543 . 165245) ( -MARK/GRAPH/NODE 165247 . 165977) (NEW/INSTANCE/OF/GRAPHNODE 165979 . 167348) (RAISE/TRANSITION/CHAIN -167350 . 167751) (REFLECT/GRAPH/DIAGONALLY 167753 . 168482) (REFLECT/GRAPH/HORIZONTALLY 168484 . -169010) (REFLECT/GRAPH/VERTICALLY 169012 . 169536) (SWITCH/NODE/HEIGHT/WIDTH 169538 . 169829)) (173177 - 174528 (GRAPHERIMAGEFNS 173187 . 174526)) (174529 176257 (GRAPHERCOPYBUTTONEVENTFN 174539 . 175518) ( -GRAPHOBJ.FINDGRAPH 175520 . 176255)) (176258 178878 (ALIGNMENTNODE 176268 . 177690) ( -GRAPHOBJ.CHECKALIGN 177692 . 178876)) (178879 194729 (GRAPHEROBJ 178889 . 180635) ( -GRAPHOBJ.BUTTONEVENTINFN 180637 . 182064) (GRAPHOBJ.COPYBUTTONEVENTFN 182066 . 182503) ( -GRAPHOBJ.COPYFN 182505 . 183429) (GRAPHOBJ.DISPLAYFN 183431 . 186246) (GRAPHOBJ.GETALIGN 186248 . -186987) (GRAPHOBJ.GETFN 186989 . 188494) (GRAPHOBJ.IMAGEBOXFN 188496 . 192512) (GRAPHOBJ.PUTALIGN -192514 . 193344) (GRAPHOBJ.PUTFN 193346 . 194727)) (194730 213882 (COPYGRAPH 194740 . 196288) ( -DUMPGRAPH 196290 . 206546) (READGRAPH 206548 . 213880))))) + (FILEMAP (NIL (7149 112538 (ADD/AND/DISPLAY/LINK 7159 . 7861) (APPLYTOSELECTEDNODE 7863 . 8351) ( +CALL.MOVENODEFN 8353 . 8702) (CHANGE.NODEFONT.SIZE 8704 . 10016) (DEFAULT.ADDNODEFN 10018 . 10816) ( +DELETE/AND/DISPLAY/LINK 10818 . 12385) (DISPLAY/NAME 12387 . 12558) (DISPLAYGRAPH 12560 . 14931) ( +DISPLAYLINK 14933 . 17486) (DISPLAYLINK/BT 17488 . 18845) (DISPLAYLINK/LR 18847 . 20205) ( +DISPLAYLINK/RL 20207 . 21565) (DISPLAYLINK/TB 21567 . 22925) (DISPLAYNODE 22927 . 23275) ( +ERASE/GRAPHNODE 23277 . 24384) (DISPLAYNODE 24386 . 24734) (DISPLAYNODELINKS 24736 . 25880) ( +DRAW/GRAPHNODE/BORDER 25882 . 26801) (DRAWAREABOX 26803 . 28004) (EDITADDLINK 28006 . 28404) ( +EDITADDNODE 28406 . 30495) (EDITAPPLYTOLINK 30497 . 32576) (EDITCHANGEFONT 32578 . 33750) ( +EDITCHANGELABEL 33752 . 35293) (EDITDELETELINK 35295 . 35701) (EDITDELETENODE 35703 . 38404) ( +EDITGRAPH 38406 . 38473) (EDITGRAPH1 38475 . 39233) (EDITGRAPH2 39235 . 40966) (EDITMOVENODE 40968 . +42545) (EDITTOGGLEBORDER 42547 . 43843) (EDITTOGGLELABEL 43845 . 45142) (FILL/GRAPHNODE/LABEL 45144 . +45972) (FIX/SCALE 45974 . 46530) (FLIPNODE 46532 . 47136) (FONTNAMELIST 47138 . 47357) (FROMLINKS +47359 . 47529) (GETNODEFROMID 47531 . 48550) (GN/BOTTOM 48552 . 48828) (GN/LEFT 48830 . 49103) ( +GN/RIGHT 49105 . 49496) (GN/TOP 49498 . 49922) (GRAPHADDLINK 49924 . 50483) (GRAPHADDNODE 50485 . +51274) (GRAPHBUTTONEVENTFN 51276 . 53456) (GRAPHCHANGELABEL 53458 . 53901) (GRAPHDELETELINK 53903 . +55211) (GRAPHDELETENODE 55213 . 55745) (GRAPHEDITCOMMANDFN 55747 . 57131) (GRAPHEDITEVENTFN 57133 . +57844) (GRAPHER/CENTERPRINTINAREA 57846 . 58610) (GRAPHERPROP 58612 . 59156) (GRAPHNODE/BORDER/WIDTH +59158 . 59679) (GRAPHREGION 59681 . 60850) (HARDCOPYGRAPH 60852 . 68234) (INTERSECT/REGIONP/LBWH 68236 + . 69512) (INVERTED/GRAPHNODE/BORDER 69514 . 70098) (INVERTED/SHADE/FOR/GRAPHER 70100 . 70732) ( +LAYOUT/POSITION 70734 . 70913) (LINKPARAMETERS 70915 . 71367) (MAX/RIGHT 71369 . 71571) (MAX/TOP 71573 + . 71771) (MEASUREGRAPHNODE 71773 . 72222) (MEMBTONODES 72224 . 72749) (MIN/BOTTOM 72751 . 73132) ( +MIN/LEFT 73134 . 73509) (MOVENODE 73511 . 74754) (NODECREATE 74756 . 75536) (NODELST/AS/MENU 75538 . +77138) (NODEREGION 77140 . 77600) (PRINTDISPLAYNODE 77602 . 82660) (PROMPTINWINDOW 82662 . 85471) ( +READ/NODE 85473 . 86587) (REDISPLAYGRAPH 86589 . 87031) (REMOVETONODES 87033 . 87554) ( +RESET/NODE/BORDER 87556 . 89343) (RESET/NODE/LABELSHADE 89345 . 90860) (SCALE/GRAPH 90862 . 97148) ( +SCALE/GRAPHNODE/BORDER 97150 . 97845) (SCALE/TONODES 97847 . 98728) (SET/LABEL/SIZE 98730 . 101676) ( +SET/LAYOUT/POSITION 101678 . 102163) (SHOWGRAPH 102165 . 103964) (SIZE/GRAPH/WINDOW 103966 . 107450) ( +TOGGLE/DIRECTEDFLG 107452 . 108082) (TOGGLE/SIDESFLG 108084 . 108572) (TOLINKS 108574 . 108740) ( +TRACKCURSOR 108742 . 110149) (TRACKNODE 110151 . 110787) (TRANSGRAPH 110789 . 112536)) (112779 129396 +(EDITMOVEREGION 112789 . 116592) (EDITMOVESUBTREE 116594 . 118371) (NOT.TRACKCURSOR 118373 . 121351) ( +RECURSIVE.COLLECTDESCENDENTS 121353 . 122841) (MOVEDESCENDENTS 122843 . 124905) (COLLECT.CHILD.NODES +124907 . 126023) (CREATE.NEW.NODEPOSITION 126025 . 126565) (GETBOXPOSITION.FROMINITIALREGION 126567 . +128039) (COLLECTDESCENDENTS 128041 . 129394)) (129460 131749 (NEXTSIZEFONT 129470 . 130660) ( +DECREASING.FONT.LIST 130662 . 130988) (SCALE.FONT 130990 . 131747)) (131973 171125 (BRH/LAYOUT 131983 + . 133727) (BRH/LAYOUT/DAUGHTERS 133729 . 134675) (BRH/OFFSET 134677 . 135355) (BRHC/INTERTREE/SPACE +135357 . 136675) (BRHC/LAYOUT 136677 . 138533) (BRHC/LAYOUT/DAUGHTERS 138535 . 141489) ( +BRHC/LAYOUT/TERMINAL 141491 . 142172) (BRHC/OFFSET 142174 . 143070) (BRHL/LAYOUT 143072 . 145296) ( +BRHL/LAYOUT/DAUGHTERS 145298 . 147056) (BRHL/MOVE/RIGHT 147058 . 148201) (BROWSE/LAYOUT/HORIZ 148203 + . 148927) (BROWSE/LAYOUT/HORIZ/COMPACTLY 148929 . 151735) (BROWSE/LAYOUT/LATTICE 151737 . 152593) ( +BRV/OFFSET 152595 . 153458) (EXTEND/TRANSITION/CHAIN 153460 . 154731) (FOREST/BREAK/CYCLES 154733 . +155663) (INIT/NODES/FOR/LAYOUT 155665 . 157160) (INTERPRET/MARK/FORMAT 157162 . 158429) ( +LATTICE/BREAK/CYCLES 158431 . 159135) (LAYOUTFOREST 159137 . 159838) (LAYOUTGRAPH 159840 . 163307) ( +LAYOUTLATTICE 163309 . 164762) (LAYOUTSEXPR 164764 . 165835) (LAYOUTSEXPR1 165837 . 166539) ( +MARK/GRAPH/NODE 166541 . 167271) (NEW/INSTANCE/OF/GRAPHNODE 167273 . 168642) (RAISE/TRANSITION/CHAIN +168644 . 169045) (REFLECT/GRAPH/DIAGONALLY 169047 . 169776) (REFLECT/GRAPH/HORIZONTALLY 169778 . +170304) (REFLECT/GRAPH/VERTICALLY 170306 . 170830) (SWITCH/NODE/HEIGHT/WIDTH 170832 . 171123)) (174438 + 175789 (GRAPHERIMAGEFNS 174448 . 175787)) (175790 177518 (GRAPHERCOPYBUTTONEVENTFN 175800 . 176779) ( +GRAPHOBJ.FINDGRAPH 176781 . 177516)) (177519 180139 (ALIGNMENTNODE 177529 . 178951) ( +GRAPHOBJ.CHECKALIGN 178953 . 180137)) (180140 195990 (GRAPHEROBJ 180150 . 181896) ( +GRAPHOBJ.BUTTONEVENTINFN 181898 . 183325) (GRAPHOBJ.COPYBUTTONEVENTFN 183327 . 183764) ( +GRAPHOBJ.COPYFN 183766 . 184690) (GRAPHOBJ.DISPLAYFN 184692 . 187507) (GRAPHOBJ.GETALIGN 187509 . +188248) (GRAPHOBJ.GETFN 188250 . 189755) (GRAPHOBJ.IMAGEBOXFN 189757 . 193773) (GRAPHOBJ.PUTALIGN +193775 . 194605) (GRAPHOBJ.PUTFN 194607 . 195988)) (195991 215143 (COPYGRAPH 196001 . 197549) ( +DUMPGRAPH 197551 . 207807) (READGRAPH 207809 . 215141))))) STOP diff --git a/library/GRAPHER.LCOM b/library/GRAPHER.LCOM index b2dd5625..dc21e426 100644 Binary files a/library/GRAPHER.LCOM and b/library/GRAPHER.LCOM differ diff --git a/library/IMPORTFONTS b/library/IMPORTFONTS new file mode 100644 index 00000000..460c1507 --- /dev/null +++ b/library/IMPORTFONTS @@ -0,0 +1,877 @@ +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8) + +(FILECREATED " 5-May-2026 12:21:37" {MEDLEY}IMPORTFONTS.;116 58246 + + :EDIT-BY rmk + + :CHANGES-TO (FNS PEF) + + :PREVIOUS-DATE " 4-May-2026 15:26:51" {MEDLEY}IMPORTFONTS.;115) + + +(PRETTYCOMPRINT IMPORTFONTSCOMS) + +(RPAQQ IMPORTFONTSCOMS + ((FNS IMPORTFONTS FONT.TO.MCCS IMPORTFONTS.FONTSPECS IMPORTFONTS.CONTEXT IMPORTFONTS.NOCACHE + IMPORTFONTS.DIRECTORY IMPORTFONTS.CLEAR IMPORTFONTS.SUBDIR IMPORTFONTS.DIRSIZE) + (FNS IMPORTFONTS.AVAILABLE IMPORTFONTS.EXISTS?) + (FNS FAKEFACE FAKEFACE.FROMFILE FAKEFACE.FROMFONT) + (COMS (* ; "For legacy display imports") + (FNS IMPORT.DISPLAY LEGACYDISPLAYFONT) + (FILES ACFONT)) + (COMS (* ; "For testing") + (FNS IPF IPFSIZES) + (FNS PEF AEF IEF MEF CEF FEF DEF EFCLOSE) + (FNS SHOWCHARS CSSOURCE FONTDEFFONTS) + (FILES EDITFONT)))) +(DEFINEQ + +(IMPORTFONTS + [LAMBDA (PHASE FONTSPECS DEVICE FROMDIR TODIR IMPORTFN NODRIBBLE) + (* ; "Edited 4-May-2026 13:49 by rmk") + (* ; "Edited 11-Apr-2026 10:55 by rmk") + (* ; "Edited 5-Apr-2026 14:22 by rmk") + (* ; "Edited 3-Apr-2026 08:15 by rmk") + (* ; "Edited 1-Apr-2026 08:25 by rmk") + (* ; "Edited 30-Mar-2026 16:41 by rmk") + (* ; "Edited 29-Mar-2026 11:33 by rmk") + (* ; "Edited 26-Mar-2026 12:47 by rmk") + (* ; "Edited 24-Mar-2026 15:00 by rmk") + (* ; "Edited 21-Mar-2026 11:16 by rmk") + (* ; "Edited 4-Mar-2026 09:44 by rmk") + (* ; "Edited 9-Oct-2025 15:56 by rmk") + + (* ;; "Device-dependent IMPORTFN must be provided if PHASE is IMPORT, the other phases (MCCS, COMPLETE, FAKE) operate on Medleyfont files.") + + (* ;; "If PHASE is MCCS, recodes source FONTSPECS to MCCS without completion, otherwise coerces/completes the specified MCCS fonts.") + + (* ;; "Unless TODIRECTORY=DONT, writes the resultiing fonts Medley fontfiles, otherwise collects and returns them in a list (which will eat up storage). ") + + (CL:UNLESS (MEMB (SETQ PHASE (U-CASE PHASE)) + '(IMPORT MCCS COMPLETE FAKE DEPLOY)) + (\ILLEGAL.ARG PHASE)) + (CL:UNLESS DEVICE + (SETQ DEVICE 'DISPLAY)) + (CL:WHEN (AND (EQ PHASE 'IMPORT) + (NOT (GETD IMPORTFN))) + (ERROR "Importing from source requires an IMPORTFN")) + (PROG1 + (RESETLST (* ; + "Close dribble outside of this context") + (CL:MULTIPLE-VALUE-SETQ (FROMDIR TODIR) + (IMPORTFONTS.CONTEXT PHASE FROMDIR TODIR DEVICE)) + (IMPORTFONTS.CLEAR PHASE FONTSPECS TODIR DEVICE) + (SETQ FONTSPECS (IMPORTFONTS.FONTSPECS PHASE FONTSPECS FROMDIR DEVICE)) + (CL:WHEN (AND (IGEQ (LENGTH FONTSPECS) + 5) + (NOT NODRIBBLE)) (* ; + "Put all the dribbles together one up") + [DRIBBLE (PSEUDOFILENAME (PACKFILENAME 'BODY + (OR (SUBSTRING TODIR 1 + (STRPOS ">" TODIR -2 NIL NIL NIL NIL T)) + LOGINHOST/DIR) + 'NAME PHASE 'EXTENSION 'DRIBBLE] + (PRINTOUT T "Dribbling to " (FULLNAME (DRIBBLEFILE)) + T)) + (PRINTOUT T (SELECTQ PHASE + (IMPORT "Importing ") + (MCCS "MCCS recoding ") + (COMPLETE "Completing ") + (FAKE "Faking ") + (DEPLOY "Deploying ") + NIL) + (LENGTH FONTSPECS) + " " DEVICE " font" (CL:IF (IGEQ (LENGTH FONTSPECS) + 2) + "s" + "")) + (if TODIR + then (PRINTOUT T 3 "from " FROMDIR 3 "to " TODIR T) + else (PRINTOUT T " from " FROMDIR T 3 "(but not writing)" T)) + (BKSYSBUF " ") + (IMPORTFONTS.CLEAR PHASE FONTSPECS TODIR DEVICE) + (for FS FONT FONT FONTSTART TOFILE FROMFILE CAPTIONS THISTIME FROMSIZE TOSIZE CHANGED + NOTINSTANTIATED TOTALTIME TODIRSIZE (FROMDIRSIZE ← (CL:IF (EQ PHASE 'IMPORT) + 0 + (IMPORTFONTS.DIRSIZE PHASE + DEVICE FROMDIR))) + (NNOCHARSETS ← 0) in FONTSPECS as I from 1 first (SETQ TOTALTIME (CLOCK 0)) + eachtime (PRINTOUT T .I3 I ". " (fetch (FONTSPEC FSFAMILY) of FS) + " " .I2 (fetch (FONTSPEC FSSIZE) of FS) + " " + (FONTFACETOATOM (fetch (FONTSPEC FSFACE) of FS))) + (SETQ THISTIME (CLOCK 0)) + collect (SELECTQ PHASE + (IMPORT (SETQ FONT (APPLY* IMPORTFN FS FROMDIR)) + (SETQ CHANGED T)) + ((MCCS COMPLETE) + (SETQ FROMFILE (INFILEP (MEDLEYFONT.FILENAME FS FROMDIR))) + (if FROMFILE + then (SETQ FONT (MEDLEYFONT.READ.FONT FROMFILE 'ALL)) + (SETQ FROMSIZE (GETFILEINFO FROMFILE 'LENGTH)) + else (SETQ FONT (FONTCREATE.SLUGFD FS)) + (SETQ FROMSIZE 0)) + (SETQ CHANGED (SELECTQ PHASE + (MCCS (FONT.TO.MCCS FONT)) + (COMPLETE (COMPLETE.FONT FONT T)) + NIL))) + (FAKE (CL:MULTIPLE-VALUE-SETQ (FONT FROMFILE) + (FAKEFACE.FROMFONT FS FROMDIR)) + (SETQ FROMSIZE (GETFILEINFO FROMFILE 'LENGTH)) + (SETQ CHANGED (FAKEFACE FONT))) + (DEPLOY (SETQ FROMFILE (MEDLEYFONT.FILENAME FS FROMDIR)) + (SETQ FROMSIZE (GETFILEINFO FROMFILE 'LENGTH))) + NIL) + (CL:WHEN [SETQ NOTINSTANTIATED (EQ 0 (FONTPROP FONT 'NINSTANTIATEDCHARSETS] + (add NNOCHARSETS 1)) + (CL:WHEN TODIR + (SETQ TOFILE (MEDLEYFONT.FILENAME FS TODIR)) + (SETQ TOFILE (CL:IF CHANGED + (MEDLEYFONT.WRITE.FONT FONT TOFILE) + (COPYFILE FROMFILE TOFILE)))) + (SETQ THISTIME (FQUOTIENT (IDIFFERENCE (CLOCK 0) + THISTIME) + 1000)) + (if NOTINSTANTIATED + then (PRINTOUT T 26 "No instantiated charsets" 41 .F7.2 THISTIME) + elseif TOFILE + then (SETQ TOSIZE (GETFILEINFO TOFILE 'LENGTH)) + (SELECTQ PHASE + (IMPORT (PRINTOUT T 25 .I6 TOSIZE " " .F7.2 THISTIME)) + ((MCCS COMPLETE FAKE DEPLOY) + (if CHANGED + then (PRINTOUT T 25 .I6 FROMSIZE " -> " .I6 TOSIZE " " + .F6.2 THISTIME 50 .I5 (IDIFFERENCE TOSIZE + FROMSIZE)) + else (PRINTOUT T 28 "Copied " .I6 TOSIZE " " .F6.2 THISTIME) + )) + NIL)) + (TERPRI T) + (CL:IF TODIR + TOFILE + FONT) finally (SETQ TOTALTIME (FIXR (FQUOTIENT (IDIFFERENCE (CLOCK 0) + TOTALTIME) + 1000))) + (PRINTOUT T 4 (IDIFFERENCE (LENGTH $$VAL) + NNOCHARSETS) + " font" + (CL:IF (IGEQ (LENGTH $$VAL) + 2) + "s " + " ") + (SELECTQ PHASE + (IMPORT "imported") + (MCCS "recoded to MCCS") + (COMPLETE "completed") + (FAKE "faked") + (DEPLOY "deployed") + NIL)) + (if TODIR + then (SETQ TODIRSIZE (IMPORTFONTS.DIRSIZE PHASE DEVICE TODIR + )) + (PRINTOUT T " and written in " TOTALTIME " seconds" 4 + "Total size is " (FIXR (FQUOTIENT TODIRSIZE 1024 + )) + " KB, grew by " + (FIXR (FQUOTIENT (IDIFFERENCE TODIRSIZE + FROMDIRSIZE) + 1024)) + " KB" T) + (CL:UNLESS (EQ 0 NNOCHARSETS) + (PRINTOUT T 4 NNOCHARSETS + " fonts had no character sets" T)) + (CL:WHEN (AND TODIR (IGEQ (LENGTH $$VAL) + 5)) + (SETQ $$VAL TODIR)) + else (PRINTOUT T " (but not written) in " TOTALTIME " seconds" + T)))) + (CL:WHEN (DRIBBLEFILE) + (PRINTOUT T "Dribbled to " (FULLNAME (DRIBBLEFILE)) + T) + [TEDIT (DRIBBLE) + 'Dribble NIL `(TITLE ,(CONCAT PHASE " font dribble" " " (DATE)) + LEAVETTY T READONLY QUIET PARABREAKCHARS NIL FONT DEFAULTFONT + OPENWIDTH ,(fetch (REGION WIDTH) of (WINDOWPROP (WFROMDS + T) + 'REGION)) + OPENHEIGHT + ,(fetch (REGION HEIGHT) of (WINDOWPROP (WFROMDS T) + 'REGION]))]) + +(FONT.TO.MCCS + [LAMBDA (FONT) (* ; "Edited 11-Apr-2026 15:43 by rmk") + (* ; "Edited 10-Mar-2026 00:23 by rmk") + (* ; "Edited 7-Mar-2026 12:55 by rmk") + (* ; "Edited 1-Mar-2026 13:43 by rmk") + (* ; "Edited 7-Oct-2025 17:13 by rmk") + (* ; "Edited 6-Sep-2025 16:43 by rmk") + (* ; "Edited 2-Sep-2025 15:20 by rmk") + (* ; "Edited 29-Aug-2025 11:25 by rmk") + (* ; "Edited 27-Aug-2025 17:36 by rmk") + + (* ;; + "Move character information in font to their MCCS positions, with coercions otherwise suppressed. ") + + (* ;; "If there are no mappings, prints a message and returns INFONT.") + + (LET [(PAIRS (MCCSMAPPAIRS (FONTPROP FONT 'CHARENCODING] + (CL:WHEN PAIRS + (MOVEFONTCHARS PAIRS FONT FONT) + (replace (FONTDESCRIPTOR FONTCOMPLETEP) of FONT with NIL) + + (* ;; "Keep the map function even for coerced MCCS fonts--can still be used for code conversion (e.g. Tedit file updating) ") + + [replace (FONTDESCRIPTOR FONTTOMCCSFN) of FONT with (MCCSMAPFN (FONTPROP FONT + 'CHARENCODING] + (CL:WHEN (MEMB (FONTPROP FONT 'CHARENCODING) + '(GACHA XCCS$ ALTOTEXT PALATINO UNICODE HIPPO CYRILLIC)) + (replace (FONTDESCRIPTOR FONTCHARENCODING) of FONT with 'MCCS) + (* ; "These fonts made it all the way") + (CHARSETPROP (\GETCHARSETINFO FONT 0) + 'CSCHARENCODING + 'MCCS)) + FONT)]) + +(IMPORTFONTS.FONTSPECS + [LAMBDA (PHASE FONTSPECS FROMDIR DEVICE) (* ; "Edited 4-May-2026 08:59 by rmk") + (* ; "Edited 4-Apr-2026 11:41 by rmk") + (* ; "Edited 3-Apr-2026 00:51 by rmk") + (* ; "Edited 1-Apr-2026 12:50 by rmk") + (* ; "Edited 30-Mar-2026 23:27 by rmk") + (* ; "Edited 23-Mar-2026 13:17 by rmk") + (* ; "Edited 21-Mar-2026 08:58 by rmk") + (* ; "Edited 14-Mar-2026 23:50 by rmk") + (* ; "Edited 13-Mar-2026 10:53 by rmk") + (* ; "Edited 4-Mar-2026 10:44 by rmk") + + (* ;; "Crucially, the fontspecs for COMPLETE and FAKEFACE must be ordered so that coercions or faces come before the fontspecs that depend on them. E.g. the order of faces has to be MRR MIR/BRR BIR. That means that the TODIR can be the source for the completion/faking of later fonts.") + + (CL:UNLESS DEVICE + (SETQ DEVICE 'DISPLAY)) + (SETQ FROMDIR (IMPORTFONTS.DIRECTORY DEVICE FROMDIR PHASE)) + (RESETLST + (IMPORTFONTS.NOCACHE) + [RESETSAVE (FONTDEVICEPROP DEVICE 'FONTDIRECTORIES FROMDIR) + `(PROGN (FONTDEVICEPROP ',DEVICE 'FONTDIRECTORIES OLDVALUE] + (LET [(EXPANDED (CL:REMOVE-DUPLICATES + (for F inside (CL:IF (type? FONTSPEC FONTSPECS) + (CONS FONTSPECS) + (OR FONTSPECS '*)) + join (if (type? FONTSPEC F) + then (for FACE in (FONTFACE.STARS (fetch (FONTSPEC FSFACE) + of (\FONT.CHECKARGS F))) + collect (create FONTSPEC + using F FSFACE ← FACE FSDEVICE ← DEVICE + FSROTATION ← 0)) + elseif (LITATOM F) + then + (* ;; "Looks in FROMDIR") + + (IMPORTFONTS.AVAILABLE PHASE (MAKEFONTSPEC + (OR F '*) + '* + '* 0 DEVICE) + FROMDIR) + else (\ILLEGAL.ARG F))) + :TEST + (FUNCTION EQUAL] + (SELECTQ PHASE + (COMPLETE + (* ;; "Fonts have to be ordered so that a coercion target is done before the font that needs it (e.g. CLASSIC before MODERN before TERMINAL before GACHA). This is essentially a topsort") + + (for FONTSPEC NEWFONTS in EXPANDED + do (for F in (DREVERSE (CONS FONTSPEC (COERCEFONTSPEC FONTSPEC + 'CHARCOERCIONS T))) + unless (MEMBER F NEWFONTS) when (IMPORTFONTS.EXISTS? 'COMPLETE F + FROMDIR) + do (push NEWFONTS F)) finally + + (* ;; + "We may have requested a font that doesn't exist at all on its own: HELVETICA 10 MIR") + + (for F in EXPANDED + unless (MEMBER F NEWFONTS) + do (push NEWFONTS F)) + (RETURN (DREVERSE NEWFONTS)))) + (FAKE + (* ;; + "If e.g. BIR is in the list, then so should be BMR, MIR, and if those are there, then so should MRR") + + (for ETAIL FS FACE SOURCE NEWFONTS on EXPANDED + do (SETQ FS (CAR ETAIL)) + (SETQ FACE (fetch (FONTSPEC FSFACE) of FS)) + (CL:WHEN (EQ 'BOLD (fetch (FONTFACE WEIGHT) of FACE)) + (* ; + "BRR -> MRR, BIR ->MIR which goes to MRR") + (for FC SOURCE in (FONTFACE.STARS (create FONTFACE + using FACE WEIGHT ← + 'MEDIUM)) + eachtime (SETQ SOURCE (create FONTSPEC using FS FSFACE ← FC)) + when (IMPORTFONTS.EXISTS? 'FAKE SOURCE FROMDIR) + do (push NEWFONTS SOURCE))) + (CL:WHEN (EQ 'ITALIC (fetch (FONTFACE SLOPE) of FACE)) + (* ; "MIR -> MRR, BIR ->BMR") + (for F SOURCE in (FONTFACE.STARS (create FONTFACE + using FACE SLOPE ← 'REGULAR)) + eachtime (SETQ SOURCE (create FONTSPEC using FS FSFACE ← F)) + when (IMPORTFONTS.EXISTS? 'FAKE SOURCE FROMDIR) + do (push NEWFONTS SOURCE))) + (CL:WHEN (EQ 'COMPRESSED (fetch (FONTFACE EXPANSION) of FACE)) + (* ; "MRC -> MRR") + (for F SOURCE in (FONTFACE.STARS (create FONTFACE + using FACE EXPANSION ← + 'REGULAR)) + eachtime (SETQ SOURCE (create FONTSPEC using FS FSFACE ← F)) + when (IMPORTFONTS.EXISTS? 'FAKE SOURCE FROMDIR) + do (push NEWFONTS SOURCE))) + finally (for F in EXPANDED unless (MEMBER F NEWFONTS) + do (push NEWFONTS F)) + (RETURN (DREVERSE NEWFONTS)))) + (DEPLOY (* ; + "Make sure we copy consistent versions of the indirects") + (SORTFONTSPECS (CL:REMOVE-DUPLICATES (APPEND + (for FS in EXPANDED + join (MEDLEYFONT.GETFILEPROP + (MEDLEYFONT.FILENAME FS + FROMDIR) + 'INDIRECTS)) + EXPANDED) + :TEST + (FUNCTION EQUAL)))) + (SORTFONTSPECS EXPANDED))))]) + +(IMPORTFONTS.CONTEXT + [LAMBDA (PHASE FROMDIR TODIR DEVICE) (* ; "Edited 4-May-2026 00:16 by rmk") + (* ; "Edited 4-Apr-2026 09:33 by rmk") + (* ; "Edited 24-Mar-2026 23:11 by rmk") + (* ; "Edited 23-Mar-2026 13:17 by rmk") + (* ; "Edited 21-Mar-2026 09:53 by rmk") + (* ; "Edited 18-Mar-2026 22:36 by rmk") + (* ; "Edited 16-Mar-2026 09:01 by rmk") + (* ; "Edited 14-Mar-2026 23:56 by rmk") + (* ; "Edited 13-Mar-2026 10:52 by rmk") + (* ; "Edited 3-Mar-2026 21:58 by rmk") + + (* ;; "This sets up the FONTDEVICE props according to PHASE, using default values for the directories if they aren't specified. Returns the TODIR, or NIL if the TODIR was DONT=don't file.") + + (SETQ FROMDIR (IMPORTFONTS.DIRECTORY DEVICE FROMDIR + (SELECTQ PHASE + (IMPORT 'SOURCE) + (MCCS 'IMPORT) + (COMPLETE 'MCCS) + (FAKE 'COMPLETE) + (DEPLOY (for P in '(FAKE COMPLETE MCCS IMPORT) + suchthat (DIRECTORYNAMEP (IMPORTFONTS.DIRECTORY DEVICE + FROMDIR P)))) + NIL))) + (SETQ TODIR (CL:IF (EQ PHASE 'DEPLOY) + (CONCAT [CAR (MKLIST (FONTDEVICEPROP DEVICE 'FONTDIRECTORIES] + ">") + (IMPORTFONTS.DIRECTORY DEVICE TODIR PHASE))) + [RESETSAVE (FONTDEVICEPROP DEVICE 'FONTCOERCIONS NIL) + `(PROGN (FONTDEVICEPROP ',DEVICE 'FONTCOERCIONS OLDVALUE] + (SELECTQ PHASE + ((IMPORT MCCS) + [RESETSAVE (FONTDEVICEPROP DEVICE 'FONTDIRECTORIES FROMDIR) + `(PROGN (FONTDEVICEPROP ',DEVICE 'FONTDIRECTORIES OLDVALUE]) + (COMPLETE + (* ;; "Make FONTCREATE1 in the COMPLETE phase draw from previously import-completed fonts, not from the currently active fonts") + + [RESETSAVE (FONTDEVICEPROP DEVICE 'FONTDIRECTORIES (LIST TODIR FROMDIR)) + `(PROGN (FONTDEVICEPROP ',DEVICE 'FONTDIRECTORIES OLDVALUE] + (* ; "Suppress face faking") + [RESETSAVE (FONTDEVICEPROP DEVICE 'FACECOERCIONS NIL) + `(PROGN (FONTDEVICEPROP ',DEVICE 'FACECOERCIONS OLDVALUE]) + (FAKE + (* ;; "Make FONTCREATE1 in the FAKE phase draw from previously import-completed fonts, not from the currently active fonts") + + [RESETSAVE (FONTDEVICEPROP DEVICE 'FONTDIRECTORIES (LIST TODIR FROMDIR)) + `(PROGN (FONTDEVICEPROP ',DEVICE 'FONTDIRECTORIES OLDVALUE] + (* ; "Completion has already been done") + [RESETSAVE (FONTDEVICEPROP DEVICE 'FONTCOERCIONS NIL) + `(PROGN (FONTDEVICEPROP ',DEVICE 'FONTCOERCIONS OLDVALUE]) + NIL) + (IMPORTFONTS.NOCACHE) + (CL:VALUES FROMDIR TODIR]) + +(IMPORTFONTS.NOCACHE + [LAMBDA NIL (* ; "Edited 3-Mar-2026 11:54 by rmk") + (RESETSAVE \FONTSINCORE NIL) + (RESETSAVE \FONTEXISTS?-CACHE NIL) + (RESETSAVE \FONTSAVAILABLEFILECACHE NIL]) + +(IMPORTFONTS.DIRECTORY + [LAMBDA (DEVICE DIRECTORY PHASE) (* ; "Edited 4-May-2026 00:52 by rmk") + (* ; "Edited 5-Apr-2026 14:17 by rmk") + (* ; "Edited 22-Mar-2026 22:59 by rmk") + (* ; "Edited 21-Mar-2026 22:40 by rmk") + (* ; "Edited 12-Mar-2026 09:35 by rmk") + (* ; "Edited 9-Mar-2026 09:14 by rmk") + (* ; "Edited 4-Mar-2026 00:46 by rmk") + (CL:UNLESS (MEMB DIRECTORY '(DONT DON'T)) + [PSEUDOFILENAME (OR DIRECTORY + (SELECTQ PHASE + (DEPLOY (CONCAT [CAR (MKLIST (FONTDEVICEPROP DEVICE 'FONTDIRECTORIES] + ">")) + (CONCAT "{MEDLEY}fonts>" + (L-CASE (CONCAT (OR (if (type? FONTDESCRIPTOR DEVICE) + then (FONTPROP DEVICE 'DEVICE) + elseif (type? FONTSPEC DEVICE) + then (fetch (FONTSPEC FSDEVICE) + of (\FONT.CHECKARGS DEVICE)) + elseif (NOT (LITATOM DEVICE)) + then (\ILLEGAL.ARG DEVICE) + elseif DEVICE + else 'DISPLAY)) + ">" + (CL:IF PHASE + (CONCAT (IMPORTFONTS.SUBDIR PHASE) + ">") + "")])]) + +(IMPORTFONTS.CLEAR + [LAMBDA (PHASE FONTSPECS TODIR DEVICE) (* ; "Edited 3-May-2026 22:40 by rmk") + (* ; "Edited 4-Apr-2026 10:03 by rmk") + (* ; "Edited 3-Apr-2026 01:06 by rmk") + (* ; "Edited 30-Mar-2026 12:37 by rmk") + (* ; "Edited 23-Mar-2026 13:18 by rmk") + (* ; "Edited 14-Mar-2026 22:51 by rmk") + (* ; "Edited 12-Mar-2026 09:31 by rmk") + (CL:WHEN [AND TODIR (MEMB PHASE '(COMPLETE FAKE] (* ; + "Previous completions could serve as inputs for later ones, start fresh.") + (LET (NDELETED) + [SETQ NDELETED (if FONTSPECS + then (for FS in (CL:IF (type? FONTSPEC FONTSPECS) + (CONS FONTSPECS) + FONTSPECS) + sum (for FILE in (FILDIR (PACKFILENAME 'VERSION '* + 'BODY + (MEDLEYFONT.FILENAME FS TODIR + ))) + count (DELFILE FILE))) + else (for FILE + in [FILDIR (PACKFILENAME 'DIRECTORY TODIR 'NAME '* 'VERSION + '* + 'EXTENSION + (CAR (MKLIST (FONTDEVICEPROP DEVICE + 'FONTEXTENSIONS] + count (DELFILE FILE] + (CL:UNLESS (EQ 0 NDELETED) + (PRINTOUT T (SELECTQ NDELETED + (1 "1 font") + (CONCAT NDELETED " fonts")) + " deleted from " + (PSEUDOFILENAME TODIR) + T))))]) + +(IMPORTFONTS.SUBDIR + [LAMBDA (PHASE) (* ; "Edited 4-May-2026 00:27 by rmk") + (* ; "Edited 30-Mar-2026 16:27 by rmk") + (* ; "Edited 23-Mar-2026 13:18 by rmk") + (* ; "Edited 21-Mar-2026 09:53 by rmk") + (SELECTQ PHASE + (SOURCE "source") + (IMPORT "imported") + (MCCS "mccs") + (COMPLETE "completed") + (FAKE "faked") + (DEPLOY) + (\ILLEGAL.ARG]) + +(IMPORTFONTS.DIRSIZE + [LAMBDA (PHASE DEVICE DIRECTORY) (* ; "Edited 4-May-2026 00:26 by rmk") + (* ; "Edited 30-Mar-2026 16:30 by rmk") + (DIRECTORY (PACKFILENAME 'DIRECTORY (IMPORTFONTS.DIRECTORY DEVICE DIRECTORY PHASE) + 'NAME + '* + 'EXTENSION + [CAR (MKLIST (FONTDEVICEPROP (OR DEVICE 'DISPLAY) + 'FONTEXTENSIONS] + 'VERSION "") + 'COUNTLENGTH]) +) +(DEFINEQ + +(IMPORTFONTS.AVAILABLE + [LAMBDA (PHASE FONTSPEC FROMDIR) (* ; "Edited 4-May-2026 00:00 by rmk") + (* ; "Edited 22-Mar-2026 13:36 by rmk") + (RESETLST + [RESETSAVE (FONTDEVICEPROP FONTSPEC 'FONTDIRECTORIES (IMPORTFONTS.DIRECTORY FONTSPEC FROMDIR + PHASE)) + `(PROGN (FONTDEVICEPROP ',FONTSPEC 'FONTDIRECTORIES OLDVALUE] + (IMPORTFONTS.NOCACHE) + (FONTSAVAILABLE FONTSPEC NIL NIL NIL NIL 'ONLY))]) + +(IMPORTFONTS.EXISTS? + [LAMBDA (PHASE FONTSPEC FROMDIR) (* ; "Edited 4-May-2026 00:00 by rmk") + (* ; "Edited 22-Mar-2026 14:55 by rmk") + (RESETLST + [RESETSAVE (FONTDEVICEPROP FONTSPEC 'FONTDIRECTORIES (IMPORTFONTS.DIRECTORY FONTSPEC FROMDIR + PHASE)) + `(PROGN (FONTDEVICEPROP ',FONTSPEC 'FONTDIRECTORIES OLDVALUE] + (IMPORTFONTS.NOCACHE) + (FONTEXISTS? FONTSPEC NIL NIL NIL NIL T))]) +) +(DEFINEQ + +(FAKEFACE + [LAMBDA (FONT) (* ; "Edited 5-Apr-2026 14:10 by rmk") + (* ; "Edited 4-Apr-2026 09:38 by rmk") + (* ; "Edited 1-Apr-2026 09:00 by rmk") + (* ; "Edited 24-Mar-2026 22:14 by rmk") + (* ; "Edited 21-Mar-2026 14:37 by rmk") + (* ; "Edited 14-Mar-2026 23:53 by rmk") + + (* ;; "FONTSPEC describes a font that has already been completed in terms of its CHARCOERCIONS.") + + (* ;; "Suppose FONTSPEC describes a (display) BRR font. If it has not been completed (i.e., it is still just MCCS), then all of the glyphs in all of its character sets are natively bold.") + + (* ;; "If it has been completed without facefaking, then some of its characters may have been retrieved from other fonts, and those are mixed in with its native glyphs. But presumably, those characters are also drawn from a BRR font, on the assumption that CHARCOERCIONS tends to preserve faces.") + + (* ;; "So: it is correct to run through all of the slugs, grab the corresponding glyphs from the already completed MRR, if it exists, and insert the bolded versions of those characters.") + + (* ;; "") + + (LET* ((FONTSPEC (FONTPROP FONT 'DEVICESPEC)) + (FACE (fetch (FONTSPEC FSFACE) of FONTSPEC)) + SOURCEFONT CHANGED) + (CL:UNLESS (EQ 'DISPLAY (FONTPROP FONT 'DEVICE)) + (ERROR "Only display fonts can be face-faked" FONT)) + (CL:UNLESS (fetch (FONTDESCRIPTOR FONTCOMPLETEP) of FONT) + (ERROR "Fonts must be completed before face-faking" FONTSPEC)) + (CL:WHEN [AND (EQ 'BOLD (fetch (FONTFACE WEIGHT) of FACE)) + (SETQ SOURCEFONT (FONTCREATE1 (create FONTSPEC using FONTSPEC FSWEIGHT ← + 'MEDIUM] + (for CHARSET from 0 to (MAXCHARSET FONT) when (FAKEFACE.CHARSET FONT CHARSET + (FUNCTION MAKEBOLD.CHAR) + SOURCEFONT) + do (SETQ CHANGED T))) + (CL:WHEN [AND (EQ 'ITALIC (fetch (FONTFACE SLOPE) of FACE)) + (SETQ SOURCEFONT (FONTCREATE1 (create FONTSPEC using FONTSPEC FSSLOPE ← + 'REGULAR] + (for CHARSET from 0 to (MAXCHARSET FONT) when (FAKEFACE.CHARSET FONT CHARSET + (FUNCTION MAKEITALIC.CHAR) + SOURCEFONT) + do (SETQ CHANGED T))) + (CL:WHEN [AND (EQ 'COMPRESSED (fetch (FONTFACE EXPANSION) of FACE)) + (SETQ SOURCEFONT (FONTCREATE1 (create FONTSPEC using FONTSPEC FSEXPANSION ← + 'REGULAR] + (for CHARSET from 0 to (MAXCHARSET FONT) when (FAKEFACE.CHARSET FONT CHARSET + (FUNCTION MOVEFONTCHARS) + SOURCEFONT) + do (SETQ CHANGED T))) + CHANGED]) + +(FAKEFACE.FROMFILE + [LAMBDA (FONTSPEC FROMDIR) (* ; "Edited 3-May-2026 22:37 by rmk") + (* ; "Edited 4-Apr-2026 09:42 by rmk") + (* ; "Edited 30-Mar-2026 23:17 by rmk") + (* ; "Edited 21-Mar-2026 09:03 by rmk") + (* ; "Edited 19-Mar-2026 11:53 by rmk") + (* ; + "Start with MRR for a face that doesn't yet exist (HELVETICA MIR).") + (OR (INFILEP (MEDLEYFONT.FILENAME FONTSPEC FROMDIR)) + (LET ((FACE (fetch (FONTSPEC FSFACE) of FONTSPEC))) + (OR (AND (EQ 'BOLD (fetch (FONTFACE WEIGHT) of FACE)) + (INFILEP (MEDLEYFONT.FILENAME (create FONTSPEC using FONTSPEC FSFACE ← + (MAKEFONTFACE 'MEDIUM NIL + NIL FACE)) + FROMDIR))) + (AND (EQ 'ITALIC (fetch (FONTFACE SLOPE) of FACE)) + (FAKEFACE.FROMFILE (create FONTSPEC using FONTSPEC FSFACE ← (MAKEFONTFACE + NIL + 'REGULAR NIL FACE) + ) + FROMDIR)) + (AND (EQ 'COMPRESSED (fetch (FONTFACE EXPANSION) of FACE)) + (FAKEFACE.FROMFILE (create FONTSPEC using FONTSPEC FSFACE ← (MAKEFONTFACE + NIL NIL + 'REGULAR FACE)) + FROMDIR)) + (ERROR "No source for face-faking" FONTSPEC]) + +(FAKEFACE.FROMFONT + [LAMBDA (FONTSPEC FROMDIR) (* ; "Edited 3-May-2026 22:37 by rmk") + (* ; "Edited 19-Mar-2026 20:42 by rmk") + + (* ;; "If FONTSPEC doesn't identifyan existing font that needs to be coerced, we create an empty starting font full of slug charsets. ") + + (LET (FROMFILE FONT) + (SETQ FROMFILE (FAKEFACE.FROMFILE FONTSPEC FROMDIR)) + (SETQ FONT (MEDLEYFONT.READ.FONT FROMFILE 'ALL)) + (CL:UNLESS (EQUAL FONTSPEC (FONTPROP FONT 'SPEC)) + + (* ;; "We catch all the other properties of the backing font--encoding etc.") + + (SETQ FONT (FONTCREATE.SLUGFD FONTSPEC FONT))) + (CL:VALUES FONT FROMFILE]) +) + + + +(* ; "For legacy display imports") + +(DEFINEQ + +(IMPORT.DISPLAY + [LAMBDA (FONTSPECS) (* ; "Edited 4-May-2026 15:18 by rmk") + (* ; "Edited 28-Mar-2026 23:08 by rmk") + (* ; "Edited 18-Mar-2026 23:54 by rmk") + (IMPORTFONTS 'IMPORT FONTSPECS 'DISPLAY '{MEDLEY}/fonts/displayfonts/ NIL (FUNCTION + LEGACYDISPLAYFONT]) + +(LEGACYDISPLAYFONT + [LAMBDA (FONTSPEC FROMDIR) (* ; "Edited 3-May-2026 22:38 by rmk") + (* ; "Edited 16-Apr-2026 22:37 by rmk") + (* ; "Edited 12-Apr-2026 13:22 by rmk") + (* ; "Edited 31-Mar-2026 15:01 by rmk") + (* ; "Edited 28-Mar-2026 09:27 by rmk") + + (* ;; "Loads legacy display fonts (ac or strike format, gacha, terminal, helevetica...) from FROMDIR. If NIL, the current directory") + + (SETQ FONTSPEC (\FONT.CHECKARGS FONTSPEC NIL NIL NIL 'DISPLAY T)) + (RESETLST + [RESETSAVE (FONTDEVICEPROP 'DISPLAY 'FONTDIRECTORIES FROMDIR) + `(PROGN (FONTDEVICEPROP 'DISPLAY 'FONTDIRECTORIES OLDVALUE] + [RESETSAVE (FONTDEVICEPROP 'DISPLAY 'FONTEXTENSIONS '(DISPLAYFONT) + FROMDIR) + `(PROGN (FONTDEVICEPROP 'DISPLAY 'FONTEXTENSIONS OLDVALUE] + (for CSNO CSINFO (FONT ← (FONTSPEC.TO.FONTDESCRIPTOR FONTSPEC 255)) from 0 to 255 + do (SETQ CSINFO (\READCHARSET FONT CSNO '((AC ACFONT.FILEP ACFONT.GETCHARSET) + (STRIKE STRIKEFONT.FILEP STRIKEFONT.GETCHARSET)) + FROMDIR)) + + (* ;; "NIL means empty") + + (CL:IF CSINFO + (\INSTALLCHARSETINFO FONT CSINFO CSNO) + (\SETCHARSETINFO FONT CSNO (SLUGCSINFO FONT))) finally (RETURN FONT)))]) +) + +(FILESLOAD ACFONT) + + + +(* ; "For testing") + +(DEFINEQ + +(IPF + [LAMBDA (PHASE FONTSPEC) (* ; "Edited 4-May-2026 00:01 by rmk") + (* ; "Edited 30-Mar-2026 12:44 by rmk") + (* ; "Edited 21-Mar-2026 22:46 by rmk") + (* ; "Edited 10-Mar-2026 00:54 by rmk") + (MEDLEYFONT.READ.FONT (MEDLEYFONT.FILENAME FONTSPEC (IMPORTFONTS.DIRECTORY + (OR (fetch (FONTSPEC FSDEVICE) of FONTSPEC) + 'DISPLAY) + NIL PHASE)) + 'ALL]) + +(IPFSIZES + [LAMBDA (FONTSPEC) (* ; "Edited 4-May-2026 00:49 by rmk") + (* ; "Edited 30-Mar-2026 12:45 by rmk") + (* ; "Edited 23-Mar-2026 13:18 by rmk") + (* ; "Edited 21-Mar-2026 00:59 by rmk") + (* ; "Edited 16-Mar-2026 08:43 by rmk") + (* ; "Edited 13-Mar-2026 10:33 by rmk") + + (* ;; "Returns the file sizes for all the phases of FONTSPEC") + + (if (type? FONTSPEC FONTSPEC) + then (SETQ FONTSPEC (\FONT.CHECKARGS FONTSPEC NIL NIL NIL NIL T)) + else (SETQ FONTSPEC (FONTSPECFROMFILENAME FONTSPEC))) + (for PHASE DIR FONTFILE SIZE LASTSIZE in '(IMPORT MCCS COMPLETE FAKE DEPLOY) + eachtime (SETQ DIR (IMPORTFONTS.DIRECTORY FONTSPEC NIL PHASE)) + when (SETQ FONTFILE (INFILEP (MEDLEYFONT.FILENAME FONTSPEC DIR))) + collect (SETQ FONTFILE (INFILEP (MEDLEYFONT.FILENAME FONTSPEC DIR))) + [SETQ SIZE (CL:IF FONTFILE + (GETFILEINFO FONTFILE 'LENGTH))] + (PROG1 [LIST* PHASE SIZE (CL:IF LASTSIZE + (CONS (IDIFFERENCE SIZE LASTSIZE)))] + (SETQ LASTSIZE SIZE]) +) +(DEFINEQ + +(PEF + [LAMBDA (PHASES FONTSPEC CHARSET) (* ; "Edited 5-May-2026 12:20 by rmk") + (* ; "Edited 4-May-2026 08:27 by rmk") + (* ; "Edited 12-Apr-2026 19:32 by rmk") + (* ; "Edited 30-Mar-2026 09:14 by rmk") + (* ; "Edited 25-Mar-2026 00:11 by rmk") + (* ; "Edited 22-Mar-2026 00:19 by rmk") + (* ; "Edited 16-Mar-2026 08:43 by rmk") + (* ; "Edited 13-Mar-2026 10:33 by rmk") + (if (type? FONTSPEC FONTSPEC) + then (SETQ FONTSPEC (\FONT.CHECKARGS FONTSPEC NIL NIL NIL NIL T)) + else (SETQ FONTSPEC (FONTSPECFROMFILENAME FONTSPEC))) + (for PHASE TITLETAG CHARSETNAME DIR FONTFILE inside PHASES + do (* ; + "Some phases may not have some charsets") + (SETQ CHARSET (if (EQ CHARSET T) + then (for C in (MEDLEYFONT.GETFILEPROP FONTFILE 'CHARSET) + unless (OR (KANJICHARSETP C) + (UNIHANCHARSETP C)) collect C) + elseif (CHARSET.DECODE CHARSET) + else 0)) + (if (LISTP CHARSET) + then (for C in CHARSET do (PEF PHASE FONTSPEC C)) + elseif (EQ PHASE 'DEPLOY) + then (EDITFONT FONTSPEC CHARSET NIL NIL "Deployed") + else (SETQ DIR (IMPORTFONTS.DIRECTORY FONTSPEC NIL PHASE)) + (SETQ FONTFILE (MEDLEYFONT.FILENAME FONTSPEC DIR)) + (if (NLSETQ (MEDLEYFONT.FILEP FONTFILE)) + then (SETQ TITLETAG (CL:IF (EQ PHASE 'MCCS) + 'MCCS + (L-CASE PHASE T))) + (SETQ CHARSETNAME (CHARSET.ENCODE CHARSET)) + (CL:UNLESS (OCTALNUM? CHARSETNAME) + (SETQ TITLETAG (CONCAT CHARSETNAME " " TITLETAG))) + (if [CAR (NLSETQ (RESETLST + (IMPORTFONTS.CONTEXT PHASE DIR NIL (fetch (FONTSPEC + FSDEVICE) + of FONTSPEC)) + (EDITFONT (MEDLEYFONT.READ.FONT FONTFILE CHARSET) + CHARSET NIL NIL TITLETAG))] + else (PRINTOUT T "Charset " (OCTALSTRING CHARSET) + " of " FONTSPEC " not found in " DIR T) + NIL) + else (PRINTOUT T FONTSPEC " not found in " DIR T]) + +(AEF + [LAMBDA (FONTSPEC CHARSET CLOSE) (* ; "Edited 4-May-2026 08:22 by rmk") + (* ; "Edited 5-Apr-2026 11:50 by rmk") + (* ; "Edited 21-Mar-2026 15:09 by rmk") + (* ; "Edited 14-Mar-2026 12:59 by rmk") + (* ; "Edited 12-Mar-2026 22:56 by rmk") + + (* ;; "Show CHARSET for all phases of FONTSPEC") + + (CL:WHEN CLOSE (EFCLOSE)) + (PEF '(IMPORT MCCS COMPLETE FAKE DEPLOY) + FONTSPEC CHARSET]) + +(IEF + [LAMBDA (FONTSPEC CHARSET) (* ; "Edited 4-May-2026 08:34 by rmk") + (* ; "Edited 12-Mar-2026 11:38 by rmk") + (* ; "Edited 10-Mar-2026 01:02 by rmk") + (* ; "Edited 4-Mar-2026 00:31 by rmk") + (* ; "Edited 1-Mar-2026 23:56 by rmk") + (* ; "Edited 27-Feb-2026 14:24 by rmk") + (PEF 'IMPORT FONTSPEC CHARSET]) + +(MEF + [LAMBDA (FONTSPEC CHARSET) (* ; "Edited 4-May-2026 08:35 by rmk") + (* ; "Edited 12-Mar-2026 11:38 by rmk") + (* ; "Edited 10-Mar-2026 01:01 by rmk") + (* ; "Edited 4-Mar-2026 00:31 by rmk") + (* ; "Edited 1-Mar-2026 23:57 by rmk") + (* ; "Edited 9-Oct-2025 20:38 by rmk") + (PEF 'MCCS FONTSPEC CHARSET]) + +(CEF + [LAMBDA (FONTSPEC CHARSET) (* ; "Edited 4-May-2026 08:35 by rmk") + (* ; "Edited 12-Mar-2026 11:38 by rmk") + (* ; "Edited 10-Mar-2026 01:03 by rmk") + (* ; "Edited 4-Mar-2026 00:31 by rmk") + (* ; "Edited 2-Mar-2026 00:00 by rmk") + (* ; "Edited 9-Oct-2025 22:58 by rmk") + (PEF 'COMPLETE FONTSPEC CHARSET]) + +(FEF + [LAMBDA (FONTSPEC CHARSET) (* ; "Edited 4-May-2026 08:35 by rmk") + (* ; "Edited 23-Mar-2026 13:18 by rmk") + (* ; "Edited 19-Mar-2026 00:42 by rmk") + (* ; "Edited 12-Mar-2026 11:38 by rmk") + (* ; "Edited 10-Mar-2026 01:03 by rmk") + (* ; "Edited 4-Mar-2026 00:31 by rmk") + (* ; "Edited 2-Mar-2026 00:00 by rmk") + (* ; "Edited 9-Oct-2025 22:58 by rmk") + (PEF 'FAKE FONTSPEC CHARSET]) + +(DEF + [LAMBDA (FONTSPEC CHARSET) (* ; "Edited 4-May-2026 08:34 by rmk") + (* ; "Edited 12-Mar-2026 11:38 by rmk") + (* ; "Edited 10-Mar-2026 01:02 by rmk") + (* ; "Edited 4-Mar-2026 00:31 by rmk") + (* ; "Edited 1-Mar-2026 23:56 by rmk") + (* ; "Edited 27-Feb-2026 14:24 by rmk") + (PEF 'DEPLOY FONTSPEC CHARSET]) + +(EFCLOSE + [LAMBDA NIL (* ; "Edited 9-Oct-2025 19:48 by rmk") + (for W in (OPENWINDOWS) when (AND (WINDOWPROP W 'FONT) + (WINDOWPROP W 'CHARITEMS)) do (CLOSEW W]) +) +(DEFINEQ + +(SHOWCHARS + [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") + (* ; "Edited 26-Jan-2024 14:18 by mth") + (* ; "Edited 1-Aug-2020 09:27 by rmk:") + [SETQ FONT (FONTCREATE (OR FONT '(CLASSIC 12] + (RESETLST + [LET ((OLDFONT (DSPFONT NIL T)) + CHARS) + (CL:UNLESS (CHARCODEP FROMCHAR) + (SETQ FROMCHAR (OR (CHARCODE.DECODE FROMCHAR T) + FROMCHAR))) + (SETQ CHARS (if (LISTP FROMCHAR) + elseif (CHARCODEP FROMCHAR) + then (CL:UNLESS (CHARCODEP TOCHAR) + (SETQ TOCHAR (OR (CHARCODE.DECODE TOCHAR) + FROMCHAR))) + (for C from FROMCHAR to TOCHAR collect C) + else (CHCON FROMCHAR))) + [RESETSAVE OLDFONT '(PROGN (DSPFONT OLDVALUE] + (TERPRI) + (for C in CHARS do (PRINTOUT T .FONT OLDFONT (CONCAT (OCTALSTRING (\CHARSET C)) + "," + (OCTALSTRING (\CHAR8CODE C))) + 10 .FONT FONT (CHARACTER C)) + (CL:UNLESS ONELINE (PRINTOUT T T]) + (TERPRI]) + +(CSSOURCE + [LAMBDA (PHASE FONT INDIRECT) (* ; "Edited 22-Mar-2026 00:26 by rmk") + + (* ;; "Shows the source properties of all the charsets") + + (CL:UNLESS (FONTP FONT) + (SETQ FONT (IPF PHASE FONT))) + (LIST* PHASE (FONTPROP FONT 'SPEC) + (for CS CSINFO SOURCE (FONTSPEC ← (FONTPROP FONT 'SPEC)) from 0 to (MAXCHARSET FONT) + eachtime (SETQ CSINFO (\GETCHARSETINFO FONT CS)) when CSINFO + unless (fetch (CHARSETINFO CSSLUGP) of CSINFO) + unless [AND INDIRECT (EQUAL FONTSPEC (CHARSETPROP CSINFO 'SOURCE] + collect (LIST CS (CHARSETPROP CSINFO 'SOURCE]) + +(FONTDEFFONTS + [LAMBDA (FACES) (* ; "Edited 22-Mar-2026 12:48 by rmk") + (SETQ FACES (for F inside FACES collect (\FONTFACE F))) + (for FD FONTLIST in FONTDEFS + do (for FP in (CDR (ASSOC 'FONTPROFILE FD)) + do (for FONT in (CDDR FP) when FONT unless (MEMB (CAR FONT) + '(PDF POSTSCRIPT)) + when (OR (NOT FACES) + (MEMBER (\FONTFACE (fetch (FONTSPEC FSFACE) of FONT)) + FACES)) do (push FONTLIST FONT))) + finally (RETURN (SORTFONTSPECS (CL:REMOVE-DUPLICATES FONTLIST :TEST (FUNCTION EQUAL]) +) + +(FILESLOAD EDITFONT) +(DECLARE%: DONTCOPY + (FILEMAP (NIL (1116 33853 (IMPORTFONTS 1126 . 13073) (FONT.TO.MCCS 13075 . 15325) ( +IMPORTFONTS.FONTSPECS 15327 . 23722) (IMPORTFONTS.CONTEXT 23724 . 27433) (IMPORTFONTS.NOCACHE 27435 . +27686) (IMPORTFONTS.DIRECTORY 27688 . 30039) (IMPORTFONTS.CLEAR 30041 . 32587) (IMPORTFONTS.SUBDIR +32589 . 33238) (IMPORTFONTS.DIRSIZE 33240 . 33851)) (33854 35077 (IMPORTFONTS.AVAILABLE 33864 . 34473) + (IMPORTFONTS.EXISTS? 34475 . 35075)) (35078 41861 (FAKEFACE 35088 . 38825) (FAKEFACE.FROMFILE 38827 + . 41068) (FAKEFACE.FROMFONT 41070 . 41859)) (41905 44151 (IMPORT.DISPLAY 41915 . 42453) ( +LEGACYDISPLAYFONT 42455 . 44149)) (44200 46532 (IPF 44210 . 45004) (IPFSIZES 45006 . 46530)) (46533 +54653 (PEF 46543 . 49912) (AEF 49914 . 50637) (IEF 50639 . 51341) (MEF 51343 . 52043) (CEF 52045 . +52749) (FEF 52751 . 53669) (DEF 53671 . 54373) (EFCLOSE 54375 . 54651)) (54654 58201 (SHOWCHARS 54664 + . 56694) (CSSOURCE 56696 . 57409) (FONTDEFFONTS 57411 . 58199))))) +STOP diff --git a/library/IMPORTFONTS.LCOM b/library/IMPORTFONTS.LCOM new file mode 100644 index 00000000..91ebfacd Binary files /dev/null and b/library/IMPORTFONTS.LCOM differ diff --git a/library/IMPORTFONTS.TEDIT b/library/IMPORTFONTS.TEDIT new file mode 100644 index 00000000..59b6c048 Binary files /dev/null and b/library/IMPORTFONTS.TEDIT differ diff --git a/library/POSTSCRIPTSTREAM b/library/POSTSCRIPTSTREAM index c715c964..3ddd19d3 100644 --- a/library/POSTSCRIPTSTREAM +++ b/library/POSTSCRIPTSTREAM @@ -1,13 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "12-Feb-2026 12:19:03" {DSK}matt>Interlisp>medley>library>POSTSCRIPTSTREAM.;6 258522 +(FILECREATED "11-May-2026 10:22:21" {MEDLEY}POSTSCRIPTSTREAM.;73 258415 - :EDIT-BY "mth" + :EDIT-BY rmk - :CHANGES-TO (FNS PSCFONT.READFONT) + :CHANGES-TO (VARS POSTSCRIPTSTREAMCOMS) - :PREVIOUS-DATE "27-Jan-2026 17:57:49" -{DSK}matt>Interlisp>medley>library>POSTSCRIPTSTREAM.;5) + :PREVIOUS-DATE "26-Apr-2026 11:39:26" {MEDLEY}POSTSCRIPTSTREAM.;71) (PRETTYCOMPRINT POSTSCRIPTSTREAMCOMS) @@ -136,10 +135,7 @@ (POSTSCRIPT.TEXTFILE.LANDSCAPE NIL) (POSTSCRIPT.DEFAULT.PAGEREGION '(4800 4800 52800 70800)) (POSTSCRIPT.TEXTURE.SCALE 4) - [POSTSCRIPTFONTDIRECTORIES (LIST (COND ((EQ (MACHINETYPE) - 'MAIKO) - "{dsk}/USR/LOCAL/LDE/FONTS/POSTSCRIPT/") - (T "{DSK}POSTSCRIPT>"] + (POSTSCRIPTFONTDIRECTORIES (LIST "{MEDLEY}/fonts/postscriptfonts")) (POSTSCRIPTFONTEXTENSIONS '(PSCFONT PF PSC)) [POSTSCRIPTFONTCOERCIONS '((HELVETICA (HELVETICA 1)) (HELVETICAD (HELVETICA 1)) @@ -154,6 +150,7 @@ (LOGO (HELVETICA 1)) (OPTIMA (PALATINO 1)) (TITAN (COURIER 1)) + (* CLASSIC) (* (* 1] (POSTSCRIPTCHARCOERCIONS NIL) (\POSTSCRIPT.MAX.WILD.FONTSIZE 72)) @@ -878,7 +875,8 @@ FONTID]) (POSTSCRIPT.FONTCREATE - [LAMBDA (FONTSPEC) (* ; "Edited 13-Oct-2025 18:04 by rmk") + [LAMBDA (FONTSPEC) (* ; "Edited 17-Mar-2026 16:29 by rmk") + (* ; "Edited 13-Oct-2025 18:04 by rmk") (* ; "Edited 7-Sep-2025 23:44 by rmk") (* ; "Edited 30-Aug-2025 23:24 by rmk") (* ; "Edited 21-Aug-2025 18:21 by rmk") @@ -998,10 +996,12 @@ (COND ((AND TMP (NEQ FAMILY (CAR TMP))) - (replace FONTDEVICESPEC of FD with (LIST (CAR TMP) - SIZE - (COPY FACE) - 0 DEVICE] + (replace FONTDEVICESPEC of FD with (create FONTSPEC + FSFAMILY _ (CAR TMP) + FSSIZE _ SIZE + FSFACE _ (COPY FACE) + FSROTATION _ 0 + FSDEVICE _ DEVICE] [LET ((SYMWIDTHS (\POSTSCRIPT.SPECIALFONT.SCALEDWIDTHS 'SYMBOL FD ROTATION DEVICE) ) (DINGWIDTHS (\POSTSCRIPT.SPECIALFONT.SCALEDWIDTHS 'ZAPFDINGBATS FD ROTATION @@ -4298,10 +4298,7 @@ (RPAQ? POSTSCRIPT.TEXTURE.SCALE 4) -(RPAQ? POSTSCRIPTFONTDIRECTORIES (LIST (COND ((EQ (MACHINETYPE) - 'MAIKO) - "{dsk}/USR/LOCAL/LDE/FONTS/POSTSCRIPT/") - (T "{DSK}POSTSCRIPT>")))) +(RPAQ? POSTSCRIPTFONTDIRECTORIES (LIST "{MEDLEY}/fonts/postscriptfonts")) (RPAQ? POSTSCRIPTFONTEXTENSIONS '(PSCFONT PF PSC)) @@ -4319,6 +4316,7 @@ (LOGO (HELVETICA 1)) (OPTIMA (PALATINO 1)) (TITAN (COURIER 1)) + (* CLASSIC) (* (* 1)))) (RPAQ? POSTSCRIPTCHARCOERCIONS NIL) @@ -4393,37 +4391,37 @@ (ADDTOVAR LAMA POSTSCRIPT.PUTCOMMAND) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (22366 32685 (POSTSCRIPT.INIT 22376 . 29291) (POSTSCRIPT.PUTRGBCOLOR 29293 . 30315) ( -\PSC.COLOR.TO.RGB 30317 . 32683)) (33671 69196 (PSCFONT.READFONT 33681 . 35692) (PSCFONT.SPELLFILE -35694 . 36507) (PSCFONT.COERCEFILE 36509 . 38081) (PSCFONTFROMCACHE.SPELLFILE 38083 . 39068) ( -PSCFONTFROMCACHE.COERCEFILE 39070 . 40722) (PSCFONT.WRITEFONT 40724 . 41739) (READ-AFM-FILE 41741 . -47612) (CONVERT-AFM-FILES 47614 . 48826) (POSTSCRIPT.GETFONTID 48828 . 50223) (POSTSCRIPT.FONTCREATE -50225 . 63119) (\POSTSCRIPT.SPECIALFONT.SCALEDWIDTHS 63121 . 65518) (POSTSCRIPT.FONTSAVAILABLE 65520 - . 67807) (POSTSCRIPT.FONTEXISTS? 67809 . 69194)) (69197 79106 (OPENPOSTSCRIPTSTREAM 69207 . 78772) ( -CLOSEPOSTSCRIPTSTREAM 78774 . 79104)) (79151 85477 (POSTSCRIPT.HARDCOPYW 79161 . 82268) ( -POSTSCRIPT.TEDIT 82270 . 82722) (POSTSCRIPTFILEP 82724 . 84212) (MAKEEPSFILE 84214 . 85475)) (85478 -129222 (POSTSCRIPT.BITMAPSCALE 85488 . 87944) (POSTSCRIPT.CLOSESTRING 87946 . 88499) ( -POSTSCRIPT.ENDPAGE 88501 . 89392) (POSTSCRIPT.OUTSTR 89394 . 90611) (POSTSCRIPT.PUTBITMAPBYTES 90613 - . 99084) (POSTSCRIPT.PUTCOMMAND 99086 . 100075) (POSTSCRIPT.SET-FAKE-LANDSCAPE 100077 . 104597) ( -POSTSCRIPT.SHOWACCUM 104599 . 106754) (POSTSCRIPT.STARTPAGE 106756 . 109458) (\POSTSCRIPTTAB 109460 . -110257) (\PS.BOUTFIXP 110259 . 111539) (\PS.SCALEHACK 111541 . 114184) (\PS.SCALEREGION 114186 . -114746) (\SCALEDBITBLT.PSC 114748 . 119058) (\SETPOS.PSC 119060 . 119541) (\SETXFORM.PSC 119543 . -122127) (\STRINGWIDTH.PSC 122129 . 122602) (\SWITCHFONTS.PSC 122604 . 128096) (\TERPRI.PSC 128098 . -129220)) (129257 183113 (\BITBLT.PSC 129267 . 129819) (\BLTSHADE.PSC 129821 . 134482) (\CHARWIDTH.PSC -134484 . 134991) (\CREATECHARSET.PSC 134993 . 136349) (\DRAWARC.PSC 136351 . 138729) (\DRAWCIRCLE.PSC -138731 . 140982) (\DRAWCURVE.PSC 140984 . 144828) (\DRAWELLIPSE.PSC 144830 . 147194) (\DRAWLINE.PSC -147196 . 149936) (\DRAWPOINT.PSC 149938 . 150514) (\DRAWPOLYGON.PSC 150516 . 153645) ( -\DSPBOTTOMMARGIN.PSC 153647 . 154334) (\DSPCLIPPINGREGION.PSC 154336 . 155711) (\DSPCOLOR.PSC 155713 - . 156644) (\DSPFONT.PSC 156646 . 160283) (\DSPLEFTMARGIN.PSC 160285 . 160971) (\DSPLINEFEED.PSC -160973 . 161563) (\DSPPUSHSTATE.PSC 161565 . 163025) (\DSPPOPSTATE.PSC 163027 . 166512) (\DSPRESET.PSC - 166514 . 167179) (\DSPRIGHTMARGIN.PSC 167181 . 167870) (\DSPROTATE.PSC 167872 . 168871) ( -\DSPSCALE.PSC 168873 . 169825) (\DSPSCALE2.PSC 169827 . 170667) (\DSPSPACEFACTOR.PSC 170669 . 171590) -(\DSPTOPMARGIN.PSC 171592 . 172163) (\DSPTRANSLATE.PSC 172165 . 174196) (\DSPXPOSITION.PSC 174198 . -174762) (\DSPYPOSITION.PSC 174764 . 175355) (\FILLCIRCLE.PSC 175357 . 177582) (\FILLPOLYGON.PSC 177584 - . 180821) (\FIXLINELENGTH.PSC 180823 . 182142) (\MOVETO.PSC 182144 . 182914) (\NEWPAGE.PSC 182916 . -183111)) (183169 205315 (\POSTSCRIPT.CHANGECHARSET 183179 . 183897) (\POSTSCRIPT.OUTCHARFN 183899 . -196169) (\POSTSCRIPT.PRINTSLUG 196171 . 197895) (\POSTSCRIPT.SPECIALOUTCHARFN 197897 . 200248) ( -\UPDATE.PSC 200250 . 201496) (\POSTSCRIPT.ACCENTFN 201498 . 202440) (\POSTSCRIPT.ACCENTPAIR 202442 . -205313)) (205413 207058 (\PSC.SPACEDISP 205423 . 205702) (\PSC.SPACEWID 205704 . 206323) (\PSC.SYMBOLS - 206325 . 207056)) (207167 210158 (\POSTSCRIPT.NSHASH 207177 . 210156))))) + (FILEMAP (NIL (22135 32454 (POSTSCRIPT.INIT 22145 . 29060) (POSTSCRIPT.PUTRGBCOLOR 29062 . 30084) ( +\PSC.COLOR.TO.RGB 30086 . 32452)) (33440 69285 (PSCFONT.READFONT 33450 . 35461) (PSCFONT.SPELLFILE +35463 . 36276) (PSCFONT.COERCEFILE 36278 . 37850) (PSCFONTFROMCACHE.SPELLFILE 37852 . 38837) ( +PSCFONTFROMCACHE.COERCEFILE 38839 . 40491) (PSCFONT.WRITEFONT 40493 . 41508) (READ-AFM-FILE 41510 . +47381) (CONVERT-AFM-FILES 47383 . 48595) (POSTSCRIPT.GETFONTID 48597 . 49992) (POSTSCRIPT.FONTCREATE +49994 . 63208) (\POSTSCRIPT.SPECIALFONT.SCALEDWIDTHS 63210 . 65607) (POSTSCRIPT.FONTSAVAILABLE 65609 + . 67896) (POSTSCRIPT.FONTEXISTS? 67898 . 69283)) (69286 79195 (OPENPOSTSCRIPTSTREAM 69296 . 78861) ( +CLOSEPOSTSCRIPTSTREAM 78863 . 79193)) (79240 85566 (POSTSCRIPT.HARDCOPYW 79250 . 82357) ( +POSTSCRIPT.TEDIT 82359 . 82811) (POSTSCRIPTFILEP 82813 . 84301) (MAKEEPSFILE 84303 . 85564)) (85567 +129311 (POSTSCRIPT.BITMAPSCALE 85577 . 88033) (POSTSCRIPT.CLOSESTRING 88035 . 88588) ( +POSTSCRIPT.ENDPAGE 88590 . 89481) (POSTSCRIPT.OUTSTR 89483 . 90700) (POSTSCRIPT.PUTBITMAPBYTES 90702 + . 99173) (POSTSCRIPT.PUTCOMMAND 99175 . 100164) (POSTSCRIPT.SET-FAKE-LANDSCAPE 100166 . 104686) ( +POSTSCRIPT.SHOWACCUM 104688 . 106843) (POSTSCRIPT.STARTPAGE 106845 . 109547) (\POSTSCRIPTTAB 109549 . +110346) (\PS.BOUTFIXP 110348 . 111628) (\PS.SCALEHACK 111630 . 114273) (\PS.SCALEREGION 114275 . +114835) (\SCALEDBITBLT.PSC 114837 . 119147) (\SETPOS.PSC 119149 . 119630) (\SETXFORM.PSC 119632 . +122216) (\STRINGWIDTH.PSC 122218 . 122691) (\SWITCHFONTS.PSC 122693 . 128185) (\TERPRI.PSC 128187 . +129309)) (129346 183202 (\BITBLT.PSC 129356 . 129908) (\BLTSHADE.PSC 129910 . 134571) (\CHARWIDTH.PSC +134573 . 135080) (\CREATECHARSET.PSC 135082 . 136438) (\DRAWARC.PSC 136440 . 138818) (\DRAWCIRCLE.PSC +138820 . 141071) (\DRAWCURVE.PSC 141073 . 144917) (\DRAWELLIPSE.PSC 144919 . 147283) (\DRAWLINE.PSC +147285 . 150025) (\DRAWPOINT.PSC 150027 . 150603) (\DRAWPOLYGON.PSC 150605 . 153734) ( +\DSPBOTTOMMARGIN.PSC 153736 . 154423) (\DSPCLIPPINGREGION.PSC 154425 . 155800) (\DSPCOLOR.PSC 155802 + . 156733) (\DSPFONT.PSC 156735 . 160372) (\DSPLEFTMARGIN.PSC 160374 . 161060) (\DSPLINEFEED.PSC +161062 . 161652) (\DSPPUSHSTATE.PSC 161654 . 163114) (\DSPPOPSTATE.PSC 163116 . 166601) (\DSPRESET.PSC + 166603 . 167268) (\DSPRIGHTMARGIN.PSC 167270 . 167959) (\DSPROTATE.PSC 167961 . 168960) ( +\DSPSCALE.PSC 168962 . 169914) (\DSPSCALE2.PSC 169916 . 170756) (\DSPSPACEFACTOR.PSC 170758 . 171679) +(\DSPTOPMARGIN.PSC 171681 . 172252) (\DSPTRANSLATE.PSC 172254 . 174285) (\DSPXPOSITION.PSC 174287 . +174851) (\DSPYPOSITION.PSC 174853 . 175444) (\FILLCIRCLE.PSC 175446 . 177671) (\FILLPOLYGON.PSC 177673 + . 180910) (\FIXLINELENGTH.PSC 180912 . 182231) (\MOVETO.PSC 182233 . 183003) (\NEWPAGE.PSC 183005 . +183200)) (183258 205404 (\POSTSCRIPT.CHANGECHARSET 183268 . 183986) (\POSTSCRIPT.OUTCHARFN 183988 . +196258) (\POSTSCRIPT.PRINTSLUG 196260 . 197984) (\POSTSCRIPT.SPECIALOUTCHARFN 197986 . 200337) ( +\UPDATE.PSC 200339 . 201585) (\POSTSCRIPT.ACCENTFN 201587 . 202529) (\POSTSCRIPT.ACCENTPAIR 202531 . +205402)) (205502 207147 (\PSC.SPACEDISP 205512 . 205791) (\PSC.SPACEWID 205793 . 206412) (\PSC.SYMBOLS + 206414 . 207145)) (207256 210247 (\POSTSCRIPT.NSHASH 207266 . 210245))))) STOP diff --git a/library/POSTSCRIPTSTREAM.LCOM b/library/POSTSCRIPTSTREAM.LCOM index 1778b1df..6ffd409c 100644 Binary files a/library/POSTSCRIPTSTREAM.LCOM and b/library/POSTSCRIPTSTREAM.LCOM differ diff --git a/library/PSEUDOHOSTS b/library/PSEUDOHOSTS index a563e43b..5cfb61c6 100644 --- a/library/PSEUDOHOSTS +++ b/library/PSEUDOHOSTS @@ -1,10 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "16-May-2025 12:07:44" {DSK}frank>il>qmedley>library>PSEUDOHOSTS.;2 31408 +(FILECREATED "28-Apr-2026 08:31:30" {WMEDLEY}PSEUDOHOSTS.;191 30987 - :CHANGES-TO (FNS PSEUDOHOSTS) + :EDIT-BY rmk - :PREVIOUS-DATE "31-Dec-2024 11:45:23" {DSK}frank>il>qmedley>library>PSEUDOHOSTS.;1) + :CHANGES-TO (FNS PSEUDOHOST) + + :PREVIOUS-DATE "27-Apr-2026 22:55:50" {MEDLEY}PSEUDOHOSTS.;190) (PRETTYCOMPRINT PSEUDOHOSTSCOMS) @@ -13,22 +15,19 @@ ( (* ;; "Public entries") - (FNS PSEUDOHOST PSEUDOHOSTP PSEUDOHOSTS TARGETHOST TRUEDEVICE TRUEFILENAME PSEUDOFILENAME) + (FNS PSEUDOHOST PSEUDOHOSTP PSEUDOHOSTS TARGETHOST TRUEDEVICE TRUEFILENAME PSEUDOFILENAME + PSEUDOFILENAMES) + (FNS CDPSEUDO) (* ;; "Internals") (FNS EXPAND.PH CONTRACT.PH UNSLASHIT GETHOSTINFO.PH) - (FNS CDPSEUDO) (FNS OPENFILE.PH GETFILENAME.PH DIRECTORYNAMEP.PH CLOSEFILE.PH REOPENFILE.PH DELETEFILE.PH - OPENP.PH UNREGISTERFILE.PH REGISTERFILE.PH GENERATEFILES.PH GETFILEINFO.PH - SETFILEINFO.PH NEXTFILEFN.PH FILEINFOFN.PH RENAMEFILE.PH) - (DECLARE%: DONTEVAL@LOAD DOCOPY (P (PSEUDOHOST 'LI LOGINHOST/DIR))) + GENERATEFILES.PH GETFILEINFO.PH SETFILEINFO.PH NEXTFILEFN.PH FILEINFOFN.PH) (P (MOVD? 'GETHOSTINFO 'GETHOSTINFO.ORIG) (MOVD 'GETHOSTINFO.PH 'GETHOSTINFO)) (DECLARE%: EVAL@COMPILE DONTCOPY (RECORDS PHDEVICE PHGENFILESTATE TARGETDEVICE) - (MACROS PSEUDOHOST.NAME PSEUDOHOST.TARGETVAL) - (FILES (FROM LOADUPS) - EXPORTS.ALL)))) + (MACROS PSEUDOHOST.NAME PSEUDOHOST.TARGETVAL)))) @@ -37,7 +36,15 @@ (DEFINEQ (PSEUDOHOST - [LAMBDA (HOST PREFIX) + [LAMBDA (HOST PREFIX CDSUFFIX NOERROR) + + (* ;; "Edited 28-Apr-2026 08:31 by rmk") + + (* ;; "Edited 25-Apr-2026 15:51 by rmk") + + (* ;; "Edited 2-Feb-2025 10:05 by rmk") + + (* ;; "Edited 30-Jan-2025 23:32 by rmk") (* ;; "Edited 2-Nov-2023 10:53 by rmk") @@ -58,12 +65,14 @@ (CHARCODE })) (SETQ HOST (SUBSTRING HOST 1 -2))) (SETQ HOST (U-CASE (MKATOM HOST))) - [if PREFIX - then (SETQ PREFIX (TRUEFILENAME PREFIX)) + (if PREFIX + then (CL:UNLESS (SETQ PREFIX (TRUEFILENAME PREFIX NOERROR)) + (RETFROM (FUNCTION PSEUDOHOST) + NIL)) (CL:WHEN (PSEUDOHOSTP HOST) (* ;  "Redefining: first clear out the previous one") (PSEUDOHOST HOST NIL)) - [LET (TARGETHOST TARGETDEVICE PREFIXHOST) + [LET (TARGETHOST TARGETDEVICE PREFIXHOST PHDEV) (CL:UNLESS [SETQ PREFIXHOST (U-CASE (FILENAMEFIELD PREFIX 'HOST] (SETQ PREFIX (UNSLASHIT (PACKFILENAME 'HOST (SETQ PREFIXHOST 'DSK) 'BODY PREFIX)))) @@ -86,6 +95,8 @@ (UNIX (SETQ PREFIX (SLASHIT PREFIX))) NIL) (SETQ TARGETDEVICE (OR (\GETDEVICEFROMHOSTNAME TARGETHOST) + (AND NOERROR (RETFROM (FUNCTION PSEUDOHOST) + NIL)) (ERROR "UNKNOWN TARGET HOST" TARGETHOST))) (* ;; "Save the last directory marker to pack on if needed.") @@ -104,38 +115,52 @@ REGISTERFILE _ (FUNCTION \ADD-OPEN-STREAM) GENERATEFILES _ (FUNCTION GENERATEFILES.PH) GETFILEINFO _ (FUNCTION GETFILEINFO.PH) - SETFILEINFO _ (FUNCTION SETFILEINFO.PH) - RENAMEFILE _ (FUNCTION RENAMEFILE.PH))) + SETFILEINFO _ (FUNCTION SETFILEINFO.PH))) - (* ;; "The ultimate target device keeps a map of prefixes and the hostnames they map to. The longest matching prefix is chosen when a name that expands to the target device is contracted.") + (* ;; "The ultimate target device keeps a map of prefixes and the hostnames they map to. If a PHOST preference isn't provided and two prefixes have common initial substrings, choose the one that provides the smallest file name. ") - (change (fetch (TARGETDEVICE PREFIXMAP) OF TARGETDEVICE) - (SORT (CONS (LIST PREFIX HOST (CL:IF (EQ (CHARCODE /) - (NTHCHARCODE PREFIX -1)) - '/ - '<)) - DATUM) - (FUNCTION (LAMBDA (P1 P2) - (IGREATERP (NCHARS (CAR P1)) - (NCHARS (CAR P2] - elseif (SETQ PREFIX (CADR (PSEUDOHOSTP HOST))) + (UNINTERRUPTABLY + [change (fetch (TARGETDEVICE PREFIXMAPS) OF TARGETDEVICE) + (SORT (CONS (LIST HOST PREFIX (CL:IF (EQ (CHARCODE /) + (NTHCHARCODE PREFIX -1)) + '/ + '<)) + DATUM) + (FUNCTION (LAMBDA (P1 P2) + + (* ;; "To give smallest file names, longest prefix comes first. If same length (synonyms), the one with the smallest host comes first. So MEDLEY before WMEDLEY") + + (if (IGREATERP (NCHARS (CADR P1)) + (NCHARS (CADR P2))) + elseif (EQ (NCHARS (CADR P1)) + (NCHARS (CADR P2))) + then (ILESSP (NCHARS (CAR P1)) + (NCHARS (CAR P2])] + elseif (PSEUDOHOSTP HOST) then (* ;; "\DEFINEDEVICE removes the name-mapping but doesn't remove the device. Maybe that's on purpose for other devices, but not here.") (LET* ((PHHOST (\GETDEVICEFROMNAME HOST \FILEDEVICES)) - (TARGETDEV (fetch (PHDEVICE TARGETDEV) OF PHHOST))) + (TARGETDEV (fetch (PHDEVICE TARGETDEV) of PHHOST))) (UNINTERRUPTABLY (CL:WHEN TARGETDEV (* ;  "Don't want to fail uninterruptably") - (CHANGE (FETCH (TARGETDEVICE PREFIXMAP) OF TARGETDEV) - (DREMOVE (ASSOC PREFIX DATUM) + (CHANGE (fetch (TARGETDEVICE PREFIXMAPS) of TARGETDEV) + (DREMOVE (ASSOC HOST DATUM) DATUM))) (SETQ \FILEDEVICES (DREMOVE PHHOST \FILEDEVICES)) - (\DEFINEDEVICE HOST NIL))] - HOST]) + (\DEFINEDEVICE HOST NIL))) + elseif NOERROR + else (ERROR (CONCAT "PREFIX FOR PSEUDOHOST " HOST " NOT FOUND"))) + (CL:WHEN (AND PREFIX CDSUFFIX) + (CDPSEUDO HOST CDSUFFIX)) + (CL:WHEN PREFIX (* ; + "If no prefix, we didn't get a pseudohost") + HOST)]) (PSEUDOHOSTP - [LAMBDA (HOST) (* ; "Edited 16-Dec-2024 21:15 by rmk") + [LAMBDA (HOST) (* ; "Edited 27-Apr-2026 17:27 by rmk") + (* ; "Edited 16-Dec-2024 21:15 by rmk") (* ; "Edited 24-Feb-2022 23:51 by rmk") (* ; "Edited 18-Jan-2022 11:29 by rmk") (LET [(DEV (if (type? FDEV HOST) @@ -144,37 +169,14 @@ then (fetch (STREAM DEVICE) of HOST) else (\GETDEVICEFROMNAME HOST T T] (CL:WHEN (AND DEV (type? FDEV (fetch (PHDEVICE TARGETDEV) OF DEV))) - (LIST (FETCH (FDEV DEVICENAME) OF DEV) - (FETCH (PHDEVICE PREFIX) - DEV)))]) + (LIST (fetch (FDEV DEVICENAME) of DEV) + (fetch (PHDEVICE PREFIX) of DEV)))]) (PSEUDOHOSTS - [LAMBDA (NEW.HOSTS) (* ; "Edited 17-Jan-2022 18:15 by rmk") - (* ; "Edited 16-May-2025 9:16 by fgh") - - (* ;; "") - - (* ;; " Returns existing list of PSEUDOHOST pairs. If NEW.HOSTS is T, all current pseudohosts are removed by calling (PSEUDOHOST HOST NIL) on each current pseudohost in turn. Otherwise, NEW.HOSTS should be a list of (HOST PREFIX) pairs and all current pseudohosts are r(PSEUDOHOSTSemoved (as above) and the NEW.HOSTS pairs are used to create new pseudohosts by calling (PSEUDOHOST HOST PREFIX) sequentially in reverse order of the NEW.HOSTS list. Reverse order to ensure that (PSEUDOHOSTS (PSEUDOHOSTS)) doesn't impact the ordering in the PSEUDOHOST list. This function is designed to be used cleanly with RESETSAVE.") - - (* ;; "") - - (LET [(CURRENT.HOSTS (for DEV in \FILEDEVICES when (type? FDEV (fetch (PHDEVICE TARGETDEV) - of DEV)) - collect (LIST (fetch (FDEV DEVICENAME) of DEV) - (fetch (PHDEVICE PREFIX) of DEV] - [COND - ((EQ NEW.HOSTS T) - (for HOST in CURRENT.HOSTS do (PSEUDOHOST (CAR HOST) - NIL))) - [[AND (LISTP NEW.HOSTS) - (for HOST in NEW.HOSTS always (AND (LISTP HOST) - (NOT (CDDR HOST] - (for HOST in CURRENT.HOSTS do (PSEUDOHOST (CAR HOST) - NIL)) - (for HOST in (REVERSE NEW.HOSTS) do (PSEUDOHOST (CAR HOST) - (CADR HOST] - (NEW.HOSTS (ERROR (CONCAT "PSEUDOHOSTS: Argument not valid:" NEW.HOSTS] - CURRENT.HOSTS]) + [LAMBDA NIL (* ; "Edited 17-Jan-2022 18:15 by rmk") + (FOR DEV IN \FILEDEVICES WHEN (TYPE? FDEV (FETCH (PHDEVICE TARGETDEV) OF DEV)) + COLLECT (LIST (FETCH (FDEV DEVICENAME) OF DEV) + (FETCH (PHDEVICE PREFIX) OF DEV]) (TARGETHOST [LAMBDA (HOST) (* ; "Edited 14-Dec-2024 15:26 by rmk") @@ -203,7 +205,8 @@ else DEV]) (TRUEFILENAME - [LAMBDA (FILE) (* ; "Edited 1-Oct-2023 20:16 by rmk") + [LAMBDA (FILE NOERROR) (* ; "Edited 2-Feb-2025 09:12 by rmk") + (* ; "Edited 1-Oct-2023 20:16 by rmk") (* ; "Edited 26-Jul-2023 07:53 by rmk") (* ; "Edited 26-Jan-2022 23:33 by rmk") (* ; "Edited 25-Jan-2022 08:47 by rmk") @@ -215,22 +218,60 @@ FILE)) (SETQ DEVICE (FETCH (STREAM DEVICE) OF FILE)) ELSE (SETQ FILENAME (\ADD.CONNECTED.DIR FILE)) - (SETQ DEVICE (\GETDEVICEFROMNAME FILENAME))) - (CL:IF (TYPE? PHDEVICE DEVICE) - (EXPAND.PH FILENAME DEVICE) - FILENAME)]) + (SETQ DEVICE (\GETDEVICEFROMNAME FILENAME NOERROR))) + (CL:WHEN DEVICE + (CL:IF (TYPE? PHDEVICE DEVICE) + (EXPAND.PH FILENAME DEVICE) + FILENAME))]) (PSEUDOFILENAME - [LAMBDA (FILE) (* ; "Edited 26-Jul-2023 12:34 by rmk") + [LAMBDA (FILE PHOST) (* ; "Edited 27-Apr-2026 18:50 by rmk") + (* ; "Edited 26-Apr-2026 09:00 by rmk: If PHOST is non-NIL and a pseudohost, that's the one that the caller wants.") + (* ; "Edited 24-Apr-2026 22:52 by rmk") + (* ; "Edited 26-Jul-2023 12:34 by rmk") (* ; "Edited 29-Jan-2022 23:08 by rmk") (* ; "Edited 28-Jan-2022 09:06 by rmk") (if (LISTP FILE) - then (for F in FILE collect (PSEUDOFILENAME F)) - else (FOR D PN (FILENAME _ (IF (STREAMP FILE) - THEN (FETCH (STREAM FULLFILENAME) OF FILE) - ELSE (\ADD.CONNECTED.DIR FILE))) IN \FILEDEVICES - WHEN (TYPE? PHDEVICE D) UNLESS (EQ FILENAME (SETQ PN (CONTRACT.PH FILENAME D))) - DO (RETURN PN) FINALLY (RETURN FILENAME]) + then (for F in FILE collect (PSEUDOFILENAME F PHOST)) + else (for D PN (FILENAME _ (if (STREAMP FILE) + then (fetch (STREAM FULLFILENAME) of FILE) + else (\ADD.CONNECTED.DIR FILE))) in \FILEDEVICES + when (type? PHDEVICE D) when (OR (NULL PHOST) + (EQ PHOST (fetch (FDEV DEVICENAME) of D))) + unless (EQ FILENAME (SETQ PN (CONTRACT.PH FILENAME D PHOST))) do (RETURN PN) + finally (RETURN FILENAME]) + +(PSEUDOFILENAMES + [LAMBDA (FILE) (* ; "Edited 27-Apr-2026 19:23 by rmk") + (* ; + "Edited 27-Apr-2026 10:00 by rmk; Edited 27-Apr-2026 09:33 by rmk") + + (* ;; "Shows all the pseudohost synonyms for FILE (including its truename)") + + (for D PN (TRUENAME _ (TRUEFILENAME FILE)) in \FILEDEVICES when (type? PHDEVICE D) + unless [EQ TRUENAME (SETQ PN (PSEUDOFILENAME TRUENAME (fetch (FDEV DEVICENAME) of D] + collect PN finally (RETURN (CONS TRUENAME $$VAL]) +) +(DEFINEQ + +(CDPSEUDO + [LAMBDA (PHOST CDSUFFIX FILEPKGFLG) (* ; "Edited 27-Apr-2026 22:54 by rmk") + (* ; "Edited 25-Apr-2026 23:53 by rmk") + (* ; "Edited 21-Dec-2024 13:48 by rmk") + (* ; "Edited 6-Feb-2024 15:50 by rmk") + + (* ;; "Makes a cd command for PHOST. The command name is %"cd%" followed by the lower-case letters of CDSUFFIX (e.g. cdf for PHOST FOO and CDSUFFIX %"f%".") + + (* ;; "Does not notify FILEPKG unless FILEPKGFLG") + + (DECLARE (SPECVARS FILEPKGFLG)) + (CL:WHEN (AND (SETQ PHOST (CAR (PSEUDOHOSTP PHOST))) + CDSUFFIX) + [LET [(CNAME (CONCAT "cd" (L-CASE CDSUFFIX] + (SETQ PHOST (CONCAT "{" PHOST "}")) + (EVAL `(DEFCOMMAND ,CNAME (SUBDIR) (/CNDIR (CL:IF SUBDIR + (CONCAT ,PHOST "/" SUBDIR) + ,PHOST)))])]) ) @@ -242,67 +283,76 @@ (EXPAND.PH [LAMBDA (FILENAME PHDEV) - (* ;; "Edited 25-Apr-2022 09:35 by rmk: that FILENAME contains }, because HOST was identified in it. If FILENAME is a stream, expand its full name") + (* ;; "Edited 27-Apr-2026 17:27 by rmk") + + (* ;; "Edited 25-Apr-2022 09:35 by rmk: that FILENAME contains }, because HOST was identified in it. If FILENAME is a stream, expand to its true name") (* ;; "Assumes that FILENAME contains }, because HOST was identified in it. If FILENAME is a stream, expand its full name") - [IF (TYPE? STREAM FILENAME) - THEN (CL:UNLESS PHDEV - (SETQ PHDEV (FETCH (STREAM DEVICE) OF FILENAME))) - (SETQ FILENAME (FETCH (STREAM FULLNAME) OF FILENAME)) - ELSEIF (NOT (TYPE? FDEV PHDEV)) - THEN (SETQ PHDEV (\GETDEVICEFROMNAME (OR PHDEV FILENAME] - (IF (TYPE? PHDEVICE PHDEV) - THEN (LET (SUFFIX SUFFIXPOS) + [if (type? STREAM FILENAME) + then (CL:UNLESS PHDEV + (SETQ PHDEV (fetch (STREAM DEVICE) of FILENAME))) + (SETQ FILENAME (fetch (STREAM FULLNAME) of FILENAME)) + elseif (NOT (type? FDEV PHDEV)) + then (SETQ PHDEV (\GETDEVICEFROMNAME (OR PHDEV FILENAME] + (if (type? PHDEVICE PHDEV) + then (LET (SUFFIX SUFFIXPOS) (CL:WHEN (SETQ SUFFIXPOS (STRPOS "}" FILENAME)) (SETQ SUFFIX (OR (SUBSTRING FILENAME (ADD1 SUFFIXPOS)) "")) (CL:WHEN (FMEMB (CHCON1 SUFFIX) (CHARCODE (< > /))) (SETQ SUFFIX (SUBSTRING SUFFIX 2))) - (CONCAT (FETCH (PHDEVICE PREFIX) OF PHDEV) + (CONCAT (fetch (PHDEVICE PREFIX) of PHDEV) SUFFIX))) - ELSE FILENAME]) + else FILENAME]) (CONTRACT.PH - [LAMBDA (NAME PHDEV) + [LAMBDA (TRUENAME PHDEV PHOST) + + (* ;; "Edited 27-Apr-2026 18:43 by rmk") + + (* ;; "Edited 26-Apr-2026 10:31 by rmk") (* ;; "Edited 22-Sep-2023 14:30 by rmk") - (* ;; "Edited 30-Jan-2022 00:20 by rmk: the smallest pseudoname for NAME. If the NAME was constructed by expanding, then") + (* ;; "Finds the preferred pseudoname for TRUENAME, the name on PHOST if given, else the shortest one. The PHDEV is used only to find its targetdev, that's where we scan for matching prefixes. This replaces the chosen prefix of TRUENAME with the corresponding pseudohost.") - (* ;; "Finds the smallest pseudoname for NAME. The PHDEV is used only to find its targetdev, that's where we scan for matching prefixes. This is so we can find the lowest matching pseudohost in the target's prefix map. If the hosts are defined as {DSK}...{H1}...{H2}, DSK knows the prefixes that lead to H1 and H2, picks the longest matching prefix and replaces it by the corresponding host.") + (CL:WHEN TRUENAME + (CL:UNLESS (type? FDEV PHDEV) + (SETQ PHDEV (\GETDEVICEFROMNAME PHDEV))) + (CL:WHEN (EQ PHOST T) + (SETQ PHOST (fetch (FDEV DEVICENAME) of PHDEV))) + (LET ((PREFIXMAPS (fetch (TARGETDEVICE PREFIXMAPS) of (fetch (PHDEVICE TARGETDEV) + of PHDEV))) + PREFIXMNAP SUFFIX CONNECTOR) - (* ;; "If pseudohosts are defined in terms of other pseudohosts (e.g. FUM is defined in terms of FOO which is defined in terms of LI which is rooted in DSK, then the pseudodevices presumably were created in that order, so the first name we encounter will be the one with the longest prefix. So {DSK}... might collapse to {FUM}. But {FOO}... will not. ") + (* ;; + "PREFIXMAPs of PHDEVare sorted so that the longest one comes first, if PHOST isn't specified") - (CL:UNLESS (TYPE? FDEV PHDEV) - (SETQ PHDEV (\GETDEVICEFROMNAME PHDEV))) - (CL:WHEN NAME - (FOR PM PREFIX SUFFIX CONNECTOR IN (FETCH (TARGETDEVICE PREFIXMAP) OF (FETCH (PHDEVICE - TARGETDEV - ) - OF PHDEV)) - WHEN (STRPOS (SETQ PREFIX (CAR PM)) - NAME 1 NIL T NIL FILEDIRCASEARRAY) - DO - (* ;; "This is the lowest host. ") + (SETQ PREFIXMAP (find PM in PREFIXMAPS when (OR (NULL PHOST) + (EQ PHOST (CAR PM))) + suchthat (STRPOS (CADR PM) + TRUENAME 1 NIL T NIL FILEDIRCASEARRAY))) - [SETQ SUFFIX (SUBSTRING NAME (ADD1 (NCHARS PREFIX] - (CL:WHEN (STRPOS ">" SUFFIX 1 NIL NIL NIL FILEDIRCASEARRAY) + (* ;; "If we didn't find a prefix map, TRUENAME was not related to any pseudohost descending from the target, it is a pure target name, presumably because something like a relative .. reference took it off all paths. We return the original name.") - (* ;; "CONNECTOR tells us whether to use / or > depending on what the prefix has") + (if PREFIXMAP + then (SETQ PREFIX (CADR PREFIXMAP)) + [SETQ SUFFIX (SUBSTRING TRUENAME (ADD1 (NCHARS PREFIX] + (CL:WHEN (STRPOS ">" SUFFIX) - (SETQ CONNECTOR (CADDR PM)) - [SETQ SUFFIX (CONCAT CONNECTOR (IF (EQ CONNECTOR '/) - THEN (SLASHIT SUFFIX) - ELSE (UNSLASHIT SUFFIX]) - (RETURN (PACK* '{ (CADR PM) + (* ;; + "CONNECTOR tells us whether to use / or > depending on what the prefix has") + + (SETQ CONNECTOR (CADDR PREFIXMAP)) + [SETQ SUFFIX (CONCAT CONNECTOR (CL:IF (EQ CONNECTOR '/) + (SLASHIT SUFFIX) + (UNSLASHIT SUFFIX))]) + (PACK* '{ (CAR PREFIXMAP) "}" - (OR SUFFIX ""))) FINALLY - - (* ;; "If we didn't match a prefix, then this was not related to any pseudhost descending from the target, it is a pure target name, presumably because something like a relative .. reference took it off all paths. We return the original name.") - - (RETURN NAME)))]) + (OR SUFFIX "")) + else TRUENAME)))]) (UNSLASHIT [LAMBDA (X LCASEDIRS) (* ; "Edited 26-Jan-2022 15:09 by rmk") @@ -338,37 +388,23 @@ (GETHOSTINFO.PH [LAMBDA (HOST ATTRIBUTE) + (* ;; "Edited 26-Nov-2025 17:26 by rmk") + (* ;; "Edited 24-Apr-2022 14:16 by rmk: the info from the true host") (* ;; "Want the info from the true host") (GETHOSTINFO.ORIG (OR (TARGETHOST HOST) HOST) - HOST ATTRIBUTE]) -) -(DEFINEQ - -(CDPSEUDO - [LAMBDA (PHOST CDSUFFIX FILEPKG) (* ; "Edited 21-Dec-2024 13:48 by rmk") - (* ; "Edited 6-Feb-2024 15:50 by rmk") - - (* ;; "Makes a cd command for PHOST. The command name is %"cd%" followed by the lower-case letters of CDSUFFIX (e.g. cdf for PHOST FOO and CDSUFFIX %"f%".") - - (CL:WHEN (AND (SETQ PHOST (CAR (PSEUDOHOSTP PHOST))) - CDSUFFIX) - [LET ((C (PACK* "cd" (L-CASE CDSUFFIX))) - (FILEPKGFLG FILEPKG)) - (DECLARE (SPECVARS FILEPKGFLG)) - (SETQ PHOST (CONCAT "{" PHOST "}")) - (EVAL `(DEFCOMMAND ,C (SUBDIR) (/CNDIR (CL:IF SUBDIR - (CONCAT ,PHOST "/" SUBDIR) - ,PHOST)))])]) + ATTRIBUTE]) ) (DEFINEQ (OPENFILE.PH [LAMBDA (FILE ACCESS RECOG OTHERINFO FDEV OLDSTRING) + (* ;; "Edited 26-Apr-2026 10:25 by rmk") + (* ;; "Edited 31-Oct-2022 23:32 by rmk") (* ;; "Edited 14-Jul-2022 17:53 by rmk") @@ -379,18 +415,19 @@ (* ;; "Edited 18-Jan-2022 10:29 by rmk") - (LET ((TARGETDEV (FETCH (PHDEVICE TARGETDEV) OF FDEV)) + (LET ((TARGETDEV (fetch (PHDEVICE TARGETDEV) of FDEV)) (STREAM (PSEUDOHOST.TARGETVAL OPENFILE (FILE ACCESS RECOG OTHERINFO FDEV OLDSTRING) FDEV))) (CL:WHEN STREAM (FDEVOP 'UNREGISTERFILE TARGETDEV TARGETDEV STREAM) - (CHANGE (FETCH (STREAM FULLFILENAME) OF STREAM) - (CONTRACT.PH DATUM FDEV)) - (REPLACE (STREAM DEVICE) OF STREAM WITH FDEV)) + (change (fetch (STREAM FULLFILENAME) of STREAM) + (CONTRACT.PH DATUM FDEV T)) + (replace (STREAM DEVICE) of STREAM with FDEV)) STREAM]) (GETFILENAME.PH - [LAMBDA (NAME RECOG FDEV) (* ; "Edited 25-Jan-2022 22:56 by rmk") + [LAMBDA (NAME RECOG FDEV) (* ; "Edited 25-Apr-2026 16:11 by rmk") + (* ; "Edited 25-Jan-2022 22:56 by rmk") (* ; "Edited 16-Jan-2022 20:27 by rmk") (PSEUDOHOST.NAME GETFILENAME (NAME RECOG FDEV]) @@ -413,52 +450,24 @@ STREAM ABORTFLG]) (REOPENFILE.PH - [LAMBDA (FILE ACCESS RECOG OTHERINFO FDEV OLDSTREAM) (* ; "Edited 25-Jan-2022 12:50 by rmk") + [LAMBDA (FILE ACCESS RECOG OTHERINFO FDEV OLDSTREAM) (* ; "Edited 26-Apr-2026 10:26 by rmk") + (* ; "Edited 25-Jan-2022 12:50 by rmk") (* ; "Edited 18-Jan-2022 11:41 by rmk") (LET ((STREAM (PSEUDOHOST.TARGETVAL REOPENFILE (FILE ACCESS RECOG OTHERINFO FDEV OLDSTREAM) FDEV))) - (CHANGE (FETCH (STREAM FULLFILENAME) OF STREAM) - (CONTRACT.PH DATUM FDEV)) - (REPLACE (STREAM DEVICE) OF STREAM WITH FDEV) + (CHANGE (fetch (STREAM FULLFILENAME) of STREAM) + (CONTRACT.PH DATUM FDEV T)) + (replace (STREAM DEVICE) of STREAM with FDEV) STREAM]) (DELETEFILE.PH - [LAMBDA (FILENAME DEV) (* ; "Edited 25-Jan-2022 22:56 by rmk") - (* ; "Edited 18-Jan-2022 10:23 by rmk") + [LAMBDA (FILENAME DEV) (* ; "Edited 25-Apr-2026 23:41 by rmk") + (* ; "Edited 25-Jan-2022 22:56 by rmk") (PSEUDOHOST.NAME DELETEFILE (FILENAME DEV]) -(OPENP.PH - [LAMBDA (FILENAME ACCESS DEVICE) - - (* ;; "Edited 25-Jun-2022 15:48 by rmk: No longer called. Streams are registered in the pseudohost, not in the target device.") - - (* ;; "Edited 18-Jan-2022 10:29 by rmk") - - (PSEUDOHOST.TARGETVAL OPENP (FILENAME ACCESS DEVICE]) - -(UNREGISTERFILE.PH - [LAMBDA (DEVICE STREAM) (* ; "Edited 25-Jun-2022 15:07 by rmk") - (* ; "Edited 16-Jan-2022 16:47 by rmk") - - (* ;; - "This isn't called now because files are now registered in the pseudohost, not the target device.") - - (APPLY* (FETCH (FDEV UNREGISTERFILE) OF (FETCH (PHDEVICE TARGETDEV) OF DEVICE)) - (FETCH (PHDEVICE TARGETDEV) OF DEVICE) - STREAM]) - -(REGISTERFILE.PH - [LAMBDA (DEVICE STREAM) (* ; "Edited 25-Jun-2022 15:07 by rmk") - (* ; "Edited 16-Jan-2022 16:46 by rmk") - - (* ;; "This isn't called now, because the stream is registered in the pseudohost, not in the target device.") - - (APPLY* (FETCH (FDEV REGISTERFILE) OF (FETCH (PHDEVICE TARGETDEV) OF DEVICE)) - (FETCH (PHDEVICE TARGETDEV) OF DEVICE) - STREAM]) - (GENERATEFILES.PH - [LAMBDA (FDEV PATTERN DESIREDPROPS OPTIONS) (* ; "Edited 17-Jan-2022 20:46 by rmk") + [LAMBDA (FDEV PATTERN DESIREDPROPS OPTIONS) (* ; "Edited 25-Apr-2026 23:21 by rmk") + (* ; "Edited 17-Jan-2022 20:46 by rmk") (* ;; "FDEV is the pseudohost. We will generate from the target directory using its GENFILESTATE, but fiddle the output so that it looks like it is coming from the pseudo host.") @@ -473,26 +482,33 @@ (CREATE FILEGENOBJ NEXTFILEFN _ (FUNCTION NEXTFILEFN.PH) FILEINFOFN _ (FUNCTION FILEINFOFN.PH) - GENFILESTATE _ (LIST FDEV TARGETGENOBJ]) + GENFILESTATE _ (LIST FDEV TARGETGENOBJ (fetch (FDEV DEVICENAME) of FDEV]) (GETFILEINFO.PH - [LAMBDA (STREAM ATTRIBUTE DEVICE) (* ; "Edited 25-Jan-2022 12:43 by rmk") + [LAMBDA (STREAM ATTRIBUTE DEVICE) (* ; "Edited 22-Apr-2026 18:12 by rmk") + (* ; "Edited 20-Apr-2026 08:30 by rmk") + (* ; "Edited 25-Jan-2022 12:43 by rmk") (* ; "Edited 17-Jan-2022 18:21 by rmk") - (PSEUDOHOST.TARGETVAL GETFILEINFO (STREAM ATTRIBUTE DEVICE]) + (GETFILEINFO (TRUEFILENAME STREAM) + ATTRIBUTE]) (SETFILEINFO.PH - [LAMBDA (STREAM ATTRIBUTE VALUE DEVICE) (* ; "Edited 25-Jan-2022 12:37 by rmk") - (PSEUDOHOST.TARGETVAL SETFILEINFO (STREAM ATTRIBUTE VALUE DEVICE]) + [LAMBDA (STREAM ATTRIBUTE VALUE DEVICE) (* ; "Edited 25-Apr-2026 15:52 by rmk") + (* ; "Edited 25-Jan-2022 12:37 by rmk") + (SETFILEINFO (TRUEFILENAME STREAM) + ATTRIBUTE VALUE]) (NEXTFILEFN.PH - [LAMBDA (GENFILESTATE NAMEONLY) (* ; "Edited 17-Jan-2022 21:27 by rmk") + [LAMBDA (GENFILESTATE NAMEONLY) (* ; "Edited 25-Apr-2026 23:21 by rmk") + (* ; "Edited 17-Jan-2022 21:27 by rmk") (LET* ((TARGETGENOBJ (CADR GENFILESTATE)) (TARGETGENFILESTATE (FETCH GENFILESTATE OF TARGETGENOBJ)) (FILENAME (APPLY* (FETCH NEXTFILEFN OF TARGETGENOBJ) TARGETGENFILESTATE NAMEONLY))) (CL:WHEN FILENAME (CL:UNLESS NAMEONLY - (SETQ FILENAME (CONTRACT.PH FILENAME (CAR GENFILESTATE))))) + (SETQ FILENAME (CONTRACT.PH FILENAME (CAR GENFILESTATE) + (CADDR GENFILESTATE))))) FILENAME]) (FILEINFOFN.PH @@ -500,27 +516,6 @@ (APPLY* (FETCH FILEINFOFN OF (CADR GENFILESTATE)) (FETCH GENFILESTATE OF (CADR GENFILESTATE)) ATTRIBUTE]) - -(RENAMEFILE.PH - [LAMBDA (OLD-DEVICE OLD-NAME NEW-DEVICE NEW-NAME) (* ; "Edited 18-Jan-2022 09:52 by rmk") - (LET ((OLDTARGETDEV (FETCH (PHDEVICE TARGETDEV) OF OLD-DEVICE)) - (NEWTARGETDEV (FETCH (PHDEVICE TARGETDEV) OF NEW-DEVICE)) - (NEWTARGETNAME NEW-NAME) - RESULT) - (CL:WHEN (TYPE? FDEV NEWTARGETDEV) (* ; "NEW-DEVICE is a pseudo host") - (SETQ NEWTARGETNAME (EXPAND.PH NEW-NAME NEW-DEVICE))) - (SETQ RESULT (APPLY* (FETCH (FDEV RENAMEFILE) OF OLDTARGETDEV) - OLDTARGETDEV - (EXPAND.PH OLD-NAME OLD-DEVICE) - (OR NEWTARGETDEV NEW-DEVICE) - NEWTARGETNAME)) - (CL:WHEN (AND RESULT (NEQ NEWTARGETDEV NEW-DEVICE)) - (SETQ RESULT (CONTRACT.PH RESULT NEW-DEVICE))) - RESULT]) -) -(DECLARE%: DONTEVAL@LOAD DOCOPY - -(PSEUDOHOST 'LI LOGINHOST/DIR) ) (MOVD? 'GETHOSTINFO 'GETHOSTINFO.ORIG) @@ -536,7 +531,7 @@ (RECORD PHGENFILESTATE (PHDEVICE . TARGETGENFILESTATE)) -(ACCESSFNS TARGETDEVICE ((PREFIXMAP (FETCH (FDEV FDEV3) OF DATUM) +(ACCESSFNS TARGETDEVICE ((PREFIXMAPS (FETCH (FDEV FDEV3) OF DATUM) (REPLACE (FDEV FDEV3) OF DATUM WITH NEWVALUE)))) ) @@ -551,14 +546,14 @@ (* ;;  "Assumes that the name is (CAR ARGS), the device is the last or args if not specified separately") - `(CONTRACT.PH [APPLY* (FETCH (FDEV ,OPNAME) OF (FETCH (PHDEVICE TARGETDEV) + `(CONTRACT.PH [APPLY* (fetch (FDEV ,OPNAME) of (fetch (PHDEVICE TARGETDEV) OF ,DEV)) (EXPAND.PH ,(CAR ARGS) ,DEV) - ,@(SUBST `(FETCH (PHDEVICE TARGETDEV) OF ,DEV) + ,@(SUBST `(fetch (PHDEVICE TARGETDEV) of ,DEV) DEV (CDR ARGS] - ,DEV]) + ,DEV T]) (PUTPROPS PSEUDOHOST.TARGETVAL MACRO [TAIL (LET [(OPNAME (CAR TAIL)) @@ -576,19 +571,14 @@ DEV (CDR ARGS]) ) - - -(FILESLOAD (FROM LOADUPS) - EXPORTS.ALL) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1331 13754 (PSEUDOHOST 1341 . 7049) (PSEUDOHOSTP 7051 . 7880) (PSEUDOHOSTS 7882 . 9925) - (TARGETHOST 9927 . 10796) (TRUEDEVICE 10798 . 11754) (TRUEFILENAME 11756 . 12881) (PSEUDOFILENAME -12883 . 13752)) (13782 19797 (EXPAND.PH 13792 . 15045) (CONTRACT.PH 15047 . 17758) (UNSLASHIT 17760 . -19506) (GETHOSTINFO.PH 19508 . 19795)) (19798 20699 (CDPSEUDO 19808 . 20697)) (20700 28720 ( -OPENFILE.PH 20710 . 21783) (GETFILENAME.PH 21785 . 22074) (DIRECTORYNAMEP.PH 22076 . 22700) ( -CLOSEFILE.PH 22702 . 23169) (REOPENFILE.PH 23171 . 23736) (DELETEFILE.PH 23738 . 24022) (OPENP.PH -24024 . 24319) (UNREGISTERFILE.PH 24321 . 24863) (REGISTERFILE.PH 24865 . 25399) (GENERATEFILES.PH -25401 . 26445) (GETFILEINFO.PH 26447 . 26749) (SETFILEINFO.PH 26751 . 26950) (NEXTFILEFN.PH 26952 . -27498) (FILEINFOFN.PH 27500 . 27775) (RENAMEFILE.PH 27777 . 28718))))) + (FILEMAP (NIL (1128 14735 (PSEUDOHOST 1138 . 8248) (PSEUDOHOSTP 8250 . 9169) (PSEUDOHOSTS 9171 . 9532) + (TARGETHOST 9534 . 10403) (TRUEDEVICE 10405 . 11361) (TRUEFILENAME 11363 . 12650) (PSEUDOFILENAME +12652 . 14064) (PSEUDOFILENAMES 14066 . 14733)) (14736 15885 (CDPSEUDO 14746 . 15883)) (15913 21797 ( +EXPAND.PH 15923 . 17229) (CONTRACT.PH 17231 . 19713) (UNSLASHIT 19715 . 21461) (GETHOSTINFO.PH 21463 + . 21795)) (21798 28419 (OPENFILE.PH 21808 . 22933) (GETFILENAME.PH 22935 . 23333) (DIRECTORYNAMEP.PH +23335 . 23959) (CLOSEFILE.PH 23961 . 24428) (REOPENFILE.PH 24430 . 25106) (DELETEFILE.PH 25108 . 25392 +) (GENERATEFILES.PH 25394 . 26588) (GETFILEINFO.PH 26590 . 27111) (SETFILEINFO.PH 27113 . 27422) ( +NEXTFILEFN.PH 27424 . 28140) (FILEINFOFN.PH 28142 . 28417))))) STOP diff --git a/library/PSEUDOHOSTS.LCOM b/library/PSEUDOHOSTS.LCOM index 3f8e0a28..0252b146 100644 Binary files a/library/PSEUDOHOSTS.LCOM and b/library/PSEUDOHOSTS.LCOM differ diff --git a/library/PSEUDOHOSTS.TEDIT b/library/PSEUDOHOSTS.TEDIT index ea981028..462899ae 100644 Binary files a/library/PSEUDOHOSTS.TEDIT and b/library/PSEUDOHOSTS.TEDIT differ diff --git a/library/SAMEDIR b/library/SAMEDIR index 1ff27939..1b1e67fa 100644 --- a/library/SAMEDIR +++ b/library/SAMEDIR @@ -1,15 +1,13 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "31-Oct-2022 13:09:14" {WMEDLEY}SAMEDIR.;4 6221 +(FILECREATED "27-Apr-2026 21:18:26" {WMEDLEY}SAMEDIR.;6 6540 - :CHANGES-TO (FNS CHECKSAMEDIR HOST&DIRECTORYFIELD) + :EDIT-BY rmk - :PREVIOUS-DATE "25-Apr-2022 09:23:16" {WMEDLEY}SAMEDIR.;3) + :CHANGES-TO (FNS CHECKSAMEDIR) + :PREVIOUS-DATE "31-Oct-2022 13:09:14" {MEDLEY}SAMEDIR.;4) -(* ; " -Copyright (c) 1982, 1984-1987, 1990, 2018, 2020 by Venue & Xerox Corporation. -") (PRETTYCOMPRINT SAMEDIRCOMS) @@ -24,7 +22,8 @@ Copyright (c) 1982, 1984-1987, 1990, 2018, 2020 by Venue & Xerox Corporation. (DEFINEQ (CHECKSAMEDIR - [LAMBDA (FILE) (* ; "Edited 31-Oct-2022 13:08 by rmk") + [LAMBDA (FILE) (* ; "Edited 27-Apr-2026 21:18 by rmk") + (* ; "Edited 31-Oct-2022 13:08 by rmk") (* ; "Edited 25-Apr-2022 09:16 by rmk") (* ; "Edited 1-Sep-2020 11:40 by rmk:") @@ -32,70 +31,75 @@ Copyright (c) 1982, 1984-1987, 1990, 2018, 2020 by Venue & Xerox Corporation. (* ;; " OKHOST/DIRS is a list of places it's OK for the file to be winding up, so if your'e migrating code from one place ot another, you can do it gracefully.") + (* ;; + "MIGRATIONS may be provided as a global variable, to suppress the askusers. See documentation. ") + [RESETSAVE (DIRECTORYNAME T) - '(PROGN (CNDIR OLDVALUE] (* ; + '(PROGN (CNDIR OLDVALUE] + (SETQ FILE (ROOTFILENAME FILE)) (* ;  "Assumes that MAKEFILE has RESETLST") (PROG ((*UPPER-CASE-FILE-NAMES* NIL) - (DATES (GET (SETQ FILE (ROOTFILENAME FILE)) - 'FILEDATES)) - HOST/DIR HOST DIR NEWV OKHOST/DIRS) + [OLDFILE (CDAR (LISTP (GET FILE 'FILEDATES] + PREVPDIRS HOST/DIR NEWV OKHOST/DIRS OLDDIR) + (CL:UNLESS OLDFILE (RETURN)) + + (* ;; "Only the first previor location matters. If we moved it, we don't want to move it back.") + + (SETQ OLDDIR (HOST&DIRECTORYFIELD OLDFILE)) + + (* ;; "PREVPDIRS is a list of all possible pseudohost synonyms for the previous location of FILE. Use HOST&DIRECTORYFIELD to canonicalize both file and connected directory") + + (SETQ PREVPDIRS (PSEUDOFILENAMES OLDDIR)) (* ; + "Any pseudohost or migrating pseudohost is good") + (SETQ OKHOST/DIRS (APPEND (for M in MIGRATIONS when (CL:MEMBER (CAR M) + PREVPDIRS :TEST + (FUNCTION STRING-EQUAL)) + collect (CDR M)) + PREVPDIRS)) AGAIN - (OR (LISTP DATES) - (RETURN)) (* ; - "RMK: Use HOST&DIRECTORYFIELD to canonicalize both file and connected directory") - [SETQ OKHOST/DIRS (CONS (SETQ HOST/DIR (HOST&DIRECTORYFIELD (DIRECTORYNAME T))) - (MKLIST (CDR (OR (ASSOC HOST/DIR MIGRATIONS :TEST 'STRING-EQUAL) - (ASSOC (TRUEFILENAME HOST/DIR) - MIGRATIONS :TEST 'STRING-EQUAL) - (ASSOC (PSEUDOFILENAME HOST/DIR) - MIGRATIONS :TEST 'STRING-EQUAL] - (COND - ([for OLDFILE in DATES bind HOST DIR - never (OR (CL:MEMBER (HOST&DIRECTORYFIELD (CDR OLDFILE)) - OKHOST/DIRS :TEST 'STRING-EQUAL) - (CL:MEMBER (TRUEFILENAME (HOST&DIRECTORYFIELD (CDR OLDFILE))) - OKHOST/DIRS :TEST 'STRING-EQUAL) - (CL:MEMBER (PSEUDOFILENAME (HOST&DIRECTORYFIELD (CDR OLDFILE))) - OKHOST/DIRS :TEST 'STRING-EQUAL] + (* ; "Come here on new directory") + (SETQ HOST/DIR (DIRECTORYNAME T)) (* ; + "Current directory, maybe newly connected") + (if (NOT (CL:MEMBER HOST/DIR OKHOST/DIRS :TEST (FUNCTION STRING-EQUAL))) + then + (* ;; "The file would go somewhere new. Is that what the user really wants?") - (* ;; "The file is going somewhere it has never been before. ") + (SELECTQ (ASKUSER SAMEDIRWAIT SAMEDIRDEFAULT (LIST "You haven't loaded or written" + FILE + "in your connected directory" + HOST/DIR + "-- write it out anyway") + `[[O ,(CONCAT "Oops! Make file on " (SETQ HOST/DIR OLDDIR] + (C "Make file on other directory: ") + (Y ,(CONCAT "Yes, write it here") + (CHARACTER (CHARCODE EOL))) + (N ,(CONCAT "No, abort MAKEFILE") + (CHARACTER (CHARCODE EOL] + NIL NIL '(NOECHOFLG T)) + (Y (RETURN)) + (N (ERROR!)) + (C (SETQ HOST/DIR NIL)) + (O (* ; + "Choose DATE directory above, switch in NLSETQ below, switch back in RESETSAVE above") + (TERPRI T)) + (SHOULDNT)) + (CL:WHEN [NLSETQ (CNDIR (OR HOST/DIR (READ T T] + (RETURN)) + (GO AGAIN) + elseif (AND (SETQ NEWV (INFILEP (PACKFILENAME.STRING 'VERSION NIL 'BODY OLDFILE))) + (NOT (STRING-EQUAL NEWV OLDFILE))) + then + (* ;; "A newer version appeared while the user was editing this file.") - (* ;; "Check that that is really what the user wants.") + (* ;; "Ask if he should over-write it.") - (SELECTQ (ASKUSER SAMEDIRWAIT SAMEDIRDEFAULT (LIST "You haven't loaded or written" FILE - "in your connected directory" - HOST/DIR "-- write it out anyway") - `[[O ,(CONCAT "Oops! Make file on " (SETQ HOST/DIR ( - HOST&DIRECTORYFIELD - (CDAR DATES] - (C "Make file on other directory: ") - (Y ,(CONCAT "Yes, write it here") - (CHARACTER (CHARCODE EOL))) - (N ,(CONCAT "No, abort MAKEFILE") - (CHARACTER (CHARCODE EOL] - NIL NIL '(NOECHOFLG T)) - (Y (RETURN)) - (N (ERROR!)) - (C (SETQ HOST/DIR)) - (O (TERPRI T)) - (SHOULDNT)) - [NLSETQ (CNDIR (OR HOST/DIR (READ T T] - (GO AGAIN)) - ([AND [SETQ NEWV (INFILEP (PACKFILENAME.STRING 'VERSION NIL 'BODY (CDAR DATES] - (NOT (STRING-EQUAL NEWV (CDAR DATES] - - (* ;; "A newer version appeared while the user was editing this file.") - - (* ;; "Ask if he should over-write it.") - - (SELECTQ (ASKUSER 15 'Y (LIST (CDAR DATES) - "is not the most recent version (version" - (FILENAMEFIELD.STRING NEWV 'VERSION) - "has since appeared)." - "Do you want to make the file anyway")) - (Y) - (N (ERROR!)) - (SHOULDNT]) + (SELECTQ (ASKUSER 15 'Y (LIST OLDFILE "is not the most recent version (version" + (FILENAMEFIELD.STRING NEWV 'VERSION) + "has since appeared)." + "Do you want to make the file anyway")) + (Y) + (N (ERROR!)) + (SHOULDNT]) (HOST&DIRECTORYFIELD [LAMBDA (FILENAME) (* ; "Edited 31-Oct-2022 13:03 by rmk") @@ -120,7 +124,6 @@ Copyright (c) 1982, 1984-1987, 1990, 2018, 2020 by Venue & Xerox Corporation. (GLOBALVARS MIGRATIONS) ) -(PUTPROPS SAMEDIR COPYRIGHT ("Venue & Xerox Corporation" 1982 1984 1985 1986 1987 1990 2018 2020)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (731 5838 (CHECKSAMEDIR 741 . 5249) (HOST&DIRECTORYFIELD 5251 . 5836))))) + (FILEMAP (NIL (641 6256 (CHECKSAMEDIR 651 . 5667) (HOST&DIRECTORYFIELD 5669 . 6254))))) STOP diff --git a/library/SAMEDIR.LCOM b/library/SAMEDIR.LCOM index 3185b143..32bfbbfe 100644 Binary files a/library/SAMEDIR.LCOM and b/library/SAMEDIR.LCOM differ diff --git a/library/UNICODE-TABLES b/library/UNICODE-TABLES index cd429286..1f275912 100644 --- a/library/UNICODE-TABLES +++ b/library/UNICODE-TABLES @@ -1,15 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT UTF-8) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8) -(FILECREATED "22-Feb-2026 10:44:33" {WMEDLEY}UNICODE-TABLES.;20 44960 +(FILECREATED "26-Apr-2026 10:44:13" {MEDLEY}UNICODE-TABLES.;23 44829 :EDIT-BY rmk - :CHANGES-TO (FNS ALL-UNICODE-MAPPINGS GET-MCCS-UNICODE-MAPPING INVERT-UNICODE-MAPPING - MAKE-UNICODE-TRANSLATION-TABLES MERGE-UNICODE-TRANSLATION-TABLES - READ-UNICODE-MAPPING-FILENAMES) - (VARS UNICODE-TABLESCOMS) + :CHANGES-TO (VARS UNICODE-TABLESCOMS) - :PREVIOUS-DATE "22-Feb-2026 09:15:20" {WMEDLEY}UNICODE-TABLES.;16) + :PREVIOUS-DATE "31-Mar-2026 09:01:05" {MEDLEY}UNICODE-TABLES.;22) (PRETTYCOMPRINT UNICODE-TABLESCOMS) @@ -19,7 +16,7 @@ (* ;; "This is code for reading/writing the XCCS-to-UNICODE mapping tables. It runs offline, when UNICODE-UTF8 is modified. ") (COMS (* ; "Read Unicode mapping files") - (INITVARS (UNICODEDIRECTORIES NIL)) + [INITVARS (UNICODEDIRECTORIES '({MEDLEY}/unicode/xerox/] (GLOBALVARS UNICODEDIRECTORIES) (VARS XCCS-CHARSETS) (FNS READ-UNICODE-MAPPING-FILENAMES READ-UNICODE-MAPPING)) @@ -59,7 +56,7 @@ (* ; "Read Unicode mapping files") -(RPAQ? UNICODEDIRECTORIES NIL) +(RPAQ? UNICODEDIRECTORIES '({MEDLEY}/unicode/xerox/)) (DECLARE%: DOEVAL@COMPILE DONTCOPY (GLOBALVARS UNICODEDIRECTORIES) @@ -78,8 +75,9 @@ (RUNIC-GOTHIC "51") (MORE-CYRILLIC "52") (UNKNOWN1 "56") + (DECORATED-RULES "56") (UNKNOWN2 "57") - (JIS "60-166") + (VERTICAL-JAPANESE "57") (ARABIC "340") (HEBREW "341") (IPA "342") @@ -101,9 +99,10 @@ (ACCENTED-GREEK2 "364") (MORE-ARABIC "365") (GRAPHIC-VARIANTS "375") + (JAPANESE HIRAGANA KATAKANA JIS) (DEFAULT LATIN ACCENTED-LATIN1 EXTENDED-LATIN SYMBOLS1 SYMBOLS2 FORMS JAPANESE-SYMBOLS1 JAPANESE-SYMBOLS2) - (JAPANESE HIRAGANA KATAKANA JIS))) + (JIS "60-166"))) (DEFINEQ (READ-UNICODE-MAPPING-FILENAMES @@ -793,12 +792,12 @@ UNICODE-EXPORTS) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4107 12829 (READ-UNICODE-MAPPING-FILENAMES 4117 . 8586) (READ-UNICODE-MAPPING 8588 . -12827)) (12896 19704 (MAKE-UNICODE-TRANSLATION-TABLES 12906 . 15666) (GET-MCCS-UNICODE-MAPPING 15668 - . 16688) (INVERT-UNICODE-MAPPING 16690 . 18483) (XCCSTOMCCS-MAPPING 18485 . 19702)) (19705 26328 ( -ALL-UNICODE-MAPPINGS 19715 . 24991) (XCCSJAPANESECHARSETS 24993 . 26326)) (26373 37135 ( -WRITE-UNICODE-MAPPING 26383 . 30127) (WRITE-UNICODE-INCLUDED 30129 . 34441) ( -WRITE-UNICODE-MAPPING-HEADER 34443 . 35691) (WRITE-UNICODE-MAPPING-FILENAME 35693 . 37133)) (37136 -37812 (XCCS-UTF8-AFTER-OPEN 37146 . 37810)) (40337 42426 (UTF8HEXSTRING 40347 . 42424)) (42453 44495 ( -SHOWCHARS 42463 . 44493))))) + (FILEMAP (NIL (3976 12698 (READ-UNICODE-MAPPING-FILENAMES 3986 . 8455) (READ-UNICODE-MAPPING 8457 . +12696)) (12765 19573 (MAKE-UNICODE-TRANSLATION-TABLES 12775 . 15535) (GET-MCCS-UNICODE-MAPPING 15537 + . 16557) (INVERT-UNICODE-MAPPING 16559 . 18352) (XCCSTOMCCS-MAPPING 18354 . 19571)) (19574 26197 ( +ALL-UNICODE-MAPPINGS 19584 . 24860) (XCCSJAPANESECHARSETS 24862 . 26195)) (26242 37004 ( +WRITE-UNICODE-MAPPING 26252 . 29996) (WRITE-UNICODE-INCLUDED 29998 . 34310) ( +WRITE-UNICODE-MAPPING-HEADER 34312 . 35560) (WRITE-UNICODE-MAPPING-FILENAME 35562 . 37002)) (37005 +37681 (XCCS-UTF8-AFTER-OPEN 37015 . 37679)) (40206 42295 (UTF8HEXSTRING 40216 . 42293)) (42322 44364 ( +SHOWCHARS 42332 . 44362))))) STOP diff --git a/library/UNICODE-TABLES.LCOM b/library/UNICODE-TABLES.LCOM index 88ca0dcb..26c0cfeb 100644 Binary files a/library/UNICODE-TABLES.LCOM and b/library/UNICODE-TABLES.LCOM differ diff --git a/library/UNIXUTILS b/library/UNIXUTILS index 0c0553a4..b2beae1d 100644 --- a/library/UNIXUTILS +++ b/library/UNIXUTILS @@ -1,12 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "19-Jan-2026 14:09:03" {WMEDLEY}UNIXUTILS.;55 20711 +(FILECREATED "13-May-2026 12:28:06" {MEDLEY}UNIXUTILS.;62 22210 :EDIT-BY rmk :CHANGES-TO (FNS UNIX-FILE-NAME) - :PREVIOUS-DATE "17-Jan-2026 23:16:17" {WMEDLEY}UNIXUTILS.;54) + :PREVIOUS-DATE "28-Apr-2026 09:59:13" {MEDLEY}UNIXUTILS.;61) (PRETTYCOMPRINT UNIXUTILSCOMS) @@ -23,6 +23,7 @@ (ShellOpener NIL RESET))) (FNS ShellBrowser ShellBrowse ShellOpener ShellOpen PROCESS-COMMAND SLASHIT UNIX-FILE-NAME UNIX-TMP-FILE-NAME) + (COMMANDS "cd" cdm "ls" "pwd") (PROPS (UNIXUTILS FILETYPE)))) (DECLARE%: EVAL@COMPILE DONTCOPY @@ -148,7 +149,8 @@ "true"]) (ShellOpen - [LAMBDA (FilenameOrURL) (* ; "Edited 28-Dec-2025 18:26 by rmk") + [LAMBDA (FilenameOrURL) (* ; "Edited 27-Apr-2026 11:08 by FGH") + (* ; "Edited 28-Dec-2025 18:26 by rmk") (* ; "Edited 10-Sep-2025 15:29 by rmk") (* ; "Edited 4-May-2025 11:14 by rmk") @@ -210,7 +212,8 @@ 'NAME NEWNAME 'EXTENSION EXTENSION)) (TARGETFILE.UNIX (SLASHIT (PACKFILENAME.STRING 'HOST NIL 'DIRECTORY TMPDIR 'NAME NEWNAME 'EXTENSION - EXTENSION))) + EXTENSION) + NIL NIL NIL T)) (UNIXFILE NIL)) (DECLARE (SPECVARS UNIXFILE)) (if (OR VERSION.SPECIFIED (NOT UNVERSIONED.EXISTS)) @@ -245,7 +248,8 @@ 0))) DO (BLOCK) FINALLY (RETURN CODE]) (SLASHIT - [LAMBDA (X LCASEDIRS NOHOST KEEPDOT) (* ; "Edited 17-Jan-2026 23:15 by rmk") + [LAMBDA (X LCASEDIRS NOHOST KEEPDOT NO.QUOTE.SPACE) (* ; "Edited 27-Apr-2026 11:00 by FGH") + (* ; "Edited 17-Jan-2026 23:15 by rmk") (* ; "Edited 4-Nov-2025 10:10 by rmk") (* ; "Edited 22-Oct-2025 13:05 by rmk") (* ; "Edited 25-Sep-2025 09:57 by rmk") @@ -258,7 +262,10 @@ (* ;; "This is a first approximation to a utility that converts a filename X on a host whose files physically reside in the local Unix file system into the strings that shell commands can use to reference that file. For now, this just involves replacing directory brackets with /, removing the host, perhaps lower-casing the directory, and perhaps removing a final dot. It probably should be extended to deal with version number translation, for now it just keeps the ; version. ") (LET [LASTDIRPOS SLASHED (DIRPOS (ADD1 (OR (STRPOS "}" X) - 0] + 0))) + (REPLACE.SPACE (if NO.QUOTE.SPACE + then (CONS (CHARCODE SPACE)) + else (CHARCODE (\ SPACE] [SETQ SLASHED (CONCATCODES (for I C from DIRPOS while (SETQ C (NTHCHARCODE X I)) join (SELCHARQ C ((< >) @@ -266,7 +273,7 @@ (CONS (CHARCODE /))) (/ (SETQ LASTDIRPOS I) (CONS C)) - (SPACE (APPEND (CHARCODE (\ SPACE)))) + (SPACE (APPEND REPLACE.SPACE)) (CONS C] (CL:WHEN (AND LCASEDIRS LASTDIRPOS) (SETQ LASTDIRPOS (ADD1 (IDIFFERENCE LASTDIRPOS DIRPOS))) @@ -287,7 +294,10 @@ SLASHED]) (UNIX-FILE-NAME - [LAMBDA (FILE ACCESS COPY EXTENSION) (* ; "Edited 19-Jan-2026 14:05 by rmk") + [LAMBDA (FILE ACCESS COPY EXTENSION) (* ; "Edited 13-May-2026 12:25 by rmk") + (* ; "Edited 31-Mar-2026 00:13 by rmk") + (* ; "Edited 29-Mar-2026 00:26 by rmk") + (* ; "Edited 19-Jan-2026 14:05 by rmk") (* ; "Edited 17-Jan-2026 22:32 by rmk") (* ; "Edited 11-Jan-2026 23:54 by rmk") (* ; "Edited 27-Dec-2025 21:24 by rmk") @@ -310,15 +320,20 @@ (NIL (SETQ ACCESS 'INPUT) 'OLD) (\ILLEGAL.ARG ACCESS]) - [SLASHIT (SELECTQ (FILENAMEFIELD FILE 'HOST) + (SLASHIT (SELECTQ (FILENAMEFIELD FILE 'HOST) (UNIX (CL:IF [AND EXTENSION (NEQ (L-CASE EXTENSION) (L-CASE (FILENAMEFIELD FILE 'EXTENSION] (COPYFILE FILE (PACKFILENAME 'EXTENSION EXTENSION 'BODY FILE)) FILE)) (DSK [LET ((VERSION (FILENAMEFIELD FILE 'VERSION)) (UNAME (PACKFILENAME 'VERSION NIL 'BODY FILE))) - (CL:UNLESS (EQ VERSION 1) - (CONCAT UNAME (CONCAT "~" VERSION "~")))]) + (CL:IF (EQ VERSION 1) + UNAME + (CONCAT UNAME (CONCAT (CL:IF (EQ (CHARCODE %.) + (NTHCHARCODE UNAME -1)) + "" + ".") + "~" VERSION "~")))]) (LET (UNAME) (* ;; "Catch the streams as well as other devices (CORE, servers)") @@ -331,7 +346,8 @@ [RESETSAVE (GETFILEPTR FILE) `(PROGN (SETFILEPTR ,FILE OLDVALUE]) (COPYFILE FILE UNAME)) - UNAME)])]) + UNAME))) + NIL T))]) (UNIX-TMP-FILE-NAME [LAMBDA (NAME EXT HOST) (* ; "Edited 17-Jan-2026 22:28 by rmk") @@ -358,10 +374,20 @@ unless (INFILEP UNAME) do (RETURN (SLASHIT (CLOSEF (OPENSTREAM UNAME 'OUTPUT 'NEW]) ) +(DEFCOMMAND "cd" (DIR) (/CNDIR DIR)) + +(DEFCOMMAND cdm (SUBDIR) (/CNDIR (CL:IF SUBDIR + (CONCAT '{MEDLEY}/ SUBDIR) + '{MEDLEY}))) + +(DEFCOMMAND "ls" (FIRST . REST) (DODIR (CONS FIRST REST))) + +(DEFCOMMAND "pwd" NIL (DIRECTORYNAME T)) + (PUTPROPS UNIXUTILS FILETYPE CL:COMPILE-FILE) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1170 1543 (ShellCommand 1170 . 1543)) (1545 1942 (ShellWhich 1545 . 1942)) (2052 20633 -(ShellBrowser 2062 . 3834) (ShellBrowse 3836 . 4521) (ShellOpener 4523 . 6211) (ShellOpen 6213 . 11982 -) (PROCESS-COMMAND 11984 . 12597) (SLASHIT 12599 . 15623) (UNIX-FILE-NAME 15625 . 18952) ( -UNIX-TMP-FILE-NAME 18954 . 20631))))) + (FILEMAP (NIL (1207 1580 (ShellCommand 1207 . 1580)) (1582 1979 (ShellWhich 1582 . 1979)) (2089 21826 +(ShellBrowser 2099 . 3871) (ShellBrowse 3873 . 4558) (ShellOpener 4560 . 6248) (ShellOpen 6250 . 12197 +) (PROCESS-COMMAND 12199 . 12812) (SLASHIT 12814 . 16126) (UNIX-FILE-NAME 16128 . 20145) ( +UNIX-TMP-FILE-NAME 20147 . 21824))))) STOP diff --git a/library/UNIXUTILS.DFASL b/library/UNIXUTILS.DFASL index 8de67334..2e939088 100644 Binary files a/library/UNIXUTILS.DFASL and b/library/UNIXUTILS.DFASL differ diff --git a/library/tedit/TEDIT b/library/tedit/TEDIT index 5c5ff485..5de675cb 100644 --- a/library/tedit/TEDIT +++ b/library/tedit/TEDIT @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED " 2-Mar-2026 18:32:06" {WMEDLEY}tedit>TEDIT.;853 146506 +(FILECREATED "10-Mar-2026 18:07:31" {WMEDLEY}tedit>TEDIT.;855 146853 :EDIT-BY rmk - :CHANGES-TO (VARS TEDITCOMS) + :CHANGES-TO (FNS TDRIBBLE) - :PREVIOUS-DATE " 4-Feb-2026 16:02:02" {WMEDLEY}tedit>TEDIT.;852) + :PREVIOUS-DATE " 2-Mar-2026 18:32:06" {WMEDLEY}tedit>TEDIT.;853) (PRETTYCOMPRINT TEDITCOMS) @@ -743,17 +743,21 @@ (DEFINEQ (TDRIBBLE - [LAMBDA NIL (* ; "Edited 31-Mar-2025 12:03 by rmk") + [LAMBDA (TITLE WINDOW) (* ; "Edited 10-Mar-2026 17:39 by rmk") + (* ; "Edited 31-Mar-2025 12:03 by rmk") (* ; "Edited 16-Mar-2025 21:47 by rmk") (* ; "Edited 27-Nov-2024 23:20 by rmk") (* ; "Edited 17-Nov-2024 14:10 by rmk") (* ; "Edited 15-Nov-2024 21:13 by rmk") (* ; "Edited 22-Oct-2024 21:23 by rmk") - (LET [(TSTREAM (OPENTEXTSTREAM NIL NIL NIL NIL `(HISTORY OFF FONT DEFAULTFONT] + (LET [(TSTREAM (OPENTEXTSTREAM NIL NIL NIL NIL `(TITLE ,(CONCAT (OR TITLE "Tedit Dribble") + " " + (DATE)) + HISTORY OFF FONT DEFAULTFONT] [WHENCLOSE TSTREAM 'BEFORE (FUNCTION (LAMBDA (TSTREAM) [TEDIT TSTREAM 'Dribble NIL - `(TITLE ,(CONCAT "Tedit Dribble " (DATE)) + `(TITLE ,(TEXTPROP TSTREAM 'TITLE) LEAVETTY T APPEND QUIET PARABREAKCHARS NIL HISTORY OFF OPENWIDTH ,(fetch (REGION WIDTH) of (WINDOWPROP (WFROMDS T) @@ -2345,27 +2349,27 @@ (DEFAULT.IMAGETYPE.CONVERSIONS '(TEDIT TEDIT.TO.IMAGEFILE)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4738 7132 (MAKE-TEDIT-EXPORTS.ALL 4748 . 5294) (UPDATE-TEDIT 5296 . 6225) (EDIT-TEDIT -6227 . 7130)) (8487 37486 (TEDIT 8497 . 11111) (TEXTSTREAM 11113 . 13002) (TEXTSTREAMP 13004 . 13388) -(COERCETEXTSTREAM 13390 . 17601) (TEDIT.CONCAT 17603 . 20905) (TEDITSTRING 20907 . 21821) (TEDIT-SEE -21823 . 22507) (TEDIT.COPY 22509 . 24654) (TEDIT.DELETE 24656 . 26017) (TEDIT.INSERT 26019 . 28988) ( -TEDIT.TERPRI 28990 . 30104) (TEDIT.KILL 30106 . 31088) (TEDIT.QUIT 31090 . 32456) (TEDIT.MOVE 32458 . -33346) (TEDIT.STRINGWIDTH 33348 . 34019) (TEDIT.CHARWIDTH 34021 . 36263) (TEDIT.PARAGRAPH.BOUNDARIES -36265 . 37484)) (37487 39428 (TEXTOBJ 37497 . 37962) (COERCETEXTOBJ 37964 . 39426)) (40828 42478 ( -TDRIBBLE 40838 . 42476)) (42519 54499 (TEDIT.INSERT.OBJECT 42529 . 46236) (TEDIT.EDIT.OBJECT 46238 . -49178) (TEDIT.OBJECT.CHANGED 49180 . 52370) (TEDIT.MAP.OBJECTS 52372 . 54027) (\TEDIT.FIRST.OBJPIECE -54029 . 54262) (\TEDIT.NEXT.OBJPIECE 54264 . 54497)) (54522 61965 (\TEDIT.CONCAT.PAGEFRAMES 54532 . -59599) (\TEDIT.GET.PAGE.HEADINGS 59601 . 60630) (\TEDIT.CONCAT.INSTALL.HEADINGS 60632 . 61963)) (61966 - 65573 (\TEDIT.MOVE.MSG 61976 . 64057) (\TEDIT.READONLY 64059 . 65571)) (65574 71465 (TEDIT.NCHARS -65584 . 65957) (TEDIT.RPLCHARCODE 65959 . 68949) (TEDIT.NTHCHARCODE 68951 . 70994) (TEDIT.NTHCHAR -70996 . 71463)) (71511 128555 (\TEDIT1 71521 . 73598) (\TEDIT.INSERT 73600 . 79713) (\TEDIT.MOVE 79715 - . 87813) (\TEDIT.COPY 87815 . 92421) (\TEDIT.REPLACE.SELPIECES 92423 . 96959) ( -\TEDIT.INSERT.SELPIECES 96961 . 99958) (\TEDIT.RESTARTFN 99960 . 102465) (\TEDIT.CHARDELETE 102467 . -105396) (\TEDIT.COPYPIECE 105398 . 110560) (\TEDIT.APPLY.OBJFN 110562 . 113648) (\TEDIT.DELETE 113650 - . 118018) (\TEDIT.DIFFUSE.PARALOOKS 118020 . 120291) (\TEDIT.WORDDELETE 120293 . 121908) ( -\TEDIT.WORDDELETE.FORWARD 121910 . 123699) (\TEDIT.FINISHEDIT? 123701 . 128553)) (128556 129215 ( -\TEDIT.THELP 128566 . 129213)) (129249 138380 (\TEDIT.PARAPIECES 129259 . 131233) (\TEDIT.PARACHNOS -131235 . 132127) (\TEDIT.PARA.FIRST 132129 . 135230) (\TEDIT.PARA.LAST 135232 . 138378)) (138381 -145476 (\TEDIT.WORD.FIRST 138391 . 142395) (\TEDIT.WORD.LAST 142397 . 145474)) (145677 145954 ( -TEDITSYSTEMDATE 145687 . 145952)) (146090 146297 (TEDIT.IMAGESOURCEP 146100 . 146295))))) + (FILEMAP (NIL (4736 7130 (MAKE-TEDIT-EXPORTS.ALL 4746 . 5292) (UPDATE-TEDIT 5294 . 6223) (EDIT-TEDIT +6225 . 7128)) (8485 37484 (TEDIT 8495 . 11109) (TEXTSTREAM 11111 . 13000) (TEXTSTREAMP 13002 . 13386) +(COERCETEXTSTREAM 13388 . 17599) (TEDIT.CONCAT 17601 . 20903) (TEDITSTRING 20905 . 21819) (TEDIT-SEE +21821 . 22505) (TEDIT.COPY 22507 . 24652) (TEDIT.DELETE 24654 . 26015) (TEDIT.INSERT 26017 . 28986) ( +TEDIT.TERPRI 28988 . 30102) (TEDIT.KILL 30104 . 31086) (TEDIT.QUIT 31088 . 32454) (TEDIT.MOVE 32456 . +33344) (TEDIT.STRINGWIDTH 33346 . 34017) (TEDIT.CHARWIDTH 34019 . 36261) (TEDIT.PARAGRAPH.BOUNDARIES +36263 . 37482)) (37485 39426 (TEXTOBJ 37495 . 37960) (COERCETEXTOBJ 37962 . 39424)) (40826 42825 ( +TDRIBBLE 40836 . 42823)) (42866 54846 (TEDIT.INSERT.OBJECT 42876 . 46583) (TEDIT.EDIT.OBJECT 46585 . +49525) (TEDIT.OBJECT.CHANGED 49527 . 52717) (TEDIT.MAP.OBJECTS 52719 . 54374) (\TEDIT.FIRST.OBJPIECE +54376 . 54609) (\TEDIT.NEXT.OBJPIECE 54611 . 54844)) (54869 62312 (\TEDIT.CONCAT.PAGEFRAMES 54879 . +59946) (\TEDIT.GET.PAGE.HEADINGS 59948 . 60977) (\TEDIT.CONCAT.INSTALL.HEADINGS 60979 . 62310)) (62313 + 65920 (\TEDIT.MOVE.MSG 62323 . 64404) (\TEDIT.READONLY 64406 . 65918)) (65921 71812 (TEDIT.NCHARS +65931 . 66304) (TEDIT.RPLCHARCODE 66306 . 69296) (TEDIT.NTHCHARCODE 69298 . 71341) (TEDIT.NTHCHAR +71343 . 71810)) (71858 128902 (\TEDIT1 71868 . 73945) (\TEDIT.INSERT 73947 . 80060) (\TEDIT.MOVE 80062 + . 88160) (\TEDIT.COPY 88162 . 92768) (\TEDIT.REPLACE.SELPIECES 92770 . 97306) ( +\TEDIT.INSERT.SELPIECES 97308 . 100305) (\TEDIT.RESTARTFN 100307 . 102812) (\TEDIT.CHARDELETE 102814 + . 105743) (\TEDIT.COPYPIECE 105745 . 110907) (\TEDIT.APPLY.OBJFN 110909 . 113995) (\TEDIT.DELETE +113997 . 118365) (\TEDIT.DIFFUSE.PARALOOKS 118367 . 120638) (\TEDIT.WORDDELETE 120640 . 122255) ( +\TEDIT.WORDDELETE.FORWARD 122257 . 124046) (\TEDIT.FINISHEDIT? 124048 . 128900)) (128903 129562 ( +\TEDIT.THELP 128913 . 129560)) (129596 138727 (\TEDIT.PARAPIECES 129606 . 131580) (\TEDIT.PARACHNOS +131582 . 132474) (\TEDIT.PARA.FIRST 132476 . 135577) (\TEDIT.PARA.LAST 135579 . 138725)) (138728 +145823 (\TEDIT.WORD.FIRST 138738 . 142742) (\TEDIT.WORD.LAST 142744 . 145821)) (146024 146301 ( +TEDITSYSTEMDATE 146034 . 146299)) (146437 146644 (TEDIT.IMAGESOURCEP 146447 . 146642))))) STOP diff --git a/library/tedit/TEDIT-ABBREV b/library/tedit/TEDIT-ABBREV index 6c874eea..3d579432 100644 --- a/library/tedit/TEDIT-ABBREV +++ b/library/tedit/TEDIT-ABBREV @@ -1,12 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "23-Jan-2026 15:49:26" {WMEDLEY}TEDIT>TEDIT-ABBREV.;58 18256 +(FILECREATED "30-Apr-2026 11:55:15" {MEDLEY}tedit>TEDIT-ABBREV.;59 18372 :EDIT-BY rmk :CHANGES-TO (FNS \TEDIT.ABBREV.EXPAND) - :PREVIOUS-DATE "13-Jan-2026 17:51:55" {WMEDLEY}tedit>TEDIT-ABBREV.;55) + :PREVIOUS-DATE "23-Jan-2026 15:49:26" {MEDLEY}tedit>TEDIT-ABBREV.;58) (PRETTYCOMPRINT TEDIT-ABBREVCOMS) @@ -86,7 +86,8 @@ (DEFINEQ (\TEDIT.ABBREV.EXPAND - [LAMBDA (TSTREAM TEXTOBJ SEL) (* ; "Edited 23-Jan-2026 15:49 by rmk") + [LAMBDA (TSTREAM TEXTOBJ SEL) (* ; "Edited 30-Apr-2026 11:53 by rmk") + (* ; "Edited 23-Jan-2026 15:49 by rmk") (* ; "Edited 20-Jan-2026 09:56 by rmk") (* ; "Edited 13-Jan-2026 17:51 by rmk") (* ; "Edited 8-Jan-2026 09:08 by rmk") @@ -118,7 +119,7 @@ (SETQ BACKSLASH T) (* ;  "Started with backslash, extend match") (SETQ POINTSELECTION NIL) - (for I CH from (SUB1 LASTCHNO) by -1 as J from 1 to 25 + (for I CH from (SUB1 LASTCHNO) by -1 to 1 as J from 1 to 25 do (SETQ CH (TEDIT.NTHCHARCODE TSTREAM I)) (* ; "Don't cross over an image obj") (if (IMAGEOBJP CH) then (RETURN) @@ -363,7 +364,7 @@ ("DATE" \TEDIT.EXPAND.DATE) (">>DATE<<" \TEDIT.EXPAND.DATE))) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4348 15152 (\TEDIT.ABBREV.EXPAND 4358 . 9123) (\TEDIT.ABBREV.EXPANSION 9125 . 12189) ( -\TEDIT.ABBREV.TREE 12191 . 13322) (\TEDIT.ABBREV.PARSE 13324 . 14476) (\TEDIT.ABBREV.PARSE.CHARCODE -14478 . 15150)) (15153 15798 (\TEDIT.EXPAND.DATE 15163 . 15796))))) + (FILEMAP (NIL (4346 15268 (\TEDIT.ABBREV.EXPAND 4356 . 9239) (\TEDIT.ABBREV.EXPANSION 9241 . 12305) ( +\TEDIT.ABBREV.TREE 12307 . 13438) (\TEDIT.ABBREV.PARSE 13440 . 14592) (\TEDIT.ABBREV.PARSE.CHARCODE +14594 . 15266)) (15269 15914 (\TEDIT.EXPAND.DATE 15279 . 15912))))) STOP diff --git a/library/tedit/TEDIT-ABBREV.LCOM b/library/tedit/TEDIT-ABBREV.LCOM index 0d3e936e..e15d9473 100644 Binary files a/library/tedit/TEDIT-ABBREV.LCOM and b/library/tedit/TEDIT-ABBREV.LCOM differ diff --git a/library/tedit/TEDIT-BUTTONS b/library/tedit/TEDIT-BUTTONS index bb2ccdbe..3c7f914c 100644 --- a/library/tedit/TEDIT-BUTTONS +++ b/library/tedit/TEDIT-BUTTONS @@ -1,12 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "25-Jan-2026 09:14:04" {WMEDLEY}TEDIT>TEDIT-BUTTONS.;230 123301 +(FILECREATED " 8-May-2026 12:17:16" {MEDLEY}TEDIT>TEDIT-BUTTONS.;234 123908 :EDIT-BY rmk - :CHANGES-TO (VARS TEDIT-BUTTONSCOMS) + :CHANGES-TO (FNS MB.NWAY.SIZEFN) - :PREVIOUS-DATE "19-Oct-2025 10:44:18" {WMEDLEY}TEDIT>TEDIT-BUTTONS.;229) + :PREVIOUS-DATE "29-Apr-2026 17:57:09" {MEDLEY}TEDIT>TEDIT-BUTTONS.;233) (PRETTYCOMPRINT TEDIT-BUTTONSCOMS) @@ -922,7 +922,9 @@ SOBJ STREAM]) (MB.NWAY.SIZEFN - [LAMBDA (OBJ STREAM CURX RIGHTMARGIN) (* ; "Edited 20-Aug-2024 15:12 by rmk") + [LAMBDA (OBJ STREAM CURX RIGHTMARGIN) (* ; "Edited 8-May-2026 12:16 by rmk") + (* ; "Edited 29-Apr-2026 17:56 by rmk") + (* ; "Edited 20-Aug-2024 15:12 by rmk") (* ; "Edited 22-Jul-2024 11:31 by rmk") (* jds " 6-Sep-84 14:19") (* ; "Tell the size of an n-way menu") @@ -935,7 +937,9 @@ (BUTTONHEIGHT (IMAGEOBJPROP OBJ 'BUTTONHEIGHT)) (SPACING (IMAGEOBJPROP OBJ 'ITEMSPACE)) (SLACK (IDIFFERENCE RIGHTMARGIN CURX)) - BOX XSIZE YSIZE LINES) + (XSIZE 0) + (YSIZE 0) + BOX YSIZE LINES) [if (AND (IGEQ SLACK MAXWIDTH) (EQ MAXITEMS/LINE (LENGTH SUBOBJECTS))) then (* ; @@ -950,8 +954,11 @@ (IMAGEOBJPROP SO 'Y 0)) elseif (ILEQ SLACK (IMAGEOBJPROP OBJ 'MINWIDTH)) then (* ; "Stack them vertically.") - (for SO (Y _ (ITIMES BUTTONHEIGHT (LENGTH SUBOBJECTS))) in SUBOBJECTS + (SETQ YSIZE (ITIMES BUTTONHEIGHT (LENGTH SUBOBJECTS))) + (SETQ XSIZE SPACING) + (for SO (Y _ YSIZE) in SUBOBJECTS do (add Y (IMINUS BUTTONHEIGHT)) + [SETQ XSIZE (IMAX XSIZE (fetch XSIZE of (IMAGEOBJPROP SO 'BOUNDBOX] (IMAGEOBJPROP SO 'Y Y) (IMAGEOBJPROP SO 'X 0)) else (* ; "Divide them into lines") @@ -1749,7 +1756,8 @@ ENDPC]) (MB.FIELD.SETSTATEFN - [LAMBDA (PREFIXPC NEWVALUE TSTREAM) (* ; "Edited 6-Apr-2025 12:23 by rmk") + [LAMBDA (PREFIXPC NEWVALUE TSTREAM) (* ; "Edited 17-Mar-2026 00:38 by rmk") + (* ; "Edited 6-Apr-2025 12:23 by rmk") (* ; "Edited 9-Dec-2024 22:14 by rmk") (* ; "Edited 4-Dec-2024 20:31 by rmk") (* ; "Edited 20-Oct-2024 17:20 by rmk") @@ -1805,8 +1813,9 @@ (\TEDIT.INSERT NEWVALUE FSEL TSTREAM T T) (NCHARS NEWVALUE))) (\TEDIT.UPDATE.SEL FSEL FIELDSTART FIELDLENGTH 'LEFT) - (\TEDIT.CHANGE.CHARLOOKS TSTREAM (IMAGEOBJPROP PREFIXOBJ 'FIELDLOOKS) - FSEL) + (CL:UNLESS (EQ 0 (GETSEL FSEL DCH)) + (\TEDIT.CHANGE.CHARLOOKS TSTREAM (IMAGEOBJPROP PREFIXOBJ 'FIELDLOOKS) + FSEL)) (IMAGEOBJPROP PREFIXOBJ 'FIELDLENGTH FIELDLENGTH) (IMAGEOBJPROP PREFIXOBJ 'STATE NEWVALUE) @@ -1937,25 +1946,25 @@ (MB.FIELD.INIT) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (3188 19324 (MB.ADD 3198 . 9910) (MB.DELETE 9912 . 10286) (MB.GET 10288 . 17058) ( -MB.GET.MBARG 17060 . 18729) (TEDIT.BACKTOMAIN 18731 . 19322)) (19368 39304 (MB.BUTTONEVENTINFN 19378 - . 20946) (MB.DISPLAYFN 20948 . 23007) (MB.SETIMAGE 23009 . 24177) (MB.SIZEFN 24179 . 25727) ( -MB.WHENOPERATEDONFN 25729 . 27678) (MB.COPYFN 27680 . 28138) (MB.GETFN 28140 . 29101) (MB.PUTFN 29103 - . 30203) (MB.SHOWSELFN 30205 . 31714) (MB.CREATE 31716 . 35739) (MB.CHANGENAME 35741 . 36223) ( -MB.INIT 36225 . 37686) (MB.TRACK.UNTIL 37688 . 38383) (MB.DON'T 38385 . 38681) (MB.SPEC.REMAINDER -38683 . 39302)) (39466 49471 (MB.3STATE.CREATE 39476 . 40340) (MB.3STATE.DISPLAYFN 40342 . 41328) ( -MB.3STATE.SHOWSELFN 41330 . 43641) (MB.3STATE.INIT 43643 . 45054) (MB.3STATE.SETSTATEFN 45056 . 45714) - (MB.3STATE.BUTTONEVENTINFN 45716 . 49469)) (49626 78530 (MB.NWAY.CREATE 49636 . 55819) ( -MB.NWAY.DISPLAYFN 55821 . 56684) (MB.NWAY.SIZEFN 56686 . 60622) (MB.NWAY.SELECT 60624 . 64194) ( -MB.NWAY.BUTTONEVENTINFN 64196 . 67408) (MB.NWAY.NEWMENUBUTTON 67410 . 68122) (MB.NWAY.COPYFN 68124 . -69091) (MB.NWAY.INIT 69093 . 70584) (MB.NWAY.ARRANGEBUTTONS 70586 . 72557) (MB.NWAY.ADDITEM 72559 . -76708) (MB.NWAY.FINDSUBOBJ 76710 . 77224) (MB.NWAY.SETSTATEFN 77226 . 78528)) (78609 90608 ( -MB.TOGGLE.CREATE 78619 . 79614) (MB.TOGGLE.DISPLAYFN 79616 . 81099) (MB.TOGGLE.INIT 81101 . 82900) ( -MB.SET.TOGGLE 82902 . 84103) (MB.TOGGLE.SETSTATEFN 84105 . 84945) (MB.TOGGLE.BUTTONEVENTINFN 84947 . -89263) (MB.TOGGLE.WHENOPERATEDONFN 89265 . 90606)) (90689 123222 (MB.FIELD.CREATE 90699 . 96150) ( -MB.FIELD.DISPLAYFN 96152 . 96943) (MB.FIELD.IMAGEBOXFN 96945 . 98427) (MB.FIELD.PREFIXCREATE 98429 . -102365) (MB.FIELD.SUFFIXCREATE 102367 . 104027) (MB.FIELD.INIT 104029 . 105796) ( -MB.FIELD.WHENOPERATEDONFN 105798 . 107069) (MB.FIELD.GETSTATEFN 107071 . 111005) (MB.FIELD.SETSTATEFN -111007 . 115811) (MB.FIELD.BUTTONEVENTINFN 115813 . 118118) (MB.FIELD.SIZEFN 118120 . 118360) ( -MB.FIELD.INSURETYPE 118362 . 123220))))) + (FILEMAP (NIL (3182 19318 (MB.ADD 3192 . 9904) (MB.DELETE 9906 . 10280) (MB.GET 10282 . 17052) ( +MB.GET.MBARG 17054 . 18723) (TEDIT.BACKTOMAIN 18725 . 19316)) (19362 39298 (MB.BUTTONEVENTINFN 19372 + . 20940) (MB.DISPLAYFN 20942 . 23001) (MB.SETIMAGE 23003 . 24171) (MB.SIZEFN 24173 . 25721) ( +MB.WHENOPERATEDONFN 25723 . 27672) (MB.COPYFN 27674 . 28132) (MB.GETFN 28134 . 29095) (MB.PUTFN 29097 + . 30197) (MB.SHOWSELFN 30199 . 31708) (MB.CREATE 31710 . 35733) (MB.CHANGENAME 35735 . 36217) ( +MB.INIT 36219 . 37680) (MB.TRACK.UNTIL 37682 . 38377) (MB.DON'T 38379 . 38675) (MB.SPEC.REMAINDER +38677 . 39296)) (39460 49465 (MB.3STATE.CREATE 39470 . 40334) (MB.3STATE.DISPLAYFN 40336 . 41322) ( +MB.3STATE.SHOWSELFN 41324 . 43635) (MB.3STATE.INIT 43637 . 45048) (MB.3STATE.SETSTATEFN 45050 . 45708) + (MB.3STATE.BUTTONEVENTINFN 45710 . 49463)) (49620 78972 (MB.NWAY.CREATE 49630 . 55813) ( +MB.NWAY.DISPLAYFN 55815 . 56678) (MB.NWAY.SIZEFN 56680 . 61064) (MB.NWAY.SELECT 61066 . 64636) ( +MB.NWAY.BUTTONEVENTINFN 64638 . 67850) (MB.NWAY.NEWMENUBUTTON 67852 . 68564) (MB.NWAY.COPYFN 68566 . +69533) (MB.NWAY.INIT 69535 . 71026) (MB.NWAY.ARRANGEBUTTONS 71028 . 72999) (MB.NWAY.ADDITEM 73001 . +77150) (MB.NWAY.FINDSUBOBJ 77152 . 77666) (MB.NWAY.SETSTATEFN 77668 . 78970)) (79051 91050 ( +MB.TOGGLE.CREATE 79061 . 80056) (MB.TOGGLE.DISPLAYFN 80058 . 81541) (MB.TOGGLE.INIT 81543 . 83342) ( +MB.SET.TOGGLE 83344 . 84545) (MB.TOGGLE.SETSTATEFN 84547 . 85387) (MB.TOGGLE.BUTTONEVENTINFN 85389 . +89705) (MB.TOGGLE.WHENOPERATEDONFN 89707 . 91048)) (91131 123829 (MB.FIELD.CREATE 91141 . 96592) ( +MB.FIELD.DISPLAYFN 96594 . 97385) (MB.FIELD.IMAGEBOXFN 97387 . 98869) (MB.FIELD.PREFIXCREATE 98871 . +102807) (MB.FIELD.SUFFIXCREATE 102809 . 104469) (MB.FIELD.INIT 104471 . 106238) ( +MB.FIELD.WHENOPERATEDONFN 106240 . 107511) (MB.FIELD.GETSTATEFN 107513 . 111447) (MB.FIELD.SETSTATEFN +111449 . 116418) (MB.FIELD.BUTTONEVENTINFN 116420 . 118725) (MB.FIELD.SIZEFN 118727 . 118967) ( +MB.FIELD.INSURETYPE 118969 . 123827))))) STOP diff --git a/library/tedit/TEDIT-BUTTONS.LCOM b/library/tedit/TEDIT-BUTTONS.LCOM index ae82ac19..1f7b7789 100644 Binary files a/library/tedit/TEDIT-BUTTONS.LCOM and b/library/tedit/TEDIT-BUTTONS.LCOM differ diff --git a/library/tedit/TEDIT-FILE b/library/tedit/TEDIT-FILE index f0c0f19b..2975aeba 100644 --- a/library/tedit/TEDIT-FILE +++ b/library/tedit/TEDIT-FILE @@ -1,13 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "15-Feb-2026 23:45:51" {WMEDLEY}tedit>TEDIT-FILE.;666 175062 +(FILECREATED "29-Apr-2026 23:49:14" {MEDLEY}tedit>TEDIT-FILE.;684 174888 :EDIT-BY rmk - :CHANGES-TO (FNS \TEDIT.PUT.MCCS.SPLITPIECES \TEDIT.PUT.PCTB.NEXTNEW) - (VARS TEDIT-FILECOMS) + :CHANGES-TO (FNS \TEDIT.INTERPRET.MCCS.SHIFTS) - :PREVIOUS-DATE "14-Feb-2026 10:32:44" {WMEDLEY}tedit>TEDIT-FILE.;659) + :PREVIOUS-DATE "24-Apr-2026 21:09:13" {MEDLEY}tedit>TEDIT-FILE.;683) (PRETTYCOMPRINT TEDIT-FILECOMS) @@ -39,8 +38,8 @@ (P (MOVD? '\TEDIT.GET.TRAILER '\TEDIT.FORMATTEDP1] (FNS \TEDIT.GET.PIECES3 \TEDIT.GET.PROPS3 \TEDIT.MAKE.STRINGPIECE) (FNS \TEDIT.GET.UNFORMATTED.FILE.MCCS \TEDIT.INTERPRET.MCCS.SHIFTS - \TEDIT.CONVERT.XCCSTOMCCS) - (* ; "XCCS") + \TEDIT.CONVERT.XCCSTOMCCS \TEDIT.RUN.TO.STRINGPIECE) + (* ; "MCCS") (FNS \TEDIT.GET.UNFORMATTED.FILE.UTF8) (* ; "UTF-8") (FNS \TEDIT.GET.CHARLOOKS.LIST \TEDIT.GET.SINGLE.CHARLOOKS \TEDIT.GET.CHARLOOKS @@ -643,7 +642,8 @@ TSTREAM)]) (\TEDIT.GET.UNFORMATTED.FILE - [LAMBDA (STREAM TSTREAM START END PROPS) (* ; "Edited 28-Jul-2025 23:46 by rmk") + [LAMBDA (STREAM TSTREAM START END PROPS) (* ; "Edited 10-Apr-2026 09:33 by rmk") + (* ; "Edited 28-Jul-2025 23:46 by rmk") (* ; "Edited 24-Apr-2025 17:21 by rmk") (* ; "Edited 8-Feb-2025 20:21 by rmk") (* ; "Edited 17-Mar-2024 00:21 by rmk") @@ -669,7 +669,7 @@ (CL:WHEN (AND (EQ FORMAT :STRING) (\IOMODEP STREAM 'OUTPUT T)) (SETQ STREAM (COPYFILE STREAM '{NODIRCORE}))) - [SETQ PIECES + (SETQ PIECES (SELECTQ FORMAT ((:MCCS :XCCS) (* ; "XCCS is done later") (\TEDIT.GET.UNFORMATTED.FILE.MCCS STREAM START END DEFAULTCHARLOOKS @@ -703,8 +703,7 @@ PPARALAST _ NIL PPARALOOKS _ DEFAULTPARALOOKS PTYPE _ THINFILE.PTYPE - PBYTESPERCHAR _ 1 - PBINABLE _ (fetch (STREAM BINABLE) of STREAM] + PBYTESPERCHAR _ 1))) (\TEDIT.INSERTPIECES PIECES NIL TEXTOBJ)))]) (\TEDIT.GET.FORMATTED.FILE @@ -940,7 +939,9 @@ (DEFINEQ (\TEDIT.GET.PIECES3 - [LAMBDA (TEXT TSTREAM PCCOUNT CURFILEBYTE# END) (* ; "Edited 29-Jul-2025 09:30 by rmk") + [LAMBDA (TEXT TSTREAM PCCOUNT CURTEXTBYTE# END) (* ; "Edited 15-Apr-2026 12:06 by rmk") + (* ; "Edited 9-Apr-2026 13:45 by rmk") + (* ; "Edited 29-Jul-2025 09:30 by rmk") (* ; "Edited 24-Apr-2025 17:20 by rmk") (* ; "Edited 8-Feb-2025 20:21 by rmk") (* ; "Edited 30-Aug-2024 15:44 by rmk") @@ -962,7 +963,7 @@ (SETFILEPTR TEXT (\DWIN TEXT)) (* ; "Pieceinfo byte #") (for PCNO PC BYTELEN PREVPC FIRSTPC PARALOOKSMAP CHARLOOKSMAP DEFAULTCHARLOOKS OLDPARALOOKS (TEXTOBJ _ (TEXTOBJ! (fetch (TEXTSTREAM TEXTOBJ) of TSTREAM))) - (ORIGBYTE# _ CURFILEBYTE#) from 1 to PCCOUNT first (SETQ DEFAULTCHARLOOKS (FGETTOBJ TEXTOBJ + (ORIGBYTE# _ CURTEXTBYTE#) from 1 to PCCOUNT first (SETQ DEFAULTCHARLOOKS (FGETTOBJ TEXTOBJ DEFAULTCHARLOOKS )) @@ -981,17 +982,15 @@ (SETQ PC (create PIECE PCONTENTS _ TEXT - PFPOS _ CURFILEBYTE# + PFPOS _ CURTEXTBYTE# PLEN _ BYTELEN - PBYTELEN _ BYTELEN PPARALOOKS _ OLDPARALOOKS PTYPE _ THINFILE.PTYPE - PCHARSET _ 0 PBYTESPERCHAR _ 1 PREVPIECE _ PREVPC)) (\TEDIT.GET.CHARLOOKS.INDEX PC TEXT) (* ;  "Get its looks and character-pointers") - (add CURFILEBYTE# BYTELEN)) + (add CURTEXTBYTE# BYTELEN)) (\PieceDescriptorPARA (* ;  "Reading a new set of paragraph looks.") (CL:WHEN PREVPC (FSETPC PREVPC PPARALAST T)) @@ -1010,14 +1009,13 @@ (SETQ PC (create PIECE PCONTENTS _ TEXT - PFPOS _ CURFILEBYTE# - PBYTELEN _ BYTELEN + PFPOS _ CURTEXTBYTE# PLEN _ 1 PPARALOOKS _ OLDPARALOOKS PTYPE _ OBJECT.PTYPE PREVPIECE _ PREVPC)) - (\TEDIT.GET.OBJECT TSTREAM PC TEXT CURFILEBYTE#) - (add CURFILEBYTE# BYTELEN) + (\TEDIT.GET.OBJECT TSTREAM PC TEXT CURTEXTBYTE#) + (add CURTEXTBYTE# BYTELEN) (FSETPC PC PCHARLOOKS (if (ZEROP (BIN TEXT)) then @@ -1142,7 +1140,9 @@ PROPS)))]) (\TEDIT.MAKE.STRINGPIECE - [LAMBDA (PC STRING) (* ; "Edited 23-Jan-2024 14:32 by rmk") + [LAMBDA (PC STRING) (* ; "Edited 12-Apr-2026 21:30 by rmk") + (* ; "Edited 10-Apr-2026 09:33 by rmk") + (* ; "Edited 23-Jan-2024 14:32 by rmk") (* ; "Edited 16-Jan-2024 11:15 by rmk") (* ; "Edited 12-Jan-2024 16:34 by rmk") @@ -1155,15 +1155,10 @@ (SETQ SPIECE (if (fetch (STRINGP FATSTRINGP) of STRING) then (create PIECE using PC PTYPE _ FATSTRING.PTYPE PCONTENTS _ STRING PLEN _ (NCHARS STRING) - PBYTESPERCHAR _ 2 PBINABLE _ NIL PBYTELEN _ - (UNFOLD (NCHARS STRING) - 2) - PREVPIECE _ PC PUTF8BYTESPERCHAR _ 2 PFPOS _ 0) + PBYTESPERCHAR _ 2 PREVPIECE _ PC) else (create PIECE using PC PTYPE _ THINSTRING.PTYPE PCONTENTS _ STRING PLEN _ (NCHARS STRING) - PBYTESPERCHAR _ 1 PBINABLE _ T PBYTELEN _ - (NCHARS STRING) - PREVPIECE _ PC PUTF8BYTESPERCHAR _ 1 PFPOS _ 0))) + PBYTESPERCHAR _ 1 PREVPIECE _ PC))) (CL:WHEN (NEXTPIECE PC) (FSETPC (NEXTPIECE PC) PREVPIECE SPIECE)) @@ -1173,111 +1168,114 @@ (DEFINEQ (\TEDIT.GET.UNFORMATTED.FILE.MCCS - [LAMBDA (STRM START END DEFAULTCHARLOOKS DEFAULTPARALOOKS) (* ; "Edited 28-Jul-2025 23:45 by rmk") - (* ; "Edited 21-Jan-2024 09:40 by rmk") - (* ; "Edited 12-Jan-2024 13:13 by rmk") - (* ; "Edited 10-Jan-2024 11:19 by rmk") - (* ; "Edited 8-Jan-2024 13:15 by rmk") + [LAMBDA (STRM START END DEFAULTCHARLOOKS DEFAULTPARALOOKS) (* ; "Edited 12-Apr-2026 21:34 by rmk") + (* ; "Edited 10-Apr-2026 09:33 by rmk") - (* ;; "We build a chain of pieces for the NS stringlets, some of which are divided at CR/LF. ") + (* ;; + "We build a chain of pieces for the MCCS stringlets, some of which are subdivided at CR/LF. ") (* ;; "We assume that caller has positioned the stream at the intended start byte and has set the ENDOFSTREAMOP to return NIL on EOF. ") - (* ;; "CRBEFORE and the LF test are used to ensure that potential EOL's are normalized to EOL and appear at the end of their pieces, whether or not they we decide to make them PPARALAST on input. LF's after CR are discarded, LF's by themselves are converted to singleton EOLstring pieces.") + (* ;; "This does not set PPARALAST on EOL pieces. Maybe double EOL's?") - (bind (NEXTFILEPOS _ START) - (CHARSET _ 0) - (FIRSTPC _ (create PIECE - PCHARLOOKS _ DEFAULTCHARLOOKS - PPARALOOKS _ DEFAULTPARALOOKS)) - (CODESIZE _ 1) - (SBINABLE _ (fetch (STREAM BINABLE) of STRM)) - EOLC PC BYTE CHAR PREVPC PTYPE RUNLEN FILEPOS CRBEFORE SHIFTNEXT first (SETQ PREVPC FIRSTPC - ) - (* ; "FIRSTPC is a throwaway") - do (SETQ FILEPOS NEXTFILEPOS) (* ; "Start of next file piece") + (* ;; "If a shift at the EOF is ill-formed, it is ignored--no error.") - (* ;; "In thin or fat mode, we have to look at the first byte of the next character, to see if it is a shift. If not a shift, we have to decode the byte configuration to make sure we can detect CR or LF.") + (* ;; + " LF's after CR are discarded, LF's by themselves are converted to singleton EOLstring pieces.") - (do (CL:WHEN (IGEQ NEXTFILEPOS END) - (RETURN)) - (SETQ BYTE (\PEEKBIN STRM T)) - (CL:WHEN (SETQ SHIFTNEXT (EQ NSCHARSETSHIFT BYTE)) - (SETQ CHAR NIL) (* ; - "Suppress CR/LF checking on real shift") - (RETURN)) - (BIN STRM) (* ; "Not a shift, read the peeked byte") - (SETQ CHAR (if (EQ CODESIZE 2) - then (* ; - "Return T if this takes us over the end") - (LOGOR (LLSH BYTE 8) - (CL:IF (AND (ILEQ NEXTFILEPOS END) - (SETQ BYTE (BIN STRM))) - BYTE - (RETURN))) - else (LOGOR (LLSH CHARSET 8) - BYTE))) - (add NEXTFILEPOS CODESIZE) - (CL:WHEN (MEMB CHAR (CHARCODE (CR LF))) - (RETURN))) + (bind PREVPC PC CHAR TWOBYTE CHARLIST PLEN STARTPOS STRING (FIRSTPIECE _ (create PIECE)) + (CHARSET _ 0) first (SETQ PREVPC FIRSTPIECE) + do (SETQ PLEN 0) + (SETQ STARTPOS (GETFILEPTR STRM)) + [while (SETQ CHAR (BIN STRM)) until (EQ CHAR NSCHARSETSHIFT) + do (CL:WHEN TWOBYTE + (SETQ CHARSET (LLSH CHAR 8)) + (CL:UNLESS (SETQ CHAR (BIN STRM)) (* ; "Ill-formed at EOF, skip last byte") + (RETURN))) + (SETQ CHAR (LOGOR CHARSET CHAR)) + (CL:UNLESS (OR TWOBYTE (EQ CHARSET 0)) (* ; "Collect characters for fatstring") + (push CHARLIST CHAR)) + (add PLEN 1) repeatuntil (MEMB CHAR (CHARCODE (CR LF] - (* ;; "NEXTFILEPOS and file are positioned at beginning of the next piece, possibly after CR and LF have been read.") + (* ;; "Reached the end of the current (sub) run") - (SETQ RUNLEN (IDIFFERENCE NEXTFILEPOS FILEPOS)) - (CL:WHEN (EQ CHAR (CHARCODE LF)) (* ; "We never produce raw LF's") - (add RUNLEN (IMINUS CODESIZE))) - (CL:WHEN (IGREATERP RUNLEN 0) - (SETQ PTYPE (if (EQ CODESIZE 2) - then FATFILE2.PTYPE - elseif (EQ CHARSET 0) - then THINFILE.PTYPE - else FATFILE1.PTYPE)) + (CL:UNLESS (EQ PLEN 0) (* ; "Make subrun's piece") + (SELCHARQ CHAR + (CR (* ; "Skip following LF") + (if TWOBYTE + then (CL:WHEN (EQ 0 (\PEEKCCODE STRM T)) + (BIN STRM) + (CL:IF (EQ (CHARCODE LF) + (\PEEKCCODE STRM T)) + (BIN STRM) + (\BACKFILEPTR STRM))) + elseif (EQ (CHARCODE LF) + (\PEEKCCODE STRM T)) + then (BIN STRM))) + (LF (* ; + "Prefix bcomes a separate piece, LF a singleton coerced to EOL") + (if (EQ PLEN 1) + then (SETQ CHARLIST (CHARCODE (EOL))) + (* ; "Let it be fat below") + else (add PLEN -1) (* ; + "Back up to split the LF off into a separate EOL piece") + (\BACKFILEPTR STRM) + (CL:WHEN TWOBYTE (\BACKFILEPTR STRM)))) + NIL) (SETQ PC - (create PIECE - PTYPE _ PTYPE - PCONTENTS _ STRM - PFPOS _ FILEPOS - PLEN _ (IQUOTIENT RUNLEN CODESIZE) - PCHARLOOKS _ DEFAULTCHARLOOKS - PPARALOOKS _ DEFAULTPARALOOKS - PCHARSET _ CHARSET - PBYTESPERCHAR _ CODESIZE - PBYTELEN _ RUNLEN - PREVPIECE _ PREVPC - PBINABLE _ (AND (EQ PTYPE THINFILE.PTYPE) - SBINABLE))) - (SETQ PREVPC (FSETPC PREVPC NEXTPIECE PC))) - (CL:WHEN (EQ CHAR (CHARCODE LF)) - [if CRBEFORE - then (SETQ EOLC CRLF.EOLC) - else - (* ;; "Linefeed not preceded by CR, replace by string piece") + (if CHARLIST + then (SETQ STRING (ALLOCSTRING (LENGTH CHARLIST) + NIL NIL T)) + (for C in CHARLIST as I from PLEN by -1 do (RPLCHARCODE STRING I C)) + (SETQ CHARLIST NIL) + (create PIECE + PTYPE _ FATSTRING.PTYPE + PCONTENTS _ STRING + PLEN _ PLEN + PBYTESPERCHAR _ 2) + elseif TWOBYTE + then (create PIECE + PTYPE _ FATFILE2.PTYPE + PCONTENTS _ STRM + PFPOS _ STARTPOS + PLEN _ PLEN + PBYTESPERCHAR _ 2) + else (create PIECE + PTYPE _ THINFILE.PTYPE + PCONTENTS _ STRM + PFPOS _ STARTPOS + PLEN _ PLEN + PBYTESPERCHAR _ 1))) + (FSETPC PC PCHARLOOKS DEFAULTCHARLOOKS) + (FSETPC PC PPARALOOKS DEFAULTPARALOOKS) + (FSETPC PC PREVPIECE PREVPC) + (FSETPC PREVPC NEXTPIECE PC) + (SETQ PREVPC PC)) - (SETQ EOLC LF.EOLC) - (SETQ PREVPC (\TEDIT.MAKE.STRINGPIECE PREVPC (CHARCODE EOL]) - (CL:WHEN SHIFTNEXT (* ; - "Interpret and bump NEXTFILEPOS for the shifting bytes. ") - (BIN STRM) (* ; "Read the original peeked byte") - (SETQ CHARSET (BIN STRM)) - (if (EQ CHARSET \NORUNCODE) - then (CL:UNLESS (MEMB (BIN STRM) - '(0 NIL)) - (ERROR "EXPECTED PLANE 0 XCCS CHARACTER IS ILL-FORMED")) - (SETQ CHARSET 0) - (SETQ CODESIZE 2) - else (SETQ CODESIZE 1)) - (add NEXTFILEPOS (ADD1 CODESIZE)) - (SETQ SHIFTNEXT NIL)) - (CL:WHEN (IGEQ NEXTFILEPOS END) - (CL:WHEN EOLC (* ; - "Record the last one we encountered") - (replace (STREAM EOLCONVENTION) of STRM with EOLC)) - (RETURN (NEXTPIECE FIRSTPC))) - (CL:WHEN (SETQ CRBEFORE (EQ CHAR (CHARCODE CR))) - (SETQ EOLC CR.EOLC]) + (* ;; "Switch to next run, end, or continue with next subrun") + + (SELECTC CHAR + (NSCHARSETSHIFT (* ; "Switch to next run") + (SETQ CHARSET (BIN STRM)) + (CL:UNLESS CHARSET (* ; "Ill-formed") + (RETURN (NEXTPIECE FIRSTPIECE))) + (SETQ TWOBYTE (CL:WHEN (EQ CHARSET \NORUNCODE) + (SETQ CHARSET (BIN STRM)) + (CL:UNLESS CHARSET (* ; "Ill-formed") + (RETURN (NEXTPIECE FIRSTPIECE))) + (CL:UNLESS (EQ CHARSET 0) + (\MCCS.24BITENCODING.ERROR STRM)) + T)) + (SETQ CHARSET (LLSH CHARSET 8))) + (NIL (* ; "End of file") + (RETURN (NEXTPIECE FIRSTPIECE))) + NIL]) (\TEDIT.INTERPRET.MCCS.SHIFTS - [LAMBDA (PIECES PFILE) (* ; "Edited 21-Oct-2024 00:33 by rmk") + [LAMBDA (PIECES PFILE) (* ; "Edited 29-Apr-2026 23:48 by rmk") + (* ; "Edited 24-Apr-2026 21:08 by rmk") + (* ; "Edited 10-Apr-2026 09:33 by rmk") + (* ; "Edited 21-Oct-2024 00:33 by rmk") (* ; "Edited 14-May-2024 18:39 by rmk") (* ; "Edited 21-Jan-2024 00:02 by rmk") (* ; "Edited 19-Jan-2024 10:34 by rmk") @@ -1285,58 +1283,44 @@ (* ; "Edited 6-Jan-2024 15:02 by rmk") (* ; "Edited 19-Dec-2023 13:13 by rmk") - (* ;; "This is called after a GET or PUT, when the file pieces are known all to reside in PFILE.PIECES is a chain of pieces read from a formatted XCCS file but not yet inserted into the BTREE. Each file piece has PFILE, PFPOS, and PBYTELEN. This function interprets any XCCS shift characters that prefix the actual characters, coercing the piece properties and bumping the PFPOS/PLEN to hide the shifts. ") + (* ;; "This is called after by \TEDIT.GET.PIECES, after a GET, when the pieces are known all to reside in PFILE. PIECES is a chain of pieces read from a formatted MCCS (or XCCS) file but not yet inserted into the BTREE. Each file piece has PFILE and PFPOS. This function makes sure that no shift bytes are included in the pieces, by coercing the piece properties and bumping the PFPOS/PLEN to hide the shifts. This also coerces non-charset 0 one-byte pieces to fatstrings.") (* ;; "We run this before the pieces are inistalled in a stream, since this may change the character lengths.") + (* ;; "This also has some EOL normalization.") + (for PC BYTE EOLC inpieces PIECES when (EQ PFILE (PCONTENTS PC)) do (\SETFILEPTR PFILE (PFPOS PC)) (SETQ BYTE (BIN PFILE)) - [if (EQ NSCHARSETSHIFT BYTE) + (if (EQ NSCHARSETSHIFT BYTE) then (SELECTC (SETQ BYTE (BIN PFILE)) - (0 (* ; "Runlength of charset 0") - (add (PBYTELEN PC) - -2) (* ; - "The shift characters really disappear") - (FSETPC PC PLEN (PBYTELEN PC)) - (FSETPC PC PTYPE THINFILE.PTYPE) - (FSETPC PC PBINABLE T) - (FSETPC PC PCHARSET 0) - (add (PFPOS PC) - 2)) - (\NORUNCODE (* ; "Going for 3 byte characters") + (0 (add (PFPOS PC) + 2) + (add (PLEN PC) + -2)) + (\NORUNCODE (* ; "Going for 2 byte characters") (CL:UNLESS (EQ 0 (BIN PFILE)) - (\TEDIT.THELP "XCCS CHARACTER NOT IN PLANE 0")) + (\TEDIT.THELP "MCCS CHARACTER NOT IN PLANE 0, FILEPOS = " + (IDIFFERENCE (GETFILEPTR PFILE) + 2))) (FSETPC PC PTYPE FATFILE2.PTYPE) - (FSETPC PC PBYTESPERCHAR 2) (add (PFPOS PC) 3) - (add (PBYTELEN PC) - -3) - (FSETPC PC PLEN (FOLDLO (PBYTELEN PC) - 2))) + (change (PLEN PC) + (FOLDLO (IDIFFERENCE DATUM 3) + 2))) (PROGN - (* ;; "A run in a non-zero charset. Convert it to FATFILE1. Could also read into a FATSTRING instead, get rid of on-file FATFILE1. A string piece could hold adjacent substrings in different charsets") + (* ;; "A run in a non-zero charset. Convert it to FATSTRING so we don't have to maintain code to interpret XCCS stringlet pieces. After all, space efficiency is far worse for our ultimate goal of UTF-8 codes.") - (add (PBYTELEN PC) - -2) - (add (PFPOS PC) - 2) - (FSETPC PC PLEN (PBYTELEN PC)) - (FSETPC PC PBINABLE NIL) - (FSETPC PC PTYPE FATFILE1.PTYPE) - (FSETPC PC PBYTESPERCHAR 1) - (FSETPC PC PCHARSET BYTE))) - elseif (EQ 2 (PBYTESPERCHAR PC)) - then (FSETPC PC PTYPE FATFILE2.PTYPE) (* ; "This is the continuation of an XCCS 2-byte run that was broken up presumably for looks or paragraphs") - (FSETPC PC PCHARSET \NORUNCODE) - (FSETPC PC PLEN (FOLDLO (PBYTELEN PC) - 2)) - else (FSETPC PC PCHARSET 0) (* ; "A charset 0 1-byte run") - (FSETPC PC PBINABLE T) - (FSETPC PC PBYTESPERCHAR 1) - [\SETFILEPTR PFILE (IPLUS (PFPOS PC) - (SUB1 (PLEN PC] + (\TEDIT.RUN.TO.STRINGPIECE PC BYTE PFILE))) + elseif (EQ FATFILE2.PTYPE (PTYPE PC)) + then (* ; "This is the continuation of an MCCS 2-byte run that was broken up presumably for looks or paragraphs") + (change (PLEN PC) + (FOLDLO DATUM 2)) + else (FSETPC PC PBYTESPERCHAR 1) (* ; "A charset 0 1-byte run") + [\SETFILEPTR PFILE (SUB1 (IPLUS (PFPOS PC) + (PLEN PC] (* ; + "Position for the last byte for EOL processing. Maybe only if PPARALAST ?") (if (EQ (CHARCODE LF) (SETQ BYTE (BIN PFILE))) then @@ -1350,8 +1334,6 @@ else (add (PLEN PC) -1) (* ;  "Shorten PC, add EOL string piece unless preceded by CR") - (add (PBYTELEN PC) - -1) (if (EQ (CHARCODE CR) (\BACKBIN PFILE)) then (SETQ EOLC CRLF.EOLC) @@ -1360,10 +1342,9 @@ (FSETPC PC PPARALAST NIL] else (CL:WHEN (EQ BYTE (CHARCODE CR)) (SETQ EOLC CR.EOLC)) - (FSETPC PC PTYPE THINFILE.PTYPE) - (FSETPC PC PLEN (PBYTELEN PC] finally (CL:WHEN EOLC - (replace (STREAM EOLCONVENTION) - of PFILE with EOLC))) + (FSETPC PC PTYPE THINFILE.PTYPE))) + finally (CL:WHEN EOLC + (replace (STREAM EOLCONVENTION) of PFILE with EOLC))) PIECES]) (\TEDIT.CONVERT.XCCSTOMCCS @@ -1379,16 +1360,30 @@ TSTREAM CHNO))) unless (EQ CHAR (SETQ CHAR (MTOXCODE CHAR))) do (\TEDIT.RPLCHARCODE TSTREAM CHNO CHAR NIL T)))]) + +(\TEDIT.RUN.TO.STRINGPIECE + [LAMBDA (PC CHARSET PFILE) (* ; "Edited 10-Apr-2026 09:20 by rmk") + (* ; "Edited 7-Apr-2026 18:16 by rmk") + (SETQ CHARSET (LLSH CHARSET 8)) + (LET ((STRING (ALLOCSTRING (PLEN PC) + NIL NIL T))) + [for I from 1 to (PLEN PC) do (RPLCHARCODE STRING I (LOGOR CHARSET (BIN PFILE] + (FSETPC PC PTYPE FATSTRING.PTYPE) + (FSETPC PC PCONTENTS STRING) + (FSETPC PC PBYTESPERCHAR 2) + PC]) ) -(* ; "XCCS") +(* ; "MCCS") (DEFINEQ (\TEDIT.GET.UNFORMATTED.FILE.UTF8 - [LAMBDA (STRM START END DEFAULTCHARLOOKS DEFAULTPARALOOKS) (* ; "Edited 23-Oct-2025 08:48 by rmk") + [LAMBDA (STRM START END DEFAULTCHARLOOKS DEFAULTPARALOOKS) (* ; "Edited 12-Apr-2026 21:46 by rmk") + (* ; "Edited 10-Apr-2026 09:24 by rmk") + (* ; "Edited 23-Oct-2025 08:48 by rmk") (* ; "Edited 28-Jul-2025 23:45 by rmk") (* ; "Edited 11-Mar-2024 23:55 by rmk") (* ; "Edited 4-Feb-2024 10:12 by rmk") @@ -1409,7 +1404,6 @@ PCHARLOOKS _ DEFAULTCHARLOOKS PPARALOOKS _ DEFAULTPARALOOKS)) (NEXTCODESIZE _ 1) - (SBINABLE _ (fetch (STREAM BINABLE) of STRM)) EOLC CHAR PREVPC PTYPE RUNLEN FILEPOS CRBEFORE CODESIZE PREVCRLF first (SELECTQ (READBOM STRM) (:UTF-8 (add NEXTFILEPOS 3)) @@ -1457,21 +1451,16 @@ (SETQ PTYPE (CL:IF (EQ CODESIZE 1) THINFILE.PTYPE UTF8.PTYPE)) - (SETQ PREVPC - (FSETPC PREVPC NEXTPIECE - (create PIECE - PTYPE _ PTYPE - PCONTENTS _ STRM - PFPOS _ FILEPOS - PLEN _ (IQUOTIENT RUNLEN CODESIZE) - PCHARLOOKS _ DEFAULTCHARLOOKS - PPARALOOKS _ DEFAULTPARALOOKS - PBYTESPERCHAR _ CODESIZE - PBYTELEN _ RUNLEN - PREVPIECE _ PREVPC - PBINABLE _ (AND (EQ PTYPE THINFILE.PTYPE) - SBINABLE) - PUTF8BYTESPERCHAR _ CODESIZE)))) + (SETQ PREVPC (FSETPC PREVPC NEXTPIECE + (create PIECE + PTYPE _ PTYPE + PCONTENTS _ STRM + PFPOS _ FILEPOS + PLEN _ (IQUOTIENT RUNLEN CODESIZE) + PCHARLOOKS _ DEFAULTCHARLOOKS + PPARALOOKS _ DEFAULTPARALOOKS + PBYTESPERCHAR _ CODESIZE + PREVPIECE _ PREVPC)))) (CL:WHEN (EQ CHAR (CHARCODE LF)) [if CRBEFORE then (SETQ EOLC CRLF.EOLC) @@ -1646,7 +1635,8 @@ (\WIN STREAM]) (\TEDIT.GET.CHARLOOKS.INDEX - [LAMBDA (PC FORMATSTREAM) (* ; "Edited 28-Jul-2025 23:46 by rmk") + [LAMBDA (PC FORMATSTREAM) (* ; "Edited 24-Apr-2026 21:03 by rmk") + (* ; "Edited 28-Jul-2025 23:46 by rmk") (* ; "Edited 14-Jan-2024 00:11 by rmk") (* ; "Edited 19-Dec-2023 10:13 by rmk") (* ; "Edited 3-Sep-2023 23:31 by rmk") @@ -1654,18 +1644,18 @@ (* ; "Edited 26-Aug-2023 23:22 by rmk") (* ; "Edited 30-May-91 21:43 by jds") - (* ;; "Set the type, length, and and charlooks-index for the current piece, PC") + (* ;; "Set the type, length, and charlooks-index for the current piece, PC") (LET ((FLAGS (BIN FORMATSTREAM))) (FSETPC PC PCHARLOOKS (\WIN FORMATSTREAM)) (CL:UNLESS (ZEROP (LOGAND FLAGS 1)) (FSETPC PC PNEW T)) - (CL:UNLESS (ZEROP (LOGAND FLAGS 2)) (* ; - "XCSS FAT. It may be a continuation of a previous fat piece") - (FSETPC PC PLEN (IQUOTIENT (FGETPC PC PLEN) - 2)) - (FSETPC PC PTYPE FATFILE2.PTYPE) - (FSETPC PC PBYTESPERCHAR 2))]) + (CL:UNLESS (ZEROP (LOGAND FLAGS 2)) + + (* ;; "MCSS FAT. It may have a 255 255 0 (NSHIFTBYTES=3) prefix or it may be a continuation of a previous fat piece. PLEN on the file is the runlength including the NSHIFTBYTES, so we can't fold from bytes to chars here: \TEDIT.INTERPRET.MCCS.SHIFTS. Until then, this is goofy") + + (FSETPC PC PBYTESPERCHAR 2) + (FSETPC PC PTYPE FATFILE2.PTYPE))]) ) (DEFINEQ @@ -1773,7 +1763,8 @@ (DEFINEQ (\TEDIT.GET.OBJECT - [LAMBDA (TSTREAM PIECE FILE CURFILEBYTE# BYTELEN) (* ; "Edited 1-Aug-2025 14:50 by rmk") + [LAMBDA (TSTREAM PIECE FILE CURTEXTBYTE# BYTELEN) (* ; "Edited 15-Apr-2026 12:05 by rmk") + (* ; "Edited 1-Aug-2025 14:50 by rmk") (* ; "Edited 28-Jul-2025 23:46 by rmk") (* ; "Edited 31-Jul-2024 12:09 by rmk") (* ; "Edited 5-Dec-2023 12:28 by rmk") @@ -1794,13 +1785,13 @@ (* ;; "rrb 10-AUG-87 --- calculate the length of the image object's data. This assumes that the file is currently pointed at the end of the data which is where the GETFN is written {I think}.") - (* ;; "RMK: Originally, BYTELEN was calculated here as (DIFFERENCE (GETFILEPTR FILE) CURFILEBYTE#). But this is garbage: (GETFILEPTR FILE) is in the looks section, CURFILEBYTE# is in the text section. The caller knows the true value, now passes it in. ") + (* ;; "RMK: Originally, BYTELEN was calculated here as (DIFFERENCE (GETFILEPTR FILE) CURTEXTBYTE#). But this is garbage: (GETFILEPTR FILE) is in the looks section, CURTEXTBYTE# is in the text section. The caller knows the true value, now passes it in. ") (SETQ GETFN (\ATMIN FILE)) (* ;  "The GETFN for this kind of IMAGEOBJ") (SETQ FILEPTRSAVE (GETFILEPTR FILE)) (* ;  "Save our file location thru the building of the object") - (SETFILEPTR FILE CURFILEBYTE#) + (SETFILEPTR FILE CURTEXTBYTE#) (SETQ OBJ (READIMAGEOBJ FILE GETFN NIL BYTELEN)) (CL:WHEN (IMAGEOBJPROP OBJ 'UNKNOWNGETFN) (* ;  "If the object has an unknown getfn property, then it's an encapsulated object. Warn the user") @@ -1832,6 +1823,9 @@ (\TEDIT.PUT.PCTB [LAMBDA (TEXTOBJ CHARSTREAM FORMATSTREAM CONTINUE KEEPSEPARATE) + (* ; "Edited 18-Apr-2026 14:56 by rmk") + (* ; "Edited 9-Apr-2026 23:19 by rmk") + (* ; "Edited 7-Apr-2026 12:31 by rmk") (* ; "Edited 14-Feb-2026 10:32 by rmk") (* ; "Edited 9-Sep-2025 21:32 by rmk") (* ; "Edited 26-Apr-2025 00:11 by rmk") @@ -1870,8 +1864,8 @@ (CL:WHEN (EQ :UTF-8 (STREAMPROP CHARSTREAM 'FORMAT)) (\TEDIT.PUT.UTF8.SPLITPIECES TEXTOBJ)) (for PC PFILE NEXTNEW RUNLEN UNFORMATTED? (NSHIFTBYTES _ 0) - (CURBYTE# _ 0) - (OLDBYTE# _ 0) + (CURTEXTBYTE# _ 0) + (OLDTEXTBYTE# _ 0) [UNFORMATTED? _ (PROG1 (EQ FORMATSTREAM T) (CL:UNLESS (STREAMP FORMATSTREAM) [SETQ FORMATSTREAM (OPENSTREAM '{NODIRCORE} 'BOTH 'NEW @@ -1906,8 +1900,8 @@ (* ;; " We're ready to put the pieces on the output file. ") - (SETQ CURBYTE# (\GETFILEPTR CHARSTREAM)) - (SETQ OLDBYTE# CURBYTE#) + (SETQ CURTEXTBYTE# (\GETFILEPTR CHARSTREAM)) + (SETQ OLDTEXTBYTE# CURTEXTBYTE#) (* ;; "ZEROP should never happen, but...") @@ -1915,7 +1909,7 @@ unless (ZEROP (PLEN PC)) do - (* ;; "PC starts a run of one or more pieces that can be collapsed together into a single file piece. The paragraph looks are produced before the first piece of a new paragraph (first piece or previous piece was PPARALAST), then the piece(s)-characters, followed by the charlooks. I.e., FORMATSTREAM describes the paragraph-start piece with its paragraph looks forllowed by its char looks.") + (* ;; "PC starts a run of one or more pieces that can be collapsed together into a single file piece. The paragraph looks are produced before the first piece of a new paragraph (first piece or previous piece was PPARALAST), then the piece(s)-characters, followed by the charlooks. I.e., FORMATSTREAM describes the paragraph-start piece with its paragraph looks followed by its char looks.") (CL:WHEN (OR (NULL (PREVPIECE PC)) (PPARALAST (PREVPIECE PC))) @@ -1923,15 +1917,15 @@ (add PCCOUNT 1)) (CL:WHEN (MEMB EXTFORMAT '(:MCCS :XCCS)) - (* ;; "For MCCS, CHARSET will put out the char-shifting prefix bytes as needed. In format-version 3 all the file bytes belong to a piece, no skipping in the file. TEDIT.GET calls \TEDIT.INTERPRET.XCCS.SHIFTS to shave those bytes. NSHIFTBYTES is used here if the edit will continue.") + (* ;; "For MCCS, CHARSET will put out the char-shifting prefix bytes as needed. In format-version 3 all the file bytes belong to a piece, no skipping in the file. TEDIT.GET calls \TEDIT.INTERPRET.MCCS.SHIFTS to shave those bytes. NSHIFTBYTES is used here so the edit can continue.") - (CHARSET CHARSTREAM (OR (AND (EQ EXTFORMAT :XCCS) - (MEMB (PTYPE PC) - FAT.PTYPES)) - (PCHARSET PC))) + (CHARSET CHARSTREAM (CL:IF (MEMB (PTYPE PC) + FAT.PTYPES) + T + 0)) (SETQ NSHIFTBYTES (IDIFFERENCE (\GETFILEPTR CHARSTREAM) - OLDBYTE#))) - (do (\TEDIT.PUT.PCTB.PIECEDATA PC CHARSTREAM TEXTOBJ FORMATSTREAM OLDBYTE#) + OLDTEXTBYTE#))) + (do (\TEDIT.PUT.PCTB.PIECEDATA PC CHARSTREAM TEXTOBJ FORMATSTREAM OLDTEXTBYTE#) (CL:UNLESS (\TEDIT.PUT.PCTB.MERGEABLE PC (NEXTPIECE PC) EDITSTENTATIVE EXTFORMAT TEXTOBJ) (RETURN)) @@ -1939,8 +1933,8 @@ (* ;; "PC is the last piece written for a mergeable sequence. Finish off the corresponding file piece by writing PC's character looks into FORMATSTREAM. ") - (SETQ CURBYTE# (\GETFILEPTR CHARSTREAM)) - (SETQ RUNLEN (IDIFFERENCE CURBYTE# OLDBYTE#)) + (SETQ CURTEXTBYTE# (\GETFILEPTR CHARSTREAM)) + (SETQ RUNLEN (IDIFFERENCE CURTEXTBYTE# OLDTEXTBYTE#)) (CL:UNLESS (EQ OBJECT.PTYPE (PTYPE PC)) (* ;  "Objects get their charlooks from the preceding piece.") (\TEDIT.PUT.CHARLOOKS FORMATSTREAM RUNLEN PC EDITSTENTATIVE LOOKSHASH)) @@ -1952,28 +1946,30 @@ (* ;; "Only for continued editing: make a new piece that describes those characters as they now reside on CHARSTREAM. ") - (SETQ NEXTNEW (\TEDIT.PUT.PCTB.NEXTNEW NEXTNEW PC OLDBYTE# RUNLEN EXTFORMAT TEXTOBJ + (SETQ NEXTNEW (\TEDIT.PUT.PCTB.NEXTNEW NEXTNEW PC OLDTEXTBYTE# RUNLEN EXTFORMAT TEXTOBJ EOLC NSHIFTBYTES))) - (SETQ OLDBYTE# CURBYTE#) finally + (SETQ OLDTEXTBYTE# CURTEXTBYTE#) finally (* ;; "Finalize and append FORMATSTREAM unless unformatted or KEEPSEPARATE (for splitting). If KEEPSEPARATE, the caller must have provided the formatstream") - (CL:UNLESS UNFORMATTED? - (\TEDIT.PUT.TRAILER FORMATSTREAM (\GETFILEPTR CHARSTREAM - ) - PCCOUNT 3 (FGETTOBJ TEXTOBJ DOCPROPS))) - (CL:UNLESS (OR UNFORMATTED? KEEPSEPARATE) - (COPYBYTES FORMATSTREAM CHARSTREAM 0 (GETEOFPTR - FORMATSTREAM - ))) - (RETURN (CL:WHEN NEWPIECES + (CL:UNLESS UNFORMATTED? + (\TEDIT.PUT.TRAILER FORMATSTREAM (\GETFILEPTR + CHARSTREAM) + PCCOUNT 3 (FGETTOBJ TEXTOBJ DOCPROPS))) + (CL:UNLESS (OR UNFORMATTED? KEEPSEPARATE) + (COPYBYTES FORMATSTREAM CHARSTREAM 0 + (GETEOFPTR FORMATSTREAM))) + (RETURN (CL:WHEN NEWPIECES - (* ;; "Throw away the dummy head of the new piece chain (NEWPIECES is NIL if not continuing). The caller must make install the new pieces.") + (* ;; "Throw away the dummy head of the new piece chain (NEWPIECES is NIL if not continuing). The caller must install the new pieces.") - (NEXTPIECE NEWPIECES))]) + (NEXTPIECE NEWPIECES))]) (\TEDIT.PUT.PCTB.PIECEDATA - [LAMBDA (PC CHARSTREAM TEXTOBJ FORMATSTREAM OLDBYTE#) (* ; "Edited 21-Oct-2024 00:33 by rmk") + [LAMBDA (PC CHARSTREAM TEXTOBJ FORMATSTREAM OLDTEXTBYTE#) (* ; "Edited 18-Apr-2026 14:54 by rmk") + (* ; "Edited 9-Apr-2026 13:37 by rmk") + (* ; "Edited 7-Apr-2026 18:10 by rmk") + (* ; "Edited 21-Oct-2024 00:33 by rmk") (* ; "Edited 15-May-2024 17:04 by rmk") (* ;; "Write the data defining PC on CHARSTREAM.") @@ -1982,7 +1978,7 @@ (* ;; "FORMATSTREAM is needed for objects.") - (* ;; "OLDBYTE# needed to deal with XCCS shift before objects.") + (* ;; "OLDTEXTBYTE# needed to deal with XCCS shift before objects.") (LET (PFILE) (CL:WHEN (MEMB (PTYPE PC) @@ -2004,16 +2000,9 @@ (for CH instring (PCONTENTS PC) do (\OUTCHAR CHARSTREAM CH))) (FATFILE2.PTYPE (for I from 1 to (PLEN PC) do (\OUTCHAR CHARSTREAM (\WIN PFILE)))) - (FATFILE1.PTYPE - (* ;; - "We read but don't write FATFILE1 pieces, they merge with FATFILE2.") - - [for I (CSET _ (LLSH (PCHARSET PC) - 8)) from 1 to (PLEN PC) - do (\OUTCHAR CHARSTREAM (LOGOR CSET (BIN PFILE]) (UTF8.PTYPE (for I from 1 to (PLEN PC) do (\OUTCHAR CHARSTREAM (UTF8.INCCODEFN PFILE)))) (OBJECT.PTYPE (* ; "It's an object, use its PUTFN.") - (\TEDIT.PUT.OBJECT PC CHARSTREAM FORMATSTREAM OLDBYTE#) + (\TEDIT.PUT.OBJECT PC CHARSTREAM FORMATSTREAM OLDTEXTBYTE#) (* ;; "0 indicates that nothing special needs to be done here to recover the looks of this piece. \TEDIT.GET.PIECES3 says that the object-piece looks are taken from the previous piece (or default for first piece. In earlier versions the value 1 indicated that the looks were not indexed and therefore had to be written explicitly here. This byte won't be needed in the next version of the format.") @@ -2041,7 +2030,9 @@ (\WOUT FORMATSTREAM (IPLUS 31415 VERSION]) (\TEDIT.PUT.PCTB.MERGEABLE - [LAMBDA (PREVPC PC EDITSTENTATIVE EXTFORMAT TEXTOBJ) (* ; "Edited 1-Aug-2025 14:51 by rmk") + [LAMBDA (PREVPC PC EDITSTENTATIVE EXTFORMAT TEXTOBJ) (* ; "Edited 12-Apr-2026 21:44 by rmk") + (* ; "Edited 7-Apr-2026 18:07 by rmk") + (* ; "Edited 1-Aug-2025 14:51 by rmk") (* ; "Edited 25-Apr-2025 23:50 by rmk") (* ; "Edited 24-Apr-2025 16:02 by rmk") (* ; "Edited 14-May-2024 11:55 by rmk") @@ -2076,21 +2067,21 @@ (THINPIECEP PC))) (:UTF-8 - (* ;; "UTF8 pieces with the same bytesperchar are mergeable. We rely on \TEDIT.PUT.UTF8.SPLITPIECES to examine string pieces and split thin strings that include mixtures of Ascii and non-Ascii characters, and to split fat pieces that may contain Ascii character in 2-byte form. After splitting, all pieces with the same PUTF8BYTESPERCHAR can be merged.") + (* ;; "UTF8 pieces with the same bytesperchar are mergeable. We rely on \TEDIT.PUT.UTF8.SPLITPIECES to examine string pieces and split thin strings that include mixtures of Ascii and non-Ascii characters, and to split fat pieces that may contain Ascii character in 2-byte form. After splitting, all pieces with the same PBYTESPERCHAR can be merged.") - (EQ (FGETPC PREVPC PUTF8BYTESPERCHAR) - (FGETPC PC PUTF8BYTESPERCHAR))) + (EQ (FGETPC PREVPC PBYTESPERCHAR) + (FGETPC PC PBYTESPERCHAR))) NIL) (OR (EQ PREVTYPE UTF8.PTYPE) - (AND (EQ PREVTYPE FATFILE1.PTYPE) - (NEQ 0 (PCHARSET PREVPC))) [AND (EQ EXTFORMAT :UTF-8) (NOT (MEMB PREVTYPE (CONSTANT (LIST THINFILE.PTYPE THINSTRING.PTYPE] (NOT (MEMB (\TEDIT.PIECE.NTHCHARCODE PREVPC (SUB1 (PLEN PREVPC))) (CHARCODE (EOL LF])])]) (\TEDIT.PUT.UTF8.SPLITPIECES - [LAMBDA (TEXTOBJ) (* ; "Edited 19-Jan-2025 15:02 by rmk") + [LAMBDA (TEXTOBJ) (* ; "Edited 12-Apr-2026 21:49 by rmk") + (* ; "Edited 9-Apr-2026 00:05 by rmk") + (* ; "Edited 19-Jan-2025 15:02 by rmk") (* ; "Edited 17-Mar-2024 00:14 by rmk") (* ; "Edited 3-Feb-2024 14:52 by rmk") (* ; "Edited 11-Jan-2024 23:29 by rmk") @@ -2101,24 +2092,24 @@ (for PC inpieces (\TEDIT.FIRSTPIECE TEXTOBJ) do (SELECTC (PTYPE PC) - (UTF8.PTYPE (FSETPC PC PUTF8BYTESPERCHAR (PBYTESPERCHAR PC))) + (UTF8.PTYPE) (STRING.PTYPES (for CH BPC instring (PCONTENTS PC) as I from 1 do (* ;; "If BPC changes, split off and mark the prefix piece with the previous value, go back to the main loop to continue on the residual suffix piece.") (if (EQ I 1) - then (SETQ BPC (NUTF8-CODE-BYTES (XTOUCODE CH))) - (FSETPC PC PUTF8BYTESPERCHAR BPC) + then (SETQ BPC (NUTF8-CODE-BYTES (MTOUCODE CH))) + (FSETPC PC PBYTESPERCHAR BPC) (* ;  "The first character defines the piece") - elseif (EQ BPC (NUTF8-CODE-BYTES (XTOUCODE CH))) + elseif (EQ BPC (NUTF8-CODE-BYTES (MTOUCODE CH))) else (\TEDIT.SPLITPIECE PC (SUB1 I) TEXTOBJ) (SETQ PC (PREVPIECE PC)) (* ;  "Prefix piece always exists since I>1") - (FSETPC PC PUTF8BYTESPERCHAR BPC) + (FSETPC PC PBYTESPERCHAR BPC) (* ;  "Mark it, iteration continues on its next.") (RETURN)))) @@ -2128,30 +2119,26 @@ (for I BPC (PFILE _ (PCONTENTS PC)) from 1 to (PLEN PC) first (\SETFILEPTR PFILE (PFPOS PC)) do (if (EQ I 1) - then [SETQ BPC (NUTF8-CODE-BYTES (XTOUCODE (BIN PFILE] - (FSETPC PC PUTF8BYTESPERCHAR BPC) - elseif [EQ BPC (NUTF8-CODE-BYTES (XTOUCODE (BIN PFILE] + then [SETQ BPC (NUTF8-CODE-BYTES (MTOUCODE (BIN PFILE] + (FSETPC PC PBYTESPERCHAR BPC) + elseif [EQ BPC (NUTF8-CODE-BYTES (MTOUCODE (BIN PFILE] else (\TEDIT.SPLITPIECE PC (SUB1 I) TEXTOBJ) (SETQ PC (PREVPIECE PC)) - (FSETPC PC PUTF8BYTESPERCHAR BPC) + (FSETPC PC PBYTESPERCHAR BPC) (RETURN))))) - ((LIST FATFILE2.PTYPE FATFILE1.PTYPE) (* ; "XCCS pieces") + (FATFILE2.PTYPE (* ; "XCCS pieces") (for I BPC CH (PFILE _ (PCONTENTS PC)) from 1 to (PLEN PC) first (\SETFILEPTR PFILE (PFPOS PC)) - do (SETQ CH (LOGOR (LLSH (CL:IF (EQ FATFILE2.PTYPE (PTYPE PC)) - (BIN PFILE) - (PCHARSET PC)) - 8) - (BIN PFILE))) + do (SETQ CH (\WIN PFILE)) (if (EQ I 1) - then (SETQ BPC (NUTF8-CODE-BYTES (XTOUCODE CH))) - (FSETPC PC PUTF8BYTESPERCHAR BPC) - elseif (EQ BPC (NUTF8-CODE-BYTES (XTOUCODE CH))) + then (SETQ BPC (NUTF8-CODE-BYTES (MTOUCODE CH))) + (FSETPC PC PBYTESPERCHAR BPC) + elseif (EQ BPC (NUTF8-CODE-BYTES (MTOUCODE CH))) else (\TEDIT.SPLITPIECE PC (SUB1 I) TEXTOBJ) (SETQ PC (PREVPIECE PC)) - (FSETPC PC PUTF8BYTESPERCHAR BPC) + (FSETPC PC PBYTESPERCHAR BPC) (RETURN)))) NIL]) @@ -2183,6 +2170,11 @@ (\TEDIT.PUT.PCTB.NEXTNEW [LAMBDA (NEXTNEW PC OLDBYTE# RUNLEN EXTFORMAT TEXTOBJ EOLC NSHIFTBYTES) + (* ; "Edited 24-Apr-2026 20:45 by rmk") + (* ; "Edited 17-Apr-2026 23:55 by rmk") + (* ; "Edited 12-Apr-2026 21:47 by rmk") + (* ; "Edited 9-Apr-2026 13:20 by rmk") + (* ; "Edited 7-Apr-2026 18:12 by rmk") (* ; "Edited 15-Feb-2026 15:09 by rmk") (* ; "Edited 25-Apr-2025 08:48 by rmk") (* ; "Edited 26-Mar-2025 09:27 by rmk") @@ -2198,28 +2190,25 @@ (* ;; "This updates the piece chain that is created for continued editing.") - (* ;; "Note that the PCONTENTS (= PFILE) field for these file pieces isn't filled in, that has to be done after CHARSTREAM is closed and reopened at the TEDIT.PUT level. For the same reason, PBINABLE isn't set here.") + (* ;; "Note that the PCONTENTS (= PFILE) field for these file pieces isn't filled in, that has to be done after CHARSTREAM is closed and reopened at the TEDIT.PUT level. ") - (* ;; "NSHIFTBYTES strips any MCCS/XCCS charset shifts at the beginning of the new piece.") + (* ;; "NSHIFTBYTES ignores any MCCS/XCCS charset shifts at the beginning of the new piece.") (SETQ RUNLEN (IDIFFERENCE RUNLEN NSHIFTBYTES)) (FSETPC NEXTNEW NEXTPIECE (SETQ NEXTNEW (create PIECE using PC PFPOS _ (IPLUS NSHIFTBYTES OLDBYTE#) - PBYTELEN _ RUNLEN PREVPIECE _ NEXTNEW PTREENODE - _ NIL))) + PLEN _ RUNLEN PREVPIECE _ NEXTNEW PTREENODE _ + NIL))) (SELECTQ EXTFORMAT - (:UTF-8 (FSETPC NEXTNEW PTYPE (CL:IF (EQ 1 (FGETPC PC PUTF8BYTESPERCHAR)) + (:UTF-8 (FSETPC NEXTNEW PTYPE (CL:IF (EQ 1 (FGETPC PC PBYTESPERCHAR)) THINFILE.PTYPE - UTF8.PTYPE)) - (FSETPC NEXTNEW PBYTESPERCHAR (FGETPC PC PUTF8BYTESPERCHAR))) + UTF8.PTYPE))) ((:MCCS :XCCS) (* ;  "String pieces can be merged with corresponding file pieces") (FSETPC NEXTNEW PTYPE (SELECTC (PTYPE PC) (THINSTRING.PTYPE THINFILE.PTYPE) - ((LIST FATSTRING.PTYPE FATFILE1.PTYPE) - (* ; - "PCHARSET is not relevant for FILEFILE2") + (FATSTRING.PTYPE (FSETPC NEXTNEW PBYTESPERCHAR 2) FATFILE2.PTYPE) (PTYPE PC)))) @@ -2238,15 +2227,14 @@ (FSETPC NEXTNEW PCONTENTS (ALLOCSTRING 1 (CHARCODE EOL))) else (add (FGETPC NEXTNEW PLEN) -1) (* ; "We know it's thin, maybe paralast") - (add (FGETPC NEXTNEW PBYTELEN) - -1) (SETQ NEXTNEW (\TEDIT.MAKE.STRINGPIECE NEXTNEW (CHARCODE EOL))) (FSETPC (PREVPIECE NEXTNEW) PPARALAST NIL)))) NEXTNEW]) (\TEDIT.INSERT.NEWPIECES - [LAMBDA (DESTSTREAM OLDSTREAM NEWPIECES) (* ; "Edited 14-May-2024 18:38 by rmk") + [LAMBDA (DESTSTREAM OLDSTREAM NEWPIECES) (* ; "Edited 10-Apr-2026 09:25 by rmk") + (* ; "Edited 14-May-2024 18:38 by rmk") (* ; "Edited 29-Apr-2024 10:13 by rmk") (* ; "Edited 20-Mar-2024 10:59 by rmk") (* ; "Edited 17-Mar-2024 12:06 by rmk") @@ -2265,13 +2253,8 @@ (LET ((TEXTOBJ (TEXTOBJ! (fetch (TEXTSTREAM TEXTOBJ) of OLDSTREAM))) FILEPTR) (SETQ FILEPTR (\TEDIT.TEXTGETFILEPTR OLDSTREAM)) (* ; "Restore the editing parameters") - (for PC (SBINABLE _ (fetch (STREAM BINABLE) of DESTSTREAM)) inpieces NEWPIECES - when (MEMB (PTYPE PC) - FILE.PTYPES) do (FSETPC PC PCONTENTS DESTSTREAM) - (CL:WHEN (EQ THINFILE.PTYPE (PTYPE PC)) - (* ; - "If the backing stream isn't binable, the thinfile pieces aren't either") - (FSETPC PC PBINABLE SBINABLE))) + (for PC inpieces NEWPIECES when (MEMB (PTYPE PC) + FILE.PTYPES) do (FSETPC PC PCONTENTS DESTSTREAM)) (* ; "Non-object pieces are on OFILE") (* ;; "Here, finally, we toss the out-of-date pieces to install the new ones. For complete safety, the rest should be uninterruptable (although the file has just been saved, so nothing would really be lost)") @@ -2459,6 +2442,7 @@ (\TEDIT.PUT.CHARLOOKS [LAMBDA (FORMATSTREAM BYTELEN PC EDITSTENTATIVE LOOKSHARRAY) + (* ; "Edited 9-Apr-2026 23:24 by rmk") (* ; "Edited 1-Aug-2025 14:51 by rmk") (* ; "Edited 14-May-2024 10:24 by rmk") (* ; "Edited 13-Jan-2024 16:35 by rmk") @@ -2471,7 +2455,7 @@ (* ;; "Put a description of PC's charlooks into FORMATSTREAM. The looks apply to bytes OLDBYTE# thru CURBYTE#-1") (\DTEST PC 'PIECE) - (\TEDIT.PUT.CHARLOOKS1 FORMATSTREAM BYTELEN (GETHASH (PCHARALOOKS PC) + (\TEDIT.PUT.CHARLOOKS1 FORMATSTREAM BYTELEN (GETHASH (PCHARLOOKS PC) LOOKSHARRAY) (AND EDITSTENTATIVE PC (PNEW PC)) (EQ FATFILE2.PTYPE (PTYPE PC]) @@ -2496,7 +2480,8 @@ (\WOUT FORMATSTREAM CHARLOOKSINDEX]) (\TEDIT.PUT.OBJECT - [LAMBDA (PIECE CHARSTREAM FORMATSTREAM CURFILEBYTE#) (* ; "Edited 14-May-2024 12:09 by rmk") + [LAMBDA (PIECE CHARSTREAM FORMATSTREAM CURTEXTBYTE#) (* ; "Edited 18-Apr-2026 14:52 by rmk") + (* ; "Edited 14-May-2024 12:09 by rmk") (* ; "Edited 24-Jan-2024 23:35 by rmk") (* ; "Edited 13-Jan-2024 12:20 by rmk") (* ; "Edited 19-Dec-2023 10:14 by rmk") @@ -2519,7 +2504,7 @@ (APPLY* (IMAGEOBJPROP OBJECT 'PUTFN) OBJECT CHARSTREAM) (SETQ BYTELEN (IDIFFERENCE (GETEOFPTR CHARSTREAM) - CURFILEBYTE#)) + CURTEXTBYTE#)) (SETFILEPTR FORMATSTREAM ORIGFILEPTR) (* ;  "Now go back and fill in the length of the text description of the object.") (\DWOUT FORMATSTREAM BYTELEN) @@ -2721,29 +2706,29 @@ (RPAQ? *TEDIT-FILE-READTABLE* (COPYREADTABLE \ORIGREADTABLE)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (5423 35682 (TEDIT.GET 5433 . 11843) (TEDIT.FORMATTEDFILEP 11845 . 13161) ( -TEDIT.FILEDATE 13163 . 14472) (TEDIT.INCLUDE 14474 . 22503) (TEDIT.RAW.INCLUDE 22505 . 23313) ( -TEDIT.PUT 23315 . 31671) (TEDIT.PUT.STREAM 31673 . 35680)) (35683 56957 (\TEDIT.GET.FOREIGN.FILE 35693 - . 39118) (\TEDIT.GET.UNFORMATTED.FILE 39120 . 43426) (\TEDIT.GET.FORMATTED.FILE 43428 . 47071) ( -\TEDIT.FORMATTEDSTREAMP 47073 . 50204) (\ARBIN 50206 . 50926) (\ATMIN 50928 . 51465) (\DWIN 51467 . -51846) (\STRINGIN 51848 . 52556) (\TEDIT.GET.TRAILER 52558 . 55426) (\TEDIT.CACHEFILE 55428 . 56955)) -(57123 73161 (\TEDIT.GET.PIECES3 57133 . 68096) (\TEDIT.GET.PROPS3 68098 . 71320) ( -\TEDIT.MAKE.STRINGPIECE 71322 . 73159)) (73162 86588 (\TEDIT.GET.UNFORMATTED.FILE.MCCS 73172 . 79405) -(\TEDIT.INTERPRET.MCCS.SHIFTS 79407 . 85652) (\TEDIT.CONVERT.XCCSTOMCCS 85654 . 86586)) (86610 92855 ( -\TEDIT.GET.UNFORMATTED.FILE.UTF8 86620 . 92853)) (92878 104220 (\TEDIT.GET.CHARLOOKS.LIST 92888 . -93619) (\TEDIT.GET.SINGLE.CHARLOOKS 93621 . 100693) (\TEDIT.GET.CHARLOOKS 100695 . 102251) ( -\TEDIT.GET.PARALOOKS.INDEX 102253 . 102797) (\TEDIT.GET.CHARLOOKS.INDEX 102799 . 104218)) (104221 -111878 (\TEDIT.GET.PARALOOKS.LIST 104231 . 104853) (\TEDIT.GET.SINGLE.PARALOOKS 104855 . 111876)) ( -111879 115712 (\TEDIT.GET.OBJECT 111889 . 115710)) (115777 150880 (\TEDIT.PUT.PCTB 115787 . 125844) ( -\TEDIT.PUT.PCTB.PIECEDATA 125846 . 129044) (\TEDIT.PUT.TRAILER 129046 . 130374) ( -\TEDIT.PUT.PCTB.MERGEABLE 130376 . 134149) (\TEDIT.PUT.UTF8.SPLITPIECES 134151 . 138853) ( -\TEDIT.PUT.MCCS.SPLITPIECES 138855 . 140433) (\TEDIT.PUT.PCTB.NEXTNEW 140435 . 145041) ( -\TEDIT.INSERT.NEWPIECES 145043 . 148478) (\TEDIT.PUTRESET 148480 . 148722) (\ARBOUT 148724 . 149448) ( -\ATMOUT 149450 . 150055) (\DWOUT 150057 . 150336) (\STRINGOUT 150338 . 150878)) (150881 163615 ( -\TEDIT.PUT.CHARLOOKS.LIST 150891 . 152563) (\TEDIT.PUT.SINGLE.CHARLOOKS 152565 . 158845) ( -\TEDIT.PUT.CHARLOOKS 158847 . 160186) (\TEDIT.PUT.CHARLOOKS1 160188 . 161239) (\TEDIT.PUT.OBJECT -161241 . 163613)) (163616 171255 (\TEDIT.PUT.PARALOOKS.LIST 163626 . 164528) ( -\TEDIT.PUT.SINGLE.PARALOOKS 164530 . 170114) (\TEDIT.PUT.PARALOOKS 170116 . 171253)) (171350 174755 ( -TEDITFROMLISPSOURCE 171360 . 174004) (SHELLSCRIPTP 174006 . 174235) (TEDITFROMSHELLSCRIPT 174237 . -174753))))) + (FILEMAP (NIL (5384 35643 (TEDIT.GET 5394 . 11804) (TEDIT.FORMATTEDFILEP 11806 . 13122) ( +TEDIT.FILEDATE 13124 . 14433) (TEDIT.INCLUDE 14435 . 22464) (TEDIT.RAW.INCLUDE 22466 . 23274) ( +TEDIT.PUT 23276 . 31632) (TEDIT.PUT.STREAM 31634 . 35641)) (35644 56951 (\TEDIT.GET.FOREIGN.FILE 35654 + . 39079) (\TEDIT.GET.UNFORMATTED.FILE 39081 . 43420) (\TEDIT.GET.FORMATTED.FILE 43422 . 47065) ( +\TEDIT.FORMATTEDSTREAMP 47067 . 50198) (\ARBIN 50200 . 50920) (\ATMIN 50922 . 51459) (\DWIN 51461 . +51840) (\STRINGIN 51842 . 52550) (\TEDIT.GET.TRAILER 52552 . 55420) (\TEDIT.CACHEFILE 55422 . 56949)) +(57117 73044 (\TEDIT.GET.PIECES3 57127 . 68176) (\TEDIT.GET.PROPS3 68178 . 71400) ( +\TEDIT.MAKE.STRINGPIECE 71402 . 73042)) (73045 85841 (\TEDIT.GET.UNFORMATTED.FILE.MCCS 73055 . 78706) +(\TEDIT.INTERPRET.MCCS.SHIFTS 78708 . 84304) (\TEDIT.CONVERT.XCCSTOMCCS 84306 . 85238) ( +\TEDIT.RUN.TO.STRINGPIECE 85240 . 85839)) (85863 92124 (\TEDIT.GET.UNFORMATTED.FILE.UTF8 85873 . 92122 +)) (92147 103665 (\TEDIT.GET.CHARLOOKS.LIST 92157 . 92888) (\TEDIT.GET.SINGLE.CHARLOOKS 92890 . 99962) + (\TEDIT.GET.CHARLOOKS 99964 . 101520) (\TEDIT.GET.PARALOOKS.INDEX 101522 . 102066) ( +\TEDIT.GET.CHARLOOKS.INDEX 102068 . 103663)) (103666 111323 (\TEDIT.GET.PARALOOKS.LIST 103676 . 104298 +) (\TEDIT.GET.SINGLE.PARALOOKS 104300 . 111321)) (111324 115266 (\TEDIT.GET.OBJECT 111334 . 115264)) ( +115331 150489 (\TEDIT.PUT.PCTB 115341 . 125667) (\TEDIT.PUT.PCTB.PIECEDATA 125669 . 128826) ( +\TEDIT.PUT.TRAILER 128828 . 130156) (\TEDIT.PUT.PCTB.MERGEABLE 130158 . 134019) ( +\TEDIT.PUT.UTF8.SPLITPIECES 134021 . 138597) (\TEDIT.PUT.MCCS.SPLITPIECES 138599 . 140177) ( +\TEDIT.PUT.PCTB.NEXTNEW 140179 . 144920) (\TEDIT.INSERT.NEWPIECES 144922 . 148087) (\TEDIT.PUTRESET +148089 . 148331) (\ARBOUT 148333 . 149057) (\ATMOUT 149059 . 149664) (\DWOUT 149666 . 149945) ( +\STRINGOUT 149947 . 150487)) (150490 163441 (\TEDIT.PUT.CHARLOOKS.LIST 150500 . 152172) ( +\TEDIT.PUT.SINGLE.CHARLOOKS 152174 . 158454) (\TEDIT.PUT.CHARLOOKS 158456 . 159903) ( +\TEDIT.PUT.CHARLOOKS1 159905 . 160956) (\TEDIT.PUT.OBJECT 160958 . 163439)) (163442 171081 ( +\TEDIT.PUT.PARALOOKS.LIST 163452 . 164354) (\TEDIT.PUT.SINGLE.PARALOOKS 164356 . 169940) ( +\TEDIT.PUT.PARALOOKS 169942 . 171079)) (171176 174581 (TEDITFROMLISPSOURCE 171186 . 173830) ( +SHELLSCRIPTP 173832 . 174061) (TEDITFROMSHELLSCRIPT 174063 . 174579))))) STOP diff --git a/library/tedit/TEDIT-FILE.LCOM b/library/tedit/TEDIT-FILE.LCOM index 6e1598c7..276477d1 100644 Binary files a/library/tedit/TEDIT-FILE.LCOM and b/library/tedit/TEDIT-FILE.LCOM differ diff --git a/library/tedit/TEDIT-FIXFILES b/library/tedit/TEDIT-FIXFILES new file mode 100644 index 00000000..495db781 --- /dev/null +++ b/library/tedit/TEDIT-FIXFILES @@ -0,0 +1,183 @@ +(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) + +(FILECREATED "14-Dec-2024 16:53:27" {WMEDLEY}TEDIT>TEDIT-FIXFILES.;14 9776 + + :EDIT-BY rmk + + :CHANGES-TO (FNS CR-LF-FONTFIX) + (VARS TEDIT-FIXFILESCOMS) + (ADVICE ELT) + + :PREVIOUS-DATE "12-Dec-2024 21:50:29" {WMEDLEY}TEDIT>TEDIT-FIXFILES.;10) + + +(PRETTYCOMPRINT TEDIT-FIXFILESCOMS) + +(RPAQQ TEDIT-FIXFILESCOMS ( + (* ;; "Hacks that may help in fixing broken Tedit files") + + (FILES TEDIT-DEBUG) + (FNS CRLFSWAP CHANGEPLEN) + (FNS CR-LF-FONTFIX) + (P (MOVD 'CR-LF-FONTFIX '\TEDIT.GET.SINGLE.CHARLOOKS)) + (ADVISE ELT))) + + + +(* ;; "Hacks that may help in fixing broken Tedit files") + + +(FILESLOAD TEDIT-DEBUG) +(DEFINEQ + +(CRLFSWAP + [LAMBDA (INFILE OUTFILE) (* ; "Edited 12-Dec-2024 08:25 by rmk") + (* ; "Edited 9-Dec-2024 13:33 by rmk") + (CL:WITH-OPEN-FILE (INSTREAM INFILE :DIRECTION :INPUT) + (CL:UNLESS OUTFILE + (SETQ OUTFILE (PACKFILENAME 'VERSION NIL 'NAME (CONCAT (FILENAMEFIELD INSTREAM + 'NAME) + "-SWAPPED") + 'BODY INSTREAM))) + (CL:WITH-OPEN-FILE (OUTSTREAM OUTFILE :DIRECTION :OUTPUT) + (for I B from 1 to (GETEOFPTR INSTREAM) + do (BOUT OUTSTREAM (SELCHARQ (SETQ B (BIN INSTREAM)) + (LF (CHARCODE CR)) + (CR (CHARCODE LF)) + B))) + (FULLNAME OUTSTREAM]) + +(CHANGEPLEN + [LAMBDA (PC DELTA ARG) (* ; "Edited 11-Dec-2024 15:18 by rmk") + + (* ;; "Change the length of piece PC by DELTA (negative = shorter).") + + (LET [(PC (SP PC 1 NIL (GTO ARG] + (CL:WHEN (EQ 'Y (ASKUSER NIL NIL (CONCAT "Confirm changing PLEN by " DELTA " from " + (PLEN PC) + " to " + (IPLUS (PLEN PC) + DELTA) + " ? "))) + (FSETPC PC PLEN (IPLUS (PLEN PC) + DELTA)) + (SP PC 1 NIL (GTO ARG)))]) +) +(DEFINEQ + +(CR-LF-FONTFIX + [LAMBDA (FILE TEXTOBJ) (* ; "Edited 14-Dec-2024 14:31 by rmk") + (* ; "Edited 12-Dec-2024 21:50 by rmk") + (SI::%%WITH-CHANGED-CALLS + ((|TEXTPROP in INTERLISP::\TEDIT.GET.SINGLE.CHARLOOKS| . TEXTPROP)) + (* ; "Edited 12-Dec-2024 20:51 by rmk") + (* ; "Edited 11-Dec-2024 17:11 by rmk") + (* ; "Edited 9-Dec-2024 20:11 by rmk") + (* ; "Edited 13-Aug-2024 08:49 by rmk") + (* ; "Edited 31-Jul-2024 00:04 by rmk") + (* ; "Edited 7-Apr-2024 17:21 by rmk") + (* ; "Edited 16-Jan-2024 22:46 by rmk") + (* ; "Edited 21-Dec-2023 23:54 by rmk") + (* ; "Edited 19-Dec-2023 10:13 by rmk") + (* ; "Edited 25-Nov-2023 23:21 by rmk") + (* ; "Edited 24-Aug-2023 15:05 by rmk") + (* ; "Edited 20-Feb-2022 12:42 by larry") + (* ; "Edited 30-May-91 20:25 by jds") + + (* ;; "Read one CHARLOOKS from FILE. This gets and then sets the file pointer, based on the stored length. But that won't work if the file is not random access. Maybe that's not necessary?") + + (* ;; "TEXTOBJ only for printing in the local promptwindow, if necessary.") + + (PROG* ((LOOKS (create CHARLOOKS)) + (FILEPOS (GETFILEPTR FILE)) + (LOOKSLEN (\WIN FILE)) + FONT NAME FACE SIZE SUPER PROPS STYLESTR) + (SETQ NAME (\ARBIN FILE)) (* ; "The font name") + (SETQ SIZE (\WIN FILE)) (* ; "Size of the type, in points") + (SETQ SUPER (\SMALLPIN FILE)) (* ; + "Superscripting distance, could be negative") + (FSETCLOOKS LOOKS CLSTYLE (OR (\ARBIN FILE) + 0)) + (FSETCLOOKS LOOKS CLUSERINFO (\ARBIN FILE)) + (SETQ PROPS (\WIN FILE)) + (with CHARLOOKS LOOKS [SETQ CLSELBEFORE (NOT (ZEROP (LOGAND 8192 PROPS] + [SETQ CLUNBREAKABLE (NOT (ZEROP (LOGAND 4096 PROPS] + [SETQ CLLEADER (NOT (ZEROP (LOGAND 2048 PROPS] + [SETQ CLINVERTED (NOT (ZEROP (LOGAND 1024 PROPS] + [SETQ CLBOLD (NOT (ZEROP (LOGAND 512 PROPS] + [SETQ CLITAL (NOT (ZEROP (LOGAND 256 PROPS] + [SETQ CLULINE (NOT (ZEROP (LOGAND 128 PROPS] + [SETQ CLOLINE (NOT (ZEROP (LOGAND 64 PROPS] + [SETQ CLSTRIKE (NOT (ZEROP (LOGAND 32 PROPS] + [SETQ CLSMALLCAP (NOT (ZEROP (LOGAND 16 PROPS] + [SETQ CLPROTECTED (NOT (ZEROP (LOGAND 8 PROPS] + [SETQ CLINVISIBLE (NOT (ZEROP (LOGAND 4 PROPS] + [SETQ CLSELAFTER (NOT (ZEROP (LOGAND 2 PROPS] + [SETQ CLCANCOPY (NOT (ZEROP (LOGAND 1 PROPS] + (SETQ CLSIZE SIZE) + (SETQ CLOFFSET SUPER)) + (SETQ FACE (PACK* (CL:IF (FGETCLOOKS LOOKS CLBOLD) + 'B + 'M) + (CL:IF (FGETCLOOKS LOOKS CLITAL) + 'I + 'R) + 'R)) + (if (LISTP NAME) + then (* ; + "This was a font class. Restore it.") + (SETQ FONT (FONTCLASS (pop NAME) + NAME)) + elseif (OR (NOT NAME) + (ZEROP SIZE)) + then + (* ;; "This was a test in the original, seems bogus") + + elseif (SETQ FONT (FONTCREATE NAME SIZE FACE NIL NIL T)) + elseif [AND (EQ SIZE 13) + (SETQ FONT (FONTCREATE NAME 10 FACE NIL NIL T)) + (SELECTQ (STREAMPROP FILE 'COERCEFONT) + (YES T) + (NO NIL) + (SELECTQ [U-CASE (MKATOM (CL:IF TEXTOBJ + (TEDIT.GETINPUT TEXTOBJ + "Change font size 13 to 10 ? ") + (ASKUSER NIL NIL + "Change font size 13 to 10 ? "))] + ((Y YES) + (STREAMPROP FILE 'COERCEFONT 'YES) + T) + (PROGN (STREAMPROP FILE 'COERCEFONT 'NO) + NIL] + then + (* ;; "A hack to deal with files that have CR-LF corruption") + + (SETQ SIZE 10) + (FSETCLOOKS LOOKS CLSIZE 10) + else (SETQ FONT (FONTCREATE NAME SIZE FACE))) + (FSETCLOOKS LOOKS CLNAME (if (type? FONTCLASS FONT) + then + (* ;; + "Put the display family in the CLNAME spot. Better than NIL.") + + (CL:WHEN [SETQ NAME (FONTCOPY FONT + '(DEVICE DISPLAY NOERROR T] + (FONTPROP NAME 'FAMILY)) + else NAME)) + (FSETCLOOKS LOOKS CLFONT FONT) + (SETFILEPTR FILE (IPLUS FILEPOS LOOKSLEN)) + (RETURN LOOKS]) +) + +(MOVD 'CR-LF-FONTFIX '\TEDIT.GET.SINGLE.CHARLOOKS) + +[XCL:REINSTALL-ADVICE 'ELT :BEFORE '((:LAST (CL:WHEN (AND (EQ N 13) + (ILESSP (ARRAYSIZE A) + 13)) + (SETQ N 10] + +(READVISE ELT) +(DECLARE%: DONTCOPY + (FILEMAP (NIL (912 2760 (CRLFSWAP 922 . 1990) (CHANGEPLEN 1992 . 2758)) (2761 9403 (CR-LF-FONTFIX 2771 + . 9401))))) +STOP diff --git a/library/tedit/TEDIT-FIXFILES.LCOM b/library/tedit/TEDIT-FIXFILES.LCOM new file mode 100644 index 00000000..c8396a9f Binary files /dev/null and b/library/tedit/TEDIT-FIXFILES.LCOM differ diff --git a/library/tedit/TEDIT-HISTORY b/library/tedit/TEDIT-HISTORY index cb7da339..7d6024dc 100644 --- a/library/tedit/TEDIT-HISTORY +++ b/library/tedit/TEDIT-HISTORY @@ -1,14 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 1-Aug-2025 14:58:56"  -{DSK}kaplan>Local>medley3.5>working-medley>library>tedit>TEDIT-HISTORY.;252 59126 +(FILECREATED "19-Feb-2026 12:39:37" {WMEDLEY}tedit>TEDIT-HISTORY.;253 59143 :EDIT-BY rmk - :CHANGES-TO (FNS \TEDIT.UNDO.CHARLOOKS) + :CHANGES-TO (FNS \TEDIT.UNDO1) - :PREVIOUS-DATE "28-Jul-2025 23:47:41" -{DSK}kaplan>Local>medley3.5>working-medley>library>tedit>TEDIT-HISTORY.;251) + :PREVIOUS-DATE " 1-Aug-2025 14:58:56" {WMEDLEY}tedit>TEDIT-HISTORY.;252) (PRETTYCOMPRINT TEDIT-HISTORYCOMS) @@ -407,7 +405,8 @@ (\TEDIT.SHOWSEL SEL T TSTREAM]) (\TEDIT.UNDO1 - [LAMBDA (TSTREAM EVENT) (* ; "Edited 6-Apr-2025 14:42 by rmk") + [LAMBDA (TSTREAM EVENT) (* ; "Edited 19-Feb-2026 12:39 by rmk") + (* ; "Edited 6-Apr-2025 14:42 by rmk") (* ; "Edited 1-Apr-2025 21:22 by rmk") (* ; "Edited 28-Mar-2025 14:22 by rmk") (* ; "Edited 16-Mar-2025 18:46 by rmk") @@ -457,7 +456,7 @@ (COND (UNDOFN - (* ;; "TEDIT.HISTORY.TYPELST is an ALST of form (type redofn undofn)") + (* ;; "TEDIT.HISTORY.TYPELST is an ALST of form (type redofn undofn)") (APPLY* UNDOFN TSTREAM EVENT (GETTH EVENT THLEN) (GETTH EVENT THCH#) @@ -920,15 +919,15 @@ (\TEDIT.THELP 'Redo-composite]) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (5022 6043 (\TEDIT.HISTORYEVENT.DEFPRINT 5032 . 6041)) (7133 18387 (\TEDIT.HISTORYADD -7143 . 12405) (\TEDIT.HISTORYADD.COMPOSITE 12407 . 13439) (\TEDIT.CUMULATE.EVENTS 13441 . 15035) ( -\TEDIT.COMPOSITE.EVENT 15037 . 15773) (\TEDIT.HISTORY.PROP 15775 . 17138) (\TEDIT.HISTORY.EVENT 17140 - . 18211) (\TEDIT.POPEVENT 18213 . 18385)) (18440 37427 (TEDIT.UNDO 18450 . 23326) (\TEDIT.UNDO1 23328 - . 27666) (TEDIT.REDO 27668 . 34581) (\TEDIT.UNDO.UNDO 34583 . 37425)) (37428 56129 ( -\TEDIT.UNDO.INSERT 37438 . 38563) (\TEDIT.UNDO.DELETE 38565 . 39577) (\TEDIT.UNDO.MOVE 39579 . 41232) -(\TEDIT.UNDO.REPLACE 41234 . 42744) (\TEDIT.UNDO.CHARLOOKS 42746 . 48209) (\TEDIT.UNDO.PARALOOKS 48211 - . 52040) (\TEDIT.UNDO.PAGELOOKS 52042 . 52600) (\TEDIT.UNDO.COMPOSITE 52602 . 54202) ( -\TEDIT.UNDO.REPLACECODE 54204 . 54538) (\TEDIT.UNDO.WRAP 54540 . 55469) (\TEDIT.UNDO.SEL 55471 . 56127 -)) (56130 59103 (\TEDIT.REDO.INSERT 56140 . 57102) (\TEDIT.REDO.REPLACE 57104 . 58710) ( -\TEDIT.REDO.COMPOSITE 58712 . 59101))))) + (FILEMAP (NIL (4931 5952 (\TEDIT.HISTORYEVENT.DEFPRINT 4941 . 5950)) (7042 18296 (\TEDIT.HISTORYADD +7052 . 12314) (\TEDIT.HISTORYADD.COMPOSITE 12316 . 13348) (\TEDIT.CUMULATE.EVENTS 13350 . 14944) ( +\TEDIT.COMPOSITE.EVENT 14946 . 15682) (\TEDIT.HISTORY.PROP 15684 . 17047) (\TEDIT.HISTORY.EVENT 17049 + . 18120) (\TEDIT.POPEVENT 18122 . 18294)) (18349 37444 (TEDIT.UNDO 18359 . 23235) (\TEDIT.UNDO1 23237 + . 27683) (TEDIT.REDO 27685 . 34598) (\TEDIT.UNDO.UNDO 34600 . 37442)) (37445 56146 ( +\TEDIT.UNDO.INSERT 37455 . 38580) (\TEDIT.UNDO.DELETE 38582 . 39594) (\TEDIT.UNDO.MOVE 39596 . 41249) +(\TEDIT.UNDO.REPLACE 41251 . 42761) (\TEDIT.UNDO.CHARLOOKS 42763 . 48226) (\TEDIT.UNDO.PARALOOKS 48228 + . 52057) (\TEDIT.UNDO.PAGELOOKS 52059 . 52617) (\TEDIT.UNDO.COMPOSITE 52619 . 54219) ( +\TEDIT.UNDO.REPLACECODE 54221 . 54555) (\TEDIT.UNDO.WRAP 54557 . 55486) (\TEDIT.UNDO.SEL 55488 . 56144 +)) (56147 59120 (\TEDIT.REDO.INSERT 56157 . 57119) (\TEDIT.REDO.REPLACE 57121 . 58727) ( +\TEDIT.REDO.COMPOSITE 58729 . 59118))))) STOP diff --git a/library/tedit/TEDIT-HISTORY.LCOM b/library/tedit/TEDIT-HISTORY.LCOM index f0117009..6b69e32c 100644 Binary files a/library/tedit/TEDIT-HISTORY.LCOM and b/library/tedit/TEDIT-HISTORY.LCOM differ diff --git a/library/tedit/TEDIT-LOOKS b/library/tedit/TEDIT-LOOKS index 07d6e3b3..613a60ed 100644 --- a/library/tedit/TEDIT-LOOKS +++ b/library/tedit/TEDIT-LOOKS @@ -1,12 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "16-Feb-2026 00:36:00" {WMEDLEY}TEDIT>TEDIT-LOOKS.;467 155443 +(FILECREATED "10-Apr-2026 09:34:11" {WMEDLEY}tedit>TEDIT-LOOKS.;469 155253 :EDIT-BY rmk :CHANGES-TO (FNS \TEDIT.MCCS.TRANSLATE) - :PREVIOUS-DATE "10-Feb-2026 11:07:12" {WMEDLEY}tedit>TEDIT-LOOKS.;465) + :PREVIOUS-DATE " 9-Apr-2026 17:25:54" {WMEDLEY}tedit>TEDIT-LOOKS.;468) (PRETTYCOMPRINT TEDIT-LOOKSCOMS) @@ -924,7 +924,8 @@ (DEFINEQ (\TEDIT.MCCS.TRANSLATE - [LAMBDA (TSTREAM) (* ; "Edited 16-Feb-2026 00:35 by rmk") + [LAMBDA (TSTREAM) (* ; "Edited 10-Apr-2026 09:34 by rmk") + (* ; "Edited 16-Feb-2026 00:35 by rmk") (* ; "Edited 6-Oct-2025 20:50 by rmk") (* ; "Edited 5-Oct-2025 10:57 by rmk") (* ; "Edited 25-Sep-2025 21:30 by rmk") @@ -972,14 +973,9 @@ THINSTRING.PTYPE)) (FSETPC PC PCONTENTS STRING) (FSETPC PC PFPOS NIL) - (FSETPC PC PBINABLE (NOT FAT)) (FSETPC PC PBYTESPERCHAR (CL:IF FAT 2 1)) - (FSETPC PC PBYTELEN (CL:IF FAT - (UNFOLD (PLEN PC) - 2) - (PLEN PC))) (CL:UNLESS (EQ 'MCCS (fetch (FONTDESCRIPTOR FONTCHARENCODING) of CLFONT)) (* ;; @@ -2472,18 +2468,18 @@ \TEDIT.UNPARSE.CHARLOOKS.LIST 40951 . 44445) (\TEDIT.MODIFYLOOKS 44447 . 46607) (TEDIT.NEW.FONT 46609 . 47056) (\TEDIT.CARETLOOKS.VERIFY 47058 . 47895) (\TEDIT.CARETPIECE 47897 . 48202) ( \TEDIT.GET.INSERT.CHARLOOKS 48204 . 51251) (\TEDIT.GET.TERMSA.WIDTHS 51253 . 51669) ( -\TEDIT.PARSE.CHARLOOKS.LIST 51671 . 52871)) (52874 64879 (\TEDIT.MCCS.TRANSLATE 52884 . 58615) ( -\TEDIT.CONVERT.TO.FORMATTED 58617 . 64877)) (65751 73088 (\TEDIT.UNIQUIFY.CHARLOOKS 65761 . 67421) ( -\TEDIT.UNIQUIFY.PARALOOKS 67423 . 68690) (\TEDIT.UNIQUIFY.ALL 68692 . 70780) ( -\TEDIT.FLUSH.UNUSED.LOOKS 70782 . 73086)) (73121 85079 (TEDIT.LOOKS 73131 . 75520) (TEDIT.GET.LOOKS -75522 . 77857) (TEDIT.SUBLOOKS 77859 . 82239) (TEDIT.FINDLOOKS 82241 . 85077)) (85080 114853 ( -\TEDIT.CHANGE.CHARLOOKS 85090 . 93991) (\TEDIT.CHANGE.CHARLOOKS.NEW 93993 . 97808) ( -\TEDIT.CHARLOOKS.CHANGE.FONT 97810 . 106117) (\TEDIT.FONT.NEXTSIZE 106119 . 107740) (\TEDIT.LOOKS -107742 . 111071) (\TEDIT.FONTCOPY 111073 . 112574) (\TEDIT.COERCE.FONTCLASS 112576 . 113727) ( -\TEDIT.FONTCLASS.TO.FONT 113729 . 114851)) (114896 146785 (\TEDIT.EQFMTSPEC 114906 . 118121) ( -TEDIT.GET.PARALOOKS 118123 . 122170) (\TEDIT.PARSE.PARALOOKS.LIST 122172 . 130205) (TEDIT.PARALOOKS -130207 . 131247) (\TEDIT.CHANGE.PARALOOKS 131249 . 138458) (\TEDIT.CHANGE.PARALOOKS.NEW 138460 . -142443) (TEDIT.COPY.PARALOOKS 142445 . 145119) (\TEDIT.PARABOUNDS 145121 . 146783)) (146845 154561 ( -TEDIT.SUBPARALOOKS 146855 . 150957) (SAMEPARALOOKS 150959 . 154559)) (154562 155249 ( -\TEDIT.MARK.REVISION 154572 . 155247))))) +\TEDIT.PARSE.CHARLOOKS.LIST 51671 . 52871)) (52874 64689 (\TEDIT.MCCS.TRANSLATE 52884 . 58425) ( +\TEDIT.CONVERT.TO.FORMATTED 58427 . 64687)) (65561 72898 (\TEDIT.UNIQUIFY.CHARLOOKS 65571 . 67231) ( +\TEDIT.UNIQUIFY.PARALOOKS 67233 . 68500) (\TEDIT.UNIQUIFY.ALL 68502 . 70590) ( +\TEDIT.FLUSH.UNUSED.LOOKS 70592 . 72896)) (72931 84889 (TEDIT.LOOKS 72941 . 75330) (TEDIT.GET.LOOKS +75332 . 77667) (TEDIT.SUBLOOKS 77669 . 82049) (TEDIT.FINDLOOKS 82051 . 84887)) (84890 114663 ( +\TEDIT.CHANGE.CHARLOOKS 84900 . 93801) (\TEDIT.CHANGE.CHARLOOKS.NEW 93803 . 97618) ( +\TEDIT.CHARLOOKS.CHANGE.FONT 97620 . 105927) (\TEDIT.FONT.NEXTSIZE 105929 . 107550) (\TEDIT.LOOKS +107552 . 110881) (\TEDIT.FONTCOPY 110883 . 112384) (\TEDIT.COERCE.FONTCLASS 112386 . 113537) ( +\TEDIT.FONTCLASS.TO.FONT 113539 . 114661)) (114706 146595 (\TEDIT.EQFMTSPEC 114716 . 117931) ( +TEDIT.GET.PARALOOKS 117933 . 121980) (\TEDIT.PARSE.PARALOOKS.LIST 121982 . 130015) (TEDIT.PARALOOKS +130017 . 131057) (\TEDIT.CHANGE.PARALOOKS 131059 . 138268) (\TEDIT.CHANGE.PARALOOKS.NEW 138270 . +142253) (TEDIT.COPY.PARALOOKS 142255 . 144929) (\TEDIT.PARABOUNDS 144931 . 146593)) (146655 154371 ( +TEDIT.SUBPARALOOKS 146665 . 150767) (SAMEPARALOOKS 150769 . 154369)) (154372 155059 ( +\TEDIT.MARK.REVISION 154382 . 155057))))) STOP diff --git a/library/tedit/TEDIT-LOOKS.LCOM b/library/tedit/TEDIT-LOOKS.LCOM index 6b163d52..efcb9581 100644 Binary files a/library/tedit/TEDIT-LOOKS.LCOM and b/library/tedit/TEDIT-LOOKS.LCOM differ diff --git a/library/tedit/TEDIT-MENU b/library/tedit/TEDIT-MENU index 5a14b140..931fc43b 100644 --- a/library/tedit/TEDIT-MENU +++ b/library/tedit/TEDIT-MENU @@ -1,12 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED " 9-Feb-2026 09:10:43" {WMEDLEY}tedit>TEDIT-MENU.;510 183027 +(FILECREATED "29-Apr-2026 15:35:33" {MEDLEY}TEDIT>TEDIT-MENU.;512 183159 :EDIT-BY rmk - :CHANGES-TO (FNS \TEDIT.PAGEMENU.CREATE) + :CHANGES-TO (FNS \TEDIT.SHOW.PAGELOOKS) - :PREVIOUS-DATE "27-Jan-2026 10:42:09" {WMEDLEY}tedit>TEDIT-MENU.;508) + :PREVIOUS-DATE " 9-Feb-2026 09:10:43" {MEDLEY}TEDIT>TEDIT-MENU.;510) (PRETTYCOMPRINT TEDIT-MENUCOMS) @@ -2525,7 +2525,8 @@ 'PAGE))]) (\TEDIT.SHOW.PAGELOOKS - [LAMBDA (OBJ MENUSEL MENUWINDOW MENUSTREAM) (* ; "Edited 20-Apr-2025 23:41 by rmk") + [LAMBDA (OBJ MENUSEL MENUWINDOW MENUSTREAM) (* ; "Edited 29-Apr-2026 15:35 by rmk") + (* ; "Edited 20-Apr-2025 23:41 by rmk") (* ; "Edited 22-Oct-2024 11:04 by rmk") (* ; "Edited 20-Oct-2024 17:32 by rmk") (* ; "Edited 29-Sep-2024 15:10 by rmk") @@ -2538,19 +2539,18 @@ (* ;; "OBJ is unused, presumably to have a standard interface with other menu functions that update image objects.") - (PROG [(PAGEID (MB.GET 'PAGEID MENUSTREAM 'STATE] - (CL:WHEN (MEMB PAGEID '(NIL OFF)) - (TEDIT.PROMPTPRINT MENUWINDOW "Please specify the page-type" T T) - (RETURN)) - (RESETLST - (TEDIT.DEFER.UPDATES MENUSTREAM) - (\TEDIT.PAGEMENU.FILLIN MENUSTREAM (\TEDIT.PAGEREGION.UNPARSE (\TEDIT.MAINSTREAM + (LET [(PAGEID (MB.GET 'PAGEID MENUSTREAM 'STATE] + (if (MEMB PAGEID '(NIL OFF)) + then (TEDIT.PROMPTPRINT MENUWINDOW "Please specify the page-type" T T) + else (RESETLST + (TEDIT.DEFER.UPDATES MENUSTREAM) + (\TEDIT.PAGEMENU.FILLIN MENUSTREAM (\TEDIT.PAGEREGION.UNPARSE (\TEDIT.MAINSTREAM MENUSTREAM) - PAGEID))) - (FSETSEL MENUSEL ONFLG T) - (\TEDIT.UPDATE.SEL MENUSEL 1 0 'LEFT) - (\TEDIT.FIXSEL MENUSEL MENUSTREAM) - (TEDIT.BACKTOMAIN MENUSTREAM]) + PAGEID))) + (FSETSEL MENUSEL ONFLG T) + (\TEDIT.UPDATE.SEL MENUSEL 1 0 'LEFT) + (\TEDIT.FIXSEL MENUSEL MENUSTREAM)) + (TEDIT.BACKTOMAIN MENUSTREAM]) (\TEDIT.PAGEMENU.FILLIN [LAMBDA (MENUSTREAM PAGELOOKS) (* ; "Edited 29-Sep-2024 12:53 by rmk") @@ -2899,32 +2899,32 @@ (ADDTOVAR LAMA ) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4936 16574 (TEDIT.ADD.MENUITEM 4946 . 7063) (TEDIT.DEFAULT.MENUFN 7065 . 13786) ( -TEDIT.REMOVE.MENUITEM 13788 . 14785) (\TEDIT.CREATEMENU 14787 . 15352) (\TEDIT.MENU.WHENHELDFN 15354 - . 16259) (\TEDIT.MENU.WHENSELECTEDFN 16261 . 16572)) (17388 65423 (DRAWMARGINSCALE 17398 . 20857) ( -MARGINBAR 20859 . 27984) (MARGINBAR.CREATE 27986 . 32184) (MB.MARGINBAR.BUTTONEVENTINFN 32186 . 39988) - (MB.MARGINBAR.SELFN.TABS 39990 . 45230) (MB.MARGINBAR.SELFN.TABS.KIND 45232 . 46167) ( -MARGINBAR.GETSTATEFN 46169 . 50156) (MARGINBAR.SETSTATEFN 50158 . 50368) (MARGINBAR.NEUTRALIZE 50370 - . 51045) (MARGINBAR.LOOKS 51047 . 54153) (MB.MARGINBAR.SIZEFN 54155 . 54941) (MB.MARGINBAR.DISPLAYFN -54943 . 58004) (MDESCALE 58006 . 58546) (MSCALE 58548 . 58878) (MB.MARGINBAR.SHOWTAB 58880 . 61203) ( -MB.MARGINBAR.TABTRACK 61205 . 62590) (MARGINBAR.INIT 62592 . 63985) (\TEDIT.PARALOOKS.TO.MARBAR 63987 - . 65421)) (66248 73530 (TEDIT.MENUSTREAM 66258 . 67258) (TEDITMENUP 67260 . 68229) (\TEDIT.MENU.START - 68231 . 72578) (\TEDIT.MENU.OPEN? 72580 . 72954) (\TEDIT.MENU.BUTTONEVENTFN 72956 . 73528)) (73849 -81900 (\TEDIT.MENU.CREATE 73859 . 75799) (\TEDIT.MENU.PARSE 75801 . 79490) (\TEDIT.MENU.NEUTRALIZE -79492 . 81563) (\TEDITMENU.RECORD.UNFORMATTED 81565 . 81898)) (81966 101368 ( -\TEDIT.EXPANDEDMENU.CREATE 81976 . 87654) (\TEDIT.EXPANDEDMENU.START 87656 . 89280) ( -\TEDIT.EXPANDEDMENU.FN 89282 . 92537) (\TEDIT.EXPANDEDMENU.ACTIONFN 92539 . 101366)) (101430 120855 ( -\TEDIT.PARAMENU.CREATE 101440 . 110171) (\TEDIT.PARAMENU.START 110173 . 111427) ( -\TEDIT.APPLY.PARALOOKS 111429 . 112481) (\TEDIT.SHOW.PARALOOKS 112483 . 115200) ( -\TEDIT.PARAMENU.FILLIN 115202 . 119951) (\TEDIT.PARAMENU.RESHAPEFN 119953 . 120853)) (121049 147891 ( -\TEDIT.CHARMENU.CREATE 121059 . 123663) (\TEDIT.CHARMENU.START 123665 . 124955) (\TEDIT.CHARMENU.SPEC -124957 . 129640) (\TEDIT.CHARMENU.PARSE 129642 . 132810) (\TEDIT.CHARMENU.FILLIN 132812 . 137442) ( -\TEDIT.SHOW.CHARLOOKS 137444 . 140989) (\TEDIT.APPLY.CHARLOOKS 140991 . 142152) ( -\TEDIT.OFFSETTYPE.STATEFN 142154 . 144117) (\TEDIT.OTHER.STATECHANGEFN 144119 . 145764) ( -\TEDIT.OTHER.SELECTFN 145766 . 147889)) (147953 177067 (\TEDIT.PAGEMENU.CREATE 147963 . 156484) ( -\TEDIT.PAGEMENU.START 156486 . 156837) (\TEDIT.SHOW.PAGELOOKS 156839 . 158725) (\TEDIT.PAGEMENU.FILLIN - 158727 . 160277) (\TEDIT.PAGEREGION.UNPARSE 160279 . 169678) (\TEDIT.APPLY.PAGELOOKS 169680 . 171607) - (\TEDIT.CHANGE.PAGELOOKS 171609 . 176223) (\TEDIT.PAGEMENU.CHARLOOKS.STATEFN 176225 . 177065)) ( -177068 182871 (\TEDIT.PAGEMENU.CREATE.HEADINGS 177078 . 179890) (\TEDIT.PAGEMENU.HEADINGS.SETSTATEFN -179892 . 181317) (\TEDIT.PAGEMENU.HEADINGS.STATEFN 181319 . 182869))))) + (FILEMAP (NIL (4933 16571 (TEDIT.ADD.MENUITEM 4943 . 7060) (TEDIT.DEFAULT.MENUFN 7062 . 13783) ( +TEDIT.REMOVE.MENUITEM 13785 . 14782) (\TEDIT.CREATEMENU 14784 . 15349) (\TEDIT.MENU.WHENHELDFN 15351 + . 16256) (\TEDIT.MENU.WHENSELECTEDFN 16258 . 16569)) (17385 65420 (DRAWMARGINSCALE 17395 . 20854) ( +MARGINBAR 20856 . 27981) (MARGINBAR.CREATE 27983 . 32181) (MB.MARGINBAR.BUTTONEVENTINFN 32183 . 39985) + (MB.MARGINBAR.SELFN.TABS 39987 . 45227) (MB.MARGINBAR.SELFN.TABS.KIND 45229 . 46164) ( +MARGINBAR.GETSTATEFN 46166 . 50153) (MARGINBAR.SETSTATEFN 50155 . 50365) (MARGINBAR.NEUTRALIZE 50367 + . 51042) (MARGINBAR.LOOKS 51044 . 54150) (MB.MARGINBAR.SIZEFN 54152 . 54938) (MB.MARGINBAR.DISPLAYFN +54940 . 58001) (MDESCALE 58003 . 58543) (MSCALE 58545 . 58875) (MB.MARGINBAR.SHOWTAB 58877 . 61200) ( +MB.MARGINBAR.TABTRACK 61202 . 62587) (MARGINBAR.INIT 62589 . 63982) (\TEDIT.PARALOOKS.TO.MARBAR 63984 + . 65418)) (66245 73527 (TEDIT.MENUSTREAM 66255 . 67255) (TEDITMENUP 67257 . 68226) (\TEDIT.MENU.START + 68228 . 72575) (\TEDIT.MENU.OPEN? 72577 . 72951) (\TEDIT.MENU.BUTTONEVENTFN 72953 . 73525)) (73846 +81897 (\TEDIT.MENU.CREATE 73856 . 75796) (\TEDIT.MENU.PARSE 75798 . 79487) (\TEDIT.MENU.NEUTRALIZE +79489 . 81560) (\TEDITMENU.RECORD.UNFORMATTED 81562 . 81895)) (81963 101365 ( +\TEDIT.EXPANDEDMENU.CREATE 81973 . 87651) (\TEDIT.EXPANDEDMENU.START 87653 . 89277) ( +\TEDIT.EXPANDEDMENU.FN 89279 . 92534) (\TEDIT.EXPANDEDMENU.ACTIONFN 92536 . 101363)) (101427 120852 ( +\TEDIT.PARAMENU.CREATE 101437 . 110168) (\TEDIT.PARAMENU.START 110170 . 111424) ( +\TEDIT.APPLY.PARALOOKS 111426 . 112478) (\TEDIT.SHOW.PARALOOKS 112480 . 115197) ( +\TEDIT.PARAMENU.FILLIN 115199 . 119948) (\TEDIT.PARAMENU.RESHAPEFN 119950 . 120850)) (121046 147888 ( +\TEDIT.CHARMENU.CREATE 121056 . 123660) (\TEDIT.CHARMENU.START 123662 . 124952) (\TEDIT.CHARMENU.SPEC +124954 . 129637) (\TEDIT.CHARMENU.PARSE 129639 . 132807) (\TEDIT.CHARMENU.FILLIN 132809 . 137439) ( +\TEDIT.SHOW.CHARLOOKS 137441 . 140986) (\TEDIT.APPLY.CHARLOOKS 140988 . 142149) ( +\TEDIT.OFFSETTYPE.STATEFN 142151 . 144114) (\TEDIT.OTHER.STATECHANGEFN 144116 . 145761) ( +\TEDIT.OTHER.SELECTFN 145763 . 147886)) (147950 177199 (\TEDIT.PAGEMENU.CREATE 147960 . 156481) ( +\TEDIT.PAGEMENU.START 156483 . 156834) (\TEDIT.SHOW.PAGELOOKS 156836 . 158857) (\TEDIT.PAGEMENU.FILLIN + 158859 . 160409) (\TEDIT.PAGEREGION.UNPARSE 160411 . 169810) (\TEDIT.APPLY.PAGELOOKS 169812 . 171739) + (\TEDIT.CHANGE.PAGELOOKS 171741 . 176355) (\TEDIT.PAGEMENU.CHARLOOKS.STATEFN 176357 . 177197)) ( +177200 183003 (\TEDIT.PAGEMENU.CREATE.HEADINGS 177210 . 180022) (\TEDIT.PAGEMENU.HEADINGS.SETSTATEFN +180024 . 181449) (\TEDIT.PAGEMENU.HEADINGS.STATEFN 181451 . 183001))))) STOP diff --git a/library/tedit/TEDIT-MENU.LCOM b/library/tedit/TEDIT-MENU.LCOM index 4e14a98a..d3c531af 100644 Binary files a/library/tedit/TEDIT-MENU.LCOM and b/library/tedit/TEDIT-MENU.LCOM differ diff --git a/library/tedit/TEDIT-OLDFILE b/library/tedit/TEDIT-OLDFILE index 06e8ac8a..42229cf4 100644 --- a/library/tedit/TEDIT-OLDFILE +++ b/library/tedit/TEDIT-OLDFILE @@ -1,12 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED " 8-Sep-2025 22:10:10" {WMEDLEY}TEDIT>TEDIT-OLDFILE.;40 73888 +(FILECREATED "10-Apr-2026 09:29:21" {WMEDLEY}tedit>TEDIT-OLDFILE.;45 73241 :EDIT-BY rmk - :CHANGES-TO (FNS \TEDIT.GET.PCTB2) + :CHANGES-TO (FNS \TEDIT.GET.PCTB2 \TEDIT.GET.PCTB1 \TEDIT.GET.PCTB0) - :PREVIOUS-DATE " 7-Sep-2025 11:07:57" {WMEDLEY}TEDIT>TEDIT-OLDFILE.;39) + :PREVIOUS-DATE "10-Apr-2026 00:16:32" {WMEDLEY}tedit>TEDIT-OLDFILE.;41) (PRETTYCOMPRINT TEDIT-OLDFILECOMS) @@ -46,23 +46,18 @@ (DEFINEQ (\TEDIT.GET.PCTB2 - [LAMBDA (TEXT TSTREAM PCCOUNT START END) (* ; "Edited 8-Sep-2025 22:08 by rmk") + [LAMBDA (TEXT TSTREAM PCCOUNT START END) (* ; "Edited 10-Apr-2026 09:28 by rmk") + (* ; "Edited 8-Sep-2025 22:08 by rmk") (* ; "Edited 1-Aug-2025 14:55 by rmk") (* ; "Edited 28-Jul-2025 23:39 by rmk") (* ; "Edited 8-Feb-2025 20:21 by rmk") (* ; "Edited 21-Oct-2024 00:33 by rmk") (* ; "Edited 29-Apr-2024 10:28 by rmk") (* ; "Edited 20-Mar-2024 11:00 by rmk") - (* ; "Edited 17-Mar-2024 12:41 by rmk") - (* ; "Edited 15-Mar-2024 14:37 by rmk") (* ; "Edited 21-Jan-2024 10:21 by rmk") - (* ; "Edited 13-Jan-2024 12:09 by rmk") - (* ; "Edited 19-Dec-2023 10:13 by rmk") (* ; "Edited 25-Nov-2023 23:18 by rmk") - (* ; "Edited 8-Nov-2023 13:48 by rmk") (* ; "Edited 4-Oct-2022 16:58 by rmk") (* ; "Edited 8-Sep-2022 23:06 by rmk") - (* ; "Edited 5-Sep-2022 21:33 by rmk") (* ; "Edited 4-May-93 16:27 by jds") (* ;; "READ OBSOLETE FORMATS OF TEDIT FILE") @@ -80,8 +75,7 @@ (SETQ PIECEINFOCH# (\DWIN TEXT)) (SETFILEPTR TEXT PIECEINFOCH#) (bind PC TYPECODE PCLEN OLDPC (DEFAULTCHARLOOKS _ (FGETTOBJ TEXTOBJ DEFAULTCHARLOOKS)) - (OLDPARALOOKS _ (FGETTOBJ TEXTOBJ DEFAULTPARALOOKS)) - (SBINABLE _ (fetch (STREAM BINABLE) of TEXT)) for I from 1 to PCCOUNT + (OLDPARALOOKS _ (FGETTOBJ TEXTOBJ DEFAULTPARALOOKS)) for I from 1 to PCCOUNT do (SETQ PC NIL) (* ;  "This loop may not really read a piece, so we have to distinguish that case.") (SETQ PCLEN (\DWIN TEXT)) @@ -131,37 +125,35 @@ (create PIECE PCONTENTS _ TEXT PFPOS _ CURFILECH# - PBYTELEN _ PCLEN PLEN _ PCLEN PPARALOOKS _ OLDPARALOOKS PTYPE _ THINFILE.PTYPE PBYTESPERCHAR _ 1)) (* ; "Build the new piece") (\TEDIT.GET.CHARLOOKS2 PC TEXT LOOKSHASH) - (CL:WHEN (EQ THINFILE.PTYPE (PTYPE PC)) - (FSETPC PC PBINABLE SBINABLE))(* ; + (* ;  "Read the character looks for this guy.") - (COND - [OLDPC (* ; + (if OLDPC + then (* ;  "If there's a prior piece, hook this one on the chain.") - (COND - ([AND (EQ FATFILE2.PTYPE (PTYPE PC)) - (NOT (EQ FATFILE2.PTYPE (PTYPE OLDPC] - (* ; + (if [AND (EQ FATFILE2.PTYPE (PTYPE PC)) + (NOT (EQ FATFILE2.PTYPE (PTYPE OLDPC] + then (* ;  "Switching from not-fat to fat. Add 3 bytes for the 255-255-0") - (add (PFPOS PC) - 3) - (add CURFILECH# -3)) - ([AND (EQ FATFILE2.PTYPE (PTYPE OLDPC)) - (NOT (EQ FATFILE2.PTYPE (PTYPE PC] - (* ; + (add (PFPOS PC) + 3) + (add CURFILECH# -3) + elseif [AND (EQ FATFILE2.PTYPE (PTYPE OLDPC)) + (NOT (EQ FATFILE2.PTYPE (PTYPE PC] + then (* ;  "Switching from fat to not-fat. Add 3 bytes for the 255-0") - (add (PFPOS PC) - 2] - ((EQ FATFILE2.PTYPE (PTYPE PC)) (* ; + (add (PFPOS PC) + 2)) + elseif (EQ FATFILE2.PTYPE (PTYPE PC)) + then (* ;  "Switching from not-fat to fat. Add 3 bytes for the 255-255-0") - (add (PFPOS PC) - 3) - (add CURFILECH# -3))) (* ; + (add (PFPOS PC) + 3) + (add CURFILECH# -3)) (* ;  "And note the passing of characters.") (add CURFILECH# PCLEN)) (\PieceDescriptorOBJECT (* ; @@ -580,7 +572,8 @@ (DEFINEQ (\TEDIT.GET.PCTB1 - [LAMBDA (TEXT TSTREAM PCCOUNT START END) (* ; "Edited 1-Aug-2025 14:56 by rmk") + [LAMBDA (TEXT TSTREAM PCCOUNT START END) (* ; "Edited 10-Apr-2026 09:25 by rmk") + (* ; "Edited 1-Aug-2025 14:56 by rmk") (* ; "Edited 28-Jul-2025 23:39 by rmk") (* ; "Edited 8-Feb-2025 20:22 by rmk") (* ; "Edited 21-Oct-2024 00:33 by rmk") @@ -612,8 +605,7 @@ (SETQ PIECEINFOCH# (\DWIN TEXT)) (SETFILEPTR TEXT PIECEINFOCH#) (bind PC TYPECODE PCLEN OLDPC (DEFAULTCHARLOOKS _ (FGETTOBJ TEXTOBJ DEFAULTCHARLOOKS)) - (OLDPARALOOKS _ (FGETTOBJ TEXTOBJ DEFAULTPARALOOKS)) - (SBINABLE _ (fetch (STREAM BINABLE) of TEXT)) for I from 1 to PCCOUNT + (OLDPARALOOKS _ (FGETTOBJ TEXTOBJ DEFAULTPARALOOKS)) for I from 1 to PCCOUNT do (SETQ PC NIL) (* ;  "This loop may not really read a piece, so we have to distinguish that case.") (SETQ PCLEN (\DWIN TEXT)) @@ -640,13 +632,11 @@ (create PIECE PCONTENTS _ TEXT PFPOS _ CURFILECH# - PBYTELEN _ PCLEN PLEN _ PCLEN PPARALOOKS _ OLDPARALOOKS PTYPE _ THINFILE.PTYPE PBYTESPERCHAR _ 1)) - (\TEDIT.GET.CHARLOOKS1 PC TEXT) - (FSETPC PC PBINABLE SBINABLE) (* ; + (\TEDIT.GET.CHARLOOKS1 PC TEXT) (* ;  "Read the character looks for this guy.") (add CURFILECH# (PLEN PC)) (* ;  "And note the passing of characters.") @@ -891,7 +881,8 @@ (DEFINEQ (\TEDIT.GET.PCTB0 - [LAMBDA (TEXT TSTREAM PCCOUNT START END) (* ; "Edited 8-Feb-2025 20:22 by rmk") + [LAMBDA (TEXT TSTREAM PCCOUNT START END) (* ; "Edited 10-Apr-2026 09:22 by rmk") + (* ; "Edited 8-Feb-2025 20:22 by rmk") (* ; "Edited 21-Oct-2024 00:33 by rmk") (* ; "Edited 29-Apr-2024 10:27 by rmk") (* ; "Edited 17-Mar-2024 12:41 by rmk") @@ -908,7 +899,7 @@ (LET ((TEXTOBJ (TEXTOBJ! (fetch (TEXTSTREAM TEXTOBJ) of TSTREAM))) OLDPC TYPECODE PCLEN PIECEINFOCH# TSTREAM USERFILEFORMAT USERTEMP (CURFILECH# (OR START 0)) - (SBINABLE (fetch (STREAM BINABLE) of TEXT))) + ) (SETFILEPTR TEXT (IDIFFERENCE (OR END (GETEOFPTR TEXT)) 8)) (SETQ PIECEINFOCH# (\DWIN TEXT)) @@ -924,8 +915,7 @@ PREVPIECE _ OLDPC PPARALOOKS _ DEFAULTPARALOOKS PTYPE _ THINFILE.PTYPE - PBYTESPERCHAR _ 1 - PBINABLE _ SBINABLE)) + PBYTESPERCHAR _ 1)) [COND (OLDPC (FSETPC OLDPC NEXTPIECE PC) (FSETPC PC PPARALOOKS (PPARALOOKS OLDPC] @@ -1100,14 +1090,14 @@ PARALOOKS]) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1649 37832 (\TEDIT.GET.PCTB2 1659 . 12415) (\TEDIT.GET.PARALOOKS2 12417 . 13006) ( -\TEDIT.GET.CHARLOOKS2 13008 . 14565) (\TEDIT.PARSE.PAGEFRAMES2 14567 . 17306) ( -\TEDIT.GET.CHARLOOKS.LIST2 17308 . 17815) (\TEDIT.GET.SINGLE.CHARLOOKS2 17817 . 21176) ( -\TEDIT.PUT.SINGLE.PARALOOKS2 21178 . 25428) (\TEDIT.PUT.SINGLE.CHARLOOKS2 25430 . 29140) ( -\TEDIT.GET.PARALOOKS.LIST2 29142 . 29649) (\TEDIT.GET.SINGLE.PARALOOKS2 29651 . 34550) ( -\TEDIT.PUT.CHARLOOKS.LIST2 34552 . 36631) (\TEDIT.PUT.PARALOOKS.LIST2 36633 . 37830)) (37909 59190 ( -\TEDIT.GET.PCTB1 37919 . 44936) (\TEDIT.GET.PAGEFRAMES1 44938 . 45390) (\TEDIT.PARSE.PAGEFRAMES1 45392 - . 48045) (\TEDIT.GET.CHARLOOKS1 48047 . 52413) (\TEDIT.GET.PARALOOKS1 52415 . 57326) ( -TEDIT.GET.OBJECT1 57328 . 59188)) (59250 73865 (\TEDIT.GET.PCTB0 59260 . 63341) (\TEDIT.GET.CHARLOOKS0 - 63343 . 67783) (\TEDIT.GET.OBJECT0 67785 . 69860) (\TEDIT.GET.PARALOOKS0 69862 . 73863))))) + (FILEMAP (NIL (1683 37235 (\TEDIT.GET.PCTB2 1693 . 11818) (\TEDIT.GET.PARALOOKS2 11820 . 12409) ( +\TEDIT.GET.CHARLOOKS2 12411 . 13968) (\TEDIT.PARSE.PAGEFRAMES2 13970 . 16709) ( +\TEDIT.GET.CHARLOOKS.LIST2 16711 . 17218) (\TEDIT.GET.SINGLE.CHARLOOKS2 17220 . 20579) ( +\TEDIT.PUT.SINGLE.PARALOOKS2 20581 . 24831) (\TEDIT.PUT.SINGLE.CHARLOOKS2 24833 . 28543) ( +\TEDIT.GET.PARALOOKS.LIST2 28545 . 29052) (\TEDIT.GET.SINGLE.PARALOOKS2 29054 . 33953) ( +\TEDIT.PUT.CHARLOOKS.LIST2 33955 . 36034) (\TEDIT.PUT.PARALOOKS.LIST2 36036 . 37233)) (37312 58528 ( +\TEDIT.GET.PCTB1 37322 . 44274) (\TEDIT.GET.PAGEFRAMES1 44276 . 44728) (\TEDIT.PARSE.PAGEFRAMES1 44730 + . 47383) (\TEDIT.GET.CHARLOOKS1 47385 . 51751) (\TEDIT.GET.PARALOOKS1 51753 . 56664) ( +TEDIT.GET.OBJECT1 56666 . 58526)) (58588 73218 (\TEDIT.GET.PCTB0 58598 . 62694) (\TEDIT.GET.CHARLOOKS0 + 62696 . 67136) (\TEDIT.GET.OBJECT0 67138 . 69213) (\TEDIT.GET.PARALOOKS0 69215 . 73216))))) STOP diff --git a/library/tedit/TEDIT-OLDFILE.LCOM b/library/tedit/TEDIT-OLDFILE.LCOM index c5e337db..616d547c 100644 Binary files a/library/tedit/TEDIT-OLDFILE.LCOM and b/library/tedit/TEDIT-OLDFILE.LCOM differ diff --git a/library/tedit/TEDIT-PAGE b/library/tedit/TEDIT-PAGE index 3ed7ebe6..7f72d18a 100644 --- a/library/tedit/TEDIT-PAGE +++ b/library/tedit/TEDIT-PAGE @@ -1,13 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "27-Jan-2026 10:30:27" {WMEDLEY}TEDIT>TEDIT-PAGE.;243 130855 +(FILECREATED " 6-May-2026 22:17:41" {MEDLEY}TEDIT>TEDIT-PAGE.;244 130772 :EDIT-BY rmk - :CHANGES-TO (FNS TEDIT.SINGLE.PAGEFORMAT) - (VARS TEDIT-PAGECOMS) + :CHANGES-TO (FNS TEDIT.TO.IMAGEFILE) - :PREVIOUS-DATE "17-Jan-2026 12:00:08" {WMEDLEY}TEDIT>TEDIT-PAGE.;241) + :PREVIOUS-DATE "27-Jan-2026 10:30:27" {MEDLEY}TEDIT>TEDIT-PAGE.;243) (PRETTYCOMPRINT TEDIT-PAGECOMS) @@ -636,7 +635,8 @@ (DEFINEQ (TEDIT.TO.IMAGEFILE - [LAMBDA (TSTREAM IMAGEFILE IMAGETYPE OPTIONS) (* ; "Edited 17-Jan-2026 11:59 by rmk") + [LAMBDA (TSTREAM IMAGEFILE IMAGETYPE OPTIONS) (* ; "Edited 6-May-2026 22:16 by rmk") + (* ; "Edited 17-Jan-2026 11:59 by rmk") (* ; "Edited 15-Jan-2026 08:46 by rmk") (* ; "Edited 25-Dec-2025 15:07 by rmk") (* ; "Edited 20-Dec-2025 23:03 by rmk") @@ -650,11 +650,9 @@ (RESETLST (SETQ TSTREAM (if (TEXTSTREAM TSTREAM T) - elseif (TEDIT.FORMATTEDFILEP TSTREAM) - then [RESETSAVE (SETQ TSTREAM (OPENTEXTSTREAM TSTREAM)) - `(PROGN (CLOSEF? OLDVALUE] - TSTREAM - else (ERROR TSTREAM "is not a Tedit stream"))) + else [RESETSAVE (SETQ TSTREAM (OPENTEXTSTREAM TSTREAM)) + `(PROGN (CLOSEF? OLDVALUE] + TSTREAM)) (CL:WHEN (GETTEXTPROP TSTREAM 'MENUFLG) (SETQ TSTREAM (TEXTSTREAM (\TEDIT.MAINW TSTREAM)))) (CL:UNLESS IMAGEFILE @@ -2062,18 +2060,18 @@ (RETURN (DREMOVE NIL $$VAL]) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (12248 15860 (\TEDIT.PARSE.PAGEFRAMES 12258 . 14037) (\TEDIT.PUT.PAGEFRAMES 14039 . -14863) (\TEDIT.UNPARSE.PAGEFRAMES 14865 . 15858)) (15923 38091 (TEDIT.SINGLE.PAGEFORMAT 15933 . 27077) - (TEDIT.COMPOUND.PAGEFORMAT 27079 . 28058) (TEDIT.PAGEFORMAT 28060 . 35349) (TEDIT.GET.PAGEFORMAT -35351 . 38089)) (38378 44858 (TEDIT.TO.IMAGEFILE 38388 . 44856)) (45006 98258 (\TEDIT.FORMATBOX 45016 - . 58440) (\TEDIT.FORMATHEADING 58442 . 63088) (\TEDIT.FORMATPAGE 63090 . 72279) (\TEDIT.FORMATTEXTBOX - 72281 . 88794) (\TEDIT.FORMATFOLIO 88796 . 94113) (\TEDIT.FORMAT.FOUNDBOX? 94115 . 96154) ( -\TEDIT.SKIP.SPECIALCOND 96156 . 98256)) (98338 103393 (\TEDIT.HARDCOPY.PAGEHEADINGS 98348 . 103391)) ( -103502 111553 (\TEDIT.HARDCOPY-COLUMN-END 103512 . 111551)) (111598 116539 (SCALEPAGEUNITS 111608 . -112749) (SCALEPAGEXUNITS 112751 . 113521) (SCALEPAGEYUNITS 113523 . 114294) (\TEDIT.PAPERHEIGHT 114296 - . 115231) (\TEDIT.PAPERWIDTH 115233 . 116537)) (116955 120523 (ROMANNUMERALS 116965 . 120521)) ( -120562 127828 (TEDIT.PAGENO.CREATE 120572 . 120948) (\TEDIT.PAGENO.OBJINIT 120950 . 122233) ( -\TEDIT.PAGENO.BUTTONEVENTINFN 122235 . 123301) (\TEDIT.PAGENO.IMAGEBOXFN 123303 . 125453) ( -\TEDIT.PAGENO.DISPLAYFN 125455 . 127105) (\TEDIT.PAGENO.GETFN 127107 . 127499) (\TEDIT.PAGENO.PUTFN -127501 . 127826)) (127893 130832 (\TEDIT.FORMAT.FOOTNOTE 127903 . 130830))))) + (FILEMAP (NIL (12201 15813 (\TEDIT.PARSE.PAGEFRAMES 12211 . 13990) (\TEDIT.PUT.PAGEFRAMES 13992 . +14816) (\TEDIT.UNPARSE.PAGEFRAMES 14818 . 15811)) (15876 38044 (TEDIT.SINGLE.PAGEFORMAT 15886 . 27030) + (TEDIT.COMPOUND.PAGEFORMAT 27032 . 28011) (TEDIT.PAGEFORMAT 28013 . 35302) (TEDIT.GET.PAGEFORMAT +35304 . 38042)) (38331 44775 (TEDIT.TO.IMAGEFILE 38341 . 44773)) (44923 98175 (\TEDIT.FORMATBOX 44933 + . 58357) (\TEDIT.FORMATHEADING 58359 . 63005) (\TEDIT.FORMATPAGE 63007 . 72196) (\TEDIT.FORMATTEXTBOX + 72198 . 88711) (\TEDIT.FORMATFOLIO 88713 . 94030) (\TEDIT.FORMAT.FOUNDBOX? 94032 . 96071) ( +\TEDIT.SKIP.SPECIALCOND 96073 . 98173)) (98255 103310 (\TEDIT.HARDCOPY.PAGEHEADINGS 98265 . 103308)) ( +103419 111470 (\TEDIT.HARDCOPY-COLUMN-END 103429 . 111468)) (111515 116456 (SCALEPAGEUNITS 111525 . +112666) (SCALEPAGEXUNITS 112668 . 113438) (SCALEPAGEYUNITS 113440 . 114211) (\TEDIT.PAPERHEIGHT 114213 + . 115148) (\TEDIT.PAPERWIDTH 115150 . 116454)) (116872 120440 (ROMANNUMERALS 116882 . 120438)) ( +120479 127745 (TEDIT.PAGENO.CREATE 120489 . 120865) (\TEDIT.PAGENO.OBJINIT 120867 . 122150) ( +\TEDIT.PAGENO.BUTTONEVENTINFN 122152 . 123218) (\TEDIT.PAGENO.IMAGEBOXFN 123220 . 125370) ( +\TEDIT.PAGENO.DISPLAYFN 125372 . 127022) (\TEDIT.PAGENO.GETFN 127024 . 127416) (\TEDIT.PAGENO.PUTFN +127418 . 127743)) (127810 130749 (\TEDIT.FORMAT.FOOTNOTE 127820 . 130747))))) STOP diff --git a/library/tedit/TEDIT-PAGE.LCOM b/library/tedit/TEDIT-PAGE.LCOM index e0e57bf5..2e43148c 100644 Binary files a/library/tedit/TEDIT-PAGE.LCOM and b/library/tedit/TEDIT-PAGE.LCOM differ diff --git a/library/tedit/TEDIT-PCTREE b/library/tedit/TEDIT-PCTREE index b31bd75c..1ccfb60f 100644 --- a/library/tedit/TEDIT-PCTREE +++ b/library/tedit/TEDIT-PCTREE @@ -1,13 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "14-Feb-2026 13:22:06" {WMEDLEY}TEDIT>TEDIT-PCTREE.;251 68691 +(FILECREATED " 9-Apr-2026 17:25:38" {WMEDLEY}TEDIT>TEDIT-PCTREE.;252 68540 :EDIT-BY rmk - :CHANGES-TO (VARS TEDIT-PCTREECOMS) - (FNS \TEDIT.UNLINKPIECE \TEDIT.DELETEPIECES) + :CHANGES-TO (FNS \TEDIT.SPLITPIECE) - :PREVIOUS-DATE "28-Jul-2025 23:25:19" {WMEDLEY}TEDIT>TEDIT-PCTREE.;249) + :PREVIOUS-DATE "14-Feb-2026 13:22:06" {WMEDLEY}TEDIT>TEDIT-PCTREE.;251) (PRETTYCOMPRINT TEDIT-PCTREECOMS) @@ -658,7 +657,8 @@ NEW]) (\TEDIT.SPLITPIECE - [LAMBDA (PC CHOFFSET TEXTOBJ) (* ; "Edited 21-Oct-2024 00:33 by rmk") + [LAMBDA (PC CHOFFSET TEXTOBJ) (* ; "Edited 9-Apr-2026 13:22 by rmk") + (* ; "Edited 21-Oct-2024 00:33 by rmk") (* ; "Edited 17-Mar-2024 00:11 by rmk") (* ; "Edited 28-Dec-2023 22:17 by rmk") (* ; "Edited 7-Dec-2023 21:07 by rmk") @@ -680,9 +680,8 @@ (\INSURE.VACANT.BTREESLOT (FGETPC PC PTREENODE) TEXTOBJ) (* ;  "Do this before reducing PC, so tree remains valid") - (LET [(PREVPC (create PIECE using PC PPARALAST _ NIL PLEN _ CHOFFSET PBYTELEN _ - (ITIMES (PBYTESPERCHAR PC) - CHOFFSET] (* ; + (LET ((PREVPC (create PIECE using PC PPARALAST _ NIL PLEN _ CHOFFSET))) + (* ;  "There can be no para break before the split, as things now work.") (* ;; "PREVPC is the prefix before the split point of length CHOFFSET, PC will be the suffix, a shortened version of a piece that was already in the piece tree.") @@ -713,8 +712,6 @@ (change (PLEN PC) (IDIFFERENCE DATUM CHOFFSET)) - (FSETPC PC PBYTELEN (ITIMES (PBYTESPERCHAR PC) - (PLEN PC))) (freplace (BTSLOT DLEN) of (\FINDSLOT (FGETPC PC PTREENODE) PC) with (PLEN PC)) @@ -1104,13 +1101,13 @@ (GLOBALVARS BTVALIDATETAGS) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (8731 56217 (\TEDIT.MAKEPCTB 8741 . 10634) (\TEDIT.UPDATEPCNODES 10636 . 12930) ( -\TEDIT.FIRSTPIECE 12932 . 14339) (\TEDIT.DELETETREE 14341 . 17615) (\TEDIT.INSERTTREE 17617 . 20362) ( -\TEDIT.LASTPIECE 20364 . 21171) (\TEDIT.PCTOCH 21173 . 23270) (\TEDIT.CHTOPC 23272 . 29449) ( -\TEDIT.SET-TOTLEN 29451 . 30239) (\TEDIT.MAKE.VACANT.BTREESLOT 30241 . 36971) (\TEDIT.LINKNEWPIECE -36973 . 38562) (\TEDIT.SPLITPIECE 38564 . 43220) (\TEDIT.INSERTPIECE 43222 . 46494) ( -\TEDIT.INSERTPIECES 46496 . 49588) (\TEDIT.DELETEPIECES 49590 . 54100) (\TEDIT.ALIGNEDPIECE 54102 . -56215)) (56245 68568 (\TEDIT.BTVALIDATE 56255 . 57796) (\TEDIT.BTVALIDATE.PRINT 57798 . 59163) ( -\TEDIT.CHECK-BTREE 59165 . 61492) (\TEDIT.CHECK-BTREE1 61494 . 67125) (\TEDIT.BTFAIL 67127 . 67549) ( -\TEDIT.MATCHPCS 67551 . 68566))))) + (FILEMAP (NIL (8668 56066 (\TEDIT.MAKEPCTB 8678 . 10571) (\TEDIT.UPDATEPCNODES 10573 . 12867) ( +\TEDIT.FIRSTPIECE 12869 . 14276) (\TEDIT.DELETETREE 14278 . 17552) (\TEDIT.INSERTTREE 17554 . 20299) ( +\TEDIT.LASTPIECE 20301 . 21108) (\TEDIT.PCTOCH 21110 . 23207) (\TEDIT.CHTOPC 23209 . 29386) ( +\TEDIT.SET-TOTLEN 29388 . 30176) (\TEDIT.MAKE.VACANT.BTREESLOT 30178 . 36908) (\TEDIT.LINKNEWPIECE +36910 . 38499) (\TEDIT.SPLITPIECE 38501 . 43069) (\TEDIT.INSERTPIECE 43071 . 46343) ( +\TEDIT.INSERTPIECES 46345 . 49437) (\TEDIT.DELETEPIECES 49439 . 53949) (\TEDIT.ALIGNEDPIECE 53951 . +56064)) (56094 68417 (\TEDIT.BTVALIDATE 56104 . 57645) (\TEDIT.BTVALIDATE.PRINT 57647 . 59012) ( +\TEDIT.CHECK-BTREE 59014 . 61341) (\TEDIT.CHECK-BTREE1 61343 . 66974) (\TEDIT.BTFAIL 66976 . 67398) ( +\TEDIT.MATCHPCS 67400 . 68415))))) STOP diff --git a/library/tedit/TEDIT-PCTREE.LCOM b/library/tedit/TEDIT-PCTREE.LCOM index f0cf5a86..fac6fe27 100644 Binary files a/library/tedit/TEDIT-PCTREE.LCOM and b/library/tedit/TEDIT-PCTREE.LCOM differ diff --git a/library/tedit/TEDIT-SCREEN b/library/tedit/TEDIT-SCREEN index 4c33bbac..228b8df4 100644 --- a/library/tedit/TEDIT-SCREEN +++ b/library/tedit/TEDIT-SCREEN @@ -1,12 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED " 5-Feb-2026 00:39:54" {WMEDLEY}TEDIT>TEDIT-SCREEN.;916 186880 +(FILECREATED " 6-May-2026 22:52:37" {MEDLEY}TEDIT>TEDIT-SCREEN.;918 186879 :EDIT-BY rmk :CHANGES-TO (FNS \TEDIT.FORMATLINE) - :PREVIOUS-DATE "31-Dec-2025 23:10:18" {WMEDLEY}TEDIT>TEDIT-SCREEN.;915) + :PREVIOUS-DATE " 5-Feb-2026 00:39:54" {MEDLEY}TEDIT>TEDIT-SCREEN.;916) (PRETTYCOMPRINT TEDIT-SCREENCOMS) @@ -654,6 +654,7 @@ (\TEDIT.FORMATLINE [LAMBDA (TSTREAM CH#1 LINE REGION IMAGESTREAM FORMATTINGSTATE) + (* ; "Edited 6-May-2026 22:52 by rmk") (* ; "Edited 5-Feb-2026 00:38 by rmk") (* ; "Edited 21-Nov-2025 16:36 by rmk") (* ; "Edited 7-Aug-2025 12:49 by rmk") @@ -1101,28 +1102,26 @@ (CL:WHEN (EQ CHARSLOT LASTCHARSLOT) - (* ;; - "If too long, we let it roll over to the next line. Should we put something in the margin??") + (* ;; "If too long, we let it roll over to the next line. ") - (TEDIT.PROMPTPRINT TEXTOBJ "Line too long to format." T) - (RETURN)) finally + (GO $$OUT)) finally - (* ;; + (* ;;  "Ran out of TEXTLEN (and paragraph). Back up and force a break. Are ASCENT/DESCENT correct?") - (CL:WHEN (AND (EQ PREVSP (PREVCHARSLOT CHARSLOT)) - (NULL (CHAR PREVSP))) + (CL:WHEN (AND (EQ PREVSP (PREVCHARSLOT CHARSLOT)) + (NULL (CHAR PREVSP))) (* ;; "The line ended in a space that needs to be resolved. If we coded the end of a space-chain as (CHARCODE SPACE) instead of NIL, maybe this wouldn't be necessary.") - (FILLCHARSLOT PREVSP (CHARCODE SPACE) - (CHARW PREVSP) - CHARLOOKS) - (SETQ PREVSP NIL)) - (SETQ CHARSLOT (PREVCHARSLOT CHARSLOT)) - (add CHNO -1) - (SETQ DX 0) (* ; "TX is already correct") - (FORCEBREAK)) + (FILLCHARSLOT PREVSP (CHARCODE SPACE) + (CHARW PREVSP) + CHARLOOKS) + (SETQ PREVSP NIL)) + (SETQ CHARSLOT (PREVCHARSLOT CHARSLOT)) + (add CHNO -1) + (SETQ DX 0) (* ; "TX is already correct") + (FORCEBREAK)) (* ;; "End of character loop. ") @@ -2866,21 +2865,21 @@ (\TEDIT.LINE.TALLP LINE PHEIGHT))))]) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (26200 28416 (\TEDIT.LINEDESCRIPTOR.DEFPRINT 26210 . 28414)) (35870 119724 ( -\TEDIT.FORMATLINE 35880 . 71208) (\TEDIT.FORMATLINE.SETUP.PARA 71210 . 76404) ( -\TEDIT.FORMATLINE.HORIZONTAL 76406 . 81223) (\TEDIT.FORMATLINE.VERTICAL 81225 . 83676) ( -\TEDIT.FORMATLINE.JUSTIFY 83678 . 89699) (\TEDIT.FORMATLINE.TABS 89701 . 97729) (\TEDIT.SCALE.TABS -97731 . 98522) (\TEDIT.FORMATLINE.PURGE.SPACES 98524 . 99951) (\TEDIT.FORMATLINE.FLUSH.SOFTHYPHEN -99953 . 101030) (\TEDIT.FORMATLINE.EMPTY 101032 . 105852) (\TEDIT.FORMATLINE.UPDATELOOKS 105854 . -112035) (\TEDIT.FORMATLINE.LASTLEGAL 112037 . 115487) (\TEDIT.LINES.ABOVE 115489 . 119100) ( -\TEDIT.CHNO.TO.YTOP 119102 . 119722)) (120001 140581 (\TEDIT.DISPLAYLINE 120011 . 132521) ( -\TEDIT.DISPLAYLINE.TABS 132523 . 135327) (\TEDIT.LINECACHE 135329 . 136057) (\TEDIT.CREATE.LINECACHE -136059 . 136895) (\TEDIT.BLTCHAR 136897 . 139524) (\TEDIT.DIACRITIC.SHIFT 139526 . 140579)) (141196 -186857 (\TEDIT.BACKFORMAT 141206 . 143760) (\TEDIT.PREVIOUS.LINEBREAK 143762 . 146565) ( -\TEDIT.UPDATE.LINES 146567 . 152873) (\TEDIT.PANE.CREATELINES 152875 . 155165) ( -\TEDIT.SUFFIXLINE.CREATE 155167 . 156782) (\TEDIT.LINES.BELOW 156784 . 161394) (\TEDIT.MEASURED.LINES -161396 . 163405) (\TEDIT.VALID.LASTCHNOS 163407 . 167183) (\TEDIT.VALID.NEXTCHNOS 167185 . 170659) ( -\TEDIT.LASTVALIDLINE 170661 . 175332) (\TEDIT.NEXTVALIDLINE 175334 . 178304) ( -\TEDIT.CLEARPANE.BELOW.LINE 178306 . 180412) (\TEDIT.INSERTLINE 180414 . 181800) (\TEDIT.LINE.BOTTOM -181802 . 185032) (\TEDIT.SHOW.AT.BOTTOMP 185034 . 186144) (\TEDIT.SHOW.AT.TOPP 186146 . 186855))))) + (FILEMAP (NIL (26198 28414 (\TEDIT.LINEDESCRIPTOR.DEFPRINT 26208 . 28412)) (35868 119723 ( +\TEDIT.FORMATLINE 35878 . 71207) (\TEDIT.FORMATLINE.SETUP.PARA 71209 . 76403) ( +\TEDIT.FORMATLINE.HORIZONTAL 76405 . 81222) (\TEDIT.FORMATLINE.VERTICAL 81224 . 83675) ( +\TEDIT.FORMATLINE.JUSTIFY 83677 . 89698) (\TEDIT.FORMATLINE.TABS 89700 . 97728) (\TEDIT.SCALE.TABS +97730 . 98521) (\TEDIT.FORMATLINE.PURGE.SPACES 98523 . 99950) (\TEDIT.FORMATLINE.FLUSH.SOFTHYPHEN +99952 . 101029) (\TEDIT.FORMATLINE.EMPTY 101031 . 105851) (\TEDIT.FORMATLINE.UPDATELOOKS 105853 . +112034) (\TEDIT.FORMATLINE.LASTLEGAL 112036 . 115486) (\TEDIT.LINES.ABOVE 115488 . 119099) ( +\TEDIT.CHNO.TO.YTOP 119101 . 119721)) (120000 140580 (\TEDIT.DISPLAYLINE 120010 . 132520) ( +\TEDIT.DISPLAYLINE.TABS 132522 . 135326) (\TEDIT.LINECACHE 135328 . 136056) (\TEDIT.CREATE.LINECACHE +136058 . 136894) (\TEDIT.BLTCHAR 136896 . 139523) (\TEDIT.DIACRITIC.SHIFT 139525 . 140578)) (141195 +186856 (\TEDIT.BACKFORMAT 141205 . 143759) (\TEDIT.PREVIOUS.LINEBREAK 143761 . 146564) ( +\TEDIT.UPDATE.LINES 146566 . 152872) (\TEDIT.PANE.CREATELINES 152874 . 155164) ( +\TEDIT.SUFFIXLINE.CREATE 155166 . 156781) (\TEDIT.LINES.BELOW 156783 . 161393) (\TEDIT.MEASURED.LINES +161395 . 163404) (\TEDIT.VALID.LASTCHNOS 163406 . 167182) (\TEDIT.VALID.NEXTCHNOS 167184 . 170658) ( +\TEDIT.LASTVALIDLINE 170660 . 175331) (\TEDIT.NEXTVALIDLINE 175333 . 178303) ( +\TEDIT.CLEARPANE.BELOW.LINE 178305 . 180411) (\TEDIT.INSERTLINE 180413 . 181799) (\TEDIT.LINE.BOTTOM +181801 . 185031) (\TEDIT.SHOW.AT.BOTTOMP 185033 . 186143) (\TEDIT.SHOW.AT.TOPP 186145 . 186854))))) STOP diff --git a/library/tedit/TEDIT-SCREEN.LCOM b/library/tedit/TEDIT-SCREEN.LCOM index 93232968..1b35bdc4 100644 Binary files a/library/tedit/TEDIT-SCREEN.LCOM and b/library/tedit/TEDIT-SCREEN.LCOM differ diff --git a/library/tedit/TEDIT-SELECTION b/library/tedit/TEDIT-SELECTION index 6c5bab83..cd619a01 100644 --- a/library/tedit/TEDIT-SELECTION +++ b/library/tedit/TEDIT-SELECTION @@ -1,12 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "16-Feb-2026 00:38:33" {WMEDLEY}TEDIT>TEDIT-SELECTION.;738 162152 +(FILECREATED "16-Apr-2026 09:27:41" {WMEDLEY}TEDIT>TEDIT-SELECTION.;741 161623 :EDIT-BY rmk - :CHANGES-TO (FNS \TEDIT.SELPIECES.CHARTRANSFORM) + :CHANGES-TO (FNS \TEDIT.SELPIECES.FROM.STRING) - :PREVIOUS-DATE "14-Jan-2026 14:32:01" {WMEDLEY}tedit>TEDIT-SELECTION.;736) + :PREVIOUS-DATE "10-Apr-2026 09:31:20" {WMEDLEY}TEDIT>TEDIT-SELECTION.;740) (PRETTYCOMPRINT TEDIT-SELECTIONCOMS) @@ -2041,7 +2041,8 @@ SPLASTCHAR _ (ffetch (SELPIECES SPLASTCHAR) of SP2]) (\TEDIT.SELPIECES.CHARTRANSFORM - [LAMBDA (SELPIECES CHARFN OBJECTSTOO TSTREAM) (* ; "Edited 16-Feb-2026 00:38 by rmk") + [LAMBDA (SELPIECES CHARFN OBJECTSTOO TSTREAM) (* ; "Edited 10-Apr-2026 09:17 by rmk") + (* ; "Edited 16-Feb-2026 00:38 by rmk") (* ; "Edited 24-Apr-2025 16:02 by rmk") (* ; "Edited 20-Apr-2025 23:23 by rmk") (* ; "Edited 16-Mar-2025 10:03 by rmk") @@ -2063,7 +2064,7 @@ (STRING.PTYPES (for I CH (STR _ PCONTENTS) from 1 while (SETQ CH (NTHCHARCODE STR I)) do (RPLCHARCODE STR I (APPLY* CHARFN CH (add INDEX 1) TEXTOBJ)))) - (FILE.PTYPES [LET [(STR (ALLOCSTRING (PLEN PC] + (FILE.PTYPES (LET [(STR (ALLOCSTRING (PLEN PC] (* ;; "This assumes that no file piece has a PLEN greater than \MaxArrayLen characters. We rely on the piece-table reader and writer to guarantee this. If not, ALLOCSTRING will cause an error.") @@ -2074,13 +2075,9 @@ (if (fetch (STRINGP FATSTRINGP) of STR) then (FSETPC PC PTYPE FATSTRING.PTYPE) (FSETPC PC PBYTESPERCHAR 2) - (FSETPC PC PBINABLE NIL) else (FSETPC PC PTYPE THINSTRING.PTYPE) - (FSETPC PC PBYTESPERCHAR 1) - (FSETPC PC PBINABLE T)) - (FSETPC PC PCONTENTS STR) - (FSETPC PC PBYTELEN (ITIMES (PBYTESPERCHAR PC) - (PLEN PC]) + (FSETPC PC PBYTESPERCHAR 1)) + (FSETPC PC PCONTENTS STR))) (OBJECT.PTYPE (add INDEX 1) (CL:WHEN OBJECTSTOO (FSETPC PC PCONTENTS (APPLY* CHARFN PCONTENTS INDEX)))) @@ -2088,7 +2085,8 @@ SELPIECES]) (\TEDIT.SELPIECES.FROM.STRING - [LAMBDA (STRING TEXTOBJ CHECKFOREOL CHARLOOKS PARALOOKS) (* ; "Edited 28-Jul-2025 23:50 by rmk") + [LAMBDA (STRING TEXTOBJ CHECKFOREOL CHARLOOKS PARALOOKS) (* ; "Edited 10-Apr-2026 09:18 by rmk") + (* ; "Edited 28-Jul-2025 23:50 by rmk") (* ; "Edited 8-Feb-2025 20:14 by rmk") (* ; "Edited 20-Mar-2024 10:57 by rmk") (* ; "Edited 3-Mar-2024 13:00 by rmk") @@ -2109,12 +2107,10 @@ (CL:WHEN (AND TEXTOBJ (FGETTOBJ TEXTOBJ FORMATTEDP)) (SETQ CHECKFOREOL T)) (LET (FIRSTPIECE EOLPOS (BYTESPERCHAR 1) - (PTYPE THINSTRING.PTYPE) - (PBINABLE T)) + (PTYPE THINSTRING.PTYPE)) (SETQ STRING (CONCAT STRING)) (CL:WHEN (fetch (STRINGP FATSTRINGP) of STRING) (SETQ PTYPE FATSTRING.PTYPE) - (SETQ PBINABLE NIL) (SETQ BYTESPERCHAR 2)) (if (AND CHECKFOREOL (SETQ EOLPOS (STRPOS (CONSTANT (CHARACTER (CHARCODE EOL))) STRING))) @@ -2131,13 +2127,10 @@ PTYPE _ PTYPE PCONTENTS _ STR PLEN _ (NCHARS STR) - PBYTELEN _ (ITIMES (NCHARS STR) - BYTESPERCHAR) PCHARLOOKS _ CHARLOOKS PPARALOOKS _ PARALOOKS PPARALAST _ T - PREVPIECE _ PC - PBINABLE _ PBINABLE)) + PREVPIECE _ PC)) (CL:WHEN PREVPC (FSETPC PREVPC NEXTPIECE PC)) (SETQ PREVPC PC) (SETQ EOLPOS (OR (STRPOS (CONSTANT (CHARACTER (CHARCODE EOL))) @@ -2158,10 +2151,7 @@ PTYPE _ PTYPE PCONTENTS _ STRING PLEN _ (NCHARS STRING) - PBYTELEN _ (ITIMES (NCHARS STRING) - BYTESPERCHAR) PBYTESPERCHAR _ BYTESPERCHAR - PBINABLE _ PBINABLE PCHARLOOKS _ CHARLOOKS PPARALOOKS _ PARALOOKS)) (create SELPIECES @@ -2571,26 +2561,26 @@ (ADDTOVAR LAMA TEDIT.SELPROP) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (15888 17709 (\TEDIT.SELECTION.DEFPRINT 15898 . 17707)) (17746 19251 ( -\TEDIT.SET.GLOBAL.SELECTIONS 17756 . 19249)) (19252 25473 (\TEDIT.SELECTED.PIECES 19262 . 20901) ( -\TEDIT.FIND.PROTECTED.END 20903 . 22697) (\TEDIT.FIND.PROTECTED.START 22699 . 24682) ( -\TEDIT.WORD.BOUND 24684 . 25471)) (25607 59714 (\TEDIT.EXTEND.SEL 25617 . 32857) (\TEDIT.SCAN.LINE -32859 . 44532) (\TEDIT.SCAN.LINE.WORD 44534 . 49527) (\TEDIT.XYTOSEL 49529 . 56867) (\TEDIT.REGIONTYPE - 56869 . 57888) (\TEDIT.XYTOSEL.INLINEP 57890 . 58345) (\TEDIT.XYTOSEL.LINE 58347 . 59712)) (59715 -73260 (\TEDIT.FIXSEL 59725 . 69102) (\TEDIT.CHTOLINEX 69104 . 73258)) (73261 77465 ( -\TEDIT.RESET.EXTEND.PENDING.DELETE 73271 . 74549) (\TEDIT.SET.SEL.LOOKS 74551 . 77463)) (78402 99555 ( -\TEDIT.SHOWSEL 78412 . 83388) (\TEDIT.NOSEL 83390 . 83691) (\TEDIT.SEL.OFF 83693 . 84104) ( -\TEDIT.SEL.ON 84106 . 84522) (\TEDIT.SHOWSEL.HILIGHT 84524 . 89145) (\TEDIT.UPDATE.SEL 89147 . 93749) -(\TEDIT.CARETLINE 93751 . 94465) (\TEDIT.SEL.L1 94467 . 95150) (\TEDIT.SEL.LN 95152 . 95835) ( -\TEDIT.SEL.DELETEDCHARS 95837 . 99553)) (99556 104438 (\TEDIT.COPYSEL 99566 . 102208) ( -\TEDIT.SEL.CHANGED? 102210 . 104436)) (104469 118128 (\TEDIT.SELECT.OBJECT 104479 . 109432) ( -\TEDIT.SHOWSEL.OBJECT 109434 . 111665) (\TEDIT.CLIP.OBJECT 111667 . 113671) (\TEDIT.OPERATE.OBJECT -113673 . 118126)) (118156 137982 (\TEDIT.SELPIECES 118166 . 122447) (\TEDIT.SELPIECES.COPY 122449 . -124938) (\TEDIT.SELPIECES.CONCAT 124940 . 126819) (\TEDIT.SELPIECES.CHARTRANSFORM 126821 . 130357) ( -\TEDIT.SELPIECES.FROM.STRING 130359 . 135617) (\TEDIT.SELPIECES.TO.STRING 135619 . 137980)) (138035 -161983 (TEDIT.XYTOCH 138045 . 140621) (TEDIT.SELPROP 140623 . 144900) (TEDIT.GETPOINT 144902 . 146822) - (TEDIT.GETSEL 146824 . 147700) (TEDIT.GETSEL.PARA 147702 . 148651) (TEDIT.SCANSEL 148653 . 149601) ( -TEDIT.SET.SEL.LOOKS 149603 . 151088) (TEDIT.SETSEL 151090 . 156008) (TEDIT.SHOWSEL 156010 . 157874) ( -TEDIT.SEL.AS.STRING 157876 . 160361) (TEDIT.SEL.AS.SEXPR 160363 . 161649) (TEDIT.SELECTALL 161651 . -161981))))) + (FILEMAP (NIL (15886 17707 (\TEDIT.SELECTION.DEFPRINT 15896 . 17705)) (17744 19249 ( +\TEDIT.SET.GLOBAL.SELECTIONS 17754 . 19247)) (19250 25471 (\TEDIT.SELECTED.PIECES 19260 . 20899) ( +\TEDIT.FIND.PROTECTED.END 20901 . 22695) (\TEDIT.FIND.PROTECTED.START 22697 . 24680) ( +\TEDIT.WORD.BOUND 24682 . 25469)) (25605 59712 (\TEDIT.EXTEND.SEL 25615 . 32855) (\TEDIT.SCAN.LINE +32857 . 44530) (\TEDIT.SCAN.LINE.WORD 44532 . 49525) (\TEDIT.XYTOSEL 49527 . 56865) (\TEDIT.REGIONTYPE + 56867 . 57886) (\TEDIT.XYTOSEL.INLINEP 57888 . 58343) (\TEDIT.XYTOSEL.LINE 58345 . 59710)) (59713 +73258 (\TEDIT.FIXSEL 59723 . 69100) (\TEDIT.CHTOLINEX 69102 . 73256)) (73259 77463 ( +\TEDIT.RESET.EXTEND.PENDING.DELETE 73269 . 74547) (\TEDIT.SET.SEL.LOOKS 74549 . 77461)) (78400 99553 ( +\TEDIT.SHOWSEL 78410 . 83386) (\TEDIT.NOSEL 83388 . 83689) (\TEDIT.SEL.OFF 83691 . 84102) ( +\TEDIT.SEL.ON 84104 . 84520) (\TEDIT.SHOWSEL.HILIGHT 84522 . 89143) (\TEDIT.UPDATE.SEL 89145 . 93747) +(\TEDIT.CARETLINE 93749 . 94463) (\TEDIT.SEL.L1 94465 . 95148) (\TEDIT.SEL.LN 95150 . 95833) ( +\TEDIT.SEL.DELETEDCHARS 95835 . 99551)) (99554 104436 (\TEDIT.COPYSEL 99564 . 102206) ( +\TEDIT.SEL.CHANGED? 102208 . 104434)) (104467 118126 (\TEDIT.SELECT.OBJECT 104477 . 109430) ( +\TEDIT.SHOWSEL.OBJECT 109432 . 111663) (\TEDIT.CLIP.OBJECT 111665 . 113669) (\TEDIT.OPERATE.OBJECT +113671 . 118124)) (118154 137453 (\TEDIT.SELPIECES 118164 . 122445) (\TEDIT.SELPIECES.COPY 122447 . +124936) (\TEDIT.SELPIECES.CONCAT 124938 . 126817) (\TEDIT.SELPIECES.CHARTRANSFORM 126819 . 130189) ( +\TEDIT.SELPIECES.FROM.STRING 130191 . 135088) (\TEDIT.SELPIECES.TO.STRING 135090 . 137451)) (137506 +161454 (TEDIT.XYTOCH 137516 . 140092) (TEDIT.SELPROP 140094 . 144371) (TEDIT.GETPOINT 144373 . 146293) + (TEDIT.GETSEL 146295 . 147171) (TEDIT.GETSEL.PARA 147173 . 148122) (TEDIT.SCANSEL 148124 . 149072) ( +TEDIT.SET.SEL.LOOKS 149074 . 150559) (TEDIT.SETSEL 150561 . 155479) (TEDIT.SHOWSEL 155481 . 157345) ( +TEDIT.SEL.AS.STRING 157347 . 159832) (TEDIT.SEL.AS.SEXPR 159834 . 161120) (TEDIT.SELECTALL 161122 . +161452))))) STOP diff --git a/library/tedit/TEDIT-SELECTION.LCOM b/library/tedit/TEDIT-SELECTION.LCOM index 1317c79c..ff537247 100644 Binary files a/library/tedit/TEDIT-SELECTION.LCOM and b/library/tedit/TEDIT-SELECTION.LCOM differ diff --git a/library/tedit/TEDIT-STREAM b/library/tedit/TEDIT-STREAM index f88ae2ae..3860eb4d 100644 --- a/library/tedit/TEDIT-STREAM +++ b/library/tedit/TEDIT-STREAM @@ -1,12 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "16-Feb-2026 12:40:44" {WMEDLEY}tedit>TEDIT-STREAM.;944 193110 +(FILECREATED " 1-May-2026 08:15:56" {MEDLEY}tedit>TEDIT-STREAM.;956 190971 :EDIT-BY rmk - :CHANGES-TO (FNS \TEDIT.STREAMINIT) + :CHANGES-TO (RECORDS PIECE) - :PREVIOUS-DATE "16-Feb-2026 09:39:00" {WMEDLEY}tedit>TEDIT-STREAM.;943) + :PREVIOUS-DATE "26-Apr-2026 23:46:38" {MEDLEY}tedit>TEDIT-STREAM.;955) (PRETTYCOMPRINT TEDIT-STREAMCOMS) @@ -14,8 +14,8 @@ (RPAQQ TEDIT-STREAMCOMS [(DECLARE%: EVAL@COMPILE DONTCOPY (EXPORT (RECORDS PIECE TEXTOBJ TEXTSTREAM) - (MACROS NEXTPIECE PREVPIECE PLEN PLAST PTYPE PCONTENTS PCHARLOOKS PCHARSET - PPARALOOKS PPARALAST PFPOS PBYTELEN PNEW PBINABLE PBYTESPERCHAR POBJ) + (MACROS NEXTPIECE PREVPIECE PLEN PLAST PTYPE PCONTENTS PCHARLOOKS PPARALOOKS + PPARALAST PFPOS PBYTELEN PNEW PBYTESPERCHAR POBJ) (MACROS SETPC FSETPC GETPC FGETPC) (MACROS THINPIECEP) (MACROS VISIBLEPIECEP \NEXT.VISIBLE.PIECE \PREV.VISIBLE.PIECE) @@ -94,8 +94,8 @@ PCONTENTS (* ; "The background source of data for this piece (stream, string, block, object, depending on the PTYPE).") (PTYPE BITS 4) (* ;  "How the characters are delivered: thinfile, fatstring, object, substream") - PBYTELEN (* ; - "Length of this character piece in bytes. PBYTELEN = PLEN*PBYTESPERCHAR") + NIL (* ; + "Was PBYTELEN: Length of this character piece in bytes. PBYTELEN = PLEN*PBYTESPERCHAR") PFPOS (* ;  "The FILEPTR of the start of the piece in the file") PLEN (* ; @@ -111,20 +111,18 @@ (PNEW FLAG) (* ;  "This text is new here; used by the tentative edit system, and anyone else interested.") (NIL FLAG) (* ; "Was PFATP") - (PBINABLE FLAG) (* ; - "8-bit bytes are binable (THINSTRING and THINFILE) ") + (NIL FLAG) (PTREENODE XPOINTER) (* ;  "Points to the PCTB tree-node that contains this piece.") - (PCHARSET BYTE) (* ; - "High-order charset for FATFILE1 pieces") - (PUTF8BYTESPERCHAR BYTE)) (* ; - "The number of bytes in the UTF-8 encoding of all the Unicode characters in this piece") + (NIL BYTE) (* ; + "Was PCHARSET: High-order charset for FATFILE1 pieces") + NIL) (* ; "Was PUTF8BYTESPERCHAR: The number of bytes in the UTF-8 encoding of all the Unicode characters in this piece. But this just duplicates PBYTESPERCHAR for UTF-8 pieces") [ACCESSFNS ((POBJ (AND (EQ OBJECT.PTYPE (PTYPE DATUM)) (type? IMAGEOBJ (PCONTENTS DATUM)) (PCONTENTS DATUM)) (AND (EQ OBJECT.PTYPE (PTYPE DATUM)) (SETPC DATUM PCONTENTS NEWVALUE] - PFPOS _ 0 PLEN _ 0 PBYTELEN _ 0) + PFPOS _ 0 PLEN _ 0) (DATATYPE TEXTOBJ ( (* ;; @@ -294,7 +292,7 @@ (/DECLAREDATATYPE 'PIECE '(POINTER (BITS 4) POINTER POINTER POINTER POINTER FULLXPOINTER POINTER POINTER FLAG POINTER FLAG FLAG - FLAG XPOINTER BYTE BYTE) + FLAG XPOINTER BYTE POINTER) '((PIECE 0 POINTER) (PIECE 0 (BITS . 3)) (PIECE 2 POINTER) @@ -311,8 +309,8 @@ (PIECE 16 (FLAGBITS . 32)) (PIECE 18 XPOINTER) (PIECE 20 (BITS . 7)) - (PIECE 20 (BITS . 135))) - '22) + (PIECE 22 POINTER)) + '24) (/DECLAREDATATYPE 'TEXTOBJ '(POINTER POINTER POINTER POINTER POINTER POINTER POINTER POINTER POINTER FLAG FLAG POINTER @@ -405,9 +403,6 @@ (PUTPROPS PCHARLOOKS MACRO ((PC) (ffetch (PIECE PCHARLOOKS) of PC))) -(PUTPROPS PCHARSET MACRO ((PC) - (ffetch (PIECE PCHARSET) of PC))) - (PUTPROPS PPARALOOKS MACRO ((PC) (ffetch (PIECE PPARALOOKS) of PC))) @@ -417,15 +412,13 @@ (PUTPROPS PFPOS MACRO ((PC) (ffetch (PIECE PFPOS) of PC))) -(PUTPROPS PBYTELEN MACRO ((PC) - (ffetch (PIECE PBYTELEN) of PC))) +(PUTPROPS PBYTELEN MACRO (OPENLAMBDA (PC) + (ITIMES (ffetch (PIECE PLEN) of PC) + (ffetch (PIECE PBYTESPERCHAR) of PC)))) (PUTPROPS PNEW MACRO ((PC) (ffetch (PIECE PNEW) of PC))) -(PUTPROPS PBINABLE MACRO ((PC) - (ffetch (PIECE PBINABLE) of PC))) - (PUTPROPS PBYTESPERCHAR MACRO ((PC) (ffetch (PIECE PBYTESPERCHAR) of PC))) @@ -454,7 +447,7 @@ (SELECTC (PTYPE PC) (THIN.PTYPES T) - (UTF8.PTYPE (EQ 1 (FGETPC PC PUTF8BYTESPERCHAR))) + (UTF8.PTYPE (EQ 1 (FGETPC PC PBYTESPERCHAR))) NIL))) ) (DECLARE%: EVAL@COMPILE @@ -517,7 +510,6 @@ (RPAQQ PTYPES ((THINFILE.PTYPE 0) - (FATFILE1.PTYPE 1) (FATFILE2.PTYPE 2) (THINSTRING.PTYPE 3) (FATSTRING.PTYPE 4) @@ -527,18 +519,15 @@ (UTF16BE.PTYPE 8) (UTF16LE.PTYPE 9) (UTF8.PTYPE 11) - (FILE.PTYPES (LIST THINFILE.PTYPE FATFILE1.PTYPE FATFILE2.PTYPE UTF8.PTYPE UTF16BE.PTYPE - UTF16LE.PTYPE)) + (FILE.PTYPES (LIST THINFILE.PTYPE FATFILE2.PTYPE UTF8.PTYPE UTF16BE.PTYPE UTF16LE.PTYPE)) (STRING.PTYPES (LIST THINSTRING.PTYPE FATSTRING.PTYPE)) (BINABLE.PTYPES (LIST THINFILE.PTYPE THINSTRING.PTYPE)) (THIN.PTYPES (LIST THINFILE.PTYPE THINSTRING.PTYPE)) - (FAT.PTYPES (LIST FATFILE2.PTYPE FATSTRING.PTYPE FATFILE1.PTYPE)))) + (FAT.PTYPES (LIST FATFILE2.PTYPE FATSTRING.PTYPE)))) (DECLARE%: EVAL@COMPILE (RPAQQ THINFILE.PTYPE 0) -(RPAQQ FATFILE1.PTYPE 1) - (RPAQQ FATFILE2.PTYPE 2) (RPAQQ THINSTRING.PTYPE 3) @@ -557,8 +546,7 @@ (RPAQQ UTF8.PTYPE 11) -(RPAQ FILE.PTYPES (LIST THINFILE.PTYPE FATFILE1.PTYPE FATFILE2.PTYPE UTF8.PTYPE UTF16BE.PTYPE - UTF16LE.PTYPE)) +(RPAQ FILE.PTYPES (LIST THINFILE.PTYPE FATFILE2.PTYPE UTF8.PTYPE UTF16BE.PTYPE UTF16LE.PTYPE)) (RPAQ STRING.PTYPES (LIST THINSTRING.PTYPE FATSTRING.PTYPE)) @@ -566,11 +554,10 @@ (RPAQ THIN.PTYPES (LIST THINFILE.PTYPE THINSTRING.PTYPE)) -(RPAQ FAT.PTYPES (LIST FATFILE2.PTYPE FATSTRING.PTYPE FATFILE1.PTYPE)) +(RPAQ FAT.PTYPES (LIST FATFILE2.PTYPE FATSTRING.PTYPE)) (CONSTANTS (THINFILE.PTYPE 0) - (FATFILE1.PTYPE 1) (FATFILE2.PTYPE 2) (THINSTRING.PTYPE 3) (FATSTRING.PTYPE 4) @@ -580,12 +567,11 @@ (UTF16BE.PTYPE 8) (UTF16LE.PTYPE 9) (UTF8.PTYPE 11) - (FILE.PTYPES (LIST THINFILE.PTYPE FATFILE1.PTYPE FATFILE2.PTYPE UTF8.PTYPE UTF16BE.PTYPE - UTF16LE.PTYPE)) + (FILE.PTYPES (LIST THINFILE.PTYPE FATFILE2.PTYPE UTF8.PTYPE UTF16BE.PTYPE UTF16LE.PTYPE)) (STRING.PTYPES (LIST THINSTRING.PTYPE FATSTRING.PTYPE)) (BINABLE.PTYPES (LIST THINFILE.PTYPE THINSTRING.PTYPE)) (THIN.PTYPES (LIST THINFILE.PTYPE THINSTRING.PTYPE)) - (FAT.PTYPES (LIST FATFILE2.PTYPE FATSTRING.PTYPE FATFILE1.PTYPE))) + (FAT.PTYPES (LIST FATFILE2.PTYPE FATSTRING.PTYPE))) ) (DECLARE%: DOEVAL@COMPILE DONTCOPY @@ -599,7 +585,7 @@ (/DECLAREDATATYPE 'PIECE '(POINTER (BITS 4) POINTER POINTER POINTER POINTER FULLXPOINTER POINTER POINTER FLAG POINTER FLAG FLAG - FLAG XPOINTER BYTE BYTE) + FLAG XPOINTER BYTE POINTER) '((PIECE 0 POINTER) (PIECE 0 (BITS . 3)) (PIECE 2 POINTER) @@ -616,8 +602,8 @@ (PIECE 16 (FLAGBITS . 32)) (PIECE 18 XPOINTER) (PIECE 20 (BITS . 7)) - (PIECE 20 (BITS . 135))) - '22) + (PIECE 22 POINTER)) + '24) (/DECLAREDATATYPE 'TEXTOBJ '(POINTER POINTER POINTER POINTER POINTER POINTER POINTER POINTER POINTER FLAG FLAG POINTER @@ -697,6 +683,10 @@ (\TEDIT.TEXTBIN [LAMBDA (TSTREAM) + (* ;; "Edited 9-Apr-2026 00:06 by rmk") + + (* ;; "Edited 7-Apr-2026 09:57 by rmk") + (* ;; "Edited 13-Oct-2025 17:16 by rmk") (* ;; "Edited 21-Oct-2024 00:26 by rmk") @@ -818,18 +808,6 @@ (\TEDIT.INSTALL.FILEBUFFER TSTREAM (ffetch (TEXTSTREAM PCCHARSLEFT) of TSTREAM))))) - (FATFILE1.PTYPE - (PROG1 (create WORD - HIBYTE _ (PCHARSET PC) - LOBYTE _ (BIN (PCONTENTS PC))) - (add (ffetch (STREAM COFFSET) of TSTREAM) - 1) - (CL:WHEN (\ENDOFBUFFERP TSTREAM) - (\TEDIT.INSTALL.FILEBUFFER TSTREAM (ffetch - (TEXTSTREAM - PCCHARSLEFT - ) - of TSTREAM))))) (THINFILE.PTYPE (* ;  "Fall through when the underlying stream is not binable") (PROG1 (BIN (PCONTENTS PC)) @@ -848,7 +826,8 @@ (\TEDIT.THELP "\TEXTBIN UNKNOWN PTYPE" (PTYPE PC]) (\TEDIT.TEXTPEEKBIN - [LAMBDA (TSTREAM NOERROR) (* ; "Edited 21-Oct-2024 00:33 by rmk") + [LAMBDA (TSTREAM NOERROR) (* ; "Edited 9-Apr-2026 00:06 by rmk") + (* ; "Edited 21-Oct-2024 00:33 by rmk") (* ; "Edited 19-Mar-2024 19:14 by rmk") (* ; "Edited 16-Mar-2024 12:44 by rmk") (* ; "Edited 1-Feb-2024 11:13 by rmk") @@ -911,10 +890,6 @@ 'OBJECTBYTE) PCONTENTS)) (UTF8.PTYPE (UTF8.PEEKCCODEFN PCONTENTS)) - (FATFILE1.PTYPE - (create WORD - HIBYTE _ (PCHARSET PC) - LOBYTE _ (\PEEKBIN PCONTENTS))) (SUBSTREAM.PTYPE (* ; "A substream stored as an object") (\PEEKBIN (IMAGEOBJPROP PCONTENTS 'SUBSTREAM))) (\TEDIT.THELP "UNKNOWN PIECE TYPE"))) @@ -923,7 +898,8 @@ else (STREAMOP 'ENDOFSTREAMOP TSTREAM TSTREAM]) (\TEDIT.TEXTBACKFILEPTR - [LAMBDA (TSTREAM) (* ; "Edited 16-Feb-2026 08:54 by rmk") + [LAMBDA (TSTREAM) (* ; "Edited 9-Apr-2026 00:07 by rmk") + (* ; "Edited 16-Feb-2026 08:54 by rmk") (* ; "Edited 21-Oct-2024 00:33 by rmk") (* ; "Edited 1-Feb-2024 11:25 by rmk") (* ; "Edited 5-Jan-2024 17:57 by rmk") @@ -1008,10 +984,6 @@ 'OBJECTBYTE) (PCONTENTS PC))) (UTF8.PTYPE (UTF8.PEEKCCODEFN (PCONTENTS PC))) - (FATFILE1.PTYPE - (LOGOR (LLSH (PCHARSET PC) - 8) - (\PEEKBIN (PCONTENTS PC)))) (SUBSTREAM.PTYPE (* ; "A substream stored as an object") (BIN (IMAGEOBJPROP (PCONTENTS PC) 'SUBSTREAM))) @@ -1760,7 +1732,8 @@ (DEFINEQ (\TEDIT.STREAMINIT - [LAMBDA NIL (* ; "Edited 16-Feb-2026 12:40 by rmk") + [LAMBDA NIL (* ; "Edited 24-Feb-2026 23:38 by rmk") + (* ; "Edited 16-Feb-2026 12:40 by rmk") (* ; "Edited 26-Jan-2026 16:06 by rmk") (* ; "Edited 23-Sep-2025 21:03 by rmk") (* ; "Edited 20-Sep-2025 08:48 by rmk") @@ -1823,7 +1796,7 @@ (FUNCTION \TEDIT.TEXTBACKCCODEFN) (FUNCTION \TEDIT.TEXTOUTCHARFN) (FUNCTION \TEDIT.TEXTFORMATBYTESTREAM) - 'CR NIL (FUNCTION \TEDIT.TEXTFORMATBYTESTRING)) + 'CR T (FUNCTION \TEDIT.TEXTFORMATBYTESTRING)) (* ;; "Support for error handling: The old error handler for the stream-not-open error. ") @@ -2277,7 +2250,8 @@ (IDIFFERENCE N START-OF-PIECE)))]) (\TEDIT.PIECE.NTHCHARCODE - [LAMBDA (PC OFFSET) (* ; "Edited 15-Feb-2026 14:31 by rmk") + [LAMBDA (PC OFFSET) (* ; "Edited 9-Apr-2026 00:06 by rmk") + (* ; "Edited 15-Feb-2026 14:31 by rmk") (* ; "Edited 24-Apr-2025 16:04 by rmk") (* ; "Edited 21-Oct-2024 00:26 by rmk") (* ; "Edited 29-Apr-2024 08:46 by rmk") @@ -2304,14 +2278,6 @@ OFFSET)) (PROG1 (BIN PCONTENTS) (\SETFILEPTR PCONTENTS FILEPOS))) - (FATFILE1.PTYPE - (SETQ FILEPOS (\GETFILEPTR PCONTENTS)) - (\SETFILEPTR PCONTENTS (IPLUS (PFPOS PC) - OFFSET)) - (PROG1 (create WORD - HIBYTE _ (PCHARSET PC) - LOBYTE _ (BIN PCONTENTS)) - (\SETFILEPTR PCONTENTS FILEPOS))) (FATFILE2.PTYPE (SETQ FILEPOS (\GETFILEPTR PCONTENTS)) (\SETFILEPTR PCONTENTS (IPLUS (PFPOS PC) @@ -2359,7 +2325,8 @@ TSTREAM))]) (\TEDIT.PIECE.RPLCHARCODE - [LAMBDA (TEXTOBJ PC OFFSET NEWCHARCODE NEWCHARLOOKS) (* ; "Edited 16-Feb-2026 08:41 by rmk") + [LAMBDA (TEXTOBJ PC OFFSET NEWCHARCODE NEWCHARLOOKS) (* ; "Edited 10-Apr-2026 09:32 by rmk") + (* ; "Edited 16-Feb-2026 08:41 by rmk") (* ; "Edited 28-Jul-2025 23:38 by rmk") (* ; "Edited 24-Apr-2025 16:30 by rmk") (* ; "Edited 20-Apr-2025 13:25 by rmk") @@ -2393,10 +2360,7 @@ (CL:WHEN (AND (EQ THINSTRING.PTYPE (PTYPE PC)) (IGREATERP NEWCHARCODE \MAXTHINCHAR)) (FSETPC PC PTYPE FATSTRING.PTYPE) - (FSETPC PC PBINABLE NIL) - (FSETPC PC PBYTESPERCHAR 2) - (FSETPC PC PBYTELEN (UNFOLD (PLEN PC) - 2))) + (FSETPC PC PBYTESPERCHAR 2)) elseif [AND (IMAGEOBJP NEWCHARCODE) (EQ OBJECT.PTYPE (PTYPE PC)) (OR (NULL NEWCHARLOOKS) @@ -2425,24 +2389,17 @@ (SETQ OLDCHAR (\TEDIT.PIECE.NTHCHARCODE PC 0)) (if (IMAGEOBJP NEWCHARCODE) - then (FSETPC PC PBINABLE NIL) - (FSETPC PC PCONTENTS NEWCHARCODE) + then (FSETPC PC PCONTENTS NEWCHARCODE) (FSETPC PC PTYPE OBJECT.PTYPE) (FSETPC PC PBYTESPERCHAR NIL) (* ; "Doesn't make sense for objects") - (FSETPC PC PBYTELEN NIL) else (FSETPC PC PCONTENTS (MKSTRING (CHARACTER NEWCHARCODE))) (* ;  "Use the extend-string in INSERTCH for repeated calls?") (if (IGREATERP NEWCHARCODE \MAXTHINCHAR) then (FSETPC PC PTYPE FATSTRING.PTYPE) - (FSETPC PC PBINABLE NIL) (FSETPC PC PBYTESPERCHAR 2) - (FSETPC PC PBYTELEN 2) else (FSETPC PC PTYPE THINSTRING.PTYPE) - (FSETPC PC PBINABLE T) - (FSETPC PC PBYTESPERCHAR 1) - (FSETPC PC PBYTELEN 1) - (FSETPC PC PCHARSET 0))) + (FSETPC PC PBYTESPERCHAR 1))) (FSETPC PC PFPOS NIL) (CL:WHEN NEWCHARLOOKS (FSETPC PC PCHARLOOKS (CL:IF (FONTP NEWCHARLOOKS) @@ -2546,7 +2503,8 @@ T)]) (\TEDIT.INSERTCH - [LAMBDA (CH CH# TEXTOBJ PARALAST) (* ; "Edited 26-Jul-2025 21:13 by rmk") + [LAMBDA (CH CH# TEXTOBJ PARALAST) (* ; "Edited 10-Apr-2026 09:46 by rmk") + (* ; "Edited 26-Jul-2025 21:13 by rmk") (* ; "Edited 26-Mar-2025 00:29 by rmk") (* ; "Edited 22-Nov-2024 13:48 by rmk") (* ; "Edited 22-Sep-2024 12:32 by rmk") @@ -2634,14 +2592,9 @@ PNEW _ T)) (SELECTC INSERTPTYPE (THINSTRING.PTYPE - (FSETPC PREVPC PBYTESPERCHAR 1) - (FSETPC PREVPC PBYTELEN ILEN) - (FSETPC PREVPC PBINABLE T) - (FSETPC PREVPC PCHARSET 0)) - (FATSTRING.PTYPE (* ; "PCHARSET is not relevant") - (FSETPC PREVPC PBYTESPERCHAR 2) - (FSETPC PREVPC PBYTELEN (UNFOLD ILEN 2)) - (FSETPC PREVPC PBINABLE NIL)) + (FSETPC PREVPC PBYTESPERCHAR 1)) + (FATSTRING.PTYPE + (FSETPC PREVPC PBYTESPERCHAR 2)) (\TEDIT.THELP "Unexpected PTYPE")) (\TEDIT.INSERTPIECE PREVPC INSERTPC TEXTOBJ)) @@ -2785,7 +2738,8 @@ INSERTION]) (\TEDIT.INSERTCH.EXTEND - [LAMBDA (PC ILEN TEXTOBJ) (* ; "Edited 16-Mar-2024 09:56 by rmk") + [LAMBDA (PC ILEN TEXTOBJ) (* ; "Edited 9-Apr-2026 13:24 by rmk") + (* ; "Edited 16-Mar-2024 09:56 by rmk") (* ; "Edited 21-Jan-2024 14:09 by rmk") (* ; "Edited 12-Apr-2023 09:37 by rmk") (* ; "Edited 1-Sep-2022 08:26 by rmk") @@ -2796,8 +2750,6 @@ (add (PLEN PC) ILEN) - (FSETPC PC PBYTELEN (ITIMES (PLEN PC) - (PBYTESPERCHAR PC))) (add (ffetch (STRINGP LENGTH) of (PCONTENTS PC)) ILEN) (add (ffetch (BTSLOT DLEN) of (\FINDSLOT (ffetch (PIECE PTREENODE) of PC) @@ -2836,7 +2788,8 @@ (DEFINEQ (\TEDIT.INSTALL.PIECE - [LAMBDA (TSTREAM PC CHOFFSET) (* ; "Edited 21-Oct-2024 00:26 by rmk") + [LAMBDA (TSTREAM PC CHOFFSET) (* ; "Edited 26-Apr-2026 23:46 by rmk") + (* ; "Edited 21-Oct-2024 00:26 by rmk") (* ; "Edited 18-May-2024 22:39 by rmk") (* ; "Edited 9-May-2024 22:34 by rmk") (* ; "Edited 18-Mar-2024 22:26 by rmk") @@ -2891,7 +2844,11 @@ PLEN))) (OBJECT.PTYPE (freplace (STREAM CBUFSIZE) of TSTREAM with 1)) NIL) - (freplace (STREAM BINABLE) of TSTREAM with (PBINABLE PC)) + + (* ;; "Would work for an ASCII. PTYPE or 1-byte UTF-8, except for MCCS/UNICODE differences.") + + [freplace (STREAM BINABLE) of TSTREAM with (OR (EQ THINFILE.PTYPE (PTYPE PC)) + (EQ THINSTRING.PTYPE (PTYPE PC] (freplace (TEXTSTREAM STARTINGCOFFSET) of TSTREAM with (ffetch (STREAM COFFSET) of TSTREAM)) (freplace (TEXTSTREAM PCCHARSLEFT) of TSTREAM with PCCHARSLEFT) @@ -3127,33 +3084,33 @@ (ADDTOVAR LAMA TEXTPROP) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (36667 67629 (\TEDIT.TEXTBIN 36677 . 47470) (\TEDIT.TEXTPEEKBIN 47472 . 53022) ( -\TEDIT.TEXTBACKFILEPTR 53024 . 58800) (\TEDIT.TEXTBOUT 58802 . 63419) (\TEDIT.INSTALL.FILEBUFFER 63421 - . 67627)) (68527 72818 (\TEDIT.TEXTOUTCHARFN 68537 . 70093) (\TEDIT.TEXTINCCODEFN 70095 . 70834) ( -\TEDIT.TEXTBACKCCODEFN 70836 . 71428) (\TEDIT.TEXTFORMATBYTESTREAM 71430 . 72267) ( -\TEDIT.TEXTFORMATBYTESTRING 72269 . 72816)) (72865 84940 (OPENTEXTSTREAM 72875 . 79851) ( -COPYTEXTSTREAM 79853 . 84163) (TEDIT.STREAMCHANGEDP 84165 . 84467) (TXTFILE 84469 . 84938)) (84941 -108146 (\TEDIT.REOPENTEXTSTREAM 84951 . 86303) (\TEDIT.OPENTEXTSTREAM.PIECES 86305 . 91233) ( -\TEDIT.OPENTEXTSTREAM.PROPS 91235 . 92337) (\TEDIT.OPENTEXTSTREAM.SETUP.SEL 92339 . 97789) ( -\TEDIT.OPENTEXTSTREAM.WINDOW 97791 . 100582) (\TEDIT.OPENTEXTSTREAM.DEFAULTLOOKS 100584 . 102523) ( -\TEDIT.OPENTEXTFILE 102525 . 104657) (\TEDIT.CREATE.TEXTSTREAM 104659 . 105806) (\TEDIT.REOPEN.STREAM -105808 . 108144)) (108147 116372 (\TEDIT.STREAMINIT 108157 . 116189) (TEDIT.IMAGESTREAM.OPEN 116191 . -116370)) (116560 117748 (\TEDIT.TTYBOUT 116570 . 117746)) (117866 139549 (\TEDIT.TEXTCLOSEF 117876 . -119200) (\TEDIT.TEXTDSPFONT 119202 . 120400) (\TEDIT.TEXTEOFP 120402 . 122157) (\TEDIT.TEXTGETEOFPTR -122159 . 122482) (\TEDIT.TEXTSETEOFPTR 122484 . 123771) (\TEDIT.TEXTGETFILEPTR 123773 . 126608) ( -\TEDIT.TEXTSETFILEINFO 126610 . 127118) (\TEDIT.TEXTOPENF 127120 . 128051) (\TEDIT.TEXTSETEOF 128053 - . 128669) (\TEDIT.TEXTSETFILEPTR 128671 . 130781) (\TEDIT.TEXTDSPXPOSITION 130783 . 133486) ( -\TEDIT.TEXTDSPYPOSITION 133488 . 134229) (\TEDIT.TEXTLEFTMARGIN 134231 . 134822) (\TEDIT.TEXTCOLOR -134824 . 135407) (\TEDIT.TEXTRIGHTMARGIN 135409 . 138698) (\TEDIT.TEXTDSPCHARWIDTH 138700 . 139004) ( -\TEDIT.TEXTDSPSTRINGWIDTH 139006 . 139312) (\TEDIT.TEXTDSPLINEFEED 139314 . 139547)) (139587 152583 ( -\TEDIT.NTHCHARCODE 139597 . 141123) (\TEDIT.PIECE.NTHCHARCODE 141125 . 145033) (\TEDIT.RPLCHARCODE -145035 . 146593) (\TEDIT.PIECE.RPLCHARCODE 146595 . 152228) (\TEDIT.NTHCHARLOOKS 152230 . 152581)) ( -153630 174724 (\TEDIT.DELETE.SELPIECES 153640 . 157265) (\TEDIT.INSERTCH 157267 . 165306) ( -\TEDIT.INSERTCH.HISTORY 165308 . 168772) (\TEDIT.INSERTEOL 168774 . 170599) (\TEDIT.INSERTCH.INSERTION - 170601 . 173438) (\TEDIT.INSERTCH.EXTEND 173440 . 174722)) (174725 176332 (\TEDIT.NEXTCHANGEABLE.CHNO - 174735 . 175450) (\TEDIT.LASTCHANGEABLE.CHNO 175452 . 176330)) (176333 180791 (\TEDIT.INSTALL.PIECE -176343 . 180789)) (180829 190295 (TEXTPROP 180839 . 181186) (GETTEXTPROP 181188 . 181432) (PUTTEXTPROP - 181434 . 181691) (GETTEXTPROPS 181693 . 182137) (PUTTEXTPROPS 182139 . 183043) (TEXTPROP.ADD 183045 - . 183308) (\TEDIT.TEXTPROP 183310 . 190293)) (190296 192673 (\TEDIT.TEXTOBJ.PROPNAMES 190306 . 191565 -) (\TEDIT.TEXTOBJ.PROPFETCHFN 191567 . 192083) (\TEDIT.TEXTOBJ.PROPSTOREFN 192085 . 192671))))) + (FILEMAP (NIL (36156 66033 (\TEDIT.TEXTBIN 36166 . 46068) (\TEDIT.TEXTPEEKBIN 46070 . 51495) ( +\TEDIT.TEXTBACKFILEPTR 51497 . 57204) (\TEDIT.TEXTBOUT 57206 . 61823) (\TEDIT.INSTALL.FILEBUFFER 61825 + . 66031)) (66931 71222 (\TEDIT.TEXTOUTCHARFN 66941 . 68497) (\TEDIT.TEXTINCCODEFN 68499 . 69238) ( +\TEDIT.TEXTBACKCCODEFN 69240 . 69832) (\TEDIT.TEXTFORMATBYTESTREAM 69834 . 70671) ( +\TEDIT.TEXTFORMATBYTESTRING 70673 . 71220)) (71269 83344 (OPENTEXTSTREAM 71279 . 78255) ( +COPYTEXTSTREAM 78257 . 82567) (TEDIT.STREAMCHANGEDP 82569 . 82871) (TXTFILE 82873 . 83342)) (83345 +106550 (\TEDIT.REOPENTEXTSTREAM 83355 . 84707) (\TEDIT.OPENTEXTSTREAM.PIECES 84709 . 89637) ( +\TEDIT.OPENTEXTSTREAM.PROPS 89639 . 90741) (\TEDIT.OPENTEXTSTREAM.SETUP.SEL 90743 . 96193) ( +\TEDIT.OPENTEXTSTREAM.WINDOW 96195 . 98986) (\TEDIT.OPENTEXTSTREAM.DEFAULTLOOKS 98988 . 100927) ( +\TEDIT.OPENTEXTFILE 100929 . 103061) (\TEDIT.CREATE.TEXTSTREAM 103063 . 104210) (\TEDIT.REOPEN.STREAM +104212 . 106548)) (106551 114883 (\TEDIT.STREAMINIT 106561 . 114700) (TEDIT.IMAGESTREAM.OPEN 114702 . +114881)) (115071 116259 (\TEDIT.TTYBOUT 115081 . 116257)) (116377 138060 (\TEDIT.TEXTCLOSEF 116387 . +117711) (\TEDIT.TEXTDSPFONT 117713 . 118911) (\TEDIT.TEXTEOFP 118913 . 120668) (\TEDIT.TEXTGETEOFPTR +120670 . 120993) (\TEDIT.TEXTSETEOFPTR 120995 . 122282) (\TEDIT.TEXTGETFILEPTR 122284 . 125119) ( +\TEDIT.TEXTSETFILEINFO 125121 . 125629) (\TEDIT.TEXTOPENF 125631 . 126562) (\TEDIT.TEXTSETEOF 126564 + . 127180) (\TEDIT.TEXTSETFILEPTR 127182 . 129292) (\TEDIT.TEXTDSPXPOSITION 129294 . 131997) ( +\TEDIT.TEXTDSPYPOSITION 131999 . 132740) (\TEDIT.TEXTLEFTMARGIN 132742 . 133333) (\TEDIT.TEXTCOLOR +133335 . 133918) (\TEDIT.TEXTRIGHTMARGIN 133920 . 137209) (\TEDIT.TEXTDSPCHARWIDTH 137211 . 137515) ( +\TEDIT.TEXTDSPSTRINGWIDTH 137517 . 137823) (\TEDIT.TEXTDSPLINEFEED 137825 . 138058)) (138098 150332 ( +\TEDIT.NTHCHARCODE 138108 . 139634) (\TEDIT.PIECE.NTHCHARCODE 139636 . 143204) (\TEDIT.RPLCHARCODE +143206 . 144764) (\TEDIT.PIECE.RPLCHARCODE 144766 . 149977) (\TEDIT.NTHCHARLOOKS 149979 . 150330)) ( +151379 172254 (\TEDIT.DELETE.SELPIECES 151389 . 155014) (\TEDIT.INSERTCH 155016 . 162821) ( +\TEDIT.INSERTCH.HISTORY 162823 . 166287) (\TEDIT.INSERTEOL 166289 . 168114) (\TEDIT.INSERTCH.INSERTION + 168116 . 170953) (\TEDIT.INSERTCH.EXTEND 170955 . 172252)) (172255 173862 (\TEDIT.NEXTCHANGEABLE.CHNO + 172265 . 172980) (\TEDIT.LASTCHANGEABLE.CHNO 172982 . 173860)) (173863 178652 (\TEDIT.INSTALL.PIECE +173873 . 178650)) (178690 188156 (TEXTPROP 178700 . 179047) (GETTEXTPROP 179049 . 179293) (PUTTEXTPROP + 179295 . 179552) (GETTEXTPROPS 179554 . 179998) (PUTTEXTPROPS 180000 . 180904) (TEXTPROP.ADD 180906 + . 181169) (\TEDIT.TEXTPROP 181171 . 188154)) (188157 190534 (\TEDIT.TEXTOBJ.PROPNAMES 188167 . 189426 +) (\TEDIT.TEXTOBJ.PROPFETCHFN 189428 . 189944) (\TEDIT.TEXTOBJ.PROPSTOREFN 189946 . 190532))))) STOP diff --git a/library/tedit/TEDIT-STREAM.LCOM b/library/tedit/TEDIT-STREAM.LCOM index f477a5e5..083f02ec 100644 Binary files a/library/tedit/TEDIT-STREAM.LCOM and b/library/tedit/TEDIT-STREAM.LCOM differ diff --git a/library/tedit/TEDIT-TFBRAVO b/library/tedit/TEDIT-TFBRAVO index 18a1521c..82b95c0c 100644 --- a/library/tedit/TEDIT-TFBRAVO +++ b/library/tedit/TEDIT-TFBRAVO @@ -1,13 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "21-Jan-2026 12:15:57" {WMEDLEY}TEDIT>TEDIT-TFBRAVO.;190 98203 +(FILECREATED "10-Apr-2026 09:25:52" {WMEDLEY}tedit>TEDIT-TFBRAVO.;192 97960 :EDIT-BY rmk - :CHANGES-TO (FNS BRAVOFILEP) - (VARS TEDIT-TFBRAVOCOMS) + :CHANGES-TO (FNS \TFBRAVO.INSERT.RUN) - :PREVIOUS-DATE " 7-Sep-2025 11:11:43" {WMEDLEY}TEDIT>TEDIT-TFBRAVO.;187) + :PREVIOUS-DATE " 9-Apr-2026 17:24:28" {WMEDLEY}tedit>TEDIT-TFBRAVO.;191) (PRETTYCOMPRINT TEDIT-TFBRAVOCOMS) @@ -1027,7 +1026,8 @@ (\TFBRAVO.INSERT.RUN RUN BSTREAM PARALOOKS TEXTOBJ]) (\TFBRAVO.INSERT.RUN - [LAMBDA (RUN BSTREAM PARALOOKS TEXTOBJ) (* ; "Edited 28-Jul-2025 23:33 by rmk") + [LAMBDA (RUN BSTREAM PARALOOKS TEXTOBJ) (* ; "Edited 10-Apr-2026 09:22 by rmk") + (* ; "Edited 28-Jul-2025 23:33 by rmk") (* ; "Edited 8-Feb-2025 23:08 by rmk") (* ; "Edited 17-Mar-2024 12:41 by rmk") (* ; "Edited 16-Jan-2024 18:28 by rmk") @@ -1064,17 +1064,11 @@ THINSTRING.PTYPE)) (SETQ PBYTESPERCHAR (CL:IF FATP 2 - 1)) - (SETQ PBINABLE (NOT FATP)) - (SETQ PBYTELEN (UNFOLD NCHARS 2)) - (SETQ PUTF8BYTESPERCHAR 2)) + 1))) else (with PIECE PC (SETQ PCONTENTS BSTREAM) (SETQ PFPOS RUNSTART) (SETQ PTYPE THINFILE.PTYPE) - (SETQ PBINABLE T) - (SETQ PBYTESPERCHAR 1) - (SETQ PBYTELEN NCHARS) - (SETQ PUTF8BYTESPERCHAR 2))) + (SETQ PBYTESPERCHAR 1))) (\TEDIT.INSERTPIECE PC NIL TEXTOBJ) PC))]) @@ -1571,18 +1565,18 @@ (AND NIL (\TEDIT.NAMEDTAB.INIT)) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (7784 15335 (BRAVOFILEP 7794 . 9981) (TEDITFROMBRAVO 9983 . 15333)) (15610 32026 ( -\TFBRAVO.GET.USER.CM 15620 . 18800) (\TFBRAVO.USER.CM.LOOKS 18802 . 20295) (\TFBRAVO.READ.USER.CM -20297 . 24920) (\TFBRAVO.INIT.PARALOOKS 24922 . 27139) (\TFBRAVO.INIT.PAGEFORMAT 27141 . 28021) ( -\TFBRAVO.GETPARAMS 28023 . 30877) (\TFBRAVO.FIND.LAST.TRAILER 30879 . 32024)) (32068 52773 ( -\TFBRAVO.PARSE.PARA 32078 . 36005) (\TFBRAVO.READ.PARALOOKS 36007 . 42897) (\TFBRAVO.CREATE.RUNS 42899 - . 44287) (\TFBRAVO.READ.CHARLOOKS 44289 . 49318) (\TFBRAVO.FONT.FROM.CHARLOOKS 49320 . 50874) ( -\TFBRAVO.READNUM? 50876 . 52771)) (52810 63851 (\TFBRAVO.HANDLE.HEADING 52820 . 55547) ( -\TFBRAVO.PARSE.PROFILE.PARA 55549 . 63849)) (63894 86228 (\TFBRAVO.INSERT.PARA 63904 . 64745) ( -\TFBRAVO.INSERT.RUN 64747 . 68238) (\TFBRAVO.SPLIT.PARA 68240 . 75664) (\TFBRAVO.RUN.TABSPEC 75666 . -80533) (\TFBRAVO.INSTALL.PAGEFORMAT 80535 . 86226)) (86229 90372 (\TFBRAVO.ASSERT 86239 . 86769) ( -\TEST.CHARACTER.LOOKS 86771 . 88657) (\TEST.PARAGRAPH.LOOKS 88659 . 90370)) (91382 98037 ( -\TFBRAVO.ADD.NAMEDTAB 91392 . 94995) (\TFBRAVO.COPY.NAMEDTAB 94997 . 95445) (\TFBRAVO.PUT.NAMEDTAB -95447 . 95727) (\TFBRAVO.GET.NAMEDTAB 95729 . 96106) (\NAMEDTABNYET 96108 . 96268) (\NAMEDTABSIZE -96270 . 96785) (\NAMEDTABPREPRINT 96787 . 96985) (\TEDIT.NAMEDTAB.INIT 96987 . 98035))))) + (FILEMAP (NIL (7750 15301 (BRAVOFILEP 7760 . 9947) (TEDITFROMBRAVO 9949 . 15299)) (15576 31992 ( +\TFBRAVO.GET.USER.CM 15586 . 18766) (\TFBRAVO.USER.CM.LOOKS 18768 . 20261) (\TFBRAVO.READ.USER.CM +20263 . 24886) (\TFBRAVO.INIT.PARALOOKS 24888 . 27105) (\TFBRAVO.INIT.PAGEFORMAT 27107 . 27987) ( +\TFBRAVO.GETPARAMS 27989 . 30843) (\TFBRAVO.FIND.LAST.TRAILER 30845 . 31990)) (32034 52739 ( +\TFBRAVO.PARSE.PARA 32044 . 35971) (\TFBRAVO.READ.PARALOOKS 35973 . 42863) (\TFBRAVO.CREATE.RUNS 42865 + . 44253) (\TFBRAVO.READ.CHARLOOKS 44255 . 49284) (\TFBRAVO.FONT.FROM.CHARLOOKS 49286 . 50840) ( +\TFBRAVO.READNUM? 50842 . 52737)) (52776 63817 (\TFBRAVO.HANDLE.HEADING 52786 . 55513) ( +\TFBRAVO.PARSE.PROFILE.PARA 55515 . 63815)) (63860 85985 (\TFBRAVO.INSERT.PARA 63870 . 64711) ( +\TFBRAVO.INSERT.RUN 64713 . 67995) (\TFBRAVO.SPLIT.PARA 67997 . 75421) (\TFBRAVO.RUN.TABSPEC 75423 . +80290) (\TFBRAVO.INSTALL.PAGEFORMAT 80292 . 85983)) (85986 90129 (\TFBRAVO.ASSERT 85996 . 86526) ( +\TEST.CHARACTER.LOOKS 86528 . 88414) (\TEST.PARAGRAPH.LOOKS 88416 . 90127)) (91139 97794 ( +\TFBRAVO.ADD.NAMEDTAB 91149 . 94752) (\TFBRAVO.COPY.NAMEDTAB 94754 . 95202) (\TFBRAVO.PUT.NAMEDTAB +95204 . 95484) (\TFBRAVO.GET.NAMEDTAB 95486 . 95863) (\NAMEDTABNYET 95865 . 96025) (\NAMEDTABSIZE +96027 . 96542) (\NAMEDTABPREPRINT 96544 . 96742) (\TEDIT.NAMEDTAB.INIT 96744 . 97792))))) STOP diff --git a/library/tedit/TEDIT-TFBRAVO.LCOM b/library/tedit/TEDIT-TFBRAVO.LCOM index 8bf7c2d0..c44b9995 100644 Binary files a/library/tedit/TEDIT-TFBRAVO.LCOM and b/library/tedit/TEDIT-TFBRAVO.LCOM differ diff --git a/library/tedit/TEDIT-WINDOW b/library/tedit/TEDIT-WINDOW index 58ee6114..d675e84a 100644 --- a/library/tedit/TEDIT-WINDOW +++ b/library/tedit/TEDIT-WINDOW @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "24-Dec-2025 11:22:33" {WMEDLEY}TEDIT>TEDIT-WINDOW.;883 231422 +(FILECREATED " 7-Feb-2026 18:53:22" {WMEDLEY}TEDIT>TEDIT-WINDOW.;896 234678 :EDIT-BY rmk - :CHANGES-TO (FNS \TEDIT.MINIMAL.WINDOW.SETUP TEDIT.PROMPTCLEAR TEDIT.PROMPTPRINT) + :CHANGES-TO (FNS TEDIT.PROMPTPRINT) - :PREVIOUS-DATE "15-Nov-2025 01:27:38" {WMEDLEY}tedit>TEDIT-WINDOW.;881) + :PREVIOUS-DATE " 5-Feb-2026 08:24:23" {WMEDLEY}TEDIT>TEDIT-WINDOW.;895) (PRETTYCOMPRINT TEDIT-WINDOWCOMS) @@ -458,7 +458,10 @@ WINDOW]) (\TEDIT.WINDOW.GETREGION - [LAMBDA (TSTREAM REGIONTYPE PHEIGHT) (* ; "Edited 25-Oct-2025 10:27 by rmk") + [LAMBDA (TSTREAM REGIONTYPE PHEIGHT) (* ; "Edited 5-Feb-2026 08:24 by rmk") + (* ; "Edited 27-Jan-2026 15:30 by rmk") + (* ; "Edited 25-Jan-2026 20:09 by rmk") + (* ; "Edited 25-Oct-2025 10:27 by rmk") (* ; "Edited 19-Oct-2025 01:05 by rmk") (* ; "Edited 14-Apr-2025 00:05 by rmk") (* ; "Edited 31-Mar-2025 22:43 by rmk") @@ -466,87 +469,94 @@ (* ; "Edited 18-Mar-2025 21:52 by rmk") (* ; "Edited 19-Feb-2025 16:48 by rmk") (* ; "Edited 18-Feb-2025 10:09 by rmk") - (LET ((TEXTOBJ (GETTSTR TSTREAM TEXTOBJ)) - [WIDTHOVERHEAD (IPLUS \TEDIT.LINEREGION.WIDTH (TIMES 2 WBorder) - (if (FGETTOBJ TEXTOBJ TXTNOTSPLITTABLE) - then 0 - elseif (ILEQ \TEDIT.OP.WIDTH 0) - then - (* ;; "On both sides, for symmetry") + (LET* ((TEXTOBJ (GETTSTR TSTREAM TEXTOBJ)) + [WIDTHOVERHEAD (IPLUS \TEDIT.LINEREGION.WIDTH (TIMES 2 WBorder) + (if (FGETTOBJ TEXTOBJ TXTNOTSPLITTABLE) + then 0 + elseif (ILEQ \TEDIT.OP.WIDTH 0) + then + (* ;; "On both sides, for symmetry") - \TEDIT.LINEREGION.WIDTH - else - (* ;; + \TEDIT.LINEREGION.WIDTH + else + (* ;;  "36 to allow for some spacing between the text and the OPS area on the right.") - (IPLUS \TEDIT.OP.WIDTH 36] - [HEIGHTOVERHEAD (IPLUS PHEIGHT (ADD1 (TIMES 2 WBorder)) - (FONTPROP WindowTitleDisplayStream 'HEIGHT] - WIDTH HEIGHT) + (IPLUS \TEDIT.OP.WIDTH 36] + [HEIGHTOVERHEAD (IPLUS PHEIGHT (ADD1 (TIMES 2 WBorder)) + (FONTPROP WindowTitleDisplayStream 'HEIGHT] + WIDTH HEIGHT) - (* ;; "Explict properties cover content") + (* ;; "Explict properties cover content") - [SETQ WIDTH (OR (GETTEXTPROP TEXTOBJ 'OPENWIDTH) - (for PARALOOKS in (FGETTOBJ TEXTOBJ TXTPARALOOKSLIST) - when (IGREATERP (GETPLOOKS PARALOOKS RIGHTMAR) - 0) largest (GETPLOOKS PARALOOKS RIGHTMAR) - finally (RETURN $$EXTREME] - (SETQ HEIGHT (GETTEXTPROP TEXTOBJ 'OPENHEIGHT)) + [SETQ WIDTH (OR (GETTEXTPROP TEXTOBJ 'OPENWIDTH) + (for PARALOOKS in (FGETTOBJ TEXTOBJ TXTPARALOOKSLIST) + when (IGREATERP (GETPLOOKS PARALOOKS RIGHTMAR) + 0) largest (GETPLOOKS PARALOOKS RIGHTMAR) + finally (RETURN $$EXTREME] + (SETQ HEIGHT (GETTEXTPROP TEXTOBJ 'OPENHEIGHT)) - (* ;; "If still no WIDTH or HEIGHT, look at the first 20 lines") + (* ;; "If still no WIDTH or HEIGHT, look at the first 20 lines") - (CL:UNLESS (AND HEIGHT WIDTH) - (for I L (TEXTLEN _ (TEXTLEN TEXTOBJ)) - (REG _ (CREATEREGION 0 0 (IDIFFERENCE SCREENWIDTH WIDTHOVERHEAD) - (IDIFFERENCE SCREENHEIGHT HEIGHTOVERHEAD))) - (W _ 0) - (H _ 0) - (CHNO _ 1) from 1 to 20 while (ILEQ CHNO TEXTLEN) - do - (* ;; + (CL:UNLESS (AND HEIGHT WIDTH) + (for I L (TEXTLEN _ (TEXTLEN TEXTOBJ)) + (REG _ (CREATEREGION 0 0 (IDIFFERENCE SCREENWIDTH WIDTHOVERHEAD) + (IDIFFERENCE SCREENHEIGHT HEIGHTOVERHEAD))) + (IMAGESTREAM _ (CL:IF (\TEDIT.PRIMARYPANE TSTREAM) + (WINDOWPROP (\TEDIT.PRIMARYPANE TSTREAM) + 'DSP) + (DSPCREATE))) + (W _ 0) + (H _ 0) + (CHNO _ 1) from 1 to 20 while (ILESSP CHNO TEXTLEN) + do + (* ;;  "But we start by saying that the right margin is infinite, so we can find the true width") - (SETQ L (\TEDIT.FORMATLINE TSTREAM CHNO NIL REG)) - (SETQ CHNO (FGETLD L LCHARLIM)) - (add H (FGETLD L LHEIGHT)) - (CL:UNLESS WIDTH - (CL:WHEN (EQ 'LEFT (FGETPLOOKS (FGETLD L LPARALOOKS) - QUAD)) + (SETQ L (\TEDIT.FORMATLINE TSTREAM CHNO NIL REG IMAGESTREAM)) + (SETQ CHNO (FGETLD L LCHARLIM)) + (add H (FGETLD L LHEIGHT)) + (CL:UNLESS WIDTH + (CL:WHEN (EQ 'LEFT (FGETPLOOKS (FGETLD L LPARALOOKS) + QUAD)) - (* ;; - "JUSTIFIED, RIGHT and CENTERED involve right margin, which we don't know") + (* ;; + "JUSTIFIED, RIGHT and CENTERED involve right margin, which we don't know") - (SETQ W (IMAX W (FGETLD L LXLIM))))) - finally (CL:UNLESS (OR WIDTH (EQ W 0)) (* ; "Maybe no lefts?") - (SETQ WIDTH W)) - (CL:UNLESS (OR HEIGHT (EQ H 0)) - (SETQ HEIGHT H)))) + (SETQ W (IMAX W (FGETLD L LXLIM))))) + finally (CL:UNLESS (OR WIDTH (EQ W 0)) (* ; "Maybe no lefts?") + (SETQ WIDTH W)) + (CL:UNLESS (OR HEIGHT (EQ H 0)) + (SETQ HEIGHT H)))) - (* ;; "Minimum sizes") + (* ;; "Minimum sizes: 90 characters by 10 lines") - (SETQ WIDTH (IMAX 200 (OR WIDTH 0))) - (SETQ HEIGHT (IMAX 100 (OR HEIGHT 0))) + (CL:UNLESS WIDTH + [SETQ WIDTH (TIMES 80 (FONTPROP TSTREAM 'AVGCHARWIDTH]) + (CL:UNLESS HEIGHT + [SETQ HEIGHT (TIMES 10 (FONTPROP TSTREAM 'HEIGHT]) - (* ;; "Allow for the extra stuff") + (* ;; "Allow for the extra stuff") - (add WIDTH WIDTHOVERHEAD) - (add HEIGHT HEIGHTOVERHEAD) - (if (GRAB-TYPED-REGION REGIONTYPE WIDTH HEIGHT 1.1) - else - (* ;; "Maximum new sizes") + (add WIDTH WIDTHOVERHEAD) + (add HEIGHT HEIGHTOVERHEAD) + (if (GRAB-TYPED-REGION REGIONTYPE WIDTH HEIGHT 1.1) + else + (* ;; "Maximum new sizes") - [SETQ WIDTH (IMIN WIDTH (FIXR (FTIMES SCREENWIDTH 0.9] - [SETQ HEIGHT (IMIN HEIGHT (FIXR (FTIMES SCREENHEIGHT 0.9] - (CLRPROMPT) (* ; "System promptwindow") - (printout PROMPTWINDOW "Please specify a " (OR REGIONTYPE "Tedit") - " region") - (CL:WHEN (TXTFILE TSTREAM) - (printout PROMPTWINDOW " for " 2 (GETTEXTPROP TSTREAM 'FILENAME))) - (TERPRI PROMPTWINDOW) - (GETBOXREGION WIDTH HEIGHT]) + [SETQ WIDTH (IMIN WIDTH (FIXR (FTIMES SCREENWIDTH 0.9] + [SETQ HEIGHT (IMIN HEIGHT (FIXR (FTIMES SCREENHEIGHT 0.9] + (CLRPROMPT) (* ; "System promptwindow") + (printout PROMPTWINDOW "Please specify a " (OR REGIONTYPE "Tedit") + " region") + (CL:WHEN (TXTFILE TSTREAM) + (printout PROMPTWINDOW " for " 2 (GETTEXTPROP TSTREAM 'FILENAME))) + (TERPRI PROMPTWINDOW) + (GETBOXREGION WIDTH HEIGHT]) (\TEDIT.WINDOW.SETUP - [LAMBDA (PANE TSTREAM PROPS AFTERPANE LCHAR1) (* ; "Edited 6-May-2025 11:44 by rmk") + [LAMBDA (PANE TSTREAM PROPS AFTERPANE LCHAR1) (* ; "Edited 15-Jan-2026 10:35 by rmk") + (* ; "Edited 6-May-2025 11:44 by rmk") (* ; "Edited 21-Apr-2025 12:02 by rmk") (* ; "Edited 6-Apr-2025 18:56 by rmk") (* ; "Edited 5-Apr-2025 14:07 by rmk") @@ -595,11 +605,12 @@ (\TEDIT.CLEARPANE PANE) (\TEDIT.SUFFIXLINE.CREATE PANE TSTREAM (\TEDIT.LINES.BELOW NIL PANE TSTREAM)) (CL:WHEN AFTERPANE - (for PANE inpanes (PROGN TEXTOBJ) as L1 on (GETSEL SEL L1) as LN - on (GETSEL SEL LN) when (EQ PANE AFTERPANE) do (push (CDR L1) - NIL) - (push (CDR LN) - NIL))) + (for P inpanes (PROGN TEXTOBJ) as L1 on (GETSEL SEL L1) as LN + on (GETSEL SEL LN) when (EQ P AFTERPANE) do (push (CDR L1) + NIL) + (push (CDR LN) + NIL)) + (WINDOWPROP PANE 'PROMPTWINDOW (WINDOWPROP AFTERPANE 'PROMPTWINDOW))) (FSETSEL SEL HASCARET (NOT (FGETTOBJ TEXTOBJ TXTREADONLY))) (\TEDIT.FIXSEL SEL TSTREAM (AND AFTERPANE PANE)) (* ;  "If not fixed, the highlight in the lower pane will disappear") @@ -775,7 +786,8 @@ (DEFINEQ (\TEDIT.CURSORMOVEDFN - [LAMBDA (PANE) (* ; "Edited 27-Apr-2025 23:43 by rmk") + [LAMBDA (PANE) (* ; "Edited 14-Jan-2026 00:42 by rmk") + (* ; "Edited 27-Apr-2025 23:43 by rmk") (* ; "Edited 24-Apr-2025 10:35 by rmk") (* ; "Edited 19-Apr-2025 22:22 by rmk") (* ; "Edited 1-Dec-2024 11:55 by rmk") @@ -792,71 +804,68 @@ (CL:WHEN (fetch (TEXTWINDOW WTEXTSTREAM) of (OR (WINDOWP PANE) (PANEWINDOW PANE))) - [PROG ((X (LASTMOUSEX PANE)) - (Y (LASTMOUSEY PANE)) - (TEXTOBJ (PANETEXTOBJ PANE)) - (CURSORREG (fetch (TEXTWINDOW CURSORREGION) of (PANEWINDOW PANE))) - LINE LEFT) - (CL:UNLESS (INSIDE? (PANEREGION PANE) - X Y) - (CURSOR T) - (RETURN)) - (CL:UNLESS (INSIDE? CURSORREG X Y) - [if [AND (IGEQ X (SETQ LEFT (IDIFFERENCE (PANERIGHT PANE) - \TEDIT.OP.WIDTH))) - (IGEQ Y (IPLUS (PANEBOTTOM PANE) - \TEDIT.OP.BOTTOM)) - (NOT (OR (FGETTOBJ TEXTOBJ TXTNOTSPLITTABLE) - (EQ \TEDIT.OP.WIDTH -1] - then - (* ;; "We're in the split region on the right") + [LET ((X (LASTMOUSEX PANE)) + (Y (LASTMOUSEY PANE)) + (TEXTOBJ (PANETEXTOBJ PANE)) + (CURSORREG (fetch (TEXTWINDOW CURSORREGION) of (PANEWINDOW PANE))) + LINE LEFT) + (CL:UNLESS (INSIDE? CURSORREG X Y) + [if [AND (IGEQ X (SETQ LEFT (IDIFFERENCE (PANERIGHT PANE) + \TEDIT.OP.WIDTH))) + (IGEQ Y (IPLUS (PANEBOTTOM PANE) + \TEDIT.OP.BOTTOM)) + (NOT (OR (FGETTOBJ TEXTOBJ TXTNOTSPLITTABLE) + (EQ \TEDIT.OP.WIDTH -1] + then + (* ;; "We're in the split region on the right") - (CURSOR \TEDIT.SPLITCURSOR) - (FSETTOBJ TEXTOBJ MOUSEREGION 'PANE) + (CURSOR \TEDIT.SPLITCURSOR) + (FSETTOBJ TEXTOBJ MOUSEREGION 'PANE) (* ;  "PANE just signals \TEDIT.BUTTONEVENTFN to do a split operation.") - (replace (REGION LEFT) of CURSORREG with LEFT) - (replace (REGION WIDTH) of CURSORREG with \TEDIT.OP.WIDTH) - else - (* ;; "Not in the split region. Are we in the line-select region on the left? Don't call PANEPREFIX, because that tests for LINEDESCRIPTOR") + (replace (REGION LEFT) of CURSORREG with LEFT) + (replace (REGION WIDTH) of CURSORREG with \TEDIT.OP.WIDTH) + else + (* ;; "Not in the split region. Are we in the line-select region on the left? Don't call PANEPREFIX, because that tests for LINEDESCRIPTOR") - (SETQ LINE (find L inlines (GETPANEPROP (PANEPROPS PANE) - PREFIXLINE) - suchthat (ILEQ (FGETLD L YBOT) - Y))) - (CL:WHEN LINE (* ; + (SETQ LINE (find L inlines (GETPANEPROP (PANEPROPS PANE) + PREFIXLINE) + suchthat (ILEQ (FGETLD L YBOT) + Y))) + (CL:WHEN LINE (* ;  "The CURSORREGION picks out just LINE") - (replace BOTTOM of CURSORREG with (FGETLD LINE YBOT)) - (replace HEIGHT of CURSORREG with (FGETLD LINE LHEIGHT))) + (replace BOTTOM of CURSORREG with (FGETLD LINE YBOT)) + (replace HEIGHT of CURSORREG with (FGETLD LINE LHEIGHT))) - (* ;; "The line region gets wider if the paragraph is indented") + (* ;; "The line region gets wider if the paragraph is indented") - (SETQ LEFT (OR (AND LINE (FGETLD LINE LEFTMARGIN)) - (IPLUS (PANELEFT PANE) - \TEDIT.LINEREGION.WIDTH))) - (if (ILESSP X LEFT) - then - (* ;; "In left margin; switch to the line-select cursor") + (SETQ LEFT (OR (AND LINE (FGETLD LINE LEFTMARGIN)) + (IPLUS (PANELEFT PANE) + \TEDIT.LINEREGION.WIDTH))) + (if (ILESSP X LEFT) + then + (* ;; "In left margin; switch to the line-select cursor") - (CURSOR \TEDIT.LINECURSOR) - (FSETTOBJ TEXTOBJ MOUSEREGION 'LINE) - (replace (REGION LEFT) of CURSORREG with 0) - (replace (REGION WIDTH) of CURSORREG with LEFT) - else - (* ;; + (CURSOR \TEDIT.LINECURSOR) + (FSETTOBJ TEXTOBJ MOUSEREGION 'LINE) + (replace (REGION LEFT) of CURSORREG with 0) + (replace (REGION WIDTH) of CURSORREG with LEFT) + else + (* ;;  "Not in the line-select region, not in the split region, must be the main text. ") - (CURSOR T) - (FSETTOBJ TEXTOBJ MOUSEREGION 'TEXT) - (replace (REGION LEFT) of CURSORREG with LEFT) - (replace (REGION WIDTH) of CURSORREG with (IDIFFERENCE (PANERIGHT - PANE) - (IPLUS LEFT + (CURSOR T) + (FSETTOBJ TEXTOBJ MOUSEREGION 'TEXT) + (replace (REGION LEFT) of CURSORREG with LEFT) + (replace (REGION WIDTH) of CURSORREG with (IDIFFERENCE (PANERIGHT + PANE) + (IPLUS LEFT \TEDIT.LINEREGION.WIDTH - ])])]) + ])])]) (\TEDIT.CURSOROUTFN - [LAMBDA (PANE) (* ; "Edited 4-May-2025 14:27 by rmk") + [LAMBDA (PANE) (* ; "Edited 10-Jan-2026 22:49 by rmk") + (* ; "Edited 4-May-2025 14:27 by rmk") (* ; "Edited 20-Jul-2023 20:32 by rmk") (* ; "Edited 30-May-91 23:32 by jds") @@ -1147,7 +1156,9 @@ (DEFINEQ (\TEDIT.BUTTONEVENTFN - [LAMBDA (PANE) (* ; "Edited 6-May-2025 20:35 by rmk") + [LAMBDA (PANE) (* ; "Edited 15-Jan-2026 00:39 by rmk") + (* ; "Edited 11-Jan-2026 08:30 by rmk") + (* ; "Edited 6-May-2025 20:35 by rmk") (* ; "Edited 21-Apr-2025 20:19 by rmk") (* ; "Edited 13-Apr-2025 13:33 by rmk") (* ; "Edited 6-Apr-2025 18:59 by rmk") @@ -1187,7 +1198,7 @@ (OLDX _ MIN.SMALLP) (OLDY _ MIN.SMALLP) (PREG _ (PANEREGION PANE)) - TEXTOBJ CURSEL NEWSEL CUROPERATION NEWOPERATION PENDINGDEL READONLY + TEXTOBJ CURSEL NEWSEL CUROPERATION NEWOPERATION PENDINGDEL READONLY SECSEL declare (SPECVARS CURSEL) first (* ;; "Pick off and return from a bunch of peripheral situations, then fall through to the complexities of normal text selection.") @@ -1215,13 +1226,34 @@ (* ;; "") (SETQ READONLY (FGETTOBJ TEXTOBJ TXTREADONLY)) - (SETQ CUROPERATION 'NORMAL) (SETQ NEWOPERATION (\TEDIT.BUTTONEVENTFN.GETOPERATION - READONLY NIL)) - (CL:UNLESS (SETQ CURSEL ( + READONLY NIL)) + + (* ;; "") + + (if (SETQ CURSEL (FGETTOBJ TEXTOBJ SECONDARYSEL)) + then (* ; + "Mouse moved out and came back...and clicked.") + (SETQ CUROPERATION (FGETSEL CURSEL + SELOPERATION)) + (SETQ PENDINGDEL (EQ CUROPERATION + 'PENDINGDEL)) + (CL:UNLESS (EQ NEWOPERATION CUROPERATION) + (* ; + "Shift keys have changed, turn off old secondary") + (\TEDIT.SEL.OFF TSTREAM CURSEL)) + (CL:WHEN (EQ NEWOPERATION 'NORMAL) + (* ; "") + (CL:UNLESS (SETQ CURSEL (  \TEDIT.BUTTONEVENTFN.CURSEL.INIT - NEWOPERATION TSTREAM)) - (RETURN)) + NEWOPERATION + TSTREAM)) + (RETURN))) + elseif (SETQ CURSEL ( + \TEDIT.BUTTONEVENTFN.CURSEL.INIT + NEWOPERATION TSTREAM)) + then (SETQ CUROPERATION 'NORMAL) + else (RETURN)) (SETQ NEWSEL (\TEDIT.COPYSEL CURSEL)) (* ;  "Gets line-chains and consistent initial looks") @@ -1230,35 +1262,27 @@ (GETMOUSESTATE) (* ;  "And get the new mouse and key info") (\TEDIT.CURSORMOVEDFN PANE) - (SETQ NEWOPERATION (\TEDIT.BUTTONEVENTFN.GETOPERATION READONLY CUROPERATION)) + (SETQ NEWOPERATION (\TEDIT.BUTTONEVENTFN.GETOPERATION READONLY CUROPERATION)) + (FSETTOBJ TEXTOBJ SECONDARYSEL CURSEL) (* ;; "We're done if keys and buttons are up") until (AND (EQ NEWOPERATION 'NORMAL) (ALLBUTTONSUP)) unless (AND (IEQP OLDX (SETQ X (LASTMOUSEX DS))) (IEQP OLDY (SETQ Y (LASTMOUSEY DS))) (EQ CUROPERATION NEWOPERATION)) - do + do (CL:UNLESS (INSIDEP (PANEREGION PANE PREG) + X Y) (* ; + "Left the window, stay in the loop if scrolling") + (CL:UNLESS (IN/SCROLL/BAR? PANE LASTMOUSEX LASTMOUSEY) + (RETURN)) + (SCROLL.HANDLER PANE)) + + (* ;; "") + (* ;; "Polling loop, track the mouse until the buttons and modifier keys come up, i.e. NORMAL Nothing to do until the mouse moves or the operation changes. .") (* ;; "First and always: CURSEL is ON at this point and matches the display. NEWSEL may not be well-defined.") - (CL:UNLESS (INSIDEP (PANEREGION PANE PREG) - X Y) (* ; - "The mouse left the window: cleanup and leave. ") - (CL:UNLESS (EQ CUROPERATION 'NORMAL) (* ; - "Take down the copy/delete/copylooks highlight") - (\TEDIT.SEL.OFF TSTREAM CURSEL) - (\TEDIT.SEL.ON TSTREAM)) (* ; "Go back to original selection?") - - (* ;; - "Scroll if mouse moved to scroll bar (and scroll bar doesn't overlap the window)") - - (CL:WHEN (IN/SCROLL/BAR? PANE LASTMOUSEX LASTMOUSEY) - (SCROLL.HANDLER PANE)) - (RETURN)) - - (* ;; "") - (* ;; "Ready to track the selection.") (SETQ OLDX X) @@ -1322,9 +1346,12 @@ (* ;; "Out of Polling loop") + (SETTOBJ (FTEXTOBJ TSTREAM) + SECONDARYSEL NIL) (* ; + "All keys are up, secondary selection is closed") (CL:UNLESS (FGETSEL NEWSEL SET) - (* ;; ".Here to restore when no valid selection, maybe an unhappy image object?") + (* ;; "Here to restore when no valid selection, maybe an unhappy image object?") (\TEDIT.SEL.OFF TSTREAM CURSEL) (* ; "Turn off CURSEL") (\TEDIT.SET.SEL.LOOKS (TEXTSEL TEXTOBJ) @@ -1335,6 +1362,8 @@ (\TEDIT.BUTTONEVENTFN.DOOPERATION [LAMBDA (CURSEL CUROPERATION TSTREAM PANE PENDINGDEL TTYPROC) + (* ; "Edited 31-Jan-2026 11:51 by rmk") + (* ; "Edited 9-Jan-2026 11:28 by rmk") (* ; "Edited 6-May-2025 11:54 by rmk") (* ; "Edited 27-Apr-2025 22:26 by rmk") (* ; "Edited 21-Apr-2025 20:32 by rmk") @@ -1388,14 +1417,14 @@  "Make sure the caret blinks in the position of a successful deletion") (FSETSEL TEXTSEL HASCARET T)) (\TEDIT.SETCARET TEXTSEL PANE TEXTOBJ T)) - (COPY (CL:IF TTYSEL + (COPY (\TEDIT.SEL.OFF TSTREAM CURSEL) + (CL:IF TTYSEL (\TEDIT.COPY CURSEL TTYSEL TSTREAM TTYSTREAM) - (\TEDIT.FOREIGN.COPY TTYW CURSEL TSTREAM)) - (\TEDIT.SEL.OFF TSTREAM CURSEL)) + (\TEDIT.FOREIGN.COPY CURSEL TSTREAM))) (MOVE (\TEDIT.SEL.OFF TSTREAM CURSEL) (if TTYSEL then (\TEDIT.MOVE CURSEL TTYSEL TSTREAM TTYSTREAM) - else (\TEDIT.FOREIGN.COPY TTYW CURSEL TSTREAM) + else (\TEDIT.FOREIGN.COPY CURSEL TSTREAM) (* ; "TEXTSEL moves to deletion point") (\TEDIT.UPDATE.SEL TEXTSEL (FGETSEL CURSEL CH#) 0 @@ -1618,7 +1647,8 @@ then (TEDIT.INSERT TSTREAM I]) (\TEDIT.FOREIGN.COPY - [LAMBDA (TTYW SOURCESEL SOURCESTREAM BKSYSBUFP) (* ; "Edited 28-Mar-2025 12:51 by rmk") + [LAMBDA (SOURCESEL SOURCESTREAM BKSYSBUFP) (* ; "Edited 31-Jan-2026 09:20 by rmk") + (* ; "Edited 28-Mar-2025 12:51 by rmk") (* ; "Edited 27-Aug-2024 13:38 by rmk") (* ; "Edited 7-Jul-2024 09:26 by rmk") (* ; "Edited 29-Apr-2024 13:37 by rmk") @@ -1630,7 +1660,8 @@ (CL:WHEN (IGREATERP (GETSEL SOURCESEL DCH) 0) (* ; "If empty, nothing to do") [if (AND NIL (NOT BKSYSBUFP) - (WINDOWPROP TTYW 'COPYINSERTFN)) + (PROCESSPROP (TTY.PROCESS) + 'WINDOW)) then (* ;; "This is a stub for a definition that knows how to do a looked string object, given that the destination TTY window has a COPYINSERTFN. OBJECTFROMSEL is in {LFG}tedit/UNBREAKABLESTRING") @@ -2060,7 +2091,8 @@ PROMPTWINDOW]) (TEDIT.PROMPTPRINT - [LAMBDA (TSTREAM MSG CLEAR? FLASH?) (* ; "Edited 14-Dec-2025 17:41 by rmk") + [LAMBDA (TSTREAM MSG CLEAR? FLASH?) (* ; "Edited 7-Feb-2026 18:51 by rmk") + (* ; "Edited 14-Dec-2025 17:41 by rmk") (* ; "Edited 29-Dec-2024 14:45 by rmk") (* ; "Edited 26-Nov-2023 10:10 by rmk") (* ; "Edited 10-Sep-2023 00:27 by rmk") @@ -2072,31 +2104,33 @@ (* ;; "Print a message in the editor's prompt window (if none, use the global promptwindow). Optionally clear the window first.") - (LET ((TEXTOBJ (TEXTOBJ TSTREAM T)) - PWINDOW MAINWINDOW) - (if TEXTOBJ - then (CL:WHEN (SETQ MAINWINDOW (\TEDIT.MAINW TEXTOBJ)) - [SETQ PWINDOW - (CAR (NLSETQ (SELECTQ PWINDOW - (DON'T (CL:WHEN (GETTEXTPROP TEXTOBJ 'PWINDOW.ON.DEMAND) - (GETPROMPTWINDOW MAINWINDOW))) - (NIL (CL:WHEN TSTREAM - [GETPROMPTWINDOW MAINWINDOW NIL NIL - (NOT (GETTEXTPROP TEXTOBJ 'PWINDOW.ON.DEMAND])) - PWINDOW]) (* ; + (PROG ((TEXTOBJ (TEXTOBJ TSTREAM T)) + PWINDOW MAINWINDOW) + (CL:UNLESS TEXTOBJ + (PROMPTPRINT MSG) + (RETURN)) + (CL:WHEN (SETQ MAINWINDOW (\TEDIT.MAINW TSTREAM)) + (SETQ PWINDOW (FGETTOBJ TEXTOBJ PROMPTWINDOW)) + [SETQ PWINDOW (CAR (NLSETQ (SELECTQ PWINDOW + (DON'T (CL:WHEN (GETTEXTPROP TEXTOBJ 'PWINDOW.ON.DEMAND) + (GETPROMPTWINDOW MAINWINDOW))) + (NIL (CL:WHEN TSTREAM + [GETPROMPTWINDOW MAINWINDOW NIL NIL + (NOT (GETTEXTPROP TEXTOBJ + 'PWINDOW.ON.DEMAND])) + PWINDOW]) (* ;  "Try to find an editor's prompt window for our message") - (COND - ((WINDOWP PWINDOW) (* ; + (if (WINDOWP PWINDOW) + then (* ;  "We found a window to use. Print the message.") - (CL:WHEN CLEAR? (CLEARW PWINDOW)) - (CL:WHEN FLASH? (FLASHWINDOW PWINDOW 1 75)) - (PRIN1 MSG PWINDOW)) - (T (* ; + (CL:WHEN CLEAR? (CLEARW PWINDOW)) + (CL:WHEN FLASH? (FLASHWINDOW PWINDOW 1 75)) + (PRIN1 MSG PWINDOW) + else (* ;  "Failing all else, use global PROMPTWINDOW.") - (FRESHLINE PROMPTWINDOW) - (CL:WHEN FLASH? (FLASHWINDOW PWINDOW 1 75)) - (printout PROMPTWINDOW MSG))) - else (PROMPTPRINT MSG]) + (FRESHLINE PROMPTWINDOW) + (CL:WHEN FLASH? (FLASHWINDOW PWINDOW 1 75)) + (printout PROMPTWINDOW MSG]) (TEDIT.PROMPTCLEAR [LAMBDA (TSTREAM FONT) (* ; "Edited 14-Dec-2025 17:34 by rmk") @@ -3664,36 +3698,36 @@ (RPAQ? TEDIT.TITLED.ICON.TEMPLATE (create TITLEDICON ICON _ TEDITICON MASK _ TEDITMASK TITLEREG _ TEDIT.ICON.TITLE.REGION)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (17143 18039 (TEDIT.DEFER.UPDATES 17153 . 18037)) (18040 45281 (\TEDIT.WINDOW.CREATE -18050 . 24913) (\TEDIT.WINDOW.GETREGION 24915 . 29619) (\TEDIT.WINDOW.SETUP 29621 . 33951) ( -\TEDIT.MINIMAL.WINDOW.SETUP 33953 . 41913) (\TEDIT.CLEARPANE 41915 . 42632) (\TEDIT.FILL.PANES 42634 - . 45279)) (45282 68983 (\TEDIT.CURSORMOVEDFN 45292 . 50902) (\TEDIT.CURSOROUTFN 50904 . 51592) ( -\TEDIT.ACTIVE.WINDOWP 51594 . 52664) (\TEDIT.EXPANDFN 52666 . 53229) (\TEDIT.MAINW 53231 . 54511) ( -\TEDIT.MAINSTREAM 54513 . 54847) (\TEDIT.PRIMARYPANE 54849 . 55619) (\TEDIT.PANELIST 55621 . 56117) ( -\TEDIT.NEWREGIONFN 56119 . 58635) (\TEDIT.SET.WINDOW.EXTENT 58637 . 63619) (\TEDIT.SHRINK.ICONCREATE -63621 . 66354) (\TEDIT.SHRINKFN 66356 . 66765) (\TEDIT.PANEREGION 66767 . 68981)) (69015 102061 ( -\TEDIT.BUTTONEVENTFN 69025 . 81998) (\TEDIT.BUTTONEVENTFN.DOOPERATION 82000 . 89263) ( -\TEDIT.BUTTONEVENTFN.GETOPERATION 89265 . 91107) (\TEDIT.BUTTONEVENTFN.CURSEL.INIT 91109 . 94779) ( -\TEDIT.BUTTONEVENTFN.INACTIVE 94781 . 97211) (\TEDIT.BUTTONEVENTFN.INTITLE 97213 . 99048) ( -\TEDIT.COPYINSERTFN 99050 . 100182) (\TEDIT.FOREIGN.COPY 100184 . 102059)) (102062 119625 ( -\TEDIT.PANE.SPLIT 102072 . 106020) (\TEDIT.SPLITW 106022 . 114081) (\TEDIT.UNSPLITW 114083 . 118282) ( -\TEDIT.LINKPANES 118284 . 119047) (\TEDIT.UNLINKPANE 119049 . 119623)) (121059 121950 (TEDITWINDOWP -121069 . 121948)) (121987 125090 (TEDIT.GETINPUT 121997 . 124440) (\TEDIT.MAKEFILENAME 124442 . 125088 -)) (125139 132985 (TEDIT.PROMPTWINDOW 125149 . 125463) (TEDIT.PROMPTPRINT 125465 . 128195) ( -TEDIT.PROMPTCLEAR 128197 . 130032) (TEDIT.PROMPTFLASH 130034 . 131292) (\TEDIT.PROMPT.PAGEFULLFN -131294 . 132983)) (133223 143801 (\TEDIT.FILENAME 133233 . 134005) (\TEDIT.DEFAULT.TITLE 134007 . -136386) (\TEDIT.WINDOW.TITLE 136388 . 138557) (\TEDIT.LIKELY.FILENAME 138559 . 141283) ( -\TEDIT.UPDATE.TITLE 141285 . 143799)) (143844 156328 (TEDIT.DEACTIVATE.WINDOW 143854 . 149427) ( -\TEDIT.RESHAPEFN 149429 . 151514) (\TEDIT.REPAINTFN 151516 . 151740) (\TEDIT.CLOSESPLITS 151742 . -154187) (\TEDIT.CLOSEPANE 154189 . 156326)) (156329 199128 (\TEDIT.SCROLLFN 156339 . 158570) ( -\TEDIT.SCROLLCH.TOP 158572 . 160683) (\TEDIT.SCROLLCH.BOTTOM 160685 . 165015) (\TEDIT.SCROLLUP 165017 - . 170743) (\TEDIT.TOPLINE.YTOP 170745 . 172414) (\TEDIT.SCROLLDOWN 172416 . 179455) ( -\TEDIT.SCROLL.CARET 179457 . 182295) (\TEDIT.VISIBLECARETP 182297 . 184591) (\TEDIT.VISIBLECHARP -184593 . 185684) (\TEDIT.BITMAPLINES 185686 . 189606) (\TEDIT.SETPANE.TOPLINE 189608 . 190220) ( -\TEDIT.SHIFTLINES 190222 . 199126)) (199129 209998 (\TEDIT.ONSCREEN? 199139 . 203690) ( -\TEDIT.ONSCREEN.REGION 203692 . 207343) (\TEDIT.AFTERMOVEFN 207345 . 208242) (OFFSCREENP 208244 . -209996)) (210040 212854 (\TEDIT.PROCIDLEFN 210050 . 211710) (\TEDIT.PROCENTRYFN 211712 . 212157) ( -\TEDIT.PROCEXITFN 212159 . 212852)) (212933 226158 (\TEDIT.DOWNCARET 212943 . 213736) ( -\TEDIT.FLASHCARET 213738 . 215849) (\TEDIT.UPCARET 215851 . 216955) (TEDIT.NORMALIZECARET 216957 . -220175) (\TEDIT.SETCARET 220177 . 225528) (\TEDIT.CARET 225530 . 226156))))) + (FILEMAP (NIL (17097 17993 (TEDIT.DEFER.UPDATES 17107 . 17991)) (17994 46195 (\TEDIT.WINDOW.CREATE +18004 . 24867) (\TEDIT.WINDOW.GETREGION 24869 . 30356) (\TEDIT.WINDOW.SETUP 30358 . 34865) ( +\TEDIT.MINIMAL.WINDOW.SETUP 34867 . 42827) (\TEDIT.CLEARPANE 42829 . 43546) (\TEDIT.FILL.PANES 43548 + . 46193)) (46196 69923 (\TEDIT.CURSORMOVEDFN 46206 . 51733) (\TEDIT.CURSOROUTFN 51735 . 52532) ( +\TEDIT.ACTIVE.WINDOWP 52534 . 53604) (\TEDIT.EXPANDFN 53606 . 54169) (\TEDIT.MAINW 54171 . 55451) ( +\TEDIT.MAINSTREAM 55453 . 55787) (\TEDIT.PRIMARYPANE 55789 . 56559) (\TEDIT.PANELIST 56561 . 57057) ( +\TEDIT.NEWREGIONFN 57059 . 59575) (\TEDIT.SET.WINDOW.EXTENT 59577 . 64559) (\TEDIT.SHRINK.ICONCREATE +64561 . 67294) (\TEDIT.SHRINKFN 67296 . 67705) (\TEDIT.PANEREGION 67707 . 69921)) (69955 105080 ( +\TEDIT.BUTTONEVENTFN 69965 . 84672) (\TEDIT.BUTTONEVENTFN.DOOPERATION 84674 . 92145) ( +\TEDIT.BUTTONEVENTFN.GETOPERATION 92147 . 93989) (\TEDIT.BUTTONEVENTFN.CURSEL.INIT 93991 . 97661) ( +\TEDIT.BUTTONEVENTFN.INACTIVE 97663 . 100093) (\TEDIT.BUTTONEVENTFN.INTITLE 100095 . 101930) ( +\TEDIT.COPYINSERTFN 101932 . 103064) (\TEDIT.FOREIGN.COPY 103066 . 105078)) (105081 122644 ( +\TEDIT.PANE.SPLIT 105091 . 109039) (\TEDIT.SPLITW 109041 . 117100) (\TEDIT.UNSPLITW 117102 . 121301) ( +\TEDIT.LINKPANES 121303 . 122066) (\TEDIT.UNLINKPANE 122068 . 122642)) (124078 124969 (TEDITWINDOWP +124088 . 124967)) (125006 128109 (TEDIT.GETINPUT 125016 . 127459) (\TEDIT.MAKEFILENAME 127461 . 128107 +)) (128158 136241 (TEDIT.PROMPTWINDOW 128168 . 128482) (TEDIT.PROMPTPRINT 128484 . 131451) ( +TEDIT.PROMPTCLEAR 131453 . 133288) (TEDIT.PROMPTFLASH 133290 . 134548) (\TEDIT.PROMPT.PAGEFULLFN +134550 . 136239)) (136479 147057 (\TEDIT.FILENAME 136489 . 137261) (\TEDIT.DEFAULT.TITLE 137263 . +139642) (\TEDIT.WINDOW.TITLE 139644 . 141813) (\TEDIT.LIKELY.FILENAME 141815 . 144539) ( +\TEDIT.UPDATE.TITLE 144541 . 147055)) (147100 159584 (TEDIT.DEACTIVATE.WINDOW 147110 . 152683) ( +\TEDIT.RESHAPEFN 152685 . 154770) (\TEDIT.REPAINTFN 154772 . 154996) (\TEDIT.CLOSESPLITS 154998 . +157443) (\TEDIT.CLOSEPANE 157445 . 159582)) (159585 202384 (\TEDIT.SCROLLFN 159595 . 161826) ( +\TEDIT.SCROLLCH.TOP 161828 . 163939) (\TEDIT.SCROLLCH.BOTTOM 163941 . 168271) (\TEDIT.SCROLLUP 168273 + . 173999) (\TEDIT.TOPLINE.YTOP 174001 . 175670) (\TEDIT.SCROLLDOWN 175672 . 182711) ( +\TEDIT.SCROLL.CARET 182713 . 185551) (\TEDIT.VISIBLECARETP 185553 . 187847) (\TEDIT.VISIBLECHARP +187849 . 188940) (\TEDIT.BITMAPLINES 188942 . 192862) (\TEDIT.SETPANE.TOPLINE 192864 . 193476) ( +\TEDIT.SHIFTLINES 193478 . 202382)) (202385 213254 (\TEDIT.ONSCREEN? 202395 . 206946) ( +\TEDIT.ONSCREEN.REGION 206948 . 210599) (\TEDIT.AFTERMOVEFN 210601 . 211498) (OFFSCREENP 211500 . +213252)) (213296 216110 (\TEDIT.PROCIDLEFN 213306 . 214966) (\TEDIT.PROCENTRYFN 214968 . 215413) ( +\TEDIT.PROCEXITFN 215415 . 216108)) (216189 229414 (\TEDIT.DOWNCARET 216199 . 216992) ( +\TEDIT.FLASHCARET 216994 . 219105) (\TEDIT.UPCARET 219107 . 220211) (TEDIT.NORMALIZECARET 220213 . +223431) (\TEDIT.SETCARET 223433 . 228784) (\TEDIT.CARET 228786 . 229412))))) STOP diff --git a/library/tedit/TEDIT-WINDOW.LCOM b/library/tedit/TEDIT-WINDOW.LCOM index 02c73d4d..a8581c7f 100644 Binary files a/library/tedit/TEDIT-WINDOW.LCOM and b/library/tedit/TEDIT-WINDOW.LCOM differ diff --git a/library/tedit/TEDIT.LCOM b/library/tedit/TEDIT.LCOM index 5e803694..f1ac94b5 100644 Binary files a/library/tedit/TEDIT.LCOM and b/library/tedit/TEDIT.LCOM differ diff --git a/library/tedit/tedit-exports.all b/library/tedit/tedit-exports.all index cb02912f..c44d4199 100644 --- a/library/tedit/tedit-exports.all +++ b/library/tedit/tedit-exports.all @@ -1,11 +1,10 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "16-Feb-2026 08:56:58"  -{DSK}kaplan>Local>medley3.5>working-medley>library>tedit>tedit-exports.all;249 52790 +(FILECREATED " 1-May-2026 08:16:04" {MEDLEY}tedit>tedit-exports.all;255 52514 :EDIT-BY rmk - :PREVIOUS-DATE "14-Jan-2026 14:50:53" {WMEDLEY}TEDIT>tedit-exports.all;248) + :PREVIOUS-DATE "15-Apr-2026 23:45:28" {MEDLEY}TEDIT>tedit-exports.all;254) (PRETTYCOMPRINT ((E (MAPC (MKLIST FROMFILES) (FUNCTION (LAMBDA (F) (MAPC (IMPORTFILE F FLG) (FUNCTION @@ -17,7 +16,7 @@ PRINT)))))))) (PUTPROPS FTEXTOBJ MACRO ((X) (TEXTOBJ! (CL:IF (type? TEXTOBJ X) X (GETTSTR X TEXTOBJ))))) (GLOBALVARS CHECK-TEDIT-ASSERTIONS) (RPAQ? CHECK-TEDIT-ASSERTIONS T) -(PUTPROP (QUOTE TEDIT) (QUOTE IMPORTDATE) (IDATE " 4-Feb-2026 16:02:02")) +(PUTPROP (QUOTE TEDIT) (QUOTE IMPORTDATE) (IDATE "10-Mar-2026 18:07:31")) (RPAQQ \BTREEWORDSPERSLOT 4) (RPAQQ \BTREEMAXCOUNT 8) (CONSTANTS (\BTREEWORDSPERSLOT 4) (\BTREEMAXCOUNT 8)) @@ -51,7 +50,7 @@ DLEN1 DOWN2 DLEN2 DOWN3 DLEN3 DOWN4 DLEN4 DOWN5 DLEN5 DOWN6 DLEN6 DOWN7 DLEN7 DO (\DTEST (OR (NEXTPIECE I.V.) (GO $$OUT)) (QUOTE PIECE))))) (I.S.OPR (QUOTE backpieces) NIL (QUOTE (first (SETQ I.V. (\DTEST (OR BODY (GO $$OUT)) (QUOTE PIECE))) by (\DTEST (OR (PREVPIECE I.V.) (GO $$OUT)) (QUOTE PIECE))))) -(PUTPROP (QUOTE TEDIT-PCTREE) (QUOTE IMPORTDATE) (IDATE "14-Feb-2026 13:22:06")) +(PUTPROP (QUOTE TEDIT-PCTREE) (QUOTE IMPORTDATE) (IDATE " 9-Apr-2026 17:25:38")) (DATATYPE SELECTION ((* ;; "Description of a piece of selected text for TEdit. Text has to be selected before it can be operated on by the user. The caret is to the left of CH# if POINT is LEFT, to the keft of CHLIM if POINT is RIGHT." ) (* ;; "If DCH > 0, highlighting goes from CH# to (SUB1 CHLIM = (SUB1 (IPLUS CH# DCH)).") (* ;; @@ -128,7 +127,7 @@ TSTREAM ONLYPANE DONTFIX))) (PUTPROPS \TEDIT.SEL.OFF MACRO ((TSTREAM SEL ONLYPANE) (* ; "Takes down SEL in TSTREAM, where SEL defaults to the current selection") (\TEDIT.SHOWSEL SEL NIL TSTREAM ONLYPANE))) -(PUTPROP (QUOTE TEDIT-SELECTION) (QUOTE IMPORTDATE) (IDATE "16-Feb-2026 00:38:33")) +(PUTPROP (QUOTE TEDIT-SELECTION) (QUOTE IMPORTDATE) (IDATE "16-Apr-2026 09:27:41")) (RECORD TAB (TABX . TABKIND)) (RECORD TABSPEC (DEFAULTTAB . TABS)) (DATATYPE LINECACHE ((* ;; "Image cache for display lines.") LCBITMAP (* ; @@ -263,21 +262,22 @@ $$CHARSLOTLIMIT))))) T) (DATATYPE PIECE ((* ; "The piece describes either a string or part of a file. , or a generalized OBJECT.") PCONTENTS (* ; "The background source of data for this piece (stream, string, block, object, depending on the PTYPE)." -) (PTYPE BITS 4) (* ; "How the characters are delivered: thinfile, fatstring, object, substream") -PBYTELEN (* ; "Length of this character piece in bytes. PBYTELEN = PLEN*PBYTESPERCHAR") PFPOS (* ; -"The FILEPTR of the start of the piece in the file") PLEN (* ; "Length of the piece, in characters.") -NEXTPIECE (* ; "-> Next piece in this textobj.") (PREVPIECE FULLXPOINTER) (* ; -"-> Prior piece in this text object.") PCHARLOOKS (* ; "Character formatting info ") PBYTESPERCHAR (* -; "The number of bytes per character, given that all characters in a piece are the same length.") ( +) (PTYPE BITS 4) (* ; "How the characters are delivered: thinfile, fatstring, object, substream") NIL +(* ; "Was PBYTELEN: Length of this character piece in bytes. PBYTELEN = PLEN*PBYTESPERCHAR") PFPOS (* + ; "The FILEPTR of the start of the piece in the file") PLEN (* ; +"Length of the piece, in characters.") NEXTPIECE (* ; "-> Next piece in this textobj.") (PREVPIECE +FULLXPOINTER) (* ; "-> Prior piece in this text object.") PCHARLOOKS (* ; "Character formatting info " +) PBYTESPERCHAR (* ; +"The number of bytes per character, given that all characters in a piece are the same length.") ( PPARALAST FLAG) (* ; "This piece ends paragraph") PPARALOOKS (* ; "Paragraph looks for this piece") ( PNEW FLAG) (* ; "This text is new here; used by the tentative edit system, and anyone else interested.") (NIL FLAG) ( -* ; "Was PFATP") (PBINABLE FLAG) (* ; "8-bit bytes are binable (THINSTRING and THINFILE) ") (PTREENODE - XPOINTER) (* ; "Points to the PCTB tree-node that contains this piece.") (PCHARSET BYTE) (* ; -"High-order charset for FATFILE1 pieces") (PUTF8BYTESPERCHAR BYTE)) (* ; -"The number of bytes in the UTF-8 encoding of all the Unicode characters in this piece") (ACCESSFNS (( -POBJ (AND (EQ OBJECT.PTYPE (PTYPE DATUM)) (type? IMAGEOBJ (PCONTENTS DATUM)) (PCONTENTS DATUM)) (AND ( -EQ OBJECT.PTYPE (PTYPE DATUM)) (SETPC DATUM PCONTENTS NEWVALUE))))) PFPOS _ 0 PLEN _ 0 PBYTELEN _ 0) +* ; "Was PFATP") (NIL FLAG) (PTREENODE XPOINTER) (* ; +"Points to the PCTB tree-node that contains this piece.") (NIL BYTE) (* ; +"Was PCHARSET: High-order charset for FATFILE1 pieces") NIL) (* ; +"Was PUTF8BYTESPERCHAR: The number of bytes in the UTF-8 encoding of all the Unicode characters in this piece. But this just duplicates PBYTESPERCHAR for UTF-8 pieces" +) (ACCESSFNS ((POBJ (AND (EQ OBJECT.PTYPE (PTYPE DATUM)) (type? IMAGEOBJ (PCONTENTS DATUM)) (PCONTENTS + DATUM)) (AND (EQ OBJECT.PTYPE (PTYPE DATUM)) (SETPC DATUM PCONTENTS NEWVALUE))))) PFPOS _ 0 PLEN _ 0) (DATATYPE TEXTOBJ ((* ;; "This is where TEdit stores its state information, and internal data about the text being edited.") PCTB (* ; "The piece table") TEXTLEN (* ; "# of chars in the text") PRIMARYPANE (* ; @@ -376,13 +376,12 @@ IMAGEDATA _ NIL))) (PUTPROPS PTYPE MACRO ((PC) (ffetch (PIECE PTYPE) of PC))) (PUTPROPS PCONTENTS MACRO ((PC) (ffetch (PIECE PCONTENTS) of PC))) (PUTPROPS PCHARLOOKS MACRO ((PC) (ffetch (PIECE PCHARLOOKS) of PC))) -(PUTPROPS PCHARSET MACRO ((PC) (ffetch (PIECE PCHARSET) of PC))) (PUTPROPS PPARALOOKS MACRO ((PC) (ffetch (PIECE PPARALOOKS) of PC))) (PUTPROPS PPARALAST MACRO ((PC) (ffetch (PIECE PPARALAST) of PC))) (PUTPROPS PFPOS MACRO ((PC) (ffetch (PIECE PFPOS) of PC))) -(PUTPROPS PBYTELEN MACRO ((PC) (ffetch (PIECE PBYTELEN) of PC))) +(PUTPROPS PBYTELEN MACRO (OPENLAMBDA (PC) (ITIMES (ffetch (PIECE PLEN) of PC) (ffetch (PIECE +PBYTESPERCHAR) of PC)))) (PUTPROPS PNEW MACRO ((PC) (ffetch (PIECE PNEW) of PC))) -(PUTPROPS PBINABLE MACRO ((PC) (ffetch (PIECE PBINABLE) of PC))) (PUTPROPS PBYTESPERCHAR MACRO ((PC) (ffetch (PIECE PBYTESPERCHAR) of PC))) (PUTPROPS POBJ MACRO ((PC) (ffetch (PIECE POBJ) of PC))) (PUTPROPS SETPC MACRO ((PC FIELD NEWVALUE) (replace (PIECE FIELD) of PC with NEWVALUE))) @@ -391,7 +390,7 @@ IMAGEDATA _ NIL))) (PUTPROPS FGETPC MACRO ((PC FIELD) (ffetch (PIECE FIELD) of PC))) (PUTPROPS THINPIECEP MACRO ((PC) (* ;; "Assume that objects start out thin, for CHARSET in \TEDIT.PUT.PCTB. The putfn might immediately change that, but we don't care." -) (SELECTC (PTYPE PC) (THIN.PTYPES T) (UTF8.PTYPE (EQ 1 (FGETPC PC PUTF8BYTESPERCHAR))) NIL))) +) (SELECTC (PTYPE PC) (THIN.PTYPES T) (UTF8.PTYPE (EQ 1 (FGETPC PC PBYTESPERCHAR))) NIL))) (PUTPROPS VISIBLEPIECEP MACRO ((PC) (AND PC (NEQ 0 (PLEN PC)) (NOT (FGETCLOOKS (PCHARLOOKS PC) CLINVISIBLE))))) (PUTPROPS \NEXT.VISIBLE.PIECE MACRO ((PC) (find NPC inpieces (AND PC (NEXTPIECE PC)) suchthat ( @@ -411,14 +410,13 @@ VISIBLEPIECEP PPC)))) (PUTPROPS FSETTSTR MACRO ((TSTR FIELD NEWVALUE) (freplace (TEXTSTREAM FIELD) of TSTR with NEWVALUE))) (PUTPROPS TEXTSTREAM! MACRO (OPENLAMBDA (TSTR) (AND (\DTEST TSTR (QUOTE STREAM)) (TEXTOBJ! (FGETTSTR TSTR TEXTOBJ)) TSTR))) -(RPAQQ PTYPES ((THINFILE.PTYPE 0) (FATFILE1.PTYPE 1) (FATFILE2.PTYPE 2) (THINSTRING.PTYPE 3) ( -FATSTRING.PTYPE 4) (SUBSTREAM.PTYPE 5) (OBJECT.PTYPE 6) (LOOKS.PTYPE 7) (UTF16BE.PTYPE 8) ( -UTF16LE.PTYPE 9) (UTF8.PTYPE 11) (FILE.PTYPES (LIST THINFILE.PTYPE FATFILE1.PTYPE FATFILE2.PTYPE -UTF8.PTYPE UTF16BE.PTYPE UTF16LE.PTYPE)) (STRING.PTYPES (LIST THINSTRING.PTYPE FATSTRING.PTYPE)) ( -BINABLE.PTYPES (LIST THINFILE.PTYPE THINSTRING.PTYPE)) (THIN.PTYPES (LIST THINFILE.PTYPE -THINSTRING.PTYPE)) (FAT.PTYPES (LIST FATFILE2.PTYPE FATSTRING.PTYPE FATFILE1.PTYPE)))) +(RPAQQ PTYPES ((THINFILE.PTYPE 0) (FATFILE2.PTYPE 2) (THINSTRING.PTYPE 3) (FATSTRING.PTYPE 4) ( +SUBSTREAM.PTYPE 5) (OBJECT.PTYPE 6) (LOOKS.PTYPE 7) (UTF16BE.PTYPE 8) (UTF16LE.PTYPE 9) (UTF8.PTYPE 11 +) (FILE.PTYPES (LIST THINFILE.PTYPE FATFILE2.PTYPE UTF8.PTYPE UTF16BE.PTYPE UTF16LE.PTYPE)) ( +STRING.PTYPES (LIST THINSTRING.PTYPE FATSTRING.PTYPE)) (BINABLE.PTYPES (LIST THINFILE.PTYPE +THINSTRING.PTYPE)) (THIN.PTYPES (LIST THINFILE.PTYPE THINSTRING.PTYPE)) (FAT.PTYPES (LIST +FATFILE2.PTYPE FATSTRING.PTYPE)))) (RPAQQ THINFILE.PTYPE 0) -(RPAQQ FATFILE1.PTYPE 1) (RPAQQ FATFILE2.PTYPE 2) (RPAQQ THINSTRING.PTYPE 3) (RPAQQ FATSTRING.PTYPE 4) @@ -428,20 +426,19 @@ THINSTRING.PTYPE)) (FAT.PTYPES (LIST FATFILE2.PTYPE FATSTRING.PTYPE FATFILE1.PTY (RPAQQ UTF16BE.PTYPE 8) (RPAQQ UTF16LE.PTYPE 9) (RPAQQ UTF8.PTYPE 11) -(RPAQ FILE.PTYPES (LIST THINFILE.PTYPE FATFILE1.PTYPE FATFILE2.PTYPE UTF8.PTYPE UTF16BE.PTYPE -UTF16LE.PTYPE)) +(RPAQ FILE.PTYPES (LIST THINFILE.PTYPE FATFILE2.PTYPE UTF8.PTYPE UTF16BE.PTYPE UTF16LE.PTYPE)) (RPAQ STRING.PTYPES (LIST THINSTRING.PTYPE FATSTRING.PTYPE)) (RPAQ BINABLE.PTYPES (LIST THINFILE.PTYPE THINSTRING.PTYPE)) (RPAQ THIN.PTYPES (LIST THINFILE.PTYPE THINSTRING.PTYPE)) -(RPAQ FAT.PTYPES (LIST FATFILE2.PTYPE FATSTRING.PTYPE FATFILE1.PTYPE)) -(CONSTANTS (THINFILE.PTYPE 0) (FATFILE1.PTYPE 1) (FATFILE2.PTYPE 2) (THINSTRING.PTYPE 3) ( -FATSTRING.PTYPE 4) (SUBSTREAM.PTYPE 5) (OBJECT.PTYPE 6) (LOOKS.PTYPE 7) (UTF16BE.PTYPE 8) ( -UTF16LE.PTYPE 9) (UTF8.PTYPE 11) (FILE.PTYPES (LIST THINFILE.PTYPE FATFILE1.PTYPE FATFILE2.PTYPE -UTF8.PTYPE UTF16BE.PTYPE UTF16LE.PTYPE)) (STRING.PTYPES (LIST THINSTRING.PTYPE FATSTRING.PTYPE)) ( -BINABLE.PTYPES (LIST THINFILE.PTYPE THINSTRING.PTYPE)) (THIN.PTYPES (LIST THINFILE.PTYPE -THINSTRING.PTYPE)) (FAT.PTYPES (LIST FATFILE2.PTYPE FATSTRING.PTYPE FATFILE1.PTYPE))) +(RPAQ FAT.PTYPES (LIST FATFILE2.PTYPE FATSTRING.PTYPE)) +(CONSTANTS (THINFILE.PTYPE 0) (FATFILE2.PTYPE 2) (THINSTRING.PTYPE 3) (FATSTRING.PTYPE 4) ( +SUBSTREAM.PTYPE 5) (OBJECT.PTYPE 6) (LOOKS.PTYPE 7) (UTF16BE.PTYPE 8) (UTF16LE.PTYPE 9) (UTF8.PTYPE 11 +) (FILE.PTYPES (LIST THINFILE.PTYPE FATFILE2.PTYPE UTF8.PTYPE UTF16BE.PTYPE UTF16LE.PTYPE)) ( +STRING.PTYPES (LIST THINSTRING.PTYPE FATSTRING.PTYPE)) (BINABLE.PTYPES (LIST THINFILE.PTYPE +THINSTRING.PTYPE)) (THIN.PTYPES (LIST THINFILE.PTYPE THINSTRING.PTYPE)) (FAT.PTYPES (LIST +FATFILE2.PTYPE FATSTRING.PTYPE))) (GLOBALVARS \TEXTIMAGEOPS \TEXTFDEV) -(PUTPROP (QUOTE TEDIT-STREAM) (QUOTE IMPORTDATE) (IDATE "16-Feb-2026 08:56:40")) +(PUTPROP (QUOTE TEDIT-STREAM) (QUOTE IMPORTDATE) (IDATE " 1-May-2026 08:15:56")) (PUTPROPS \TEDIT.MOUSESTATE MACRO (BUTTON (* ;; "Test to see if only the specified mouse button is down. DOES NOT call GETMOUSESTATE, so the mouse-button info is the same as the last time it was called." ) (SELECTQ (CAR BUTTON) (LEFT (QUOTE (EQ LASTMOUSEBUTTONS 4))) (MIDDLE (QUOTE (EQ LASTMOUSEBUTTONS 1)) @@ -455,8 +452,8 @@ I in ARGS as J on ARGS when (NOT (STRINGP I)) collect (LIST (QUOTE OR) I (LIST ( \BIN STREAM)) BITSPERWORD))) (PUTPROPS \SMALLPOUT MACRO (OPENLAMBDA (STREAM W) (* ; "Signed smallp, unlike \WOUT") (\BOUT STREAM ( LOGAND 255 (LRSH W 8))) (\BOUT STREAM (LOGAND W 255)))) -(PUTPROP (QUOTE TEDIT-FILE) (QUOTE IMPORTDATE) (IDATE "15-Feb-2026 23:45:51")) -(PUTPROP (QUOTE TEDIT-OLDFILE) (QUOTE IMPORTDATE) (IDATE " 8-Sep-2025 22:10:10")) +(PUTPROP (QUOTE TEDIT-FILE) (QUOTE IMPORTDATE) (IDATE "29-Apr-2026 23:49:14")) +(PUTPROP (QUOTE TEDIT-OLDFILE) (QUOTE IMPORTDATE) (IDATE "10-Apr-2026 09:29:21")) (DATATYPE CHARLOOKS ((* ;; "Describes the appearance (%"Looks%") of characters in a TEdit document.") (* ;; "NOTE: If fields change EQCLOOKS should change too.") CLFONT (* ; "The font descriptor for these characters") CLFONTUNPARSE (* ;; @@ -538,7 +535,7 @@ LINELEAD _ 0) (PUTPROPS FSETPLOOKS MACRO ((PLOOKS FIELD NEWVALUE) (freplace (PARALOOKS FIELD) of PLOOKS with NEWVALUE))) (PUTPROPS PARALOOKS! MACRO ((PL) (\DTEST PL (QUOTE PARALOOKS)))) -(PUTPROP (QUOTE TEDIT-LOOKS) (QUOTE IMPORTDATE) (IDATE "16-Feb-2026 00:36:00")) +(PUTPROP (QUOTE TEDIT-LOOKS) (QUOTE IMPORTDATE) (IDATE "10-Apr-2026 09:34:11")) (PUTPROP (QUOTE TEDIT-STYLES) (QUOTE IMPORTDATE) (IDATE "28-Jul-2025 23:25:43")) (DATATYPE TEDITCARET (TCNOWTIME (* Used to hold the current time, when checking to see if a transition is due) TCTHENTIME (* Time when the next transition is to take place) TCFORCEDDOWN (* TCFORCEDOWN = T @@ -602,8 +599,8 @@ GETPANEPROP (PANEPROPS P) NEXTPANE))) (GO $$OUT))) by (OR (GETPANEPROP (PANEPROP $$OUT))))) (PUTPROPS ALLBUTTONSUP MACRO (NIL (ZEROP (LOGAND 7 LASTMOUSEBUTTONS)))) (PUTPROP (QUOTE TEDIT-WINDOW) (QUOTE IMPORTDATE) (IDATE " 7-Feb-2026 18:53:22")) -(PUTPROP (QUOTE TEDIT-BUTTONS) (QUOTE IMPORTDATE) (IDATE "25-Jan-2026 09:14:04")) -(PUTPROP (QUOTE TEDIT-MENU) (QUOTE IMPORTDATE) (IDATE " 9-Feb-2026 09:10:43")) +(PUTPROP (QUOTE TEDIT-BUTTONS) (QUOTE IMPORTDATE) (IDATE "29-Apr-2026 17:57:09")) +(PUTPROP (QUOTE TEDIT-MENU) (QUOTE IMPORTDATE) (IDATE "29-Apr-2026 15:35:33")) (PUTPROP (QUOTE TEDIT-FIND) (QUOTE IMPORTDATE) (IDATE "21-Apr-2025 22:42:57")) (RPAQQ \TEDIT.TTCCODES ((NONE . 0) (CHARDELETE . 1) (:CHARDELETE.BACKWARD . 1) (WORDDELETE . 2) ( :WORDDELETE.BACKWORD . 2) (DELETE . 3) (:DELETE . 3) (FN . 4) (REDO . 5) (:REDO . 5) (UNDO . 6) (:UNDO @@ -626,7 +623,7 @@ TEDITHISTORYEVENT THLEN) of DATUM) 0))))) (INIT (DEFPRINT (QUOTE TEDITHISTORYEVE (PUTPROPS GETTH MACRO ((EVENT FIELD) (fetch (TEDITHISTORYEVENT FIELD) of EVENT))) (PUTPROPS SETTH MACRO ((EVENT FIELD NEWVALUE) (replace (TEDITHISTORYEVENT FIELD) of EVENT with NEWVALUE))) -(PUTPROP (QUOTE TEDIT-HISTORY) (QUOTE IMPORTDATE) (IDATE " 1-Aug-2025 14:58:56")) +(PUTPROP (QUOTE TEDIT-HISTORY) (QUOTE IMPORTDATE) (IDATE "19-Feb-2026 12:39:37")) (RECORD PAGEFORMATTINGSTATE ((* ;; "Contains the state for a TEdit page-formatting job.") PAGE# (* ; "The current page number. Counted from 1") FIRSTPAGE (* ;; "T if the current page is the 'first page' . Is set initially, and can be set again by the user at will. Gets reset after each page image is printed." @@ -662,8 +659,8 @@ $$VALUES)) (PROG1 (CAR $$VALUES) (\,@ (FOR V IN (CAR ARGS) collect (COND (V (BQU $$VALUES)))) (T (BQUOTE (SETQ $$VALUES (CDR $$VALUES)))))))))))) (PUTPROPS TEDIT.VALUES MACRO (ARGS (BQUOTE (LIST (\,@ ARGS))))) (PUTPROP (QUOTE TEDIT-PAGE) (QUOTE IMPORTDATE) (IDATE "27-Jan-2026 10:30:27")) -(PUTPROP (QUOTE TEDIT-ABBREV) (QUOTE IMPORTDATE) (IDATE "23-Jan-2026 15:49:26")) -(PUTPROP (QUOTE TEDIT-TFBRAVO) (QUOTE IMPORTDATE) (IDATE "21-Jan-2026 12:15:57")) +(PUTPROP (QUOTE TEDIT-ABBREV) (QUOTE IMPORTDATE) (IDATE "30-Apr-2026 11:55:15")) +(PUTPROP (QUOTE TEDIT-TFBRAVO) (QUOTE IMPORTDATE) (IDATE "10-Apr-2026 09:25:52")) (DECLARE%: DONTCOPY (FILEMAP (NIL))) STOP diff --git a/lispusers/BITMAP-GALLERY.TEDIT b/lispusers/BITMAP-GALLERY.TEDIT index aa14181e..ab88e8cd 100644 Binary files a/lispusers/BITMAP-GALLERY.TEDIT and b/lispusers/BITMAP-GALLERY.TEDIT differ diff --git a/lispusers/BROKEN-ATOMS b/lispusers/BROKEN-ATOMS new file mode 100644 index 00000000..a6f211aa --- /dev/null +++ b/lispusers/BROKEN-ATOMS @@ -0,0 +1,187 @@ +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) + +(FILECREATED "14-Apr-2026 12:14:44" {PROJECTS}BROKEN-ATOMS.;10 7207 + + :CHANGES-TO (FUNCTIONS WITHOUT-BROKEN-ATOMS TEST-PRETTY-FILE TEST-DEEP-COMPUTATION + CURE-BROKEN-ATOM) + (VARS BROKEN-ATOMSCOMS) + + :PREVIOUS-DATE "18-Feb-2026 16:08:40" {PROJECTS}BROKEN-ATOMS.;3) + + +(PRETTYCOMPRINT BROKEN-ATOMSCOMS) + +(RPAQQ BROKEN-ATOMSCOMS + ( + (* ;; "the representation of a broken atom") + + (RECORDS BROKEN-ATOM) + (FUNCTIONS CURE-BROKEN-ATOM) + + (* ;; "for DEFPRINT") + + (FNS BROKEN-ATOM-PRINTER) + + (* ;; "special form") + + (FUNCTIONS WITHOUT-BROKEN-ATOMS) + + (* ;; "setup") + + (P (DEFPRINT 'BROKEN-ATOM 'BROKEN-ATOM-PRINTER)) + + (* ;; "Debugging/testing") + + (FUNCTIONS TEST-INTERNAL-BA TEST-EXTERNAL-BA TEST-DEEP-COMPUTATION TEST-PRETTY-FILE))) + + + +(* ;; "the representation of a broken atom") + +(DECLARE%: EVAL@COMPILE + +(DATATYPE BROKEN-ATOM ((PACKAGE POINTER) + (NAME POINTER) + (EXTERNAL FLAG))) +) + +(/DECLAREDATATYPE 'BROKEN-ATOM '(POINTER POINTER FLAG) + '((BROKEN-ATOM 0 POINTER) + (BROKEN-ATOM 2 POINTER) + (BROKEN-ATOM 2 (FLAGBITS . 0))) + '4) + +(CL:DEFUN CURE-BROKEN-ATOM (CONDITION) + "Given an XCL:MISSING-EXTERNAL-SYMBOL condition, return a corresponding BROKEN-ATOM" + (COND + ((TYPEP CONDITION 'XCL:MISSING-PACKAGE) (* ; "no such package ") + (create BROKEN-ATOM + PACKAGE _ (XCL:MISSING-PACKAGE-PACKAGE-NAME CONDITION) + NAME _ (XCL:MISSING-PACKAGE-SYMBOL-NAME CONDITION) + EXTERNAL _ (XCL:MISSING-PACKAGE-EXTERNAL CONDITION))) + ((TYPEP CONDITION 'XCL:MISSING-EXTERNAL-SYMBOL) (* ; + "package exists, no such external symbol") + (create BROKEN-ATOM + PACKAGE _ (CL:PACKAGE-NAME (XCL:MISSING-EXTERNAL-SYMBOL-PACKAGE CONDITION)) + NAME _ (XCL:MISSING-EXTERNAL-SYMBOL-NAME CONDITION) + EXTERNAL _ NIL)) + (T (HELP "Don't know how to cure" CONDITION)))) + + + +(* ;; "for DEFPRINT") + +(DEFINEQ + +(BROKEN-ATOM-PRINTER + [LAMBDA (BROKEN-ATOM STREAM) + (CONS (CONCAT (fetch (BROKEN-ATOM PACKAGE) of BROKEN-ATOM) + (if (fetch (BROKEN-ATOM EXTERNAL) of BROKEN-ATOM) + then ":" + else "::") + (fetch (BROKEN-ATOM NAME) of BROKEN-ATOM]) +) + + + +(* ;; "special form") + + +(DEFMACRO WITHOUT-BROKEN-ATOMS (&BODY FORMS) + "Handle any broken-atom errors by producing a BROKEN-ATOM that prints as if the original atom were intact" + `[HANDLER-BIND [[XCL:MISSING-PACKAGE #'(CL:LAMBDA (C) + (CONDITIONS:INVOKE-RESTART + 'CREATE-MISSING-PACKAGE-BA (CURE-BROKEN-ATOM + C] + (XCL:MISSING-EXTERNAL-SYMBOL #'(CL:LAMBDA (C) + (CONDITIONS:INVOKE-RESTART + 'CREATE-EXTERNAL-BA (CURE-BROKEN-ATOM + C] + (CONDITIONS:RESTART-BIND [(CREATE-MISSING-PACKAGE-BA + #'(CL:LAMBDA (V) + (RETFROM (FUNCTION RESOLVE-MISSING-PACKAGE) + V) + V)) + (CREATE-EXTERNAL-BA #'(CL:LAMBDA (V) + (RETFROM (FUNCTION + RESOLVE-MISSING-EXTERNAL-SYMBOL + ) + V) + V] + (PROGN ,@FORMS]) + + + +(* ;; "setup") + + +(DEFPRINT 'BROKEN-ATOM 'BROKEN-ATOM-PRINTER) + + + +(* ;; "Debugging/testing") + + +(CL:DEFUN TEST-INTERNAL-BA () + [LET ((FILE NIL)) + (CL:WITH-OPEN-STREAM (OUT (OPENSTREAM "{nodircore}" 'OUTPUT)) + (SETQ FILE OUT) + (PRINTOUT OUT "BROKEN::INTERNAL-ATOM" T)) + (CL:WITH-OPEN-STREAM (IN (OPENSTREAM FILE 'INPUT)) + (WITHOUT-BROKEN-ATOMS (RATOM IN]) + +(CL:DEFUN TEST-EXTERNAL-BA () + [LET ((FILE NIL)) + (CL:WITH-OPEN-STREAM (OUT (OPENSTREAM "{nodircore}" 'OUTPUT)) + (SETQ FILE OUT) + (PRINTOUT OUT "BROKEN:EXTERNAL-ATOM" T)) + (CL:WITH-OPEN-STREAM (IN (OPENSTREAM FILE 'INPUT)) + (WITHOUT-BROKEN-ATOMS (RATOM IN]) + +(CL:DEFUN TEST-DEEP-COMPUTATION () + "Test that we can handle internal calls to READ that encounter broken atoms" + + (* ;; "make sure it works when there's no error") + + (LET [(RESULT (WITHOUT-BROKEN-ATOMS (CL:LOOP :FOR X :FROM 0 :TO 9 :COLLECT X] + (PRINTOUT T "No error loop result: " RESULT T)) + + (* ;; "and when reading legit atoms") + + (LET [(RESULT (WITHOUT-BROKEN-ATOMS (CL:LOOP :FOR X :FROM 0 :TO 9 :COLLECT (CL:READ-FROM-STRING + (CONCAT "IL:ATOM" X] + (PRINTOUT T "No error read loop result: " RESULT T)) + + (* ;; "test XCL:MISSING-PACKAGE.") + + (COND + ((CL:FIND-PACKAGE :BROKEN) + (DELETE-PACKAGE :BROKEN))) + (LET [(RESULT (WITHOUT-BROKEN-ATOMS (CL:LOOP :FOR X :FROM 0 :TO 9 :COLLECT (CL:READ-FROM-STRING + (CONCAT "BROKEN:ATOM" + X] + (PRINTOUT T "No such package loop result: " RESULT T)) + + (* ;; "test XCL:MISSING-EXTERNAL-SYMBOL") + + (CL:UNWIND-PROTECT + (PROGN (CL:MAKE-PACKAGE :BROKEN) + (LET [(RESULT (WITHOUT-BROKEN-ATOMS (CL:LOOP :FOR X :FROM 0 :TO 9 :COLLECT + (CL:READ-FROM-STRING (CONCAT "BROKEN:ATOM" X + ] + (PRINTOUT T "Not external symbol loop result: " RESULT T))) + [COND + ((CL:FIND-PACKAGE :BROKEN) + (DELETE-PACKAGE 'BROKEN])) + +(CL:DEFUN TEST-PRETTY-FILE (SOURCE-FILE-NAME OUTPUT-FILE-NAME OUTPUT-TYPE) + "Prettyprint a Lisp source file to an imagestream file" + (CL:WITH-OPEN-STREAM (OUTPUT-STREAM (OPENIMAGESTREAM OUTPUT-FILE-NAME OUTPUT-TYPE)) + (WITHOUT-BROKEN-ATOMS (PRETTYFILEINDEX SOURCE-FILE-NAME NIL OUTPUT-STREAM T)) + (FULLNAME OUTPUT-STREAM))) +(DECLARE%: DONTCOPY + (FILEMAP (NIL (1403 2315 (CURE-BROKEN-ATOM 1403 . 2315)) (2346 2699 (BROKEN-ATOM-PRINTER 2356 . 2697)) + (2731 4397 (WITHOUT-BROKEN-ATOMS 2731 . 4397)) (4503 4831 (TEST-INTERNAL-BA 4503 . 4831)) (4833 5160 +(TEST-EXTERNAL-BA 4833 . 5160)) (5162 6829 (TEST-DEEP-COMPUTATION 5162 . 6829)) (6831 7184 ( +TEST-PRETTY-FILE 6831 . 7184))))) +STOP diff --git a/lispusers/BROKEN-ATOMS.DFASL b/lispusers/BROKEN-ATOMS.DFASL new file mode 100644 index 00000000..05926d41 Binary files /dev/null and b/lispusers/BROKEN-ATOMS.DFASL differ diff --git a/lispusers/BROKEN-ATOMS.TEdit b/lispusers/BROKEN-ATOMS.TEdit new file mode 100644 index 00000000..c5351762 Binary files /dev/null and b/lispusers/BROKEN-ATOMS.TEdit differ diff --git a/lispusers/COMPAREDIRECTORIES b/lispusers/COMPAREDIRECTORIES index 36bf7841..962d86d0 100644 --- a/lispusers/COMPAREDIRECTORIES +++ b/lispusers/COMPAREDIRECTORIES @@ -1,12 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "10-Feb-2026 21:28:55" {WMEDLEY}COMPAREDIRECTORIES.;286 138607 +(FILECREATED "28-Apr-2026 23:41:24" {MEDLEY}COMPAREDIRECTORIES.;289 139726 :EDIT-BY rmk - :CHANGES-TO (FNS CD-MENUFN) + :CHANGES-TO (FNS CDFILES.PATS CDFILES.MATCH CDBROWSER-COPY) - :PREVIOUS-DATE " 8-Nov-2025 13:07:39" {WMEDLEY}COMPAREDIRECTORIES.;285) + :PREVIOUS-DATE "28-Apr-2026 21:38:49" {MEDLEY}COMPAREDIRECTORIES.;288) (PRETTYCOMPRINT COMPAREDIRECTORIESCOMS) @@ -507,32 +507,37 @@ UNLESS (CDFILES.MATCH SUBDIR NAME EXT THISDEPTH EXCLUDES) COLLECT FULLNAME]) (CDFILES.MATCH - [LAMBDA (SUBDIR NAME EXT THISDEPTH PATTERNS) (* ; "Edited 26-Jan-2022 15:33 by rmk") + [LAMBDA (SUBDIR NAME EXT THISDEPTH PATTERNS) (* ; "Edited 28-Apr-2026 23:40 by rmk") + (* ; "Edited 26-Jan-2022 15:33 by rmk") (* ; "Edited 23-Dec-2021 21:47 by rmk") + (thereis P in PATTERNS suchthat - (* ;; "True if the components of the fullname match at least one of the patterns") + (* ;; "The SUBDIR test is tricky. If the exclusion pattern was internal/fonts/**, this shows up as (* * internal/fonts 65535), it has to match internal/fonts/display/completed/. Below we test for an initial substring") - (THEREIS P IN PATTERNS SUCHTHAT (AND [OR (STRING.EQUAL NAME (CAR P) - FILEDIRCASEARRAY) - (EQ '* (CAR P)) - (AND (EQ (CHARCODE %.) - (CHCON1 (CAR P))) - (EQ (CHARCODE %.) - (CHCON1 NAME)) - (OR (STRING.EQUAL NAME (SUBATOM (CAR P) - 2)) - (EQ (CHARCODE *) - (NTHCHARCODE (CAR P) - 2] - (OR (STRING.EQUAL EXT (CADR P)) - (EQ '* (CADR P))) - (OR (STRING.EQUAL SUBDIR (CADDR P)) - (NULL (CADDR P)) - (EQ '* (CADDR P))) - (ILEQ THISDEPTH (CADDDR P]) + (AND [OR (STRING.EQUAL NAME (CAR P) + FILEDIRCASEARRAY) + (EQ '* (CAR P)) + (AND (EQ (CHARCODE %.) + (CHCON1 (CAR P))) + (EQ (CHARCODE %.) + (CHCON1 NAME)) + (OR (STRING.EQUAL NAME (SUBATOM (CAR P) + 2)) + (EQ (CHARCODE *) + (NTHCHARCODE (CAR P) + 2] + (OR (STRING.EQUAL EXT (CADR P)) + (EQ '* (CADR P))) + (ILEQ THISDEPTH (CADDDR P)) + (OR (STRING.EQUAL SUBDIR (CADDR P)) + (NULL (CADDR P)) + (EQ '* (CADDR P)) + (STRPOS (CADDR P) + SUBDIR 1 NIL T]) (CDFILES.PATS - [LAMBDA (PATTERNS) (* ; "Edited 17-Jun-2023 23:36 by rmk") + [LAMBDA (PATTERNS) (* ; "Edited 28-Apr-2026 23:01 by rmk") + (* ; "Edited 17-Jun-2023 23:36 by rmk") (* ; "Edited 23-Dec-2021 17:02 by rmk") (* ;; "Returns (NAME EXT SUBDIR DEPTH) items where NAME or EXT may be the wildcard *, SD is the subdirectory (if any) and DEPTH is the number of / or > in the subdirectory") @@ -544,15 +549,15 @@ (* * NIL 1) ) ELSE (FOR P N E SD DEPTH UNPACK INSIDE PATTERNS - JOIN (SETQ UNPACK (UNPACKFILENAME.STRING P)) (* ; + JOIN (SETQ UNPACK (UNPACKFILENAME P)) (* ;  "String so we can tell the difference between x and x.") - [SETQ SD (MKATOM (LISTGET UNPACK 'SUBDIRECTORY] + (SETQ SD (LISTGET UNPACK 'SUBDIRECTORY)) (* ;; "Count the subdirectory depth") - [SETQ DEPTH (IF (EQ SD '*) - THEN MAX.SMALLP - ELSE (FOR I (CNT _ 1) FROM 1 DO (SELCHARQ (NTHCHARCODE SD I) + [SETQ DEPTH (if (EQ SD '*) + then MAX.SMALLP + else (for I (CNT _ 1) from 1 do (SELCHARQ (NTHCHARCODE SD I) ((/ >) (ADD CNT 1)) (NIL (RETURN CNT)) @@ -560,28 +565,31 @@ (SETQ N (LISTGET UNPACK 'NAME)) (SETQ N (if (NULL N) then '* + elseif (EQ N '**) + then (SETQ DEPTH MAX.SMALLP) + '* elseif (NEQ 0 (NCHARS N)) - then (MKATOM N))) + then N)) (SETQ E (LISTGET UNPACK 'EXTENSION)) (SETQ E (if (NULL E) then '* elseif (NEQ 0 (NCHARS E)) - then (MKATOM E))) - (if [OR (AND (STRING.EQUAL N 'COM) + then E)) + (if [OR (AND (EQ N 'COM) (NULL E)) - (AND (STRING.EQUAL E 'COM) + (AND (EQ E 'COM) (MEMB N ' (* NIL)] - THEN (FOR CE IN *COMPILED-EXTENSIONS* COLLECT (LIST '* CE SD DEPTH)) - ELSE (CONS (IF N - THEN (LIST N E SD DEPTH) - ELSEIF E - THEN + then (for CE in *COMPILED-EXTENSIONS* collect (LIST '* CE SD DEPTH)) + else (CONS (if N + then (LIST N E SD DEPTH) + elseif E + then (* ;; "This is the case .XXX, which presumably identifies a dotted file. If this is supposed to be all files with extension XXX, it shoud be specified as *.XXX, the case above. So we move .E into the N field.") (LIST (PACK* '%. E) NIL SD DEPTH) - ELSE ` + else ` (* * (\, SD) (\, DEPTH)) ]) @@ -2146,7 +2154,9 @@ NIL]) (CDBROWSER-COPY - [LAMBDA (CDBROWSER TBITEM SOURCE UNIXDEST) (* ; "Edited 28-Oct-2025 17:39 by rmk") + [LAMBDA (CDBROWSER TBITEM SOURCE UNIXDEST) (* ; "Edited 28-Apr-2026 18:54 by rmk") + (* ; "Edited 31-Mar-2026 10:49 by rmk") + (* ; "Edited 28-Oct-2025 17:39 by rmk") (* ; "Edited 25-Oct-2025 23:58 by rmk") (* ; "Edited 24-May-2022 15:49 by rmk") (* ; "Edited 25-Apr-2022 09:24 by rmk") @@ -2184,7 +2194,8 @@ (PRIN3 "No source file to copy" T) (RETURN NIL)) (CL:WHEN [AND (EQ DATERELBAD (FETCH (CDENTRY DATEREL) OF CDENTRY)) - (PROGN (FLASHWINDOW T) + (PROGN (GIVE.TTY.PROCESS T) + (FLASHWINDOW T) (EQ 'N (ASKUSER NIL NIL "Target is newer than source. Really copy? "] (RETURN NIL)) @@ -2194,6 +2205,7 @@ )) 'VERSION)) (PROGN (FLASHWINDOW T) + (GIVE.TTY.PROCESS T) (EQ 'N (ASKUSER NIL NIL (CONCAT SOURCEFILE " is not the newest version. Really copy? " ] @@ -2202,8 +2214,10 @@ (CL:UNLESS DESTFILE (SETQ DESTFILE (CD-SWAPDIRS SOURCEFILE SOURCEDIR DESTDIR))) [SETQ RESULT (if UNIXDEST - then (SPUTMULTI (fetch (TABLEBROWSER TBUSERDATA) of CDBROWSER) - 'ORIGINALFILES DESTFILE (COPYFILE DESTFILE '{NODIRCORE)) + then (CL:WHEN (INFILEP DESTFILE) + (SPUTMULTI (fetch (TABLEBROWSER TBUSERDATA) of CDBROWSER) + 'ORIGINALFILES DESTFILE (COPYFILE DESTFILE + '{NODIRCORE}))) [PSEUDOFILENAME (PACKFILENAME 'HOST 'DSK 'BODY (COPYFILE SOURCEFILE (PACKFILENAME 'HOST @@ -2323,25 +2337,25 @@ (MOVD? 'NILL 'TEDIT.FILEDATE) (DECLARE%: DONTCOPY - (FILEMAP (NIL (2653 23632 (COMPAREDIRECTORIES 2663 . 7998) (COMPAREDIRECTORIES.INFOS 8000 . 11229) ( -COMPAREDIRECTORIES.CANDIDATES 11231 . 14616) (CDENTRIES.SELECT 14618 . 19520) ( -COMPAREDIRECTORIES.INFOS.TYPE 19522 . 20866) (MATCHNAME 20868 . 21548) (CD.INSURECDVALUE 21550 . 23164 -) (CD.UPDATEWIDTHS 23166 . 23630)) (23633 34338 (CDFILES 23643 . 29740) (CDFILES.MATCH 29742 . 31367) -(CDFILES.PATS 31369 . 34336)) (34339 52357 (CDPRINT 34349 . 36866) (CDPRINT.HEADER 36868 . 37765) ( -CDPRINT.LINE 37767 . 41196) (CDPRINT.MAXWIDTHS 41198 . 45313) (CDPRINT.COLHEADERS 45315 . 46600) ( -CDPRINT.COLUMNS 46602 . 51722) (CDTEDIT 51724 . 52355)) (52358 61479 (CDMAP 52368 . 53800) (CDENTRY -53802 . 54111) (CDSUBSET 54113 . 55552) (CDMERGE 55554 . 59538) (CDMERGE.COMMON 59540 . 60855) ( -CD.SORT 60857 . 61477)) (61480 69018 (BINCOMP 61490 . 65779) (EOLTYPE 65781 . 68343) (EOLTYPE.SHOW -68345 . 69016)) (69546 82073 (FIND-UNCOMPILED-FILES 69556 . 73199) (FIND-UNSOURCED-FILES 73201 . 75585 -) (FIND-SOURCE-FILES 75587 . 77325) (FIND-COMPILED-FILES 77327 . 79204) (FIND-UNLOADED-FILES 79206 . -80059) (FIND-LOADED-FILES 80061 . 80489) (FIND-MULTICOMPILED-FILES 80491 . 82071)) (82074 90505 ( -CREATED-AS 82084 . 86881) (SOURCE-FOR-COMPILED-P 86883 . 89810) (COMPILE-SOURCE-DATE-DIFF 89812 . -90503)) (90506 101269 (FIX-DIRECTORY-DATES 90516 . 93966) (FIX-EQUIV-DATES 93968 . 95493) ( -COPY-COMPARED-FILES 95495 . 97316) (COPY-MISSING-FILES 97318 . 99475) (COMPILED-ON-SAME-SOURCE 99477 - . 101267)) (101463 109341 (CDBROWSER 101473 . 105440) (CDBROWSER.STRINGS 105442 . 109339)) (109503 -111239 (CD.TABLEITEM 109513 . 109733) (CD.TABLEITEM.PRINTFN 109735 . 109934) (CD.TABLEITEM.COPYFN -109936 . 110994) (CDTABLEBROWSER.HEADING.REPAINTFN 110996 . 111237)) (111240 138091 ( -CDTABLEBROWSER.WHENSELECTEDFN 111250 . 111718) (CD.COMMANDSELECTEDFN 111720 . 117893) (CD-MENUFN -117895 . 124372) (CD-COMPARE-FILES 124374 . 127901) (CDBROWSER-COPY 127903 . 132965) ( -CDBROWSER-DELETE-FILE 132967 . 137570) (CD-SWAPDIRS 137572 . 138089))))) + (FILEMAP (NIL (2683 23662 (COMPAREDIRECTORIES 2693 . 8028) (COMPAREDIRECTORIES.INFOS 8030 . 11259) ( +COMPAREDIRECTORIES.CANDIDATES 11261 . 14646) (CDENTRIES.SELECT 14648 . 19550) ( +COMPAREDIRECTORIES.INFOS.TYPE 19552 . 20896) (MATCHNAME 20898 . 21578) (CD.INSURECDVALUE 21580 . 23194 +) (CD.UPDATEWIDTHS 23196 . 23660)) (23663 34971 (CDFILES 23673 . 29770) (CDFILES.MATCH 29772 . 31782) +(CDFILES.PATS 31784 . 34969)) (34972 52990 (CDPRINT 34982 . 37499) (CDPRINT.HEADER 37501 . 38398) ( +CDPRINT.LINE 38400 . 41829) (CDPRINT.MAXWIDTHS 41831 . 45946) (CDPRINT.COLHEADERS 45948 . 47233) ( +CDPRINT.COLUMNS 47235 . 52355) (CDTEDIT 52357 . 52988)) (52991 62112 (CDMAP 53001 . 54433) (CDENTRY +54435 . 54744) (CDSUBSET 54746 . 56185) (CDMERGE 56187 . 60171) (CDMERGE.COMMON 60173 . 61488) ( +CD.SORT 61490 . 62110)) (62113 69651 (BINCOMP 62123 . 66412) (EOLTYPE 66414 . 68976) (EOLTYPE.SHOW +68978 . 69649)) (70179 82706 (FIND-UNCOMPILED-FILES 70189 . 73832) (FIND-UNSOURCED-FILES 73834 . 76218 +) (FIND-SOURCE-FILES 76220 . 77958) (FIND-COMPILED-FILES 77960 . 79837) (FIND-UNLOADED-FILES 79839 . +80692) (FIND-LOADED-FILES 80694 . 81122) (FIND-MULTICOMPILED-FILES 81124 . 82704)) (82707 91138 ( +CREATED-AS 82717 . 87514) (SOURCE-FOR-COMPILED-P 87516 . 90443) (COMPILE-SOURCE-DATE-DIFF 90445 . +91136)) (91139 101902 (FIX-DIRECTORY-DATES 91149 . 94599) (FIX-EQUIV-DATES 94601 . 96126) ( +COPY-COMPARED-FILES 96128 . 97949) (COPY-MISSING-FILES 97951 . 100108) (COMPILED-ON-SAME-SOURCE 100110 + . 101900)) (102096 109974 (CDBROWSER 102106 . 106073) (CDBROWSER.STRINGS 106075 . 109972)) (110136 +111872 (CD.TABLEITEM 110146 . 110366) (CD.TABLEITEM.PRINTFN 110368 . 110567) (CD.TABLEITEM.COPYFN +110569 . 111627) (CDTABLEBROWSER.HEADING.REPAINTFN 111629 . 111870)) (111873 139210 ( +CDTABLEBROWSER.WHENSELECTEDFN 111883 . 112351) (CD.COMMANDSELECTEDFN 112353 . 118526) (CD-MENUFN +118528 . 125005) (CD-COMPARE-FILES 125007 . 128534) (CDBROWSER-COPY 128536 . 134084) ( +CDBROWSER-DELETE-FILE 134086 . 138689) (CD-SWAPDIRS 138691 . 139208))))) STOP diff --git a/lispusers/COMPAREDIRECTORIES.LCOM b/lispusers/COMPAREDIRECTORIES.LCOM index 80f806ea..341d2592 100644 Binary files a/lispusers/COMPAREDIRECTORIES.LCOM and b/lispusers/COMPAREDIRECTORIES.LCOM differ diff --git a/lispusers/DATEFORMAT-EDITOR b/lispusers/DATEFORMAT-EDITOR index cc51b2ca..df73a7d1 100644 --- a/lispusers/DATEFORMAT-EDITOR +++ b/lispusers/DATEFORMAT-EDITOR @@ -1,18 +1,43 @@ -(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP" BASE 10) -(FILECREATED "19-May-89 17:52:44" {ERINYES}MEDLEY>DATEFORMAT-EDITOR.;1 13443 +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) - changes to%: (VARS DATEFORMAT-EDITORCOMS) +(FILECREATED " 3-May-2026 10:44:14" {MEDLEY}DATEFORMAT-EDITOR.;2 14047 - previous date%: "16-Sep-88 12:50:52" {PHYLUM}MEDLEY>LISPUSERS>DATEFORMAT-EDITOR.;1) + :EDIT-BY "lmm" + :CHANGES-TO (VARS DATEFORMAT-EDITORCOMS) + + :PREVIOUS-DATE "19-May-89 17:52:44" {MEDLEY}DATEFORMAT-EDITOR.;1) -(* " -Copyright (c) 1987, 1988, 1989 by Johannes A. G. M. Koomen. All rights reserved. -") (PRETTYCOMPRINT DATEFORMAT-EDITORCOMS) -(RPAQQ DATEFORMAT-EDITORCOMS ((* ;;; "This system provides a facility for editing date formats as described in section 12.5 of the Interlisp-D manual, Koto version. User entry point is the function EDIT-DATEFORMAT. Editing is accomplished using a FREEMENU. Items displayed in this menu are stored on DATEFORMAT-EDITOR-ITEMS. Call (GET-DATEFORMAT-EDITOR T) after changing this variable. Input to EDIT-DATEFORMAT is either NIL or a value returned by the DATEFORMAT function. Output is either NIL -- in case editing was aborted -- or another value as returned from the DATEFORMAT function.") (* ;;; "Interface") (FNS EDIT-DATEFORMAT GET-DATEFORMAT-EDITOR) (INITVARS (EDIT-DATEFORMAT-DEFAULT (DATEFORMAT))) (* ;;; "Support") (FILES (SYSLOAD) FREEMENU) (FNS DATEFORMAT-EDITOR-STATUS DATEFORMAT-EDITOR-GET-STATE DATEFORMAT-EDITOR-PUT-STATE DATEFORMAT-EDITOR-SHOW-STATE DATEFORMAT-EDITOR-ABORTFN DATEFORMAT-EDITOR-CLOSEFN DATEFORMAT-EDITOR-GETDFLTFN DATEFORMAT-EDITOR-PUTDFLTFN DATEFORMAT-EDITOR-QUITFN DATEFORMAT-EDITOR-SHOWFN) (VARS $$DATEFORMAT-EDITOR-ITEMS) (INITVARS (DATEFORMAT-EDITOR-ITEMS (COPY $$DATEFORMAT-EDITOR-ITEMS))) (DECLARE%: DONTEVAL@LOAD DOCOPY (VARS ($$DATEFORMAT-EDITOR (GET-DATEFORMAT-EDITOR)) ($$DATEFORMAT-EDITOR-IDATE (IDATE " 1-Jan-88 23:56:41"))) (P (COND ((NOT (GETD (QUOTE \OUTDATE-STRING))) (* ; "Get DATE extensions") (FILESLOAD (SYSLOAD) DATEPATCH))))) (PROP MAKEFILE-ENVIRONMENT DATEFORMAT-EDITOR))) +(RPAQQ DATEFORMAT-EDITORCOMS + ( + +(* ;;; "This system provides a facility for editing date formats as described in section 12.5 of the Interlisp-D manual, Koto version. User entry point is the function EDIT-DATEFORMAT. Editing is accomplished using a FREEMENU. Items displayed in this menu are stored on DATEFORMAT-EDITOR-ITEMS. Call (GET-DATEFORMAT-EDITOR T) after changing this variable. Input to EDIT-DATEFORMAT is either NIL or a value returned by the DATEFORMAT function. Output is either NIL -- in case editing was aborted -- or another value as returned from the DATEFORMAT function.") + + + +(* ;;; "Interface") + + (FNS EDIT-DATEFORMAT GET-DATEFORMAT-EDITOR) + (INITVARS (EDIT-DATEFORMAT-DEFAULT (DATEFORMAT))) + + +(* ;;; "Support") + + (FILES FREEMENU) + (FNS DATEFORMAT-EDITOR-STATUS DATEFORMAT-EDITOR-GET-STATE DATEFORMAT-EDITOR-PUT-STATE + DATEFORMAT-EDITOR-SHOW-STATE DATEFORMAT-EDITOR-ABORTFN DATEFORMAT-EDITOR-CLOSEFN + DATEFORMAT-EDITOR-GETDFLTFN DATEFORMAT-EDITOR-PUTDFLTFN DATEFORMAT-EDITOR-QUITFN + DATEFORMAT-EDITOR-SHOWFN) + (VARS $$DATEFORMAT-EDITOR-ITEMS) + (INITVARS (DATEFORMAT-EDITOR-ITEMS (COPY $$DATEFORMAT-EDITOR-ITEMS))) + [DECLARE%: DONTEVAL@LOAD DOCOPY (VARS ($$DATEFORMAT-EDITOR (GET-DATEFORMAT-EDITOR)) + ($$DATEFORMAT-EDITOR-IDATE (IDATE + " 1-Jan-1988 23:56:41" + ] + (PROP MAKEFILE-ENVIRONMENT DATEFORMAT-EDITOR))) @@ -36,14 +61,14 @@ Copyright (c) 1987, 1988, 1989 by Johannes A. G. M. Koomen. All rights reserved ) ) -(RPAQ? EDIT-DATEFORMAT-DEFAULT (DATEFORMAT)) +(RPAQ? EDIT-DATEFORMAT-DEFAULT (DATEFORMAT)) (* ;;; "Support") -(FILESLOAD (SYSLOAD) FREEMENU) +(FILESLOAD FREEMENU) (DEFINEQ (DATEFORMAT-EDITOR-STATUS @@ -87,26 +112,76 @@ Copyright (c) 1987, 1988, 1989 by Johannes A. G. M. Koomen. All rights reserved ) ) -(RPAQQ $$DATEFORMAT-EDITOR-ITEMS (((TYPE MOMENTARY LABEL "Quit" FONT (GACHA 10 BOLD) SELECTEDFN DATEFORMAT-EDITOR-QUITFN MESSAGE "Stop editing, return current settings") (TYPE DISPLAY LABEL "") (TYPE MOMENTARY LABEL "Abort" FONT (GACHA 10 BOLD) SELECTEDFN DATEFORMAT-EDITOR-ABORTFN MESSAGE "Stop editing, ignore changes, return NIL") (TYPE DISPLAY LABEL " Default:") (TYPE MOMENTARY LABEL "Get" FONT (GACHA 10 BOLD) SELECTEDFN DATEFORMAT-EDITOR-GETDFLTFN MESSAGE "Use default settings") (TYPE MOMENTARY LABEL "Put" FONT (GACHA 10 BOLD) SELECTEDFN DATEFORMAT-EDITOR-PUTDFLTFN MESSAGE "Save settings as default") (TYPE DISPLAY LABEL "")) ((TYPE DISPLAY LABEL "")) ((TYPE DISPLAY LABEL "DATE: " FONT (GACHA 10 BOLD))) ((TYPE DISPLAY LABEL " Format: " FONT (GACHA 10 BOLD)) (TYPE NWAY COLLECTION DATE ID DATE-NORMAL LABEL "dd-mon-yy" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) (TYPE NWAY COLLECTION DATE ID DATE-SLASHES LABEL "dd/mon/yy" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) (TYPE NWAY COLLECTION DATE ID DATE-NONE LABEL "none" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN)) ((TYPE DISPLAY LABEL " ") (TYPE NWAY COLLECTION DATE ID DATE-SPACES LABEL "dd mon yy" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) (TYPE NWAY COLLECTION DATE ID DATE-LEADING LABEL "mon dd, yy" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN)) ((TYPE DISPLAY LABEL " Year: " FONT (GACHA 10 BOLD)) (TYPE NWAY COLLECTION YEAR ID YEAR-LONG LABEL "long" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) (TYPE NWAY COLLECTION YEAR ID YEAR-SHORT LABEL "short" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN)) ((TYPE DISPLAY LABEL " Month: " FONT (GACHA 10 BOLD)) (TYPE NWAY COLLECTION MONTH ID MONTH-LONG LABEL "long" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) (TYPE NWAY COLLECTION MONTH ID MONTH-SHORT LABEL "short" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) (TYPE NWAY COLLECTION MONTH ID MONTH-NUMERIC LABEL "numeric" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN)) ((TYPE DISPLAY LABEL " Weekday:" FONT (GACHA 10 BOLD)) (TYPE NWAY COLLECTION DAY ID DAY-LONG LABEL "long" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) (TYPE NWAY COLLECTION DAY ID DAY-SHORT LABEL "short" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) (TYPE NWAY COLLECTION DAY ID DAY-NONE LABEL "none" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN)) ((TYPE DISPLAY LABEL " Spaces: " FONT (GACHA 10 BOLD)) (TYPE NWAY COLLECTION LEADER ID LEADER-YES LABEL "yes" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) (TYPE NWAY COLLECTION LEADER ID LEADER-NO LABEL "no" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN)) ((TYPE DISPLAY LABEL "")) ((TYPE DISPLAY LABEL "TIME:" FONT (GACHA 10 BOLD))) ((TYPE DISPLAY LABEL " Format: " FONT (GACHA 10 BOLD)) (TYPE NWAY COLLECTION TIME ID TIME-SECS LABEL "hh:mm:ss" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) (TYPE NWAY COLLECTION TIME ID TIME-MINS LABEL "hh:mm" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) (TYPE NWAY COLLECTION TIME ID TIME-NONE LABEL "none" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN)) ((TYPE DISPLAY LABEL " Time Zone:" FONT (GACHA 10 BOLD)) (TYPE NWAY COLLECTION TIMEZONE ID TIMEZONE-YES LABEL "yes" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) (TYPE NWAY COLLECTION TIMEZONE ID TIMEZONE-NO LABEL "no" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN)))) +(RPAQQ $$DATEFORMAT-EDITOR-ITEMS + (((TYPE MOMENTARY LABEL "Quit" FONT (GACHA 10 BOLD) + SELECTEDFN DATEFORMAT-EDITOR-QUITFN MESSAGE "Stop editing, return current settings") + (TYPE DISPLAY LABEL "") + (TYPE MOMENTARY LABEL "Abort" FONT (GACHA 10 BOLD) + SELECTEDFN DATEFORMAT-EDITOR-ABORTFN MESSAGE + "Stop editing, ignore changes, return NIL") + (TYPE DISPLAY LABEL " Default:") + (TYPE MOMENTARY LABEL "Get" FONT (GACHA 10 BOLD) + SELECTEDFN DATEFORMAT-EDITOR-GETDFLTFN MESSAGE "Use default settings") + (TYPE MOMENTARY LABEL "Put" FONT (GACHA 10 BOLD) + SELECTEDFN DATEFORMAT-EDITOR-PUTDFLTFN MESSAGE "Save settings as default") + (TYPE DISPLAY LABEL "")) + ((TYPE DISPLAY LABEL "")) + ((TYPE DISPLAY LABEL "DATE: " FONT (GACHA 10 BOLD))) + ((TYPE DISPLAY LABEL " Format: " FONT (GACHA 10 BOLD)) + (TYPE NWAY COLLECTION DATE ID DATE-NORMAL LABEL "dd-mon-yyyy" SELECTEDFN + DATEFORMAT-EDITOR-SHOWFN) + (TYPE NWAY COLLECTION DATE ID DATE-SLASHES LABEL "dd/mon/yyyy" SELECTEDFN + DATEFORMAT-EDITOR-SHOWFN) + (TYPE NWAY COLLECTION DATE ID DATE-NONE LABEL "none" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN)) + ((TYPE DISPLAY LABEL " ") + (TYPE NWAY COLLECTION DATE ID DATE-SPACES LABEL "dd mon yyyy" SELECTEDFN + DATEFORMAT-EDITOR-SHOWFN) + (TYPE NWAY COLLECTION DATE ID DATE-LEADING LABEL "mon dd, yyyy??" SELECTEDFN + DATEFORMAT-EDITOR-SHOWFN)) + ((TYPE DISPLAY LABEL " Year: " FONT (GACHA 10 BOLD)) + (TYPE NWAY COLLECTION YEAR ID YEAR-LONG LABEL "long" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) + (TYPE NWAY COLLECTION YEAR ID YEAR-SHORT LABEL "short" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN)) + ((TYPE DISPLAY LABEL " Month: " FONT (GACHA 10 BOLD)) + (TYPE NWAY COLLECTION MONTH ID MONTH-LONG LABEL "long" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) + (TYPE NWAY COLLECTION MONTH ID MONTH-SHORT LABEL "short" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN + ) + (TYPE NWAY COLLECTION MONTH ID MONTH-NUMERIC LABEL "numeric" SELECTEDFN + DATEFORMAT-EDITOR-SHOWFN)) + ((TYPE DISPLAY LABEL " Weekday:" FONT (GACHA 10 BOLD)) + (TYPE NWAY COLLECTION DAY ID DAY-LONG LABEL "long" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) + (TYPE NWAY COLLECTION DAY ID DAY-SHORT LABEL "short" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) + (TYPE NWAY COLLECTION DAY ID DAY-NONE LABEL "none" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN)) + ((TYPE DISPLAY LABEL " Spaces: " FONT (GACHA 10 BOLD)) + (TYPE NWAY COLLECTION LEADER ID LEADER-YES LABEL "yes" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) + (TYPE NWAY COLLECTION LEADER ID LEADER-NO LABEL "no" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN)) + ((TYPE DISPLAY LABEL "")) + ((TYPE DISPLAY LABEL "TIME:" FONT (GACHA 10 BOLD))) + ((TYPE DISPLAY LABEL " Format: " FONT (GACHA 10 BOLD)) + (TYPE NWAY COLLECTION TIME ID TIME-SECS LABEL "hh:mm:ss" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN + ) + (TYPE NWAY COLLECTION TIME ID TIME-MINS LABEL "hh:mm" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN) + (TYPE NWAY COLLECTION TIME ID TIME-NONE LABEL "none" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN)) + ((TYPE DISPLAY LABEL " Time Zone:" FONT (GACHA 10 BOLD)) + (TYPE NWAY COLLECTION TIMEZONE ID TIMEZONE-YES LABEL "yes" SELECTEDFN + DATEFORMAT-EDITOR-SHOWFN) + (TYPE NWAY COLLECTION TIMEZONE ID TIMEZONE-NO LABEL "no" SELECTEDFN DATEFORMAT-EDITOR-SHOWFN + )))) -(RPAQ? DATEFORMAT-EDITOR-ITEMS (COPY $$DATEFORMAT-EDITOR-ITEMS)) +(RPAQ? DATEFORMAT-EDITOR-ITEMS (COPY $$DATEFORMAT-EDITOR-ITEMS)) (DECLARE%: DONTEVAL@LOAD DOCOPY -(RPAQ $$DATEFORMAT-EDITOR (GET-DATEFORMAT-EDITOR)) +(RPAQ $$DATEFORMAT-EDITOR (GET-DATEFORMAT-EDITOR)) -(RPAQ $$DATEFORMAT-EDITOR-IDATE (IDATE " 1-Jan-88 23:56:41")) - - -(COND ((NOT (GETD (QUOTE \OUTDATE-STRING))) (* ; "Get DATE extensions") (FILESLOAD (SYSLOAD) DATEPATCH))) +(RPAQ $$DATEFORMAT-EDITOR-IDATE (IDATE " 1-Jan-1988 23:56:41")) ) -(PUTPROPS DATEFORMAT-EDITOR MAKEFILE-ENVIRONMENT (:READTABLE "INTERLISP" :PACKAGE "INTERLISP" :BASE 10)) -(PUTPROPS DATEFORMAT-EDITOR COPYRIGHT ("Johannes A. G. M. Koomen" 1987 1988 1989)) +(PUTPROPS DATEFORMAT-EDITOR MAKEFILE-ENVIRONMENT (:READTABLE "INTERLISP" :PACKAGE "INTERLISP" :BASE + 10)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (2483 4408 (EDIT-DATEFORMAT 2493 . 3520) (GET-DATEFORMAT-EDITOR 3522 . 4406)) (4513 9803 - (DATEFORMAT-EDITOR-STATUS 4523 . 4743) (DATEFORMAT-EDITOR-GET-STATE 4745 . 6551) ( -DATEFORMAT-EDITOR-PUT-STATE 6553 . 8363) (DATEFORMAT-EDITOR-SHOW-STATE 8365 . 8616) ( -DATEFORMAT-EDITOR-ABORTFN 8618 . 8758) (DATEFORMAT-EDITOR-CLOSEFN 8760 . 8949) ( -DATEFORMAT-EDITOR-GETDFLTFN 8951 . 9218) (DATEFORMAT-EDITOR-PUTDFLTFN 9220 . 9456) ( -DATEFORMAT-EDITOR-QUITFN 9458 . 9596) (DATEFORMAT-EDITOR-SHOWFN 9598 . 9801))))) + (FILEMAP (NIL (2634 4559 (EDIT-DATEFORMAT 2644 . 3671) (GET-DATEFORMAT-EDITOR 3673 . 4557)) (4658 9948 + (DATEFORMAT-EDITOR-STATUS 4668 . 4888) (DATEFORMAT-EDITOR-GET-STATE 4890 . 6696) ( +DATEFORMAT-EDITOR-PUT-STATE 6698 . 8508) (DATEFORMAT-EDITOR-SHOW-STATE 8510 . 8761) ( +DATEFORMAT-EDITOR-ABORTFN 8763 . 8903) (DATEFORMAT-EDITOR-CLOSEFN 8905 . 9094) ( +DATEFORMAT-EDITOR-GETDFLTFN 9096 . 9363) (DATEFORMAT-EDITOR-PUTDFLTFN 9365 . 9601) ( +DATEFORMAT-EDITOR-QUITFN 9603 . 9741) (DATEFORMAT-EDITOR-SHOWFN 9743 . 9946))))) STOP diff --git a/lispusers/DATEFORMAT-EDITOR.LCOM b/lispusers/DATEFORMAT-EDITOR.LCOM index 23b83f87..775a8ae1 100644 Binary files a/lispusers/DATEFORMAT-EDITOR.LCOM and b/lispusers/DATEFORMAT-EDITOR.LCOM differ diff --git a/lispusers/DOC-OBJECTS b/lispusers/DOC-OBJECTS index 6754b73b..8b3a2dfb 100644 --- a/lispusers/DOC-OBJECTS +++ b/lispusers/DOC-OBJECTS @@ -1,12 +1,31 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED " 9-Dec-2024 21:07:13" {WMEDLEY}DOC-OBJECTS.;58 52672 +(FILECREATED " 3-May-2026 10:44:14" {MEDLEY}DOC-OBJECTS.;2 53774 - :EDIT-BY rmk + :EDIT-BY "lmm" - :CHANGES-TO (FNS DOCOBJ-STRING-IMAGEBOX) + :CHANGES-TO (VARS DOC-OBJECTSCOMS) + (FNS DOCOBJ-ACQUIRE-OBJECT DOCOBJ-INIT DOCOBJ-TEDIT-MENU-ENTRY DOCOBJ-GET-LOOKS + DOCOBJ-REGISTER-OBJECT DOCOBJ-STRING-IMAGEBOX DOCOBJ-WAIT-MOUSE + DOCOBJ-BEFOREHARDCOPYFN DOCOBJ-AFTERHARDCOPYFN DOCOBJ-ACQUIRE-EVALED-OBJECT + DOCOBJ-ACQUIRE-SNAPPED-OBJECT DOCOBJ-EDIT-TIMESTAMP DOCOBJ-MAKE-TIMESTAMP + DOCOBJ-MAKE-TIMESTAMP-IMAGEFNS DOCOBJ-TIMESTAMP-BUTTONEVENTINFN + DOCOBJ-TIMESTAMP-COPYFN DOCOBJ-TIMESTAMP-DISPLAYFN DOCOBJ-TIMESTAMP-GETFN + DOCOBJ-TIMESTAMP-IMAGEBOXFN DOCOBJ-TIMESTAMP-PREPRINTFN DOCOBJ-TIMESTAMP-PUTFN + DOCOBJ-TIMESTAMP-TO-STRING DOCOBJ-MAKE-FILESTAMP + DOCOBJ-MAKE-FILESTAMP-IMAGEFNS DOCOBJ-FILESTAMP-COPYFN + DOCOBJ-FILESTAMP-DISPLAYFN DOCOBJ-FILESTAMP-GETFN DOCOBJ-FILESTAMP-IMAGEBOXFN + DOCOBJ-FILESTAMP-GET-FULLNAME DOCOBJ-FILESTAMP-NEW-FULLNAME + DOCOBJ-FILESTAMP-PREPRINTFN DOCOBJ-FILESTAMP-PUTFN DOCOBJ-MAKE-HRULE + DOCOBJ-EDIT-HRULE DOCOBJ-HRULE-INIT DOCOBJ-HRULE-GET-WIDTH + DOCOBJ-HRULE-BUTTONEVENTINFN DOCOBJ-MAKE-INCLUDE DOCOBJ-MAKE-INCLUDE-IMAGEFNS + DOCOBJ-INCLUDE-CREATE-OBJ DOCOBJ-INCLUDE-EDIT DOCOBJ-INCLUDE-EDIT-WINDOWP + DOCOBJ-INCLUDE-RESET-OBJ DOCOBJ-INCLUDE-BEFOREHARDCOPYFN + DOCOBJ-INCLUDE-CLEANUPFN DOCOBJ-INCLUDE-BUTTONEVENTINFN DOCOBJ-INCLUDE-COPYFN + DOCOBJ-INCLUDE-DISPLAYFN DOCOBJ-INCLUDE-GETFN DOCOBJ-INCLUDE-IMAGEBOXFN + DOCOBJ-INCLUDE-PREPRINTFN DOCOBJ-INCLUDE-PUTFN) - :PREVIOUS-DATE " 8-Dec-2024 15:49:01" {WMEDLEY}DOC-OBJECTS.;57) + :PREVIOUS-DATE " 9-Dec-2024 21:07:13" {MEDLEY}DOC-OBJECTS.;1) (PRETTYCOMPRINT DOC-OBJECTSCOMS) @@ -16,8 +35,7 @@ (* ;;; "This TEdit subsystem implements an extensible facility originally intended to provide bibliography and citation capabilities. The TEdit function GET.OBJ.FROM.USER, the one triggered by typing ^O, calls the function PROMPTFOREVALED which is redefined by this subsystem to be equivalent to the function DocObj-Acquire-Object. This function inserts IMAGEOBJects into the current TEdit, and is driven by the variables DocObjectsMenu and DocObjectsMenuCommands (analogous to BackgroundMenu and BackgroundMenuCommands). Each menu entry contains a form that, when EVAL'd, creates and returns a particular kind of IMAGEOBJ. Note that this form is EVAL'd under the function DocObj-Acquire-Object, which runs under the function GET.OBJ.FROM.USER, which gets TEXTSTREAM and TEXTOBJ as arguments. They can be (and are) used freely to record state or other desired info. The image objects supplied by this subsystem are 'Eval`d Form' (i.e., the original behavior of ^O), 'Screen Snap' (equivalent to right-buttoning in the background while holding the SHIFT key down), etc.") - (FILES (SYSLOAD) - TEDIT IMAGEOBJ) + (FILES TEDIT IMAGEOBJ) (DECLARE%: EVAL@COMPILE DONTCOPY (FILES TEDIT-EXPORTS.ALL)) (VARS (DocObjectsMenu NIL) (DocObjectsConfirmEditMenu NIL)) @@ -45,8 +63,7 @@ (* ;; "Time Stamp") (DECLARE%: DONTCOPY (RECORDS DOCOBJ-TIMESTAMP)) - (FILES (SYSLOAD) - DATEFORMAT-EDITOR) + (FILES DATEFORMAT-EDITOR) (FNS DOCOBJ-EDIT-TIMESTAMP DOCOBJ-MAKE-TIMESTAMP DOCOBJ-MAKE-TIMESTAMP-IMAGEFNS DOCOBJ-TIMESTAMP-BUTTONEVENTINFN DOCOBJ-TIMESTAMP-COPYFN DOCOBJ-TIMESTAMP-DISPLAYFN DOCOBJ-TIMESTAMP-GETFN DOCOBJ-TIMESTAMP-IMAGEBOXFN @@ -70,8 +87,7 @@ (COMS (* ;; "Horizontal Rule") - (FILES (SYSLOAD) - HRULE READNUMBER) + (FILES HRULE READNUMBER) (FNS DOCOBJ-MAKE-HRULE DOCOBJ-EDIT-HRULE DOCOBJ-HRULE-INIT DOCOBJ-HRULE-GET-WIDTH DOCOBJ-HRULE-BUTTONEVENTINFN) (VARS (DOCOBJ-HRULE-RULE-PAD) @@ -107,8 +123,7 @@ ) -(FILESLOAD (SYSLOAD) - TEDIT IMAGEOBJ) +(FILESLOAD TEDIT IMAGEOBJ) (DECLARE%: EVAL@COMPILE DONTCOPY (FILESLOAD TEDIT-EXPORTS.ALL) @@ -146,21 +161,17 @@ (MENU DocObjectsMenu]) (DOCOBJ-INIT - [LAMBDA NIL (* ; - "Edited 8-Oct-87 21:32 by Koomen") + [LAMBDA NIL (* ; "Edited 8-Oct-87 21:32 by Koomen") (* ;;; "This function changes the behavior of standard TEdit such that ^O will invoke the DocObjects system; an entry to invoke the DocObjects system is also added to TEdit's middle button menu.") (DECLARE (GLOBALVARS TEDIT.DEFAULT.MENU)) - (CHANGENAME 'GET.OBJ.FROM.USER 'PROMPTFOREVALED ' - DOCOBJ-ACQUIRE-OBJECT) - (TEDIT.ADD.MENUITEM TEDIT.DEFAULT.MENU - '(Object (FUNCTION DOCOBJ-TEDIT-MENU-ENTRY) - "Insert a Document Object"]) + (CHANGENAME 'GET.OBJ.FROM.USER 'PROMPTFOREVALED 'DOCOBJ-ACQUIRE-OBJECT) + (TEDIT.ADD.MENUITEM TEDIT.DEFAULT.MENU '(Object (FUNCTION DOCOBJ-TEDIT-MENU-ENTRY) + "Insert a Document Object"]) (DOCOBJ-TEDIT-MENU-ENTRY - [LAMBDA (TEXTSTREAM) (* ; - "Edited 8-Oct-87 21:31 by Koomen") + [LAMBDA (TEXTSTREAM) (* ; "Edited 8-Oct-87 21:31 by Koomen") (* ;;; "This is the entry point into the DocObjects system from TEdit's middle button menu. GET.OBJ.FROM.USER used to call PROMPTFOREVALED but DocObjects changes this into a call to DOCOBJ-ACQUIRE-OBJECT.") @@ -201,8 +212,8 @@ (DOCOBJ-REGISTER-OBJECT [LAMBDA (OBJECT) (* ; "Edited 23-Oct-87 14:48 by Koomen") - - (* ;; "The following ensures that all DocObjects get a chance to do whatever they want to before and after hardcopying. Each DocObject can associate a BEFOREHARDCOPYFN and/or an AFTERHARDCOPYFN with the ImageObj representing the DocObject") + + (* ;; "The following ensures that all DocObjects get a chance to do whatever they want to before and after hardcopying. Each DocObject can associate a BEFOREHARDCOPYFN and/or an AFTERHARDCOPYFN with the ImageObj representing the DocObject") (DECLARE (SPECVARS TEXTOBJ)) (if OBJECT @@ -230,11 +241,8 @@ XKERN _ 0]) (DOCOBJ-WAIT-MOUSE - [LAMBDA (STREAM) (* ; - "Edited 8-Oct-87 23:46 by Koomen") - - (while (NOT (MOUSESTATE UP)) bind (REGION _ (DSPCLIPPINGREGION - NIL STREAM)) + [LAMBDA (STREAM) (* ; "Edited 8-Oct-87 23:46 by Koomen") + (while (NOT (MOUSESTATE UP)) bind (REGION _ (DSPCLIPPINGREGION NIL STREAM)) do (if (NOT (INSIDEP REGION (LASTMOUSEX STREAM) (LASTMOUSEY STREAM))) then (RETURN NIL)) finally (RETURN T]) @@ -346,10 +354,9 @@ (DEFINEQ (DOCOBJ-ACQUIRE-EVALED-OBJECT - [LAMBDA NIL (* Koomen "30-Sep-86 02:08") - - (* * This is the original function called under - GET.OBJ.FROM.USER * *) + [LAMBDA NIL (* Koomen "30-Sep-86 02:08") + + (* * This is the original function called under GET.OBJ.FROM.USER * *) (PROMPTFOREVALED "Form to eval: "]) ) @@ -364,7 +371,7 @@ (DEFINEQ (DOCOBJ-ACQUIRE-SNAPPED-OBJECT - [LAMBDA NIL (* Koomen "26-Sep-86 16:55") + [LAMBDA NIL (* Koomen "26-Sep-86 16:55") (GETREGION]) ) @@ -382,34 +389,27 @@ ) ) -(FILESLOAD (SYSLOAD) - DATEFORMAT-EDITOR) +(FILESLOAD DATEFORMAT-EDITOR) (DEFINEQ (DOCOBJ-EDIT-TIMESTAMP - [LAMBDA (TIMESTAMP) (* Koomen " 4-Feb-87 14:08") - (PROG [(FORMAT (EDIT-DATEFORMAT (fetch (DOCOBJ-TIMESTAMP FORMAT) - of TIMESTAMP] + [LAMBDA (TIMESTAMP) (* Koomen " 4-Feb-87 14:08") + (PROG [(FORMAT (EDIT-DATEFORMAT (fetch (DOCOBJ-TIMESTAMP FORMAT) of TIMESTAMP] (if FORMAT - then (replace (DOCOBJ-TIMESTAMP FORMAT) of TIMESTAMP - with FORMAT) - (replace (DOCOBJ-TIMESTAMP DATESTR) of TIMESTAMP - with NIL) + then (replace (DOCOBJ-TIMESTAMP FORMAT) of TIMESTAMP with FORMAT) + (replace (DOCOBJ-TIMESTAMP DATESTR) of TIMESTAMP with NIL) (RETURN TIMESTAMP]) (DOCOBJ-MAKE-TIMESTAMP - [LAMBDA NIL (* Koomen " 4-Feb-87 13:54") - (DECLARE (GLOBALVARS DOCOBJ-TIMESTAMP-IMAGEFNS - DocObjectsTimeStampFormat)) + [LAMBDA NIL (* Koomen " 4-Feb-87 13:54") + (DECLARE (GLOBALVARS DOCOBJ-TIMESTAMP-IMAGEFNS DocObjectsTimeStampFormat)) (IMAGEOBJCREATE (create DOCOBJ-TIMESTAMP - IDATE _ (IDATE) - FORMAT _ DocObjectsTimeStampFormat) + IDATE _ (IDATE) + FORMAT _ DocObjectsTimeStampFormat) DOCOBJ-TIMESTAMP-IMAGEFNS]) (DOCOBJ-MAKE-TIMESTAMP-IMAGEFNS - [LAMBDA NIL (* ; - "Edited 8-Oct-87 22:53 by Koomen") - + [LAMBDA NIL (* ; "Edited 8-Oct-87 22:53 by Koomen") (LET ((DISPLAYFN (FUNCTION DOCOBJ-TIMESTAMP-DISPLAYFN)) (IMAGEBOXFN (FUNCTION DOCOBJ-TIMESTAMP-IMAGEBOXFN)) (PUTFN (FUNCTION DOCOBJ-TIMESTAMP-PUTFN)) @@ -423,68 +423,58 @@ (WHENCOPIEDFN (FUNCTION NILL)) (WHENOPERATEDONFN (FUNCTION NILL)) (PREPRINTFN (FUNCTION DOCOBJ-TIMESTAMP-PREPRINTFN))) - (IMAGEFNSCREATE DISPLAYFN IMAGEBOXFN PUTFN GETFN COPYFN - BUTTONEVENTINFN COPYBUTTONEVENTINFN WHENMOVEDFN - WHENINSERTEDFN WHENDELETEDFN WHENCOPIEDFN - WHENOPERATEDONFN PREPRINTFN]) + (IMAGEFNSCREATE DISPLAYFN IMAGEBOXFN PUTFN GETFN COPYFN BUTTONEVENTINFN COPYBUTTONEVENTINFN + WHENMOVEDFN WHENINSERTEDFN WHENDELETEDFN WHENCOPIEDFN WHENOPERATEDONFN PREPRINTFN]) (DOCOBJ-TIMESTAMP-BUTTONEVENTINFN - [LAMBDA (IMAGEOBJ WINDOWSTREAM SELECTION RELX RELY WINDOW HOSTSTREAM - BUTTON) (* ; - "Edited 8-Oct-87 23:43 by Koomen") - + [LAMBDA (IMAGEOBJ WINDOWSTREAM SELECTION RELX RELY WINDOW HOSTSTREAM BUTTON) + (* ; "Edited 8-Oct-87 23:43 by Koomen") (if (AND (EQ BUTTON 'MIDDLE) (DOCOBJ-WAIT-MOUSE WINDOWSTREAM)) then (ALLOW.BUTTON.EVENTS) - (if (DOCOBJ-EDIT-TIMESTAMP (IMAGEOBJPROP IMAGEOBJ - 'OBJECTDATUM)) + (if (DOCOBJ-EDIT-TIMESTAMP (IMAGEOBJPROP IMAGEOBJ 'OBJECTDATUM)) then 'CHANGED]) (DOCOBJ-TIMESTAMP-COPYFN - [LAMBDA (IMAGEOBJ SOURCEHOSTSTREAM TARGETHOSTSTREAM) - (* Koomen "31-Jan-87 00:30") + [LAMBDA (IMAGEOBJ SOURCEHOSTSTREAM TARGETHOSTSTREAM) (* Koomen "31-Jan-87 00:30") (DECLARE (GLOBALVARS DOCOBJ-TIMESTAMP-IMAGEFNS)) (IMAGEOBJCREATE (COPYALL (IMAGEOBJPROP IMAGEOBJ 'OBJECTDATUM)) DOCOBJ-TIMESTAMP-IMAGEFNS]) (DOCOBJ-TIMESTAMP-DISPLAYFN - [LAMBDA (IMAGEOBJ IMAGESTREAM IMAGESTREAMTYPE HOSTSTREAM) - (* Koomen " 4-Feb-87 14:11") - (PRINTOUT IMAGESTREAM (DOCOBJ-TIMESTAMP-TO-STRING - (IMAGEOBJPROP IMAGEOBJ 'OBJECTDATUM]) + [LAMBDA (IMAGEOBJ IMAGESTREAM IMAGESTREAMTYPE HOSTSTREAM) (* Koomen " 4-Feb-87 14:11") + (PRINTOUT IMAGESTREAM (DOCOBJ-TIMESTAMP-TO-STRING (IMAGEOBJPROP IMAGEOBJ 'OBJECTDATUM]) (DOCOBJ-TIMESTAMP-GETFN - [LAMBDA (FILESTREAM) (* Koomen "31-Jan-87 00:19") + [LAMBDA (FILESTREAM) (* Koomen "31-Jan-87 00:19") (DECLARE (GLOBALVARS DOCOBJ-TIMESTAMP-IMAGEFNS)) (IMAGEOBJCREATE (READ FILESTREAM) DOCOBJ-TIMESTAMP-IMAGEFNS]) (DOCOBJ-TIMESTAMP-IMAGEBOXFN - [LAMBDA (IMAGEOBJ IMAGESTREAM CURRENTX RIGHTMARGIN) - (* Koomen " 9-Feb-87 17:13") + [LAMBDA (IMAGEOBJ IMAGESTREAM CURRENTX RIGHTMARGIN) (* Koomen " 9-Feb-87 17:13") (LET* ((TIMESTAMP (IMAGEOBJPROP IMAGEOBJ 'OBJECTDATUM)) (TIMESTRING (DOCOBJ-TIMESTAMP-TO-STRING TIMESTAMP))) (DOCOBJ-STRING-IMAGEBOX TIMESTRING IMAGESTREAM]) (DOCOBJ-TIMESTAMP-PREPRINTFN - [LAMBDA (IMAGEOBJ) (* ; - "Edited 8-Oct-87 22:29 by Koomen") - + [LAMBDA (IMAGEOBJ) (* ; "Edited 8-Oct-87 22:29 by Koomen") (DOCOBJ-TIMESTAMP-TO-STRING (IMAGEOBJPROP IMAGEOBJ 'OBJECTDATUM]) (DOCOBJ-TIMESTAMP-PUTFN - [LAMBDA (IMAGEOBJ FILESTREAM) (* Koomen " 4-Feb-87 14:08") + [LAMBDA (IMAGEOBJ FILESTREAM) (* Koomen " 4-Feb-87 14:08") (PROG [(TIMESTAMP (IMAGEOBJPROP IMAGEOBJ 'OBJECTDATUM] (replace (DOCOBJ-TIMESTAMP IDATE) of TIMESTAMP with (IDATE)) (replace (DOCOBJ-TIMESTAMP DATESTR) of TIMESTAMP with NIL) (PRINT TIMESTAMP FILESTREAM]) (DOCOBJ-TIMESTAMP-TO-STRING - [LAMBDA (TIMESTAMP) (* Koomen " 4-Feb-87 14:12") + [LAMBDA (TIMESTAMP) (* Koomen " 4-Feb-87 14:12") (OR (STRINGP (fetch (DOCOBJ-TIMESTAMP DATESTR) of TIMESTAMP)) - (replace (DOCOBJ-TIMESTAMP DATESTR) of TIMESTAMP - with (GDATE (fetch (DOCOBJ-TIMESTAMP IDATE) of TIMESTAMP) - (fetch (DOCOBJ-TIMESTAMP FORMAT) of TIMESTAMP]) + (replace (DOCOBJ-TIMESTAMP DATESTR) of TIMESTAMP with (GDATE (fetch (DOCOBJ-TIMESTAMP IDATE) + of TIMESTAMP) + (fetch (DOCOBJ-TIMESTAMP FORMAT) + of TIMESTAMP]) ) (RPAQ? DocObjectsTimeStampFormat ) @@ -501,18 +491,14 @@ (DEFINEQ (DOCOBJ-MAKE-FILESTAMP - [LAMBDA NIL (* ; - "Edited 8-Oct-87 22:55 by Koomen") - + [LAMBDA NIL (* ; "Edited 8-Oct-87 22:55 by Koomen") (DECLARE (SPECVARS TEXTOBJ) (GLOBALVARS DOCOBJ-FILESTAMP-IMAGEFNS)) (IMAGEOBJCREATE (DOCOBJ-FILESTAMP-NEW-FULLNAME TEXTOBJ) DOCOBJ-FILESTAMP-IMAGEFNS]) (DOCOBJ-MAKE-FILESTAMP-IMAGEFNS - [LAMBDA NIL (* ; - "Edited 8-Oct-87 22:54 by Koomen") - + [LAMBDA NIL (* ; "Edited 8-Oct-87 22:54 by Koomen") (LET ((DISPLAYFN (FUNCTION DOCOBJ-FILESTAMP-DISPLAYFN)) (IMAGEBOXFN (FUNCTION DOCOBJ-FILESTAMP-IMAGEBOXFN)) (PUTFN (FUNCTION DOCOBJ-FILESTAMP-PUTFN)) @@ -526,46 +512,33 @@ (WHENCOPIEDFN (FUNCTION NILL)) (WHENOPERATEDONFN (FUNCTION NILL)) (PREPRINTFN (FUNCTION DOCOBJ-FILESTAMP-PREPRINTFN))) - (IMAGEFNSCREATE DISPLAYFN IMAGEBOXFN PUTFN GETFN COPYFN - BUTTONEVENTINFN COPYBUTTONEVENTINFN WHENMOVEDFN - WHENINSERTEDFN WHENDELETEDFN WHENCOPIEDFN - WHENOPERATEDONFN PREPRINTFN]) + (IMAGEFNSCREATE DISPLAYFN IMAGEBOXFN PUTFN GETFN COPYFN BUTTONEVENTINFN COPYBUTTONEVENTINFN + WHENMOVEDFN WHENINSERTEDFN WHENDELETEDFN WHENCOPIEDFN WHENOPERATEDONFN PREPRINTFN]) (DOCOBJ-FILESTAMP-COPYFN - [LAMBDA (IMAGEOBJ SOURCEHOSTSTREAM TARGETHOSTSTREAM) - (* Koomen "31-Jan-87 04:10") + [LAMBDA (IMAGEOBJ SOURCEHOSTSTREAM TARGETHOSTSTREAM) (* Koomen "31-Jan-87 04:10") (DECLARE (GLOBALVARS DOCOBJ-FILESTAMP-IMAGEFNS)) (IMAGEOBJCREATE (IMAGEOBJPROP IMAGEOBJ 'OBJECTDATUM) DOCOBJ-FILESTAMP-IMAGEFNS]) (DOCOBJ-FILESTAMP-DISPLAYFN - [LAMBDA (IMAGEOBJ IMAGESTREAM IMAGESTREAMTYPE HOSTSTREAM) - (* ; - "Edited 8-Oct-87 22:56 by Koomen") - + [LAMBDA (IMAGEOBJ IMAGESTREAM IMAGESTREAMTYPE HOSTSTREAM) (* ; "Edited 8-Oct-87 22:56 by Koomen") (PRINTOUT IMAGESTREAM (DOCOBJ-FILESTAMP-GET-FULLNAME IMAGEOBJ]) (DOCOBJ-FILESTAMP-GETFN - [LAMBDA (FILESTREAM) (* ; - "Edited 8-Oct-87 22:58 by Koomen") - + [LAMBDA (FILESTREAM) (* ; "Edited 8-Oct-87 22:58 by Koomen") (DECLARE (GLOBALVARS DOCOBJ-FILESTAMP-IMAGEFNS)) (LET ((FULLNAME (READ FILESTREAM))) (IMAGEOBJCREATE (AND FULLNAME (MKSTRING FULLNAME)) DOCOBJ-FILESTAMP-IMAGEFNS]) (DOCOBJ-FILESTAMP-IMAGEBOXFN - [LAMBDA (IMAGEOBJ IMAGESTREAM CURRENTX RIGHTMARGIN) - (* ; - "Edited 8-Oct-87 22:59 by Koomen") - + [LAMBDA (IMAGEOBJ IMAGESTREAM CURRENTX RIGHTMARGIN) (* ; "Edited 8-Oct-87 22:59 by Koomen") (LET ((FULLNAME (DOCOBJ-FILESTAMP-GET-FULLNAME IMAGEOBJ))) (DOCOBJ-STRING-IMAGEBOX FULLNAME IMAGESTREAM]) (DOCOBJ-FILESTAMP-GET-FULLNAME - [LAMBDA (IMAGEOBJ NODEFAULTFLG) (* ; - "Edited 8-Oct-87 22:59 by Koomen") - + [LAMBDA (IMAGEOBJ NODEFAULTFLG) (* ; "Edited 8-Oct-87 22:59 by Koomen") (PROG [(FULLNAME (IMAGEOBJPROP IMAGEOBJ 'OBJECTDATUM] (RETURN (OR (if FULLNAME then (if (LITATOM FULLNAME) @@ -576,9 +549,7 @@ then "-- not yet filed --"]) (DOCOBJ-FILESTAMP-NEW-FULLNAME - [LAMBDA (TEXTOBJ) (* ; - "Edited 8-Oct-87 22:52 by Koomen") - + [LAMBDA (TEXTOBJ) (* ; "Edited 8-Oct-87 22:52 by Koomen") (PROG ((FULLNAME (FULLNAME TEXTOBJ))) (RETURN (if FULLNAME then (if (LITATOM FULLNAME) @@ -587,15 +558,11 @@ then (COPYALL FULLNAME]) (DOCOBJ-FILESTAMP-PREPRINTFN - [LAMBDA (IMAGEOBJ) (* ; - "Edited 8-Oct-87 22:56 by Koomen") - + [LAMBDA (IMAGEOBJ) (* ; "Edited 8-Oct-87 22:56 by Koomen") (DOCOBJ-FILESTAMP-GET-FULLNAME IMAGEOBJ T]) (DOCOBJ-FILESTAMP-PUTFN - [LAMBDA (IMAGEOBJ FILESTREAM) (* ; - "Edited 8-Oct-87 22:39 by Koomen") - + [LAMBDA (IMAGEOBJ FILESTREAM) (* ; "Edited 8-Oct-87 22:39 by Koomen") (PROG [(FULLNAME (MKSTRING (FULLNAME FILESTREAM] (IMAGEOBJPROP IMAGEOBJ 'OBJECTDATUM FULLNAME) (PRINT FULLNAME FILESTREAM]) @@ -611,22 +578,19 @@ (* ;; "Horizontal Rule") -(FILESLOAD (SYSLOAD) - HRULE READNUMBER) +(FILESLOAD HRULE READNUMBER) (DEFINEQ (DOCOBJ-MAKE-HRULE - [LAMBDA NIL (* Koomen " 4-Feb-87 16:12") - (HRULE.CREATE (bind WIDTH for I from 1 - while (AND (SETQ WIDTH (DOCOBJ-HRULE-GET-WIDTH - (ODDP I) - (EQ I 1))) - (GREATERP WIDTH 0)) collect WIDTH]) + [LAMBDA NIL (* Koomen " 4-Feb-87 16:12") + (HRULE.CREATE (bind WIDTH for I from 1 while (AND (SETQ WIDTH (DOCOBJ-HRULE-GET-WIDTH + (ODDP I) + (EQ I 1))) + (GREATERP WIDTH 0)) collect WIDTH]) (DOCOBJ-EDIT-HRULE - [LAMBDA (IMAGEOBJ) (* Koomen " 4-Feb-87 15:45") - (PROG [NEWWIDTH (OLDWIDTH (MKLIST (IMAGEOBJPROP IMAGEOBJ - 'RULE.WIDTH] + [LAMBDA (IMAGEOBJ) (* Koomen " 4-Feb-87 15:45") + (PROG [NEWWIDTH (OLDWIDTH (MKLIST (IMAGEOBJPROP IMAGEOBJ 'RULE.WIDTH] (SETQ NEWWIDTH (COPYALL OLDWIDTH)) (if (AND (NLSETQ (EDITE NEWWIDTH)) (NOT (EQUAL NEWWIDTH OLDWIDTH))) @@ -634,18 +598,18 @@ (RETURN IMAGEOBJ]) (DOCOBJ-HRULE-INIT - [LAMBDA NIL (* Koomen " 4-Feb-87 16:13") - - (* * provide HRULE editing * *) + [LAMBDA NIL (* Koomen " 4-Feb-87 16:13") + + (* * provide HRULE editing * *) (DECLARE (GLOBALVARS HRULE.IMAGEFNS)) - (replace (IMAGEFNS BUTTONEVENTINFN) of HRULE.IMAGEFNS - with (FUNCTION DOCOBJ-HRULE-BUTTONEVENTINFN)) + (replace (IMAGEFNS BUTTONEVENTINFN) of HRULE.IMAGEFNS with (FUNCTION DOCOBJ-HRULE-BUTTONEVENTINFN + )) NIL]) (DOCOBJ-HRULE-GET-WIDTH - [LAMBDA (RULE? FIRST?) (* ; - "Edited 24-May-93 23:35 by sybalsky:mv:envos") + [LAMBDA (RULE? FIRST?) (* ; + "Edited 24-May-93 23:35 by sybalsky:mv:envos") (DECLARE (GLOBALVARS DOCOBJ-HRULE-BLANK-PAD DOCOBJ-HRULE-RULE-PAD LASTMOUSEX LASTMOUSEY)) [COND ((NULL DOCOBJ-HRULE-RULE-PAD) @@ -660,10 +624,8 @@ T]) (DOCOBJ-HRULE-BUTTONEVENTINFN - [LAMBDA (IMAGEOBJ WINDOWSTREAM SELECTION RELX RELY WINDOW HOSTSTREAM - BUTTON) (* ; - "Edited 8-Oct-87 23:43 by Koomen") - + [LAMBDA (IMAGEOBJ WINDOWSTREAM SELECTION RELX RELY WINDOW HOSTSTREAM BUTTON) + (* ; "Edited 8-Oct-87 23:43 by Koomen") (if (AND (EQ BUTTON 'MIDDLE) (DOCOBJ-WAIT-MOUSE WINDOWSTREAM)) then (ALLOW.BUTTON.EVENTS) @@ -696,7 +658,6 @@ (DOCOBJ-MAKE-INCLUDE [LAMBDA NIL (* ; "Edited 15-Oct-87 14:54 by Koomen") - (DECLARE (SPECVARS TEXTOBJ)) (PROG ((SUBFILE (TEDIT.GETINPUT TEXTOBJ "Enter file name: "))) (if SUBFILE @@ -705,7 +666,6 @@ (DOCOBJ-MAKE-INCLUDE-IMAGEFNS [LAMBDA NIL (* ; "Edited 23-Oct-87 00:20 by Koomen") - (LET ((DISPLAYFN (FUNCTION DOCOBJ-INCLUDE-DISPLAYFN)) (IMAGEBOXFN (FUNCTION DOCOBJ-INCLUDE-IMAGEBOXFN)) (PUTFN (FUNCTION DOCOBJ-INCLUDE-PUTFN)) @@ -719,7 +679,7 @@ (WHENCOPIEDFN (FUNCTION NILL)) (WHENOPERATEDONFN (FUNCTION NILL)) (PREPRINTFN (FUNCTION DOCOBJ-INCLUDE-PREPRINTFN))) - (IMAGEFNSCREATE DISPLAYFN IMAGEBOXFN PUTFN GETFN COPYFN BUTTONEVENTINFN COPYBUTTONEVENTINFN + (IMAGEFNSCREATE DISPLAYFN IMAGEBOXFN PUTFN GETFN COPYFN BUTTONEVENTINFN COPYBUTTONEVENTINFN WHENMOVEDFN WHENINSERTEDFN WHENDELETEDFN WHENCOPIEDFN WHENOPERATEDONFN PREPRINTFN]) (DOCOBJ-INCLUDE-CREATE-OBJ @@ -912,7 +872,6 @@ (DOCOBJ-INCLUDE-COPYFN [LAMBDA (IMAGEOBJ SOURCEHOSTSTREAM TARGETHOSTSTREAM) (* ; "Edited 23-Oct-87 00:13 by Koomen") - (DOCOBJ-INCLUDE-CREATE-OBJ (COPYALL (IMAGEOBJPROP IMAGEOBJ 'OBJECTDATUM]) (DOCOBJ-INCLUDE-DISPLAYFN @@ -927,28 +886,24 @@ (DOCOBJ-INCLUDE-GETFN [LAMBDA (FILESTREAM) (* ; "Edited 26-Oct-87 22:00 by Koomen") - (LET ((INCLOBJ (READ FILESTREAM))) (if (NLISTP INCLOBJ) then - - (* ;; "Version 1: Just filename as string") - - (* ;; "Version 2: List whose CAR is filename") + (* ;; "Version 1: Just filename as string") + + (* ;; "Version 2: List whose CAR is filename") (SETQ INCLOBJ (create INCLOBJ - FILENAME _ INCLOBJ))) + FILENAME _ INCLOBJ))) (if (NLISTP (CDR INCLOBJ)) then - - (* ;; "Version 3: List whose CADR is ENABLEDP flag") + (* ;; "Version 3: List whose CADR is ENABLEDP flag") (NCONC1 INCLOBJ T)) (DOCOBJ-INCLUDE-CREATE-OBJ INCLOBJ]) (DOCOBJ-INCLUDE-IMAGEBOXFN [LAMBDA (IMAGEOBJ IMAGESTREAM CURRENTX RIGHTMARGIN) (* ; "Edited 23-Oct-87 14:41 by Koomen") - (OR (LET [(INCLOBJ (IMAGEOBJPROP IMAGEOBJ 'OBJECTDATUM] (if [AND INCLOBJ (OR (EQ (IMAGESTREAMTYPE IMAGESTREAM) 'DISPLAY) @@ -959,19 +914,17 @@ else 'DONTINCLDISPLAYSTRING)) IMAGESTREAM))) (create IMAGEBOX - XSIZE _ 0 - YSIZE _ 0 - YDESC _ 0 - XKERN _ 0]) + XSIZE _ 0 + YSIZE _ 0 + YDESC _ 0 + XKERN _ 0]) (DOCOBJ-INCLUDE-PREPRINTFN [LAMBDA (IMAGEOBJ) (* ; "Edited 23-Oct-87 14:19 by Koomen") - (fetch (INCLOBJ FILENAME) of (IMAGEOBJPROP IMAGEOBJ 'OBJECTDATUM]) (DOCOBJ-INCLUDE-PUTFN [LAMBDA (IMAGEOBJ FILESTREAM) (* ; "Edited 15-Oct-87 17:17 by Koomen") - (PRINT (IMAGEOBJPROP IMAGEOBJ 'OBJECTDATUM) FILESTREAM]) ) @@ -993,29 +946,29 @@ (PUTPROPS DOC-OBJECTS MAKEFILE-ENVIRONMENT (:READTABLE "INTERLISP" :PACKAGE "INTERLISP" :BASE 10)) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (7640 21328 (DOCOBJ-ACQUIRE-OBJECT 7650 . 8651) (DOCOBJ-INIT 8653 . 9281) ( -DOCOBJ-TEDIT-MENU-ENTRY 9283 . 9705) (DOCOBJ-GET-LOOKS 9707 . 12167) (DOCOBJ-REGISTER-OBJECT 12169 . -12823) (DOCOBJ-STRING-IMAGEBOX 12825 . 13881) (DOCOBJ-WAIT-MOUSE 13883 . 14343) ( -DOCOBJ-BEFOREHARDCOPYFN 14345 . 19815) (DOCOBJ-AFTERHARDCOPYFN 19817 . 21326)) (21358 21625 ( -DOCOBJ-ACQUIRE-EVALED-OBJECT 21368 . 21623)) (21825 21967 (DOCOBJ-ACQUIRE-SNAPPED-OBJECT 21835 . 21965 -)) (22306 27102 (DOCOBJ-EDIT-TIMESTAMP 22316 . 22845) (DOCOBJ-MAKE-TIMESTAMP 22847 . 23258) ( -DOCOBJ-MAKE-TIMESTAMP-IMAGEFNS 23260 . 24330) (DOCOBJ-TIMESTAMP-BUTTONEVENTINFN 24332 . 24863) ( -DOCOBJ-TIMESTAMP-COPYFN 24865 . 25190) (DOCOBJ-TIMESTAMP-DISPLAYFN 25192 . 25485) ( -DOCOBJ-TIMESTAMP-GETFN 25487 . 25727) (DOCOBJ-TIMESTAMP-IMAGEBOXFN 25729 . 26085) ( -DOCOBJ-TIMESTAMP-PREPRINTFN 26087 . 26318) (DOCOBJ-TIMESTAMP-PUTFN 26320 . 26689) ( -DOCOBJ-TIMESTAMP-TO-STRING 26691 . 27100)) (27396 31703 (DOCOBJ-MAKE-FILESTAMP 27406 . 27747) ( -DOCOBJ-MAKE-FILESTAMP-IMAGEFNS 27749 . 28791) (DOCOBJ-FILESTAMP-COPYFN 28793 . 29108) ( -DOCOBJ-FILESTAMP-DISPLAYFN 29110 . 29398) (DOCOBJ-FILESTAMP-GETFN 29400 . 29753) ( -DOCOBJ-FILESTAMP-IMAGEBOXFN 29755 . 30093) (DOCOBJ-FILESTAMP-GET-FULLNAME 30095 . 30713) ( -DOCOBJ-FILESTAMP-NEW-FULLNAME 30715 . 31188) (DOCOBJ-FILESTAMP-PREPRINTFN 31190 . 31399) ( -DOCOBJ-FILESTAMP-PUTFN 31401 . 31701)) (32026 34523 (DOCOBJ-MAKE-HRULE 32036 . 32450) ( -DOCOBJ-EDIT-HRULE 32452 . 32924) (DOCOBJ-HRULE-INIT 32926 . 33258) (DOCOBJ-HRULE-GET-WIDTH 33260 . -34071) (DOCOBJ-HRULE-BUTTONEVENTINFN 34073 . 34521)) (34942 43284 (DOCOBJ-MAKE-INCLUDE 34952 . 35353) -(DOCOBJ-MAKE-INCLUDE-IMAGEFNS 35355 . 36360) (DOCOBJ-INCLUDE-CREATE-OBJ 36362 . 37130) ( -DOCOBJ-INCLUDE-EDIT 37132 . 41401) (DOCOBJ-INCLUDE-EDIT-WINDOWP 41403 . 42259) ( -DOCOBJ-INCLUDE-RESET-OBJ 42261 . 43282)) (43285 52131 (DOCOBJ-INCLUDE-BEFOREHARDCOPYFN 43295 . 46789) -(DOCOBJ-INCLUDE-CLEANUPFN 46791 . 48310) (DOCOBJ-INCLUDE-BUTTONEVENTINFN 48312 . 48989) ( -DOCOBJ-INCLUDE-COPYFN 48991 . 49209) (DOCOBJ-INCLUDE-DISPLAYFN 49211 . 49963) (DOCOBJ-INCLUDE-GETFN -49965 . 50688) (DOCOBJ-INCLUDE-IMAGEBOXFN 50690 . 51699) (DOCOBJ-INCLUDE-PREPRINTFN 51701 . 51920) ( -DOCOBJ-INCLUDE-PUTFN 51922 . 52129))))) + (FILEMAP (NIL (9262 22844 (DOCOBJ-ACQUIRE-OBJECT 9272 . 10273) (DOCOBJ-INIT 10275 . 10897) ( +DOCOBJ-TEDIT-MENU-ENTRY 10899 . 11306) (DOCOBJ-GET-LOOKS 11308 . 13768) (DOCOBJ-REGISTER-OBJECT 13770 + . 14408) (DOCOBJ-STRING-IMAGEBOX 14410 . 15466) (DOCOBJ-WAIT-MOUSE 15468 . 15859) ( +DOCOBJ-BEFOREHARDCOPYFN 15861 . 21331) (DOCOBJ-AFTERHARDCOPYFN 21333 . 22842)) (22874 23139 ( +DOCOBJ-ACQUIRE-EVALED-OBJECT 22884 . 23137)) (23339 23496 (DOCOBJ-ACQUIRE-SNAPPED-OBJECT 23349 . 23494 +)) (23818 28482 (DOCOBJ-EDIT-TIMESTAMP 23828 . 24289) (DOCOBJ-MAKE-TIMESTAMP 24291 . 24688) ( +DOCOBJ-MAKE-TIMESTAMP-IMAGEFNS 24690 . 25709) (DOCOBJ-TIMESTAMP-BUTTONEVENTINFN 25711 . 26186) ( +DOCOBJ-TIMESTAMP-COPYFN 26188 . 26473) (DOCOBJ-TIMESTAMP-DISPLAYFN 26475 . 26696) ( +DOCOBJ-TIMESTAMP-GETFN 26698 . 26953) (DOCOBJ-TIMESTAMP-IMAGEBOXFN 26955 . 27272) ( +DOCOBJ-TIMESTAMP-PREPRINTFN 27274 . 27489) (DOCOBJ-TIMESTAMP-PUTFN 27491 . 27875) ( +DOCOBJ-TIMESTAMP-TO-STRING 27877 . 28480)) (28776 32750 (DOCOBJ-MAKE-FILESTAMP 28786 . 29111) ( +DOCOBJ-MAKE-FILESTAMP-IMAGEFNS 29113 . 30104) (DOCOBJ-FILESTAMP-COPYFN 30106 . 30381) ( +DOCOBJ-FILESTAMP-DISPLAYFN 30383 . 30595) (DOCOBJ-FILESTAMP-GETFN 30597 . 30934) ( +DOCOBJ-FILESTAMP-IMAGEBOXFN 30936 . 31204) (DOCOBJ-FILESTAMP-GET-FULLNAME 31206 . 31808) ( +DOCOBJ-FILESTAMP-NEW-FULLNAME 31810 . 32267) (DOCOBJ-FILESTAMP-PREPRINTFN 32269 . 32462) ( +DOCOBJ-FILESTAMP-PUTFN 32464 . 32748)) (33056 35661 (DOCOBJ-MAKE-HRULE 33066 . 33540) ( +DOCOBJ-EDIT-HRULE 33542 . 33984) (DOCOBJ-HRULE-INIT 33986 . 34386) (DOCOBJ-HRULE-GET-WIDTH 34388 . +35218) (DOCOBJ-HRULE-BUTTONEVENTINFN 35220 . 35659)) (36080 44419 (DOCOBJ-MAKE-INCLUDE 36090 . 36490) +(DOCOBJ-MAKE-INCLUDE-IMAGEFNS 36492 . 37495) (DOCOBJ-INCLUDE-CREATE-OBJ 37497 . 38265) ( +DOCOBJ-INCLUDE-EDIT 38267 . 42536) (DOCOBJ-INCLUDE-EDIT-WINDOWP 42538 . 43394) ( +DOCOBJ-INCLUDE-RESET-OBJ 43396 . 44417)) (44420 53233 (DOCOBJ-INCLUDE-BEFOREHARDCOPYFN 44430 . 47924) +(DOCOBJ-INCLUDE-CLEANUPFN 47926 . 49445) (DOCOBJ-INCLUDE-BUTTONEVENTINFN 49447 . 50124) ( +DOCOBJ-INCLUDE-COPYFN 50126 . 50343) (DOCOBJ-INCLUDE-DISPLAYFN 50345 . 51097) (DOCOBJ-INCLUDE-GETFN +51099 . 51809) (DOCOBJ-INCLUDE-IMAGEBOXFN 51811 . 52803) (DOCOBJ-INCLUDE-PREPRINTFN 52805 . 53023) ( +DOCOBJ-INCLUDE-PUTFN 53025 . 53231))))) STOP diff --git a/lispusers/DOC-OBJECTS.LCOM b/lispusers/DOC-OBJECTS.LCOM index ff23b3dd..4747e893 100644 Binary files a/lispusers/DOC-OBJECTS.LCOM and b/lispusers/DOC-OBJECTS.LCOM differ diff --git a/lispusers/EDITFONT b/lispusers/EDITFONT index 2bd3628f..01e163c7 100644 --- a/lispusers/EDITFONT +++ b/lispusers/EDITFONT @@ -1,13 +1,13 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "12-Oct-2025 17:39:29" {WMEDLEY}EDITFONT.;41 26261 +(FILECREATED " 5-May-2026 12:21:24" {MEDLEY}EDITFONT.;53 27357 :EDIT-BY rmk - :CHANGES-TO (RECORDS CHARITEM) - (FNS EF.SAVE) + :CHANGES-TO (FNS EDITFONT) + (RECORDS CHARITEM) - :PREVIOUS-DATE " 7-Oct-2025 14:56:00" {WMEDLEY}EDITFONT.;40) + :PREVIOUS-DATE " 5-Apr-2026 11:56:20" {MEDLEY}EDITFONT.;51) (PRETTYCOMPRINT EDITFONTCOMS) @@ -19,8 +19,8 @@ (INITVARS (EF.MENU NIL) (EF.TITLEMENU NIL)) (FNS EF.INIT EF.PROMPT EF.MESSAGE EF.CLOSEFN EF.CHARITEMS EF.BUTTONEVENTFN EF.WHENSELECTEDFN - EF.EDITBM EF.MIDDLEBUTTONFN EF.CHANGESIZE EF.DELETE EF.ENTER EF.REPLACE EF.SAVE COPYFONT - READSTRIKEFONTFILE) + EF.EDITBM EF.MIDDLEBUTTONFN EF.CHANGESIZE EF.DELETE EF.ENTER EF.REPLACE EF.SAVE + EF.INSPECT COPYFONT READSTRIKEFONTFILE) (FNS BLANKCHARSETCREATE EDITFONT) (DECLARE%: EVAL@COMPILE DONTCOPY (RECORDS CHARITEM) (FILES (LOADCOMP) @@ -38,14 +38,16 @@ (DEFINEQ (EF.INIT - [LAMBDA NIL (* ; "Edited 4-Aug-2025 13:16 by rmk") + [LAMBDA NIL (* ; "Edited 5-Apr-2026 11:56 by rmk") + (* ; "Edited 4-Aug-2025 13:16 by rmk") [SETQ EF.MENU (create MENU - ITEMS _ '((CHANGESIZE 'EF.CHANGESIZE "Change size of character.") - (DELETE 'EF.DELETE "Delete character.") - (EDITBM 'EF.EDITBM "Edit character.") - (REPLACE 'EF.REPLACE "Prompt for bitmap to replace character."] + ITEMS _ '((Changesize 'EF.CHANGESIZE "Change size of character.") + (Delete 'EF.DELETE "Delete character.") + (EditBM 'EF.EDITBM "Edit character.") + (Replace 'EF.REPLACE "Prompt for bitmap to replace character."] (SETQ EF.TITLEMENU (create MENU - ITEMS _ '((SAVE 'EF.SAVE "Save EDITFONT's work back into font."]) + ITEMS _ '((Save 'EF.SAVE "Save EDITFONT's work back into font.") + (Inspect 'EF.INSPECT "Inspect this charset info"]) (EF.PROMPT [LAMBDA (STRING WINDOW) (* kbr%: "16-Oct-85 22:48") @@ -81,7 +83,8 @@ (WINDOWPROP WINDOW 'MENU NIL]) (EF.CHARITEMS - [LAMBDA (FONT CHARSET ROWMAJOR) (* ; "Edited 5-Oct-2025 14:42 by rmk") + [LAMBDA (FONT CHARSET ROWMAJOR) (* ; "Edited 18-Mar-2026 16:13 by rmk") + (* ; "Edited 5-Oct-2025 14:42 by rmk") (* ; "Edited 29-Aug-2025 11:34 by rmk") (* ; "Edited 27-Aug-2025 22:50 by rmk") (* ; "Edited 4-Aug-2025 00:14 by rmk") @@ -95,7 +98,7 @@ collect (create CHARITEM BITMAP _ (GETCHARBITMAP C FONT) CHARCODE _ C8 - SLUGCHARP _ (SLUGCHARP.DISPLAY C FONT))) + SLUGCHARP _ (SLUGCHARP C FONT))) else (for ROW from 0 to 15 join (for COL CODE from 0 to 15 collect (SETQ CODE (LOGOR (LLSH CHARSET 8) (IPLUS (TIMES COL 16) @@ -103,7 +106,7 @@ (create CHARITEM BITMAP _ (GETCHARBITMAP CODE FONT) CHARCODE _ CODE - SLUGCHARP _ (SLUGCHARP.DISPLAY CODE FONT]) + SLUGCHARP _ (SLUGCHARP CODE FONT]) (EF.BUTTONEVENTFN [LAMBDA (WINDOW) (* kbr%: "16-Oct-85 22:19") @@ -313,6 +316,12 @@ (\SETCHARSETINFO FONT CHARSET CSINFO]) +(EF.INSPECT + [LAMBDA (WINDOW) (* ; "Edited 5-Apr-2026 11:41 by rmk") + (* ; "Save EDITFONT changes to FONT. *") + (INSPECT (\GETCHARSETINFO (WINDOWPROP WINDOW 'FONT) + (WINDOWPROP WINDOW 'CHARSET]) + (COPYFONT [LAMBDA (FONT) (* ; "Edited 3-Aug-2025 17:37 by rmk") (* jds "26-Aug-86 16:01") @@ -429,17 +438,22 @@ (RETURN FONT]) (EDITFONT - [LAMBDA (FONT CHARSET ROWMAJOR NCOLUMNS TITLETAG) (* ; "Edited 7-Oct-2025 14:55 by rmk") - (* ; "Edited 5-Oct-2025 15:06 by rmk") + [LAMBDA (FONT CHARSET ROWMAJOR NCOLUMNS TITLETAG) (* ; "Edited 5-May-2026 12:19 by rmk") + (* ; "Edited 4-Apr-2026 18:14 by rmk") + (* ; "Edited 30-Mar-2026 12:10 by rmk") + (* ; "Edited 25-Mar-2026 00:04 by rmk") + (* ; "Edited 21-Mar-2026 10:43 by rmk") + (* ; "Edited 16-Mar-2026 23:17 by rmk") + (* ; "Edited 7-Oct-2025 14:55 by rmk") (* ; "Edited 4-Sep-2025 09:27 by rmk") - (* ; "Edited 29-Aug-2025 22:34 by rmk") (* ; "Edited 17-Aug-2025 12:03 by rmk") - (* ; "Edited 3-Aug-2025 23:25 by rmk") (* ; "Edited 2-Aug-2025 10:11 by rmk") (* mjs "27-Mar-85 14:48") (* kbr%: "21-Oct-85 15:35") (* kbr%: "21-Oct-85 15:35") - (SETQ FONT (FONTCREATE FONT)) + (SETQ FONT (FONTCREATE FONT NIL NIL NIL NIL NIL CHARSET)) + (CL:UNLESS (EQ 'DISPLAY (FONTPROP FONT 'DEVICE)) + (ERROR FONT " is not a display font")) (SETQ CHARSET (OR (CHARSET.DECODE CHARSET) 0)) (LET (CHARITEMS MENU TITLE HEIGHT WIDTH REGION POS WINDOW) @@ -494,10 +508,10 @@ (EF.INIT) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1146 16903 (EF.INIT 1156 . 1790) (EF.PROMPT 1792 . 2374) (EF.MESSAGE 2376 . 2588) ( -EF.CLOSEFN 2590 . 3117) (EF.CHARITEMS 3119 . 4955) (EF.BUTTONEVENTFN 4957 . 5369) (EF.WHENSELECTEDFN -5371 . 5775) (EF.EDITBM 5777 . 7271) (EF.MIDDLEBUTTONFN 7273 . 7518) (EF.CHANGESIZE 7520 . 8849) ( -EF.DELETE 8851 . 10032) (EF.ENTER 10034 . 10975) (EF.REPLACE 10977 . 11950) (EF.SAVE 11952 . 16195) ( -COPYFONT 16197 . 16472) (READSTRIKEFONTFILE 16474 . 16901)) (16904 26073 (BLANKCHARSETCREATE 16914 . -22999) (EDITFONT 23001 . 26071))))) + (FILEMAP (NIL (1157 17541 (EF.INIT 1167 . 1996) (EF.PROMPT 1998 . 2580) (EF.MESSAGE 2582 . 2794) ( +EF.CLOSEFN 2796 . 3323) (EF.CHARITEMS 3325 . 5254) (EF.BUTTONEVENTFN 5256 . 5668) (EF.WHENSELECTEDFN +5670 . 6074) (EF.EDITBM 6076 . 7570) (EF.MIDDLEBUTTONFN 7572 . 7817) (EF.CHANGESIZE 7819 . 9148) ( +EF.DELETE 9150 . 10331) (EF.ENTER 10333 . 11274) (EF.REPLACE 11276 . 12249) (EF.SAVE 12251 . 16494) ( +EF.INSPECT 16496 . 16833) (COPYFONT 16835 . 17110) (READSTRIKEFONTFILE 17112 . 17539)) (17542 27169 ( +BLANKCHARSETCREATE 17552 . 23637) (EDITFONT 23639 . 27167))))) STOP diff --git a/lispusers/EDITFONT.LCOM b/lispusers/EDITFONT.LCOM index 589ac6dd..cac25bf6 100644 Binary files a/lispusers/EDITFONT.LCOM and b/lispusers/EDITFONT.LCOM differ diff --git a/lispusers/GITFNS b/lispusers/GITFNS index 7b9e5ad3..1ce3bdc3 100644 --- a/lispusers/GITFNS +++ b/lispusers/GITFNS @@ -1,12 +1,14 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8) -(FILECREATED " 2-Mar-2026 14:00:13" {WMEDLEY}GITFNS.;576 133513 +(FILECREATED "29-Apr-2026 12:51:53" {MEDLEY}GITFNS.;592 137200 :EDIT-BY rmk - :CHANGES-TO (FNS GIT-MY-NEXT-BRANCH) + :CHANGES-TO (FNS GIT-GWC-COMMAND) + (COMMANDS gwc) + (VARS GITFNSCOMS) - :PREVIOUS-DATE "26-Feb-2026 00:39:22" {WMEDLEY}GITFNS.;575) + :PREVIOUS-DATE "29-Apr-2026 09:00:33" {MEDLEY}GITFNS.;588) (PRETTYCOMPRINT GITFNSCOMS) @@ -51,7 +53,7 @@ (INITVARS (GIT-MERGE-COMPARES T) (GIT-CDBROWSER-SEPARATE-DIRECTIONS T)) (COMMANDS gwc bbc prc cob b? cdg cdw) - (FNS PRC-COMMAND) + (FNS PRC-COMMAND GIT-GWC-COMMAND) (* ;; "") @@ -60,7 +62,7 @@ (FNS ALLSUBDIRS MEDLEYSUBDIRS GITSUBDIRS) (FNS TOGIT FROMGIT) - (FNS MYMEDLEYSUBDIR GITSUBDIR STRIPDIR STRIPHOST STRIPNAME STRIPWHERE) + (FNS WORKINGSUBDIR GITSUBDIR STRIPDIR STRIPHOST STRIPNAME STRIPWHERE) (FNS GFILE4MFILE MFILE4GFILE GIT-REPO-FILENAME) (* ;; "") @@ -169,6 +171,9 @@ (GIT-MAKE-PROJECT [LAMBDA (PROJECTNAME CLONEPATH WORKINGPATH EXCLUSIONS DEFAULTSUBDIRS) + (* ; "Edited 29-Apr-2026 09:00 by rmk") + (* ; "Edited 17-Apr-2026 12:33 by rmk") + (* ; "Edited 15-Apr-2026 16:33 by rmk") (* ; "Edited 25-Feb-2026 23:25 by rmk") (* ; "Edited 25-Oct-2025 16:53 by rmk") (* ; "Edited 22-Oct-2025 12:45 by rmk") @@ -275,7 +280,8 @@ "for " PROJECTNAME] (SETQ PROJECT (create GIT-PROJECT PROJECTNAME ← PROJECTNAME - GITHOST ← (PACK* "{" (PSEUDOHOST PROJECTNAME CLONEPATH) + GITHOST ← (PACK* "{" (PSEUDOHOST (CONCAT "G" PROJECTNAME) + CLONEPATH) "}") WHOST ← (AND WORKINGPATH (PACK* "{" (PSEUDOHOST (CONCAT "W" PROJECTNAME) @@ -439,18 +445,7 @@ (RPAQ? GIT-CDBROWSER-SEPARATE-DIRECTIONS T) -(DEFCOMMAND gwc (SUBDIR . OTHERS) - - (* ;; "Compares the specified local git-medley subdirectories against my working Medley. The SUBDIRS are the arguments up to one that looks like a project") - - (LET ((SUBDIRS (AND SUBDIR (CONS SUBDIR OTHERS))) - PROJECT) - (SETQ SUBDIRS (FOR STAIL ON SUBDIRS COLLECT (IF (GIT-GET-PROJECT (CAR STAIL) - NIL T) - THEN (SETQ PROJECT (CAR STAIL)) - (GO $$OUT)) - (CAR STAIL))) - (GIT-WORKING-COMPARE-DIRECTORIES SUBDIRS NIL NIL NIL T PROJECT))) +(DEFCOMMAND gwc (SUBDIR . OTHERS) (GIT-GWC-COMMAND SUBDIR OTHERS)) (DEFCOMMAND bbc (BRANCH1 BRANCH2 LOCAL PROJECT) @@ -535,7 +530,8 @@ (DEFINEQ (PRC-COMMAND - [LAMBDA (REMOTEBRANCH DRAFTS PROJECT) (* ; "Edited 29-Jan-2025 19:19 by rmk") + [LAMBDA (REMOTEBRANCH DRAFTS PROJECT) (* ; "Edited 16-Mar-2026 11:54 by rmk") + (* ; "Edited 29-Jan-2025 19:19 by rmk") (* ; "Edited 13-May-2024 18:49 by rmk") (* ; "Edited 2-May-2024 11:44 by rmk") (* ; "Edited 1-Apr-2024 20:24 by rmk") @@ -592,7 +588,10 @@ then (SETQ MENUWINDOW (ADDMENU (GIT-BRANCH-MENU (GIT-PRC-BRANCHES DRAFTS PROJECT PRS) (CONCAT (LENGTH PRS) - " pull requests")) + " pull requests in " + (GIT-GET-PROJECT PROJECT + 'PROJECTNAME)) + PROJECT) NIL NIL T)) (* ;; "Position the new menu just under the current TTY window, to keep it out of the way of the comparison windows. If we have menus open for other projects, those probably should be pushed down to make room for the new menu, and moved up when a higher menu is closed. An edge case that is not worth the effort. ") @@ -612,6 +611,32 @@ PROJECT)) else (CONCAT "No open " (OR REMOTEBRANCH "") " pull requests"]) + +(GIT-GWC-COMMAND + [LAMBDA (SUBDIR OTHERS) (* ; "Edited 29-Apr-2026 12:51 by rmk") + + (* ;; "Compares the specified local git-medley subdirectories against my working Medley. The SUBDIRS are the arguments up to one that looks like a project, which may be followed by - and some excluded files") + + (LET ((SUBDIRS (AND SUBDIR (CONS SUBDIR OTHERS))) + EXCLUDEDFILES PROJECT) + (SETQ SUBDIRS (for STAIL on SUBDIRS unless (CL:WHEN (AND (NULL PROJECT) + (SETQ PROJECT (GIT-GET-PROJECT + (CAR STAIL) + NIL T))) + (CL:UNLESS (EQ '- (CADR STAIL)) + (RETURN $$VAL)) + T) collect (CL:WHEN (EQ '- (CAR STAIL)) + (SETQ EXCLUDEDFILES + (CDR STAIL)) + (RETURN $$VAL)) + (CAR STAIL))) + (CL:UNLESS PROJECT + (SETQ PROJECT (GIT-GET-PROJECT PROJECT))) + (if (AND (fetch GITHOST of PROJECT) + (fetch WHOST of PROJECT)) + then (GIT-WORKING-COMPARE-DIRECTORIES SUBDIRS NIL EXCLUDEDFILES NIL T PROJECT) + else (PRINTOUT T "gwc requires " (fetch PROJECTNAME of PROJECT) + " to have both git and working directories" T T]) ) @@ -723,7 +748,7 @@ ) (DEFINEQ -(MYMEDLEYSUBDIR +(WORKINGSUBDIR [LAMBDA (SUBDIR STAR PROJECT) (* ; "Edited 13-May-2022 10:40 by rmk") (* ; "Edited 7-May-2022 23:15 by rmk") (UNSLASHIT (PACK* (PACKFILENAME 'HOST (FETCH WHOST OF PROJECT) @@ -1394,13 +1419,12 @@ " branches"]) (GIT-BRANCH-MENU - [LAMBDA (BRANCHES TITLE PIN?) (* ; "Edited 1-May-2024 14:36 by rmk") + [LAMBDA (BRANCHES TITLE) (* ; "Edited 18-Apr-2026 21:36 by rmk") + (* ; "Edited 1-May-2024 14:36 by rmk") (* ; "Edited 6-Jul-2023 22:31 by rmk") (* ; "Edited 30-Jun-2023 16:58 by rmk") (* ; "Edited 18-May-2022 13:44 by rmk") (CL:WHEN (SETQ BRANCHES (MKLIST BRANCHES)) - (CL:WHEN PIN? - [SETQ BRANCHES (APPEND BRANCHES '((" Pin menu" 'PinMenu]) (create MENU TITLE ← (OR TITLE (CONCAT (LENGTH BRANCHES) " branches")) @@ -1409,7 +1433,8 @@ WHENSELECTEDFN ← (FUNCTION GIT-BRANCH-WHENSELECTEDFN)))]) (GIT-BRANCH-WHENSELECTEDFN - [LAMBDA (ITEM MENU BUTTON) (* ; "Edited 2-Oct-2025 23:08 by rmk") + [LAMBDA (ITEM MENU BUTTON) (* ; "Edited 16-Mar-2026 12:05 by rmk") + (* ; "Edited 2-Oct-2025 23:08 by rmk") (* ; "Edited 30-Sep-2025 14:58 by rmk") (* ; "Edited 21-Mar-2025 19:07 by rmk") (* ; "Edited 11-May-2024 11:05 by rmk") @@ -1420,9 +1445,11 @@ (LET [(PR (CAR (LAST ITEM] (if (EQ BUTTON 'MIDDLE) - then (ShellOpen (CONCAT "https://github.com/Interlisp/medley/pull/" (fetch (PULLREQUEST - PRNUMBER) - of PR))) + then (ShellOpen (CONCAT "https://github.com/Interlisp/" + (L-CASE (GIT-GET-PROJECT (fetch PRPROJECT of PR) + 'PROJECTNAME)) + "/pull/" + (fetch (PULLREQUEST PRNUMBER) of PR))) else (* ;; "This prints notices in its own TTY window") @@ -1943,6 +1970,8 @@ (GIT-WORKING-COMPARE-DIRECTORIES [LAMBDA (SUBDIRS SELECT EXCLUDEDFILES FIXDIRECTORYDATES UPDATE PROJECT) + (* ;; "Edited 29-Apr-2026 08:46 by rmk") + (* ;; "Edited 28-Oct-2025 14:00 by rmk") (* ;; "Edited 25-Oct-2025 23:32 by rmk") @@ -1953,18 +1982,12 @@ (* ;; "Edited 26-Sep-2023 22:41 by rmk") - (* ;; "Edited 17-Jun-2023 22:54 by rmk") - - (* ;; "Edited 10-Jun-2023 21:32 by rmk") - (* ;; "Edited 20-Jul-2022 21:18 by rmk") (* ;; "Edited 25-Jun-2022 21:37 by rmk") (* ;; "Edited 17-May-2022 17:39 by rmk") - (* ;; "Edited 10-May-2022 10:41 by rmk") - (* ;;  "Edited 29-Mar-2022 13:58 by rmk: working medley subdirectories with the current local git branch.") @@ -1984,7 +2007,8 @@ (LET ((SUBDIRSTRING (if (EQ SUBDIRS 'all) then (SETQ SUBDIRS (ALLSUBDIRS PROJECT)) "ALL subdirectories" - else SUBDIRS))) + else SUBDIRS)) + (EXCLUSIONS)) (for SUBDIR TITLE CDVAL (WPROJ ← (CONCAT "Working " (L-CASE (fetch PROJECTNAME of PROJECT) T))) (NENTRIES ← 0) @@ -1992,11 +2016,12 @@ first (PRINTOUT T "Comparing " SUBDIRSTRING 6 " of " WPROJ " and Git " BRANCH2 T) (BKSYSBUF " ") inside SUBDIRS collect (TERPRI T) - (SETQ CDVAL (COMPAREDIRECTORIES (MYMEDLEYSUBDIR SUBDIR T PROJECT) + (SETQ CDVAL (COMPAREDIRECTORIES (WORKINGSUBDIR SUBDIR T PROJECT) (GITSUBDIR SUBDIR T PROJECT) (OR SELECT '(> < ~= -* *-)) '(*.* *>*.* .* *>.*) - (for E DPOS in (GIT-GET-PROJECT PROJECT 'EXCLUSIONS) + (for E DPOS in (APPEND (MKLIST EXCLUDEDFILES) + (GIT-GET-PROJECT PROJECT 'EXCLUSIONS)) collect (SETQ DPOS (STRPOS SUBDIR (FILENAMEFIELD E 'DIRECTORY) 1 NIL T T FILEDIRCASEARRAY)) @@ -2209,7 +2234,7 @@ (OR LABEL2 FILE2]) (GIT-CD-MENUFN - [LAMBDA (TBITEM MENUITEM CDBROWSER KEY) (* ; "Edited 28-Oct-2025 11:50 by rmk") + [LAMBDA (TBITEM MENUITEM CDBROWSER KEY) (* ; "Edited 28-Oct-2025 11:30 by rmk") (* ; "Edited 25-Oct-2025 23:44 by rmk") (* ; "Edited 21-Sep-2022 21:34 by rmk") (* ; "Edited 22-May-2022 19:13 by rmk") @@ -2218,9 +2243,32 @@ (* ;; "MENUITEM is of the form (display-atom . extrainfo). The selector for the selectq is either the CAR of the extrainfo or the display atom") - (DECLARE (USEDFREE FILE1 FILE2 LABEL2 TYPE CDENTRY USERDATA PWINDOW)) + (DECLARE (USEDFREE FILE1 FILE2 LABEL2 TYPE CDENTRY USERDATA)) (SELECTQ (OR (CADDR MENUITEM) (CAR MENUITEM)) + (Delete% -> (FLASHWINDOW PWINDOW) + (GIVE.TTY.PROCESS PWINDOW) + (CL:WHEN [OR (EQ KEY 'MIDDLE) + (EQ 'Y (ASKUSER NIL 'N (CONCAT "Delete " LABEL2 " ? "] + (CDBROWSER-DELETE-FILE CDBROWSER TBITEM 'RIGHT NIL T))) + (|Delete ALL <-| + (FLASHWINDOW PWINDOW) + (GIVE.TTY.PROCESS PWINDOW) + (if (NAMEFIELD LABEL1 T) + then (CL:WHEN [OR (EQ KEY 'MIDDLE) + (EQ 'Y (ASKUSER NIL 'N (CONCAT "Delete ALL versions of " + (NAMEFIELD LABEL1 T) + " ? "] + (CDBROWSER-DELETE-FILE CDBROWSER TBITEM 'LEFT NIL T)) + else (PRINTOUT T "Nothing to delete"))) + (Delete% BOTH (FLASHWINDOW PWINDOW) + (GIVE.TTY.PROCESS PWINDOW) + (CL:WHEN (EQ 'Y (ASKUSER NIL 'N (CONCAT + "Delete all Medley and git versions of " + (NAMEFIELD LABEL1 T) + " ? "))) + (CDBROWSER-DELETE-FILE CDBROWSER TBITEM 'LEFT NIL T) + (CDBROWSER-DELETE-FILE CDBROWSER TBITEM 'RIGHT NIL T T))) (Copy% -> (CDBROWSER-COPY CDBROWSER TBITEM 'LEFT (CADDDR MENUITEM))) (SHOULDNT]) @@ -2422,33 +2470,33 @@ (PUTPROPS GITFNS FILETYPE :TCOMPL) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4178 21056 (GIT-CLONEP 4188 . 5619) (GIT-INIT 5621 . 6251) (GIT-MAKE-PROJECT 6253 . -14110) (GIT-GET-PROJECT 14112 . 16037) (GIT-PUT-PROJECT-FIELD 16039 . 17680) (GIT-PROJECT-PATH 17682 - . 18726) (FIND-ANCESTOR-DIRECTORY 18728 . 19079) (GIT-FIND-CLONE 19081 . 20164) (GIT-MAINBRANCH 20166 - . 20561) (GIT-MAINBRANCH? 20563 . 21054)) (26519 31448 (PRC-COMMAND 26529 . 31446)) (31504 34292 ( -ALLSUBDIRS 31514 . 32800) (MEDLEYSUBDIRS 32802 . 33495) (GITSUBDIRS 33497 . 34290)) (34293 36698 ( -TOGIT 34303 . 35711) (FROMGIT 35713 . 36696)) (36699 39709 (MYMEDLEYSUBDIR 36709 . 37165) (GITSUBDIR -37167 . 37610) (STRIPDIR 37612 . 37990) (STRIPHOST 37992 . 38232) (STRIPNAME 38234 . 38987) ( -STRIPWHERE 38989 . 39707)) (39710 41945 (GFILE4MFILE 39720 . 40416) (MFILE4GFILE 40418 . 40987) ( -GIT-REPO-FILENAME 40989 . 41943)) (41994 52251 (GIT-COMMIT 42004 . 42830) (GIT-PUSH 42832 . 43592) ( -GIT-PULL 43594 . 44346) (GIT-APPROVAL 44348 . 44697) (GIT-GET-FILE 44699 . 46614) (GIT-FILE-EXISTS? -46616 . 46890) (GIT-REMOTE-UPDATE 46892 . 47727) (GIT-REMOTE-ADD 47729 . 48036) (GIT-FILE-DATE 48038 - . 49085) (GIT-FILE-HISTORY 49087 . 51021) (GIT-PRINT-FILE-HISTORY 51023 . 52075) (GIT-FETCH 52077 . -52249)) (52281 64233 (GIT-BRANCH-DIFF 52291 . 59180) (GIT-COMMIT-DIFFS 59182 . 60073) ( -GIT-BRANCH-RELATIONS 60075 . 63759) (GIT-MODIFIED 63761 . 64231)) (64278 83045 (GIT-BRANCH-NUM 64288 - . 64861) (GIT-CHECKOUT 64863 . 66149) (GIT-WHICH-BRANCH 66151 . 66558) (GIT-MAKE-BRANCH 66560 . 69139 -) (GIT-BRANCHES 69141 . 71738) (GIT-BRANCH-EXISTS? 71740 . 72611) (GIT-PICK-BRANCH 72613 . 73103) ( -GIT-BRANCH-MENU 73105 . 73994) (GIT-BRANCH-WHENSELECTEDFN 73996 . 75535) (GIT-PULL-REQUESTS 75537 . -79422) (GIT-SHORT-BRANCH-NAME 79424 . 79715) (GIT-LONG-NAME 79717 . 80034) (GIT-PRC-BRANCHES 80036 . -83043)) (83075 87829 (GIT-MY-CURRENT-BRANCH 83085 . 83455) (GIT-MY-BRANCHP 83457 . 84075) ( -GIT-MY-NEXT-BRANCH 84077 . 85877) (GIT-MY-BRANCHES 85879 . 87827)) (87875 91959 (GIT-ADD-WORKTREE -87885 . 89492) (GIT-REMOVE-WORKTREE 89494 . 90426) (GIT-LIST-WORKTREES 90428 . 91239) (WORKTREEDIR -91241 . 91957)) (92007 125045 (GIT-GET-DIFFERENT-FILES 92017 . 98925) ( -GIT-BRANCHES-COMPARE-DIRECTORIES 98927 . 106566) (GIT-WORKING-COMPARE-DIRECTORIES 106568 . 112370) ( -GIT-COMPARE-WORKTREE 112372 . 116350) (GITCDOBJBUTTONFN 116352 . 120850) (GIT-CD-LABELFN 120852 . -121938) (GIT-CD-MENUFN 121940 . 123026) (GIT-WORKING-COMPARE-FILES 123028 . 123648) ( -GIT-BRANCHES-COMPARE-FILES 123650 . 124814) (GIT-PR-COMPARE 124816 . 125043)) (125115 133446 (CDGITDIR - 125125 . 125812) (GIT-COMMAND 125814 . 127372) (GITORIGIN 127374 . 128071) (GIT-INITIALS 128073 . -128377) (GIT-COMMAND-TO-FILE 128379 . 131864) (GIT-RESULT-TO-LINES 131866 . 132779) (STRIPLOCAL 132781 - . 133444))))) + (FILEMAP (NIL (4257 21537 (GIT-CLONEP 4267 . 5698) (GIT-INIT 5700 . 6330) (GIT-MAKE-PROJECT 6332 . +14591) (GIT-GET-PROJECT 14593 . 16518) (GIT-PUT-PROJECT-FIELD 16520 . 18161) (GIT-PROJECT-PATH 18163 + . 19207) (FIND-ANCESTOR-DIRECTORY 19209 . 19560) (GIT-FIND-CLONE 19562 . 20645) (GIT-MAINBRANCH 20647 + . 21042) (GIT-MAINBRANCH? 21044 . 21535)) (26309 33483 (PRC-COMMAND 26319 . 31601) (GIT-GWC-COMMAND +31603 . 33481)) (33539 36327 (ALLSUBDIRS 33549 . 34835) (MEDLEYSUBDIRS 34837 . 35530) (GITSUBDIRS +35532 . 36325)) (36328 38733 (TOGIT 36338 . 37746) (FROMGIT 37748 . 38731)) (38734 41743 ( +WORKINGSUBDIR 38744 . 39199) (GITSUBDIR 39201 . 39644) (STRIPDIR 39646 . 40024) (STRIPHOST 40026 . +40266) (STRIPNAME 40268 . 41021) (STRIPWHERE 41023 . 41741)) (41744 43979 (GFILE4MFILE 41754 . 42450) +(MFILE4GFILE 42452 . 43021) (GIT-REPO-FILENAME 43023 . 43977)) (44028 54285 (GIT-COMMIT 44038 . 44864) + (GIT-PUSH 44866 . 45626) (GIT-PULL 45628 . 46380) (GIT-APPROVAL 46382 . 46731) (GIT-GET-FILE 46733 . +48648) (GIT-FILE-EXISTS? 48650 . 48924) (GIT-REMOTE-UPDATE 48926 . 49761) (GIT-REMOTE-ADD 49763 . +50070) (GIT-FILE-DATE 50072 . 51119) (GIT-FILE-HISTORY 51121 . 53055) (GIT-PRINT-FILE-HISTORY 53057 . +54109) (GIT-FETCH 54111 . 54283)) (54315 66267 (GIT-BRANCH-DIFF 54325 . 61214) (GIT-COMMIT-DIFFS 61216 + . 62107) (GIT-BRANCH-RELATIONS 62109 . 65793) (GIT-MODIFIED 65795 . 66265)) (66312 85259 ( +GIT-BRANCH-NUM 66322 . 66895) (GIT-CHECKOUT 66897 . 68183) (GIT-WHICH-BRANCH 68185 . 68592) ( +GIT-MAKE-BRANCH 68594 . 71173) (GIT-BRANCHES 71175 . 73772) (GIT-BRANCH-EXISTS? 73774 . 74645) ( +GIT-PICK-BRANCH 74647 . 75137) (GIT-BRANCH-MENU 75139 . 76040) (GIT-BRANCH-WHENSELECTEDFN 76042 . +77749) (GIT-PULL-REQUESTS 77751 . 81636) (GIT-SHORT-BRANCH-NAME 81638 . 81929) (GIT-LONG-NAME 81931 . +82248) (GIT-PRC-BRANCHES 82250 . 85257)) (85289 90043 (GIT-MY-CURRENT-BRANCH 85299 . 85669) ( +GIT-MY-BRANCHP 85671 . 86289) (GIT-MY-NEXT-BRANCH 86291 . 88091) (GIT-MY-BRANCHES 88093 . 90041)) ( +90089 94173 (GIT-ADD-WORKTREE 90099 . 91706) (GIT-REMOVE-WORKTREE 91708 . 92640) (GIT-LIST-WORKTREES +92642 . 93453) (WORKTREEDIR 93455 . 94171)) (94221 128732 (GIT-GET-DIFFERENT-FILES 94231 . 101139) ( +GIT-BRANCHES-COMPARE-DIRECTORIES 101141 . 108780) (GIT-WORKING-COMPARE-DIRECTORIES 108782 . 114597) ( +GIT-COMPARE-WORKTREE 114599 . 118577) (GITCDOBJBUTTONFN 118579 . 123077) (GIT-CD-LABELFN 123079 . +124165) (GIT-CD-MENUFN 124167 . 126713) (GIT-WORKING-COMPARE-FILES 126715 . 127335) ( +GIT-BRANCHES-COMPARE-FILES 127337 . 128501) (GIT-PR-COMPARE 128503 . 128730)) (128802 137133 (CDGITDIR + 128812 . 129499) (GIT-COMMAND 129501 . 131059) (GITORIGIN 131061 . 131758) (GIT-INITIALS 131760 . +132064) (GIT-COMMAND-TO-FILE 132066 . 135551) (GIT-RESULT-TO-LINES 135553 . 136466) (STRIPLOCAL 136468 + . 137131))))) STOP diff --git a/lispusers/GITFNS.LCOM b/lispusers/GITFNS.LCOM index edc706ad..fa32aa44 100644 Binary files a/lispusers/GITFNS.LCOM and b/lispusers/GITFNS.LCOM differ diff --git a/lispusers/GITFNS.TEDIT b/lispusers/GITFNS.TEDIT index 0aa747b4..86b5f8c1 100644 Binary files a/lispusers/GITFNS.TEDIT and b/lispusers/GITFNS.TEDIT differ diff --git a/lispusers/HELPSYS b/lispusers/HELPSYS index 748a9348..12cde91a 100644 --- a/lispusers/HELPSYS +++ b/lispusers/HELPSYS @@ -1,13 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "27-Jan-2026 13:21:10" {WMEDLEY}HELPSYS.;21 88654 +(FILECREATED "20-Apr-2026 08:07:50" {MEDLEY}HELPSYS.;24 89018 :EDIT-BY rmk - :CHANGES-TO (FNS DOCS.LOOKUP GENERIC.MAN.LOOKUP) - (VARS HELPSYSCOMS) + :CHANGES-TO (FNS REPO.LOOKUP) - :PREVIOUS-DATE " 5-May-2025 22:04:32" {WMEDLEY}HELPSYS.;15) + :PREVIOUS-DATE "27-Jan-2026 13:21:10" {MEDLEY}HELPSYS.;21) (PRETTYCOMPRINT HELPSYSCOMS) @@ -340,21 +339,27 @@ else "git web--browse"]) (REPO.LOOKUP - [LAMBDA (ENTRY TYPES) (* ; "Edited 13-Jan-2023 10:46 by lmm") + [LAMBDA (ENTRY TYPES) (* ; "Edited 20-Apr-2026 08:06 by rmk") + (* ; "Edited 13-Jan-2023 10:46 by lmm") (* ; "Edited 16-Aug-2022 16:26 by lmm") - (for FL in (UNION (WHEREIS ENTRY (OR TYPES HELPSYS.REPO.TYPES) - T) - (LIST ENTRY)) bind POS FND + (for FL POS FND TSTREAM in (UNION (WHEREIS ENTRY (OR TYPES HELPSYS.REPO.TYPES) + T) + (LIST ENTRY)) when [SETQ FND (OR (FINDFILE-WITH-EXTENSIONS FL NIL '(TEDIT TXT TED)) (AND (SETQ POS (STRPOS "-" FL)) (FINDFILE-WITH-EXTENSIONS (SUBSTRING FL 1 (CL:1- POS)) NIL '(TEDIT TXT TTY TED] - join (CL:WITH-OPEN-FILE (STR (PATHNAME FND) - :DIRECTION :INPUT) - (CL:WHEN (SETQ POS (FFILEPOS ENTRY STR)) - (TEDIT-SEE STR NIL NIL (CL:FORMAT NIL "~a [~a]" FL ENTRY)) - (LIST FL))]) + collect (SETQ TSTREAM (OPENTEXTSTREAM FND)) + [TEDIT TSTREAM NIL NIL `(READONLY T LEAVETTY T FONT ,DEFAULTFONT TITLE + ,(CL:IF (EQ FL ENTRY) + FL + (CONCAT ENTRY " on " FL))] + (CL:UNLESS (EQ FL ENTRY) + (CL:WHEN (SETQ POS (TEDIT.FIND TSTREAM ENTRY)) + (TEDIT.SETSEL TSTREAM POS (NCHARS ENTRY)) + (TEDIT.NORMALIZECARET TSTREAM))) + FL]) ) (RPAQQ CLHS.INDEX @@ -1716,14 +1721,14 @@ (PUTPROPS HELPSYS FILETYPE :FAKE-COMPILE-FILE) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4640 10992 (HELPSYS 4650 . 6491) (IRM.LOOKUP 6493 . 8131) (GENERIC.MAN.LOOKUP 8133 . -10001) (IRM.SMART.LOOKUP 10003 . 10159) (IRM.RESET 10161 . 10570) (DOCS.LOOKUP 10572 . 10990)) (11249 -18568 (CLHS.INDEX 11259 . 14223) (CLHS.LOOKUP 14225 . 16231) (CLHS.OPENER 16233 . 17556) (REPO.LOOKUP -17558 . 18566)) (71663 73181 (IRM.GET.DINFOGRAPH 71673 . 72548) (IRM.DISPLAY.REF 72550 . 73179)) ( -73183 73545 (IRM.LOAD-GRAPH 73183 . 73545)) (73870 79374 (IRM.DISPLAY.CREF 73880 . 75594) ( -IRM.CREF.BOX 75596 . 76423) (IRM.PUT.CREF 76425 . 76650) (IRM.GET.CREF 76652 . 77023) ( -IRM.CREF.BUTTONEVENTFN 77025 . 79372)) (79929 88235 (\IRM.GET.REF 79939 . 81270) (\IRM.SMART.REF 81272 - . 83199) (\IRM.CHOOSE.REF 83201 . 84452) (\IRM.WILD.REF 84454 . 85709) (\IRM.WILDCARD 85711 . 86077) -(\IRM.WILD.MATCH 86079 . 87309) (\IRM.GET.HASHFILE 87311 . 87774) (\IRM.GET.KEYWORDS 87776 . 88233)) ( -88372 88528 (\IRM.AROUND-EXIT 88372 . 88528))))) + (FILEMAP (NIL (4582 10934 (HELPSYS 4592 . 6433) (IRM.LOOKUP 6435 . 8073) (GENERIC.MAN.LOOKUP 8075 . +9943) (IRM.SMART.LOOKUP 9945 . 10101) (IRM.RESET 10103 . 10512) (DOCS.LOOKUP 10514 . 10932)) (11191 +18932 (CLHS.INDEX 11201 . 14165) (CLHS.LOOKUP 14167 . 16173) (CLHS.OPENER 16175 . 17498) (REPO.LOOKUP +17500 . 18930)) (72027 73545 (IRM.GET.DINFOGRAPH 72037 . 72912) (IRM.DISPLAY.REF 72914 . 73543)) ( +73547 73909 (IRM.LOAD-GRAPH 73547 . 73909)) (74234 79738 (IRM.DISPLAY.CREF 74244 . 75958) ( +IRM.CREF.BOX 75960 . 76787) (IRM.PUT.CREF 76789 . 77014) (IRM.GET.CREF 77016 . 77387) ( +IRM.CREF.BUTTONEVENTFN 77389 . 79736)) (80293 88599 (\IRM.GET.REF 80303 . 81634) (\IRM.SMART.REF 81636 + . 83563) (\IRM.CHOOSE.REF 83565 . 84816) (\IRM.WILD.REF 84818 . 86073) (\IRM.WILDCARD 86075 . 86441) +(\IRM.WILD.MATCH 86443 . 87673) (\IRM.GET.HASHFILE 87675 . 88138) (\IRM.GET.KEYWORDS 88140 . 88597)) ( +88736 88892 (\IRM.AROUND-EXIT 88736 . 88892))))) STOP diff --git a/lispusers/HELPSYS.LCOM b/lispusers/HELPSYS.LCOM index 8307d3e2..951eccb2 100644 Binary files a/lispusers/HELPSYS.LCOM and b/lispusers/HELPSYS.LCOM differ diff --git a/lispusers/UNIXYCD b/lispusers/UNIXYCD deleted file mode 100644 index e6dd17ee..00000000 --- a/lispusers/UNIXYCD +++ /dev/null @@ -1,24 +0,0 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) - -(FILECREATED "12-Aug-2022 12:29:18" {DSK}larry>medley>lispusers>UNIXYCD.;1 568 - - :CHANGES-TO (VARS UNIXYCDCOMS) - - :PREVIOUS-DATE "12-Aug-2022 11:14:47" {DSK}larry>medley>lispusers>UNIXYCD.;1) - - -(PRETTYCOMPRINT UNIXYCDCOMS) - -(RPAQQ UNIXYCDCOMS ((COMMANDS "cd" "ls" "pwd"))) - -(DEFCOMMAND "cd" (DIR) - (/CNDIR DIR)) - -(DEFCOMMAND "ls" (FIRST . REST) - (DODIR (CONS FIRST REST))) - -(DEFCOMMAND "pwd" () - (DIRECTORYNAME T)) -(DECLARE%: DONTCOPY - (FILEMAP (NIL))) -STOP diff --git a/lispusers/UNIXYCD.LCOM b/lispusers/UNIXYCD.LCOM deleted file mode 100644 index 013420cc..00000000 --- a/lispusers/UNIXYCD.LCOM +++ /dev/null @@ -1,13 +0,0 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) - -(FILECREATED "12-Aug-2022 12:29:30" ("compiled on " {DSK}larry>medley>lispusers>UNIXYCD.;1) -"12-Aug-2022 10:18:11" bcompl'd in "Welcome to Fuller sysout 12-Aug-2022 ..." dated -"12-Aug-2022 10:22:21") -(FILECREATED "12-Aug-2022 12:29:18" {DSK}larry>medley>lispusers>UNIXYCD.;1 568 :CHANGES-TO (VARS - UNIXYCDCOMS) :PREVIOUS-DATE "12-Aug-2022 11:14:47" {DSK}larry>medley>lispusers>UNIXYCD.;1) -(PRETTYCOMPRINT UNIXYCDCOMS) -(RPAQQ UNIXYCDCOMS ((COMMANDS "cd" "ls" "pwd"))) -(DEFCOMMAND "cd" (DIR) (/CNDIR DIR)) -(DEFCOMMAND "ls" (FIRST . REST) (DODIR (CONS FIRST REST))) -(DEFCOMMAND "pwd" NIL (DIRECTORYNAME T)) -NIL diff --git a/lispusers/UNIXYCD.TXT b/lispusers/UNIXYCD.TXT deleted file mode 100644 index 670e3988..00000000 --- a/lispusers/UNIXYCD.TXT +++ /dev/null @@ -1,13 +0,0 @@ - UNIXYCD & .LCOM .TXT - - -This file implements little commands: - -cd change Lisp's current directory to home -cd dir dir can be a path separated by / or >. - if no "hostname" is given, it's assumed {DSK} -ls [dir] list current directory or a directory that's given - non-feature: ls foo only prints foo; you need to - specify ls foo/ -pwd print working directory - diff --git a/lispusers/WHEELSCROLL.TEDIT b/lispusers/WHEELSCROLL.TEDIT index fa325bb1..c6deafba 100644 Binary files a/lispusers/WHEELSCROLL.TEDIT and b/lispusers/WHEELSCROLL.TEDIT differ diff --git a/scripts/do_hcfiles.sh b/scripts/do_hcfiles.sh index 0246a0db..f32f61de 100755 --- a/scripts/do_hcfiles.sh +++ b/scripts/do_hcfiles.sh @@ -57,7 +57,12 @@ main() { # save dribble file to loadups; extract and save fails "${MEDLEYDIR}"/scripts/cpv ${logindir}/HCFILES.DRIBBLE "${MEDLEYDIR}"/loadups/hcfiles.dribble - grep "IL:FAIL" < "${MEDLEYDIR}"/loadups/hcfiles.dribble > ${logindir}/fails + if [ -f "$(command -v perl)" ] && [ -x "$(command -v perl)" ] + then + perl "${MEDLEYDIR}"/scripts/getFails.pl '^[^\n]*IL:FAIL' 'DONE' "${MEDLEYDIR}"/loadups/hcfiles.dribble > ${logindir}/fails + else + echo Unable to extract FAIL information from "${MEDLEYDIR}"/loadups/hcfiles.dribble > ${logindir}/fails + fi "${MEDLEYDIR}"/scripts/cpv ${logindir}/fails "${MEDLEYDIR}"/loadups/hcfiles-fails.txt # cleanup diff --git a/scripts/getFails.pl b/scripts/getFails.pl new file mode 100644 index 00000000..4c1fea8d --- /dev/null +++ b/scripts/getFails.pl @@ -0,0 +1,31 @@ +#!/usr/bin/env perl +use strict; +use warnings; + +die "Usage: $0 [file...]\n" unless @ARGV >= 2; + +my $pat1 = shift; +my $pat2 = shift; +my $regex1line = qr/${pat1}.*?${pat2}/; # all on 1 line +my $regexStart = qr/${pat1}/; # the line has the start pattern +my $regexEnd = qr/${pat2}/; # the line has the end pattern + +my $flag = 0; + +while (<>) { + if ($flag) { # we're in a multi-line block + print; + if (/$regexEnd/) { # does this line end the multi-line block? + $flag = 0; + print "\n"; # separator + }; + } + elsif (/$regex1line/) { # all on 1 line + print; + print "\n"; # separator + } + elsif (/$regexStart/) { # begin a multi-line block + print; + $flag = 1; + } +} \ No newline at end of file diff --git a/scripts/loadups/loadup-setup.sh b/scripts/loadups/loadup-setup.sh index 1e80d037..dcdc1f9f 100644 --- a/scripts/loadups/loadup-setup.sh +++ b/scripts/loadups/loadup-setup.sh @@ -256,8 +256,6 @@ process_maikodir() { export LOADUP_LOCKFILE="${LOADUP_WORKDIR}"/lock LOADUP_LOCK="" -override_lock=false -ignore_lock=false check_run_lock() { if [ "${ignore_lock}" = false ] diff --git a/sources/AFONT b/sources/ACFONT similarity index 54% rename from sources/AFONT rename to sources/ACFONT index 96e8e6d9..420d71a7 100644 --- a/sources/AFONT +++ b/sources/ACFONT @@ -1,36 +1,33 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8) -(FILECREATED "22-Jul-2025 23:20:06"  -{DSK}kaplan>Local>medley3.5>working-medley>sources>AFONT.;15 27510 +(FILECREATED "15-Apr-2026 09:04:48" {WMEDLEY}ACFONT.;11 42920 :EDIT-BY rmk - :CHANGES-TO (VARS AFONTCOMS) + :CHANGES-TO (VARS ACFONTCOMS) - :PREVIOUS-DATE "21-Jul-2025 00:14:04" -{DSK}kaplan>Local>medley3.5>working-medley>sources>AFONT.;14) + :PREVIOUS-DATE "13-Apr-2026 09:00:05" {WMEDLEY}ACFONT.;10) -(PRETTYCOMPRINT AFONTCOMS) +(PRETTYCOMPRINT ACFONTCOMS) -(RPAQQ AFONTCOMS +(RPAQQ ACFONTCOMS [ - (* ;; "AC font file support. ACFONT.FILEP is on FONT") + (* ;; "AC and STRIKE font file support. ") - (XCL:FILE-ENVIRONMENTS "AFONT") (DECLARE%: EVAL@COMPILE DONTCOPY (RECORDS BOUNDINGBOX FONTBOUNDINGBOX)) (FNS ACFONT.FILEP ACFONT.GETCHARSET \READACFONTBOXES \READACFONTFILE \ACCHARIMAGELIST \ACCHARWIDTHLIST \GETFBB \ACCHARPOSLIST \ACROTATECHAR \FACECODE \FAMILYCODE) - (ADDVARS (DISPLAYCHARSETFNS (AC ACFONT.FILEP ACFONT.GETCHARSET]) + (PROP FILETYPE ACFONT) + [APPENDVARS (DISPLAYCHARSETFNS '(AC ACFONT.FILEP ACFONT.GETCHARSET] + (COMS (* ; "STRIKE format files") + (FNS STRIKEFONT.FILEP STRIKEFONT.GETCHARSET WRITESTRIKEFONTFILE STRIKECSINFO) + (APPENDVARS (DISPLAYCHARSETFNS '(STRIKE STRIKEFONT.FILEP STRIKEFONT.GETCHARSET]) -(* ;; "AC font file support. ACFONT.FILEP is on FONT") +(* ;; "AC and STRIKE font file support. ") - -(XCL:DEFINE-FILE-ENVIRONMENT "AFONT" :PACKAGE "IL" - :READTABLE "INTERLISP" - :COMPILER :COMPILE-FILE) (DECLARE%: EVAL@COMPILE DONTCOPY (DECLARE%: EVAL@COMPILE @@ -78,7 +75,9 @@ 4))))]) (ACFONT.GETCHARSET - [LAMBDA (STRM CHARSET) (* ; "Edited 14-Jul-2025 19:50 by rmk") + [LAMBDA (STRM CHARSET FONT) (* ; "Edited 28-Mar-2026 23:02 by rmk") + (* ; "Edited 27-Mar-2026 07:59 by rmk") + (* ; "Edited 14-Jul-2025 19:50 by rmk") (* ; "Edited 17-May-2025 10:15 by rmk") (* ;; @@ -87,36 +86,31 @@ (\READACFONTFILE STRM]) (\READACFONTBOXES - [LAMBDA (FILE STARTCHAR ENDCHAR) (* jds "15-Jun-85 11:48") + [LAMBDA (FILE STARTCHAR ENDCHAR) (* jds "15-Jun-85 11:48") (* ;  "GETACCHARSPECS returns (bbox bboy bbdx bbdy)") (* ;  "if bbdx and bbdy are both zero, then treat it as a space.") - (SETFILEPTR FILE 48) (* ;  "Move to the start of AC file's width info.") - (for X from STARTCHAR to ENDCHAR collect (* ;  "Now collect the 4 bounding box values into a list") - (create BOUNDINGBOX - RASTERWIDTHX _ (PROG1 (\WIN FILE) + RASTERWIDTHX ← (PROG1 (\WIN FILE) (* ;  "Read a fraction, and truncate it to an integer # of raster bits") - - (\WIN FILE)) - RASTERWIDTHY _ (PROG1 (\WIN FILE) + (\WIN FILE)) + RASTERWIDTHY ← (PROG1 (\WIN FILE) (* ;  "Read a fraction, and truncate it to an integer # of raster bits") - - (\WIN FILE)) - BBOX _ (SIGNED (\WIN FILE) + (\WIN FILE)) + BBOX ← (SIGNED (\WIN FILE) BITSPERWORD) - BBOY _ (SIGNED (\WIN FILE) + BBOY ← (SIGNED (\WIN FILE) BITSPERWORD) - BBDX _ (SIGNED (\WIN FILE) + BBDX ← (SIGNED (\WIN FILE) BITSPERWORD) - BBDY _ (SIGNED (\WIN FILE) + BBDY ← (SIGNED (\WIN FILE) BITSPERWORD]) (\READACFONTFILE @@ -129,8 +123,8 @@ (PROG [FBBLIST STARTCHAR ENDCHAR CHARWIDTHLIST CHARIMAGEWIDTHLIST OFFSETS WIDTHS IMAGEWIDTHS FONTDESC FBBBITMAP CHARBITMAP STARTWORDLIST BBOXLIST DUMMYCHAROFFSET DUMMYWIDTH (CSINFO (create CHARSETINFO - IMAGEWIDTHS _ (\CREATECSINFOELEMENT) - LEFTKERN _ (\CREATEKERNELEMENT] + IMAGEWIDTHS ← (\CREATECSINFOELEMENT) + LEFTKERN ← (\CREATEKERNELEMENT] (CL:UNLESS (GETSTREAM STRM 'INPUT T) [RESETSAVE (SETQ STRM (OPENSTREAM STRM 'INPUT 'OLD)) `(PROGN (CLOSEF? OLDVALUE]) @@ -215,7 +209,7 @@ of FBBLIST] [replace CHARSETBITMAP of CSINFO with (SETQ CHARBITMAP (BITMAPCREATE (IPLUS (SETQ DUMMYCHAROFFSET - (for (X _ STARTCHAR) + (for (X ← STARTCHAR) to ENDCHAR sum (\FGETWIDTH IMAGEWIDTHS @@ -226,7 +220,7 @@ (SETQ OFFSETS (fetch (CHARSETINFO OFFSETS) of CSINFO)) (for I from 0 to (ADD1 \MAXTHINCHAR) do (\FSETOFFSET OFFSETS I DUMMYCHAROFFSET)) (SETQ STARTWORDLIST (\ACCHARPOSLIST STRM STARTCHAR ENDCHAR)) - (bind (DESTLEFT _ 0) for NTHCHAR from STARTCHAR to ENDCHAR as BBLIST in BBOXLIST + (bind (DESTLEFT ← 0) for NTHCHAR from STARTCHAR to ENDCHAR as BBLIST in BBOXLIST as STARTWORD in STARTWORDLIST as CHARWIDTH in CHARWIDTHLIST do (PROG (RASTERINFO BBOX BBBITMAP BBBMBASE)(* ;  "\ACCHARPOSLIST returns NIL if no raster exists for the code") @@ -296,19 +290,18 @@ (RETURN CSINFO)))]) (\ACCHARIMAGELIST - [LAMBDA (BOXLIST) (* jds "15-Jun-85 11:37") - - (* ;; "Returns a list of the ESCAPEMENTS (ie how far to move after printng this character) for each char in the font.") + [LAMBDA (BOXLIST) (* jds "15-Jun-85 11:37") + + (* ;; "Returns a list of the ESCAPEMENTS (ie how far to move after printng this character) for each char in the font.") (for BOX in BOXLIST collect (fetch (BOUNDINGBOX RASTERWIDTHX) of BOX]) (\ACCHARWIDTHLIST - [LAMBDA (BOXLIST FBBOX) (* jds " 4-Dec-84 16:05") + [LAMBDA (BOXLIST FBBOX) (* jds " 4-Dec-84 16:05") (* ;  "GETACCHARSPECS returns (bbox bboy bbdx bbdy)") (* ;  "if bbdx and bbdy are both zero, then treat it as a space.") - (for BOX in BOXLIST bind (STARTWORD BBOX BBOY BBDX BBDY) collect (SETQ BBOX (fetch BBOX of BOX)) (SETQ BBOY (fetch BBOY of BOX)) @@ -318,7 +311,6 @@ ((AND (ZEROP BBDX) (ZEROP BBDY)) (* ;  "we've found a Space. Smash in a quarter of the maximum width. Maybe should be an explicit em?") - (IMAX 2 (FOLDLO (IPLUS 2 (fetch (FONTBOUNDINGBOX FBBBDX) of FBBOX)) 4))) (T (COND @@ -327,14 +319,12 @@ (T (IPLUS BBDX (IMAX 0 BBOX]) (\GETFBB - [LAMBDA (BOXLIST) (* jds "17-May-85 10:22") + [LAMBDA (BOXLIST) (* jds "17-May-85 10:22") (* ;  "Read a font bounding box from an AC file") - - (PROG (RESULTLIST CHARCOUNT BBLIST MAXBBOX MAXBBOY MINBBOX MINBBOY MAXSUMBBOXBBDX MAXSUMBBOYBBDY + (PROG (RESULTLIST CHARCOUNT BBLIST MAXBBOX MAXBBOY MINBBOX MINBBOY MAXSUMBBOXBBDX MAXSUMBBOYBBDY BBOX BBOY BBDX BBDY) (* ;  "\GETFBB returns the fbbdx fbbdy fbbox fbboy of an acfont") - (SETQ MINBBOX 32767) (SETQ MINBBOY 32767) (SETQ MAXBBOX -32768) @@ -347,11 +337,9 @@ (SETQ BBDY (fetch (BOUNDINGBOX BBDY) of BOX)) (* ;  "GETACCHARSPECS returns bbox bboy bbdx bbdy") - (COND [(IEQP BBDY -1) (* ;  "This character doesn't exist. Create a dummy bounding box for it") - (SETQ BBLIST '(0 0 0 -1] (T (COND ((IGREATERP BBOX MAXBBOX) @@ -375,25 +363,22 @@ (SETQ MAXSUMBBOYBBDY (IPLUS BBOY BBDY] (* ;  "\GETFBB returns the fbbdx fbbdy fbbox fbboy of an acfont") - (RETURN (create FONTBOUNDINGBOX - FBBBDX _ (IDIFFERENCE MAXSUMBBOXBBDX MINBBOX) - FBBBDY _ (IDIFFERENCE MAXSUMBBOYBBDY MINBBOY) - FBBBOX _ MINBBOX - FBBBOY _ MINBBOY]) + FBBBDX ← (IDIFFERENCE MAXSUMBBOXBBDX MINBBOX) + FBBBDY ← (IDIFFERENCE MAXSUMBBOYBBDY MINBBOY) + FBBBOX ← MINBBOX + FBBBOY ← MINBBOY]) (\ACCHARPOSLIST - [LAMBDA (FILE STARTCHAR ENDCHAR) (* jds "10-NOV-83 20:19") + [LAMBDA (FILE STARTCHAR ENDCHAR) (* jds "10-NOV-83 20:19") (* ;  "\ACCHARPOSLIST returns the word position of the raster for the nth character of the file") - [SETFILEPTR FILE (IPLUS 48 (ITIMES 16 (ADD1 (IDIFFERENCE ENDCHAR STARTCHAR] - (bind HIWORD LOWORD [DIRECTORYSTART _ (IPLUS 48 (ITIMES 16 (ADD1 (IDIFFERENCE ENDCHAR STARTCHAR] + (bind HIWORD LOWORD [DIRECTORYSTART ← (IPLUS 48 (ITIMES 16 (ADD1 (IDIFFERENCE ENDCHAR STARTCHAR] first (SETFILEPTR FILE DIRECTORYSTART) for X from STARTCHAR to ENDCHAR collect (SETQ HIWORD (\WIN FILE)) (SETQ LOWORD (\WIN FILE)) (* ;  "If the position of the acchar is given as -1,-1 then the raster does not exist so return nil") - (COND ((AND (IEQP HIWORD 65535) (IEQP LOWORD 65535)) @@ -404,13 +389,13 @@ (\ACROTATECHAR [LAMBDA (BITMAP) (* ; "Edited 28-Jul-87 18:49 by Snow") - - (* ;; "(prog (new.bitmap (width (|fetch| (bitmap bitmapwidth) |of| bitmap)) (height (|fetch| (bitmap bitmapheight) |of| bitmap))) (setq new.bitmap (bitmapcreate height width)) (|for| y |from| 0 |to| (sub1 height) |do| (|for| x |from| 0 |to| (sub1 width) |bind| (y1 _ (idifference (sub1 height) y)) |do| (bitmapbit new.bitmap y1 x (bitmapbit bitmap x y)))) (return new.bitmap))") + + (* ;; "(prog (new.bitmap (width (|fetch| (bitmap bitmapwidth) |of| bitmap)) (height (|fetch| (bitmap bitmapheight) |of| bitmap))) (setq new.bitmap (bitmapcreate height width)) (|for| y |from| 0 |to| (sub1 height) |do| (|for| x |from| 0 |to| (sub1 width) |bind| (y1 ← (idifference (sub1 height) y)) |do| (bitmapbit new.bitmap y1 x (bitmapbit bitmap x y)))) (return new.bitmap))") (ROTATE-BITMAP-LEFT BITMAP]) (\FACECODE - [LAMBDA (FACE) (* rmk%: "27-FEB-81 12:16") + [LAMBDA (FACE) (* rmk%: "27-FEB-81 12:16") (IPLUS (SELECTQ (fetch (FONTFACE EXPANSION) of FACE) (REGULAR 0) (COMPRESSED 6) @@ -427,13 +412,13 @@ (SHOULDNT]) (\FAMILYCODE - [LAMBDA (FAMILY WSTRM) (* rmk%: "11-Sep-84 10:54") - - (* ;; "Returns the family CODE for FAMILY in a standard widths file, leaving the file positioned at the beginning of the next file entry. Returns NIL if FAMILY not found. If FAMILY is T, returns the code for the first family in the index.") + [LAMBDA (FAMILY WSTRM) (* rmk%: "11-Sep-84 10:54") + + (* ;; "Returns the family CODE for FAMILY in a standard widths file, leaving the file positioned at the beginning of the next file entry. Returns NIL if FAMILY not found. If FAMILY is T, returns the code for the first family in the index.") (SETFILEPTR WSTRM 0) - (bind TYPE CODE LENGTH (NCHARS _ (NCHARS FAMILY)) - (NEXT _ 0) + (bind TYPE CODE LENGTH (NCHARS ← (NCHARS FAMILY)) + (NEXT ← 0) do (SETFILEPTR WSTRM NEXT) (SETQ TYPE (\BIN WSTRM)) (SETQ LENGTH (\BIN WSTRM)) @@ -448,16 +433,264 @@ (for I from 1 to NCHARS always (EQ (\BIN WSTRM) (NTHCHARCODE FAMILY I] (SETFILEPTR WSTRM NEXT) (* ; "Move file to next entry") - (RETURN CODE)))) (0 (RETURN NIL)) NIL]) ) -(ADDTOVAR DISPLAYCHARSETFNS (AC ACFONT.FILEP ACFONT.GETCHARSET)) +(PUTPROPS ACFONT FILETYPE CL:COMPILE-FILE) + +(APPENDTOVAR DISPLAYCHARSETFNS '(AC ACFONT.FILEP ACFONT.GETCHARSET)) + + + +(* ; "STRIKE format files") + +(DEFINEQ + +(STRIKEFONT.FILEP + [LAMBDA (FILE) (* ; "Edited 15-May-2025 17:47 by rmk") + + (* ;; "If high bit of type is on, then must be strike. If 2nd bit is on, must be strike-index, and we punt. We don't care about the 3rd bit") + + (* ;; "first word has high bits (onebit index fixed). Onebit means 'new-style font' , index is 0 for simple strike, 1 for index, and fixed is if all chars have max width. Lisp doesn't care about 'fixed'") + + (RESETLST + (CL:UNLESS (OPENP FILE 'INPUT) + [RESETSAVE (SETQ FILE (OPENSTREAM FILE 'INPUT 'OLD)) + `(PROGN (CLOSEF? OLDVALUE]) + (CL:WHEN [MEMB (\WIN FILE) + (CONSTANT (LIST (LLSH 1 15) + (LOGOR (LLSH 1 15) + (LLSH 1 13] + T))]) + +(STRIKEFONT.GETCHARSET + [LAMBDA (STRM) (* ; "Edited 3-Aug-2025 22:27 by rmk") + (* ; "Edited 1-Aug-2025 23:50 by rmk") + (* ; "Edited 14-Jul-2025 19:52 by rmk") + (* ; "Edited 9-Jun-2025 14:22 by rmk") + (* ; "Edited 12-Jul-2022 09:19 by rmk") + (* ; "Edited 4-Dec-92 12:11 by jds") + + (* ;; "STRM has already been determined to be a vanilla strike-format file holding only the desired charset.") + (* ; "returns a charsetinfo") + (RESETLST + (CL:UNLESS (\GETSTREAM STRM 'INPUT T) + [RESETSAVE (SETQ STRM (OPENSTREAM STRM 'INPUT 'OLD)) + `(PROGN (CLOSEF? OLDVALUE]) + (SETFILEPTR STRM 0) + (CL:UNLESS (STRIKEFONT.FILEP STRM) + (ERROR "Not a STRIKE font file" STRM)) + (CL:UNLESS (EQ 2 (GETFILEPTR STRM)) + (SETFILEPTR STRM 2)) + (LET (CSINFO NUMBCODES RW BITMAP OFFSETS FIRSTCHAR LASTCHAR HEIGHT WIDTHS) + (SETQ CSINFO (create CHARSETINFO)) + (SETQ FIRSTCHAR (\WIN STRM)) (* ; "minimum ascii code") + (SETQ LASTCHAR (\WIN STRM)) (* ; "maximum ascii code") + (\WIN STRM) (* ; + "MaxWidth which isn't used by anyone.") + (\WIN STRM) (* ; + "number of words in this StrikeBody") + (replace (CHARSETINFO CHARSETASCENT) of CSINFO with (\WIN STRM)) + (* ; + "ascent in scan lines (=FBBdy+FBBoy)") + (replace (CHARSETINFO CHARSETDESCENT) of CSINFO with (\WIN STRM)) + (* ; "descent in scan-lines (=FBBoy)") + (\WIN STRM) (* ; + "offset in bits (<0 for kerning, else 0, =FBBox)") + (SETQ RW (\WIN STRM)) (* ; "raster width of bitmap") + (* ; "height of bitmap") + + (* ;; "JDS 12/4/92: Apparently, these fields can be signed values, if all chars, e.g., ride above the base line.") + + (SETQ HEIGHT (IPLUS (SIGNED (fetch (CHARSETINFO CHARSETASCENT) of CSINFO) + 16) + (SIGNED (fetch (CHARSETINFO CHARSETDESCENT) of CSINFO) + 16))) + (SETQ BITMAP (BITMAPCREATE (UNFOLD RW BITSPERWORD) + HEIGHT)) + (\BINS STRM (fetch BITMAPBASE of BITMAP) + 0 + (UNFOLD (ITIMES RW HEIGHT) + BYTESPERWORD)) (* ; "read bits into bitmap") + (replace (CHARSETINFO CHARSETBITMAP) of CSINFO with BITMAP) + (SETQ NUMBCODES (IDIFFERENCE (ADD1 LASTCHAR) + FIRSTCHAR)) + (SETQ OFFSETS (fetch (CHARSETINFO OFFSETS) of CSINFO)) + + (* ;; + "Initialize the offsets to 0, all but FIRSTCHAR to be replaced with the slug offset") + + (for I from 0 to (IPLUS \MAXTHINCHAR 2) do (\FSETOFFSET OFFSETS I 0)) + (for I from FIRSTCHAR as J from 1 to NUMBCODES do + (* ;; + "J starts at 1 because we know that the offset of J=0 is 0 ?") + + (\FSETOFFSET OFFSETS I (\WIN STRM))) + (for I (SLUGOFFSET ← (\WIN STRM)) from 0 to \MAXTHINCHAR + when (EQ 0 (\FGETOFFSET OFFSETS I)) unless (EQ I FIRSTCHAR) + do (\FSETOFFSET OFFSETS I SLUGOFFSET) finally (\FSETOFFSET OFFSETS SLUGCHARINDEX + SLUGOFFSET) + + (* ;; + "There's one more so that \FONTRESETCHARWIDTHS can get the slug width, otherwise not necessary") + + (\FSETOFFSET OFFSETS (ADD1 SLUGCHARINDEX) + (\WIN STRM))) + + (* ;; "Initialize the widths to 0") + + (SETQ WIDTHS (fetch (CHARSETINFO WIDTHS) of CSINFO)) + (for I from 0 to (IPLUS \MAXTHINCHAR 2) do (\FSETWIDTH WIDTHS I 0)) + (\FONTRESETCHARWIDTHS CSINFO 0 SLUGCHARINDEX) + (replace (CHARSETINFO IMAGEWIDTHS) of CSINFO with (fetch (CHARSETINFO WIDTHS) + of CSINFO)) + CSINFO))]) + +(WRITESTRIKEFONTFILE + [LAMBDA (FONT CHARSET FILE) (* ; "Edited 30-Aug-2025 23:21 by rmk") + (* ; "Edited 28-Aug-2025 15:09 by rmk") + (* ; "Edited 24-Aug-2025 11:39 by rmk") + (* ; "Edited 3-Aug-2025 22:33 by rmk") + (* ; "Edited 22-May-2025 09:53 by rmk") + (* ; "Edited 1-Feb-2025 12:27 by mth") + (* ; "Edited 12-Jul-2022 14:36 by rmk") + (* kbr%: "21-Oct-85 15:08") + (* ; + "Write strike FILE using info in FONT. ") + (CL:UNLESS (FONTP FONT) + (LISPERROR "ILLEGAL ARG" FONT)) + (CL:UNLESS CHARSET (SETQ CHARSET 0)) + (CL:UNLESS (AND (IGEQ CHARSET 0) + (ILEQ CHARSET \MAXCHARSET)) + (LISPERROR "ILLEGAL ARG" CHARSET)) + (LET (STREAM CSINFO FIRSTCHAR LASTCHAR WIDTHS MAXWIDTH LENGTH RASTERWIDTH SLUGOFFSET OFFSETS) + (SETQ CSINFO (\INSURECHARSETINFO FONT CHARSET)) + (CL:UNLESS CSINFO (ERROR "Couldn't find charset " CHARSET)) + (SETQ WIDTHS (fetch (CHARSETINFO WIDTHS) of CSINFO)) + (SETQ OFFSETS (fetch (CHARSETINFO OFFSETS) of CSINFO)) + (SETQ SLUGOFFSET (\FGETOFFSET OFFSETS SLUGCHARINDEX)) + + (* ;; "Find the first and last non-slug characters") + + [SETQ FIRSTCHAR (for I from 0 to \MAXTHINCHAR thereis (NEQ SLUGOFFSET (\FGETOFFSET OFFSETS I + ] + [SETQ LASTCHAR (for I from \MAXTHINCHAR to 0 by -1 thereis (NEQ SLUGOFFSET (\FGETOFFSET + OFFSETS I] + [SETQ STREAM (OPENSTREAM FILE 'OUTPUT 'NEW '((TYPE BINARY] + (\WOUT STREAM 32768) (* ; "STRIKE HEADER. ") + (\WOUT STREAM FIRSTCHAR) + (\WOUT STREAM LASTCHAR) + (SETQ MAXWIDTH 0) + [for I from 0 to SLUGCHARINDEX do (SETQ MAXWIDTH (IMAX MAXWIDTH (\FGETWIDTH WIDTHS I] + (\WOUT STREAM MAXWIDTH) (* ; "STRIKE BODY. ") + (* ; "Length. ") + (SETQ RASTERWIDTH (fetch (BITMAP BITMAPRASTERWIDTH) of (fetch (CHARSETINFO CHARSETBITMAP) + of CSINFO))) + (SETQ LENGTH (IPLUS 8 (IDIFFERENCE LASTCHAR FIRSTCHAR) + (ITIMES (fetch (FONTDESCRIPTOR \SFHeight) of FONT) + RASTERWIDTH))) + (\WOUT STREAM LENGTH) (* ; + "Ascent, Descent, Xoffset (no longer used) and Rasterwidth. ") + (\WOUT STREAM (fetch (CHARSETINFO CHARSETASCENT) of CSINFO)) + (\WOUT STREAM (fetch (CHARSETINFO CHARSETDESCENT) of CSINFO)) + (\WOUT STREAM 0) + (\WOUT STREAM RASTERWIDTH) (* ; "Bitmap. ") + [\BOUTS STREAM (fetch (BITMAP BITMAPBASE) of (fetch (CHARSETINFO CHARSETBITMAP) of CSINFO)) + 0 + (ITIMES 2 RASTERWIDTH (IPLUS (fetch (CHARSETINFO CHARSETASCENT) of CSINFO) + (fetch (CHARSETINFO CHARSETDESCENT) of CSINFO] + (* ; "Offsets. ") + [for I (OFFSET ← 0) from FIRSTCHAR to LASTCHAR first (\WOUT STREAM OFFSET) + (* ; "Offset of the first char") + do (CL:UNLESS (EQ SLUGOFFSET (\FGETOFFSET OFFSETS I)) + (* ; + "The slug isn't really here in the bitmap") + (ADD OFFSET (\FGETWIDTH WIDTHS I))) + (\WOUT STREAM OFFSET) finally (* ; + "Offset for the after-slug, for width") + (\WOUT STREAM (IPLUS OFFSET (\FGETWIDTH WIDTHS + SLUGCHARINDEX] + (CLOSEF STREAM]) + +(STRIKECSINFO + [LAMBDA (CSINFO) (* ; "Edited 27-Apr-89 13:39 by atm") + + (* ;; "Returns a STRIKE type font descriptor (EQ WIDTHS IMAGEWIDTHS), cause we know how to write those guys out (they read quicker but display slower). If (EQ WIDTHS IMAGEWIDTHS), just return original.") + + (PROG (WIDTHS OFFSETS IMWIDTHS OLDBM BMWIDTH BMHEIGHT NEWBM NEWOFFSET NEWWIDTH OLDOFFSET + DUMMYOFFSET NEWOFFSETS) + (SETQ WIDTHS (fetch (CHARSETINFO WIDTHS) of CSINFO)) + (SETQ IMWIDTHS (fetch (CHARSETINFO IMAGEWIDTHS) of CSINFO)) + (if (EQ WIDTHS IMWIDTHS) + then (RETURN CSINFO)) + (SETQ OFFSETS (fetch (CHARSETINFO OFFSETS) of CSINFO)) + (SETQ OLDBM (fetch (CHARSETINFO CHARSETBITMAP) of CSINFO)) + (SETQ DUMMYOFFSET (\FGETOFFSET OFFSETS 256)) + (SETQ BMHEIGHT (BITMAPHEIGHT OLDBM)) + [SETQ BMWIDTH (for I from 0 to \MAXTHINCHAR + sum (if (IEQP DUMMYOFFSET (\FGETOFFSET OFFSETS I)) + then 0 + else (IMAX (\FGETIMAGEWIDTH IMWIDTHS I) + (\FGETWIDTH WIDTHS I] + + (* ;; "") + + (* ;; "Initialize new offsets vector") + + (* ;; "") + + (SETQ NEWOFFSETS (\CREATECSINFOELEMENT)) + (for I from 0 to (IPLUS \MAXTHINCHAR 2) do (\FSETOFFSET NEWOFFSETS I 0)) + (\FSETOFFSET NEWOFFSETS (ADD1 \MAXTHINCHAR) + BMWIDTH) + + (* ;; "") + + (* ;; "Adjust bitmap with so width = imagewidth, fill offsets") + + (* ;; "") + + (SETQ NEWBM (BITMAPCREATE BMWIDTH BMHEIGHT 1)) + (SETQ NEWOFFSET 0) + [for I from 0 to 255 do (SETQ OLDOFFSET (\FGETOFFSET OFFSETS I)) + (if (IEQP DUMMYOFFSET OLDOFFSET) + then (\FSETOFFSET NEWOFFSETS I BMWIDTH) + else (\FSETOFFSET NEWOFFSETS I NEWOFFSET) + (SETQ NEWWIDTH (IMAX (\FGETIMAGEWIDTH IMWIDTHS I) + (\FGETWIDTH WIDTHS I))) + (BITBLT OLDBM OLDOFFSET 0 NEWBM NEWOFFSET 0 (\FGETWIDTH + IMWIDTHS I) + BMHEIGHT + 'REPLACE) + (SETQ NEWOFFSET (IPLUS NEWOFFSET NEWWIDTH] + + (* ;; "") + + (* ;; "Make new CSInfo record withs IMAGEWIDTHS, WIDTHS the same") + + (* ;; "") + + (SETQ WIDTHS (COPYALL WIDTHS)) + [for I from 0 to \MAXTHINCHAR do (\FSETWIDTH WIDTHS I (IMAX (\FGETWIDTH WIDTHS I) + (\FGETIMAGEWIDTH IMWIDTHS I] + (RETURN (create CHARSETINFO + WIDTHS ← WIDTHS + OFFSETS ← NEWOFFSETS + IMAGEWIDTHS ← WIDTHS + CHARSETBITMAP ← NEWBM + YWIDTHS ← (fetch (CHARSETINFO YWIDTHS) of CSINFO) + CHARSETASCENT ← (fetch (CHARSETINFO CHARSETASCENT) of CSINFO) + CHARSETDESCENT ← (fetch (CHARSETINFO CHARSETDESCENT) of CSINFO]) +) + +(APPENDTOVAR DISPLAYCHARSETFNS '(STRIKE STRIKEFONT.FILEP STRIKEFONT.GETCHARSET)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (2626 27417 (ACFONT.FILEP 2636 . 3520) (ACFONT.GETCHARSET 3522 . 3914) (\READACFONTBOXES - 3916 . 6143) (\READACFONTFILE 6145 . 18986) (\ACCHARIMAGELIST 18988 . 19345) (\ACCHARWIDTHLIST 19347 - . 20613) (\GETFBB 20615 . 23895) (\ACCHARPOSLIST 23897 . 24947) (\ACROTATECHAR 24949 . 25513) ( -\FACECODE 25515 . 26109) (\FAMILYCODE 26111 . 27415))))) + (FILEMAP (NIL (2704 27651 (ACFONT.FILEP 2714 . 3598) (ACFONT.GETCHARSET 3600 . 4210) (\READACFONTBOXES + 4212 . 6436) (\READACFONTFILE 6438 . 19287) (\ACCHARIMAGELIST 19289 . 19626) (\ACCHARWIDTHLIST 19628 + . 20888) (\GETFBB 20890 . 24168) (\ACCHARPOSLIST 24170 . 25216) (\ACROTATECHAR 25218 . 25768) ( +\FACECODE 25770 . 26360) (\FAMILYCODE 26362 . 27649)) (27814 42811 (STRIKEFONT.FILEP 27824 . 28712) ( +STRIKEFONT.GETCHARSET 28714 . 34304) (WRITESTRIKEFONTFILE 34306 . 39215) (STRIKECSINFO 39217 . 42809)) +))) STOP diff --git a/sources/ACFONT.DFASL b/sources/ACFONT.DFASL new file mode 100644 index 00000000..f5acc7ca Binary files /dev/null and b/sources/ACFONT.DFASL differ diff --git a/sources/AFONT.DFASL b/sources/AFONT.DFASL deleted file mode 100644 index 9338e3cf..00000000 Binary files a/sources/AFONT.DFASL and /dev/null differ diff --git a/sources/FILEIO b/sources/FILEIO index 433ead86..45dab841 100644 --- a/sources/FILEIO +++ b/sources/FILEIO @@ -1,12 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED " 6-Feb-2026 23:22:00" {WMEDLEY}FILEIO.;142 166519 +(FILECREATED "26-Apr-2026 23:27:40" {WMEDLEY}FILEIO.;146 165936 :EDIT-BY rmk - :CHANGES-TO (FNS DIRECTORYNAME) + :CHANGES-TO (FNS \DO.PARAMS.AT.OPEN) - :PREVIOUS-DATE "12-Sep-2025 08:19:06" {WMEDLEY}FILEIO.;141) + :PREVIOUS-DATE "26-Apr-2026 21:00:55" {WMEDLEY}FILEIO.;145) (PRETTYCOMPRINT FILEIOCOMS) @@ -1446,7 +1446,10 @@ (GO RETRY]) (\DO.PARAMS.AT.OPEN - [LAMBDA (STREAM ACCESS PARAMETERS) (* ; "Edited 25-Dec-2024 10:54 by rmk") + [LAMBDA (STREAM ACCESS PARAMETERS) (* ; "Edited 26-Apr-2026 23:27 by rmk") + (* ; "Edited 21-Apr-2026 20:57 by mth") + (* ; "Edited 20-Apr-2026 17:36 by mth") + (* ; "Edited 25-Dec-2024 10:54 by rmk") (* ; "Edited 15-Jul-2024 22:29 by rmk") (* ; "Edited 25-Aug-2023 08:43 by rmk") (* ; "Edited 6-Jul-2022 00:00 by rmk") @@ -1469,44 +1472,40 @@ (DECLARE (USEDFREE STREAM-AFTER-OPEN-FNS)) (\EXTERNALFORMAT STREAM :DEFAULT) - [for X ATTR VAL EOL in PARAMETERS do [(COND - [(LISTP X) - (SETQ ATTR (CAR X)) - (SETQ VAL (CAR (LISTP (CDR X] - (T (SETQ ATTR X) - (SETQ VAL T))) - (SELECTQ ATTR - (BUFFERS (SETFILEINFO STREAM 'BUFFERS VAL)) - (ENDOFSTREAMOP (SETFILEINFO STREAM 'ENDOFSTREAMOP VAL)) - (CHARSET (CHARSET STREAM VAL)) - ((FORMAT EXTERNALFORMAT :EXTERNAL-FORMAT) + (for X ATTR VAL EOL in PARAMETERS + do (COND + [(LISTP X) + (SETQ ATTR (CAR X)) + (SETQ VAL (CAR (LISTP (CDR X] + (T (SETQ ATTR X) + (SETQ VAL T))) + (SELECTQ ATTR + (BUFFERS (SETFILEINFO STREAM 'BUFFERS VAL)) + (ENDOFSTREAMOP (SETFILEINFO STREAM 'ENDOFSTREAMOP VAL)) + (CHARSET (CHARSET STREAM VAL)) + ((FORMAT EXTERNALFORMAT :EXTERNAL-FORMAT) + (* ;; + "This allows an EOL and format to be intermixed, the last ones of each are installed") - (* ;; - "VAL can be :UTF-8, CR, (UTF:8 CR), i.e. specify either one or both") + (for V inside VAL do (if (MEMB V '(LF CR CRLF ANY)) + then (SETQ EOL V) + else (\EXTERNALFORMAT STREAM V)))) + (CONVHANKAKU (CONVHANKAKU STREAM VAL)) + ((EOL EOLCONVENTION EOLC) + (SETQ EOL VAL)) + NIL) finally - (if (LISTP VAL) - then (* ; - "VAL could be (:UTF-8 CR) e.g. from CL:OPEN") - (\EXTERNALFORMAT STREAM (CAR VAL)) - (* ; - "Can override the EOL of the format") - (SETQ EOL (CADR VAL)) - elseif (SETQ EOL (CAR) - VAL) - else (\EXTERNALFORMAT STREAM VAL))) - (CONVHANKAKU (CONVHANKAKU STREAM VAL)) - ((EOL EOLCONVENTION EOLC) - (SETQ EOL VAL] finally + (* ;; "If EOL is not specified, default input streams to ANY. ") - (* ;; - "If not specified, default EOL to ANY--SETFILEINFO checks for output streams") - - (SETFILEINFO STREAM 'EOL - (OR EOL 'ANY] - (FOR FN IN STREAM-AFTER-OPEN-FNS DO (APPLY* FN STREAM ACCESS PARAMETERS]) + (CL:UNLESS (OR EOL (\GETSTREAM STREAM 'OUTPUT T)) + (SETQ EOL 'ANY)) + (CL:WHEN EOL + (SETFILEINFO STREAM 'EOL EOL))) + (for FN in STREAM-AFTER-OPEN-FNS do (APPLY* FN STREAM ACCESS PARAMETERS]) (\RENAMEFILE - [LAMBDA (OLDFILE NEWFILE) (* ; "Edited 25-Dec-2024 10:14 by rmk") + [LAMBDA (OLDFILE NEWFILE) (* ; "Edited 25-Apr-2026 16:03 by rmk") + (* ; "Edited 25-Dec-2024 10:14 by rmk") (* ; "Edited 16-Dec-2024 21:07 by rmk") (* hdj " 7-May-86 12:22") (SETQ OLDFILE (\ADD.CONNECTED.DIR OLDFILE)) @@ -1521,7 +1520,7 @@ NEW-DEVICE (TRUEFILENAME NEWFILE))) (CL:IF (PSEUDOHOSTP NEWFILE) - (PSEUDOFILENAME NEWFULLNAME) + (PSEUDOFILENAME NEWFULLNAME (FILENAMEFIELD NEWFILE 'HOST)) NEWFULLNAME))]) (\REVALIDATEFILE @@ -3161,39 +3160,39 @@ update the map") (ADDTOVAR LAMA \IS.NOT.RANDACCESSP \ILLEGAL.DEVICEOP STREAMPROP) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (27706 31822 (STREAMPROP 27716 . 28150) (GETSTREAMPROP 28152 . 28901) (PUTSTREAMPROP -28903 . 31670) (STREAMP 31672 . 31820)) (31865 35244 (\DEFPRINT.BY.NAME 31875 . 33027) ( -\STREAM.DEFPRINT 33029 . 34937) (\FDEV.DEFPRINT 34939 . 35242)) (35502 40543 (\GETACCESS 35512 . 35966 -) (\SETACCESS 35968 . 40541)) (60769 66738 (\DEFINEDEVICE 60779 . 63095) (\GETDEVICEFROMNAME 63097 . -63570) (\GETDEVICEFROMHOSTNAME 63572 . 64616) (\REMOVEDEVICE 64618 . 65741) (\REMOVEDEVICE.NAMES 65743 - . 66736)) (66778 94509 (\CLOSEFILE 66788 . 67613) (\DELETEFILE 67615 . 67909) (\DEVICEEVENT 67911 . -69681) (\GENERATEFILES 69683 . 70630) (\GENERATENEXTFILE 70632 . 71283) (\GENERATEFILEINFO 71285 . -71746) (\GETFILENAME 71748 . 72137) (\GENERIC.OUTFILEP 72139 . 72609) (\OPENFILE 72611 . 75189) ( -\DO.PARAMS.AT.OPEN 75191 . 79387) (\RENAMEFILE 79389 . 80345) (\REVALIDATEFILE 80347 . 82949) ( -\PAGED.REVALIDATEFILELST 82951 . 84509) (\PAGED.REVALIDATEFILES 84511 . 86230) (\PAGED.REVALIDATEFILE -86232 . 88515) (\BUFFERED.REVALIDATEFILE 88517 . 90803) (\BUFFERED.REVALIDATEFILELST 90805 . 91989) ( -\PRINT-REVALIDATION-RESULT 91991 . 92833) (\TRUNCATEFILE 92835 . 93226) (\FILE-CONFLICT 93228 . 94507) -) (94545 99208 (\GENERATENOFILES 94555 . 96651) (\NULLFILEGENERATOR 96653 . 96897) (\NOFILESNEXTFILEFN - 96899 . 98890) (\NOFILESINFOFN 98892 . 99206)) (99327 101235 (\FILE.NOT.OPEN 99337 . 99850) ( -\FILE.WONT.OPEN 99852 . 100180) (\ILLEGAL.DEVICEOP 100182 . 100464) (\IS.NOT.RANDACCESSP 100466 . -100912) (\STREAM.NOT.OPEN 100914 . 101233)) (101370 103668 (\FDEVINSTANCE 101380 . 103666)) (104870 -111841 (CNDIR 104880 . 106185) (DIRECTORYNAME 106187 . 109967) (DIRECTORYNAMEP 109969 . 110585) ( -HOSTNAMEP 110587 . 111394) (\ADD.CONNECTED.DIR 111396 . 111839)) (111886 140833 (\BACKFILEPTR 111896 - . 112084) (\BACKPEEKBIN 112086 . 112447) (\BACKBIN 112449 . 112800) (BIN 112802 . 113019) (\BIN -113021 . 113298) (\BINS 113300 . 113586) (BOUT 113588 . 113950) (\BOUT 113952 . 114267) (\BOUTS 114269 - . 114580) (COPYBYTES 114582 . 117914) (COPYCHARS 117916 . 121714) (COPYFILE 121716 . 123076) ( -\COPYOPENFILE 123078 . 126277) (\INFER.FILE.TYPE 126279 . 127233) (EOFP 127235 . 127532) (FORCEOUTPUT -127534 . 127781) (\FLUSH.OPEN.STREAMS 127783 . 128139) (CHARSET 128141 . 129500) (ACCESS-CHARSET -129502 . 130139) (GETEOFPTR 130141 . 130391) (GETFILEINFO 130393 . 133586) (\TYPE.FROM.FILETYPE 133588 - . 134058) (\FILETYPE.FROM.TYPE 134060 . 134239) (GETFILEPTR 134241 . 134493) (SETFILEINFO 134495 . -138732) (SETFILEPTR 138734 . 140453) (BOUT16 140455 . 140640) (BIN16 140642 . 140831)) (140936 148116 -(\GENERIC.BINS 140946 . 141226) (\GENERIC.BOUTS 141228 . 141493) (\GENERIC.RENAMEFILE 141495 . 143743) - (\GENERIC.OPENP 143745 . 145060) (\GENERIC.READP 145062 . 146214) (\GENERIC.CHARSET 146216 . 148114)) - (148117 148456 (\MAP-OPEN-STREAMS 148127 . 148454)) (150311 152391 (\EOF.ACTION 150321 . 150572) ( -\EOSERROR 150574 . 150767) (\GETEOFPTR 150769 . 150951) (\INCFILEPTR 150953 . 151303) (\PEEKBIN 151305 - . 151496) (\SETCLOSEDFILELENGTH 151498 . 151832) (\SETEOFPTR 151834 . 152022) (\SETFILEPTR 152024 . -152389)) (152392 152934 (\FIXPOUT 152402 . 152702) (\FIXPIN 152704 . 152932)) (152935 153501 (\BOUTEOL - 152945 . 153499)) (156397 166261 (\BUFFERED.BIN 156407 . 157259) (\BUFFERED.PEEKBIN 157261 . 158043) -(\BUFFERED.BOUT 158045 . 158905) (\BUFFERED.BINS 158907 . 162592) (\BUFFERED.BOUTS 162594 . 164395) ( -\BUFFERED.COPYBYTES 164397 . 166259))))) + (FILEMAP (NIL (27711 31827 (STREAMPROP 27721 . 28155) (GETSTREAMPROP 28157 . 28906) (PUTSTREAMPROP +28908 . 31675) (STREAMP 31677 . 31825)) (31870 35249 (\DEFPRINT.BY.NAME 31880 . 33032) ( +\STREAM.DEFPRINT 33034 . 34942) (\FDEV.DEFPRINT 34944 . 35247)) (35507 40548 (\GETACCESS 35517 . 35971 +) (\SETACCESS 35973 . 40546)) (60774 66743 (\DEFINEDEVICE 60784 . 63100) (\GETDEVICEFROMNAME 63102 . +63575) (\GETDEVICEFROMHOSTNAME 63577 . 64621) (\REMOVEDEVICE 64623 . 65746) (\REMOVEDEVICE.NAMES 65748 + . 66741)) (66783 93926 (\CLOSEFILE 66793 . 67618) (\DELETEFILE 67620 . 67914) (\DEVICEEVENT 67916 . +69686) (\GENERATEFILES 69688 . 70635) (\GENERATENEXTFILE 70637 . 71288) (\GENERATEFILEINFO 71290 . +71751) (\GETFILENAME 71753 . 72142) (\GENERIC.OUTFILEP 72144 . 72614) (\OPENFILE 72616 . 75194) ( +\DO.PARAMS.AT.OPEN 75196 . 78665) (\RENAMEFILE 78667 . 79762) (\REVALIDATEFILE 79764 . 82366) ( +\PAGED.REVALIDATEFILELST 82368 . 83926) (\PAGED.REVALIDATEFILES 83928 . 85647) (\PAGED.REVALIDATEFILE +85649 . 87932) (\BUFFERED.REVALIDATEFILE 87934 . 90220) (\BUFFERED.REVALIDATEFILELST 90222 . 91406) ( +\PRINT-REVALIDATION-RESULT 91408 . 92250) (\TRUNCATEFILE 92252 . 92643) (\FILE-CONFLICT 92645 . 93924) +) (93962 98625 (\GENERATENOFILES 93972 . 96068) (\NULLFILEGENERATOR 96070 . 96314) (\NOFILESNEXTFILEFN + 96316 . 98307) (\NOFILESINFOFN 98309 . 98623)) (98744 100652 (\FILE.NOT.OPEN 98754 . 99267) ( +\FILE.WONT.OPEN 99269 . 99597) (\ILLEGAL.DEVICEOP 99599 . 99881) (\IS.NOT.RANDACCESSP 99883 . 100329) +(\STREAM.NOT.OPEN 100331 . 100650)) (100787 103085 (\FDEVINSTANCE 100797 . 103083)) (104287 111258 ( +CNDIR 104297 . 105602) (DIRECTORYNAME 105604 . 109384) (DIRECTORYNAMEP 109386 . 110002) (HOSTNAMEP +110004 . 110811) (\ADD.CONNECTED.DIR 110813 . 111256)) (111303 140250 (\BACKFILEPTR 111313 . 111501) ( +\BACKPEEKBIN 111503 . 111864) (\BACKBIN 111866 . 112217) (BIN 112219 . 112436) (\BIN 112438 . 112715) +(\BINS 112717 . 113003) (BOUT 113005 . 113367) (\BOUT 113369 . 113684) (\BOUTS 113686 . 113997) ( +COPYBYTES 113999 . 117331) (COPYCHARS 117333 . 121131) (COPYFILE 121133 . 122493) (\COPYOPENFILE +122495 . 125694) (\INFER.FILE.TYPE 125696 . 126650) (EOFP 126652 . 126949) (FORCEOUTPUT 126951 . +127198) (\FLUSH.OPEN.STREAMS 127200 . 127556) (CHARSET 127558 . 128917) (ACCESS-CHARSET 128919 . +129556) (GETEOFPTR 129558 . 129808) (GETFILEINFO 129810 . 133003) (\TYPE.FROM.FILETYPE 133005 . 133475 +) (\FILETYPE.FROM.TYPE 133477 . 133656) (GETFILEPTR 133658 . 133910) (SETFILEINFO 133912 . 138149) ( +SETFILEPTR 138151 . 139870) (BOUT16 139872 . 140057) (BIN16 140059 . 140248)) (140353 147533 ( +\GENERIC.BINS 140363 . 140643) (\GENERIC.BOUTS 140645 . 140910) (\GENERIC.RENAMEFILE 140912 . 143160) +(\GENERIC.OPENP 143162 . 144477) (\GENERIC.READP 144479 . 145631) (\GENERIC.CHARSET 145633 . 147531)) +(147534 147873 (\MAP-OPEN-STREAMS 147544 . 147871)) (149728 151808 (\EOF.ACTION 149738 . 149989) ( +\EOSERROR 149991 . 150184) (\GETEOFPTR 150186 . 150368) (\INCFILEPTR 150370 . 150720) (\PEEKBIN 150722 + . 150913) (\SETCLOSEDFILELENGTH 150915 . 151249) (\SETEOFPTR 151251 . 151439) (\SETFILEPTR 151441 . +151806)) (151809 152351 (\FIXPOUT 151819 . 152119) (\FIXPIN 152121 . 152349)) (152352 152918 (\BOUTEOL + 152362 . 152916)) (155814 165678 (\BUFFERED.BIN 155824 . 156676) (\BUFFERED.PEEKBIN 156678 . 157460) +(\BUFFERED.BOUT 157462 . 158322) (\BUFFERED.BINS 158324 . 162009) (\BUFFERED.BOUTS 162011 . 163812) ( +\BUFFERED.COPYBYTES 163814 . 165676))))) STOP diff --git a/sources/FILEIO.LCOM b/sources/FILEIO.LCOM index d120ea24..e53409e6 100644 Binary files a/sources/FILEIO.LCOM and b/sources/FILEIO.LCOM differ diff --git a/sources/FILESETS b/sources/FILESETS index 15ac01f1..2feef07f 100644 --- a/sources/FILESETS +++ b/sources/FILESETS @@ -1,12 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "23-Feb-2026 10:32:36" {WMEDLEY}FILESETS.;32 6226 +(FILECREATED "26-Apr-2026 11:53:54" {FOO}FILESETS.;37 6268 :EDIT-BY rmk - :CHANGES-TO (VARS 0LISPSET) + :CHANGES-TO (VARS 1LISPSET 0LISPSET) - :PREVIOUS-DATE "23-Feb-2026 09:36:51" {WMEDLEY}FILESETS.;31) + :PREVIOUS-DATE "16-Apr-2026 09:01:52" {WMEDLEY}FILESETS.;34) (PRETTYCOMPRINT FILESETSCOMS) @@ -50,15 +50,16 @@ (RPAQQ 0LISPSET (PACKAGE-CONVERSION-TABLE LLFAULT LLSUBRS LLBFS LLNEW FILEIO LLARRAYELT EXTERNALFORMAT IOCHAR UNICODE-FORMATS IMAGEIO LLBASIC LLGC LLINTERP LLMVS - DEFSTRUCT-RUN-TIME SETF-RUNTIME CMLSEQBASICS LLARITH LLFLOAT LLBIGNUM LLREAD + DEFSTRUCT-RUN-TIME SETF-RUNTIME CMLSEQBASICS LLARITH LLFLOAT LLREAD LLBIGNUM MCCS LLCHAR LLSTK LLDATATYPE LLKEY LLTIMER)) (RPAQQ 1LISPSET (ASTACK DTDECLARE ATBL LLCODE ACODE COREIO AOFD ADIR PMAP VANILLADISK ATERM APRINT ABASIC AERROR AINTERRUPT MISC BOOTSTRAP CMLMACROS CMLEVAL CMLPROGV CMLSPECIALFORMS LLRESTART LLERROR LLSYMBOL LLPACKAGE PACKAGE-STARTUP CONDITION-PACKAGE XCL-PACKAGE PROC CMLARRAY - DSK UFS UFSCALLC PASSWORDS FONT MEDLEYFONTFORMAT APUTDQ COMPATIBILITY DMISC CMLMACROS - CMLLIST CMLCHARACTER CMLREADTABLE MAIKOLOADUPFNS MAIKOBITBLT MAIKOINIT LLDISPLAY)) + DSK UFS UFSCALLC PASSWORDS PSEUDOHOSTS MEDLEYDIR FONT MEDLEYFONTFORMAT MCCSFONTS APUTDQ + COMPATIBILITY DMISC CMLMACROS CMLLIST CMLCHARACTER CMLREADTABLE MAIKOLOADUPFNS + MAIKOBITBLT MAIKOINIT LLDISPLAY)) (RPAQQ 2LISPSET (MACHINEINDEPENDENT)) diff --git a/sources/FONT b/sources/FONT index 1a92ec84..89c7010c 100644 --- a/sources/FONT +++ b/sources/FONT @@ -1,57 +1,58 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8) -(FILECREATED "26-Feb-2026 17:01:47" {WMEDLEY}FONT.;677 278005 +(FILECREATED " 5-May-2026 09:56:41" {MEDLEY}FONT.;797 260815 :EDIT-BY rmk - :CHANGES-TO (FNS MOVEFONTCHARS) + :CHANGES-TO (FNS \CREATEDISPLAYFONT FONTSPEC.TO.FONTDESCRIPTOR) - :PREVIOUS-DATE "20-Feb-2026 12:54:44" {WMEDLEY}FONT.;675) + :PREVIOUS-DATE " 4-May-2026 12:39:02" {MEDLEY}FONT.;796) (PRETTYCOMPRINT FONTCOMS) (RPAQQ FONTCOMS [ - (* ;; "font functions ") + (* ;; "Font functions ") (FNS CHARWIDTH CHARWIDTHY STRINGWIDTH \CHARWIDTH.DISPLAY \STRINGWIDTH.DISPLAY \STRINGWIDTH.GENERIC) (COMS (FNS DEFAULTFONT FONTCLASS FONTCLASSUNPARSE FONTCLASSCOMPONENT SETFONTCLASSCOMPONENT GETFONTCLASSCOMPONENT) (MACROS \GETFONTCLASSCOMPONENT \SETFONTCLASSCOMPONENT)) - (VARS NSFONTFAMILIES ALTOFONTFAMILIES) - (INITVARS MCCSFONTFAMILIES) (COMS (* ;; "Creation: ") (FNS FONTCREATE FONTCREATE1 FONTCREATE.SLUGFD \FONT.CHECKARGS1 \FONTCREATE1.NOFN - FONTFILEP \READCHARSET) + FONTFILEP \READCHARSET FONTCHARSETS) (FNS \FONT.CHECKARGS \CHARSET.CHECK) (FNS COERCEFONTSPEC COERCEFONTSPEC.TARGETFACE) (DECLARE%: EVAL@COMPILE DONTCOPY (MACROS COERCEFONTSPEC.MATCH COERCEFONTSPEC.TARGET)) (MACROS SPREADFONTSPEC) - (FNS MAKEFONTSPEC) + (FNS MAKEFONTSPEC FONTSPEC.TO.FONTDESCRIPTOR) (FNS COMPLETE.FONT COMPLETEFONTP COMPLETE.CHARSET PRUNESLUGCSINFOS MONOSPACEFONTP)) (COMS (* ;; "Property extraction:") (FNS FONTASCENT FONTDESCENT FONTHEIGHT FONTPROP \AVGCHARWIDTH) (EXPORT (OPTIMIZERS FONTPROP)) - (FNS FONTDEVICEPROP)) + (FNS FONTDEVICEPROP) + (PROP ARGNAMES FONTDEVICEPROP)) (COMS (* ; "Moving character information") (FNS EDITCHAR) (* ; "Should this be on EDITFONT ?") (FNS GETCHARBITMAP PUTCHARBITMAP \GETCHARBITMAP.CSINFO \PUTCHARBITMAP.CSINFO) (FNS MOVECHARBITMAP MOVEFONTCHARS \MOVEFONTCHAR \MOVEFONTCHARS.SOURCEDATA \MAKESLUGCHAR - SLUGCHARP.DISPLAY) + SLUGCHARP) + [DECLARE%: DONTCOPY (EXPORT (CONSTANTS (SLUGCHARINDEX (ADD1 \MAXTHINCHAR] + (* ; "At the end of each csinfo") (MACROS UPDATEINFOELEMENT)) (FNS FONTFILES \FINDFONTFILE \FONTFILENAMES \FONTFILENAME FONTSPECFROMFILENAME) (FNS FONTCOPY FONTP FONTUNPARSE SETFONTDESCRIPTOR \STREAMCHARWIDTH \COERCECHARSET \BUILDSLUGCSINFO \FONTSYMBOL \DEVICESYMBOL \FONTFACE \FONTFACE.COLOR SETFONTCHARENCODING ) (FNS FONTSAVAILABLE FONTEXISTS? \SEARCHFONTFILES FLUSHFONTCACHE FINDFONTFILES SORTFONTSPECS) - (FNS MATCHFONTFACE MAKEFONTFACE FONTFACETOATOM) + (FNS MATCHFONTFACE MAKEFONTFACE FONTFACETOATOM FONTFACE.STARS) (INITVARS \FONTSINCORE \FONTEXISTS?-CACHE \FONTSAVAILABLEFILECACHE \DEFAULTDEVICEFONTS) (* ;; "The INITVARS value of MEDLEY-INIT-VARS in MEDLEY dalso includes these entries. That's because FONT is in the INIT, so these entries would be lost when MEDLEY-INIT-VARS is reinitialized when the Lisp loadup starts") @@ -62,15 +63,14 @@ (INITVARS \UNITWIDTHSVECTOR) (FNS \UNITWIDTHSVECTOR) (DECLARE%: DONTEVAL@LOAD DOCOPY (P (\UNITWIDTHSVECTOR] - (DECLARE%: DONTCOPY [EXPORT (RECORDS FONTCLASS FONTDESCRIPTOR FONTFACE CHARSETINFO FONTSPEC) + (DECLARE%: DONTCOPY (EXPORT (RECORDS FONTCLASS FONTDESCRIPTOR FONTFACE CHARSETINFO FONTSPEC) (MACROS FONTASCENT FONTDESCENT FONTHEIGHT \FGETOFFSET \FSETOFFSET \FGETWIDTH \FSETWIDTH \FGETCHARWIDTH \FSETCHARWIDTH - \FGETIMAGEWIDTH \FSETIMAGEWIDTH) + \FGETIMAGEWIDTH \FSETIMAGEWIDTH MAXCHARSET) (MACROS \GETCHARSETINFO \SETCHARSETINFO \INSURECHARSETINFO - \CREATECSINFOELEMENT \CREATEFONTCHARSETVECTOR CHARSETPROP) - (PROP ARGNAMES CHARSETPROP) - (CONSTANTS (SLUGCHARINDEX (ADD1 \MAXTHINCHAR)) - (SLUGCHARSET (ADD1 \MAXCHARSET] + \CREATECSINFOELEMENT \CREATEFONTCHARSETVECTOR CHARSETPROP + SLUGCSINFO) + (PROP ARGNAMES CHARSETPROP)) (MACROS INDIRECTCHARSETP)) (FNS FONTDESCRIPTOR.DEFPRINT FONTCLASS.DEFPRINT) (INITRECORDS FONTCLASS FONTDESCRIPTOR CHARSETINFO) @@ -80,8 +80,6 @@ (DECLARE%: DONTCOPY (MACROS FIRSTCHARSETCODE LASTCHARSETCODE)) (FNS \FONTRESETCHARWIDTHS) (MACROS \FGETCHARIMAGEWIDTH) - (LOCALVARS . T) - (PROP FILETYPE FONT) (* ;; "") @@ -90,115 +88,33 @@ (COMS (* ;  "Functions for DISPLAY IMAGESTREAMTYPES ") - (FNS \CREATEDISPLAYFONT \CREATECHARSET.DISPLAY \FONTEXISTS?.DISPLAY)) - (FNS STRIKEFONT.FILEP STRIKEFONT.GETCHARSET WRITESTRIKEFONTFILE STRIKECSINFO) + (FNS \CREATEDISPLAYFONT \CREATECHARSET.DISPLAY \FONTEXISTS?.DISPLAY) + (FNS FAKEFACE.CHARSET MAKEBOLD.CHAR MAKEITALIC.CHAR)) (COMS (* ; "Bitmap faking") - (FNS MAKEBOLD.CHARSET MAKEBOLD.CHAR MAKEITALIC.CHARSET MAKEITALIC.CHAR \SFMAKEBOLD - \SFMAKEITALIC) - (FNS \SFMAKEROTATEDFONT \SFROTATECSINFO \SFROTATEFONTCHARACTERS \SFROTATECSINFOOFFSETS) + (FNS \SFROTATECSINFO \SFROTATEFONTCHARACTERS \SFROTATECSINFOOFFSETS) (FNS \SFMAKECOLOR)) - (EXPORT (GLOBALVARS DISPLAYFONTDIRECTORIES DISPLAYFONTEXTENSIONS DISPLAYCHARCOERCIONS - DISPLAYFONTCOERCIONS DISPLAYCHARSETFNS)) - (DECLARE%: DONTEVAL@LOAD DOCOPY (INITVARS (DISPLAYFONTDIRECTORIES NIL)) - (ADDVARS (DISPLAYCHARSETFNS (STRIKE STRIKEFONT.FILEP STRIKEFONT.GETCHARSET))) + [DECLARE%: DONTEVAL@LOAD DOCOPY (INITVARS (DISPLAYFONTDIRECTORIES (LIST + "{MEDLEY}/fonts/medleydisplayfonts" + ))) (* ; "The loadup might have fewer") - (ADDVARS (DISPLAYFONTEXTENSIONS MEDLEYDISPLAYFONT DISPLAYFONT))) - (INITVARS [DISPLAYFONTCOERCIONS '(((HELVETICA (<= * 2)) - (HELVETICA 4)) - ((MODERN (<= 15 * 16)) - (* 14)) - ((MODERN (<= 17 * 21)) - (* 18)) - ((MODERN (<= 22 * 28)) - (* 24)) - ((MODERN (<= 29 * 33)) - (* 30)) - ((MODERN (<= 34 * 40)) - (* 36)) - ((MODERN (<= 41 * 65)) - (* 48)) - ((MODERN (<= 66 *)) - (* 72)) - ((PALATINO 9) - (PALATINO 12)) - ((PALATINO (<= * 8)) - (PALATINO 10)) - ((TITAN (<= * 9) - BOLD) - (MODERN 10)) - ((TITAN (<= * 9) - ITALIC) - (MODERN 10)) - ((TITAN (<= * 9)) - (TITAN 10)) - (LPT AMTEX] - [DISPLAYCHARCOERCIONS '((GACHA TERMINAL) - (MODERN CLASSIC) - (TIMESROMAN CLASSIC) - (HELVETICA MODERN) - (TERMINAL MODERN) - (HIPPO CLASSIC) - (CYRILLIC CLASSIC) - (MATH CLASSIC) - (SIGMA MODERN) - (SYMBOL MODERN) - (TITAN CLASSIC) - (PALATINO CLASSIC) - (OPTIMA MODERN) - (BOLDPS CLASSIC) - (PCTERMINAL CLASSIC) - (TITANLEGAL CLASSIC] - (\DEFAULTCHARSET 0)) - - (* ;; "") - - - (* ;; "Defunct coercions? Mapping for DOS filenames, Adobe equivalences") - - [COMS (INITVARS [ADOBEDISPLAYFONTCOERCIONS '(((HELVETICABLACK 16) - (HELVETICABLACK 18)) - ((SYMBOL) - (ADOBESYMBOL)) - ((SYMBOL 11) - (ADOBESYMBOL 10)) - ((AVANTGARDE-DEMI) - (AVANTGARDE)) - ((AVANTGARDE-BOOK) - (AVANTGARDE)) - ((NEWCENTURYSCHLBK) - (CENTURYSCHOOLBOOK)) - ((BOOKMAN-LIGHT) - (BOOKMAN)) - ((BOOKMAN-DEMI) - (BOOKMAN)) - ((HELVETICA-NARROW) - (HELVETICANARROW)) - ((HELVETICA 24) - (ADOBEHELVETICA 24] - (*DISPLAY-FONT-NAME-MAP* '((TIMESROMAN . TR) - (HELVETICA . HV) - (TIMESROMAND . TD) - (HELVETICAD . HD) - (MODERN . MD) - (CLASSIC . CL) - (GACHA . GC) - (TITAN . TI) - (LETTERGOTHIC . LG) - (BOLDPS . BP) - (TERMINAL . TM) - (CLASSICTHIN . CT) - (HIPPO . HP) - (LOGO . LG) - (MATH . MA) - (OLDENGLISH . OE) - (SYMBOL . SY] + (ADDVARS (DISPLAYFONTEXTENSIONS MEDLEYDISPLAYFONT)) + (INITVARS (DISPLAYFACECOERCIONS '(((* * (BOLD * *)) + (* * (MEDIUM * *))) + ((* * (* ITALIC *)) + (* * (* REGULAR *))) + ((* * (* * COMPRESSED)) + (* * (* * REGULAR] + (INITVARS (\DEFAULTCHARSET 0)) + (LOCALVARS . T) + (PROP FILETYPE FONT) (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDVARS (NLAMA) (NLAML) - (LAMA FONTCOPY]) + (LAMA FONTCOPY + FONTDEVICEPROP]) -(* ;; "font functions ") +(* ;; "Font functions ") (DEFINEQ @@ -484,13 +400,6 @@ DEVICE NEWFONT)))) ) -(RPAQQ NSFONTFAMILIES (CLASSIC MODERN TERMINAL OPTIMA TITAN BOLDPS PCTERMINAL)) - -(RPAQQ ALTOFONTFAMILIES (TIMESROMAN TIMESROMAND HELVETICA HELVETICAD CLARITY BRAVOX TONTO CREAM - OLDENGLISH)) - -(RPAQ? MCCSFONTFAMILIES NIL) - (* ;; "Creation: ") @@ -544,7 +453,8 @@ (GO RETRY]) (FONTCREATE1 - [LAMBDA (FONTSPEC CHARSET) (* ; "Edited 25-Sep-2025 18:41 by rmk") + [LAMBDA (FONTSPEC CHARSET) (* ; "Edited 17-Mar-2026 23:41 by rmk") + (* ; "Edited 25-Sep-2025 18:41 by rmk") (* ; "Edited 30-Aug-2025 23:13 by rmk") (* ; "Edited 28-Aug-2025 14:32 by rmk") (* ; "Edited 26-Aug-2025 23:45 by rmk") @@ -567,8 +477,7 @@ (CL:UNLESS CHARSET (SETQ CHARSET \DEFAULTCHARSET)) (LET (FONT) (CL:WHEN (if (SETQ FONT (FETCHMULTI \FONTSINCORE FONTSPEC T)) - elseif (AND (FONTEXISTS? FONTSPEC) - (SETQ FONT (\CREATEFONT FONTSPEC))) + elseif (SETQ FONT (\CREATEFONT FONTSPEC)) then (* ;; "Storing stops internal charset recursions") @@ -581,30 +490,37 @@ FONT)]) (FONTCREATE.SLUGFD - [LAMBDA (FAMILY SIZE FACE ROTATION DEVICE CHARSET) (* ; "Edited 31-Aug-2025 14:36 by rmk") + [LAMBDA (FONTSPEC SOURCEFONT) (* ; "Edited 21-Mar-2026 09:20 by rmk") + (* ; "Edited 19-Mar-2026 20:47 by rmk") + (* ; "Edited 31-Aug-2025 14:36 by rmk") (* ; "Edited 14-Jun-2025 23:25 by rmk") (* ; "Edited 13-Jun-2025 09:44 by rmk") (* ; "Edited 11-Jun-2025 10:59 by rmk") - (* ;; "For the REMEMBER case, dummy font descriptor completely fillled with a slug charsetinfo") + (* ;; + "Makes an empty fontdescriptor for FONTSPEC, with parameters taken from SOURCEFONT if given") - (LET* ([FONTDESC (create FONTDESCRIPTOR - FONTDEVICE ← DEVICE - FONTFAMILY ← FAMILY - FONTSIZE ← SIZE - FONTFACE ← FACE - \SFAscent ← SIZE - \SFDescent ← 0 - \SFHeight ← SIZE - ROTATION ← ROTATION - FONTDEVICESPEC ← (LIST FAMILY SIZE FACE ROTATION DEVICE) - FONTCHARENCODING ← 'MCCS - FONTAVGCHARWIDTH ← (FIXR (FTIMES SIZE 0.75] - (SLUGCSINFO (\BUILDSLUGCSINFO FONTDESC))) - (if CHARSET - then (\SETCHARSETINFO FONTDESC CHARSET SLUGCSINFO) - else (for CS from 0 to (ADD1 \MAXCHARSET) do (\SETCHARSETINFO FONTDESC CS SLUGCSINFO))) - FONTDESC]) + (LET ((FONTDESC (if SOURCEFONT + then (create FONTDESCRIPTOR using SOURCEFONT FONTFAMILY ← (fetch (FONTSPEC + FSFAMILY) + of FONTSPEC) + FONTSIZE ← (fetch (FONTSPEC FSSIZE) + of FONTSPEC) + FONTFACE ← (fetch (FONTSPEC FSFACE) + of FONTSPEC) + ROTATION ← (fetch (FONTSPEC FSROTATION) + of FONTSPEC) + FONTDEVICE ← (fetch (FONTSPEC FSDEVICE) + of FONTSPEC) + FONTDEVICESPEC ← FONTSPEC FONTCHARSETVECTOR + ← NIL) + else (FONTSPEC.TO.FONTDESCRIPTOR FONTSPEC))) + SLUGCSINFO) + (replace (FONTDESCRIPTOR FONTCHARSETVECTOR) of FONTDESC with (\CREATEFONTCHARSETVECTOR + FONTDESC)) + (SETQ SLUGCSINFO (\BUILDSLUGCSINFO)) + (for CS from 0 to (ADD1 (MAXCHARSET FONTDESC)) do (\SETCHARSETINFO FONTDESC CS SLUGCSINFO)) + FONTDESC]) (\FONT.CHECKARGS1 [LAMBDA (SPEC STREAM NOERRORFLG) (* ; "Edited 19-Feb-2026 00:03 by rmk") @@ -705,7 +621,15 @@ (CLOSEF? STRM))))]) (\READCHARSET - [LAMBDA (FONTSPEC CHARSET FONT) (* ; "Edited 14-Feb-2026 09:47 by rmk") + [LAMBDA (FONT CHARSET CHARSETFNS) (* ; "Edited 18-Apr-2026 20:44 by rmk") + (* ; "Edited 16-Apr-2026 22:38 by rmk") + (* ; "Edited 12-Apr-2026 12:59 by rmk") + (* ; "Edited 2-Apr-2026 15:52 by rmk") + (* ; "Edited 28-Mar-2026 07:51 by rmk") + (* ; "Edited 17-Mar-2026 08:57 by rmk") + (* ; "Edited 12-Mar-2026 13:39 by rmk") + (* ; "Edited 8-Mar-2026 21:41 by rmk") + (* ; "Edited 14-Feb-2026 09:47 by rmk") (* ; "Edited 6-Feb-2026 00:03 by rmk") (* ; "Edited 11-Nov-2025 14:30 by rmk") (* ; "Edited 2-Sep-2025 23:57 by rmk") @@ -720,14 +644,14 @@ (* ;; "This finds the first file in the directories/extensions order that contains information about charset, determines its format, and reads it in. The assumption is that the first such existing file is the one we want. ") - (CL:WHEN (AND FONTSPEC (EQ 0 (fetch (FONTSPEC FSROTATION) of FONTSPEC))) + (CL:WHEN (EQ 0 (FONTPROP FONT 'ROTATION)) (RESETLST - (for FILE STRM CSINFO in (FONTFILES FONTSPEC CHARSET) + (for FILE STRM CSINFO in (FONTFILES FONT CHARSET) do (* ;; "We know that FILE exists and is the best source of information about charset--maybe none. We assume FILE is one of the valid formats, we open it separately for each format-type, and ensure it is closed on exit. We can't used CL:WITHOPEN-FILE because that doesn't exist in the loadup when the first font is created.") - (for FNS FAMILY in [OR (FONTDEVICEPROP FONTSPEC 'CHARSETFNS) - '((MEDLEYFONT MEDLEYFONT.FILEP MEDLEYFONT.GETCHARSET] + (for FNS in [OR CHARSETFNS (FONTDEVICEPROP FONT 'CHARSETFNS) + '((MEDLEYFONT MEDLEYFONT.FILEP MEDLEYFONT.GETCHARSET] do [RESETSAVE (SETQ STRM (OPENSTREAM FILE 'INPUT)) `(PROGN (CLOSEF? OLDVALUE] (CL:WHEN (CAR (NLSETQ (APPLY* (CADR FNS) @@ -742,22 +666,16 @@ (* ;; "The file didn't know its own encoding") - (SETQ FAMILY (fetch (FONTSPEC FSFAMILY) of FONTSPEC)) (CHARSETPROP CSINFO 'CSCHARENCODING - (if (OR (NEQ CHARSET 0) - (MEMB FAMILY MCCSFONTFAMILIES)) - then 'MCCS - elseif (MEMB FAMILY NSFONTFAMILIES) - then 'XCCS$ - elseif (MEMB FAMILY ALTOFONTFAMILIES) - then 'ALTOTEXT - else FAMILY))) - - (* ;; "Remember the file that this basic charset information came from, before any character coercions, for informational purposes. Path and version won't be valid if sysout moves, or if PSEUDOFILENAME's aren't aligned. Don't want files to be new atoms, for loadup.") - - (CHARSETPROP CSINFO 'FILE (MKSTRING (PSEUDOFILENAME FILE))) + (APPLY* (OR (FONTDEVICEPROP FONT 'ENCODINGFN) + (FUNCTION NILL)) + FONTSPEC))) (CL:UNLESS (CHARSETPROP CSINFO 'SOURCE) - (CHARSETPROP CSINFO 'SOURCE (create FONTSPEC using FONTSPEC))) + [CHARSETPROP CSINFO 'SOURCE (create FONTSPEC + using (CL:IF (type? FONTSPEC FONT) + FONT + (FONTPROP FONT + 'DEVICESPEC))]) (replace (CHARSETINFO CHARSETNO) of CSINFO with CHARSET) (RETURN))) @@ -765,6 +683,14 @@ (CLOSEF? STRM)) (CL:WHEN CSINFO (RETURN CSINFO)))))]) + +(FONTCHARSETS + [LAMBDA (FONT) (* ; "Edited 26-Mar-2026 12:46 by rmk") + + (* ;; "Returns a list of the charset numbers for nonempty instantiated charsets.") + + (for CSNO CSINFO from 0 to (MAXCHARSET FONT) when (SETQ CSINFO (\GETCHARSETINFO FONT CSNO)) + unless (fetch (CHARSETINFO CSSLUGP) of CSINFO) collect CSNO]) ) (DEFINEQ @@ -886,7 +812,9 @@ (DEFINEQ (COERCEFONTSPEC - [LAMBDA (FONTSPEC COERCIONS ALL) (* ; "Edited 22-Dec-2025 22:56 by rmk") + [LAMBDA (FONTSPEC COERCIONS ALL MISSINGOK) (* ; "Edited 2-Apr-2026 00:08 by rmk") + (* ; "Edited 11-Mar-2026 10:18 by rmk") + (* ; "Edited 22-Dec-2025 22:56 by rmk") (* ; "Edited 18-Dec-2025 16:06 by rmk") (* ; "Edited 2-Dec-2025 17:24 by rmk") (* ; "Edited 25-Nov-2025 20:37 by rmk") @@ -947,20 +875,12 @@ (EQUAL FACE TFACE) (EQ ROTATION TROTATION] (MAKEFONTSPEC TFAMILY TSIZE TFACE TROTATION DEVICE] - unless (MEMBER COERCED RESULT) - when (SETQ COERCED (if (FONTEXISTS? COERCED NIL NIL NIL NIL T) - then (CONS COERCED) - elseif ALL - then (COERCEFONTSPEC COERCED COERCIONS T) - elseif (SETQ COERCED (COERCEFONTSPEC COERCED COERCIONS)) - then (CONS COERCED))) do + unless (MEMBER COERCED RESULT) when (OR MISSINGOK (FONTEXISTS? COERCED T)) + do + (* ;; "If COERCED exists, it's a singleton whether or not ALL. We always inflate it to a list, to simplify code") - (* ;; "If COERCED exists, it's a singleton whether or not ALL. We always inflate it to a list, to simplify code") - - (for C in COERCED - unless (MEMBER C RESULT) - do (push RESULT C)) - finally (RETURN (DREVERSE RESULT]) + (for C in (CONS COERCED (CL:IF ALL (COERCEFONTSPEC COERCED COERCIONS ALL MISSINGOK))) + unless (MEMBER C RESULT) do (push RESULT C)) finally (RETURN (DREVERSE RESULT]) (COERCEFONTSPEC.TARGETFACE [LAMBDA (TFACE FFACE) (* ; "Edited 22-Dec-2025 22:54 by rmk") @@ -1021,7 +941,9 @@ (DEFINEQ (MAKEFONTSPEC - [LAMBDA (FAMILY SIZE FACE ROTATION DEVICE BASE) (* ; "Edited 7-Nov-2025 07:52 by rmk") + [LAMBDA (FAMILY SIZE FACE ROTATION DEVICE BASE) (* ; "Edited 4-May-2026 12:38 by rmk") + (* ; "Edited 15-Apr-2026 00:25 by rmk") + (* ; "Edited 7-Nov-2025 07:52 by rmk") (* ; "Edited 28-Aug-2025 14:32 by rmk") (* ; "Edited 17-Aug-2025 20:44 by rmk") @@ -1029,58 +951,89 @@ (* ;; "BASE (fontspec or font) provides defaults for NIL arguments, essentialy models a (create using BASE...)") - (CL:WHEN (FONTP BASE) - (SETQ BASE (FONTPROP BASE 'SPEC))) + (CL:WHEN (LISTP FAMILY) + (SPREADFONTSPEC FAMILY)) + (CL:WHEN FACE + (SETQ FACE (\FONTFACE FACE))) (create FONTSPEC FSFAMILY ← (OR FAMILY (fetch (FONTSPEC FSFAMILY) of BASE)) FSSIZE ← (OR SIZE (fetch (FONTSPEC FSSIZE) of BASE)) - FSFACE ← (OR FACE (fetch (FONTSPEC FSFACE) of BASE)) + FSFACE ← (OR (AND FACE (\FONTFACE FACE)) + (fetch (FONTSPEC FSFACE) of BASE)) FSROTATION ← (OR ROTATION (fetch (FONTSPEC FSROTATION) of BASE)) FSDEVICE ← (OR DEVICE (fetch (FONTSPEC FSDEVICE) of BASE]) + +(FONTSPEC.TO.FONTDESCRIPTOR + [LAMBDA (FONTSPEC MAXCHARSET) (* ; "Edited 5-May-2026 09:55 by rmk") + (* ; "Edited 29-Mar-2026 10:29 by rmk") + (* ; "Edited 28-Mar-2026 09:29 by rmk") + (* ; "Edited 20-Mar-2026 23:57 by rmk") + (* ; "Edited 19-Mar-2026 10:24 by rmk") + (* ; "Edited 12-Mar-2026 13:29 by rmk") + (if (NULL MAXCHARSET) + then (SETQ MAXCHARSET 255) + elseif (<= 0 MAXCHARSET \MAXCHARSET) + else (\ILLEGAL.ARG MAXCHARSET)) + (LET ((FONT (create FONTDESCRIPTOR + FONTFAMILY ← (fetch (FONTSPEC FSFAMILY) of FONTSPEC) + FONTSIZE ← (fetch (FONTSPEC FSSIZE) of FONTSPEC) + FONTFACE ← (COPY (fetch (FONTSPEC FSFACE) of FONTSPEC)) + ROTATION ← (fetch (FONTSPEC FSROTATION) of FONTSPEC) + FONTDEVICE ← (fetch (FONTSPEC FSDEVICE) of FONTSPEC) + \SFAscent ← 0 + \SFDescent ← 0 + \SFHeight ← 0 + FONTDEVICESPEC ← (COPY (create FONTSPEC using FONTSPEC)) + MAXCHARSET ← MAXCHARSET + FONTCHARSETVECTOR ← NIL))) + (replace (FONTDESCRIPTOR FONTCHARSETVECTOR) of FONT with (\CREATEFONTCHARSETVECTOR FONT)) + FONT]) ) (DEFINEQ (COMPLETE.FONT - [LAMBDA (FONTSPEC EVENIFCOMPLETE) (* ; "Edited 7-Oct-2025 17:01 by rmk") - (* ; "Edited 2-Sep-2025 22:59 by rmk") - (* ; "Edited 29-Aug-2025 23:51 by rmk") - (* ; "Edited 27-Aug-2025 10:51 by rmk") + [LAMBDA (FONT EVENIFCOMPLETE) (* ; "Edited 5-Apr-2026 01:01 by rmk") + (* ; "Edited 24-Mar-2026 22:35 by rmk") + (* ; "Edited 22-Mar-2026 22:32 by rmk") + (* ; "Edited 21-Mar-2026 09:20 by rmk") + (* ; "Edited 19-Mar-2026 09:30 by rmk") + (* ; "Edited 16-Mar-2026 09:30 by rmk") + (* ; "Edited 7-Oct-2025 17:01 by rmk") (* ; "Edited 21-Jun-2025 11:37 by rmk") - (* ; "Edited 19-Jun-2025 14:42 by rmk") - (* ; "Edited 12-Jun-2025 22:06 by rmk") - (* ; "Edited 8-Jun-2025 15:57 by rmk") - (* ; "Edited 7-Jun-2025 15:18 by rmk") (* ; "Edited 23-May-2025 22:57 by rmk") - (* ; "Edited 20-May-2025 19:57 by rmk") (* ; "Edited 16-May-2025 21:26 by rmk") - (* ;; "This returns a FONTDESCRIPTOR for FONTSPEC that is complete with respect to all known character sources. A caller that wants to insure that only files sources are considered should reset \FONTSINCORE and \FONTEXISTS?-CACHE. If reset, we still get the benefit of previous completions/coercions in this run if medleyfont files have been created for them.") + (* ;; "This completes FONT with respect to all currently known character sources. A caller that wants to insure that only file sources are considered should reset \FONTSINCORE and \FONTEXISTS?-CACHE. ") - (LET ((FONT (FONTCREATE FONTSPEC))) - (SETQ FONTSPEC (FONTPROP FONT 'SPEC)) (* ; "Normalized version") - (CL:WHEN (OR EVENIFCOMPLETE (NOT (fetch (FONTDESCRIPTOR FONTCOMPLETEP) of FONT))) - (for CHARSET CSINFO from 0 to \MAXCHARSET - do (if (SETQ CSINFO (\GETCHARSETINFO FONT CHARSET)) - then (CL:WHEN EVENIFCOMPLETE - (replace (CHARSETINFO CSCOMPLETEP) of CSINFO with NIL)) - else (SETQ CSINFO (\CREATECHARSET CHARSET FONT))) - (COMPLETE.CHARSET CSINFO FONTSPEC CHARSET FONT)) - (replace (FONTDESCRIPTOR FONTCOMPLETEP) of FONT with T)) - (PRUNESLUGCSINFOS FONT) - FONT]) + (* ;; "This assumes that all of the fonts in the coercion chain are already complete. ") + + (LET (CHANGED) + (CL:WHEN (AND (OR EVENIFCOMPLETE (NOT (fetch (FONTDESCRIPTOR FONTCOMPLETEP) of FONT))) + (COERCEFONTSPEC (FONTPROP FONT 'SPEC) + 'CHARCOERCIONS NIL T)) + (for CHARSET from 0 to (MAXCHARSET FONT) when (COMPLETE.CHARSET FONT CHARSET) + do (SETQ CHANGED T))) + (CL:UNLESS (fetch (FONTDESCRIPTOR FONTCOMPLETEP) of FONT) + (replace (FONTDESCRIPTOR FONTCOMPLETEP) of FONT with T) + (SETQ CHANGED T)) + CHANGED]) (COMPLETEFONTP - [LAMBDA (FONT) (* ; "Edited 2-Sep-2025 22:59 by rmk") + [LAMBDA (FONT) (* ; "Edited 18-Mar-2026 23:10 by rmk") + (* ; "Edited 2-Sep-2025 22:59 by rmk") (* ; "Edited 24-May-2025 20:55 by rmk") (* ; "Edited 20-May-2025 14:37 by rmk") (* ;; "A font is incomplete if there is a NIL in any charset slot. Completing will install a charset everywhere, even if it is a slug charset.") (SETQ FONT (FONTCREATE FONT)) - (for CS from 0 to \MAXCHARSET always (\GETCHARSETINFO FONT CS]) + (for CS from 0 to (MAXCHARSET FONT) always (\GETCHARSETINFO FONT CS]) (COMPLETE.CHARSET - [LAMBDA (CSINFO FONTSPEC CHARSET FONT) (* ; "Edited 7-Sep-2025 11:23 by rmk") + [LAMBDA (FONT CHARSET) (* ; "Edited 5-Apr-2026 11:33 by rmk") + (* ; "Edited 15-Mar-2026 17:20 by rmk") + (* ; "Edited 6-Mar-2026 21:42 by rmk") + (* ; "Edited 7-Sep-2025 11:23 by rmk") (* ; "Edited 31-Aug-2025 14:36 by rmk") (* ; "Edited 28-Aug-2025 20:46 by rmk") (* ; "Edited 27-Aug-2025 12:37 by rmk") @@ -1093,39 +1046,62 @@ (* ; "Edited 8-Jun-2025 20:20 by rmk") (* ; "Edited 7-Jun-2025 13:52 by rmk") - (* ;; "CSINFO has some characters for this charset in FONT, but others may fill in from the FONTSPEC of later fonts in the coercion chain. We assume that CSINFO is or will be the charsetinfo for the charset/font described by FONTSPEC. For each missing code we look through all the possible coercions to find the first font with real information about that character. We copy that character up to CSINFO.") + (* ;; "Return T if anything changed.") - (\SETCHARSETINFO FONT CHARSET CSINFO) - (CL:UNLESS (fetch (CHARSETINFO CSCOMPLETEP) of CSINFO) - (for CODE SOURCEFONT from (FIRSTCHARSETCODE CHARSET) to (LASTCHARSETCODE CHARSET) - when [AND (SLUGCHARP.DISPLAY CODE FONT) - (SETQ SOURCEFONT (CAR (\COERCECHARSET FONTSPEC CHARSET CODE] - collect (LIST (LIST CODE SOURCEFONT) - CODE) finally (CL:WHEN $$VAL (* ; "The source is now here") - (MOVEFONTCHARS $$VAL FONT) - (CHARSETPROP CSINFO 'SOURCE FONTSPEC))) - (CL:WHEN (FONTDEVICEPROP FONT 'CHARCOERCIONS) (* ; + (LET ((FONTSPEC (FONTPROP FONT 'DEVICESPEC)) + (CSINFO (\GETCHARSETINFO FONT CHARSET)) + CHANGED) + (CL:UNLESS CSINFO + (SETQ CSINFO (SLUGCSINFO FONT)) + (SETQ CHANGED T)) + (CL:UNLESS (fetch (CHARSETINFO CSCOMPLETEP) of CSINFO) + [if (fetch (CHARSETINFO CSSLUGP) of CSINFO) + then + (* ;; "If CSINFO is a slug and there is a non-slug down the coercion chain, copy that in. Presumably that gets filed as an indirect.") + + [SETQ CSINFO (CADR (\COERCECHARSET FONTSPEC CHARSET NIL 'CHARCOERCIONS] + (CL:WHEN (AND CSINFO (NOT (fetch (CHARSETINFO CSSLUGP) of CSINFO))) + (\INSTALLCHARSETINFO FONT (COPYALL CSINFO) + CHARSET) + (SETQ CHANGED T)) + else + (* ;; "CSINFO in FONT has some characters for this charset, but others may fill in from later fonts in the coercion chain. We assume that CSINFO is or will be the charsetinfo for the charset/font described by FONTSPEC. For each missing code we look through all the possible coercions to find the first font with real information about that character. We copy that character up to CSINFO.") + + (for CODE SOURCEFONT from (FIRSTCHARSETCODE CHARSET) to (LASTCHARSETCODE CHARSET) + when [AND (SLUGCHARP CODE FONT) + (SETQ SOURCEFONT (CAR (\COERCECHARSET FONTSPEC CHARSET CODE] + collect (LIST CODE (LIST CODE SOURCEFONT)) + finally (CL:WHEN $$VAL + (MOVEFONTCHARS $$VAL FONT)(* ; "The source is now here") + (CHARSETPROP CSINFO 'SOURCE FONTSPEC)) + (CL:UNLESS (FONTDEVICEPROP FONT 'CHARCOERCIONS) + (* ;  "Maybe coercions are just being delayed") - (replace (CHARSETINFO CSCOMPLETEP) of CSINFO with T))) - CSINFO]) + (replace (CHARSETINFO CSCOMPLETEP) of CSINFO with T)) + (CL:WHEN $$VAL (SETQ CHANGED T]) + CHANGED]) (PRUNESLUGCSINFOS - [LAMBDA (FONT) (* ; "Edited 2-Sep-2025 22:59 by rmk") + [LAMBDA (FONT) (* ; "Edited 22-Mar-2026 18:21 by rmk") + (* ; "Edited 19-Mar-2026 09:29 by rmk") + (* ; "Edited 2-Sep-2025 22:59 by rmk") (* ; "Edited 31-Aug-2025 14:36 by rmk") (* ; "Edited 17-Aug-2025 19:44 by rmk") (* ; "Edited 9-Jun-2025 15:02 by rmk") (* ; "Edited 24-May-2025 21:11 by rmk") - (* ;; "Replaces slug csinfos in FONT with NIL") + (* ;; "Replaces slug csinfos in FONT with NIL, returns the number of non-slug charsets") (SETQ FONT (FONTCREATE FONT)) - (for CS CSINFO from 0 to \MAXCHARSET when (AND (SETQ CSINFO (\GETCHARSETINFO FONT CS)) - (fetch (CHARSETINFO CSSLUGP) of CSINFO)) - do (\SETCHARSETINFO FONT CS NIL)) - FONT]) + (for CS CSINFO CHANGED (NREAL ← 0) from 0 to (MAXCHARSET FONT) when (SETQ CSINFO (\GETCHARSETINFO + FONT CS)) + do (CL:IF (fetch (CHARSETINFO CSSLUGP) of CSINFO) + (\SETCHARSETINFO FONT CS NIL) + (add NREAL 1)) finally (RETURN NREAL]) (MONOSPACEFONTP - [LAMBDA (FONT CODES SKIPSLUGS RETURNVARIABLES) (* ; "Edited 12-Oct-2025 21:13 by rmk") + [LAMBDA (FONT CODES SKIPSLUGS RETURNVARIABLES) (* ; "Edited 15-Mar-2026 14:24 by rmk") + (* ; "Edited 12-Oct-2025 21:13 by rmk") (* ;; "Returns T if all the CODES are the same width. Skips slugs if SKIPSLUGHTS, returns the list of variable width characters if RETURNVARIABLES (instead of NIL).") @@ -1141,7 +1117,7 @@ (LIST (FIRSTCHARSETCODE CODES) (LASTCHARSETCODE CODES] (for CODE WIDTH from (CAR CODES) to (CADR CODES) - unless (OR (AND SKIPSLUGS (SLUGCHARP.DISPLAY CODE FONT)) + unless (OR (AND SKIPSLUGS (SLUGCHARP CODE FONT)) (EQ (OR WIDTH (SETQ WIDTH (CHARWIDTH CODE FONT))) (CHARWIDTH CODE FONT))) collect CODE finally (RETURN (if (NULL $$VAL) @@ -1175,7 +1151,10 @@ (fetch (FONTDESCRIPTOR \SFHeight) of (FONTCREATE FONTSPEC]) (FONTPROP - [LAMBDA (FONT PROP) (* ; "Edited 25-Jan-2026 20:08 by rmk") + [LAMBDA (FONT PROP) (* ; "Edited 12-Apr-2026 12:52 by rmk") + (* ; "Edited 28-Mar-2026 07:51 by rmk") + (* ; "Edited 18-Mar-2026 23:11 by rmk") + (* ; "Edited 25-Jan-2026 20:08 by rmk") (* ; "Edited 2-Dec-2025 16:01 by rmk") (* ; "Edited 2-Sep-2025 22:21 by rmk") (* ; "Edited 12-Aug-2025 21:10 by rmk") @@ -1204,6 +1183,8 @@ (BACKCOLOR (ffetch BACKCOLOR of (ffetch FONTFACE of FONT))) (ROTATION (ffetch ROTATION of FONT)) (DEVICE (ffetch FONTDEVICE of FONT)) + (FILENAME (CL:WHEN (ffetch FONTFILENAME of FONT) + (INFILEP (ffetch FONTFILENAME of FONT)))) (CHARENCODING [OR (ffetch FONTCHARENCODING of FONT) (freplace FONTCHARENCODING of FONT with (if (MEMB (fetch (FONTDESCRIPTOR FONTFAMILY) of FONT) @@ -1249,10 +1230,22 @@ (fetch (FONTSPEC FSFACE) of (ffetch FONTDEVICESPEC of FONT)) (ffetch FONTFACE of FONT)))) (SCALE (ffetch FONTSCALE of FONT)) - (CHARSETS (for CS CSINFO (CSVECTOR ← (ffetch FONTCHARSETVECTOR of FONT)) from 0 to - \MAXCHARSET - eachtime (SETQ CSINFO (\GETBASEPTR CSVECTOR (UNFOLD CS 2))) when CSINFO - unless (fetch (CHARSETINFO CSSLUGP) of CSINFO) collect CS)) + (CHARSETS (for CS CSINFO from 0 to (MAXCHARSET FONT) eachtime (SETQ CSINFO (\GETCHARSETINFO + FONT CS)) + when CSINFO unless (fetch (CHARSETINFO CSSLUGP) of CSINFO) collect CS)) + (MAXCHARSET (MAXCHARSET FONT)) + (NEMPTYCHARSETS + (for CS CSINFO from 0 to (MAXCHARSET FONT) eachtime (SETQ CSINFO (\GETCHARSETINFO FONT + CS)) + when CSINFO count (fetch (CHARSETINFO CSSLUGP) of CSINFO))) + (NINSTANTIATEDCHARSETS + (for CS CSINFO from 0 to (MAXCHARSET FONT) eachtime (SETQ CSINFO (\GETCHARSETINFO FONT + CS)) + when CSINFO count (NOT (fetch (CHARSETINFO CSSLUGP) of CSINFO)))) + (NUNINSTANTIATEDCHARSETS + (for CS CSINFO from 0 to (MAXCHARSET FONT) eachtime (SETQ CSINFO (\GETCHARSETINFO FONT + CS)) + count (NULL CSINFO))) (AVGCHARWIDTH (ffetch (FONTDESCRIPTOR FONTAVGCHARWIDTH) of FONT)) (FONTTOMCCSFN (ffetch FONTTOMCCSFN of FONT)) (\ILLEGAL.ARG PROP]) @@ -1273,15 +1266,16 @@ else 1]) ) (* "FOLLOWING DEFINITIONS EXPORTED") -(DEFOPTIMIZER FONTPROP (&REST ARGS) - (SELECTQ (AND (EQ (CAADR ARGS) +(DEFOPTIMIZER FONTPROP (FONT PROP &REST REST) + (SELECTQ (AND (EQ (CAR PROP) 'QUOTE) - (CADADR ARGS)) - (ASCENT `(FONTASCENT ,(CAR ARGS))) - (DESCENT `(FONTDESCENT ,(CAR ARGS))) - (HEIGHT `(FONTHEIGHT ,(CAR ARGS))) - (FONTTOMCCSFN `(fetch (FONTDESCRIPTOR FONTTOMCCSFN) - of ,(CAR ARGS))) + (CADR PROP)) + (ASCENT `(FONTASCENT ,FONT)) + (DESCENT `(FONTDESCENT ,FONT)) + (HEIGHT `(FONTHEIGHT ,FONT)) + (FONTTOMCCSFN `(fetch (FONTDESCRIPTOR FONTTOMCCSFN) of ,FONT)) + (MAXCHARSET `(MAXCHARSET ,FONT)) + (FILENAME `(fetch (FONTDESCRIPTOR FONTFILENAME) of ,FONT)) 'IGNOREMACRO)) (* "END EXPORTED DEFINITIONS") @@ -1289,23 +1283,43 @@ (DEFINEQ (FONTDEVICEPROP - [LAMBDA (FONTDEVICE PROP) (* ; "Edited 25-Aug-2025 21:23 by rmk") + [LAMBDA NARGS (* ; "Edited 8-Mar-2026 21:48 by rmk") + (* ; "Edited 2-Mar-2026 13:14 by rmk") + (* ; "Edited 1-Mar-2026 12:22 by rmk") + (* ; "Edited 25-Aug-2025 21:23 by rmk") (* ;; "Returns the value of the PROP property of the FONTDEVICE. E.g. if FONTDEVICE is DISPLAY and PROP is %"FONTCOERCIONS%", returns the value of DISPLAYFONTCOERCIONS ((HELVETICA 1)(HELVETICA 4)...)") - [if (LITATOM FONTDEVICE) - then (SETQ FONTDEVICE (\FONTSYMBOL FONTDEVICE)) - else (SETQ FONTDEVICE (\FONT.CHECKARGS FONTDEVICE)) - (SETQ FONTDEVICE (CL:IF (type? FONTDESCRIPTOR FONTDEVICE) - (FONTPROP FONTDEVICE 'DEVICE) - (fetch (FONTSPEC FSDEVICE) of FONTDEVICE))] - (CL:UNLESS FONTDEVICE - (SETQ FONTDEVICE 'DISPLAY)) - (LET ((VAR (PACK* FONTDEVICE PROP))) - (CL:WHEN (BOUNDP VAR) - (GETATOMVAL VAR]) + (CL:WHEN (ILESSP NARGS 2) + (ERROR "DEVICE/PROP not specified")) + (LET ((FONTDEVICE (ARG NARGS 1)) + (PROP (ARG NARGS 2)) + VAR) + [if (LITATOM FONTDEVICE) + then (SETQ FONTDEVICE (\FONTSYMBOL FONTDEVICE)) + else (SETQ FONTDEVICE (\FONT.CHECKARGS FONTDEVICE)) + (SETQ FONTDEVICE (CL:IF (type? FONTDESCRIPTOR FONTDEVICE) + (FONTPROP FONTDEVICE 'DEVICE) + (fetch (FONTSPEC FSDEVICE) of FONTDEVICE))] + (CL:UNLESS FONTDEVICE + (SETQ FONTDEVICE 'DISPLAY)) + (SETQ VAR (PACK* FONTDEVICE PROP)) + (if (EQ PROP 'ENCODINGFN) + then + (* ;; "The name of a function") + + (PROG1 (CL:IF (GETD VAR) + VAR) + (CL:WHEN (IGEQ NARGS 3) + (PUTD VAR (ARG NARGS 3)))) + else (PROG1 (CL:WHEN (BOUNDP VAR) + (GETATOMVAL VAR)) + (CL:WHEN (IGEQ NARGS 3) + (SETATOMVAL VAR (ARG NARGS 3))))]) ) +(PUTPROPS FONTDEVICEPROP ARGNAMES (FONTDEVICE PROP NEWVALUE)) + (* ; "Moving character information") @@ -1550,7 +1564,11 @@ NEWDESCENT]) (MOVEFONTCHARS - [LAMBDA (PAIRS DESTFONT DEFAULTSOURCEFONT) (* ; "Edited 26-Feb-2026 16:59 by rmk") + [LAMBDA (PAIRS DESTFONT DEFAULTSOURCEFONT) (* ; "Edited 9-Mar-2026 23:00 by rmk") + (* ; "Edited 7-Mar-2026 11:41 by rmk") + (* ; "Edited 4-Mar-2026 10:33 by rmk") + (* ; "Edited 1-Mar-2026 09:40 by rmk") + (* ; "Edited 26-Feb-2026 16:59 by rmk") (* ; "Edited 4-Sep-2025 11:07 by rmk") (* ; "Edited 30-Aug-2025 23:20 by rmk") (* ; "Edited 26-Aug-2025 23:10 by rmk") @@ -1566,9 +1584,13 @@ (* ;; "The character information for schar in sfont replaces the information for the destination character in the destination font.") - (* ;; "Pairs is a list of (SOURCE DEST) pairs where each source is a list of the form (schar/code sfont) or just a character, and each DEST is a destination character/code. If a pair is a character code C, it is treated as (C C).") + (* ;; "Pairs is either") - (* ;; "If a pair does not contain its own source font, then information is extracted from the DEFAULTSOURCEFONT. If the DEFAULTSOURCEFONT is not provided, thenSFONT it is assumed that the source is the DESTFONT (which must always be provided).") + (* ;; " a hasharray that maps destination codes to source codes") + + (* ;; " a list of (DEST SOURCE) pairs where each source is a list of the form (schar/scode sfont) or just a schar/scode, and each DEST is a destination character/code. An schar/scode of NIL designates a slug source.") + + (* ;; "If a pair does not contain its own source font, then information is extracted from the DEFAULTSOURCEFONT. If the DEFAULTSOURCEFONT is not provided, then it is assumed that the source is the DESTFONT (which must always be provided).") (* ;; "This collects the source information for all the pairs before it starts, to make sure that it doesn't step on itself when source and destination are the same font.") @@ -1578,41 +1600,42 @@ (FONTCREATE DEFAULTSOURCEFONT NIL NIL NIL (FONTPROP DESTFONT 'DEVICE)) DESTFONT)) - [if (HARRAYP PAIRS) - then - (* ;; "E.g. *UNICODETOMCCS*") + (LET (PAIRINFO) - [MAPHASH PAIRS (FUNCTION (LAMBDA (VAL KEY) - (CL:UNLESS (EQ VAL KEY) - (\MOVEFONTCHAR (\MOVEFONTCHARS.SOURCEDATA KEY - DEFAULTSOURCEFONT) - VAL DESTFONT))] - else (LET (PAIRINFO) + (* ;; "Collect and execute at the end, so that we have validated all of the source information before making any changes. ") - (* ;; "Fix/check arguments, and expand out the information for all the source characters, so there is no toe-stepping if there are overlaps.") + [if (HARRAYP PAIRS) + then + (* ;; "E.g. *UNICODETOMCCS*") - (SETQ PAIRINFO (for P S DCODE in PAIRS collect (CL:WHEN (SMALLP P) - (SETQ P (LIST P P))) - (SETQ DCODE (CADR P)) - (CL:UNLESS (CHARCODEP DCODE) - (SETQ DCODE (CHARCODE.DECODE - DCODE))) - (\INSURECHARSETINFO DESTFONT - (\CHARSET DCODE)) - (LIST (\MOVEFONTCHARS.SOURCEDATA - (CAR P) - DEFAULTSOURCEFONT) - DCODE))) + [MAPHASH PAIRS (FUNCTION (LAMBDA (SCODE DCODE) + (\INSURECHARSETINFO DESTFONT (\CHARSET DCODE)) + (LET ((SD (\MOVEFONTCHARS.SOURCEDATA SCODE + DEFAULTSOURCEFONT DESTFONT DCODE + DESTFONT))) + (CL:WHEN (push PAIRINFO (LIST SD DCODE] + else (for P DCODE SD in PAIRS do (CL:WHEN (SMALLP P) + (SETQ P (LIST P P))) + (SETQ DCODE (CAR P)) + (CL:UNLESS (CHARCODEP DCODE) + (SETQ DCODE (CHARCODE.DECODE DCODE))) + (\INSURECHARSETINFO DESTFONT (\CHARSET DCODE)) + (SETQ SD (\MOVEFONTCHARS.SOURCEDATA (CADR P) + DEFAULTSOURCEFONT DCODE DESTFONT)) + (CL:WHEN SD + (push PAIRINFO (LIST SD DCODE)))] - (* ;; "Install source character information into the destination font. ") + (* ;; + "Arguments checked out. install source character information into destfont slots. ") - (for P in PAIRINFO do (\MOVEFONTCHAR (CAR P) - (CADR P) - DESTFONT]) + (for P in PAIRINFO do (\MOVEFONTCHAR (CAR P) + (CADR P) + DESTFONT)))) DESTFONT]) (\MOVEFONTCHAR - [LAMBDA (SOURCEDATA DCODE DFONT) (* ; "Edited 25-Sep-2025 21:25 by rmk") + [LAMBDA (SOURCEDATA DCODE DFONT) (* ; "Edited 4-Mar-2026 11:03 by rmk") + (* ; "Edited 25-Sep-2025 21:25 by rmk") (* ; "Edited 4-Sep-2025 12:37 by rmk") (* ; "Edited 31-Aug-2025 14:36 by rmk") (* ; "Edited 28-Aug-2025 20:50 by rmk") @@ -1660,7 +1683,6 @@ (UPDATEINFOELEMENT YWIDTHS) (CL:WHEN (GETMULTI SOURCEDATA 'LEFTKERN) (\FSETLEFTKERN DCSINFO DTHINCODE (GETMULTI SOURCEDATA 'LEFTKERN))) - (replace (CHARSETINFO CSSLUGP) of DCSINFO with NIL) (CHARSETPROP DCSINFO 'SOURCE (FONTPROP DFONT 'SPEC)))] (SETQ DESCENT (IMAX (GETMULTI SOURCEDATA 'DESCENT) (fetch (CHARSETINFO CHARSETDESCENT) of DCSINFO))) @@ -1677,7 +1699,10 @@ DCSINFO]) (\MOVEFONTCHARS.SOURCEDATA - [LAMBDA (SOURCE DEFAULTSOURCEFONT) (* ; "Edited 6-Sep-2025 12:59 by rmk") + [LAMBDA (SOURCE DEFAULTSOURCEFONT DCODE DESTFONT) (* ; "Edited 15-Mar-2026 14:24 by rmk") + (* ; "Edited 9-Mar-2026 23:00 by rmk") + (* ; "Edited 7-Mar-2026 11:41 by rmk") + (* ; "Edited 6-Sep-2025 12:59 by rmk") (* ; "Edited 4-Sep-2025 11:01 by rmk") (* ; "Edited 2-Sep-2025 13:28 by rmk") (* ; "Edited 30-Aug-2025 23:20 by rmk") @@ -1695,6 +1720,8 @@ (* ;; " a list of the form (sourcechar sourcefont) where sourcechar is a name or code and sourcefont is a full or partial font specification with defaults taken from the DEFAULTSOURCE FONT. E.g. if the defaultsource font is GACHA 10 then the pair (94 TERMINAL) is interpreted as (TERMINAL 10).") + (* ;; "DCODE and DESTFONT provided so that we can avoid vacuous translations") + (LET (SCODE CHAR8CODE SFONT CSINFO TEMP) (if (LISTP SOURCE) then (SETQ SFONT (CADR SOURCE)) @@ -1729,34 +1756,36 @@ else (SETQ SFONT DEFAULTSOURCEFONT))) (CL:UNLESS (CHARCODEP SCODE) (SETQ SCODE (CHARCODE.DECODE SCODE))) - (CL:WHEN (AND SCODE (SLUGCHARP.DISPLAY SCODE SFONT)) - (SETQ SCODE NIL)) - (if SCODE - then (SETQ CSINFO (\INSURECHARSETINFO SFONT (\CHARSET SCODE))) - (SETQ CHAR8CODE (\CHAR8CODE SCODE)) - else - (* ;; "NIL SCODE means replace with slug. We calculate the source-slug information, but that should be ignored later in favor of the slug information from the destination's character set. ") + (CL:UNLESS (AND (EQ DCODE SCODE) + (EQ SFONT DESTFONT)) (* ; "Nothing to do") + (CL:WHEN (AND SCODE (SLUGCHARP SCODE SFONT)) + (SETQ SCODE NIL)) + (if SCODE + then (SETQ CSINFO (\INSURECHARSETINFO SFONT (\CHARSET SCODE))) + (SETQ CHAR8CODE (\CHAR8CODE SCODE)) + else + (* ;; "NIL SCODE means replace with slug. We calculate the source-slug information, but that should be ignored later in favor of the slug information from the destination's character set. ") - (SETQ CSINFO (\INSURECHARSETINFO SFONT 0)) - (SETQ CHAR8CODE SLUGCHARINDEX)) + (SETQ CSINFO (\INSURECHARSETINFO SFONT 0)) + (SETQ CHAR8CODE SLUGCHARINDEX)) - (* ;; "Use (plural) vector field names for UPDATEINFOELEMENT. Don't know if the CHAR8CODE is useful, but...") + (* ;; "Use (plural) vector field names for UPDATEINFOELEMENT. Don't know if the CHAR8CODE is useful, but...") - `((CHAR8CODE \, CHAR8CODE) - (ASCENT \, (fetch (CHARSETINFO CHARSETASCENT) of CSINFO)) - (DESCENT \, (fetch (CHARSETINFO CHARSETDESCENT) of CSINFO)) - (WIDTHS \, (CL:WHEN (SETQ TEMP (ffetch (CHARSETINFO WIDTHS) of CSINFO)) - (\FGETWIDTH TEMP CHAR8CODE))) - (YWIDTHS \, (CL:WHEN (SETQ TEMP (ffetch (CHARSETINFO YWIDTHS) of CSINFO)) - (\FGETWIDTH TEMP CHAR8CODE))) - (IMAGEWIDTHS \, (CL:WHEN (SETQ TEMP (ffetch (CHARSETINFO IMAGEWIDTHS) of CSINFO)) + `((CHAR8CODE \, CHAR8CODE) + (ASCENT \, (fetch (CHARSETINFO CHARSETASCENT) of CSINFO)) + (DESCENT \, (fetch (CHARSETINFO CHARSETDESCENT) of CSINFO)) + (WIDTHS \, (CL:WHEN (SETQ TEMP (ffetch (CHARSETINFO WIDTHS) of CSINFO)) + (\FGETWIDTH TEMP CHAR8CODE))) + (YWIDTHS \, (CL:WHEN (SETQ TEMP (ffetch (CHARSETINFO YWIDTHS) of CSINFO)) (\FGETWIDTH TEMP CHAR8CODE))) - (LEFTKERN \, (CL:WHEN (ARRAYP (fetch (CHARSETINFO LEFTKERN) of CSINFO)) - (ELT (fetch (CHARSETINFO LEFTKERN) of CSINFO) - CHAR8CODE))) - (BITMAP \, (CL:WHEN (SETQ TEMP (fetch (CHARSETINFO CHARSETBITMAP) of CSINFO)) - (\GETCHARBITMAP.CSINFO CHAR8CODE CSINFO))) - (SLUG \, (NOT SCODE]) + (IMAGEWIDTHS \, (CL:WHEN (SETQ TEMP (ffetch (CHARSETINFO IMAGEWIDTHS) of CSINFO)) + (\FGETWIDTH TEMP CHAR8CODE))) + (LEFTKERN \, (CL:WHEN (ARRAYP (fetch (CHARSETINFO LEFTKERN) of CSINFO)) + (ELT (fetch (CHARSETINFO LEFTKERN) of CSINFO) + CHAR8CODE))) + (BITMAP \, (CL:WHEN (SETQ TEMP (fetch (CHARSETINFO CHARSETBITMAP) of CSINFO)) + (\GETCHARBITMAP.CSINFO CHAR8CODE CSINFO))) + (SLUG \, (NOT SCODE))))]) (\MAKESLUGCHAR [LAMBDA (CODE FONT/CSINFO) (* ; "Edited 30-Aug-2025 23:20 by rmk") @@ -1800,7 +1829,7 @@ SLUGCHARINDEX)))) CSINFO]) -(SLUGCHARP.DISPLAY +(SLUGCHARP [LAMBDA (CODE FONT/CHARSETINFO) (* ; "Edited 2-Sep-2025 22:59 by rmk") (* ; "Edited 28-Aug-2025 22:56 by rmk") (* ; "Edited 6-Jun-2025 10:24 by rmk") @@ -1818,6 +1847,23 @@ (\FGETOFFSET (fetch (CHARSETINFO OFFSETS) of CSINFO) (ADD1 \MAXTHINCHAR]) ) +(DECLARE%: DONTCOPY +(* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE + +(RPAQ SLUGCHARINDEX (ADD1 \MAXTHINCHAR)) + + +(CONSTANTS (SLUGCHARINDEX (ADD1 \MAXTHINCHAR))) +) + +(* "END EXPORTED DEFINITIONS") + +) + + + +(* ; "At the end of each csinfo") + (DECLARE%: EVAL@COMPILE (PUTPROPS UPDATEINFOELEMENT MACRO [(FIELD) @@ -1832,7 +1878,9 @@ (DEFINEQ (FONTFILES - [LAMBDA (FONTSPEC CHARSET DIRLST EXTLST) (* ; "Edited 28-Aug-2025 14:42 by rmk") + [LAMBDA (FONTSPEC CHARSET DIRLST EXTLST) (* ; "Edited 19-Apr-2026 09:54 by rmk") + (* ; "Edited 16-Apr-2026 22:26 by rmk") + (* ; "Edited 28-Aug-2025 14:42 by rmk") (* ; "Edited 25-Aug-2025 10:22 by rmk") (* ; "Edited 16-Aug-2025 21:03 by rmk") (* ; "Edited 11-Jul-2025 09:42 by rmk") @@ -1843,15 +1891,27 @@ (* ; "Edited 17-May-2025 00:06 by rmk") (* ; "Edited 15-May-2025 16:29 by rmk") - (* ;; "Considers all posible names for font files that respect the given characteristics, returns a list of the names of files that actually exist somewhere in DIRLST. Does not validate their contents.") + (* ;; "Considers all posible names for font files that respect the given characteristics, returns a list of the names of files that actually exist somewhere in DIRLST. If FONTSPEC is a FONT with a FILENAME that exists, that is the only one returned. Does not validate their contents.") - (LET (FAMILY SIZE FACE ROTATION DEVICE) - (SPREADFONTSPEC FONTSPEC) - [SETQ DIRLST (MKLIST (OR DIRLST (FONTDEVICEPROP DEVICE 'FONTDIRECTORIES] - [SETQ EXTLST (MKLIST (OR EXTLST (FONTDEVICEPROP DEVICE 'FONTEXTENSIONS] - (CL:UNLESS CHARSET (SETQ CHARSET \DEFAULTCHARSET)) - (APPEND (MKLIST (\FINDFONTFILE FAMILY SIZE FACE ROTATION DEVICE 'NOCHARSET DIRLST EXTLST)) - (MKLIST (\FINDFONTFILE FAMILY SIZE FACE ROTATION DEVICE CHARSET DIRLST EXTLST]) + (if (type? FONTDESCRIPTOR FONTSPEC) + then + (* ;; "Prefer the same version, but maybe a different version if coming up in a new environment. E.g. a font that was created in a loadup sysout that was then distributed into an environment with different font versions.") + + (OR [MKLIST (INFILEP (FONTPROP FONTSPEC 'FILENAME] + [AND (FONTPROP FONTSPEC 'FILENAME) + (MKLIST (INFILEP (PACKFILENAME 'VERSION NIL 'BODY (FONTPROP FONTSPEC + 'FILENAME] + (FONTFILES (FONTPROP FONTSPEC 'DEVICESPEC) + CHARSET DIRLST EXTLST)) + else (LET (FAMILY SIZE FACE ROTATION DEVICE) + (SETQ FONTSPEC (\FONT.CHECKARGS FONTSPEC NIL NIL NIL NIL T)) + (SPREADFONTSPEC FONTSPEC) + [SETQ DIRLST (MKLIST (OR DIRLST (FONTDEVICEPROP DEVICE 'FONTDIRECTORIES] + [SETQ EXTLST (MKLIST (OR EXTLST (FONTDEVICEPROP DEVICE 'FONTEXTENSIONS] + (CL:UNLESS CHARSET (SETQ CHARSET \DEFAULTCHARSET)) + (APPEND (MKLIST (\FINDFONTFILE FAMILY SIZE FACE ROTATION DEVICE 'NOCHARSET DIRLST + EXTLST)) + (MKLIST (\FINDFONTFILE FAMILY SIZE FACE ROTATION DEVICE CHARSET DIRLST EXTLST]) (\FINDFONTFILE [LAMBDA (FAMILY SIZE FACE ROTATION DEVICE CHARSET DIRLST EXTLST) @@ -1890,7 +1950,8 @@ (for EXT inside EXTENSIONS collect (\FONTFILENAME FAMILY SIZE FACE EXT 0]) (\FONTFILENAME - [LAMBDA (FAMILY SIZE FACE EXTENSION CHARSET) (* ; "Edited 22-Jan-2026 14:25 by rmk") + [LAMBDA (FAMILY SIZE FACE EXTENSION CHARSET) (* ; "Edited 15-Apr-2026 00:44 by rmk") + (* ; "Edited 22-Jan-2026 14:25 by rmk") (* ; "Edited 11-Jul-2025 09:39 by rmk") (* ; "Edited 15-May-2025 15:51 by rmk") (* ; "Edited 5-Mar-93 16:10 by rmk:") @@ -1919,14 +1980,15 @@ (* ;; "Fortunately, PACKFILENAME ignores packages") - (SETQ FILENAME (PACKFILENAME.STRING 'NAME (CONCAT (CL:IF CSETNAME + [SETQ FILENAME (PACKFILENAME.STRING 'NAME (CONCAT (CL:IF CSETNAME (CONCAT "c" CSETNAME ">") "") FAMILY SIZEPATT "-" (FONTFACETOATOM FACE) (CL:IF CSETNAME (CONCAT "-C" CSETNAME) "")) - 'EXTENSION EXTENSION)) + 'EXTENSION + (OR EXTENSION (CAR (MKLIST (FONTDEVICEPROP DEVICE 'FONTEXTENSIONS] (* ;;  " Avoid adjacent wildcards because some devices (notably old DSK) get exponentially slower.") @@ -2212,7 +2274,8 @@ (SHOULDNT]) (\COERCECHARSET - [LAMBDA (FONTSPEC CHARSET CODE COERCIONS FONT) (* ; "Edited 17-Dec-2025 21:51 by rmk") + [LAMBDA (FONTSPEC CHARSET CODE COERCIONS FONT) (* ; "Edited 15-Mar-2026 14:23 by rmk") + (* ; "Edited 17-Dec-2025 21:51 by rmk") (* ; "Edited 7-Oct-2025 17:25 by rmk") (* ; "Edited 31-Aug-2025 00:00 by rmk") (* ; "Edited 28-Aug-2025 23:07 by rmk") @@ -2243,8 +2306,7 @@ (SETQ CFONT (FONTCREATE1 CFS CHARSET)) - when (SETQ CSINFO (\INSURECHARSETINFO CFONT CHARSET)) unless (AND CODE (SLUGCHARP.DISPLAY - CODE CFONT)) + when (SETQ CSINFO (\INSURECHARSETINFO CFONT CHARSET)) unless (AND CODE (SLUGCHARP CODE CFONT)) do (CL:WHEN FONT (replace (FONTDESCRIPTOR FONTCHARENCODING) of FONT with (fetch (FONTDESCRIPTOR FONTCHARENCODING) @@ -2254,7 +2316,8 @@ (RETURN (LIST CFONT CSINFO]) (\BUILDSLUGCSINFO - [LAMBDA (FONT SLUGWIDTH) (* ; "Edited 17-Aug-2025 12:46 by rmk") + [LAMBDA (FONT SLUGWIDTH) (* ; "Edited 15-Mar-2026 23:39 by rmk") + (* ; "Edited 17-Aug-2025 12:46 by rmk") (* ; "Edited 10-Aug-2025 12:43 by rmk") (* ; "Edited 6-Aug-2025 22:42 by rmk") (* ; "Edited 3-Aug-2025 16:11 by rmk") @@ -2291,8 +2354,7 @@ (SETQ CSINFO (create CHARSETINFO CHARSETASCENT ← (IDIFFERENCE SLUGHEIGHT DESCENT) CHARSETDESCENT ← DESCENT - CSSLUGP ← T - CSCOMPLETEP ← T)) + CSSLUGP ← T)) (SETQ WIDTHS (fetch (CHARSETINFO WIDTHS) of CSINFO)) (for I from 0 to \MAXTHINCHAR do (\FSETWIDTH WIDTHS I SLUGWIDTH)) (replace IMAGEWIDTHS OF CSINFO with WIDTHS) @@ -2678,7 +2740,10 @@ then FILEFONTS)))]) (FONTEXISTS? - [LAMBDA (FAMILY SIZE FACE ROTATION DEVICE NOCOERCIONS) (* ; "Edited 22-Jan-2026 09:07 by rmk") + [LAMBDA (FONTSPEC NOCOERCIONS) (* ; "Edited 4-Apr-2026 12:27 by rmk") + (* ; "Edited 2-Apr-2026 23:52 by rmk") + (* ; "Edited 17-Mar-2026 23:04 by rmk") + (* ; "Edited 22-Jan-2026 09:07 by rmk") (* ; "Edited 18-Dec-2025 13:10 by rmk") (* ; "Edited 25-Nov-2025 20:18 by rmk") (* ; "Edited 26-Sep-2025 10:10 by rmk") @@ -2689,14 +2754,14 @@ (* ; "Edited 9-Aug-2025 00:08 by rmk") (* ; "Edited 5-Aug-2025 17:54 by rmk") - (* ;; "Do we have any way of finding or creating the font, even by coercion from other fonts? The DEVICE can have a FONTEXISTS? function for the case where we can't find a file--presumably returns the file for a coercion to a different font specification.") + (* ;; "Do we have any way of finding or creating the font, even by coercion from other fonts? The IMAGESTREAM DEVICE can have a FONTEXISTS? function for the case where we can't find a file--presumably returns the file for a coercion to a different font specification.") (* ;; - "Tries device specific coercions if the original request can't be satisfied and NOCOERCIONS is NIL.") + "Tries device-specific coercions if the original request can't be satisfied and NOCOERCIONS is NIL.") (DECLARE (GLOBALVARS \FONTSINCORE \FONTEXISTS?-CACHE IMAGESTREAMTYPES)) - (LET ((FONTSPEC (\FONT.CHECKARGS FAMILY SIZE FACE ROTATION DEVICE T)) - VAL DEVICE) + (SETQ FONTSPEC (\FONT.CHECKARGS FONTSPEC NIL NIL NIL NIL T)) + (LET (VAL DEVICE COERCED) (* ;; "SASSOC everywhere because of face") @@ -2705,30 +2770,30 @@ then (CL:UNLESS (EQ VAL 'NO) VAL) else (* ; - "Only 0 really exists. Cache just the first file") + "Only 0 really exists--but is that true only for the display? Cache just the first file") (SETQ DEVICE (fetch (FONTSPEC FSDEVICE) of FONTSPEC)) - (SETQ VAL (OR (CAR (FONTFILES (CL:IF (MEMB (fetch (FONTSPEC FSROTATION) of FONTSPEC) + [SETQ VAL (OR (CAR (FONTFILES (CL:IF (MEMB (fetch (FONTSPEC FSROTATION) of FONTSPEC) '(90 270)) (create FONTSPEC using FONTSPEC FSROTATION ← 0) FONTSPEC))) (APPLY* (OR (CAR (GETMULTI IMAGESTREAMTYPES DEVICE 'FONTEXISTS?)) (CAR (GETMULTI IMAGESTREAMTYPES DEVICE 'FONTSAVAILABLE)) (FUNCTION NILL)) - FONTSPEC))) - (if VAL - then (STOREMULTI \FONTEXISTS?-CACHE FONTSPEC VAL 'SASSOC) - elseif [AND (NOT NOCOERCIONS) - (SETQ VAL (COERCEFONTSPEC FONTSPEC (FONTDEVICEPROP DEVICE - 'FONTCOERCIONS] - then - (* ;; "It's coerceable...even though coercion may not yet be instantiated") + FONTSPEC NOCOERCIONS) + (AND (NOT NOCOERCIONS) + (SETQ COERCED (CAR (OR (COERCEFONTSPEC FONTSPEC 'FONTCOERCIONS) + (COERCEFONTSPEC FONTSPEC 'FACECOERCIONS] - (STOREMULTI \FONTEXISTS?-CACHE FONTSPEC VAL 'SASSOC) - else (STOREMULTI \FONTEXISTS?-CACHE FONTSPEC 'NO 'SASSOC) - NIL]) + (* ;; "Don't cache NO if the font isn't found and coercion is suppressed. A later coercive call might produce a different result.") + + (CL:WHEN (OR VAL COERCED) + (STOREMULTI \FONTEXISTS?-CACHE FONTSPEC (OR VAL 'NO) + 'SASSOC)) + VAL]) (\SEARCHFONTFILES - [LAMBDA (FONTSPEC) (* ; "Edited 28-Aug-2025 14:47 by rmk") + [LAMBDA (FONTSPEC) (* ; "Edited 4-Mar-2026 00:14 by rmk") + (* ; "Edited 28-Aug-2025 14:47 by rmk") (* ; "Edited 25-Aug-2025 10:23 by rmk") (* ; "Edited 23-Aug-2025 12:36 by rmk") (* ; "Edited 21-Jul-2025 08:57 by rmk") @@ -2762,8 +2827,8 @@ (* ;;  "make sure the face, size, and family really match.") - when (AND (OR (EQ FAMILY '*) - (EQ FAMILY (fetch (FONTSPEC FSFAMILY) of THISFONT))) + when (AND THISFONT (OR (EQ FAMILY '*) + (EQ FAMILY (fetch (FONTSPEC FSFAMILY) of THISFONT))) (OR (EQ SIZE '*) (EQ SIZE (fetch (FONTSPEC FSSIZE) of THISFONT))) (MATCHFONTFACE FACE (fetch (FONTSPEC FSFACE) of THISFONT))) unless (MEMBER THISFONT @@ -2771,47 +2836,47 @@ do (push FONTSFOUND THISFONT))) finally (RETURN (DREVERSE FONTSFOUND]) (FLUSHFONTCACHE - [LAMBDA (TYPE FAMILY SIZE FACE ROTATION DEVICE) (* ; "Edited 27-Nov-2025 10:02 by rmk") + [LAMBDA (CACHES FAMILY SIZE FACE ROTATION DEVICE) (* ; "Edited 15-Apr-2026 22:11 by rmk") + (* ; "Edited 12-Apr-2026 11:54 by rmk") + (* ; "Edited 4-Apr-2026 23:04 by rmk") + (* ; "Edited 27-Nov-2025 10:02 by rmk") (* ; "Edited 22-Nov-2025 15:52 by rmk") - (* ;; - "Removes information for font(s) from the TYPE cache, if TYPE is NIL, all caches are flushed") + (* ;; "Removes information for font(s) from the caches in CACHES, if CACHES is NIL, all caches are flushed") - (CL:UNLESS TYPE - (SETQ TYPE '(:INCORE :EXISTS :AVAILABLE))) - (if (LISTP TYPE) - then (for TY in TYPE collect (FLUSHFONTCACHE TY FAMILY SIZE FACE ROTATION DEVICE)) - else - (* ;; "If all NILs, don't want the default font") - - (SPREADFONTSPEC (\FONT.CHECKARGS (OR FAMILY '*) - (OR SIZE '*) - (OR FACE '*) - (OR ROTATION '*) - (OR DEVICE '*) - T)) - (LET ((NFLUSHED 0) - FONTX) - (DECLARE (SPECVARS NFLUSHED)) - [MAPMULTI (SELECTQ TYPE - (:INCORE \FONTSINCORE) - (:EXISTS \FONTEXISTS?-CACHE) - (:AVAILABLE \FONTSAVAILABLEFILECACHE) - (\ILLEGAL.ARG TYPE)) - (FUNCTION (LAMBDA (FM S FC R DPAIR) - (CL:WHEN (AND (OR (EQ FAMILY FM) - (EQ FAMILY '*)) - (OR (EQ SIZE S) - (EQ SIZE '*)) - (MATCHFONTFACE FACE FC) - (OR (EQ ROTATION R) - (EQ ROTATION '*)) - (OR (EQ DEVICE (CAR DPAIR)) - (EQ DEVICE '*)) - (CDR DPAIR)) - (ADD NFLUSHED 1) - (RPLACD DPAIR))] - (LIST TYPE NFLUSHED]) + (for CACHE NFLUSHED inside (OR CACHES '(:INCORE :EXISTS :AVAILABLE)) declare (SPECVARS NFLUSHED) + first (CL:WHEN (type? FONTSPEC FAMILY) + (SPREADFONTSPEC (\FONT.CHECKARGS FAMILY SIZE FACE ROTATION DEVICE T))) + (CL:UNLESS FAMILY + (SETQ FAMILY '*)) + (CL:UNLESS SIZE + (SETQ SIZE '*)) + (CL:UNLESS FACE + (SETQ FACE '*)) + (CL:UNLESS ROTATION + (SETQ ROTATION '*)) + (CL:UNLESS DEVICE + (SETQ DEVICE '*)) eachtime (SETQ NFLUSHED 0) + collect [MAPMULTI (SELECTQ CACHE + (:INCORE \FONTSINCORE) + (:EXISTS \FONTEXISTS?-CACHE) + (:AVAILABLE \FONTSAVAILABLEFILECACHE) + (\ILLEGAL.ARG CACHE)) + (FUNCTION (LAMBDA (FM S FC R DPAIR) + (DECLARE (USEDFREE NFLUSHED)) + (CL:WHEN (AND (OR (EQ FAMILY FM) + (EQ FAMILY '*)) + (OR (EQ SIZE S) + (EQ SIZE '*)) + (MATCHFONTFACE FACE FC) + (OR (EQ ROTATION R) + (EQ ROTATION '*)) + (OR (EQ DEVICE (CAR DPAIR)) + (EQ DEVICE '*)) + (CDR DPAIR)) + (ADD NFLUSHED 1) + (RPLACD DPAIR))] + (LIST CACHE NFLUSHED]) (FINDFONTFILES [LAMBDA (FAMILY SIZE FACE ROTATION DEVICE DIRLST EXTLST) (* ; "Edited 28-Aug-2025 14:45 by rmk") @@ -2862,10 +2927,11 @@ ) finally (RETURN (DREVERSE FONTSFOUND]) (SORTFONTSPECS - [LAMBDA (FONTSPECS) (* ; "Edited 30-Aug-2025 15:12 by rmk") + [LAMBDA (FONTSPECS) (* ; "Edited 22-Mar-2026 12:44 by rmk") + (* ; "Edited 13-Mar-2026 11:33 by rmk") + (* ; "Edited 30-Aug-2025 15:12 by rmk") - (* ;; - "Sort FONTSPECS by alphabetically by family, then by smaller sizes, then by medium/regular faces") + (* ;; "Sort FONTSPECS by alphabetically by family, then by smaller sizes, then by faces. For faces the order is MRR MIR BRR BIR and any others, so that coercions from earlier fonts are possible.") (SORT FONTSPECS @@ -2878,8 +2944,10 @@ (fetch (FONTSPEC FSSIZE) of FS2)) (CL:WHEN (EQ (fetch (FONTSPEC FSSIZE) of FS1) (fetch (FONTSPEC FSSIZE) of FS2)) - [LET ((FACE1 (fetch (FONTSPEC FSFACE) of FS1)) - (FACE2 (fetch (FONTSPEC FSFACE) of FS2))) + [LET [(FACE1 (\FONTFACE (fetch (FONTSPEC FSFACE) + of FS1))) + (FACE2 (\FONTFACE (fetch (FONTSPEC FSFACE) + of FS2] (OR (EQUAL FACE1 FACE2) (AND (EQ 'MEDIUM (fetch (FONTFACE WEIGHT) of FACE1)) @@ -2897,21 +2965,24 @@ (DEFINEQ (MATCHFONTFACE - [LAMBDA (PATTERN FACE) (* ; "Edited 21-Jun-2025 11:57 by rmk") + [LAMBDA (PATTERN FACE) (* ; "Edited 18-Mar-2026 13:39 by rmk") + (* ; "Edited 21-Jun-2025 11:57 by rmk") (* ;; "Does FACE match a PATTERN that may contain stars?") - (OR (EQ PATTERN '*) - (EQUAL PATTERN FACE) - (LET ((PWEIGHT (fetch (FONTFACE WEIGHT) of PATTERN)) - (PSLOPE (fetch (FONTFACE SLOPE) of PATTERN)) - (PEXPANSION (fetch (FONTFACE EXPANSION) of PATTERN))) - (AND (OR (EQ PWEIGHT (fetch (FONTFACE WEIGHT) of FACE)) - (EQ PWEIGHT '*)) - (OR (EQ PSLOPE (fetch (FONTFACE SLOPE) of FACE)) - (EQ PSLOPE '*)) - (OR (EQ PEXPANSION (fetch (FONTFACE EXPANSION) of FACE)) - (EQ PEXPANSION '*]) + (if (EQ PATTERN '*) + elseif (EQUAL PATTERN FACE) + else (CL:WHEN (AND PATTERN (LITATOM PATTERN)) + (SETQ PATTERN (\FONTFACE PATTERN))) + (LET ((PWEIGHT (fetch (FONTFACE WEIGHT) of PATTERN)) + (PSLOPE (fetch (FONTFACE SLOPE) of PATTERN)) + (PEXPANSION (fetch (FONTFACE EXPANSION) of PATTERN))) + (AND (OR (EQ PWEIGHT (fetch (FONTFACE WEIGHT) of FACE)) + (EQ PWEIGHT '*)) + (OR (EQ PSLOPE (fetch (FONTFACE SLOPE) of FACE)) + (EQ PSLOPE '*)) + (OR (EQ PEXPANSION (fetch (FONTFACE EXPANSION) of FACE)) + (EQ PEXPANSION '*]) (MAKEFONTFACE [LAMBDA (WEIGHT SLOPE EXPANSION BASE COLOR) (* ; "Edited 7-Nov-2025 08:50 by rmk") @@ -2971,6 +3042,27 @@ then FACE elseif (NOT NOERROR) then (\ILLEGAL.ARG FACE]) + +(FONTFACE.STARS + [LAMBDA (FACE) (* ; "Edited 19-Mar-2026 23:31 by rmk") + + (* ;; "Produces a list of font faces formed by expanding eacy of the starred components of FACE") + + (CL:WHEN (EQ FACE '*) + (SETQ FACE (create FONTFACE + WEIGHT ← '* + SLOPE ← '* + EXPANSION ← '*))) + (for W VAL inside (CL:IF (EQ '* (fetch (FONTFACE WEIGHT) of FACE)) + '(BOLD MEDIUM) + (fetch (FONTFACE WEIGHT) of FACE)) + do [for S inside (CL:IF (EQ '* (fetch (FONTFACE SLOPE) of FACE)) + '(ITALIC REGULAR) + (fetch (FONTFACE SLOPE) of FACE)) + do (for E inside (CL:IF (EQ '* (fetch (FONTFACE EXPANSION) of FACE)) + '(COMPRESSED REGULAR) + (fetch (FONTFACE EXPANSION) of FACE)) + do (push VAL (MAKEFONTFACE W S E] finally (RETURN VAL]) ) (RPAQ? \FONTSINCORE NIL) @@ -3019,6 +3111,8 @@ (DATATYPE FONTDESCRIPTOR ((FONTDEVICE POINTER) (FONTCOMPLETEP FLAG) + (FONTCOERCEDP FLAG) (* ; + "Indirects to another font via FONTCOERCIONS") (FONTFAMILY POINTER) (FONTSIZE POINTER) (FONTFACE POINTER) @@ -3027,12 +3121,12 @@ (\SFHeight WORD) (ROTATION WORD) (FONTSLUGWIDTH WORD) (* ; "Was FBBOX. The width of the slug character in the font, used by the generic \BUILDSLUGCSINFO to create the slug charsetinfo") - (NIL SIGNEDWORD) (* ; - "Was FBBOY. Can be removed if all references are recompiled.") + (MAXCHARSET WORD) (* ; + "Maximum number of charsets, usually \MAXCHARSET but maybe more for Unicode fonts.") (NIL SIGNEDWORD) (* ; "Was FBBDX") (NIL SIGNEDWORD) (* ; "Was FBBDY") (FONTTOMCCSFN POINTER) (* ; "Was \SFLKerns. Function that translates codes in the font's pre-MCCS encoding into MCCS (e.g. Hippo A to Greek,Alpha) ") - (NIL POINTER) (* ; "Was \SFRWidths") + (FONTFILENAME POINTER) (* ; "For a font read from a Medleyfont file, the name of that file. For access to future properties and to instantiate future charsets.") (FONTDEVICESPEC POINTER) (* ;  "Holds the spec by which the font is known to the printing device, if coercion has been done") (OTHERDEVICEFONTPROPS POINTER) (* ; @@ -3042,11 +3136,11 @@ (FONTAVGCHARWIDTH WORD) (* ;  "Set in FONTCREATE, used to fix up the linelength when DSPFONT is called") (FONTCHARENCODING POINTER) (* ; "Was FONTIMAGEWIDTHS: This is the image width, as opposed to the advanced width; initial hack for accents, kerning. Fields is referenced by FONTCREATE.") - (FONTCHARSETVECTOR POINTER) (* ; "A 257-pointer block, with one pointer per 'character set' --each group of 256 character codes. Each pointer is either NIL if there's no info for that charset, or is a CHARSETINFO, containing widths, char bitmap, etc for the characters in that charset. The last cell if not NIL is the %"slug%" charsetinfo that can be shared as the dummy entry for otherwise NIL charsets") + (FONTCHARSETVECTOR POINTER) (* ; "A MAXCHARSET+1-pointer block, with one pointer per 'character set' --each group of 256 character codes. Each pointer is either NIL if there's no info for that charset, or is a CHARSETINFO, containing widths, char bitmap, etc for the characters in that charset. The last cell if not NIL is the %"slug%" charsetinfo that can be shared as the dummy entry for otherwise NIL charsets") (FONTHASLEFTKERNS FLAG) (* ;  "T if at least one character set has an entry for left kerns") (FONTEXTRAFIELD2 POINTER)) - FONTCHARSETVECTOR ← (\CREATEFONTCHARSETVECTOR) + MAXCHARSET ← \MAXCHARSET FONTCHARSETVECTOR ← (\CREATEFONTCHARSETVECTOR) (INIT (DEFPRINT 'FONTDESCRIPTOR (FUNCTION FONTDESCRIPTOR.DEFPRINT)))) (RECORD FONTFACE (WEIGHT SLOPE EXPANSION) @@ -3095,7 +3189,14 @@ CHARSETNO ← MAX.SMALLP) (RECORD FONTSPEC (FSFAMILY FSSIZE FSFACE FSROTATION FSDEVICE) - (TYPE? LISTP)) + (RECORD FSFACE (FSWEIGHT FSSLOPE FSEXPANSION)) + FSROTATION ← 0 [TYPE? (AND (LISTP DATUM) + (AND (fetch (FONTSPEC FSFAMILY) of DATUM) + (LITATOM (fetch (FONTSPEC FSFAMILY) of DATUM))) + (OR (AND (SMALLP (fetch (FONTSPEC FSSIZE) of DATUM)) + (IGEQ (fetch (FONTSPEC FSSIZE) of DATUM) + 1)) + (EQ '* (fetch (FONTSPEC FSSIZE) of DATUM]) ) (/DECLAREDATATYPE 'FONTCLASS '(BYTE POINTER POINTER POINTER POINTER POINTER) @@ -3110,11 +3211,12 @@ (DEFPRINT 'FONTCLASS (FUNCTION FONTCLASS.DEFPRINT)) (/DECLAREDATATYPE 'FONTDESCRIPTOR - '(POINTER FLAG POINTER POINTER POINTER WORD WORD WORD WORD WORD SIGNEDWORD SIGNEDWORD + '(POINTER FLAG FLAG POINTER POINTER POINTER WORD WORD WORD WORD WORD WORD SIGNEDWORD SIGNEDWORD POINTER POINTER POINTER POINTER POINTER (BITS 8) WORD POINTER POINTER FLAG POINTER) '((FONTDESCRIPTOR 0 POINTER) (FONTDESCRIPTOR 0 (FLAGBITS . 0)) + (FONTDESCRIPTOR 0 (FLAGBITS . 16)) (FONTDESCRIPTOR 2 POINTER) (FONTDESCRIPTOR 4 POINTER) (FONTDESCRIPTOR 6 POINTER) @@ -3123,7 +3225,7 @@ (FONTDESCRIPTOR 10 (BITS . 15)) (FONTDESCRIPTOR 11 (BITS . 15)) (FONTDESCRIPTOR 12 (BITS . 15)) - (FONTDESCRIPTOR 13 (SIGNEDBITS . 15)) + (FONTDESCRIPTOR 13 (BITS . 15)) (FONTDESCRIPTOR 14 (SIGNEDBITS . 15)) (FONTDESCRIPTOR 15 (SIGNEDBITS . 15)) (FONTDESCRIPTOR 16 POINTER) @@ -3197,22 +3299,31 @@ (PUTPROPS \FSETIMAGEWIDTH DMACRO ((WIDTHSBLOCK INDEX WIDTH) (\PUTBASE WIDTHSBLOCK INDEX WIDTH))) + +(PUTPROPS MAXCHARSET MACRO ((FONT) + + (* ;; "0 test until all old files are gone") + + (LET ((MAX (fetch (FONTDESCRIPTOR MAXCHARSET) of FONT))) + (CL:IF (EQ MAX 0) + \MAXCHARSET + MAX)))) ) (DECLARE%: EVAL@COMPILE -(PUTPROPS \GETCHARSETINFO MACRO ((FONTDESC CHARSET) +(PUTPROPS \GETCHARSETINFO MACRO (OPENLAMBDA (FONTDESC CHARSET) - (* ;; + (* ;;  "Temporary until other callers of \GETCHARSETINFO are changes to \INSURECHARSETINFO") - (* ;; + (* ;;  "Fetches the charsetinfo for charset CHARSET in fontdescriptor FONTDESC. ") - (* ;; + (* ;;  "NOTE Current \GETCHARSETINFO takes the vector, not the font, as does current \SETCHARSETINFO") - (\GETBASEPTR (ffetch FONTCHARSETVECTOR of FONTDESC) - (UNFOLD CHARSET 2)))) + (\GETBASEPTR (ffetch FONTCHARSETVECTOR of FONTDESC) + (UNFOLD CHARSET 2)))) (PUTPROPS \SETCHARSETINFO MACRO ((FONTDESC CHARSET CSINFO) (\RPLPTR (fetch (FONTDESCRIPTOR FONTCHARSETVECTOR) of FONTDESC) @@ -3223,19 +3334,23 @@ (* ;; "fetches the charsetinfo for charset CHARSET in fontdescriptor FONTDESC. If NIL, then creates and installs the required charset, maybe a slug (with CSSLUGP T).") - (OR (\GETCHARSETINFO FONTDESC CHARSET) - (\SETCHARSETINFO FONTDESC CHARSET (\CREATECHARSET CHARSET - FONTDESC]) + (CL:IF (IGREATERP CHARSET (MAXCHARSET FONTDESC)) + (SLUGCSINFO FONTDESC) + (OR (\GETCHARSETINFO FONTDESC CHARSET) + (\SETCHARSETINFO FONTDESC CHARSET (\CREATECHARSET + CHARSET + FONTDESC))))]) (PUTPROPS \CREATECSINFOELEMENT MACRO (NIL (\ALLOCBLOCK (FOLDHI (IPLUS \MAXTHINCHAR 3) WORDSPERCELL)))) -(PUTPROPS \CREATEFONTCHARSETVECTOR MACRO (NIL +(PUTPROPS \CREATEFONTCHARSETVECTOR MACRO (OPENLAMBDA (FONT) - (* ;; "Allocates a block for the character set records, including one extra slot to hold the common slug charsetinfo") + (* ;; "Allocates a block for the character set records, including one extra slot to hold the common slug charsetinfo") - (\ALLOCBLOCK (IPLUS 2 \MAXCHARSET) - T))) + (\ALLOCBLOCK (IPLUS 2 (OR (AND FONT (MAXCHARSET FONT)) + \MAXCHARSET)) + T))) (PUTPROPS CHARSETPROP MACRO [ARGS (if (CDDR ARGS) then `(PUTMULTI (fetch (CHARSETINFO CSINFOPROPS) @@ -3245,19 +3360,14 @@ else `(GETMULTI (fetch (CHARSETINFO CSINFOPROPS) of ,(CAR ARGS)) ,(CADR ARGS]) + +(PUTPROPS SLUGCSINFO MACRO [(FONT) + (OR (\GETCHARSETINFO FONT (ADD1 (MAXCHARSET FONT))) + (\SETCHARSETINFO FONT (ADD1 (MAXCHARSET FONT)) + (\BUILDSLUGCSINFO FONT]) ) (PUTPROPS CHARSETPROP ARGNAMES (CSINFO PROP NEWVALUE)) -(DECLARE%: EVAL@COMPILE - -(RPAQ SLUGCHARINDEX (ADD1 \MAXTHINCHAR)) - -(RPAQ SLUGCHARSET (ADD1 \MAXCHARSET)) - - -(CONSTANTS (SLUGCHARINDEX (ADD1 \MAXTHINCHAR)) - (SLUGCHARSET (ADD1 \MAXCHARSET))) -) (* "END EXPORTED DEFINITIONS") @@ -3270,8 +3380,12 @@ (LET [(SOURCE (CL:UNLESS (fetch (CHARSETINFO CSSLUGP) of CSINFO) (CHARSETPROP CSINFO 'SOURCE))] - (CL:WHEN SOURCE - [NOT (EQUAL SOURCE (FONTPROP FONT 'DEVICESPEC])]) + (CL:WHEN [AND SOURCE (NOT (EQUAL SOURCE (FONTPROP FONT + 'DEVICESPEC] + (create FONTSPEC using SOURCE FSFACE ← + (FONTFACETOATOM (fetch (FONTSPEC + FSFACE) + of SOURCE))))]) ) ) (DEFINEQ @@ -3333,11 +3447,12 @@ (DEFPRINT 'FONTCLASS (FUNCTION FONTCLASS.DEFPRINT)) (/DECLAREDATATYPE 'FONTDESCRIPTOR - '(POINTER FLAG POINTER POINTER POINTER WORD WORD WORD WORD WORD SIGNEDWORD SIGNEDWORD + '(POINTER FLAG FLAG POINTER POINTER POINTER WORD WORD WORD WORD WORD WORD SIGNEDWORD SIGNEDWORD POINTER POINTER POINTER POINTER POINTER (BITS 8) WORD POINTER POINTER FLAG POINTER) '((FONTDESCRIPTOR 0 POINTER) (FONTDESCRIPTOR 0 (FLAGBITS . 0)) + (FONTDESCRIPTOR 0 (FLAGBITS . 16)) (FONTDESCRIPTOR 2 POINTER) (FONTDESCRIPTOR 4 POINTER) (FONTDESCRIPTOR 6 POINTER) @@ -3346,7 +3461,7 @@ (FONTDESCRIPTOR 10 (BITS . 15)) (FONTDESCRIPTOR 11 (BITS . 15)) (FONTDESCRIPTOR 12 (BITS . 15)) - (FONTDESCRIPTOR 13 (SIGNEDBITS . 15)) + (FONTDESCRIPTOR 13 (BITS . 15)) (FONTDESCRIPTOR 14 (SIGNEDBITS . 15)) (FONTDESCRIPTOR 15 (SIGNEDBITS . 15)) (FONTDESCRIPTOR 16 POINTER) @@ -3386,6 +3501,7 @@ (DATATYPE FONTDESCRIPTOR ((FONTDEVICE POINTER) (FONTCOMPLETEP FLAG) + (FONTCOERCEDP FLAG) (FONTFAMILY POINTER) (FONTSIZE POINTER) (FONTFACE POINTER) @@ -3394,11 +3510,11 @@ (\SFHeight WORD) (ROTATION WORD) (FONTSLUGWIDTH WORD) - (NIL SIGNEDWORD) + (MAXCHARSET WORD) (NIL SIGNEDWORD) (NIL SIGNEDWORD) (FONTTOMCCSFN POINTER) - (NIL POINTER) + (FONTFILENAME POINTER) (FONTDEVICESPEC POINTER) (OTHERDEVICEFONTPROPS POINTER) (FONTSCALE POINTER) @@ -3462,100 +3578,86 @@ (DEFINEQ (\CREATEFONT - [LAMBDA (FONTSPEC) (* ; "Edited 26-Jan-2026 15:24 by rmk") + [LAMBDA (FONTSPEC) (* ; "Edited 15-Apr-2026 00:13 by rmk") + (* ; "Edited 4-Apr-2026 23:29 by rmk") + (* ; "Edited 2-Apr-2026 23:01 by rmk") + (* ; "Edited 31-Mar-2026 22:55 by rmk") + (* ; "Edited 18-Mar-2026 22:44 by rmk") + (* ; "Edited 26-Jan-2026 15:24 by rmk") (* ; "Edited 25-Dec-2025 10:58 by rmk") (* ; "Edited 25-Sep-2025 21:24 by rmk") (* ; "Edited 28-Aug-2025 14:30 by rmk") - (* ; "Edited 18-Aug-2025 00:17 by rmk") - (* ; "Edited 16-Aug-2025 20:52 by rmk") - (* ; "Edited 12-Aug-2025 23:36 by rmk") (* ; "Edited 24-Jul-2025 19:51 by rmk") (* ; "Edited 20-May-2025 21:10 by rmk") - (* ;; "Generic font creation. Uses fontcreate method from device to build the font fontdescriptor but doesn't call SETFONTDESCRIPTOR to install it and doesn't instantiate a charset. That's deferred to FONTCREATE1. ") + (* ;; "Generic font creation. Uses fontcreate method from device to build the font fontdescriptor with font-level properties but doesn't call SETFONTDESCRIPTOR to install it and doesn't instantiate a charset. That's deferred to \CREATECHARSET. ") (* ;; "") - (LET ([FN (CAR (GETMULTI IMAGESTREAMTYPES (fetch (FONTSPEC FSDEVICE) of FONTSPEC) - 'FONTCREATE] - FONT) - [if FN - then (SETQ FONT (if (EQ (NARGS FN) - 1) - then (APPLY* FN FONTSPEC) - else (* ; "Old form: spreading FONTSPEC") - (APPLY FN FONTSPEC))) - (CL:UNLESS FONT - (CL:WHEN (SETQ FONTSPEC (COERCEFONTSPEC FONTSPEC)) - (SETQ FONT (if (EQ (NARGS FN) - 1) - then (APPLY* FN FONTSPEC) - else (APPLY FN FONTSPEC))))) - else (SETQ FONT (create FONTDESCRIPTOR - FONTFAMILY ← (fetch (FONTSPEC FSFAMILY) of FONTSPEC) - FONTSIZE ← (fetch (FONTSPEC FSSIZE) of FONTSPEC) - FONTFACE ← (fetch (FONTSPEC FSFACE) of FONTSPEC) - ROTATION ← (fetch (FONTSPEC FSROTATION) of FONTSPEC) - FONTDEVICE ← (fetch (FONTSPEC FSDEVICE) of FONTSPEC) - \SFAscent ← 0 - \SFDescent ← 0 - \SFHeight ← 0 - FONTDEVICESPEC ← (create FONTSPEC using FONTSPEC] - FONT]) + (LET (FN COERCIONSPEC FONT) + (if (FONTEXISTS? FONTSPEC T) + then [SETQ FN (CAR (GETMULTI IMAGESTREAMTYPES (fetch (FONTSPEC FSDEVICE) of FONTSPEC) + 'FONTCREATE] + (if FN + then (APPLY* FN FONTSPEC) + elseif (MEDLEYFONT.READ.FONT (CAR (FONTFILES FONTSPEC)) + NIL T) + else (FONTSPEC.TO.FONTDESCRIPTOR FONTSPEC)) + elseif [SETQ COERCIONSPEC (CAR (COERCEFONTSPEC FONTSPEC 'FONTCOERCIONS] + then + (* ;; "(Re)load the target font, change its spec labeling. Maybe the DEVICESPEC should also change, in case this is dumped? But \CREATECHARSET needs to know the device name so it doesn't keep coercing.") + + (SETQ FONT (\CREATEFONT COERCIONSPEC)) + (replace (FONTDESCRIPTOR FONTCOERCEDP) of FONT with T) + (replace (FONTDESCRIPTOR FONTFAMILY) of FONT with (fetch (FONTSPEC FSFAMILY) + of FONTSPEC)) + (replace (FONTDESCRIPTOR FONTSIZE) of FONT with (fetch (FONTSPEC FSSIZE) + of FONTSPEC)) + (replace (FONTDESCRIPTOR FONTFACE) of FONT with (fetch (FONTSPEC FSFACE) + of FONTSPEC)) + (replace (FONTDESCRIPTOR ROTATION) of FONT with (fetch (FONTSPEC FSROTATION) + of FONTSPEC)) + (replace (FONTDESCRIPTOR FONTDEVICESPEC) of FONT with COERCIONSPEC) + FONT + elseif [SETQ COERCIONSPEC (CAR (COERCEFONTSPEC FONTSPEC 'FACECOERCIONS] + then (FONTSPEC.TO.FONTDESCRIPTOR FONTSPEC (MAXCHARSET (\CREATEFONT COERCIONSPEC]) (\CREATECHARSET - [LAMBDA (CHARSET FONT) (* ; "Edited 14-Feb-2026 13:12 by rmk") + [LAMBDA (CHARSET FONT GETCHARSETFN) (* ; "Edited 12-Apr-2026 18:47 by rmk") + (* ; "Edited 4-Apr-2026 14:39 by rmk") + (* ; "Edited 31-Mar-2026 17:44 by rmk") + (* ; "Edited 29-Mar-2026 10:33 by rmk") + (* ; "Edited 27-Mar-2026 07:52 by rmk") + (* ; "Edited 18-Mar-2026 23:11 by rmk") + (* ; "Edited 16-Mar-2026 12:35 by rmk") + (* ; "Edited 13-Mar-2026 10:06 by rmk") + (* ; "Edited 14-Feb-2026 13:12 by rmk") (* ; "Edited 25-Sep-2025 21:24 by rmk") (* ; "Edited 2-Sep-2025 22:59 by rmk") (* ; "Edited 31-Aug-2025 14:36 by rmk") (* ; "Edited 28-Aug-2025 14:31 by rmk") - (* ; "Edited 27-Aug-2025 12:55 by rmk") - (* ; "Edited 25-Aug-2025 22:51 by rmk") - (* ; "Edited 16-Aug-2025 21:06 by rmk") - (* ; "Edited 12-Aug-2025 23:36 by rmk") - (* ; "Edited 5-Aug-2025 22:29 by rmk") - (* ; "Edited 3-Aug-2025 17:41 by rmk") - (* ; "Edited 29-Jul-2025 12:10 by rmk") - (* ; "Edited 22-Jul-2025 22:48 by rmk") (* ; "Edited 9-Jul-2025 11:12 by rmk") - (* ; "Edited 15-Jun-2025 14:50 by rmk") - (* ; "Edited 13-Jun-2025 20:00 by rmk") - (* ; "Edited 10-Jun-2025 13:55 by rmk") - (* ; "Edited 7-Jun-2025 15:10 by rmk") (* ; "Edited 18-May-2025 21:40 by rmk") - (* ; "Edited 16-May-2025 21:37 by rmk") (* ; "Edited 12-Jul-2022 14:37 by rmk") (* ; "Edited 8-May-93 23:42 by rmk:") (* ; "Edited 4-Dec-92 11:43 by jds") - (* ;; "Creates and returns the CHARSETINFO for charset CHARSET in fontdesc FONT, installing it in fonts FONTCHARSETVECTOR") + (* ;; "Creates and returns the CHARSETINFO for charset CHARSET in fontdesc FONT, installing it in FONT's FONTCHARSETVECTOR") - (CL:UNLESS (<= 0 CHARSET \MAXCHARSET) - (\ILLEGAL.ARG CHARSET)) - (LET [(CSINFO (if (fetch (FONTDESCRIPTOR FONTCOMPLETEP) of FONT) - then (\GETCHARSETINFO FONT CHARSET) - else (APPLY* [OR (CAR (GETMULTI IMAGESTREAMTYPES (fetch (FONTDESCRIPTOR - FONTDEVICE) - of FONT) - 'CREATECHARSET)) - (FUNCTION (LAMBDA (FONTSPEC FONT CHARSET) - (* ; - "No function: read or read-coerced-font") - (OR (\READCHARSET FONTSPEC CHARSET FONT) - (\READCHARSET (COERCEFONTSPEC FONTSPEC) - CHARSET FONT] - (create FONTSPEC using (FONTPROP FONT 'DEVICESPEC)) - FONT CHARSET] - - (* ;; "Create a descriptor of info for that charset. If we got one, the subfunction may have ignored NOSLUG?. But if not, we store it in the vector so that we don't search later. ") - - (if (AND CSINFO (NOT (fetch (CHARSETINFO CSSLUGP) of CSINFO))) - then (\INSTALLCHARSETINFO FONT CSINFO CHARSET) - elseif (SETQ CSINFO (\GETCHARSETINFO FONT SLUGCHARSET)) - else (SETQ CSINFO (\BUILDSLUGCSINFO FONT)) - (\SETCHARSETINFO FONT SLUGCHARSET CSINFO) - (\SETCHARSETINFO FONT CHARSET CSINFO)) - CSINFO]) + (OR (\GETCHARSETINFO FONT CHARSET) + (LET (CSINFO) (* ; + "Use DEVICESPEC in case it was coerced") + (SETQ CSINFO (if [OR GETCHARSETFN (SETQ GETCHARSETFN (CAR (GETMULTI IMAGESTREAMTYPES + (fetch (FONTDESCRIPTOR + FONTDEVICE) + of FONT) + 'CREATECHARSET] + then (APPLY* GETCHARSETFN (FONTPROP FONT 'DEVICESPEC) + FONT CHARSET) + else (\READCHARSET FONT CHARSET))) + (CL:WHEN CSINFO (* ; + "CSINFO could be a slug, an instantiated charset, or NIL meaning uninstantiated") + (\INSTALLCHARSETINFO FONT CSINFO CHARSET))]) (\INSTALLCHARSETINFO [LAMBDA (FONT CSINFO CHARSET) (* ; "Edited 31-Aug-2025 14:36 by rmk") @@ -3652,12 +3754,6 @@ ) (\CHAR8CODE CHARCODE)))) ) -(DECLARE%: DOEVAL@COMPILE DONTCOPY - -(LOCALVARS . T) -) - -(PUTPROPS FONT FILETYPE :FAKE-COMPILE-FILE) @@ -3676,7 +3772,12 @@ (DEFINEQ (\CREATEDISPLAYFONT - [LAMBDA (FONTSPEC) (* ; "Edited 28-Aug-2025 16:00 by rmk") + [LAMBDA (FONTSPEC) (* ; "Edited 5-May-2026 09:54 by rmk") + (* ; "Edited 15-Apr-2026 00:20 by rmk") + (* ; "Edited 11-Apr-2026 10:10 by rmk") + (* ; "Edited 29-Mar-2026 10:23 by rmk") + (* ; "Edited 16-Mar-2026 12:39 by rmk") + (* ; "Edited 28-Aug-2025 16:00 by rmk") (* ; "Edited 18-Aug-2025 11:32 by rmk") (* ; "Edited 16-Aug-2025 18:46 by rmk") (* ; "Edited 10-Aug-2025 13:24 by rmk") @@ -3687,93 +3788,65 @@ (* ; "Edited 22-May-2025 09:52 by rmk") (* ; "gbn: 25-Jan-86 18:02") - (* ;; "FONTEXISTS? has determined that there is at least one source file for this font, so the font exists in at least some character sets, d FONTCREATED1 tells us that the font descriptor is not yet availabe.") + (* ;; "Eventually, this should be removed from IMAGESTREAMTYPES, since it is the default. Left here in case something else turns up.") - (create FONTDESCRIPTOR - FONTFAMILY ← (fetch (FONTSPEC FSFAMILY) of FONTSPEC) - FONTSIZE ← (fetch (FONTSPEC FSSIZE) of FONTSPEC) - FONTFACE ← (fetch (FONTSPEC FSFACE) of FONTSPEC) - ROTATION ← (fetch (FONTSPEC FSROTATION) of FONTSPEC) - FONTDEVICE ← (fetch (FONTSPEC FSDEVICE) of FONTSPEC) - \SFAscent ← 0 - \SFDescent ← 0 - \SFHeight ← 0 - FONTDEVICESPEC ← (create FONTSPEC using FONTSPEC]) + (* ;; "FONTEXISTS? has determined that there is at least one source file for this font, so the font exists or can be faked in at least some character sets.") + + (LET [(FILE (CAR (FONTFILES FONTSPEC] + (if FILE + then (MEDLEYFONT.READ.FONT FILE NIL T) + else + (* ;; "Set up for faking") + + (FONTSPEC.TO.FONTDESCRIPTOR FONTSPEC]) (\CREATECHARSET.DISPLAY - [LAMBDA (FONTSPEC FONT CHARSET) (* ; "Edited 7-Oct-2025 17:05 by rmk") - (* ; "Edited 2-Sep-2025 23:42 by rmk") - (* ; "Edited 30-Aug-2025 19:42 by rmk") - (* ; "Edited 28-Aug-2025 23:08 by rmk") - (* ; "Edited 26-Aug-2025 23:29 by rmk") + [LAMBDA (FONTSPEC FONT CHARSET) (* ; "Edited 12-Apr-2026 18:52 by rmk") + (* ; "Edited 5-Apr-2026 10:02 by rmk") + (* ; "Edited 1-Apr-2026 10:32 by rmk") + (* ; "Edited 29-Mar-2026 10:30 by rmk") + (* ; "Edited 17-Mar-2026 16:11 by rmk") + (* ; "Edited 14-Mar-2026 12:26 by rmk") + (* ; "Edited 7-Oct-2025 17:05 by rmk") (* ; "Edited 18-Aug-2025 09:12 by rmk") (* ; "Edited 31-Jul-2025 10:14 by rmk") (* ; "Edited 13-Jul-2025 11:44 by rmk") - (* ; "Edited 20-May-2025 15:00 by rmk") (* ; "Edited 18-May-2025 23:31 by rmk") (* ; "Edited 14-Jan-88 23:42 by FS") - (* ;; "The first case is simple: A DISPLAYFONTCOERCIONS substitution for one font for another. E.g. Use the information derived for HELVETICA 4 to construct the fontdescriptor for Helvetic 3. ") + (* ;; "If the CHARSETINFO can be read from a file, then any appropriate charset or character coercions (complete, rotated, faked) are assumed to have already taken place.") - (* ;; "After that, it uses requested source files and/or DISPLAYCHARCOERCIONS to produce and complete the CHARSETINFO:") - - (* ;; "This first tries to find a source file that exactly matches the characteristics of the requested charset. The charset is %"completed%" by filling in any missing characters from further down the coercion chain. Thus, the missing characters for e.g. TERMINAL 357 will be filled in from MODERN357, and then perhaps CLASSIC357.") - - (* ;; "If an exact match file cannot be found for a requested rotation, the rotation 0 charset is obtained and rotated.") - - (* ;; "If a non-existent Kanji or Chinese charset is requested for a non-MRR face, the MRR charset is used unmodified. We don't try to boldify or italicize Kanji or Chinese.") - - (* ;; "When all coercions have been exhausted and FACE is bold and/or italic, the search process repeats with bold/italice changed to Regular, and algorithmic transformations are applied to the first result, if any.") - - (* ;; "If all else fails, it looks for the next charset in the coercion list, and fills that in with further coercions for missing characters.") + (* ;; "But if it doesn't exist on a file, it may be that face-faking or rotation can be applied to a character set that can be retrieved from an existing complete file.") (* ;; "") - (LET ((ROTATION (fetch (FONTSPEC FSROTATION) of FONTSPEC)) - (FACE (fetch (FONTSPEC FSFACE) of FONTSPEC)) - CSINFO) + (if (\READCHARSET FONT CHARSET) + else + (* ;; "Successful transformations must set the CSINFO so that it can be returned.") - (* ;; - "If no COERCIONS, skip that first \COERCECHARSET call--easier debugging of the other cases.") + (CL:UNLESS (EQ 0 (fetch (FONTSPEC FSROTATION) of FONTSPEC)) + (\SFROTATECSINFO FONTSPEC FONT CHARSET)) + (COMPLETE.CHARSET FONT CHARSET) + (CL:WHEN (FONTDEVICEPROP FONTSPEC 'FACECOERCIONS) (* ; + "Suppresses face-faking in offline COMPLETE phase") + (CL:WHEN (EQ 'BOLD (fetch (FONTSPEC FSWEIGHT) of FONTSPEC)) - (SETQ CSINFO (if (AND (FONTDEVICEPROP 'DISPLAY 'FONTCOERCIONS) - (CADR (\COERCECHARSET FONTSPEC CHARSET NIL 'FONTCOERCIONS FONT))) - elseif [SETQ CSINFO (OR (\READCHARSET FONTSPEC CHARSET FONT) - (CADR (\COERCECHARSET FONTSPEC CHARSET NIL - 'CHARCOERCIONS] - then - (* ;; "This completes CSINFO with glyphs for all codes from possibly different sources, even if just asking for a single THINCODE. We never return an incomplete CSINFO.") + (* ;; "Heuristically, an actual glyph from a completed/inherited font with the same face ought to be better than the fake from a more regular version of FONT--the algorithms aren't so good. So here the complete happens first. The problem is that the inherited font may have glyphs from its own faking, in the offline importfont sequence. There is no way to know on the fly whether any individual inherited character was faked or not") - (COMPLETE.CHARSET CSINFO FONTSPEC CHARSET FONT) - elseif (NEQ ROTATION 0) - then (CL:UNLESS (MEMB ROTATION '(90 270)) - (ERROR "Only implemented rotations are 0, 90 and 270." ROTATION - )) - (CL:WHEN (SETQ CSINFO (\CREATECHARSET.DISPLAY (create FONTSPEC - using FONTSPEC - FSROTATION ← 0) - FONT CHARSET)) - (\SFROTATECSINFO CSINFO ROTATION)) - elseif (OR (KANJICHARSETP CHARSET) - (CHINESECHARSETP CHARSET)) - then (CL:UNLESS (EQUAL FACE '(MEDIUM REGULAR REGULAR)) - (\CREATECHARSET.DISPLAY (create FONTSPEC - using FONTSPEC FSFACE ← - '(MEDIUM REGULAR REGULAR)) - FONT CHARSET)) - elseif (EQ 'BOLD (fetch (FONTFACE WEIGHT) of FACE)) - then (MAKEBOLD.CHARSET FONTSPEC CHARSET FONT) - elseif (EQ 'ITALIC (fetch (FONTFACE SLOPE) of FACE)) - then (MAKEITALIC.CHARSET FONTSPEC CHARSET FONT) - elseif (EQ 'COMPRESSED (fetch (FONTFACE EXPANSION) of FACE)) - then (\CREATECHARSET.DISPLAY (create FONTSPEC - using FONTSPEC FSFACE ← - '(MEDIUM REGULAR REGULAR)) - FONT CHARSET))) - CSINFO]) + (FAKEFACE.CHARSET FONT CHARSET (FUNCTION MAKEBOLD.CHAR) + (create FONTSPEC using FONTSPEC FSWEIGHT ← 'MEDIUM))) + (CL:WHEN (EQ 'ITALIC (fetch (FONTSPEC FSSLOPE) of FONTSPEC)) + (FAKEFACE.CHARSET FONT CHARSET (FUNCTION MAKEITALIC.CHAR) + (create FONTSPEC using FONTSPEC FSSLOPE ← 'REGULAR))) + (CL:WHEN (EQ 'COMPRESSED (fetch (FONTSPEC FSEXPANSION) of FONTSPEC)) + (FAKEFACE.CHARSET FONT CHARSET (FUNCTION MOVEFONTCHARS) + (create FONTSPEC using FONTSPEC FSEXPANSION ← 'REGULAR)))) + (\GETCHARSETINFO FONT CHARSET]) (\FONTEXISTS?.DISPLAY - [LAMBDA (FONTSPEC) (* ; "Edited 17-Dec-2025 20:56 by rmk") + [LAMBDA (FONTSPEC NOCOERCIONS) (* ; "Edited 4-Apr-2026 09:03 by rmk") + (* ; "Edited 18-Mar-2026 11:45 by rmk") + (* ; "Edited 17-Dec-2025 20:56 by rmk") (* ; "Edited 28-Aug-2025 22:12 by rmk") (* ; "Edited 25-Aug-2025 15:04 by rmk") (* ; "Edited 17-Aug-2025 09:56 by rmk") @@ -3784,323 +3857,88 @@ (* ; "Edited 13-Jul-2025 11:45 by rmk") (* ; "Edited 22-Jun-2025 08:53 by rmk") - (* ;; "Order doesn't matter here, only need one to work") + (* ;; "Order doesn't matter here, only need one to work. The CHAR coercions are done generically, if this fails. This considers the face faking to be a form of coercion, suppressed by NOCOERCION.") - (LET ((FACE (fetch (FONTSPEC FSFACE) of FONTSPEC))) - (OR [AND (EQ 'BOLD (fetch (FONTFACE WEIGHT) of FACE)) - (FONTEXISTS? (create FONTSPEC using FONTSPEC FSFACE ← - (create FONTFACE using FACE WEIGHT ← - 'MEDIUM] - [AND (EQ 'ITALIC (fetch (FONTFACE SLOPE) of FACE)) - (FONTEXISTS? (create FONTSPEC using FONTSPEC FSFACE ← - (create FONTFACE using FACE SLOPE ← - 'REGULAR] - [AND (EQ 'COMPRESSED (fetch (FONTFACE EXPANSION) of FACE)) - (FONTEXISTS? (create FONTSPEC using FONTSPEC FSFACE ← - (create FONTFACE using FACE EXPANSION ← - 'REGULAR] - (COERCEFONTSPEC FONTSPEC (APPEND (FONTDEVICEPROP 'DISPLAY 'FONTCOERCIONS) - (FONTDEVICEPROP 'DISPLAY 'CHARCOERCIONS]) + (* ;; "BIR is possible if either MIR or BRR is available, doesn't always go to MRR.") + + (CL:UNLESS NOCOERCIONS + (CL:WHEN (FONTDEVICEPROP FONTSPEC 'FACECOERCIONS) + (OR (AND (EQ 'BOLD (fetch (FONTSPEC FSWEIGHT) of FONTSPEC)) + (FONTEXISTS? (create FONTSPEC using FONTSPEC FSWEIGHT ← 'MEDIUM) + NOCOERCIONS)) + (AND (EQ 'ITALIC (fetch (FONTSPEC FSSLOPE) of FONTSPEC)) + (FONTEXISTS? (create FONTSPEC using FONTSPEC FSSLOPE ← 'REGULAR) + NOCOERCIONS)) + (AND (EQ 'COMPRESSED (fetch (FONTSPEC FSEXPANSION) of FONTSPEC)) + (FONTEXISTS? (create FONTSPEC using FONTSPEC FSEXPANSION ← 'REGULAR) + NOCOERCIONS)))))]) ) (DEFINEQ -(STRIKEFONT.FILEP - [LAMBDA (FILE) (* ; "Edited 15-May-2025 17:47 by rmk") - - (* ;; "If high bit of type is on, then must be strike. If 2nd bit is on, must be strike-index, and we punt. We don't care about the 3rd bit") - - (* ;; "first word has high bits (onebit index fixed). Onebit means 'new-style font' , index is 0 for simple strike, 1 for index, and fixed is if all chars have max width. Lisp doesn't care about 'fixed'") - - (RESETLST - (CL:UNLESS (OPENP FILE 'INPUT) - [RESETSAVE (SETQ FILE (OPENSTREAM FILE 'INPUT 'OLD)) - `(PROGN (CLOSEF? OLDVALUE]) - (CL:WHEN [MEMB (\WIN FILE) - (CONSTANT (LIST (LLSH 1 15) - (LOGOR (LLSH 1 15) - (LLSH 1 13] - T))]) - -(STRIKEFONT.GETCHARSET - [LAMBDA (STRM) (* ; "Edited 3-Aug-2025 22:27 by rmk") - (* ; "Edited 1-Aug-2025 23:50 by rmk") - (* ; "Edited 14-Jul-2025 19:52 by rmk") - (* ; "Edited 9-Jun-2025 14:22 by rmk") - (* ; "Edited 12-Jul-2022 09:19 by rmk") - (* ; "Edited 4-Dec-92 12:11 by jds") - - (* ;; "STRM has already been determined to be a vanilla strike-format file holding only the desired charset.") - (* ; "returns a charsetinfo") - (RESETLST - (CL:UNLESS (\GETSTREAM STRM 'INPUT T) - [RESETSAVE (SETQ STRM (OPENSTREAM STRM 'INPUT 'OLD)) - `(PROGN (CLOSEF? OLDVALUE]) - (SETFILEPTR STRM 0) - (CL:UNLESS (STRIKEFONT.FILEP STRM) - (ERROR "Not a STRIKE font file" STRM)) - (CL:UNLESS (EQ 2 (GETFILEPTR STRM)) - (SETFILEPTR STRM 2)) - (LET (CSINFO NUMBCODES RW BITMAP OFFSETS FIRSTCHAR LASTCHAR HEIGHT WIDTHS) - (SETQ CSINFO (create CHARSETINFO)) - (SETQ FIRSTCHAR (\WIN STRM)) (* ; "minimum ascii code") - (SETQ LASTCHAR (\WIN STRM)) (* ; "maximum ascii code") - (\WIN STRM) (* ; - "MaxWidth which isn't used by anyone.") - (\WIN STRM) (* ; - "number of words in this StrikeBody") - (replace (CHARSETINFO CHARSETASCENT) of CSINFO with (\WIN STRM)) - (* ; - "ascent in scan lines (=FBBdy+FBBoy)") - (replace (CHARSETINFO CHARSETDESCENT) of CSINFO with (\WIN STRM)) - (* ; "descent in scan-lines (=FBBoy)") - (\WIN STRM) (* ; - "offset in bits (<0 for kerning, else 0, =FBBox)") - (SETQ RW (\WIN STRM)) (* ; "raster width of bitmap") - (* ; "height of bitmap") - - (* ;; "JDS 12/4/92: Apparently, these fields can be signed values, if all chars, e.g., ride above the base line.") - - (SETQ HEIGHT (IPLUS (SIGNED (fetch (CHARSETINFO CHARSETASCENT) of CSINFO) - 16) - (SIGNED (fetch (CHARSETINFO CHARSETDESCENT) of CSINFO) - 16))) - (SETQ BITMAP (BITMAPCREATE (UNFOLD RW BITSPERWORD) - HEIGHT)) - (\BINS STRM (fetch BITMAPBASE of BITMAP) - 0 - (UNFOLD (ITIMES RW HEIGHT) - BYTESPERWORD)) (* ; "read bits into bitmap") - (replace (CHARSETINFO CHARSETBITMAP) of CSINFO with BITMAP) - (SETQ NUMBCODES (IDIFFERENCE (ADD1 LASTCHAR) - FIRSTCHAR)) - (SETQ OFFSETS (fetch (CHARSETINFO OFFSETS) of CSINFO)) - - (* ;; - "Initialize the offsets to 0, all but FIRSTCHAR to be replaced with the slug offset") - - (for I from 0 to (IPLUS \MAXTHINCHAR 2) do (\FSETOFFSET OFFSETS I 0)) - (for I from FIRSTCHAR as J from 1 to NUMBCODES do - (* ;; - "J starts at 1 because we know that the offset of J=0 is 0 ?") - - (\FSETOFFSET OFFSETS I (\WIN STRM))) - (for I (SLUGOFFSET ← (\WIN STRM)) from 0 to \MAXTHINCHAR - when (EQ 0 (\FGETOFFSET OFFSETS I)) unless (EQ I FIRSTCHAR) - do (\FSETOFFSET OFFSETS I SLUGOFFSET) finally (\FSETOFFSET OFFSETS SLUGCHARINDEX - SLUGOFFSET) - - (* ;; - "There's one more so that \FONTRESETCHARWIDTHS can get the slug width, otherwise not necessary") - - (\FSETOFFSET OFFSETS (ADD1 SLUGCHARINDEX) - (\WIN STRM))) - - (* ;; "Initialize the widths to 0") - - (SETQ WIDTHS (fetch (CHARSETINFO WIDTHS) of CSINFO)) - (for I from 0 to (IPLUS \MAXTHINCHAR 2) do (\FSETWIDTH WIDTHS I 0)) - (\FONTRESETCHARWIDTHS CSINFO 0 SLUGCHARINDEX) - (replace (CHARSETINFO IMAGEWIDTHS) of CSINFO with (fetch (CHARSETINFO WIDTHS) - of CSINFO)) - CSINFO))]) - -(WRITESTRIKEFONTFILE - [LAMBDA (FONT CHARSET FILE) (* ; "Edited 30-Aug-2025 23:21 by rmk") - (* ; "Edited 28-Aug-2025 15:09 by rmk") - (* ; "Edited 24-Aug-2025 11:39 by rmk") - (* ; "Edited 3-Aug-2025 22:33 by rmk") - (* ; "Edited 22-May-2025 09:53 by rmk") - (* ; "Edited 1-Feb-2025 12:27 by mth") - (* ; "Edited 12-Jul-2022 14:36 by rmk") - (* kbr%: "21-Oct-85 15:08") - (* ; - "Write strike FILE using info in FONT. ") - (CL:UNLESS (FONTP FONT) - (LISPERROR "ILLEGAL ARG" FONT)) - (CL:UNLESS CHARSET (SETQ CHARSET 0)) - (CL:UNLESS (AND (IGEQ CHARSET 0) - (ILEQ CHARSET \MAXCHARSET)) - (LISPERROR "ILLEGAL ARG" CHARSET)) - (LET (STREAM CSINFO FIRSTCHAR LASTCHAR WIDTHS MAXWIDTH LENGTH RASTERWIDTH SLUGOFFSET OFFSETS) - (SETQ CSINFO (\INSURECHARSETINFO FONT CHARSET)) - (CL:UNLESS CSINFO (ERROR "Couldn't find charset " CHARSET)) - (SETQ WIDTHS (fetch (CHARSETINFO WIDTHS) of CSINFO)) - (SETQ OFFSETS (fetch (CHARSETINFO OFFSETS) of CSINFO)) - (SETQ SLUGOFFSET (\FGETOFFSET OFFSETS SLUGCHARINDEX)) - - (* ;; "Find the first and last non-slug characters") - - [SETQ FIRSTCHAR (for I from 0 to \MAXTHINCHAR thereis (NEQ SLUGOFFSET (\FGETOFFSET OFFSETS I - ] - [SETQ LASTCHAR (for I from \MAXTHINCHAR to 0 by -1 thereis (NEQ SLUGOFFSET (\FGETOFFSET - OFFSETS I] - [SETQ STREAM (OPENSTREAM FILE 'OUTPUT 'NEW '((TYPE BINARY] - (\WOUT STREAM 32768) (* ; "STRIKE HEADER. ") - (\WOUT STREAM FIRSTCHAR) - (\WOUT STREAM LASTCHAR) - (SETQ MAXWIDTH 0) - [for I from 0 to SLUGCHARINDEX do (SETQ MAXWIDTH (IMAX MAXWIDTH (\FGETWIDTH WIDTHS I] - (\WOUT STREAM MAXWIDTH) (* ; "STRIKE BODY. ") - (* ; "Length. ") - (SETQ RASTERWIDTH (fetch (BITMAP BITMAPRASTERWIDTH) of (fetch (CHARSETINFO CHARSETBITMAP) - of CSINFO))) - (SETQ LENGTH (IPLUS 8 (IDIFFERENCE LASTCHAR FIRSTCHAR) - (ITIMES (fetch (FONTDESCRIPTOR \SFHeight) of FONT) - RASTERWIDTH))) - (\WOUT STREAM LENGTH) (* ; - "Ascent, Descent, Xoffset (no longer used) and Rasterwidth. ") - (\WOUT STREAM (fetch (CHARSETINFO CHARSETASCENT) of CSINFO)) - (\WOUT STREAM (fetch (CHARSETINFO CHARSETDESCENT) of CSINFO)) - (\WOUT STREAM 0) - (\WOUT STREAM RASTERWIDTH) (* ; "Bitmap. ") - [\BOUTS STREAM (fetch (BITMAP BITMAPBASE) of (fetch (CHARSETINFO CHARSETBITMAP) of CSINFO)) - 0 - (ITIMES 2 RASTERWIDTH (IPLUS (fetch (CHARSETINFO CHARSETASCENT) of CSINFO) - (fetch (CHARSETINFO CHARSETDESCENT) of CSINFO] - (* ; "Offsets. ") - [for I (OFFSET ← 0) from FIRSTCHAR to LASTCHAR first (\WOUT STREAM OFFSET) - (* ; "Offset of the first char") - do (CL:UNLESS (EQ SLUGOFFSET (\FGETOFFSET OFFSETS I)) - (* ; - "The slug isn't really here in the bitmap") - (ADD OFFSET (\FGETWIDTH WIDTHS I))) - (\WOUT STREAM OFFSET) finally (* ; - "Offset for the after-slug, for width") - (\WOUT STREAM (IPLUS OFFSET (\FGETWIDTH WIDTHS - SLUGCHARINDEX] - (CLOSEF STREAM]) - -(STRIKECSINFO - [LAMBDA (CSINFO) (* ; "Edited 27-Apr-89 13:39 by atm") - - (* ;; "Returns a STRIKE type font descriptor (EQ WIDTHS IMAGEWIDTHS), cause we know how to write those guys out (they read quicker but display slower). If (EQ WIDTHS IMAGEWIDTHS), just return original.") - - (PROG (WIDTHS OFFSETS IMWIDTHS OLDBM BMWIDTH BMHEIGHT NEWBM NEWOFFSET NEWWIDTH OLDOFFSET - DUMMYOFFSET NEWOFFSETS) - (SETQ WIDTHS (fetch (CHARSETINFO WIDTHS) of CSINFO)) - (SETQ IMWIDTHS (fetch (CHARSETINFO IMAGEWIDTHS) of CSINFO)) - (if (EQ WIDTHS IMWIDTHS) - then (RETURN CSINFO)) - (SETQ OFFSETS (fetch (CHARSETINFO OFFSETS) of CSINFO)) - (SETQ OLDBM (fetch (CHARSETINFO CHARSETBITMAP) of CSINFO)) - (SETQ DUMMYOFFSET (\FGETOFFSET OFFSETS 256)) - (SETQ BMHEIGHT (BITMAPHEIGHT OLDBM)) - [SETQ BMWIDTH (for I from 0 to \MAXTHINCHAR - sum (if (IEQP DUMMYOFFSET (\FGETOFFSET OFFSETS I)) - then 0 - else (IMAX (\FGETIMAGEWIDTH IMWIDTHS I) - (\FGETWIDTH WIDTHS I] - - (* ;; "") - - (* ;; "Initialize new offsets vector") - - (* ;; "") - - (SETQ NEWOFFSETS (\CREATECSINFOELEMENT)) - (for I from 0 to (IPLUS \MAXTHINCHAR 2) do (\FSETOFFSET NEWOFFSETS I 0)) - (\FSETOFFSET NEWOFFSETS (ADD1 \MAXTHINCHAR) - BMWIDTH) - - (* ;; "") - - (* ;; "Adjust bitmap with so width = imagewidth, fill offsets") - - (* ;; "") - - (SETQ NEWBM (BITMAPCREATE BMWIDTH BMHEIGHT 1)) - (SETQ NEWOFFSET 0) - [for I from 0 to 255 do (SETQ OLDOFFSET (\FGETOFFSET OFFSETS I)) - (if (IEQP DUMMYOFFSET OLDOFFSET) - then (\FSETOFFSET NEWOFFSETS I BMWIDTH) - else (\FSETOFFSET NEWOFFSETS I NEWOFFSET) - (SETQ NEWWIDTH (IMAX (\FGETIMAGEWIDTH IMWIDTHS I) - (\FGETWIDTH WIDTHS I))) - (BITBLT OLDBM OLDOFFSET 0 NEWBM NEWOFFSET 0 (\FGETWIDTH - IMWIDTHS I) - BMHEIGHT - 'REPLACE) - (SETQ NEWOFFSET (IPLUS NEWOFFSET NEWWIDTH] - - (* ;; "") - - (* ;; "Make new CSInfo record withs IMAGEWIDTHS, WIDTHS the same") - - (* ;; "") - - (SETQ WIDTHS (COPYALL WIDTHS)) - [for I from 0 to \MAXTHINCHAR do (\FSETWIDTH WIDTHS I (IMAX (\FGETWIDTH WIDTHS I) - (\FGETIMAGEWIDTH IMWIDTHS I] - (RETURN (create CHARSETINFO - WIDTHS ← WIDTHS - OFFSETS ← NEWOFFSETS - IMAGEWIDTHS ← WIDTHS - CHARSETBITMAP ← NEWBM - YWIDTHS ← (fetch (CHARSETINFO YWIDTHS) of CSINFO) - CHARSETASCENT ← (fetch (CHARSETINFO CHARSETASCENT) of CSINFO) - CHARSETDESCENT ← (fetch (CHARSETINFO CHARSETDESCENT) of CSINFO]) -) - - - -(* ; "Bitmap faking") - -(DEFINEQ - -(MAKEBOLD.CHARSET - [LAMBDA (FONTSPEC CHARSET FONT) (* ; "Edited 7-Sep-2025 12:02 by rmk") +(FAKEFACE.CHARSET + [LAMBDA (FONT CHARSET FAKEFN SOURCEFONT) (* ; "Edited 17-Apr-2026 08:42 by rmk") + (* ; "Edited 5-Apr-2026 00:25 by rmk") + (* ; "Edited 1-Apr-2026 09:10 by rmk") + (* ; "Edited 31-Mar-2026 00:39 by rmk") + (* ; "Edited 24-Mar-2026 10:26 by rmk") + (* ; "Edited 21-Mar-2026 22:31 by rmk") + (* ; "Edited 15-Mar-2026 14:26 by rmk") + (* ; "Edited 7-Sep-2025 12:02 by rmk") (* ; "Edited 2-Sep-2025 22:59 by rmk") (* ; "Edited 31-Aug-2025 14:36 by rmk") (* ; "Edited 26-Aug-2025 22:35 by rmk") (* ; "Edited 18-Aug-2025 09:08 by rmk") - (* ; "Edited 16-Aug-2025 12:53 by rmk") - (* ; "Edited 21-Jun-2025 09:10 by rmk") + (* ; "Edited 16-Aug-2025 12:53 by rmk") - (* ;; "BOLD is requested in FACE, so we look for an MRR or MIR that we can bold. If we find one, we presume that it is complete for all characters in its face. But there may be other fonts in the coercion chain that have true information about the bold face that we are after. We look for those before we try to adjust the characters in the non-bold CSINFO that we found.") + (* ;; "Caller has determined that slug characters in FONT should be replaced by applying FAKEFN to the corresponding SOURCEFACE characters.") - (LET ([MFONT (FONTCREATE1 (create FONTSPEC using FONTSPEC FSFACE ← (create FONTFACE - using (fetch (FONTSPEC - FSFACE) - of FONTSPEC) - WEIGHT ← 'MEDIUM] - CSINFO) + (* ;; "This assumes that SOURCEFONT has already been faked up.") - (* ;; "MFONT is the corresponding Medium font.") + (LET [CHANGED FCSINFO SCSINFO INDIRECT (FONTSPEC (FONTPROP FONT 'DEVICESPEC] + (CL:WHEN (type? FONTSPEC SOURCEFONT) + (SETQ SOURCEFONT (FONTCREATE1 SOURCEFONT CHARSET))) + (CL:WHEN (AND (SETQ SCSINFO (\GETCHARSETINFO SOURCEFONT CHARSET)) + (NOT (fetch (CHARSETINFO CSSLUGP) of SCSINFO))) + (if (OR (KANJICHARSETP CHARSET) + (UNIHANCHARSETP CHARSET)) + then (SETQ FCSINFO (COPYALL SCSINFO)) (* ; "Copy and set up an indirect") + (CHARSETPROP FCSINFO 'SOURCE (FONTPROP SOURCEFONT 'DEVICESPEC)) + (\INSTALLCHARSETINFO FONT FCSINFO CHARSET) + (SETQ CHANGED T) + elseif (AND [NOT (EQUAL FONTSPEC (SETQ INDIRECT (CHARSETPROP SCSINFO 'SOURCE] + (EQUAL (fetch (FONTSPEC FSFACE) of FONTSPEC) + (fetch (FONTSPEC FSFACE) of INDIRECT)) + (FONTFILES INDIRECT CHARSET)) + then + (* ;; "Indirect: font charset adds nothing new, it can inherit the faking of its charset-source: MODERN MIR for HELVETICA MIR rather than faking from HELVETICA MRR. Smaller file size?") - (CL:WHEN (AND MFONT (SETQ CSINFO (\GETCHARSETINFO MFONT CHARSET)) - (NOT (fetch (CHARSETINFO CSSLUGP) of CSINFO))) - (replace (FONTDESCRIPTOR FONTCHARENCODING) of FONT with (fetch (FONTDESCRIPTOR - FONTCHARENCODING) - of MFONT)) - (replace (FONTDESCRIPTOR FONTTOMCCSFN) of FONT with (fetch (FONTDESCRIPTOR FONTTOMCCSFN) - of MFONT)) - (SETQ CSINFO (COPYALL CSINFO)) (* ; "CSINFO is now the CS to be bolded") - (\SETCHARSETINFO FONT CHARSET CSINFO) - (for CODE SOURCEFONT (CHARCOERCIONS ← (FONTDEVICEPROP FONT 'CHARCOERCIONS)) - from (FIRSTCHARSETCODE CHARSET) to (LASTCHARSETCODE CHARSET) - do (if (SLUGCHARP.DISPLAY CODE FONT) - then - (* ;; "The Medium font doesn't have a glyph for THINCODE. Look for a bold glyph for THINCODE lurking somewhere down the chain, copy it up. There may be different sources for different codes. We're starting from FONT and FONTSPEC, still hoping for BOLD.") - - (CL:WHEN (SETQ SOURCEFONT (CAR (\COERCECHARSET FONTSPEC CHARSET CODE))) - (\MOVEFONTCHAR (\MOVEFONTCHARS.SOURCEDATA CODE SOURCEFONT) - CODE FONT)) - else - (* ;; "There is Medium glyph, bold it") - - (MAKEBOLD.CHAR CODE FONT))) - (replace (CHARSETINFO CSCOMPLETEP) of CSINFO with T) - CSINFO)]) + (SETQ FCSINFO (COPYALL (MEDLEYFONT.GETCHARSET INDIRECT CHARSET))) + (\INSTALLCHARSETINFO FONT FCSINFO CHARSET) + (SETQ CHANGED FCSINFO) + else (SETQ FCSINFO (OR (\GETCHARSETINFO FONT CHARSET) + (\INSTALLCHARSETINFO FONT (SLUGCSINFO FONT) + CHARSET))) + (for CODE from (FIRSTCHARSETCODE CHARSET) to (LASTCHARSETCODE CHARSET) + when (SLUGCHARP CODE FONT) unless (SLUGCHARP CODE SOURCEFONT) + do (\MOVEFONTCHAR (\MOVEFONTCHARS.SOURCEDATA CODE SOURCEFONT) + CODE FONT) + (APPLY* FAKEFN CODE FONT SOURCEFONT) + (SETQ CHANGED FCSINFO)) + (CL:WHEN CHANGED + (CHARSETPROP FCSINFO 'SOURCE FONTSPEC))) + (replace (CHARSETINFO CSCOMPLETEP) of FCSINFO with T) + CHANGED)]) (MAKEBOLD.CHAR - [LAMBDA (CODE FONT) (* ; "Edited 2-Sep-2025 22:59 by rmk") + [LAMBDA (CODE FONT) (* ; "Edited 15-Mar-2026 14:32 by rmk") + (* ; "Edited 2-Sep-2025 22:59 by rmk") (* ; "Edited 27-Aug-2025 23:55 by rmk") (* ; "Edited 26-Aug-2025 22:36 by rmk") (* ; "Edited 17-Jun-2025 08:22 by rmk") (* ;; "Replaces the bitmap for CODE in FONT with a bolder one: overlaps 2 bits to produce the bold effect. Could be iterated for bigger fonts, but eventually the open spaces would be closed up.") - (CL:UNLESS (SLUGCHARP.DISPLAY CODE FONT) + (CL:UNLESS (SLUGCHARP CODE FONT) (LET* [(THINCODE (\CHAR8CODE CODE)) (CSINFO (\GETCHARSETINFO FONT (\CHARSET CODE))) (OLDCHARBITMAP (\GETCHARBITMAP.CSINFO THINCODE CSINFO)) @@ -4118,61 +3956,16 @@ (BITBLT OLDCHARBITMAP 0 0 NEWCHARBITMAP 1 0 CWIDTH HEIGHT 'INPUT 'PAINT) (\PUTCHARBITMAP.CSINFO THINCODE CSINFO NEWCHARBITMAP)))]) -(MAKEITALIC.CHARSET - [LAMBDA (FONTSPEC CHARSET FONT) (* ; "Edited 7-Sep-2025 12:03 by rmk") - (* ; "Edited 2-Sep-2025 22:59 by rmk") - (* ; "Edited 31-Aug-2025 14:36 by rmk") - (* ; "Edited 26-Aug-2025 22:35 by rmk") - (* ; "Edited 18-Aug-2025 09:10 by rmk") - (* ; "Edited 16-Aug-2025 12:53 by rmk") - (* ; "Edited 21-Jun-2025 09:10 by rmk") - - (* ;; "ITALIC is requested, so we look for an MRR or MIR that we can italicize. If we find one, we presume that it is complete for all characters in its face. But there may be other fonts in the coercion chain that have true information about the italic face that we are after. We look for those before we try to adjust the characters in non-italic CSINFO that we found.") - - (LET ([RFONT (FONTCREATE1 (create FONTSPEC using FONTSPEC FSFACE ← (create FONTFACE - using (fetch (FONTSPEC - FSFACE) - of FONTSPEC) - SLOPE ← 'REGULAR] - CSINFO) - - (* ;; "RFONT is the corresponding Regular font.") - - (CL:WHEN (AND RFONT (SETQ CSINFO (\GETCHARSETINFO RFONT CHARSET)) - (NOT (fetch (CHARSETINFO CSSLUGP) of CSINFO))) - (replace (FONTDESCRIPTOR FONTCHARENCODING) of FONT with (fetch (FONTDESCRIPTOR - FONTCHARENCODING) - of RFONT)) - (replace (FONTDESCRIPTOR FONTTOMCCSFN) of FONT with (fetch (FONTDESCRIPTOR FONTTOMCCSFN) - of RFONT)) - (SETQ CSINFO (COPYALL CSINFO)) (* ; - "CSINFO is now the CS to be italicized") - (\SETCHARSETINFO FONT CHARSET CSINFO) - (for CODE SOURCEFONT (CHARCOERCIONS ← (FONTDEVICEPROP FONT 'CHARCOERCIONS)) - from (FIRSTCHARSETCODE CHARSET) to (LASTCHARSETCODE CHARSET) - do (if (SLUGCHARP.DISPLAY CODE FONT) - then - (* ;; "The regular font doesn't have a glyph for THINCODE. Look for an italic glyph for THINCODE lurking somewhere down the chain, copy it up. There may be different sources for different codes.") - - (CL:WHEN (SETQ SOURCEFONT (CAR (\COERCECHARSET FONTSPEC CHARSET CODE))) - (\MOVEFONTCHAR (\MOVEFONTCHARS.SOURCEDATA CODE SOURCEFONT) - CODE FONT)) - else - (* ;; "There is a Regular glyph, Italicize it.") - - (MAKEITALIC.CHAR CODE FONT))) - (replace (CHARSETINFO CSCOMPLETEP) of CSINFO with T) - CSINFO)]) - (MAKEITALIC.CHAR - [LAMBDA (CODE FONT) (* ; "Edited 2-Sep-2025 22:59 by rmk") + [LAMBDA (CODE FONT) (* ; "Edited 15-Mar-2026 14:32 by rmk") + (* ; "Edited 2-Sep-2025 22:59 by rmk") (* ; "Edited 26-Aug-2025 22:36 by rmk") (* ; "Edited 18-Jun-2025 14:12 by rmk") (* ; "Edited 17-Jun-2025 09:54 by rmk") (* ;; "Replaces the bitmap for CODE in FONT with a slanted one: It shifts rows to the right as a function of their vertical position. ") - (CL:UNLESS (SLUGCHARP.DISPLAY CODE FONT) + (CL:UNLESS (SLUGCHARP CODE FONT) (LET* ((THINCODE (\CHAR8CODE CODE)) (CSINFO (\GETCHARSETINFO FONT (\CHARSET CODE))) (OLDBITMAP (\GETCHARBITMAP.CSINFO THINCODE CSINFO)) @@ -4199,111 +3992,46 @@ 'INPUT 'REPLACE))] (\PUTCHARBITMAP.CSINFO THINCODE CSINFO NEWBITMAP)))]) - -(\SFMAKEBOLD - [LAMBDA (CSINFO) (* ; "Edited 28-Aug-2025 15:10 by rmk") - (* ; "Edited 24-Aug-2025 11:41 by rmk") - (* ; "Edited 16-Jun-2025 23:22 by rmk") - (* gbn "25-Jul-85 04:52") - (LET ((OLDCHARBITMAP (fetch (CHARSETINFO CHARSETBITMAP) of CSINFO)) - (WIDTHS (fetch (CHARSETINFO WIDTHS) of CSINFO)) - (OFFSETS (fetch (CHARSETINFO OFFSETS) of CSINFO)) - (HEIGHT (IPLUS (fetch (CHARSETINFO CHARSETASCENT) of CSINFO) - (fetch (CHARSETINFO CHARSETDESCENT) of CSINFO))) - NEWCHARBITMAP OFFSET SLUGOFFSET SLUGWIDTH) - (SETQ NEWCHARBITMAP (BITMAPCREATE (fetch BITMAPWIDTH of OLDCHARBITMAP) - (fetch BITMAPHEIGHT of OLDCHARBITMAP))) - (SETQ SLUGOFFSET (\FGETOFFSET OFFSETS SLUGCHARINDEX)) - (SETQ SLUGWIDTH (\FGETWIDTH WIDTHS SLUGCHARINDEX)) - (for I from 0 to \MAXTHINCHAR unless (EQ SLUGOFFSET (SETQ OFFSET (\FGETOFFSET OFFSETS I))) - do (* ; - "overlap two blts to produce bold effect") - (BITBLT OLDCHARBITMAP OFFSET 0 NEWCHARBITMAP OFFSET 0 (\FGETWIDTH WIDTHS I) - HEIGHT - 'INPUT - 'REPLACE) - (BITBLT OLDCHARBITMAP OFFSET 0 NEWCHARBITMAP (ADD1 OFFSET) - 0 - (SUB1 (\FGETWIDTH WIDTHS I)) - HEIGHT - 'INPUT - 'PAINT)) (* ; - "fill in the slug for the magic charcode") - (BITBLT OLDCHARBITMAP SLUGOFFSET 0 NEWCHARBITMAP SLUGOFFSET 0 SLUGWIDTH HEIGHT 'INPUT - 'REPLACE) - (create CHARSETINFO using CSINFO CHARSETBITMAP ← NEWCHARBITMAP]) - -(\SFMAKEITALIC - [LAMBDA (CSINFO) (* ; "Edited 16-Jun-2025 23:20 by rmk") - (* gbn "18-Sep-85 17:57") - (LET ((WIDTHS (fetch (CHARSETINFO WIDTHS) of CSINFO)) - (OFFSETS (fetch (CHARSETINFO OFFSETS) of CSINFO)) - (ASCENT (fetch (CHARSETINFO CHARSETASCENT) of CSINFO)) - (DESCENT (fetch (CHARSETINFO CHARSETDESCENT) of CSINFO)) - (OLDBITMAP (fetch (CHARSETINFO CHARSETBITMAP) of CSINFO)) - HEIGHT OFFSET NEWBITMAP WIDTH SLUGOFFSET SLUGWIDTH N M R XN XX YN YX) - (SETQ HEIGHT (IPLUS ASCENT DESCENT)) - (SETQ NEWBITMAP (BITMAPCREATE (fetch BITMAPWIDTH of OLDBITMAP) - (fetch BITMAPHEIGHT of OLDBITMAP))) - (SETQ SLUGOFFSET (\FGETOFFSET OFFSETS (ADD1 \MAXTHINCHAR))) - (SETQ SLUGWIDTH (\FGETWIDTH WIDTHS (ADD1 \MAXTHINCHAR))) - (SETQ N (IDIFFERENCE 0 (IQUOTIENT (IPLUS DESCENT 3) - 4))) - (SETQ M (IQUOTIENT (IPLUS ASCENT 3) - 4)) - [for I from 0 to \MAXTHINCHAR unless (EQ SLUGOFFSET (SETQ OFFSET (\FGETOFFSET OFFSETS I))) - do (SETQ WIDTH (\FGETWIDTH WIDTHS I)) - (for J from N to M do (SETQ R (IPLUS OFFSET WIDTH)) - (SETQ XN (IMIN R (IMAX (IPLUS OFFSET J) - 0))) - (SETQ XX (IMIN R (IMAX (IPLUS R J) - 0))) - [SETQ YN (IMAX 0 (IPLUS DESCENT (ITIMES J 4] - [SETQ YX (IMIN HEIGHT (IPLUS DESCENT (IPLUS (ITIMES J 4) - 4] - (CL:WHEN (AND (IGREATERP XX XN) - (IGREATERP YX YN)) - (BITBLT OLDBITMAP OFFSET YN NEWBITMAP XN YN (IDIFFERENCE - XX XN) - (IDIFFERENCE YX YN) - 'INPUT - 'REPLACE))] - (BITBLT OLDBITMAP SLUGOFFSET 0 NEWBITMAP SLUGOFFSET 0 SLUGWIDTH HEIGHT 'INPUT 'REPLACE) - (create CHARSETINFO using CSINFO CHARSETBITMAP ← NEWBITMAP]) ) + + + +(* ; "Bitmap faking") + (DEFINEQ -(\SFMAKEROTATEDFONT - [LAMBDA (FONTDESC ROTATION) (* ; "Edited 30-Mar-87 20:35 by FS") - - (* ;; "takes a fontdecriptor and rotates it.") - - (* ;; "1/5/86 JDS. Masterscope claims nobody calls this. Let's find out....") - - (HELP "ROTATED fonts need to be fixed for NS Chars & New FONTDESCRIPTOR fields") - (* (create FONTDESCRIPTOR using - FONTDESC (SETQ CHARACTERBITMAP - (\SFROTATEFONTCHARACTERS - (fetch (FONTDESCRIPTOR CHARACTERBITMAP) - of FONTDESC) ROTATION)) (SETQ ROTATION ROTATION) (SETQ \SFOffsets (\SFFIXOFFSETSAFTERROTATION - FONTDESC ROTATION)) (SETQ - FONTCHARSETVECTOR (\ALLOCBLOCK - (ADD1 \MAXCHARSET) T)))) - - (* ;; "If you uncomment out the code above, remove this comment and the NIL below") - - NIL]) - (\SFROTATECSINFO - [LAMBDA (CSINFO ROTATION) (* gbn "15-Sep-85 14:38") + [LAMBDA (FONTSPEC FONT CHARSET) (* ; "Edited 5-Apr-2026 01:31 by rmk") + (* gbn "15-Sep-85 14:38") - (* ;; "takes a CHARSETINFO and rotates it and produces a rotated equivalent one.") + (* ;; + "Replaces the CSINFO of CHARSET in FONT with one in which all the characters have been rotated.") - (create CHARSETINFO using CSINFO CHARSETBITMAP ← (\SFROTATEFONTCHARACTERS (fetch (CHARSETINFO - CHARSETBITMAP) - of CSINFO) - ROTATION) - OFFSETS ← (\SFROTATECSINFOOFFSETS CSINFO ROTATION]) + (* ;; "Only non-zero rotations are coerced here, since it isn't worth creating and storing rotated versions of all fonts. So in that case, it rotates the charset from the otherwise complete font.") + + (LET ((ROTATION (fetch (FONTSPEC FSROTATION) of FONTSPEC)) + CSINFO)) + (if (MEMB ROTATION '(90 270)) + then + (* ;; "WHAT ABOUT 180 ?") + + (* ;; "CAN THE RECURSIVE CALL BE REPLACED BY \READCHARSET ??") + + (CL:WHEN (SETQ CSINFO (\CREATECHARSET.DISPLAY (create FONTSPEC + using FONTSPEC FSROTATION ← 0) + FONT CHARSET)) + (\SETCHARSETINFO FONT CHARSET (create CHARSETINFO using CSINFO CHARSETBITMAP ← + (\SFROTATEFONTCHARACTERS + (fetch (CHARSETINFO + CHARSETBITMAP + ) + of CSINFO) + ROTATION) + OFFSETS ← ( + \SFROTATECSINFOOFFSETS + CSINFO ROTATION)) + )) + else (ERROR "Only rotations of 0, 90 and 270 are allowed" ROTATION]) (\SFROTATEFONTCHARACTERS [LAMBDA (CHARBITMAP ROTATION) (* ; "Edited 22-Sep-87 10:38 by Snow") @@ -4364,172 +4092,74 @@ (SETQ COLORCSINFO (create CHARSETINFO using BWCSINFO CHARSETBITMAP ← CHARACTERBITMAP)) (RETURN COLORCSINFO]) ) -(* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: DOEVAL@COMPILE DONTCOPY - -(GLOBALVARS DISPLAYFONTDIRECTORIES DISPLAYFONTEXTENSIONS DISPLAYCHARCOERCIONS DISPLAYFONTCOERCIONS - DISPLAYCHARSETFNS) -) - -(* "END EXPORTED DEFINITIONS") - (DECLARE%: DONTEVAL@LOAD DOCOPY -(RPAQ? DISPLAYFONTDIRECTORIES NIL) +(RPAQ? DISPLAYFONTDIRECTORIES (LIST "{MEDLEY}/fonts/medleydisplayfonts")) -(ADDTOVAR DISPLAYCHARSETFNS (STRIKE STRIKEFONT.FILEP STRIKEFONT.GETCHARSET)) +(ADDTOVAR DISPLAYFONTEXTENSIONS MEDLEYDISPLAYFONT) -(ADDTOVAR DISPLAYFONTEXTENSIONS MEDLEYDISPLAYFONT DISPLAYFONT) +(RPAQ? DISPLAYFACECOERCIONS + '[((* * (BOLD * *)) + (* * (MEDIUM * *))) + ((* * (* ITALIC *)) + (* * (* REGULAR *))) + ((* * (* * COMPRESSED)) + (* * (* * REGULAR]) ) -(RPAQ? DISPLAYFONTCOERCIONS - '(((HELVETICA (<= * 2)) - (HELVETICA 4)) - ((MODERN (<= 15 * 16)) - (* 14)) - ((MODERN (<= 17 * 21)) - (* 18)) - ((MODERN (<= 22 * 28)) - (* 24)) - ((MODERN (<= 29 * 33)) - (* 30)) - ((MODERN (<= 34 * 40)) - (* 36)) - ((MODERN (<= 41 * 65)) - (* 48)) - ((MODERN (<= 66 *)) - (* 72)) - ((PALATINO 9) - (PALATINO 12)) - ((PALATINO (<= * 8)) - (PALATINO 10)) - ((TITAN (<= * 9) - BOLD) - (MODERN 10)) - ((TITAN (<= * 9) - ITALIC) - (MODERN 10)) - ((TITAN (<= * 9)) - (TITAN 10)) - (LPT AMTEX))) - -(RPAQ? DISPLAYCHARCOERCIONS - '((GACHA TERMINAL) - (MODERN CLASSIC) - (TIMESROMAN CLASSIC) - (HELVETICA MODERN) - (TERMINAL MODERN) - (HIPPO CLASSIC) - (CYRILLIC CLASSIC) - (MATH CLASSIC) - (SIGMA MODERN) - (SYMBOL MODERN) - (TITAN CLASSIC) - (PALATINO CLASSIC) - (OPTIMA MODERN) - (BOLDPS CLASSIC) - (PCTERMINAL CLASSIC) - (TITANLEGAL CLASSIC))) - (RPAQ? \DEFAULTCHARSET 0) +(DECLARE%: DOEVAL@COMPILE DONTCOPY +(LOCALVARS . T) +) - -(* ;; "") - - - - -(* ;; "Defunct coercions? Mapping for DOS filenames, Adobe equivalences") - - -(RPAQ? ADOBEDISPLAYFONTCOERCIONS - '(((HELVETICABLACK 16) - (HELVETICABLACK 18)) - ((SYMBOL) - (ADOBESYMBOL)) - ((SYMBOL 11) - (ADOBESYMBOL 10)) - ((AVANTGARDE-DEMI) - (AVANTGARDE)) - ((AVANTGARDE-BOOK) - (AVANTGARDE)) - ((NEWCENTURYSCHLBK) - (CENTURYSCHOOLBOOK)) - ((BOOKMAN-LIGHT) - (BOOKMAN)) - ((BOOKMAN-DEMI) - (BOOKMAN)) - ((HELVETICA-NARROW) - (HELVETICANARROW)) - ((HELVETICA 24) - (ADOBEHELVETICA 24)))) - -(RPAQ? *DISPLAY-FONT-NAME-MAP* - '((TIMESROMAN . TR) - (HELVETICA . HV) - (TIMESROMAND . TD) - (HELVETICAD . HD) - (MODERN . MD) - (CLASSIC . CL) - (GACHA . GC) - (TITAN . TI) - (LETTERGOTHIC . LG) - (BOLDPS . BP) - (TERMINAL . TM) - (CLASSICTHIN . CT) - (HIPPO . HP) - (LOGO . LG) - (MATH . MA) - (OLDENGLISH . OE) - (SYMBOL . SY))) +(PUTPROPS FONT FILETYPE :FAKE-COMPILE-FILE) (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDTOVAR NLAMA ) (ADDTOVAR NLAML ) -(ADDTOVAR LAMA FONTCOPY) +(ADDTOVAR LAMA FONTCOPY FONTDEVICEPROP) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (11429 21096 (CHARWIDTH 11439 . 12228) (CHARWIDTHY 12230 . 13747) (STRINGWIDTH 13749 . -14786) (\CHARWIDTH.DISPLAY 14788 . 15203) (\STRINGWIDTH.DISPLAY 15205 . 15633) (\STRINGWIDTH.GENERIC -15635 . 21094)) (21097 27729 (DEFAULTFONT 21107 . 22392) (FONTCLASS 22394 . 24666) (FONTCLASSUNPARSE -24668 . 25569) (FONTCLASSCOMPONENT 25571 . 26159) (SETFONTCLASSCOMPONENT 26161 . 26603) ( -GETFONTCLASSCOMPONENT 26605 . 27727)) (29442 47482 (FONTCREATE 29452 . 32697) (FONTCREATE1 32699 . -35314) (FONTCREATE.SLUGFD 35316 . 36820) (\FONT.CHECKARGS1 36822 . 41527) (\FONTCREATE1.NOFN 41529 . -41743) (FONTFILEP 41745 . 42633) (\READCHARSET 42635 . 47480)) (47483 54559 (\FONT.CHECKARGS 47493 . -54242) (\CHARSET.CHECK 54244 . 54557)) (54560 61171 (COERCEFONTSPEC 54570 . 60482) ( -COERCEFONTSPEC.TARGETFACE 60484 . 61169)) (63366 64715 (MAKEFONTSPEC 63376 . 64713)) (64716 72893 ( -COMPLETE.FONT 64726 . 67249) (COMPLETEFONTP 67251 . 67874) (COMPLETE.CHARSET 67876 . 70561) ( -PRUNESLUGCSINFOS 70563 . 71488) (MONOSPACEFONTP 71490 . 72891)) (72932 81390 (FONTASCENT 72942 . 73326 -) (FONTDESCENT 73328 . 73813) (FONTHEIGHT 73815 . 74217) (FONTPROP 74219 . 80667) (\AVGCHARWIDTH 80669 - . 81388)) (82047 82955 (FONTDEVICEPROP 82057 . 82953)) (83001 83855 (EDITCHAR 83011 . 83853)) (83901 -96091 (GETCHARBITMAP 83911 . 85035) (PUTCHARBITMAP 85037 . 87195) (\GETCHARBITMAP.CSINFO 87197 . 89213 -) (\PUTCHARBITMAP.CSINFO 89215 . 96089)) (96092 117372 (MOVECHARBITMAP 96102 . 97996) (MOVEFONTCHARS -97998 . 102744) (\MOVEFONTCHAR 102746 . 107593) (\MOVEFONTCHARS.SOURCEDATA 107595 . 113710) ( -\MAKESLUGCHAR 113712 . 116247) (SLUGCHARP.DISPLAY 116249 . 117370)) (118030 129879 (FONTFILES 118040 - . 119873) (\FINDFONTFILE 119875 . 121852) (\FONTFILENAMES 121854 . 122414) (\FONTFILENAME 122416 . -125327) (FONTSPECFROMFILENAME 125329 . 129877)) (129880 166129 (FONTCOPY 129890 . 134973) (FONTP -134975 . 135274) (FONTUNPARSE 135276 . 136999) (SETFONTDESCRIPTOR 137001 . 138465) (\STREAMCHARWIDTH -138467 . 142478) (\COERCECHARSET 142480 . 145847) (\BUILDSLUGCSINFO 145849 . 149480) (\FONTSYMBOL -149482 . 150136) (\DEVICESYMBOL 150138 . 150922) (\FONTFACE 150924 . 158128) (\FONTFACE.COLOR 158130 - . 164912) (SETFONTCHARENCODING 164914 . 166127)) (166130 185807 (FONTSAVAILABLE 166140 . 171504) ( -FONTEXISTS? 171506 . 175047) (\SEARCHFONTFILES 175049 . 178136) (FLUSHFONTCACHE 178138 . 180361) ( -FINDFONTFILES 180363 . 183579) (SORTFONTSPECS 183581 . 185805)) (185808 189923 (MATCHFONTFACE 185818 - . 186633) (MAKEFONTFACE 186635 . 187669) (FONTFACETOATOM 187671 . 189921)) (190554 191046 ( -\UNITWIDTHSVECTOR 190564 . 191044)) (205689 207756 (FONTDESCRIPTOR.DEFPRINT 205699 . 207278) ( -FONTCLASS.DEFPRINT 207280 . 207754)) (211585 214375 (\CREATEKERNELEMENT 211595 . 211953) ( -\FSETLEFTKERN 211955 . 212446) (\FGETLEFTKERN 212448 . 214373)) (214376 226042 (\CREATEFONT 214386 . -217282) (\CREATECHARSET 217284 . 221793) (\INSTALLCHARSETINFO 221795 . 225129) ( -\INSTALLCHARSETINFO.CHARENCODING 225131 . 226040)) (226364 227732 (\FONTRESETCHARWIDTHS 226374 . -227730)) (228362 238439 (\CREATEDISPLAYFONT 228372 . 230239) (\CREATECHARSET.DISPLAY 230241 . 235956) -(\FONTEXISTS?.DISPLAY 235958 . 238437)) (238440 253445 (STRIKEFONT.FILEP 238450 . 239338) ( -STRIKEFONT.GETCHARSET 239340 . 244934) (WRITESTRIKEFONTFILE 244936 . 249849) (STRIKECSINFO 249851 . -253443)) (253476 269809 (MAKEBOLD.CHARSET 253486 . 257141) (MAKEBOLD.CHAR 257143 . 258895) ( -MAKEITALIC.CHARSET 258897 . 262576) (MAKEITALIC.CHAR 262578 . 264924) (\SFMAKEBOLD 264926 . 267152) ( -\SFMAKEITALIC 267154 . 269807)) (269810 273834 (\SFMAKEROTATEDFONT 269820 . 271054) (\SFROTATECSINFO -271056 . 271731) (\SFROTATEFONTCHARACTERS 271733 . 272117) (\SFROTATECSINFOOFFSETS 272119 . 273832)) ( -273835 275009 (\SFMAKECOLOR 273845 . 275007))))) + (FILEMAP (NIL (6638 16305 (CHARWIDTH 6648 . 7437) (CHARWIDTHY 7439 . 8956) (STRINGWIDTH 8958 . 9995) ( +\CHARWIDTH.DISPLAY 9997 . 10412) (\STRINGWIDTH.DISPLAY 10414 . 10842) (\STRINGWIDTH.GENERIC 10844 . +16303)) (16306 22938 (DEFAULTFONT 16316 . 17601) (FONTCLASS 17603 . 19875) (FONTCLASSUNPARSE 19877 . +20778) (FONTCLASSCOMPONENT 20780 . 21368) (SETFONTCLASSCOMPONENT 21370 . 21812) (GETFONTCLASSCOMPONENT + 21814 . 22936)) (24386 44288 (FONTCREATE 24396 . 27641) (FONTCREATE1 27643 . 30302) ( +FONTCREATE.SLUGFD 30304 . 32868) (\FONT.CHECKARGS1 32870 . 37575) (\FONTCREATE1.NOFN 37577 . 37791) ( +FONTFILEP 37793 . 38681) (\READCHARSET 38683 . 43868) (FONTCHARSETS 43870 . 44286)) (44289 51365 ( +\FONT.CHECKARGS 44299 . 51048) (\CHARSET.CHECK 51050 . 51363)) (51366 57726 (COERCEFONTSPEC 51376 . +57037) (COERCEFONTSPEC.TARGETFACE 57039 . 57724)) (59921 63339 (MAKEFONTSPEC 59931 . 61584) ( +FONTSPEC.TO.FONTDESCRIPTOR 61586 . 63337)) (63340 73002 (COMPLETE.FONT 63350 . 65375) (COMPLETEFONTP +65377 . 66115) (COMPLETE.CHARSET 66117 . 70183) (PRUNESLUGCSINFOS 70185 . 71496) (MONOSPACEFONTP 71498 + . 73000)) (73041 82855 (FONTASCENT 73051 . 73435) (FONTDESCENT 73437 . 73922) (FONTHEIGHT 73924 . +74326) (FONTPROP 74328 . 82132) (\AVGCHARWIDTH 82134 . 82853)) (83603 85473 (FONTDEVICEPROP 83613 . +85471)) (85590 86444 (EDITCHAR 85600 . 86442)) (86490 98680 (GETCHARBITMAP 86500 . 87624) ( +PUTCHARBITMAP 87626 . 89784) (\GETCHARBITMAP.CSINFO 89786 . 91802) (\PUTCHARBITMAP.CSINFO 91804 . +98678)) (98681 121022 (MOVECHARBITMAP 98691 . 100585) (MOVEFONTCHARS 100587 . 105737) (\MOVEFONTCHAR +105739 . 110611) (\MOVEFONTCHARS.SOURCEDATA 110613 . 117368) (\MAKESLUGCHAR 117370 . 119905) ( +SLUGCHARP 119907 . 121020)) (121937 135191 (FONTFILES 121947 . 124986) (\FINDFONTFILE 124988 . 126965) + (\FONTFILENAMES 126967 . 127527) (\FONTFILENAME 127529 . 130639) (FONTSPECFROMFILENAME 130641 . +135189)) (135192 171525 (FONTCOPY 135202 . 140285) (FONTP 140287 . 140586) (FONTUNPARSE 140588 . +142311) (SETFONTDESCRIPTOR 142313 . 143777) (\STREAMCHARWIDTH 143779 . 147790) (\COERCECHARSET 147792 + . 151181) (\BUILDSLUGCSINFO 151183 . 154876) (\FONTSYMBOL 154878 . 155532) (\DEVICESYMBOL 155534 . +156318) (\FONTFACE 156320 . 163524) (\FONTFACE.COLOR 163526 . 170308) (SETFONTCHARENCODING 170310 . +171523)) (171526 192384 (FONTSAVAILABLE 171536 . 176900) (FONTEXISTS? 176902 . 180710) ( +\SEARCHFONTFILES 180712 . 183926) (FLUSHFONTCACHE 183928 . 186459) (FINDFONTFILES 186461 . 189677) ( +SORTFONTSPECS 189679 . 192382)) (192385 197923 (MATCHFONTFACE 192395 . 193470) (MAKEFONTFACE 193472 . +194506) (FONTFACETOATOM 194508 . 196758) (FONTFACE.STARS 196760 . 197921)) (198554 199046 ( +\UNITWIDTHSVECTOR 198564 . 199044)) (215967 218034 (FONTDESCRIPTOR.DEFPRINT 215977 . 217556) ( +FONTCLASS.DEFPRINT 217558 . 218032)) (221956 224746 (\CREATEKERNELEMENT 221966 . 222324) ( +\FSETLEFTKERN 222326 . 222817) (\FGETLEFTKERN 222819 . 224744)) (224747 235901 (\CREATEFONT 224757 . +228365) (\CREATECHARSET 228367 . 231652) (\INSTALLCHARSETINFO 231654 . 234988) ( +\INSTALLCHARSETINFO.CHARENCODING 234990 . 235899)) (236223 237591 (\FONTRESETCHARWIDTHS 236233 . +237589)) (238114 246273 (\CREATEDISPLAYFONT 238124 . 240332) (\CREATECHARSET.DISPLAY 240334 . 243858) +(\FONTEXISTS?.DISPLAY 243860 . 246271)) (246274 254652 (FAKEFACE.CHARSET 246284 . 250346) ( +MAKEBOLD.CHAR 250348 . 252201) (MAKEITALIC.CHAR 252203 . 254650)) (254683 258938 (\SFROTATECSINFO +254693 . 256835) (\SFROTATEFONTCHARACTERS 256837 . 257221) (\SFROTATECSINFOOFFSETS 257223 . 258936)) ( +258939 260113 (\SFMAKECOLOR 258949 . 260111))))) STOP diff --git a/sources/FONT.LCOM b/sources/FONT.LCOM index a5dd6584..a050e71a 100644 Binary files a/sources/FONT.LCOM and b/sources/FONT.LCOM differ diff --git a/sources/INTERPRESS b/sources/INTERPRESS index f2097c89..d3f976cb 100644 --- a/sources/INTERPRESS +++ b/sources/INTERPRESS @@ -1,10 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "19-Jan-2026 17:21:17" {WMEDLEY}INTERPRESS.;105 215365 +(FILECREATED "26-Apr-2026 11:31:17" {WMEDLEY}INTERPRESS.;111 215607 :EDIT-BY rmk - :PREVIOUS-DATE "24-Dec-2025 11:24:31" {WMEDLEY}INTERPRESS.;104) + :CHANGES-TO (VARS INTERPRESSCOMS) + + :PREVIOUS-DATE "18-Mar-2026 09:45:13" {MEDLEY}INTERPRESS.;107) (PRETTYCOMPRINT INTERPRESSCOMS) @@ -95,7 +97,8 @@ (ADDVARS (INTERPRESSFONTEXTENSIONS MEDLEYINTERPRESSFONT WD)) [COMS (* ;  "Interpress fonts; but see MEDLEY-INIT-VARS") - [INITVARS (INTERPRESSFONTDIRECTORIES '(fonts>medleyinterpressfonts> fonts>ipfonts>)) + [INITVARS (INTERPRESSFONTDIRECTORIES (LIST "{MEDLEY}medleyinterpressfonts>" + "{MEDLEY}ipfonts>")) (INTERPRESSPRINTWHEELFAMILIES '(BOLDPS ELITE LETTERGOTHIC MASTER PICA PSBOLD SCIENTIFIC SPOKESMAN TITAN TREND TRENDPS TROJAN VINTAGE)) @@ -3529,7 +3532,8 @@ (* ; "Interpress fonts; but see MEDLEY-INIT-VARS") -(RPAQ? INTERPRESSFONTDIRECTORIES '(fonts>medleyinterpressfonts> fonts>ipfonts>)) +(RPAQ? INTERPRESSFONTDIRECTORIES (LIST "{MEDLEY}medleyinterpressfonts>" + "{MEDLEY}ipfonts>")) (RPAQ? INTERPRESSPRINTWHEELFAMILIES '(BOLDPS ELITE LETTERGOTHIC MASTER PICA PSBOLD SCIENTIFIC SPOKESMAN TITAN TREND TRENDPS TROJAN VINTAGE)) @@ -3562,15 +3566,15 @@ FONTTOMCCSFN _ (MCCSMAPFN FONTSPEC]) (\CREATECHARSET.IP - [LAMBDA (FONTSPEC FONT CHARSET) (* ; "Edited 7-Sep-2025 23:23 by rmk") + [LAMBDA (FONTSPEC FONT CHARSET) (* ; "Edited 17-Mar-2026 08:58 by rmk") + (* ; "Edited 7-Sep-2025 23:23 by rmk") (* ; "Edited 30-Aug-2025 14:24 by rmk") (* ; "Edited 28-Aug-2025 23:24 by rmk") (* ; "Edited 26-Aug-2025 23:43 by rmk") (* ; "Edited 16-Aug-2025 17:46 by rmk") (* ; "Edited 5-Aug-2025 22:33 by rmk") (* ; "Edited 23-Jul-2025 13:22 by rmk") - (OR (\READCHARSET FONTSPEC CHARSET FONT) - (CADR (\COERCECHARSET FONTSPEC CHARSET]) + (\READCHARSET FONTSPEC CHARSET]) ) (DEFINEQ @@ -3827,44 +3831,44 @@ (LOADDEF 'BRUSH 'RECORDS 'IMAGEIO) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (16593 22245 (APPENDBYTE.IP 16603 . 16739) (APPENDIDENTIFIER.IP 16741 . 17263) ( -APPENDINT.IP 17265 . 17716) (APPENDINTEGER.IP 17718 . 18290) (APPENDLARGEVECTOR.IP 18292 . 19257) ( -APPENDNUMBER.IP 19259 . 19728) (APPENDOP.IP 19730 . 20376) (APPENDRATIONAL.IP 20378 . 20871) ( -APPENDSEQUENCEDESCRIPTOR.IP 20873 . 22068) (BYTESININT.IP 22070 . 22243)) (22281 62088 (ARCTO.IP 22291 - . 23572) (BEGINMASTER.IP 23574 . 23847) (BEGINPAGE.IP 23849 . 24205) (BEGINPREAMBLE.IP 24207 . 24578) - (CLIPRECTANGLE.IP 24580 . 25070) (CONCAT.IP 25072 . 25337) (CONCATT.IP 25339 . 25606) (ENDMASTER.IP -25608 . 26052) (ENDPAGE.IP 26054 . 26431) (ENDPREAMBLE.IP 26433 . 27232) (FGET.IP 27234 . 27537) ( -FILLRECTANGLE.IP 27539 . 29867) (FILLTRAJECTORY.IP 29869 . 30504) (FILLNGON.IP 30506 . 32783) (FSET.IP - 32785 . 33088) (GETFRAMEVAR.IP 33090 . 33408) (INITIALIZEMASTER.IP 33410 . 34011) (INITIALIZECOLOR.IP - 34013 . 35334) (ISET.IP 35336 . 35707) (GETCP.IP 35709 . 36018) (LINETO.IP 36020 . 36625) ( -MASKSTROKE.IP 36627 . 36900) (MOVETO.IP 36902 . 37239) (ROTATE.IP 37241 . 37543) (SCALE.IP 37545 . -37848) (SCALE2.IP 37850 . 38187) (SETCOLOR.IP 38189 . 40418) (SETRGB.IP 40420 . 41476) (SETCOLORLV.IP -41478 . 46091) (SETCOLOR16.IP 46093 . 49199) (SETFONT.IP 49201 . 50022) (SETSPACE.IP 50024 . 50336) ( -SETXREL.IP 50338 . 51522) (SETX.IP 51524 . 53041) (SETXY.IP 53043 . 54215) (SETXYREL.IP 54217 . 55523) - (SETY.IP 55525 . 56834) (SETYREL.IP 56836 . 57736) (SHOW.IP 57738 . 60998) (TRAJECTORY.IP 61000 . -61398) (TRANS.IP 61400 . 61739) (TRANSLATE.IP 61741 . 62086)) (62119 68209 (\CHANGE-VISIBLE-REGION.IP -62129 . 65790) (\PAPERSIZE.IP 65792 . 66613) (HEADINGOP.IP 66615 . 68207)) (68210 172730 ( -DEFINEFONT.IP 68220 . 69194) (FONTNAME.IP 69196 . 70126) (INTERPRESS.BITMAPSCALE 70128 . 70921) ( -INTERPRESS.OUTCHARFN 70923 . 77430) (NEWLINE.IP 77432 . 78164) (NEWPAGE.IP 78166 . 83141) (NEWPAGE?.IP - 83143 . 83622) (OPENIPSTREAM 83624 . 91975) (SETUPFONTS.IP 91977 . 92969) (SHOWBITMAP.IP 92971 . -97512) (\BITMAPSIZE.IP 97514 . 98291) (SHOWBITMAP1.IP 98293 . 102665) (SHOWSHADE.IP 102667 . 103620) ( -\BITBLT.IP 103622 . 107826) (\SCALEDBITBLT.IP 107828 . 111473) (\BLTSHADE.IP 111475 . 112933) ( -\CHARWIDTH.IP 112935 . 113385) (\CLOSEIPSTREAM 113387 . 113714) (\DRAWARC.IP 113716 . 114163) ( -\DRAWCURVE.IP 114165 . 116602) (\DRAWPOINT.IP 116604 . 117641) (\DSPCOLOR.IP 117643 . 118594) ( -ENSURE.RGB 118596 . 119260) (\IPCURVE2 119262 . 132516) (\CLIPCURVELINE.IP 132518 . 137216) ( -\DRAWLINE.IP 137218 . 140950) (\CLIPLINE 140952 . 145652) (\DSPBOTTOMMARGIN.IP 145654 . 146070) ( -\DSPFONT.IP 146072 . 150832) (\DSPLEFTMARGIN.IP 150834 . 151294) (\DSPLINEFEED.IP 151296 . 151963) ( -\DSPRIGHTMARGIN.IP 151965 . 152762) (\DSPSPACEFACTOR.IP 152764 . 153893) (\DSPTOPMARGIN.IP 153895 . -154331) (\DSPXPOSITION.IP 154333 . 155320) (\DSPROTATE.IP 155322 . 155500) (\PUSHSTATE.IP 155502 . -156394) (\POPSTATE.IP 156396 . 157031) (\DEFAULTSTATE.IP 157033 . 157385) (\DSPTRANSLATE.IP 157387 . -157568) (\DSPSCALE2.IP 157570 . 157745) (\DSPYPOSITION.IP 157747 . 158048) (FILLCIRCLE.IP 158050 . -159133) (\FILLPOLYGON.IP 159135 . 160466) (\DRAWPOLYGON.IP 160468 . 166598) (\FIXLINELENGTH.IP 166600 - . 167814) (\MOVETO.IP 167816 . 168180) (\SETBRUSH.IP 168182 . 170348) (\STRINGWIDTH.IP 170350 . -170753) (\DSPCLIPPINGREGION.IP 170755 . 171931) (\DSPOPERATION.IP 171933 . 172728)) (172731 174630 ( -INTERPRESSFILEP 172741 . 174174) (INTERPRESS.TEDIT 174176 . 174628)) (174821 175576 (IP-TOS 174831 . -175091) (POP-IP-STACK 175093 . 175388) (PUSH-IP-STACK 175390 . 175574)) (175637 176561 ( -\CHANGECHARSET.IP 175647 . 176559)) (176562 180178 (\INTERPRESSINIT 176572 . 180176)) (193262 195686 ( -INTERPRESSBITMAP 193272 . 195684)) (197983 200604 (\CREATEINTERPRESSFONT 197993 . 199721) ( -\CREATECHARSET.IP 199723 . 200602)) (200605 212778 (IPFONT.FILEP 200615 . 200799) (IPFONT.GETCHARSET -200801 . 210899) (\FACECODE 210901 . 211491) (\FAMILYCODE 211493 . 212776))))) + (FILEMAP (NIL (16717 22369 (APPENDBYTE.IP 16727 . 16863) (APPENDIDENTIFIER.IP 16865 . 17387) ( +APPENDINT.IP 17389 . 17840) (APPENDINTEGER.IP 17842 . 18414) (APPENDLARGEVECTOR.IP 18416 . 19381) ( +APPENDNUMBER.IP 19383 . 19852) (APPENDOP.IP 19854 . 20500) (APPENDRATIONAL.IP 20502 . 20995) ( +APPENDSEQUENCEDESCRIPTOR.IP 20997 . 22192) (BYTESININT.IP 22194 . 22367)) (22405 62212 (ARCTO.IP 22415 + . 23696) (BEGINMASTER.IP 23698 . 23971) (BEGINPAGE.IP 23973 . 24329) (BEGINPREAMBLE.IP 24331 . 24702) + (CLIPRECTANGLE.IP 24704 . 25194) (CONCAT.IP 25196 . 25461) (CONCATT.IP 25463 . 25730) (ENDMASTER.IP +25732 . 26176) (ENDPAGE.IP 26178 . 26555) (ENDPREAMBLE.IP 26557 . 27356) (FGET.IP 27358 . 27661) ( +FILLRECTANGLE.IP 27663 . 29991) (FILLTRAJECTORY.IP 29993 . 30628) (FILLNGON.IP 30630 . 32907) (FSET.IP + 32909 . 33212) (GETFRAMEVAR.IP 33214 . 33532) (INITIALIZEMASTER.IP 33534 . 34135) (INITIALIZECOLOR.IP + 34137 . 35458) (ISET.IP 35460 . 35831) (GETCP.IP 35833 . 36142) (LINETO.IP 36144 . 36749) ( +MASKSTROKE.IP 36751 . 37024) (MOVETO.IP 37026 . 37363) (ROTATE.IP 37365 . 37667) (SCALE.IP 37669 . +37972) (SCALE2.IP 37974 . 38311) (SETCOLOR.IP 38313 . 40542) (SETRGB.IP 40544 . 41600) (SETCOLORLV.IP +41602 . 46215) (SETCOLOR16.IP 46217 . 49323) (SETFONT.IP 49325 . 50146) (SETSPACE.IP 50148 . 50460) ( +SETXREL.IP 50462 . 51646) (SETX.IP 51648 . 53165) (SETXY.IP 53167 . 54339) (SETXYREL.IP 54341 . 55647) + (SETY.IP 55649 . 56958) (SETYREL.IP 56960 . 57860) (SHOW.IP 57862 . 61122) (TRAJECTORY.IP 61124 . +61522) (TRANS.IP 61524 . 61863) (TRANSLATE.IP 61865 . 62210)) (62243 68333 (\CHANGE-VISIBLE-REGION.IP +62253 . 65914) (\PAPERSIZE.IP 65916 . 66737) (HEADINGOP.IP 66739 . 68331)) (68334 172854 ( +DEFINEFONT.IP 68344 . 69318) (FONTNAME.IP 69320 . 70250) (INTERPRESS.BITMAPSCALE 70252 . 71045) ( +INTERPRESS.OUTCHARFN 71047 . 77554) (NEWLINE.IP 77556 . 78288) (NEWPAGE.IP 78290 . 83265) (NEWPAGE?.IP + 83267 . 83746) (OPENIPSTREAM 83748 . 92099) (SETUPFONTS.IP 92101 . 93093) (SHOWBITMAP.IP 93095 . +97636) (\BITMAPSIZE.IP 97638 . 98415) (SHOWBITMAP1.IP 98417 . 102789) (SHOWSHADE.IP 102791 . 103744) ( +\BITBLT.IP 103746 . 107950) (\SCALEDBITBLT.IP 107952 . 111597) (\BLTSHADE.IP 111599 . 113057) ( +\CHARWIDTH.IP 113059 . 113509) (\CLOSEIPSTREAM 113511 . 113838) (\DRAWARC.IP 113840 . 114287) ( +\DRAWCURVE.IP 114289 . 116726) (\DRAWPOINT.IP 116728 . 117765) (\DSPCOLOR.IP 117767 . 118718) ( +ENSURE.RGB 118720 . 119384) (\IPCURVE2 119386 . 132640) (\CLIPCURVELINE.IP 132642 . 137340) ( +\DRAWLINE.IP 137342 . 141074) (\CLIPLINE 141076 . 145776) (\DSPBOTTOMMARGIN.IP 145778 . 146194) ( +\DSPFONT.IP 146196 . 150956) (\DSPLEFTMARGIN.IP 150958 . 151418) (\DSPLINEFEED.IP 151420 . 152087) ( +\DSPRIGHTMARGIN.IP 152089 . 152886) (\DSPSPACEFACTOR.IP 152888 . 154017) (\DSPTOPMARGIN.IP 154019 . +154455) (\DSPXPOSITION.IP 154457 . 155444) (\DSPROTATE.IP 155446 . 155624) (\PUSHSTATE.IP 155626 . +156518) (\POPSTATE.IP 156520 . 157155) (\DEFAULTSTATE.IP 157157 . 157509) (\DSPTRANSLATE.IP 157511 . +157692) (\DSPSCALE2.IP 157694 . 157869) (\DSPYPOSITION.IP 157871 . 158172) (FILLCIRCLE.IP 158174 . +159257) (\FILLPOLYGON.IP 159259 . 160590) (\DRAWPOLYGON.IP 160592 . 166722) (\FIXLINELENGTH.IP 166724 + . 167938) (\MOVETO.IP 167940 . 168304) (\SETBRUSH.IP 168306 . 170472) (\STRINGWIDTH.IP 170474 . +170877) (\DSPCLIPPINGREGION.IP 170879 . 172055) (\DSPOPERATION.IP 172057 . 172852)) (172855 174754 ( +INTERPRESSFILEP 172865 . 174298) (INTERPRESS.TEDIT 174300 . 174752)) (174945 175700 (IP-TOS 174955 . +175215) (POP-IP-STACK 175217 . 175512) (PUSH-IP-STACK 175514 . 175698)) (175761 176685 ( +\CHANGECHARSET.IP 175771 . 176683)) (176686 180302 (\INTERPRESSINIT 176696 . 180300)) (193386 195810 ( +INTERPRESSBITMAP 193396 . 195808)) (198173 200846 (\CREATEINTERPRESSFONT 198183 . 199911) ( +\CREATECHARSET.IP 199913 . 200844)) (200847 213020 (IPFONT.FILEP 200857 . 201041) (IPFONT.GETCHARSET +201043 . 211141) (\FACECODE 211143 . 211733) (\FAMILYCODE 211735 . 213018))))) STOP diff --git a/sources/INTERPRESS.LCOM b/sources/INTERPRESS.LCOM index 19d50a01..64fcee5b 100644 Binary files a/sources/INTERPRESS.LCOM and b/sources/INTERPRESS.LCOM differ diff --git a/sources/LLBIGNUM b/sources/LLBIGNUM index 0ffdb3eb..2e46a59b 100644 --- a/sources/LLBIGNUM +++ b/sources/LLBIGNUM @@ -1,23 +1,21 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 1-Jan-99 21:45:52" {DSK}disk3>lispcore3.0>sources>LLBIGNUM.;2 41438 +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) - changes to%: (FNS \INITBIGNUMS) +(FILECREATED "17-Apr-2026 09:00:35" {MEDLEY}LLBIGNUM.;2 41059 - previous date%: "19-Jan-93 10:44:45" {DSK}disk3>lispcore3.0>sources>LLBIGNUM.;1) + :EDIT-BY rmk + :CHANGES-TO (VARS LLBIGNUMCOMS) + + :PREVIOUS-DATE " 1-Jan-99 21:45:52" {MEDLEY}LLBIGNUM.;1) -(* ; " -Copyright (c) 1985, 1986, 1987, 1990, 1993, 1999 by Venue & Xerox Corporation. All rights reserved. -") (PRETTYCOMPRINT LLBIGNUMCOMS) -(RPAQQ LLBIGNUMCOMS +(RPAQQ LLBIGNUMCOMS [(COMS (DECLARE%: EVAL@COMPILE DONTCOPY (RECORDS BIGNUM)) (INITRECORDS BIGNUM) (CONSTANTS \BIGNUM.THETA (\BIGNUM.BETA (EXPT 2 14)) (\BIGNUM.BETA1 (SUB1 \BIGNUM.BETA))) - [DECLARE%: EVAL@COMPILE (ADDVARS (CHARACTERNAMES (INFINITY 8551] (ADDVARS (GLOBALVARS MIN.INTEGER MAX.INTEGER \BIG.0 \BIG.1))) (COMS (* ; "entries") (FNS \BIGNUM.COMPARE \BIGNUM.DIFFERENCE \BIGNUM.INTEGERLENGTH \BIGNUM.LOGAND @@ -40,7 +38,7 @@ Copyright (c) 1985, 1986, 1987, 1990, 1993, 1999 by Venue & Xerox Corporation. (DECLARE%: EVAL@COMPILE (DATATYPE BIGNUM (ELEMENTS) - (INIT (DEFPRINT 'BIGNUM 'BIGNUM.DEFPRINT))) + (INIT (DEFPRINT 'BIGNUM 'BIGNUM.DEFPRINT))) ) (/DECLAREDATATYPE 'BIGNUM '(POINTER) @@ -67,10 +65,6 @@ Copyright (c) 1985, 1986, 1987, 1990, 1993, 1999 by Venue & Xerox Corporation. (CONSTANTS \BIGNUM.THETA (\BIGNUM.BETA (EXPT 2 14)) (\BIGNUM.BETA1 (SUB1 \BIGNUM.BETA))) ) -(DECLARE%: EVAL@COMPILE - -(ADDTOVAR CHARACTERNAMES (INFINITY 8551)) -) (ADDTOVAR GLOBALVARS MIN.INTEGER MAX.INTEGER \BIG.0 \BIG.1) @@ -1134,20 +1128,19 @@ Copyright (c) 1985, 1986, 1987, 1990, 1993, 1999 by Venue & Xerox Corporation. (\INITBIGNUMS) ) -(PUTPROPS LLBIGNUM COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1990 1993 1999)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (2909 9796 (\BIGNUM.COMPARE 2919 . 3420) (\BIGNUM.DIFFERENCE 3422 . 3650) ( -\BIGNUM.INTEGERLENGTH 3652 . 3819) (\BIGNUM.LOGAND 3821 . 4589) (\BIGNUM.LOGOR 4591 . 5324) ( -\BIGNUM.LOGXOR 5326 . 6213) (\BIGNUM.PLUS 6215 . 6432) (\BIGNUM.LSH 6434 . 8017) (\BIGNUM.TIMES 8019 - . 8238) (\BIGNUM.QUOTIENT 8240 . 9178) (\BIGNUM.REMAINDER 9180 . 9552) (\BIGNUM.TO.FLOAT 9554 . 9794) -) (9797 10175 (FINITEP 9807 . 9993) (INFINITEP 9995 . 10173)) (10211 40300 (\BIGNUM.TO.INT 10221 . -10473) (\BN.2TH 10475 . 10859) (\BN.ABS 10861 . 11066) (\BN.DIFFERENCE 11068 . 11218) (\BN.DIVIDE -11220 . 16135) (\BN.FLOAT 16137 . 19004) (\BN.IGNN 19006 . 19392) (BIGNUM.DEFPRINT 19394 . 22989) ( -\BN.INTEGERLENGTH 22991 . 23418) (\BN.LOGAND 23420 . 23956) (\BN.LOGANDC2 23958 . 24510) (\BN.LOGOR -24512 . 24825) (\BN.LOGXOR 24827 . 25143) (\BN.MINUS 25145 . 25500) (\BN.PLUS2 25502 . 26588) ( -\BN.SIGN 26590 . 27036) (\BN.TIMES2 27038 . 29091) (\BN.COMPAREN 29093 . 30382) (\BN.D2TH 30384 . -31579) (\BN.FROM.FIXP 31581 . 32143) (\BN.ICANON 32145 . 33362) (\BN.IDIVIDE 33364 . 33525) (\BN.ISUM0 - 33527 . 34192) (\BN.ISUM1 34194 . 34927) (\BN.MADD 34929 . 35708) (\BN.TO.FIXP 35710 . 36321) ( -\BN.NZEROS 36323 . 36480) (\BN.QRS 36482 . 37289) (\BN.SIGN 37291 . 37737) (\BN.TH2B 37739 . 38222) ( -\BN.TH2D 38224 . 40298)) (40301 41091 (\INITBIGNUMS 40311 . 41089))))) + (FILEMAP (NIL (2620 9507 (\BIGNUM.COMPARE 2630 . 3131) (\BIGNUM.DIFFERENCE 3133 . 3361) ( +\BIGNUM.INTEGERLENGTH 3363 . 3530) (\BIGNUM.LOGAND 3532 . 4300) (\BIGNUM.LOGOR 4302 . 5035) ( +\BIGNUM.LOGXOR 5037 . 5924) (\BIGNUM.PLUS 5926 . 6143) (\BIGNUM.LSH 6145 . 7728) (\BIGNUM.TIMES 7730 + . 7949) (\BIGNUM.QUOTIENT 7951 . 8889) (\BIGNUM.REMAINDER 8891 . 9263) (\BIGNUM.TO.FLOAT 9265 . 9505) +) (9508 9886 (FINITEP 9518 . 9704) (INFINITEP 9706 . 9884)) (9922 40011 (\BIGNUM.TO.INT 9932 . 10184) +(\BN.2TH 10186 . 10570) (\BN.ABS 10572 . 10777) (\BN.DIFFERENCE 10779 . 10929) (\BN.DIVIDE 10931 . +15846) (\BN.FLOAT 15848 . 18715) (\BN.IGNN 18717 . 19103) (BIGNUM.DEFPRINT 19105 . 22700) ( +\BN.INTEGERLENGTH 22702 . 23129) (\BN.LOGAND 23131 . 23667) (\BN.LOGANDC2 23669 . 24221) (\BN.LOGOR +24223 . 24536) (\BN.LOGXOR 24538 . 24854) (\BN.MINUS 24856 . 25211) (\BN.PLUS2 25213 . 26299) ( +\BN.SIGN 26301 . 26747) (\BN.TIMES2 26749 . 28802) (\BN.COMPAREN 28804 . 30093) (\BN.D2TH 30095 . +31290) (\BN.FROM.FIXP 31292 . 31854) (\BN.ICANON 31856 . 33073) (\BN.IDIVIDE 33075 . 33236) (\BN.ISUM0 + 33238 . 33903) (\BN.ISUM1 33905 . 34638) (\BN.MADD 34640 . 35419) (\BN.TO.FIXP 35421 . 36032) ( +\BN.NZEROS 36034 . 36191) (\BN.QRS 36193 . 37000) (\BN.SIGN 37002 . 37448) (\BN.TH2B 37450 . 37933) ( +\BN.TH2D 37935 . 40009)) (40012 40802 (\INITBIGNUMS 40022 . 40800))))) STOP diff --git a/sources/LLBIGNUM.LCOM b/sources/LLBIGNUM.LCOM index a2f49541..ab7ff099 100644 Binary files a/sources/LLBIGNUM.LCOM and b/sources/LLBIGNUM.LCOM differ diff --git a/sources/LLCHAR b/sources/LLCHAR index 5959ed8d..20e66e6e 100644 --- a/sources/LLCHAR +++ b/sources/LLCHAR @@ -1,14 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "24-Aug-2025 11:50:57"  -{DSK}kaplan>Local>medley3.5>working-medley>sources>LLCHAR.;14 104478 +(FILECREATED "28-Mar-2026 08:50:21" {WMEDLEY}LLCHAR.;16 104725 :EDIT-BY rmk :CHANGES-TO (VARS LLCHARCOMS) - :PREVIOUS-DATE "28-Apr-2022 08:52:36" -{DSK}kaplan>Local>medley3.5>working-medley>sources>LLCHAR.;13) + :PREVIOUS-DATE "24-Aug-2025 11:50:57" {WMEDLEY}LLCHAR.;14) (PRETTYCOMPRINT LLCHARCOMS) @@ -45,7 +43,9 @@ (CONSTANTS (\CHARMASK 255) (\MAXTHINCHAR 255) (\MAXFATCHAR 65535) - (\MAXCHARSET 255) + (\MAXCHARSET 65535) + (\MAXCHAR (LOGOR (LLSH \MAXCHARSET 8) + \MAXTHINCHAR)) (%#STRINGPWORDS 4)) (MACROS \NATOMCHARS \NSTRINGCHARS))) (INITRESOURCES \NUMSTR \NUMSTR1 \PNAMESTRING) @@ -1730,7 +1730,10 @@ (RPAQQ \MAXFATCHAR 65535) -(RPAQQ \MAXCHARSET 255) +(RPAQQ \MAXCHARSET 65535) + +(RPAQ \MAXCHAR (LOGOR (LLSH \MAXCHARSET 8) + \MAXTHINCHAR)) (RPAQQ %#STRINGPWORDS 4) @@ -1738,7 +1741,9 @@ (CONSTANTS (\CHARMASK 255) (\MAXTHINCHAR 255) (\MAXFATCHAR 65535) - (\MAXCHARSET 255) + (\MAXCHARSET 65535) + (\MAXCHAR (LOGOR (LLSH \MAXCHARSET 8) + \MAXTHINCHAR)) (%#STRINGPWORDS 4)) ) (DECLARE%: EVAL@COMPILE @@ -1844,16 +1849,16 @@ (PUTPROPS LLCHAR FILETYPE :FAKE-COMPILE-FILE) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4108 74294 (ALLOCSTRING 4118 . 6141) (MKATOM 6143 . 6778) (SUBATOM 6780 . 8650) ( -CHARACTER 8652 . 9656) (\PARSE.NUMBER 9658 . 25378) (\INVALID.DOTTED.SYMBOL 25380 . 25875) ( -\INVALID.INTEGER 25877 . 27329) (\MKINTEGER 27331 . 30038) (MKSTRING 30040 . 32183) ( -\PRINDATUM.TO.STRING 32185 . 38363) (BKSYSBUF 38365 . 39899) (NCHARS 39901 . 41601) (NTHCHARCODE 41603 - . 43649) (RPLCHARCODE 43651 . 44712) (\RPLCHARCODE 44714 . 46249) (NTHCHAR 46251 . 46444) (RPLSTRING -46446 . 49657) (SUBSTRING 49659 . 52582) (GNC 52584 . 52757) (GNCCODE 52759 . 53527) (GLC 53529 . -53702) (GLCCODE 53704 . 54469) (STREQUAL 54471 . 56585) (STRING.EQUAL 56587 . 60925) (STRINGP 60927 . -61078) (CHCON1 61080 . 61867) (U-CASE 61869 . 65096) (L-CASE 65098 . 68958) (U-CASEP 68960 . 69534) ( -\SMASHABLESTRING 69536 . 69998) (\MAKEWRITABLESTRING 70000 . 70436) (\SMASHSTRING 70438 . 74144) ( -\FATTENSTRING 74146 . 74292)) (74479 79641 (\GETBASESTRING 74489 . 75143) (\PUTBASESTRING 75145 . -77884) (\PUTBASESTRINGFAT 77886 . 78632) (GetBcplString 78634 . 79299) (SetBcplString 79301 . 79639)) -(100978 103792 (%%COPY-ONED-ARRAY 100988 . 102838) (%%COPY-STRING-TO-ARRAY 102840 . 103790))))) + (FILEMAP (NIL (4182 74368 (ALLOCSTRING 4192 . 6215) (MKATOM 6217 . 6852) (SUBATOM 6854 . 8724) ( +CHARACTER 8726 . 9730) (\PARSE.NUMBER 9732 . 25452) (\INVALID.DOTTED.SYMBOL 25454 . 25949) ( +\INVALID.INTEGER 25951 . 27403) (\MKINTEGER 27405 . 30112) (MKSTRING 30114 . 32257) ( +\PRINDATUM.TO.STRING 32259 . 38437) (BKSYSBUF 38439 . 39973) (NCHARS 39975 . 41675) (NTHCHARCODE 41677 + . 43723) (RPLCHARCODE 43725 . 44786) (\RPLCHARCODE 44788 . 46323) (NTHCHAR 46325 . 46518) (RPLSTRING +46520 . 49731) (SUBSTRING 49733 . 52656) (GNC 52658 . 52831) (GNCCODE 52833 . 53601) (GLC 53603 . +53776) (GLCCODE 53778 . 54543) (STREQUAL 54545 . 56659) (STRING.EQUAL 56661 . 60999) (STRINGP 61001 . +61152) (CHCON1 61154 . 61941) (U-CASE 61943 . 65170) (L-CASE 65172 . 69032) (U-CASEP 69034 . 69608) ( +\SMASHABLESTRING 69610 . 70072) (\MAKEWRITABLESTRING 70074 . 70510) (\SMASHSTRING 70512 . 74218) ( +\FATTENSTRING 74220 . 74366)) (74553 79715 (\GETBASESTRING 74563 . 75217) (\PUTBASESTRING 75219 . +77958) (\PUTBASESTRINGFAT 77960 . 78706) (GetBcplString 78708 . 79373) (SetBcplString 79375 . 79713)) +(101225 104039 (%%COPY-ONED-ARRAY 101235 . 103085) (%%COPY-STRING-TO-ARRAY 103087 . 104037))))) STOP diff --git a/sources/LLCHAR.LCOM b/sources/LLCHAR.LCOM index 8fd7f263..91fcf6a2 100644 Binary files a/sources/LLCHAR.LCOM and b/sources/LLCHAR.LCOM differ diff --git a/sources/LLDISPLAY b/sources/LLDISPLAY index 6cafa80c..51f76e73 100644 --- a/sources/LLDISPLAY +++ b/sources/LLDISPLAY @@ -1,14 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED " 2-Sep-2025 22:54:03"  -{DSK}kaplan>Local>medley3.5>working-medley>sources>LLDISPLAY.;50 272104 +(FILECREATED "28-Apr-2026 00:08:21" {WMEDLEY}LLDISPLAY.;54 272196 :EDIT-BY rmk - :CHANGES-TO (FNS \SLOWBLTCHAR) + :CHANGES-TO (FNS INITIALIZEDISPLAYSTREAMS) - :PREVIOUS-DATE " 2-Sep-2025 22:41:14" -{DSK}kaplan>Local>medley3.5>working-medley>sources>LLDISPLAY.;49) + :PREVIOUS-DATE "28-Apr-2026 00:04:31" {WMEDLEY}LLDISPLAY.;53) (PRETTYCOMPRINT LLDISPLAYCOMS) @@ -4579,7 +4577,10 @@ (DEFINEQ (INITIALIZEDISPLAYSTREAMS - [LAMBDA NIL (* ; "Edited 18-Aug-2025 12:15 by rmk") + [LAMBDA NIL (* ; "Edited 28-Apr-2026 00:08 by rmk") + (* ; "Edited 15-Apr-2026 00:25 by rmk") + (* ; "Edited 31-Mar-2026 17:52 by rmk") + (* ; "Edited 18-Aug-2025 12:15 by rmk") (* ; "Edited 6-Jul-2025 12:57 by rmk") (* lmm " 7-Jan-86 16:51") (SETQ WHOLEDISPLAY (create REGION)) @@ -4589,15 +4590,13 @@ (* ;; "A guaranteed display font is initialized here after pup, font, and bitmap code has been loaded. This does not use FONTCREATE, so it doesn't depend on the argument checking and incore cache retrieval ") - [SETQ \GUARANTEEDDISPLAYFONT (\CREATEDISPLAYFONT (MAKEFONTSPEC 'GACHA 10 '(MEDIUM REGULAR REGULAR - ) - 0 - 'DISPLAY] + (SETQ \GUARANTEEDDISPLAYFONT (MEDLEYFONT.READ.FONT + "{MEDLEY}medleydisplayfonts>GACHA10-MRR.MEDLEYDISPLAYFONT" + 0)) (* ;;  "For some reason, charset 0 has to be instantiated, otherwise there is a divide by 0 in the loadup") - (\CREATECHARSET 0 \GUARANTEEDDISPLAYFONT) (SETQ DEFAULTFONT (FONTCLASS 'DEFAULTFONT (LIST 1 \GUARANTEEDDISPLAYFONT]) ) (DECLARE%: DOCOPY DONTEVAL@LOAD @@ -4622,44 +4621,44 @@ (ADDTOVAR LAMA ) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (20613 23281 (\FBITMAPBIT 20623 . 21083) (\FBITMAPBIT.UFN 21085 . 22104) ( -\NEWPAGE.DISPLAY 22106 . 22241) (INITBITMASKS 22243 . 23279)) (25206 25715 (\CreateCursorBitMap 25216 - . 25713)) (25832 85635 (BITBLT 25842 . 36232) (BLTSHADE 36234 . 37012) (\BITBLTSUB 37014 . 47149) ( -\GETPILOTBBTSCRATCHBM 47151 . 47766) (BITMAPCOPY 47768 . 48344) (BITMAPCREATE 48346 . 49906) ( -BITMAPBIT 49908 . 58295) (BITMAPEQUAL 58297 . 59759) (BLTCHAR 59761 . 60377) (\BLTCHAR 60379 . 60881) -(\MEDW.BLTCHAR 60883 . 65761) (\CHANGECHARSET.DISPLAY 65763 . 67997) (\INDICATESTRING 67999 . 69195) ( -\SLOWBLTCHAR 69197 . 75890) (TEXTUREP 75892 . 76162) (INVERT.TEXTURE 76164 . 76438) ( -INVERT.TEXTURE.BITMAP 76440 . 77975) (BITMAPWIDTH 77977 . 78349) (BITMAPHEIGHT 78351 . 78727) ( -READBITMAP 78729 . 81239) (\INSUREBITSPERPIXEL 81241 . 81536) (MAXIMUMCOLOR 81538 . 81679) ( -OPPOSITECOLOR 81681 . 81860) (MAXIMUMSHADE 81862 . 82073) (OPPOSITESHADE 82075 . 82254) (\MEDW.BITBLT -82256 . 85633)) (85636 87065 (\READBINARYBITMAP 85646 . 86284) (\PRINTBINARYBITMAP 86286 . 87063)) ( -87067 92253 (FINISH-READING-BITMAP 87067 . 92253)) (93375 93856 (BITMAPBIT.EXPANDER 93385 . 93854)) ( -93857 142391 (\BITBLT.DISPLAY 93867 . 117106) (\BITBLT.BITMAP 117108 . 126207) (\BITBLT.MERGE 126209 - . 128462) (\BLTSHADE.DISPLAY 128464 . 135564) (\BLTSHADE.BITMAP 135566 . 142389)) (142392 151712 ( -\BITBLT.BITMAP.SLOW 142402 . 151710)) (151713 168094 (\PUNT.BLTSHADE.BITMAP 151723 . 158819) ( -\PUNT.BITBLT.BITMAP 158821 . 168092)) (168095 171535 (\SCALEDBITBLT.DISPLAY 168105 . 169738) ( -\BACKCOLOR.DISPLAY 169740 . 171533)) (175390 177663 (DISPLAYSTREAMP 175400 . 176008) (DSPSOURCETYPE -176010 . 177019) (DSPXOFFSET 177021 . 177340) (DSPYOFFSET 177342 . 177661)) (177664 191859 ( -DSPDESTINATION 177674 . 180777) (DSPTEXTURE 180779 . 180941) (\DISPLAYSTREAMINCRXPOSITION 180943 . -181230) (\SFFixDestination 181232 . 182410) (\SFFixClippingRegion 182412 . 184584) (\SFFixFont 184586 - . 185636) (\SFFIXLINELENGTH 185638 . 187134) (\UPDATE-SYNONYM-STREAM-LINELENGTH-FIELD 187136 . 188949 -) (\SFFixY 188951 . 191857)) (191860 195707 (\SIMPLE.DSPCREATE 191870 . 192420) (\COMMON.DSPCREATE -192422 . 195705)) (195808 198002 (\MEDW.XOFFSET 195818 . 196959) (\MEDW.YOFFSET 196961 . 198000)) ( -198003 205933 (\DSPCLIPPINGREGION.DISPLAY 198013 . 198759) (\DSPFONT.DISPLAY 198761 . 201135) ( -\DISPLAY.PILOTBITBLT 201137 . 201286) (\DSPLINEFEED.DISPLAY 201288 . 201859) (\DSPLEFTMARGIN.DISPLAY -201861 . 202592) (\DSPOPERATION.DISPLAY 202594 . 203618) (\DSPRIGHTMARGIN.DISPLAY 203620 . 204465) ( -\DSPXPOSITION.DISPLAY 204467 . 205324) (\DSPYPOSITION.DISPLAY 205326 . 205931)) (210121 215157 ( -TTYDISPLAYSTREAM 210131 . 215155)) (215460 216490 (DSPSCROLL 215470 . 216170) (PAGEHEIGHT 216172 . -216488)) (216535 219557 (\DSPRESET.DISPLAY 216545 . 219555)) (219593 220116 (\MAYBE-DRIBBLE-CHAR -219593 . 220116)) (220117 240755 (\DSPPRINTCHAR 220127 . 227965) (\DSPPRINTCR/LF 227967 . 240753)) ( -240756 241348 (\TTYBACKGROUND 240766 . 241346)) (241349 244636 (DSPBACKUP 241359 . 244634)) (244820 -245076 (COLORDISPLAYP 244830 . 245074)) (245077 247148 (DISPLAYBEFOREEXIT 245087 . 245913) ( -DISPLAYAFTERENTRY 245915 . 247146)) (247520 252052 (\DSPCLIPTRANSFORMX 247530 . 248119) ( -\DSPCLIPTRANSFORMY 248121 . 248846) (\DSPTRANSFORMREGION 248848 . 249380) (\DSPUNTRANSFORMY 249382 . -249642) (\DSPUNTRANSFORMX 249644 . 249904) (\OFFSETCLIPPINGREGION 249906 . 252050)) (253366 255953 ( -UPDATESCREENDIMENSIONS 253376 . 254005) (\CreateScreenBitMap 254007 . 255951)) (256512 269671 ( -\CoerceToDisplayDevice 256522 . 256935) (\CREATEDISPLAY 256937 . 258777) (DISPLAYSTREAMINIT 258779 . -261923) (\STARTDISPLAY 261925 . 264836) (\MOVE.WINDOWS.ONTO.SCREEN 264838 . 267030) ( -\UPDATE.PBT.RASTERWIDTHS 267032 . 268814) (\STOPDISPLAY 268816 . 269308) (\DEFINEDISPLAYINFO 269310 . -269669)) (270279 271729 (INITIALIZEDISPLAYSTREAMS 270289 . 271727))))) + (FILEMAP (NIL (20543 23211 (\FBITMAPBIT 20553 . 21013) (\FBITMAPBIT.UFN 21015 . 22034) ( +\NEWPAGE.DISPLAY 22036 . 22171) (INITBITMASKS 22173 . 23209)) (25136 25645 (\CreateCursorBitMap 25146 + . 25643)) (25762 85565 (BITBLT 25772 . 36162) (BLTSHADE 36164 . 36942) (\BITBLTSUB 36944 . 47079) ( +\GETPILOTBBTSCRATCHBM 47081 . 47696) (BITMAPCOPY 47698 . 48274) (BITMAPCREATE 48276 . 49836) ( +BITMAPBIT 49838 . 58225) (BITMAPEQUAL 58227 . 59689) (BLTCHAR 59691 . 60307) (\BLTCHAR 60309 . 60811) +(\MEDW.BLTCHAR 60813 . 65691) (\CHANGECHARSET.DISPLAY 65693 . 67927) (\INDICATESTRING 67929 . 69125) ( +\SLOWBLTCHAR 69127 . 75820) (TEXTUREP 75822 . 76092) (INVERT.TEXTURE 76094 . 76368) ( +INVERT.TEXTURE.BITMAP 76370 . 77905) (BITMAPWIDTH 77907 . 78279) (BITMAPHEIGHT 78281 . 78657) ( +READBITMAP 78659 . 81169) (\INSUREBITSPERPIXEL 81171 . 81466) (MAXIMUMCOLOR 81468 . 81609) ( +OPPOSITECOLOR 81611 . 81790) (MAXIMUMSHADE 81792 . 82003) (OPPOSITESHADE 82005 . 82184) (\MEDW.BITBLT +82186 . 85563)) (85566 86995 (\READBINARYBITMAP 85576 . 86214) (\PRINTBINARYBITMAP 86216 . 86993)) ( +86997 92183 (FINISH-READING-BITMAP 86997 . 92183)) (93305 93786 (BITMAPBIT.EXPANDER 93315 . 93784)) ( +93787 142321 (\BITBLT.DISPLAY 93797 . 117036) (\BITBLT.BITMAP 117038 . 126137) (\BITBLT.MERGE 126139 + . 128392) (\BLTSHADE.DISPLAY 128394 . 135494) (\BLTSHADE.BITMAP 135496 . 142319)) (142322 151642 ( +\BITBLT.BITMAP.SLOW 142332 . 151640)) (151643 168024 (\PUNT.BLTSHADE.BITMAP 151653 . 158749) ( +\PUNT.BITBLT.BITMAP 158751 . 168022)) (168025 171465 (\SCALEDBITBLT.DISPLAY 168035 . 169668) ( +\BACKCOLOR.DISPLAY 169670 . 171463)) (175320 177593 (DISPLAYSTREAMP 175330 . 175938) (DSPSOURCETYPE +175940 . 176949) (DSPXOFFSET 176951 . 177270) (DSPYOFFSET 177272 . 177591)) (177594 191789 ( +DSPDESTINATION 177604 . 180707) (DSPTEXTURE 180709 . 180871) (\DISPLAYSTREAMINCRXPOSITION 180873 . +181160) (\SFFixDestination 181162 . 182340) (\SFFixClippingRegion 182342 . 184514) (\SFFixFont 184516 + . 185566) (\SFFIXLINELENGTH 185568 . 187064) (\UPDATE-SYNONYM-STREAM-LINELENGTH-FIELD 187066 . 188879 +) (\SFFixY 188881 . 191787)) (191790 195637 (\SIMPLE.DSPCREATE 191800 . 192350) (\COMMON.DSPCREATE +192352 . 195635)) (195738 197932 (\MEDW.XOFFSET 195748 . 196889) (\MEDW.YOFFSET 196891 . 197930)) ( +197933 205863 (\DSPCLIPPINGREGION.DISPLAY 197943 . 198689) (\DSPFONT.DISPLAY 198691 . 201065) ( +\DISPLAY.PILOTBITBLT 201067 . 201216) (\DSPLINEFEED.DISPLAY 201218 . 201789) (\DSPLEFTMARGIN.DISPLAY +201791 . 202522) (\DSPOPERATION.DISPLAY 202524 . 203548) (\DSPRIGHTMARGIN.DISPLAY 203550 . 204395) ( +\DSPXPOSITION.DISPLAY 204397 . 205254) (\DSPYPOSITION.DISPLAY 205256 . 205861)) (210051 215087 ( +TTYDISPLAYSTREAM 210061 . 215085)) (215390 216420 (DSPSCROLL 215400 . 216100) (PAGEHEIGHT 216102 . +216418)) (216465 219487 (\DSPRESET.DISPLAY 216475 . 219485)) (219523 220046 (\MAYBE-DRIBBLE-CHAR +219523 . 220046)) (220047 240685 (\DSPPRINTCHAR 220057 . 227895) (\DSPPRINTCR/LF 227897 . 240683)) ( +240686 241278 (\TTYBACKGROUND 240696 . 241276)) (241279 244566 (DSPBACKUP 241289 . 244564)) (244750 +245006 (COLORDISPLAYP 244760 . 245004)) (245007 247078 (DISPLAYBEFOREEXIT 245017 . 245843) ( +DISPLAYAFTERENTRY 245845 . 247076)) (247450 251982 (\DSPCLIPTRANSFORMX 247460 . 248049) ( +\DSPCLIPTRANSFORMY 248051 . 248776) (\DSPTRANSFORMREGION 248778 . 249310) (\DSPUNTRANSFORMY 249312 . +249572) (\DSPUNTRANSFORMX 249574 . 249834) (\OFFSETCLIPPINGREGION 249836 . 251980)) (253296 255883 ( +UPDATESCREENDIMENSIONS 253306 . 253935) (\CreateScreenBitMap 253937 . 255881)) (256442 269601 ( +\CoerceToDisplayDevice 256452 . 256865) (\CREATEDISPLAY 256867 . 258707) (DISPLAYSTREAMINIT 258709 . +261853) (\STARTDISPLAY 261855 . 264766) (\MOVE.WINDOWS.ONTO.SCREEN 264768 . 266960) ( +\UPDATE.PBT.RASTERWIDTHS 266962 . 268744) (\STOPDISPLAY 268746 . 269238) (\DEFINEDISPLAYINFO 269240 . +269599)) (270209 271821 (INITIALIZEDISPLAYSTREAMS 270219 . 271819))))) STOP diff --git a/sources/LLDISPLAY.LCOM b/sources/LLDISPLAY.LCOM index c1b38fe4..6033a4d9 100644 --- a/sources/LLDISPLAY.LCOM +++ b/sources/LLDISPLAY.LCOM @@ -1,12 +1,9 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED " 2-Sep-2025 22:54:03" ("compiled on " -{DSK}kaplan>Local>medley3.5>working-medley>sources>LLDISPLAY.;50) " 2-Sep-2025 22:44:30" -"COMPILE-FILEd" in "FULL 2-Sep-2025 ..." dated " 2-Sep-2025 22:44:39") -(FILECREATED " 2-Sep-2025 22:54:03" -{DSK}kaplan>Local>medley3.5>working-medley>sources>LLDISPLAY.;50 272104 :EDIT-BY rmk -:CHANGES-TO (FNS \SLOWBLTCHAR) :PREVIOUS-DATE " 2-Sep-2025 22:41:14" -{DSK}kaplan>Local>medley3.5>working-medley>sources>LLDISPLAY.;49) +(FILECREATED "28-Apr-2026 00:08:21" ("compiled on " {WMEDLEY}LLDISPLAY.;54) +"28-Apr-2026 00:01:36" "COMPILE-FILEd" in "FULL 28-Apr-2026 ..." dated "28-Apr-2026 00:01:44") +(FILECREATED "28-Apr-2026 00:08:21" {WMEDLEY}LLDISPLAY.;54 272196 :EDIT-BY rmk :CHANGES-TO ( +FNS INITIALIZEDISPLAYSTREAMS) :PREVIOUS-DATE "28-Apr-2026 00:04:31" {WMEDLEY}LLDISPLAY.;53) (RPAQQ LLDISPLAYCOMS ((DECLARE%: DONTCOPY (EXPORT (RECORDS PILOTBBT \DISPLAYDATA DISPLAYSTATE DISPLAYINFO) (MACROS \GETDISPLAYDATA))) (* ; "User-visible records are on ADISPLAY --- must be init'ed here") (INITRECORDS BITMAP PILOTBBT REGION @@ -196,7 +193,7 @@ BLTCHAR :D8 (42 \DISPLAYDATA 35 STREAM 24 OUTPUT) () \BLTCHAR :D8 -(P 0 A0152 I 2 DISPLAYDATA I 1 DISPLAYSTREAM I 0 CHARCODE) (Agh b.Z@ABlH(11 \GETSTREAM) +(P 0 A0175 I 2 DISPLAYDATA I 1 DISPLAYSTREAM I 0 CHARCODE) (Agh b.Z@ABlH(11 \GETSTREAM) (25 IMAGEOPS 18 STREAM 5 OUTPUT) () \MEDW.BLTCHAR :D8 @@ -209,11 +206,12 @@ BLTCHAR :D8 (256 \EM.DISPINTERRUPT 191 \TOPWDS 175 \EM.DISPINTERRUPT 167 \EM.DISPINTERRUPT 132 PILOTBBT) () \CHANGECHARSET.DISPLAY :D8 -(P 8 \INTERRUPTABLE P 6 BM P 5 CSINFO P 4 PBT I 1 CHARSET I 0 DISPLAYDATA) @*@ HAHAAH -IJKK"@M@M@M0@A>MLNn@'M -@@M @M -'NN@B_LOLOh(122 \SFFixY 35 \CREATECHARSET) -(157 PILOTBBT 145 PILOTBBT 24 FONTDESCRIPTOR) +(P 9 \INTERRUPTABLE P 7 BM P 6 CSINFO P 5 PBT I 1 CHARSET I 0 DISPLAYDATA)  +@*@ AH djnNHd djnkعIXHH djnkH JKLL)HAHAAH +JKLL" @N@N@N0@A>N_MOn@'N +@@N @N +)OO@B_MOMOh(221 \SFFixY 131 \CREATECHARSET 90 \BUILDSLUGCSINFO) +(258 PILOTBBT 246 PILOTBBT 120 FONTDESCRIPTOR 71 FONTDESCRIPTOR 63 FONTDESCRIPTOR 35 FONTDESCRIPTOR 15 FONTDESCRIPTOR) () \INDICATESTRINGA0001 :D8 (NAME SI::*UNWIND-PROTECT* I 0 SI::*CLEANUP-FORMS* F 0 SI::*RESETFORMS* F 1 CHARCODE) Hgd gi @@ -225,18 +223,18 @@ BLTCHAR :D8 (75 ^ 52 %# 16 SI::RESETUNWIND) ( 81 "" 58 "") \SLOWBLTCHAR :D8 -(P 18 CSINFO P 17 HEIGHTMOVED P 16 YPOS P 15 SOFTCURSORUP P 14 DISPINTERRUPT P 13 SOURCEBIT P 12 WIDTH P 11 DESTBIT P 10 PILOTBBT P 9 CURX P 8 RIGHT P 7 LEFT P 6 NEWX P 2 DD P 1 CHAR8CODE P 0 ROTATION I 1 DISPLAYSTREAM I 0 CHARCODE F 22 \SOFTCURSORP F 23 \SOFTCURSORUPP F 24 \CURSORDESTINATION F 25 \SCREENBITMAPS) n`@lYA0Zd Xdj J_JI^Jl A -J_JIؾJNOJ_J"dOO_J#NJػdKK_J*_OOO jO_OO_JIOO_JdkadlO_O_O_DdlO_O_O_$llO_lO_lO_ W,-W. hA -W0_`_`jA`hA -W2A OOOOOOOjvO`O0J_ JI_"J @\M#LMML -O&O(O*O*_$HdlZ;AO O" -O$jJIAJO$ -kO O$ -O$ O" Hn8AO O" -O$jJIAJO$ JO$ -O$ O" o h(618 ERROR 607 BKBITBLT 565 \DSPYPOSITION.DISPLAY 546 BKBITBLT 503 \DSPYPOSITION.DISPLAY 465 \CREATECHARSET 397 \SOFTCURSORUPCURRENT 362 \TOTOPWDS 352 DSPDESTINATION 335 \SOFTCURSORDOWN 304 DSPDESTINATION 285 SHOULDNT 55 \DSPPRINTCR/LF) -(454 FONTDESCRIPTOR 403 \EM.DISPINTERRUPT 342 \TOPWDS 326 \EM.DISPINTERRUPT 316 \EM.DISPINTERRUPT 113 \DISPLAYDATA 83 \DISPLAYDATA) -( 613 "Not implemented to rotate by other than 0, 90 or 270") +(P 19 CSINFO P 18 HEIGHTMOVED P 17 YPOS P 16 SOFTCURSORUP P 15 DISPINTERRUPT P 14 SOURCEBIT P 13 WIDTH P 12 DESTBIT P 11 PILOTBBT P 10 CURX P 9 RIGHT P 8 LEFT P 7 NEWX P 2 DD P 1 CHAR8CODE P 0 ROTATION I 1 DISPLAYSTREAM I 0 CHARCODE F 26 \SOFTCURSORP F 27 \SOFTCURSORUPP F 28 \CURSORDESTINATION F 29 \SCREENBITMAPS) p@lYA0Zd XdjJ_JI_Jl A +J_JI_JOOJ_J"dOO_J#OJػdKK_J*_OOO jO_OO_JIOO_JdkadlO_O_O_DdlO_O_O_$llO_lO_lO_ W4-W6 hA +W8_ `_`jA`hA +W:A OOOOOOOjvO `O50J_"JI_$J @㾽NM djnRMd djnkؼL`MM djnkM O(O*O,O,-MN#MNNM +O.O0O2O2_&HdlZ;AO"O$ +O&jJIAJO& +kO"O& +O& O$ Hn8AO"O$ +O&jJIAJO& JO& +O& O$ o h(724 ERROR 713 BKBITBLT 671 \DSPYPOSITION.DISPLAY 652 BKBITBLT 609 \DSPYPOSITION.DISPLAY 571 \CREATECHARSET 526 \BUILDSLUGCSINFO 402 \SOFTCURSORUPCURRENT 367 \TOTOPWDS 357 DSPDESTINATION 340 \SOFTCURSORDOWN 309 DSPDESTINATION 290 SHOULDNT 56 \DSPPRINTCR/LF) +(560 FONTDESCRIPTOR 507 FONTDESCRIPTOR 499 FONTDESCRIPTOR 471 FONTDESCRIPTOR 451 FONTDESCRIPTOR 408 \EM.DISPINTERRUPT 347 \TOPWDS 331 \EM.DISPINTERRUPT 321 \EM.DISPINTERRUPT 118 \DISPLAYDATA 87 \DISPLAYDATA) +( 719 "Not implemented to rotate by other than 0, 90 or 270") TEXTUREP :D8 (I 0 OBJECT) @d3 @k@NIL (18 BITMAP 10 BITMAP) @@ -289,7 +287,7 @@ OPPOSITESHADE :D8 NIL () \MEDW.BITBLT :D8 -(P 9 A0155 P 8 A0154 P 7 SOURCEBOTTOMTRANSFORMED P 6 SOURCELEFTTRANSFORMED P 3 SRCWIN P 2 A0153 P 1 DD P 0 DSTWIN I 11 CLIPPINGREGION I 10 TEXTURE I 9 OPERATION I 8 SOURCETYPE I 7 HEIGHT I 6 WIDTH I 5 DESTINATIONBOTTOM I 4 DESTINATIONLEFT I 3 DESTINATION I 2 SOURCEBOTTOM I 1 SOURCELEFT I 0 SOURCE F 10 \SCREENBITMAPS)  +(P 9 A0178 P 8 A0177 P 7 SOURCEBOTTOMTRANSFORMED P 6 SOURCELEFTTRANSFORMED P 3 SRCWIN P 2 A0176 P 1 DD P 0 DSTWIN I 11 CLIPPINGREGION I 10 TEXTURE I 9 OPERATION I 8 SOURCETYPE I 7 HEIGHT I 6 WIDTH I 5 DESTINATIONBOTTOM I 4 DESTINATIONLEFT I 3 DESTINATION I 2 SOURCEBOTTOM I 1 SOURCELEFT I 0 SOURCE F 10 \SCREENBITMAPS)   @ C o @Z@WCi Cgh 0H2HH2@ABCDEFGGGGGABlJCC@i !@gh 0AIصABIصBK2J_K2INOCDEFGGGGGNI"dLLOI$dMMlO@ @@ -455,11 +453,11 @@ Q (145 ERASE 138 INVERT 121 INVERT 110 PAINT 99 ERASE 86 \DISPLAYDATA 77 \DISPLAYDATA 53 INVERT 43 INPUT 32 \DISPLAYDATA 23 \DISPLAYDATA 16 STREAM 5 OUTPUT) () DSPXOFFSET :D8 -(P 0 A0169 I 1 DISPLAYSTREAM I 0 XOFFSET) 'Agh b.\@AlH(11 \GETSTREAM) +(P 0 A0192 I 1 DISPLAYSTREAM I 0 XOFFSET) 'Agh b.\@AlH(11 \GETSTREAM) (25 IMAGEOPS 18 STREAM 5 OUTPUT) () DSPYOFFSET :D8 -(P 0 A0170 I 1 DISPLAYSTREAM I 0 YOFFSET) 'Agh b.^@AlH(11 \GETSTREAM) +(P 0 A0193 I 1 DISPLAYSTREAM I 0 YOFFSET) 'Agh b.^@AlH(11 \GETSTREAM) (25 IMAGEOPS 18 STREAM 5 OUTPUT) () DSPDESTINATION :D8 @@ -544,13 +542,13 @@ A (23 \DISPLAYDATA 16 STREAM 5 OUTPUT) ( 63 " is not a REGION.") \DSPFONT.DISPLAY :D8 -(P 4 \INTERRUPTABLE P 2 DD P 1 OLDFONT P 0 XFONT I 1 FONT I 0 DISPLAYSTREAM) @@0Zd YAsAhdd@i J giA - o XICJH JjH -JHHjH -[K A@J -(135 \SFFixFont 116 \CREATECHARSET 66 ERROR 54 FONTCOPY 35 FONTCREATE) -(107 FONTDESCRIPTOR 87 FONTDESCRIPTOR 45 NOERROR 17 \DISPLAYDATA 8 STREAM) -( 61 "FONT NOT FOUND OR ILLEGAL FONTCOPY PARAMETER") +(P 5 \INTERRUPTABLE P 2 DD P 1 OLDFONT P 0 XFONT I 1 FONT I 0 DISPLAYSTREAM) P@0Zd YAAhdd@i J giA + o XIJH JjH +JjH djnQHd djnkػKOHH djnkH NOOOHHjH +\L A@J +(238 \SFFixFont 219 \CREATECHARSET 180 \BUILDSLUGCSINFO 68 ERROR 56 FONTCOPY 37 FONTCREATE) +(210 FONTDESCRIPTOR 161 FONTDESCRIPTOR 153 FONTDESCRIPTOR 125 FONTDESCRIPTOR 105 FONTDESCRIPTOR 91 FONTDESCRIPTOR 47 NOERROR 17 \DISPLAYDATA 8 STREAM) +( 63 "FONT NOT FOUND OR ILLEGAL FONTCOPY PARAMETER") \DISPLAY.PILOTBITBLT :D8 (I 1 N I 0 PILOTBBT) @AvNIL NIL @@ -772,10 +770,10 @@ NIL NIL () \CREATEDISPLAY :D8 -(P 0 FDEV I 0 DISPLAYNAME F 2 *DEFAULT-EXTERNALFORMAT*) ] `d@djdjdj0dgdgdgDdgdg^dgFdgdgbdg`dgdgdg -dg dgdg,dg.dg0dgTdg>dg@ghdIdRhdgRdgPdgNdgHdgBdgdg@ghdId`hdgRdgPdgNdgHdgBdgmedleydisplayfonts>GACHA10-MRR.MEDLEYDISPLAYFONT" 4 -16383) (RPAQQ \DisplayStarted NIL) (RPAQQ \LastTTYLines 12) (INITIALIZEDISPLAYSTREAMS) diff --git a/sources/LLINTERP b/sources/LLINTERP index 079e91de..406fdc09 100644 --- a/sources/LLINTERP +++ b/sources/LLINTERP @@ -1,19 +1,13 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "30-Jun-2022 22:42:02"  -{DSK}kaplan>local>medley3.5>working-medley>sources>LLINTERP.;4 120990 +(FILECREATED " 8-May-2026 23:51:41" {DSK}matt>Interlisp>medley>sources>LLINTERP.;2 120946 - :PREVIOUS-DATE "30-Jun-2022 18:04:04" -{DSK}kaplan>local>medley3.5>working-medley>sources>LLINTERP.;3) + :EDIT-BY "mth" + :CHANGES-TO (FNS \CCODEARGLIST) + + :PREVIOUS-DATE "30-Jun-2022 22:42:02" {DSK}matt>Interlisp>medley>sources>LLINTERP.;1) -(* ; " -Copyright (c) 1981-1988, 1990-1992, 1994-1995 by Venue & Xerox Corporation. -The following program was created in 1981 but has not been published -within the meaning of the copyright law, is furnished under license, -and may not be used, copied and/or disclosed except in accordance -with the terms of said license. -") (PRETTYCOMPRINT LLINTERPCOMS) @@ -1541,7 +1535,8 @@ with the terms of said license. (T (ERROR '"Args not available:" FN]) (\CCODEARGLIST - [LAMBDA (FNHD SMARTP) (* ; "Edited 10-May-88 12:18 by MASINTER") + [LAMBDA (FNHD SMARTP) (* ; "Edited 8-May-2026 23:44 by mth") + (* ; "Edited 10-May-88 12:18 by MASINTER") (* ;; "Computes the arglist for raw code object FNHD. If SMARTP is true, we're allowed to return a Common Lisp arg list if we find one; otherwise, we have to comply with Interlisp arglist semantics.") @@ -1556,53 +1551,55 @@ with the terms of said license. (SETQ SIZE (fetch (FNHEADER NTSIZE) of FNHD)) [COND ((EQ [SETQ LOCALSIZE (- (FOLDLO (if (fetch (FNHEADER NATIVE) of FNHD) - then (- (fetch (FNHEADER STARTPC) - of FNHD) - 4) + then (- (fetch (FNHEADER STARTPC) of FNHD) + 4) else (fetch (FNHEADER STARTPC) of FNHD)) BYTESPERWORD) (SETQ ENDT (+ (fetch (FNHEADER OVERHEADWORDS) of T) (COND ((EQ SIZE 0) (* ; - "No nametable, but there's a quad of zeros there anyway") + "No nametable, but there's a quad of zeros there anyway") WORDSPERQUAD) (T (UNFOLD SIZE 2] 0) (* ; "Nothing extra here") ) [(> LOCALSIZE WORDSPERCELL) (* ; - "There is a second nametable between the first and the code.") + "There is a second nametable between the first and the code.") (SETQ IVARS (\CCODEIVARSCAN FNHD ENDT (FOLDLO LOCALSIZE 2] ((AND (LISTP (SETQ ENDT (\GETBASEPTR FNHD ENDT))) (LISTP (CAR ENDT))) (* ; - "It's exactly a pointer to debugging info, car of which is a stylized arglist") + "It's exactly a pointer to debugging info, car of which is a stylized arglist") (SETQ ENDT (if (AND (EQ (CAAR ENDT) - '&OPTIONAL) - (LISTGET (CDR ENDT) - :INTERLISP)) - then (* ; "The &OPTIONAL, while strictly correct, is misleading, since it's technically true for ALL Interlisp functions.") - (CDAR ENDT) + '&OPTIONAL) + (LISTGET (CDR ENDT) + :INTERLISP)) + then (* ; "The &OPTIONAL, while strictly correct, is misleading, since it's technically true for ALL Interlisp functions.") + (CDAR ENDT) else (CAR ENDT))) (RETURN (COND (SMARTP ENDT) (T (* ; "Note that if we got this far, function can't be a nospread (we caught this in the very first COND up above), which means there can't be any &key or &rest") - (for X in ENDT unless (EQ X '&OPTIONAL) - collect (COND - ((STRINGP X) (* ; - "Callers of ARGLIST are expecting to get something that would actually function as one") - (MKATOM X)) - (T X] + (for X in ENDT unless (EQ X '&OPTIONAL) collect (COND + ((STRINGP X) + (* ; + "Callers of ARGLIST are expecting to get something that would actually function as one") + (MKATOM X)) + (T X] [COND ((< N 0) (* ; - "Waited until now to see if there was a stored arglist, but we didn't find one--give up") - (RETURN 'U] + "Waited until now to see if there was a stored arglist, but we didn't find one--give up") + (RETURN (COND + ((AND (EQ 2 (fetch (FNHEADER ARGTYPE) of FNHD)) + (SETQ IVARS (ASSOC 0 IVARS))) + (CDR IVARS)) + (T 'U] [COND ((NEQ SIZE 0) (* ; "Scan specials name table") (SETQ IVARS (\CCODEIVARSCAN FNHD (fetch (FNHEADER OVERHEADWORDS) of T) SIZE IVARS] - [SETQ IVARS (for I from 0 to (SUB1 N) - collect (OR (CDR (ASSOC I IVARS)) - (PACK* '*ARG* I] + [SETQ IVARS (for I from 0 to (SUB1 N) collect (OR (CDR (ASSOC I IVARS)) + (PACK* '*ARG* I] (RETURN (SELECTQ (fetch (FNHEADER ARGTYPE) of FNHD) (3 (CAR IVARS)) IVARS]) @@ -1745,33 +1742,31 @@ with the terms of said license. (ADDTOVAR LAMA APPLY* \INTERPRETER) ) -(PUTPROPS LLINTERP COPYRIGHT ("Venue & Xerox Corporation" T 1981 1982 1983 1984 1985 1986 1987 1988 -1990 1991 1992 1994 1995)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (6409 23670 (\INTERPRETER 6419 . 11015) (\INTERPRETER1 11017 . 17585) ( -\SETUP-COMPILED-CLOSURE-CALL 17587 . 22734) (\STKNAME 22736 . 23668)) (23699 29111 (\ENVCALL.UFN 23709 - . 23841) (\SETUP-ENVIRONMENT-CALL 23843 . 29109)) (29150 34027 (EVAL 29160 . 29260) (\EVAL 29262 . -29472) (\EVALFORM 29474 . 30705) (\EVALFORMASLAMBDA 30707 . 30897) (\EVALOTHER 30899 . 31106) (APPLY -31108 . 31215) (APPLY* 31217 . 32332) (\CHECKAPPLY* 32334 . 33439) (\CKAPPLYARGS 33441 . 33784) ( -DEFEVAL 33786 . 34025)) (35871 43460 (EVALV 35881 . 36090) (\EVALV1 36092 . 36247) (\EVALVAR 36249 . -36612) (BOUNDP 36614 . 36830) (SET 36832 . 37198) (\SETVAR 37200 . 37570) (SETQ 37572 . 38244) ( -\STKSCAN 38246 . 41910) (\SETFVARSLOT 41912 . 43458)) (43494 56501 (PROG 43504 . 46020) (\PROG0 46022 - . 49652) (\EVPROG1 49654 . 49857) (RETURN 49859 . 50400) (GO 50402 . 51217) (EVALA 51219 . 53148) ( -\EVALA 53150 . 55743) (ERRORSET 55745 . 56350) (SI::ERRORSET-PRINT-FUNCTION 56352 . 56499)) (56560 -69212 (LET 56570 . 58713) (LET* 58715 . 60863) (\LET0 60865 . 64525) (\LET* 64527 . 69210)) (69213 -70789 (QUOTE 69223 . 69254) (AND 69256 . 69464) (OR 69466 . 69714) (PROGN 69716 . 69995) (COND 69997 - . 70331) (\EVPROGN 70333 . 70546) (PROG1 70548 . 70787)) (71277 78168 (ENVEVAL 71287 . 71537) ( -ENVAPPLY 71539 . 71796) (FUNCTION 71798 . 72028) (\FUNCT1 72030 . 74479) (\MAKEFUNARGFRAME 74481 . -76678) (STKEVAL 76680 . 76828) (STKAPPLY 76830 . 76999) (RETEVAL 77001 . 77605) (RETAPPLY 77607 . -78166)) (78289 85797 (BLIPVAL 78299 . 82200) (SETBLIPVAL 82202 . 84944) (BLIPSCAN 84946 . 85795)) ( -85798 86493 (\REALFRAMEP 85808 . 86491)) (86869 96264 (RAIDCOMMAND 86879 . 90485) (RAIDSHOWFRAME 90487 - . 90870) (RAIDSTACKCMD 90872 . 92053) (RAIDROOTFRAME 92055 . 92317) (PRINTADDRS 92319 . 92845) ( -PRINTVA 92847 . 92992) (READVA 92994 . 93072) (READATOM 93074 . 93656) (READOCT 93658 . 94289) ( -SHOWSTACKBLOCKS 94291 . 95537) (SHOWSTACKBLOCK1 95539 . 95690) (PRINCOPY 95692 . 95824) (NOSUCHATOM -95826 . 96262)) (96265 104893 (BACKTRACE 96275 . 96632) (\BACKTRACE 96634 . 97740) (\SCANFORNTENTRY -97742 . 99372) (\PRINTSTK 99374 . 99561) (\PRINTFRAME 99563 . 103546) (\PRINTBF 103548 . 104891)) ( -107393 116737 (CCODEP 107403 . 107678) (EXPRP 107680 . 107939) (SUBRP 107941 . 107996) (FNTYP 107998 - . 108758) (ARGTYPE 108760 . 109374) (NARGS 109376 . 109863) (ARGLIST 109865 . 111114) (\CCODEARGLIST -111116 . 115512) (\CCODEIVARSCAN 115514 . 116735)) (117687 119918 (CONSTANTS 117697 . 117988) ( -CONSTANTEXPRESSIONP 117990 . 119916))))) + (FILEMAP (NIL (6111 23372 (\INTERPRETER 6121 . 10717) (\INTERPRETER1 10719 . 17287) ( +\SETUP-COMPILED-CLOSURE-CALL 17289 . 22436) (\STKNAME 22438 . 23370)) (23401 28813 (\ENVCALL.UFN 23411 + . 23543) (\SETUP-ENVIRONMENT-CALL 23545 . 28811)) (28852 33729 (EVAL 28862 . 28962) (\EVAL 28964 . +29174) (\EVALFORM 29176 . 30407) (\EVALFORMASLAMBDA 30409 . 30599) (\EVALOTHER 30601 . 30808) (APPLY +30810 . 30917) (APPLY* 30919 . 32034) (\CHECKAPPLY* 32036 . 33141) (\CKAPPLYARGS 33143 . 33486) ( +DEFEVAL 33488 . 33727)) (35573 43162 (EVALV 35583 . 35792) (\EVALV1 35794 . 35949) (\EVALVAR 35951 . +36314) (BOUNDP 36316 . 36532) (SET 36534 . 36900) (\SETVAR 36902 . 37272) (SETQ 37274 . 37946) ( +\STKSCAN 37948 . 41612) (\SETFVARSLOT 41614 . 43160)) (43196 56203 (PROG 43206 . 45722) (\PROG0 45724 + . 49354) (\EVPROG1 49356 . 49559) (RETURN 49561 . 50102) (GO 50104 . 50919) (EVALA 50921 . 52850) ( +\EVALA 52852 . 55445) (ERRORSET 55447 . 56052) (SI::ERRORSET-PRINT-FUNCTION 56054 . 56201)) (56262 +68914 (LET 56272 . 58415) (LET* 58417 . 60565) (\LET0 60567 . 64227) (\LET* 64229 . 68912)) (68915 +70491 (QUOTE 68925 . 68956) (AND 68958 . 69166) (OR 69168 . 69416) (PROGN 69418 . 69697) (COND 69699 + . 70033) (\EVPROGN 70035 . 70248) (PROG1 70250 . 70489)) (70979 77870 (ENVEVAL 70989 . 71239) ( +ENVAPPLY 71241 . 71498) (FUNCTION 71500 . 71730) (\FUNCT1 71732 . 74181) (\MAKEFUNARGFRAME 74183 . +76380) (STKEVAL 76382 . 76530) (STKAPPLY 76532 . 76701) (RETEVAL 76703 . 77307) (RETAPPLY 77309 . +77868)) (77991 85499 (BLIPVAL 78001 . 81902) (SETBLIPVAL 81904 . 84646) (BLIPSCAN 84648 . 85497)) ( +85500 86195 (\REALFRAMEP 85510 . 86193)) (86571 95966 (RAIDCOMMAND 86581 . 90187) (RAIDSHOWFRAME 90189 + . 90572) (RAIDSTACKCMD 90574 . 91755) (RAIDROOTFRAME 91757 . 92019) (PRINTADDRS 92021 . 92547) ( +PRINTVA 92549 . 92694) (READVA 92696 . 92774) (READATOM 92776 . 93358) (READOCT 93360 . 93991) ( +SHOWSTACKBLOCKS 93993 . 95239) (SHOWSTACKBLOCK1 95241 . 95392) (PRINCOPY 95394 . 95526) (NOSUCHATOM +95528 . 95964)) (95967 104595 (BACKTRACE 95977 . 96334) (\BACKTRACE 96336 . 97442) (\SCANFORNTENTRY +97444 . 99074) (\PRINTSTK 99076 . 99263) (\PRINTFRAME 99265 . 103248) (\PRINTBF 103250 . 104593)) ( +107095 116821 (CCODEP 107105 . 107380) (EXPRP 107382 . 107641) (SUBRP 107643 . 107698) (FNTYP 107700 + . 108460) (ARGTYPE 108462 . 109076) (NARGS 109078 . 109565) (ARGLIST 109567 . 110816) (\CCODEARGLIST +110818 . 115596) (\CCODEIVARSCAN 115598 . 116819)) (117771 120002 (CONSTANTS 117781 . 118072) ( +CONSTANTEXPRESSIONP 118074 . 120000))))) STOP diff --git a/sources/LLINTERP.LCOM b/sources/LLINTERP.LCOM index 7abb7a4a..4a24ebca 100644 Binary files a/sources/LLINTERP.LCOM and b/sources/LLINTERP.LCOM differ diff --git a/sources/LLREAD b/sources/LLREAD index d3897704..03d0d72e 100644 --- a/sources/LLREAD +++ b/sources/LLREAD @@ -1,13 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "20-Sep-2025 14:18:31" {WMEDLEY}LLREAD.;123 99281 +(FILECREATED "29-Apr-2026 22:56:18" {MEDLEY}LLREAD.;128 100032 :EDIT-BY rmk :CHANGES-TO (VARS LLREADCOMS) - (FNS CHARSET.ENCODE) - :PREVIOUS-DATE "24-Aug-2025 11:47:11" {WMEDLEY}LLREAD.;122) + :PREVIOUS-DATE "17-Apr-2026 17:06:49" {MEDLEY}LLREAD.;127) (PRETTYCOMPRINT LLREADCOMS) @@ -40,7 +39,9 @@ (ALISTS (CHARACTERNAMES Page Form FF Rubout Del Null Escape Esc Bell Tab Backspace Bs Newline CR EOL Return Tenexeol Space Sp Linefeed LF Zero One Two Three Four Five Six Seven Eight Nine INFINITY EMQUAD ENQUAD THINSPACE - FIGURESPACE LEFT-DOUBLEQUOTE RIGHT-DOUBLEQUOTE EMDASH) + HAIRSPACE FIGURESPACE LEFT-DOUBLEQUOTE RIGHT-DOUBLEQUOTE EMDASH ENDASH + Union Intersection And Or Contourintegral Integral Summation Product + Radical All Exists Member INFINITY Notmember Minus) (CHARACTERSETNAMES Meta Function Greek Cyrillic Hira Hiragana Kata Katakana Kanji))) (DECLARE%: DOEVAL@COMPILE DONTCOPY (CONSTANTS * READTYPES) @@ -1486,7 +1487,8 @@ (ERROR "BAD CHARACTER SPECIFICATION" C]) (CHARCODE.ENCODE - [LAMBDA (CODE OCTALCHARS NONCHARIDENTITY) (* ; "Edited 13-Aug-2025 08:54 by rmk") + [LAMBDA (CODE OCTALCHARS NONCHARIDENTITY) (* ; "Edited 17-Apr-2026 17:05 by rmk") + (* ; "Edited 13-Aug-2025 08:54 by rmk") (* ; "Edited 7-Aug-2025 11:10 by rmk") (* ; "Edited 23-Apr-2025 19:08 by rmk") (* ; "Edited 26-Mar-2025 10:37 by rmk") @@ -1518,6 +1520,10 @@ then (CL:IF NONCHARIDENTITY CODE (\ILLEGAL.ARG CODE)) + elseif OCTALCHARS + then (CONCAT (OCTALSTRING (LRSH CODE 8)) + "," + (OCTALSTRING (LOGAND CODE 255))) elseif [CAR (find CN in CHARACTERNAMES suchthat (if (CHARCODEP (CADR CN)) then (IEQP CODE (CADR CN)) else (IEQP CODE (CHARCODE.DECODE (CADR CN] @@ -1528,10 +1534,8 @@ (SETQ CSETNAME (if [CAR (find CN in CHARACTERSETNAMES suchthat (STRING.EQUAL CHARSET (CADR CN] else (OCTALSTRING CHARSET))) - [SETQ CHARNAME (if OCTALCHARS - then (OCTALSTRING CHAR) - else (CAR (for CC in CHARACTERNAMES when (EQ CHAR (CADR CC)) - smallest (NCHARS (CAR CC] + [SETQ CHARNAME (CAR (for CC in CHARACTERNAMES when (EQ CHAR (CADR CC)) + smallest (NCHARS (CAR CC] (CL:WHEN (STREQUAL CHARNAME "Tenexeol") (* ;  "Put (%"^_%" Tenexeol) in CHARACTERNAMES ?") (SETQ CHARNAME "^_")) @@ -1551,8 +1555,7 @@ (SETQ CHARNAME (CL:IF (IGEQ CHAR 128) (CONCAT "#" ASCIINAME) ASCIINAME))) - (CL:IF (AND (ZEROP CHARSET) - (NOT OCTALCHARS)) + (CL:IF (ZEROP CHARSET) CHARNAME (CONCAT CSETNAME "," CHARNAME))]) @@ -1723,10 +1726,27 @@ (EMQUAD "357,55") (ENQUAD "357,54") (THINSPACE "357,57") + (HAIRSPACE "356,043") (FIGURESPACE "357,56") (LEFT-DOUBLEQUOTE "0,252") (RIGHT-DOUBLEQUOTE "0,272") - (EMDASH "357,045")) + (EMDASH "357,045") + (ENDASH "357,044") + (Union "357,127") + (Intersection "357,126") + (And "357,266") + (Or "357,267") + (Contourintegral "357,166") + (Integral "357,165") + (Summation "357,172") + (Product "357,173") + (Radical "357,174") + (All "357,265") + (Exists "357,264") + (Member "357,112") + (INFINITY "41,147") + (Notmember "357,113") + (Minus "356,055")) (ADDTOVAR CHARACTERSETNAMES (Meta 1) (Function 2) @@ -1840,19 +1860,19 @@ (ADDTOVAR LAMA CL:PARSE-INTEGER CL:READ-DELIMITED-LIST CL:READ-PRESERVING-WHITESPACE CL:READ) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (3828 12272 (LASTC 3838 . 4144) (PEEKC 4146 . 4534) (PEEKCCODE 4536 . 4947) (RATOM 4949 - . 6030) (READ 6032 . 6592) (READC 6594 . 7235) (READCCODE 7237 . 7996) (READP 7998 . 8550) ( -SETREADMACROFLG 8552 . 8851) (SKIPSEPRCODES 8853 . 9933) (SKIPSEPRS 9935 . 10321) (SKREAD 10323 . -12270)) (12318 20927 (CL:READ 12328 . 12877) (CL:READ-PRESERVING-WHITESPACE 12879 . 13601) ( -CL:READ-DELIMITED-LIST 13603 . 14518) (CL:PARSE-INTEGER 14520 . 20925)) (21020 33497 (RSTRING 21030 . -21762) (READ-EXTENDED-TOKEN 21764 . 25636) (\RSTRING2 25638 . 33495)) (33533 64266 (\TOP-LEVEL-READ -33543 . 35526) (\SUBREAD 35528 . 60682) (\SUBREADCONCAT 60684 . 61307) (\ORIG-READ.SYMBOL 61309 . -62377) (\ORIG-INVALID.SYMBOL 62379 . 63278) (\APPLYREADMACRO 63280 . 63696) (INREADMACROP 63698 . -64264)) (64425 64600 (READQUOTE 64435 . 64598)) (64625 76529 (READVBAR 64635 . 65966) (READHASHMACRO -65968 . 71778) (DEFMACRO-LAMBDA-LIST-KEYWORD-P 71780 . 72000) (DIGITBASEP 72002 . 72736) ( -READNUMBERINBASE 72738 . 74624) (ESTIMATE-DIMENSIONALITY 74626 . 74951) (SKIP.HASH.COMMENT 74953 . -75921) (CMLREAD.FEATURE.PARSER 75923 . 76527)) (76573 77839 (CHARACTER.READ 76583 . 77837)) (77872 -89790 (CHARCODE.DECODE 77882 . 83051) (CHARCODE.ENCODE 83053 . 87495) (CHARCODEP 87497 . 88026) ( -CHARSET.DECODE 88028 . 88976) (CHARSET.ENCODE 88978 . 89788)) (89791 94287 (HEXNUM? 89801 . 92144) ( -OCTALNUM? 92146 . 92959) (HEXSTRING 92961 . 94285))))) + (FILEMAP (NIL (3984 12428 (LASTC 3994 . 4300) (PEEKC 4302 . 4690) (PEEKCCODE 4692 . 5103) (RATOM 5105 + . 6186) (READ 6188 . 6748) (READC 6750 . 7391) (READCCODE 7393 . 8152) (READP 8154 . 8706) ( +SETREADMACROFLG 8708 . 9007) (SKIPSEPRCODES 9009 . 10089) (SKIPSEPRS 10091 . 10477) (SKREAD 10479 . +12426)) (12474 21083 (CL:READ 12484 . 13033) (CL:READ-PRESERVING-WHITESPACE 13035 . 13757) ( +CL:READ-DELIMITED-LIST 13759 . 14674) (CL:PARSE-INTEGER 14676 . 21081)) (21176 33653 (RSTRING 21186 . +21918) (READ-EXTENDED-TOKEN 21920 . 25792) (\RSTRING2 25794 . 33651)) (33689 64422 (\TOP-LEVEL-READ +33699 . 35682) (\SUBREAD 35684 . 60838) (\SUBREADCONCAT 60840 . 61463) (\ORIG-READ.SYMBOL 61465 . +62533) (\ORIG-INVALID.SYMBOL 62535 . 63434) (\APPLYREADMACRO 63436 . 63852) (INREADMACROP 63854 . +64420)) (64581 64756 (READQUOTE 64591 . 64754)) (64781 76685 (READVBAR 64791 . 66122) (READHASHMACRO +66124 . 71934) (DEFMACRO-LAMBDA-LIST-KEYWORD-P 71936 . 72156) (DIGITBASEP 72158 . 72892) ( +READNUMBERINBASE 72894 . 74780) (ESTIMATE-DIMENSIONALITY 74782 . 75107) (SKIP.HASH.COMMENT 75109 . +76077) (CMLREAD.FEATURE.PARSER 76079 . 76683)) (76729 77995 (CHARACTER.READ 76739 . 77993)) (78028 +90031 (CHARCODE.DECODE 78038 . 83207) (CHARCODE.ENCODE 83209 . 87736) (CHARCODEP 87738 . 88267) ( +CHARSET.DECODE 88269 . 89217) (CHARSET.ENCODE 89219 . 90029)) (90032 94528 (HEXNUM? 90042 . 92385) ( +OCTALNUM? 92387 . 93200) (HEXSTRING 93202 . 94526))))) STOP diff --git a/sources/LLREAD.LCOM b/sources/LLREAD.LCOM index 0a78b0a6..73bb8944 100644 Binary files a/sources/LLREAD.LCOM and b/sources/LLREAD.LCOM differ diff --git a/sources/MCCS b/sources/MCCS index f4524019..db81355e 100644 --- a/sources/MCCS +++ b/sources/MCCS @@ -1,18 +1,19 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8) -(FILECREATED "26-Feb-2026 12:57:11" {WMEDLEY}MCCS.;168 61634 +(FILECREATED "17-Apr-2026 08:42:39" {MEDLEY}MCCS.;200 23340 :EDIT-BY rmk - :CHANGES-TO (FNS MCCSMAPPAIRS) + :CHANGES-TO (FNS KANJICHARSETP UNIHANCHARSETP) + (VARS MCCSCOMS) - :PREVIOUS-DATE "20-Feb-2026 09:21:16" {WMEDLEY}MCCS.;167) + :PREVIOUS-DATE "11-Mar-2026 11:58:53" {MEDLEY}MCCS.;199) (PRETTYCOMPRINT MCCSCOMS) (RPAQQ MCCSCOMS - [ + ( (* ;; "Stringlet number encoding common to MCCS and XCCS") (FNS \MCCSINCCODE \MCCSPEEKCCODE \MCCSOUTCHAR \MCCSBACKCCODE \MCCSFORMATBYTESTREAM @@ -37,30 +38,7 @@ (FNS MTOXCODE XTOMCODE XTOMSTRING MTOXSTRING) (FNS MTOX$CODE X$TOMCODE) - (FNS KANJICHARSETP CHINESECHARSETP) - (COMS (* ; " Mapping to MCCS") - (VARS ALTOTEXT2MCCS SYMBOLTOMCCS SIGMATOMCCS HIPPOTOMCCS CYRILLICTOMCCS MATHTOMCCS - PALATINOTOMCCS) - (FNS MCCSCODEMAPARRAY) - (GLOBALVARS ALTOTOMCCSARRAY SYMBOLTOMCCSARRAY HIPPOTOMCCSARRAY CYRILLICTOMCCSARRAY - MATHTOMCCSARRAY SIGMATOMCCSARRAY PALATINOTOMCCSARRAY) - (INITVARS (ALTOTOMCCSARRAY (MCCSCODEMAPARRAY 'MCCS)) - (SYMBOLTOMCCSARRAY (MCCSCODEMAPARRAY SYMBOLTOMCCS)) - (HIPPOTOMCCSARRAY (MCCSCODEMAPARRAY HIPPOTOMCCS)) - (CYRILLICTOMCCSARRAY (MCCSCODEMAPARRAY CYRILLICTOMCCS)) - (MATHTOMCCSARRAY (MCCSCODEMAPARRAY MATHTOMCCS)) - (SIGMATOMCCSARRAY (MCCSCODEMAPARRAY SIGMATOMCCS)) - (PALATINOTOMCCSARRAY (MCCSCODEMAPARRAY PALATINOTOMCCS))) - (FNS MCCSMAPFN MCCSMAPPAIRS XCCS.CS0.UNDEFINED XCCSUNDEFINEDPAIRS) - (COMS - (* ;; - "Mappings into MCCS: needed for hardcopy and Tedit coercion, e.g. \TEDIT.MCCS.TRANSLATE") - - (FNS GACHATOMCODE SYMBOLTOMCODE SIGMATOMCODE ATOMCODE MATHTOMCODE HIPPOTOMCODE - CYRILLICTOMCODE PALATINOTOMCODE)) - (COMS (FNS SYSTEM-EXTERNALFORMAT MTOSYSSTRING SYSTOMSTRING) - (EXPORT (GLOBALVARS *SYSTEM-EXTERNALFORMAT*)) - (INITVARS (*SYSTEM-EXTERNALFORMAT* :UTF-8]) + (FNS KANJICHARSETP UNIHANCHARSETP))) @@ -470,1125 +448,34 @@ (DEFINEQ (KANJICHARSETP - [LAMBDA (CHARSET) (* ; "Edited 13-Jun-2025 16:33 by rmk") + [LAMBDA (CHARSET) (* ; "Edited 17-Apr-2026 08:38 by rmk") + (* ; "Edited 11-Mar-2026 11:58 by rmk") + (* ; "Edited 13-Jun-2025 16:33 by rmk") (* ;; "Returns CHARSET if it is a charset with MCCS Kanji characters") - (AND (<= 48 CHARSET 118) + (AND [OR (<= (CONSTANT (CHARSET.DECODE "60")) + CHARSET + (CONSTANT (CHARSET.DECODE "172"] CHARSET]) -(CHINESECHARSETP - [LAMBDA (CHARSET) (* ; "Edited 18-Jun-2025 23:09 by rmk") +(UNIHANCHARSETP + [LAMBDA (CHARSET) (* ; "Edited 17-Apr-2026 08:41 by rmk") (* ; "Edited 13-Jun-2025 16:33 by rmk") - (* ;; "Returns CHARSET if it is a charset with MCCS Chinese characters") + (* ;; "Returns CHARSET if it is a charset with MCCS Unihan characters") - (AND (<= 161 CHARSET 212) + (AND (<= (CONSTANT (OCTALNUM? "241")) + CHARSET + (CONSTANT (OCTALNUM? "324"))) CHARSET]) ) - - - -(* ; " Mapping to MCCS") - - -(RPAQQ ALTOTEXT2MCCS - ( - (* ;; "From bravo doc") - - (↑N "356,055" MINUS) - (↑V "357,44" ENDASH) - (↑S EMDASH) - (↑O EMQUAD) - (↑X "356,055" MINUS) - (↑Y FIGURESPACE ENQUAD) - - (* ;; "Fom current Helvetica/Timesroman fonts") - - ("0,1" "0,317" HACHEK) - ("0,3" "361,255" DIARESIS) - ("0,4" "0,310" CCEDILLA) - ("0,5" "0,301" GRAVE) - ("0,6" "360,41" ff) - ("0,7" "0,271" LSQ) - ("0,10" "0,241" SPANISHEXCL) - ("0,13" "0,302" ACUTE) - ("0,20" "0,304" TILDE) - ("0,21" "360,42" ffi) - ("0,22" "360,43" ffl) - ("0,24" "360,44" fi) - ("0,25" "360,45" fl) - ("0,26" "357,44" ENDASH) - ("0,27" "0,306" BREVE) - ("0,34" ENQUAD) - ("0,36" "0,304" TILDE) - ("0,140" "0,251") - ("0,200" "361,47" A-umlaut) - ("0,201" "361,124" O-umlaut) - ("0,202" "361,47" A-ring) - ("0,233" "357,44" ENDASH) - ("0,234" EMDASH) - ("0,240" "361,247" a-umlaut) - ("0,241" "361,324" o-umlaut) - ("0,242" "361,250" a-ring) - ("0,243" "361,345" u-umlaut) - ("0,254" Circumflex) - ("0,260" "0,242" CENTS) - ("0,261" "0,243" POUND) - ("0,265" "41,172" STAR) - ("0,266" "0,247" SECTION) - ("0,267" "357,146" BULLET) - ("0,270" "357,60" DAGGER) - ("0,271" "357,061" DOUBLEDAGGER) - ("0,272" "0,266" PARAGRAPH) - ("0,274" "0,261" PLUSMINUS) - ("0,275" "0,241" SPANISHEXCL) - ("0,276" "0,277" SPANISHQUES) - ("0,277" Lowline))) - -(RPAQQ SYMBOLTOMCCS - (("0,1" Null) - ("0,2" "0,264") - ("0,3" "41,142") - ("0,4" Null) - ("0,5" "41,176") - ("0,6" "0,261") - (Bell "357,175") - (Backspace "357,142") - (Tab "357,143") - (Linefeed "357,144") - ("0,13" "357,145") - (Page Null) - (Newline "0,270") - ("0,16" Null) - ("0,17" Null) - ("0,20" "357,160") - ("0,21" "357,162") - ("0,22" "357,131") - ("0,23" "357,130") - ("0,24" "41,145") - ("0,25" "41,146") - ("0,26" Null) - ("0,27" Null) - ("0,30" "356,176") - ("0,31" "357,171") - ("0,32" "357,133") - (Escape "357,132") - ("0,34" "41,142") - ("0,35" "357,163") - ("0,36" Null) - (Tenexeol Null) - (Space Null) - ("0,41" "0,256") - ("0,42" Circumflex) - ("0,43" "0,257") - (Dollar "357,122") - ("0,45" "357,102") - ("0,46" "357,103") - ("0,47" "357,167") - ("0,50" "357,115") - ("0,51" "357,117") - ("0,52" Null) - ("0,53" Null) - ("0,54" "357,116") - ("0,55" Null) - ("0,56" Null) - ("0,57" Null) - (Zero Null) - (One INFINITY) - (Two "357,112") - (Three "357,113") - (Four "357,141") - (Five Null) - (Six "357,154") - (Seven Lowline) - (Eight "357,265") - (Nine "357,264") - ("0,72" "357,152") - ("0,73" "357,247") - ("0,74" Null) - ("0,75" Null) - ("0,76" Null) - ("0,77" "0,57") - ("0,100" Null) - ("0,133" "357,127") - ("0,134" "357,126") - ("0,135" Null) - (Uparrow "357,266") - (Leftarrow "357,267") - ("0,140" "357,66") - ("0,141" "357,67") - ("0,142" "357,262") - ("0,143" "357,263") - ("0,144" "357,260") - ("0,145" "357,261") - ("0,146" "0,173") - ("0,147" "0,175") - ("0,150" "357,62") - ("0,151" "357,63") - ("0,152" "356,174") - ("0,153" "41,102") - ("0,154" "357,73") - ("0,155" "357,72") - ("0,156" "42,44") - ("0,157" "42,46") - ("0,160" "357,174") - ("0,161" "41,142") - ("0,162" Null) - ("0,163" "357,165") - ("0,164" Null) - ("0,165" Null) - ("0,166" Null) - ("0,167" Null) - ("0,170" "0,247") - ("0,171" "357,60") - ("0,172" "357,61") - ("0,173" "0,266") - ("0,174" "0,100") - ("0,175" "0,323") - ("0,176" "0,243") - (Rubout Dollar) - ("0,200" Null) - ("0,201" Null) - ("0,202" Null) - ("0,203" Null) - ("0,204" Null) - ("0,205" Null) - ("0,206" Null) - ("0,207" Null) - ("0,210" Null) - ("0,211" Null) - ("0,212" Null) - ("0,213" Null) - ("0,214" Null) - ("0,215" Null) - ("0,216" Null) - ("0,217" Null) - ("0,220" Null) - ("0,221" Null) - ("0,222" Null) - ("0,223" Null) - ("0,224" Null) - ("0,225" Null) - ("0,226" Null) - ("0,227" Null) - ("0,230" Null) - ("0,231" Null) - ("0,232" Null) - ("0,233" Null) - ("0,234" Null) - ("0,235" Null) - ("0,236" Null) - ("0,237" Null) - ("0,240" Null) - ("0,241" Null) - ("0,242" Null) - ("0,243" Null) - (Currency Null) - ("0,245" Null) - ("0,246" Null) - ("0,247" Null) - ("0,250" Null) - ("0,251" Null) - (LEFT-DOUBLEQUOTE Null) - ("0,253" Null) - (Lowline Null) - (Circumflex Null) - ("0,256" Null) - ("0,257" Null) - ("0,260" Null) - ("0,261" Null) - ("0,262" Null) - ("0,263" Null) - ("0,264" Null) - ("0,265" Null) - ("0,266" Null) - ("0,267" Null) - ("0,270" Null) - ("0,271" Null) - (RIGHT-DOUBLEQUOTE Null) - ("0,273" Null) - ("0,274" Null) - ("0,275" Null) - ("0,276" Null) - ("0,277" Null) - ("0,300" Null) - ("0,301" Null) - ("0,302" Null) - ("0,303" Null) - ("0,304" Null) - ("0,305" Null) - ("0,306" Null) - ("0,307" Null) - ("0,310" Null) - ("0,311" Null) - ("0,312" Null) - ("0,313" Null) - ("0,314" Null) - ("0,315" Null) - ("0,316" Null) - ("0,317" Null) - ("0,320" Null) - ("0,321" Null) - ("0,322" Null) - ("0,323" Null) - ("0,324" Null) - ("0,325" Null) - ("0,326" Null) - ("0,327" Null) - ("0,330" Null) - ("0,331" Null) - ("0,332" Null) - ("0,333" Null) - ("0,334" Null) - ("0,335" Null) - ("0,336" Null) - ("0,337" Null) - ("0,340" Null) - ("0,341" Null) - ("0,342" Null) - ("0,343" Null) - ("0,344" Null) - ("0,345" Null) - ("0,346" Null) - ("0,347" Null) - ("0,350" Null) - ("0,351" Null) - ("0,352" Null) - ("0,353" Null) - ("0,354" Null) - ("0,355" Null) - ("0,356" Null) - ("0,357" Null) - ("0,360" Null) - ("0,361" Null) - ("0,362" Null) - ("0,363" Null) - ("0,364" Null) - ("0,365" Null) - ("0,366" Null) - ("0,367" Null) - ("0,370" Null) - ("0,371" Null) - ("0,372" Null) - ("0,373" Null) - ("0,374" Null) - ("0,375" Null) - ("0,376" Null) - ("0,377" Null))) - -(RPAQQ SIGMATOMCCS - (("0,101" "0,101" low squaredot not in XCCS) - ("0,103" "357,166" contourintegral) - ("0,111" "357,126" intersection) - ("0,114" "357,266" and) - ("0,115" "357,172" Summation) - ("0,120" "357,173" Product) - ("0,122" "357,174" radical) - ("0,123" "357,165" integral) - ("0,125" "357,127" union) - ("0,126" "357,267" or))) - -(RPAQQ HIPPOTOMCCS - (("0,16" "356,55") - ("0,17" EMQUAD) - ("0,23" EMDASH) - ("0,26" "357,44") - ("0,30" "356,55") - ("0,31" ENQUAD) - ("0,101" "Greek,101") - ("0,102" "Greek,102") - ("0,103" "Greek,121") - ("0,104" "Greek,105") - ("0,105" "Greek,106") - ("0,106" "Greek,132") - ("0,107" "Greek,104") - ("0,110" "Greek,112") - ("0,111" "Greek,114") - ("0,113" "Greek,115") - ("0,114" "Greek,116") - ("0,115" "Greek,117") - ("0,116" "Greek,120") - ("0,117" "Greek,122") - ("0,120" "Greek,123") - ("0,121" "Greek,113") - ("0,122" "Greek,125") - ("0,123" "Greek,126") - ("0,124" "Greek,130") - ("0,125" "Greek,131") - ("0,127" "Greek,135") - ("0,130" "Greek,133") - ("0,131" "Greek,134") - ("0,132" "Greek,111") - (Uparrow Circumflex) - (Leftarrow Lowline) - ("0,141" "Greek,141") - ("0,142" "Greek,142") - ("0,143" "Greek,161") - ("0,144" "Greek,145") - ("0,145" "Greek,146") - ("0,146" "Greek,172") - ("0,147" "Greek,144") - ("0,150" "Greek,152") - ("0,151" "Greek,154") - ("0,153" "Greek,155") - ("0,154" "Greek,156") - ("0,155" "Greek,157") - ("0,156" "Greek,160") - ("0,157" "Greek,162") - ("0,160" "Greek,163") - ("0,161" "Greek,153") - ("0,162" "Greek,165") - ("0,163" "Greek,166") - ("0,164" "Greek,170") - ("0,165" "Greek,171") - ("0,167" "Greek,175") - ("0,170" "Greek,173") - ("0,171" "Greek,174") - ("0,172" "Greek,151") - ("0,233" "357,44") - ("0,234" EMDASH) - ("0,267" "357,146"))) - -(RPAQQ CYRILLICTOMCCS - ((Dollar "Cyrillic,47") - ("0,52" "Cyrillic,71") - ("0,55" "41,76") - (Two "Cyrillic,157") - (Four "Cyrillic,127") - (Six "Cyrillic,150") - (Eight "Cyrillic,151") - ("0,74" "0,253") - ("0,76" "0,273") - ("0,100" "Cyrillic,77") - ("0,101" "Cyrillic,41") - ("0,102" "Cyrillic,42") - ("0,103" "Cyrillic,76") - ("0,104" "Cyrillic,45") - ("0,105" "Cyrillic,46") - ("0,106" "Cyrillic,66") - ("0,107" "Cyrillic,44") - ("0,110" "Cyrillic,101") - ("0,111" "Cyrillic,52") - ("0,112" "Cyrillic,53") - ("0,113" "Cyrillic,54") - ("0,114" "Cyrillic,55") - ("0,115" "Cyrillic,56") - ("0,116" "Cyrillic,57") - ("0,117" "Cyrillic,60") - ("0,120" "Cyrillic,61") - ("0,121" "Cyrillic,67") - ("0,122" "Cyrillic,62") - ("0,123" "Cyrillic,63") - ("0,124" "Cyrillic,64") - ("0,125" "Cyrillic,65") - ("0,126" "Cyrillic,43") - ("0,127" "Cyrillic,50") - ("0,130" "Cyrillic,75") - ("0,131" "Cyrillic,100") - ("0,132" "Cyrillic,51") - ("0,133" "Cyrillic,152") - ("0,134" "Cyrillic,0") - ("0,135" "Cyrillic,153") - (Uparrow "Cyrillic,74") - (Leftarrow "Cyrillic,154") - ("0,140" "Cyrillic,0") - ("0,141" "Cyrillic,121") - ("0,142" "Cyrillic,122") - ("0,143" "Cyrillic,176") - ("0,144" "Cyrillic,125") - ("0,145" "Cyrillic,126") - ("0,146" "Cyrillic,146") - ("0,147" "Cyrillic,124") - ("0,150" "Cyrillic,161") - ("0,151" "Cyrillic,132") - ("0,152" "Cyrillic,133") - ("0,153" "Cyrillic,134") - ("0,154" "Cyrillic,135") - ("0,155" "Cyrillic,136") - ("0,156" "Cyrillic,137") - ("0,157" "Cyrillic,140") - ("0,160" "Cyrillic,141") - ("0,161" "Cyrillic,147") - ("0,162" "Cyrillic,142") - ("0,163" "Cyrillic,143") - ("0,164" "Cyrillic,144") - ("0,165" "Cyrillic,145") - ("0,166" "Cyrillic,123") - ("0,167" "Cyrillic,130") - ("0,170" "Cyrillic,155") - ("0,171" "Cyrillic,160") - ("0,172" "Cyrillic,131") - ("0,173" "Cyrillic,72") - ("0,174" "Cyrillic,0") - ("0,175" "Cyrillic,73") - ("0,176" "Cyrillic,70") - (Rubout "Cyrillic,0") - ("0,217" "Cyrillic,156") - ("0,233" "357,44") - ("0,234" EMDASH) - ("0,267" "357,146"))) - -(RPAQQ MATHTOMCCS - (("0,1" "357,173") - ("0,2" "357,62") - ("0,3" "357,63") - ("0,4" Null) - ("0,5" "0,243") - ("0,6" "357,165") - (Bell "357,166") - (Backspace Null) - (Tab Null) - (Linefeed Null) - ("0,13" "0,266") - (Page Null) - (Newline Null) - ("0,16" Null) - ("0,17" "357,146") - ("0,20" Null) - ("0,21" Null) - ("0,22" Null) - ("0,23" "357,172") - ("0,24" Null) - ("0,25" Null) - ("0,26" "357,157") - ("0,27" Null) - ("0,30" Null) - ("0,31" Null) - ("0,32" Null) - (Escape Null) - ("0,34" Null) - ("0,35" Null) - ("0,36" Null) - (Tenexeol Null) - ("0,41" "357,60") - ("0,42" "357,147") - ("0,43" INFINITY) - (Dollar "0,242") - ("0,45" "0,270") - ("0,46" "357,266") - ("0,47" "357,163") - ("0,50" "0,302") - ("0,51" "357,174") - ("0,52" "0,307") - ("0,53" "0,261") - ("0,54" "357,114") - ("0,55" "357,175") - ("0,56" "41,150") - ("0,57" "357,145") - (Zero "357,147") - (One "42,42") - (Two "42,44") - (Three "41,176") - (Four "357,142") - (Five "357,143") - (Six "357,144") - (Seven "357,154") - (Eight "41,172") - (Nine "0,307") - ("0,72" "0,247") - ("0,73" Null) - ("0,74" "41,145") - ("0,75" "41,142") - ("0,76" "41,146") - ("0,77" "0,277") - ("0,100" "357,100") - ("0,101" "357,265") - ("0,102" "357,112") - ("0,103" "357,254") - ("0,104" "357,271") - ("0,105" "357,264") - ("0,106" "357,61") - ("0,107" "357,133") - ("0,110" "357,137") - ("0,111" "357,131") - ("0,112" "357,132") - ("0,113" "357,136") - ("0,114" "357,130") - ("0,115" "360,275") - ("0,116" "357,113") - ("0,117" "357,141") - ("0,120" "357,161") - ("0,121" "357,121") - ("0,122" "357,256") - ("0,123" "357,171") - ("0,124" "357,160") - ("0,125" "357,127") - ("0,126" "357,267") - ("0,127" "357,162") - ("0,130" "0,264") - ("0,131" "360,272") - ("0,132" "357,270") - ("0,133" Null) - ("0,134" Null) - ("0,135" Null) - (Uparrow "0,257") - (Leftarrow "0,256") - ("0,140" Null) - ("0,141" "357,247") - ("0,142" "357,123") - ("0,143" "0,323") - ("0,144" "357,272") - ("0,145" "357,167") - ("0,146" "357,122") - ("0,147" "357,117") - ("0,150" "357,150") - ("0,151" "357,260") - ("0,152" "357,261") - ("0,153" "357,262") - ("0,154" "357,263") - ("0,155" "357,110") - ("0,156" "357,152") - ("0,157" "357,147") - ("0,160" "357,66") - ("0,161" "357,70") - ("0,162" "0,322") - ("0,163" "357,76") - ("0,164" "357,74") - ("0,165" "357,77") - ("0,166" "357,75") - ("0,167" "357,102") - ("0,170" "357,103") - ("0,171" "357,126") - ("0,172" "357,67") - ("0,173" "0,274") - ("0,174" "0,275") - ("0,175" "0,276") - ("0,176" "357,120") - (Rubout Null) - ("0,200" Null) - ("0,201" Null) - ("0,202" Null) - ("0,203" Null) - ("0,204" Null) - ("0,205" Null) - ("0,206" Null) - ("0,207" Null) - ("0,210" Null) - ("0,211" Null) - ("0,212" Null) - ("0,213" Null) - ("0,214" Null) - ("0,215" Null) - ("0,216" Null) - ("0,217" Null) - ("0,220" Null) - ("0,221" Null) - ("0,222" Null) - ("0,223" Null) - ("0,224" Null) - ("0,225" Null) - ("0,226" Null) - ("0,227" Null) - ("0,230" Null) - ("0,231" Null) - ("0,232" Null) - ("0,233" Null) - ("0,234" Null) - ("0,235" Null) - ("0,236" Null) - ("0,237" Null) - ("0,240" Null) - ("0,241" Null) - ("0,242" Null) - ("0,243" Null) - (Currency Null) - ("0,245" Null) - ("0,246" Null) - ("0,247" Null) - ("0,250" Null) - ("0,251" Null) - (LEFT-DOUBLEQUOTE Null) - ("0,253" Null) - (Lowline Null) - (Circumflex Null) - ("0,256" Null) - ("0,257" Null) - ("0,260" Null) - ("0,261" Null) - ("0,262" Null) - ("0,263" Null) - ("0,264" Null) - ("0,265" Null) - ("0,266" Null) - ("0,267" Null) - ("0,270" Null) - ("0,271" Null) - (RIGHT-DOUBLEQUOTE Null) - ("0,273" Null) - ("0,274" Null) - ("0,275" Null) - ("0,276" Null) - ("0,277" Null) - ("0,300" Null) - ("0,301" Null) - ("0,302" Null) - ("0,303" Null) - ("0,304" Null) - ("0,305" Null) - ("0,306" Null) - ("0,307" Null) - ("0,310" Null) - ("0,311" Null) - ("0,312" Null) - ("0,313" Null) - ("0,314" Null) - ("0,315" Null) - ("0,316" Null) - ("0,317" Null) - ("0,320" Null) - ("0,321" Null) - ("0,322" Null) - ("0,323" Null) - ("0,324" Null) - ("0,325" Null) - ("0,326" Null) - ("0,327" Null) - ("0,330" Null) - ("0,331" Null) - ("0,332" Null) - ("0,333" Null) - ("0,334" Null) - ("0,335" Null) - ("0,336" Null) - ("0,337" Null) - ("0,340" Null) - ("0,341" Null) - ("0,342" Null) - ("0,343" Null) - ("0,344" Null) - ("0,345" Null) - ("0,346" Null) - ("0,347" Null) - ("0,350" Null) - ("0,351" Null) - ("0,352" Null) - ("0,353" Null) - ("0,354" Null) - ("0,355" Null) - ("0,356" Null) - ("0,357" Null) - ("0,360" Null) - ("0,361" Null) - ("0,362" Null) - ("0,363" Null) - ("0,364" Null) - ("0,365" Null) - ("0,366" Null) - ("0,367" Null) - ("0,370" Null) - ("0,371" Null) - ("0,372" Null) - ("0,373" Null) - ("0,374" Null) - ("0,375" Null) - ("0,376" Null) - ("0,377" Null))) - -(RPAQQ PALATINOTOMCCS - (("0,32" "361,353") - ("0,34" "361,260") - ("0,35" "361,277") - ("0,36" "361,304") - ("0,37" "361,153") - ("0,136" "0,255") - ("0,137" "0,254") - (NIL "0,240") - ("0,200" "361,047") - ("0,201" "361,124") - ("0,202" "361,043") - ("0,203" "361,077") - ("0,204" "361,114") - ("0,205" "361,120") - ("0,206" "361,121") - ("0,207" "361,117") - ("0,210" "361,122") - ("0,211" "361,134") - ("0,212" "361,140") - ("0,213" "361,141") - ("0,214" "361,145") - ("0,215" "361,137") - ("0,216" "361,155") - ("0,217" "361,160") - ("0,220" "361,142") - ("0,221" "361,241") - ("0,222" "361,243") - ("0,223" "361,276") - ("0,224" "361,250") - ("0,225" "361,320") - ("0,226" "361,321") - ("0,227" "361,322") - ("0,230" "361,322") - ("0,231" "361,334") - ("0,232" "361,244") - ("0,233" "361,341") - ("0,234" "361,261") - ("0,235" "361,337") - ("0,236" "361,262") - ("0,237" "361,255") - ("0,240" "361,247") - ("0,244" "0,057") - (* ; "Slash, but should be fraction") - ("0,246" "357,243") - ("0,250" "0,244") - ("0,254" "357,052") - ("0,255" "357,053") - ("0,256" "360,004") - ("0,257" "360,005") - ("0,261" EMDASH) - ("0,262" "357,060") - ("0,263" "357,061") - ("0,267" "357,146") - ("0,270" "43,262") - ("0,271" "357,050") - ("0,274" "41,104") - ("0,275" "357,101") - ("0,311" "357,153") - ("0,314" "361,314") - ("0,321" "375,261") - ("0,324" "361,324") - ("0,325" "375,362") - ("0,326" "375,363") - ("0,327" "0,274") - ("0,330" "0,275") - ("0,331" "0,264") - ("0,332" "0,270") - ("0,333" "357,152") - ("0,334" "361,265") - ("0,335" "0,261") - ("0,336" "361,042") - ("0,337" "357,044") - ("0,340" "361,340") - ("0,344" "361,041") - ("0,345" "361,345") - ("0,346" "361,050") - ("0,347" "361,044") - ("0,355" "361,355") - ("0,356" "361,055") - ("0,357" "361,061") - ("0,360" "361,360") - ("0,362" "361,062") - ("0,364" "361,065") - ("0,366" "361,060") - ("0,367" "361,277") - ("0,375" "361,100") - ("0,376" "361,104"))) -(DEFINEQ - -(MCCSCODEMAPARRAY - [LAMBDA (MAP INVERT) (* ; "Edited 5-Feb-2026 11:02 by rmk") - (* ; "Edited 2-Feb-2026 23:11 by rmk") - (* ; "Edited 6-Sep-2025 18:26 by rmk") - (* ; "Edited 31-Aug-2025 16:15 by rmk") - (* ; "Edited 7-Aug-2025 08:55 by rmk") - (* ; "Edited 2-Jun-2025 11:45 by rmk") - (* ; "Edited 1-Jun-2025 07:26 by rmk") - (* ; "Edited 24-May-2025 12:22 by rmk") - (* ; "Edited 21-Dec-2024 18:57 by rmk") - - (* ;; "Atom cases for loadup") - - (SELECTQ MAP - (XCCS (SETQ MAP (APPEND MTOXCODEMAP ALTOTEXT2MCCS))) - (MCCS (SETQ MAP ALTOTEXT2MCCS)) - NIL) - (LET ((ARRAY (ARRAY (ADD1 \MAXTHINCHAR) - 'WORD 0 0)) - HARRAY) - (for I from 0 to \MAXTHINCHAR do (SETA ARRAY I I)) (* ; "Default") - [for PAIR FROMCODE in MAP when (LISTP PAIR) unless (EQ '* (CAR PAIR)) - when (SETQ FROMCODE (OR (CHARCODEP (CAR PAIR)) - (CHARCODE.DECODE (CAR PAIR) - T))) do (SETA ARRAY FROMCODE (OR (CHARCODEP (CADR PAIR)) - (CHARCODE.DECODE - (CADR PAIR] - (CL:WHEN INVERT - (SETQ HARRAY (HASHARRAY 20)) - (for I from 0 to \MAXTHINCHAR do (PUTHASH I I HARRAY)) - (for PAIR FROMCODE in MAP when (LISTP PAIR) unless (EQ '* (CAR PAIR)) - do (PUTHASH (OR (CHARCODEP (CADR PAIR)) - (CHARCODE.DECODE (CADR PAIR))) - (OR (CHARCODEP (CAR PAIR)) - (CHARCODE.DECODE (CAR PAIR))) - HARRAY))) - (CL:IF HARRAY - (LIST ARRAY HARRAY) - ARRAY)]) -) -(DECLARE%: DOEVAL@COMPILE DONTCOPY - -(GLOBALVARS ALTOTOMCCSARRAY SYMBOLTOMCCSARRAY HIPPOTOMCCSARRAY CYRILLICTOMCCSARRAY MATHTOMCCSARRAY - SIGMATOMCCSARRAY PALATINOTOMCCSARRAY) -) - -(RPAQ? ALTOTOMCCSARRAY (MCCSCODEMAPARRAY 'MCCS)) - -(RPAQ? SYMBOLTOMCCSARRAY (MCCSCODEMAPARRAY SYMBOLTOMCCS)) - -(RPAQ? HIPPOTOMCCSARRAY (MCCSCODEMAPARRAY HIPPOTOMCCS)) - -(RPAQ? CYRILLICTOMCCSARRAY (MCCSCODEMAPARRAY CYRILLICTOMCCS)) - -(RPAQ? MATHTOMCCSARRAY (MCCSCODEMAPARRAY MATHTOMCCS)) - -(RPAQ? SIGMATOMCCSARRAY (MCCSCODEMAPARRAY SIGMATOMCCS)) - -(RPAQ? PALATINOTOMCCSARRAY (MCCSCODEMAPARRAY PALATINOTOMCCS)) -(DEFINEQ - -(MCCSMAPFN - [LAMBDA (FROMENCODING) (* ; "Edited 5-Oct-2025 19:56 by rmk") - (* ; "Edited 6-Sep-2025 12:40 by rmk") - (* ; "Edited 4-Sep-2025 08:06 by rmk") - (* ; "Edited 24-May-2025 10:55 by rmk") - - (* ;; "Returns the function that maps a FROMENCODING code to the corresponding MCCS code") - - (CL:WHEN (LISTP FROMENCODING) - - (* ;; "Assume it's a FONTSPEC") - - (SETQ FROMENCODING (fetch (FONTSPEC FSFAMILY) of FROMENCODING))) - (if (MEMB FROMENCODING NSFONTFAMILIES) - then (SETQ FROMENCODING 'XCCS$) - elseif (MEMB FROMENCODING ALTOFONTFAMILIES) - then (SETQ FROMENCODING 'ALTOTEXT)) - (SELECTQ FROMENCODING - (XCCS$ (FUNCTION X$TOMCODE)) - (ALTOTEXT (FUNCTION ATOMCODE)) - (SYMBOL (FUNCTION SYMBOLTOMCODE)) - (SIGMA (FUNCTION SIGMATOMCODE)) - (MATH (FUNCTION MATHTOMCODE)) - (HIPPO (FUNCTION HIPPOTOMCODE)) - (CYRILLIC (FUNCTION CYRILLICTOMCODE)) - (XCCS (FUNCTION XTOMCODE)) - (GACHA (FUNCTION GACHATOMCODE)) - (PALATINO (FUNCTION PALATINOTOMCODE)) - (MCCS NIL) - NIL]) - -(MCCSMAPPAIRS - [LAMBDA (FROMENCODING NONIDENTITY) (* ; "Edited 26-Feb-2026 12:56 by rmk") - (* ; "Edited 7-Oct-2025 14:47 by rmk") - (* ; "Edited 6-Oct-2025 09:47 by rmk") - (* ; "Edited 20-Sep-2025 09:45 by rmk") - (* ; "Edited 6-Sep-2025 16:43 by rmk") - (* ; "Edited 31-Aug-2025 16:16 by rmk") - - (* ;; "Returns the pairs for MOVEFONTCHARS to use to move charset-0 glyphs into their MCCS positions. For example, the Leftarrow and Lowline glyphs switch positions in an XCCS$ font. Returns NIL (= nothing to do) if there is no function.") - - (LET (PAIRS KEEPCS0) - [SETQ PAIRS (SELECTQ FROMENCODING - (GACHA (* ; "ctrl and upper are slugged") - [APPEND (XCCSUNDEFINEDPAIRS) - '(((Uparrow TERMINAL) - Circumflex) - (↑X Lowline]) - (ALTOTEXT (APPEND (XCCSUNDEFINEDPAIRS) - ALTOTEXT2MCCS)) - (XCCS$ '((Uparrow Circumflex) - (Leftarrow Lowline) - (Lowline Leftarrow) - (Circumflex Uparrow))) - (UNICODE *UNICODETOMCCS*) - (PALATINO (APPEND (XCCS.CS0.UNDEFINED) - PALATINOTOMCCS)) - (PROGN (SETQ KEEPCS0 T) - (for C M FN from 0 to \MAXTHINCHAR first (CL:UNLESS (SETQ FN - (MCCSMAPFN - FROMENCODING)) - (RETURN)) - when (SETQ M (APPLY* FN C NONIDENTITY)) - collect (LIST C M] - (CL:WHEN (LISTP PAIRS) - - (* ;; "Weed out interspersed comments, convert to charcodes") - - [SETQ PAIRS (for P in PAIRS when (LISTP P) unless (EQ '* (CAR P)) - collect (LIST (if (LISTP (CAR P)) - then - (* ;; - "Allows for the (Uparrow TERMINAL) case above, for MOVEFONTCHARS") - - (CONS (CL:IF (CHARCODEP (CAAR P)) - (CAAR P) - (CHARCODE.DECODE (CAAR P))) - (CDAR P)) - elseif (CHARCODEP (CAR P)) - then (CAR P) - else (CHARCODE.DECODE (CAR P))) - (CL:IF (CHARCODEP (CADR P)) - (CADR P) - (CHARCODE.DECODE (CADR P)))] - - (* ;; "Any character that is moved gets replaced by a slug. It may then be coerced from another font. But families like SYMBOL, HIPPO etc. want to preserve CS0 even if they copy their glyphs also to somewhere else.") - - [SETQ PAIRS (APPEND PAIRS (for P in PAIRS when (CAR P) - unless [OR (AND KEEPCS0 (ILEQ (CAR P) - \MAXTHINCHAR)) - (AND (LISTP (CAR P)) - (LITATOM (CADAR P))) - (thereis X in PAIRS - suchthat (EQ (CADR X) - (CAR P] - collect (LIST NIL (CAR P]) - PAIRS]) - -(XCCS.CS0.UNDEFINED - [LAMBDA NIL (* ; "Edited 5-Oct-2025 22:44 by rmk") - - (* ;; "Maps slugs to all undefined/reserved characters in XCCS") - - (APPEND (for I from 0 to (SUB1 (CHARCODE SPACE)) collect (LIST NIL I)) - (for I from (CHARCODE "0,#NULL") to (SUB1 (CHARCODE "0,#SPACE")) - collect (LIST NIL I)) - (for I in (CHARCODE ("0,177" "0,246" "0,250" "0,300" "0,351" "0,326" "0,327" "0,330" - "0,331" "0,332" "0,333" "0,377")) collect (LIST NIL I]) - -(XCCSUNDEFINEDPAIRS - [LAMBDA NIL (* ; "Edited 5-Oct-2025 22:39 by rmk") - (* ; "Edited 2-Sep-2025 13:14 by rmk") - (APPEND (XCCS.CS0.UNDEFINED) - (for I from 128 to \MAXTHINCHAR collect (LIST NIL I]) -) - - - -(* ;; "Mappings into MCCS: needed for hardcopy and Tedit coercion, e.g. \TEDIT.MCCS.TRANSLATE") - -(DEFINEQ - -(GACHATOMCODE - [LAMBDA (GCODE) (* ; "Edited 7-Sep-2025 22:38 by rmk") - (* ; "Edited 3-Sep-2025 23:23 by rmk") - (* ; "Edited 30-Aug-2025 21:58 by rmk") - - (* ;; "Gacha did not have a code for circumflex, so there is nothing to map") - - (CL:IF (EQ GCODE (CHARCODE ↑X)) - (CHARCODE Lowline) - GCODE)]) - -(SYMBOLTOMCODE - [LAMBDA (SCODE) (* ; "Edited 7-Sep-2025 22:39 by rmk") - (* ; "Edited 3-Sep-2025 10:21 by rmk") - (* ; "Edited 7-Aug-2025 09:37 by rmk") - (* ; "Edited 1-Jun-2025 07:02 by rmk") - (OR (CL:WHEN (ILEQ SCODE \MAXTHINCHAR) - (LET ((MCODE (ELT SYMBOLTOMCCSARRAY SCODE))) - (CL:UNLESS (EQ MCODE SCODE) - MCODE))) - SCODE]) - -(SIGMATOMCODE - [LAMBDA (SCODE) (* ; "Edited 7-Sep-2025 22:39 by rmk") - (* ; "Edited 3-Sep-2025 10:21 by rmk") - (* ; "Edited 1-Jun-2025 07:02 by rmk") - (* ; "Edited 24-May-2025 10:54 by rmk") - (OR (CL:WHEN (ILEQ SCODE \MAXTHINCHAR) - (LET ((MCODE (ELT SIGMATOMCCSARRAY SCODE))) - (CL:UNLESS (EQ MCODE SCODE) - MCODE))) - SCODE]) - -(ATOMCODE - [LAMBDA (ACODE) (* ; "Edited 7-Sep-2025 22:39 by rmk") - (* ; "Edited 3-Sep-2025 10:21 by rmk") - (* ; "Edited 24-May-2025 09:41 by rmk") - (OR (CL:WHEN (ILEQ ACODE \MAXTHINCHAR) - (LET ((MCODE (ELT ALTOTOMCCSARRAY ACODE))) - (CL:UNLESS (EQ MCODE ACODE) - MCODE))) - ACODE]) - -(MATHTOMCODE - [LAMBDA (MATHCODE) (* ; "Edited 7-Sep-2025 22:39 by rmk") - (* ; "Edited 4-Sep-2025 08:18 by rmk") - (* ; "Edited 1-Jun-2025 07:02 by rmk") - (* ; "Edited 24-May-2025 10:58 by rmk") - (OR (CL:WHEN (ILEQ MATHCODE \MAXTHINCHAR) - (LET ((MCODE (ELT MATHTOMCCSARRAY MATHCODE))) - (CL:UNLESS (EQ MCODE MATHCODE) - MCODE))) - MATHCODE]) - -(HIPPOTOMCODE - [LAMBDA (HCODE) (* ; "Edited 7-Sep-2025 22:40 by rmk") - (* ; "Edited 3-Sep-2025 10:22 by rmk") - (* ; "Edited 24-May-2025 09:40 by rmk") - (OR (CL:WHEN (ILEQ HCODE \MAXTHINCHAR) - (LET ((MCODE (ELT HIPPOTOMCCSARRAY HCODE))) - (CL:UNLESS (EQ MCODE HCODE) - MCODE))) - HCODE]) - -(CYRILLICTOMCODE - [LAMBDA (CCODE) (* ; "Edited 7-Sep-2025 22:40 by rmk") - (* ; "Edited 24-May-2025 09:38 by rmk") - (OR (CL:WHEN (ILEQ CCODE \MAXTHINCHAR) - (LET ((MCODE (ELT CYRILLICTOMCCSARRAY CCODE))) - (CL:UNLESS (EQ MCODE CCODE) - MCODE))) - CCODE]) - -(PALATINOTOMCODE - [LAMBDA (PCODE) (* ; "Edited 5-Oct-2025 20:08 by rmk") - (* ; "Edited 7-Sep-2025 22:39 by rmk") - (* ; "Edited 3-Sep-2025 10:21 by rmk") - (* ; "Edited 7-Aug-2025 09:37 by rmk") - (* ; "Edited 1-Jun-2025 07:02 by rmk") - (OR (CL:WHEN (ILEQ PCODE \MAXTHINCHAR) - (LET ((MCODE (ELT PALATINOTOMCCSARRAY PCODE))) - (CL:UNLESS (EQ MCODE PCODE) - MCODE))) - PCODE]) -) -(DEFINEQ - -(SYSTEM-EXTERNALFORMAT - [LAMBDA NIL (* ; "Edited 6-Feb-2026 11:29 by rmk") - (* ; "Edited 31-Jan-2026 18:51 by rmk") - (* ; "Edited 10-Oct-2022 11:55 by lmm") - (* ; "Edited 7-Jul-2022 10:41 by rmk") - - (* ;; "Returns the name, sets the global. For now, UTF-8 or through, could be something else.") - - (fetch (EXTERNALFORMAT NAME) of (SETQ *SYSTEM-EXTERNALFORMAT* - (FIND-FORMAT (FOR X IN '("LC_CTYPE" "LC_ALL" "LANG") - WHEN (STRPOS ".UTF-8" (UNIX-GETENV X)) - DO (RETURN :UTF-8) FINALLY (RETURN :THROUGH]) - -(MTOSYSSTRING - [LAMBDA (MSTRING) (* ; "Edited 6-Feb-2026 00:20 by rmk") - (MCCSTOFORMATBYTES *SYSTEM-EXTERNALFORMAT* (MKSTRING MSTRING]) - -(SYSTOMSTRING - [LAMBDA (SYSTRING) (* ; "Edited 5-Feb-2026 23:36 by rmk") - - (* ;; "SYSSTRING is presumably shared with Unix, guarantee a copy on the way out") - - (CONCAT (FORMATBYTESTOMCCS *SYSTEM-EXTERNALFORMAT* SYSTRING]) -) -(* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: DOEVAL@COMPILE DONTCOPY - -(GLOBALVARS *SYSTEM-EXTERNALFORMAT*) -) - -(* "END EXPORTED DEFINITIONS") - - -(RPAQ? *SYSTEM-EXTERNALFORMAT* :UTF-8) (DECLARE%: DONTCOPY - (FILEMAP (NIL (3103 14674 (\MCCSINCCODE 3113 . 6201) (\MCCSPEEKCCODE 6203 . 9090) (\MCCSOUTCHAR 9092 - . 11191) (\MCCSBACKCCODE 11193 . 12737) (\MCCSFORMATBYTESTREAM 12739 . 13469) (\MCCSCHARSETFN 13471 - . 14672)) (14675 17126 (\CREATE.MCCS.EXTERNALFORMAT 14685 . 15555) (\CREATE.XCCS.EXTERNALFORMAT 15557 - . 17124)) (17127 18104 (\MCCS.24BITENCODING.ERROR 17137 . 18102)) (19480 22122 (MTOXCODE 19490 . -20287) (XTOMCODE 20289 . 20946) (XTOMSTRING 20948 . 21535) (MTOXSTRING 21537 . 22120)) (22123 23783 ( -MTOX$CODE 22133 . 22865) (X$TOMCODE 22867 . 23781)) (23784 24424 (KANJICHARSETP 23794 . 24050) ( -CHINESECHARSETP 24052 . 24422)) (45004 47493 (MCCSCODEMAPARRAY 45014 . 47491)) (48109 55125 (MCCSMAPFN - 48119 . 49486) (MCCSMAPPAIRS 49488 . 54131) (XCCS.CS0.UNDEFINED 54133 . 54762) (XCCSUNDEFINEDPAIRS -54764 . 55123)) (55230 59984 (GACHATOMCODE 55240 . 55754) (SYMBOLTOMCODE 55756 . 56404) (SIGMATOMCODE -56406 . 57052) (ATOMCODE 57054 . 57586) (MATHTOMCODE 57588 . 58244) (HIPPOTOMCODE 58246 . 58783) ( -CYRILLICTOMCODE 58785 . 59219) (PALATINOTOMCODE 59221 . 59982)) (59985 61423 (SYSTEM-EXTERNALFORMAT -59995 . 60939) (MTOSYSSTRING 60941 . 61134) (SYSTOMSTRING 61136 . 61421))))) + (FILEMAP (NIL (1608 13179 (\MCCSINCCODE 1618 . 4706) (\MCCSPEEKCCODE 4708 . 7595) (\MCCSOUTCHAR 7597 + . 9696) (\MCCSBACKCCODE 9698 . 11242) (\MCCSFORMATBYTESTREAM 11244 . 11974) (\MCCSCHARSETFN 11976 . +13177)) (13180 15631 (\CREATE.MCCS.EXTERNALFORMAT 13190 . 14060) (\CREATE.XCCS.EXTERNALFORMAT 14062 . +15629)) (15632 16609 (\MCCS.24BITENCODING.ERROR 15642 . 16607)) (17985 20627 (MTOXCODE 17995 . 18792) +(XTOMCODE 18794 . 19451) (XTOMSTRING 19453 . 20040) (MTOXSTRING 20042 . 20625)) (20628 22288 ( +MTOX$CODE 20638 . 21370) (X$TOMCODE 21372 . 22286)) (22289 23317 (KANJICHARSETP 22299 . 22869) ( +UNIHANCHARSETP 22871 . 23315))))) STOP diff --git a/sources/MCCS.LCOM b/sources/MCCS.LCOM index 4b2d7afd..fd682274 100644 Binary files a/sources/MCCS.LCOM and b/sources/MCCS.LCOM differ diff --git a/sources/MCCSFONTS b/sources/MCCSFONTS new file mode 100644 index 00000000..c95fe4af --- /dev/null +++ b/sources/MCCSFONTS @@ -0,0 +1,1280 @@ +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8) + +(FILECREATED "17-Apr-2026 08:58:07" {MEDLEY}MCCSFONTS.;145 51826 + + :EDIT-BY rmk + + :CHANGES-TO (VARS MATHTOMCCS SYMBOLTOMCCS SIGMATOMCCS) + (FNS MCCSMAPPAIRS) + + :PREVIOUS-DATE "15-Apr-2026 22:12:41" {WMEDLEY}MCCSFONTS.;134) + + +(PRETTYCOMPRINT MCCSFONTSCOMS) + +(RPAQQ MCCSFONTSCOMS + [(VARS NSFONTFAMILIES ALTOFONTFAMILIES) + (INITVARS MCCSFONTFAMILIES) + (FNS DISPLAYENCODINGFN) + (COMS (* ; " Mapping to MCCS") + (FNS MCCSCODEMAPARRAY MCCSMAPFN MCCSMAPPAIRS XCCS.CS0.UNDEFINED XCCSUNDEFINEDPAIRS) + (VARS ALTOTEXTTOMCCS SYMBOLTOMCCS SIGMATOMCCS HIPPOTOMCCS CYRILLICTOMCCS MATHTOMCCS + PALATINOTOMCCS TITANTOMCCS TITANLEGALTOMCCS) + (GLOBALVARS GACHATOMCCSARRAY ALTOTOMCCSARRAY SYMBOLTOMCCSARRAY HIPPOTOMCCSARRAY + CYRILLICTOMCCSARRAY MATHTOMCCSARRAY SIGMATOMCCSARRAY PALATINOTOMCCSARRAY + TITANTOMCCSARRAY TITANLEGALTOMCCSARRAY) + + (* ;; "For translation of codes in datastructures (e.g. Tedit)") + + [INITVARS [GACHATOMCCSARRAY (MCCSCODEMAPARRAY (XCCSUNDEFINEDPAIRS '((Lowline ↑X] + (ALTOTOMCCSARRAY (MCCSCODEMAPARRAY ALTOTEXTTOMCCS)) + (SYMBOLTOMCCSARRAY (MCCSCODEMAPARRAY SYMBOLTOMCCS)) + (HIPPOTOMCCSARRAY (MCCSCODEMAPARRAY HIPPOTOMCCS)) + (CYRILLICTOMCCSARRAY (MCCSCODEMAPARRAY CYRILLICTOMCCS)) + (MATHTOMCCSARRAY (MCCSCODEMAPARRAY MATHTOMCCS)) + (SIGMATOMCCSARRAY (MCCSCODEMAPARRAY SIGMATOMCCS)) + (PALATINOTOMCCSARRAY (MCCSCODEMAPARRAY PALATINOTOMCCS)) + (TITANTOMCCSARRAY (MCCSCODEMAPARRAY (XCCSUNDEFINEDPAIRS TITANTOMCCS))) + (TITANLEGALTOMCCSARRAY (MCCSCODEMAPARRAY (XCCSUNDEFINEDPAIRS TITANLEGALTOMCCS] + (COMS + (* ;; + "Mappings into MCCS: needed for e.g. Tedit coercion. \TEDIT.MCCS.TRANSLATE") + + (FNS GACHATOMCODE SYMBOLTOMCODE SIGMATOMCODE ATOMCODE MATHTOMCODE HIPPOTOMCODE + CYRILLICTOMCODE PALATINOTOMCODE TITANTOMCODE TITANLEGALTOMCODE)) + [INITVARS [DISPLAYFONTCOERCIONS '(((HELVETICA (<= * 2)) + (HELVETICA 4)) + ((MODERN (<= 15 * 16)) + (* 14)) + ((MODERN (<= 17 * 21)) + (* 18)) + ((MODERN (<= 22 * 28)) + (* 24)) + ((MODERN (<= 29 * 33)) + (* 30)) + ((MODERN (<= 34 * 40)) + (* 36)) + ((MODERN (<= 41 * 65)) + (* 48)) + ((MODERN (<= 66 *)) + (* 72)) + ((PALATINO 9) + (PALATINO 12)) + ((PALATINO (<= * 8)) + (PALATINO 10)) + ((TITAN (<= * 9) + BOLD) + (MODERN 10)) + ((TITAN (<= * 9) + ITALIC) + (MODERN 10)) + ((TITAN (<= * 9)) + (TITAN 10)) + (LPT AMTEX] + (DISPLAYCHARCOERCIONS '((GACHA TERMINAL) + (MODERN CLASSIC) + (TIMESROMAN CLASSIC) + (HELVETICA MODERN) + (TERMINAL MODERN) + (HIPPO CLASSIC) + (CYRILLIC CLASSIC) + (MATH CLASSIC) + (SIGMA MODERN) + (SYMBOL MODERN) + (TITAN CLASSIC) + (PALATINO CLASSIC) + (OPTIMA MODERN) + (BOLDPS CLASSIC) + (PCTERMINAL CLASSIC) + (TITANLEGAL CLASSIC] + + (* ;; "Defunct coercions? Mapping for DOS filenames, Adobe equivalences") + + (COMS (INITVARS [ADOBEDISPLAYFONTCOERCIONS '(((HELVETICABLACK 16) + (HELVETICABLACK 18)) + ((SYMBOL) + (ADOBESYMBOL)) + ((SYMBOL 11) + (ADOBESYMBOL 10)) + ((AVANTGARDE-DEMI) + (AVANTGARDE)) + ((AVANTGARDE-BOOK) + (AVANTGARDE)) + ((NEWCENTURYSCHLBK) + (CENTURYSCHOOLBOOK)) + ((BOOKMAN-LIGHT) + (BOOKMAN)) + ((BOOKMAN-DEMI) + (BOOKMAN)) + ((HELVETICA-NARROW) + (HELVETICANARROW)) + ((HELVETICA 24) + (ADOBEHELVETICA 24] + (*DISPLAY-FONT-NAME-MAP* '((TIMESROMAN . TR) + (HELVETICA . HV) + (TIMESROMAND . TD) + (HELVETICAD . HD) + (MODERN . MD) + (CLASSIC . CL) + (GACHA . GC) + (TITAN . TI) + (LETTERGOTHIC . LG) + (BOLDPS . BP) + (TERMINAL . TM) + (CLASSICTHIN . CT) + (HIPPO . HP) + (LOGO . LG) + (MATH . MA) + (OLDENGLISH . OE) + (SYMBOL . SY]) + +(RPAQQ NSFONTFAMILIES (CLASSIC CLASSICTHIN MODERN TERMINAL OPTIMA BOLDPS PCTERMINAL)) + +(RPAQQ ALTOFONTFAMILIES (TIMESROMAN TIMESROMAND HELVETICA HELVETICAD CLARITY BRAVOX TONTO CREAM + OLDENGLISH)) + +(RPAQ? MCCSFONTFAMILIES NIL) +(DEFINEQ + +(DISPLAYENCODINGFN + [LAMBDA (FONTSPEC) (* ; "Edited 8-Mar-2026 22:46 by rmk") + (LET ((FAMILY (fetch (FONTSPEC FSFAMILY) of FONTSPEC))) + (if (MEMB FAMILY MCCSFONTFAMILIES) + then 'MCCS + elseif (MEMB FAMILY NSFONTFAMILIES) + then 'XCCS$ + elseif (MEMB FAMILY ALTOFONTFAMILIES) + then 'ALTOTEXT + elseif (EQ FAMILY 'TITAN) + then + (* ;; "The other sizes seem to have already been converted") + + (CL:IF (EQ 14 (fetch (FONTSPEC FSSIZE) of FONTSPEC)) + 'TITAN + 'XCCS$) + else FAMILY]) +) + + + +(* ; " Mapping to MCCS") + +(DEFINEQ + +(MCCSCODEMAPARRAY + [LAMBDA (MAP INVERT) (* ; "Edited 8-Mar-2026 00:42 by rmk") + (* ; "Edited 5-Feb-2026 11:02 by rmk") + (* ; "Edited 2-Feb-2026 23:11 by rmk") + (* ; "Edited 6-Sep-2025 18:26 by rmk") + (* ; "Edited 31-Aug-2025 16:15 by rmk") + (* ; "Edited 7-Aug-2025 08:55 by rmk") + (* ; "Edited 2-Jun-2025 11:45 by rmk") + (* ; "Edited 1-Jun-2025 07:26 by rmk") + (* ; "Edited 24-May-2025 12:22 by rmk") + (* ; "Edited 21-Dec-2024 18:57 by rmk") + + (* ;; "MAP is a list of (destcode source) pairs where source is a code, a (code font) pair, NIL, or (NIL), where the NIL sources designate a slug.") + + (* ;; "If INVERT, this produces a hash table for font-recoding by MOVEFONTCHARS where each key is a destcode the corresponding value is its source. The NIL source is represented as (NIL) in the hash table (as if it is (NIL font)), because putting NIL as a hash value takes it out of the MAPHASH. The INVERT hashtable presumably is used only offline and only once per font, when it is recoded to MCCS.") + + (* ;; "If not INVERT, this produces an array indexed by source codes that maps CS0 sources to their dest codes. This is used for translating old font-dependent codes in data structures (like Tedit) into the MCCS codes at the same time that the font is also changed to an MCCS font. This is used online but presumably only once per document/datastructure, if the result of the code translation is remembered.") + + (* ;; "The restriction to CS0 is because only XCCS fonts have characters outside that, and that's where MCCS agrees with XCCS. Other legacy fonts (HIPPO, SYMBOL...) only have CS0 glyphs. If a CS0 source code does not exist in the mapping, it is assumed to be an identity. ") + + (* ;; "") + + (SETQ MAP (for PAIR SOURCE DEST in MAP when (AND (LISTP PAIR) + (NEQ '* (CAR PAIR))) + collect (SETQ DEST (CAR PAIR)) + (CL:UNLESS (CHARCODEP DEST) (* ; "DEST always designates a code") + (SETQ DEST (CHARCODE.DECODE DEST))) + (SETQ SOURCE (CADR PAIR)) + + (* ;; "NIL source is a slug") + + (if (NULL SOURCE) + then (SETQ SOURCE (CONS NIL)) + elseif (LISTP SOURCE) + then (CL:UNLESS (OR (CHARCODEP (CAR SOURCE)) + (NULL (CAR SOURCE))) + (SETQ SOURCE (LIST (CHARCODE.DECODE (CAR SOURCE)) + (CADR SOURCE)))) + elseif (CHARCODEP SOURCE) + else (SETQ SOURCE (CHARCODE.DECODE SOURCE))) + (LIST DEST SOURCE))) (* ; "Add identities for CS 0") + (for DEST from 0 to \MAXTHINCHAR unless (ASSOC DEST MAP) do (PUSH MAP (LIST DEST DEST))) + (SORT MAP T) (* ; "Just easier to debug") + (LET (VAL) + [if INVERT + then + (* ;; "KEY's are destination codes, good for maphash recoding") + + (SETQ VAL (HASHARRAY (LENGTH MAP))) + (for PAIR in MAP do (PUTHASH (CAR PAIR) + (CADR PAIR) + VAL)) + else (SETQ VAL (ARRAY (ADD1 \MAXTHINCHAR) + NIL NIL 0 0)) + (for PAIR SOURCE in MAP eachtime [SETQ SOURCE (CAR (MKLIST (CADR PAIR] + (* ; "Value for NIL sources is NIL") + when (CHARCODEP SOURCE) do (SETA VAL SOURCE (CAR PAIR] + VAL]) + +(MCCSMAPFN + [LAMBDA (FROMENCODING) (* ; "Edited 5-Oct-2025 19:56 by rmk") + (* ; "Edited 6-Sep-2025 12:40 by rmk") + (* ; "Edited 4-Sep-2025 08:06 by rmk") + (* ; "Edited 24-May-2025 10:55 by rmk") + + (* ;; "Returns the function that maps a FROMENCODING code to the corresponding MCCS code") + + (CL:WHEN (LISTP FROMENCODING) + + (* ;; "Assume it's a FONTSPEC") + + (SETQ FROMENCODING (fetch (FONTSPEC FSFAMILY) of FROMENCODING))) + (if (MEMB FROMENCODING NSFONTFAMILIES) + then (SETQ FROMENCODING 'XCCS$) + elseif (MEMB FROMENCODING ALTOFONTFAMILIES) + then (SETQ FROMENCODING 'ALTOTEXT)) + (SELECTQ FROMENCODING + (XCCS$ (FUNCTION X$TOMCODE)) + (ALTOTEXT (FUNCTION ATOMCODE)) + (SYMBOL (FUNCTION SYMBOLTOMCODE)) + (SIGMA (FUNCTION SIGMATOMCODE)) + (MATH (FUNCTION MATHTOMCODE)) + (HIPPO (FUNCTION HIPPOTOMCODE)) + (CYRILLIC (FUNCTION CYRILLICTOMCODE)) + (XCCS (FUNCTION XTOMCODE)) + (GACHA (FUNCTION GACHATOMCODE)) + (PALATINO (FUNCTION PALATINOTOMCODE)) + (MCCS NIL) + NIL]) + +(MCCSMAPPAIRS + [LAMBDA (FROMENCODING NOIDENTITY) (* ; "Edited 17-Apr-2026 00:02 by rmk") + (* ; "Edited 14-Apr-2026 00:35 by rmk") + (* ; "Edited 11-Apr-2026 23:44 by rmk") + (* ; "Edited 8-Mar-2026 23:43 by rmk") + (* ; "Edited 3-Mar-2026 23:19 by rmk") + (* ; "Edited 26-Feb-2026 12:56 by rmk") + (* ; "Edited 7-Oct-2025 14:47 by rmk") + (* ; "Edited 6-Oct-2025 09:47 by rmk") + (* ; "Edited 20-Sep-2025 09:45 by rmk") + (* ; "Edited 6-Sep-2025 16:43 by rmk") + (* ; "Edited 31-Aug-2025 16:16 by rmk") + + (* ;; "Returns the pairs for MOVEFONTCHARS to use to move charset-0 glyphs into their MCCS positions. For example, the Leftarrow and Lowline glyphs switch positions in an XCCS$ font. Returns NIL (= nothing to do) if there is no function.") + + (LET (PAIRS KEEPCS0) + [SETQ PAIRS (SELECTQ FROMENCODING + (GACHA [XCCSUNDEFINEDPAIRS '((Lowline ↑X]) + (ALTOTEXT (* ; "Wipe the metas") + (XCCSUNDEFINEDPAIRS ALTOTEXTTOMCCS)) + (TITAN (XCCSUNDEFINEDPAIRS TITANTOMCCS)) + (TITANLEGAL (XCCSUNDEFINEDPAIRS TITANLEGALTOMCCS)) + (XCCS$ (* ; "Leave the Metas") + [XCCS.CS0.UNDEFINED '((Circumflex Uparrow) + (Uparrow Circumflex) + (Lowline Leftarrow) + (Leftarrow Lowline]) + (UNICODE *MCCSTOUNICODE*) + (PALATINO (XCCSUNDEFINEDPAIRS PALATINOTOMCCS)) + (PROGN (if (MEMB FROMENCODING '(HIPPO CYRILLIC SYMBOL SIGMA MATH)) + then (SETQ NOIDENTITY T) + (SETQ KEEPCS0 NIL) + else (SETQ KEEPCS0 T)) + (for C M FN from 0 to \MAXTHINCHAR first (CL:UNLESS (SETQ FN + (MCCSMAPFN + FROMENCODING)) + (RETURN)) + when (SETQ M (APPLY* FN C NOIDENTITY)) + collect (LIST M C] + (CL:WHEN (LISTP PAIRS) + + (* ;; "Weed out interspersed comments, convert to charcodes") + + (CL:UNLESS NOIDENTITY + (for DEST from 0 to \MAXTHINCHAR unless (ASSOC DEST PAIRS) + do (push PAIRS (LIST DEST DEST)))) + [SETQ PAIRS (for P SOURCE in PAIRS when (LISTP P) unless (EQ '* (CAR P)) + collect (SETQ SOURCE (CADR P)) + (LIST (OR (CHARCODEP (CAR P)) + (CHARCODE.DECODE (CAR P))) + (if (LISTP SOURCE) + then + (* ;; + "Allows for the (Uparrow TERMINAL) case above, for MOVEFONTCHARS") + + (CONS (CL:IF (CHARCODEP (CAR SOURCE)) + (CAR SOURCE) + (CHARCODE.DECODE (CAR SOURCE))) + (CDR SOURCE)) + elseif (CHARCODEP SOURCE) + else (CHARCODE.DECODE SOURCE] + + (* ;; "If a source is moved to a dest, the default is that that source gets replaced by a slug and there is no separate replacement for that source. That slug may then be coerced from another font. That is, we don't expect two codes to have the same glyph, by default. But families like SYMBOL, HIPPO etc. want to preserve CS0 even if they copy their glyphs also to somewhere else--KEEPCS0.") + + (CL:UNLESS KEEPCS0 + (SETQ PAIRS (APPEND (for C from 0 to \MAXTHINCHAR + when [thereis P SCODE in PAIRS + eachtime [SETQ SCODE (CAR (MKLIST (CADR P] + suchthat + + (* ;; + "C's glyph is moving somewhere else, and nothing is replacing it. Slug it out.") + + (AND (EQ SCODE C) + (NEQ SCODE (CAR P)) + (NOT (ASSOC C PAIRS] + collect (LIST C (CONS NIL))) + PAIRS)) + (SETQ PAIRS (SORT PAIRS T))) + [AND NIL (SETQ PAIRS (APPEND PAIRS (for P DEST SOURCE SCODE in PAIRS + eachtime (SETQ DEST (CAR P)) + (SETQ SOURCE (CADR P)) + (SETQ SCODE (CAR (MKLIST SOURCE))) + (* ; "Already a slug?") when SCODE + unless (OR (AND KEEPCS0 (ILEQ SCODE \MAXTHINCHAR)) + (AND (LISTP SOURCE) + (LITATOM (CADR SOURCE))) + (ASSOC SCODE PAIRS)) + collect + + (* ;; "Don't slugify a source code in this font if it is coming from another font, or if that source is also a destination here.") + + (LIST SCODE (CONS NIL]) + PAIRS]) + +(XCCS.CS0.UNDEFINED + [LAMBDA (ADDITIONS) (* ; "Edited 8-Mar-2026 23:32 by rmk") + (* ; "Edited 5-Oct-2025 22:44 by rmk") + + (* ;; "Maps slugs to all undefined/reserved characters in XCCS, then throw in the additions") + + [SETQ ADDITIONS (for P in ADDITIONS when (LISTP P) unless (EQ '* (CAR P)) + collect (LIST (OR (CHARCODEP (CAR P)) + (CHARCODE.DECODE (CAR P))) + (OR (CHARCODEP (CADR P)) + (CHARCODE.DECODE (CADR P] + (APPEND ADDITIONS (for I from 0 to (SUB1 (CHARCODE SPACE)) collect (LIST I NIL)) + (for I from (CHARCODE "0,#NULL") to (SUB1 (CHARCODE "0,#SPACE")) + collect (LIST I NIL)) + (for I in (CHARCODE ("0,177" "0,246" "0,250" "0,300" "0,351" "0,326" "0,327" "0,330" + "0,331" "0,332" "0,333" "0,377")) collect (LIST I NIL]) + +(XCCSUNDEFINEDPAIRS + [LAMBDA (ADDITIONS) (* ; "Edited 8-Mar-2026 23:42 by rmk") + (* ; "Edited 6-Mar-2026 23:57 by rmk") + (* ; "Edited 5-Oct-2025 22:39 by rmk") + (* ; "Edited 2-Sep-2025 13:14 by rmk") + + (* ;; "This clears out everything above Ascii in charset 0, allowing ony ADDITIONS. XCCS.CS0.UNDEFINED clears out only the truly undefined") + + (LET ((PAIRS (XCCS.CS0.UNDEFINED ADDITIONS))) + (for I from 128 to \MAXTHINCHAR unless (ASSOC I PAIRS) do (push PAIRS (LIST I NIL))) + PAIRS]) +) + +(RPAQQ ALTOTEXTTOMCCS + ( + (* ;; "From bravo doc") + + ("356,055" ↑N MINUS) + ("357,44" ↑V ENDASH) + (EMDASH ↑S) + (EMQUAD ↑O) + ("356,055" ↑X MINUS) + (FIGURESPACE ↑Y ENQUAD) + + (* ;; "Fom current Helvetica/Timesroman fonts") + + ("0,317" "0,1" HACHEK) + ("361,255" "0,3" DIARESIS) + ("0,310" "0,4" CCEDILLA) + ("0,301" "0,5" GRAVE) + ("360,41" "0,6" ff) + ("0,271" "0,7" LSQ) + ("0,241" "0,10" SPANISHEXCL) + ("0,302" "0,13" ACUTE) + ("0,304" "0,20" TILDE) + ("360,42" "0,21" ffi) + ("360,43" "0,22" ffl) + ("360,44" "0,24" fi) + ("360,45" "0,25" fl) + ("357,44" "0,26" ENDASH) + ("0,306" "0,27" BREVE) + (ENQUAD "0,34") + ("0,304" "0,36" TILDE) + ("0,251" "0,140") + ("361,47" "0,200" A-umlaut) + ("361,124" "0,201" O-umlaut) + ("361,47" "0,202" A-ring) + ("357,44" "0,233" ENDASH) + (EMDASH "0,234") + ("361,247" "0,240" a-umlaut) + ("361,324" "0,241" o-umlaut) + ("361,250" "0,242" a-ring) + ("361,345" "0,243" u-umlaut) + (Circumflex "0,254") + ("0,242" "0,260" CENTS) + ("0,243" "0,261" POUND) + ("41,172" "0,265" STAR) + ("0,247" "0,266" SECTION) + ("357,146" "0,267" BULLET) + ("357,60" "0,270" DAGGER) + ("357,061" "0,271" DOUBLEDAGGER) + ("0,266" "0,272" PARAGRAPH) + ("0,261" "0,274" PLUSMINUS) + ("0,241" "0,275" SPANISHEXCL) + ("0,277" "0,276" SPANISHQUES) + (Lowline "0,277"))) + +(RPAQQ SYMBOLTOMCCS + (("42,46" "0,162") + ("41,145" "0,26") + ("41,146" "0,27") + ("42,120" "0,55") + ("42,121" "0,56") + ("0,74" "0,36") + ("0,76" "0,37") + (Null "0,1") + ("0,264" "0,2") + ("41,142" "0,3") + (Null "0,4") + ("41,176" "0,5") + ("0,261" "0,6") + ("357,175" Bell) + ("357,142" Backspace) + ("357,143" Tab) + ("357,144" Linefeed) + ("357,145" "0,13") + (Null Page) + ("0,270" Newline) + (Null "0,16") + (Null "0,17") + ("357,160" "0,20") + ("357,162" "0,21") + ("357,131" "0,22") + ("357,130" "0,23") + ("41,145" "0,24") + ("41,146" "0,25") + (Null "0,26") + (Null "0,27") + ("356,176" "0,30") + ("357,171" "0,31") + ("357,133" "0,32") + ("357,132" Escape) + ("41,142" "0,34") + ("357,163" "0,35") + (Null "0,36") + (Null Tenexeol) + (Null Space) + ("0,256" "0,41") + (Circumflex "0,42") + ("0,257" "0,43") + ("357,122" Dollar) + ("357,102" "0,45") + ("357,103" "0,46") + ("357,167" "0,47") + ("357,115" "0,50") + ("357,117" "0,51") + (Null "0,52") + (Null "0,53") + ("357,116" "0,54") + (Null "0,55") + (Null "0,56") + (Null "0,57") + (Null Zero) + (INFINITY One) + ("357,112" Two) + ("357,113" Three) + ("357,141" Four) + (Null Five) + ("357,154" Six) + (Lowline Seven) + ("357,265" Eight) + ("357,264" Nine) + ("357,152" "0,72") + ("357,247" "0,73") + (Null "0,74") + (Null "0,75") + (Null "0,76") + ("0,57" "0,77") + (Null "0,100") + ("357,127" "0,133") + ("357,126" "0,134") + (Null "0,135") + ("357,266" Uparrow) + ("357,267" Leftarrow) + ("357,66" "0,140") + ("357,67" "0,141") + ("357,262" "0,142") + ("357,263" "0,143") + ("357,260" "0,144") + ("357,261" "0,145") + ("0,173" "0,146") + ("0,175" "0,147") + ("357,62" "0,150") + ("357,63" "0,151") + ("356,174" "0,152") + ("41,102" "0,153") + ("357,73" "0,154") + ("357,72" "0,155") + ("42,44" "0,156") + ("42,46" "0,157") + ("357,174" "0,160") + ("41,142" "0,161") + (Null "0,162") + ("357,165" "0,163") + (Null "0,164") + (Null "0,165") + (Null "0,166") + (Null "0,167") + ("0,247" "0,170") + ("357,60" "0,171") + ("357,61" "0,172") + ("0,266" "0,173") + ("0,100" "0,174") + ("0,323" "0,175") + ("0,243" "0,176") + (Dollar Rubout) + (Null "0,200") + (Null "0,201") + (Null "0,202") + (Null "0,203") + (Null "0,204") + (Null "0,205") + (Null "0,206") + (Null "0,207") + (Null "0,210") + (Null "0,211") + (Null "0,212") + (Null "0,213") + (Null "0,214") + (Null "0,215") + (Null "0,216") + (Null "0,217") + (Null "0,220") + (Null "0,221") + (Null "0,222") + (Null "0,223") + (Null "0,224") + (Null "0,225") + (Null "0,226") + (Null "0,227") + (Null "0,230") + (Null "0,231") + (Null "0,232") + (Null "0,233") + (Null "0,234") + (Null "0,235") + (Null "0,236") + (Null "0,237") + (Null "0,240") + (Null "0,241") + (Null "0,242") + (Null "0,243") + (Null Currency) + (Null "0,245") + (Null "0,246") + (Null "0,247") + (Null "0,250") + (Null "0,251") + (Null LEFT-DOUBLEQUOTE) + (Null "0,253") + (Null Lowline) + (Null Circumflex) + (Null "0,256") + (Null "0,257") + (Null "0,260") + (Null "0,261") + (Null "0,262") + (Null "0,263") + (Null "0,264") + (Null "0,265") + (Null "0,266") + (Null "0,267") + (Null "0,270") + (Null "0,271") + (Null RIGHT-DOUBLEQUOTE) + (Null "0,273") + (Null "0,274") + (Null "0,275") + (Null "0,276") + (Null "0,277") + (Null "0,300") + (Null "0,301") + (Null "0,302") + (Null "0,303") + (Null "0,304") + (Null "0,305") + (Null "0,306") + (Null "0,307") + (Null "0,310") + (Null "0,311") + (Null "0,312") + (Null "0,313") + (Null "0,314") + (Null "0,315") + (Null "0,316") + (Null "0,317") + (Null "0,320") + (Null "0,321") + (Null "0,322") + (Null "0,323") + (Null "0,324") + (Null "0,325") + (Null "0,326") + (Null "0,327") + (Null "0,330") + (Null "0,331") + (Null "0,332") + (Null "0,333") + (Null "0,334") + (Null "0,335") + (Null "0,336") + (Null "0,337") + (Null "0,340") + (Null "0,341") + (Null "0,342") + (Null "0,343") + (Null "0,344") + (Null "0,345") + (Null "0,346") + (Null "0,347") + (Null "0,350") + (Null "0,351") + (Null "0,352") + (Null "0,353") + (Null "0,354") + (Null "0,355") + (Null "0,356") + (Null "0,357") + (Null "0,360") + (Null "0,361") + (Null "0,362") + (Null "0,363") + (Null "0,364") + (Null "0,365") + (Null "0,366") + (Null "0,367") + (Null "0,370") + (Null "0,371") + (Null "0,372") + (Null "0,373") + (Null "0,374") + (Null "0,375") + (Null "0,376") + (Null "0,377"))) + +(RPAQQ SIGMATOMCCS + (("0,101" "0,101" low squaredot not in XCCS) + (Contourintegral "0,103") + (Intersection "0,111") + (And "0,114") + (Summation "0,115") + (Product "0,120") + (Radical "0,122") + (Integral "0,123") + (Union "0,125") + (Or "0,126"))) + +(RPAQQ HIPPOTOMCCS + (("356,55" "0,16") + (EMQUAD "0,17") + (EMDASH "0,23") + ("357,44" "0,26") + ("356,55" "0,30") + (ENQUAD "0,31") + ("Greek,101" "0,101") + ("Greek,102" "0,102") + ("Greek,121" "0,103") + ("Greek,105" "0,104") + ("Greek,106" "0,105") + ("Greek,132" "0,106") + ("Greek,104" "0,107") + ("Greek,112" "0,110") + ("Greek,114" "0,111") + ("Greek,115" "0,113") + ("Greek,116" "0,114") + ("Greek,117" "0,115") + ("Greek,120" "0,116") + ("Greek,122" "0,117") + ("Greek,123" "0,120") + ("Greek,113" "0,121") + ("Greek,125" "0,122") + ("Greek,126" "0,123") + ("Greek,130" "0,124") + ("Greek,131" "0,125") + ("Greek,135" "0,127") + ("Greek,133" "0,130") + ("Greek,134" "0,131") + ("Greek,111" "0,132") + ("Greek,141" "0,141") + ("Greek,142" "0,142") + ("Greek,161" "0,143") + ("Greek,145" "0,144") + ("Greek,146" "0,145") + ("Greek,172" "0,146") + ("Greek,144" "0,147") + ("Greek,152" "0,150") + ("Greek,154" "0,151") + ("Greek,155" "0,153") + ("Greek,156" "0,154") + ("Greek,157" "0,155") + ("Greek,160" "0,156") + ("Greek,162" "0,157") + ("Greek,163" "0,160") + ("Greek,153" "0,161") + ("Greek,165" "0,162") + ("Greek,166" "0,163") + ("Greek,170" "0,164") + ("Greek,171" "0,165") + ("Greek,175" "0,167") + ("Greek,173" "0,170") + ("Greek,174" "0,171") + ("Greek,151" "0,172") + ("357,44" "0,233") + (EMDASH "0,234") + ("357,146" "0,267"))) + +(RPAQQ CYRILLICTOMCCS + (("Cyrillic,47" Dollar) + ("Cyrillic,71" "0,52") + ("41,76" "0,55") + ("Cyrillic,157" Two) + ("Cyrillic,127" Four) + ("Cyrillic,150" Six) + ("Cyrillic,151" Eight) + ("0,253" "0,74") + ("0,273" "0,76") + ("Cyrillic,77" "0,100") + ("Cyrillic,41" "0,101") + ("Cyrillic,42" "0,102") + ("Cyrillic,76" "0,103") + ("Cyrillic,45" "0,104") + ("Cyrillic,46" "0,105") + ("Cyrillic,66" "0,106") + ("Cyrillic,44" "0,107") + ("Cyrillic,101" "0,110") + ("Cyrillic,52" "0,111") + ("Cyrillic,53" "0,112") + ("Cyrillic,54" "0,113") + ("Cyrillic,55" "0,114") + ("Cyrillic,56" "0,115") + ("Cyrillic,57" "0,116") + ("Cyrillic,60" "0,117") + ("Cyrillic,61" "0,120") + ("Cyrillic,67" "0,121") + ("Cyrillic,62" "0,122") + ("Cyrillic,63" "0,123") + ("Cyrillic,64" "0,124") + ("Cyrillic,65" "0,125") + ("Cyrillic,43" "0,126") + ("Cyrillic,50" "0,127") + ("Cyrillic,75" "0,130") + ("Cyrillic,100" "0,131") + ("Cyrillic,51" "0,132") + ("Cyrillic,152" "0,133") + ("Cyrillic,0" "0,134") + ("Cyrillic,153" "0,135") + ("Cyrillic,74" Uparrow) + ("Cyrillic,154" Leftarrow) + ("Cyrillic,0" "0,140") + ("Cyrillic,121" "0,141") + ("Cyrillic,122" "0,142") + ("Cyrillic,176" "0,143") + ("Cyrillic,125" "0,144") + ("Cyrillic,126" "0,145") + ("Cyrillic,146" "0,146") + ("Cyrillic,124" "0,147") + ("Cyrillic,161" "0,150") + ("Cyrillic,132" "0,151") + ("Cyrillic,133" "0,152") + ("Cyrillic,134" "0,153") + ("Cyrillic,135" "0,154") + ("Cyrillic,136" "0,155") + ("Cyrillic,137" "0,156") + ("Cyrillic,140" "0,157") + ("Cyrillic,141" "0,160") + ("Cyrillic,147" "0,161") + ("Cyrillic,142" "0,162") + ("Cyrillic,143" "0,163") + ("Cyrillic,144" "0,164") + ("Cyrillic,145" "0,165") + ("Cyrillic,123" "0,166") + ("Cyrillic,130" "0,167") + ("Cyrillic,155" "0,170") + ("Cyrillic,160" "0,171") + ("Cyrillic,131" "0,172") + ("Cyrillic,72" "0,173") + ("Cyrillic,0" "0,174") + ("Cyrillic,73" "0,175") + ("Cyrillic,70" "0,176") + ("Cyrillic,0" Rubout) + ("Cyrillic,156" "0,217") + ("357,44" "0,233") + (EMDASH "0,234") + ("357,146" "0,267"))) + +(RPAQQ MATHTOMCCS + ((Product "0,1") + ("357,62" "0,2") + ("357,63" "0,3") + (Hairspace "0,4") + ("0,243" "0,5") + (Integral "0,6") + (Contourintegral "0,7") + ("0,266" "0,13") + ("357,146" "0,17") + (Summation "0,23") + ("357,157" "0,26") + ("357,60" "0,41") + ("357,147" "0,42") + (INFINITY "0,43") + ("0,242" "0,44") + ("0,270" "0,45") + (And "0,46") + ("357,163" "0,47") + ("0,302" "0,50") + (Radical "0,51") + ("0,307" "0,52") + ("0,261" "0,53") + ("357,114" "0,54") + ("357,175" "0,55") + ("41,150" "0,56") + ("357,145" "0,57") + ("357,147" "0,60") + ("42,42" "0,61") + ("42,44" "0,62") + ("41,176" "0,63") + ("357,142" "0,64") + ("357,143" "0,65") + ("357,144" "0,66") + ("357,154" "0,67") + ("41,172" "0,70") + ("0,307" "0,71") + ("0,247" "0,72") + ("356,52" "0,73") + ("41,145" "0,74") + ("41,142" "0,75") + ("41,146" "0,76") + ("0,277" "0,77") + ("357,100" "0,100") + (All "0,101") + (Member "0,102") + ("357,254" "0,103") + ("357,271" "0,104") + (Exists "0,105") + ("357,61" "0,106") + ("357,133" "0,107") + ("357,137" "0,110") + ("357,131" "0,111") + ("357,132" "0,112") + ("357,136" "0,113") + ("357,130" "0,114") + ("360,275" "0,115") + (Notmember "0,116") + ("357,141" "0,117") + ("357,161" "0,120") + ("357,121" "0,121") + ("357,256" "0,122") + ("357,171" "0,123") + ("357,160" "0,124") + (Union "0,125") + (Or "0,126") + ("357,162" "0,127") + ("0,264" "0,130") + ("360,272" "0,131") + ("357,270" "0,132") + ("41,120" "0,133") + ("41,121" "0,135") + ("0,257" "0,136") + ("0,256" "0,137") + ("357,247" "0,141") + ("357,123" "0,142") + ("0,323" "0,143") + ("357,272" "0,144") + ("357,167" "0,145") + ("357,122" "0,146") + ("357,117" "0,147") + ("357,150" "0,150") + ("357,260" "0,151") + ("357,261" "0,152") + ("357,262" "0,153") + ("357,263" "0,154") + ("357,110" "0,155") + ("357,152" "0,156") + ("357,147" "0,157") + ("357,66" "0,160") + ("357,70" "0,161") + ("0,322" "0,162") + ("357,76" "0,163") + ("357,74" "0,164") + ("357,77" "0,165") + ("357,75" "0,166") + ("357,102" "0,167") + ("357,103" "0,170") + (Intersection "0,171") + ("357,67" "0,172") + ("0,274" "0,173") + ("0,275" "0,174") + ("0,276" "0,175") + ("357,120" "0,176"))) + +(RPAQQ PALATINOTOMCCS + ((Circumflex Uparrow) + (Uparrow NIL) + (Lowline Leftarrow) + (Leftarrow NIL) + ("361,353" "0,32") + ("361,260" "0,34") + ("361,277" "0,35") + ("361,304" "0,36") + ("361,153" "0,37") + ("0,255" "0,136") + ("0,254" "0,137") + ("0,240" NIL) + ("361,047" "0,200") + ("361,124" "0,201") + ("361,043" "0,202") + ("361,077" "0,203") + ("361,114" "0,204") + ("361,120" "0,205") + ("361,121" "0,206") + ("361,117" "0,207") + ("361,122" "0,210") + ("361,134" "0,211") + ("361,140" "0,212") + ("361,141" "0,213") + ("361,145" "0,214") + ("361,137" "0,215") + ("361,155" "0,216") + ("361,160" "0,217") + ("361,142" "0,220") + ("361,241" "0,221") + ("361,243" "0,222") + ("361,276" "0,223") + ("361,250" "0,224") + ("361,320" "0,225") + ("361,321" "0,226") + ("361,322" "0,227") + ("361,322" "0,230") + ("361,334" "0,231") + ("361,244" "0,232") + ("361,341" "0,233") + ("361,261" "0,234") + ("361,337" "0,235") + ("361,262" "0,236") + ("361,255" "0,237") + ("361,247" "0,240") + ("0,057" "0,244") + (* ; "Slash, but should be fraction") + ("357,243" "0,246") + ("0,244" "0,250") + ("357,052" "0,254") + ("357,053" "0,255") + ("360,004" "0,256") + ("360,005" "0,257") + (EMDASH "0,261") + ("357,060" "0,262") + ("357,061" "0,263") + ("357,146" "0,267") + ("43,262" "0,270") + ("357,050" "0,271") + ("41,104" "0,274") + ("357,101" "0,275") + ("357,153" "0,311") + ("361,314" "0,314") + ("375,261" "0,321") + ("361,324" "0,324") + ("375,362" "0,325") + ("375,363" "0,326") + ("0,274" "0,327") + ("0,275" "0,330") + ("0,264" "0,331") + ("0,270" "0,332") + ("357,152" "0,333") + ("361,265" "0,334") + ("0,261" "0,335") + ("361,042" "0,336") + ("357,044" "0,337") + ("361,340" "0,340") + ("361,041" "0,344") + ("361,345" "0,345") + ("361,050" "0,346") + ("361,044" "0,347") + ("361,355" "0,355") + ("361,055" "0,356") + ("361,061" "0,357") + ("361,360" "0,360") + ("361,062" "0,362") + ("361,065" "0,364") + ("361,060" "0,366") + ("361,277" "0,367") + ("361,100" "0,375") + ("361,104" "0,376"))) + +(RPAQQ TITANTOMCCS + (("0,242" "0,176" cent) + ("0,176" NIL Delete cent) + (Lowline ↑X) + (Lowline "0,277") + ("0,55" "0,337") + ("0,55" "0,55" Hypehn) + ("0,274" "0,74" Quarter) + ("0,74" NIL Delete quarter) + ("0,275" "0,76" Half) + ("0,76" NIL Delete half))) + +(RPAQQ TITANLEGALTOMCCS + (("0,247" "0,176" Section) + ("0,176" NIL Delete section) + (Lowline ↑X) + (Lowline "0,277") + ("0,55" "0,337") + ("0,55" "0,55") + ("0,260" "0,74" Degree) + ("0,74" NIL Delete degree) + ("0,266" "0,100" Paragraph) + ("0,100" NIL Delete Paragraph))) +(DECLARE%: DOEVAL@COMPILE DONTCOPY + +(GLOBALVARS GACHATOMCCSARRAY ALTOTOMCCSARRAY SYMBOLTOMCCSARRAY HIPPOTOMCCSARRAY CYRILLICTOMCCSARRAY + MATHTOMCCSARRAY SIGMATOMCCSARRAY PALATINOTOMCCSARRAY TITANTOMCCSARRAY TITANLEGALTOMCCSARRAY) +) + + + +(* ;; "For translation of codes in datastructures (e.g. Tedit)") + + +(RPAQ? GACHATOMCCSARRAY [MCCSCODEMAPARRAY (XCCSUNDEFINEDPAIRS '((Lowline ↑X]) + +(RPAQ? ALTOTOMCCSARRAY (MCCSCODEMAPARRAY ALTOTEXTTOMCCS)) + +(RPAQ? SYMBOLTOMCCSARRAY (MCCSCODEMAPARRAY SYMBOLTOMCCS)) + +(RPAQ? HIPPOTOMCCSARRAY (MCCSCODEMAPARRAY HIPPOTOMCCS)) + +(RPAQ? CYRILLICTOMCCSARRAY (MCCSCODEMAPARRAY CYRILLICTOMCCS)) + +(RPAQ? MATHTOMCCSARRAY (MCCSCODEMAPARRAY MATHTOMCCS)) + +(RPAQ? SIGMATOMCCSARRAY (MCCSCODEMAPARRAY SIGMATOMCCS)) + +(RPAQ? PALATINOTOMCCSARRAY (MCCSCODEMAPARRAY PALATINOTOMCCS)) + +(RPAQ? TITANTOMCCSARRAY (MCCSCODEMAPARRAY (XCCSUNDEFINEDPAIRS TITANTOMCCS))) + +(RPAQ? TITANLEGALTOMCCSARRAY (MCCSCODEMAPARRAY (XCCSUNDEFINEDPAIRS TITANLEGALTOMCCS))) + + + +(* ;; "Mappings into MCCS: needed for e.g. Tedit coercion. \TEDIT.MCCS.TRANSLATE") + +(DEFINEQ + +(GACHATOMCODE + [LAMBDA (GCODE) (* ; "Edited 7-Mar-2026 23:53 by rmk") + (* ; "Edited 6-Mar-2026 11:19 by rmk") + (* ; "Edited 7-Sep-2025 22:38 by rmk") + (* ; "Edited 3-Sep-2025 23:23 by rmk") + + (* ;; "Gacha did not have a code for circumflex, so there is nothing to map") + + (OR (CL:WHEN (ILEQ GCODE \MAXTHINCHAR) + (ELT GACHATOMCCSARRAY GCODE)) + GCODE]) + +(SYMBOLTOMCODE + [LAMBDA (SCODE) (* ; "Edited 7-Mar-2026 23:53 by rmk") + (* ; "Edited 7-Sep-2025 22:39 by rmk") + (* ; "Edited 3-Sep-2025 10:21 by rmk") + (* ; "Edited 7-Aug-2025 09:37 by rmk") + (* ; "Edited 1-Jun-2025 07:02 by rmk") + (OR (CL:WHEN (ILEQ SCODE \MAXTHINCHAR) + (ELT SYMBOLTOMCCSARRAY SCODE)) + SCODE]) + +(SIGMATOMCODE + [LAMBDA (SCODE) (* ; "Edited 7-Mar-2026 23:54 by rmk") + (* ; "Edited 7-Sep-2025 22:39 by rmk") + (* ; "Edited 3-Sep-2025 10:21 by rmk") + (* ; "Edited 1-Jun-2025 07:02 by rmk") + (* ; "Edited 24-May-2025 10:54 by rmk") + (OR (CL:WHEN (ILEQ SCODE \MAXTHINCHAR) + (ELT SIGMATOMCCSARRAY SCODE)) + SCODE]) + +(ATOMCODE + [LAMBDA (ACODE) (* ; "Edited 7-Mar-2026 23:54 by rmk") + (* ; "Edited 7-Sep-2025 22:39 by rmk") + (* ; "Edited 3-Sep-2025 10:21 by rmk") + (* ; "Edited 24-May-2025 09:41 by rmk") + (OR (CL:WHEN (ILEQ ACODE \MAXTHINCHAR) + (ELT ALTOTOMCCSARRAY ACODE)) + ACODE]) + +(MATHTOMCODE + [LAMBDA (MATHCODE) (* ; "Edited 7-Mar-2026 23:54 by rmk") + (* ; "Edited 7-Sep-2025 22:39 by rmk") + (* ; "Edited 4-Sep-2025 08:18 by rmk") + (* ; "Edited 1-Jun-2025 07:02 by rmk") + (* ; "Edited 24-May-2025 10:58 by rmk") + (OR (CL:WHEN (ILEQ MATHCODE \MAXTHINCHAR) + (ELT MATHTOMCCSARRAY MATHCODE)) + MATHCODE]) + +(HIPPOTOMCODE + [LAMBDA (HCODE) (* ; "Edited 7-Mar-2026 23:54 by rmk") + (* ; "Edited 7-Sep-2025 22:40 by rmk") + (* ; "Edited 3-Sep-2025 10:22 by rmk") + (* ; "Edited 24-May-2025 09:40 by rmk") + (OR (CL:WHEN (ILEQ HCODE \MAXTHINCHAR) + (ELT HIPPOTOMCCSARRAY HCODE)) + HCODE]) + +(CYRILLICTOMCODE + [LAMBDA (CCODE) (* ; "Edited 7-Mar-2026 23:55 by rmk") + (* ; "Edited 7-Sep-2025 22:40 by rmk") + (* ; "Edited 24-May-2025 09:38 by rmk") + (OR (CL:WHEN (ILEQ CCODE \MAXTHINCHAR) + (ELT CYRILLICTOMCCSARRAY CCODE)) + CCODE]) + +(PALATINOTOMCODE + [LAMBDA (PCODE) (* ; "Edited 7-Mar-2026 23:55 by rmk") + (* ; "Edited 5-Oct-2025 20:08 by rmk") + (* ; "Edited 7-Sep-2025 22:39 by rmk") + (* ; "Edited 3-Sep-2025 10:21 by rmk") + (* ; "Edited 7-Aug-2025 09:37 by rmk") + (* ; "Edited 1-Jun-2025 07:02 by rmk") + (OR (CL:WHEN (ILEQ PCODE \MAXTHINCHAR) + (ELT PALATINOTOMCCSARRAY PCODE)) + PCODE]) + +(TITANTOMCODE + [LAMBDA (TCODE) (* ; "Edited 7-Mar-2026 23:51 by rmk") + (* ; "Edited 6-Mar-2026 11:19 by rmk") + (* ; "Edited 7-Sep-2025 22:38 by rmk") + (* ; "Edited 3-Sep-2025 23:23 by rmk") + (* ; "Edited 30-Aug-2025 21:58 by rmk") + (OR (CL:WHEN (ILEQ TCODE \MAXTHINCHAR) + (ELT TITANTOMCCSARRAY TCODE)) + TCODE]) + +(TITANLEGALTOMCODE + [LAMBDA (TCODE) (* ; "Edited 7-Mar-2026 23:52 by rmk") + (* ; "Edited 6-Mar-2026 11:19 by rmk") + (* ; "Edited 7-Sep-2025 22:38 by rmk") + (* ; "Edited 3-Sep-2025 23:23 by rmk") + (* ; "Edited 30-Aug-2025 21:58 by rmk") + (OR (CL:WHEN (ILEQ TCODE \MAXTHINCHAR) + (ELT TITANLEGALTOMCCSARRAY TCODE)) + TCODE]) +) + +(RPAQ? DISPLAYFONTCOERCIONS + '(((HELVETICA (<= * 2)) + (HELVETICA 4)) + ((MODERN (<= 15 * 16)) + (* 14)) + ((MODERN (<= 17 * 21)) + (* 18)) + ((MODERN (<= 22 * 28)) + (* 24)) + ((MODERN (<= 29 * 33)) + (* 30)) + ((MODERN (<= 34 * 40)) + (* 36)) + ((MODERN (<= 41 * 65)) + (* 48)) + ((MODERN (<= 66 *)) + (* 72)) + ((PALATINO 9) + (PALATINO 12)) + ((PALATINO (<= * 8)) + (PALATINO 10)) + ((TITAN (<= * 9) + BOLD) + (MODERN 10)) + ((TITAN (<= * 9) + ITALIC) + (MODERN 10)) + ((TITAN (<= * 9)) + (TITAN 10)) + (LPT AMTEX))) + +(RPAQ? DISPLAYCHARCOERCIONS + '((GACHA TERMINAL) + (MODERN CLASSIC) + (TIMESROMAN CLASSIC) + (HELVETICA MODERN) + (TERMINAL MODERN) + (HIPPO CLASSIC) + (CYRILLIC CLASSIC) + (MATH CLASSIC) + (SIGMA MODERN) + (SYMBOL MODERN) + (TITAN CLASSIC) + (PALATINO CLASSIC) + (OPTIMA MODERN) + (BOLDPS CLASSIC) + (PCTERMINAL CLASSIC) + (TITANLEGAL CLASSIC))) + + + +(* ;; "Defunct coercions? Mapping for DOS filenames, Adobe equivalences") + + +(RPAQ? ADOBEDISPLAYFONTCOERCIONS + '(((HELVETICABLACK 16) + (HELVETICABLACK 18)) + ((SYMBOL) + (ADOBESYMBOL)) + ((SYMBOL 11) + (ADOBESYMBOL 10)) + ((AVANTGARDE-DEMI) + (AVANTGARDE)) + ((AVANTGARDE-BOOK) + (AVANTGARDE)) + ((NEWCENTURYSCHLBK) + (CENTURYSCHOOLBOOK)) + ((BOOKMAN-LIGHT) + (BOOKMAN)) + ((BOOKMAN-DEMI) + (BOOKMAN)) + ((HELVETICA-NARROW) + (HELVETICANARROW)) + ((HELVETICA 24) + (ADOBEHELVETICA 24)))) + +(RPAQ? *DISPLAY-FONT-NAME-MAP* + '((TIMESROMAN . TR) + (HELVETICA . HV) + (TIMESROMAND . TD) + (HELVETICAD . HD) + (MODERN . MD) + (CLASSIC . CL) + (GACHA . GC) + (TITAN . TI) + (LETTERGOTHIC . LG) + (BOLDPS . BP) + (TERMINAL . TM) + (CLASSICTHIN . CT) + (HIPPO . HP) + (LOGO . LG) + (MATH . MA) + (OLDENGLISH . OE) + (SYMBOL . SY))) +(DECLARE%: DONTCOPY + (FILEMAP (NIL (8333 9100 (DISPLAYENCODINGFN 8343 . 9098)) (9134 24123 (MCCSCODEMAPARRAY 9144 . 13712) +(MCCSMAPFN 13714 . 15081) (MCCSMAPPAIRS 15083 . 22184) (XCCS.CS0.UNDEFINED 22186 . 23319) ( +XCCSUNDEFINEDPAIRS 23321 . 24121)) (43112 49480 (GACHATOMCODE 43122 . 43767) (SYMBOLTOMCODE 43769 . +44437) (SIGMATOMCODE 44439 . 45105) (ATOMCODE 45107 . 45659) (MATHTOMCODE 45661 . 46334) (HIPPOTOMCODE + 46336 . 46893) (CYRILLICTOMCODE 46895 . 47349) (PALATINOTOMCODE 47351 . 48132) (TITANTOMCODE 48134 . +48800) (TITANLEGALTOMCODE 48802 . 49478))))) +STOP diff --git a/sources/MCCSFONTS.LCOM b/sources/MCCSFONTS.LCOM new file mode 100644 index 00000000..ca8a2a6c Binary files /dev/null and b/sources/MCCSFONTS.LCOM differ diff --git a/sources/MEDLEYDIR b/sources/MEDLEYDIR index 886f4497..c5ab914b 100644 --- a/sources/MEDLEYDIR +++ b/sources/MEDLEYDIR @@ -1,12 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "31-Jan-2026 23:43:06" {WMEDLEY}MEDLEYDIR.;44 16074 +(FILECREATED "26-Apr-2026 20:46:52" {WMEDLEY}MEDLEYDIR.;61 15717 :EDIT-BY rmk - :CHANGES-TO (FNS MEDLEYDIR) + :CHANGES-TO (VARS MEDLEYDIRCOMS) - :PREVIOUS-DATE "26-Nov-2025 21:51:39" {WMEDLEY}MEDLEYDIR.;43) + :PREVIOUS-DATE "26-Apr-2026 14:56:00" {WMEDLEY}MEDLEYDIR.;60) (PRETTYCOMPRINT MEDLEYDIRCOMS) @@ -16,17 +16,21 @@ (* ;; "set up initialization for file paths relative to where Medley is installed. This assumes that the environment variable MEDLEYDIR is set (usually by the ./run-medley script) to the (unix path) and all of the other directories variables are set relative to that (by MEDLEY-INIT-VARS)") (FNS MEDLEY-INIT-VARS MEDLEYDIR MEDLEYSUBSTDIR SET-SYSOUT-COMMIT) - [INITVARS (MEDLEYDIR) + [INITVARS (MEDLEYDIR (MEDLEYDIR)) (\SAVE.MEDLEYDIR) (SYSOUTCOMMITS (OR (AND (BOUNDP 'SYSOUTCOMMITS) SYSOUTCOMMITS) (LIST (LIST 'MEDLEY NIL] + + (* ;; "PSEUDOHOSTS comes before MEDLEYDIR in the loadup.") + + (P (PSEUDOHOST 'MEDLEY MEDLEYDIR)) (ADDVARS (AROUNDEXITFNS MEDLEY-INIT-VARS)) (* ;; "**WARNING** The EVALed expressions get run early in the lodup.") - (* ;; "The INITVARS prevents this from accumulating entries from other files that happen to have been loaded when this is worked on and saved. The loadup scripts set MEDLEY-INIT-VARS to NOBIND to make sure that these are the initial values (as opposed to whatever there was in the startup sysout. But the FONT cache variables have to be specified here, because FONT is in the INIT and the resetting to NOBIND would wipe out these entries even if they were already correct in the init sysout.") + (* ;; "The INITVARS prevents this from accumulating entries from other files that happen to have been loaded when this is worked on and saved. The loadup scripts set MEDLEY-INIT-VARS to NOBIND to make sure that these are the initial values (as opposed to whatever there was in the startup sysout.") [INITVARS (MEDLEY-INIT-VARS '((\FONTEXISTS?-CACHE NIL RESET) (\FONTSAVAILABLEFILECACHE NIL RESET) @@ -40,28 +44,17 @@ (IRM.DINFOGRAPH) (DIRECTORIES (APPEND LISPUSERSDIRECTORIES LISPSOURCEDIRECTORIES )) - (LOGINHOST/DIR (LET [(LHD (DIRECTORYNAME (OR (UNIX-GETENV - "LOGINDIR") - (UNIX-GETENV - "HOME"] - (AND (GETD 'PSEUDOHOSTS) - (TARGETHOST 'LI) - (PSEUDOHOST 'LI LHD)) - LHD) - RESET) + (LOGINHOST/DIR + (LET [(LHD (DIRECTORYNAME (PACKFILENAME 'HOST 'DSK + 'BODY + (OR (UNIX-GETENV "LOGINDIR") + (UNIX-GETENV "HOME"] + (PSEUDOHOST 'LI LHD) + LHD) + RESET) (USERGREETFILES [LIST (CONS LOGINHOST/DIR '("INIT" COM)) (CONS LOGINHOST/DIR '("INIT"] RESET) - (DISPLAYFONTDIRECTORIES (MEDLEYDIR '("fonts/medleydisplayfonts" - "fonts/displayfonts") - NIL NIL T)) - (POSTSCRIPTFONTDIRECTORIES (MEDLEYDIR '("fonts/postscriptfonts" - ) - NIL NIL T)) - (INTERPRESSFONTDIRECTORIES (MEDLEYDIR '("fonts/ipfonts") - NIL NIL T)) - (UNICODEDIRECTORIES (MEDLEYDIR '("unicode/xerox") - NIL NIL T)) (XCL::*WHERE-IS-CASH-FILES* (MEDLEYDIR '("loadups") "whereis.hash" NIL T)) (LOADUPSDIRECTORIES (MEDLEYDIR '("loadups") @@ -78,7 +71,8 @@ (DEFINEQ (MEDLEY-INIT-VARS - [LAMBDA (EVENT) (* ; "Edited 22-Nov-2022 20:38 by FGH") + [LAMBDA (EVENT) (* ; "Edited 15-Apr-2026 16:44 by rmk") + (* ; "Edited 22-Nov-2022 20:38 by FGH") (* ; "Edited 21-Nov-2022 17:31 by FGH") (* ; "Edited 21-Nov-2022 15:39 by frank") (* ; "Edited 21-Nov-2022 14:33 by FGH") @@ -105,6 +99,7 @@ (* ;;  "Any old values, restore them, substituting the new MEDLEYDIR") + (PSEUDOHOST 'MEDLEY MEDLEYDIR) (PROG (OLDMD NEWMD SAME TMP) (IF (EQ \SAVE.MEDLEYDIR T) THEN (* ; " Already restored") @@ -139,7 +134,8 @@ NIL]) (MEDLEYDIR - [LAMBDA (DIRNAME FILENAME OUTPUT NOERROR) (* ; "Edited 31-Jan-2026 23:42 by rmk") + [LAMBDA (DIRNAME FILENAME OUTPUT NOERROR) (* ; "Edited 16-Apr-2026 11:06 by rmk") + (* ; "Edited 31-Jan-2026 23:42 by rmk") (* ; "Edited 23-Aug-2025 17:21 by lmm") (* ; "Edited 18-Aug-2025 11:15 by FGH") (* ; "Edited 29-Jun-2023 22:48 by rmk") @@ -149,55 +145,60 @@ (* ;; "RMK: MEDLEYDIR defaults to DSK") - (COND - ((NULL DIRNAME) (* ; - "Call to (MEDLEYDIR) or (MEDLEYDIR NIL ...) just set it ") - (if (OR (NOT (BOUNDP 'MEDLEYDIR)) - (NOT MEDLEYDIR)) - then (SETQ MEDLEYDIR (DIRECTORYNAME (if (SETQ MEDLEYDIR (UNIX-GETENV "MEDLEYDIR")) - then (PACKFILENAME 'BODY MEDLEYDIR 'HOST - 'DSK) - else T))) - elseif (STRPOS "/" MEDLEYDIR) - then (SETQ MEDLEYDIR (DIRECTORYNAME MEDLEYDIR)) - else MEDLEYDIR)) - ((LISTP DIRNAME) + (if (NULL DIRNAME) + then (* ; + "Call to (MEDLEYDIR) or (MEDLEYDIR NIL ...) just set it--Don't want MEDLEYDIR to be {MEDLEY}.") + (if (OR (NOT (BOUNDP 'MEDLEYDIR)) + (NOT MEDLEYDIR)) + then (SETQ MEDLEYDIR (DIRECTORYNAME (if (SETQ MEDLEYDIR (UNIX-GETENV "MEDLEYDIR")) + then (PACKFILENAME 'BODY MEDLEYDIR + 'HOST + 'DSK) + else T))) + elseif (STRPOS "/" MEDLEYDIR) + then (SETQ MEDLEYDIR (DIRECTORYNAME MEDLEYDIR)) + else MEDLEYDIR) + else (LET (MED) + [SETQ MED (COND + ((LISTP DIRNAME) - (* ;; "(MEDLEYDIR a list -- recurse") + (* ;; "(MEDLEYDIR a list -- recurse") - (for X Y in DIRNAME when (SETQ Y (MEDLEYDIR X FILENAME OUTPUT NOERROR)) collect Y)) - [FILENAME + (for X Y in DIRNAME when (SETQ Y (MEDLEYDIR X FILENAME OUTPUT NOERROR)) + collect Y)) + [FILENAME - (* ;; " if FILENAME, find it as a file. ") + (* ;; " if FILENAME, find it as a file. ") - (if (NULL (SETQ DIRNAME (MEDLEYDIR DIRNAME NIL OUTPUT NOERROR))) - then (OR NOERROR (SHOULDNT)) - NIL - else (SETQ FILENAME (CONCAT DIRNAME FILENAME)) - (if OUTPUT - then FILENAME - else (OR (INFILEP FILENAME) - (if NOERROR - then NIL - else (ERROR "No such medley file" FILENAME] - ((EQUAL DIRNAME "login") (* ; "special case for login dir") - (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR") - (UNIX-GETENV "HOME") - DIRNAME))) - [(EQUAL DIRNAME "loadups") (* ; "special case for loadups dir") - (OR (DIRECTORYNAME (UNIX-GETENV "MEDLEYLOADUPSDIR")) - (DIRECTORYNAME (CONCAT (MEDLEYDIR) - "loadups" ">") - NIL OUTPUT) - (if NOERROR - then NIL - else (ERROR "Cannot find medley loadups directory" (MEDLEYDIR] - (T (OR (DIRECTORYNAME (CONCAT (MEDLEYDIR) - DIRNAME ">") - NIL OUTPUT) - (if NOERROR - then NIL - else (ERROR "No such medley directory" DIRNAME]) + (if (NULL (SETQ DIRNAME (MEDLEYDIR DIRNAME NIL OUTPUT NOERROR))) + then (OR NOERROR (SHOULDNT)) + NIL + else (SETQ FILENAME (CONCAT DIRNAME FILENAME)) + (if OUTPUT + then FILENAME + else (OR (INFILEP FILENAME) + (if NOERROR + then NIL + else (ERROR "No such medley file" FILENAME] + ((EQUAL DIRNAME "login") (* ; "special case for login dir") + (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR") + (UNIX-GETENV "HOME") + DIRNAME))) + [(EQUAL DIRNAME "loadups") (* ; "special case for loadups dir") + (OR (DIRECTORYNAME (UNIX-GETENV "MEDLEYLOADUPSDIR")) + (DIRECTORYNAME (CONCAT (MEDLEYDIR) + "loadups" ">") + NIL OUTPUT) + (if NOERROR + then NIL + else (ERROR "Cannot find medley loadups directory" (MEDLEYDIR] + (T (OR (DIRECTORYNAME (CONCAT (MEDLEYDIR) + DIRNAME ">") + NIL OUTPUT) + (if NOERROR + then NIL + else (ERROR "No such medley directory" DIRNAME] + (CL:WHEN MED (PSEUDOFILENAME MED]) (MEDLEYSUBSTDIR [LAMBDA (OLD NEW BODY) (* ; @@ -227,7 +228,7 @@ SYSOUTCOMMITS]) ) -(RPAQ? MEDLEYDIR ) +(RPAQ? MEDLEYDIR (MEDLEYDIR)) (RPAQ? \SAVE.MEDLEYDIR ) @@ -235,6 +236,13 @@ SYSOUTCOMMITS) (LIST (LIST 'MEDLEY NIL)))) + + +(* ;; "PSEUDOHOSTS comes before MEDLEYDIR in the loadup.") + + +(PSEUDOHOST 'MEDLEY MEDLEYDIR) + (ADDTOVAR AROUNDEXITFNS MEDLEY-INIT-VARS) @@ -245,7 +253,7 @@ (* ;; -"The INITVARS prevents this from accumulating entries from other files that happen to have been loaded when this is worked on and saved. The loadup scripts set MEDLEY-INIT-VARS to NOBIND to make sure that these are the initial values (as opposed to whatever there was in the startup sysout. But the FONT cache variables have to be specified here, because FONT is in the INIT and the resetting to NOBIND would wipe out these entries even if they were already correct in the init sysout." +"The INITVARS prevents this from accumulating entries from other files that happen to have been loaded when this is worked on and saved. The loadup scripts set MEDLEY-INIT-VARS to NOBIND to make sure that these are the initial values (as opposed to whatever there was in the startup sysout." ) @@ -258,24 +266,16 @@ (IRM.HOST&DIR (MEDLEYDIR '"docs/dinfo")) (IRM.DINFOGRAPH) (DIRECTORIES (APPEND LISPUSERSDIRECTORIES LISPSOURCEDIRECTORIES)) - (LOGINHOST/DIR (LET [(LHD (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR") - (UNIX-GETENV "HOME"] - (AND (GETD 'PSEUDOHOSTS) - (TARGETHOST 'LI) - (PSEUDOHOST 'LI LHD)) + (LOGINHOST/DIR (LET [(LHD (DIRECTORYNAME (PACKFILENAME 'HOST 'DSK 'BODY (OR (UNIX-GETENV + "LOGINDIR") + (UNIX-GETENV + "HOME"] + (PSEUDOHOST 'LI LHD) LHD) RESET) (USERGREETFILES [LIST (CONS LOGINHOST/DIR '("INIT" COM)) (CONS LOGINHOST/DIR '("INIT"] RESET) - (DISPLAYFONTDIRECTORIES (MEDLEYDIR '("fonts/medleydisplayfonts" "fonts/displayfonts") - NIL NIL T)) - (POSTSCRIPTFONTDIRECTORIES (MEDLEYDIR '("fonts/postscriptfonts") - NIL NIL T)) - (INTERPRESSFONTDIRECTORIES (MEDLEYDIR '("fonts/ipfonts") - NIL NIL T)) - (UNICODEDIRECTORIES (MEDLEYDIR '("unicode/xerox") - NIL NIL T)) (XCL::*WHERE-IS-CASH-FILES* (MEDLEYDIR '("loadups") "whereis.hash" NIL T)) (LOADUPSDIRECTORIES (MEDLEYDIR '("loadups") @@ -285,6 +285,6 @@ (ADDTOVAR GLOBALVARS MEDLEYDIR MEDLEY-INIT-VARS \SAVE.MEDLEYDIR DIRECTORIES SYSOUTCOMMITS) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (5324 13336 (MEDLEY-INIT-VARS 5334 . 8812) (MEDLEYDIR 8814 . 12136) (MEDLEYSUBSTDIR -12138 . 13116) (SET-SYSOUT-COMMIT 13118 . 13334))))) + (FILEMAP (NIL (4215 13446 (MEDLEY-INIT-VARS 4225 . 7856) (MEDLEYDIR 7858 . 12246) (MEDLEYSUBSTDIR +12248 . 13226) (SET-SYSOUT-COMMIT 13228 . 13444))))) STOP diff --git a/sources/MEDLEYDIR.LCOM b/sources/MEDLEYDIR.LCOM index d348dc27..6c08ba81 100644 Binary files a/sources/MEDLEYDIR.LCOM and b/sources/MEDLEYDIR.LCOM differ diff --git a/sources/MEDLEYFONTFORMAT b/sources/MEDLEYFONTFORMAT index 96f410e0..fd2dbae2 100644 --- a/sources/MEDLEYFONTFORMAT +++ b/sources/MEDLEYFONTFORMAT @@ -1,12 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "14-Feb-2026 00:39:34" {WMEDLEY}MEDLEYFONTFORMAT.;250 60733 +(FILECREATED " 5-May-2026 11:06:05" {MEDLEY}MEDLEYFONTFORMAT.;317 67145 :EDIT-BY rmk - :CHANGES-TO (FNS MEDLEYFONT.GETCHARSET MEDLEYFONT.READ.CHARSET) + :CHANGES-TO (FNS MEDLEYFONT.READ.FONT MEDLEYFONT.FILENAME) - :PREVIOUS-DATE "23-Jan-2026 15:10:16" {WMEDLEY}MEDLEYFONTFORMAT.;249) + :PREVIOUS-DATE " 4-May-2026 14:58:55" {MEDLEY}MEDLEYFONTFORMAT.;316) (PRETTYCOMPRINT MEDLEYFONTFORMATCOMS) @@ -18,8 +18,8 @@ (* ;; "Main public entries") - (FNS MEDLEYFONT.WRITE.FONT MEDLEYFONT.GETCHARSET MEDLEYFONT.CHARSET? MEDLEYFONT.GETFILEPROP - MEDLEYFONT.FILEP) + (FNS MEDLEYFONT.WRITE.FONT MEDLEYFONT.GETCHARSET MEDLEYFONT.GETCHARSET.INTERNAL + MEDLEYFONT.CHARSET? MEDLEYFONT.GETFILEPROP MEDLEYFONT.FILEP MEDLEYFONT.FILEVERSION) (* ;; "Reading") @@ -59,191 +59,222 @@ (DEFINEQ (MEDLEYFONT.WRITE.FONT - [LAMBDA (FONT FILE CHARSETNOS OTHERFONTPROPS NOINDIRECTS) (* ; "Edited 20-Jan-2026 22:36 by rmk") + [LAMBDA (FONT FILE OTHERFONTPROPS NOINDIRECTS) (* ; "Edited 30-Mar-2026 12:55 by rmk") + (* ; "Edited 25-Mar-2026 10:48 by rmk") + (* ; "Edited 22-Mar-2026 18:19 by rmk") + (* ; "Edited 21-Mar-2026 15:32 by rmk") + (* ; "Edited 18-Mar-2026 23:16 by rmk") + (* ; "Edited 20-Jan-2026 22:36 by rmk") (* ; "Edited 2-Sep-2025 23:01 by rmk") (* ; "Edited 15-Jul-2025 16:43 by rmk") (* ; "Edited 9-Jul-2025 09:32 by rmk") (* ; "Edited 19-Jun-2025 10:59 by rmk") (* ; "Edited 9-Jun-2025 12:17 by rmk") - (* ; "Edited 25-May-2025 20:48 by rmk") - (* ; "Edited 23-May-2025 14:59 by rmk") - (* ; "Edited 22-May-2025 09:58 by rmk") - (* ; "Edited 16-May-2025 20:17 by rmk") (* ; "Edited 14-May-2025 17:45 by rmk") + + (* ;; "This writes all of the information in the fontdescriptor FONT, this doesn't allow for selecting a subset of character sets to write. The information allows all of the current CHARSETINFOs to be reconstructed when the font is read. An uninstantiated charset (CSINFO is NIL) will be read as NIL, and the CSINFO for an empty charset (CSINFO is CSSLUGP) will be installed as the font's slug. The reader can select a subset of the charsets for MEDLEYFONT.GETCHARSET to read. ") + (SETQ FONT (FONTCREATE FONT)) - (SETQ FILE (MEDLEYFONT.FILENAME FILE FONT CHARSETNOS)) - (SETQ CHARSETNOS (SORT (MKLIST CHARSETNOS))) - (CL:WITH-OPEN-FILE (STREAM FILE :DIRECTION :OUTPUT :IF-EXISTS :NEW-VERSION) - (MEDLEYFONT.WRITE.HEADER STREAM OTHERFONTPROPS) - (LET ((CHARSETLOCS (CL:MAKE-ARRAY 256 :INITIAL-ELEMENT 0)) - (FONTCHARENCODING (FONTPROP FONT 'CHARENCODING)) - (*READTABLE* (FIND-READTABLE "INTERLISP")) - CSVECTORPTRLOC CSVECTORLOC FILECHARSETS) + (CL:WITH-OPEN-FILE + (STREAM (MEDLEYFONT.FILENAME FILE) + :DIRECTION :OUTPUT :IF-EXISTS :NEW-VERSION) + (MEDLEYFONT.WRITE.HEADER STREAM OTHERFONTPROPS FONT) - (* ;; "Figure out the actual non empty/sluggish charsets that will be wrtitten.") + (* ;; "Right after the header, leave bytes for the maxcharset and a pointer to either the charset dispatch vector or a single-charset. Ptr is before fontproperties, vector is after, so MEDLEYFONT.GETCHARSET can skip the font stuff.") - (SETQ FILECHARSETS (for CSNO CSINFO from 0 to \MAXCHARSET - when (OR (NULL CHARSETNOS) - (MEMB CSNO CHARSETNOS)) - when (SETQ CSINFO (\GETCHARSETINFO FONT CSNO)) - unless (fetch (CHARSETINFO CSSLUGP) of CSINFO) collect CSNO)) - (CL:UNLESS FILECHARSETS (ERROR "No character sets to write" FONT)) + (MEDLEYFONT.WRITE.ITEM STREAM 'MAXCHARSET (MAXCHARSET FONT)) + (LET ((CHARSETLOCS (CL:MAKE-ARRAY (ADD1 (MAXCHARSET FONT)) + :INITIAL-ELEMENT 0)) + (FONTCHARENCODING (FONTPROP FONT 'CHARENCODING)) + (*READTABLE* (FIND-READTABLE "INTERLISP")) + CSVECTORPTRLOC CSLOC SINGLECS) + [SETQ SINGLECS (AND (ILEQ (FONTPROP FONT 'NINSTANTIATEDCHARSETS) + 1) + (OR (EQ 0 (FONTPROP FONT 'NEMPTYCHARSETS)) + (EQ 0 (FONTPROP FONT 'NUNINSTANTIATEDCHARSETS] + (SETQ CSVECTORPTRLOC (GETFILEPTR STREAM)) + (\FIXPOUT STREAM 0) (* ; + "Space for the pointer to the charset info") + (MEDLEYFONT.WRITE.FONTPROPS STREAM FONT) + (PRINTOUT STREAM "CHARSET LOCATIONS" T) (* ; "Signpost for debugging") + (SETQ CSLOC (GETFILEPTR STREAM)) + (SETFILEPTR STREAM CSVECTORPTRLOC) (* ; + "Store the address of the charset info") + (\FIXPOUT STREAM (CL:IF SINGLECS + (IMINUS CSLOC) + CSLOC)) (* ; "Negative for single") + (SETFILEPTR STREAM CSLOC) + [if SINGLECS + then + (* ;; "At most one instantiated, others are either all uninstantiated or all empty, no need for the vector") - (* ;; "Right after the header, leave 4 bytes for the pointer to the charset dispatch vector. If writing a single charset, we store the negative of the byte location so we can still easily skip the font properties without writing the whole vector. The byte in front of the single charset holds its number.") + (if [SETQ SINGLECS (find CSNO CSINFO from 0 to (MAXCHARSET FONT) + suchthat (AND (SETQ CSINFO (\GETCHARSETINFO FONT CSNO)) + (NOT (fetch (CHARSETINFO CSSLUGP) of CSINFO] + then (\FIXPOUT STREAM SINGLECS) (* ; + "Charsetno prefix as cell, not byte") + (\BOUT STREAM (CL:IF (EQ 0 (FONTPROP FONT 'NUNINSTANTIATEDCHARSETS)) + 1 + 2)) (* ; "All others") + (MEDLEYFONT.WRITE.CHARSET FONT SINGLECS STREAM NOINDIRECTS) + else + (* ;; + "Fake charset meaning all the same: -1 if all empty, -2 if all uninstantiated.") - (* ;; "") + (\FIXPOUT STREAM (CL:IF (EQ 0 (FONTPROP FONT 'NUNINSTANTIATEDCHARSETS)) + -1 + -2))) + else + (* ;; "Allocate the vector space") - (SETQ CSVECTORPTRLOC (GETFILEPTR STREAM)) (* ; - "Ptr is before fontproperties, vector is after") - (\FIXPOUT STREAM 0) - (MEDLEYFONT.WRITE.FONTPROPS STREAM FONT) - (if (CDR FILECHARSETS) - then (PRINTOUT STREAM "CHARSET LOCATIONS" T) - (* ; - "Allocate the vector space if multiple") - (SETQ CSVECTORLOC (GETFILEPTR STREAM)) - (for I from 0 to \MAXCHARSET do (\FIXPOUT STREAM 0)) - (TERPRI STREAM) - (for CSNO in FILECHARSETS do + (for CSNO from 0 to (MAXCHARSET FONT) do (\FIXPOUT STREAM 0)) + (for CSNO CSINFO from 0 to (MAXCHARSET FONT) when (SETQ CSINFO (\GETCHARSETINFO + FONT CSNO)) + do + (* ;; "LOC remains zero if the charset is NIL=uninstantiated. Could have initialized array to -1, flipped to zero here if uninstantiated") - (* ;; - "LOC remains zero for missing charsets, slug properties are determined by font-level properties.") - - (CL:SETF (CL:SVREF CHARSETLOCS CSNO) - (GETFILEPTR STREAM)) - (MEDLEYFONT.WRITE.CHARSET FONT CSNO STREAM - NOINDIRECTS)) - (SETFILEPTR STREAM CSVECTORLOC) - (for CSNO from 0 to \MAXCHARSET do (\FIXPOUT STREAM (CL:SVREF CHARSETLOCS - CSNO))) - else - (* ;; "Only one. The %"vector%" is the charset byte immediately before the charset, the sign bit tells the tale.") - - (SETQ CSVECTORLOC (IMINUS (GETFILEPTR STREAM))) - (BOUT STREAM (CAR FILECHARSETS)) - (MEDLEYFONT.WRITE.CHARSET FONT (CAR FILECHARSETS) - STREAM NOINDIRECTS)) - (SETFILEPTR STREAM CSVECTORPTRLOC) - (\FIXPOUT STREAM CSVECTORLOC) (* ; - "Pointer to the charset dispatch vector--or negative of actual location for a singleton") - (FULLNAME STREAM]) + (if (fetch (CHARSETINFO CSSLUGP) of CSINFO) + then (CL:SETF (CL:SVREF CHARSETLOCS CSNO) + -1) + else (CL:SETF (CL:SVREF CHARSETLOCS CSNO) + (GETFILEPTR STREAM)) + (MEDLEYFONT.WRITE.CHARSET FONT CSNO STREAM NOINDIRECTS))) + (SETFILEPTR STREAM CSLOC) (* ; "Fill in the vector") + (for CSNO from 0 to (MAXCHARSET FONT) do (\FIXPOUT STREAM (CL:SVREF CHARSETLOCS CSNO + ] + (FULLNAME STREAM]) (MEDLEYFONT.GETCHARSET - [LAMBDA (STREAM CHARSET FONT) (* ; "Edited 14-Feb-2026 00:36 by rmk") + [LAMBDA (STREAM CHARSET FONT) (* ; "Edited 15-Apr-2026 13:29 by rmk") + (* ; "Edited 12-Apr-2026 22:14 by rmk") + (* ; "Edited 6-Apr-2026 09:45 by rmk") + (* ; "Edited 30-Mar-2026 08:42 by rmk") + (* ; "Edited 24-Mar-2026 00:04 by rmk") + (* ; "Edited 21-Mar-2026 15:28 by rmk") + (* ; "Edited 17-Mar-2026 11:42 by rmk") + (* ; "Edited 14-Feb-2026 00:36 by rmk") (* ; "Edited 9-Oct-2025 15:18 by rmk") (* ; "Edited 3-Sep-2025 11:32 by rmk") (* ; "Edited 15-Jul-2025 17:09 by rmk") (* ; "Edited 9-Jul-2025 15:45 by rmk") (* ; "Edited 14-May-2025 17:46 by rmk") - (* ;; "If open, assume its a medleyfont stream, that the initial Me etc. has been checked, and we are positioned after the header information. FONT is provided so that properties of the fontdescriptor can be read through this interface--ottherwise the fontcreate function of each device might have to also have a list of functions to try.") + (* ;; "If open, assume its a medleyfont stream, that the initial %"Medley...%" has been checked, FONT is consistent with information in the file, and we are positioned after the header information, at the location of CSLOC.") - (CL:UNLESS (<= 0 CHARSET \MAXCHARSET) - (\ILLEGAL.ARG CHARSET)) + (SETQ CHARSET (CHARSET.DECODE CHARSET)) (RESETLST (CL:UNLESS (\GETSTREAM STREAM 'INPUT T) [RESETSAVE (SETQ STREAM (OPENSTREAM STREAM 'INPUT)) - `(PROGN (CLOSEF? OLDVALUE] - (CL:UNLESS (MEDLEYFONT.FILEP STREAM) (* ; - "Checks and positions, if reopening.") - (ERROR "NOT A MEDLEYFONT FILE" (FULLNAME STREAM)))) - (LET ((CSVECTORLOC (\FIXPIN STREAM)) - CSLOC) - (if (thereis CS from 0 to \MAXTHINCHAR suchthat (\GETCHARSETINFO FONT CS)) - then - (* ;; "Font fields have been initialized, just update for this charset") + `(PROGN (CLOSEF? OLDVALUE]) + (MEDLEYFONT.FILEVERSION STREAM 1) + (MEDLEYFONT.READ.ITEM STREAM 'MAXCHARSET) + (MEDLEYFONT.GETCHARSET.INTERNAL STREAM CHARSET FONT (\FIXPIN STREAM)))]) - (for P VAL in (MEDLEYFONT.READ.FONTPROPS STREAM) - do (SETQ VAL (CADR P)) - (SELECTQ (CAR VAL) - (\SFAscent (change (fetch (FONTDESCRIPTOR \SFAscent) of FONT) - (IMAX VAL DATUM))) - (\SFDescent (change (fetch (FONTDESCRIPTOR \SFDescent) of FONT) - (IMAX VAL DATUM))) - (\SFHeight (fetch (FONTDESCRIPTOR \SFHeight) of FONT)) - NIL)) - else - (* ;; "First charset, probably 0: establish the overall font properties. ") +(MEDLEYFONT.GETCHARSET.INTERNAL + [LAMBDA (STREAM CHARSET FONT CSLOC) (* ; "Edited 15-Apr-2026 11:09 by rmk") + (* ; "Edited 12-Apr-2026 14:04 by rmk") + (* ; "Edited 29-Mar-2026 22:42 by rmk") - (MEDLEYFONT.READ.VERIFIEDFONT STREAM FONT)) - (replace (FONTDESCRIPTOR FONTCOMPLETEP) of FONT with NIL) + (* ;; "Caller guarantees STREAM and CSLOC as the location of the charset info. CHARSET is less than (MAXCHARSTE FONT).") - (* ;; - "One charset doesn't %"complete%" a complete font--maybe that's only an incore property? ") + (if (IGREATERP CHARSET (fetch (FONTDESCRIPTOR MAXCHARSET) of FONT)) + then (SLUGCSINFO FONT) + else (LET (CSINFO FILECHARSET ALLOTHERS) + (if (ILESSP CSLOC 0) + then + (* ;; + "File contains at most one instantiated charset, others are either all empty or all uninstantiated") - (* ;; "We know now that this file has information about the requested charset, including NIL entries for empty/slugglish ones in the middle of populated ones. A file that would have contain a single empty/sluggish charset cannot be created--the caller would recognize the case of a missing file and provide either NIL or a slug-vector.") + (SETFILEPTR STREAM (IMINUS CSLOC)) + (SETQ FILECHARSET (\FIXPIN STREAM)) + (SETQ ALLOTHERS (BIN STREAM)) (* ; "If not the one we wanted") + [SELECTQ FILECHARSET + (-1 (* ; "All empty") + (SLUGCSINFO FONT)) + (-2 (* ; "All uninstantiated") + NIL) + (PROGN (if (IEQP CHARSET FILECHARSET) + then (MEDLEYFONT.READ.CHARSET STREAM CHARSET) + elseif (EQ 1 ALLOTHERS) + then (SLUGCSINFO FONT] + else + (* ;; + "CSLOC points to the vector, what does it say about the requested CHARSET?") - (CL:WHEN (if (ILESSP CSVECTORLOC 0) - then - (* ;; "File contains only one charset. Is it the one we want? If the intended charset is empty/sluggish, the file would not have been constructed and we wouldn't be here.") - - (SETFILEPTR STREAM (IMINUS CSVECTORLOC)) - (EQ CHARSET (BIN STREAM)) - else - (* ;; "The vector-entry points to the one we want. Is it there?") - - (SETFILEPTR STREAM (IPLUS CSVECTORLOC (UNFOLD CHARSET BYTESPERCELL))) - (CL:UNLESS (EQ 0 (SETQ CSLOC (\FIXPIN STREAM))) - (SETFILEPTR STREAM CSLOC))) - (MEDLEYFONT.READ.CHARSET STREAM CHARSET FONT))))]) + (SETFILEPTR STREAM (IPLUS CSLOC (UNFOLD CHARSET BYTESPERCELL))) + (SELECTQ (SETQ CSLOC (\FIXPIN STREAM)) + (0 NIL) + (-1 (SLUGCSINFO FONT)) + (PROGN (SETFILEPTR STREAM CSLOC) + (MEDLEYFONT.READ.CHARSET STREAM CHARSET FONT]) (MEDLEYFONT.CHARSET? - [LAMBDA (FILE CHARSET) (* ; "Edited 15-Jul-2025 15:21 by rmk") + [LAMBDA (FILE CHARSET) (* ; "Edited 16-Mar-2026 00:31 by rmk") + (* ; "Edited 15-Jul-2025 15:21 by rmk") (* ; "Edited 25-May-2025 20:53 by rmk") (* ; "Edited 21-May-2025 11:35 by rmk") (* ; "Edited 17-May-2025 11:29 by rmk") (* ; "Edited 14-May-2025 17:46 by rmk") - - (* ;; "If CHARSET, returns CHARSET if FILE contains a non-slug entry for CHARSET. If not CHARSET, returns the list of non-slug charsets in FILE.") - - (CL:WITH-OPEN-FILE (STREAM FILE :DIRECTION :INPUT) - (CL:UNLESS (MEDLEYFONT.FILEP STREAM) - (ERROR "Not a MEDLEYFONT file" FILE)) - (LET ((CSVECTORLOC (\FIXPIN STREAM))) - (CL:WHEN (if (ILESSP CSVECTORLOC 0) - then - (* ;; "File contains only one charse, is it the one we want? ") - - (SETFILEPTR STREAM (IMINUS CSVECTORLOC)) - (EQ CHARSET (BIN STREAM)) - else (SETFILEPTR STREAM (IPLUS CSVECTORLOC (UNFOLD CHARSET BYTESPERCELL))) - (NEQ 0 (\FIXPIN STREAM))) - CHARSET]) + (SETQ CHARSET (CHARSET.DECODE CHARSET)) + (LET [(CHARSETS (MEDLEYFONT.GETFILEPROP FILE 'CHARSETS] + (CL:IF CHARSET + (CAR (MEMB CHARSET CHARSETS)) + CHARSETS)]) (MEDLEYFONT.GETFILEPROP - [LAMBDA (FILE PROP) (* ; "Edited 27-Aug-2025 17:12 by rmk") + [LAMBDA (FILE PROP) (* ; "Edited 4-May-2026 09:57 by rmk") + (* ; "Edited 16-Apr-2026 22:30 by rmk") + (* ; "Edited 15-Apr-2026 00:19 by rmk") + (* ; "Edited 12-Apr-2026 19:31 by rmk") + (* ; "Edited 31-Mar-2026 14:43 by rmk") + (* ; "Edited 28-Mar-2026 22:59 by rmk") + (* ; "Edited 24-Mar-2026 10:56 by rmk") + (* ; "Edited 20-Mar-2026 13:23 by rmk") + (* ; "Edited 27-Aug-2025 17:12 by rmk") (* ; "Edited 15-Jul-2025 20:21 by rmk") (* ; "Edited 10-Jul-2025 17:50 by rmk") (* ; "Edited 25-May-2025 20:53 by rmk") (* ; "Edited 21-May-2025 11:36 by rmk") - (* ; "Edited 17-May-2025 19:07 by rmk") - (* ; "Edited 14-May-2025 17:46 by rmk") - (CL:UNLESS (OR (LITATOM FILE) - (STRINGP FILE)) - [SETQ FILE (CAR (FONTFILES (FONTPROP (FONTCREATE FILE) - 'SPEC]) - (CL:WITH-OPEN-FILE (STREAM FILE :DIRECTION :INPUT) - (LET (HEADERPROPS CSVECTORLOC) + (* ; "Edited 17-May-2025 19:07 by rmk") + (SETQ FILE (OR (MEDLEYFONT.FILENAME FILE) + (ERROR "FILE NOT FOUND" FILE))) + (CL:WITH-OPEN-FILE (STREAM (OR (MEDLEYFONT.FILENAME FILE) + FILE) + :DIRECTION :INPUT) + (LET (HEADERPROPS CSLOC SINGLECS MAXCHARSET) (CL:UNLESS (SETQ HEADERPROPS (MEDLEYFONT.FILEP STREAM)) (ERROR "Not a MEDLEYFONT file" (FULLNAME STREAM))) - (SETQ CSVECTORLOC (\FIXPIN STREAM)) + (SETQ MAXCHARSET (MEDLEYFONT.READ.ITEM STREAM 'MAXCHARSET)) + (SETQ CSLOC (\FIXPIN STREAM)) (SELECTQ PROP (OTHERPROPS (CDDR HEADERPROPS)) (DATE (CADR HEADERPROPS)) + (MAXCHARSET MAXCHARSET) (FONTPROPS (MEDLEYFONT.READ.FONTPROPS STREAM)) - (CHARSETS (if (ILESSP CSVECTORLOC 0) + (CHARSETS (* ; "Skips slugs and indirects") + (if (ILESSP CSLOC 0) then - (* ;; "File contains only one charset ") + (* ;; "File contains only one instantiated charset ") - (SETFILEPTR STREAM (IMINUS CSVECTORLOC)) - (CONS (BIN STREAM)) - else (SETFILEPTR STREAM CSVECTORLOC) - (for CS from 0 to \MAXCHARSET unless (EQ 0 (\FIXPIN STREAM)) - collect CS))) + (SETFILEPTR STREAM (IMINUS CSLOC)) + (SETQ SINGLECS (\FIXPIN STREAM)) + (CL:WHEN (IGEQ SINGLECS 0) + (CONS SINGLECS)) + else (SETFILEPTR STREAM CSLOC) + (for CS from 0 to MAXCHARSET when (IGREATERP (\FIXPIN STREAM) + 0) collect CS))) + (INDIRECTS + (* ;; + "These are fully spelled out FONTSPECS, no need to fill in defaults") + + (CADR (ASSOC 'ICS (MEDLEYFONT.READ.FONTPROPS STREAM)))) (ERROR "Unknown MEDLEYFONT property"]) (MEDLEYFONT.FILEP - [LAMBDA (FILE) (* ; "Edited 6-Jul-2025 11:44 by rmk") + [LAMBDA (FILE) (* ; "Edited 30-Mar-2026 11:58 by rmk") + (* ; "Edited 29-Mar-2026 10:50 by rmk") + (* ; "Edited 24-Mar-2026 00:55 by rmk") + (* ; "Edited 6-Jul-2025 11:44 by rmk") (* ; "Edited 10-Jun-2025 18:19 by rmk") (* ; "Edited 8-Jun-2025 22:55 by rmk") (* ; "Edited 25-May-2025 20:54 by rmk") @@ -258,7 +289,7 @@ (* ;; "If FILE is an open stream, it is left open. Otherwise it is opened and closed.") (RESETLST - [LET (STREAM VERSION DATE) + [LET (STREAM) [if (\GETSTREAM FILE 'INPUT T) then (SETQ STREAM FILE) else (RESETSAVE (SETQ STREAM (OPENSTREAM FILE 'INPUT)) @@ -266,11 +297,26 @@ (CL:UNLESS (ZEROP (GETFILEPTR STREAM)) (SETFILEPTR STREAM 0)) (CL:WHEN (for C in (CONSTANT (CHCON "Medley font")) always (EQ C (READCCODE STREAM))) - [CAR (NLSETQ [CL:WHEN (EQ 0 (SETQ VERSION (MEDLEYFONT.READ.ITEM STREAM 'VERSION] - `(,(FULLNAME STREAM) - ,(MEDLEYFONT.READ.ITEM STREAM 'DATE) - ,VERSION - ,@(MEDLEYFONT.READ.ITEM STREAM 'OTHERFONTPROPS])])]) + + (* ;; "This sticks the file's MAXCHARSET on the stream, so MEDLEYFONT.GETCHARSET can do a bounds check even without decoding all the other font information. ") + + [CAR (NLSETQ `([VERSION ,(MKATOM (MEDLEYFONT.READ.ITEM STREAM 'VERSION] + (FILE ,(FULLNAME STREAM)) + [DATE ,(MEDLEYFONT.READ.ITEM STREAM 'DATE] + ,@(MEDLEYFONT.READ.ITEM STREAM 'OTHERFONTPROPS])])]) + +(MEDLEYFONT.FILEVERSION + [LAMBDA (FILE REQUIRED) (* ; "Edited 17-Apr-2026 09:32 by rmk") + (* ; "Edited 4-Apr-2026 00:10 by rmk") + (* ; "Edited 30-Mar-2026 12:08 by rmk") + (* ; "Edited 29-Mar-2026 11:21 by rmk") + (LET* [(PROPS (OR (MEDLEYFONT.FILEP FILE) + (ERROR "Not a Medley font" FILE))) + (FILEVERSION (CADR (ASSOC 'VERSION PROPS] + (CL:WHEN (AND REQUIRED (NEQ REQUIRED FILEVERSION)) + (ERROR (CONCAT "Medley font version is " FILEVERSION ", " REQUIRED " is required") + FILE)) + FILEVERSION]) ) @@ -280,97 +326,82 @@ (DEFINEQ (MEDLEYFONT.READ.FONT - [LAMBDA (FILE CHARSETNOS FONT) (* ; "Edited 20-Jan-2026 22:31 by rmk") + [LAMBDA (FILE CHARSETS NOERROR DIRECTORY) (* ; "Edited 5-May-2026 11:05 by rmk") + (* ; "Edited 15-Apr-2026 00:50 by rmk") + (* ; "Edited 12-Apr-2026 00:30 by rmk") + (* ; "Edited 6-Apr-2026 09:07 by rmk") + (* ; "Edited 4-Apr-2026 15:29 by rmk") + (* ; "Edited 31-Mar-2026 22:53 by rmk") + (* ; "Edited 30-Mar-2026 12:08 by rmk") + (* ; "Edited 26-Mar-2026 23:23 by rmk") + (* ; "Edited 25-Mar-2026 00:07 by rmk") + (* ; "Edited 21-Mar-2026 00:31 by rmk") + (* ; "Edited 18-Mar-2026 23:51 by rmk") + (* ; "Edited 17-Mar-2026 10:16 by rmk") + (* ; "Edited 2-Mar-2026 20:40 by rmk") + (* ; "Edited 20-Jan-2026 22:31 by rmk") (* ; "Edited 31-Aug-2025 14:42 by rmk") (* ; "Edited 15-Jul-2025 20:20 by rmk") (* ; "Edited 9-Jul-2025 00:06 by rmk") (* ; "Edited 6-Jul-2025 11:45 by rmk") - (SETQ FONT (CL:IF FONT - (FONTCREATE FONT) - (create FONTDESCRIPTOR))) - (SETQ FILE (MEDLEYFONT.FILENAME FILE FONT)) - (SETQ CHARSETNOS (SORT (MKLIST CHARSETNOS))) - (CL:WITH-OPEN-FILE (STREAM FILE :DIRECTION :INPUT) - (CL:UNLESS (MEDLEYFONT.FILEP STREAM) - (ERROR "NOT A MEDLEYFONT FILE" (FULLNAME STREAM))) - (LET ((*READTABLE* (FIND-READTABLE "INTERLISP")) - CSVECTORLOC NOTFOUND SINGLECSNO) - (SETQ CSVECTORLOC (\FIXPIN STREAM)) (* ; - "Byte location of the charset dispatch vector") - (* ;; "We know now that this file has information about all requested charsets, including NIL entries for empty/slugglish ones in the middle of populated ones. A file that would have contain a single empty/sluggish charset cannot be created--the caller would recognize the case of a missing file and provide either NIL or a slug-vector.") + (* ;; "Returns a font descriptor containing the requested charsets from FILE. If FILE is a FONTSPEC, it is coerced to a standard font name on DIRECTORY.") - (SETQ FONT (MEDLEYFONT.READ.VERIFIEDFONT STREAM FONT)) - (CL:UNLESS (EQ CSVECTORLOC 0) (* ; "Not empty") - [if (ILESSP CSVECTORLOC 0) - then - (* ;; - "File contains only one charset and it's the one we want. Its CHARSET number is in the first byte.") - - (* ;; "If the intended charset is empty/sluggish, the file would not have been constructed and we wouldn't be here.") - - (SETFILEPTR STREAM (IMINUS CSVECTORLOC)) - (SETQ SINGLECSNO (BIN STREAM)) - (CL:WHEN CHARSETNOS - (CL:UNLESS (AND (EQ SINGLECSNO (CAR CHARSETNOS)) - (NULL (CDR CHARSETNOS))) - (ERROR (CONCAT FILE - " does not contain information for charsets " - (REMOVE SINGLECSNO CHARSETNOS))))) - (\SETCHARSETINFO FONT SINGLECSNO (MEDLEYFONT.READ.CHARSET STREAM - SINGLECSNO)) - else - (* ;; - "Gather all of the CSLOCS before reading, so that we always move forward") - - (for CSNO CSLOC - in (OR CHARSETNOS (for I from 0 to \MAXCHARSET collect I)) - eachtime (SETFILEPTR STREAM (IPLUS CSVECTORLOC (UNFOLD CSNO - BYTESPERCELL))) - (SETQ CSLOC (\FIXPIN STREAM)) - (CL:WHEN (ZEROP CSLOC) - (push NOTFOUND CSNO)) unless (ZEROP CSLOC) - collect (CONS CSNO CSLOC) - finally (CL:WHEN (AND CHARSETNOS NOTFOUND) - (ERROR FILE (CONCAT - " does not contain information for charsets " - (DREVERSE NOTFOUND)))) - (for X CS in $$VAL do (SETQ CSNO (CAR X)) - (SETFILEPTR STREAM (CDR X)) - (\SETCHARSETINFO FONT CSNO ( - MEDLEYFONT.READ.CHARSET - STREAM CSNO]) - FONT]) + (CL:WHEN [OR (MEMB CHARSETS '(NIL ALL)) + (SETQ CHARSETS (SORT (CHARSET.DECODE (MKLIST CHARSETS) + NOERROR] + (RESETLST + (LET ((FILENAME (MEDLEYFONT.FILENAME FILE DIRECTORY)) + STREAM FONT CSLOC MAXCHARSET) (* ; + "CL:OPEN-FILE doesn't exist in the init") + (if FILENAME + then [RESETSAVE (SETQ STREAM (OPENSTREAM FILENAME 'INPUT)) + '(PROGN (CLOSEF? OLDVALUE] + (MEDLEYFONT.FILEVERSION STREAM 1) + (SETQ MAXCHARSET (MEDLEYFONT.READ.ITEM STREAM 'MAXCHARSET)) + (SETQ CSLOC (\FIXPIN STREAM)) (* ; + "CSLOC here so MEDLEYFONT.GETCHARSET can skip over the font stuff.") + (SETQ FONT (MEDLEYFONT.READ.VERIFIEDFONT STREAM)) + (for CSNO from 0 to MAXCHARSET while CHARSETS + when (if (EQ CHARSETS 'ALL) + elseif (EQ CSNO (CAR CHARSETS)) + then (pop CHARSETS)) + do (\SETCHARSETINFO FONT CSNO (MEDLEYFONT.GETCHARSET.INTERNAL STREAM + CSNO FONT CSLOC))) + FONT + elseif NOERROR + then NIL + else (ERROR "FONT FILE NOT FOUND" FILE)))))]) (MEDLEYFONT.READ.CHARSET - [LAMBDA (STREAM CHARSET FONT) (* ; "Edited 14-Feb-2026 00:36 by rmk") + [LAMBDA (STREAM CHARSET FONT) (* ; "Edited 4-May-2026 12:38 by rmk") + (* ; "Edited 30-Apr-2026 08:56 by rmk") + (* ; "Edited 14-Apr-2026 22:32 by rmk") + (* ; "Edited 12-Apr-2026 13:59 by rmk") + (* ; "Edited 30-Mar-2026 08:36 by rmk") + (* ; "Edited 22-Mar-2026 00:21 by rmk") + (* ; "Edited 17-Mar-2026 10:00 by rmk") + (* ; "Edited 14-Feb-2026 00:36 by rmk") (* ; "Edited 4-Sep-2025 10:39 by rmk") - (* ; "Edited 28-Aug-2025 15:27 by rmk") - (* ; "Edited 26-Aug-2025 23:36 by rmk") (* ; "Edited 17-Aug-2025 13:01 by rmk") (* ; "Edited 15-Jul-2025 11:27 by rmk") - (* ; "Edited 9-Jul-2025 19:33 by rmk") - (* ; "Edited 6-Jul-2025 10:11 by rmk") - (* ; "Edited 25-May-2025 20:54 by rmk") - (* ; "Edited 23-May-2025 11:01 by rmk") - (* ; "Edited 21-May-2025 16:25 by rmk") - (* ; "Edited 16-May-2025 20:19 by rmk") - (* ; "Edited 14-May-2025 10:43 by rmk") (* ; "Edited 12-May-2025 07:55 by rmk") - - (* ;; "FONT is only needed for the \READCHARSET call below that interprets an INDIRECT and leads to a recursiving invocation of MEDLEYFONT.GETCHARSET and this function. It is the font descriptor provided at the top-level call. ") - - (MEDLEYFONT.READ.ITEM STREAM 'CHARSETSTRING) (* ; + (* ;  "Throwaway for looking with text editor") - (LET (CSNO INDIRECT) - (CL:UNLESS [EQ CHARSET (SETQ CSNO (MEDLEYFONT.READ.ITEM STREAM 'CHARSET] + (LET (CSNO) + (CL:UNLESS [EQ CHARSET (SETQ CSNO (MKATOM (MEDLEYFONT.READ.ITEM STREAM 'CS] (ERROR "Charset mismatch" (LIST CHARSET CSNO))) - (if (EQ 'INDIRECTCHARSET (CAR (MEDLEYFONT.PEEK.ITEM STREAM))) + (if (EQ 'ICS (CAR (MEDLEYFONT.PEEK.ITEM STREAM))) then - (* ;; "Read what we peeked and use it to create a complete charset from another file (e.g. shared Kanji). ") + (* ;; "Indirect: Read what we peeked and use it to create a complete charset from another file (e.g. shared Kanji). The indirect source is in the same directory and has the same extension as the starting file.") - (SETQ INDIRECT (MEDLEYFONT.READ.ITEM STREAM 'INDIRECTCHARSET)) - (\READCHARSET INDIRECT CHARSET FONT) + (MEDLEYFONT.GETCHARSET (MEDLEYFONT.FILENAME (MAKEFONTSPEC (MEDLEYFONT.READ.ITEM + STREAM + 'ICS) + NIL NIL NIL NIL + (FONTPROP FONT 'DEVICESPEC)) + (FULLNAME STREAM)) + CHARSET FONT) else (bind PAIR LABEL ITEM (CSINFO _ (create CHARSETINFO WIDTHS _ NIL OFFSETS _ NIL)) eachtime (SETQ PAIR @@ -516,20 +547,31 @@ (bind PAIR until [EQ 'STOP (CAR (SETQ PAIR (MEDLEYFONT.READ.ITEM STREAM] collect PAIR]) (MEDLEYFONT.READ.VERIFIEDFONT - [LAMBDA (STREAM FONT) (* ; "Edited 20-Jan-2026 22:31 by rmk") + [LAMBDA (STREAM FONT) (* ; "Edited 15-Apr-2026 23:16 by rmk") + (* ; "Edited 12-Apr-2026 12:51 by rmk") + (* ; "Edited 28-Mar-2026 17:03 by rmk") + (* ; "Edited 23-Mar-2026 11:37 by rmk") + (* ; "Edited 19-Mar-2026 11:48 by rmk") + (* ; "Edited 18-Mar-2026 08:18 by rmk") + (* ; "Edited 2-Mar-2026 20:40 by rmk") + (* ; "Edited 20-Jan-2026 22:31 by rmk") (* ; "Edited 2-Sep-2025 23:52 by rmk") (* ; "Edited 12-Aug-2025 17:57 by rmk") (* ; "Edited 10-Jun-2025 20:57 by rmk") (* ; "Edited 21-May-2025 22:55 by rmk") (* ; "Edited 19-May-2025 17:42 by rmk") (* ; "Edited 16-May-2025 10:28 by rmk") - (LET ((FONTPROPS (MEDLEYFONT.READ.FONTPROPS STREAM))) + (LET ((FONTPROPS (MEDLEYFONT.READ.FONTPROPS STREAM)) + (FONT (create FONTDESCRIPTOR + FONTCHARSETVECTOR _ NIL))) (for P VAL in FONTPROPS do (SETQ VAL (CADR P)) (SELECTQ (CAR P) (FONTDEVICE (replace (FONTDESCRIPTOR FONTDEVICE) of FONT with VAL)) (FONTCOMPLETEP (replace (FONTDESCRIPTOR FONTCOMPLETEP) of FONT with VAL)) + (FONTCOERCEDP (replace (FONTDESCRIPTOR FONTCOERCEDP) + of FONT with VAL)) (FONTFAMILY (replace (FONTDESCRIPTOR FONTFAMILY) of FONT with VAL)) (FONTSIZE (replace (FONTDESCRIPTOR FONTSIZE) of FONT @@ -544,6 +586,8 @@ with VAL)) (ROTATION (replace (FONTDESCRIPTOR ROTATION) of FONT with VAL)) + (MAXCHARSET (replace (FONTDESCRIPTOR MAXCHARSET) of FONT + with VAL)) (FONTSLUGWIDTH (replace (FONTDESCRIPTOR FONTSLUGWIDTH) of FONT with VAL)) (FONTTOMCCSFN (replace (FONTDESCRIPTOR FONTTOMCCSFN) @@ -556,24 +600,25 @@ of FONT with VAL)) (FONTSCALE (replace (FONTDESCRIPTOR FONTSCALE) of FONT with VAL)) - (\SFFACECODE (replace (FONTDESCRIPTOR \SFFACECODE) - of FONT with VAL)) (FONTAVGCHARWIDTH (replace (FONTDESCRIPTOR FONTAVGCHARWIDTH) of FONT with VAL)) (FONTCHARENCODING (replace (FONTDESCRIPTOR FONTCHARENCODING) of FONT with VAL)) - (FONTCHARSETVECTOR - (replace (FONTDESCRIPTOR FONTCHARSETVECTOR) of FONT - with VAL)) (FONTHASLEFTKERNS (replace (FONTDESCRIPTOR FONTHASLEFTKERNS) of FONT with VAL)) (FONTEXTRAFIELD2 (replace (FONTDESCRIPTOR FONTEXTRAFIELD2) of FONT with VAL)) + (INDIRECTS (* ; "Only a file prop")) + (\SFFACECODE (* ; "to be deprecated")) (HELP "UNKNOWN FONTDESCRIPTOR PROPERTY: P"))) + (replace (FONTDESCRIPTOR FONTFILENAME) of FONT with (PSEUDOFILENAME (FULLNAME STREAM))) + (* ; + "PSEUDOFILENAME so that a deployed fontfile is redirected in a new sysout/makesys environment ") + (replace (FONTDESCRIPTOR FONTCHARSETVECTOR) of FONT with (\CREATEFONTCHARSETVECTOR FONT)) FONT]) ) @@ -584,7 +629,9 @@ (DEFINEQ (MEDLEYFONT.WRITE.CHARSET - [LAMBDA (FONT CHARSET STREAM NOINDIRECTS) (* ; "Edited 4-Sep-2025 11:41 by rmk") + [LAMBDA (FONT CHARSET STREAM NOINDIRECTS) (* ; "Edited 4-May-2026 11:53 by rmk") + (* ; "Edited 1-Apr-2026 09:20 by rmk") + (* ; "Edited 4-Sep-2025 11:41 by rmk") (* ; "Edited 30-Aug-2025 23:44 by rmk") (* ; "Edited 28-Aug-2025 21:00 by rmk") (* ; "Edited 9-Jul-2025 19:14 by rmk") @@ -593,10 +640,9 @@ (* ; "Edited 16-May-2025 20:18 by rmk") (* ; "Edited 13-May-2025 23:26 by rmk") (LET ((CSINFO (\INSURECHARSETINFO FONT CHARSET)) - CSCHARENCODING) - (MEDLEYFONT.WRITE.ITEM STREAM 'CHARSETSTRING (MKSTRING CHARSET)) - (* ; "For human file-scan") - (MEDLEYFONT.WRITE.ITEM STREAM 'CHARSET CHARSET) + CSCHARENCODING INDIRECT) + (MEDLEYFONT.WRITE.ITEM STREAM 'CS (MKSTRING CHARSET)) + (* ; "String for human file-scan") (CL:UNLESS (OR (NULL CSINFO) (fetch (CHARSETINFO CSSLUGP) of CSINFO)) (* ; @@ -604,12 +650,21 @@ (* ;; "Copy the fonts charencoding down to each charset info so that it is available when the charsetinfo is read. The fontdescriptor isn't available at that point and coercion could lead to fonts of different encodings. At least this would make it possible to fix things up.") - (if (CL:UNLESS NOINDIRECTS (INDIRECTCHARSETP CSINFO FONT)) + (if (CL:UNLESS NOINDIRECTS + (SETQ INDIRECT (INDIRECTCHARSETP CSINFO FONT))) then - (* ;; - "This charset is is taken entirely from on another file, no need to copy it to this file.") + (* ;; "This charset is is taken entirely from another file, no need to copy it to this file. Leave off the redundant FONTSPEC stuff") - (MEDLEYFONT.WRITE.ITEM STREAM 'INDIRECTCHARSET (CHARSETPROP CSINFO 'SOURCE) + (MEDLEYFONT.WRITE.ITEM STREAM 'ICS (LIST* (fetch (FONTSPEC FSFAMILY) + of INDIRECT) + (fetch (FONTSPEC FSSIZE) of INDIRECT) + (fetch (FONTSPEC FSFACE) of INDIRECT) + (CL:UNLESS + (EQ (FONTPROP FONT 'ROTATION) + (fetch (FONTSPEC FSROTATION) + of INDIRECT)) + (fetch (FONTSPEC FSROTATION) + of INDIRECT))) NIL 'PRINT) else (MEDLEYFONT.WRITE.ITEM STREAM 'CSINFOPROPS (fetch (CHARSETINFO CSINFOPROPS) @@ -774,7 +829,12 @@ (TERPRI STREAM))]) (MEDLEYFONT.WRITE.FONTPROPS - [LAMBDA (STREAM FONT) (* ; "Edited 12-Aug-2025 17:55 by rmk") + [LAMBDA (STREAM FONT) (* ; "Edited 4-May-2026 09:57 by rmk") + (* ; "Edited 31-Mar-2026 14:53 by rmk") + (* ; "Edited 23-Mar-2026 11:52 by rmk") + (* ; "Edited 19-Mar-2026 11:48 by rmk") + (* ; "Edited 18-Mar-2026 08:17 by rmk") + (* ; "Edited 12-Aug-2025 17:55 by rmk") (* ; "Edited 10-Jun-2025 20:50 by rmk") (* ; "Edited 25-May-2025 20:50 by rmk") (* ; "Edited 22-May-2025 10:31 by rmk") @@ -785,7 +845,7 @@ (* ;; "HPRINT would be obvious, but it would get charsetvector etc.") - (* ;; "Exclude FONTCHARSETVECTOR and \SFFACECODE") + (* ;; "Exclude FONTCHARSETVECTOR ") (* ;; "Write even NIL values for default overerides") @@ -793,6 +853,8 @@ T) (MEDLEYFONT.WRITE.ITEM STREAM 'FONTCOMPLETEP (fetch (FONTDESCRIPTOR FONTCOMPLETEP) of FONT) T) + (MEDLEYFONT.WRITE.ITEM STREAM 'FONTCOERCEDP (fetch (FONTDESCRIPTOR FONTCOMPLETEP) of FONT) + T) (MEDLEYFONT.WRITE.ITEM STREAM 'FONTFAMILY (fetch (FONTDESCRIPTOR FONTFAMILY) of FONT) T) (MEDLEYFONT.WRITE.ITEM STREAM 'FONTSIZE (fetch (FONTDESCRIPTOR FONTSIZE) of FONT) @@ -807,6 +869,8 @@ T) (MEDLEYFONT.WRITE.ITEM STREAM 'ROTATION (fetch (FONTDESCRIPTOR ROTATION) of FONT) T) + (MEDLEYFONT.WRITE.ITEM STREAM 'MAXCHARSET (fetch (FONTDESCRIPTOR MAXCHARSET) of FONT) + T) (MEDLEYFONT.WRITE.ITEM STREAM 'FONTSLUGWIDTH (fetch (FONTDESCRIPTOR FONTSLUGWIDTH) of FONT) T) (MEDLEYFONT.WRITE.ITEM STREAM 'FONTTOMCCSFN (fetch (FONTDESCRIPTOR FONTTOMCCSFN) of FONT) @@ -827,53 +891,54 @@ (MEDLEYFONT.WRITE.ITEM STREAM 'FONTHASLEFTKERNS (fetch (FONTDESCRIPTOR FONTHASLEFTKERNS) of FONT) T) - (MEDLEYFONT.WRITE.ITEM STREAM 'FONTEXTRAFIELD2 (fetch (FONTDESCRIPTOR FONTEXTRAFIELD2) - of FONT) + (MEDLEYFONT.WRITE.ITEM STREAM 'INDIRECTS (for CS CSINFO INDIRECT (FSPEC _ (FONTPROP FONT + 'DEVICESPEC)) + from 0 to (MAXCHARSET FONT) + when (SETQ CSINFO (\GETCHARSETINFO FONT CS)) + when (SETQ INDIRECT (CHARSETPROP CSINFO 'SOURCE)) + unless (EQUAL FSPEC INDIRECT) + unless (MEMBER INDIRECT $$VAL) + do (push $$VAL INDIRECT)) T) (MEDLEYFONT.WRITE.ITEM STREAM 'STOP T]) (MEDLEYFONT.WRITE.HEADER - [LAMBDA (STREAM OTHERFONTPROPS) (* ; "Edited 25-May-2025 20:51 by rmk") + [LAMBDA (STREAM OTHERFONTPROPS FONT) (* ; "Edited 29-Mar-2026 10:45 by rmk") + (* ; "Edited 24-Mar-2026 00:55 by rmk") + (* ; "Edited 25-May-2025 20:51 by rmk") (* ; "Edited 16-May-2025 20:20 by rmk") (* ; "Edited 14-May-2025 17:01 by rmk") (* ;; "Me in first 2 bytes distinguishes MEDLEYFONT format from others") (PRINTOUT STREAM "Medley font" T) - (MEDLEYFONT.WRITE.ITEM STREAM 'VERSION 0) + (MEDLEYFONT.WRITE.ITEM STREAM 'VERSION "1") (MEDLEYFONT.WRITE.ITEM STREAM 'DATE (DATE)) (MEDLEYFONT.WRITE.ITEM STREAM 'OTHERFONTPROPS OTHERFONTPROPS T]) ) (DEFINEQ (MEDLEYFONT.FILENAME - [LAMBDA (FILE FONT CHARSET EXTENSION DIRECTORY) (* ; "Edited 23-Jan-2026 15:10 by rmk") - (* ; "Edited 20-Jan-2026 17:39 by rmk") + [LAMBDA (FILE DIRECTORY) (* ; "Edited 5-May-2026 11:02 by rmk") + (* ; "Edited 4-May-2026 09:01 by rmk") + (* ; "Edited 30-Apr-2026 08:54 by rmk") + (* ; "Edited 15-Apr-2026 00:41 by rmk") + (* ; "Edited 23-Jan-2026 15:10 by rmk") (* ; "Edited 7-Oct-2025 11:50 by rmk") (* ; "Edited 4-Sep-2025 08:48 by rmk") - (* ; "Edited 10-Jun-2025 11:02 by rmk") - (* ; "Edited 25-May-2025 21:25 by rmk") - (* ; "Edited 19-May-2025 17:42 by rmk") - (* ; "Edited 16-May-2025 14:09 by rmk") - (LET [(FONTSPEC (AND FONT (\FONT.CHECKARGS FONT NIL NIL NIL NIL T] - (CL:UNLESS EXTENSION (* ; - "EXTENSION may be needed for DIRECTORY below") - (SETQ EXTENSION (OR (FILENAMEFIELD FILE 'EXTENSION) - (CONCAT "MEDLEY" (OR (AND FONTSPEC (fetch (FONTSPEC FSDEVICE) - of FONTSPEC)) - (ERROR "Font device not known")) - "FONT")))) - (PACKFILENAME.STRING `(BODY ,FILE ,@(UNPACKFILENAME.STRING (AND FONTSPEC - (\FONTFILENAME FONTSPEC NIL - NIL NIL CHARSET))) - DIRECTORY - ,(OR DIRECTORY (FILENAMEFIELD FILE 'DIRECTORY) - (PSEUDOFILENAME (CONCAT (MEDLEYDIR) - "fonts/" - (L-CASE EXTENSION) - "s"))) - EXTENSION - ,EXTENSION]) + (* ; "Edited 10-Jun-2025 11:02 by rmk") + (CL:WHEN (\GETSTREAM FILE 'INPUT T) + (SETQ FILE (FULLNAME FILE))) + (CL:WHEN DIRECTORY (* ; "Keep the host/directory.") + (SETQ DIRECTORY (PACKFILENAME 'NAME NIL 'EXTENSION NIL 'VERSION NIL 'BODY DIRECTORY))) + (if (type? FONTSPEC FILE) + then (SETQ FILE (\FONT.CHECKARGS FILE NIL NIL NIL NIL T)) + (CL:UNLESS DIRECTORY + [SETQ DIRECTORY (CAR (MKLIST (FONTDEVICEPROP FILE 'FONTDIRECTORIES]) + (PACKFILENAME 'DIRECTORY DIRECTORY 'BODY (\FONTFILENAME FILE)) + elseif FILE + then (* ; "File name") + (PACKFILENAME 'BODY FILE 'DIRECTORY DIRECTORY]) ) (ADDTOVAR DISPLAYFONTEXTENSIONS MEDLEYDISPLAYFONT) @@ -924,11 +989,12 @@ ) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (2152 16901 (MEDLEYFONT.WRITE.FONT 2162 . 7217) (MEDLEYFONT.GETCHARSET 7219 . 11360) ( -MEDLEYFONT.CHARSET? 11362 . 12831) (MEDLEYFONT.GETFILEPROP 12833 . 14933) (MEDLEYFONT.FILEP 14935 . -16899)) (16927 39618 (MEDLEYFONT.READ.FONT 16937 . 21473) (MEDLEYFONT.READ.CHARSET 21475 . 27190) ( -MEDLEYFONT.READ.ITEM 27192 . 33341) (MEDLEYFONT.PEEK.ITEM 33343 . 34205) (MEDLEYFONT.READ.FONTPROPS -34207 . 34672) (MEDLEYFONT.READ.VERIFIEDFONT 34674 . 39616)) (39644 57481 (MEDLEYFONT.WRITE.CHARSET -39654 . 44216) (MEDLEYFONT.WRITE.ITEM 44218 . 53271) (MEDLEYFONT.WRITE.FONTPROPS 53273 . 56826) ( -MEDLEYFONT.WRITE.HEADER 56828 . 57479)) (57482 59848 (MEDLEYFONT.FILENAME 57492 . 59846))))) + (FILEMAP (NIL (2199 20663 (MEDLEYFONT.WRITE.FONT 2209 . 8612) (MEDLEYFONT.GETCHARSET 8614 . 10695) ( +MEDLEYFONT.GETCHARSET.INTERNAL 10697 . 12950) (MEDLEYFONT.CHARSET? 12952 . 13830) ( +MEDLEYFONT.GETFILEPROP 13832 . 17396) (MEDLEYFONT.FILEP 17398 . 19826) (MEDLEYFONT.FILEVERSION 19828 + . 20661)) (20689 44110 (MEDLEYFONT.READ.FONT 20699 . 24534) (MEDLEYFONT.READ.CHARSET 24536 . 30297) ( +MEDLEYFONT.READ.ITEM 30299 . 36448) (MEDLEYFONT.PEEK.ITEM 36450 . 37312) (MEDLEYFONT.READ.FONTPROPS +37314 . 37779) (MEDLEYFONT.READ.VERIFIEDFONT 37781 . 44108)) (44136 64607 (MEDLEYFONT.WRITE.CHARSET +44146 . 49791) (MEDLEYFONT.WRITE.ITEM 49793 . 58846) (MEDLEYFONT.WRITE.FONTPROPS 58848 . 63732) ( +MEDLEYFONT.WRITE.HEADER 63734 . 64605)) (64608 66260 (MEDLEYFONT.FILENAME 64618 . 66258))))) STOP diff --git a/sources/MEDLEYFONTFORMAT.LCOM b/sources/MEDLEYFONTFORMAT.LCOM index 23ade3fc..e3b59460 100644 Binary files a/sources/MEDLEYFONTFORMAT.LCOM and b/sources/MEDLEYFONTFORMAT.LCOM differ diff --git a/internal/MESATYPES b/sources/MESATYPES similarity index 100% rename from internal/MESATYPES rename to sources/MESATYPES diff --git a/internal/MESATYPES.LCOM b/sources/MESATYPES.LCOM similarity index 100% rename from internal/MESATYPES.LCOM rename to sources/MESATYPES.LCOM diff --git a/internal/mesatypes.tedit b/sources/MESATYPES.TXT similarity index 100% rename from internal/mesatypes.tedit rename to sources/MESATYPES.TXT diff --git a/sources/UNICODE-FORMATS b/sources/UNICODE-FORMATS index 1ab0cd81..9a4d7ae1 100644 --- a/sources/UNICODE-FORMATS +++ b/sources/UNICODE-FORMATS @@ -1,13 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT UTF-8) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8) -(FILECREATED "23-Feb-2026 12:15:24" {WMEDLEY}UNICODE-FORMATS.;2 216288 +(FILECREATED " 7-May-2026 11:08:18" {MEDLEY}UNICODE-FORMATS.;5 218405 :EDIT-BY rmk - :CHANGES-TO (VARS UNICODE-FORMATSCOMS) - (FNS MAKE-UNICODE-FORMATS) + :CHANGES-TO (FNS SYSTEM-EXTERNALFORMAT) - :PREVIOUS-DATE "23-Feb-2026 08:52:29" {WMEDLEY}UNICODE-UTF8.;26) + :PREVIOUS-DATE "31-Mar-2026 09:03:25" {MEDLEY}UNICODE-FORMATS.;4) (PRETTYCOMPRINT UNICODE-FORMATSCOMS) @@ -47,6 +46,9 @@ (LAST-PRIVATE-MCCSCODE (CHARCODE "230,377"] (FNS UNICODE-INIT) (P (UNICODE-INIT))) + (COMS (FNS SYSTEM-EXTERNALFORMAT MTOSYSSTRING SYSTOMSTRING) + (EXPORT (GLOBALVARS *SYSTEM-EXTERNALFORMAT*)) + (INITVARS (*SYSTEM-EXTERNALFORMAT* :UTF-8))) (DECLARE%: EVAL@LOAD DONTCOPY (FILES UNICODE-TABLES)) (E (PRINTOUT NIL "(MERGE-UNICODE-TRANSLATION-TABLES NIL (QUOTE " (GET-MCCS-UNICODE-MAPPING 'ALL) @@ -1243,6 +1245,46 @@ ) (UNICODE-INIT) +(DEFINEQ + +(SYSTEM-EXTERNALFORMAT + [LAMBDA NIL (* ; "Edited 7-May-2026 11:08 by rmk") + (* ; "Edited 6-Feb-2026 11:29 by rmk") + (* ; "Edited 31-Jan-2026 18:51 by rmk") + (* ; "Edited 10-Oct-2022 11:55 by lmm") + (* ; "Edited 7-Jul-2022 10:41 by rmk") + + (* ;; "Returns the name, sets the global. For now, UTF-8 or through, could be something else.") + + (fetch (EXTERNALFORMAT NAME) of (SETQ *SYSTEM-EXTERNALFORMAT* + (FIND-FORMAT (for X in '("LC_CTYPE" "LC_ALL" "LANG") + when (STRPOS "UTF" (U-CASE (UNIX-GETENV X))) + do + (* ;; + "Should it check separately for 8? Would anyone ever say UTF-16 ?") + + (RETURN :UTF-8) finally (RETURN :THROUGH]) + +(MTOSYSSTRING + [LAMBDA (MSTRING) (* ; "Edited 6-Feb-2026 00:20 by rmk") + (MCCSTOFORMATBYTES *SYSTEM-EXTERNALFORMAT* (MKSTRING MSTRING]) + +(SYSTOMSTRING + [LAMBDA (SYSTRING) (* ; "Edited 5-Feb-2026 23:36 by rmk") + + (* ;; "SYSSTRING is presumably shared with Unix, guarantee a copy on the way out") + + (CONCAT (FORMATBYTESTOMCCS *SYSTEM-EXTERNALFORMAT* SYSTRING]) +) +(* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: DOEVAL@COMPILE DONTCOPY + +(GLOBALVARS *SYSTEM-EXTERNALFORMAT*) +) + +(* "END EXPORTED DEFINITIONS") + + +(RPAQ? *SYSTEM-EXTERNALFORMAT* :UTF-8) (DECLARE%: EVAL@LOAD DONTCOPY (FILESLOAD UNICODE-TABLES) @@ -2721,19 +2763,20 @@ (64994 8322) (64995 8323) (64996 8324) (64997 8325) (64998 8326) (64999 8327) (65000 8328) (65001 8329) (65002 8331) (65003 8330) (65004 8332) (65008 (48 824))))) (DECLARE%: DONTCOPY - (FILEMAP (NIL (3333 19425 (UTF8.OUTCHARFN 3343 . 6359) (UTF8.SLUG.OUTCHARFN 6361 . 7025) ( -UTF8.INCCODEFN 7027 . 13306) (UTF8.PEEKCCODEFN 13308 . 18441) (\UTF8.BACKCCODEFN 18443 . 19423)) ( -19426 24341 (UTF16BE.OUTCHARFN 19436 . 20455) (UTF16BE.INCCODEFN 20457 . 21799) (UTF16BE.PEEKCCODEFN -21801 . 23145) (\UTF16BE.BACKCCODEFN 23147 . 24339)) (24342 29073 (UTF16LE.OUTCHARFN 24352 . 25468) ( -UTF16LE.INCCODEFN 25470 . 26599) (UTF16LE.PEEKCCODEFN 26601 . 27877) (\UTF16LE.BACKCCODEFN 27879 . -29071)) (29074 32121 (READBOM 29084 . 31153) (WRITEBOM 31155 . 32119)) (32122 36153 ( -MAKE-UNICODE-FORMATS 32132 . 36151)) (36221 40715 (UTF8.BINCODE 36231 . 38919) (\UTF8.FETCHCODE 38921 - . 40713)) (40716 46339 (UTF8.VALIDATE 40726 . 43323) (NUTF8-BYTE1-BYTES 43325 . 44062) ( -NUTF8-CODE-BYTES 44064 . 45121) (NUTF8-STRING-BYTES 45123 . 46015) (N-MCHARS 46017 . 46337)) (46403 -47677 (MTOUCODE 46413 . 46582) (UTOMCODE 46584 . 46781) (MTOUCODE? 46783 . 47162) (UTOMCODE? 47164 . -47675)) (47678 54250 (MTOUSTRING 47688 . 48271) (UTOMSTRING 48273 . 48856) (MTOUTF8STRING 48858 . -53137) (UTF8TOMSTRING 53139 . 54248)) (54308 60016 (XTOUCODE 54318 . 54836) (UTOXCODE 54838 . 55346) ( -XTOUCODE? 55348 . 56409) (UTOXCODE? 56411 . 57494) (XTOUSTRING 57496 . 58191) (UTOXSTRING 58193 . -58936) (XTOUTF8STRING 58938 . 60014)) (60017 65196 (MERGE-UNICODE-TRANSLATION-TABLES 60027 . 62789) ( -UNICODE.UNMAPPED 62791 . 65194)) (68935 69188 (UNICODE-INIT 68945 . 69186))))) + (FILEMAP (NIL (3476 19568 (UTF8.OUTCHARFN 3486 . 6502) (UTF8.SLUG.OUTCHARFN 6504 . 7168) ( +UTF8.INCCODEFN 7170 . 13449) (UTF8.PEEKCCODEFN 13451 . 18584) (\UTF8.BACKCCODEFN 18586 . 19566)) ( +19569 24484 (UTF16BE.OUTCHARFN 19579 . 20598) (UTF16BE.INCCODEFN 20600 . 21942) (UTF16BE.PEEKCCODEFN +21944 . 23288) (\UTF16BE.BACKCCODEFN 23290 . 24482)) (24485 29216 (UTF16LE.OUTCHARFN 24495 . 25611) ( +UTF16LE.INCCODEFN 25613 . 26742) (UTF16LE.PEEKCCODEFN 26744 . 28020) (\UTF16LE.BACKCCODEFN 28022 . +29214)) (29217 32264 (READBOM 29227 . 31296) (WRITEBOM 31298 . 32262)) (32265 36296 ( +MAKE-UNICODE-FORMATS 32275 . 36294)) (36364 40858 (UTF8.BINCODE 36374 . 39062) (\UTF8.FETCHCODE 39064 + . 40856)) (40859 46482 (UTF8.VALIDATE 40869 . 43466) (NUTF8-BYTE1-BYTES 43468 . 44205) ( +NUTF8-CODE-BYTES 44207 . 45264) (NUTF8-STRING-BYTES 45266 . 46158) (N-MCHARS 46160 . 46480)) (46546 +47820 (MTOUCODE 46556 . 46725) (UTOMCODE 46727 . 46924) (MTOUCODE? 46926 . 47305) (UTOMCODE? 47307 . +47818)) (47821 54393 (MTOUSTRING 47831 . 48414) (UTOMSTRING 48416 . 48999) (MTOUTF8STRING 49001 . +53280) (UTF8TOMSTRING 53282 . 54391)) (54451 60159 (XTOUCODE 54461 . 54979) (UTOXCODE 54981 . 55489) ( +XTOUCODE? 55491 . 56552) (UTOXCODE? 56554 . 57637) (XTOUSTRING 57639 . 58334) (UTOXSTRING 58336 . +59079) (XTOUTF8STRING 59081 . 60157)) (60160 65339 (MERGE-UNICODE-TRANSLATION-TABLES 60170 . 62932) ( +UNICODE.UNMAPPED 62934 . 65337)) (69078 69331 (UNICODE-INIT 69088 . 69329)) (69352 71137 ( +SYSTEM-EXTERNALFORMAT 69362 . 70653) (MTOSYSSTRING 70655 . 70848) (SYSTOMSTRING 70850 . 71135))))) STOP diff --git a/sources/UNICODE-FORMATS.LCOM b/sources/UNICODE-FORMATS.LCOM index 5ee08dff..4ca9973d 100644 Binary files a/sources/UNICODE-FORMATS.LCOM and b/sources/UNICODE-FORMATS.LCOM differ diff --git a/sources/XCCS b/sources/XCCS deleted file mode 100644 index 12746d5d..00000000 --- a/sources/XCCS +++ /dev/null @@ -1,323 +0,0 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) - -(FILECREATED "13-Jul-2025 23:08:39" {DSK}kaplan>Local>medley3.5>git-medley>sources>XCCS.;10 15413 - - :EDIT-BY rmk - - :CHANGES-TO (VARS XCCSCOMS) - - :PREVIOUS-DATE "25-Mar-2025 23:40:52" -{DSK}kaplan>Local>medley3.5>git-medley>sources>XCCS.;9) - - -(PRETTYCOMPRINT XCCSCOMS) - -(RPAQQ XCCSCOMS - [(FNS \XCCSINCCODE \XCCSPEEKCCODE \XCCSOUTCHAR \XCCSBACKCCODE \XCCSFORMATBYTESTREAM - \XCCSCHARSETFN) - (FNS \CREATE.XCCS.EXTERNALFORMAT) - (FNS \NSIN.24BITENCODING.ERROR) - (FNS KANJICHARSETP CHINESECHARSETP) - (INITVARS (*SIGNAL-24BIT-NSENCODING-ERROR*)) - (DECLARE%: EVAL@COMPILE DONTCOPY (EXPORT (CONSTANTS (\NORUNCODE 255) - (NSCHARSETSHIFT 255)) - (MACROS \RUNCODED))) - (DECLARE%: DONTEVAL@LOAD DOCOPY (P (\CREATE.XCCS.EXTERNALFORMAT]) -(DEFINEQ - -(\XCCSINCCODE - [LAMBDA (STREAM COUNTP) (* ; "Edited 8-Dec-2023 15:28 by rmk") - (* ; "Edited 6-Aug-2021 15:57 by rmk:") - -(* ;;; "Returns a 16 bit character code. SHIFTEDCSET is STREAM's char set left shifted 8.") - -(* ;;; "If COUNTP is non-NIL, the variable *BYTECOUNTER* is set freely to the number of bytes read.") - -(* ;;; "This doesn't do EOL conversion, \INCHAR does that") - - (DECLARE (USEDFREE *BYTECOUNTER*)) - (\DTEST STREAM 'STREAM) - (LET (NUMBYTES (CSET (ffetch (STREAM CHARSET) of STREAM)) - (CHAR (\BIN STREAM))) (* ; - "Error on EOF unless ENDOFSTREAMOP does something else.") - - (* ;; " NUMBYTES tracks the number of \BINs. ") - - (IF (EQ CHAR NSCHARSETSHIFT) - THEN (* ; - "Shifting character sets, toss CHAR") - (SETQ CSET (\BIN STREAM)) - (IF (NEQ NSCHARSETSHIFT CSET) - THEN (* ; - "Shift to new runcode CSET: SH CS CH") - (SETQ CHAR (\BIN STREAM)) - (SETQ NUMBYTES 3) - (freplace (STREAM CHARSET) of STREAM with CSET) - ELSEIF (EQ 0 (\BIN STREAM)) - THEN (* ; "SH SH CSH CS CH where CSH is 0") - - (* ;; - "The high-order character set byte must be 0, because we don't support obese characters (24 bit)") - - (SETQ CSET (\BIN STREAM)) - (SETQ CHAR (\BIN STREAM)) (* ; "To align with below") - (SETQ NUMBYTES 5) - (freplace (STREAM CHARSET) of STREAM with \NORUNCODE) - ELSE (\NSIN.24BITENCODING.ERROR STREAM)) - - (* ;; "The stream now knows the new character set, runcoded or not.") - - ELSEIF (EQ CSET \NORUNCODE) - THEN (* ; "2-bytes") - (SETQ CSET CHAR) - (SETQ CHAR (\BIN STREAM)) - (SETQ NUMBYTES 2) - ELSE - (* ;; "Runcoded CSET and CHAR") - - (SETQ NUMBYTES 1)) - (CL:WHEN COUNTP (SETQ *BYTECOUNTER* NUMBYTES)) - (CL:WHEN CHAR (* ; - "Typically NIL if ENDOFSTREAMOP returned NIL at EOF ") - (LOGOR (UNFOLD CSET 256) - CHAR))]) - -(\XCCSPEEKCCODE - [LAMBDA (STREAM NOERROR) (* ; "Edited 8-Dec-2023 15:32 by rmk") - (* ; "Edited 21-Jun-2021 23:44 by rmk:") - - (* ;; - "Modeled on \XCCSINCCODE, but peeks at the last byte in the sequence, leaves the stream unchanged") - - (\DTEST STREAM 'STREAM) - (LET ((CSET (ffetch (STREAM CHARSET) of STREAM)) - (CHAR (\PEEKBIN STREAM NOERROR))) - - (* ;; "Returns a 16 bit character code. Doesn't do EOL conversion--\PEEKCCODE does that. ") - - (* ;; "We don't change the charset in the stream, put the file ptr back the way it was.") - - (CL:WHEN CHAR - (IF (EQ CHAR NSCHARSETSHIFT) - THEN (\BIN STREAM) (* ; "Read the peeked shifting byte") - (SETQ CSET (\BIN STREAM)) (* ; "Consume the char shift byte") - (IF (NEQ CSET NSCHARSETSHIFT) - THEN - (* ;; - "Shift to new runcode CSET: SH CS CH. We have to BIN what we peeked, BIN, and peek again") - - (SETQ CHAR (\PEEKBIN STREAM NOERROR)) - (\BACKFILEPTR STREAM) - (\BACKFILEPTR STREAM) - ELSEIF (EQ 0 (\BIN STREAM)) - THEN (* ; "SH SH CSH CS CH where CSH is 0") - - (* ;; - "Note: no eof error check on this \BIN -- an eof in the middle of a charset shift is an error") - - (SETQ CSET (\BIN STREAM)) - (SETQ CHAR (\PEEKBIN STREAM NOERROR)) - (\BACKFILEPTR STREAM) - (\BACKFILEPTR STREAM) - (\BACKFILEPTR STREAM) - (\BACKFILEPTR STREAM) - ELSE (\NSIN.24BITENCODING.ERROR STREAM)) - ELSEIF (EQ CSET \NORUNCODE) - THEN (* ; "2 byte runs, BIN/PEEK/BACK") - (SETQ CSET CHAR) - (\BIN STREAM) - (SETQ CHAR (\PEEKBIN STREAM NOERROR)) (* ; "One BACKFILEPTR seems OK") - (\BACKFILEPTR STREAM)) - - (* ;; "No need to back up for the runcoded case") - - (CL:WHEN CHAR - (LOGOR (UNFOLD CSET 256) - CHAR)))]) - -(\XCCSOUTCHAR - [LAMBDA (STREAM CHARCODE) (* ; "Edited 13-Aug-2021 10:24 by rmk:") - - (* ;; "Closed function for the :XCCS external format, also called when :XCCS is the default") - - (COND - ((EQ CHARCODE (CHARCODE EOL)) - (FREPLACE (STREAM CHARPOSITION) OF STREAM WITH 0) - [COND - [(NOT (\RUNCODED STREAM)) (* ; - "Charset is a constant 0, we put out the high-order byte.") - (\BOUT STREAM (\CHARSET (CHARCODE EOL] - ((EQ (\CHARSET (CHARCODE EOL)) - (ffetch (STREAM CHARSET) of STREAM))) - (T (* ; - "We are runcoded, and not in character set 0, have to shift.") - (\BOUT STREAM NSCHARSETSHIFT) - (\BOUT STREAM (freplace (STREAM CHARSET) of STREAM with (\CHARSET - (CHARCODE EOL] - - (* ;; "We are now in the right charset (0) for the first EOL byte. For CRLF, the CR is immediately followed by the LF byte, without the prefix 0 byte even if not runcoded, i.e. the 2 bytes are though of as a composite. The stream is left in CSET0 (the freplace above), read for another shift according to the next shift in a runcoded file.") - - (\BOUTEOL STREAM)) - (T (CHANGE (FFETCH (STREAM CHARPOSITION) OF STREAM) - (IPLUS16 1 DATUM)) - (COND - ((NOT (\RUNCODED STREAM)) - (\BOUT STREAM (\CHARSET CHARCODE)) - (\BOUT STREAM (\CHAR8CODE CHARCODE))) - ((EQ (\CHARSET CHARCODE) - (ffetch (STREAM CHARSET) of STREAM)) - (\BOUT STREAM (\CHAR8CODE CHARCODE))) - (T (\BOUT STREAM NSCHARSETSHIFT) - (\BOUT STREAM (freplace (STREAM CHARSET) of STREAM with (\CHARSET - CHARCODE)) - ) - (\BOUT STREAM (\CHAR8CODE CHARCODE]) - -(\XCCSBACKCCODE - [LAMBDA (STREAM COUNTP) (* ; "Edited 8-Dec-2023 15:34 by rmk") - (* ; "Edited 19-Jul-2022 17:12 by rmk") - (* ; "Edited 13-Aug-2021 14:08 by rmk:") - (DECLARE (USEDFREE *BYTECOUNTER*)) - (LET ((BYTE (AND (\BACKFILEPTR STREAM) - (\PEEKBIN STREAM))) - (CSET (fetch (STREAM CHARSET) of STREAM))) - (CL:WHEN BYTE - - (* ;; "The immediately preceding byte must be a character byte. If it is a byte in a runcode, then we are done, even if the byte before is part of a shift sequence.") - - (* ;; "But if we are currently in a nonruncoded file, we have to go back one more to get the character set byte.") - - (* ;; "If we can't back up, we are already at the beginning.") - - (IF (EQ \NORUNCODE CSET) - THEN (IF (\BACKFILEPTR STREAM) - THEN (CL:WHEN COUNTP (SETQ *BYTECOUNTER* -2)) - (LOGOR (UNFOLD (\PEEKBIN STREAM) - 256) - BYTE) - ELSE (CL:WHEN COUNTP (SETQ *BYTECOUNTER* -1)) - NIL) - ELSE (CL:WHEN COUNTP (SETQ *BYTECOUNTER* -1)) - (LOGOR (UNFOLD CSET 256) - BYTE)))]) - -(\XCCSFORMATBYTESTREAM - [LAMBDA (STREAM BYTESTREAM) (* ; "Edited 26-Mar-2024 11:00 by rmk") - (* ; "Edited 19-Mar-2024 16:02 by rmk") - (\EXTERNALFORMAT BYTESTREAM (\EXTERNALFORMAT STREAM)) - - (* ;; "This stream may be read as a continuation of STREAM (TTYIN, LAFITE?), and we want to make sure that the bytes are encoded properly. So let's assert (and possibly mark) that that's its current situation.") - - (\XCCSCHARSETFN BYTESTREAM (fetch (STREAM CHARSET) of STREAM)) - BYTESTREAM]) - -(\XCCSCHARSETFN - [LAMBDA (STREAM CHARSET DONTMARKSTREAM) (* ; "Edited 9-Dec-2023 11:18 by rmk") - - (* ;; "This differs from \GENERIC.CHARSET in that it actually writes the shifting bytes into an output stream, unless DONTMARKSTREAM. It will do write the shifts, even if it just replicates the situation that is already there (presumably CHARSET = the old CHARSET). The client should test and avoid calling if useless shifts are not desired.") - - (LET [(CSET (ffetch (STREAM CHARSET) of (\DTEST STREAM 'STREAM] - (CL:WHEN CHARSET - (CL:WHEN (EQ CHARSET T) - (SETQ CHARSET \NORUNCODE)) - (CL:UNLESS (EQ CHARSET CSET) - (freplace (STREAM CHARSET) of STREAM with CHARSET) - (CL:UNLESS DONTMARKSTREAM - (CL:WHEN (\IOMODEP STREAM 'OUTPUT T) - (\BOUT STREAM NSCHARSETSHIFT) - (if (EQ CHARSET \NORUNCODE) - then (\BOUT STREAM \NORUNCODE) - (\BOUT STREAM 0) - else (\BOUT STREAM CHARSET)))))) - CSET]) -) -(DEFINEQ - -(\CREATE.XCCS.EXTERNALFORMAT - [LAMBDA (NAME EOL) (* ; "Edited 7-Dec-2023 23:03 by rmk") - (* ; "Edited 30-Jun-2022 18:08 by rmk") - (* ; "Edited 10-Sep-2021 19:49 by rmk:") - -(* ;;; "Create the :XCCS external format. Stream's EOL overrides the (vacuous) default here") - - (MAKE-EXTERNALFORMAT (OR NAME :XCCS) - (FUNCTION \XCCSINCCODE) - (FUNCTION \XCCSPEEKCCODE) - (FUNCTION \XCCSBACKCCODE) - (FUNCTION \XCCSOUTCHAR) - (FUNCTION \XCCSFORMATBYTESTREAM) - (OR EOL 'LF) - T NIL NIL (FUNCTION \XCCSCHARSETFN]) -) -(DEFINEQ - -(\NSIN.24BITENCODING.ERROR - [LAMBDA (STREAM) (* bvm%: "12-Mar-86 15:35") - (DECLARE (USEDFREE *SIGNAL-24BIT-NSENCODING-ERROR*)) - -(* ;;; "Called if we see the sequence shift,shift on STREAM -- means shift to 24-bit character set, which we don't support. Usually this just means we're erroneously reading a binary file as text. If this function returns, its value is taken as a character set to shift to") - - (COND - (*SIGNAL-24BIT-NSENCODING-ERROR* (* ; - "Only cause error if user/reader cares") - (ERROR "24-bit NS encoding not supported" STREAM))) - (* ; "Return charset zero") - 0]) -) -(DEFINEQ - -(KANJICHARSETP - [LAMBDA (CHARSET) (* ; "Edited 13-Jun-2025 16:33 by rmk") - - (* ;; "Returns CHARSET if it is a charset with MCCS Kanji characters") - - (AND (<= 48 CHARSET 118) - CHARSET]) - -(CHINESECHARSETP - [LAMBDA (CHARSET) (* ; "Edited 18-Jun-2025 23:09 by rmk") - (* ; "Edited 13-Jun-2025 16:33 by rmk") - - (* ;; "Returns CHARSET if it is a charset with MCCS Chinese characters") - - (AND (<= 161 CHARSET 212) - CHARSET]) -) - -(RPAQ? *SIGNAL-24BIT-NSENCODING-ERROR* ) -(DECLARE%: EVAL@COMPILE DONTCOPY -(* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE - -(RPAQQ \NORUNCODE 255) - -(RPAQQ NSCHARSETSHIFT 255) - - -(CONSTANTS (\NORUNCODE 255) - (NSCHARSETSHIFT 255)) -) -(DECLARE%: EVAL@COMPILE - -(PUTPROPS \RUNCODED MACRO (OPENLAMBDA (STREAM) - - (* ;; "returns NIL is the stream is not runcoded, that is, if the stream has 16 bit bytes explicitly represented") - (* ; - "note that neq is ok since charsets are known to be SMALLP's") - (NEQ (fetch CHARSET of STREAM) - \NORUNCODE))) -) - -(* "END EXPORTED DEFINITIONS") - -) -(DECLARE%: DONTEVAL@LOAD DOCOPY - -(\CREATE.XCCS.EXTERNALFORMAT) -) -(DECLARE%: DONTCOPY - (FILEMAP (NIL (997 12253 (\XCCSINCCODE 1007 . 3986) (\XCCSPEEKCCODE 3988 . 6657) (\XCCSOUTCHAR 6659 . -8879) (\XCCSBACKCCODE 8881 . 10425) (\XCCSFORMATBYTESTREAM 10427 . 11048) (\XCCSCHARSETFN 11050 . -12251)) (12254 13027 (\CREATE.XCCS.EXTERNALFORMAT 12264 . 13025)) (13028 13859 ( -\NSIN.24BITENCODING.ERROR 13038 . 13857)) (13860 14500 (KANJICHARSETP 13870 . 14126) (CHINESECHARSETP -14128 . 14498))))) -STOP diff --git a/sources/XCCS.LCOM b/sources/XCCS.LCOM deleted file mode 100644 index 031ae49d..00000000 Binary files a/sources/XCCS.LCOM and /dev/null differ diff --git a/unicode/xerox/MCCS-TO-UNICODE-MAPPINGS.TXT b/unicode/xerox/MCCS-TO-UNICODE-MAPPINGS.TXT deleted file mode 100644 index 2ed56e6f..00000000 --- a/unicode/xerox/MCCS-TO-UNICODE-MAPPINGS.TXT +++ /dev/null @@ -1,1607 +0,0 @@ -[0 ((0 0) (1 1) (2 2) (3 3) (4 4) (5 5) (6 6) (7 7) (8 8) (9 9) (10 10) (11 11) (12 12) (13 13) (14 14 -) (15 15) (16 16) (17 17) (18 18) (19 19) (20 20) (21 21) (22 22) (23 23) (24 24) (25 25) (26 26) (27 -27) (28 28) (29 29) (30 30) (31 31) (32 32) (33 33) (34 34) (35 35) (36 36) (37 37) (38 38) (39 39) ( -40 40) (41 41) (42 42) (43 43) (44 44) (45 45) (46 46) (47 47) (48 48) (49 49) (50 50) (51 51) (52 52) - (53 53) (54 54) (55 55) (56 56) (57 57) (58 58) (59 59) (60 60) (61 61) (62 62) (63 63) (64 64) (65 -65) (66 66) (67 67) (68 68) (69 69) (70 70) (71 71) (72 72) (73 73) (74 74) (75 75) (76 76) (77 77) ( -78 78) (79 79) (80 80) (81 81) (82 82) (83 83) (84 84) (85 85) (86 86) (87 87) (88 88) (89 89) (90 90) - (91 91) (92 92) (93 93) (94 8593) (95 8592) (96 96) (97 97) (98 98) (99 99) (100 100) (101 101) (102 -102) (103 103) (104 104) (105 105) (106 106) (107 107) (108 108) (109 109) (110 110) (111 111) (112 -112) (113 113) (114 114) (115 115) (116 116) (117 117) (118 118) (119 119) (120 120) (121 121) (122 -122) (123 123) (124 124) (125 125) (126 126) (161 161) (162 162) (163 163) (164 164) (165 165) (167 -167) (169 8216) (170 8220) (171 171) (172 95) (173 94) (174 8594) (175 8595) (176 176) (177 177) (178 -178) (179 179) (180 215) (181 181) (182 182) (183 183) (184 247) (185 8217) (186 8221) (187 187) (188 -188) (189 189) (190 190) (191 191) (193 768) (194 769) (195 770) (196 771) (197 772) (198 774) (199 -775) (200 776) (202 778) (203 807) (204 818) (205 779) (206 808) (207 780) (208 8213) (209 185) (210 -174) (211 169) (212 8482) (213 9834) (220 8539) (221 8540) (222 8541) (223 8542) (224 8486) (225 198) -(226 208) (227 170) (228 294) (229 567) (230 306) (231 319) (232 321) (233 216) (234 338) (235 186) ( -236 222) (237 358) (238 330) (239 329) (240 312) (241 230) (242 273) (243 240) (244 295) (245 305) ( -246 307) (247 320) (248 322) (249 248) (250 339) (251 223) (252 254) (253 359) (254 331))] - -[33 ((8481 12288) (8482 12289) (8483 12290) (8484 65292) (8485 65294) (8491 12441) (8492 12442) (8499 -12541) (8500 12542) (8501 12445) (8502 12446) (8503 12291) (8504 20189) (8505 12293) (8506 12294) ( -8507 43472) (8508 12540) (8510 8208) (8512 8918) (8513 8919) (8514 8741) (8515 8873) (8516 8230) (8517 - 8229) (8518 8920) (8519 8921) (8520 10220) (8521 10221) (8522 10214) (8523 10215) (8524 12308) (8525 -12309) (8526 8922) (8527 8923) (8528 8826) (8529 8827) (8530 8828) (8531 8829) (8532 8926) (8533 8927) - (8534 12300) (8535 12301) (8536 12302) (8537 12303) (8538 12304) (8539 12305) (8540 10949) (8541 -10950) (8542 8912) (8543 8913) (8544 10901) (8545 10902) (8546 8800) (8547 10885) (8548 10886) (8549 -8804) (8550 8805) (8551 8734) (8552 8756) (8553 9794) (8554 9792) (8555 8244) (8556 8242) (8557 8243) -(8558 8451) (8559 8874) (8560 8806) (8561 8807) (8562 10877) (8563 10878) (8564 8922) (8565 8923) ( -8566 8741) (8567 8861) (8568 8859) (8569 9734) (8570 9733) (8571 9675) (8572 9679) (8573 9678) (8574 -9671) (8609 8830) (8610 8831) (8611 10935) (8612 10936) (8613 8995) (8614 8994) (8615 124) (8616 8785) - (8617 8791) (8618 8790) (8619 8796) (8620 8916) (8621 8720) (8622 10016) (8623 9671) (8624 8769) ( -8625 8936) (8626 8937) (8627 10937) (8628 10938) (8629 8740) (8630 8742) (8631 8876) (8632 8877) (8633 - 8878) (8634 8879) (8635 8938) (8636 8939) (8637 8940) (8638 8941) (8639 8772) (8640 8777) (8641 10955 -) (8642 10956) (8643 8840) (8644 8841) (8645 8842) (8646 8843) (8647 10955) (8648 10956) (8649 8814) ( -8650 8815) (8651 8780) (8652 8775) (8656 8832) (8657 8833) (8658 8928) (8659 8929) (8660 10933) (8661 -10934) (8662 8928) (8665 8820) (8666 8821) (8672 8816) (8673 8817) (8674 10887) (8675 10888) (8676 -8934) (8677 8935) (8678 8816) (8679 8817) (8686 8930) (8687 8931) (8688 8816) (8689 8817) (8690 8808) -(8691 8809) (8692 8808) (8693 8809))] - -[34 ((8737 9670) (8738 9633) (8739 9632) (8740 9651) (8741 9650) (8742 9661) (8743 9660) (8744 8251) ( -8745 12306) (8746 8216) (8747 8242) (8748 8243) (8750 12307) (8751 8862) (8752 8863) (8753 8864) (8754 - 8865) (8756 8813) (8760 12298) (8761 12299) (8764 8258) (8765 8485) (8766 8241) (8768 8647) (8769 -8649) (8770 8648) (8771 8650) (8772 8666) (8773 8667) (8774 8606) (8775 8608) (8776 8639) (8777 8643) -(8778 8638) (8779 8642) (8780 8610) (8781 8611) (8782 8619) (8783 8620) (8784 8624) (8785 8625) (8786 -8621) (8787 8888) (8788 8788) (8789 8789) (8790 8636) (8791 8637) (8792 8640) (8793 8641) (8794 8618) -(8795 8617) (8796 10229) (8797 10230) (8798 10232) (8799 10233) (8800 8657) (8801 8659) (8802 8786) ( -8803 8787) (8804 8781) (8805 10927) (8806 10928) (8807 10231) (8808 10234) (8809 10234) (8810 8748) ( -8811 8614) (8812 8904) (8813 11089) (8814 9838) (8815 8995) (8816 9653) (8817 8810) (8818 8811) (8819 -8853) (8820 8854) (8821 8855) (8822 8856) (8823 8764) (8824 8776) (8825 8733) (8827 9663) (8828 8487) -(8829 8768) (8830 9711) (8866 8801) (8867 9049) (8868 9080) (8869 9079) (8870 8472) (8871 8709) (8872 -8476) (8873 8465) (8874 8868) (8875 8846) (8876 8871) (8877 8852) (8878 8851) (8879 8846) (8880 8849) -(8881 8850) (8882 8743) (8883 8744) (8884 9652) (8885 9662) (8886 8852) (8887 8720) (8888 8738) (8889 -8717) (8890 8951) (8891 9657) (8892 9667) (8893 8857) (8894 8765) (8896 94) (8923 9122) (8924 9125) ( -8927 9647) (8935 8474) (8936 8461) (8938 8853) (8939 8855) (8940 8857) (8941 8356) (8942 8626) (8943 -8627) (8944 8729) (8945 8988) (8946 8989) (8947 8990) (8948 8991) (8949 8858))] - -[35 ((8994 168) (8995 180) (8996 175) (8997 728) (8998 729) (8999 39) (9000 730) (9001 733) (9002 731) - (9003 711) (9004 184) (9008 183) (9009 832) (9010 833) (9011 770) (9012 771) (9013 772) (9014 774) ( -9015 775) (9016 776) (9018 778) (9019 807) (9021 779) (9022 808) (9023 780) (9024 398) (9025 385) ( -9026 394) (9027 408) (9028 416) (9029 431) (9030 399) (9031 418) (9032 437) (9036 415) (9038 400) ( -9039 404) (9040 406) (9041 390) (9042 425) (9043 434) (9044 439) (9045 440) (9046 391) (9047 401) ( -9048 420) (9049 428) (9050 435) (9053 413) (9056 96) (9057 595) (9058 599) (9059 409) (9060 417) (9061 - 432) (9062 477) (9063 419) (9064 438) (9065 447) (9066 410) (9068 629) (9077 441) (9078 392) (9079 -402) (9080 421) (9081 429) (9082 436) (9086 8254) (9121 703) (9122 8216) (9124 450) (9125 451) (9126 -448) (9127 449) (9129 384) (9130 403) (9131 405) (9132 9837) (9134 8471) (9135 8485) (9136 700) (9137 -699) (9138 8218) (9139 865) (9144 8407) (9145 824) (9146 770) (9147 771) (9148 9839) (9149 697) (9150 -698) (9151 785) (9152 777) (9153 823) (9154 8417) (9155 773) (9157 768) (9158 769) (9160 8406) (9161 -776) (9162 781) (9163 789) (9164 786) (9166 795) (9167 821) (9168 782) (9169 808) (9170 807) (9171 806 -) (9172 805) (9173 814) (9174 803) (9175 804) (9176 816) (9177 819) (9178 809) (9179 813) (9180 817) ( -9181 65056) (9182 65057) (9183 65059) (9184 8401) (9186 783) (9200 831) (9201 784) (9204 788) (9205 -790) (9206 791) (9207 792) (9208 793) (9209 794) (9210 815) (9211 822) (9212 825) (9213 826) (9214 827 -))] - -[36 ((9249 12353) (9250 12354) (9251 12355) (9252 12356) (9253 12357) (9254 12358) (9255 12359) (9256 -12360) (9257 12361) (9258 12362) (9259 12363) (9260 12364) (9261 12365) (9262 12366) (9263 12367) ( -9264 12368) (9265 12369) (9266 12370) (9267 12371) (9268 12372) (9269 12373) (9270 12374) (9271 12375) - (9272 12376) (9273 12377) (9274 12378) (9275 12379) (9276 12380) (9277 12381) (9278 12382) (9279 -12383) (9280 12384) (9281 12385) (9282 12386) (9283 12387) (9284 12388) (9285 12389) (9286 12390) ( -9287 12391) (9288 12392) (9289 12393) (9290 12394) (9291 12395) (9292 12396) (9293 12397) (9294 12398) - (9295 12399) (9296 12400) (9297 12401) (9298 12402) (9299 12403) (9300 12404) (9301 12405) (9302 -12406) (9303 12407) (9304 12408) (9305 12409) (9306 12410) (9307 12411) (9308 12412) (9309 12413) ( -9310 12414) (9311 12415) (9312 12416) (9313 12417) (9314 12418) (9315 12419) (9316 12420) (9317 12421) - (9318 12422) (9319 12423) (9320 12424) (9321 12425) (9322 12426) (9323 12427) (9324 12428) (9325 -12429) (9326 12430) (9327 12431) (9328 12432) (9329 12433) (9330 12434) (9331 12435) (9377 12549) ( -9378 12550) (9379 12551) (9380 12552) (9381 12553) (9382 12554) (9383 12555) (9384 12556) (9385 12557) - (9386 12558) (9387 12559) (9388 12560) (9389 12561) (9390 12562) (9391 12563) (9392 12564) (9393 -12565) (9394 12566) (9395 12567) (9396 12568) (9397 12569) (9398 12570) (9399 12571) (9400 12572) ( -9401 12573) (9402 12574) (9403 12575) (9404 12576) (9405 12577) (9406 12578) (9407 12579) (9408 12580) - (9409 12581) (9410 12582) (9411 12583) (9412 12584) (9413 12585) (9414 714) (9415 711) (9416 715) ( -9417 729) (9418 713) (9419 12587) (9420 12586) (9421 12588))] - -[37 ((9505 12449) (9506 12450) (9507 12451) (9508 12452) (9509 12453) (9510 12454) (9511 12455) (9512 -12456) (9513 12457) (9514 12458) (9515 12459) (9516 12460) (9517 12461) (9518 12462) (9519 12463) ( -9520 12464) (9521 12465) (9522 12466) (9523 12467) (9524 12468) (9525 12469) (9526 12470) (9527 12471) - (9528 12472) (9529 12473) (9530 12474) (9531 12475) (9532 12476) (9533 12477) (9534 12478) (9535 -12479) (9536 12480) (9537 12481) (9538 12482) (9539 12483) (9540 12484) (9541 12485) (9542 12486) ( -9543 12487) (9544 12488) (9545 12489) (9546 12490) (9547 12491) (9548 12492) (9549 12493) (9550 12494) - (9551 12495) (9552 12496) (9553 12497) (9554 12498) (9555 12499) (9556 12500) (9557 12501) (9558 -12502) (9559 12503) (9560 12504) (9561 12505) (9562 12506) (9563 12507) (9564 12508) (9565 12509) ( -9566 12510) (9567 12511) (9568 12512) (9569 12513) (9570 12514) (9571 12515) (9572 12516) (9573 12517) - (9574 12518) (9575 12519) (9576 12520) (9577 12521) (9578 12522) (9579 12523) (9580 12524) (9581 -12525) (9582 12526) (9583 12527) (9584 12528) (9585 12529) (9586 12530) (9587 12531) (9588 12532) ( -9589 12533) (9590 12534) (9591 12535) (9592 12536) (9593 12537) (9594 12538) (9595 12539))] - -[38 ((9762 894) (9763 835) (9764 900) (9765 787) (9766 788) (9767 837) (9769 8158) (9770 8157) (9771 -901) (9772 8159) (9773 8128) (9774 8189) (9775 8175) (9776 1010) (9777 900) (9778 890) (9779 8125) ( -9780 884) (9781 885) (9782 8174) (9783 8173) (9785 8142) (9786 8141) (9787 903) (9788 8143) (9789 8129 -) (9790 8127) (9791 8190) (9792 990) (9793 913) (9794 914) (9796 915) (9797 916) (9798 917) (9799 986) - (9800 988) (9801 918) (9802 919) (9803 920) (9804 921) (9805 922) (9806 923) (9807 924) (9808 925) ( -9809 926) (9810 927) (9811 928) (9812 984) (9813 929) (9814 931) (9816 932) (9817 933) (9818 934) ( -9819 935) (9820 936) (9821 937) (9822 992) (9824 991) (9825 945) (9826 946) (9827 976) (9828 947) ( -9829 948) (9830 949) (9831 987) (9832 989) (9833 950) (9834 951) (9835 952) (9836 953) (9837 954) ( -9838 955) (9839 956) (9840 957) (9841 958) (9842 959) (9843 960) (9844 985) (9845 961) (9846 963) ( -9847 962) (9848 964) (9849 965) (9850 966) (9851 967) (9852 968) (9853 969) (9854 993) (9904 1001) ( -9905 1003) (9906 1005) (9907 1007) (9920 836) (9921 8158) (9922 8142) (9923 8159) (9924 8143) (9925 -769) (9926 768) (9927 834) (9928 8158) (9929 8157) (9930 8142) (9931 8141) (9932 776) (9933 901) (9934 - 8173) (9935 8129) (9936 902) (9937 904) (9938 905) (9939 906) (9940 908) (9941 910) (9942 911) (9943 -938) (9944 939) (9948 994) (9949 996) (9950 998) (9952 979) (9953 980) (9968 940) (9969 941) (9970 942 -) (9971 943) (9972 972) (9973 973) (9974 974) (9975 970) (9976 971) (9977 912) (9978 944) (9979 1011) -(9980 995) (9981 997) (9982 999))] - -[39 ((10017 1040) (10018 1041) (10019 1042) (10020 1043) (10021 1044) (10022 1045) (10023 1025) (10024 - 1046) (10025 1047) (10026 1048) (10027 1049) (10028 1050) (10029 1051) (10030 1052) (10031 1053) ( -10032 1054) (10033 1055) (10034 1056) (10035 1057) (10036 1058) (10037 1059) (10038 1060) (10039 1061) - (10040 1062) (10041 1063) (10042 1064) (10043 1065) (10044 1066) (10045 1067) (10046 1068) (10047 -1069) (10048 1070) (10049 1071) (10050 1168) (10051 1026) (10052 1027) (10053 1028) (10054 1029) ( -10055 1030) (10056 1031) (10057 1032) (10058 1033) (10059 1034) (10060 1035) (10061 1036) (10062 1038) - (10065 1072) (10066 1073) (10067 1074) (10068 1075) (10069 1076) (10070 1077) (10071 1105) (10072 -1078) (10073 1079) (10074 1080) (10075 1081) (10076 1082) (10077 1083) (10078 1084) (10079 1085) ( -10080 1086) (10081 1087) (10082 1088) (10083 1089) (10084 1090) (10085 1091) (10086 1092) (10087 1093) - (10088 1094) (10089 1095) (10090 1096) (10091 1097) (10092 1098) (10093 1099) (10094 1100) (10095 -1101) (10096 1102) (10097 1103) (10098 1169) (10099 1106) (10100 1107) (10101 1108) (10102 1109) ( -10103 1110) (10104 1111) (10105 1112) (10106 1113) (10107 1114) (10108 1115) (10109 1116) (10110 1118) - (10145 1039) (10146 1122) (10147 1138) (10148 1140) (10149 1130) (10150 1306) (10151 1308) (10152 -1198) (10154 1234) (10155 1232) (10156 1236) (10157 1170) (10158 1172) (10160 1238) (10161 1244) ( -10162 1174) (10163 1246) (10164 1176) (10166 1252) (10167 1250) (10168 1178) (10170 1180) (10171 1184) - (10172 1182) (10173 1186) (10174 1188) (10176 1254) (10178 1190) (10179 1194) (10181 1196) (10182 -1204) (10184 1264) (10185 1266) (10187 1262) (10188 1202) (10189 1276) (10190 1268) (10191 1216) ( -10193 1119) (10194 1123) (10195 1139) (10196 1141) (10197 1131) (10198 1307) (10199 1309) (10200 1199) - (10202 1235) (10203 1233) (10204 1237) (10205 1171) (10206 1173) (10208 1239) (10209 1245) (10210 -1175) (10211 1247) (10212 1177) (10214 1253) (10215 1251) (10216 1179) (10218 1181) (10219 1185) ( -10220 1183) (10221 1187) (10222 1189) (10224 1255) (10226 1191) (10227 1195) (10229 1197) (10230 1205) - (10232 1265) (10233 1267) (10235 1263) (10236 1203) (10237 1277) (10238 1269))] - -[40 ((10273 9472) (10274 9474) (10275 9484) (10276 9488) (10277 9496) (10278 9492) (10279 9500) (10280 - 9516) (10281 9508) (10282 9524) (10283 9532) (10284 9473) (10285 9475) (10286 9487) (10287 9491) ( -10288 9499) (10289 9495) (10290 9507) (10291 9523) (10292 9515) (10293 9531) (10294 9547) (10295 9504) - (10296 9519) (10297 9512) (10298 9527) (10299 9535) (10300 9501) (10301 9520) (10302 9509) (10303 -9528) (10304 9538) (10305 9550) (10306 9551) (10307 9545) (10308 9543) (10309 9544) (10310 9546) ( -10311 9548) (10313 9486) (10314 9490) (10315 9498) (10316 9494) (10317 9485) (10318 9489) (10319 9497) - (10320 9569) (10321 9570) (10322 9558) (10323 9557) (10324 9571) (10325 9553) (10326 9559) (10327 -9565) (10328 9564) (10329 9563) (10330 9566) (10331 9567) (10332 9562) (10333 9556) (10334 9577) ( -10335 9574) (10336 9568) (10337 9552) (10338 9580) (10339 9575) (10340 9576) (10341 9572) (10342 9573) - (10343 9561) (10344 9560) (10345 9554) (10346 9555) (10347 9579) (10348 9578) (10363 9493) (10444 -9502) (10445 9503) (10446 9505) (10447 9506) (10448 9476) (10449 9477) (10450 9478) (10451 9479) ( -10452 9480) (10453 9481) (10454 9482) (10455 9483) (10456 9549) (10457 9581) (10458 9582) (10459 9583) - (10460 9584) (10461 9585) (10462 9586) (10463 9608))] - -[41 ((10530 5792) (10532 5794) (10535 5798) (10539 5800) (10546 5809) (10549 5810) (10551 5812) (10554 - 5815) (10555 5813) (10557 5817) (10559 5818) (10560 5819) (10564 5820) (10567 5822) (10570 5823) ( -10571 5825) (10572 5827) (10582 5831) (10585 5832) (10607 5839) (10608 5840) (10610 5842) (10615 5846) - (10616 5847) (10618 5848) (10620 5849) (10622 5850) (10623 5852) (10658 5853) (10659 5855) (10661 -5805) (10662 5806) (10663 5854) (10664 5841) (10665 5829) (10666 5807) (10667 5801) (10669 5873) ( -10671 5802) (10673 5803) (10674 5796) (10677 5795) (10678 5856) (10680 5857) (10721 66352) (10722 -66353) (10723 66354) (10724 66355) (10725 66356) (10726 66357) (10727 66358) (10728 66359) (10729 -66360) (10731 66361) (10732 66362) (10733 66363) (10734 66364) (10735 66365) (10736 66366) (10737 -66367) (10738 66368) (10739 66369) (10740 66370) (10741 66371) (10742 66372) (10743 66373) (10744 -66374) (10745 66375) (10746 66376) (10747 66377) (10748 66378))] - -[42 ((10785 1206) (10786 1227) (10787 1208) (10795 1272) (10798 1240) (10799 1212) (10800 1214) (10801 - 1192) (10803 1200) (10808 1242) (10809 1248) (10810 1219) (10811 1258) (10816 1170) (10817 1256) ( -10818 1217) (10819 1210) (10822 1223) (10827 1142) (10833 1207) (10834 1228) (10835 1209) (10843 1273) - (10846 1241) (10847 1213) (10848 1215) (10849 1193) (10851 1201) (10856 1243) (10857 1249) (10858 -1220) (10859 1259) (10864 1171) (10865 1257) (10866 1218) (10867 1211) (10870 1224) (10875 1143) ( -10914 1146) (10920 1120) (10924 1124) (10927 1126) (10929 1128) (10930 1132) (10931 1134) (10932 1136) - (10934 1152) (10943 1150) (10944 1148) (10951 1144) (10952 1156) (10957 1154) (10962 1147) (10967 -1145) (10968 1121) (10972 1125) (10975 1127) (10977 1129) (10978 1133) (10979 1135) (10980 1137) ( -10982 1153) (10991 1151) (10992 1149) (10999 1155))] - -[46 ((11809 9472) (11810 9135) (11811 9473) (11827 65079) (11828 65080))] - -[47 ((12068 65075) (12070 65073) (12075 8942) (12076 65072) (12077 65077) (12078 65078) (12079 65081) -(12080 65082) (12081 65079) (12082 65080) (12089 65089) (12090 65090) (12091 65091) (12092 65092) ( -12093 65083) (12094 65084) (12096 12353) (12097 12357) (12098 12357) (12099 12359) (12100 12361) ( -12101 12387) (12102 12419) (12103 12421) (12104 12423) (12105 12430) (12106 12449) (12107 12451) ( -12108 12453) (12109 12455) (12110 12457) (12111 12483) (12112 12515) (12113 12517) (12114 12519) ( -12115 12526) (12116 12533) (12117 12534) (12130 12307) (12193 65087) (12194 65088) (12216 65076) ( -12224 12832) (12225 12833) (12226 12834) (12227 12835) (12228 12836) (12229 12837) (12230 12838) ( -12231 12839) (12232 12840) (12233 12841) (12257 12337) (12258 12338) (12264 65085) (12265 65086) ( -12273 12339) (12274 12340) (12275 12341))] - -[48 ((12321 20124) (12322 21782) (12323 23043) (12324 38463) (12325 21696) (12326 24859) (12327 25384) - (12328 23030) (12329 36898) (12330 33909) (12331 33564) (12332 31312) (12333 24746) (12334 25569) ( -12335 28197) (12336 26093) (12337 33894) (12338 33446) (12339 39925) (12340 26771) (12341 22311) ( -12342 26017) (12343 25201) (12344 23451) (12345 22992) (12346 34427) (12347 39156) (12348 32098) ( -12349 32190) (12350 39822) (12351 25110) (12352 31903) (12353 34999) (12354 23433) (12355 24245) ( -12356 25353) (12357 26263) (12358 26696) (12359 38343) (12360 38797) (12361 26447) (12362 20197) ( -12363 20234) (12364 20301) (12365 20381) (12366 20553) (12367 22258) (12368 22839) (12369 22996) ( -12370 23041) (12371 23561) (12372 24799) (12373 24847) (12374 24944) (12375 26131) (12376 26885) ( -12377 28858) (12378 30031) (12379 30064) (12380 31227) (12381 32173) (12382 32239) (12383 32963) ( -12384 33806) (12385 34915) (12386 35586) (12387 36949) (12388 36986) (12389 21307) (12390 20117) ( -12391 20133) (12392 22495) (12393 32946) (12394 37057) (12395 30959) (12396 19968) (12397 22769) ( -12398 28322) (12399 36920) (12400 31282) (12401 33576) (12402 33419) (12403 39983) (12404 20801) ( -12405 21360) (12406 21693) (12407 21729) (12408 22240) (12409 23035) (12410 24341) (12411 39154) ( -12412 28139) (12413 32996) (12414 34093))] - -[49 ((12577 38498) (12578 38512) (12579 38560) (12580 38907) (12581 21515) (12582 21491) (12583 23431) - (12584 28879) (12585 32701) (12586 36802) (12587 38632) (12588 21359) (12589 40284) (12590 31418) ( -12591 19985) (12592 30867) (12593 33276) (12594 28198) (12595 22040) (12596 21764) (12597 27421) ( -12598 34074) (12599 39995) (12600 23013) (12601 21417) (12602 28006) (12603 29916) (12604 38287) ( -12605 22082) (12606 20113) (12607 36939) (12608 38642) (12609 33615) (12610 39180) (12611 21473) ( -12612 21942) (12613 23344) (12614 24433) (12615 26144) (12616 26355) (12617 26628) (12618 27704) ( -12619 27891) (12620 27945) (12621 29787) (12622 30408) (12623 31310) (12624 38964) (12625 33521) ( -12626 34907) (12627 35424) (12628 37613) (12629 28082) (12630 30123) (12631 30410) (12632 39365) ( -12633 24742) (12634 35585) (12635 36234) (12636 38322) (12637 27022) (12638 21421) (12639 20870) ( -12640 22290) (12641 22576) (12642 22852) (12643 23476) (12644 24310) (12645 24616) (12646 25513) ( -12647 25588) (12648 27839) (12649 28436) (12650 28814) (12651 28948) (12652 29017) (12653 29141) ( -12654 29503) (12655 32257) (12656 33398) (12657 33489) (12658 34199) (12659 36960) (12660 37467) ( -12661 40219) (12662 22633) (12663 26044) (12664 27738) (12665 29989) (12666 20985) (12667 22830) ( -12668 22885) (12669 24448) (12670 24540))] - -[50 ((12833 25276) (12834 26106) (12835 27178) (12836 27431) (12837 27572) (12838 29579) (12839 32705) - (12840 35158) (12841 40236) (12842 40206) (12843 40644) (12844 23713) (12845 27798) (12846 33659) ( -12847 20740) (12848 23627) (12849 25014) (12850 33222) (12851 26742) (12852 29281) (12853 20057) ( -12854 20474) (12855 21368) (12856 24681) (12857 28201) (12858 31311) (12859 38899) (12860 19979) ( -12861 21270) (12862 20206) (12863 20309) (12864 20285) (12865 20385) (12866 20339) (12867 21152) ( -12868 21487) (12869 22025) (12870 22799) (12871 23233) (12872 23478) (12873 23521) (12874 31185) ( -12875 26247) (12876 26524) (12877 26550) (12878 27468) (12879 27827) (12880 28779) (12881 29634) ( -12882 31117) (12883 31166) (12884 31292) (12885 31623) (12886 33457) (12887 33499) (12888 33540) ( -12889 33655) (12890 33775) (12891 33747) (12892 34662) (12893 35506) (12894 22057) (12895 36008) ( -12896 36838) (12897 36942) (12898 38686) (12899 34442) (12900 20420) (12901 23784) (12902 25105) ( -12903 29273) (12904 30011) (12905 33253) (12906 33469) (12907 34558) (12908 36032) (12909 38597) ( -12910 39187) (12911 39381) (12912 20171) (12913 20250) (12914 35299) (12915 22238) (12916 22602) ( -12917 22730) (12918 24315) (12919 24555) (12920 24618) (12921 24724) (12922 24674) (12923 25040) ( -12924 25106) (12925 25296) (12926 25913))] - -[51 ((13089 39745) (13090 26214) (13091 26800) (13092 28023) (13093 28784) (13094 30028) (13095 30342) - (13096 32117) (13097 33445) (13098 34809) (13099 38283) (13100 38542) (13101 35997) (13102 20977) ( -13103 21182) (13104 22806) (13105 21683) (13106 23475) (13107 23830) (13108 24936) (13109 27010) ( -13110 28079) (13111 30861) (13112 33995) (13113 34903) (13114 35442) (13115 37799) (13116 39608) ( -13117 28012) (13118 39336) (13119 34521) (13120 22435) (13121 26623) (13122 34510) (13123 37390) ( -13124 21123) (13125 22151) (13126 21508) (13127 24275) (13128 25313) (13129 25785) (13130 26684) ( -13131 26680) (13132 27579) (13133 29554) (13134 30906) (13135 31339) (13136 35226) (13137 35282) ( -13138 36203) (13139 36611) (13140 37101) (13141 38307) (13142 38548) (13143 38761) (13144 23398) ( -13145 23731) (13146 27005) (13147 38989) (13148 38990) (13149 25499) (13150 31520) (13151 27179) ( -13152 27263) (13153 26806) (13154 39949) (13155 28511) (13156 21106) (13157 21917) (13158 24688) ( -13159 25324) (13160 27963) (13161 28167) (13162 28369) (13163 33883) (13164 35088) (13165 36676) ( -13166 19988) (13167 39993) (13168 21494) (13169 26907) (13170 27194) (13171 38788) (13172 26666) ( -13173 20828) (13174 31427) (13175 33970) (13176 37340) (13177 37772) (13178 22107) (13179 40232) ( -13180 26658) (13181 33541) (13182 33841))] - -[52 ((13345 31909) (13346 21000) (13347 33477) (13348 29926) (13349 20094) (13350 20355) (13351 20896) - (13352 23506) (13353 21002) (13354 21208) (13355 21223) (13356 24059) (13357 21914) (13358 22570) ( -13359 23014) (13360 23436) (13361 23448) (13362 23515) (13363 24178) (13364 24185) (13365 24739) ( -13366 24863) (13367 24931) (13368 25022) (13369 25563) (13370 25954) (13371 26577) (13372 26707) ( -13373 26874) (13374 27454) (13375 27475) (13376 27735) (13377 28450) (13378 28567) (13379 28485) ( -13380 29872) (13381 29976) (13382 30435) (13383 30475) (13384 31487) (13385 31649) (13386 31777) ( -13387 32233) (13388 32566) (13389 32752) (13390 32925) (13391 33382) (13392 33694) (13393 35251) ( -13394 35532) (13395 36011) (13396 36996) (13397 37969) (13398 38291) (13399 38289) (13400 38306) ( -13401 38501) (13402 38867) (13403 39208) (13404 33304) (13405 20024) (13406 21547) (13407 23736) ( -13408 24012) (13409 29609) (13410 30284) (13411 30524) (13412 23721) (13413 32747) (13414 36107) ( -13415 38593) (13416 38929) (13417 38996) (13418 39000) (13419 20225) (13420 20238) (13421 21361) ( -13422 21916) (13423 22120) (13424 22522) (13425 22855) (13426 23305) (13427 23492) (13428 23696) ( -13429 24076) (13430 24190) (13431 24524) (13432 25582) (13433 26426) (13434 26071) (13435 26082) ( -13436 26399) (13437 26827) (13438 26820))] - -[53 ((13601 27231) (13602 24112) (13603 27589) (13604 27671) (13605 27773) (13606 30079) (13607 31048) - (13608 23395) (13609 31232) (13610 32000) (13611 24509) (13612 35215) (13613 35352) (13614 36020) ( -13615 36215) (13616 36556) (13617 36637) (13618 39138) (13619 39438) (13620 39740) (13621 20096) ( -13622 20605) (13623 20736) (13624 22931) (13625 23452) (13626 25135) (13627 25216) (13628 25836) ( -13629 27450) (13630 29344) (13631 30097) (13632 31047) (13633 32681) (13634 34811) (13635 35516) ( -13636 35696) (13637 25516) (13638 33738) (13639 38816) (13640 21513) (13641 21507) (13642 21931) ( -13643 26708) (13644 27224) (13645 35440) (13646 30759) (13647 26485) (13648 40653) (13649 21364) ( -13650 23458) (13651 33050) (13652 34384) (13653 36870) (13654 19992) (13655 20037) (13656 20167) ( -13657 20241) (13658 21450) (13659 21560) (13660 23470) (13661 24339) (13662 24613) (13663 25937) ( -13664 26429) (13665 27714) (13666 27762) (13667 27875) (13668 28792) (13669 29699) (13670 31350) ( -13671 31406) (13672 31496) (13673 32026) (13674 31998) (13675 32102) (13676 26087) (13677 29275) ( -13678 21435) (13679 23621) (13680 24040) (13681 25298) (13682 25312) (13683 25369) (13684 28192) ( -13685 34394) (13686 35377) (13687 36317) (13688 37624) (13689 28417) (13690 31142) (13691 39770) ( -13692 20136) (13693 20139) (13694 20140))] - -[54 ((13857 20379) (13858 20384) (13859 20689) (13860 20807) (13861 31478) (13862 20849) (13863 20982) - (13864 21332) (13865 21281) (13866 21375) (13867 21483) (13868 21932) (13869 22659) (13870 23777) ( -13871 24375) (13872 24394) (13873 24623) (13874 24656) (13875 24685) (13876 25375) (13877 25945) ( -13878 27211) (13879 27841) (13880 29378) (13881 29421) (13882 30703) (13883 33016) (13884 33029) ( -13885 33288) (13886 34126) (13887 37111) (13888 37857) (13889 38911) (13890 39255) (13891 39514) ( -13892 20208) (13893 20957) (13894 23597) (13895 26241) (13896 26989) (13897 23616) (13898 26354) ( -13899 26997) (13900 29577) (13901 26704) (13902 31873) (13903 20677) (13904 21220) (13905 22343) ( -13906 24062) (13907 37670) (13908 26020) (13909 27427) (13910 27453) (13911 29748) (13912 31105) ( -13913 31165) (13914 31563) (13915 32202) (13916 33465) (13917 33740) (13918 34943) (13919 35167) ( -13920 35641) (13921 36817) (13922 37329) (13923 21535) (13924 37504) (13925 20061) (13926 20534) ( -13927 21477) (13928 21306) (13929 29399) (13930 29590) (13931 30697) (13932 33510) (13933 36527) ( -13934 39366) (13935 39368) (13936 39378) (13937 20855) (13938 24858) (13939 34398) (13940 21936) ( -13941 31354) (13942 20598) (13943 23507) (13944 36935) (13945 38533) (13946 20018) (13947 27355) ( -13948 37351) (13949 23633) (13950 23624))] - -[55 ((14113 25496) (14114 31391) (14115 27795) (14116 38772) (14117 36705) (14118 31402) (14119 29066) - (14120 38536) (14121 31874) (14122 26647) (14123 32368) (14124 26705) (14125 37740) (14126 21234) ( -14127 21531) (14128 34219) (14129 35347) (14130 32676) (14131 36557) (14132 37089) (14133 21350) ( -14134 34952) (14135 31041) (14136 20418) (14137 20670) (14138 21009) (14139 20804) (14140 21843) ( -14141 22317) (14142 29674) (14143 22411) (14144 22865) (14145 24418) (14146 24452) (14147 24693) ( -14148 24950) (14149 24935) (14150 25001) (14151 25522) (14152 25658) (14153 25964) (14154 26223) ( -14155 26690) (14156 28179) (14157 30054) (14158 31293) (14159 31995) (14160 32076) (14161 32153) ( -14162 32331) (14163 32619) (14164 33550) (14165 33610) (14166 34509) (14167 35336) (14168 35427) ( -14169 35686) (14170 36605) (14171 38938) (14172 40335) (14173 33464) (14174 36814) (14175 39912) ( -14176 21127) (14177 25119) (14178 25731) (14179 28608) (14180 38553) (14181 26689) (14182 20625) ( -14183 27424) (14184 27770) (14185 28500) (14186 31348) (14187 32080) (14188 34880) (14189 35363) ( -14190 26376) (14191 20214) (14192 20537) (14193 20518) (14194 20581) (14195 20860) (14196 21048) ( -14197 21091) (14198 21927) (14199 22287) (14200 22533) (14201 23244) (14202 24314) (14203 25010) ( -14204 25080) (14205 25331) (14206 25458))] - -[56 ((14369 26908) (14370 27177) (14371 29309) (14372 29356) (14373 29486) (14374 30740) (14375 30831) - (14376 32121) (14377 30476) (14378 32937) (14379 35211) (14380 35609) (14381 36066) (14382 36562) ( -14383 36963) (14384 37749) (14385 38522) (14386 38997) (14387 39443) (14388 40568) (14389 20803) ( -14390 21407) (14391 21427) (14392 24187) (14393 24358) (14394 28187) (14395 28304) (14396 29572) ( -14397 29694) (14398 32067) (14399 33335) (14400 35328) (14401 35578) (14402 38480) (14403 20046) ( -14404 20491) (14405 21476) (14406 21628) (14407 22266) (14408 22993) (14409 23396) (14410 24049) ( -14411 24235) (14412 24359) (14413 25144) (14414 25925) (14415 26543) (14416 28246) (14417 29392) ( -14418 31946) (14419 34996) (14420 32929) (14421 32993) (14422 33776) (14423 34382) (14424 35463) ( -14425 36328) (14426 37431) (14427 38599) (14428 39015) (14429 40723) (14430 20116) (14431 20114) ( -14432 20237) (14433 21320) (14434 21577) (14435 21566) (14436 23087) (14437 24460) (14438 24481) ( -14439 24735) (14440 26791) (14441 27278) (14442 29786) (14443 30849) (14444 35486) (14445 35492) ( -14446 35703) (14447 37264) (14448 20062) (14449 39881) (14450 20132) (14451 20348) (14452 20399) ( -14453 20505) (14454 20502) (14455 20809) (14456 20844) (14457 21151) (14458 21177) (14459 21246) ( -14460 21402) (14461 21475) (14462 21521))] - -[57 ((14625 21518) (14626 21897) (14627 22353) (14628 22434) (14629 22909) (14630 23380) (14631 23389) - (14632 23439) (14633 24037) (14634 24039) (14635 24055) (14636 24184) (14637 24195) (14638 24218) ( -14639 24247) (14640 24344) (14641 24658) (14642 24908) (14643 25239) (14644 25304) (14645 25511) ( -14646 25915) (14647 26114) (14648 26179) (14649 26356) (14650 26477) (14651 26657) (14652 26775) ( -14653 27083) (14654 27743) (14655 27946) (14656 28009) (14657 28207) (14658 28317) (14659 30002) ( -14660 30343) (14661 30828) (14662 31295) (14663 31968) (14664 32005) (14665 32024) (14666 32094) ( -14667 32177) (14668 32789) (14669 32771) (14670 32943) (14671 32945) (14672 33108) (14673 33167) ( -14674 33322) (14675 33618) (14676 34892) (14677 34913) (14678 35611) (14679 36002) (14680 36092) ( -14681 37066) (14682 37237) (14683 37489) (14684 30783) (14685 37628) (14686 38308) (14687 38477) ( -14688 38917) (14689 39321) (14690 39640) (14691 40251) (14692 21083) (14693 21163) (14694 21495) ( -14695 21512) (14696 22741) (14697 25335) (14698 28640) (14699 35946) (14700 36703) (14701 40633) ( -14702 20811) (14703 21051) (14704 21578) (14705 22269) (14706 31296) (14707 37239) (14708 40288) ( -14709 40658) (14710 29508) (14711 28425) (14712 33136) (14713 29969) (14714 24573) (14715 24794) ( -14716 39592) (14717 29403) (14718 36796))] - -[58 ((14881 27492) (14882 38915) (14883 20170) (14884 22256) (14885 22372) (14886 22718) (14887 23130) - (14888 24680) (14889 25031) (14890 26127) (14891 26118) (14892 26681) (14893 26801) (14894 28151) ( -14895 30165) (14896 32058) (14897 33390) (14898 39746) (14899 20123) (14900 20304) (14901 21449) ( -14902 21766) (14903 23919) (14904 24038) (14905 24046) (14906 26619) (14907 27801) (14908 29811) ( -14909 30722) (14910 35408) (14911 37782) (14912 35039) (14913 22352) (14914 24231) (14915 25387) ( -14916 20661) (14917 20652) (14918 20877) (14919 26368) (14920 21705) (14921 22622) (14922 22971) ( -14923 23472) (14924 24425) (14925 25165) (14926 25505) (14927 26685) (14928 27507) (14929 28168) ( -14930 28797) (14931 37319) (14932 29312) (14933 30741) (14934 30758) (14935 31085) (14936 25998) ( -14937 32048) (14938 33756) (14939 35009) (14940 36617) (14941 38555) (14942 21092) (14943 22312) ( -14944 26448) (14945 32618) (14946 36001) (14947 20916) (14948 22338) (14949 38442) (14950 22586) ( -14951 27018) (14952 32948) (14953 21682) (14954 23822) (14955 22524) (14956 30869) (14957 40442) ( -14958 20316) (14959 21066) (14960 21643) (14961 25662) (14962 26152) (14963 26388) (14964 26613) ( -14965 31364) (14966 31574) (14967 32034) (14968 37679) (14969 26716) (14970 39853) (14971 31545) ( -14972 21273) (14973 20874) (14974 21047))] - -[59 ((15137 23519) (15138 25334) (15139 25774) (15140 25830) (15141 26413) (15142 27578) (15143 34217) - (15144 38609) (15145 30352) (15146 39894) (15147 25420) (15148 37638) (15149 39851) (15150 30399) ( -15151 26194) (15152 19977) (15153 20632) (15154 21442) (15155 23665) (15156 24808) (15157 25746) ( -15158 25955) (15159 26719) (15160 29158) (15161 29642) (15162 29987) (15163 31639) (15164 32386) ( -15165 34453) (15166 35715) (15167 36059) (15168 37240) (15169 39184) (15170 26028) (15171 26283) ( -15172 27531) (15173 20181) (15174 20180) (15175 20282) (15176 20351) (15177 21050) (15178 21496) ( -15179 21490) (15180 21987) (15181 22235) (15182 22763) (15183 22987) (15184 22985) (15185 23039) ( -15186 23376) (15187 23629) (15188 24066) (15189 24107) (15190 24535) (15191 24605) (15192 25351) ( -15193 25903) (15194 23388) (15195 26031) (15196 26045) (15197 26088) (15198 26525) (15199 27490) ( -15200 27515) (15201 27663) (15202 29509) (15203 31049) (15204 31169) (15205 31992) (15206 32025) ( -15207 32043) (15208 32930) (15209 33026) (15210 33267) (15211 35222) (15212 35422) (15213 35433) ( -15214 35430) (15215 35468) (15216 35566) (15217 36039) (15218 36060) (15219 38604) (15220 39164) ( -15221 27503) (15222 20107) (15223 20284) (15224 20365) (15225 20816) (15226 23383) (15227 23546) ( -15228 24904) (15229 25345) (15230 26178))] - -[60 ((15393 27425) (15394 28363) (15395 27835) (15396 29246) (15397 29885) (15398 30164) (15399 30913) - (15400 31034) (15401 32780) (15402 32819) (15403 33258) (15404 33940) (15405 36766) (15406 27728) ( -15407 40575) (15408 24335) (15409 35672) (15410 40235) (15411 31482) (15412 36600) (15413 23437) ( -15414 38635) (15415 19971) (15416 21489) (15417 22519) (15418 22833) (15419 23241) (15420 23460) ( -15421 24713) (15422 28287) (15423 28422) (15424 30142) (15425 36074) (15426 23455) (15427 34048) ( -15428 31712) (15429 20594) (15430 26612) (15431 33437) (15432 23649) (15433 34122) (15434 32286) ( -15435 33294) (15436 20889) (15437 23556) (15438 25448) (15439 36198) (15440 26012) (15441 29038) ( -15442 31038) (15443 32023) (15444 32773) (15445 35613) (15446 36554) (15447 36974) (15448 34503) ( -15449 37034) (15450 20511) (15451 21242) (15452 23610) (15453 26451) (15454 28796) (15455 29237) ( -15456 37196) (15457 37320) (15458 37675) (15459 33509) (15460 23490) (15461 24369) (15462 24825) ( -15463 20027) (15464 21462) (15465 23432) (15466 25163) (15467 26417) (15468 27530) (15469 29417) ( -15470 29664) (15471 31278) (15472 33131) (15473 36259) (15474 37202) (15475 39318) (15476 20754) ( -15477 21463) (15478 21610) (15479 23551) (15480 25480) (15481 27193) (15482 32172) (15483 38656) ( -15484 22234) (15485 21454) (15486 21608))] - -[61 ((15649 23447) (15650 23601) (15651 24030) (15652 20462) (15653 24833) (15654 25342) (15655 27954) - (15656 31168) (15657 31179) (15658 32066) (15659 32333) (15660 32722) (15661 33261) (15662 33311) ( -15663 33936) (15664 34886) (15665 35186) (15666 35728) (15667 36468) (15668 36655) (15669 36913) ( -15670 37195) (15671 37228) (15672 38598) (15673 37276) (15674 20160) (15675 20303) (15676 20805) ( -15677 21313) (15678 24467) (15679 25102) (15680 26580) (15681 27713) (15682 28171) (15683 29539) ( -15684 32294) (15685 37325) (15686 37507) (15687 21460) (15688 22809) (15689 23487) (15690 28113) ( -15691 31069) (15692 32302) (15693 31899) (15694 22654) (15695 29087) (15696 20986) (15697 34899) ( -15698 36848) (15699 20426) (15700 23803) (15701 26149) (15702 30636) (15703 31459) (15704 33308) ( -15705 39423) (15706 20934) (15707 24490) (15708 26092) (15709 26991) (15710 27529) (15711 28147) ( -15712 28310) (15713 28516) (15714 30462) (15715 32020) (15716 24033) (15717 36981) (15718 37255) ( -15719 38918) (15720 20966) (15721 21021) (15722 25152) (15723 26257) (15724 26329) (15725 28186) ( -15726 24246) (15727 32210) (15728 32626) (15729 26360) (15730 34223) (15731 34295) (15732 35576) ( -15733 21161) (15734 21465) (15735 22899) (15736 24207) (15737 24464) (15738 24661) (15739 37604) ( -15740 38500) (15741 20663) (15742 20767))] - -[62 ((15905 21213) (15906 21280) (15907 21319) (15908 21484) (15909 21736) (15910 21830) (15911 21809) - (15912 22039) (15913 22888) (15914 22974) (15915 23100) (15916 23477) (15917 23558) (15918 23567) ( -15919 23569) (15920 23578) (15921 24196) (15922 24202) (15923 24288) (15924 24432) (15925 25215) ( -15926 25220) (15927 25307) (15928 25484) (15929 25463) (15930 26119) (15931 26124) (15932 26157) ( -15933 26230) (15934 26494) (15935 26786) (15936 27167) (15937 27189) (15938 27836) (15939 28040) ( -15940 28169) (15941 28248) (15942 28988) (15943 28966) (15944 29031) (15945 30151) (15946 30465) ( -15947 30813) (15948 30977) (15949 31077) (15950 31216) (15951 31456) (15952 31505) (15953 31911) ( -15954 32057) (15955 32918) (15956 33750) (15957 33931) (15958 34121) (15959 34909) (15960 35059) ( -15961 35359) (15962 35388) (15963 35412) (15964 35443) (15965 35937) (15966 36062) (15967 37284) ( -15968 37478) (15969 37758) (15970 37912) (15971 38556) (15972 38808) (15973 19978) (15974 19976) ( -15975 19998) (15976 20055) (15977 20887) (15978 21104) (15979 22478) (15980 22580) (15981 22732) ( -15982 23330) (15983 24120) (15984 24773) (15985 25854) (15986 26465) (15987 26454) (15988 27972) ( -15989 29366) (15990 30067) (15991 31331) (15992 33976) (15993 35698) (15994 37304) (15995 37664) ( -15996 22065) (15997 22516) (15998 39166))] - -[63 ((16161 25325) (16162 26893) (16163 27542) (16164 29165) (16165 32340) (16166 32887) (16167 33394) - (16168 35302) (16169 39135) (16170 34645) (16171 36785) (16172 23611) (16173 20280) (16174 20449) ( -16175 20405) (16176 21767) (16177 23072) (16178 23517) (16179 23529) (16180 24515) (16181 24910) ( -16182 25391) (16183 26032) (16184 26187) (16185 26862) (16186 27035) (16187 28024) (16188 28145) ( -16189 30003) (16190 30137) (16191 30495) (16192 31070) (16193 31206) (16194 32051) (16195 33251) ( -16196 33455) (16197 34218) (16198 35242) (16199 35386) (16200 36523) (16201 36763) (16202 36914) ( -16203 37341) (16204 38663) (16205 20154) (16206 20161) (16207 20995) (16208 22645) (16209 22764) ( -16210 23563) (16211 29978) (16212 23613) (16213 33102) (16214 35338) (16215 36805) (16216 38499) ( -16217 38765) (16218 31525) (16219 35535) (16220 38920) (16221 37218) (16222 22259) (16223 21416) ( -16224 36887) (16225 21561) (16226 22402) (16227 24101) (16228 25512) (16229 27700) (16230 28810) ( -16231 30561) (16232 31883) (16233 32736) (16234 34928) (16235 36930) (16236 37204) (16237 37648) ( -16238 37656) (16239 38543) (16240 29790) (16241 39620) (16242 23815) (16243 23913) (16244 25968) ( -16245 26530) (16246 36264) (16247 38619) (16248 25454) (16249 26441) (16250 26905) (16251 33733) ( -16252 38935) (16253 38592) (16254 35070))] - -[64 ((16417 28548) (16418 25722) (16419 23544) (16420 19990) (16421 28716) (16422 30045) (16423 26159) - (16424 20932) (16425 21046) (16426 21218) (16427 22995) (16428 24449) (16429 24615) (16430 25104) ( -16431 25919) (16432 25972) (16433 26143) (16434 26228) (16435 26866) (16436 26646) (16437 27491) ( -16438 28165) (16439 29298) (16440 29983) (16441 30427) (16442 31934) (16443 32854) (16444 22768) ( -16445 35069) (16446 35199) (16447 35488) (16448 35475) (16449 35531) (16450 36893) (16451 37266) ( -16452 38738) (16453 38745) (16454 25993) (16455 31246) (16456 33030) (16457 38587) (16458 24109) ( -16459 24796) (16460 25114) (16461 26021) (16462 26132) (16463 26512) (16464 30707) (16465 31309) ( -16466 31821) (16467 32318) (16468 33034) (16469 36012) (16470 36196) (16471 36321) (16472 36447) ( -16473 30889) (16474 20999) (16475 25305) (16476 25509) (16477 25666) (16478 25240) (16479 35373) ( -16480 31363) (16481 31680) (16482 35500) (16483 38634) (16484 32118) (16485 33292) (16486 34633) ( -16487 20185) (16488 20808) (16489 21315) (16490 21344) (16491 23459) (16492 23554) (16493 23574) ( -16494 24029) (16495 25126) (16496 25159) (16497 25776) (16498 26643) (16499 26676) (16500 27849) ( -16501 27973) (16502 27927) (16503 26579) (16504 28508) (16505 29006) (16506 29053) (16507 26059) ( -16508 31359) (16509 31661) (16510 32218))] - -[65 ((16673 32330) (16674 32680) (16675 33146) (16676 33307) (16677 33337) (16678 34214) (16679 35438) - (16680 36046) (16681 36341) (16682 36984) (16683 36983) (16684 37549) (16685 37521) (16686 38275) ( -16687 39854) (16688 21069) (16689 21892) (16690 28472) (16691 28982) (16692 20840) (16693 31109) ( -16694 32341) (16695 33203) (16696 31950) (16697 22092) (16698 22609) (16699 23720) (16700 25514) ( -16701 26366) (16702 26365) (16703 26970) (16704 29401) (16705 30095) (16706 30094) (16707 30990) ( -16708 31062) (16709 31199) (16710 31895) (16711 32032) (16712 32068) (16713 34311) (16714 35380) ( -16715 38459) (16716 36961) (16717 40736) (16718 20711) (16719 21109) (16720 21452) (16721 21474) ( -16722 20489) (16723 21930) (16724 22766) (16725 22863) (16726 29245) (16727 23435) (16728 23652) ( -16729 21277) (16730 24803) (16731 24819) (16732 25436) (16733 25475) (16734 25407) (16735 25531) ( -16736 25805) (16737 26089) (16738 26361) (16739 24035) (16740 27085) (16741 27133) (16742 28437) ( -16743 29157) (16744 20105) (16745 30185) (16746 30456) (16747 31379) (16748 31967) (16749 32207) ( -16750 32156) (16751 32865) (16752 33609) (16753 33624) (16754 33900) (16755 33980) (16756 34299) ( -16757 35013) (16758 36208) (16759 36865) (16760 36973) (16761 37783) (16762 38684) (16763 39442) ( -16764 20687) (16765 22679) (16766 24974))] - -[66 ((16929 33235) (16930 34101) (16931 36104) (16932 36896) (16933 20419) (16934 20596) (16935 21063) - (16936 21363) (16937 24687) (16938 25417) (16939 26463) (16940 28204) (16941 36275) (16942 36895) ( -16943 20439) (16944 23646) (16945 36042) (16946 26063) (16947 32154) (16948 21330) (16949 34966) ( -16950 20854) (16951 25539) (16952 23384) (16953 23403) (16954 23562) (16955 25613) (16956 26449) ( -16957 36956) (16958 20182) (16959 22810) (16960 22826) (16961 27760) (16962 35409) (16963 21822) ( -16964 22549) (16965 22949) (16966 24816) (16967 25171) (16968 26561) (16969 33333) (16970 26965) ( -16971 38464) (16972 39364) (16973 39464) (16974 20307) (16975 22534) (16976 23550) (16977 32784) ( -16978 23729) (16979 24111) (16980 24453) (16981 24608) (16982 24907) (16983 25140) (16984 26367) ( -16985 27888) (16986 28382) (16987 32974) (16988 33151) (16989 33492) (16990 34955) (16991 36024) ( -16992 36864) (16993 36910) (16994 38538) (16995 40667) (16996 39899) (16997 20195) (16998 21488) ( -16999 22823) (17000 31532) (17001 37261) (17002 38988) (17003 40441) (17004 28381) (17005 28711) ( -17006 21331) (17007 21828) (17008 23429) (17009 25176) (17010 25246) (17011 25299) (17012 27810) ( -17013 28655) (17014 29730) (17015 35351) (17016 37944) (17017 28609) (17018 35582) (17019 33592) ( -17020 20967) (17021 34552) (17022 21482))] - -[67 ((17185 21481) (17186 20294) (17187 36948) (17188 36784) (17189 22890) (17190 33073) (17191 24061) - (17192 31466) (17193 36799) (17194 26842) (17195 35895) (17196 29432) (17197 40008) (17198 27197) ( -17199 35504) (17200 20025) (17201 21336) (17202 22022) (17203 22374) (17204 25285) (17205 25506) ( -17206 26086) (17207 27470) (17208 28129) (17209 28251) (17210 28845) (17211 30701) (17212 31471) ( -17213 31658) (17214 32187) (17215 32829) (17216 32966) (17217 34507) (17218 35477) (17219 37723) ( -17220 22243) (17221 22727) (17222 24382) (17223 26029) (17224 26262) (17225 27264) (17226 27573) ( -17227 30007) (17228 35527) (17229 20516) (17230 30693) (17231 22320) (17232 24347) (17233 24677) ( -17234 26234) (17235 27744) (17236 30196) (17237 31258) (17238 32622) (17239 33268) (17240 34584) ( -17241 36933) (17242 39347) (17243 31689) (17244 30044) (17245 31481) (17246 31569) (17247 33988) ( -17248 36880) (17249 31209) (17250 31378) (17251 33590) (17252 23265) (17253 30528) (17254 20013) ( -17255 20210) (17256 23449) (17257 24544) (17258 25277) (17259 26172) (17260 26609) (17261 27880) ( -17262 34411) (17263 34935) (17264 35387) (17265 37198) (17266 37619) (17267 39376) (17268 27159) ( -17269 28710) (17270 29482) (17271 33511) (17272 33879) (17273 36015) (17274 19969) (17275 20806) ( -17276 20939) (17277 21899) (17278 23541))] - -[68 ((17441 24086) (17442 24115) (17443 24193) (17444 24340) (17445 24373) (17446 24427) (17447 24500) - (17448 25074) (17449 25361) (17450 26274) (17451 26397) (17452 28526) (17453 29266) (17454 30010) ( -17455 30522) (17456 32884) (17457 33081) (17458 33144) (17459 34678) (17460 35519) (17461 35548) ( -17462 36229) (17463 36339) (17464 37530) (17465 38263) (17466 38914) (17467 40165) (17468 21189) ( -17469 25431) (17470 30452) (17471 26389) (17472 27784) (17473 29645) (17474 36035) (17475 37806) ( -17476 38515) (17477 27941) (17478 22684) (17479 26894) (17480 27084) (17481 36861) (17482 37786) ( -17483 30171) (17484 36890) (17485 22618) (17486 26626) (17487 25524) (17488 27131) (17489 20291) ( -17490 28460) (17491 26584) (17492 36795) (17493 34086) (17494 32180) (17495 37716) (17496 26943) ( -17497 28528) (17498 22378) (17499 22775) (17500 23340) (17501 32044) (17502 29226) (17503 21514) ( -17504 37347) (17505 40372) (17506 20141) (17507 20302) (17508 20572) (17509 20597) (17510 21059) ( -17511 35998) (17512 21576) (17513 22564) (17514 23450) (17515 24093) (17516 24213) (17517 24237) ( -17518 24311) (17519 24351) (17520 24716) (17521 25269) (17522 25402) (17523 25552) (17524 26799) ( -17525 27712) (17526 30855) (17527 31118) (17528 31243) (17529 32224) (17530 33351) (17531 35330) ( -17532 35558) (17533 36420) (17534 36883))] - -[69 ((17697 37048) (17698 37165) (17699 37336) (17700 40718) (17701 27877) (17702 25688) (17703 25826) - (17704 25973) (17705 28404) (17706 30340) (17707 31515) (17708 36969) (17709 37841) (17710 28346) ( -17711 21746) (17712 24505) (17713 25764) (17714 36685) (17715 36845) (17716 37444) (17717 20856) ( -17718 22635) (17719 22825) (17720 23637) (17721 24215) (17722 28155) (17723 32399) (17724 29980) ( -17725 36028) (17726 36578) (17727 39003) (17728 28857) (17729 20253) (17730 27583) (17731 28593) ( -17732 30000) (17733 38651) (17734 20814) (17735 21520) (17736 22581) (17737 22615) (17738 22956) ( -17739 23648) (17740 24466) (17741 26007) (17742 26460) (17743 28193) (17744 30331) (17745 33759) ( -17746 36077) (17747 36884) (17748 37117) (17749 37709) (17750 30757) (17751 30778) (17752 21162) ( -17753 24230) (17754 22303) (17755 22900) (17756 24594) (17757 20498) (17758 20826) (17759 20908) ( -17760 20941) (17761 20992) (17762 21776) (17763 22612) (17764 22616) (17765 22871) (17766 23445) ( -17767 23798) (17768 23947) (17769 24764) (17770 25237) (17771 25645) (17772 26481) (17773 26691) ( -17774 26812) (17775 26847) (17776 30423) (17777 28120) (17778 28271) (17779 28059) (17780 28783) ( -17781 29128) (17782 24403) (17783 30168) (17784 31095) (17785 31561) (17786 31572) (17787 31570) ( -17788 31958) (17789 32113) (17790 21040))] - -[70 ((17953 33891) (17954 34153) (17955 34276) (17956 35342) (17957 35588) (17958 35910) (17959 36367) - (17960 36867) (17961 36879) (17962 37913) (17963 38518) (17964 38957) (17965 39472) (17966 38360) ( -17967 20685) (17968 21205) (17969 21516) (17970 22530) (17971 23566) (17972 24999) (17973 25758) ( -17974 27934) (17975 30643) (17976 31461) (17977 33012) (17978 33796) (17979 36947) (17980 37509) ( -17981 23776) (17982 40199) (17983 21311) (17984 24471) (17985 24499) (17986 28060) (17987 29305) ( -17988 30563) (17989 31167) (17990 31716) (17991 27602) (17992 29420) (17993 35501) (17994 26627) ( -17995 27233) (17996 20984) (17997 31361) (17998 26932) (17999 23626) (18000 40182) (18001 33515) ( -18002 23493) (18003 37193) (18004 28702) (18005 22136) (18006 23663) (18007 24775) (18008 25958) ( -18009 27788) (18010 35930) (18011 36929) (18012 38931) (18013 21585) (18014 26311) (18015 37389) ( -18016 22856) (18017 37027) (18018 20869) (18019 20045) (18020 20970) (18021 34201) (18022 35598) ( -18023 28760) (18024 25466) (18025 37707) (18026 26978) (18027 39348) (18028 32260) (18029 30071) ( -18030 21335) (18031 26976) (18032 36575) (18033 38627) (18034 27741) (18035 20108) (18036 23612) ( -18037 24336) (18038 36841) (18039 21250) (18040 36049) (18041 32905) (18042 34425) (18043 24319) ( -18044 26085) (18045 20083) (18046 20837))] - -[71 ((18209 22914) (18210 23615) (18211 38894) (18212 20219) (18213 22922) (18214 24525) (18215 35469) - (18216 28641) (18217 31152) (18218 31074) (18219 23527) (18220 33905) (18221 29483) (18222 29105) ( -18223 24180) (18224 24565) (18225 25467) (18226 25754) (18227 29123) (18228 31896) (18229 20035) ( -18230 24316) (18231 20043) (18232 22492) (18233 22178) (18234 24745) (18235 28611) (18236 32013) ( -18237 33021) (18238 33075) (18239 33215) (18240 36786) (18241 35223) (18242 34468) (18243 24052) ( -18244 25226) (18245 25773) (18246 35207) (18247 26487) (18248 27874) (18249 27966) (18250 29750) ( -18251 30772) (18252 23110) (18253 32629) (18254 33453) (18255 39340) (18256 20467) (18257 24259) ( -18258 25309) (18259 25490) (18260 25943) (18261 26479) (18262 30403) (18263 29260) (18264 32972) ( -18265 32954) (18266 36649) (18267 37197) (18268 20493) (18269 22521) (18270 23186) (18271 26757) ( -18272 26995) (18273 29028) (18274 29437) (18275 36023) (18276 22770) (18277 36064) (18278 38506) ( -18279 36889) (18280 34687) (18281 31204) (18282 30695) (18283 33833) (18284 20271) (18285 21093) ( -18286 21338) (18287 25293) (18288 26575) (18289 27850) (18290 30333) (18291 31636) (18292 31893) ( -18293 33334) (18294 34180) (18295 36843) (18296 26333) (18297 28448) (18298 29190) (18299 32283) ( -18300 33707) (18301 39361) (18302 40614))] - -[72 ((18465 20989) (18466 31665) (18467 30834) (18468 31672) (18469 32903) (18470 31560) (18471 27368) - (18472 24161) (18473 32908) (18474 30033) (18475 30048) (18476 20843) (18477 37474) (18478 28300) ( -18479 30330) (18480 37271) (18481 39658) (18482 20240) (18483 32624) (18484 25244) (18485 31567) ( -18486 38309) (18487 40169) (18488 22138) (18489 22617) (18490 34532) (18491 38588) (18492 20276) ( -18493 21028) (18494 21322) (18495 21453) (18496 21467) (18497 24070) (18498 25644) (18499 26001) ( -18500 26495) (18501 27710) (18502 27726) (18503 29256) (18504 29359) (18505 29677) (18506 30036) ( -18507 32321) (18508 33324) (18509 34281) (18510 36009) (18511 31684) (18512 37318) (18513 29033) ( -18514 38930) (18515 39151) (18516 25405) (18517 26217) (18518 30058) (18519 30436) (18520 30928) ( -18521 34115) (18522 34542) (18523 21290) (18524 21329) (18525 21542) (18526 22915) (18527 24199) ( -18528 24444) (18529 24754) (18530 25161) (18531 25209) (18532 25259) (18533 26000) (18534 27604) ( -18535 27852) (18536 30130) (18537 30382) (18538 30865) (18539 31192) (18540 32203) (18541 32631) ( -18542 32933) (18543 34987) (18544 35513) (18545 36027) (18546 36991) (18547 38750) (18548 39131) ( -18549 27147) (18550 31800) (18551 20633) (18552 23614) (18553 24494) (18554 26503) (18555 27608) ( -18556 29749) (18557 30473) (18558 32654))] - -[73 ((18721 40763) (18722 26570) (18723 31255) (18724 21305) (18725 30091) (18726 39661) (18727 24422) - (18728 33181) (18729 33777) (18730 32920) (18731 24380) (18732 24517) (18733 30050) (18734 31558) ( -18735 36924) (18736 26727) (18737 23019) (18738 23195) (18739 32016) (18740 30334) (18741 35628) ( -18742 20469) (18743 24426) (18744 27161) (18745 27703) (18746 28418) (18747 29922) (18748 31080) ( -18749 34920) (18750 35413) (18751 35961) (18752 24287) (18753 25551) (18754 30149) (18755 31186) ( -18756 33495) (18757 37672) (18758 37618) (18759 33948) (18760 34541) (18761 39981) (18762 21697) ( -18763 24428) (18764 25996) (18765 27996) (18766 28693) (18767 36007) (18768 36051) (18769 38971) ( -18770 25935) (18771 29942) (18772 19981) (18773 20184) (18774 22496) (18775 22827) (18776 23142) ( -18777 23500) (18778 20904) (18779 24067) (18780 24220) (18781 24598) (18782 25206) (18783 25975) ( -18784 26023) (18785 26222) (18786 28014) (18787 29238) (18788 31526) (18789 33104) (18790 33178) ( -18791 33433) (18792 35676) (18793 36000) (18794 36070) (18795 36212) (18796 38428) (18797 38468) ( -18798 20398) (18799 25771) (18800 27494) (18801 33310) (18802 33889) (18803 34154) (18804 37096) ( -18805 23553) (18806 26963) (18807 39080) (18808 33914) (18809 34135) (18810 20239) (18811 21103) ( -18812 24489) (18813 24133) (18814 26381))] - -[74 ((18977 31119) (18978 33145) (18979 35079) (18980 35206) (18981 28149) (18982 24343) (18983 25173) - (18984 27832) (18985 20175) (18986 29289) (18987 39826) (18988 20998) (18989 21563) (18990 22132) ( -18991 22707) (18992 24996) (18993 25198) (18994 28954) (18995 22894) (18996 31881) (18997 31966) ( -18998 32027) (18999 38640) (19000 25991) (19001 32862) (19002 19993) (19003 20341) (19004 20853) ( -19005 22592) (19006 24163) (19007 24179) (19008 24330) (19009 26564) (19010 20006) (19011 34109) ( -19012 38281) (19013 38491) (19014 31859) (19015 38913) (19016 20731) (19017 22721) (19018 30294) ( -19019 30887) (19020 21029) (19021 30629) (19022 34065) (19023 31622) (19024 20559) (19025 22793) ( -19026 29255) (19027 31687) (19028 32232) (19029 36794) (19030 36820) (19031 36941) (19032 20415) ( -19033 21193) (19034 23081) (19035 24321) (19036 38829) (19037 20445) (19038 33303) (19039 37610) ( -19040 22275) (19041 25429) (19042 27497) (19043 29995) (19044 35036) (19045 36628) (19046 31298) ( -19047 21215) (19048 22675) (19049 24917) (19050 25098) (19051 26286) (19052 27597) (19053 31807) ( -19054 33769) (19055 20515) (19056 20472) (19057 21253) (19058 21574) (19059 22577) (19060 22857) ( -19061 23453) (19062 23792) (19063 23791) (19064 23849) (19065 24214) (19066 25265) (19067 25447) ( -19068 25918) (19069 26041) (19070 26379))] - -[75 ((19233 27861) (19234 27873) (19235 28921) (19236 30770) (19237 32299) (19238 32990) (19239 33459) - (19240 33804) (19241 34028) (19242 34562) (19243 35090) (19244 35370) (19245 35914) (19246 37030) ( -19247 37586) (19248 39165) (19249 40179) (19250 40300) (19251 20047) (19252 20129) (19253 20621) ( -19254 21078) (19255 22346) (19256 22952) (19257 24125) (19258 24536) (19259 24537) (19260 25151) ( -19261 26292) (19262 26395) (19263 26576) (19264 26834) (19265 20882) (19266 32033) (19267 32938) ( -19268 33192) (19269 35584) (19270 35980) (19271 36031) (19272 37502) (19273 38450) (19274 21536) ( -19275 38956) (19276 21271) (19277 20693) (19278 21340) (19279 22696) (19280 25778) (19281 26420) ( -19282 29287) (19283 30566) (19284 31302) (19285 37350) (19286 21187) (19287 27809) (19288 27526) ( -19289 22528) (19290 24140) (19291 22868) (19292 26412) (19293 32763) (19294 20961) (19295 30406) ( -19296 25705) (19297 30952) (19298 39764) (19299 40635) (19300 22475) (19301 22969) (19302 26151) ( -19303 26522) (19304 27598) (19305 21737) (19306 27097) (19307 24149) (19308 33180) (19309 26517) ( -19310 39850) (19311 26622) (19312 40018) (19313 26717) (19314 20134) (19315 20451) (19316 21448) ( -19317 25273) (19318 26411) (19319 27819) (19320 36804) (19321 20397) (19322 32365) (19323 40639) ( -19324 19975) (19325 24930) (19326 28288))] - -[76 ((19489 28459) (19490 34067) (19491 21619) (19492 26410) (19493 39749) (19494 24051) (19495 31637) - (19496 23724) (19497 23494) (19498 34588) (19499 28234) (19500 34001) (19501 31252) (19502 33032) ( -19503 22937) (19504 31885) (19505 27665) (19506 30496) (19507 21209) (19508 22818) (19509 28961) ( -19510 29279) (19511 30683) (19512 38695) (19513 40289) (19514 26891) (19515 23167) (19516 23064) ( -19517 20901) (19518 21517) (19519 21629) (19520 26126) (19521 30431) (19522 36855) (19523 37528) ( -19524 40180) (19525 23018) (19526 29277) (19527 28357) (19528 20813) (19529 26825) (19530 32191) ( -19531 32236) (19532 38754) (19533 40634) (19534 25720) (19535 27169) (19536 33538) (19537 22916) ( -19538 23391) (19539 27611) (19540 29467) (19541 30450) (19542 32178) (19543 32791) (19544 33945) ( -19545 20786) (19546 26408) (19547 40665) (19548 30446) (19549 26466) (19550 21247) (19551 39173) ( -19552 23588) (19553 25147) (19554 31870) (19555 36016) (19556 21839) (19557 24758) (19558 32011) ( -19559 38272) (19560 21249) (19561 20063) (19562 20918) (19563 22812) (19564 29242) (19565 32822) ( -19566 37326) (19567 24357) (19568 30690) (19569 21380) (19570 24441) (19571 32004) (19572 34220) ( -19573 35379) (19574 36493) (19575 38742) (19576 26611) (19577 34222) (19578 37971) (19579 24841) ( -19580 24840) (19581 27833) (19582 30290))] - -[77 ((19745 35565) (19746 36664) (19747 21807) (19748 20305) (19749 20778) (19750 21191) (19751 21451) - (19752 23461) (19753 24189) (19754 24736) (19755 24962) (19756 25558) (19757 26377) (19758 26586) ( -19759 28263) (19760 28044) (19761 29494) (19762 29495) (19763 30001) (19764 31056) (19765 35029) ( -19766 35480) (19767 36938) (19768 37009) (19769 37109) (19770 38596) (19771 34701) (19772 22805) ( -19773 20104) (19774 20313) (19775 19982) (19776 35465) (19777 36671) (19778 38928) (19779 20653) ( -19780 24188) (19781 22934) (19782 23481) (19783 24248) (19784 25562) (19785 25594) (19786 25793) ( -19787 26332) (19788 26954) (19789 27096) (19790 27915) (19791 28342) (19792 29076) (19793 29992) ( -19794 31407) (19795 32650) (19796 32768) (19797 33865) (19798 33993) (19799 35201) (19800 35617) ( -19801 36362) (19802 36965) (19803 38525) (19804 39178) (19805 24958) (19806 25233) (19807 27442) ( -19808 27779) (19809 28020) (19810 32716) (19811 32764) (19812 28096) (19813 32645) (19814 34746) ( -19815 35064) (19816 26469) (19817 33713) (19818 38972) (19819 38647) (19820 27931) (19821 32097) ( -19822 33853) (19823 37226) (19824 20081) (19825 21365) (19826 23888) (19827 27396) (19828 28651) ( -19829 34253) (19830 34349) (19831 35239) (19832 21033) (19833 21519) (19834 23653) (19835 26446) ( -19836 26792) (19837 29702) (19838 29827))] - -[78 ((20001 30178) (20002 35023) (20003 35041) (20004 37324) (20005 38626) (20006 38520) (20007 24459) - (20008 29575) (20009 31435) (20010 33870) (20011 25504) (20012 30053) (20013 21129) (20014 27969) ( -20015 28316) (20016 29705) (20017 30041) (20018 30827) (20019 31890) (20020 38534) (20021 31452) ( -20022 40845) (20023 20406) (20024 24942) (20025 26053) (20026 34396) (20027 20102) (20028 20142) ( -20029 20698) (20030 20001) (20031 20940) (20032 23534) (20033 26009) (20034 26753) (20035 28092) ( -20036 29471) (20037 30274) (20038 30637) (20039 31260) (20040 31975) (20041 33391) (20042 35538) ( -20043 36988) (20044 37327) (20045 38517) (20046 38936) (20047 21147) (20048 32209) (20049 20523) ( -20050 21400) (20051 26519) (20052 28107) (20053 29136) (20054 29747) (20055 33256) (20056 36650) ( -20057 38563) (20058 40023) (20059 40607) (20060 29792) (20061 22593) (20062 28057) (20063 32047) ( -20064 39006) (20065 20196) (20066 20278) (20067 20363) (20068 20919) (20069 21169) (20070 23994) ( -20071 24604) (20072 29618) (20073 31036) (20074 33491) (20075 37428) (20076 38583) (20077 38646) ( -20078 38666) (20079 40599) (20080 40802) (20081 26278) (20082 27508) (20083 21015) (20084 21155) ( -20085 28872) (20086 35010) (20087 24265) (20088 24651) (20089 24976) (20090 28451) (20091 29001) ( -20092 31806) (20093 32244) (20094 32879))] - -[79 ((20257 34030) (20258 36899) (20259 37676) (20260 21570) (20261 39791) (20262 27347) (20263 28809) - (20264 36034) (20265 36335) (20266 38706) (20267 21172) (20268 23105) (20269 24266) (20270 24324) ( -20271 26391) (20272 27004) (20273 27028) (20274 28010) (20275 28431) (20276 29282) (20277 29436) ( -20278 31725) (20279 32769) (20280 32894) (20281 34635) (20282 37070) (20283 20845) (20284 40595) ( -20285 31108) (20286 32907) (20287 37682) (20288 35542) (20289 20525) (20290 21644) (20291 35441) ( -20292 27498) (20293 36036) (20294 33031) (20295 24785) (20296 26528) (20297 40434) (20298 20121) ( -20299 20120) (20300 39952) (20301 35435) (20302 34241) (20303 34152) (20304 26880) (20305 28286) ( -20306 30871) (20307 33109))] - -[80 ((20513 24332) (20514 19984) (20515 19989) (20516 20010) (20517 20017) (20518 20022) (20519 20028) - (20520 20031) (20521 20034) (20522 20054) (20523 20056) (20524 20098) (20525 20101) (20526 35947) ( -20527 20106) (20528 33298) (20529 24333) (20530 20110) (20531 20126) (20532 20127) (20533 20128) ( -20534 20130) (20535 20144) (20536 20147) (20537 20150) (20538 20174) (20539 20173) (20540 20164) ( -20541 20166) (20542 20162) (20543 20183) (20544 20190) (20545 20205) (20546 20191) (20547 20215) ( -20548 20233) (20549 20314) (20550 20272) (20551 20315) (20552 20317) (20553 20311) (20554 20295) ( -20555 20342) (20556 20360) (20557 20367) (20558 20376) (20559 20347) (20560 20329) (20561 20336) ( -20562 20369) (20563 20335) (20564 20358) (20565 20374) (20566 20760) (20567 20436) (20568 20447) ( -20569 20430) (20570 20440) (20571 20443) (20572 20433) (20573 20442) (20574 20432) (20575 20452) ( -20576 20453) (20577 20506) (20578 20520) (20579 20500) (20580 20522) (20581 20517) (20582 20485) ( -20583 20252) (20584 20470) (20585 20513) (20586 20521) (20587 20524) (20588 20478) (20589 20463) ( -20590 20497) (20591 20486) (20592 20547) (20593 20551) (20594 26371) (20595 20565) (20596 20560) ( -20597 20552) (20598 20570) (20599 20566) (20600 20588) (20601 20600) (20602 20608) (20603 20634) ( -20604 20613) (20605 20660) (20606 20658))] - -[81 ((20769 20681) (20770 20682) (20771 20659) (20772 20674) (20773 20694) (20774 20702) (20775 20709) - (20776 20717) (20777 20707) (20778 20718) (20779 20729) (20780 20725) (20781 20745) (20782 20737) ( -20783 20738) (20784 20758) (20785 20757) (20786 20756) (20787 20762) (20788 20769) (20789 20794) ( -20790 20791) (20791 20796) (20792 20795) (20793 20799) (20794 20800) (20795 20818) (20796 20812) ( -20797 20820) (20798 20834) (20799 31480) (20800 20841) (20801 20842) (20802 20846) (20803 20864) ( -20804 20866) (20805 22232) (20806 20876) (20807 20873) (20808 20879) (20809 20881) (20810 20883) ( -20811 20885) (20812 20886) (20813 20900) (20814 20902) (20815 20898) (20816 20905) (20817 20906) ( -20818 20907) (20819 20915) (20820 20913) (20821 20914) (20822 20912) (20823 20917) (20824 20925) ( -20825 20933) (20826 20937) (20827 20955) (20828 20960) (20829 34389) (20830 20969) (20831 20973) ( -20832 20976) (20833 20981) (20834 20990) (20835 20996) (20836 21003) (20837 21012) (20838 21006) ( -20839 21031) (20840 21034) (20841 21038) (20842 21043) (20843 21049) (20844 21071) (20845 21060) ( -20846 21067) (20847 21068) (20848 21086) (20849 21076) (20850 21098) (20851 21108) (20852 21097) ( -20853 21107) (20854 21119) (20855 21117) (20856 21133) (20857 21140) (20858 21138) (20859 21105) ( -20860 21128) (20861 21137) (20862 36776))] - -[82 ((21025 36775) (21026 21164) (21027 21165) (21028 21180) (21029 21173) (21030 21185) (21031 21197) - (21032 21207) (21033 21214) (21034 21219) (21035 21222) (21036 39149) (21037 21216) (21038 21235) ( -21039 21237) (21040 21240) (21041 21241) (21042 21254) (21043 21256) (21044 30008) (21045 21261) ( -21046 21264) (21047 21263) (21048 21269) (21049 21274) (21050 21283) (21051 21295) (21052 21297) ( -21053 21299) (21054 21304) (21055 21312) (21056 21318) (21057 21317) (21058 19991) (21059 21321) ( -21060 21325) (21061 20950) (21062 21342) (21063 21353) (21064 21358) (21065 22808) (21066 21371) ( -21067 21367) (21068 21378) (21069 21398) (21070 21408) (21071 21414) (21072 21413) (21073 21422) ( -21074 21424) (21075 21430) (21076 21443) (21077 31762) (21078 38617) (21079 21471) (21080 26364) ( -21081 29166) (21082 21486) (21083 21480) (21084 21485) (21085 21498) (21086 21505) (21087 21565) ( -21088 21568) (21089 21548) (21090 21549) (21091 21564) (21092 21550) (21093 21558) (21094 21545) ( -21095 21533) (21096 21582) (21097 21647) (21098 21621) (21099 21646) (21100 21599) (21101 21617) ( -21102 21623) (21103 21616) (21104 21650) (21105 21627) (21106 21632) (21107 21622) (21108 21636) ( -21109 21648) (21110 21638) (21111 21703) (21112 21666) (21113 21688) (21114 21669) (21115 21676) ( -21116 21700) (21117 21704) (21118 21672))] - -[83 ((21281 21675) (21282 21698) (21283 21668) (21284 21694) (21285 21692) (21286 21720) (21287 21733) - (21288 21734) (21289 21775) (21290 21780) (21291 21757) (21292 21742) (21293 21741) (21294 21754) ( -21295 21730) (21296 21817) (21297 21824) (21298 21859) (21299 21836) (21300 21806) (21301 21852) ( -21302 21829) (21303 21846) (21304 21847) (21305 21816) (21306 21811) (21307 21853) (21308 21913) ( -21309 21888) (21310 21679) (21311 21898) (21312 21919) (21313 21883) (21314 21886) (21315 21912) ( -21316 21918) (21317 21934) (21318 21884) (21319 21891) (21320 21929) (21321 21895) (21322 21928) ( -21323 21978) (21324 21957) (21325 21983) (21326 21956) (21327 21980) (21328 21988) (21329 21972) ( -21330 22036) (21331 22007) (21332 22038) (21333 22014) (21334 22013) (21335 22043) (21336 22009) ( -21337 22094) (21338 22096) (21339 29151) (21340 22068) (21341 22070) (21342 22066) (21343 22072) ( -21344 22123) (21345 22116) (21346 22063) (21347 22124) (21348 22122) (21349 22150) (21350 22144) ( -21351 22154) (21352 22176) (21353 22164) (21354 22159) (21355 22181) (21356 22190) (21357 22198) ( -21358 22196) (21359 22210) (21360 22204) (21361 22209) (21362 22211) (21363 22208) (21364 22216) ( -21365 22222) (21366 22225) (21367 22227) (21368 22231) (21369 22254) (21370 22265) (21371 22272) ( -21372 22271) (21373 22276) (21374 22281))] - -[84 ((21537 22280) (21538 22283) (21539 22285) (21540 22291) (21541 22296) (21542 22294) (21543 21959) - (21544 22300) (21545 22310) (21546 22327) (21547 22328) (21548 22350) (21549 22331) (21550 22336) ( -21551 22351) (21552 22377) (21553 22464) (21554 22408) (21555 22369) (21556 22399) (21557 22409) ( -21558 22419) (21559 22432) (21560 22451) (21561 22436) (21562 22442) (21563 22448) (21564 22467) ( -21565 22470) (21566 22484) (21567 22482) (21568 22483) (21569 22538) (21570 22486) (21571 22499) ( -21572 22539) (21573 22553) (21574 22557) (21575 22642) (21576 22561) (21577 22626) (21578 22603) ( -21579 22640) (21580 27584) (21581 22610) (21582 22589) (21583 22649) (21584 22661) (21585 22713) ( -21586 22687) (21587 22699) (21588 22714) (21589 22750) (21590 22715) (21591 22712) (21592 22702) ( -21593 22725) (21594 22739) (21595 22737) (21596 22743) (21597 22745) (21598 22744) (21599 22757) ( -21600 22748) (21601 22756) (21602 22751) (21603 22767) (21604 22778) (21605 22777) (21606 22779) ( -21607 22780) (21608 22781) (21609 22786) (21610 22794) (21611 22800) (21612 22811) (21613 26790) ( -21614 22821) (21615 22828) (21616 22829) (21617 22834) (21618 22840) (21619 22846) (21620 31442) ( -21621 22869) (21622 22864) (21623 22862) (21624 22874) (21625 22872) (21626 22882) (21627 22880) ( -21628 22887) (21629 22892) (21630 22889))] - -[85 ((21793 22904) (21794 22913) (21795 22941) (21796 20318) (21797 20395) (21798 22947) (21799 22962) - (21800 22982) (21801 23016) (21802 23004) (21803 22925) (21804 23001) (21805 23002) (21806 23077) ( -21807 23071) (21808 23057) (21809 23068) (21810 23049) (21811 23066) (21812 23104) (21813 23148) ( -21814 23113) (21815 23093) (21816 23094) (21817 23138) (21818 23146) (21819 23194) (21820 23228) ( -21821 23230) (21822 23243) (21823 23234) (21824 23229) (21825 23267) (21826 23255) (21827 23270) ( -21828 23273) (21829 23254) (21830 23290) (21831 23291) (21832 23308) (21833 23307) (21834 23318) ( -21835 23346) (21836 23248) (21837 23338) (21838 23350) (21839 23358) (21840 23363) (21841 23365) ( -21842 23360) (21843 23377) (21844 23381) (21845 23386) (21846 23387) (21847 23397) (21848 23401) ( -21849 23408) (21850 23411) (21851 23413) (21852 23416) (21853 25992) (21854 23418) (21855 23424) ( -21856 23427) (21857 23462) (21858 23480) (21859 23491) (21860 23495) (21861 23497) (21862 23508) ( -21863 23504) (21864 23524) (21865 23526) (21866 23522) (21867 23518) (21868 23525) (21869 23531) ( -21870 23536) (21871 23542) (21872 23539) (21873 23557) (21874 23559) (21875 23560) (21876 23565) ( -21877 23571) (21878 23584) (21879 23586) (21880 23592) (21881 23608) (21882 23609) (21883 23617) ( -21884 23622) (21885 23630) (21886 23635))] - -[86 ((22049 23632) (22050 23631) (22051 23409) (22052 23660) (22053 23662) (22054 20066) (22055 23670) - (22056 23673) (22057 23692) (22058 23697) (22059 23700) (22060 22939) (22061 23723) (22062 23739) ( -22063 23734) (22064 23740) (22065 23735) (22066 23749) (22067 23742) (22068 23751) (22069 23769) ( -22070 23785) (22071 23805) (22072 23802) (22073 23789) (22074 23948) (22075 23786) (22076 23819) ( -22077 23829) (22078 23831) (22079 23900) (22080 23839) (22081 23835) (22082 23825) (22083 23828) ( -22084 23842) (22085 23834) (22086 23833) (22087 23832) (22088 23884) (22089 23890) (22090 23886) ( -22091 23883) (22092 23916) (22093 23923) (22094 23926) (22095 23943) (22096 23940) (22097 23938) ( -22098 23970) (22099 23965) (22100 23980) (22101 23982) (22102 23997) (22103 23952) (22104 23991) ( -22105 23996) (22106 24009) (22107 24013) (22108 24019) (22109 24018) (22110 24022) (22111 24027) ( -22112 24043) (22113 24050) (22114 24053) (22115 24075) (22116 24090) (22117 24089) (22118 24081) ( -22119 24091) (22120 24118) (22121 24119) (22122 24132) (22123 24131) (22124 24128) (22125 24142) ( -22126 24151) (22127 24148) (22128 24159) (22129 24162) (22130 24164) (22131 24135) (22132 24181) ( -22133 24182) (22134 24186) (22135 40636) (22136 24191) (22137 24224) (22138 24257) (22139 24258) ( -22140 24264) (22141 24272) (22142 24271))] - -[87 ((22305 24278) (22306 24291) (22307 24285) (22308 24282) (22309 24283) (22310 24290) (22311 24289) - (22312 24296) (22313 24297) (22314 24300) (22315 24305) (22316 24307) (22317 24304) (22318 24308) ( -22319 24312) (22320 24318) (22321 24323) (22322 24329) (22323 24413) (22324 24412) (22325 24331) ( -22326 24337) (22327 24342) (22328 24361) (22329 24365) (22330 24376) (22331 24385) (22332 24392) ( -22333 24396) (22334 24398) (22335 24367) (22336 24401) (22337 24406) (22338 24407) (22339 24409) ( -22340 24417) (22341 24429) (22342 24435) (22343 24439) (22344 24451) (22345 24450) (22346 24447) ( -22347 24458) (22348 24456) (22349 24465) (22350 24455) (22351 24478) (22352 24473) (22353 24472) ( -22354 24480) (22355 24488) (22356 24493) (22357 24508) (22358 24534) (22359 24571) (22360 24548) ( -22361 24568) (22362 24561) (22363 24541) (22364 24755) (22365 24575) (22366 24609) (22367 24672) ( -22368 24601) (22369 24592) (22370 24617) (22371 24590) (22372 24625) (22373 24603) (22374 24597) ( -22375 24619) (22376 24614) (22377 24591) (22378 24634) (22379 24666) (22380 24641) (22381 24682) ( -22382 24695) (22383 24671) (22384 24650) (22385 24646) (22386 24653) (22387 24675) (22388 24643) ( -22389 24676) (22390 24642) (22391 24684) (22392 24683) (22393 24665) (22394 24705) (22395 24717) ( -22396 24807) (22397 24707) (22398 24730))] - -[88 ((22561 24708) (22562 24731) (22563 24726) (22564 24727) (22565 24722) (22566 24743) (22567 24715) - (22568 24801) (22569 24760) (22570 24800) (22571 24787) (22572 24756) (22573 24560) (22574 24765) ( -22575 24774) (22576 24757) (22577 24792) (22578 24909) (22579 24853) (22580 24838) (22581 24822) ( -22582 24823) (22583 24832) (22584 24820) (22585 24826) (22586 24835) (22587 24865) (22588 24827) ( -22589 24817) (22590 24845) (22591 24846) (22592 24903) (22593 24894) (22594 24872) (22595 24871) ( -22596 24906) (22597 24895) (22598 24892) (22599 24876) (22600 24884) (22601 24893) (22602 24898) ( -22603 24900) (22604 24947) (22605 24951) (22606 24920) (22607 24921) (22608 24922) (22609 24939) ( -22610 24948) (22611 24943) (22612 24933) (22613 24945) (22614 24927) (22615 24925) (22616 24915) ( -22617 24949) (22618 24985) (22619 24982) (22620 24967) (22621 25004) (22622 24980) (22623 24986) ( -22624 24970) (22625 24977) (22626 25003) (22627 25006) (22628 25036) (22629 25034) (22630 25033) ( -22631 25079) (22632 25032) (22633 25027) (22634 25030) (22635 25018) (22636 25035) (22637 32633) ( -22638 25037) (22639 25062) (22640 25059) (22641 25078) (22642 25082) (22643 25076) (22644 25087) ( -22645 25085) (22646 25084) (22647 25086) (22648 25088) (22649 25096) (22650 25097) (22651 25101) ( -22652 25100) (22653 25108) (22654 25115))] - -[89 ((22817 25118) (22818 25121) (22819 25130) (22820 25134) (22821 25136) (22822 25138) (22823 25139) - (22824 25153) (22825 25166) (22826 25182) (22827 25187) (22828 25179) (22829 25184) (22830 25192) ( -22831 25212) (22832 25218) (22833 25225) (22834 25214) (22835 25234) (22836 25235) (22837 25238) ( -22838 25300) (22839 25219) (22840 25236) (22841 25303) (22842 25297) (22843 25275) (22844 25295) ( -22845 25343) (22846 25286) (22847 25812) (22848 25288) (22849 25308) (22850 25292) (22851 25290) ( -22852 25282) (22853 25287) (22854 25243) (22855 25289) (22856 25356) (22857 25326) (22858 25329) ( -22859 25383) (22860 25346) (22861 25352) (22862 25327) (22863 25333) (22864 25424) (22865 25406) ( -22866 25421) (22867 25628) (22868 25423) (22869 25494) (22870 25486) (22871 25472) (22872 25515) ( -22873 25462) (22874 25507) (22875 25487) (22876 25481) (22877 25503) (22878 25525) (22879 25451) ( -22880 25449) (22881 25534) (22882 25577) (22883 25536) (22884 25542) (22885 25571) (22886 25545) ( -22887 25554) (22888 25590) (22889 25540) (22890 25622) (22891 25652) (22892 25606) (22893 25619) ( -22894 25638) (22895 25654) (22896 25885) (22897 25623) (22898 25640) (22899 25615) (22900 25703) ( -22901 25711) (22902 25718) (22903 25678) (22904 25898) (22905 25749) (22906 25747) (22907 25765) ( -22908 25769) (22909 25736) (22910 25788))] - -[90 ((23073 25818) (23074 25810) (23075 25797) (23076 25799) (23077 25787) (23078 25816) (23079 25794) - (23080 25841) (23081 25831) (23082 33289) (23083 25824) (23084 25825) (23085 25260) (23086 25827) ( -23087 25839) (23088 25900) (23089 25846) (23090 25844) (23091 25842) (23092 25850) (23093 25856) ( -23094 25853) (23095 25880) (23096 25884) (23097 25861) (23098 25892) (23099 25891) (23100 25899) ( -23101 25908) (23102 25909) (23103 25911) (23104 25910) (23105 25912) (23106 30027) (23107 25928) ( -23108 25942) (23109 25941) (23110 25933) (23111 25944) (23112 25950) (23113 25949) (23114 25970) ( -23115 25976) (23116 25986) (23117 25987) (23118 35722) (23119 26011) (23120 26015) (23121 26027) ( -23122 26039) (23123 26051) (23124 26054) (23125 26049) (23126 26052) (23127 26060) (23128 26066) ( -23129 26075) (23130 26073) (23131 26080) (23132 26081) (23133 26097) (23134 26482) (23135 26122) ( -23136 26115) (23137 26107) (23138 26483) (23139 26165) (23140 26166) (23141 26164) (23142 26140) ( -23143 26191) (23144 26180) (23145 26185) (23146 26177) (23147 26206) (23148 26205) (23149 26212) ( -23150 26215) (23151 26216) (23152 26207) (23153 26210) (23154 26224) (23155 26243) (23156 26248) ( -23157 26254) (23158 26249) (23159 26244) (23160 26264) (23161 26269) (23162 26305) (23163 26297) ( -23164 26313) (23165 26302) (23166 26300))] - -[91 ((23329 26308) (23330 26296) (23331 26326) (23332 26330) (23333 26336) (23334 26175) (23335 26342) - (23336 26345) (23337 26352) (23338 26357) (23339 26359) (23340 26383) (23341 26390) (23342 26398) ( -23343 26406) (23344 26407) (23345 38712) (23346 26414) (23347 26431) (23348 26422) (23349 26433) ( -23350 26424) (23351 26423) (23352 26438) (23353 26462) (23354 26464) (23355 26457) (23356 26467) ( -23357 26468) (23358 26505) (23359 26480) (23360 26537) (23361 26492) (23362 26474) (23363 26508) ( -23364 26507) (23365 26534) (23366 26529) (23367 26501) (23368 26551) (23369 26607) (23370 26548) ( -23371 26604) (23372 26547) (23373 26601) (23374 26552) (23375 26596) (23376 26590) (23377 26589) ( -23378 26594) (23379 26606) (23380 26553) (23381 26574) (23382 26566) (23383 26599) (23384 27292) ( -23385 26654) (23386 26694) (23387 26665) (23388 26688) (23389 26701) (23390 26674) (23391 26702) ( -23392 26803) (23393 26667) (23394 26713) (23395 26723) (23396 26743) (23397 26751) (23398 26783) ( -23399 26767) (23400 26797) (23401 26772) (23402 26781) (23403 26779) (23404 26755) (23405 27310) ( -23406 26809) (23407 26740) (23408 26805) (23409 26784) (23410 26810) (23411 26895) (23412 26765) ( -23413 26750) (23414 26881) (23415 26826) (23416 26888) (23417 26840) (23418 26914) (23419 26918) ( -23420 26849) (23421 26892) (23422 26829))] - -[92 ((23585 26836) (23586 26855) (23587 26837) (23588 26934) (23589 26898) (23590 26884) (23591 26839) - (23592 26851) (23593 26917) (23594 26873) (23595 26848) (23596 26863) (23597 26920) (23598 26922) ( -23599 26906) (23600 26915) (23601 26913) (23602 26822) (23603 27001) (23604 26999) (23605 26972) ( -23606 27000) (23607 26987) (23608 26964) (23609 27006) (23610 26990) (23611 26937) (23612 26996) ( -23613 26941) (23614 26969) (23615 26928) (23616 26977) (23617 26974) (23618 26973) (23619 27009) ( -23620 26986) (23621 27058) (23622 27054) (23623 27088) (23624 27071) (23625 27073) (23626 27091) ( -23627 27070) (23628 27086) (23629 23528) (23630 27082) (23631 27101) (23632 27067) (23633 27075) ( -23634 27047) (23635 27182) (23636 27025) (23637 27040) (23638 27036) (23639 27029) (23640 27060) ( -23641 27102) (23642 27112) (23643 27138) (23644 27163) (23645 27135) (23646 27402) (23647 27129) ( -23648 27122) (23649 27111) (23650 27141) (23651 27057) (23652 27166) (23653 27117) (23654 27156) ( -23655 27115) (23656 27146) (23657 27154) (23658 27329) (23659 27171) (23660 27155) (23661 27204) ( -23662 27148) (23663 27250) (23664 27190) (23665 27256) (23666 27207) (23667 27234) (23668 27225) ( -23669 27238) (23670 27208) (23671 27192) (23672 27170) (23673 27280) (23674 27277) (23675 27296) ( -23676 27268) (23677 27298) (23678 27299))] - -[93 ((23841 27287) (23842 34327) (23843 27323) (23844 27331) (23845 27330) (23846 27320) (23847 27315) - (23848 27308) (23849 27358) (23850 27345) (23851 27359) (23852 27306) (23853 27354) (23854 27370) ( -23855 27387) (23856 27397) (23857 34326) (23858 27386) (23859 27410) (23860 27414) (23861 39729) ( -23862 27423) (23863 27448) (23864 27447) (23865 30428) (23866 27449) (23867 39150) (23868 27463) ( -23869 27459) (23870 27465) (23871 27472) (23872 27481) (23873 27476) (23874 27483) (23875 27487) ( -23876 27489) (23877 27512) (23878 27513) (23879 27519) (23880 27520) (23881 27524) (23882 27523) ( -23883 27533) (23884 27544) (23885 27541) (23886 27550) (23887 27556) (23888 27562) (23889 27563) ( -23890 27567) (23891 27570) (23892 27569) (23893 27571) (23894 27575) (23895 27580) (23896 27590) ( -23897 27595) (23898 27603) (23899 27615) (23900 27628) (23901 27627) (23902 27635) (23903 27631) ( -23904 40638) (23905 27656) (23906 27667) (23907 27668) (23908 27675) (23909 27684) (23910 27683) ( -23911 27742) (23912 27733) (23913 27746) (23914 27754) (23915 27778) (23916 27789) (23917 27802) ( -23918 27777) (23919 27803) (23920 27774) (23921 27752) (23922 27763) (23923 27794) (23924 27792) ( -23925 27844) (23926 27889) (23927 27859) (23928 27837) (23929 27863) (23930 27845) (23931 27869) ( -23932 27822) (23933 27825) (23934 27838))] - -[94 ((24097 27834) (24098 27867) (24099 27887) (24100 27865) (24101 27882) (24102 27935) (24103 34893) - (24104 27958) (24105 27947) (24106 27965) (24107 27960) (24108 27929) (24109 27957) (24110 27955) ( -24111 27922) (24112 27916) (24113 28003) (24114 28051) (24115 28004) (24116 27994) (24117 28025) ( -24118 27993) (24119 28046) (24120 28053) (24121 28644) (24122 28037) (24123 28153) (24124 28181) ( -24125 28170) (24126 28085) (24127 28103) (24128 28134) (24129 28088) (24130 28102) (24131 28140) ( -24132 28126) (24133 28108) (24134 28136) (24135 28114) (24136 28101) (24137 28154) (24138 28121) ( -24139 28132) (24140 28117) (24141 28138) (24142 28142) (24143 28205) (24144 28270) (24145 28206) ( -24146 28185) (24147 28274) (24148 28255) (24149 28222) (24150 28195) (24151 28267) (24152 28203) ( -24153 28278) (24154 28237) (24155 28191) (24156 28227) (24157 28218) (24158 28238) (24159 28196) ( -24160 28415) (24161 28189) (24162 28216) (24163 28290) (24164 28330) (24165 28312) (24166 28361) ( -24167 28343) (24168 28371) (24169 28349) (24170 28335) (24171 28356) (24172 28338) (24173 28372) ( -24174 28373) (24175 28303) (24176 28325) (24177 28354) (24178 28319) (24179 28481) (24180 28433) ( -24181 28748) (24182 28396) (24183 28408) (24184 28414) (24185 28479) (24186 28402) (24187 28465) ( -24188 28399) (24189 28466) (24190 28364))] - -[95 ((24353 28478) (24354 28435) (24355 28407) (24356 28550) (24357 28538) (24358 28536) (24359 28545) - (24360 28544) (24361 28527) (24362 28507) (24363 28659) (24364 28525) (24365 28546) (24366 28540) ( -24367 28504) (24368 28558) (24369 28561) (24370 28610) (24371 28518) (24372 28595) (24373 28579) ( -24374 28577) (24375 28580) (24376 28601) (24377 28614) (24378 28586) (24379 28639) (24380 28629) ( -24381 28652) (24382 28628) (24383 28632) (24384 28657) (24385 28654) (24386 28635) (24387 28681) ( -24388 28683) (24389 28666) (24390 28689) (24391 28673) (24392 28687) (24393 28670) (24394 28699) ( -24395 28698) (24396 28532) (24397 28701) (24398 28696) (24399 28703) (24400 28720) (24401 28734) ( -24402 28722) (24403 28753) (24404 28771) (24405 28825) (24406 28818) (24407 28847) (24408 28913) ( -24409 28844) (24410 28856) (24411 28851) (24412 28846) (24413 28895) (24414 28875) (24415 28893) ( -24416 28889) (24417 28937) (24418 28925) (24419 28956) (24420 28953) (24421 29029) (24422 29013) ( -24423 29064) (24424 29030) (24425 29026) (24426 29004) (24427 29014) (24428 29036) (24429 29071) ( -24430 29179) (24431 29060) (24432 29077) (24433 29096) (24434 29100) (24435 29143) (24436 29113) ( -24437 29118) (24438 29138) (24439 29129) (24440 29140) (24441 29134) (24442 29152) (24443 29164) ( -24444 29159) (24445 29173) (24446 29180))] - -[96 ((24609 29177) (24610 29183) (24611 29197) (24612 29200) (24613 29211) (24614 29224) (24615 29229) - (24616 29228) (24617 29232) (24618 29234) (24619 29243) (24620 29244) (24621 29247) (24622 29248) ( -24623 29254) (24624 29259) (24625 29272) (24626 29300) (24627 29310) (24628 29314) (24629 29313) ( -24630 29319) (24631 29330) (24632 29334) (24633 29346) (24634 29351) (24635 29369) (24636 29362) ( -24637 29379) (24638 29382) (24639 29380) (24640 29390) (24641 29394) (24642 29410) (24643 29408) ( -24644 29409) (24645 29433) (24646 29431) (24647 20495) (24648 29463) (24649 29450) (24650 29468) ( -24651 29462) (24652 29469) (24653 29492) (24654 29487) (24655 29481) (24656 29477) (24657 29502) ( -24658 29518) (24659 29519) (24660 40664) (24661 29527) (24662 29546) (24663 29544) (24664 29552) ( -24665 29560) (24666 29557) (24667 29563) (24668 29562) (24669 29640) (24670 29619) (24671 29646) ( -24672 29627) (24673 29632) (24674 29669) (24675 29678) (24676 29662) (24677 29858) (24678 29701) ( -24679 29807) (24680 29733) (24681 29688) (24682 29746) (24683 29754) (24684 29781) (24685 29759) ( -24686 29791) (24687 29785) (24688 29761) (24689 29788) (24690 29801) (24691 29808) (24692 29795) ( -24693 29802) (24694 29814) (24695 29822) (24696 29835) (24697 29854) (24698 29863) (24699 29898) ( -24700 29903) (24701 29908) (24702 29681))] - -[97 ((24865 29920) (24866 29923) (24867 29927) (24868 29929) (24869 29934) (24870 29938) (24871 29936) - (24872 29937) (24873 29944) (24874 29943) (24875 29956) (24876 29955) (24877 29957) (24878 29964) ( -24879 29966) (24880 29965) (24881 29973) (24882 29971) (24883 29982) (24884 29990) (24885 29996) ( -24886 30012) (24887 30020) (24888 30029) (24889 30026) (24890 30025) (24891 30043) (24892 30022) ( -24893 30042) (24894 30057) (24895 30052) (24896 30055) (24897 30059) (24898 30061) (24899 30072) ( -24900 30070) (24901 30086) (24902 30087) (24903 30068) (24904 30090) (24905 30089) (24906 30082) ( -24907 30100) (24908 30106) (24909 30109) (24910 30117) (24911 30115) (24912 30146) (24913 30131) ( -24914 30147) (24915 30133) (24916 30141) (24917 30136) (24918 30140) (24919 30129) (24920 30157) ( -24921 30154) (24922 30162) (24923 30169) (24924 30179) (24925 30174) (24926 30206) (24927 30207) ( -24928 30204) (24929 30209) (24930 30192) (24931 30202) (24932 30194) (24933 30195) (24934 30219) ( -24935 30221) (24936 30217) (24937 30239) (24938 30247) (24939 30240) (24940 30241) (24941 30242) ( -24942 30244) (24943 30260) (24944 30256) (24945 30267) (24946 30279) (24947 30280) (24948 30278) ( -24949 30300) (24950 30296) (24951 30305) (24952 30306) (24953 30312) (24954 30313) (24955 30314) ( -24956 30311) (24957 30316) (24958 30320))] - -[98 ((25121 30322) (25122 30326) (25123 30328) (25124 30332) (25125 30336) (25126 30339) (25127 30344) - (25128 30347) (25129 30350) (25130 30358) (25131 30355) (25132 30361) (25133 30362) (25134 30384) ( -25135 30388) (25136 30392) (25137 30393) (25138 30394) (25139 30402) (25140 30413) (25141 30422) ( -25142 30418) (25143 30430) (25144 30433) (25145 30437) (25146 30439) (25147 30442) (25148 34351) ( -25149 30459) (25150 30472) (25151 30471) (25152 30468) (25153 30505) (25154 30500) (25155 30494) ( -25156 30501) (25157 30502) (25158 30491) (25159 30519) (25160 30520) (25161 30535) (25162 30554) ( -25163 30568) (25164 30571) (25165 30555) (25166 30565) (25167 30591) (25168 30590) (25169 30585) ( -25170 30606) (25171 30603) (25172 30609) (25173 30624) (25174 30622) (25175 30640) (25176 30646) ( -25177 30649) (25178 30655) (25179 30652) (25180 30653) (25181 30651) (25182 30663) (25183 30669) ( -25184 30679) (25185 30682) (25186 30684) (25187 30691) (25188 30702) (25189 30716) (25190 30732) ( -25191 30738) (25192 31014) (25193 30752) (25194 31018) (25195 30789) (25196 30862) (25197 30836) ( -25198 30854) (25199 30844) (25200 30874) (25201 30860) (25202 30883) (25203 30901) (25204 30890) ( -25205 30895) (25206 30929) (25207 30918) (25208 30923) (25209 30932) (25210 30910) (25211 30908) ( -25212 30917) (25213 30922) (25214 30956))] - -[99 ((25377 30951) (25378 30938) (25379 30973) (25380 30964) (25381 30983) (25382 30994) (25383 30993) - (25384 31001) (25385 31020) (25386 31019) (25387 31040) (25388 31072) (25389 31063) (25390 31071) ( -25391 31066) (25392 31061) (25393 31059) (25394 31098) (25395 31103) (25396 31114) (25397 31133) ( -25398 31143) (25399 40779) (25400 31146) (25401 31150) (25402 31155) (25403 31161) (25404 31162) ( -25405 31177) (25406 31189) (25407 31207) (25408 31212) (25409 31201) (25410 31203) (25411 31240) ( -25412 31245) (25413 31256) (25414 31257) (25415 31264) (25416 31263) (25417 31104) (25418 31281) ( -25419 31291) (25420 31294) (25421 31287) (25422 31299) (25423 31319) (25424 31305) (25425 31329) ( -25426 31330) (25427 31337) (25428 40861) (25429 31344) (25430 31353) (25431 31357) (25432 31368) ( -25433 31383) (25434 31381) (25435 31384) (25436 31382) (25437 31401) (25438 31432) (25439 31408) ( -25440 31414) (25441 31429) (25442 31428) (25443 31423) (25444 36995) (25445 31431) (25446 31434) ( -25447 31437) (25448 31439) (25449 31445) (25450 31443) (25451 31449) (25452 31450) (25453 31453) ( -25454 31457) (25455 31458) (25456 31462) (25457 31469) (25458 31472) (25459 31490) (25460 31503) ( -25461 31498) (25462 31494) (25463 31539) (25464 31512) (25465 31513) (25466 31518) (25467 31541) ( -25468 31528) (25469 31542) (25470 31568))] - -[100 ((25633 31610) (25634 31492) (25635 31565) (25636 31499) (25637 31564) (25638 31557) (25639 31605 -) (25640 31589) (25641 31604) (25642 31591) (25643 31600) (25644 31601) (25645 31596) (25646 31598) ( -25647 31645) (25648 31640) (25649 31647) (25650 31629) (25651 31644) (25652 31642) (25653 31627) ( -25654 31634) (25655 31631) (25656 31581) (25657 31641) (25658 31691) (25659 31681) (25660 31692) ( -25661 31695) (25662 31668) (25663 31686) (25664 31709) (25665 31721) (25666 31761) (25667 31764) ( -25668 31718) (25669 31717) (25670 31840) (25671 31744) (25672 31751) (25673 31763) (25674 31731) ( -25675 31735) (25676 31767) (25677 31757) (25678 31734) (25679 31779) (25680 31783) (25681 31786) ( -25682 31775) (25683 31799) (25684 31787) (25685 31805) (25686 31820) (25687 31811) (25688 31828) ( -25689 31823) (25690 31808) (25691 31824) (25692 31832) (25693 31839) (25694 31844) (25695 31830) ( -25696 31845) (25697 31852) (25698 31861) (25699 31875) (25700 31888) (25701 31908) (25702 31917) ( -25703 31906) (25704 31915) (25705 31905) (25706 31912) (25707 31923) (25708 31922) (25709 31921) ( -25710 31918) (25711 31929) (25712 31933) (25713 31936) (25714 31941) (25715 31938) (25716 31960) ( -25717 31954) (25718 31964) (25719 31970) (25720 39739) (25721 31983) (25722 31986) (25723 31988) ( -25724 31990) (25725 31994) (25726 32006))] - -[101 ((25889 32002) (25890 32028) (25891 32021) (25892 32010) (25893 32069) (25894 32075) (25895 32046 -) (25896 32050) (25897 32063) (25898 32053) (25899 32070) (25900 32115) (25901 32086) (25902 32078) ( -25903 32114) (25904 32104) (25905 32110) (25906 32079) (25907 32099) (25908 32147) (25909 32137) ( -25910 32091) (25911 32143) (25912 32125) (25913 32155) (25914 32186) (25915 32174) (25916 32163) ( -25917 32181) (25918 32199) (25919 32189) (25920 32171) (25921 32317) (25922 32162) (25923 32175) ( -25924 32220) (25925 32184) (25926 32159) (25927 32176) (25928 32216) (25929 32221) (25930 32228) ( -25931 32222) (25932 32251) (25933 32242) (25934 32225) (25935 32261) (25936 32266) (25937 32291) ( -25938 32289) (25939 32274) (25940 32305) (25941 32287) (25942 32265) (25943 32267) (25944 32290) ( -25945 32326) (25946 32358) (25947 32315) (25948 32309) (25949 32313) (25950 32323) (25951 32311) ( -25952 32306) (25953 32314) (25954 32359) (25955 32349) (25956 32342) (25957 32350) (25958 32345) ( -25959 32346) (25960 32377) (25961 32362) (25962 32361) (25963 32380) (25964 32379) (25965 32387) ( -25966 32213) (25967 32381) (25968 36782) (25969 32383) (25970 32392) (25971 32393) (25972 32396) ( -25973 32402) (25974 32400) (25975 32403) (25976 32404) (25977 32406) (25978 32398) (25979 32411) ( -25980 32412) (25981 32568) (25982 32570))] - -[102 ((26145 32581) (26146 32588) (26147 32589) (26148 32590) (26149 32592) (26150 32593) (26151 32597 -) (26152 32596) (26153 32600) (26154 32607) (26155 32608) (26156 32616) (26157 32617) (26158 32615) ( -26159 32632) (26160 32642) (26161 32646) (26162 32643) (26163 32648) (26164 32647) (26165 32652) ( -26166 32660) (26167 32670) (26168 32669) (26169 32666) (26170 32675) (26171 32687) (26172 32690) ( -26173 32697) (26174 32686) (26175 32694) (26176 32696) (26177 35697) (26178 32709) (26179 32710) ( -26180 32714) (26181 32725) (26182 32724) (26183 32737) (26184 32742) (26185 32745) (26186 32755) ( -26187 32761) (26188 39132) (26189 32774) (26190 32772) (26191 32779) (26192 32786) (26193 32792) ( -26194 32793) (26195 32796) (26196 32801) (26197 32808) (26198 32831) (26199 32827) (26200 32842) ( -26201 32838) (26202 32850) (26203 32856) (26204 32858) (26205 32863) (26206 32866) (26207 32872) ( -26208 32883) (26209 32882) (26210 32880) (26211 32886) (26212 32889) (26213 32893) (26214 32895) ( -26215 32900) (26216 32902) (26217 32901) (26218 32923) (26219 32915) (26220 32922) (26221 32941) ( -26222 20880) (26223 32940) (26224 32987) (26225 32997) (26226 32985) (26227 32989) (26228 32964) ( -26229 32986) (26230 32982) (26231 33033) (26232 33007) (26233 33009) (26234 33051) (26235 33065) ( -26236 33059) (26237 33071) (26238 33099))] - -[103 ((26401 38539) (26402 33094) (26403 33086) (26404 33107) (26405 33105) (26406 33020) (26407 33137 -) (26408 33134) (26409 33125) (26410 33126) (26411 33140) (26412 33155) (26413 33160) (26414 33162) ( -26415 33152) (26416 33154) (26417 33184) (26418 33173) (26419 33188) (26420 33187) (26421 33119) ( -26422 33171) (26423 33193) (26424 33200) (26425 33205) (26426 33214) (26427 33208) (26428 33213) ( -26429 33216) (26430 33218) (26431 33210) (26432 33225) (26433 33229) (26434 33233) (26435 33241) ( -26436 33240) (26437 33224) (26438 33242) (26439 33247) (26440 33248) (26441 33255) (26442 33274) ( -26443 33275) (26444 33278) (26445 33281) (26446 33282) (26447 33285) (26448 33287) (26449 33290) ( -26450 33293) (26451 33296) (26452 33302) (26453 33321) (26454 33323) (26455 33336) (26456 33331) ( -26457 33344) (26458 33369) (26459 33368) (26460 33373) (26461 33370) (26462 33375) (26463 33380) ( -26464 33378) (26465 33384) (26466 33386) (26467 33387) (26468 33326) (26469 33393) (26470 33399) ( -26471 33400) (26472 33406) (26473 33421) (26474 33426) (26475 33451) (26476 33439) (26477 33467) ( -26478 33452) (26479 33505) (26480 33507) (26481 33503) (26482 33490) (26483 33524) (26484 33523) ( -26485 33530) (26486 33683) (26487 33539) (26488 33531) (26489 33529) (26490 33502) (26491 33542) ( -26492 33500) (26493 33545) (26494 33497))] - -[104 ((26657 33589) (26658 33588) (26659 33558) (26660 33586) (26661 33585) (26662 33600) (26663 33593 -) (26664 33616) (26665 33605) (26666 33583) (26667 33579) (26668 33559) (26669 33560) (26670 33669) ( -26671 33690) (26672 33706) (26673 33695) (26674 33698) (26675 33686) (26676 33571) (26677 33678) ( -26678 33671) (26679 33674) (26680 33660) (26681 33717) (26682 33651) (26683 33653) (26684 33696) ( -26685 33673) (26686 33704) (26687 33780) (26688 33811) (26689 33771) (26690 33742) (26691 33789) ( -26692 33795) (26693 33752) (26694 33803) (26695 33729) (26696 33783) (26697 33799) (26698 33760) ( -26699 33778) (26700 33805) (26701 33826) (26702 33824) (26703 33725) (26704 33848) (26705 34054) ( -26706 33787) (26707 33901) (26708 33834) (26709 33852) (26710 34138) (26711 33924) (26712 33911) ( -26713 33899) (26714 33965) (26715 33902) (26716 33922) (26717 33897) (26718 33862) (26719 33836) ( -26720 33903) (26721 33913) (26722 33845) (26723 33994) (26724 33890) (26725 33977) (26726 33983) ( -26727 33951) (26728 34009) (26729 33997) (26730 33979) (26731 34010) (26732 34000) (26733 33985) ( -26734 33990) (26735 34006) (26736 33953) (26737 34081) (26738 34047) (26739 34036) (26740 34071) ( -26741 34072) (26742 34092) (26743 34079) (26744 34069) (26745 34068) (26746 34044) (26747 34112) ( -26748 34147) (26749 34136) (26750 34120))] - -[105 ((26913 34113) (26914 34306) (26915 34123) (26916 34133) (26917 34176) (26918 34212) (26919 34184 -) (26920 34193) (26921 34186) (26922 34216) (26923 34157) (26924 34196) (26925 34203) (26926 34282) ( -26927 34183) (26928 34204) (26929 34167) (26930 34174) (26931 34192) (26932 34249) (26933 34234) ( -26934 34255) (26935 34233) (26936 34256) (26937 34261) (26938 34269) (26939 34277) (26940 34268) ( -26941 34297) (26942 34314) (26943 34323) (26944 34315) (26945 34302) (26946 34298) (26947 34310) ( -26948 34338) (26949 34330) (26950 34352) (26951 34367) (26952 34381) (26953 20053) (26954 34388) ( -26955 34399) (26956 34407) (26957 34417) (26958 34451) (26959 34467) (26960 34473) (26961 34474) ( -26962 34443) (26963 34444) (26964 34486) (26965 34479) (26966 34500) (26967 34502) (26968 34480) ( -26969 34505) (26970 34851) (26971 34475) (26972 34516) (26973 34526) (26974 34537) (26975 34540) ( -26976 34527) (26977 34523) (26978 34543) (26979 34578) (26980 34566) (26981 34568) (26982 34560) ( -26983 34563) (26984 34555) (26985 34577) (26986 34569) (26987 34573) (26988 34553) (26989 34570) ( -26990 34612) (26991 34623) (26992 34615) (26993 34619) (26994 34597) (26995 34601) (26996 34586) ( -26997 34656) (26998 34655) (26999 34680) (27000 34636) (27001 34638) (27002 34676) (27003 34647) ( -27004 34664) (27005 34670) (27006 34649))] - -[106 ((27169 34643) (27170 34659) (27171 34666) (27172 34821) (27173 34722) (27174 34719) (27175 34690 -) (27176 34735) (27177 34763) (27178 34749) (27179 34752) (27180 34768) (27181 38614) (27182 34731) ( -27183 34756) (27184 34739) (27185 34759) (27186 34758) (27187 34747) (27188 34799) (27189 34802) ( -27190 34784) (27191 34831) (27192 34829) (27193 34814) (27194 34806) (27195 34807) (27196 34830) ( -27197 34770) (27198 34833) (27199 34838) (27200 34837) (27201 34850) (27202 34849) (27203 34865) ( -27204 34870) (27205 34873) (27206 34855) (27207 34875) (27208 34884) (27209 34882) (27210 34898) ( -27211 34905) (27212 34910) (27213 34914) (27214 34923) (27215 34945) (27216 34942) (27217 34974) ( -27218 34933) (27219 34941) (27220 34997) (27221 34930) (27222 34946) (27223 34967) (27224 34962) ( -27225 34990) (27226 34969) (27227 34978) (27228 34957) (27229 34980) (27230 34992) (27231 35007) ( -27232 34993) (27233 35011) (27234 35012) (27235 35028) (27236 35032) (27237 35033) (27238 35037) ( -27239 35065) (27240 35074) (27241 35068) (27242 35060) (27243 35048) (27244 35058) (27245 35076) ( -27246 35084) (27247 35082) (27248 35091) (27249 35139) (27250 35102) (27251 35109) (27252 35114) ( -27253 35115) (27254 35137) (27255 35140) (27256 35131) (27257 35126) (27258 35128) (27259 35148) ( -27260 35101) (27261 35168) (27262 35166))] - -[107 ((27425 35174) (27426 35172) (27427 35181) (27428 35178) (27429 35183) (27430 35188) (27431 35191 -) (27432 35198) (27433 35203) (27434 35208) (27435 35210) (27436 35219) (27437 35224) (27438 35233) ( -27439 35241) (27440 35238) (27441 35244) (27442 35247) (27443 35250) (27444 35258) (27445 35261) ( -27446 35263) (27447 35264) (27448 35290) (27449 35292) (27450 35293) (27451 35303) (27452 35316) ( -27453 35320) (27454 35331) (27455 35350) (27456 35344) (27457 35340) (27458 35355) (27459 35357) ( -27460 35365) (27461 35382) (27462 35393) (27463 35419) (27464 35410) (27465 35398) (27466 35400) ( -27467 35452) (27468 35437) (27469 35436) (27470 35426) (27471 35461) (27472 35458) (27473 35460) ( -27474 35496) (27475 35489) (27476 35473) (27477 35493) (27478 35494) (27479 35482) (27480 35491) ( -27481 35524) (27482 35533) (27483 35522) (27484 35546) (27485 35563) (27486 35571) (27487 35559) ( -27488 35556) (27489 35569) (27490 35604) (27491 35552) (27492 35554) (27493 35575) (27494 35550) ( -27495 35547) (27496 35596) (27497 35591) (27498 35610) (27499 35553) (27500 35606) (27501 35600) ( -27502 35607) (27503 35616) (27504 35635) (27505 38827) (27506 35622) (27507 35627) (27508 35646) ( -27509 35624) (27510 35649) (27511 35660) (27512 35663) (27513 35662) (27514 35657) (27515 35670) ( -27516 35675) (27517 35674) (27518 35691))] - -[108 ((27681 35679) (27682 35692) (27683 35695) (27684 35700) (27685 35709) (27686 35712) (27687 35724 -) (27688 35726) (27689 35730) (27690 35731) (27691 35734) (27692 35737) (27693 35738) (27694 35898) ( -27695 35905) (27696 35903) (27697 35912) (27698 35916) (27699 35918) (27700 35920) (27701 35925) ( -27702 35938) (27703 35948) (27704 35960) (27705 35962) (27706 35970) (27707 35977) (27708 35973) ( -27709 35978) (27710 35981) (27711 35982) (27712 35988) (27713 35964) (27714 35992) (27715 25117) ( -27716 36013) (27717 36010) (27718 36029) (27719 36018) (27720 36019) (27721 36014) (27722 36022) ( -27723 36040) (27724 36033) (27725 36068) (27726 36067) (27727 36058) (27728 36093) (27729 36090) ( -27730 36091) (27731 36100) (27732 36101) (27733 36106) (27734 36103) (27735 36111) (27736 36109) ( -27737 36112) (27738 40782) (27739 36115) (27740 36045) (27741 36116) (27742 36118) (27743 36199) ( -27744 36205) (27745 36209) (27746 36211) (27747 36225) (27748 36249) (27749 36290) (27750 36286) ( -27751 36282) (27752 36303) (27753 36314) (27754 36310) (27755 36300) (27756 36315) (27757 36299) ( -27758 36330) (27759 36331) (27760 36319) (27761 36323) (27762 36348) (27763 36360) (27764 36361) ( -27765 36351) (27766 36381) (27767 36382) (27768 36368) (27769 36383) (27770 36418) (27771 36405) ( -27772 36400) (27773 36404) (27774 36426))] - -[109 ((27937 36423) (27938 36425) (27939 36428) (27940 36432) (27941 36424) (27942 36441) (27943 36452 -) (27944 36448) (27945 36394) (27946 36451) (27947 36437) (27948 36470) (27949 36466) (27950 36476) ( -27951 36481) (27952 36487) (27953 36485) (27954 36484) (27955 36491) (27956 36490) (27957 36499) ( -27958 36497) (27959 36500) (27960 36505) (27961 36522) (27962 36513) (27963 36524) (27964 36528) ( -27965 36550) (27966 36529) (27967 36542) (27968 36549) (27969 36552) (27970 36555) (27971 36571) ( -27972 36579) (27973 36604) (27974 36603) (27975 36587) (27976 36606) (27977 36618) (27978 36613) ( -27979 36629) (27980 36626) (27981 36633) (27982 36627) (27983 36636) (27984 36639) (27985 36635) ( -27986 36620) (27987 36646) (27988 36659) (27989 36667) (27990 36665) (27991 36677) (27992 36674) ( -27993 36670) (27994 36684) (27995 36681) (27996 36678) (27997 36686) (27998 36695) (27999 36700) ( -28000 36706) (28001 36707) (28002 36708) (28003 36764) (28004 36767) (28005 36771) (28006 36781) ( -28007 36783) (28008 36791) (28009 36826) (28010 36837) (28011 36834) (28012 36842) (28013 36847) ( -28014 36999) (28015 36852) (28016 36869) (28017 36857) (28018 36858) (28019 36881) (28020 36885) ( -28021 36897) (28022 36877) (28023 36894) (28024 36886) (28025 36875) (28026 36903) (28027 36918) ( -28028 36917) (28029 36921) (28030 36856))] - -[110 ((28193 36943) (28194 36944) (28195 36945) (28196 36946) (28197 36878) (28198 36937) (28199 36926 -) (28200 36950) (28201 36952) (28202 36958) (28203 36968) (28204 36975) (28205 36982) (28206 38568) ( -28207 36978) (28208 36994) (28209 36989) (28210 36993) (28211 36992) (28212 37002) (28213 37001) ( -28214 37007) (28215 37032) (28216 37039) (28217 37041) (28218 37045) (28219 37090) (28220 37092) ( -28221 25160) (28222 37083) (28223 37122) (28224 37138) (28225 37145) (28226 37170) (28227 37168) ( -28228 37194) (28229 37206) (28230 37208) (28231 37219) (28232 37221) (28233 37225) (28234 37235) ( -28235 37234) (28236 37259) (28237 37257) (28238 37250) (28239 37282) (28240 37291) (28241 37295) ( -28242 37290) (28243 37301) (28244 37300) (28245 37306) (28246 37312) (28247 37313) (28248 37321) ( -28249 37323) (28250 37328) (28251 37334) (28252 37343) (28253 37345) (28254 37339) (28255 37372) ( -28256 37365) (28257 37366) (28258 37406) (28259 37375) (28260 37396) (28261 37420) (28262 37397) ( -28263 37393) (28264 37470) (28265 37463) (28266 37445) (28267 37449) (28268 37476) (28269 37448) ( -28270 37525) (28271 37439) (28272 37451) (28273 37456) (28274 37532) (28275 37526) (28276 37523) ( -28277 37531) (28278 37466) (28279 37583) (28280 37561) (28281 37559) (28282 37609) (28283 37647) ( -28284 37626) (28285 37700) (28286 37678))] - -[111 ((28449 37657) (28450 37666) (28451 37658) (28452 37667) (28453 37690) (28454 37685) (28455 37691 -) (28456 37724) (28457 37728) (28458 37756) (28459 37742) (28460 37718) (28461 37808) (28462 37804) ( -28463 37805) (28464 37780) (28465 37817) (28466 37846) (28467 37847) (28468 37864) (28469 37861) ( -28470 37848) (28471 37827) (28472 37853) (28473 37840) (28474 37832) (28475 37860) (28476 37914) ( -28477 37908) (28478 37907) (28479 37891) (28480 37895) (28481 37904) (28482 37942) (28483 37931) ( -28484 37941) (28485 37921) (28486 37946) (28487 37953) (28488 37970) (28489 37956) (28490 37979) ( -28491 37984) (28492 37986) (28493 37982) (28494 37994) (28495 37417) (28496 38000) (28497 38005) ( -28498 38007) (28499 38013) (28500 37978) (28501 38012) (28502 38014) (28503 38017) (28504 38015) ( -28505 38274) (28506 38279) (28507 38282) (28508 38292) (28509 38294) (28510 38296) (28511 38297) ( -28512 38304) (28513 38312) (28514 38311) (28515 38317) (28516 38332) (28517 38331) (28518 38329) ( -28519 38334) (28520 38346) (28521 28662) (28522 38339) (28523 38349) (28524 38348) (28525 38357) ( -28526 38356) (28527 38358) (28528 38364) (28529 38369) (28530 38373) (28531 38370) (28532 38433) ( -28533 38440) (28534 38446) (28535 38447) (28536 38466) (28537 38476) (28538 38479) (28539 38475) ( -28540 38519) (28541 38492) (28542 38494))] - -[112 ((28705 38493) (28706 38495) (28707 38502) (28708 38514) (28709 38508) (28710 38541) (28711 38552 -) (28712 38549) (28713 38551) (28714 38570) (28715 38567) (28716 38577) (28717 38578) (28718 38576) ( -28719 38580) (28720 38582) (28721 38584) (28722 38585) (28723 38606) (28724 38603) (28725 38601) ( -28726 38605) (28727 35149) (28728 38620) (28729 38669) (28730 38613) (28731 38649) (28732 38660) ( -28733 38662) (28734 38664) (28735 38675) (28736 38670) (28737 38673) (28738 38671) (28739 38678) ( -28740 38681) (28741 38692) (28742 38698) (28743 38704) (28744 38713) (28745 38717) (28746 38718) ( -28747 38724) (28748 38726) (28749 38728) (28750 38722) (28751 38729) (28752 38748) (28753 38752) ( -28754 38756) (28755 38758) (28756 38760) (28757 21202) (28758 38763) (28759 38769) (28760 38777) ( -28761 38789) (28762 38780) (28763 38785) (28764 38778) (28765 38790) (28766 38795) (28767 38799) ( -28768 38800) (28769 38812) (28770 38824) (28771 38822) (28772 38819) (28773 38835) (28774 38836) ( -28775 38851) (28776 38854) (28777 38856) (28778 38859) (28779 38876) (28780 38893) (28781 40783) ( -28782 38898) (28783 31455) (28784 38902) (28785 38901) (28786 38927) (28787 38924) (28788 38968) ( -28789 38948) (28790 38945) (28791 38967) (28792 38973) (28793 38982) (28794 38991) (28795 38987) ( -28796 39019) (28797 39023) (28798 39024))] - -[113 ((28961 39025) (28962 39028) (28963 39027) (28964 39082) (28965 39087) (28966 39089) (28967 39094 -) (28968 39108) (28969 39107) (28970 39110) (28971 39145) (28972 39147) (28973 39171) (28974 39177) ( -28975 39186) (28976 39188) (28977 39192) (28978 39201) (28979 39197) (28980 39198) (28981 39204) ( -28982 39200) (28983 39212) (28984 39214) (28985 39229) (28986 39230) (28987 39234) (28988 39241) ( -28989 39237) (28990 39248) (28991 39243) (28992 39249) (28993 39250) (28994 39244) (28995 39253) ( -28996 39319) (28997 39320) (28998 39333) (28999 39341) (29000 39342) (29001 39356) (29002 39391) ( -29003 39387) (29004 39389) (29005 39384) (29006 39377) (29007 39405) (29008 39406) (29009 39409) ( -29010 39410) (29011 39419) (29012 39416) (29013 39425) (29014 39439) (29015 39429) (29016 39394) ( -29017 39449) (29018 39467) (29019 39479) (29020 39493) (29021 39490) (29022 39488) (29023 39491) ( -29024 39486) (29025 39509) (29026 39501) (29027 39515) (29028 39511) (29029 39519) (29030 39522) ( -29031 39525) (29032 39524) (29033 39529) (29034 39531) (29035 39530) (29036 39597) (29037 39600) ( -29038 39612) (29039 39616) (29040 39631) (29041 39633) (29042 39635) (29043 39636) (29044 39646) ( -29045 39647) (29046 39650) (29047 39651) (29048 39654) (29049 39663) (29050 39659) (29051 39662) ( -29052 39668) (29053 39665) (29054 39671))] - -[114 ((29217 39675) (29218 39686) (29219 39704) (29220 39706) (29221 39711) (29222 39714) (29223 39715 -) (29224 39717) (29225 39719) (29226 39720) (29227 39721) (29228 39722) (29229 39726) (29230 39727) ( -29231 39730) (29232 39748) (29233 39747) (29234 39759) (29235 39757) (29236 39758) (29237 39761) ( -29238 39768) (29239 39796) (29240 39827) (29241 39811) (29242 39825) (29243 39830) (29244 39831) ( -29245 39839) (29246 39840) (29247 39848) (29248 39860) (29249 39872) (29250 39882) (29251 39865) ( -29252 39878) (29253 39887) (29254 39889) (29255 39890) (29256 39907) (29257 39906) (29258 39908) ( -29259 39892) (29260 39905) (29261 39994) (29262 39922) (29263 39921) (29264 39920) (29265 39957) ( -29266 39956) (29267 39945) (29268 39955) (29269 39948) (29270 39942) (29271 39944) (29272 39954) ( -29273 39946) (29274 39940) (29275 39982) (29276 39963) (29277 39973) (29278 39972) (29279 39969) ( -29280 39984) (29281 40007) (29282 39986) (29283 40006) (29284 39998) (29285 40026) (29286 40032) ( -29287 40039) (29288 40054) (29289 40056) (29290 40167) (29291 40172) (29292 40176) (29293 40201) ( -29294 40200) (29295 40171) (29296 40195) (29297 40198) (29298 40234) (29299 40230) (29300 40367) ( -29301 40227) (29302 40223) (29303 40260) (29304 40213) (29305 40210) (29306 40257) (29307 40255) ( -29308 40254) (29309 40262) (29310 40264))] - -[115 ((29473 40285) (29474 40286) (29475 40292) (29476 40273) (29477 40272) (29478 40281) (29479 40306 -) (29480 40329) (29481 40327) (29482 40363) (29483 40303) (29484 40314) (29485 40346) (29486 40356) ( -29487 40361) (29488 40370) (29489 40388) (29490 40385) (29491 40379) (29492 40376) (29493 40378) ( -29494 40390) (29495 40399) (29496 40386) (29497 40409) (29498 40403) (29499 40440) (29500 40422) ( -29501 40429) (29502 40431) (29503 40445) (29504 40474) (29505 40475) (29506 40478) (29507 40565) ( -29508 40569) (29509 40573) (29510 40577) (29511 40584) (29512 40587) (29513 40588) (29514 40594) ( -29515 40597) (29516 40593) (29517 40605) (29518 40613) (29519 40617) (29520 40632) (29521 40618) ( -29522 40621) (29523 38753) (29524 40652) (29525 40654) (29526 40655) (29527 40656) (29528 40660) ( -29529 40668) (29530 40670) (29531 40669) (29532 40672) (29533 40677) (29534 40680) (29535 40687) ( -29536 40692) (29537 40694) (29538 40695) (29539 40697) (29540 40699) (29541 40700) (29542 40701) ( -29543 40711) (29544 40712) (29545 30391) (29546 40725) (29547 40737) (29548 40748) (29549 40766) ( -29550 40778) (29551 40786) (29552 40788) (29553 40803) (29554 40799) (29555 40800) (29556 40801) ( -29557 40806) (29558 40807) (29559 40812) (29560 40810) (29561 40823) (29562 40818) (29563 40822) ( -29564 40853) (29565 40860) (29566 40864))] - -[116 ((29740 13027) (29741 13024) (29742 13047) (29743 13030) (29744 12956) (29745 12957) (29746 12960 -) (29747 12949) (29752 12957) (29753 12950) (29754 12953) (29755 12958) (29756 12938) (29757 12939) ( -29758 12940) (29759 12941) (29760 12848) (29761 12842) (29762 12843) (29763 12844) (29764 12845) ( -29765 12846) (29766 12847) (29767 12864) (29768 12855) (29769 12850) (29770 12851) (29771 12852) ( -29772 12853) (29773 12854) (29774 12856) (29775 12857) (29776 13182) (29777 13181) (29778 13180) ( -29779 13179) (29808 9332) (29809 9333) (29810 9334) (29811 9335) (29812 9336) (29813 9337) (29814 9338 -) (29815 9339) (29816 9340) (29817 9341) (29818 9342) (29819 12292) (29857 12896) (29858 12897) (29859 - 12898) (29860 12899) (29861 12900) (29862 12901) (29863 12902) (29864 12903) (29865 12904) (29866 -12905) (29867 12906) (29868 12907) (29869 12908) (29870 12909) (29871 12910) (29872 12911) (29873 -12912) (29874 12913) (29875 12914) (29876 12915) (29877 12916) (29878 12917) (29879 12918) (29880 -12919) (29881 12920) (29882 12921) (29883 12922) (29884 12923) (29888 12800) (29889 12801) (29890 -12802) (29891 12803) (29892 12804) (29893 12805) (29894 12806) (29895 12807) (29896 12808) (29897 -12809) (29898 12810) (29899 12811) (29900 12812) (29901 12813) (29902 12814) (29903 12815) (29904 -12816) (29905 12817) (29906 12818) (29907 12819) (29908 12820) (29909 12821) (29910 12822) (29911 -12823) (29912 12824) (29913 12825) (29914 12826) (29915 12827) (29916 12828) (29921 9372) (29922 9373) - (29923 9374) (29924 9375) (29925 9376) (29926 9377) (29927 9378) (29928 9379) (29929 9380) (29930 -9381) (29931 9382) (29932 9383) (29933 9384) (29934 9385) (29935 9386) (29936 9387) (29937 9388) ( -29938 9389) (29939 9390) (29940 9391) (29941 9392) (29942 9393) (29943 9394) (29944 9395) (29945 9396) - (29946 9397) (29947 9343) (29948 9344) (29949 9345) (29950 9346))] - -[117 ((29985 22575 23383) (29986 24590 27079) (29987 24555 36953) (29988 24107 29796) (29989 20956 -34389) (29990 29081 30456) (29991 27963) (29992 35242) (29993 28023) (29994 38651) (29995 27597) ( -29996 26524) (29997 31435) (29998 21407) (29999 21512) (30000 26360) (30001 20837) (30002 20006) ( -30003 24179) (30004 26989) (30005 22577) (30006 36523) (30007 24066) (30008 34987) (30009 35377) ( -30010 35531) (30011 23569) (30012 38291) (30013 39636) (30014 20303) (30015 36554) (30016 36557) ( -30017 37002) (30018 37325) (30019 21152) (30020 22294) (30021 25110) (30022 27425) (30023 27599) ( -30024 32317) (30025 28779) (30026 25991) (30027 23401) (30028 19990) (30029 23433) (30030 25918) ( -30031 27231) (30032 20839) (30033 38364) (30034 21033) (30035 20687) (30036 29702) (30037 27604) ( -30038 24859) (30039 29579) (30040 21029) (30041 22827) (30042 33287) (30043 20809) (30044 33457) ( -30045 33775) (30046 35506) (30047 32946) (30048 25925) (30049 24517) (30050 26781) (30051 23229) ( -30052 24351) (30053 29238) (30054 36890) (30055 34920) (30056 37329) (30057 23531) (30058 24049) ( -30059 25165) (30060 27827) (30061 30465) (30062 21488) (30063 27714) (30064 25910) (30065 33836) ( -30066 19988) (30067 20309) (30068 20195) (30069 20849) (30070 21463) (30071 39080) (30072 27743) ( -30073 25343) (30074 38627) (30075 30028) (30076 20449) (30077 26395) (30078 31354) (30113 27515) ( -30114 29677) (30115 39340) (30116 26399) (30117 38750) (30118 27193) (30119 21450) (30120 32080) ( -30121 34399) (30122 24118) (30123 20803) (30124 20132) (30125 35442) (30126 26410) (30127 32681) ( -30128 24220) (30129 23436) (30130 35542) (30131 37666) (30132 39131) (30133 21629) (30134 24373) ( -30135 21729) (30136 25976) (30137 26519) (30138 25509) (30139 23616) (30140 21451) (30141 21916) ( -30142 28165) (30143 27915) (30144 27138) (30145 23130) (30146 31038) (30147 26089) (30148 24067) ( -30149 26997) (30150 30524) (30151 21966) (30152 29986) (30153 21578) (30154 21733) (30155 33288) ( -30156 21214) (30157 37941) (30158 21462) (30159 31639) (30160 26356) (30161 20853) (30162 36896) ( -30163 31572) (30164 25214) (30165 32631) (30166 22833) (30167 36939) (30168 24418) (30169 26131) ( -30170 32675) (30171 24230) (30172 21322) (30173 34915) (30174 33509) (30175 33267) (30176 35696) ( -30177 36817) (30178 29031) (30179 35722) (30180 22992) (30181 26381) (30182 21063) (30183 39006) ( -30184 33521) (30185 29699) (30186 21315) (30187 24448) (30188 35611) (30189 35336) (30190 25136) ( -30191 26408) (30192 31505) (30193 21151) (30194 33289) (30195 36319) (30196 31070) (30197 27770) ( -30198 27969) (30199 29105) (30200 21531) (30201 31350) (30202 32004) (30203 38587) (30204 30452) ( -30205 21476) (30206 40643))] - -[118 ((30273 9398) (30274 9399) (30275 9400) (30276 9401) (30277 9402) (30278 9403) (30279 9404) ( -30280 9405) (30281 9406) (30282 9407) (30283 9408) (30284 9409) (30285 9410) (30286 9411) (30287 9412) - (30288 9413) (30289 9414) (30290 9415) (30291 9416) (30292 9417) (30293 9418) (30294 9419) (30295 -9420) (30296 9421) (30297 9422) (30298 9423) (30299 9322) (30300 9323) (30301 9324) (30302 9325) ( -30303 9326) (30305 9424) (30306 9425) (30307 9426) (30308 9427) (30309 9428) (30310 9429) (30311 9430) - (30312 9431) (30313 9432) (30314 9433) (30315 9434) (30316 9435) (30317 9436) (30318 9437) (30319 -9438) (30320 9439) (30321 9440) (30322 9441) (30323 9442) (30324 9443) (30325 9444) (30326 9445) ( -30327 9446) (30328 9447) (30329 9448) (30330 9449) (30331 9327) (30332 9328) (30333 9329) (30334 9330) - (30395 9331) (30396 9450))] - -[224 ((57381 1642) (57388 1548) (57390 1748) (57392 1632) (57393 1633) (57394 1634) (57395 1635) ( -57396 1636) (57397 1637) (57398 1638) (57399 1639) (57400 1640) (57401 1641) (57403 1563) (57407 1567) - (57409 1569) (57410 1570) (57411 1571) (57412 1572) (57413 1573) (57414 1574) (57415 1575) (57416 -1576) (57417 1577) (57418 1578) (57419 1579) (57420 1580) (57421 1581) (57422 1582) (57423 1583) ( -57424 1584) (57425 1585) (57426 1586) (57427 1587) (57428 1588) (57429 1589) (57430 1590) (57431 1591) - (57432 1592) (57433 1593) (57434 1594) (57440 1600) (57441 1601) (57442 1602) (57443 1603) (57444 -1604) (57445 1605) (57446 1606) (57447 1607) (57448 1608) (57449 1609) (57450 1610) (57451 1611) ( -57452 1612) (57453 1613) (57454 1614) (57455 1615) (57456 1616) (57457 1617) (57458 1618) (57459 1648) - (57460 1649) (57461 1643) (57462 1644) (57505 1700) (57506 1662) (57507 1670) (57508 1688) (57509 -1711) (57510 1728) (57511 1657) (57512 1672) (57513 1681) (57514 1722) (57515 1726) (57516 1729) ( -57517 1731) (57518 1730) (57519 1746) (57521 1660) (57522 1665) (57523 1669) (57524 1673) (57525 1683) - (57526 1686) (57527 1690) (57528 1724) (57529 1744) (57530 1741) (57531 1650) (57532 1651) (57533 -1747) (57534 1749) (57535 64467) (57536 1735) (57537 1734) (57538 1736) (57539 64477) (57540 1739) ( -57541 1733) (57542 1737) (57543 1652) (57544 1653) (57545 1654) (57546 1666) (57547 1655) (57548 1656) - (57549 1661) (57550 1674) (57551 1675) (57552 1707) (57553 1679) (57554 1680) (57555 1740) (57556 -1659) (57557 1664) (57558 1658) (57559 1663) (57560 1702) (57561 1668) (57562 1667) (57563 1671) ( -57564 1677) (57565 1676) (57566 1678) (57567 1705) (57568 1715) (57569 1713) (57570 1723) (57571 1682) - (57572 1684) (57573 1685) (57574 1687) (57575 1689) (57576 1691) (57577 1692) (57578 1693) (57579 -1694) (57580 1695) (57581 1696) (57582 1697) (57583 1698) (57584 1699) (57585 1701) (57586 1703) ( -57587 1704) (57588 1706) (57589 1708) (57590 1709) (57592 1710) (57593 1712) (57594 1714) (57595 1716) - (57596 8206) (57597 8207) (57598 8205))] - -[225 ((57634 1438) (57636 8362) (57639 1436) (57644 44) (57645 8209) (57658 1475) (57659 59) (57664 -1488) (57665 1489) (57666 1490) (57667 1491) (57668 1492) (57669 1493) (57670 1494) (57671 1495) ( -57672 1496) (57673 1497) (57674 1498) (57675 1499) (57676 1500) (57677 1501) (57678 1502) (57679 1503) - (57680 1504) (57681 1505) (57682 1506) (57683 1507) (57684 1508) (57685 1509) (57686 1510) (57687 -1511) (57688 1512) (57689 1513) (57690 1514) (57691 64305) (57692 64315) (57693 64324) (57694 64298) ( -57695 64299) (57696 64300) (57697 64301) (57698 64302) (57699 64303) (57700 64331) (57701 64332) ( -57702 64333) (57703 64334) (57704 64335) (57705 64287) (57706 64288) (57707 64289) (57708 64290) ( -57709 64291) (57710 64292) (57711 64293) (57712 64294) (57713 64295) (57714 64296) (57715 64297) ( -57716 1520) (57717 1521) (57718 1522) (57719 64304) (57720 64306) (57721 64307) (57722 64308) (57723 -64309) (57724 64310) (57725 64312) (57726 64313) (57761 64314) (57762 64316) (57763 64318) (57764 -64320) (57765 64321) (57766 64323) (57767 64326) (57768 64327) (57769 64328) (57770 64329) (57771 -64330) (57793 1460) (57794 1461) (57795 1462) (57796 1467) (57797 1464) (57798 1463) (57799 1456) ( -57800 1458) (57801 1457) (57802 1459) (57803 1474) (57804 1473) (57806 1465) (57807 1468) (57839 1469) - (57840 64286) (57841 1471) (57842 1472))] - -[226 ((57889 776) (57890 771) (57891 774) (57892 775) (57893 865) (57894 820) (57895 801) (57896 802) -(57897 805) (57898 812) (57899 804) (57900 810) (57901 811) (57902 809) (57903 797) (57904 803) (57905 - 798) (57906 796) (57907 799) (57908 800) (57909 860) (57910 724) (57911 725) (57914 720) (57915 721) -(57916 825) (57917 796) (57918 712) (57919 716) (57920 772) (57921 817) (57922 769) (57923 791) (57924 - 768) (57925 790) (57926 770) (57927 780) (57928 788) (57929 787) (57930 702) (57937 105) (57938 121) -(57939 617) (57940 618) (57941 655) (57942 101) (57943 248) (57944 603) (57945 339) (57946 230) (57947 - 97) (57948 630) (57949 616) (57950 649) (57951 601) (57952 602) (57953 629) (57954 604) (57955 592) ( -57956 623) (57957 117) (57958 631) (57959 650) (57960 612) (57961 111) (57962 652) (57963 596) (57964 -593) (57965 594) (57966 600) (57967 605) (57968 606) (57969 639) (57970 645) (57971 666) (57980 644) ( -57981 619) (57982 608) (58017 109) (58018 112) (58019 98) (58020 632) (58021 946) (58022 613) (58023 -653) (58024 119) (58025 595) (58026 664) (58027 625) (58028 102) (58029 118) (58030 651) (58031 110) ( -58032 116) (58033 100) (58034 952) (58035 240) (58036 446) (58037 443) (58038 115) (58039 122) (58040 -963) (58041 397) (58042 633) (58043 620) (58044 622) (58045 108) (58046 636) (58047 634) (58048 114) ( -58049 638) (58050 599) (58051 647) (58052 663) (58053 662) (58054 627) (58055 648) (58056 598) (58057 -642) (58058 656) (58059 635) (58060 621) (58061 637) (58062 597) (58063 657) (58064 643) (58065 658) ( -58066 646) (58067 659) (58068 426) (58069 442) (58070 615) (58071 626) (58072 99) (58073 607) (58074 -231) (58075 669) (58076 654) (58077 331) (58078 107) (58079 609) (58080 120) (58081 611) (58082 624) ( -58083 608) (58084 628) (58085 414) (58086 113) (58087 610) (58088 967) (58089 641) (58090 640) (58091 -295) (58092 661) (58093 660) (58094 104) (58095 614) (58096 665) (58097 667) (58098 668) (58099 669) ( -58100 670) (58101 671) (58102 672) (58103 673) (58104 674) (58105 675) (58106 676) (58107 677) (58108 -678) (58109 679) (58110 680))] - -[227 ((58146 12645) (58147 12646) (58148 12647) (58149 12648) (58150 12649) (58151 12650) (58152 12651 -) (58153 12652) (58154 12653) (58155 12654) (58156 12655) (58157 12656) (58158 12657) (58159 12658) ( -58160 12659) (58161 12660) (58162 12661) (58163 12662) (58164 12663) (58165 12664) (58166 12665) ( -58167 12666) (58168 12667) (58169 12668) (58170 12669) (58171 12670) (58172 12671) (58173 12672) ( -58174 12673) (58175 12674) (58176 12675) (58177 12676) (58178 12677) (58179 12678) (58180 12679) ( -58181 12680) (58182 12681) (58183 12682) (58184 12683) (58185 12684) (58186 12685) (58187 12686) ( -58273 32) (58274 8361) (58305 4352) (58306 4353) (58307 4522) (58308 4354) (58309 4524) (58310 4525) ( -58311 4355) (58312 4356) (58313 4357) (58314 4528) (58315 4529) (58316 4530) (58317 4531) (58318 4532) - (58319 4533) (58320 4534) (58321 4358) (58322 4359) (58323 4360) (58324 4537) (58325 4361) (58326 -4362) (58327 4363) (58328 4364) (58329 4365) (58330 4366) (58331 4367) (58332 4368) (58333 4369) ( -58334 4370) (58338 4449) (58339 4450) (58340 4451) (58341 4452) (58342 4453) (58343 4454) (58346 4455) - (58347 4456) (58348 4457) (58349 4458) (58350 4459) (58351 4460) (58354 4461) (58355 4462) (58356 -4463) (58357 4464) (58358 4465) (58359 4466) (58362 4467) (58363 4468) (58364 4469))] - -[228 ((58401 4304) (58402 4305) (58403 4306) (58404 4307) (58405 4308) (58406 4309) (58407 4310) ( -58408 4337) (58409 4311) (58410 4312) (58411 4313) (58412 4314) (58413 4315) (58414 4316) (58415 4338) - (58416 4317) (58417 4318) (58418 4319) (58419 4320) (58420 4321) (58421 4322) (58422 4323) (58423 -4339) (58424 4324) (58425 4325) (58426 4326) (58427 4327) (58428 4328) (58429 4329) (58430 4330) ( -58431 4331) (58432 4332) (58433 4333) (58434 4334) (58435 4340) (58436 4335) (58437 4336) (58438 4341) - (58439 4342) (58446 1417) (58447 4347) (58449 4256) (58450 4257) (58451 4258) (58452 4259) (58453 -4260) (58454 4261) (58455 4262) (58456 4289) (58457 4263) (58458 4264) (58459 4265) (58460 4266) ( -58461 4267) (58462 4268) (58463 4290) (58464 4269) (58465 4270) (58466 4271) (58467 4272) (58468 4273) - (58469 4274) (58470 4275) (58471 4291) (58472 4276) (58473 4277) (58474 4278) (58475 4279) (58476 -4280) (58477 4281) (58478 4282) (58479 4283) (58480 4284) (58481 4285) (58482 4286) (58483 4292) ( -58484 4287) (58485 4288) (58486 4293) (58529 1329) (58530 1330) (58531 1331) (58532 1332) (58533 1333) - (58534 1334) (58535 1335) (58536 1336) (58537 1337) (58538 1338) (58539 1339) (58540 1340) (58541 -1341) (58542 1342) (58543 1343) (58544 1344) (58545 1345) (58546 1346) (58547 1347) (58548 1348) ( -58549 1349) (58550 1350) (58551 1351) (58552 1352) (58553 1353) (58554 1354) (58555 1355) (58556 1356) - (58557 1357) (58558 1358) (58559 1359) (58560 1360) (58561 1361) (58562 1362) (58563 1363) (58564 -1364) (58565 1365) (58566 1366) (58569 1369) (58570 1417) (58571 1370) (58572 1371) (58573 1372) ( -58574 1373) (58575 1374) (58576 1375) (58577 1377) (58578 1378) (58579 1379) (58580 1380) (58581 1381) - (58582 1382) (58583 1383) (58584 1384) (58585 1385) (58586 1386) (58587 1387) (58588 1388) (58589 -1389) (58590 1390) (58591 1391) (58592 1392) (58593 1393) (58594 1394) (58595 1395) (58596 1396) ( -58597 1397) (58598 1398) (58599 1399) (58600 1400) (58601 1401) (58602 1402) (58603 1403) (58604 1404) - (58605 1405) (58606 1406) (58607 1407) (58608 1408) (58609 1409) (58610 1410) (58611 1411) (58612 -1412) (58613 1413) (58614 1414) (58616 64275) (58617 64276) (58618 64277) (58619 64278) (58620 64279) -(58622 1415))] - -[229 ((58657 2406) (58658 2407) (58659 2408) (58660 2409) (58661 2410) (58662 2411) (58663 2412) ( -58664 2413) (58665 2414) (58666 2415) (58671 8360) (58736 2378) (58737 2385) (58738 2386) (58739 2387) - (58740 2388) (58741 2405) (58785 2305) (58786 2306) (58787 2307) (58788 2317) (58789 2309) (58790 -2310) (58791 2311) (58792 2312) (58793 2313) (58794 2314) (58795 2315) (58796 2400) (58797 2316) ( -58798 2401) (58800 2319) (58801 2320) (58802 2321) (58803 2322) (58804 2323) (58805 2324) (58807 2325) - (58808 2392) (58809 2326) (58810 2393) (58811 2327) (58812 2394) (58813 2328) (58814 2329) (58815 -2330) (58816 2331) (58817 2332) (58818 2395) (58819 2333) (58820 2334) (58821 2335) (58822 2336) ( -58823 2337) (58824 2396) (58825 2338) (58826 2397) (58827 2339) (58828 2340) (58829 2341) (58830 2342) - (58831 2343) (58832 2344) (58833 2345) (58834 2346) (58835 2347) (58836 2398) (58837 2348) (58838 -2349) (58839 2350) (58840 2351) (58841 2399) (58842 2352) (58843 2353) (58844 2354) (58845 2355) ( -58846 2356) (58847 2357) (58848 2358) (58849 2359) (58850 2360) (58851 2361) (58854 2366) (58855 2367) - (58856 2368) (58857 2369) (58858 2370) (58859 2371) (58860 2372) (58861 2402) (58862 2403) (58863 -2364) (58864 2375) (58865 2376) (58866 2373) (58868 2379) (58869 2380) (58870 2374) (58871 2381) ( -58872 2416) (58873 2365) (58874 2384) (58875 2404) (58876 2377) (58877 8360) (58878 2381))] - -[230 ((58913 2534) (58914 2535) (58915 2536) (58916 2537) (58917 2538) (58918 2539) (58919 2540) ( -58920 2541) (58921 2542) (58922 2543) (58928 2547) (58929 2548) (58930 2549) (58931 2550) (58932 2552) - (58933 2546) (58934 2553) (58935 2551) (59041 2433) (59042 2434) (59043 2435) (59045 2437) (59046 -2438) (59047 2439) (59048 2440) (59049 2441) (59050 2442) (59051 2443) (59052 2528) (59053 2444) ( -59054 2529) (59056 2447) (59057 2448) (59060 2451) (59061 2452) (59063 2453) (59065 2454) (59067 2455) - (59069 2456) (59070 2457) (59071 2458) (59072 2459) (59073 2460) (59075 2461) (59076 2462) (59077 -2463) (59078 2464) (59079 2465) (59080 2524) (59081 2466) (59082 2525) (59083 2467) (59084 2468) ( -59085 2469) (59086 2470) (59087 2471) (59088 2472) (59090 2474) (59091 2475) (59093 2476) (59094 2477) - (59095 2478) (59096 2479) (59097 2527) (59098 2480) (59099 2544) (59100 2482) (59103 2545) (59104 -2486) (59105 2487) (59106 2488) (59107 2489) (59108 2492) (59109 160) (59110 2494) (59111 2495) (59112 - 2496) (59113 2497) (59114 2498) (59115 2499) (59116 2500) (59117 2530) (59118 2531) (59120 2503) ( -59121 2504) (59124 2507) (59125 2508) (59127 2509) (59130 2554) (59131 2404))] - -[231 ((59170 2562) (59173 2565) (59174 2566) (59175 2567) (59176 2568) (59177 2569) (59178 2570) ( -59183 2575) (59184 2576) (59187 2579) (59188 2580) (59189 2581) (59190 2582) (59191 2583) (59192 2584) - (59193 2585) (59194 2586) (59195 2587) (59196 2588) (59197 2589) (59198 2590) (59199 2591) (59200 -2592) (59201 2593) (59202 2594) (59203 2595) (59204 2596) (59205 2597) (59206 2598) (59207 2599) ( -59208 2600) (59210 2602) (59211 2603) (59212 2604) (59213 2605) (59214 2606) (59215 2607) (59216 2608) - (59218 2610) (59219 2611) (59221 2613) (59222 2614) (59224 2616) (59225 2617) (59228 2620) (59230 -2622) (59231 2623) (59232 2624) (59233 2625) (59234 2626) (59239 2631) (59240 2632) (59243 2635) ( -59244 2636) (59245 2637) (59257 2649) (59258 2650) (59259 2651) (59260 2652) (59262 2654))] - -[232 ((59425 3585) (59426 3586) (59427 3587) (59428 3588) (59429 3589) (59430 3590) (59431 3591) ( -59432 3592) (59433 3593) (59434 3594) (59435 3595) (59436 3596) (59437 3597) (59438 3598) (59439 3599) - (59440 3600) (59441 3601) (59442 3602) (59443 3603) (59444 3604) (59445 3605) (59446 3606) (59447 -3607) (59448 3608) (59449 3609) (59450 3610) (59451 3611) (59452 3612) (59453 3613) (59454 3614) ( -59455 3615) (59456 3616) (59457 3617) (59458 3618) (59459 3619) (59460 3620) (59461 3621) (59462 3622) - (59463 3623) (59464 3624) (59465 3625) (59466 3626) (59467 3627) (59468 3628) (59469 3629) (59470 -3630) (59471 3631) (59472 3632) (59473 3633) (59474 3634) (59475 3635) (59476 3636) (59477 3637) ( -59478 3638) (59479 3639) (59480 3640) (59481 3641) (59482 3642) (59487 3647) (59488 3648) (59489 3649) - (59490 3650) (59491 3651) (59492 3652) (59493 3653) (59494 3654) (59495 3655) (59496 3656) (59497 -3657) (59498 3658) (59499 3659) (59500 3660) (59501 3661) (59502 3662) (59503 3663) (59504 3664) ( -59505 3665) (59506 3666) (59507 3667) (59508 3668) (59509 3669) (59510 3670) (59511 3671) (59512 3672) - (59513 3673) (59514 3674) (59515 3675) (59553 3713) (59554 3714) (59556 3716) (59559 3719) (59560 -3720) (59562 3722) (59565 3725) (59572 3732) (59573 3733) (59574 3734) (59575 3735) (59577 3737) ( -59578 3738) (59579 3739) (59580 3740) (59581 3741) (59582 3742) (59583 3743) (59585 3745) (59586 3746) - (59587 3747) (59589 3749) (59591 3751) (59594 3754) (59595 3755) (59597 3757) (59598 3758) (59599 -3759) (59600 3760) (59601 3761) (59602 3762) (59603 3763) (59604 3764) (59605 3765) (59606 3766) ( -59607 3767) (59608 3768) (59609 3769) (59611 3771) (59612 3772) (59613 3773) (59616 3776) (59617 3777) - (59618 3778) (59619 3779) (59620 3780) (59621 3773) (59622 3782) (59624 3784) (59625 3785) (59626 -3786) (59627 3787) (59628 3788) (59629 3789) (59632 3792) (59633 3793) (59634 3794) (59635 3795) ( -59636 3796) (59637 3797) (59638 3798) (59639 3799) (59640 3800) (59641 3801) (59644 3804) (59645 3805) -)] - -[235 ((60193 8473) (60194 8459) (60195 8464) (60196 8779) (60197 8860) (60198 8455) (60199 818) (60200 - 8253) (60201 8984) (60203 8460) (60205 120125) (60206 8645) (60207 8693) (60208 8674) (60209 8803) ( -60210 8845) (60211 10941) (60212 10773) (60213 10774) (60214 8751) (60215 8752) (60219 9635) (60220 -8259) (60221 8524) (60222 9878) (60223 8353) (60224 9608) (60225 9764) (60226 8456) (60228 9775) ( -60229 9785) (60230 9855) (60231 9642) (60235 8985) (60236 9700) (60237 9701) (60238 9698) (60239 9699) - (60240 8533) (60241 8534) (60242 8535) (60243 8536) (60244 8537) (60245 8538) (60246 9833) (60249 -8749) (60250 9702) (60254 8499) (60255 8981) (60262 8721) (60267 9632) (60268 9656) (60269 9666) ( -60270 8226) (60271 8495) (60273 8472) (60275 8482) (60276 8482) (60279 9633) (60280 9643) (60281 9702) - (60282 8891) (60283 8493) (60284 8488) (60285 8359) (60326 9676) (60327 9645) (60328 9649) (60330 -8480) (60331 8402) (60332 8403) (60334 8408) (60335 8410) (60336 8409) (60337 8404) (60338 8405) ( -60339 8825) (60340 8824) (60343 8774) (60344 8892) (60345 8893) (60347 8716) (60348 8462) (60350 9769) - (60351 9747) (60353 8754) (60354 8755) (60355 8753) (60356 8887) (60357 8886) (60358 8766) (60359 -8763) (60363 8669) (60364 8668) (60365 8967) (60368 8489) (60369 8554) (60370 8555) (60383 9694) ( -60384 9693) (60385 9695) (60386 9692))] - -[236 ((60450 9755) (60451 9754) (60453 9986) (60454 9988) (60455 9742) (60456 10002) (60458 10003) ( -60459 65291) (60462 9733) (60463 9734) (60464 42) (60480 64) (60486 10008) (60490 9988) (60491 9743) ( -60492 10001) (60494 9989) (60496 64) (60497 9686) (60531 10133) (60535 9754) (60600 9312) (60601 9313) - (60602 9314) (60603 9315) (60604 9316) (60605 9317) (60606 9318) (60607 9319) (60608 9320) (60609 -9321) (60610 10112) (60611 10113) (60612 10114) (60613 10115) (60614 10116) (60615 10117) (60616 10118 -) (60617 10119) (60618 10120) (60619 10121) (60620 10122) (60621 10123) (60622 10124) (60623 10125) ( -60624 10126) (60625 10127) (60626 10128) (60627 10129) (60628 10130) (60629 10131) (60640 9679) (60641 - 9685) (60642 9682) (60643 9681) (60644 9684) (60645 9675) (60661 9680) (60662 9683) (60663 10077) ( -60664 10078) (60665 10072))] - -[237 ((60705 9985) (60706 9986) (60707 9987) (60708 9988) (60709 9742) (60710 9990) (60711 9991) ( -60712 9992) (60713 9993) (60714 9755) (60715 9758) (60716 9996) (60717 9997) (60718 9998) (60719 9999) - (60720 10000) (60721 10001) (60722 10002) (60723 10004) (60724 10005) (60725 10006) (60727 10008) ( -60728 10009) (60729 10010) (60730 10011) (60731 10012) (60732 10013) (60733 10014) (60734 10015) ( -60735 10017) (60736 10018) (60737 10019) (60738 10020) (60739 10021) (60740 10022) (60741 10023) ( -60742 10025) (60743 10026) (60744 10027) (60745 10028) (60746 10029) (60747 10030) (60748 10031) ( -60749 10032) (60750 10033) (60751 10034) (60752 10035) (60753 10036) (60754 10037) (60755 10038) ( -60756 10039) (60757 10040) (60758 10041) (60759 10042) (60760 10043) (60761 10044) (60762 10045) ( -60763 10046) (60764 10047) (60765 10048) (60766 10049) (60767 10050) (60768 10051) (60769 10052) ( -60770 10053) (60771 10054) (60772 10055) (60773 10056) (60774 10057) (60775 10058) (60776 10059) ( -60777 10061) (60778 10063) (60779 10064) (60780 10065) (60781 10066) (60782 10070) (60783 9687) (60784 - 10073) (60785 10074) (60786 10081) (60787 10082) (60788 10083) (60789 10084) (60790 10085) (60791 -10086) (60792 10087) (60793 10102) (60794 10103) (60795 10104) (60796 10105) (60797 10106) (60798 -10107) (60833 10108) (60834 10109) (60835 10110) (60836 10111) (60837 10132) (60838 10136) (60839 -10137) (60840 10138) (60841 10139) (60842 10140) (60843 10141) (60844 10142) (60845 10143) (60846 -10144) (60847 10146) (60848 10147) (60849 10148) (60850 10149) (60851 10150) (60852 10151) (60853 -10152) (60854 10153) (60855 10154) (60856 10155) (60857 10156) (60858 10157) (60859 10158) (60860 -10159) (60861 10161) (60862 10162) (60863 10163) (60864 10164) (60865 10165) (60866 10166) (60867 -10167) (60868 10168) (60869 10169) (60870 10170) (60871 10171) (60872 10172) (60873 10173) (60874 -10174) (60899 10075) (60900 10076))] - -[238 ((60961 8196) (60962 8197) (60963 8202) (60964 8200) (60965 8231) (60966 8974) (60967 8975) ( -60968 8972) (60969 8973) (60970 9646) (60971 8724) (60972 1644) (60973 8722) (60974 1643) (60975 8463) - (60976 8812) (60977 8448) (60979 9743) (60980 8758) (60981 33) (60982 8870) (60983 9007) (60984 9008) - (60985 437) (60986 8962) (60987 8760) (60988 8726) (60989 8793) (60990 8794) (60991 8903) (60992 8454 -) (60993 9688) (60994 8782) (60995 8475) (60996 8466) (60997 8710) (60998 8977) (60999 8248) (61000 -8452) (61001 9188) (61002 9649) (61003 9005) (61004 8978) (61005 8979) (61006 9006) (61007 8982) ( -61008 8644) (61009 8661) (61010 8847) (61011 8848) (61012 402) (61013 9689) (61014 8898) (61015 8899) -(61021 8987) (61024 9617) (61025 9619) (61026 8914) (61027 8915) (61028 8762) (61031 8728) (61032 8770 -) (61033 8705) (61034 8976) (61035 8242) (61036 8822) (61037 8823) (61038 8818) (61039 8819) (61040 -8868) (61041 8708) (61042 8802) (61043 8968) (61044 8970) (61045 124) (61046 8969) (61047 8971) (61048 - 8778) (61049 8783) (61050 8252) (61051 8245) (61052 8739) (61053 8727) (61054 8764) (61089 8890) ( -61090 8228) (61091 8229) (61092 11157) (61093 11013) (61094 11014) (61095 11015) (61096 8680) (61097 -8678) (61098 8679) (61099 8681) (61100 8592) (61101 8593) (61102 8594) (61103 8595) (61104 9654) ( -61105 9664) (61106 9655) (61107 9665) (61108 8901) (61109 8597) (61110 8616) (61111 9074) (61112 9073) - (61113 9608) (61114 9604) (61115 9616) (61116 9612) (61117 9600) (61118 9668) (61119 9658) (61120 -9067) (61121 9042) (61122 9035) (61123 9021) (61124 9033) (61125 9055) (61126 9054) (61127 9017) ( -61128 9023) (61129 9024) (61130 8965) (61131 9828) (61132 9829) (61133 9830) (61134 9831) (61136 9038) - (61137 9045) (61138 9053) (61139 9014) (61140 9019) (61141 9835) (61142 8905) (61143 8906) (61144 -8907) (61145 8908) (61146 8966) (61147 8891) (61148 9015) (61149 8735) (61150 9644) (61151 9787) ( -61152 9131) (61153 9130) (61154 9132) (61155 9133) (61156 9127) (61157 9129) (61158 9128) (61159 9136) - (61160 9137) (61161 8911) (61162 8910) (61163 8884) (61164 8885) (61165 8992) (61166 8993) (61167 -9130) (61168 9026) (61170 8630) (61171 8631) (61172 8634) (61173 8635) (61174 8651) (61175 8602) ( -61176 8603) (61177 8622) (61178 8653) (61179 8655) (61180 8654) (61181 8909) (61182 8769))] - -[239 ((61217 160) (61218 8209) (61219 173) (61220 8211) (61221 8212) (61222 8210) (61223 39) (61224 -8222) (61225 8220) (61226 8249) (61227 8250) (61228 8192) (61229 8193) (61230 8199) (61231 8201) ( -61232 8224) (61233 8225) (61234 9001) (61235 9002) (61236 9758) (61237 9756) (61238 8866) (61239 8867) - (61240 8872) (61241 10980) (61242 12310) (61243 12311) (61244 8598) (61245 8600) (61246 8599) (61247 -8601) (61248 8453) (61249 8240) (61250 8810) (61251 8811) (61252 8814) (61253 8815) (61254 8739) ( -61255 8740) (61256 8741) (61257 8742) (61258 8712) (61259 8713) (61260 8715) (61261 8656) (61262 8660) - (61263 8658) (61264 8652) (61265 8646) (61266 8596) (61267 8605) (61270 8745) (61271 8746) (61272 -8839) (61273 8838) (61274 8835) (61275 8834) (61276 8841) (61277 8840) (61278 8837) (61279 8836) ( -61280 9746) (61281 8709) (61282 8853) (61283 8854) (61284 8855) (61285 8856) (61286 8226) (61287 8728) - (61288 8463) (61289 8467) (61290 172) (61291 166) (61292 8736) (61293 8737) (61294 8759) (61295 8757) - (61296 8869) (61297 8733) (61298 8801) (61299 8784) (61300 8799) (61301 8747) (61302 8750) (61303 -8771) (61304 8773) (61305 8776) (61306 8721) (61307 8719) (61308 8730) (61309 8723) (61310 9618) ( -61345 8354) (61346 402) (61347 8355) (61348 8359) (61349 8352) (61350 36) (61351 8501) (61352 8470) ( -61353 8478) (61354 8481) (61355 658) (61356 8450) (61357 8469) (61358 8477) (61359 8484) (61360 8968) -(61361 8969) (61362 8970) (61363 8971) (61364 8707) (61365 8704) (61366 8896) (61367 8897) (61368 8718 -) (61369 8711) (61370 8706) (61371 9280) (61372 9282) (61373 9281) (61374 9190) (61375 8215) (61376 -8978) (61377 8544) (61378 8545) (61379 8546) (61380 8547) (61381 8548) (61382 8549) (61383 8550) ( -61384 8551) (61385 8552) (61386 8553) (61387 9824) (61388 9825) (61389 9826) (61390 9827) (61391 10003 -) (61392 10007) (61393 9312) (61394 9313) (61395 9314) (61396 9315) (61397 9316) (61398 9317) (61399 -9318) (61400 9319) (61401 9320) (61402 9321) (61406 9774) (61407 9786) (61408 9760) (61409 9475) ( -61410 9473) (61411 9547) (61412 9474) (61413 9472) (61414 9532) (61415 9737) (61416 9789) (61417 9790) - (61418 9791) (61419 9795) (61420 9796) (61421 9797) (61422 9798) (61423 9799) (61424 9810) (61425 -9811) (61426 9800) (61427 9801) (61428 9802) (61429 9803) (61430 9804) (61431 9805) (61432 9806) ( -61433 9807) (61434 9808) (61435 9809) (61436 9742) (61437 8531) (61438 8532))] - -[240 ((61473 64256) (61474 64259) (61475 64260) (61476 64257) (61477 64258) (61478 64261) (61481 64262 -) (61552 188) (61553 189) (61554 190) (61555 8531) (61556 8532) (61557 8539) (61558 8540) (61559 8541) - (61560 8542) (61561 8543) (61608 9227) (61609 9225) (61610 9226) (61611 9228) (61612 9229) (61613 -9252) (61616 9216) (61617 8196) (61618 8197) (61619 8198) (61620 8192) (61621 8193) (61622 8200) ( -61623 8200) (61624 8595) (61625 8594) (61626 8628) (61627 8609) (61628 8592) (61629 8629) (61630 10550 -) (61635 8227) (61636 9679) (61639 65533) (61666 10692) (61692 183) (61693 384) (61694 9251))] - -[241 ((61729 192) (61730 193) (61731 194) (61732 195) (61733 256) (61734 258) (61735 196) (61736 197) -(61737 260) (61738 262) (61739 264) (61740 266) (61741 199) (61742 268) (61743 270) (61744 200) (61745 - 201) (61746 202) (61747 274) (61748 278) (61749 203) (61750 280) (61751 282) (61752 500) (61753 284) -(61754 286) (61755 288) (61756 290) (61757 292) (61758 204) (61759 461) (61760 206) (61761 296) (61762 - 298) (61763 304) (61764 207) (61765 302) (61766 308) (61767 310) (61768 313) (61769 315) (61770 317) -(61771 323) (61772 209) (61773 325) (61774 327) (61775 210) (61776 211) (61777 212) (61778 213) (61779 - 332) (61780 214) (61781 336) (61782 340) (61783 342) (61784 344) (61785 346) (61786 348) (61787 350) -(61788 352) (61789 354) (61790 356) (61791 217) (61792 218) (61793 219) (61794 360) (61795 362) (61796 - 364) (61797 220) (61798 366) (61799 368) (61800 370) (61801 372) (61802 7922) (61803 221) (61804 374) - (61805 376) (61806 377) (61807 379) (61808 381) (61812 7884) (61813 562) (61814 482) (61817 461) ( -61818 276) (61821 486) (61822 300) (61857 224) (61858 225) (61859 226) (61860 227) (61861 257) (61862 -259) (61863 228) (61864 229) (61865 261) (61866 263) (61867 265) (61868 267) (61869 231) (61870 269) ( -61871 271) (61872 232) (61873 233) (61874 234) (61875 275) (61876 279) (61877 235) (61878 281) (61879 -283) (61880 501) (61881 285) (61882 287) (61883 289) (61884 291) (61885 293) (61886 236) (61887 237) ( -61888 238) (61889 297) (61890 299) (61892 239) (61893 303) (61894 309) (61895 311) (61896 314) (61897 -316) (61898 318) (61899 324) (61900 241) (61901 326) (61902 328) (61903 242) (61904 243) (61905 244) ( -61906 245) (61907 333) (61908 246) (61909 337) (61910 341) (61911 343) (61912 345) (61913 347) (61914 -349) (61915 351) (61916 353) (61917 355) (61918 357) (61919 249) (61920 250) (61921 251) (61922 361) ( -61923 363) (61924 365) (61925 252) (61926 367) (61927 369) (61928 371) (61929 373) (61930 7923) (61931 - 253) (61932 375) (61933 255) (61934 378) (61935 380) (61936 382) (61940 7885) (61941 563) (61942 483) - (61945 462) (61946 277) (61949 487) (61950 301))] - -[242 ((61986 463) (61989 465) (61990 334) (61993 490) (61994 467) (62001 7692) (62002 7716) (62003 -7778) (62004 7788) (62114 464) (62117 466) (62118 335) (62121 491) (62122 468) (62123 363) (62127 7695 -) (62128 7791) (62129 7693) (62130 7717) (62131 7779) (62132 7789))] - -[243 ((62241 7937) (62242 7945) (62243 7936) (62244 7944) (62245 8049) (62246 8123) (62247 8048) ( -62248 8122) (62249 8118) (62251 7941) (62252 7949) (62253 7939) (62254 7949) (62255 7943) (62256 7951) - (62257 7940) (62258 7948) (62259 7938) (62260 7946) (62261 7942) (62262 7950) (62263 8115) (62264 -8124) (62265 8065) (62266 8073) (62267 8064) (62268 8072) (62269 8116) (62271 8114) (62273 8119) ( -62275 8069) (62276 8077) (62277 8067) (62278 8075) (62279 8071) (62280 8079) (62281 8068) (62282 8076) - (62283 8066) (62284 8074) (62285 8070) (62286 8078) (62287 7953) (62288 7961) (62289 7952) (62290 -7960) (62291 8051) (62292 8137) (62293 8050) (62294 8136) (62295 7957) (62296 7965) (62297 7955) ( -62298 7963) (62299 7956) (62300 7964) (62301 7954) (62302 7962) (62303 7969) (62304 7977) (62305 7968) - (62306 7976) (62307 8053) (62308 8139) (62309 8052) (62310 8138) (62311 8134) (62313 7973) (62314 -7981) (62315 7971) (62316 7979) (62317 7975) (62318 7983) (62319 8084) (62320 7980) (62321 7970) ( -62322 7978) (62323 7974) (62324 7982) (62325 8131) (62326 8140) (62327 8081) (62328 8089) (62329 8080) - (62330 8088) (62331 8132) (62333 8130) (62369 8135) (62371 8085) (62372 8093) (62373 8083) (62374 -8091) (62375 8087) (62376 8095) (62377 8084) (62378 8092) (62379 8082) (62380 8090) (62381 8086) ( -62382 8094) (62383 7985) (62384 7993) (62385 7984) (62386 7992) (62387 8055) (62388 8155) (62389 8054) - (62390 8154) (62391 8150) (62393 7989) (62394 7997) (62395 7987) (62396 7995) (62397 7991) (62398 -7999) (62399 7988) (62400 7996) (62401 7986) (62402 7994) (62403 7990) (62404 7998) (62411 8001) ( -62412 8009) (62413 8000) (62414 8008) (62415 8057) (62416 8185) (62417 8056) (62418 8184) (62419 8005) - (62420 8013) (62421 8003) (62422 8011) (62423 8004) (62424 8012) (62425 8002) (62426 8010) (62427 -8017) (62428 8025) (62429 8016) (62431 8059) (62432 8171) (62433 8058) (62434 8170) (62435 8166) ( -62437 8021) (62438 8029) (62439 8019) (62440 8027) (62441 8023) (62442 8031) (62445 8020) (62447 8018) - (62449 8022) (62455 8033) (62456 8041) (62457 8032) (62458 8040) (62459 8061) (62460 8187) (62461 -8060) (62462 8186))] - -[244 ((62497 8182) (62499 8037) (62500 8045) (62501 8035) (62502 8043) (62503 8039) (62504 8047) ( -62505 8036) (62506 8044) (62507 8034) (62508 8042) (62509 8038) (62510 8046) (62511 8179) (62512 8188) - (62513 8097) (62514 8105) (62515 8096) (62516 8104) (62517 8180) (62519 8178) (62521 8183) (62523 -8101) (62524 8107) (62525 8099) (62526 8107) (62527 8103) (62528 8111) (62529 8100) (62530 8108) ( -62531 8098) (62532 8106) (62533 8102) (62534 8110) (62535 8165) (62536 8172) (62537 8164))] - -[245 ((62753 65154) (62754 65156) (62755 65158) (62756 65160) (62757 65163) (62758 65164) (62759 65162 -) (62760 65166) (62761 65169) (62762 65170) (62763 65168) (62764 65172) (62765 65175) (62766 65176) ( -62767 65174) (62768 65179) (62769 65180) (62770 65178) (62771 65183) (62772 65184) (62773 65182) ( -62774 65187) (62775 65188) (62776 65186) (62777 65191) (62778 65192) (62779 65190) (62780 65194) ( -62781 65196) (62782 65198) (62783 65200) (62784 65203) (62785 65204) (62786 65202) (62787 65207) ( -62788 65208) (62789 65206) (62790 65211) (62791 65212) (62792 65210) (62793 65215) (62794 65216) ( -62795 65214) (62796 65219) (62797 65220) (62798 65218) (62799 65223) (62800 65224) (62801 65222) ( -62802 65227) (62803 65228) (62804 65226) (62805 65231) (62806 65232) (62807 65230) (62808 65235) ( -62809 65236) (62810 65234) (62811 65239) (62812 65240) (62813 65238) (62814 65243) (62815 65244) ( -62816 65242) (62817 65247) (62818 65248) (62819 65246) (62820 65251) (62821 65252) (62822 65250) ( -62823 65255) (62824 65256) (62825 65254) (62826 65259) (62827 65260) (62828 65258) (62829 65262) ( -62830 65264) (62831 65267) (62832 65268) (62833 65266) (62834 65269) (62835 65270) (62836 65271) ( -62837 65272) (62838 65273) (62839 65274) (62840 65275) (62841 65276) (62842 1780) (62843 1780) (62844 -1781) (62845 1782) (62882 64606) (62883 64607) (62884 64608) (62885 64609) (62886 64610) (62887 64364) - (62888 64365) (62889 64363) (62890 1740) (62891 64562) (62956 64344) (62957 64345) (62958 64343) ( -62959 64380) (62960 64381) (62961 64379) (62962 64395) (62963 1705) (62964 64399) (62965 64404) (62966 - 64405) (62967 64403) (62968 64421))] - -[253 ((64812 1644) (64832 978) (64848 7425) (64849 630) (64859 1013) (64860 982) (64861 977) (64862 -1009) (64863 966) (64864 1008) (64865 7424) (64866 665) (64867 7428) (64868 7429) (64869 7431) (64870 -42800) (64871 610) (64872 668) (64873 618) (64874 7434) (64875 7435) (64876 671) (64877 7437) (64878 -628) (64879 7439) (64880 7448) (64881 42927) (64882 640) (64883 42801) (64884 7451) (64885 7452) ( -64886 7456) (64887 7457) (64888 120) (64889 655) (64890 7458) (64891 411) (64893 945) (64936 8319) ( -64942 8316) (64944 8304) (64945 185) (64946 178) (64947 179) (64948 8308) (64949 8309) (64950 8310) ( -64951 8311) (64952 8312) (64953 8313) (64958 8314) (64959 8315) (64992 8320) (64993 8321) (64994 8322) - (64995 8323) (64996 8324) (64997 8325) (64998 8326) (64999 8327) (65000 8328) (65001 8329) (65002 -8331) (65003 8330) (65004 8332))] - -STOP diff --git a/unicode/xerox/README.TEDIT b/unicode/xerox/README.TEDIT new file mode 100644 index 00000000..306ee10d Binary files /dev/null and b/unicode/xerox/README.TEDIT differ diff --git a/unicode/xerox/UNICODE-TO-MCCS-MAPPINGS.TXT b/unicode/xerox/UNICODE-TO-MCCS-MAPPINGS.TXT deleted file mode 100644 index 6e7a7cf3..00000000 --- a/unicode/xerox/UNICODE-TO-MCCS-MAPPINGS.TXT +++ /dev/null @@ -1,1584 +0,0 @@ -[0 ((0 0) (1 1) (2 2) (3 3) (4 4) (5 5) (6 6) (7 7) (8 8) (9 9) (10 10) (11 11) (12 12) (13 13) (14 14 -) (15 15) (16 16) (17 17) (18 18) (19 19) (20 20) (21 21) (22 22) (23 23) (24 24) (25 25) (26 26) (27 -27) (28 28) (29 29) (30 30) (31 31) (32 32 58273) (33 33 60981) (34 34) (35 35) (36 36 61350) (37 37) -(38 38) (39 39 8999 61223) (40 40) (41 41) (42 42 60464) (43 43) (44 44 57644) (45 45) (46 46) (47 47) - (48 48) (49 49) (50 50) (51 51) (52 52) (53 53) (54 54) (55 55) (56 56) (57 57) (58 58) (59 59 57659) - (60 60) (61 61) (62 62) (63 63) (64 64 60480 60496) (65 65) (66 66) (67 67) (68 68) (69 69) (70 70) ( -71 71) (72 72) (73 73) (74 74) (75 75) (76 76) (77 77) (78 78) (79 79) (80 80) (81 81) (82 82) (83 83) - (84 84) (85 85) (86 86) (87 87) (88 88) (89 89) (90 90) (91 91) (92 92) (93 93) (94 173 8896) (95 172 -) (96 96 9056) (97 97 57947) (98 98 58019) (99 99 58072) (100 100 58033) (101 101 57942) (102 102 -58028) (103 103) (104 104 58094) (105 105 57937) (106 106) (107 107 58078) (108 108 58045) (109 109 -58017) (110 110 58031) (111 111 57961) (112 112 58018) (113 113 58086) (114 114 58048) (115 115 58038) - (116 116 58032) (117 117 57957) (118 118 58029) (119 119 58024) (120 120 58080 64888) (121 121 57938) - (122 122 58039) (123 123) (124 124 8615 61045) (125 125) (126 126) (160 59109 61217) (161 161) (162 -162) (163 163) (164 164) (165 165) (166 61291) (167 167) (168 8994) (169 211) (170 227) (171 171) (172 - 61290) (173 61219) (174 210) (175 8996) (176 176) (177 177) (178 178 64946) (179 179 64947) (180 8995 -) (181 181) (182 182) (183 183 9008 61692) (184 9004) (185 209 64945) (186 235) (187 187) (188 188 -61552) (189 189 61553) (190 190 61554) (191 191) (192 61729) (193 61730) (194 61731) (195 61732) (196 -61735) (197 61736) (198 225) (199 61741) (200 61744) (201 61745) (202 61746) (203 61749) (204 61758) ( -206 61760) (207 61764) (208 226) (209 61772) (210 61775) (211 61776) (212 61777) (213 61778) (214 -61780) (215 180) (216 233) (217 61791) (218 61792) (219 61793) (220 61797) (221 61803) (222 236) (223 -251) (224 61857) (225 61858) (226 61859) (227 61860) (228 61863) (229 61864) (230 241 57946) (231 -58074 61869) (232 61872) (233 61873) (234 61874) (235 61877) (236 61886) (237 61887) (238 61888) (239 -61892) (240 243 58035) (241 61900) (242 61903) (243 61904) (244 61905) (245 61906) (246 61908) (247 -184) (248 249 57943) (249 61919) (250 61920) (251 61921) (252 61925) (253 61931) (254 252) (255 61933) -)] - -[1 ((256 61733) (257 61861) (258 61734) (259 61862) (260 61737) (261 61865) (262 61738) (263 61866) ( -264 61739) (265 61867) (266 61740) (267 61868) (268 61742) (269 61870) (270 61743) (271 61871) (273 -242) (274 61747) (275 61875) (276 61818) (277 61946) (278 61748) (279 61876) (280 61750) (281 61878) ( -282 61751) (283 61879) (284 61753) (285 61881) (286 61754) (287 61882) (288 61755) (289 61883) (290 -61756) (291 61884) (292 61757) (293 61885) (294 228) (295 244 58091) (296 61761) (297 61889) (298 -61762) (299 61890) (300 61822) (301 61950) (302 61765) (303 61893) (304 61763) (305 245) (306 230) ( -307 246) (308 61766) (309 61894) (310 61767) (311 61895) (312 240) (313 61768) (314 61896) (315 61769) - (316 61897) (317 61770) (318 61898) (319 231) (320 247) (321 232) (322 248) (323 61771) (324 61899) ( -325 61773) (326 61901) (327 61774) (328 61902) (329 239) (330 238) (331 254 58077) (332 61779) (333 -61907) (334 61990) (335 62118) (336 61781) (337 61909) (338 234) (339 250 57945) (340 61782) (341 -61910) (342 61783) (343 61911) (344 61784) (345 61912) (346 61785) (347 61913) (348 61786) (349 61914) - (350 61787) (351 61915) (352 61788) (353 61916) (354 61789) (355 61917) (356 61790) (357 61918) (358 -237) (359 253) (360 61794) (361 61922) (362 61795) (363 61923 62123) (364 61796) (365 61924) (366 -61798) (367 61926) (368 61799) (369 61927) (370 61800) (371 61928) (372 61801) (373 61929) (374 61804) - (375 61932) (376 61805) (377 61806) (378 61934) (379 61807) (380 61935) (381 61808) (382 61936) (384 -9129 61693) (385 9025) (390 9041) (391 9046) (392 9078) (394 9026) (397 58041) (398 9024) (399 9030) ( -400 9038) (401 9047) (402 9079 61012 61346) (403 9130) (404 9039) (405 9131) (406 9040) (408 9027) ( -409 9059) (410 9066) (411 64891) (413 9053) (414 58085) (415 9036) (416 9028) (417 9060) (418 9031) ( -419 9063) (420 9048) (421 9080) (425 9042) (426 58068) (428 9049) (429 9081) (431 9029) (432 9061) ( -434 9043) (435 9050) (436 9082) (437 9032 60985) (438 9064) (439 9044) (440 9045) (441 9077) (442 -58069) (443 58037) (446 58036) (447 9065) (448 9126) (449 9127) (450 9124) (451 9125) (461 61759 61817 -) (462 61945) (463 61986) (464 62114) (465 61989) (466 62117) (467 61994) (468 62122) (477 9062) (482 -61814) (483 61942) (486 61821) (487 61949) (490 61993) (491 62121) (500 61752) (501 61880))] - -[2 ((562 61813) (563 61941) (567 229) (592 57955) (593 57964) (594 57965) (595 9057 58025) (596 57963) - (597 58062) (598 58056) (599 9058 58050) (600 57966) (601 57951) (602 57952) (603 57944) (604 57954) -(605 57967) (606 57968) (607 58073) (608 57982 58083) (609 58079) (610 58087 64871) (611 58081) (612 -57960) (613 58022) (614 58095) (615 58070) (616 57949) (617 57939) (618 57940 64873) (619 57981) (620 -58043) (621 58060) (622 58044) (623 57956) (624 58082) (625 58027) (626 58071) (627 58054) (628 58084 -64878) (629 9068 57953) (630 57948 64849) (631 57958) (632 58020) (633 58042) (634 58047) (635 58059) -(636 58046) (637 58061) (638 58049) (639 57969) (640 58090 64882) (641 58089) (642 58057) (643 58064) -(644 57980) (645 57970) (646 58066) (647 58051) (648 58055) (649 57950) (650 57959) (651 58030) (652 -57962) (653 58023) (654 58076) (655 57941 64889) (656 58058) (657 58063) (658 58065 61355) (659 58067) - (660 58093) (661 58092) (662 58053) (663 58052) (664 58026) (665 58096 64866) (666 57971) (667 58097) - (668 58098 64872) (669 58075 58099) (670 58100) (671 58101 64876) (672 58102) (673 58103) (674 58104) - (675 58105) (676 58106) (677 58107) (678 58108) (679 58109) (680 58110) (697 9149) (698 9150) (699 -9137) (700 9136) (702 57930) (703 9121) (711 9003 9415) (712 57918) (713 9418) (714 9414) (715 9416) ( -716 57919) (720 57914) (721 57915) (724 57910) (725 57911) (728 8997) (729 8998 9417) (730 9000) (731 -9002) (733 9001))] - -[3 ((768 193 9157 9926 57924) (769 194 9158 9925 57922) (770 195 9011 9146 57926) (771 196 9012 9147 -57890) (772 197 9013 57920) (773 9155) (774 198 9014 57891) (775 199 9015 57892) (776 200 9016 9161 -9932 57889) (777 9152) (778 202 9018) (779 205 9021) (780 207 9023 57927) (781 9162) (782 9168) (783 -9186) (784 9201) (785 9151) (786 9164) (787 9765 57929) (788 9204 9766 57928) (789 9163) (790 9205 -57925) (791 9206 57923) (792 9207) (793 9208) (794 9209) (795 9166) (796 57906 57917) (797 57903) (798 - 57905) (799 57907) (800 57908) (801 57895) (802 57896) (803 9174 57904) (804 9175 57899) (805 9172 -57897) (806 9171) (807 203 9019 9170) (808 206 9022 9169) (809 9178 57902) (810 57900) (811 57901) ( -812 57898) (813 9179) (814 9173) (815 9210) (816 9176) (817 9180 57921) (818 204 60199) (819 9177) ( -820 57894) (821 9167) (822 9211) (823 9153) (824 9145) (825 9212 57916) (826 9213) (827 9214) (831 -9200) (832 9009) (833 9010) (834 9927) (835 9763) (836 9920) (837 9767) (860 57909) (865 9139 57893) ( -884 9780) (885 9781) (890 9778) (894 9762) (900 9764 9777) (901 9771 9933) (902 9936) (903 9787) (904 -9937) (905 9938) (906 9939) (908 9940) (910 9941) (911 9942) (912 9977) (913 9793) (914 9794) (915 -9796) (916 9797) (917 9798) (918 9801) (919 9802) (920 9803) (921 9804) (922 9805) (923 9806) (924 -9807) (925 9808) (926 9809) (927 9810) (928 9811) (929 9813) (931 9814) (932 9816) (933 9817) (934 -9818) (935 9819) (936 9820) (937 9821) (938 9943) (939 9944) (940 9968) (941 9969) (942 9970) (943 -9971) (944 9978) (945 9825 64893) (946 9826 58021) (947 9828) (948 9829) (949 9830) (950 9833) (951 -9834) (952 9835 58034) (953 9836) (954 9837) (955 9838) (956 9839) (957 9840) (958 9841) (959 9842) ( -960 9843) (961 9845) (962 9847) (963 9846 58040) (964 9848) (965 9849) (966 9850 64863) (967 9851 -58088) (968 9852) (969 9853) (970 9975) (971 9976) (972 9972) (973 9973) (974 9974) (976 9827) (977 -64861) (978 64832) (979 9952) (980 9953) (982 64860) (984 9812) (985 9844) (986 9799) (987 9831) (988 -9800) (989 9832) (990 9792) (991 9824) (992 9822) (993 9854) (994 9948) (995 9980) (996 9949) (997 -9981) (998 9950) (999 9982) (1001 9904) (1003 9905) (1005 9906) (1007 9907) (1008 64864) (1009 64862) -(1010 9776) (1011 9979) (1013 64859))] - -[4 ((1025 10023) (1026 10051) (1027 10052) (1028 10053) (1029 10054) (1030 10055) (1031 10056) (1032 -10057) (1033 10058) (1034 10059) (1035 10060) (1036 10061) (1038 10062) (1039 10145) (1040 10017) ( -1041 10018) (1042 10019) (1043 10020) (1044 10021) (1045 10022) (1046 10024) (1047 10025) (1048 10026) - (1049 10027) (1050 10028) (1051 10029) (1052 10030) (1053 10031) (1054 10032) (1055 10033) (1056 -10034) (1057 10035) (1058 10036) (1059 10037) (1060 10038) (1061 10039) (1062 10040) (1063 10041) ( -1064 10042) (1065 10043) (1066 10044) (1067 10045) (1068 10046) (1069 10047) (1070 10048) (1071 10049) - (1072 10065) (1073 10066) (1074 10067) (1075 10068) (1076 10069) (1077 10070) (1078 10072) (1079 -10073) (1080 10074) (1081 10075) (1082 10076) (1083 10077) (1084 10078) (1085 10079) (1086 10080) ( -1087 10081) (1088 10082) (1089 10083) (1090 10084) (1091 10085) (1092 10086) (1093 10087) (1094 10088) - (1095 10089) (1096 10090) (1097 10091) (1098 10092) (1099 10093) (1100 10094) (1101 10095) (1102 -10096) (1103 10097) (1105 10071) (1106 10099) (1107 10100) (1108 10101) (1109 10102) (1110 10103) ( -1111 10104) (1112 10105) (1113 10106) (1114 10107) (1115 10108) (1116 10109) (1118 10110) (1119 10193) - (1120 10920) (1121 10968) (1122 10146) (1123 10194) (1124 10924) (1125 10972) (1126 10927) (1127 -10975) (1128 10929) (1129 10977) (1130 10149) (1131 10197) (1132 10930) (1133 10978) (1134 10931) ( -1135 10979) (1136 10932) (1137 10980) (1138 10147) (1139 10195) (1140 10148) (1141 10196) (1142 10827) - (1143 10875) (1144 10951) (1145 10967) (1146 10914) (1147 10962) (1148 10944) (1149 10992) (1150 -10943) (1151 10991) (1152 10934) (1153 10982) (1154 10957) (1155 10999) (1156 10952) (1168 10050) ( -1169 10098) (1170 10157 10816) (1171 10205 10864) (1172 10158) (1173 10206) (1174 10162) (1175 10210) -(1176 10164) (1177 10212) (1178 10168) (1179 10216) (1180 10170) (1181 10218) (1182 10172) (1183 10220 -) (1184 10171) (1185 10219) (1186 10173) (1187 10221) (1188 10174) (1189 10222) (1190 10178) (1191 -10226) (1192 10801) (1193 10849) (1194 10179) (1195 10227) (1196 10181) (1197 10229) (1198 10152) ( -1199 10200) (1200 10803) (1201 10851) (1202 10188) (1203 10236) (1204 10182) (1205 10230) (1206 10785) - (1207 10833) (1208 10787) (1209 10835) (1210 10819) (1211 10867) (1212 10799) (1213 10847) (1214 -10800) (1215 10848) (1216 10191) (1217 10818) (1218 10866) (1219 10810) (1220 10858) (1223 10822) ( -1224 10870) (1227 10786) (1228 10834) (1232 10155) (1233 10203) (1234 10154) (1235 10202) (1236 10156) - (1237 10204) (1238 10160) (1239 10208) (1240 10798) (1241 10846) (1242 10808) (1243 10856) (1244 -10161) (1245 10209) (1246 10163) (1247 10211) (1248 10809) (1249 10857) (1250 10167) (1251 10215) ( -1252 10166) (1253 10214) (1254 10176) (1255 10224) (1256 10817) (1257 10865) (1258 10811) (1259 10859) - (1262 10187) (1263 10235) (1264 10184) (1265 10232) (1266 10185) (1267 10233) (1268 10190) (1269 -10238) (1272 10795) (1273 10843) (1276 10189) (1277 10237))] - -[5 ((1306 10150) (1307 10198) (1308 10151) (1309 10199) (1329 58529) (1330 58530) (1331 58531) (1332 -58532) (1333 58533) (1334 58534) (1335 58535) (1336 58536) (1337 58537) (1338 58538) (1339 58539) ( -1340 58540) (1341 58541) (1342 58542) (1343 58543) (1344 58544) (1345 58545) (1346 58546) (1347 58547) - (1348 58548) (1349 58549) (1350 58550) (1351 58551) (1352 58552) (1353 58553) (1354 58554) (1355 -58555) (1356 58556) (1357 58557) (1358 58558) (1359 58559) (1360 58560) (1361 58561) (1362 58562) ( -1363 58563) (1364 58564) (1365 58565) (1366 58566) (1369 58569) (1370 58571) (1371 58572) (1372 58573) - (1373 58574) (1374 58575) (1375 58576) (1377 58577) (1378 58578) (1379 58579) (1380 58580) (1381 -58581) (1382 58582) (1383 58583) (1384 58584) (1385 58585) (1386 58586) (1387 58587) (1388 58588) ( -1389 58589) (1390 58590) (1391 58591) (1392 58592) (1393 58593) (1394 58594) (1395 58595) (1396 58596) - (1397 58597) (1398 58598) (1399 58599) (1400 58600) (1401 58601) (1402 58602) (1403 58603) (1404 -58604) (1405 58605) (1406 58606) (1407 58607) (1408 58608) (1409 58609) (1410 58610) (1411 58611) ( -1412 58612) (1413 58613) (1414 58614) (1415 58622) (1417 58446 58570) (1436 57639) (1438 57634) (1456 -57799) (1457 57801) (1458 57800) (1459 57802) (1460 57793) (1461 57794) (1462 57795) (1463 57798) ( -1464 57797) (1465 57806) (1467 57796) (1468 57807) (1469 57839) (1471 57841) (1472 57842) (1473 57804) - (1474 57803) (1475 57658) (1488 57664) (1489 57665) (1490 57666) (1491 57667) (1492 57668) (1493 -57669) (1494 57670) (1495 57671) (1496 57672) (1497 57673) (1498 57674) (1499 57675) (1500 57676) ( -1501 57677) (1502 57678) (1503 57679) (1504 57680) (1505 57681) (1506 57682) (1507 57683) (1508 57684) - (1509 57685) (1510 57686) (1511 57687) (1512 57688) (1513 57689) (1514 57690) (1520 57716) (1521 -57717) (1522 57718))] - -[6 ((1548 57388) (1563 57403) (1567 57407) (1569 57409) (1570 57410) (1571 57411) (1572 57412) (1573 -57413) (1574 57414) (1575 57415) (1576 57416) (1577 57417) (1578 57418) (1579 57419) (1580 57420) ( -1581 57421) (1582 57422) (1583 57423) (1584 57424) (1585 57425) (1586 57426) (1587 57427) (1588 57428) - (1589 57429) (1590 57430) (1591 57431) (1592 57432) (1593 57433) (1594 57434) (1600 57440) (1601 -57441) (1602 57442) (1603 57443) (1604 57444) (1605 57445) (1606 57446) (1607 57447) (1608 57448) ( -1609 57449) (1610 57450) (1611 57451) (1612 57452) (1613 57453) (1614 57454) (1615 57455) (1616 57456) - (1617 57457) (1618 57458) (1632 57392) (1633 57393) (1634 57394) (1635 57395) (1636 57396) (1637 -57397) (1638 57398) (1639 57399) (1640 57400) (1641 57401) (1642 57381) (1643 57461 60974) (1644 57462 - 60972 64812) (1648 57459) (1649 57460) (1650 57531) (1651 57532) (1652 57543) (1653 57544) (1654 -57545) (1655 57547) (1656 57548) (1657 57511) (1658 57558) (1659 57556) (1660 57521) (1661 57549) ( -1662 57506) (1663 57559) (1664 57557) (1665 57522) (1666 57546) (1667 57562) (1668 57561) (1669 57523) - (1670 57507) (1671 57563) (1672 57512) (1673 57524) (1674 57550) (1675 57551) (1676 57565) (1677 -57564) (1678 57566) (1679 57553) (1680 57554) (1681 57513) (1682 57571) (1683 57525) (1684 57572) ( -1685 57573) (1686 57526) (1687 57574) (1688 57508) (1689 57575) (1690 57527) (1691 57576) (1692 57577) - (1693 57578) (1694 57579) (1695 57580) (1696 57581) (1697 57582) (1698 57583) (1699 57584) (1700 -57505) (1701 57585) (1702 57560) (1703 57586) (1704 57587) (1705 57567 62963) (1706 57588) (1707 57552 -) (1708 57589) (1709 57590) (1710 57592) (1711 57509) (1712 57593) (1713 57569) (1714 57594) (1715 -57568) (1716 57595) (1722 57514) (1723 57570) (1724 57528) (1726 57515) (1728 57510) (1729 57516) ( -1730 57518) (1731 57517) (1733 57541) (1734 57537) (1735 57536) (1736 57538) (1737 57542) (1739 57540) - (1740 57555 62890) (1741 57530) (1744 57529) (1746 57519) (1747 57533) (1748 57390) (1749 57534) ( -1780 62842 62843) (1781 62844) (1782 62845))] - -[9 ((2305 58785) (2306 58786) (2307 58787) (2309 58789) (2310 58790) (2311 58791) (2312 58792) (2313 -58793) (2314 58794) (2315 58795) (2316 58797) (2317 58788) (2319 58800) (2320 58801) (2321 58802) ( -2322 58803) (2323 58804) (2324 58805) (2325 58807) (2326 58809) (2327 58811) (2328 58813) (2329 58814) - (2330 58815) (2331 58816) (2332 58817) (2333 58819) (2334 58820) (2335 58821) (2336 58822) (2337 -58823) (2338 58825) (2339 58827) (2340 58828) (2341 58829) (2342 58830) (2343 58831) (2344 58832) ( -2345 58833) (2346 58834) (2347 58835) (2348 58837) (2349 58838) (2350 58839) (2351 58840) (2352 58842) - (2353 58843) (2354 58844) (2355 58845) (2356 58846) (2357 58847) (2358 58848) (2359 58849) (2360 -58850) (2361 58851) (2364 58863) (2365 58873) (2366 58854) (2367 58855) (2368 58856) (2369 58857) ( -2370 58858) (2371 58859) (2372 58860) (2373 58866) (2374 58870) (2375 58864) (2376 58865) (2377 58876) - (2378 58736) (2379 58868) (2380 58869) (2381 58871 58878) (2384 58874) (2385 58737) (2386 58738) ( -2387 58739) (2388 58740) (2392 58808) (2393 58810) (2394 58812) (2395 58818) (2396 58824) (2397 58826) - (2398 58836) (2399 58841) (2400 58796) (2401 58798) (2402 58861) (2403 58862) (2404 58875 59131) ( -2405 58741) (2406 58657) (2407 58658) (2408 58659) (2409 58660) (2410 58661) (2411 58662) (2412 58663) - (2413 58664) (2414 58665) (2415 58666) (2416 58872) (2433 59041) (2434 59042) (2435 59043) (2437 -59045) (2438 59046) (2439 59047) (2440 59048) (2441 59049) (2442 59050) (2443 59051) (2444 59053) ( -2447 59056) (2448 59057) (2451 59060) (2452 59061) (2453 59063) (2454 59065) (2455 59067) (2456 59069) - (2457 59070) (2458 59071) (2459 59072) (2460 59073) (2461 59075) (2462 59076) (2463 59077) (2464 -59078) (2465 59079) (2466 59081) (2467 59083) (2468 59084) (2469 59085) (2470 59086) (2471 59087) ( -2472 59088) (2474 59090) (2475 59091) (2476 59093) (2477 59094) (2478 59095) (2479 59096) (2480 59098) - (2482 59100) (2486 59104) (2487 59105) (2488 59106) (2489 59107) (2492 59108) (2494 59110) (2495 -59111) (2496 59112) (2497 59113) (2498 59114) (2499 59115) (2500 59116) (2503 59120) (2504 59121) ( -2507 59124) (2508 59125) (2509 59127) (2524 59080) (2525 59082) (2527 59097) (2528 59052) (2529 59054) - (2530 59117) (2531 59118) (2534 58913) (2535 58914) (2536 58915) (2537 58916) (2538 58917) (2539 -58918) (2540 58919) (2541 58920) (2542 58921) (2543 58922) (2544 59099) (2545 59103) (2546 58933) ( -2547 58928) (2548 58929) (2549 58930) (2550 58931) (2551 58935) (2552 58932) (2553 58934) (2554 59130) -)] - -[10 ((2562 59170) (2565 59173) (2566 59174) (2567 59175) (2568 59176) (2569 59177) (2570 59178) (2575 -59183) (2576 59184) (2579 59187) (2580 59188) (2581 59189) (2582 59190) (2583 59191) (2584 59192) ( -2585 59193) (2586 59194) (2587 59195) (2588 59196) (2589 59197) (2590 59198) (2591 59199) (2592 59200) - (2593 59201) (2594 59202) (2595 59203) (2596 59204) (2597 59205) (2598 59206) (2599 59207) (2600 -59208) (2602 59210) (2603 59211) (2604 59212) (2605 59213) (2606 59214) (2607 59215) (2608 59216) ( -2610 59218) (2611 59219) (2613 59221) (2614 59222) (2616 59224) (2617 59225) (2620 59228) (2622 59230) - (2623 59231) (2624 59232) (2625 59233) (2626 59234) (2631 59239) (2632 59240) (2635 59243) (2636 -59244) (2637 59245) (2649 59257) (2650 59258) (2651 59259) (2652 59260) (2654 59262))] - -[14 ((3585 59425) (3586 59426) (3587 59427) (3588 59428) (3589 59429) (3590 59430) (3591 59431) (3592 -59432) (3593 59433) (3594 59434) (3595 59435) (3596 59436) (3597 59437) (3598 59438) (3599 59439) ( -3600 59440) (3601 59441) (3602 59442) (3603 59443) (3604 59444) (3605 59445) (3606 59446) (3607 59447) - (3608 59448) (3609 59449) (3610 59450) (3611 59451) (3612 59452) (3613 59453) (3614 59454) (3615 -59455) (3616 59456) (3617 59457) (3618 59458) (3619 59459) (3620 59460) (3621 59461) (3622 59462) ( -3623 59463) (3624 59464) (3625 59465) (3626 59466) (3627 59467) (3628 59468) (3629 59469) (3630 59470) - (3631 59471) (3632 59472) (3633 59473) (3634 59474) (3635 59475) (3636 59476) (3637 59477) (3638 -59478) (3639 59479) (3640 59480) (3641 59481) (3642 59482) (3647 59487) (3648 59488) (3649 59489) ( -3650 59490) (3651 59491) (3652 59492) (3653 59493) (3654 59494) (3655 59495) (3656 59496) (3657 59497) - (3658 59498) (3659 59499) (3660 59500) (3661 59501) (3662 59502) (3663 59503) (3664 59504) (3665 -59505) (3666 59506) (3667 59507) (3668 59508) (3669 59509) (3670 59510) (3671 59511) (3672 59512) ( -3673 59513) (3674 59514) (3675 59515) (3713 59553) (3714 59554) (3716 59556) (3719 59559) (3720 59560) - (3722 59562) (3725 59565) (3732 59572) (3733 59573) (3734 59574) (3735 59575) (3737 59577) (3738 -59578) (3739 59579) (3740 59580) (3741 59581) (3742 59582) (3743 59583) (3745 59585) (3746 59586) ( -3747 59587) (3749 59589) (3751 59591) (3754 59594) (3755 59595) (3757 59597) (3758 59598) (3759 59599) - (3760 59600) (3761 59601) (3762 59602) (3763 59603) (3764 59604) (3765 59605) (3766 59606) (3767 -59607) (3768 59608) (3769 59609) (3771 59611) (3772 59612) (3773 59613 59621) (3776 59616) (3777 59617 -) (3778 59618) (3779 59619) (3780 59620) (3782 59622) (3784 59624) (3785 59625) (3786 59626) (3787 -59627) (3788 59628) (3789 59629) (3792 59632) (3793 59633) (3794 59634) (3795 59635) (3796 59636) ( -3797 59637) (3798 59638) (3799 59639) (3800 59640) (3801 59641) (3804 59644) (3805 59645))] - -[16 ((4256 58449) (4257 58450) (4258 58451) (4259 58452) (4260 58453) (4261 58454) (4262 58455) (4263 -58457) (4264 58458) (4265 58459) (4266 58460) (4267 58461) (4268 58462) (4269 58464) (4270 58465) ( -4271 58466) (4272 58467) (4273 58468) (4274 58469) (4275 58470) (4276 58472) (4277 58473) (4278 58474) - (4279 58475) (4280 58476) (4281 58477) (4282 58478) (4283 58479) (4284 58480) (4285 58481) (4286 -58482) (4287 58484) (4288 58485) (4289 58456) (4290 58463) (4291 58471) (4292 58483) (4293 58486) ( -4304 58401) (4305 58402) (4306 58403) (4307 58404) (4308 58405) (4309 58406) (4310 58407) (4311 58409) - (4312 58410) (4313 58411) (4314 58412) (4315 58413) (4316 58414) (4317 58416) (4318 58417) (4319 -58418) (4320 58419) (4321 58420) (4322 58421) (4323 58422) (4324 58424) (4325 58425) (4326 58426) ( -4327 58427) (4328 58428) (4329 58429) (4330 58430) (4331 58431) (4332 58432) (4333 58433) (4334 58434) - (4335 58436) (4336 58437) (4337 58408) (4338 58415) (4339 58423) (4340 58435) (4341 58438) (4342 -58439) (4347 58447))] - -[17 ((4352 58305) (4353 58306) (4354 58308) (4355 58311) (4356 58312) (4357 58313) (4358 58321) (4359 -58322) (4360 58323) (4361 58325) (4362 58326) (4363 58327) (4364 58328) (4365 58329) (4366 58330) ( -4367 58331) (4368 58332) (4369 58333) (4370 58334) (4449 58338) (4450 58339) (4451 58340) (4452 58341) - (4453 58342) (4454 58343) (4455 58346) (4456 58347) (4457 58348) (4458 58349) (4459 58350) (4460 -58351) (4461 58354) (4462 58355) (4463 58356) (4464 58357) (4465 58358) (4466 58359) (4467 58362) ( -4468 58363) (4469 58364) (4522 58307) (4524 58309) (4525 58310) (4528 58314) (4529 58315) (4530 58316) - (4531 58317) (4532 58318) (4533 58319) (4534 58320) (4537 58324))] - -[22 ((5792 10530) (5794 10532) (5795 10677) (5796 10674) (5798 10535) (5800 10539) (5801 10667) (5802 -10671) (5803 10673) (5805 10661) (5806 10662) (5807 10666) (5809 10546) (5810 10549) (5812 10551) ( -5813 10555) (5815 10554) (5817 10557) (5818 10559) (5819 10560) (5820 10564) (5822 10567) (5823 10570) - (5825 10571) (5827 10572) (5829 10665) (5831 10582) (5832 10585) (5839 10607) (5840 10608) (5841 -10664) (5842 10610) (5846 10615) (5847 10616) (5848 10618) (5849 10620) (5850 10622) (5852 10623) ( -5853 10658) (5854 10663) (5855 10659) (5856 10678) (5857 10680) (5873 10669))] - -[29 ((7424 64865) (7425 64848) (7428 64867) (7429 64868) (7431 64869) (7434 64874) (7435 64875) (7437 -64877) (7439 64879) (7448 64880) (7451 64884) (7452 64885) (7456 64886) (7457 64887) (7458 64890))] - -[30 ((7692 62001) (7693 62129) (7695 62127) (7716 62002) (7717 62130) (7778 62003) (7779 62131) (7788 -62004) (7789 62132) (7791 62128) (7884 61812) (7885 61940) (7922 61802) (7923 61930))] - -[31 ((7936 62243) (7937 62241) (7938 62259) (7939 62253) (7940 62257) (7941 62251) (7942 62261) (7943 -62255) (7944 62244) (7945 62242) (7946 62260) (7948 62258) (7949 62252 62254) (7950 62262) (7951 62256 -) (7952 62289) (7953 62287) (7954 62301) (7955 62297) (7956 62299) (7957 62295) (7960 62290) (7961 -62288) (7962 62302) (7963 62298) (7964 62300) (7965 62296) (7968 62305) (7969 62303) (7970 62321) ( -7971 62315) (7973 62313) (7974 62323) (7975 62317) (7976 62306) (7977 62304) (7978 62322) (7979 62316) - (7980 62320) (7981 62314) (7982 62324) (7983 62318) (7984 62385) (7985 62383) (7986 62401) (7987 -62395) (7988 62399) (7989 62393) (7990 62403) (7991 62397) (7992 62386) (7993 62384) (7994 62402) ( -7995 62396) (7996 62400) (7997 62394) (7998 62404) (7999 62398) (8000 62413) (8001 62411) (8002 62425) - (8003 62421) (8004 62423) (8005 62419) (8008 62414) (8009 62412) (8010 62426) (8011 62422) (8012 -62424) (8013 62420) (8016 62429) (8017 62427) (8018 62447) (8019 62439) (8020 62445) (8021 62437) ( -8022 62449) (8023 62441) (8025 62428) (8027 62440) (8029 62438) (8031 62442) (8032 62457) (8033 62455) - (8034 62507) (8035 62501) (8036 62505) (8037 62499) (8038 62509) (8039 62503) (8040 62458) (8041 -62456) (8042 62508) (8043 62502) (8044 62506) (8045 62500) (8046 62510) (8047 62504) (8048 62247) ( -8049 62245) (8050 62293) (8051 62291) (8052 62309) (8053 62307) (8054 62389) (8055 62387) (8056 62417) - (8057 62415) (8058 62433) (8059 62431) (8060 62461) (8061 62459) (8064 62267) (8065 62265) (8066 -62283) (8067 62277) (8068 62281) (8069 62275) (8070 62285) (8071 62279) (8072 62268) (8073 62266) ( -8074 62284) (8075 62278) (8076 62282) (8077 62276) (8078 62286) (8079 62280) (8080 62329) (8081 62327) - (8082 62379) (8083 62373) (8084 62319 62377) (8085 62371) (8086 62381) (8087 62375) (8088 62330) ( -8089 62328) (8090 62380) (8091 62374) (8092 62378) (8093 62372) (8094 62382) (8095 62376) (8096 62515) - (8097 62513) (8098 62531) (8099 62525) (8100 62529) (8101 62523) (8102 62533) (8103 62527) (8104 -62516) (8105 62514) (8106 62532) (8107 62524 62526) (8108 62530) (8110 62534) (8111 62528) (8114 62271 -) (8115 62263) (8116 62269) (8118 62249) (8119 62273) (8122 62248) (8123 62246) (8124 62264) (8125 -9779) (8127 9790) (8128 9773) (8129 9789 9935) (8130 62333) (8131 62325) (8132 62331) (8134 62311) ( -8135 62369) (8136 62294) (8137 62292) (8138 62310) (8139 62308) (8140 62326) (8141 9786 9931) (8142 -9785 9922 9930) (8143 9788 9924) (8150 62391) (8154 62390) (8155 62388) (8157 9770 9929) (8158 9769 -9921 9928) (8159 9772 9923) (8164 62537) (8165 62535) (8166 62435) (8170 62434) (8171 62432) (8172 -62536) (8173 9783 9934) (8174 9782) (8175 9775) (8178 62519) (8179 62511) (8180 62517) (8182 62497) ( -8183 62521) (8184 62418) (8185 62416) (8186 62462) (8187 62460) (8188 62512) (8189 9774) (8190 9791))] - -[32 ((8192 61228 61620) (8193 61229 61621) (8196 60961 61617) (8197 60962 61618) (8198 61619) (8199 -61230) (8200 60964 61622 61623) (8201 61231) (8202 60963) (8205 57598) (8206 57596) (8207 57597) (8208 - 8510) (8209 57645 61218) (8210 61222) (8211 61220) (8212 61221) (8213 208) (8215 61375) (8216 169 -8746 9122) (8217 185) (8218 9138) (8220 170 61225) (8221 186) (8222 61224) (8224 61232) (8225 61233) ( -8226 60270 61286) (8227 61635) (8228 61090) (8229 8517 61091) (8230 8516) (8231 60965) (8240 61249) ( -8241 8766) (8242 8556 8747 61035) (8243 8557 8748) (8244 8555) (8245 61051) (8248 60999) (8249 61226) -(8250 61227) (8251 8744) (8252 61050) (8253 60200) (8254 9086) (8258 8764) (8259 60220) (8304 64944) ( -8308 64948) (8309 64949) (8310 64950) (8311 64951) (8312 64952) (8313 64953) (8314 64958) (8315 64959) - (8316 64942) (8319 64936) (8320 64992) (8321 64993) (8322 64994) (8323 64995) (8324 64996) (8325 -64997) (8326 64998) (8327 64999) (8328 65000) (8329 65001) (8330 65003) (8331 65002) (8332 65004) ( -8352 61349) (8353 60223) (8354 61345) (8355 61347) (8356 8941) (8359 60285 61348) (8360 58671 58877) ( -8361 58274) (8362 57636) (8401 9184) (8402 60331) (8403 60332) (8404 60337) (8405 60338) (8406 9160) ( -8407 9144) (8408 60334) (8409 60336) (8410 60335) (8417 9154))] - -[33 ((8448 60977) (8450 61356) (8451 8558) (8452 61000) (8453 61248) (8454 60992) (8455 60198) (8456 -60226) (8459 60194) (8460 60203) (8461 8936) (8462 60348) (8463 60975 61288) (8464 60195) (8465 8873) -(8466 60996) (8467 61289) (8469 61357) (8470 61352) (8471 9134) (8472 8870 60273) (8473 60193) (8474 -8935) (8475 60995) (8476 8872) (8477 61358) (8478 61353) (8480 60330) (8481 61354) (8482 212 60275 -60276) (8484 61359) (8485 8765 9135) (8486 224) (8487 8828) (8488 60284) (8489 60368) (8493 60283) ( -8495 60271) (8499 60254) (8501 61351) (8524 60221) (8531 61437 61555) (8532 61438 61556) (8533 60240) -(8534 60241) (8535 60242) (8536 60243) (8537 60244) (8538 60245) (8539 220 61557) (8540 221 61558) ( -8541 222 61559) (8542 223 61560) (8543 61561) (8544 61377) (8545 61378) (8546 61379) (8547 61380) ( -8548 61381) (8549 61382) (8550 61383) (8551 61384) (8552 61385) (8553 61386) (8554 60369) (8555 60370) - (8592 95 61100 61628) (8593 94 61101) (8594 174 61102 61625) (8595 175 61103 61624) (8596 61266) ( -8597 61109) (8598 61244) (8599 61246) (8600 61245) (8601 61247) (8602 61175) (8603 61176) (8605 61267) - (8606 8774) (8608 8775) (8609 61627) (8610 8780) (8611 8781) (8614 8811) (8616 61110) (8617 8795) ( -8618 8794) (8619 8782) (8620 8783) (8621 8786) (8622 61177) (8624 8784) (8625 8785) (8626 8942) (8627 -8943) (8628 61626) (8629 61629) (8630 61170) (8631 61171) (8634 61172) (8635 61173) (8636 8790) (8637 -8791) (8638 8778) (8639 8776) (8640 8792) (8641 8793) (8642 8779) (8643 8777) (8644 61008) (8645 60206 -) (8646 61265) (8647 8768) (8648 8770) (8649 8769) (8650 8771) (8651 61174) (8652 61264) (8653 61178) -(8654 61180) (8655 61179) (8656 61261) (8657 8800) (8658 61263) (8659 8801) (8660 61262) (8661 61009) -(8666 8772) (8667 8773) (8668 60364) (8669 60363) (8674 60208) (8678 61097) (8679 61098) (8680 61096) -(8681 61099) (8693 60207))] - -[34 ((8704 61365) (8705 61033) (8706 61370) (8707 61364) (8708 61041) (8709 8871 61281) (8710 60997) ( -8711 61369) (8712 61258) (8713 61259) (8715 61260) (8716 60347) (8717 8889) (8718 61368) (8719 61307) -(8720 8621 8887) (8721 60262 61306) (8722 60973) (8723 61309) (8724 60971) (8726 60988) (8727 61053) ( -8728 61031 61287) (8729 8944) (8730 61308) (8733 8825 61297) (8734 8551) (8735 61149) (8736 61292) ( -8737 61293) (8738 8888) (8739 61052 61254) (8740 8629 61255) (8741 8514 8566 61256) (8742 8630 61257) -(8743 8882) (8744 8883) (8745 61270) (8746 61271) (8747 61301) (8748 8810) (8749 60249) (8750 61302) ( -8751 60214) (8752 60215) (8753 60355) (8754 60353) (8755 60354) (8756 8552) (8757 61295) (8758 60980) -(8759 61294) (8760 60987) (8762 61028) (8763 60359) (8764 8823 61054) (8765 8894) (8766 60358) (8768 -8829) (8769 8624 61182) (8770 61032) (8771 61303) (8772 8639) (8773 61304) (8774 60343) (8775 8652) ( -8776 8824 61305) (8777 8640) (8778 61048) (8779 60196) (8780 8651) (8781 8804) (8782 60994) (8783 -61049) (8784 61299) (8785 8616) (8786 8802) (8787 8803) (8788 8788) (8789 8789) (8790 8618) (8791 8617 -) (8793 60989) (8794 60990) (8796 8619) (8799 61300) (8800 8546) (8801 8866 61298) (8802 61042) (8803 -60209) (8804 8549) (8805 8550) (8806 8560) (8807 8561) (8808 8690 8692) (8809 8691 8693) (8810 8817 -61250) (8811 8818 61251) (8812 60976) (8813 8756) (8814 8649 61252) (8815 8650 61253) (8816 8672 8678 -8688) (8817 8673 8679 8689) (8818 61038) (8819 61039) (8820 8665) (8821 8666) (8822 61036) (8823 61037 -) (8824 60340) (8825 60339) (8826 8528) (8827 8529) (8828 8530) (8829 8531) (8830 8609) (8831 8610) ( -8832 8656) (8833 8657) (8834 61275) (8835 61274) (8836 61279) (8837 61278) (8838 61273) (8839 61272) ( -8840 8643 61277) (8841 8644 61276) (8842 8645) (8843 8646) (8845 60210) (8846 8875 8879) (8847 61010) -(8848 61011) (8849 8880) (8850 8881) (8851 8878) (8852 8877 8886) (8853 8819 8938 61282) (8854 8820 -61283) (8855 8821 8939 61284) (8856 8822 61285) (8857 8893 8940) (8858 8949) (8859 8568) (8860 60197) -(8861 8567) (8862 8751) (8863 8752) (8864 8753) (8865 8754) (8866 61238) (8867 61239) (8868 8874 61040 -) (8869 61296) (8870 60982) (8871 8876) (8872 61240) (8873 8515) (8874 8559) (8876 8631) (8877 8632) ( -8878 8633) (8879 8634) (8884 61163) (8885 61164) (8886 60357) (8887 60356) (8888 8787) (8890 61089) ( -8891 60282 61147) (8892 60344) (8893 60345) (8896 61366) (8897 61367) (8898 61014) (8899 61015) (8901 -61108) (8903 60991) (8904 8812) (8905 61142) (8906 61143) (8907 61144) (8908 61145) (8909 61181) (8910 - 61162) (8911 61161) (8912 8542) (8913 8543) (8914 61026) (8915 61027) (8916 8620) (8918 8512) (8919 -8513) (8920 8518) (8921 8519) (8922 8526 8564) (8923 8527 8565) (8926 8532) (8927 8533) (8928 8658 -8662) (8929 8659) (8930 8686) (8931 8687) (8934 8676) (8935 8677) (8936 8625) (8937 8626) (8938 8635) -(8939 8636) (8940 8637) (8941 8638) (8942 12075) (8951 8890))] - -[35 ((8962 60986) (8965 61130) (8966 61146) (8967 60365) (8968 61043 61360) (8969 61046 61361) (8970 -61044 61362) (8971 61047 61363) (8972 60968) (8973 60969) (8974 60966) (8975 60967) (8976 61034) (8977 - 60998) (8978 61004 61376) (8979 61005) (8981 60255) (8982 61007) (8984 60201) (8985 60235) (8987 -61021) (8988 8945) (8989 8946) (8990 8947) (8991 8948) (8992 61165) (8993 61166) (8994 8614) (8995 -8613 8815) (9001 61234) (9002 61235) (9005 61003) (9006 61006) (9007 60983) (9008 60984) (9014 61139) -(9015 61148) (9017 61127) (9019 61140) (9021 61123) (9023 61128) (9024 61129) (9026 61168) (9033 61124 -) (9035 61122) (9038 61136) (9042 61121) (9045 61137) (9049 8867) (9053 61138) (9054 61126) (9055 -61125) (9067 61120) (9073 61112) (9074 61111) (9079 8869) (9080 8868) (9122 8923) (9125 8924) (9127 -61156) (9128 61158) (9129 61157) (9130 61153 61167) (9131 61152) (9132 61154) (9133 61155) (9135 11810 -) (9136 61159) (9137 61160) (9188 61001) (9190 61374))] - -[36 ((9216 61616) (9225 61609) (9226 61610) (9227 61608) (9228 61611) (9229 61612) (9251 61694) (9252 -61613) (9280 61371) (9281 61373) (9282 61372) (9312 60600 61393) (9313 60601 61394) (9314 60602 61395) - (9315 60603 61396) (9316 60604 61397) (9317 60605 61398) (9318 60606 61399) (9319 60607 61400) (9320 -60608 61401) (9321 60609 61402) (9322 30299) (9323 30300) (9324 30301) (9325 30302) (9326 30303) (9327 - 30331) (9328 30332) (9329 30333) (9330 30334) (9331 30395) (9332 29808) (9333 29809) (9334 29810) ( -9335 29811) (9336 29812) (9337 29813) (9338 29814) (9339 29815) (9340 29816) (9341 29817) (9342 29818) - (9343 29947) (9344 29948) (9345 29949) (9346 29950) (9372 29921) (9373 29922) (9374 29923) (9375 -29924) (9376 29925) (9377 29926) (9378 29927) (9379 29928) (9380 29929) (9381 29930) (9382 29931) ( -9383 29932) (9384 29933) (9385 29934) (9386 29935) (9387 29936) (9388 29937) (9389 29938) (9390 29939) - (9391 29940) (9392 29941) (9393 29942) (9394 29943) (9395 29944) (9396 29945) (9397 29946) (9398 -30273) (9399 30274) (9400 30275) (9401 30276) (9402 30277) (9403 30278) (9404 30279) (9405 30280) ( -9406 30281) (9407 30282) (9408 30283) (9409 30284) (9410 30285) (9411 30286) (9412 30287) (9413 30288) - (9414 30289) (9415 30290) (9416 30291) (9417 30292) (9418 30293) (9419 30294) (9420 30295) (9421 -30296) (9422 30297) (9423 30298) (9424 30305) (9425 30306) (9426 30307) (9427 30308) (9428 30309) ( -9429 30310) (9430 30311) (9431 30312) (9432 30313) (9433 30314) (9434 30315) (9435 30316) (9436 30317) - (9437 30318) (9438 30319) (9439 30320) (9440 30321) (9441 30322) (9442 30323) (9443 30324) (9444 -30325) (9445 30326) (9446 30327) (9447 30328) (9448 30329) (9449 30330) (9450 30396))] - -[37 ((9472 10273 11809 61413) (9473 10284 11811 61410) (9474 10274 61412) (9475 10285 61409) (9476 -10448) (9477 10449) (9478 10450) (9479 10451) (9480 10452) (9481 10453) (9482 10454) (9483 10455) ( -9484 10275) (9485 10317) (9486 10313) (9487 10286) (9488 10276) (9489 10318) (9490 10314) (9491 10287) - (9492 10278) (9493 10363) (9494 10316) (9495 10289) (9496 10277) (9497 10319) (9498 10315) (9499 -10288) (9500 10279) (9501 10300) (9502 10444) (9503 10445) (9504 10295) (9505 10446) (9506 10447) ( -9507 10290) (9508 10281) (9509 10302) (9512 10297) (9515 10292) (9516 10280) (9519 10296) (9520 10301) - (9523 10291) (9524 10282) (9527 10298) (9528 10303) (9531 10293) (9532 10283 61414) (9535 10299) ( -9538 10304) (9543 10308) (9544 10309) (9545 10307) (9546 10310) (9547 10294 61411) (9548 10311) (9549 -10456) (9550 10305) (9551 10306) (9552 10337) (9553 10325) (9554 10345) (9555 10346) (9556 10333) ( -9557 10323) (9558 10322) (9559 10326) (9560 10344) (9561 10343) (9562 10332) (9563 10329) (9564 10328) - (9565 10327) (9566 10330) (9567 10331) (9568 10336) (9569 10320) (9570 10321) (9571 10324) (9572 -10341) (9573 10342) (9574 10335) (9575 10339) (9576 10340) (9577 10334) (9578 10348) (9579 10347) ( -9580 10338) (9581 10457) (9582 10458) (9583 10459) (9584 10460) (9585 10461) (9586 10462) (9600 61117) - (9604 61114) (9608 10463 60224 61113) (9612 61116) (9616 61115) (9617 61024) (9618 61310) (9619 61025 -) (9632 8739 60267) (9633 8738 60279) (9635 60219) (9642 60231) (9643 60280) (9644 61150) (9645 60327) - (9646 60970) (9647 8927) (9649 60328 61002) (9650 8741) (9651 8740) (9652 8884) (9653 8816) (9654 -61104) (9655 61106) (9656 60268) (9657 8891) (9658 61119) (9660 8743) (9661 8742) (9662 8885) (9663 -8827) (9664 61105) (9665 61107) (9666 60269) (9667 8892) (9668 61118) (9670 8737) (9671 8574 8623) ( -9675 8571 60645) (9676 60326) (9678 8573) (9679 8572 60640 61636) (9680 60661) (9681 60643) (9682 -60642) (9683 60662) (9684 60644) (9685 60641) (9686 60497) (9687 60783) (9688 60993) (9689 61013) ( -9692 60386) (9693 60384) (9694 60383) (9695 60385) (9698 60238) (9699 60239) (9700 60236) (9701 60237) - (9702 60250 60281) (9711 8830))] - -[38 ((9733 8570 60462) (9734 8569 60463) (9737 61415) (9742 60455 60709 61436) (9743 60491 60979) ( -9746 61280) (9747 60351) (9754 60451 60535) (9755 60450 60714) (9756 61237) (9758 60715 61236) (9760 -61408) (9764 60225) (9769 60350) (9774 61406) (9775 60228) (9785 60229) (9786 61407) (9787 61151) ( -9789 61416) (9790 61417) (9791 61418) (9792 8554) (9794 8553) (9795 61419) (9796 61420) (9797 61421) ( -9798 61422) (9799 61423) (9800 61426) (9801 61427) (9802 61428) (9803 61429) (9804 61430) (9805 61431) - (9806 61432) (9807 61433) (9808 61434) (9809 61435) (9810 61424) (9811 61425) (9824 61387) (9825 -61388) (9826 61389) (9827 61390) (9828 61131) (9829 61132) (9830 61133) (9831 61134) (9833 60246) ( -9834 213) (9835 61141) (9837 9132) (9838 8814) (9839 9148) (9855 60230) (9878 60222))] - -[39 ((9985 60705) (9986 60453 60706) (9987 60707) (9988 60454 60490 60708) (9989 60494) (9990 60710) ( -9991 60711) (9992 60712) (9993 60713) (9996 60716) (9997 60717) (9998 60718) (9999 60719) (10000 60720 -) (10001 60492 60721) (10002 60456 60722) (10003 60458 61391) (10004 60723) (10005 60724) (10006 60725 -) (10007 61392) (10008 60486 60727) (10009 60728) (10010 60729) (10011 60730) (10012 60731) (10013 -60732) (10014 60733) (10015 60734) (10016 8622) (10017 60735) (10018 60736) (10019 60737) (10020 60738 -) (10021 60739) (10022 60740) (10023 60741) (10025 60742) (10026 60743) (10027 60744) (10028 60745) ( -10029 60746) (10030 60747) (10031 60748) (10032 60749) (10033 60750) (10034 60751) (10035 60752) ( -10036 60753) (10037 60754) (10038 60755) (10039 60756) (10040 60757) (10041 60758) (10042 60759) ( -10043 60760) (10044 60761) (10045 60762) (10046 60763) (10047 60764) (10048 60765) (10049 60766) ( -10050 60767) (10051 60768) (10052 60769) (10053 60770) (10054 60771) (10055 60772) (10056 60773) ( -10057 60774) (10058 60775) (10059 60776) (10061 60777) (10063 60778) (10064 60779) (10065 60780) ( -10066 60781) (10070 60782) (10072 60665) (10073 60784) (10074 60785) (10075 60899) (10076 60900) ( -10077 60663) (10078 60664) (10081 60786) (10082 60787) (10083 60788) (10084 60789) (10085 60790) ( -10086 60791) (10087 60792) (10102 60793) (10103 60794) (10104 60795) (10105 60796) (10106 60797) ( -10107 60798) (10108 60833) (10109 60834) (10110 60835) (10111 60836) (10112 60610) (10113 60611) ( -10114 60612) (10115 60613) (10116 60614) (10117 60615) (10118 60616) (10119 60617) (10120 60618) ( -10121 60619) (10122 60620) (10123 60621) (10124 60622) (10125 60623) (10126 60624) (10127 60625) ( -10128 60626) (10129 60627) (10130 60628) (10131 60629) (10132 60837) (10133 60531) (10136 60838) ( -10137 60839) (10138 60840) (10139 60841) (10140 60842) (10141 60843) (10142 60844) (10143 60845) ( -10144 60846) (10146 60847) (10147 60848) (10148 60849) (10149 60850) (10150 60851) (10151 60852) ( -10152 60853) (10153 60854) (10154 60855) (10155 60856) (10156 60857) (10157 60858) (10158 60859) ( -10159 60860) (10161 60861) (10162 60862) (10163 60863) (10164 60864) (10165 60865) (10166 60866) ( -10167 60867) (10168 60868) (10169 60869) (10170 60870) (10171 60871) (10172 60872) (10173 60873) ( -10174 60874) (10214 8522) (10215 8523) (10220 8520) (10221 8521) (10229 8796) (10230 8797) (10231 8807 -) (10232 8798) (10233 8799) (10234 8808 8809))] - -[41 ((10550 61630) (10692 61666))] - -[42 ((10773 60212) (10774 60213) (10877 8562) (10878 8563) (10885 8547) (10886 8548) (10887 8674) ( -10888 8675) (10901 8544) (10902 8545) (10927 8805) (10928 8806) (10933 8660) (10934 8661) (10935 8611) - (10936 8612) (10937 8627) (10938 8628) (10941 60211) (10949 8540) (10950 8541) (10955 8641 8647) ( -10956 8642 8648) (10980 61241))] - -[43 ((11013 61093) (11014 61094) (11015 61095) (11089 8813) (11157 61092))] - -[48 ((12288 8481) (12289 8482) (12290 8483) (12291 8503) (12292 29819) (12293 8505) (12294 8506) ( -12298 8760) (12299 8761) (12300 8534) (12301 8535) (12302 8536) (12303 8537) (12304 8538) (12305 8539) - (12306 8745) (12307 8750 12130) (12308 8524) (12309 8525) (12310 61242) (12311 61243) (12337 12257) ( -12338 12258) (12339 12273) (12340 12274) (12341 12275) (12353 9249 12096) (12354 9250) (12355 9251) ( -12356 9252) (12357 9253 12097 12098) (12358 9254) (12359 9255 12099) (12360 9256) (12361 9257 12100) ( -12362 9258) (12363 9259) (12364 9260) (12365 9261) (12366 9262) (12367 9263) (12368 9264) (12369 9265) - (12370 9266) (12371 9267) (12372 9268) (12373 9269) (12374 9270) (12375 9271) (12376 9272) (12377 -9273) (12378 9274) (12379 9275) (12380 9276) (12381 9277) (12382 9278) (12383 9279) (12384 9280) ( -12385 9281) (12386 9282) (12387 9283 12101) (12388 9284) (12389 9285) (12390 9286) (12391 9287) (12392 - 9288) (12393 9289) (12394 9290) (12395 9291) (12396 9292) (12397 9293) (12398 9294) (12399 9295) ( -12400 9296) (12401 9297) (12402 9298) (12403 9299) (12404 9300) (12405 9301) (12406 9302) (12407 9303) - (12408 9304) (12409 9305) (12410 9306) (12411 9307) (12412 9308) (12413 9309) (12414 9310) (12415 -9311) (12416 9312) (12417 9313) (12418 9314) (12419 9315 12102) (12420 9316) (12421 9317 12103) (12422 - 9318) (12423 9319 12104) (12424 9320) (12425 9321) (12426 9322) (12427 9323) (12428 9324) (12429 9325 -) (12430 9326 12105) (12431 9327) (12432 9328) (12433 9329) (12434 9330) (12435 9331) (12441 8491) ( -12442 8492) (12445 8501) (12446 8502) (12449 9505 12106) (12450 9506) (12451 9507 12107) (12452 9508) -(12453 9509 12108) (12454 9510) (12455 9511 12109) (12456 9512) (12457 9513 12110) (12458 9514) (12459 - 9515) (12460 9516) (12461 9517) (12462 9518) (12463 9519) (12464 9520) (12465 9521) (12466 9522) ( -12467 9523) (12468 9524) (12469 9525) (12470 9526) (12471 9527) (12472 9528) (12473 9529) (12474 9530) - (12475 9531) (12476 9532) (12477 9533) (12478 9534) (12479 9535) (12480 9536) (12481 9537) (12482 -9538) (12483 9539 12111) (12484 9540) (12485 9541) (12486 9542) (12487 9543) (12488 9544) (12489 9545) - (12490 9546) (12491 9547) (12492 9548) (12493 9549) (12494 9550) (12495 9551) (12496 9552) (12497 -9553) (12498 9554) (12499 9555) (12500 9556) (12501 9557) (12502 9558) (12503 9559) (12504 9560) ( -12505 9561) (12506 9562) (12507 9563) (12508 9564) (12509 9565) (12510 9566) (12511 9567) (12512 9568) - (12513 9569) (12514 9570) (12515 9571 12112) (12516 9572) (12517 9573 12113) (12518 9574) (12519 9575 - 12114) (12520 9576) (12521 9577) (12522 9578) (12523 9579) (12524 9580) (12525 9581) (12526 9582 -12115) (12527 9583) (12528 9584) (12529 9585) (12530 9586) (12531 9587) (12532 9588) (12533 9589 12116 -) (12534 9590 12117) (12535 9591) (12536 9592) (12537 9593) (12538 9594) (12539 9595) (12540 8508) ( -12541 8499) (12542 8500))] - -[49 ((12549 9377) (12550 9378) (12551 9379) (12552 9380) (12553 9381) (12554 9382) (12555 9383) (12556 - 9384) (12557 9385) (12558 9386) (12559 9387) (12560 9388) (12561 9389) (12562 9390) (12563 9391) ( -12564 9392) (12565 9393) (12566 9394) (12567 9395) (12568 9396) (12569 9397) (12570 9398) (12571 9399) - (12572 9400) (12573 9401) (12574 9402) (12575 9403) (12576 9404) (12577 9405) (12578 9406) (12579 -9407) (12580 9408) (12581 9409) (12582 9410) (12583 9411) (12584 9412) (12585 9413) (12586 9420) ( -12587 9419) (12588 9421) (12645 58146) (12646 58147) (12647 58148) (12648 58149) (12649 58150) (12650 -58151) (12651 58152) (12652 58153) (12653 58154) (12654 58155) (12655 58156) (12656 58157) (12657 -58158) (12658 58159) (12659 58160) (12660 58161) (12661 58162) (12662 58163) (12663 58164) (12664 -58165) (12665 58166) (12666 58167) (12667 58168) (12668 58169) (12669 58170) (12670 58171) (12671 -58172) (12672 58173) (12673 58174) (12674 58175) (12675 58176) (12676 58177) (12677 58178) (12678 -58179) (12679 58180) (12680 58181) (12681 58182) (12682 58183) (12683 58184) (12684 58185) (12685 -58186) (12686 58187))] - -[50 ((12800 29888) (12801 29889) (12802 29890) (12803 29891) (12804 29892) (12805 29893) (12806 29894) - (12807 29895) (12808 29896) (12809 29897) (12810 29898) (12811 29899) (12812 29900) (12813 29901) ( -12814 29902) (12815 29903) (12816 29904) (12817 29905) (12818 29906) (12819 29907) (12820 29908) ( -12821 29909) (12822 29910) (12823 29911) (12824 29912) (12825 29913) (12826 29914) (12827 29915) ( -12828 29916) (12832 12224) (12833 12225) (12834 12226) (12835 12227) (12836 12228) (12837 12229) ( -12838 12230) (12839 12231) (12840 12232) (12841 12233) (12842 29761) (12843 29762) (12844 29763) ( -12845 29764) (12846 29765) (12847 29766) (12848 29760) (12850 29769) (12851 29770) (12852 29771) ( -12853 29772) (12854 29773) (12855 29768) (12856 29774) (12857 29775) (12864 29767) (12896 29857) ( -12897 29858) (12898 29859) (12899 29860) (12900 29861) (12901 29862) (12902 29863) (12903 29864) ( -12904 29865) (12905 29866) (12906 29867) (12907 29868) (12908 29869) (12909 29870) (12910 29871) ( -12911 29872) (12912 29873) (12913 29874) (12914 29875) (12915 29876) (12916 29877) (12917 29878) ( -12918 29879) (12919 29880) (12920 29881) (12921 29882) (12922 29883) (12923 29884) (12938 29756) ( -12939 29757) (12940 29758) (12941 29759) (12949 29747) (12950 29753) (12953 29754) (12956 29744) ( -12957 29745 29752) (12958 29755) (12960 29746) (13024 29741) (13027 29740) (13030 29743) (13047 29742) -)] - -[51 ((13179 29779) (13180 29778) (13181 29777) (13182 29776))] - -[78 ((19968 12396) (19969 17274) (19971 15415) (19975 19324) (19976 15974) (19977 15152) (19978 15973) - (19979 12860) (19981 18772) (19982 19775) (19984 20514) (19985 12591) (19988 13166 30066) (19989 -20515) (19990 16420 30028) (19991 21058) (19992 13654) (19993 19002) (19998 15975) (20001 20030) ( -20006 19010 30002) (20010 20516) (20013 17254) (20017 20517) (20018 13946) (20022 20518) (20024 13405) - (20025 17200) (20027 15463) (20028 20519) (20031 20520) (20034 20521) (20035 18229) (20037 13655) ( -20043 18231) (20045 18019) (20046 14403) (20047 19251) (20053 26953) (20054 20522) (20055 15976) ( -20056 20523) (20057 12853) (20061 13925) (20062 14448) (20063 19561) (20066 22054) (20081 19824) ( -20083 18045) (20094 13349) (20096 13621) (20098 20524) (20101 20525) (20102 20027) (20104 19773) ( -20105 16744) (20106 20527) (20107 15222) (20108 18035) (20110 20530) (20113 12606) (20114 14431) ( -20116 14430) (20117 12390) (20120 20299) (20121 20298) (20123 14899) (20124 12321) (20126 20531) ( -20127 20532) (20128 20533) (20129 19252) (20130 20534) (20132 14450 30124) (20133 12391) (20134 19314) - (20136 13692) (20139 13693) (20140 13694) (20141 17506) (20142 20028) (20144 20535) (20147 20536) ( -20150 20537) (20154 16205) (20160 15674) (20161 16206) (20162 20542) (20164 20540) (20166 20541) ( -20167 13656) (20170 14883) (20171 12912) (20173 20539) (20174 20538) (20175 18985) (20180 15174) ( -20181 15173) (20182 16958) (20183 20543) (20184 18773) (20185 16487) (20189 8504) (20190 20544) (20191 - 20546) (20195 16997 30068) (20196 20065) (20197 12362) (20205 20545) (20206 12862) (20208 13892) ( -20210 17255) (20214 14191) (20215 20547) (20219 18212))] - -[79 ((20225 13419) (20233 20548) (20234 12363) (20237 14432) (20238 13420) (20239 18810) (20240 18482) - (20241 13657) (20250 12913) (20252 20583) (20253 17729) (20271 18284) (20272 20550) (20276 18492) ( -20278 20066) (20280 16173) (20282 15175) (20284 15223) (20285 12864) (20291 17489) (20294 17186) ( -20295 20554) (20301 12364) (20302 17507) (20303 15675 30014) (20304 14900) (20305 19748) (20307 16974) - (20309 12863 30067) (20311 20553) (20313 19774) (20314 20549) (20315 20551) (20316 14958) (20317 -20552) (20318 21796) (20329 20560) (20335 20563) (20336 20561) (20339 12866) (20341 19003) (20342 -20555) (20347 20559) (20348 14451) (20351 15176) (20355 13350) (20358 20564) (20360 20556) (20363 -20067) (20365 15224) (20367 20557) (20369 20562) (20374 20565) (20376 20558) (20379 13857) (20381 -12365) (20384 13858) (20385 12865) (20395 21797) (20397 19321) (20398 18798) (20399 14452) (20405 -16175) (20406 20023) (20415 19032) (20418 14136) (20419 16933) (20420 12900) (20426 15699) (20430 -20569) (20432 20574) (20433 20572) (20436 20567) (20439 16943) (20440 20570) (20442 20573) (20443 -20571) (20445 19037) (20447 20568) (20449 16174 30076) (20451 19315) (20452 20575) (20453 20576) ( -20462 15652) (20463 20589) (20467 18256) (20469 18742) (20470 20584) (20472 19056) (20474 12854) ( -20478 20588))] - -[80 ((20485 20582) (20486 20591) (20489 16722) (20491 14404) (20493 18268) (20495 24647) (20497 20590) - (20498 17757) (20500 20579) (20502 14454) (20505 14453) (20506 20577) (20511 15450) (20513 20585) ( -20515 19055) (20516 17229) (20517 20581) (20518 14193) (20520 20578) (20521 20586) (20522 20580) ( -20523 20049) (20524 20587) (20525 20289) (20534 13926) (20537 14192) (20547 20592) (20551 20593) ( -20552 20597) (20553 12366) (20559 19024) (20560 20596) (20565 20595) (20566 20599) (20570 20598) ( -20572 17508) (20581 14194) (20588 20600) (20594 15429) (20596 16934) (20597 17509) (20598 13942) ( -20600 20601) (20605 13622) (20608 20602) (20613 20604) (20621 19253) (20625 14182) (20632 15153) ( -20633 18551) (20634 20603) (20652 14917) (20653 19779) (20658 20606) (20659 20771) (20660 20605) ( -20661 14916) (20663 15741) (20670 14137) (20674 20772) (20677 13903) (20681 20769) (20682 20770) ( -20685 17967) (20687 16764 30035) (20689 13859) (20693 19277) (20694 20773) (20698 20029) (20702 20774) - (20707 20777) (20709 20775) (20711 16718) (20717 20776) (20718 20778) (20725 20780) (20729 20779) ( -20731 19016))] - -[81 ((20736 13623) (20737 20782) (20738 20783) (20740 12847) (20745 20781) (20754 15476) (20756 20786) - (20757 20785) (20758 20784) (20760 20566) (20762 20787) (20767 15742) (20769 20788) (20778 19749) ( -20786 19545) (20791 20790) (20794 20789) (20795 20792) (20796 20791) (20799 20793) (20800 20794) ( -20801 12404) (20803 14389 30123) (20804 14139) (20805 15676) (20806 17275) (20807 13860) (20808 16488) - (20809 14455 30043) (20811 14702) (20812 20796) (20813 19528) (20814 17734) (20816 15225) (20818 -20795) (20820 20797) (20826 17758) (20828 13173) (20834 20798) (20837 18046 30001) (20839 30032) ( -20840 16692) (20841 20800) (20842 20801) (20843 18476) (20844 14456) (20845 20283) (20846 20802) ( -20849 13862 30069) (20853 19004 30161) (20854 16950) (20855 13937) (20856 17717) (20860 14195) (20864 -20803) (20866 20804) (20869 18018) (20870 12639) (20873 20807) (20874 14973) (20876 20806) (20877 -14918) (20879 20808) (20880 26222) (20881 20809) (20882 19265) (20883 20810) (20885 20811) (20886 -20812) (20887 15977) (20889 15436) (20896 13351) (20898 20815) (20900 20813) (20901 19517) (20902 -20814) (20904 18778) (20905 20816) (20906 20817) (20907 20818) (20908 17759) (20912 20822) (20913 -20820) (20914 20821) (20915 20819) (20916 14947) (20917 20823) (20918 19562) (20919 20068) (20925 -20824) (20932 16424) (20933 20825) (20934 15706) (20937 20826) (20939 17276) (20940 20031) (20941 -17760) (20950 21061) (20955 20827) (20956 29989) (20957 13893) (20960 20828) (20961 19294) (20966 -15720) (20967 17020) (20969 20830) (20970 18020) (20973 20831) (20976 20832) (20977 13102) (20981 -20833) (20982 13863) (20984 17996) (20985 12666) (20986 15696) (20989 18465) (20990 20834))] - -[82 ((20992 17761) (20995 16207) (20996 20835) (20998 18988) (20999 16474) (21000 13346) (21002 13353) - (21003 20836) (21006 20838) (21009 14138) (21012 20837) (21015 20083) (21021 15721) (21028 18493) ( -21029 19020 30040) (21031 20839) (21033 19832 30034) (21034 20840) (21038 20841) (21040 17790) (21043 -20842) (21046 16425) (21047 14974) (21048 14196) (21049 20843) (21050 15177) (21051 14703) (21059 -17510) (21060 20845) (21063 16935 30182) (21066 14959) (21067 20846) (21068 20847) (21069 16688) ( -21071 20844) (21076 20849) (21078 19254) (21083 14692) (21086 20848) (21091 14197) (21092 14942) ( -21093 18285) (21097 20852) (21098 20850) (21103 18811) (21104 15978) (21105 20859) (21106 13156) ( -21107 20853) (21108 20851) (21109 16719) (21117 20855) (21119 20854) (21123 13124) (21127 14176) ( -21128 20860) (21129 20013) (21133 20856) (21137 20861) (21138 20858) (21140 20857) (21147 20047) ( -21151 14457 30193) (21152 12867 30019) (21155 20084) (21161 15733) (21162 17752) (21163 14693) (21164 -21026) (21165 21027) (21169 20069) (21172 20267) (21173 21029) (21177 14458) (21180 21028) (21182 -13103) (21185 21030) (21187 19286) (21189 17468) (21191 19750) (21193 19033) (21197 21031) (21202 -28757) (21205 17968) (21207 21032) (21208 13354) (21209 19507) (21213 15905) (21214 21033 30156) ( -21215 19047) (21216 21037) (21218 16426) (21219 21034) (21220 13904) (21222 21035) (21223 13355) ( -21234 14126) (21235 21038) (21237 21039) (21240 21040) (21241 21041) (21242 15451) (21246 14459) ( -21247 19550))] - -[83 ((21249 19560) (21250 18039) (21253 19057) (21254 21042) (21256 21043) (21261 21045) (21263 21047) - (21264 21046) (21269 21048) (21270 12861) (21271 19276) (21273 14972) (21274 21049) (21277 16729) ( -21280 15906) (21281 13865) (21283 21050) (21290 18523) (21295 21051) (21297 21052) (21299 21053) ( -21304 21054) (21305 18724) (21306 13928) (21307 12389) (21311 17983) (21312 21055) (21313 15677) ( -21315 16489 30186) (21317 21057) (21318 21056) (21319 15907) (21320 14433) (21321 21059) (21322 18494 -30172) (21325 21060) (21329 18524) (21330 16948) (21331 17006) (21332 13864) (21335 18030) (21336 -17201) (21338 18286) (21340 19278) (21342 21062) (21344 16490) (21350 14133) (21353 21063) (21358 -21064) (21359 12588) (21360 12405) (21361 13421) (21363 16936) (21364 13649) (21365 19825) (21367 -21067) (21368 12855) (21371 21066) (21375 13866) (21378 21068) (21380 19569) (21398 21069) (21400 -20050) (21402 14460) (21407 14390 29998) (21408 21070) (21413 21072) (21414 21071) (21416 16223) ( -21417 12601) (21421 12638) (21422 21073) (21424 21074) (21427 14391) (21430 21075) (21435 13678) ( -21442 15154) (21443 21076) (21448 19316) (21449 14901) (21450 13658 30119) (21451 19751 30140) (21452 -16720) (21453 18495) (21454 15485) (21460 15687) (21462 15464 30158) (21463 15477 30070) (21465 15734) - (21467 18496) (21471 21079) (21473 12611) (21474 16721) (21475 14461) (21476 14405 30205) (21477 -13927) (21480 21083) (21481 17185) (21482 17022) (21483 13867) (21484 15908) (21485 21084) (21486 -21082) (21487 12868) (21488 16998 30062) (21489 15416) (21490 15179) (21491 12582) (21494 13168) ( -21495 14694) (21496 15178) (21498 21085))] - -[84 ((21505 21086) (21507 13641) (21508 13126) (21512 14695 29999) (21513 13640) (21514 17503) (21515 -12581) (21516 17969) (21517 19518) (21518 14625) (21519 19833) (21520 17735) (21521 14462) (21531 -14127 30200) (21533 21095) (21535 13923) (21536 19274) (21542 18525) (21545 21094) (21547 13406) ( -21548 21089) (21549 21090) (21550 21092) (21558 21093) (21560 13659) (21561 16225) (21563 18989) ( -21564 21091) (21565 21087) (21566 14435) (21568 21088) (21570 20260) (21574 19058) (21576 17512) ( -21577 14434) (21578 14704 30153) (21582 21096) (21585 18013) (21599 21100) (21608 15486) (21610 15478) - (21616 21103) (21617 21101) (21619 19491) (21621 21098) (21622 21107) (21623 21102) (21627 21105) ( -21628 14406) (21629 19519 30133) (21632 21106) (21636 21108) (21638 21110) (21643 14960) (21644 20290) - (21646 21099) (21647 21097) (21648 21109) (21650 21104) (21666 21112) (21668 21283) (21669 21114) ( -21672 21118) (21675 21281) (21676 21115) (21679 21310) (21682 14953) (21683 13105) (21688 21113) ( -21692 21285) (21693 12406) (21694 21284) (21696 12325) (21697 18762) (21698 21282) (21700 21116) ( -21703 21111) (21704 21117) (21705 14920) (21720 21286) (21729 12407 30135) (21730 21295) (21733 21287 -30154) (21734 21288) (21736 15909) (21737 19305) (21741 21293) (21742 21292) (21746 17711) (21754 -21294) (21757 21291))] - -[85 ((21764 12596) (21766 14902) (21767 16176) (21775 21289) (21776 17762) (21780 21290) (21782 12322) - (21806 21300) (21807 19747) (21809 15911) (21811 21306) (21816 21305) (21817 21296) (21822 16963) ( -21824 21297) (21828 17007) (21829 21302) (21830 15910) (21836 21299) (21839 19556) (21843 14140) ( -21846 21303) (21847 21304) (21852 21301) (21853 21307) (21859 21298) (21883 21313) (21884 21318) ( -21886 21314) (21888 21309) (21891 21319) (21892 16689) (21895 21321) (21897 14626) (21898 21311) ( -21899 17277) (21912 21315) (21913 21308) (21914 13357) (21916 13422 30141) (21917 13157) (21918 21316) - (21919 21312) (21927 14198) (21928 21322) (21929 21320) (21930 16723) (21931 13642) (21932 13868) ( -21934 21317) (21936 13940) (21942 12612) (21956 21326) (21957 21324) (21959 21543) (21966 30151) ( -21972 21329) (21978 21323) (21980 21327) (21983 21325) (21987 15180) (21988 21328) (22007 21331) ( -22009 21336) (22013 21334) (22014 21333))] - -[86 ((22022 17202) (22025 12869) (22036 21330) (22038 21332) (22039 15912) (22040 12595) (22043 21335) - (22057 12894) (22063 21346) (22065 15996) (22066 21342) (22068 21340) (22070 21341) (22072 21343) ( -22082 12605) (22092 16697) (22094 21337) (22096 21338) (22107 13178) (22116 21345) (22120 13423) ( -22122 21348) (22123 21344) (22124 21347) (22132 18990) (22136 18005) (22138 18488) (22144 21350) ( -22150 21349) (22151 13125) (22154 21351) (22159 21354) (22164 21353) (22176 21352) (22178 18233) ( -22181 21355) (22190 21356) (22196 21358) (22198 21357) (22204 21360) (22208 21363) (22209 21361) ( -22210 21359) (22211 21362) (22216 21364) (22222 21365) (22225 21366) (22227 21367) (22231 21368) ( -22232 20805) (22234 15484) (22235 15181) (22238 12915) (22240 12408) (22243 17220) (22254 21369) ( -22256 14884) (22258 12367) (22259 16222) (22265 21370) (22266 14407) (22269 14705) (22271 21372))] - -[87 ((22272 21371) (22275 19040) (22276 21373) (22280 21537) (22281 21374) (22283 21538) (22285 21539) - (22287 14199) (22290 12640) (22291 21540) (22294 21542 30020) (22296 21541) (22300 21544) (22303 -17754) (22310 21545) (22311 12341) (22312 14943) (22317 14141) (22320 17231) (22327 21546) (22328 -21547) (22331 21549) (22336 21550) (22338 14948) (22343 13905) (22346 19255) (22350 21548) (22351 -21551) (22352 14913) (22353 14627) (22369 21555) (22372 14885) (22374 17203) (22377 21552) (22378 -17498) (22399 21556) (22402 16226) (22408 21554) (22409 21557) (22411 14143) (22419 21558) (22432 -21559) (22434 14628) (22435 13120) (22436 21561) (22442 21562) (22448 21563) (22451 21560) (22464 -21553) (22467 21564) (22470 21565) (22475 19300) (22478 15979) (22482 21567) (22483 21568) (22484 -21566) (22486 21570) (22492 18232) (22495 12392) (22496 18774) (22499 21571) (22516 15997) (22519 -15417) (22521 18269) (22522 13424) (22524 14955))] - -[88 ((22528 19289) (22530 17970) (22533 14200) (22534 16975) (22538 21569) (22539 21572) (22549 16964) - (22553 21573) (22557 21574) (22561 21576) (22564 17513) (22570 13358) (22575 29985) (22576 12641) ( -22577 19059 30005) (22580 15980) (22581 17736) (22586 14950) (22589 21582) (22592 19005) (22593 20061) - (22602 12916) (22603 21578) (22609 16698) (22610 21581) (22612 17763) (22615 17737) (22616 17764) ( -22617 18489) (22618 17485) (22622 14921) (22626 21577) (22633 12662) (22635 17718) (22640 21579) ( -22642 21575) (22645 16208) (22649 21583) (22654 15694) (22659 13869) (22661 21584) (22675 19048) ( -22679 16765) (22684 17478) (22687 21586) (22696 19279) (22699 21587) (22702 21592) (22707 18991) ( -22712 21591) (22713 21585) (22714 21588) (22715 21590) (22718 14886) (22721 19017) (22725 21593) ( -22727 17221) (22730 12917) (22732 15981) (22737 21595) (22739 21594) (22741 14696) (22743 21596) ( -22744 21598) (22745 21597) (22748 21600) (22750 21589) (22751 21602) (22756 21601) (22757 21599) ( -22763 15182) (22764 16209) (22766 16724) (22767 21603) (22768 16444) (22769 12397) (22770 18276) ( -22775 17499) (22777 21605) (22778 21604) (22779 21606) (22780 21607) (22781 21608))] - -[89 ((22786 21609) (22793 19025) (22794 21610) (22799 12870) (22800 21611) (22805 19772) (22806 13104) - (22808 21065) (22809 15688) (22810 16959) (22811 21612) (22812 19563) (22818 19508) (22821 21614) ( -22823 16999) (22825 17719) (22826 16960) (22827 18775 30041) (22828 21615) (22829 21616) (22830 12667) - (22833 15418 30166) (22834 21617) (22839 12368) (22840 21618) (22846 21619) (22852 12642) (22855 -13425) (22856 18016) (22857 19060) (22862 21623) (22863 16725) (22864 21622) (22865 14144) (22868 -19291) (22869 21621) (22871 17765) (22872 21625) (22874 21624) (22880 21627) (22882 21626) (22885 -12668) (22887 21628) (22888 15913) (22889 21630) (22890 17189) (22892 21629) (22894 18995) (22899 -15735) (22900 17755) (22904 21793) (22909 14629) (22913 21794) (22914 18209) (22915 18526) (22916 -19537) (22922 18213) (22925 21803) (22931 13624) (22934 19781) (22937 19503) (22939 22060) (22941 -21795) (22947 21798) (22949 16965) (22952 19256) (22956 17738) (22962 21799) (22969 19301) (22971 -14922) (22974 15914) (22982 21800) (22985 15184) (22987 15183) (22992 12345 30180) (22993 14408) ( -22995 16427) (22996 12369) (23001 21804) (23002 21805) (23004 21802) (23013 12600) (23014 13359) ( -23016 21801) (23018 19525) (23019 18737) (23030 12328) (23035 12409) (23039 15185))] - -[90 ((23041 12370) (23043 12323) (23049 21810) (23057 21808) (23064 19516) (23066 21811) (23068 21809) - (23071 21807) (23072 16177) (23077 21806) (23081 19034) (23087 14436) (23093 21815) (23094 21816) ( -23100 15915) (23104 21812) (23105 20268) (23110 18252) (23113 21814) (23130 14887 30145) (23138 21817) - (23142 18776) (23146 21818) (23148 21813) (23167 19515) (23186 18270) (23194 21819) (23195 18738) ( -23228 21820) (23229 21824 30051) (23230 21821) (23233 12871) (23234 21823) (23241 15419) (23243 21822) - (23244 14201) (23248 21836) (23254 21829) (23255 21826) (23265 17252) (23267 21825) (23270 21827) ( -23273 21828) (23290 21830) (23291 21831))] - -[91 ((23305 13426) (23307 21833) (23308 21832) (23318 21834) (23330 15982) (23338 21837) (23340 17500) - (23344 12613) (23346 21835) (23350 21838) (23358 21839) (23360 21842) (23363 21840) (23365 21841) ( -23376 15186) (23377 21843) (23380 14630) (23381 21844) (23383 15226 29985) (23384 16952) (23386 21845) - (23387 21846) (23388 15194) (23389 14631) (23391 19538) (23395 13608) (23396 14409) (23397 21847) ( -23398 13144) (23401 21848 30027) (23403 16953) (23408 21849) (23409 22051) (23411 21850) (23413 21851) - (23416 21852) (23418 21854) (23424 21855) (23427 21856) (23429 17008) (23431 12583) (23432 15465) ( -23433 12354 30029) (23435 16727) (23436 13360 30129) (23437 15413) (23439 14632) (23445 17766) (23447 -15649) (23448 13361) (23449 17256) (23450 17514) (23451 12344) (23452 13625) (23453 19061) (23455 -15426) (23458 13650) (23459 16491) (23460 15420) (23461 19752) (23462 21857) (23470 13660) (23472 -14923) (23475 13106) (23476 12643) (23477 15916) (23478 12872) (23480 21858) (23481 19782) (23487 -15689) (23490 15460) (23491 21859) (23492 13427) (23493 18002) (23494 19497) (23495 21860) (23497 -21861) (23500 18777) (23504 21863) (23506 13352) (23507 13943) (23508 21862) (23515 13362) (23517 -16178) (23518 21867) (23519 15137) (23521 12873) (23522 21866) (23524 21864) (23525 21868) (23526 -21865) (23527 18219) (23528 23629) (23529 16179) (23531 21869 30057) (23534 20032) (23536 21870) ( -23539 21872) (23541 17278) (23542 21871) (23544 16419) (23546 15227) (23550 16976) (23551 15479))] - -[92 ((23553 18805) (23554 16492) (23556 15437) (23557 21873) (23558 15917) (23559 21874) (23560 21875) - (23561 12371) (23562 16954) (23563 16210) (23565 21876) (23566 17971) (23567 15918) (23569 15919 -30011) (23571 21877) (23574 16493) (23578 15920) (23584 21878) (23586 21879) (23588 19552) (23592 -21880) (23597 13894) (23601 15650) (23608 21881) (23609 21882) (23610 15452) (23611 16172) (23612 -18036) (23613 16212) (23614 18552) (23615 18210) (23616 13897 30139) (23617 21883) (23621 13679) ( -23622 21884) (23624 13950) (23626 17999) (23627 12848) (23629 15187) (23630 21885) (23631 22050) ( -23632 22049) (23633 13949) (23635 21886) (23637 17720) (23646 16944) (23648 17739) (23649 15432) ( -23652 16728) (23653 19834) (23660 22052) (23662 22053) (23663 18006) (23665 15155) (23670 22055) ( -23673 22056) (23692 22057) (23696 13428) (23697 22058) (23700 22059) (23713 12844) (23720 16699) ( -23721 13412) (23723 22061) (23724 19496) (23729 16978) (23731 13145) (23734 22063) (23735 22065) ( -23736 13407) (23739 22062) (23740 22064) (23742 22067) (23749 22066) (23751 22068) (23769 22069) ( -23776 17981) (23777 13870) (23784 12901) (23785 22070) (23786 22075) (23789 22073) (23791 19063) ( -23792 19062) (23798 17767) (23802 22072) (23803 15700) (23805 22071))] - -[93 ((23815 16242) (23819 22076) (23822 14954) (23825 22082) (23828 22083) (23829 22077) (23830 13107) - (23831 22078) (23832 22087) (23833 22086) (23834 22085) (23835 22081) (23839 22080) (23842 22084) ( -23849 19064) (23883 22091) (23884 22088) (23886 22090) (23888 19826) (23890 22089) (23900 22079) ( -23913 16243) (23916 22092) (23919 14903) (23923 22093) (23926 22094) (23938 22097) (23940 22096) ( -23943 22095) (23947 17768) (23948 22074) (23952 22103) (23965 22099) (23970 22098) (23980 22100) ( -23982 22101) (23991 22104) (23994 20070) (23996 22105) (23997 22102) (24009 22106) (24012 13408) ( -24013 22107) (24018 22109) (24019 22108) (24022 22110) (24027 22111) (24029 16494) (24030 15651) ( -24033 15716) (24035 16739) (24037 14633) (24038 14904) (24039 14634) (24040 13680) (24043 22112) ( -24046 14905) (24049 14410 30058) (24050 22113) (24051 19494) (24052 18243) (24053 22114) (24055 14635) - (24059 13356) (24061 17191) (24062 13906))] - -[94 ((24066 15188 30007) (24067 18779 30148) (24070 18497) (24075 22115) (24076 13429) (24081 22118) ( -24086 17441) (24089 22117) (24090 22116) (24091 22119) (24093 17515) (24101 16227) (24107 15189 29988) - (24109 16458) (24111 16979) (24112 13602) (24115 17442) (24118 22120 30122) (24119 22121) (24120 -15983) (24125 19257) (24128 22124) (24131 22123) (24132 22122) (24133 18813) (24135 22131) (24140 -19290) (24142 22125) (24148 22127) (24149 19307) (24151 22126) (24159 22128) (24161 18472) (24162 -22129) (24163 19006) (24164 22130) (24178 13363) (24179 19007 30003) (24180 18223) (24181 22132) ( -24182 22133) (24184 14636) (24185 13364) (24186 22134) (24187 14392) (24188 19780) (24189 19753) ( -24190 13430) (24191 22136) (24193 17443) (24195 14637) (24196 15921) (24199 18527) (24202 15922) ( -24207 15736) (24213 17516) (24214 19065) (24215 17721) (24218 14638) (24220 18780 30128) (24224 22137) - (24230 17753 30171) (24231 14914) (24235 14411) (24237 17517) (24245 12355) (24246 15726) (24247 -14639) (24248 19783) (24257 22138) (24258 22139) (24259 18257) (24264 22140) (24265 20087) (24266 -20269) (24271 22142) (24272 22141) (24275 13127) (24278 22305) (24282 22308) (24283 22309) (24285 -22307) (24287 18752) (24288 15923) (24289 22311) (24290 22310) (24291 22306) (24296 22312) (24297 -22313) (24300 22314) (24304 22317) (24305 22315) (24307 22316) (24308 22318) (24310 12644) (24311 -17518) (24312 22319) (24314 14202) (24315 12918) (24316 18230) (24318 22320) (24319 18043))] - -[95 ((24321 19035) (24323 22321) (24324 20270) (24329 22322) (24330 19008) (24331 22325) (24332 20513) - (24333 20529) (24335 15408) (24336 18037) (24337 22326) (24339 13661) (24340 17444) (24341 12410) ( -24342 22327) (24343 18982) (24344 14640) (24347 17232) (24351 17519 30052) (24357 19567) (24358 14393) - (24359 14412) (24361 22328) (24365 22329) (24367 22335) (24369 15461) (24373 17445 30134) (24375 -13871) (24376 22330) (24380 18731) (24382 17222) (24385 22331) (24392 22332) (24394 13872) (24396 -22333) (24398 22334) (24401 22336) (24403 17782) (24406 22337) (24407 22338) (24409 22339) (24412 -22324) (24413 22323) (24417 22340) (24418 14145 30168) (24422 18727) (24425 14924) (24426 18743) ( -24427 17446) (24428 18763) (24429 22341) (24432 15924) (24433 12614) (24435 22342) (24439 22343) ( -24441 19570) (24444 18528) (24447 22346) (24448 12669 30187) (24449 16428) (24450 22345) (24451 22344) - (24452 14146) (24453 16980) (24455 22350) (24456 22348) (24458 22347) (24459 20007) (24460 14437) ( -24464 15737) (24465 22349) (24466 17740) (24467 15678) (24471 17984) (24472 22353) (24473 22352) ( -24478 22351) (24480 22354) (24481 14438) (24488 22355) (24489 18812) (24490 15707) (24493 22356) ( -24494 18553) (24499 17985) (24500 17447) (24505 17712) (24508 22357) (24509 13611) (24515 16180) ( -24517 18732 30049) (24524 13431) (24525 18214) (24534 22358) (24535 15190) (24536 19258) (24537 19259) - (24540 12670) (24541 22363) (24544 17257) (24548 22360) (24555 12919 29987) (24560 22573) (24561 -22362) (24565 18224) (24568 22361) (24571 22359) (24573 14714) (24575 22365))] - -[96 ((24590 22371 29986) (24591 22377) (24592 22369) (24594 17756) (24597 22374) (24598 18781) (24601 -22368) (24603 22373) (24604 20071) (24605 15191) (24608 16981) (24609 22366) (24613 13662) (24614 -22376) (24615 16429) (24616 12645) (24617 22370) (24618 12920) (24619 22375) (24623 13873) (24625 -22372) (24634 22378) (24641 22380) (24642 22390) (24643 22388) (24646 22385) (24650 22384) (24651 -20088) (24653 22386) (24656 13874) (24658 14641) (24661 15738) (24665 22393) (24666 22379) (24671 -22383) (24672 22367) (24674 12922) (24675 22387) (24676 22389) (24677 17233) (24680 14888) (24681 -12856) (24682 22381) (24683 22392) (24684 22391) (24685 13875) (24687 16937) (24688 13158) (24693 -14147) (24695 22382) (24705 22394) (24707 22397) (24708 22561) (24713 15421) (24715 22567) (24716 -17520) (24717 22395) (24722 22565) (24724 12921) (24726 22563) (24727 22564) (24730 22398) (24731 -22562) (24735 14439) (24736 19754) (24739 13365) (24742 12633) (24743 22566) (24745 18234) (24746 -12333) (24754 18529) (24755 22364) (24756 22572) (24757 22576) (24758 19557) (24760 22569) (24764 -17769) (24765 22574) (24773 15984) (24774 22575) (24775 18007) (24785 20295) (24787 22571) (24792 -22577) (24794 14715) (24796 16459) (24799 12372) (24800 22570) (24801 22568) (24803 16730) (24807 -22396) (24808 15156) (24816 16966) (24817 22589) (24819 16731) (24820 22584) (24822 22581) (24823 -22582) (24825 15462) (24826 22585) (24827 22588))] - -[97 ((24832 22583) (24833 15653) (24835 22586) (24838 22580) (24840 19580) (24841 19579) (24845 22590) - (24846 22591) (24847 12373) (24853 22579) (24858 13938) (24859 12326 30038) (24863 13366) (24865 -22587) (24871 22595) (24872 22594) (24876 22599) (24884 22600) (24892 22598) (24893 22601) (24894 -22593) (24895 22597) (24898 22602) (24900 22603) (24903 22592) (24904 15228) (24906 22596) (24907 -16982) (24908 14642) (24909 22578) (24910 16181) (24915 22616) (24917 19049) (24920 22606) (24921 -22607) (24922 22608) (24925 22615) (24927 22614) (24930 19325) (24931 13367) (24933 22612) (24935 -14149) (24936 13108) (24939 22609) (24942 20024) (24943 22611) (24944 12374) (24945 22613) (24947 -22604) (24948 22610) (24949 22617) (24950 14148) (24951 22605) (24958 19805) (24962 19755) (24967 -22620) (24970 22624) (24974 16766) (24976 20089) (24977 22625) (24980 22622) (24982 22619) (24985 -22618) (24986 22623) (24996 18992) (24999 17972) (25001 14150) (25003 22626) (25004 22621) (25006 -22627) (25010 14203) (25014 12849) (25018 22635) (25022 13368) (25027 22633) (25030 22634) (25031 -14889) (25032 22632) (25033 22630) (25034 22629) (25035 22636) (25036 22628) (25037 22638) (25040 -12923) (25059 22640) (25062 22639) (25074 17448) (25076 22643) (25078 22641) (25079 22631) (25080 -14204) (25082 22642) (25084 22646) (25085 22645) (25086 22647) (25087 22644))] - -[98 ((25088 22648) (25096 22649) (25097 22650) (25098 19050) (25100 22652) (25101 22651) (25102 15679) - (25104 16430) (25105 12902) (25106 12924) (25108 22653) (25110 12351 30021) (25114 16460) (25115 -22654) (25117 27715) (25118 22817) (25119 14177) (25121 22818) (25126 16495) (25130 22819) (25134 -22820) (25135 13626) (25136 22821 30190) (25138 22822) (25139 22823) (25140 16983) (25144 14413) ( -25147 19553) (25151 19260) (25152 15722) (25153 22824) (25159 16496) (25160 28221) (25161 18530) ( -25163 15466) (25165 14925 30059) (25166 22825) (25171 16967) (25173 18983) (25176 17009) (25179 22828) - (25182 22826) (25184 22829) (25187 22827) (25192 22830) (25198 18993) (25201 12343) (25206 18782) ( -25209 18531) (25212 22831) (25214 22834 30164) (25215 15925) (25216 13627) (25218 22832) (25219 22839) - (25220 15926) (25225 22833) (25226 18244) (25233 19806) (25234 22835) (25235 22836) (25236 22840) ( -25237 17770) (25238 22837) (25239 14643) (25240 16478) (25243 22854) (25244 18484) (25246 17010) ( -25259 18532) (25260 23085) (25265 19066) (25269 17521) (25273 19317) (25275 22843) (25276 12833) ( -25277 17258) (25282 22852) (25285 17204) (25286 22846) (25287 22853) (25288 22848) (25289 22855) ( -25290 22851) (25292 22850) (25293 18287) (25295 22844) (25296 12925) (25297 22842) (25298 13681) ( -25299 17011) (25300 22838) (25303 22841) (25304 14644) (25305 16475) (25307 15927) (25308 22849) ( -25309 18258) (25312 13682) (25313 13128) (25324 13159) (25325 16161) (25326 22857) (25327 22862) ( -25329 22858) (25331 14205) (25333 22863) (25334 15138) (25335 14697) (25342 15654) (25343 22845 30073) -)] - -[99 ((25345 15229) (25346 22860) (25351 15192) (25352 22861) (25353 12356) (25356 22856) (25361 17449) - (25369 13683) (25375 13876) (25383 22859) (25384 12327) (25387 14915) (25391 16182) (25402 17522) ( -25405 18516) (25406 22865) (25407 16734) (25417 16938) (25420 15147) (25421 22866) (25423 22868) ( -25424 22864) (25429 19041) (25431 17469) (25436 16732) (25447 19067) (25448 15438) (25449 22880) ( -25451 22879) (25454 16248) (25458 14206) (25462 22873) (25463 15929) (25466 18024) (25467 18225) ( -25472 22871) (25475 16733) (25480 15480) (25481 22876) (25484 15928) (25486 22870) (25487 22875) ( -25490 18259) (25494 22869) (25496 14113) (25499 13149) (25503 22877) (25504 20011) (25505 14926) ( -25506 17205) (25507 22874) (25509 16476 30138) (25511 14645) (25512 16228) (25513 12646) (25514 16700) - (25515 22872) (25516 13637) (25522 14151) (25524 17487) (25525 22878) (25531 16735) (25534 22881) ( -25536 22883) (25539 16951) (25540 22889) (25542 22884) (25545 22886) (25551 18753) (25552 17523) ( -25554 22887) (25558 19756) (25562 19784) (25563 13369) (25569 12334) (25571 22885) (25577 22882) ( -25582 13432) (25588 12647) (25590 22888) (25594 19785))] - -[100 ((25606 22892) (25613 16955) (25615 22899) (25619 22893) (25622 22890) (25623 22897) (25628 22867 -) (25638 22894) (25640 22898) (25644 18498) (25645 17771) (25652 22891) (25654 22895) (25658 14152) ( -25662 14961) (25666 16477) (25678 22903) (25688 17702) (25703 22900) (25705 19296) (25711 22901) ( -25718 22902) (25720 19534) (25722 16418) (25731 14178) (25736 22909) (25746 15157) (25747 22906) ( -25749 22905) (25754 18226) (25758 17973) (25764 17713) (25765 22907) (25769 22908) (25771 18799) ( -25773 18245) (25774 15139) (25776 16497) (25778 19280) (25785 13129) (25787 23077) (25788 22910) ( -25793 19786) (25794 23079) (25797 23075) (25799 23076) (25805 16736) (25810 23074) (25812 22847) ( -25816 23078) (25818 23073) (25824 23083) (25825 23084) (25826 17703) (25827 23086) (25830 15140) ( -25831 23081) (25836 13628) (25839 23087) (25841 23080) (25842 23091) (25844 23090) (25846 23089) ( -25850 23092) (25853 23094) (25854 15985))] - -[101 ((25856 23093) (25861 23097) (25880 23095) (25884 23096) (25885 22896) (25891 23099) (25892 23098 -) (25898 22904) (25899 23100) (25900 23088) (25903 15193) (25908 23101) (25909 23102) (25910 23104 -30064) (25911 23103) (25912 23105) (25913 12926) (25915 14646) (25918 19068 30030) (25919 16431) ( -25925 14414 30048) (25928 23107) (25933 23110) (25935 18770) (25937 13663) (25941 23109) (25942 23108) - (25943 18260) (25944 23111) (25945 13877) (25949 23113) (25950 23112) (25954 13370) (25955 15158) ( -25958 18008) (25964 14153) (25968 16244) (25970 23114) (25972 16432) (25973 17704) (25975 18783) ( -25976 23115 30136) (25986 23116) (25987 23117) (25991 19000 30026) (25992 21853) (25993 16454) (25996 -18764) (25998 14936) (26000 18533) (26001 18499) (26007 17741) (26009 20033) (26011 23119) (26012 -15440) (26015 23120) (26017 12342) (26020 13908) (26021 16461) (26023 18784) (26027 23121) (26028 -15170) (26029 17223) (26031 15195) (26032 16183) (26039 23122) (26041 19069) (26044 12663) (26045 -15196) (26049 23125) (26051 23123) (26052 23126) (26053 20025) (26054 23124) (26059 16507) (26060 -23127) (26063 16946) (26066 23128) (26071 13434) (26073 23130) (26075 23129) (26080 23131) (26081 -23132) (26082 13435) (26085 18044) (26086 17206) (26087 13676) (26088 15197) (26089 16737 30147) ( -26092 15708) (26093 12336) (26097 23133) (26106 12834) (26107 23137))] - -[102 ((26114 14647) (26115 23136) (26118 14891) (26119 15930) (26122 23135) (26124 15931) (26126 19520 -) (26127 14890) (26131 12375 30169) (26132 16462) (26140 23142) (26143 16433) (26144 12615) (26149 -15701) (26151 19302) (26152 14962) (26157 15932) (26159 16423) (26164 23141) (26165 23139) (26166 -23140) (26172 17259) (26175 23334) (26177 23146) (26178 15230) (26179 14648) (26180 23144) (26185 -23145) (26187 16184) (26191 23143) (26194 15151) (26205 23148) (26206 23147) (26207 23152) (26210 -23153) (26212 23149) (26214 13090) (26215 23150) (26216 23151) (26217 18517) (26222 18785) (26223 -14154) (26224 23154) (26228 16434) (26230 15933) (26234 17234) (26241 13895) (26243 23155) (26244 -23159) (26247 12875) (26248 23156) (26249 23158) (26254 23157) (26257 15723) (26262 17224) (26263 -12357) (26264 23160) (26269 23161) (26274 17450) (26278 20081) (26283 15171) (26286 19051) (26292 -19261) (26296 23330) (26297 23163) (26300 23166) (26302 23165) (26305 23162) (26308 23329) (26311 -18014) (26313 23164) (26326 23331) (26329 15724) (26330 23332) (26332 19787) (26333 18296) (26336 -23333) (26342 23335) (26345 23336) (26352 23337) (26354 13898) (26355 12616) (26356 14649 30160) ( -26357 23338) (26359 23339) (26360 15729 30000) (26361 16738) (26364 21080) (26365 16702) (26366 16701) - (26367 16984))] - -[103 ((26368 14919) (26371 20594) (26376 14190) (26377 19757) (26379 19070) (26381 18814 30181) (26383 - 23340) (26388 14963) (26389 17471) (26390 23341) (26391 20271) (26395 19262 30077) (26397 17451) ( -26398 23342) (26399 13436 30116) (26406 23343) (26407 23344) (26408 19546 30191) (26410 19492 30126) ( -26411 19318) (26412 19292) (26413 15141) (26414 23346) (26417 15467) (26420 19281) (26422 23348) ( -26423 23351) (26424 23350) (26426 13433) (26429 13664) (26431 23347) (26433 23349) (26438 23352) ( -26441 16249) (26446 19835) (26447 12361) (26448 14944) (26449 16956) (26451 15453) (26454 15987) ( -26457 23355) (26460 17742) (26462 23353) (26463 16939) (26464 23354) (26465 15986) (26466 19549) ( -26467 23356) (26468 23357) (26469 19816) (26474 23362) (26477 14650) (26479 18261) (26480 23359) ( -26481 17772) (26482 23134) (26483 23138) (26485 13647) (26487 18247) (26492 23361) (26494 15934) ( -26495 18500) (26501 23367) (26503 18554) (26505 23358) (26507 23364) (26508 23363) (26512 16463) ( -26517 19309) (26519 20051 30137) (26522 19303) (26524 12876 29996) (26525 15198) (26528 20296) (26529 -23366) (26530 16245) (26534 23365) (26537 23360) (26543 14415) (26547 23372) (26548 23370) (26550 -12877) (26551 23368) (26552 23374) (26553 23380) (26561 16968) (26564 19009) (26566 23382) (26570 -18722) (26574 23381) (26575 18288) (26576 19263) (26577 13371) (26579 16503) (26580 15680) (26584 -17491) (26586 19758) (26589 23377) (26590 23376) (26594 23378) (26596 23375) (26599 23383) (26601 -23373) (26604 23371) (26606 23379) (26607 23369) (26609 17260) (26611 19576) (26612 15430) (26613 -14964) (26619 14906) (26622 19311) (26623 13121))] - -[104 ((26626 17486) (26627 17994) (26628 12617) (26643 16498) (26646 16436) (26647 14122) (26654 23385 -) (26657 14651) (26658 13180) (26665 23387) (26666 13172) (26667 23393) (26674 23390) (26676 16499) ( -26680 13131) (26681 14892) (26684 13130) (26685 14927) (26688 23388) (26689 14181) (26690 14155) ( -26691 17773) (26694 23386) (26696 12358) (26701 23389) (26702 23391) (26704 13901) (26705 14124) ( -26707 13372) (26708 13643) (26713 23394) (26716 14969) (26717 19313) (26719 15159) (26723 23395) ( -26727 18736) (26740 23407) (26742 12851) (26743 23396) (26750 23413) (26751 23397) (26753 20034) ( -26755 23404) (26757 18271) (26765 23412) (26767 23399) (26771 12340) (26772 23401) (26775 14652) ( -26779 23403) (26781 23402 30050) (26783 23398) (26784 23409) (26786 15935) (26790 21613) (26791 14440) - (26792 19836) (26797 23400) (26799 17524) (26800 13091) (26801 14893) (26803 23392) (26805 23408) ( -26806 13153) (26809 23406) (26810 23410) (26812 17774) (26820 13438) (26822 23602) (26825 19529) ( -26826 23415) (26827 13437) (26829 23422) (26834 19264) (26836 23585) (26837 23587) (26839 23591) ( -26840 23417) (26842 17194) (26847 17775) (26848 23595) (26849 23420) (26851 23592) (26855 23586) ( -26862 16185) (26863 23596) (26866 16435) (26873 23594) (26874 13373))] - -[105 ((26880 20304) (26881 23414) (26884 23590) (26885 12376) (26888 23416) (26891 19514) (26892 23421 -) (26893 16162) (26894 17479) (26895 23411) (26898 23589) (26905 16250) (26906 23599) (26907 13169) ( -26908 14369) (26913 23601) (26914 23418) (26915 23600) (26917 23593) (26918 23419) (26920 23597) ( -26922 23598) (26928 23615) (26932 17998) (26934 23588) (26937 23611) (26941 23613) (26943 17496) ( -26954 19788) (26963 18806) (26964 23608) (26965 16970) (26969 23614) (26970 16703) (26972 23605) ( -26973 23618) (26974 23617) (26976 18031) (26977 23616) (26978 18026) (26986 23620) (26987 23607) ( -26989 13896 30004) (26990 23610) (26991 15709) (26995 18272) (26996 23612) (26997 13899 30149) (26999 -23604) (27000 23606) (27001 23603) (27004 20272) (27005 13146) (27006 23609) (27009 23619) (27010 -13109) (27018 14951) (27022 12637) (27025 23636) (27028 20273) (27029 23639) (27035 16186) (27036 -23638) (27040 23637) (27047 23634) (27054 23622) (27057 23651) (27058 23621) (27060 23640) (27067 -23632) (27070 23627) (27071 23624) (27073 23625) (27075 23633) (27079 29986) (27082 23630) (27083 -14653) (27084 17480) (27085 16740) (27086 23628) (27088 23623) (27091 23626) (27096 19789) (27097 -19306) (27101 23631) (27102 23641) (27111 23649) (27112 23642) (27115 23655) (27117 23653) (27122 -23648) (27129 23647) (27131 17488) (27133 16741) (27135 23645))] - -[106 ((27138 23643 30144) (27141 23650) (27146 23656) (27147 18549) (27148 23662) (27154 23657) (27155 - 23660) (27156 23654) (27159 17268) (27161 18744) (27163 23644) (27166 23652) (27167 15936) (27169 -19535) (27170 23672) (27171 23659) (27177 14370) (27178 12835) (27179 13151) (27182 23635) (27189 -15937) (27190 23664) (27192 23671) (27193 15481 30118) (27194 13170) (27197 17198) (27204 23661) ( -27207 23666) (27208 23670) (27211 13878) (27224 13644) (27225 23668) (27231 13601 30031) (27233 17995) - (27234 23667) (27238 23669) (27250 23663) (27256 23665) (27263 13152) (27264 17225) (27268 23676) ( -27277 23674) (27278 14441) (27280 23673) (27287 23841) (27292 23384) (27296 23675) (27298 23677) ( -27299 23678) (27306 23852) (27308 23848) (27310 23405) (27315 23847) (27320 23846) (27323 23843) ( -27329 23658) (27330 23845) (27331 23844) (27345 23850) (27347 20262) (27354 23853) (27355 13947) ( -27358 23849) (27359 23851) (27368 18471) (27370 23854) (27386 23858) (27387 23855))] - -[107 ((27396 19827) (27397 23856) (27402 23646) (27410 23859) (27414 23860) (27421 12597) (27423 23862 -) (27424 14183) (27425 15393 30022) (27427 13909) (27431 12836) (27442 19807) (27447 23864) (27448 -23863) (27449 23866) (27450 13629) (27453 13910) (27454 13374) (27459 23869) (27463 23868) (27465 -23870) (27468 12878) (27470 17207) (27472 23871) (27475 13375) (27476 23873) (27481 23872) (27483 -23874) (27487 23875) (27489 23876) (27490 15199) (27491 16437) (27492 14881) (27494 18800) (27497 -19042) (27498 20292) (27503 15221) (27507 14928) (27508 20082) (27512 23877) (27513 23878) (27515 -15200 30113) (27519 23879) (27520 23880) (27523 23882) (27524 23881) (27526 19288) (27529 15710) ( -27530 15468) (27531 15172) (27533 23883) (27541 23885) (27542 16163) (27544 23884) (27550 23886) ( -27556 23887) (27562 23888) (27563 23889) (27567 23890) (27569 23892) (27570 23891) (27571 23893) ( -27572 12837) (27573 17226) (27575 23894) (27578 15142) (27579 13132) (27580 23895) (27583 17730) ( -27584 21580) (27589 13603) (27590 23896) (27595 23897) (27597 19052 29995) (27598 19304) (27599 30023) - (27602 17991) (27603 23898) (27604 18534 30037) (27608 18555) (27611 19539) (27615 23899) (27627 -23901) (27628 23900) (27631 23903) (27635 23902))] - -[108 ((27656 23905) (27663 15201) (27665 19505) (27667 23906) (27668 23907) (27671 13604) (27675 23908 -) (27683 23910) (27684 23909) (27700 16229) (27703 18745) (27704 12618) (27710 18501) (27712 17525) ( -27713 15681) (27714 13665 30063) (27726 18502) (27728 15406) (27733 23912) (27735 13376) (27738 12664) - (27741 18034) (27742 23911) (27743 14654 30072) (27744 17235) (27746 23913) (27752 23921) (27754 -23914) (27760 16961) (27762 13666) (27763 23922) (27770 14184 30197) (27773 13605) (27774 23920) ( -27777 23918) (27778 23915) (27779 19808) (27784 17472) (27788 18009) (27789 23916) (27792 23924) ( -27794 23923) (27795 14115) (27798 12845) (27801 14907) (27802 23917) (27803 23919) (27809 19287) ( -27810 17012) (27819 19319) (27822 23932) (27825 23933) (27827 12879 30060) (27832 18984) (27833 19581) - (27834 24097) (27835 15395) (27836 15938) (27837 23928) (27838 23934) (27839 12648) (27841 13879) ( -27844 23925) (27845 23930) (27849 16500) (27850 18289) (27852 18535) (27859 23927) (27861 19233) ( -27863 23929) (27865 24100) (27867 24098) (27869 23931) (27873 19234) (27874 18248) (27875 13667) ( -27877 17701) (27880 17261) (27882 24101) (27887 24099) (27888 16985) (27889 23926) (27891 12619))] - -[109 ((27915 19790 30143) (27916 24112) (27922 24111) (27927 16502) (27929 24108) (27931 19820) (27934 - 17974) (27935 24102) (27941 17477) (27945 12620) (27946 14655) (27947 24105) (27954 15655) (27955 -24110) (27957 24109) (27958 24104) (27960 24107) (27963 13160 29991) (27965 24106) (27966 18249) ( -27969 20014 30198) (27972 15988) (27973 16501) (27993 24118) (27994 24116) (27996 18765) (28003 24113) - (28004 24115) (28006 12602) (28009 14656) (28010 20274) (28012 13117) (28014 18786) (28020 19809) ( -28023 13092 29993) (28024 16187) (28025 24117) (28037 24122) (28040 15939) (28044 19760) (28046 24119) - (28051 24114) (28053 24120) (28057 20062) (28059 17779) (28060 17986) (28079 13110) (28082 12629) ( -28085 24126) (28088 24129) (28092 20035) (28096 19812) (28101 24136) (28102 24130) (28103 24127) ( -28107 20052) (28108 24133) (28113 15690) (28114 24135) (28117 24140) (28120 17777) (28121 24138) ( -28126 24132) (28129 17208) (28132 24139) (28134 24128) (28136 24134) (28138 24141) (28139 12412) ( -28140 24131) (28142 24142) (28145 16188) (28147 15711) (28149 18981) (28151 14894) (28153 24123) ( -28154 24137) (28155 17722))] - -[110 ((28165 16438 30142) (28167 13161) (28168 14929) (28169 15940) (28170 24125) (28171 15682) (28179 - 14156) (28181 24124) (28185 24146) (28186 15725) (28187 14394) (28189 24161) (28191 24155) (28192 -13684) (28193 17743) (28195 24150) (28196 24159) (28197 12335) (28198 12594) (28201 12857) (28203 -24152) (28204 16940) (28205 24143) (28206 24145) (28207 14657) (28216 24162) (28218 24157) (28222 -24149) (28227 24156) (28234 19499) (28237 24154) (28238 24158) (28246 14416) (28248 15941) (28251 -17209) (28255 24148) (28263 19759) (28267 24151) (28270 24144) (28271 17778) (28274 24147) (28278 -24153) (28286 20305) (28287 15422) (28288 19326) (28290 24163) (28300 18478) (28303 24175) (28304 -14395) (28310 15712) (28312 24165) (28316 20015) (28317 14658) (28319 24178) (28322 12398) (28325 -24176) (28330 24164) (28335 24170) (28338 24172) (28342 19791) (28343 24167) (28346 17710) (28349 -24169) (28354 24177) (28356 24171) (28357 19527) (28361 24166) (28363 15394) (28364 24190) (28369 -13162) (28371 24168) (28372 24173) (28373 24174) (28381 17004) (28382 16986) (28396 24182) (28399 -24188) (28402 24186) (28404 17705) (28407 24355) (28408 24183) (28414 24184) (28415 24160))] - -[111 ((28417 13689) (28418 18746) (28422 15423) (28425 14711) (28431 20275) (28433 24180) (28435 24354 -) (28436 12649) (28437 16742) (28448 18297) (28450 13377) (28451 20090) (28459 19489) (28460 17490) ( -28465 24187) (28466 24189) (28472 16690) (28478 24353) (28479 24185) (28481 24179) (28485 13379) ( -28500 14185) (28504 24367) (28507 24362) (28508 16504) (28511 13155) (28516 15713) (28518 24371) ( -28525 24364) (28526 17452) (28527 24361) (28528 17497) (28532 24396) (28536 24358) (28538 24357) ( -28540 24366) (28544 24360) (28545 24359) (28546 24365) (28548 16417) (28550 24356) (28558 24368) ( -28561 24369) (28567 13378) (28577 24374) (28579 24373) (28580 24375) (28586 24378) (28593 17731) ( -28595 24372) (28601 24376) (28608 14179) (28609 17017) (28610 24370) (28611 18235) (28614 24377) ( -28628 24382) (28629 24380) (28632 24383) (28635 24386) (28639 24379) (28640 14698) (28641 18216) ( -28644 24121) (28651 19828) (28652 24381) (28654 24385) (28655 17013) (28657 24384) (28659 24363) ( -28662 28521) (28666 24389) (28670 24393))] - -[112 ((28673 24391) (28681 24387) (28683 24388) (28687 24392) (28689 24390) (28693 18766) (28696 24398 -) (28698 24395) (28699 24394) (28701 24397) (28702 18004) (28703 24399) (28710 17269) (28711 17005) ( -28716 16421) (28720 24400) (28722 24402) (28734 24401) (28748 24181) (28753 24403) (28760 18023) ( -28771 24404) (28779 12880 30025) (28783 17780) (28784 13093) (28792 13668) (28796 15454) (28797 14930) - (28809 20263) (28810 16230) (28814 12650) (28818 24406) (28825 24405) (28844 24409) (28845 17210) ( -28846 24412) (28847 24407) (28851 24411) (28856 24410) (28857 17728) (28858 12377) (28872 20085) ( -28875 24414) (28879 12584) (28889 24416) (28893 24415) (28895 24413) (28913 24408) (28921 19235) ( -28925 24418))] - -[113 ((28937 24417) (28948 12651) (28953 24420) (28954 18994) (28956 24419) (28961 19509) (28966 15943 -) (28982 16691) (28988 15942) (29001 20091) (29004 24426) (29006 16505) (29013 24422) (29014 24427) ( -29017 12652) (29026 24425) (29028 18273) (29029 24421) (29030 24424) (29031 15944 30178) (29033 18513) - (29036 24428) (29038 15441) (29053 16506) (29060 24431) (29064 24423) (29066 14119) (29071 24429) ( -29076 19792) (29077 24432) (29081 29990) (29087 15695) (29096 24433) (29100 24434) (29105 18222 30199) - (29113 24436) (29118 24437) (29123 18227) (29128 17781) (29129 24439) (29134 24441) (29136 20053) ( -29138 24438) (29140 24440) (29141 12653) (29143 24435) (29151 21339) (29152 24442) (29157 16743) ( -29158 15160) (29159 24444) (29164 24443) (29165 16164) (29166 21081) (29173 24445) (29177 24609) ( -29179 24430) (29180 24446) (29183 24610))] - -[114 ((29190 18298) (29197 24611) (29200 24612) (29211 24613) (29224 24614) (29226 17502) (29228 24616 -) (29229 24615) (29232 24617) (29234 24618) (29237 15455) (29238 18787 30053) (29242 19564) (29243 -24619) (29244 24620) (29245 16726) (29246 15396) (29247 24621) (29248 24622) (29254 24623) (29255 -19026) (29256 18503) (29259 24624) (29260 18263) (29266 17453) (29272 24625) (29273 12903) (29275 -13677) (29277 19526) (29279 19510) (29281 12852) (29282 20276) (29287 19282) (29289 18986) (29298 -16439) (29300 24626) (29305 17987) (29309 14371) (29310 24627) (29312 14932) (29313 24629) (29314 -24628) (29319 24630) (29330 24631) (29334 24632) (29344 13630) (29346 24633) (29351 24634) (29356 -14372) (29359 18504) (29362 24636) (29366 15989) (29369 24635) (29378 13880) (29379 24637) (29380 -24639) (29382 24638) (29390 24640) (29392 14417) (29394 24641) (29399 13929) (29401 16704) (29403 -14717) (29408 24643) (29409 24644) (29410 24642) (29417 15469) (29420 17992) (29421 13881) (29431 -24646) (29432 17196) (29433 24645) (29436 20277) (29437 18274))] - -[115 ((29450 24649) (29462 24651) (29463 24648) (29467 19540) (29468 24650) (29469 24652) (29471 20036 -) (29477 24656) (29481 24655) (29482 17270) (29483 18221) (29486 14373) (29487 24654) (29492 24653) ( -29494 19761) (29495 19762) (29502 24657) (29503 12654) (29508 14710) (29509 15202) (29518 24658) ( -29519 24659) (29527 24661) (29539 15683) (29544 24663) (29546 24662) (29552 24664) (29554 13133) ( -29557 24666) (29560 24665) (29562 24668) (29563 24667) (29572 14396) (29575 20008) (29577 13900) ( -29579 12838 30039) (29590 13930) (29609 13409) (29618 20072) (29619 24670) (29627 24672) (29632 24673) - (29634 12881) (29640 24669) (29642 15161) (29645 17473) (29646 24671) (29662 24676) (29664 15470) ( -29669 24674) (29674 14142) (29677 18505 30114) (29678 24675) (29681 24702) (29688 24681) (29694 14397) -)] - -[116 ((29699 13669 30185) (29701 24678) (29702 19837 30036) (29705 20016) (29730 17014) (29733 24680) -(29746 24682) (29747 20054) (29748 13911) (29749 18556) (29750 18250) (29754 24683) (29759 24685) ( -29761 24688) (29781 24684) (29785 24687) (29786 14442) (29787 12621) (29788 24689) (29790 16240) ( -29791 24686) (29792 20060) (29795 24692) (29796 29988) (29801 24690) (29802 24693) (29807 24679) ( -29808 24691) (29811 14908) (29814 24694) (29822 24695) (29827 19838) (29835 24696) (29854 24697) ( -29858 24677) (29863 24698) (29872 13380) (29885 15397) (29898 24699) (29903 24700) (29908 24701) ( -29916 12603) (29920 24865) (29922 18747) (29923 24866) (29926 13348) (29927 24867) (29929 24868) ( -29934 24869) (29936 24871) (29937 24872) (29938 24870) (29942 18771) (29943 24874) (29944 24873))] - -[117 ((29955 24876) (29956 24875) (29957 24877) (29964 24878) (29965 24880) (29966 24879) (29969 14713 -) (29971 24882) (29973 24881) (29976 13381) (29978 16211) (29980 17724) (29982 24883) (29983 16440) ( -29986 30152) (29987 15162) (29989 12665) (29990 24884) (29992 19793) (29995 19043) (29996 24885) ( -30000 17732) (30001 19763) (30002 14659) (30003 16189) (30007 17227) (30008 21044) (30010 17454) ( -30011 12904) (30012 24886) (30020 24887) (30022 24892) (30025 24890) (30026 24889) (30027 23106) ( -30028 13094 30075) (30029 24888) (30031 12378) (30033 18474) (30036 18506) (30041 20017) (30042 24893) - (30043 24891) (30044 17244) (30045 16422) (30048 18475) (30050 18733) (30052 24895) (30053 20012) ( -30054 14157) (30055 24896) (30057 24894) (30058 18518) (30059 24897) (30061 24898) (30064 12379) ( -30067 15990) (30068 24903) (30070 24900) (30071 18029) (30072 24899) (30079 13606) (30082 24906) ( -30086 24901) (30087 24902) (30089 24905) (30090 24904) (30091 18725) (30094 16706) (30095 16705) ( -30097 13631) (30100 24907) (30106 24908) (30109 24909) (30115 24911) (30117 24910) (30123 12630) ( -30129 24919) (30130 18536) (30131 24913) (30133 24915) (30136 24917) (30137 16190) (30140 24918) ( -30141 24916) (30142 15424) (30146 24912) (30147 24914) (30149 18754) (30151 15945) (30154 24921) ( -30157 24920) (30162 24922) (30164 15398) (30165 14895) (30168 17783) (30169 24923) (30171 17483) ( -30174 24925) (30178 20001) (30179 24924) (30185 16745) (30192 24930) (30194 24932) (30195 24933) ( -30196 17236) (30202 24931) (30204 24928) (30206 24926) (30207 24927))] - -[118 ((30209 24929) (30217 24936) (30219 24934) (30221 24935) (30239 24937) (30240 24939) (30241 24940 -) (30242 24941) (30244 24942) (30247 24938) (30256 24944) (30260 24943) (30267 24945) (30274 20037) ( -30278 24948) (30279 24946) (30280 24947) (30284 13410) (30290 19582) (30294 19018) (30296 24950) ( -30300 24949) (30305 24951) (30306 24952) (30311 24956) (30312 24953) (30313 24954) (30314 24955) ( -30316 24957) (30320 24958) (30322 25121) (30326 25122) (30328 25123) (30330 18479) (30331 17744) ( -30332 25124) (30333 18290) (30334 18740) (30336 25125) (30339 25126) (30340 17706) (30342 13095) ( -30343 14660) (30344 25127) (30347 25128) (30350 25129) (30352 15145) (30355 25131) (30358 25130) ( -30361 25132) (30362 25133) (30382 18537) (30384 25134) (30388 25135) (30391 29545) (30392 25136) ( -30393 25137) (30394 25138) (30399 15150) (30402 25139) (30403 18262) (30406 19295) (30408 12622) ( -30410 12631) (30413 25140) (30418 25142) (30422 25141) (30423 17776) (30427 16441) (30428 23865) ( -30430 25143) (30431 19521) (30433 25144) (30435 13382) (30436 18519) (30437 25145) (30439 25146) ( -30442 25147) (30446 19548) (30450 19541) (30452 17470 30204) (30456 16746 29990) (30459 25149) (30462 -15714))] - -[119 ((30465 15946 30061) (30468 25152) (30471 25151) (30472 25150) (30473 18557) (30475 13383) (30476 - 14377) (30491 25158) (30494 25155) (30495 16191) (30496 19506) (30500 25154) (30501 25156) (30502 -25157) (30505 25153) (30519 25159) (30520 25160) (30522 17455) (30524 13411 30150) (30528 17253) ( -30535 25161) (30554 25162) (30555 25165) (30561 16231) (30563 17988) (30565 25166) (30566 19283) ( -30568 25163) (30571 25164) (30585 25169) (30590 25168) (30591 25167) (30603 25171) (30606 25170) ( -30609 25172) (30622 25174) (30624 25173) (30629 19021) (30636 15702) (30637 20038) (30640 25175) ( -30643 17975) (30646 25176) (30649 25177) (30651 25181) (30652 25179) (30653 25180) (30655 25178) ( -30663 25182) (30669 25183) (30679 25184) (30682 25185) (30683 19511) (30684 25186) (30690 19568) ( -30691 25187) (30693 17230) (30695 18282) (30697 13931) (30701 17211) (30702 25188) (30703 13882) ( -30707 16464) (30716 25189))] - -[120 ((30722 14909) (30732 25190) (30738 25191) (30740 14374) (30741 14933) (30752 25193) (30757 17750 -) (30758 14934) (30759 13646) (30770 19236) (30772 18251) (30778 17751) (30783 14684) (30789 25195) ( -30813 15947) (30827 20018) (30828 14661) (30831 14375) (30834 18467) (30836 25197) (30844 25199) ( -30849 14443) (30854 25198) (30855 17526) (30860 25201) (30861 13111) (30862 25196) (30865 18538) ( -30867 12592) (30869 14956) (30871 20306) (30874 25200) (30883 25202) (30887 19019) (30889 16473) ( -30890 25204) (30895 25205) (30901 25203) (30906 13134) (30908 25211) (30910 25210) (30913 15399) ( -30917 25212) (30918 25207) (30922 25213) (30923 25208) (30928 18520) (30929 25206) (30932 25209) ( -30938 25378) (30951 25377) (30952 19297) (30956 25214) (30959 12395) (30964 25380) (30973 25379))] - -[121 ((30977 15948) (30983 25381) (30990 16707) (30993 25383) (30994 25382) (31001 25384) (31014 25192 -) (31018 25194) (31019 25386) (31020 25385) (31034 15400) (31036 20073) (31038 15442 30146) (31040 -25387) (31041 14135) (31047 13632) (31048 13607) (31049 15203) (31056 19764) (31059 25393) (31061 -25392) (31062 16708) (31063 25389) (31066 25391) (31069 15691) (31070 16192 30196) (31071 25390) ( -31072 25388) (31074 18218) (31077 15949) (31080 18748) (31085 14935) (31095 17784) (31098 25394) ( -31103 25395) (31104 25417) (31105 13912) (31108 20285) (31109 16693) (31114 25396) (31117 12882) ( -31118 17527) (31119 18977) (31133 25397) (31142 13690) (31143 25398) (31146 25400) (31150 25401) ( -31152 18217) (31155 25402) (31161 25403) (31162 25404) (31165 13913) (31166 12883) (31167 17989) ( -31168 15656) (31169 15204) (31177 25405) (31179 15657) (31185 12874) (31186 18755) (31189 25406) ( -31192 18539) (31199 16709) (31201 25409) (31203 25410) (31204 18281) (31206 16193) (31207 25407) ( -31209 17249) (31212 25408) (31216 15950) (31227 12380))] - -[122 ((31232 13609) (31240 25411) (31243 17528) (31245 25412) (31246 16455) (31252 19501) (31255 18723 -) (31256 25413) (31257 25414) (31258 17237) (31260 20039) (31263 25416) (31264 25415) (31278 15471) ( -31281 25418) (31282 12400) (31287 25421) (31291 25419) (31292 12884) (31293 14158) (31294 25420) ( -31295 14662) (31296 14706) (31298 19046) (31299 25422) (31302 19284) (31305 25424) (31309 16465) ( -31310 12623) (31311 12858) (31312 12332) (31319 25423) (31329 25425) (31330 25426) (31331 15991) ( -31337 25427) (31339 13135) (31344 25429) (31348 14186) (31350 13670 30201) (31353 25430) (31354 13941 -30078) (31357 25431) (31359 16508) (31361 17997) (31363 16480) (31364 14965) (31368 25432) (31378 -17250) (31379 16747) (31381 25434) (31382 25436) (31383 25433) (31384 25435) (31391 14114) (31401 -25437) (31402 14118) (31406 13671) (31407 19794) (31408 25439) (31414 25440) (31418 12590) (31423 -25443) (31427 13174) (31428 25442) (31429 25441) (31431 25445) (31432 25438) (31434 25446) (31435 -20009 29997) (31437 25447) (31439 25448) (31442 21620) (31443 25450) (31445 25449) (31449 25451) ( -31450 25452) (31452 20021) (31453 25453) (31455 28783) (31456 15951) (31457 25454) (31458 25455) ( -31459 15703) (31461 17976) (31462 25456) (31466 17192) (31469 25457) (31471 17212) (31472 25458) ( -31478 13861) (31480 20799) (31481 17245) (31482 15411) (31487 13384))] - -[123 ((31490 25459) (31492 25634) (31494 25462) (31496 13672) (31498 25461) (31499 25636) (31503 25460 -) (31505 15952 30192) (31512 25464) (31513 25465) (31515 17707) (31518 25466) (31520 13150) (31525 -16218) (31526 18788) (31528 25468) (31532 17000) (31539 25463) (31541 25467) (31542 25469) (31545 -14971) (31557 25638) (31558 18734) (31560 18470) (31561 17785) (31563 13914) (31564 25637) (31565 -25635) (31567 18485) (31568 25470) (31569 17246) (31570 17787) (31572 17786 30163) (31574 14966) ( -31581 25656) (31589 25640) (31591 25642) (31596 25645) (31598 25646) (31600 25643) (31601 25644) ( -31604 25641) (31605 25639) (31610 25633) (31622 19023) (31623 12885) (31627 25653) (31629 25650) ( -31631 25655) (31634 25654) (31636 18291) (31637 19495) (31639 15163 30159) (31640 25648) (31641 25657) - (31642 25652) (31644 25651) (31645 25647) (31647 25649) (31649 13385) (31658 17213) (31661 16509) ( -31665 18466) (31668 25662) (31672 18468) (31680 16481) (31681 25659) (31684 18511) (31686 25663) ( -31687 19027) (31689 17243) (31691 25658) (31692 25660) (31695 25661) (31709 25664) (31712 15428) ( -31716 17990) (31717 25669) (31718 25668) (31721 25665) (31725 20278) (31731 25674) (31734 25678) ( -31735 25675))] - -[124 ((31744 25671) (31751 25672) (31757 25677) (31761 25666) (31762 21077) (31763 25673) (31764 25667 -) (31767 25676) (31775 25682) (31777 13386) (31779 25679) (31783 25680) (31786 25681) (31787 25684) ( -31799 25683) (31800 18550) (31805 25685) (31806 20092) (31807 19053) (31808 25690) (31811 25687) ( -31820 25686) (31821 16466) (31823 25689) (31824 25691) (31828 25688) (31830 25695) (31832 25692) ( -31839 25693) (31840 25670) (31844 25694) (31845 25696) (31852 25697) (31859 19014) (31861 25698) ( -31870 19554) (31873 13902) (31874 14121) (31875 25699) (31881 18996) (31883 16232) (31885 19504) ( -31888 25700) (31890 20019) (31893 18292) (31895 16710) (31896 18228) (31899 15693) (31903 12352) ( -31905 25705) (31906 25703) (31908 25701) (31909 13345) (31911 15953) (31912 25706) (31915 25704) ( -31917 25702) (31918 25710) (31921 25709) (31922 25708) (31923 25707) (31929 25711) (31933 25712) ( -31934 16442) (31936 25713) (31938 25715) (31941 25714) (31946 14418) (31950 16696) (31954 25717) ( -31958 17788) (31960 25716) (31964 25718) (31966 18997) (31967 16748) (31968 14663) (31970 25719) ( -31975 20040) (31983 25721) (31986 25722) (31988 25723) (31990 25724) (31992 15205) (31994 25725) ( -31995 14159) (31998 13674))] - -[125 ((32000 13610) (32002 25889) (32004 19571 30202) (32005 14664) (32006 25726) (32010 25892) (32011 - 19558) (32013 18236) (32016 18739) (32020 15715) (32021 25891) (32023 15443) (32024 14665) (32025 -15206) (32026 13673) (32027 18998) (32028 25890) (32032 16711) (32033 19266) (32034 14967) (32043 -15207) (32044 17501) (32046 25895) (32047 20063) (32048 14937) (32050 25896) (32051 16194) (32053 -25898) (32057 15954) (32058 14896) (32063 25897) (32066 15658) (32067 14398) (32068 16712) (32069 -25893) (32070 25899) (32075 25894) (32076 14160) (32078 25902) (32079 25906) (32080 14187 30120) ( -32086 25901) (32091 25910) (32094 14666) (32097 19821) (32098 12348) (32099 25907) (32102 13675) ( -32104 25904) (32110 25905) (32113 17789) (32114 25903) (32115 25900) (32117 13096) (32118 16484) ( -32121 14376) (32125 25912) (32137 25909) (32143 25911) (32147 25908) (32153 14161) (32154 16947) ( -32155 25913) (32156 16750) (32159 25926) (32162 25922) (32163 25916) (32171 25920) (32172 15482) ( -32173 12381) (32174 25915) (32175 25923) (32176 25927) (32177 14667) (32178 19542) (32180 17494) ( -32181 25917) (32184 25925) (32186 25914) (32187 17214) (32189 25919) (32190 12349) (32191 19530) ( -32199 25918) (32202 13915) (32203 18540) (32207 16749) (32209 20048) (32210 15727) (32213 25966) ( -32216 25928) (32218 16510) (32220 25924) (32221 25929) (32222 25931) (32224 17529) (32225 25934) ( -32228 25930) (32232 19028) (32233 13387) (32236 19531) (32239 12382) (32242 25933) (32244 20093) ( -32251 25932))] - -[126 ((32257 12655) (32260 18028) (32261 25935) (32265 25942) (32266 25936) (32267 25943) (32274 25939 -) (32283 18299) (32286 15434) (32287 25941) (32289 25938) (32290 25944) (32291 25937) (32294 15684) ( -32299 19237) (32302 15692) (32305 25940) (32306 25952) (32309 25948) (32311 25951) (32313 25949) ( -32314 25953) (32315 25947) (32317 25921 30024) (32318 16467) (32321 18507) (32323 25950) (32326 25945) - (32330 16673) (32331 14162) (32333 15659) (32340 16165) (32341 16694) (32342 25956) (32345 25958) ( -32346 25959) (32349 25955) (32350 25957) (32358 25946) (32359 25954) (32361 25962) (32362 25961) ( -32365 19322) (32368 14123) (32377 25960) (32379 25964) (32380 25963) (32381 25967) (32383 25969) ( -32386 15164) (32387 25965) (32392 25970) (32393 25971) (32396 25972) (32398 25978) (32399 17723) ( -32400 25974) (32402 25973) (32403 25975) (32404 25976) (32406 25977) (32411 25979) (32412 25980))] - -[127 ((32566 13388) (32568 25981) (32570 25982) (32581 26145) (32588 26146) (32589 26147) (32590 26148 -) (32592 26149) (32593 26150) (32596 26152) (32597 26151) (32600 26153) (32607 26154) (32608 26155) ( -32615 26158) (32616 26156) (32617 26157) (32618 14945) (32619 14163) (32622 17238) (32624 18483) ( -32626 15728) (32629 18253) (32631 18541 30165) (32632 26159) (32633 22637) (32642 26160) (32643 26162) - (32645 19813) (32646 26161) (32647 26164) (32648 26163) (32650 19795) (32652 26165) (32654 18558) ( -32660 26166) (32666 26169) (32669 26168) (32670 26167) (32675 26170 30170) (32676 14130) (32680 16674) - (32681 13633 30127) (32686 26174) (32687 26171) (32690 26172) (32694 26175) (32696 26176) (32697 -26173) (32701 12585) (32705 12839) (32709 26178) (32710 26179) (32714 26180) (32716 19810) (32722 -15660) (32724 26182) (32725 26181) (32736 16233) (32737 26183) (32742 26184) (32745 26185) (32747 -13413) (32752 13389) (32755 26186) (32761 26187) (32763 19293) (32764 19811))] - -[128 ((32768 19796) (32769 20279) (32771 14669) (32772 26190) (32773 15444) (32774 26189) (32779 26191 -) (32780 15401) (32784 16977) (32786 26192) (32789 14668) (32791 19543) (32792 26193) (32793 26194) ( -32796 26195) (32801 26196) (32808 26197) (32819 15402) (32822 19565) (32827 26199) (32829 17215) ( -32831 26198) (32838 26201) (32842 26200) (32850 26202) (32854 16443) (32856 26203) (32858 26204) ( -32862 19001) (32863 26205) (32865 16751) (32866 26206) (32872 26207) (32879 20094) (32880 26210) ( -32882 26209) (32883 26208) (32884 17456) (32886 26211) (32887 16166) (32889 26212) (32893 26213) ( -32894 20280) (32895 26214) (32900 26215) (32901 26217) (32902 26216) (32903 18469) (32905 18041) ( -32907 20286) (32908 18473) (32915 26219) (32918 15955) (32920 18730) (32922 26220) (32923 26218) ( -32925 13390) (32929 14420) (32930 15208) (32933 18542) (32937 14378) (32938 19267) (32940 26223) ( -32941 26221) (32943 14670) (32945 14671) (32946 12393 30047) (32948 14952) (32954 18265) (32963 12383) - (32964 26228) (32966 17216) (32972 18264) (32974 16987) (32982 26230) (32985 26226) (32986 26229) ( -32987 26224) (32989 26227) (32990 19238) (32993 14421) (32996 12413) (32997 26225) (33007 26232) ( -33009 26233) (33012 17977) (33016 13883) (33020 26406) (33021 18237))] - -[129 ((33026 15209) (33029 13884) (33030 16456) (33031 20294) (33032 19502) (33033 26231) (33034 16468 -) (33050 13651) (33051 26234) (33059 26236) (33065 26235) (33071 26237) (33073 17190) (33075 18238) ( -33081 17457) (33086 26403) (33094 26402) (33099 26238) (33102 16213) (33104 18789) (33105 26405) ( -33107 26404) (33108 14672) (33109 20307) (33119 26421) (33125 26409) (33126 26410) (33131 15472) ( -33134 26408) (33136 14712) (33137 26407) (33140 26411) (33144 17458) (33145 18978) (33146 16675) ( -33151 16988) (33152 26415) (33154 26416) (33155 26412) (33160 26413) (33162 26414) (33167 14673) ( -33171 26422) (33173 26418) (33178 18790) (33180 19308) (33181 18728) (33184 26417) (33187 26420) ( -33188 26419) (33192 19268) (33193 26423) (33200 26424) (33203 16695) (33205 26425) (33208 26427) ( -33210 26431) (33213 26428) (33214 26426) (33215 18239) (33216 26429) (33218 26430) (33222 12850) ( -33224 26437) (33225 26432) (33229 26433) (33233 26434) (33235 16929) (33240 26436) (33241 26435) ( -33242 26438) (33247 26439) (33248 26440) (33251 16195) (33253 12905) (33255 26441) (33256 20055) ( -33258 15403) (33261 15661) (33267 15210 30175) (33268 17239) (33274 26442) (33275 26443) (33276 12593) - (33278 26444))] - -[130 ((33281 26445) (33282 26446) (33285 26447) (33287 26448 30042) (33288 13885 30155) (33289 23082 -30194) (33290 26449) (33292 16485) (33293 26450) (33294 15435) (33296 26451) (33298 20528) (33302 -26452) (33303 19038) (33304 13404) (33307 16676) (33308 15704) (33310 18801) (33311 15662) (33321 -26453) (33322 14674) (33323 26454) (33324 18508) (33326 26468) (33331 26456) (33333 16969) (33334 -18293) (33335 14399) (33336 26455) (33337 16677) (33344 26457) (33351 17530) (33368 26459) (33369 -26458) (33370 26461) (33373 26460) (33375 26462) (33378 26464) (33380 26463) (33382 13391) (33384 -26465) (33386 26466) (33387 26467) (33390 14897) (33391 20041) (33393 26469) (33394 16167) (33398 -12656) (33399 26470) (33400 26471) (33406 26472) (33419 12402) (33421 26473) (33426 26474) (33433 -18791) (33437 15431) (33439 26476) (33445 13097) (33446 12338) (33451 26475) (33452 26478) (33453 -18254) (33455 16196) (33457 12886 30044) (33459 19239) (33464 14173) (33465 13916) (33467 26477) ( -33469 12906) (33477 13347) (33489 12657) (33490 26482) (33491 20074) (33492 16989) (33495 18756) ( -33497 26494) (33499 12887) (33500 26492) (33502 26490) (33503 26481) (33505 26479) (33507 26480) ( -33509 15459 30174) (33510 13932) (33511 17271) (33515 18001) (33521 12625 30184) (33523 26484) (33524 -26483) (33529 26489) (33530 26485) (33531 26488))] - -[131 ((33538 19536) (33539 26487) (33540 12888) (33541 13181) (33542 26491) (33545 26493) (33550 14164 -) (33558 26659) (33559 26668) (33560 26669) (33564 12331) (33571 26676) (33576 12401) (33579 26667) ( -33583 26666) (33585 26661) (33586 26660) (33588 26658) (33589 26657) (33590 17251) (33592 17019) ( -33593 26663) (33600 26662) (33605 26665) (33609 16752) (33610 14165) (33615 12609) (33616 26664) ( -33618 14675) (33624 16753) (33651 26682) (33653 26683) (33655 12889) (33659 12846) (33660 26680) ( -33669 26670) (33671 26678) (33673 26685) (33674 26679) (33678 26677) (33683 26486) (33686 26675) ( -33690 26671) (33694 13392) (33695 26673) (33696 26684) (33698 26674) (33704 26686) (33706 26672) ( -33707 18300) (33713 19817) (33717 26681) (33725 26703) (33729 26695) (33733 16251) (33738 13638) ( -33740 13917) (33742 26690) (33747 12891) (33750 15956) (33752 26693) (33756 14938) (33759 17745) ( -33760 26698) (33769 19054) (33771 26689) (33775 12890 30045) (33776 14422) (33777 18729) (33778 26699) - (33780 26687) (33783 26696) (33787 26706) (33789 26691))] - -[132 ((33795 26692) (33796 17978) (33799 26697) (33803 26694) (33804 19240) (33805 26700) (33806 12384 -) (33811 26688) (33824 26702) (33826 26701) (33833 18283) (33834 26708) (33836 26719 30065) (33841 -13182) (33845 26722) (33848 26704) (33852 26709) (33853 19822) (33862 26718) (33865 19797) (33870 -20010) (33879 17272) (33883 13163) (33889 18802) (33890 26724) (33891 17953) (33894 12337) (33897 -26717) (33899 26713) (33900 16754) (33901 26707) (33902 26715) (33903 26720) (33905 18220) (33909 -12330) (33911 26712) (33913 26721) (33914 18808) (33922 26716) (33924 26711) (33931 15957) (33936 -15663) (33940 15404) (33945 19544) (33948 18759) (33951 26727) (33953 26736) (33965 26714) (33970 -13175) (33976 15992) (33977 26725) (33979 26730) (33980 16755) (33983 26726) (33985 26733) (33988 -17247) (33990 26734) (33993 19798) (33994 26723) (33995 13112) (33997 26729) (34000 26732) (34001 -19500) (34006 26735) (34009 26728) (34010 26731) (34028 19241) (34030 20257) (34036 26739) (34044 -26746) (34047 26738))] - -[133 ((34048 15427) (34054 26705) (34065 19022) (34067 19490) (34068 26745) (34069 26744) (34071 26740 -) (34072 26741) (34074 12598) (34079 26743) (34081 26737) (34086 17493) (34092 26742) (34093 12414) ( -34101 16930) (34109 19011) (34112 26747) (34113 26913) (34115 18521) (34120 26750) (34121 15958) ( -34122 15433) (34123 26915) (34126 13886) (34133 26916) (34135 18809) (34136 26749) (34138 26710) ( -34147 26748) (34152 20303) (34153 17954) (34154 18803) (34157 26923) (34167 26929) (34174 26930) ( -34176 26917) (34180 18294) (34183 26927) (34184 26919) (34186 26921) (34192 26931) (34193 26920) ( -34196 26924) (34199 12658) (34201 18021) (34203 26925) (34204 26928) (34212 26918) (34214 16678) ( -34216 26922) (34217 15143) (34218 16197) (34219 14128) (34220 19572) (34222 19577) (34223 15730) ( -34233 26935) (34234 26933) (34241 20302) (34249 26932) (34253 19829) (34255 26934) (34256 26936) ( -34261 26937) (34268 26940) (34269 26938) (34276 17955) (34277 26939) (34281 18509) (34282 26926) ( -34295 15731) (34297 26941) (34298 26946) (34299 16756) (34302 26945))] - -[134 ((34306 26914) (34310 26947) (34311 16713) (34314 26942) (34315 26944) (34323 26943) (34326 23857 -) (34327 23842) (34330 26949) (34338 26948) (34349 19830) (34351 25148) (34352 26950) (34367 26951) ( -34381 26952) (34382 14423) (34384 13652) (34388 26954) (34389 20829 29989) (34394 13685) (34396 20026) - (34398 13939) (34399 26955 30121) (34407 26956) (34411 17262) (34417 26957) (34425 18042) (34427 -12346) (34442 12899) (34443 26962) (34444 26963) (34451 26958) (34453 15165) (34467 26959) (34468 -18242) (34473 26960) (34474 26961) (34475 26971) (34479 26965) (34480 26968) (34486 26964) (34500 -26966) (34502 26967) (34503 15448) (34505 26969) (34507 17217) (34509 14166) (34510 13122) (34516 -26972) (34521 13119) (34523 26977) (34526 26973) (34527 26976) (34532 18490) (34537 26974) (34540 -26975) (34541 18760) (34542 18522) (34543 26978) (34552 17021) (34553 26988) (34555 26984) (34558 -12907))] - -[135 ((34560 26982) (34562 19242) (34563 26983) (34566 26980) (34568 26981) (34569 26986) (34570 26989 -) (34573 26987) (34577 26985) (34578 26979) (34584 17240) (34586 26996) (34588 19498) (34597 26994) ( -34601 26995) (34612 26990) (34615 26992) (34619 26993) (34623 26991) (34633 16486) (34635 20281) ( -34636 27000) (34638 27001) (34643 27169) (34645 16170) (34647 27003) (34649 27006) (34655 26998) ( -34656 26997) (34659 27170) (34662 12892) (34664 27004) (34666 27171) (34670 27005) (34676 27002) ( -34678 17459) (34680 26999) (34687 18280) (34690 27175) (34701 19771) (34719 27174) (34722 27173) ( -34731 27182) (34735 27176) (34739 27184) (34746 19814) (34747 27187) (34749 27178) (34752 27179) ( -34756 27183) (34758 27186) (34759 27185) (34763 27177) (34768 27180) (34770 27197) (34784 27190) ( -34799 27188) (34802 27189) (34806 27194) (34807 27195) (34809 13098) (34811 13634) (34814 27193))] - -[136 ((34821 27172) (34829 27192) (34830 27196) (34831 27191) (34833 27198) (34837 27200) (34838 27199 -) (34849 27202) (34850 27201) (34851 26970) (34855 27206) (34865 27203) (34870 27204) (34873 27205) ( -34875 27207) (34880 14188) (34882 27209) (34884 27208) (34886 15664) (34892 14676) (34893 24103) ( -34898 27210) (34899 15697) (34903 13113) (34905 27211) (34907 12626) (34909 15959) (34910 27212) ( -34913 14677) (34914 27213) (34915 12385 30173) (34920 18749 30055) (34923 27214) (34928 16234) (34930 -27221) (34933 27218) (34935 17263) (34941 27219) (34942 27216) (34943 13918) (34945 27215) (34946 -27222) (34952 14134) (34955 16990) (34957 27228) (34962 27224) (34966 16949) (34967 27223) (34969 -27226) (34974 27217) (34978 27227) (34980 27229) (34987 18543 30008) (34990 27225) (34992 27230) ( -34993 27232) (34996 14419) (34997 27220) (34999 12353) (35007 27231) (35009 14939) (35010 20086) ( -35011 27233) (35012 27234) (35013 16757) (35023 20002) (35028 27235) (35029 19765) (35032 27236) ( -35033 27237) (35036 19044) (35037 27238) (35039 14912) (35041 20003) (35048 27243) (35058 27244) ( -35059 15960) (35060 27242) (35064 19815) (35065 27239) (35068 27241) (35069 16445) (35070 16254))] - -[137 ((35074 27240) (35076 27245) (35079 18979) (35082 27247) (35084 27246) (35088 13164) (35090 19243 -) (35091 27248) (35101 27260) (35102 27250) (35109 27251) (35114 27252) (35115 27253) (35126 27257) ( -35128 27258) (35131 27256) (35137 27254) (35139 27249) (35140 27255) (35148 27259) (35149 28727) ( -35158 12840) (35166 27262) (35167 13919) (35168 27261) (35172 27426) (35174 27425) (35178 27428) ( -35181 27427) (35183 27429) (35186 15665) (35188 27430) (35191 27431) (35198 27432) (35199 16446) ( -35201 19799) (35203 27433) (35206 18980) (35207 18246) (35208 27434) (35210 27435) (35211 14379) ( -35215 13612) (35219 27436) (35222 15211) (35223 18241) (35224 27437) (35226 13136) (35233 27438) ( -35238 27440) (35239 19831) (35241 27439) (35242 16198 29992) (35244 27441) (35247 27442) (35250 27443) - (35251 13393) (35258 27444) (35261 27445) (35263 27446) (35264 27447) (35282 13137) (35290 27448) ( -35292 27449) (35293 27450) (35299 12914) (35302 16168) (35303 27451) (35316 27452) (35320 27453))] - -[138 ((35328 14400) (35330 17531) (35331 27454) (35336 14167 30189) (35338 16214) (35340 27457) (35342 - 17956) (35344 27456) (35347 14129) (35350 27455) (35351 17015) (35352 13613) (35355 27458) (35357 -27459) (35359 15961) (35363 14189) (35365 27460) (35370 19244) (35373 16479) (35377 13686 30009) ( -35379 19573) (35380 16714) (35382 27461) (35386 16199) (35387 17264) (35388 15962) (35393 27462) ( -35398 27465) (35400 27466) (35408 14910) (35409 16962) (35410 27464) (35412 15963) (35413 18750) ( -35419 27463) (35422 15212) (35424 12627) (35426 27470) (35427 14168) (35430 15214) (35433 15213) ( -35435 20301) (35436 27469) (35437 27468) (35438 16679) (35440 13645) (35441 20291) (35442 13114 30125) - (35443 15964) (35452 27467) (35458 27472) (35460 27473) (35461 27471) (35463 14424) (35465 19776) ( -35468 15215) (35469 18215) (35473 27476) (35475 16448) (35477 17218) (35480 19766) (35482 27479) ( -35486 14444) (35488 16447) (35489 27475) (35491 27480) (35492 14445) (35493 27477) (35494 27478) ( -35496 27474) (35500 16482) (35501 17993) (35504 17199) (35506 12893 30046) (35513 18544) (35516 13635) - (35519 17460) (35522 27483) (35524 27481) (35527 17228) (35531 16449 30010) (35532 13394) (35533 -27482) (35535 16219) (35538 20042) (35542 20288 30130) (35546 27484) (35547 27495) (35548 17461) ( -35550 27494) (35552 27491) (35553 27499) (35554 27492) (35556 27488) (35558 17532) (35559 27487) ( -35563 27485) (35565 19745) (35566 15216) (35569 27489) (35571 27486) (35575 27493) (35576 15732) ( -35578 14401) (35582 17018))] - -[139 ((35584 19269) (35585 12634) (35586 12386) (35588 17957) (35591 27497) (35596 27496) (35598 18022 -) (35600 27501) (35604 27490) (35606 27500) (35607 27502) (35609 14380) (35610 27498) (35611 14678 -30188) (35613 15445) (35616 27503) (35617 19800) (35622 27506) (35624 27509) (35627 27507) (35628 -18741) (35635 27504) (35641 13920) (35646 27508) (35649 27510) (35657 27514) (35660 27511) (35662 -27513) (35663 27512) (35670 27515) (35672 15409) (35674 27517) (35675 27516) (35676 18792) (35679 -27681) (35686 14169) (35691 27518) (35692 27682) (35695 27683) (35696 13636 30176) (35697 26177) ( -35698 15993) (35700 27684) (35703 14446) (35709 27685) (35712 27686) (35715 15166) (35722 23118 30179) - (35724 27687) (35726 27688) (35728 15666) (35730 27689) (35731 27690) (35734 27691) (35737 27692) ( -35738 27693))] - -[140 ((35895 17195) (35898 27694) (35903 27696) (35905 27695) (35910 17958) (35912 27697) (35914 19245 -) (35916 27698) (35918 27699) (35920 27700) (35925 27701) (35930 18010) (35937 15965) (35938 27702) ( -35946 14699) (35947 20526) (35948 27703) (35960 27704) (35961 18751) (35962 27705) (35964 27713) ( -35970 27706) (35973 27708) (35977 27707) (35978 27709) (35980 19270) (35981 27710) (35982 27711) ( -35988 27712) (35992 27714) (35997 13101) (35998 17511) (36000 18793) (36001 14946) (36002 14679) ( -36007 18767) (36008 12895) (36009 18510) (36010 27717) (36011 13395) (36012 16469) (36013 27716) ( -36014 27721) (36015 17273) (36016 19555) (36018 27719) (36019 27720) (36020 13614) (36022 27722) ( -36023 18275) (36024 16991) (36027 18545) (36028 17725) (36029 27718) (36031 19271) (36032 12908) ( -36033 27724) (36034 20264) (36035 17474) (36036 20293) (36039 15217) (36040 27723) (36042 16945) ( -36045 27740) (36046 16680) (36049 18040) (36051 18768) (36058 27727) (36059 15167) (36060 15218) ( -36062 15966) (36064 18277) (36066 14381) (36067 27726) (36068 27725) (36070 18794) (36074 15425) ( -36077 17746) (36090 27729) (36091 27730) (36092 14680) (36093 27728))] - -[141 ((36100 27731) (36101 27732) (36103 27734) (36104 16931) (36106 27733) (36107 13414) (36109 27736 -) (36111 27735) (36112 27737) (36115 27739) (36116 27741) (36118 27742) (36196 16470) (36198 15439) ( -36199 27743) (36203 13138) (36205 27744) (36208 16758) (36209 27745) (36211 27746) (36212 18795) ( -36215 13615) (36225 27747) (36229 17462) (36234 12635) (36249 27748) (36259 15473) (36264 16246) ( -36275 16941) (36282 27751) (36286 27750) (36290 27749) (36299 27757) (36300 27755) (36303 27752) ( -36310 27754) (36314 27753) (36315 27756) (36317 13687) (36319 27760 30195) (36321 16471) (36323 27761) - (36328 14425) (36330 27758) (36331 27759) (36335 20265) (36339 17463) (36341 16681) (36348 27762) ( -36351 27765))] - -[142 ((36360 27763) (36361 27764) (36362 19801) (36367 17959) (36368 27768) (36381 27766) (36382 27767 -) (36383 27769) (36394 27945) (36400 27772) (36404 27773) (36405 27771) (36418 27770) (36420 17533) ( -36423 27937) (36424 27941) (36425 27938) (36426 27774) (36428 27939) (36432 27940) (36437 27947) ( -36441 27942) (36447 16472) (36448 27944) (36451 27946) (36452 27943) (36466 27949) (36468 15667) ( -36470 27948) (36476 27950) (36481 27951) (36484 27954) (36485 27953) (36487 27952) (36490 27956) ( -36491 27955) (36493 19574) (36497 27958) (36499 27957) (36500 27959) (36505 27960) (36513 27962) ( -36522 27961) (36523 16200 30006) (36524 27963) (36527 13933) (36528 27964) (36529 27966) (36542 27967) - (36549 27968) (36550 27965) (36552 27969) (36554 15446 30015) (36555 27970) (36556 13616) (36557 -14131 30016) (36562 14382) (36571 27971) (36575 18032) (36578 17726) (36579 27972) (36587 27975) ( -36600 15412) (36603 27974) (36604 27973) (36605 14170) (36606 27976))] - -[143 ((36611 13139) (36613 27978) (36617 14940) (36618 27977) (36620 27986) (36626 27980) (36627 27982 -) (36628 19045) (36629 27979) (36633 27981) (36635 27985) (36636 27983) (36637 13617) (36639 27984) ( -36646 27987) (36649 18266) (36650 20056) (36655 15668) (36659 27988) (36664 19746) (36665 27990) ( -36667 27989) (36670 27993) (36671 19777) (36674 27992) (36676 13165) (36677 27991) (36678 27996) ( -36681 27995) (36684 27994) (36685 17714) (36686 27997) (36695 27998) (36700 27999) (36703 14700) ( -36705 14117) (36706 28000) (36707 28001) (36708 28002) (36763 16201) (36764 28003) (36766 15405) ( -36767 28004) (36771 28005) (36775 21025) (36776 20862) (36781 28006) (36782 25968) (36783 28007) ( -36784 17188) (36785 16171) (36786 18240) (36791 28008) (36794 19029) (36795 17492) (36796 14718) ( -36799 17193) (36802 12586) (36804 19320) (36805 16215) (36814 14174) (36817 13921 30177) (36820 19030) - (36826 28009) (36834 28011) (36837 28010) (36838 12896) (36841 18038) (36842 28012) (36843 18295) ( -36845 17715) (36847 28013) (36848 15698) (36852 28015) (36855 19522) (36856 28030) (36857 28017) ( -36858 28018) (36861 17481))] - -[144 ((36864 16992) (36865 16759) (36867 17960) (36869 28016) (36870 13653) (36875 28025) (36877 28022 -) (36878 28197) (36879 17961) (36880 17248) (36881 28019) (36883 17534) (36884 17747) (36885 28020) ( -36886 28024) (36887 16224) (36889 18279) (36890 17484 30054) (36893 16450) (36894 28023) (36895 16942) - (36896 16932 30162) (36897 28021) (36898 12329) (36899 20258) (36903 28026) (36910 16993) (36913 -15669) (36914 16202) (36917 28028) (36918 28027) (36920 12399) (36921 28029) (36924 18735) (36926 -28199) (36929 18011) (36930 16235) (36933 17241) (36935 13944) (36937 28198) (36938 19767) (36939 -12607 30167) (36941 19031) (36942 12897) (36943 28193) (36944 28194) (36945 28195) (36946 28196) ( -36947 17979) (36948 17187) (36949 12387) (36950 28200) (36952 28201) (36953 29987) (36956 16957) ( -36958 28202) (36960 12659) (36961 16716) (36963 14383) (36965 19802) (36968 28203) (36969 17708) ( -36973 16760) (36974 15447) (36975 28204) (36978 28207) (36981 15717) (36982 28205) (36983 16683) ( -36984 16682) (36986 12388) (36988 20043) (36989 28209) (36991 18546) (36992 28211) (36993 28210) ( -36994 28208) (36995 25444) (36996 13396) (36999 28014) (37001 28213) (37002 28212 30017) (37007 28214) - (37009 19768) (37027 18017) (37030 19246) (37032 28215) (37034 15449) (37039 28216) (37041 28217) ( -37045 28218) (37048 17697) (37057 12394) (37066 14681) (37070 20282) (37083 28222) (37089 14132) ( -37090 28219) (37092 28220) (37096 18804) (37101 13140) (37109 19769) (37111 13887) (37117 17748))] - -[145 ((37122 28223) (37138 28224) (37145 28225) (37165 17698) (37168 28227) (37170 28226) (37193 18003 -) (37194 28228) (37195 15670) (37196 15456) (37197 18267) (37198 17265) (37202 15474) (37204 16236) ( -37206 28229) (37208 28230) (37218 16221) (37219 28231) (37221 28232) (37225 28233) (37226 19823) ( -37228 15671) (37234 28235) (37235 28234) (37237 14682) (37239 14707) (37240 15168) (37250 28238) ( -37255 15718) (37257 28237) (37259 28236) (37261 17001) (37264 14447) (37266 16451) (37271 18480) ( -37276 15673) (37282 28239) (37284 15967) (37290 28242) (37291 28240) (37295 28241) (37300 28244) ( -37301 28243) (37304 15994) (37306 28245) (37312 28246) (37313 28247) (37318 18512) (37319 14931) ( -37320 15457) (37321 28248) (37323 28249) (37324 20004) (37325 15685 30018) (37326 19566) (37327 20044) - (37328 28250) (37329 13922 30056) (37334 28251) (37336 17699) (37339 28254) (37340 13176) (37341 -16203) (37343 28252) (37345 28253) (37347 17504) (37350 19285) (37351 13948) (37365 28256) (37366 -28257) (37372 28255) (37375 28259))] - -[146 ((37389 18015) (37390 13123) (37393 28263) (37396 28260) (37397 28262) (37406 28258) (37417 28495 -) (37420 28261) (37428 20075) (37431 14426) (37439 28271) (37444 17716) (37445 28266) (37448 28269) ( -37449 28267) (37451 28272) (37456 28273) (37463 28265) (37466 28278) (37467 12660) (37470 28264) ( -37474 18477) (37476 28268) (37478 15968) (37489 14683) (37502 19272) (37504 13924) (37507 15686) ( -37509 17980) (37521 16685) (37523 28276) (37525 28270) (37526 28275) (37528 19523) (37530 17464) ( -37531 28277) (37532 28274) (37549 16684) (37559 28281) (37561 28280) (37583 28279) (37586 19247) ( -37604 15739) (37609 28282) (37610 19039) (37613 12628) (37618 18758) (37619 17266) (37624 13688) ( -37626 28284) (37628 14685))] - -[147 ((37638 15148) (37647 28283) (37648 16237) (37656 16238) (37657 28449) (37658 28451) (37664 15995 -) (37666 28450 30131) (37667 28452) (37670 13907) (37672 18757) (37675 15458) (37676 20259) (37678 -28286) (37679 14968) (37682 20287) (37685 28454) (37690 28453) (37691 28455) (37700 28285) (37707 -18025) (37709 17749) (37716 17495) (37718 28460) (37723 17219) (37724 28456) (37728 28457) (37740 -14125) (37742 28459) (37749 14384) (37756 28458) (37758 15969) (37772 13177) (37780 28464) (37782 -14911) (37783 16761) (37786 17482) (37799 13115) (37804 28462) (37805 28463) (37806 17475) (37808 -28461) (37817 28465) (37827 28471) (37832 28474) (37840 28473) (37841 17709) (37846 28466) (37847 -28467) (37848 28470) (37853 28472) (37857 13888) (37860 28475) (37861 28469) (37864 28468))] - -[148 ((37891 28479) (37895 28480) (37904 28481) (37907 28478) (37908 28477) (37912 15970) (37913 17962 -) (37914 28476) (37921 28485) (37931 28483) (37941 28484 30157) (37942 28482) (37944 17016) (37946 -28486) (37953 28487) (37956 28489) (37969 13397) (37970 28488) (37971 19578) (37978 28500) (37979 -28490) (37982 28493) (37984 28491) (37986 28492) (37994 28494) (38000 28496) (38005 28497) (38007 -28498) (38012 28501) (38013 28499) (38014 28502) (38015 28504) (38017 28503))] - -[149 ((38263 17465) (38272 19559) (38274 28505) (38275 16686) (38279 28506) (38281 19012) (38282 28507 -) (38283 13099) (38287 12604) (38289 13399) (38291 13398 30012) (38292 28508) (38294 28509) (38296 -28510) (38297 28511) (38304 28512) (38306 13400) (38307 13141) (38308 14686) (38309 18486) (38311 -28514) (38312 28513) (38317 28515) (38322 12636) (38329 28518) (38331 28517) (38332 28516) (38334 -28519) (38339 28522) (38343 12359) (38346 28520) (38348 28524) (38349 28523) (38356 28526) (38357 -28525) (38358 28527) (38360 17966) (38364 28528 30033) (38369 28529) (38370 28531) (38373 28530))] - -[150 ((38428 18796) (38433 28532) (38440 28533) (38442 14949) (38446 28534) (38447 28535) (38450 19273 -) (38459 16715) (38463 12324) (38464 16971) (38466 28536) (38468 18797) (38475 28539) (38476 28537) ( -38477 14687) (38479 28538) (38480 14402) (38491 19013) (38492 28541) (38493 28705) (38494 28542) ( -38495 28706) (38498 12577) (38499 16216) (38500 15740) (38501 13401) (38502 28707) (38506 18278) ( -38508 28709) (38512 12578) (38514 28708) (38515 17476) (38517 20045) (38518 17963) (38519 28540) ( -38520 20006) (38522 14385) (38525 19803) (38533 13945) (38534 20020) (38536 14120) (38538 16994) ( -38539 26401) (38541 28710) (38542 13100) (38543 16239) (38548 13142) (38549 28712) (38551 28713) ( -38552 28711) (38553 14180) (38555 14941) (38556 15971) (38560 12579) (38563 20057) (38567 28715) ( -38568 28206) (38570 28714) (38576 28718) (38577 28716) (38578 28717) (38580 28719) (38582 28720) ( -38583 20076) (38584 28721) (38585 28722) (38587 16457 30203) (38588 18491) (38592 16253) (38593 13415) - (38596 19770) (38597 12909) (38598 15672) (38599 14427) (38601 28725) (38603 28724) (38604 15219) ( -38605 28726) (38606 28723) (38609 15144) (38613 28730) (38614 27181) (38617 21078) (38619 16247) ( -38620 28728) (38626 20005) (38627 18033 30074) (38632 12587) (38634 16483) (38635 15414) (38640 18999) - (38642 12608) (38646 20077) (38647 19819) (38649 28731) (38651 17733 29994))] - -[151 ((38656 15483) (38660 28732) (38662 28733) (38663 16204) (38664 28734) (38666 20078) (38669 28729 -) (38670 28736) (38671 28738) (38673 28737) (38675 28735) (38678 28739) (38681 28740) (38684 16762) ( -38686 12898) (38692 28741) (38695 19512) (38698 28742) (38704 28743) (38706 20266) (38712 23345) ( -38713 28744) (38717 28745) (38718 28746) (38722 28750) (38724 28747) (38726 28748) (38728 28749) ( -38729 28751) (38738 16452) (38742 19575) (38745 16453) (38748 28752) (38750 18547 30117) (38752 28753) - (38753 29523) (38754 19532) (38756 28754) (38758 28755) (38760 28756) (38761 13143) (38763 28758) ( -38765 16217) (38769 28759) (38772 14116) (38777 28760) (38778 28764) (38780 28762) (38785 28763) ( -38788 13171) (38789 28761) (38790 28765) (38795 28766) (38797 12360) (38799 28767) (38800 28768) ( -38808 15972) (38812 28769) (38816 13639) (38819 28772) (38822 28771) (38824 28770) (38827 27505) ( -38829 19036) (38835 28773) (38836 28774) (38851 28775) (38854 28776) (38856 28777) (38859 28778) ( -38867 13402) (38876 28779) (38893 28780) (38894 18211) (38898 28782) (38899 12859) (38901 28785) ( -38902 28784) (38907 12580) (38911 13889))] - -[152 ((38913 19015) (38914 17466) (38915 14882) (38917 14688) (38918 15719) (38920 16220) (38924 28787 -) (38927 28786) (38928 19778) (38929 13416) (38930 18514) (38931 18012) (38935 16252) (38936 20046) ( -38938 14171) (38945 28790) (38948 28789) (38956 19275) (38957 17964) (38964 12624) (38967 28791) ( -38968 28788) (38971 18769) (38972 19818) (38973 28792) (38982 28793) (38987 28795) (38988 17002) ( -38989 13147) (38990 13148) (38991 28794) (38996 13417) (38997 14386) (39000 13418) (39003 17727) ( -39006 20064 30183) (39015 14428) (39019 28796) (39023 28797) (39024 28798) (39025 28961) (39027 28963) - (39028 28962) (39080 18807 30071) (39082 28964) (39087 28965) (39089 28966) (39094 28967) (39107 -28969) (39108 28968) (39110 28970) (39131 18548 30132) (39132 26188) (39135 16169) (39138 13618) ( -39145 28971) (39147 28972) (39149 21036) (39150 23867) (39151 18515) (39154 12411) (39156 12347) ( -39164 15220) (39165 19248) (39166 15998))] - -[153 ((39171 28973) (39173 19551) (39177 28974) (39178 19804) (39180 12610) (39184 15169) (39186 28975 -) (39187 12910) (39188 28976) (39192 28977) (39197 28979) (39198 28980) (39200 28982) (39201 28978) ( -39204 28981) (39208 13403) (39212 28983) (39214 28984) (39229 28985) (39230 28986) (39234 28987) ( -39237 28989) (39241 28988) (39243 28991) (39244 28994) (39248 28990) (39249 28992) (39250 28993) ( -39253 28995) (39255 13890) (39318 15475) (39319 28996) (39320 28997) (39321 14689) (39333 28998) ( -39336 13118) (39340 18255 30115) (39341 28999) (39342 29000) (39347 17242) (39348 18027) (39356 29001) - (39361 18301) (39364 16972) (39365 12632) (39366 13934) (39368 13935) (39376 17267) (39377 29006) ( -39378 13936) (39381 12911) (39384 29005) (39387 29003) (39389 29004) (39391 29002) (39394 29016) ( -39405 29007) (39406 29008) (39409 29009) (39410 29010) (39416 29012) (39419 29011) (39423 15705))] - -[154 ((39425 29013) (39429 29015) (39438 13619) (39439 29014) (39442 16763) (39443 14387) (39449 29017 -) (39464 16973) (39467 29018) (39472 17965) (39479 29019) (39486 29024) (39488 29022) (39490 29021) ( -39491 29023) (39493 29020) (39501 29026) (39509 29025) (39511 29028) (39514 13891) (39515 29027) ( -39519 29029) (39522 29030) (39524 29032) (39525 29031) (39529 29033) (39530 29035) (39531 29034) ( -39592 14716) (39597 29036) (39600 29037) (39608 13116) (39612 29038) (39616 29039) (39620 16241) ( -39631 29040) (39633 29041) (39635 29042) (39636 29043 30013) (39640 14690) (39646 29044) (39647 29045) - (39650 29046) (39651 29047) (39654 29048) (39658 18481) (39659 29050) (39661 18726) (39662 29051) ( -39663 29049) (39665 29053) (39668 29052) (39671 29054) (39675 29217))] - -[155 ((39686 29218) (39704 29219) (39706 29220) (39711 29221) (39714 29222) (39715 29223) (39717 29224 -) (39719 29225) (39720 29226) (39721 29227) (39722 29228) (39726 29229) (39727 29230) (39729 23861) ( -39730 29231) (39739 25720) (39740 13620) (39745 13089) (39746 14898) (39747 29233) (39748 29232) ( -39749 19493) (39757 29235) (39758 29236) (39759 29234) (39761 29237) (39764 19298) (39768 29238) ( -39770 13691) (39791 20261) (39796 29239) (39811 29241) (39822 12350) (39825 29242) (39826 18987) ( -39827 29240) (39830 29243) (39831 29244) (39839 29245) (39840 29246) (39848 29247) (39850 19310) ( -39851 15149) (39853 14970) (39854 16687) (39860 29248) (39865 29251) (39872 29249) (39878 29252) ( -39881 14449) (39882 29250) (39887 29253) (39889 29254) (39890 29255) (39892 29259) (39894 15146) ( -39899 16996) (39905 29260) (39906 29257) (39907 29256) (39908 29258) (39912 14175) (39920 29264) ( -39921 29263) (39922 29262) (39925 12339))] - -[156 ((39940 29274) (39942 29270) (39944 29271) (39945 29267) (39946 29273) (39948 29269) (39949 13154 -) (39952 20300) (39954 29272) (39955 29268) (39956 29266) (39957 29265) (39963 29276) (39969 29279) ( -39972 29278) (39973 29277) (39981 18761) (39982 29275) (39983 12403) (39984 29280) (39986 29282) ( -39993 13167) (39994 29261) (39995 12599) (39998 29284) (40006 29283) (40007 29281) (40008 17197) ( -40018 19312) (40023 20058) (40026 29285) (40032 29286) (40039 29287) (40054 29288) (40056 29289) ( -40165 17467) (40167 29290) (40169 18487) (40171 29295) (40172 29291) (40176 29292) (40179 19249) ( -40180 19524) (40182 18000))] - -[157 ((40195 29296) (40198 29297) (40199 17982) (40200 29294) (40201 29293) (40206 12842) (40210 29305 -) (40213 29304) (40219 12661) (40223 29302) (40227 29301) (40230 29299) (40232 13179) (40234 29298) ( -40235 15410) (40236 12841) (40251 14691) (40254 29308) (40255 29307) (40257 29306) (40260 29303) ( -40262 29309) (40264 29310) (40272 29477) (40273 29476) (40281 29478) (40284 12589) (40285 29473) ( -40286 29474) (40288 14708) (40289 19513) (40292 29475) (40300 19250) (40303 29483) (40306 29479) ( -40314 29484) (40327 29481) (40329 29480) (40335 14172) (40346 29485) (40356 29486) (40361 29487) ( -40363 29482) (40367 29300) (40370 29488) (40372 17505) (40376 29492) (40378 29493) (40379 29491) ( -40385 29490) (40386 29496) (40388 29489) (40390 29494) (40399 29495) (40403 29498) (40409 29497) ( -40422 29500) (40429 29501) (40431 29502) (40434 20297) (40440 29499) (40441 17003) (40442 14957) ( -40445 29503))] - -[158 ((40474 29504) (40475 29505) (40478 29506) (40565 29507) (40568 14388) (40569 29508) (40573 29509 -) (40575 15407) (40577 29510) (40584 29511) (40587 29512) (40588 29513) (40593 29516) (40594 29514) ( -40595 20284) (40597 29515) (40599 20079) (40605 29517) (40607 20059) (40613 29518) (40614 18302) ( -40617 29519) (40618 29521) (40621 29522) (40632 29520) (40633 14701) (40634 19533) (40635 19299) ( -40636 22135) (40638 23904) (40639 19323) (40643 30206) (40644 12843) (40652 29524) (40653 13648) ( -40654 29525) (40655 29526) (40656 29527) (40658 14709) (40660 29528) (40664 24660) (40665 19547) ( -40667 16995) (40668 29529) (40669 29531) (40670 29530) (40672 29532) (40677 29533) (40680 29534) ( -40687 29535) (40692 29536) (40694 29537) (40695 29538) (40697 29539) (40699 29540) (40700 29541) ( -40701 29542))] - -[159 ((40711 29543) (40712 29544) (40718 17700) (40723 14429) (40725 29546) (40736 16717) (40737 29547 -) (40748 29548) (40763 18721) (40766 29549) (40778 29550) (40779 25399) (40782 27738) (40783 28781) ( -40786 29551) (40788 29552) (40799 29554) (40800 29555) (40801 29556) (40802 20080) (40803 29553) ( -40806 29557) (40807 29558) (40810 29560) (40812 29559) (40818 29562) (40822 29563) (40823 29561) ( -40845 20022) (40853 29564) (40860 29565) (40861 25428) (40864 29566))] - -[167 ((42800 64870) (42801 64883) (42927 64881))] - -[169 ((43472 8507))] - -[251 ((64256 61473) (64257 61476) (64258 61477) (64259 61474) (64260 61475) (64261 61478) (64262 61481 -) (64275 58616) (64276 58617) (64277 58618) (64278 58619) (64279 58620) (64286 57840) (64287 57705) ( -64288 57706) (64289 57707) (64290 57708) (64291 57709) (64292 57710) (64293 57711) (64294 57712) ( -64295 57713) (64296 57714) (64297 57715) (64298 57694) (64299 57695) (64300 57696) (64301 57697) ( -64302 57698) (64303 57699) (64304 57719) (64305 57691) (64306 57720) (64307 57721) (64308 57722) ( -64309 57723) (64310 57724) (64312 57725) (64313 57726) (64314 57761) (64315 57692) (64316 57762) ( -64318 57763) (64320 57764) (64321 57765) (64323 57766) (64324 57693) (64326 57767) (64327 57768) ( -64328 57769) (64329 57770) (64330 57771) (64331 57700) (64332 57701) (64333 57702) (64334 57703) ( -64335 57704) (64343 62958) (64344 62956) (64345 62957) (64363 62889) (64364 62887) (64365 62888) ( -64379 62961) (64380 62959) (64381 62960) (64395 62962) (64399 62964) (64403 62967) (64404 62965) ( -64405 62966) (64421 62968) (64467 57535) (64477 57539))] - -[252 ((64562 62891) (64606 62882) (64607 62883) (64608 62884) (64609 62885) (64610 62886))] - -[254 ((65056 9181) (65057 9182) (65059 9183) (65072 12076) (65073 12070) (65075 12068) (65076 12216) ( -65077 12077) (65078 12078) (65079 11827 12081) (65080 11828 12082) (65081 12079) (65082 12080) (65083 -12093) (65084 12094) (65085 12264) (65086 12265) (65087 12193) (65088 12194) (65089 12089) (65090 -12090) (65091 12091) (65092 12092) (65154 62753) (65156 62754) (65158 62755) (65160 62756) (65162 -62759) (65163 62757) (65164 62758) (65166 62760) (65168 62763) (65169 62761) (65170 62762) (65172 -62764) (65174 62767) (65175 62765) (65176 62766) (65178 62770) (65179 62768) (65180 62769) (65182 -62773) (65183 62771) (65184 62772) (65186 62776) (65187 62774) (65188 62775) (65190 62779) (65191 -62777) (65192 62778) (65194 62780) (65196 62781) (65198 62782) (65200 62783) (65202 62786) (65203 -62784) (65204 62785) (65206 62789) (65207 62787) (65208 62788) (65210 62792) (65211 62790) (65212 -62791) (65214 62795) (65215 62793) (65216 62794) (65218 62798) (65219 62796) (65220 62797) (65222 -62801) (65223 62799) (65224 62800) (65226 62804) (65227 62802) (65228 62803) (65230 62807) (65231 -62805) (65232 62806) (65234 62810) (65235 62808) (65236 62809) (65238 62813) (65239 62811) (65240 -62812) (65242 62816) (65243 62814) (65244 62815) (65246 62819) (65247 62817) (65248 62818) (65250 -62822) (65251 62820) (65252 62821) (65254 62825) (65255 62823) (65256 62824) (65258 62828) (65259 -62826) (65260 62827) (65262 62829) (65264 62830) (65266 62833) (65267 62831) (65268 62832) (65269 -62834) (65270 62835) (65271 62836) (65272 62837) (65273 62838) (65274 62839) (65275 62840) (65276 -62841))] - -[255 ((65291 60459) (65292 8484) (65294 8485) (65533 61639))] - -[259 ((66352 10721) (66353 10722) (66354 10723) (66355 10724) (66356 10725) (66357 10726) (66358 10727 -) (66359 10728) (66360 10729) (66361 10731) (66362 10732) (66363 10733) (66364 10734) (66365 10735) ( -66366 10736) (66367 10737) (66368 10738) (66369 10739) (66370 10740) (66371 10741) (66372 10742) ( -66373 10743) (66374 10744) (66375 10745) (66376 10746) (66377 10747) (66378 10748))] - -[469 ((120125 60205))] - -STOP diff --git a/unicode/xerox/XCCS-0,41-43,46,50,356,357,361.TXT b/unicode/xerox/XCCS-0,41-43,46,50,356,357,361.TXT deleted file mode 100644 index 00b8357a..00000000 --- a/unicode/xerox/XCCS-0,41-43,46,50,356,357,361.TXT +++ /dev/null @@ -1,1500 +0,0 @@ -# -# Name: XCCS (Version 2.0) to Unicode -# Unicode version: 3.0 -# XCCS charsets: 0 41-43 46 50 356 357 361 -# Table version: 0.1 -# Table format: Format A -# Date: 5-Jan-2024 -# Author: Ron Kaplan -# -# This file contains mappings from the Xerox Character Code Standard (version -# 2.0, 1990) into Unicode 3.0. standard codes. That is an extension of the -# version of XCCS corresponding to the fonts in the Medley system. -# -# The format of this file conforms to the format of the other Unicode-supplied -# mapping files: -# Three white-space (tab or spaces) separated columns: -# Column 1 is the XCCS code (as hex 0xXXXX) -# Column 2 is the corresponding Unicode (as hex 0xXXXX) -# Column 3 (after #) is a comment column. For convenience, it contains the -# Unicode character itself and the Unicode character names when available. -# Unicode FFFF is used for undefined XCCS codes (Column 3 = UNDEFINED -# Unicode FFFE is used for XCCS codes that have not yet been filled in. -# (Column 3 = MISSING) -# -# This file is encoded in UTF-8, so that the Unicode characters -# are properly displayed in Column 3 and can be edited by standard -# Unicode-enabled editors (e.g. Mac Textedit). -# -# This file can also be read by the function -# READ-UNICODE-MAPPING in the UNICODE Medley library package. -# -# The entries are in XCCS order and grouped by character sets. In front of -# the mappings, for convenience, there is a line with the octal XCCS -# character set, after #. -# -# Note that a given XCCS code might map to codes in several different Unicode -# positions, since there are repetitions in the Unicode standard. -# -# For more details, see the associated README.TXT file. -# -# Any comments or problems, contact - - -# "0" LATIN -0x0000 0x0000 # ^@ -0x0001 0x0001 # ^A -0x0002 0x0002 # ^B -0x0003 0x0003 # ^C -0x0004 0x0004 # ^D -0x0005 0x0005 # ^E -0x0006 0x0006 # ^F -0x0007 0x0007 # ^G -0x0008 0x0008 # ^H -0x0009 0x0009 # ^I -0x000A 0x000A # ^J -0x000B 0x000B # ^K -0x000C 0x000C # ^L -0x000D 0x000D # ^M -0x000E 0x000E # ^N -0x000F 0x000F # ^O -0x0010 0x0010 # ^P -0x0011 0x0011 # ^Q -0x0012 0x0012 # ^R -0x0013 0x0013 # ^S -0x0014 0x0014 # ^T -0x0015 0x0015 # ^U -0x0016 0x0016 # ^V -0x0017 0x0017 # ^W -0x0018 0x0018 # ^X -0x0019 0x0019 # ^Y -0x001A 0x001A # ^Z -0x001B 0x001B # ^[ -0x001C 0x001C # ^\ -0x001D 0x001D # ^] -0x001E 0x001E # ^^ -0x001F 0x001F # ^_ -0x0020 0x0020 # -0x0021 0x0021 # ! -0x0022 0x0022 # " -0x0023 0x0023 # # -0x0024 0x0024 # $ -0x0025 0x0025 # % -0x0026 0x0026 # & -0x0027 0x0027 # ' -0x0028 0x0028 # ( -0x0029 0x0029 # ) -0x002A 0x002A # * -0x002B 0x002B # + -0x002C 0x002C # , -0x002D 0x002D # - -0x002E 0x002E # . -0x002F 0x002F # / -0x0030 0x0030 # 0 -0x0031 0x0031 # 1 -0x0032 0x0032 # 2 -0x0033 0x0033 # 3 -0x0034 0x0034 # 4 -0x0035 0x0035 # 5 -0x0036 0x0036 # 6 -0x0037 0x0037 # 7 -0x0038 0x0038 # 8 -0x0039 0x0039 # 9 -0x003A 0x003A # : -0x003B 0x003B # ; -0x003C 0x003C # < -0x003D 0x003D # = -0x003E 0x003E # > -0x003F 0x003F # ? -0x0040 0x0040 # @ -0x0041 0x0041 # A -0x0042 0x0042 # B -0x0043 0x0043 # C -0x0044 0x0044 # D -0x0045 0x0045 # E -0x0046 0x0046 # F -0x0047 0x0047 # G -0x0048 0x0048 # H -0x0049 0x0049 # I -0x004A 0x004A # J -0x004B 0x004B # K -0x004C 0x004C # L -0x004D 0x004D # M -0x004E 0x004E # N -0x004F 0x004F # O -0x0050 0x0050 # P -0x0051 0x0051 # Q -0x0052 0x0052 # R -0x0053 0x0053 # S -0x0054 0x0054 # T -0x0055 0x0055 # U -0x0056 0x0056 # V -0x0057 0x0057 # W -0x0058 0x0058 # X -0x0059 0x0059 # Y -0x005A 0x005A # Z -0x005B 0x005B # [ -0x005C 0x005C # \ -0x005D 0x005D # ] -0x005E 0x005E # ^ -0x005F 0x005F # _ -0x0060 0x0060 # ` -0x0061 0x0061 # a -0x0062 0x0062 # b -0x0063 0x0063 # c -0x0064 0x0064 # d -0x0065 0x0065 # e -0x0066 0x0066 # f -0x0067 0x0067 # g -0x0068 0x0068 # h -0x0069 0x0069 # i -0x006A 0x006A # j -0x006B 0x006B # k -0x006C 0x006C # l -0x006D 0x006D # m -0x006E 0x006E # n -0x006F 0x006F # o -0x0070 0x0070 # p -0x0071 0x0071 # q -0x0072 0x0072 # r -0x0073 0x0073 # s -0x0074 0x0074 # t -0x0075 0x0075 # u -0x0076 0x0076 # v -0x0077 0x0077 # w -0x0078 0x0078 # x -0x0079 0x0079 # y -0x007A 0x007A # z -0x007B 0x007B # { -0x007C 0x007C # | -0x007D 0x007D # } -0x007E 0x007E # ~ -0x00A1 0x00A1 # ¡ -0x00A2 0x00A2 # ¢ -0x00A3 0x00A3 # £ -0x00A4 0x0024 # $ -0x00A5 0x00A5 # ¥ -0x00A7 0x00A7 # § -0x00A9 0x2018 # ‘ -0x00AA 0x201C # “ -0x00AB 0x00AB # « -0x00AC 0x2190 # ← -0x00AD 0x2191 # ↑ -0x00AE 0x2192 # → -0x00AF 0x2193 # ↓ -0x00B0 0x00B0 # ° -0x00B1 0x00B1 # ± -0x00B2 0x00B2 # ² -0x00B3 0x00B3 # ³ -0x00B4 0x00D7 # × -0x00B5 0x00B5 # µ -0x00B6 0x00B6 # ¶ -0x00B7 0x00B7 # · -0x00B8 0x00F7 # ÷ -0x00B9 0x2019 # ’ -0x00BA 0x201D # ” -0x00BB 0x00BB # » -0x00BC 0x00BC # ¼ -0x00BD 0x00BD # ½ -0x00BE 0x00BE # ¾ -0x00BF 0x00BF # ¿ -0x00C1 0x0300 # ̀ -0x00C2 0x0301 # ́ -0x00C3 0x0302 # ̂ -0x00C4 0x0303 # ̃ -0x00C5 0x0304 # ̄ -0x00C6 0x0306 # ̆ -0x00C7 0x0307 # ̇ -0x00C8 0x0308 # ̈ -0x00CA 0x030A # ̊ -0x00CB 0x0327 # ̧ -0x00CC 0x0332 # ̲ -0x00CD 0x030B # ̋ -0x00CE 0x0328 # ̨ -0x00CF 0x030C # ̌ -0x00D0 0x2015 # ― -0x00D1 0x00B9 # ¹ -0x00D2 0x00AE # ® -0x00D3 0x00A9 # © -0x00D4 0x2122 # ™ -0x00D5 0x266A # ♪ -0x00DC 0x215B # ⅛ -0x00DD 0x215C # ⅜ -0x00DE 0x215D # ⅝ -0x00DF 0x215E # ⅞ -0x00E0 0x2126 # Ω -0x00E1 0x00C6 # Æ -0x00E2 0x00D0 # Ð -0x00E3 0x00AA # ª -0x00E4 0x0126 # Ħ -0x00E5 0x0237 # ȷ -0x00E6 0x0132 # IJ -0x00E7 0x013F # Ŀ -0x00E8 0x0141 # Ł -0x00E9 0x00D8 # Ø -0x00EA 0x0152 # Œ -0x00EB 0x00BA # º -0x00EC 0x00DE # Þ -0x00ED 0x0166 # Ŧ -0x00EE 0x014A # Ŋ -0x00EF 0x0149 # ʼn -0x00F0 0x0138 # ĸ -0x00F1 0x00E6 # æ -0x00F2 0x0111 # đ -0x00F3 0x00F0 # ð -0x00F4 0x0127 # ħ -0x00F5 0x0131 # ı -0x00F6 0x0133 # ij -0x00F7 0x0140 # ŀ -0x00F8 0x0142 # ł -0x00F9 0x00F8 # ø -0x00FA 0x0153 # œ -0x00FB 0x00DF # ß -0x00FC 0x00FE # þ -0x00FD 0x0167 # ŧ -0x00FE 0x014B # ŋ - -# "41" JAPANESE-SYMBOLS1 -0x2121 0x3000 # 　 -0x2122 0x3001 # 、 -0x2123 0x3002 # 。 -0x2124 0xFF0C # ， -0x2125 0xFF0E # ． -0x212B 0x3099 # ゙ -0x212C 0x309A # ゚ -0x2133 0x30FD # ヽ -0x2134 0x30FE # ヾ -0x2135 0x309D # ゝ -0x2136 0x309E # ゞ -0x2137 0x3003 # 〃 -0x2138 0x4EDD # 仝 -0x2139 0x3005 # 々 -0x213A 0x3006 # 〆 -0x213B 0xA9D0 # ꧐ -0x213C 0x30FC # ー -0x213E 0x2010 # ‐ -0x2140 0x22D6 # ⋖ -0x2141 0x22D7 # ⋗ -0x2142 0x2225 # ∥ -0x2143 0x22A9 # ⊩ -0x2144 0x2026 # … -0x2145 0x2025 # ‥ -0x2146 0x22D8 # ⋘ -0x2147 0x22D9 # ⋙ -0x2148 0x27EC # ⟬ -0x2149 0x27ED # ⟭ -0x214A 0x27E6 # ⟦ -0x214B 0x27E7 # ⟧ -0x214C 0x3014 # 〔 -0x214D 0x3015 # 〕 -0x214E 0x22DA # ⋚ -0x214F 0x22DB # ⋛ -0x2150 0x227A # ≺ -0x2151 0x227B # ≻ -0x2152 0x227C # ≼ -0x2153 0x227D # ≽ -0x2154 0x22DE # ⋞ -0x2155 0x22DF # ⋟ -0x2156 0x300C # 「 -0x2157 0x300D # 」 -0x2158 0x300E # 『 -0x2159 0x300F # 』 -0x215A 0x3010 # 【 -0x215B 0x3011 # 】 -0x215C 0x2AC5 # ⫅ -0x215D 0x2AC6 # ⫆ -0x215E 0x22D0 # ⋐ -0x215F 0x22D1 # ⋑ -0x2160 0x2A95 # ⪕ -0x2161 0x2A96 # ⪖ -0x2162 0x2260 # ≠ -0x2163 0x2A85 # ⪅ -0x2164 0x2A86 # ⪆ -0x2165 0x2264 # ≤ -0x2166 0x2265 # ≥ -0x2167 0x221E # ∞ -0x2168 0x2234 # ∴ -0x2169 0x2642 # ♂ -0x216A 0x2640 # ♀ -0x216B 0x2034 # ‴ -0x216C 0x2032 # ′ -0x216D 0x2033 # ″ -0x216E 0x2103 # ℃ -0x216F 0x22AA # ⊪ -0x2170 0x2266 # ≦ -0x2171 0x2267 # ≧ -0x2172 0x2A7D # ⩽ -0x2173 0x2A7E # ⩾ -0x2174 0x22DA # ⋚ -0x2175 0x22DB # ⋛ -0x2176 0x2225 # ∥ -0x2177 0x229D # ⊝ -0x2178 0x229B # ⊛ -0x2179 0x2606 # ☆ -0x217A 0x2605 # ★ -0x217B 0x25CB # ○ -0x217C 0x25CF # ● -0x217D 0x25CE # ◎ -0x217E 0x25C7 # ◇ -0x21A1 0x227E # ≾ -0x21A2 0x227F # ≿ -0x21A3 0x2AB7 # ⪷ -0x21A4 0x2AB8 # ⪸ -0x21A5 0x2323 # ⌣ -0x21A6 0x2322 # ⌢ -0x21A7 0x007C # | -0x21A8 0x2251 # ≑ -0x21A9 0x2257 # ≗ -0x21AA 0x2256 # ≖ -0x21AB 0x225C # ≜ -0x21AC 0x22D4 # ⋔ -0x21AD 0x2210 # ∐ -0x21AE 0x2720 # ✠ -0x21AF 0x25C7 # ◇ -0x21B0 0x2241 # ≁ -0x21B1 0x22E8 # ⋨ -0x21B2 0x22E9 # ⋩ -0x21B3 0x2AB9 # ⪹ -0x21B4 0x2ABA # ⪺ -0x21B5 0x2224 # ∤ -0x21B6 0x2226 # ∦ -0x21B7 0x22AC # ⊬ -0x21B8 0x22AD # ⊭ -0x21B9 0x22AE # ⊮ -0x21BA 0x22AF # ⊯ -0x21BB 0x22EA # ⋪ -0x21BC 0x22EB # ⋫ -0x21BD 0x22EC # ⋬ -0x21BE 0x22ED # ⋭ -0x21BF 0x2244 # ≄ -0x21C0 0x2249 # ≉ -0x21C1 0x2ACB # ⫋ -0x21C2 0x2ACC # ⫌ -0x21C3 0x2288 # ⊈ -0x21C4 0x2289 # ⊉ -0x21C5 0x228A # ⊊ -0x21C6 0x228B # ⊋ -0x21C7 0x2ACB # ⫋ -0x21C8 0x2ACC # ⫌ -0x21C9 0x226E # ≮ -0x21CA 0x226F # ≯ -0x21CB 0x224C # ≌ -0x21CC 0x2247 # ≇ -0x21D0 0x2280 # ⊀ -0x21D1 0x2281 # ⊁ -0x21D2 0x22E0 # ⋠ -0x21D3 0x22E1 # ⋡ -0x21D4 0x2AB5 # ⪵ -0x21D5 0x2AB6 # ⪶ -0x21D6 0x22E0 # ⋠ -0x21D9 0x2274 # ≴ -0x21DA 0x2275 # ≵ -0x21E0 0x2270 # ≰ -0x21E1 0x2271 # ≱ -0x21E2 0x2A87 # ⪇ -0x21E3 0x2A88 # ⪈ -0x21E4 0x22E6 # ⋦ -0x21E5 0x22E7 # ⋧ -0x21E6 0x2270 # ≰ -0x21E7 0x2271 # ≱ -0x21EE 0x22E2 # ⋢ -0x21EF 0x22E3 # ⋣ -0x21F0 0x2270 # ≰ -0x21F1 0x2271 # ≱ -0x21F2 0x2268 # ≨ -0x21F3 0x2269 # ≩ -0x21F4 0x2268 # ≨ -0x21F5 0x2269 # ≩ - -# "42" JAPANESE-SYMBOLS2 -0x2221 0x25C6 # ◆ -0x2222 0x25A1 # □ -0x2223 0x25A0 # ■ -0x2224 0x25B3 # △ -0x2225 0x25B2 # ▲ -0x2226 0x25BD # ▽ -0x2227 0x25BC # ▼ -0x2228 0x203B # ※ -0x2229 0x3012 # 〒 -0x222A 0x2018 # ‘ -0x222B 0x2032 # ′ -0x222C 0x2033 # ″ -0x222E 0x3013 # 〓 -0x222F 0x229E # ⊞ -0x2230 0x229F # ⊟ -0x2231 0x22A0 # ⊠ -0x2232 0x22A1 # ⊡ -0x2234 0x226D # ≭ -0x2238 0x300A # 《 -0x2239 0x300B # 》 -0x223C 0x2042 # ⁂ -0x223D 0x2125 # ℥ -0x223E 0x2031 # ‱ -0x2240 0x21C7 # ⇇ -0x2241 0x21C9 # ⇉ -0x2242 0x21C8 # ⇈ -0x2243 0x21CA # ⇊ -0x2244 0x21DA # ⇚ -0x2245 0x21DB # ⇛ -0x2246 0x219E # ↞ -0x2247 0x21A0 # ↠ -0x2248 0x21BF # ↿ -0x2249 0x21C3 # ⇃ -0x224A 0x21BE # ↾ -0x224B 0x21C2 # ⇂ -0x224C 0x21A2 # ↢ -0x224D 0x21A3 # ↣ -0x224E 0x21AB # ↫ -0x224F 0x21AC # ↬ -0x2250 0x21B0 # ↰ -0x2251 0x21B1 # ↱ -0x2252 0x21AD # ↭ -0x2253 0x22B8 # ⊸ -0x2254 0x2254 # ≔ -0x2255 0x2255 # ≕ -0x2256 0x21BC # ↼ -0x2257 0x21BD # ↽ -0x2258 0x21C0 # ⇀ -0x2259 0x21C1 # ⇁ -0x225A 0x21AA # ↪ -0x225B 0x21A9 # ↩ -0x225C 0x27F5 # ⟵ -0x225D 0x27F6 # ⟶ -0x225E 0x27F8 # ⟸ -0x225F 0x27F9 # ⟹ -0x2260 0x21D1 # ⇑ -0x2261 0x21D3 # ⇓ -0x2262 0x2252 # ≒ -0x2263 0x2253 # ≓ -0x2264 0x224D # ≍ -0x2265 0x2AAF # ⪯ -0x2266 0x2AB0 # ⪰ -0x2267 0x27F7 # ⟷ -0x2268 0x27FA # ⟺ -0x2269 0x27FA # ⟺ -0x226A 0x222C # ∬ -0x226B 0x21A6 # ↦ -0x226C 0x22C8 # ⋈ -0x226D 0x2B51 # ⭑ -0x226E 0x266E # ♮ -0x226F 0x2323 # ⌣ -0x2270 0x25B5 # ▵ -0x2271 0x226A # ≪ -0x2272 0x226B # ≫ -0x2273 0x2295 # ⊕ -0x2274 0x2296 # ⊖ -0x2275 0x2297 # ⊗ -0x2276 0x2298 # ⊘ -0x2277 0x223C # ∼ -0x2278 0x2248 # ≈ -0x2279 0x221D # ∝ -0x227B 0x25BF # ▿ -0x227C 0x2127 # ℧ -0x227D 0x2240 # ≀ -0x227E 0x25EF # ◯ -0x22A1 0x0026 0x0332 # & -0x22A2 0x2261 # ≡ -0x22A3 0x2359 # ⍙ -0x22A4 0x2378 # ⍸ -0x22A5 0x2377 # ⍷ -0x22A6 0x2118 # ℘ -0x22A7 0x2205 # ∅ -0x22A8 0x211C # ℜ -0x22A9 0x2111 # ℑ -0x22AA 0x22A4 # ⊤ -0x22AB 0x228E # ⊎ -0x22AC 0x22A7 # ⊧ -0x22AD 0x2294 # ⊔ -0x22AE 0x2293 # ⊓ -0x22AF 0x228E # ⊎ -0x22B0 0x2291 # ⊑ -0x22B1 0x2292 # ⊒ -0x22B2 0x2227 # ∧ -0x22B3 0x2228 # ∨ -0x22B4 0x25B4 # ▴ -0x22B5 0x25BE # ▾ -0x22B6 0x2294 # ⊔ -0x22B7 0x2210 # ∐ -0x22B8 0x2222 # ∢ -0x22B9 0x220D # ∍ -0x22BA 0x22F7 # ⋷ -0x22BB 0x25B9 # ▹ -0x22BC 0x25C3 # ◃ -0x22BD 0x2299 # ⊙ -0x22BE 0x223D # ∽ -0x22C0 0x005E # ^ -0x22C1 0x0041 0x0332 # A -0x22C2 0x0042 0x0332 # B -0x22C3 0x0043 0x0332 # C -0x22C4 0x0044 0x0332 # D -0x22C5 0x0045 0x0332 # E -0x22C6 0x0046 0x0332 # F -0x22C7 0x0047 0x0332 # G -0x22C8 0x0048 0x0332 # H -0x22C9 0x0049 0x0332 # I -0x22CA 0x004A 0x0332 # J -0x22CB 0x004B 0x0332 # K -0x22CC 0x004C 0x0332 # L -0x22CD 0x004D 0x0332 # M -0x22CE 0x004E 0x0332 # N -0x22CF 0x004F 0x0332 # O -0x22D0 0x0050 0x0332 # P -0x22D1 0x0051 0x0332 # Q -0x22D2 0x0052 0x0332 # R -0x22D3 0x0053 0x0332 # S -0x22D4 0x0054 0x0332 # T -0x22D5 0x0055 0x0332 # U -0x22D6 0x0056 0x0332 # V -0x22D7 0x0057 0x0332 # W -0x22D8 0x0058 0x0332 # X -0x22D9 0x0059 0x0332 # Y -0x22DA 0x005A 0x0332 # Z -0x22DB 0x23A2 # ⎢ -0x22DC 0x23A5 # ⎥ -0x22DF 0x25AF # ▯ -0x22E7 0x211A # ℚ -0x22E8 0x210D # ℍ -0x22EA 0x2295 # ⊕ -0x22EB 0x2297 # ⊗ -0x22EC 0x2299 # ⊙ -0x22ED 0x20A4 # ₤ -0x22EE 0x21B2 # ↲ -0x22EF 0x21B3 # ↳ -0x22F0 0x2219 # ∙ -0x22F1 0x231C # ⌜ -0x22F2 0x231D # ⌝ -0x22F3 0x231E # ⌞ -0x22F4 0x231F # ⌟ -0x22F5 0x229A # ⊚ - -# "43" EXTENDED-LATIN -0x2322 0x00A8 # ¨ -0x2323 0x00B4 # ´ -0x2324 0x00AF # ¯ -0x2325 0x02D8 # ˘ -0x2326 0x02D9 # ˙ -0x2327 0x0027 # ' -0x2328 0x02DA # ˚ -0x2329 0x02DD # ˝ -0x232A 0x02DB # ˛ -0x232B 0x02C7 # ˇ -0x232C 0x00B8 # ¸ -0x2330 0x00B7 # · -0x2331 0x0340 # ̀ -0x2332 0x0341 # ́ -0x2333 0x0302 # ̂ -0x2334 0x0303 # ̃ -0x2335 0x0304 # ̄ -0x2336 0x0306 # ̆ -0x2337 0x0307 # ̇ -0x2338 0x0308 # ̈ -0x233A 0x030A # ̊ -0x233B 0x0327 # ̧ -0x233D 0x030B # ̋ -0x233E 0x0328 # ̨ -0x233F 0x030C # ̌ -0x2340 0x018E # Ǝ -0x2341 0x0181 # Ɓ -0x2342 0x018A # Ɗ -0x2343 0x0198 # Ƙ -0x2344 0x01A0 # Ơ -0x2345 0x01AF # Ư -0x2346 0x018F # Ə -0x2347 0x01A2 # Ƣ -0x2348 0x01B5 # Ƶ -0x234C 0x019F # Ɵ -0x234E 0x0190 # Ɛ -0x234F 0x0194 # Ɣ -0x2350 0x0196 # Ɩ -0x2351 0x0186 # Ɔ -0x2352 0x01A9 # Ʃ -0x2353 0x01B2 # Ʋ -0x2354 0x01B7 # Ʒ -0x2355 0x01B8 # Ƹ -0x2356 0x0187 # Ƈ -0x2357 0x0191 # Ƒ -0x2358 0x01A4 # Ƥ -0x2359 0x01AC # Ƭ -0x235A 0x01B3 # Ƴ -0x235D 0x019D # Ɲ -0x2360 0x0060 # ` -0x2361 0x0253 # ɓ -0x2362 0x0257 # ɗ -0x2363 0x0199 # ƙ -0x2364 0x01A1 # ơ -0x2365 0x01B0 # ư -0x2366 0x01DD # ǝ -0x2367 0x01A3 # ƣ -0x2368 0x01B6 # ƶ -0x2369 0x01BF # ƿ -0x236A 0x019A # ƚ -0x236C 0x0275 # ɵ -0x2375 0x01B9 # ƹ -0x2376 0x0188 # ƈ -0x2377 0x0192 # ƒ -0x2378 0x01A5 # ƥ -0x2379 0x01AD # ƭ -0x237A 0x01B4 # ƴ -0x237E 0x203E # ‾ -0x23A1 0x02BF # ʿ -0x23A2 0x2018 # ‘ -0x23A4 0x01C2 # ǂ -0x23A5 0x01C3 # ǃ -0x23A6 0x01C0 # ǀ -0x23A7 0x01C1 # ǁ -0x23A9 0x0180 # ƀ -0x23AA 0x0193 # Ɠ -0x23AB 0x0195 # ƕ -0x23AC 0x266D # ♭ -0x23AE 0x2117 # ℗ -0x23AF 0x2125 # ℥ -0x23B0 0x02BC # ʼ -0x23B1 0x02BB # ʻ -0x23B2 0x201A # ‚ -0x23B3 0x0361 # ͡ -0x23B8 0x20D7 # ⃗ -0x23B9 0x0338 # ̸ -0x23BA 0x0302 # ̂ -0x23BB 0x0303 # ̃ -0x23BC 0x266F # ♯ -0x23BD 0x02B9 # ʹ -0x23BE 0x02BA # ʺ -0x23BF 0x0311 # ̑ -0x23C0 0x0309 # ̉ -0x23C1 0x0337 # ̷ -0x23C2 0x20E1 # ⃡ -0x23C3 0x0305 # ̅ -0x23C5 0x0300 # ̀ -0x23C6 0x0301 # ́ -0x23C8 0x20D6 # ⃖ -0x23C9 0x0308 # ̈ -0x23CA 0x030D # ̍ -0x23CB 0x0315 # ̕ -0x23CC 0x0312 # ̒ -0x23CE 0x031B # ̛ -0x23CF 0x0335 # ̵ -0x23D0 0x030E # ̎ -0x23D1 0x0328 # ̨ -0x23D2 0x0327 # ̧ -0x23D3 0x0326 # ̦ -0x23D4 0x0325 # ̥ -0x23D5 0x032E # ̮ -0x23D6 0x0323 # ̣ -0x23D7 0x0324 # ̤ -0x23D8 0x0330 # ̰ -0x23D9 0x0333 # ̳ -0x23DA 0x0329 # ̩ -0x23DB 0x032D # ̭ -0x23DC 0x0331 # ̱ -0x23DD 0xFE20 # ︠ -0x23DE 0xFE21 # ︡ -0x23DF 0xFE23 # ︣ -0x23E0 0x20D1 # ⃑ -0x23E2 0x030F # ̏ -0x23F0 0x033F # ̿ -0x23F1 0x0310 # ̐ -0x23F4 0x0314 # ̔ -0x23F5 0x0316 # ̖ -0x23F6 0x0317 # ̗ -0x23F7 0x0318 # ̘ -0x23F8 0x0319 # ̙ -0x23F9 0x031A # ̚ -0x23FA 0x032F # ̯ -0x23FB 0x0336 # ̶ -0x23FC 0x0339 # ̹ -0x23FD 0x033A # ̺ -0x23FE 0x033B # ̻ - -# "46" GREEK -0x2622 0x037E # ; -0x2623 0x0343 # ̓ -0x2624 0x0384 # ΄ -0x2625 0x0313 # ̓ -0x2626 0x0314 # ̔ -0x2627 0x0345 # ͅ -0x2629 0x1FDE # ῞ -0x262A 0x1FDD # ῝ -0x262B 0x0385 # ΅ -0x262C 0x1FDF # ῟ -0x262D 0x1FC0 # ῀ -0x262E 0x1FFD # ´ -0x262F 0x1FEF # ` -0x2630 0x03F2 # ϲ -0x2631 0x0384 # ΄ -0x2632 0x037A # ͺ -0x2633 0x1FBD # ᾽ -0x2634 0x0374 # ʹ -0x2635 0x0375 # ͵ -0x2636 0x1FEE # ΅ -0x2637 0x1FED # ῭ -0x2639 0x1FCE # ῎ -0x263A 0x1FCD # ῍ -0x263B 0x0387 # · -0x263C 0x1FCF # ῏ -0x263D 0x1FC1 # ῁ -0x263E 0x1FBF # ᾿ -0x263F 0x1FFE # ῾ -0x2640 0x03DE # Ϟ -0x2641 0x0391 # Α -0x2642 0x0392 # Β -0x2644 0x0393 # Γ -0x2645 0x0394 # Δ -0x2646 0x0395 # Ε -0x2647 0x03DA # Ϛ -0x2648 0x03DC # Ϝ -0x2649 0x0396 # Ζ -0x264A 0x0397 # Η -0x264B 0x0398 # Θ -0x264C 0x0399 # Ι -0x264D 0x039A # Κ -0x264E 0x039B # Λ -0x264F 0x039C # Μ -0x2650 0x039D # Ν -0x2651 0x039E # Ξ -0x2652 0x039F # Ο -0x2653 0x03A0 # Π -0x2654 0x03D8 # Ϙ -0x2655 0x03A1 # Ρ -0x2656 0x03A3 # Σ -0x2658 0x03A4 # Τ -0x2659 0x03A5 # Υ -0x265A 0x03A6 # Φ -0x265B 0x03A7 # Χ -0x265C 0x03A8 # Ψ -0x265D 0x03A9 # Ω -0x265E 0x03E0 # Ϡ -0x2660 0x03DF # ϟ -0x2661 0x03B1 # α -0x2662 0x03B2 # β -0x2663 0x03D0 # ϐ -0x2664 0x03B3 # γ -0x2665 0x03B4 # δ -0x2666 0x03B5 # ε -0x2667 0x03DB # ϛ -0x2668 0x03DD # ϝ -0x2669 0x03B6 # ζ -0x266A 0x03B7 # η -0x266B 0x03B8 # θ -0x266C 0x03B9 # ι -0x266D 0x03BA # κ -0x266E 0x03BB # λ -0x266F 0x03BC # μ -0x2670 0x03BD # ν -0x2671 0x03BE # ξ -0x2672 0x03BF # ο -0x2673 0x03C0 # π -0x2674 0x03D9 # ϙ -0x2675 0x03C1 # ρ -0x2676 0x03C3 # σ -0x2677 0x03C2 # ς -0x2678 0x03C4 # τ -0x2679 0x03C5 # υ -0x267A 0x03C6 # φ -0x267B 0x03C7 # χ -0x267C 0x03C8 # ψ -0x267D 0x03C9 # ω -0x267E 0x03E1 # ϡ -0x26B0 0x03E9 # ϩ -0x26B1 0x03EB # ϫ -0x26B2 0x03ED # ϭ -0x26B3 0x03EF # ϯ -0x26C0 0x0344 # ̈́ -0x26C1 0x1FDE # ῞ -0x26C2 0x1FCE # ῎ -0x26C3 0x1FDF # ῟ -0x26C4 0x1FCF # ῏ -0x26C5 0x0301 # ́ -0x26C6 0x0300 # ̀ -0x26C7 0x0342 # ͂ -0x26C8 0x1FDE # ῞ -0x26C9 0x1FDD # ῝ -0x26CA 0x1FCE # ῎ -0x26CB 0x1FCD # ῍ -0x26CC 0x0308 # ̈ -0x26CD 0x0385 # ΅ -0x26CE 0x1FED # ῭ -0x26CF 0x1FC1 # ῁ -0x26D0 0x0386 # Ά -0x26D1 0x0388 # Έ -0x26D2 0x0389 # Ή -0x26D3 0x038A # Ί -0x26D4 0x038C # Ό -0x26D5 0x038E # Ύ -0x26D6 0x038F # Ώ -0x26D7 0x03AA # Ϊ -0x26D8 0x03AB # Ϋ -0x26D9 0x03AA 0x0301 # Ϊ -0x26DA 0x03AB 0x0301 # Ϋ -0x26DC 0x03E2 # Ϣ -0x26DD 0x03E4 # Ϥ -0x26DE 0x03E6 # Ϧ -0x26E0 0x03D3 # ϓ -0x26E1 0x03D4 # ϔ -0x26F0 0x03AC # ά -0x26F1 0x03AD # έ -0x26F2 0x03AE # ή -0x26F3 0x03AF # ί -0x26F4 0x03CC # ό -0x26F5 0x03CD # ύ -0x26F6 0x03CE # ώ -0x26F7 0x03CA # ϊ -0x26F8 0x03CB # ϋ -0x26F9 0x0390 # ΐ -0x26FA 0x03B0 # ΰ -0x26FB 0x03F3 # ϳ -0x26FC 0x03E3 # ϣ -0x26FD 0x03E5 # ϥ -0x26FE 0x03E7 # ϧ - -# "50" FORMS -0x2821 0x2500 # ─ -0x2822 0x2502 # │ -0x2823 0x250C # ┌ -0x2824 0x2510 # ┐ -0x2825 0x2518 # ┘ -0x2826 0x2514 # └ -0x2827 0x251C # ├ -0x2828 0x252C # ┬ -0x2829 0x2524 # ┤ -0x282A 0x2534 # ┴ -0x282B 0x253C # ┼ -0x282C 0x2501 # ━ -0x282D 0x2503 # ┃ -0x282E 0x250F # ┏ -0x282F 0x2513 # ┓ -0x2830 0x251B # ┛ -0x2831 0x2517 # ┗ -0x2832 0x2523 # ┣ -0x2833 0x2533 # ┳ -0x2834 0x252B # ┫ -0x2835 0x253B # ┻ -0x2836 0x254B # ╋ -0x2837 0x2520 # ┠ -0x2838 0x252F # ┯ -0x2839 0x2528 # ┨ -0x283A 0x2537 # ┷ -0x283B 0x253F # ┿ -0x283C 0x251D # ┝ -0x283D 0x2530 # ┰ -0x283E 0x2525 # ┥ -0x283F 0x2538 # ┸ -0x2840 0x2542 # ╂ -0x2841 0x254E # ╎ -0x2842 0x254F # ╏ -0x2843 0x2549 # ╉ -0x2844 0x2547 # ╇ -0x2845 0x2548 # ╈ -0x2846 0x254A # ╊ -0x2847 0x254C # ╌ -0x2849 0x250E # ┎ -0x284A 0x2512 # ┒ -0x284B 0x251A # ┚ -0x284C 0x2516 # ┖ -0x284D 0x250D # ┍ -0x284E 0x2511 # ┑ -0x284F 0x2519 # ┙ -0x2850 0x2561 # ╡ -0x2851 0x2562 # ╢ -0x2852 0x2556 # ╖ -0x2853 0x2555 # ╕ -0x2854 0x2563 # ╣ -0x2855 0x2551 # ║ -0x2856 0x2557 # ╗ -0x2857 0x255D # ╝ -0x2858 0x255C # ╜ -0x2859 0x255B # ╛ -0x285A 0x255E # ╞ -0x285B 0x255F # ╟ -0x285C 0x255A # ╚ -0x285D 0x2554 # ╔ -0x285E 0x2569 # ╩ -0x285F 0x2566 # ╦ -0x2860 0x2560 # ╠ -0x2861 0x2550 # ═ -0x2862 0x256C # ╬ -0x2863 0x2567 # ╧ -0x2864 0x2568 # ╨ -0x2865 0x2564 # ╤ -0x2866 0x2565 # ╥ -0x2867 0x2559 # ╙ -0x2868 0x2558 # ╘ -0x2869 0x2552 # ╒ -0x286A 0x2553 # ╓ -0x286B 0x256B # ╫ -0x286C 0x256A # ╪ -0x287B 0x2515 # ┕ -0x28CC 0x251E # ┞ -0x28CD 0x251F # ┟ -0x28CE 0x2521 # ┡ -0x28CF 0x2522 # ┢ -0x28D0 0x2504 # ┄ -0x28D1 0x2505 # ┅ -0x28D2 0x2506 # ┆ -0x28D3 0x2507 # ┇ -0x28D4 0x2508 # ┈ -0x28D5 0x2509 # ┉ -0x28D6 0x250A # ┊ -0x28D7 0x250B # ┋ -0x28D8 0x254D # ╍ -0x28D9 0x256D # ╭ -0x28DA 0x256E # ╮ -0x28DB 0x256F # ╯ -0x28DC 0x2570 # ╰ -0x28DD 0x2571 # ╱ -0x28DE 0x2572 # ╲ -0x28DF 0x2588 # █ - -# "356" SYMBOLS2 -0xEE21 0x2004 #   -0xEE22 0x2005 #   -0xEE23 0x200A #   -0xEE24 0x2008 #   -0xEE25 0x2027 # ‧ -0xEE26 0x230E # ⌎ -0xEE27 0x230F # ⌏ -0xEE28 0x230C # ⌌ -0xEE29 0x230D # ⌍ -0xEE2A 0x25AE # ▮ -0xEE2B 0x2214 # ∔ -0xEE2C 0x066C # ٬ -0xEE2D 0x2212 # − -0xEE2E 0x066B # ٫ -0xEE2F 0x210F # ℏ -0xEE30 0x226C # ≬ -0xEE31 0x2100 # ℀ -0xEE33 0x260F # ☏ -0xEE34 0x2236 # ∶ -0xEE35 0x0021 # ! -0xEE36 0x22A6 # ⊦ -0xEE37 0x232F # ⌯ -0xEE38 0x2330 # ⌰ -0xEE39 0x01B5 # Ƶ -0xEE3A 0x2302 # ⌂ -0xEE3B 0x2238 # ∸ -0xEE3C 0x2216 # ∖ -0xEE3D 0x2259 # ≙ -0xEE3E 0x225A # ≚ -0xEE3F 0x22C7 # ⋇ -0xEE40 0x2106 # ℆ -0xEE41 0x25D8 # ◘ -0xEE42 0x224E # ≎ -0xEE43 0x211B # ℛ -0xEE44 0x2112 # ℒ -0xEE45 0x2206 # ∆ -0xEE46 0x2311 # ⌑ -0xEE47 0x2038 # ‸ -0xEE48 0x2104 # ℄ -0xEE49 0x23E4 # ⏤ -0xEE4A 0x25B1 # ▱ -0xEE4B 0x232D # ⌭ -0xEE4C 0x2312 # ⌒ -0xEE4D 0x2313 # ⌓ -0xEE4E 0x232E # ⌮ -0xEE4F 0x2316 # ⌖ -0xEE50 0x21C4 # ⇄ -0xEE51 0x21D5 # ⇕ -0xEE52 0x228F # ⊏ -0xEE53 0x2290 # ⊐ -0xEE54 0x0192 # ƒ -0xEE55 0x25D9 # ◙ -0xEE56 0x22C2 # ⋂ -0xEE57 0x22C3 # ⋃ -0xEE5D 0x231B # ⌛ -0xEE60 0x2591 # ░ -0xEE61 0x2593 # ▓ -0xEE62 0x22D2 # ⋒ -0xEE63 0x22D3 # ⋓ -0xEE64 0x223A # ∺ -0xEE67 0x2218 # ∘ -0xEE68 0x2242 # ≂ -0xEE69 0x2201 # ∁ -0xEE6A 0x2310 # ⌐ -0xEE6B 0x2032 # ′ -0xEE6C 0x2276 # ≶ -0xEE6D 0x2277 # ≷ -0xEE6E 0x2272 # ≲ -0xEE6F 0x2273 # ≳ -0xEE70 0x22A4 # ⊤ -0xEE71 0x2204 # ∄ -0xEE72 0x2262 # ≢ -0xEE73 0x2308 # ⌈ -0xEE74 0x230A # ⌊ -0xEE75 0x007C # | -0xEE76 0x2309 # ⌉ -0xEE77 0x230B # ⌋ -0xEE78 0x224A # ≊ -0xEE79 0x224F # ≏ -0xEE7A 0x203C # ‼ -0xEE7B 0x2035 # ‵ -0xEE7C 0x2223 # ∣ -0xEE7D 0x2217 # ∗ -0xEE7E 0x223C # ∼ -0xEEA1 0x22BA # ⊺ -0xEEA2 0x2024 # ․ -0xEEA3 0x2025 # ‥ -0xEEA4 0x2B95 # ⮕ -0xEEA5 0x2B05 # ⬅ -0xEEA6 0x2B06 # ⬆ -0xEEA7 0x2B07 # ⬇ -0xEEA8 0x21E8 # ⇨ -0xEEA9 0x21E6 # ⇦ -0xEEAA 0x21E7 # ⇧ -0xEEAB 0x21E9 # ⇩ -0xEEAC 0x2190 # ← -0xEEAD 0x2191 # ↑ -0xEEAE 0x2192 # → -0xEEAF 0x2193 # ↓ -0xEEB0 0x25B6 # ▶ -0xEEB1 0x25C0 # ◀ -0xEEB2 0x25B7 # ▷ -0xEEB3 0x25C1 # ◁ -0xEEB4 0x22C5 # ⋅ -0xEEB5 0x2195 # ↕ -0xEEB6 0x21A8 # ↨ -0xEEB7 0x2372 # ⍲ -0xEEB8 0x2371 # ⍱ -0xEEB9 0x2588 # █ -0xEEBA 0x2584 # ▄ -0xEEBB 0x2590 # ▐ -0xEEBC 0x258C # ▌ -0xEEBD 0x2580 # ▀ -0xEEBE 0x25C4 # ◄ -0xEEBF 0x25BA # ► -0xEEC0 0x236B # ⍫ -0xEEC1 0x2352 # ⍒ -0xEEC2 0x234B # ⍋ -0xEEC3 0x233D # ⌽ -0xEEC4 0x2349 # ⍉ -0xEEC5 0x235F # ⍟ -0xEEC6 0x235E # ⍞ -0xEEC7 0x2339 # ⌹ -0xEEC8 0x233F # ⌿ -0xEEC9 0x2340 # ⍀ -0xEECA 0x2305 # ⌅ -0xEECB 0x2664 # ♤ -0xEECC 0x2665 # ♥ -0xEECD 0x2666 # ♦ -0xEECE 0x2667 # ♧ -0xEED0 0x234E # ⍎ -0xEED1 0x2355 # ⍕ -0xEED2 0x235D # ⍝ -0xEED3 0x2336 # ⌶ -0xEED4 0x233B # ⌻ -0xEED5 0x266B # ♫ -0xEED6 0x22C9 # ⋉ -0xEED7 0x22CA # ⋊ -0xEED8 0x22CB # ⋋ -0xEED9 0x22CC # ⋌ -0xEEDA 0x2306 # ⌆ -0xEEDB 0x22BB # ⊻ -0xEEDC 0x2337 # ⌷ -0xEEDD 0x221F # ∟ -0xEEDE 0x25AC # ▬ -0xEEDF 0x263B # ☻ -0xEEE0 0x23AB # ⎫ -0xEEE1 0x23AA # ⎪ -0xEEE2 0x23AC # ⎬ -0xEEE3 0x23AD # ⎭ -0xEEE4 0x23A7 # ⎧ -0xEEE5 0x23A9 # ⎩ -0xEEE6 0x23A8 # ⎨ -0xEEE7 0x23B0 # ⎰ -0xEEE8 0x23B1 # ⎱ -0xEEE9 0x22CF # ⋏ -0xEEEA 0x22CE # ⋎ -0xEEEB 0x22B4 # ⊴ -0xEEEC 0x22B5 # ⊵ -0xEEED 0x2320 # ⌠ -0xEEEE 0x2321 # ⌡ -0xEEEF 0x23AA # ⎪ -0xEEF0 0x2342 # ⍂ -0xEEF2 0x21B6 # ↶ -0xEEF3 0x21B7 # ↷ -0xEEF4 0x21BA # ↺ -0xEEF5 0x21BB # ↻ -0xEEF6 0x21CB # ⇋ -0xEEF7 0x219A # ↚ -0xEEF8 0x219B # ↛ -0xEEF9 0x21AE # ↮ -0xEEFA 0x21CD # ⇍ -0xEEFB 0x21CF # ⇏ -0xEEFC 0x21CE # ⇎ -0xEEFD 0x22CD # ⋍ -0xEEFE 0x2241 # ≁ - -# "357" SYMBOLS1 -0xEF21 0x00A0 #   -0xEF22 0x2011 # ‑ -0xEF23 0x00AD # ­ -0xEF24 0x2013 # – -0xEF25 0x2014 # — -0xEF26 0x2012 # ‒ -0xEF27 0x0027 # ' -0xEF28 0x201E # „ -0xEF29 0x201C # “ -0xEF2A 0x2039 # ‹ -0xEF2B 0x203A # › -0xEF2C 0x2000 #   -0xEF2D 0x2001 #   -0xEF2E 0x2007 #   -0xEF2F 0x2009 #   -0xEF30 0x2020 # † -0xEF31 0x2021 # ‡ -0xEF32 0x2329 # 〈 -0xEF33 0x232A # 〉 -0xEF34 0x261E # ☞ -0xEF35 0x261C # ☜ -0xEF36 0x22A2 # ⊢ -0xEF37 0x22A3 # ⊣ -0xEF38 0x22A8 # ⊨ -0xEF39 0x2AE4 # ⫤ -0xEF3A 0x3016 # 〖 -0xEF3B 0x3017 # 〗 -0xEF3C 0x2196 # ↖ -0xEF3D 0x2198 # ↘ -0xEF3E 0x2197 # ↗ -0xEF3F 0x2199 # ↙ -0xEF40 0x2105 # ℅ -0xEF41 0x2030 # ‰ -0xEF42 0x226A # ≪ -0xEF43 0x226B # ≫ -0xEF44 0x226E # ≮ -0xEF45 0x226F # ≯ -0xEF46 0x2223 # ∣ -0xEF47 0x2224 # ∤ -0xEF48 0x2225 # ∥ -0xEF49 0x2226 # ∦ -0xEF4A 0x2208 # ∈ -0xEF4B 0x2209 # ∉ -0xEF4C 0x220B # ∋ -0xEF4D 0x21D0 # ⇐ -0xEF4E 0x21D4 # ⇔ -0xEF4F 0x21D2 # ⇒ -0xEF50 0x21CC # ⇌ -0xEF51 0x21C6 # ⇆ -0xEF52 0x2194 # ↔ -0xEF53 0x219D # ↝ -0xEF56 0x2229 # ∩ -0xEF57 0x222A # ∪ -0xEF58 0x2287 # ⊇ -0xEF59 0x2286 # ⊆ -0xEF5A 0x2283 # ⊃ -0xEF5B 0x2282 # ⊂ -0xEF5C 0x2289 # ⊉ -0xEF5D 0x2288 # ⊈ -0xEF5E 0x2285 # ⊅ -0xEF5F 0x2284 # ⊄ -0xEF60 0x2612 # ☒ -0xEF61 0x2205 # ∅ -0xEF62 0x2295 # ⊕ -0xEF63 0x2296 # ⊖ -0xEF64 0x2297 # ⊗ -0xEF65 0x2298 # ⊘ -0xEF66 0x2022 # • -0xEF67 0x2218 # ∘ -0xEF68 0x210F # ℏ -0xEF69 0x2113 # ℓ -0xEF6A 0x00AC # ¬ -0xEF6B 0x00A6 # ¦ -0xEF6C 0x2220 # ∠ -0xEF6D 0x2221 # ∡ -0xEF6E 0x2237 # ∷ -0xEF6F 0x2235 # ∵ -0xEF70 0x22A5 # ⊥ -0xEF71 0x221D # ∝ -0xEF72 0x2261 # ≡ -0xEF73 0x2250 # ≐ -0xEF74 0x225F # ≟ -0xEF75 0x222B # ∫ -0xEF76 0x222E # ∮ -0xEF77 0x2243 # ≃ -0xEF78 0x2245 # ≅ -0xEF79 0x2248 # ≈ -0xEF7A 0x2211 # ∑ -0xEF7B 0x220F # ∏ -0xEF7C 0x221A # √ -0xEF7D 0x2213 # ∓ -0xEF7E 0x2592 # ▒ -0xEFA1 0x20A2 # ₢ -0xEFA2 0x0192 # ƒ -0xEFA3 0x20A3 # ₣ -0xEFA4 0x20A7 # ₧ -0xEFA5 0x20A0 # ₠ -0xEFA6 0x0024 # $ -0xEFA7 0x2135 # ℵ -0xEFA8 0x2116 # № -0xEFA9 0x211E # ℞ -0xEFAA 0x2121 # ℡ -0xEFAB 0x0292 # ʒ -0xEFAC 0x2102 # ℂ -0xEFAD 0x2115 # ℕ -0xEFAE 0x211D # ℝ -0xEFAF 0x2124 # ℤ -0xEFB0 0x2308 # ⌈ -0xEFB1 0x2309 # ⌉ -0xEFB2 0x230A # ⌊ -0xEFB3 0x230B # ⌋ -0xEFB4 0x2203 # ∃ -0xEFB5 0x2200 # ∀ -0xEFB6 0x22C0 # ⋀ -0xEFB7 0x22C1 # ⋁ -0xEFB8 0x220E # ∎ -0xEFB9 0x2207 # ∇ -0xEFBA 0x2202 # ∂ -0xEFBB 0x2440 # ⑀ -0xEFBC 0x2442 # ⑂ -0xEFBD 0x2441 # ⑁ -0xEFBE 0x23E6 # ⏦ -0xEFBF 0x2017 # ‗ -0xEFC0 0x2312 # ⌒ -0xEFC1 0x2160 # Ⅰ -0xEFC2 0x2161 # Ⅱ -0xEFC3 0x2162 # Ⅲ -0xEFC4 0x2163 # Ⅳ -0xEFC5 0x2164 # Ⅴ -0xEFC6 0x2165 # Ⅵ -0xEFC7 0x2166 # Ⅶ -0xEFC8 0x2167 # Ⅷ -0xEFC9 0x2168 # Ⅸ -0xEFCA 0x2169 # Ⅹ -0xEFCB 0x2660 # ♠ -0xEFCC 0x2661 # ♡ -0xEFCD 0x2662 # ♢ -0xEFCE 0x2663 # ♣ -0xEFCF 0x2713 # ✓ -0xEFD0 0x2717 # ✗ -0xEFD1 0x2460 # ① -0xEFD2 0x2461 # ② -0xEFD3 0x2462 # ③ -0xEFD4 0x2463 # ④ -0xEFD5 0x2464 # ⑤ -0xEFD6 0x2465 # ⑥ -0xEFD7 0x2466 # ⑦ -0xEFD8 0x2467 # ⑧ -0xEFD9 0x2468 # ⑨ -0xEFDA 0x2469 # ⑩ -0xEFDB 0x2192 0x20DD # → -0xEFDC 0x21B4 0x20DD # ↴ -0xEFDD 0x21B2 0x20DD # ↲ -0xEFDE 0x262E # ☮ -0xEFDF 0x263A # ☺ -0xEFE0 0x2620 # ☠ -0xEFE1 0x2503 # ┃ -0xEFE2 0x2501 # ━ -0xEFE3 0x254B # ╋ -0xEFE4 0x2502 # │ -0xEFE5 0x2500 # ─ -0xEFE6 0x253C # ┼ -0xEFE7 0x2609 # ☉ -0xEFE8 0x263D # ☽ -0xEFE9 0x263E # ☾ -0xEFEA 0x263F # ☿ -0xEFEB 0x2643 # ♃ -0xEFEC 0x2644 # ♄ -0xEFED 0x2645 # ♅ -0xEFEE 0x2646 # ♆ -0xEFEF 0x2647 # ♇ -0xEFF0 0x2652 # ♒ -0xEFF1 0x2653 # ♓ -0xEFF2 0x2648 # ♈ -0xEFF3 0x2649 # ♉ -0xEFF4 0x264A # ♊ -0xEFF5 0x264B # ♋ -0xEFF6 0x264C # ♌ -0xEFF7 0x264D # ♍ -0xEFF8 0x264E # ♎ -0xEFF9 0x264F # ♏ -0xEFFA 0x2650 # ♐ -0xEFFB 0x2651 # ♑ -0xEFFC 0x260E # ☎ -0xEFFD 0x2153 # ⅓ -0xEFFE 0x2154 # ⅔ - -# "361" ACCENTED-LATIN1 -0xF121 0x00C0 # À -0xF122 0x00C1 # Á -0xF123 0x00C2 #  -0xF124 0x00C3 # à -0xF125 0x0100 # Ā -0xF126 0x0102 # Ă -0xF127 0x00C4 # Ä -0xF128 0x00C5 # Å -0xF129 0x0104 # Ą -0xF12A 0x0106 # Ć -0xF12B 0x0108 # Ĉ -0xF12C 0x010A # Ċ -0xF12D 0x00C7 # Ç -0xF12E 0x010C # Č -0xF12F 0x010E # Ď -0xF130 0x00C8 # È -0xF131 0x00C9 # É -0xF132 0x00CA # Ê -0xF133 0x0112 # Ē -0xF134 0x0116 # Ė -0xF135 0x00CB # Ë -0xF136 0x0118 # Ę -0xF137 0x011A # Ě -0xF138 0x01F4 # Ǵ -0xF139 0x011C # Ĝ -0xF13A 0x011E # Ğ -0xF13B 0x0120 # Ġ -0xF13C 0x0122 # Ģ -0xF13D 0x0124 # Ĥ -0xF13E 0x00CC # Ì -0xF13F 0x01CD # Ǎ -0xF140 0x00CE # Î -0xF141 0x0128 # Ĩ -0xF142 0x012A # Ī -0xF143 0x0130 # İ -0xF144 0x00CF # Ï -0xF145 0x012E # Į -0xF146 0x0134 # Ĵ -0xF147 0x0136 # Ķ -0xF148 0x0139 # Ĺ -0xF149 0x013B # Ļ -0xF14A 0x013D # Ľ -0xF14B 0x0143 # Ń -0xF14C 0x00D1 # Ñ -0xF14D 0x0145 # Ņ -0xF14E 0x0147 # Ň -0xF14F 0x00D2 # Ò -0xF150 0x00D3 # Ó -0xF151 0x00D4 # Ô -0xF152 0x00D5 # Õ -0xF153 0x014C # Ō -0xF154 0x00D6 # Ö -0xF155 0x0150 # Ő -0xF156 0x0154 # Ŕ -0xF157 0x0156 # Ŗ -0xF158 0x0158 # Ř -0xF159 0x015A # Ś -0xF15A 0x015C # Ŝ -0xF15B 0x015E # Ş -0xF15C 0x0160 # Š -0xF15D 0x0162 # Ţ -0xF15E 0x0164 # Ť -0xF15F 0x00D9 # Ù -0xF160 0x00DA # Ú -0xF161 0x00DB # Û -0xF162 0x0168 # Ũ -0xF163 0x016A # Ū -0xF164 0x016C # Ŭ -0xF165 0x00DC # Ü -0xF166 0x016E # Ů -0xF167 0x0170 # Ű -0xF168 0x0172 # Ų -0xF169 0x0174 # Ŵ -0xF16A 0x1EF2 # Ỳ -0xF16B 0x00DD # Ý -0xF16C 0x0176 # Ŷ -0xF16D 0x0178 # Ÿ -0xF16E 0x0179 # Ź -0xF16F 0x017B # Ż -0xF170 0x017D # Ž -0xF171 0x004C 0x0315 # L -0xF172 0x0054 0x0315 # T -0xF173 0x0044 0x0315 # D -0xF174 0x1ECC # Ọ -0xF175 0x0232 # Ȳ -0xF176 0x01E2 # Ǣ -0xF177 0x0152 0x0304 # Œ -0xF178 0x0100 0x0306 # Ā -0xF179 0x01CD # Ǎ -0xF17A 0x0114 # Ĕ -0xF17B 0x0112 0x0323 # Ē -0xF17C 0x0112 0x0306 # Ē -0xF17D 0x01E6 # Ǧ -0xF17E 0x012C # Ĭ -0xF1A1 0x00E0 # à -0xF1A2 0x00E1 # á -0xF1A3 0x00E2 # â -0xF1A4 0x00E3 # ã -0xF1A5 0x0101 # ā -0xF1A6 0x0103 # ă -0xF1A7 0x00E4 # ä -0xF1A8 0x00E5 # å -0xF1A9 0x0105 # ą -0xF1AA 0x0107 # ć -0xF1AB 0x0109 # ĉ -0xF1AC 0x010B # ċ -0xF1AD 0x00E7 # ç -0xF1AE 0x010D # č -0xF1AF 0x010F # ď -0xF1B0 0x00E8 # è -0xF1B1 0x00E9 # é -0xF1B2 0x00EA # ê -0xF1B3 0x0113 # ē -0xF1B4 0x0117 # ė -0xF1B5 0x00EB # ë -0xF1B6 0x0119 # ę -0xF1B7 0x011B # ě -0xF1B8 0x01F5 # ǵ -0xF1B9 0x011D # ĝ -0xF1BA 0x011F # ğ -0xF1BB 0x0121 # ġ -0xF1BC 0x0123 # ģ -0xF1BD 0x0125 # ĥ -0xF1BE 0x00EC # ì -0xF1BF 0x00ED # í -0xF1C0 0x00EE # î -0xF1C1 0x0129 # ĩ -0xF1C2 0x012B # ī -0xF1C4 0x00EF # ï -0xF1C5 0x012F # į -0xF1C6 0x0135 # ĵ -0xF1C7 0x0137 # ķ -0xF1C8 0x013A # ĺ -0xF1C9 0x013C # ļ -0xF1CA 0x013E # ľ -0xF1CB 0x0144 # ń -0xF1CC 0x00F1 # ñ -0xF1CD 0x0146 # ņ -0xF1CE 0x0148 # ň -0xF1CF 0x00F2 # ò -0xF1D0 0x00F3 # ó -0xF1D1 0x00F4 # ô -0xF1D2 0x00F5 # õ -0xF1D3 0x014D # ō -0xF1D4 0x00F6 # ö -0xF1D5 0x0151 # ő -0xF1D6 0x0155 # ŕ -0xF1D7 0x0157 # ŗ -0xF1D8 0x0159 # ř -0xF1D9 0x015B # ś -0xF1DA 0x015D # ŝ -0xF1DB 0x015F # ş -0xF1DC 0x0161 # š -0xF1DD 0x0163 # ţ -0xF1DE 0x0165 # ť -0xF1DF 0x00F9 # ù -0xF1E0 0x00FA # ú -0xF1E1 0x00FB # û -0xF1E2 0x0169 # ũ -0xF1E3 0x016B # ū -0xF1E4 0x016D # ŭ -0xF1E5 0x00FC # ü -0xF1E6 0x016F # ů -0xF1E7 0x0171 # ű -0xF1E8 0x0173 # ų -0xF1E9 0x0175 # ŵ -0xF1EA 0x1EF3 # ỳ -0xF1EB 0x00FD # ý -0xF1EC 0x0177 # ŷ -0xF1ED 0x00FF # ÿ -0xF1EE 0x017A # ź -0xF1EF 0x017C # ż -0xF1F0 0x017E # ž -0xF1F1 0x006C 0x0315 # l -0xF1F2 0x0074 0x0315 # t -0xF1F3 0x0064 0x0315 # d -0xF1F4 0x1ECD # ọ -0xF1F5 0x0233 # ȳ -0xF1F6 0x01E3 # ǣ -0xF1F7 0x0153 0x0304 # œ -0xF1F8 0x0101 0x0306 # ā -0xF1F9 0x01CE # ǎ -0xF1FA 0x0115 # ĕ -0xF1FB 0x0113 0x0323 # ē -0xF1FC 0x0113 0x0306 # ē -0xF1FD 0x01E7 # ǧ -0xF1FE 0x012D # ĭ diff --git a/unicode/xerox/XCCS-0,41-50,340-344,356-361.TXT b/unicode/xerox/XCCS-0,41-50,340-344,356-361.TXT deleted file mode 100644 index 525bfc7f..00000000 --- a/unicode/xerox/XCCS-0,41-50,340-344,356-361.TXT +++ /dev/null @@ -1,1961 +0,0 @@ - - Name: XCCS (XC-3-1-1-0) to Unicode - Unicode version: 3.0 - XCCS charsets: 0 41-50 340-344 356-361 - Table version: 0.1 - Table format: Format A - Date: 3-Aug-2020 - Author: Ron Kaplan - -This file contains mappings from the Xerox Character Code Standard (version -XC1-3-3-0, 1987) into Unicode 3.0. standard codes. That is the version of -XCCS corresponding to the fonts in the Medley system. - -The format of this file conforms to the format of the other Unicode-supplied -mapping files: - Three white-space (tab or spaces) separated columns: - Column 1 is the XCCS code (as hex 0xXXXX) - Column 2 is the corresponding Unicode (as hex 0xXXXX) - Column 3 (after #) is a comment column. For convenience, it contains the - Unicode character itself (since the Unicode character names - are not available) -Unicode FFFF is used for undefined XCCS codes (Column 3 = UNDEFINED -Unicode FFFE is used for XCCS codes that have not yet been filled in. -(Column 3 = MISSING) - -This file is encoded in UTF8, so that the Unicode characters -are properly displayed in Column 3 and can be edited by standard -Unicode-enabled editors (e.g. Mac Textedit). - -This file can also be read by the function -READ-UNICODE-MAPPING in the UNICODE Medley library package. - -The entries are in XCCS order and grouped by character sets. In front of -the mappings, for convenience, there is a line with the octal XCCS -character set, after #. - -Note that a given XCCS code might map to codes in several different Unicode -positions, since there are repetitions in the Unicode standard. - -For more details, see the associated README.TXT file. - -Any comments or problems, contact - - -# "0" LATIN -0x0020 0x0020 # -0x0021 0x0021 # ! -0x0022 0x0022 # " -0x0023 0x0023 # # -0x0024 0x0024 # $ -0x0025 0x0025 # % -0x0026 0x0026 # & -0x0027 0x0027 # ' -0x0028 0x0028 # ( -0x0029 0x0029 # ) -0x002A 0x002A # * -0x002B 0x002B # + -0x002C 0x002C # , -0x002D 0x002D # - -0x002E 0x002E # . -0x002F 0x002F # / -0x0030 0x0030 # 0 -0x0031 0x0031 # 1 -0x0032 0x0032 # 2 -0x0033 0x0033 # 3 -0x0034 0x0034 # 4 -0x0035 0x0035 # 5 -0x0036 0x0036 # 6 -0x0037 0x0037 # 7 -0x0038 0x0038 # 8 -0x0039 0x0039 # 9 -0x003A 0x003A # : -0x003B 0x003B # ; -0x003C 0x003C # < -0x003D 0x003D # = -0x003E 0x003E # > -0x003F 0x003F # ? -0x0040 0x0040 # @ -0x0041 0x0041 # A -0x0042 0x0042 # B -0x0043 0x0043 # C -0x0044 0x0044 # D -0x0045 0x0045 # E -0x0046 0x0046 # F -0x0047 0x0047 # G -0x0048 0x0048 # H -0x0049 0x0049 # I -0x004A 0x004A # J -0x004B 0x004B # K -0x004C 0x004C # L -0x004D 0x004D # M -0x004E 0x004E # N -0x004F 0x004F # O -0x0050 0x0050 # P -0x0051 0x0051 # Q -0x0052 0x0052 # R -0x0053 0x0053 # S -0x0054 0x0054 # T -0x0055 0x0055 # U -0x0056 0x0056 # V -0x0057 0x0057 # W -0x0058 0x0058 # X -0x0059 0x0059 # Y -0x005A 0x005A # Z -0x005B 0x005B # [ -0x005C 0x005C # \ -0x005D 0x005D # ] -0x005E 0x005E # ^ -0x005F 0x005F # _ -0x0060 0x0060 # ` -0x0061 0x0061 # a -0x0062 0x0062 # b -0x0063 0x0063 # c -0x0064 0x0064 # d -0x0065 0x0065 # e -0x0066 0x0066 # f -0x0067 0x0067 # g -0x0068 0x0068 # h -0x0069 0x0069 # i -0x006A 0x006A # j -0x006B 0x006B # k -0x006C 0x006C # l -0x006D 0x006D # m -0x006E 0x006E # n -0x006F 0x006F # o -0x0070 0x0070 # p -0x0071 0x0071 # q -0x0072 0x0072 # r -0x0073 0x0073 # s -0x0074 0x0074 # t -0x0075 0x0075 # u -0x0076 0x0076 # v -0x0077 0x0077 # w -0x0078 0x0078 # x -0x0079 0x0079 # y -0x007A 0x007A # z -0x007B 0x007B # { -0x007C 0x007C # | -0x007D 0x007D # } -0x007E 0x007E # ~ -0x00A1 0x00A1 # ¡ -0x00A2 0x00A2 # ¢ -0x00A3 0x00A3 # £ -0x00A4 0x0024 # $ -0x00A5 0x00A5 # ¥ -0x00A7 0x00A7 # § -0x00A9 0x2018 # ‘ -0x00AA 0x201C # “ -0x00AB 0x00AB # « -0x00AC 0x2190 # ← -0x00AD 0x2191 # ↑ -0x00AE 0x2192 # → -0x00AF 0x2193 # ↓ -0x00B0 0x00B0 # ° -0x00B1 0x00B1 # ± -0x00B2 0x00B2 # ² -0x00B3 0x00B3 # ³ -0x00B4 0x00D7 # × -0x00B5 0x00B5 # µ -0x00B6 0x00B6 # ¶ -0x00B7 0x00B7 # · -0x00B8 0x00F7 # ÷ -0x00B9 0x2019 # ’ -0x00BA 0x201D # ” -0x00BB 0x00BB # » -0x00BC 0x00BC # ¼ -0x00BD 0x00BD # ½ -0x00BE 0x00BE # ¾ -0x00BF 0x00BF # ¿ -0x00C1 0x0300 # ̀ -0x00C2 0x0301 # ́ -0x00C3 0x0302 # ̂ -0x00C4 0x0303 # ̃ -0x00C5 0x0304 # ̄ -0x00C6 0x0306 # ̆ -0x00C7 0x0307 # ̇ -0x00C8 0x0308 # ̈ -0x00CA 0x030A # ̊ -0x00CB 0x0327 # ̧ -0x00CC 0x0332 # ̲ -0x00CD 0x030B # ̋ -0x00CE 0x0328 # ̨ -0x00CF 0x030C # ̌ -0x00D0 0x2015 # ― -0x00D1 0x00B9 # ¹ -0x00D2 0x00AE # ® -0x00D3 0x00A9 # © -0x00D4 0x2122 # ™ -0x00D5 0x266A # ♪ -0x00DC 0x215B # ⅛ -0x00DD 0x215C # ⅜ -0x00DE 0x215D # ⅝ -0x00DF 0x215E # ⅞ -0x00E0 0x2126 # Ω -0x00E1 0x00C6 # Æ -0x00E2 0x00D0 # Ð -0x00E3 0x00AA # ª -0x00E4 0x0126 # Ħ -0x00E5 0x0237 # ȷ -0x00E6 0x0132 # IJ -0x00E7 0x013F # Ŀ -0x00E8 0x0141 # Ł -0x00E9 0x00D8 # Ø -0x00EA 0x0152 # Œ -0x00EB 0x00BA # º -0x00EC 0x00DE # Þ -0x00ED 0x0166 # Ŧ -0x00EE 0x014A # Ŋ -0x00EF 0x0149 # ʼn -0x00F0 0x0138 # ĸ -0x00F1 0x00E6 # æ -0x00F2 0x0111 # đ -0x00F3 0x00F0 # ð -0x00F4 0x0127 # ħ -0x00F5 0x0131 # ı -0x00F6 0x0133 # ij -0x00F7 0x0140 # ŀ -0x00F8 0x0142 # ł -0x00F9 0x00F8 # ø -0x00FA 0x0153 # œ -0x00FB 0x00DF # ß -0x00FC 0x00FE # þ -0x00FD 0x0167 # ŧ -0x00FE 0x014B # ŋ - -# "41" SYMBOLS1 -0x2121 0x3000 # 　 -0x2122 0x3001 # 、 -0x2123 0x3002 # 。 -0x2124 0xFF0C # ， -0x2125 0xFF0E # ． -0x212B 0x309B # ゛ -0x212C 0x309C # ゜ -0x212D 0x00B4 # ´ -0x212F 0x00A8 # ¨ -0x2133 0x30FD # ヽ -0x2134 0x30FE # ヾ -0x2135 0x309D # ゝ -0x2136 0x309E # ゞ -0x2137 0x3003 # 〃 -0x2138 0x4EDD # 仝 -0x2139 0x3005 # 々 -0x213A 0x3006 # 〆 -0x213B 0x3007 # 〇 -0x213C 0x30FC # ー -0x213E 0x2010 # ‐ -0x2140 0x22D6 # ⋖ -0x2141 0x22D7 # ⋗ -0x2142 0x2016 # ‖ -0x2143 0x22A9 # ⊩ -0x2144 0x2026 # … -0x2145 0x2025 # ‥ -0x2146 0x22D8 # ⋘ -0x2147 0x22D9 # ⋙ -0x2148 0x3018 # 〘 -0x2149 0x3019 # 〙 -0x214A 0x301A # 〚 -0x214B 0x301B # 〛 -0x214C 0x3014 # 〔 -0x214D 0x3015 # 〕 -0x214E 0x22DA # ⋚ -0x214F 0x22DB # ⋛ -0x2150 0x227A # ≺ -0x2151 0x227B # ≻ -0x2152 0x227C # ≼ -0x2153 0x227D # ≽ -0x2154 0x22DE # ⋞ -0x2155 0x22DF # ⋟ -0x2156 0x300C # 「 -0x2157 0x300D # 」 -0x2158 0x300E # 『 -0x2159 0x300F # 』 -0x215A 0x3010 # 【 -0x215B 0x3011 # 】 -0x215C 0x2286 # ⊆ -0x215D 0x2287 # ⊇ -0x215E 0x22D0 # ⋐ -0x215F 0x22D1 # ⋑ -0x2160 0x22DC # ⋜ -0x2161 0x22DD # ⋝ -0x2162 0x2260 # ≠ -0x2163 0x2272 # ≲ -0x2164 0x2273 # ≳ -0x2165 0x2264 # ≤ -0x2166 0x2265 # ≥ -0x2167 0x221E # ∞ -0x2168 0x2234 # ∴ -0x2169 0x2642 # ♂ -0x216A 0x2640 # ♀ -0x216C 0x2032 # ′ -0x216D 0x2033 # ″ -0x216E 0x2103 # ℃ -0x216F 0x22AA # ⊪ -0x2170 0x2266 # ≦ -0x2171 0x2267 # ≧ -0x2172 0x2264 # ≤ -0x2173 0x2265 # ≥ -0x2174 0x22DA # ⋚ -0x2175 0x22DB # ⋛ -0x2176 0x2225 # ∥ -0x2177 0x229D # ⊝ -0x2178 0x229B # ⊛ -0x2179 0x2606 # ☆ -0x217A 0x2605 # ★ -0x217B 0x25CB # ○ -0x217C 0x25CF # ● -0x217D 0x25CE # ◎ -0x217E 0x25C7 # ◇ -0x21A1 0x227E # ≾ -0x21A2 0x227F # ≿ -0x21A3 0x227E # ≾ -0x21A4 0x227F # ≿ -0x21A5 0x2323 # ⌣ -0x21A6 0x2322 # ⌢ -0x21A7 0x007C # | -0x21A8 0x2251 # ≑ -0x21A9 0x2257 # ≗ -0x21AA 0x2256 # ≖ -0x21AB 0x225C # ≜ -0x21AC 0x22D4 # ⋔ -0x21AD 0x2210 # ∐ -0x21AE 0x2720 # ✠ -0x21B0 0x2241 # ≁ -0x21B1 0x22E8 # ⋨ -0x21B2 0x22E9 # ⋩ -0x21B3 0x22E8 # ⋨ -0x21B4 0x22E9 # ⋩ -0x21B5 0x2224 # ∤ -0x21B6 0x2226 # ∦ -0x21B7 0x22AC # ⊬ -0x21B8 0x22AD # ⊭ -0x21B9 0x22AE # ⊮ -0x21BA 0x22AF # ⊯ -0x21BB 0x22EA # ⋪ -0x21BC 0x22EB # ⋫ -0x21BD 0x22EC # ⋬ -0x21BE 0x22ED # ⋭ -0x21C0 0x2249 # ≉ -0x21C1 0x228A # ⊊ -0x21C2 0x228B # ⊋ -0x21C3 0x2288 # ⊈ -0x21C4 0x2289 # ⊉ -0x21C5 0x228A # ⊊ -0x21C6 0x228B # ⊋ -0x21C7 0x228A # ⊊ -0x21C8 0x228B # ⊋ -0x21D0 0x2280 # ⊀ -0x21D1 0x2281 # ⊁ -0x21D2 0x22E0 # ⋠ -0x21D3 0x22E1 # ⋡ -0x21D4 0x22E8 # ⋨ -0x21D5 0x22E9 # ⋩ -0x21E0 0x2270 # ≰ -0x21E1 0x2271 # ≱ -0x21E2 0x2268 # ≨ -0x21E3 0x2269 # ≩ -0x21E4 0x22E6 # ⋦ -0x21E5 0x22E7 # ⋧ -0x21F0 0x2270 # ≰ -0x21F1 0x2271 # ≱ -0x21F2 0x2268 # ≨ -0x21F3 0x2269 # ≩ -0x21F4 0x2268 # ≨ -0x21F5 0x2269 # ≩ -0x21F6 0x22E6 # ⋦ -0x21F7 0x22E7 # ⋧ - -# "42" SYMBOLS2 -0x2221 0x25C6 # ◆ -0x2222 0x25A1 # □ -0x2223 0x25A0 # ■ -0x2224 0x25B3 # △ -0x2225 0x25B2 # ▲ -0x2226 0x25BD # ▽ -0x2227 0x25BC # ▼ -0x2228 0x203B # ※ -0x2229 0x3012 # 〒 -0x222E 0x3013 # 〓 -0x222F 0x229E # ⊞ -0x2230 0x229F # ⊟ -0x2231 0x22A0 # ⊠ -0x2232 0x22A1 # ⊡ -0x2240 0x21C7 # ⇇ -0x2241 0x21C9 # ⇉ -0x2242 0x21C8 # ⇈ -0x2243 0x21CA # ⇊ -0x2244 0x21DA # ⇚ -0x2245 0x21DB # ⇛ -0x2246 0x219E # ↞ -0x2247 0x21A0 # ↠ -0x2248 0x21BF # ↿ -0x2249 0x21C3 # ⇃ -0x224A 0x21BE # ↾ -0x224B 0x21C2 # ⇂ -0x224C 0x21A2 # ↢ -0x224D 0x21A3 # ↣ -0x224E 0x21AB # ↫ -0x224F 0x21AC # ↬ -0x2250 0x21B0 # ↰ -0x2251 0x21B1 # ↱ -0x2252 0x21AD # ↭ -0x2253 0x22B8 # ⊸ -0x2262 0x2252 # ≒ -0x2263 0x2253 # ≓ -0x226A 0x222C # ∬ -0x227E 0x25EF # ◯ -0x22A2 0x2261 # ≡ -0x22A3 0x2359 # ⍙ -0x22A4 0x2378 # ⍸ -0x22A5 0x2377 # ⍷ - -# "43" EXTENDED-LATIN -0x2322 0x00A8 # ¨ -0x2327 0x0027 # ' -0x2328 0x02DA # ˚ -0x2329 0x02DD # ˝ -0x232A 0x02DB # ˛ -0x232B 0x02C7 # ˇ -0x232C 0x00B8 # ¸ -0x2330 0x00B7 # · -0x2331 0x0340 # ̀ -0x2332 0x0341 # ́ -0x2333 0x0302 # ̂ -0x2334 0x0303 # ̃ -0x2335 0x0304 # ̄ -0x2336 0x0306 # ̆ -0x2337 0x0307 # ̇ -0x2338 0x0308 # ̈ -0x233A 0x030A # ̊ -0x233B 0x0327 # ̧ -0x233D 0x030B # ̋ -0x233E 0x0328 # ̨ -0x2341 0x0181 # Ɓ -0x2342 0x018A # Ɗ -0x2343 0x0198 # Ƙ -0x2344 0x01A0 # Ơ -0x2345 0x01AF # Ư -0x2346 0x018F # Ə -0x2347 0x01A2 # Ƣ -0x2348 0x01B5 # Ƶ -0x2360 0x0060 # ` -0x2361 0x0253 # ɓ -0x2362 0x0257 # ɗ -0x2363 0x0199 # ƙ -0x2364 0x01A1 # ơ -0x2365 0x01B0 # ư -0x2366 0x01DD # ǝ -0x2367 0x01A3 # ƣ -0x2368 0x01B6 # ƶ -0x237E 0x203E # ‾ -0x23AC 0x266D # ♭ -0x23AE 0x2117 # ℗ -0x23B0 0x02BC # ʼ -0x23B1 0x02BB # ʻ -0x23B2 0x201A # ‚ -0x23BC 0x266F # ♯ -0x23BD 0x02B9 # ʹ -0x23BE 0x02BA # ʺ -0x23C0 0x0309 # ̉ -0x23C3 0x0305 # ̅ -0x23C5 0x0300 # ̀ -0x23C6 0x0301 # ́ -0x23C9 0x0308 # ̈ -0x23CB 0x0315 # ̕ -0x23CC 0x0312 # ̒ -0x23CE 0x031B # ̛ -0x23D1 0x0328 # ̨ -0x23D2 0x0327 # ̧ -0x23D4 0x0325 # ̥ -0x23D5 0x032E # ̮ -0x23D6 0x0323 # ̣ -0x23D7 0x0324 # ̤ -0x23D9 0x0333 # ̳ -0x23DA 0x0329 # ̩ -0x23DB 0x032D # ̭ -0x23DD 0xFE20 # ︠ -0x23DE 0xFE21 # ︡ -0x23DF 0xFE23 # ︣ - -# "44" HIRAGANA -0x2421 0x3041 # ぁ -0x2422 0x3042 # あ -0x2423 0x3043 # ぃ -0x2424 0x3044 # い -0x2425 0x3045 # ぅ -0x2426 0x3046 # う -0x2427 0x3047 # ぇ -0x2428 0x3048 # え -0x2429 0x3049 # ぉ -0x242A 0x304A # お -0x242B 0x304B # か -0x242C 0x304C # が -0x242D 0x304D # き -0x242E 0x304E # ぎ -0x242F 0x304F # く -0x2430 0x3050 # ぐ -0x2431 0x3051 # け -0x2432 0x3052 # げ -0x2433 0x3053 # こ -0x2434 0x3054 # ご -0x2435 0x3055 # さ -0x2436 0x3056 # ざ -0x2437 0x3057 # し -0x2438 0x3058 # じ -0x2439 0x3059 # す -0x243A 0x305A # ず -0x243B 0x305B # せ -0x243C 0x305C # ぜ -0x243D 0x305D # そ -0x243E 0x305E # ぞ -0x243F 0x305F # た -0x2440 0x3060 # だ -0x2441 0x3061 # ち -0x2442 0x3062 # ぢ -0x2443 0x3063 # っ -0x2444 0x3064 # つ -0x2445 0x3065 # づ -0x2446 0x3066 # て -0x2447 0x3067 # で -0x2448 0x3068 # と -0x2449 0x3069 # ど -0x244A 0x306A # な -0x244B 0x306B # に -0x244C 0x306C # ぬ -0x244D 0x306D # ね -0x244E 0x306E # の -0x244F 0x306F # は -0x2450 0x3070 # ば -0x2451 0x3071 # ぱ -0x2452 0x3072 # ひ -0x2453 0x3073 # び -0x2454 0x3074 # ぴ -0x2455 0x3075 # ふ -0x2456 0x3076 # ぶ -0x2457 0x3077 # ぷ -0x2458 0x3078 # へ -0x2459 0x3079 # べ -0x245A 0x307A # ぺ -0x245B 0x307B # ほ -0x245C 0x307C # ぼ -0x245D 0x307D # ぽ -0x245E 0x307E # ま -0x245F 0x307F # み -0x2460 0x3080 # む -0x2461 0x3081 # め -0x2462 0x3082 # も -0x2463 0x3083 # ゃ -0x2464 0x3084 # や -0x2465 0x3085 # ゅ -0x2466 0x3086 # ゆ -0x2467 0x3087 # ょ -0x2468 0x3088 # よ -0x2469 0x3089 # ら -0x246A 0x308A # り -0x246B 0x308B # る -0x246C 0x308C # れ -0x246D 0x308D # ろ -0x246E 0x308E # ゎ -0x246F 0x308F # わ -0x2470 0x3090 # ゐ -0x2471 0x3091 # ゑ -0x2472 0x3092 # を -0x2473 0x3093 # ん -0x24A1 0x3105 # ㄅ -0x24A2 0x3106 # ㄆ -0x24A3 0x3107 # ㄇ -0x24A4 0x3108 # ㄈ -0x24A5 0x3109 # ㄉ -0x24A6 0x310A # ㄊ -0x24A7 0x310B # ㄋ -0x24A8 0x310C # ㄌ -0x24A9 0x310D # ㄍ -0x24AA 0x310E # ㄎ -0x24AB 0x310F # ㄏ -0x24AC 0x3110 # ㄐ -0x24AD 0x3111 # ㄑ -0x24AE 0x3112 # ㄒ -0x24AF 0x3113 # ㄓ -0x24B0 0x3114 # ㄔ -0x24B1 0x3115 # ㄕ -0x24B2 0x3116 # ㄖ -0x24B3 0x3117 # ㄗ -0x24B4 0x3118 # ㄘ -0x24B5 0x3119 # ㄙ -0x24B6 0x311A # ㄚ -0x24B7 0x311B # ㄛ -0x24B8 0x311C # ㄜ -0x24B9 0x311D # ㄝ -0x24BA 0x311E # ㄞ -0x24BB 0x311F # ㄟ -0x24BC 0x3120 # ㄠ -0x24BD 0x3121 # ㄡ -0x24BE 0x3122 # ㄢ -0x24BF 0x3123 # ㄣ -0x24C0 0x3124 # ㄤ -0x24C1 0x3125 # ㄥ -0x24C2 0x3126 # ㄦ -0x24C3 0x3127 # ㄧ -0x24C4 0x3128 # ㄨ -0x24C5 0x3129 # ㄩ -0x24C6 0x02CA # ˊ -0x24C7 0x02C7 # ˇ -0x24C8 0x02CB # ˋ -0x24C9 0x02D9 # ˙ -0x24CA 0x02C9 # ˉ -0x24CB 0x312B # ㄫ -0x24CC 0x312A # ㄪ -0x24CD 0x312C # ㄬ - -# "45" KATAKANA -0x2521 0x30A1 # ァ -0x2522 0x30A2 # ア -0x2523 0x30A3 # ィ -0x2524 0x30A4 # イ -0x2525 0x30A5 # ゥ -0x2526 0x30A6 # ウ -0x2527 0x30A7 # ェ -0x2528 0x30A8 # エ -0x2529 0x30A9 # ォ -0x252A 0x30AA # オ -0x252B 0x30AB # カ -0x252C 0x30AC # ガ -0x252D 0x30AD # キ -0x252E 0x30AE # ギ -0x252F 0x30AF # ク -0x2530 0x30B0 # グ -0x2531 0x30B1 # ケ -0x2532 0x30B2 # ゲ -0x2533 0x30B3 # コ -0x2534 0x30B4 # ゴ -0x2535 0x30B5 # サ -0x2536 0x30B6 # ザ -0x2537 0x30B7 # シ -0x2538 0x30B8 # ジ -0x2539 0x30B9 # ス -0x253A 0x30BA # ズ -0x253B 0x30BB # セ -0x253C 0x30BC # ゼ -0x253D 0x30BD # ソ -0x253E 0x30BE # ゾ -0x253F 0x30BF # タ -0x2540 0x30C0 # ダ -0x2541 0x30C1 # チ -0x2542 0x30C2 # ヂ -0x2543 0x30C3 # ッ -0x2544 0x30C4 # ツ -0x2545 0x30C5 # ヅ -0x2546 0x30C6 # テ -0x2547 0x30C7 # デ -0x2548 0x30C8 # ト -0x2549 0x30C9 # ド -0x254A 0x30CA # ナ -0x254B 0x30CB # ニ -0x254C 0x30CC # ヌ -0x254D 0x30CD # ネ -0x254E 0x30CE # ノ -0x254F 0x30CF # ハ -0x2550 0x30D0 # バ -0x2551 0x30D1 # パ -0x2552 0x30D2 # ヒ -0x2553 0x30D3 # ビ -0x2554 0x30D4 # ピ -0x2555 0x30D5 # フ -0x2556 0x30D6 # ブ -0x2557 0x30D7 # プ -0x2558 0x30D8 # ヘ -0x2559 0x30D9 # ベ -0x255A 0x30DA # ペ -0x255B 0x30DB # ホ -0x255C 0x30DC # ボ -0x255D 0x30DD # ポ -0x255E 0x30DE # マ -0x255F 0x30DF # ミ -0x2560 0x30E0 # ム -0x2561 0x30E1 # メ -0x2562 0x30E2 # モ -0x2563 0x30E3 # ャ -0x2564 0x30E4 # ヤ -0x2565 0x30E5 # ュ -0x2566 0x30E6 # ユ -0x2567 0x30E7 # ョ -0x2568 0x30E8 # ヨ -0x2569 0x30E9 # ラ -0x256A 0x30EA # リ -0x256B 0x30EB # ル -0x256C 0x30EC # レ -0x256D 0x30ED # ロ -0x256E 0x30EE # ヮ -0x256F 0x30EF # ワ -0x2570 0x30F0 # ヰ -0x2571 0x30F1 # ヱ -0x2572 0x30F2 # ヲ -0x2573 0x30F3 # ン -0x2574 0x30F4 # ヴ -0x2575 0x30F5 # ヵ -0x2576 0x30F6 # ヶ -0x2577 0x30F7 # ヷ -0x2578 0x30F8 # ヸ -0x2579 0x30F9 # ヹ -0x257A 0x30FA # ヺ -0x257B 0x30FB # ・ - -# "46" GREEK -0x2624 0x0384 # ΄ -0x2625 0x0313 # ̓ -0x2626 0x0314 # ̔ -0x2627 0x0345 # ͅ -0x2634 0x0374 # ʹ -0x2635 0x0375 # ͵ -0x263B 0x0387 # · -0x2641 0x0391 # Α -0x2642 0x0392 # Β -0x2644 0x0393 # Γ -0x2645 0x0394 # Δ -0x2646 0x0395 # Ε -0x2647 0x03DA # Ϛ -0x2648 0x03DC # Ϝ -0x2649 0x0396 # Ζ -0x264A 0x0397 # Η -0x264B 0x0398 # Θ -0x264C 0x0399 # Ι -0x264D 0x039A # Κ -0x264E 0x039B # Λ -0x264F 0x039C # Μ -0x2650 0x039D # Ν -0x2651 0x039E # Ξ -0x2652 0x039F # Ο -0x2653 0x03A0 # Π -0x2654 0x03DE # Ϟ -0x2655 0x03A1 # Ρ -0x2656 0x03A3 # Σ -0x2658 0x03A4 # Τ -0x2659 0x03A5 # Υ -0x265A 0x03A6 # Φ -0x265B 0x03A7 # Χ -0x265C 0x03A8 # Ψ -0x265D 0x03A9 # Ω -0x265E 0x03E0 # Ϡ -0x2661 0x03B1 # α -0x2662 0x03B2 # β -0x2663 0x03D0 # ϐ -0x2664 0x03B3 # γ -0x2665 0x03B4 # δ -0x2666 0x03B5 # ε -0x2669 0x03B6 # ζ -0x266A 0x03B7 # η -0x266B 0x03B8 # θ -0x266C 0x03B9 # ι -0x266D 0x03BA # κ -0x266E 0x03BB # λ -0x266F 0x03BC # μ -0x2670 0x03BD # ν -0x2671 0x03BE # ξ -0x2672 0x03BF # ο -0x2673 0x03C0 # π -0x2675 0x03C1 # ρ -0x2676 0x03C3 # σ -0x2677 0x03C2 # ς -0x2678 0x03C4 # τ -0x2679 0x03C5 # υ -0x267A 0x03C6 # φ -0x267B 0x03C7 # χ -0x267C 0x03C8 # ψ -0x267D 0x03C9 # ω -0x267E 0x03E1 # ϡ -0x26C0 0x0344 # ̈́ -0x26C3 0x1FDF # ῟ -0x26C4 0x1FCF # ῏ -0x26C5 0x0301 # ́ -0x26C6 0x0300 # ̀ -0x26C7 0x0342 # ͂ -0x26C8 0x1FDE # ῞ -0x26C9 0x1FDD # ῝ -0x26CA 0x1FCE # ῎ -0x26CB 0x1FCD # ῍ -0x26CC 0x0308 # ̈ -0x26CD 0x0385 # ΅ -0x26CE 0x1FED # ῭ -0x26CF 0x1FC1 # ῁ -0x26D0 0x0386 # Ά -0x26D1 0x0388 # Έ -0x26D2 0x0389 # Ή -0x26D3 0x038A # Ί -0x26D4 0x038C # Ό -0x26D5 0x038E # Ύ -0x26D6 0x038F # Ώ -0x26D7 0x03AA # Ϊ -0x26D8 0x03AB # Ϋ -0x26DC 0x03E2 # Ϣ -0x26DD 0x03E4 # Ϥ -0x26DE 0x03E6 # Ϧ -0x26E0 0x03D3 # ϓ -0x26E1 0x03D4 # ϔ -0x26F0 0x03AC # ά -0x26F1 0x03AD # έ -0x26F2 0x03AE # ή -0x26F3 0x03AF # ί -0x26F4 0x03CC # ό -0x26F5 0x03CD # ύ -0x26F6 0x03CE # ώ -0x26F7 0x03CA # ϊ -0x26F8 0x03CB # ϋ -0x26F9 0x0390 # ΐ -0x26FA 0x03B0 # ΰ -0x26FB 0x03F3 # ϳ -0x26FC 0x03E3 # ϣ -0x26FD 0x03E5 # ϥ - -# "47" CYRILLIC -0x2721 0x0410 # А -0x2722 0x0411 # Б -0x2723 0x0412 # В -0x2724 0x0413 # Г -0x2725 0x0414 # Д -0x2726 0x0415 # Е -0x2727 0x0401 # Ё -0x2728 0x0416 # Ж -0x2729 0x0417 # З -0x272A 0x0418 # И -0x272B 0x0419 # Й -0x272C 0x041A # К -0x272D 0x041B # Л -0x272E 0x041C # М -0x272F 0x041D # Н -0x2730 0x041E # О -0x2731 0x041F # П -0x2732 0x0420 # Р -0x2733 0x0421 # С -0x2734 0x0422 # Т -0x2735 0x0423 # У -0x2736 0x0424 # Ф -0x2737 0x0425 # Х -0x2738 0x0426 # Ц -0x2739 0x0427 # Ч -0x273A 0x0428 # Ш -0x273B 0x0429 # Щ -0x273C 0x042A # Ъ -0x273D 0x042B # Ы -0x273E 0x042C # Ь -0x273F 0x042D # Э -0x2740 0x042E # Ю -0x2741 0x042F # Я -0x2742 0x0490 # Ґ -0x2743 0x0402 # Ђ -0x2744 0x0403 # Ѓ -0x2745 0x0404 # Є -0x2746 0x0405 # Ѕ -0x2747 0x0406 # І -0x2748 0x0407 # Ї -0x2749 0x0408 # Ј -0x274A 0x0409 # Љ -0x274B 0x040A # Њ -0x274C 0x040B # Ћ -0x274D 0x040C # Ќ -0x274E 0x040E # Ў -0x2751 0x0430 # а -0x2752 0x0431 # б -0x2753 0x0432 # в -0x2754 0x0433 # г -0x2755 0x0434 # д -0x2756 0x0435 # е -0x2757 0x0451 # ё -0x2758 0x0436 # ж -0x2759 0x0437 # з -0x275A 0x0438 # и -0x275B 0x0439 # й -0x275C 0x043A # к -0x275D 0x043B # л -0x275E 0x043C # м -0x275F 0x043D # н -0x2760 0x043E # о -0x2761 0x043F # п -0x2762 0x0440 # р -0x2763 0x0441 # с -0x2764 0x0442 # т -0x2765 0x0443 # у -0x2766 0x0444 # ф -0x2767 0x0445 # х -0x2768 0x0446 # ц -0x2769 0x0447 # ч -0x276A 0x0448 # ш -0x276B 0x0449 # щ -0x276C 0x044A # ъ -0x276D 0x044B # ы -0x276E 0x044C # ь -0x276F 0x044D # э -0x2770 0x044E # ю -0x2771 0x044F # я -0x2772 0x0491 # ґ -0x2773 0x0452 # ђ -0x2774 0x0453 # ѓ -0x2775 0x0454 # є -0x2776 0x0455 # ѕ -0x2777 0x0456 # і -0x2778 0x0457 # ї -0x2779 0x0458 # ј -0x277A 0x0459 # љ -0x277B 0x045A # њ -0x277C 0x045B # ћ -0x277D 0x045C # ќ -0x277E 0x045E # ў -0x27A1 0x040F # Џ -0x27A2 0x0462 # Ѣ -0x27A3 0x0472 # Ѳ -0x27A4 0x0474 # Ѵ -0x27A5 0x046A # Ѫ -0x27D1 0x045F # џ -0x27D2 0x0463 # ѣ -0x27D3 0x0473 # ѳ -0x27D4 0x0475 # ѵ -0x27D5 0x046B # ѫ - -# "50" FORMS -0x2821 0xFFFF # UNDEFINED -0x2822 0xFFFF # UNDEFINED -0x2823 0x250C # ┌ -0x2824 0x250C # ┌ -0x2825 0x2518 # ┘ -0x2826 0x2514 # └ -0x2827 0x251C # ├ -0x2828 0x252C # ┬ -0x2829 0x2524 # ┤ -0x282A 0x2534 # ┴ -0x282B 0xFFFF # UNDEFINED -0x282C 0xFFFF # UNDEFINED -0x282D 0xFFFF # UNDEFINED -0x282E 0x250F # ┏ -0x282F 0x2513 # ┓ -0x2830 0x251B # ┛ -0x2831 0x2517 # ┗ -0x2832 0x2523 # ┣ -0x2833 0x2533 # ┳ -0x2834 0x252B # ┫ -0x2835 0x253B # ┻ -0x2836 0xFFFF # UNDEFINED -0x2837 0x2520 # ┠ -0x2838 0x252F # ┯ -0x2839 0x2528 # ┨ -0x283A 0x2537 # ┷ -0x283B 0x253F # ┿ -0x283C 0x251D # ┝ -0x283D 0x2530 # ┰ -0x283E 0x2525 # ┥ -0x283F 0x2538 # ┸ -0x2840 0x2542 # ╂ -0x2841 0x254E # ╎ -0x2842 0x254F # ╏ -0x2843 0xFFFF # UNDEFINED -0x2850 0x2561 # ╡ -0x2851 0x2562 # ╢ -0x2852 0x2556 # ╖ -0x2853 0x2555 # ╕ -0x2854 0x2563 # ╣ -0x2855 0x2551 # ║ -0x2856 0x2557 # ╗ -0x2857 0x255D # ╝ -0x2858 0x255C # ╜ -0x2859 0x255B # ╛ -0x285A 0x255E # ╞ -0x285B 0x255F # ╟ -0x285C 0x255A # ╚ -0x285D 0x2554 # ╔ -0x285E 0x2569 # ╩ -0x285F 0x2566 # ╦ -0x2860 0x2560 # ╠ -0x2861 0x2550 # ═ -0x2862 0x256C # ╬ -0x2863 0x2567 # ╧ -0x2864 0x2568 # ╨ -0x2865 0x2564 # ╤ -0x2866 0x2565 # ╥ -0x2867 0x2559 # ╙ -0x2868 0x2558 # ╘ -0x2869 0x2552 # ╒ -0x286A 0x2553 # ╓ -0x286B 0x256B # ╫ -0x286C 0x256A # ╪ - -# "340" ARABIC -0xE025 0x066A # ٪ -0xE02C 0x060C # ، -0xE02E 0x06D4 # ۔ -0xE030 0x0660 # ٠ -0xE031 0x0661 # ١ -0xE032 0x0662 # ٢ -0xE033 0x0663 # ٣ -0xE034 0x0664 # ٤ -0xE035 0x0665 # ٥ -0xE036 0x0666 # ٦ -0xE037 0x0667 # ٧ -0xE038 0x0668 # ٨ -0xE039 0x0669 # ٩ -0xE03B 0x061B # ؛ -0xE03F 0x061F # ؟ -0xE041 0x0621 # ء -0xE042 0x0622 # آ -0xE043 0x0623 # أ -0xE044 0x0624 # ؤ -0xE045 0x0625 # إ -0xE046 0x0626 # ئ -0xE047 0x0627 # ا -0xE048 0x0628 # ب -0xE049 0x0629 # ة -0xE04A 0x062A # ت -0xE04B 0x062B # ث -0xE04C 0x062C # ج -0xE04D 0x062D # ح -0xE04E 0x062E # خ -0xE04F 0x062F # د -0xE050 0x0630 # ذ -0xE051 0x0631 # ر -0xE052 0x0632 # ز -0xE053 0x0633 # س -0xE054 0x0634 # ش -0xE055 0x0635 # ص -0xE056 0x0636 # ض -0xE057 0x0637 # ط -0xE058 0x0638 # ظ -0xE059 0x0639 # ع -0xE05A 0x063A # غ -0xE060 0x0640 # ـ -0xE061 0x0641 # ف -0xE062 0x0642 # ق -0xE063 0x0643 # ك -0xE064 0x0644 # ل -0xE065 0x0645 # م -0xE066 0x0646 # ن -0xE067 0x0647 # ه -0xE068 0x0648 # و -0xE069 0x0649 # ى -0xE06A 0x064A # ي -0xE06B 0x064B # ً -0xE06C 0x064C # ٌ -0xE06D 0x064D # ٍ -0xE06E 0x064E # َ -0xE06F 0x064F # ُ -0xE070 0x0650 # ِ -0xE071 0x0651 # ّ -0xE072 0x0652 # ْ -0xE073 0x0670 # ٰ -0xE074 0x0671 # ٱ -0xE075 0x066B # ٫ -0xE076 0x066C # ٬ -0xE077 0x0657 # ٗ -0xE0A1 0x06A4 # ڤ -0xE0A2 0x067E # پ -0xE0A3 0x0686 # چ -0xE0A4 0x0698 # ژ -0xE0A5 0x06AF # گ -0xE0A6 0x06C0 # ۀ -0xE0A7 0x0679 # ٹ -0xE0A8 0x0688 # ڈ -0xE0A9 0x0691 # ڑ -0xE0AA 0x06BA # ں -0xE0AB 0x06BE # ھ -0xE0AC 0x06C1 # ہ -0xE0AD 0x06C3 # ۃ -0xE0AE 0x06C2 # ۂ -0xE0AF 0x06D2 # ے -0xE0B1 0x067C # ټ -0xE0B2 0x0681 # ځ -0xE0B3 0x0685 # څ -0xE0B4 0x0689 # ډ -0xE0B5 0x0693 # ړ -0xE0B6 0x0696 # ږ -0xE0B7 0x069A # ښ -0xE0B8 0x06BC # ڼ -0xE0B9 0x06D0 # ې -0xE0BA 0x06CD # ۍ -0xE0BB 0x0672 # ٲ -0xE0BC 0x0673 # ٳ -0xE0BD 0x06D3 # ۓ -0xE0BE 0x06D5 # ە -0xE0BF 0xFBD3 # ﯓ -0xE0C0 0x06C7 # ۇ -0xE0C1 0x06C6 # ۆ -0xE0C2 0x06C8 # ۈ -0xE0C3 0xFBDD # ﯝ -0xE0C4 0x06CB # ۋ -0xE0C5 0x06C5 # ۅ -0xE0C6 0x06C9 # ۉ -0xE0C7 0x0674 # ٴ -0xE0C8 0x0675 # ٵ -0xE0C9 0x0676 # ٶ -0xE0CA 0x0682 # ڂ -0xE0CB 0x0677 # ٷ -0xE0CC 0x0678 # ٸ -0xE0CD 0x067D # ٽ -0xE0CE 0x068A # ڊ -0xE0CF 0x068B # ڋ -0xE0D0 0x06AB # ګ -0xE0D1 0x068F # ڏ -0xE0D2 0x0690 # ڐ -0xE0D3 0x06CC # ی -0xE0D4 0x067B # ٻ -0xE0D5 0x0680 # ڀ -0xE0D6 0x067A # ٺ -0xE0D7 0x067F # ٿ -0xE0D8 0x06A6 # ڦ -0xE0D9 0x0684 # ڄ -0xE0DA 0x0683 # ڃ -0xE0DB 0x0687 # ڇ -0xE0DC 0x068D # ڍ -0xE0DD 0x068C # ڌ -0xE0DE 0x068E # ڎ -0xE0DF 0x06A9 # ک -0xE0E0 0x06B3 # ڳ -0xE0E1 0x06B1 # ڱ -0xE0E2 0x06BB # ڻ -0xE0E3 0x0692 # ڒ -0xE0E4 0x0694 # ڔ -0xE0E5 0x0695 # ڕ -0xE0E6 0x0697 # ڗ -0xE0E7 0x0699 # ڙ -0xE0E8 0x069B # ڛ -0xE0E9 0x069C # ڜ -0xE0EA 0x069D # ڝ -0xE0EB 0x069E # ڞ -0xE0EC 0x069F # ڟ -0xE0ED 0x06A0 # ڠ -0xE0EE 0x06A1 # ڡ -0xE0EF 0x06A2 # ڢ -0xE0F0 0x06A3 # ڣ -0xE0F1 0x06A5 # ڥ -0xE0F2 0x06A7 # ڧ -0xE0F3 0x06A8 # ڨ -0xE0F4 0x06AA # ڪ -0xE0F5 0x06AC # ڬ -0xE0F6 0x06AD # ڭ -0xE0F8 0x06AE # ڮ -0xE0F9 0x06B0 # ڰ -0xE0FA 0x06B2 # ڲ -0xE0FB 0x06B4 # ڴ -0xE0FC 0x200E # ‎ -0xE0FD 0x200F # ‏ -0xE0FE 0x200D # ‍ - -# "341" HEBREW -0xE140 0x05D0 # א -0xE141 0x05D1 # ב -0xE142 0x05D2 # ג -0xE143 0x05D3 # ד -0xE144 0x05D4 # ה -0xE145 0x05D5 # ו -0xE146 0x05D6 # ז -0xE147 0x05D7 # ח -0xE148 0x05D8 # ט -0xE149 0x05D9 # י -0xE14A 0x05DA # ך -0xE14B 0x05DB # כ -0xE14C 0x05DC # ל -0xE14D 0x05DD # ם -0xE14E 0x05DE # מ -0xE14F 0x05DF # ן -0xE150 0x05E0 # נ -0xE151 0x05E1 # ס -0xE152 0x05E2 # ע -0xE153 0x05E3 # ף -0xE154 0x05E4 # פ -0xE155 0x05E5 # ץ -0xE156 0x05E6 # צ -0xE157 0x05E7 # ק -0xE158 0x05E8 # ר -0xE159 0x05E9 # ש -0xE15A 0x05EA # ת -0xE15B 0xFB31 # בּ -0xE15C 0xFB3B # כּ -0xE15D 0xFB44 # פּ -0xE15E 0xFB2A # שׁ -0xE15F 0xFB2B # שׂ -0xE160 0xFB2C # שּׁ -0xE161 0xFB2D # שּׂ -0xE162 0xFB2E # אַ -0xE163 0xFB2F # אָ -0xE164 0xFB4B # וֹ -0xE165 0xFB4C # בֿ -0xE166 0xFB4D # כֿ -0xE167 0xFB4E # פֿ -0xE168 0xFB4F # ﭏ -0xE169 0xFB1F # ײַ -0xE16A 0xFB20 # ﬠ -0xE16B 0xFB21 # ﬡ -0xE16C 0xFB22 # ﬢ -0xE16D 0xFB23 # ﬣ -0xE16E 0xFB24 # ﬤ -0xE16F 0xFB25 # ﬥ -0xE170 0xFB26 # ﬦ -0xE171 0xFB27 # ﬧ -0xE172 0xFB28 # ﬨ -0xE173 0xFB29 # ﬩ -0xE174 0x05F0 # װ -0xE175 0x05F1 # ױ -0xE176 0x05F2 # ײ -0xE177 0xFB30 # אּ -0xE178 0xFB32 # גּ -0xE179 0xFB33 # דּ -0xE17A 0xFB34 # הּ -0xE17B 0xFB35 # וּ -0xE17C 0xFB36 # זּ -0xE17D 0xFB38 # טּ -0xE17E 0xFB39 # יּ -0xE1A1 0xFB3A # ךּ -0xE1A2 0xFB3C # לּ -0xE1A3 0xFB3E # מּ -0xE1A4 0xFB40 # נּ -0xE1A5 0xFB41 # סּ -0xE1A6 0xFB43 # ףּ -0xE1A7 0xFB46 # צּ -0xE1A8 0xFB47 # קּ -0xE1A9 0xFB48 # רּ -0xE1AA 0xFB49 # שּ -0xE1AB 0xFB4A # תּ -0xE1C1 0x05B4 # ִ -0xE1C2 0x05B5 # ֵ -0xE1C3 0x05B6 # ֶ -0xE1C4 0x05BB # ֻ -0xE1C5 0x05B8 # ָ -0xE1C6 0x05B7 # ַ -0xE1C7 0x05B0 # ְ -0xE1C8 0x05B2 # ֲ -0xE1C9 0x05B1 # ֱ -0xE1CA 0x05B3 # ֳ -0xE1CB 0x05C2 # ׂ -0xE1CC 0x05C1 # ׁ -0xE1CE 0x05B9 # ֹ -0xE1CF 0x05BC # ּ -0xE1EF 0x05BD # ֽ -0xE1F0 0xFB1E # ﬞ -0xE1F1 0x05BF # ֿ -0xE1F2 0x05C0 # ׀ - -# "342" IPA -0xE2DB 0x029D # ʝ -0xE2DC 0x028E # ʎ -0xE2DD 0x014B # ŋ -0xE2DE 0x006B # k -0xE2DF 0x0261 # ɡ -0xE2E0 0x0078 # x -0xE2E1 0x0263 # ɣ -0xE2E2 0x0270 # ɰ -0xE2E3 0x0260 # ɠ -0xE2E4 0x0274 # ɴ -0xE2E5 0x019E # ƞ -0xE2E6 0x0071 # q -0xE2E7 0x0262 # ɢ -0xE2E8 0x03C7 # χ -0xE2E9 0x0281 # ʁ -0xE2EA 0x0280 # ʀ -0xE2EB 0x0127 # ħ -0xE2EC 0x0295 # ʕ -0xE2ED 0x0294 # ʔ -0xE2EE 0x0068 # h -0xE2EF 0x0266 # ɦ - -# "343" HANGUL -0xE3A2 0xFFE6 # ￦ -0xE3C1 0xFFA1 # ﾡ -0xE3C2 0xFFA2 # ﾢ -0xE3C3 0xFFA3 # ﾣ -0xE3C4 0xFFA4 # ﾤ -0xE3C5 0xFFA5 # ﾥ -0xE3C6 0xFFA6 # ﾦ -0xE3C7 0xFFA7 # ﾧ -0xE3C8 0xFFA8 # ﾨ -0xE3C9 0xFFA9 # ﾩ -0xE3CA 0xFFAA # ﾪ -0xE3CB 0xFFAB # ﾫ -0xE3CC 0xFFAC # ﾬ -0xE3CD 0xFFAD # ﾭ -0xE3CE 0xFFAE # ﾮ -0xE3CF 0xFFAF # ﾯ -0xE3D0 0xFFB0 # ﾰ -0xE3D1 0xFFB1 # ﾱ -0xE3D2 0xFFB2 # ﾲ -0xE3D3 0xFFB3 # ﾳ -0xE3D4 0xFFB4 # ﾴ -0xE3D5 0xFFB5 # ﾵ -0xE3D6 0xFFB6 # ﾶ -0xE3D7 0xFFB7 # ﾷ -0xE3D8 0xFFB8 # ﾸ -0xE3D9 0xFFB9 # ﾹ -0xE3DA 0xFFBA # ﾺ -0xE3DB 0xFFBB # ﾻ -0xE3DC 0xFFBC # ﾼ -0xE3DD 0xFFBD # ﾽ -0xE3DE 0xFFBE # ﾾ -0xE3E2 0xFFC2 # ￂ -0xE3E3 0xFFC3 # ￃ -0xE3E4 0xFFC4 # ￄ -0xE3E5 0xFFC5 # ￅ -0xE3E6 0xFFC6 # ￆ -0xE3E7 0xFFC7 # ￇ -0xE3EA 0xFFCA # ￊ -0xE3EB 0xFFCB # ￋ -0xE3EC 0xFFCC # ￌ -0xE3ED 0xFFCD # ￍ -0xE3EE 0xFFCE # ￎ -0xE3EF 0xFFCF # ￏ -0xE3F2 0xFFD2 # ￒ -0xE3F3 0xFFD3 # ￓ -0xE3F4 0xFFD4 # ￔ -0xE3F5 0xFFD5 # ￕ -0xE3F6 0xFFD6 # ￖ -0xE3F7 0xFFD7 # ￗ -0xE3FA 0xFFDA # ￚ -0xE3FB 0xFFDB # ￛ -0xE3FC 0xFFDC # ￜ - -# "344" GEORGIAN-ARMENIAN -0xE421 0x10D0 # ა -0xE421 0x0966 # ० -0xE422 0x10D1 # ბ -0xE422 0x0967 # १ -0xE423 0x10D2 # გ -0xE423 0x0968 # २ -0xE424 0x10D3 # დ -0xE424 0x0969 # ३ -0xE425 0x10D4 # ე -0xE425 0x096A # ४ -0xE426 0x10D5 # ვ -0xE426 0x096B # ५ -0xE427 0x10D6 # ზ -0xE427 0x096C # ६ -0xE428 0x10F1 # ჱ -0xE428 0x096D # ७ -0xE429 0x10D7 # თ -0xE429 0x096E # ८ -0xE42A 0x10D8 # ი -0xE42A 0x096F # ९ -0xE42B 0x10D9 # კ -0xE42C 0x10DA # ლ -0xE42D 0x10DB # მ -0xE42E 0x10DC # ნ -0xE42F 0x10F2 # ჲ -0xE42F 0x20A8 # ₨ -0xE430 0x10DD # ო -0xE431 0x10DE # პ -0xE432 0x10DF # ჟ -0xE433 0x10E0 # რ -0xE434 0x10E1 # ს -0xE435 0x10E2 # ტ -0xE436 0x10E3 # უ -0xE437 0x10F3 # ჳ -0xE438 0x10E4 # ფ -0xE439 0x10E5 # ქ -0xE43A 0x10E6 # ღ -0xE43B 0x10E7 # ყ -0xE43C 0x10E8 # შ -0xE43D 0x10E9 # ჩ -0xE43E 0x10EA # ც -0xE43F 0x10EB # ძ -0xE440 0x10EC # წ -0xE441 0x10ED # ჭ -0xE442 0x10EE # ხ -0xE443 0x10F4 # ჴ -0xE444 0x10EF # ჯ -0xE445 0x10F0 # ჰ -0xE446 0x10F5 # ჵ -0xE447 0x10F6 # ჶ -0xE44E 0x0589 # ։ -0xE44F 0x10FB # ჻ -0xE451 0x10A0 # Ⴀ -0xE452 0x10A1 # Ⴁ -0xE453 0x10A2 # Ⴂ -0xE454 0x10A3 # Ⴃ -0xE455 0x10A4 # Ⴄ -0xE456 0x10A5 # Ⴅ -0xE457 0x10A6 # Ⴆ -0xE458 0x10C1 # Ⴡ -0xE459 0x10A7 # Ⴇ -0xE45A 0x10A8 # Ⴈ -0xE45B 0x10A9 # Ⴉ -0xE45C 0x10AA # Ⴊ -0xE45D 0x10AB # Ⴋ -0xE45E 0x10AC # Ⴌ -0xE45F 0x10C2 # Ⴢ -0xE460 0x10AD # Ⴍ -0xE461 0x10AE # Ⴎ -0xE462 0x10AF # Ⴏ -0xE463 0x10B0 # Ⴐ -0xE464 0x10B1 # Ⴑ -0xE465 0x10B2 # Ⴒ -0xE466 0x10B3 # Ⴓ -0xE467 0x10C3 # Ⴣ -0xE468 0x10B4 # Ⴔ -0xE469 0x10B5 # Ⴕ -0xE46A 0x10B6 # Ⴖ -0xE46B 0x10B7 # Ⴗ -0xE46C 0x10B8 # Ⴘ -0xE46D 0x10B9 # Ⴙ -0xE46E 0x10BA # Ⴚ -0xE46F 0x10BB # Ⴛ -0xE470 0x10BC # Ⴜ -0xE470 0x094A # ॊ -0xE471 0x10BD # Ⴝ -0xE471 0x0951 # ॑ -0xE472 0x10BE # Ⴞ -0xE472 0x0952 # ॒ -0xE473 0x10C4 # Ⴤ -0xE473 0x0953 # ॓ -0xE474 0x10BF # Ⴟ -0xE474 0x0954 # ॔ -0xE475 0x10C0 # Ⴠ -0xE475 0x0965 # ॥ -0xE476 0x10C5 # Ⴥ - -# "356" SYMBOLS3 -0xEE21 0x2004 #   -0xEE22 0x2005 #   -0xEE23 0x200A #   -0xEE24 0x2008 #   -0xEE25 0x002E # . -0xEE26 0x230E # ⌎ -0xEE27 0x230F # ⌏ -0xEE28 0x230C # ⌌ -0xEE29 0x230D # ⌍ -0xEE2A 0x25AE # ▮ -0xEE2B 0x2214 # ∔ -0xEE2C 0xFFFE # MISSING -0xEE2D 0x2212 # − -0xEE2E 0xFFFE # MISSING -0xEE2F 0x210F # ℏ -0xEE30 0x226C # ≬ -0xEE31 0x2100 # ℀ -0xEE32 0xFFFE # MISSING -0xEE33 0x260F # ☏ -0xEE34 0x2236 # ∶ -0xEE35 0x0021 # ! -0xEE36 0x22A6 # ⊦ -0xEE37 0x232F # ⌯ -0xEE38 0x2330 # ⌰ -0xEE39 0x01B5 # Ƶ -0xEE3A 0x2302 # ⌂ -0xEE3B 0x2238 # ∸ -0xEE3C 0x2216 # ∖ -0xEE3D 0x2259 # ≙ -0xEE3E 0x225A # ≚ -0xEE3F 0x22C7 # ⋇ -0xEE40 0x2106 # ℆ -0xEE41 0x25D8 # ◘ -0xEE42 0x224E # ≎ -0xEE43 0x211B # ℛ -0xEE44 0x2112 # ℒ -0xEE45 0x2206 # ∆ -0xEE46 0x2311 # ⌑ -0xEE47 0x2038 # ‸ -0xEE48 0x2104 # ℄ -0xEE49 0xFFFE # MISSING -0xEE4A 0x25B1 # ▱ -0xEE4B 0x232D # ⌭ -0xEE4C 0x2312 # ⌒ -0xEE4D 0x2313 # ⌓ -0xEE4E 0x232E # ⌮ -0xEE4F 0x2316 # ⌖ -0xEE50 0x21C4 # ⇄ -0xEE51 0x21D5 # ⇕ -0xEE52 0x228F # ⊏ -0xEE53 0x2290 # ⊐ -0xEE54 0x0192 # ƒ -0xEE55 0x25D9 # ◙ -0xEE56 0x22C2 # ⋂ -0xEE57 0x22C3 # ⋃ -0xEE58 0xFFFE # MISSING -0xEE59 0xFFFE # MISSING -0xEE5A 0xFFFE # MISSING -0xEE5B 0xFFFE # MISSING -0xEE5C 0xFFFE # MISSING -0xEE5D 0xFFFE # MISSING -0xEE5E 0xFFFE # MISSING -0xEE5F 0xFFFE # MISSING -0xEE60 0x2591 # ░ -0xEE61 0x2593 # ▓ -0xEE62 0x22D2 # ⋒ -0xEE63 0x22D3 # ⋓ -0xEE64 0x223A # ∺ -0xEE65 0x2270 # ≰ -0xEE66 0x2271 # ≱ -0xEE67 0x2218 # ∘ -0xEE68 0xFFFF # UNDEFINED -0xEE69 0x2201 # ∁ -0xEE6A 0x2310 # ⌐ -0xEE6B 0x2032 # ′ -0xEE6C 0x2276 # ≶ -0xEE6D 0x2277 # ≷ -0xEE6E 0x2272 # ≲ -0xEE6F 0x2273 # ≳ -0xEE70 0x22A4 # ⊤ -0xEE71 0x2204 # ∄ -0xEE72 0x2262 # ≢ -0xEE73 0x2308 # ⌈ -0xEE74 0x230A # ⌊ -0xEE75 0x007C # | -0xEE76 0x2309 # ⌉ -0xEE77 0x230B # ⌋ -0xEE78 0x224A # ≊ -0xEE79 0x224F # ≏ -0xEE7A 0x203C # ‼ -0xEE7B 0x2035 # ‵ -0xEE7C 0x2223 # ∣ -0xEE7D 0x2217 # ∗ -0xEE7E 0x223C # ∼ -0xEEA1 0x22BA # ⊺ -0xEEA2 0x2024 # ․ -0xEEA3 0x2025 # ‥ -0xEEA4 0x2B95 # ⮕ -0xEEA5 0x2B05 # ⬅ -0xEEA6 0x2B06 # ⬆ -0xEEA7 0x2B07 # ⬇ -0xEEA8 0x21E8 # ⇨ -0xEEA9 0x21E6 # ⇦ -0xEEAA 0x21E7 # ⇧ -0xEEAB 0x21E9 # ⇩ -0xEEAC 0x2190 # ← -0xEEAD 0x2191 # ↑ -0xEEAE 0x2192 # → -0xEEAF 0x2193 # ↓ -0xEEB0 0x25B6 # ▶ -0xEEB1 0x25C0 # ◀ -0xEEB2 0x25B7 # ▷ -0xEEB3 0x25C1 # ◁ -0xEEB4 0x22C5 # ⋅ -0xEEB5 0x2195 # ↕ -0xEEB6 0x21A8 # ↨ -0xEEB7 0x2372 # ⍲ -0xEEB8 0x2371 # ⍱ -0xEEB9 0x2588 # █ -0xEEBA 0x2584 # ▄ -0xEEBB 0x2590 # ▐ -0xEEBC 0x258C # ▌ -0xEEBD 0x2580 # ▀ -0xEEBE 0x25C4 # ◄ -0xEEBF 0x25BA # ► -0xEEC0 0x236B # ⍫ -0xEEC1 0x2352 # ⍒ -0xEEC2 0x234B # ⍋ -0xEEC3 0x233D # ⌽ -0xEEC4 0x2349 # ⍉ -0xEEC5 0x235F # ⍟ -0xEEC6 0x235E # ⍞ -0xEEC7 0x2339 # ⌹ -0xEEC8 0x233F # ⌿ -0xEEC9 0x2340 # ⍀ -0xEECA 0x2305 # ⌅ -0xEECB 0x2664 # ♤ -0xEECC 0x2665 # ♥ -0xEECD 0xFFFF # UNDEFINED -0xEECE 0x2667 # ♧ -0xEECF 0x263C # ☼ -0xEED0 0x234E # ⍎ -0xEED1 0x2355 # ⍕ -0xEED2 0x235D # ⍝ -0xEED3 0x2336 # ⌶ -0xEED4 0x233B # ⌻ -0xEED5 0x266B # ♫ -0xEED6 0x22C9 # ⋉ -0xEED7 0x22CA # ⋊ -0xEED8 0x22CB # ⋋ -0xEED9 0x22CC # ⋌ -0xEEDA 0x2306 # ⌆ -0xEEDB 0x22BB # ⊻ -0xEEDC 0x2337 # ⌷ -0xEEDD 0x221F # ∟ -0xEEDE 0x25AC # ▬ -0xEEDF 0x263B # ☻ -0xEEE0 0x23AB # ⎫ -0xEEE1 0x23AA # ⎪ -0xEEE2 0x23AC # ⎬ -0xEEE3 0x23AD # ⎭ -0xEEE4 0x23A7 # ⎧ -0xEEE5 0x23A9 # ⎩ -0xEEE6 0x23A8 # ⎨ -0xEEE7 0xFFFE # MISSING -0xEEE8 0xFFFE # MISSING -0xEEE9 0xFFFE # MISSING -0xEEEA 0xFFFE # MISSING -0xEEEB 0xFFFE # MISSING -0xEEEC 0xFFFE # MISSING -0xEEED 0x2320 # ⌠ -0xEEEE 0x2321 # ⌡ -0xEEEF 0x23AA # ⎪ -0xEEF0 0x2342 # ⍂ -0xEEF1 0xFFFE # MISSING -0xEEF2 0x21B6 # ↶ -0xEEF3 0x21B7 # ↷ -0xEEF4 0x21BA # ↺ -0xEEF5 0x21BB # ↻ -0xEEF6 0x21CB # ⇋ -0xEEF7 0x219A # ↚ -0xEEF8 0x219B # ↛ -0xEEF9 0x21AE # ↮ -0xEEFA 0x21CD # ⇍ -0xEEFB 0x21CF # ⇏ -0xEEFC 0x21CE # ⇎ -0xEEFD 0x22CD # ⋍ -0xEEFE 0x2241 # ≁ - -# "357" SYMBOLS4 -0xEF21 0x0020 # -0xEF22 0x2011 # ‑ -0xEF23 0x00AD # ­ -0xEF24 0x2013 # – -0xEF25 0x2014 # — -0xEF26 0x2012 # ‒ -0xEF27 0x0027 # ' -0xEF28 0x201E # „ -0xEF29 0x201C # “ -0xEF2A 0x2039 # ‹ -0xEF2B 0x203A # › -0xEF2C 0x2000 #   -0xEF2D 0x2001 #   -0xEF2E 0x2007 #   -0xEF2F 0x2009 #   -0xEF30 0x2020 # † -0xEF31 0x2021 # ‡ -0xEF32 0x3008 # 〈 -0xEF33 0x3009 # 〉 -0xEF34 0x261E # ☞ -0xEF35 0x261C # ☜ -0xEF36 0x22A2 # ⊢ -0xEF37 0x22A3 # ⊣ -0xEF38 0x22A8 # ⊨ -0xEF39 0x2AE4 # ⫤ -0xEF3A 0x3016 # 〖 -0xEF3B 0x3017 # 〗 -0xEF3C 0x2196 # ↖ -0xEF3D 0x2198 # ↘ -0xEF3E 0x2197 # ↗ -0xEF3F 0x2199 # ↙ -0xEF40 0x2105 # ℅ -0xEF41 0x2030 # ‰ -0xEF42 0x226A # ≪ -0xEF43 0x226B # ≫ -0xEF44 0x226E # ≮ -0xEF45 0x226F # ≯ -0xEF46 0x2223 # ∣ -0xEF47 0x2224 # ∤ -0xEF48 0x2225 # ∥ -0xEF49 0x2226 # ∦ -0xEF4A 0x2208 # ∈ -0xEF4B 0x2209 # ∉ -0xEF4C 0x220B # ∋ -0xEF4D 0x21D0 # ⇐ -0xEF4E 0x21D4 # ⇔ -0xEF4F 0x21D2 # ⇒ -0xEF50 0x21CB # ⇋ -0xEF51 0x21C4 # ⇄ -0xEF52 0x2194 # ↔ -0xEF53 0x219D # ↝ -0xEF54 0x2289 # ⊉ -0xEF55 0x2288 # ⊈ -0xEF56 0x2229 # ∩ -0xEF57 0x222A # ∪ -0xEF58 0x2287 # ⊇ -0xEF59 0x2286 # ⊆ -0xEF5A 0x2283 # ⊃ -0xEF5B 0x2282 # ⊂ -0xEF5C 0x2289 # ⊉ -0xEF5D 0x2288 # ⊈ -0xEF5E 0x2285 # ⊅ -0xEF5F 0x2284 # ⊄ -0xEF60 0x2612 # ☒ -0xEF61 0x2205 # ∅ -0xEF62 0x2295 # ⊕ -0xEF63 0x2296 # ⊖ -0xEF64 0x2297 # ⊗ -0xEF65 0x2298 # ⊘ -0xEF66 0x2022 # • -0xEF67 0x2218 # ∘ -0xEF68 0x210F # ℏ -0xEF69 0x2113 # ℓ -0xEF6A 0x00AC # ¬ -0xEF6B 0x00A6 # ¦ -0xEF6C 0x2220 # ∠ -0xEF6D 0x2221 # ∡ -0xEF6E 0x2237 # ∷ -0xEF6F 0x2235 # ∵ -0xEF70 0x22A5 # ⊥ -0xEF71 0x221D # ∝ -0xEF72 0x2261 # ≡ -0xEF73 0x2250 # ≐ -0xEF74 0x225F # ≟ -0xEF75 0x222B # ∫ -0xEF76 0x222E # ∮ -0xEF77 0x2243 # ≃ -0xEF78 0x2245 # ≅ -0xEF79 0x2248 # ≈ -0xEF7A 0x2211 # ∑ -0xEF7B 0x220F # ∏ -0xEF7C 0x221A # √ -0xEF7D 0x2213 # ∓ -0xEF7E 0x2592 # ▒ -0xEFA1 0x20A2 # ₢ -0xEFA2 0x0192 # ƒ -0xEFA3 0x20A3 # ₣ -0xEFA4 0x20A7 # ₧ -0xEFA5 0x20A0 # ₠ -0xEFA6 0x0024 # $ -0xEFA7 0x2135 # ℵ -0xEFA8 0x2116 # № -0xEFA9 0x211E # ℞ -0xEFAA 0x2121 # ℡ -0xEFAB 0x0292 # ʒ -0xEFAC 0x2102 # ℂ -0xEFAD 0x2115 # ℕ -0xEFAE 0x211D # ℝ -0xEFAF 0x2124 # ℤ -0xEFB0 0x2308 # ⌈ -0xEFB1 0x2309 # ⌉ -0xEFB2 0x230A # ⌊ -0xEFB3 0x230B # ⌋ -0xEFB4 0x2203 # ∃ -0xEFB5 0x2200 # ∀ -0xEFB6 0x2227 # ∧ -0xEFB7 0x2228 # ∨ -0xEFB8 0x220E # ∎ -0xEFB9 0x2207 # ∇ -0xEFBA 0x2202 # ∂ -0xEFBB 0x2440 # ⑀ -0xEFBC 0x2442 # ⑂ -0xEFBD 0x2441 # ⑁ -0xEFBE 0x23E6 # ⏦ -0xEFBF 0x23E6 # ⏦ -0xEFC0 0x2312 # ⌒ -0xEFC1 0x2160 # Ⅰ -0xEFC2 0x2161 # Ⅱ -0xEFC3 0x2162 # Ⅲ -0xEFC4 0x2163 # Ⅳ -0xEFC5 0x2164 # Ⅴ -0xEFC6 0x2165 # Ⅵ -0xEFC7 0x2166 # Ⅶ -0xEFC8 0x2167 # Ⅷ -0xEFC9 0x2168 # Ⅸ -0xEFCA 0x2169 # Ⅹ -0xEFCB 0x2660 # ♠ -0xEFCC 0x2661 # ♡ -0xEFCD 0x2662 # ♢ -0xEFCE 0x2663 # ♣ -0xEFCF 0x2713 # ✓ -0xEFD0 0x2717 # ✗ -0xEFD1 0x2460 # ① -0xEFD2 0x2461 # ② -0xEFD3 0x2462 # ③ -0xEFD4 0x2463 # ④ -0xEFD5 0x2464 # ⑤ -0xEFD6 0x2465 # ⑥ -0xEFD7 0x2466 # ⑦ -0xEFD8 0x2467 # ⑧ -0xEFD9 0x2468 # ⑨ -0xEFDA 0x2469 # ⑩ -0xEFDB 0xFFFE # MISSING -0xEFDC 0xFFFE # MISSING -0xEFDD 0xFFFE # MISSING -0xEFDE 0x262E # ☮ -0xEFDF 0x263A # ☺ -0xEFE0 0x2620 # ☠ -0xEFE1 0x2503 # ┃ -0xEFE2 0x2578 # ╸ -0xEFE3 0x2578 # ╸ -0xEFE4 0x254B # ╋ -0xEFE5 0x2500 # ─ -0xEFE6 0x253C # ┼ -0xEFE7 0x2609 # ☉ -0xEFE8 0x263D # ☽ -0xEFE9 0x263E # ☾ -0xEFEA 0x263F # ☿ -0xEFEB 0x2643 # ♃ -0xEFEC 0x2644 # ♄ -0xEFED 0x2645 # ♅ -0xEFEE 0x2646 # ♆ -0xEFEF 0x2647 # ♇ -0xEFF0 0x2652 # ♒ -0xEFF1 0x2653 # ♓ -0xEFF2 0x2648 # ♈ -0xEFF3 0x2649 # ♉ -0xEFF4 0x264A # ♊ -0xEFF5 0x264B # ♋ -0xEFF6 0x264C # ♌ -0xEFF7 0x264D # ♍ -0xEFF8 0x264E # ♎ -0xEFF9 0x264F # ♏ -0xEFFA 0x2650 # ♐ -0xEFFB 0x2651 # ♑ -0xEFFC 0x260E # ☎ -0xEFFD 0x2153 # ⅓ -0xEFFE 0x2154 # ⅔ - -# "360" LIGATURES -0xF021 0xFB00 # ff -0xF022 0xFB03 # ffi -0xF023 0xFB04 # ffl -0xF024 0xFB01 # fi -0xF025 0xFB02 # fl -0xF026 0xFB05 # ſt - -# "361" ACCENTED-LATIN -0xF121 0x00C0 # À -0xF122 0x00C1 # Á -0xF123 0x00C2 #  -0xF124 0x00C3 # à -0xF125 0x00DC # Ü -0xF126 0x0102 # Ă -0xF127 0x00C4 # Ä -0xF128 0x00C5 # Å -0xF129 0x0104 # Ą -0xF12A 0x0106 # Ć -0xF12B 0x0108 # Ĉ -0xF12C 0x010A # Ċ -0xF12D 0x00C7 # Ç -0xF12E 0x010C # Č -0xF12F 0x010E # Ď -0xF130 0x00C8 # È -0xF131 0x00C9 # É -0xF132 0x00CA # Ê -0xF133 0x0112 # Ē -0xF134 0x0116 # Ė -0xF135 0x00CB # Ë -0xF136 0x0118 # Ę -0xF137 0x011A # Ě -0xF138 0x01F4 # Ǵ -0xF139 0x011C # Ĝ -0xF13A 0x011E # Ğ -0xF13B 0x0120 # Ġ -0xF13C 0x0122 # Ģ -0xF13D 0x0124 # Ĥ -0xF13E 0x00CC # Ì -0xF13F 0x01CD # Ǎ -0xF140 0x00CE # Î -0xF141 0x0128 # Ĩ -0xF142 0x012A # Ī -0xF143 0x0130 # İ -0xF144 0x00CF # Ï -0xF145 0x012E # Į -0xF146 0x0134 # Ĵ -0xF147 0x0136 # Ķ -0xF148 0x0139 # Ĺ -0xF149 0x013B # Ļ -0xF14A 0x013D # Ľ -0xF14B 0x0143 # Ń -0xF14C 0x00D1 # Ñ -0xF14D 0x0145 # Ņ -0xF14E 0x0147 # Ň -0xF14F 0x00D2 # Ò -0xF150 0x00D3 # Ó -0xF151 0x00D4 # Ô -0xF152 0x00D5 # Õ -0xF153 0x014C # Ō -0xF154 0x00D6 # Ö -0xF155 0x0150 # Ő -0xF156 0x0154 # Ŕ -0xF157 0x0156 # Ŗ -0xF158 0x0158 # Ř -0xF159 0x015A # Ś -0xF15A 0x015C # Ŝ -0xF15B 0x015E # Ş -0xF15C 0x0160 # Š -0xF15D 0x0162 # Ţ -0xF15E 0x0164 # Ť -0xF15F 0x00D9 # Ù -0xF160 0x00DA # Ú -0xF161 0x00DB # Û -0xF162 0x0168 # Ũ -0xF163 0x016A # Ū -0xF164 0x016C # Ŭ -0xF165 0x00DC # Ü -0xF166 0x016E # Ů -0xF167 0x0170 # Ű -0xF168 0x0172 # Ų -0xF169 0x0174 # Ŵ -0xF16A 0x1EF2 # Ỳ -0xF16B 0x00DD # Ý -0xF16C 0x0176 # Ŷ -0xF16D 0x0178 # Ÿ -0xF16E 0x0179 # Ź -0xF16F 0x017B # Ż -0xF170 0x017D # Ž -0xF171 0x0130 # İ -0xF172 0x0164 # Ť -0xF173 0x010E # Ď -0xF1A1 0x00E0 # à -0xF1A2 0x00E1 # á -0xF1A3 0x00E2 # â -0xF1A4 0x00E3 # ã -0xF1A5 0x0101 # ā -0xF1A6 0x0103 # ă -0xF1A7 0x00E4 # ä -0xF1A8 0x00E5 # å -0xF1A9 0x0105 # ą -0xF1AA 0x0107 # ć -0xF1AB 0x0109 # ĉ -0xF1AC 0x010B # ċ -0xF1AD 0x00E7 # ç -0xF1AE 0x010D # č -0xF1AF 0x010F # ď -0xF1B0 0x00E8 # è -0xF1B1 0x00E9 # é -0xF1B2 0x00EA # ê -0xF1B3 0x0113 # ē -0xF1B4 0x0117 # ė -0xF1B5 0x00EB # ë -0xF1B6 0x0119 # ę -0xF1B7 0x011B # ě -0xF1B8 0x01F5 # ǵ -0xF1B9 0x011D # ĝ -0xF1BA 0x011F # ğ -0xF1BB 0x0121 # ġ -0xF1BC 0x0123 # ģ -0xF1BD 0x0125 # ĥ -0xF1BE 0x00EC # ì -0xF1BF 0x00ED # í -0xF1C0 0x00EE # î -0xF1C1 0x0129 # ĩ -0xF1C2 0x012B # ī -0xF1C4 0x00EF # ï -0xF1C5 0x012F # į -0xF1C6 0x0135 # ĵ -0xF1C7 0x0137 # ķ -0xF1C8 0x013A # ĺ -0xF1C9 0x013C # ļ -0xF1CA 0x013E # ľ -0xF1CB 0x0144 # ń -0xF1CC 0x00F1 # ñ -0xF1CD 0x0146 # ņ -0xF1CE 0x0148 # ň -0xF1CF 0x00F2 # ò -0xF1D0 0x00F3 # ó -0xF1D1 0x00F4 # ô -0xF1D2 0x00F5 # õ -0xF1D3 0x014D # ō -0xF1D4 0x00F6 # ö -0xF1D5 0x0151 # ő -0xF1D6 0x0155 # ŕ -0xF1D7 0x0157 # ŗ -0xF1D8 0x0159 # ř -0xF1D9 0x015B # ś -0xF1DA 0x015D # ŝ -0xF1DB 0x015F # ş -0xF1DC 0x0161 # š -0xF1DD 0x0163 # ţ -0xF1DE 0x0165 # ť -0xF1DF 0x00F9 # ù -0xF1E0 0x00FA # ú -0xF1E1 0x00FB # û -0xF1E2 0x0169 # ũ -0xF1E3 0x016B # ū -0xF1E4 0x016D # ŭ -0xF1E5 0x00FC # ü -0xF1E6 0x016F # ů -0xF1E7 0x0171 # ű -0xF1E8 0x0173 # ų -0xF1E9 0x0175 # ŵ -0xF1EA 0x1EF3 # ỳ -0xF1EB 0x00FD # ý -0xF1EC 0x0177 # ŷ -0xF1ED 0x00FF # ÿ -0xF1EE 0x017A # ź -0xF1EF 0x017C # ż -0xF1F0 0x017E # ž -0xF1F1 0x013E # ľ -0xF1F2 0x0165 # ť -0xF1F3 0x010F # ď -0xF1F4 0x1ECD # ọ diff --git a/unicode/xerox/XCCS-60-163=JISX.TXT b/unicode/xerox/XCCS-60-163=JISX.TXT deleted file mode 100644 index 7a28c767..00000000 --- a/unicode/xerox/XCCS-60-163=JISX.TXT +++ /dev/null @@ -1,6529 +0,0 @@ -# -# Name: XCCS (XC-3-1-1-0) to Unicode -# Unicode version: 3.0 -# XCCS charsets: JIS - -# Table version: 0.1 -# Table format: Format A -# Date: 4-Aug-2020 -# Author: Ron Kaplan -# -# This file contains mappings from the Xerox Character Code Standard (version -# XC1-3-3-0, 1987) into Unicode 3.0. standard codes. That is the version of -# XCCS corresponding to the fonts in the Medley system. -# -# The format of this file conforms to the format of the other Unicode-supplied -# mapping files: -# Three white-space (tab or spaces) separated columns: -# Column 1 is the XCCS code (as hex 0xXXXX) -# Column 2 is the corresponding Unicode (as hex 0xXXXX) -# Column 3 (after #) is a comment column. For convenience, it contains the -# Unicode character itself (since the Unicode character names -# are not available) -# Unicode FFFF is used for undefined XCCS codes (Column 3 = UNDEFINED -# Unicode FFFE is used for XCCS codes that have not yet been filled in. -# (Column 3 = MISSING) -# -# This file is encoded in UTF8, so that the Unicode characters -# are properly displayed in Column 3 and can be edited by standard -# Unicode-enabled editors (e.g. Mac Textedit). -# -# This file can also be read by the function -# READ-UNICODE-MAPPING in the UNICODE Medley library package. -# -# The entries are in XCCS order and grouped by character sets. In front of -# the mappings, for convenience, there is a line with the octal XCCS -# character set, after #. -# -# Note that a given XCCS code might map to codes in several different Unicode -# positions, since there are repetitions in the Unicode standard. -# -# For more details, see the associated README.TXT file. -# -# Any comments or problems, contact - - -# "60" JIS -0x3021 0x4E9C # 亜 -0x3022 0x5516 # 唖 -0x3023 0x5A03 # 娃 -0x3024 0x963F # 阿 -0x3025 0x54C0 # 哀 -0x3026 0x611B # 愛 -0x3027 0x6328 # 挨 -0x3028 0x59F6 # 姶 -0x3029 0x9022 # 逢 -0x302A 0x8475 # 葵 -0x302B 0x831C # 茜 -0x302C 0x7A50 # 穐 -0x302D 0x60AA # 悪 -0x302E 0x63E1 # 握 -0x302F 0x6E25 # 渥 -0x3030 0x65ED # 旭 -0x3031 0x8466 # 葦 -0x3032 0x82A6 # 芦 -0x3033 0x9BF5 # 鯵 -0x3034 0x6893 # 梓 -0x3035 0x5727 # 圧 -0x3036 0x65A1 # 斡 -0x3037 0x6271 # 扱 -0x3038 0x5B9B # 宛 -0x3039 0x59D0 # 姐 -0x303A 0x867B # 虻 -0x303B 0x98F4 # 飴 -0x303C 0x7D62 # 絢 -0x303D 0x7DBE # 綾 -0x303E 0x9B8E # 鮎 -0x303F 0x6216 # 或 -0x3040 0x7C9F # 粟 -0x3041 0x88B7 # 袷 -0x3042 0x5B89 # 安 -0x3043 0x5EB5 # 庵 -0x3044 0x6309 # 按 -0x3045 0x6697 # 暗 -0x3046 0x6848 # 案 -0x3047 0x95C7 # 闇 -0x3048 0x978D # 鞍 -0x3049 0x674F # 杏 -0x304A 0x4EE5 # 以 -0x304B 0x4F0A # 伊 -0x304C 0x4F4D # 位 -0x304D 0x4F9D # 依 -0x304E 0x5049 # 偉 -0x304F 0x56F2 # 囲 -0x3050 0x5937 # 夷 -0x3051 0x59D4 # 委 -0x3052 0x5A01 # 威 -0x3053 0x5C09 # 尉 -0x3054 0x60DF # 惟 -0x3055 0x610F # 意 -0x3056 0x6170 # 慰 -0x3057 0x6613 # 易 -0x3058 0x6905 # 椅 -0x3059 0x70BA # 為 -0x305A 0x754F # 畏 -0x305B 0x7570 # 異 -0x305C 0x79FB # 移 -0x305D 0x7DAD # 維 -0x305E 0x7DEF # 緯 -0x305F 0x80C3 # 胃 -0x3060 0x840E # 萎 -0x3061 0x8863 # 衣 -0x3062 0x8B02 # 謂 -0x3063 0x9055 # 違 -0x3064 0x907A # 遺 -0x3065 0x533B # 医 -0x3066 0x4E95 # 井 -0x3067 0x4EA5 # 亥 -0x3068 0x57DF # 域 -0x3069 0x80B2 # 育 -0x306A 0x90C1 # 郁 -0x306B 0x78EF # 磯 -0x306C 0x4E00 # 一 -0x306D 0x58F1 # 壱 -0x306E 0x6EA2 # 溢 -0x306F 0x9038 # 逸 -0x3070 0x7A32 # 稲 -0x3071 0x8328 # 茨 -0x3072 0x828B # 芋 -0x3073 0x9C2F # 鰯 -0x3074 0x5141 # 允 -0x3075 0x5370 # 印 -0x3076 0x54BD # 咽 -0x3077 0x54E1 # 員 -0x3078 0x56E0 # 因 -0x3079 0x59FB # 姻 -0x307A 0x5F15 # 引 -0x307B 0x98F2 # 飲 -0x307C 0x6DEB # 淫 -0x307D 0x80E4 # 胤 -0x307E 0x852D # 蔭 - -# "61" JIS -0x3121 0x9662 # 院 -0x3122 0x9670 # 陰 -0x3123 0x96A0 # 隠 -0x3124 0x97FB # 韻 -0x3125 0x540B # 吋 -0x3126 0x53F3 # 右 -0x3127 0x5B87 # 宇 -0x3128 0x70CF # 烏 -0x3129 0x7FBD # 羽 -0x312A 0x8FC2 # 迂 -0x312B 0x96E8 # 雨 -0x312C 0x536F # 卯 -0x312D 0x9D5C # 鵜 -0x312E 0x7ABA # 窺 -0x312F 0x4E11 # 丑 -0x3130 0x7893 # 碓 -0x3131 0x81FC # 臼 -0x3132 0x6E26 # 渦 -0x3133 0x5618 # 嘘 -0x3134 0x5504 # 唄 -0x3135 0x6B1D # 欝 -0x3136 0x851A # 蔚 -0x3137 0x9C3B # 鰻 -0x3138 0x59E5 # 姥 -0x3139 0x53A9 # 厩 -0x313A 0x6D66 # 浦 -0x313B 0x74DC # 瓜 -0x313C 0x958F # 閏 -0x313D 0x5642 # 噂 -0x313E 0x4E91 # 云 -0x313F 0x904B # 運 -0x3140 0x96F2 # 雲 -0x3141 0x834F # 荏 -0x3142 0x990C # 餌 -0x3143 0x53E1 # 叡 -0x3144 0x55B6 # 営 -0x3145 0x5B30 # 嬰 -0x3146 0x5F71 # 影 -0x3147 0x6620 # 映 -0x3148 0x66F3 # 曳 -0x3149 0x6804 # 栄 -0x314A 0x6C38 # 永 -0x314B 0x6CF3 # 泳 -0x314C 0x6D29 # 洩 -0x314D 0x745B # 瑛 -0x314E 0x76C8 # 盈 -0x314F 0x7A4E # 穎 -0x3150 0x9834 # 頴 -0x3151 0x82F1 # 英 -0x3152 0x885B # 衛 -0x3153 0x8A60 # 詠 -0x3154 0x92ED # 鋭 -0x3155 0x6DB2 # 液 -0x3156 0x75AB # 疫 -0x3157 0x76CA # 益 -0x3158 0x99C5 # 駅 -0x3159 0x60A6 # 悦 -0x315A 0x8B01 # 謁 -0x315B 0x8D8A # 越 -0x315C 0x95B2 # 閲 -0x315D 0x698E # 榎 -0x315E 0x53AD # 厭 -0x315F 0x5186 # 円 -0x3160 0x5712 # 園 -0x3161 0x5830 # 堰 -0x3162 0x5944 # 奄 -0x3163 0x5BB4 # 宴 -0x3164 0x5EF6 # 延 -0x3165 0x6028 # 怨 -0x3166 0x63A9 # 掩 -0x3167 0x63F4 # 援 -0x3168 0x6CBF # 沿 -0x3169 0x6F14 # 演 -0x316A 0x708E # 炎 -0x316B 0x7114 # 焔 -0x316C 0x7159 # 煙 -0x316D 0x71D5 # 燕 -0x316E 0x733F # 猿 -0x316F 0x7E01 # 縁 -0x3170 0x8276 # 艶 -0x3171 0x82D1 # 苑 -0x3172 0x8597 # 薗 -0x3173 0x9060 # 遠 -0x3174 0x925B # 鉛 -0x3175 0x9D1B # 鴛 -0x3176 0x5869 # 塩 -0x3177 0x65BC # 於 -0x3178 0x6C5A # 汚 -0x3179 0x7525 # 甥 -0x317A 0x51F9 # 凹 -0x317B 0x592E # 央 -0x317C 0x5965 # 奥 -0x317D 0x5F80 # 往 -0x317E 0x5FDC # 応 - -# "62" JIS -0x3221 0x62BC # 押 -0x3222 0x65FA # 旺 -0x3223 0x6A2A # 横 -0x3224 0x6B27 # 欧 -0x3225 0x6BB4 # 殴 -0x3226 0x738B # 王 -0x3227 0x7FC1 # 翁 -0x3228 0x8956 # 襖 -0x3229 0x9D2C # 鴬 -0x322A 0x9D0E # 鴎 -0x322B 0x9EC4 # 黄 -0x322C 0x5CA1 # 岡 -0x322D 0x6C96 # 沖 -0x322E 0x837B # 荻 -0x322F 0x5104 # 億 -0x3230 0x5C4B # 屋 -0x3231 0x61B6 # 憶 -0x3232 0x81C6 # 臆 -0x3233 0x6876 # 桶 -0x3234 0x7261 # 牡 -0x3235 0x4E59 # 乙 -0x3236 0x4FFA # 俺 -0x3237 0x5378 # 卸 -0x3238 0x6069 # 恩 -0x3239 0x6E29 # 温 -0x323A 0x7A4F # 穏 -0x323B 0x97F3 # 音 -0x323C 0x4E0B # 下 -0x323D 0x5316 # 化 -0x323E 0x4EEE # 仮 -0x323F 0x4F55 # 何 -0x3240 0x4F3D # 伽 -0x3241 0x4FA1 # 価 -0x3242 0x4F73 # 佳 -0x3243 0x52A0 # 加 -0x3244 0x53EF # 可 -0x3245 0x5609 # 嘉 -0x3246 0x590F # 夏 -0x3247 0x5AC1 # 嫁 -0x3248 0x5BB6 # 家 -0x3249 0x5BE1 # 寡 -0x324A 0x79D1 # 科 -0x324B 0x6687 # 暇 -0x324C 0x679C # 果 -0x324D 0x67B6 # 架 -0x324E 0x6B4C # 歌 -0x324F 0x6CB3 # 河 -0x3250 0x706B # 火 -0x3251 0x73C2 # 珂 -0x3252 0x798D # 禍 -0x3253 0x79BE # 禾 -0x3254 0x7A3C # 稼 -0x3255 0x7B87 # 箇 -0x3256 0x82B1 # 花 -0x3257 0x82DB # 苛 -0x3258 0x8304 # 茄 -0x3259 0x8377 # 荷 -0x325A 0x83EF # 華 -0x325B 0x83D3 # 菓 -0x325C 0x8766 # 蝦 -0x325D 0x8AB2 # 課 -0x325E 0x5629 # 嘩 -0x325F 0x8CA8 # 貨 -0x3260 0x8FE6 # 迦 -0x3261 0x904E # 過 -0x3262 0x971E # 霞 -0x3263 0x868A # 蚊 -0x3264 0x4FC4 # 俄 -0x3265 0x5CE8 # 峨 -0x3266 0x6211 # 我 -0x3267 0x7259 # 牙 -0x3268 0x753B # 画 -0x3269 0x81E5 # 臥 -0x326A 0x82BD # 芽 -0x326B 0x86FE # 蛾 -0x326C 0x8CC0 # 賀 -0x326D 0x96C5 # 雅 -0x326E 0x9913 # 餓 -0x326F 0x99D5 # 駕 -0x3270 0x4ECB # 介 -0x3271 0x4F1A # 会 -0x3272 0x89E3 # 解 -0x3273 0x56DE # 回 -0x3274 0x584A # 塊 -0x3275 0x58CA # 壊 -0x3276 0x5EFB # 廻 -0x3277 0x5FEB # 快 -0x3278 0x602A # 怪 -0x3279 0x6094 # 悔 -0x327A 0x6062 # 恢 -0x327B 0x61D0 # 懐 -0x327C 0x6212 # 戒 -0x327D 0x62D0 # 拐 -0x327E 0x6539 # 改 - -# "63" JIS -0x3321 0x9B41 # 魁 -0x3322 0x6666 # 晦 -0x3323 0x68B0 # 械 -0x3324 0x6D77 # 海 -0x3325 0x7070 # 灰 -0x3326 0x754C # 界 -0x3327 0x7686 # 皆 -0x3328 0x7D75 # 絵 -0x3329 0x82A5 # 芥 -0x332A 0x87F9 # 蟹 -0x332B 0x958B # 開 -0x332C 0x968E # 階 -0x332D 0x8C9D # 貝 -0x332E 0x51F1 # 凱 -0x332F 0x52BE # 劾 -0x3330 0x5916 # 外 -0x3331 0x54B3 # 咳 -0x3332 0x5BB3 # 害 -0x3333 0x5D16 # 崖 -0x3334 0x6168 # 慨 -0x3335 0x6982 # 概 -0x3336 0x6DAF # 涯 -0x3337 0x788D # 碍 -0x3338 0x84CB # 蓋 -0x3339 0x8857 # 街 -0x333A 0x8A72 # 該 -0x333B 0x93A7 # 鎧 -0x333C 0x9AB8 # 骸 -0x333D 0x6D6C # 浬 -0x333E 0x99A8 # 馨 -0x333F 0x86D9 # 蛙 -0x3340 0x57A3 # 垣 -0x3341 0x67FF # 柿 -0x3342 0x86CE # 蛎 -0x3343 0x920E # 鈎 -0x3344 0x5283 # 劃 -0x3345 0x5687 # 嚇 -0x3346 0x5404 # 各 -0x3347 0x5ED3 # 廓 -0x3348 0x62E1 # 拡 -0x3349 0x64B9 # 撹 -0x334A 0x683C # 格 -0x334B 0x6838 # 核 -0x334C 0x6BBB # 殻 -0x334D 0x7372 # 獲 -0x334E 0x78BA # 確 -0x334F 0x7A6B # 穫 -0x3350 0x899A # 覚 -0x3351 0x89D2 # 角 -0x3352 0x8D6B # 赫 -0x3353 0x8F03 # 較 -0x3354 0x90ED # 郭 -0x3355 0x95A3 # 閣 -0x3356 0x9694 # 隔 -0x3357 0x9769 # 革 -0x3358 0x5B66 # 学 -0x3359 0x5CB3 # 岳 -0x335A 0x697D # 楽 -0x335B 0x984D # 額 -0x335C 0x984E # 顎 -0x335D 0x639B # 掛 -0x335E 0x7B20 # 笠 -0x335F 0x6A2B # 樫 -0x3360 0x6A7F # 橿 -0x3361 0x68B6 # 梶 -0x3362 0x9C0D # 鰍 -0x3363 0x6F5F # 潟 -0x3364 0x5272 # 割 -0x3365 0x559D # 喝 -0x3366 0x6070 # 恰 -0x3367 0x62EC # 括 -0x3368 0x6D3B # 活 -0x3369 0x6E07 # 渇 -0x336A 0x6ED1 # 滑 -0x336B 0x845B # 葛 -0x336C 0x8910 # 褐 -0x336D 0x8F44 # 轄 -0x336E 0x4E14 # 且 -0x336F 0x9C39 # 鰹 -0x3370 0x53F6 # 叶 -0x3371 0x691B # 椛 -0x3372 0x6A3A # 樺 -0x3373 0x9784 # 鞄 -0x3374 0x682A # 株 -0x3375 0x515C # 兜 -0x3376 0x7AC3 # 竃 -0x3377 0x84B2 # 蒲 -0x3378 0x91DC # 釜 -0x3379 0x938C # 鎌 -0x337A 0x565B # 噛 -0x337B 0x9D28 # 鴨 -0x337C 0x6822 # 栢 -0x337D 0x8305 # 茅 -0x337E 0x8431 # 萱 - -# "64" JIS -0x3421 0x7CA5 # 粥 -0x3422 0x5208 # 刈 -0x3423 0x82C5 # 苅 -0x3424 0x74E6 # 瓦 -0x3425 0x4E7E # 乾 -0x3426 0x4F83 # 侃 -0x3427 0x51A0 # 冠 -0x3428 0x5BD2 # 寒 -0x3429 0x520A # 刊 -0x342A 0x52D8 # 勘 -0x342B 0x52E7 # 勧 -0x342C 0x5DFB # 巻 -0x342D 0x559A # 喚 -0x342E 0x582A # 堪 -0x342F 0x59E6 # 姦 -0x3430 0x5B8C # 完 -0x3431 0x5B98 # 官 -0x3432 0x5BDB # 寛 -0x3433 0x5E72 # 干 -0x3434 0x5E79 # 幹 -0x3435 0x60A3 # 患 -0x3436 0x611F # 感 -0x3437 0x6163 # 慣 -0x3438 0x61BE # 憾 -0x3439 0x63DB # 換 -0x343A 0x6562 # 敢 -0x343B 0x67D1 # 柑 -0x343C 0x6853 # 桓 -0x343D 0x68FA # 棺 -0x343E 0x6B3E # 款 -0x343F 0x6B53 # 歓 -0x3440 0x6C57 # 汗 -0x3441 0x6F22 # 漢 -0x3442 0x6F97 # 澗 -0x3443 0x6F45 # 潅 -0x3444 0x74B0 # 環 -0x3445 0x7518 # 甘 -0x3446 0x76E3 # 監 -0x3447 0x770B # 看 -0x3448 0x7AFF # 竿 -0x3449 0x7BA1 # 管 -0x344A 0x7C21 # 簡 -0x344B 0x7DE9 # 緩 -0x344C 0x7F36 # 缶 -0x344D 0x7FF0 # 翰 -0x344E 0x809D # 肝 -0x344F 0x8266 # 艦 -0x3450 0x839E # 莞 -0x3451 0x89B3 # 観 -0x3452 0x8ACC # 諌 -0x3453 0x8CAB # 貫 -0x3454 0x9084 # 還 -0x3455 0x9451 # 鑑 -0x3456 0x9593 # 間 -0x3457 0x9591 # 閑 -0x3458 0x95A2 # 関 -0x3459 0x9665 # 陥 -0x345A 0x97D3 # 韓 -0x345B 0x9928 # 館 -0x345C 0x8218 # 舘 -0x345D 0x4E38 # 丸 -0x345E 0x542B # 含 -0x345F 0x5CB8 # 岸 -0x3460 0x5DCC # 巌 -0x3461 0x73A9 # 玩 -0x3462 0x764C # 癌 -0x3463 0x773C # 眼 -0x3464 0x5CA9 # 岩 -0x3465 0x7FEB # 翫 -0x3466 0x8D0B # 贋 -0x3467 0x96C1 # 雁 -0x3468 0x9811 # 頑 -0x3469 0x9854 # 顔 -0x346A 0x9858 # 願 -0x346B 0x4F01 # 企 -0x346C 0x4F0E # 伎 -0x346D 0x5371 # 危 -0x346E 0x559C # 喜 -0x346F 0x5668 # 器 -0x3470 0x57FA # 基 -0x3471 0x5947 # 奇 -0x3472 0x5B09 # 嬉 -0x3473 0x5BC4 # 寄 -0x3474 0x5C90 # 岐 -0x3475 0x5E0C # 希 -0x3476 0x5E7E # 幾 -0x3477 0x5FCC # 忌 -0x3478 0x63EE # 揮 -0x3479 0x673A # 机 -0x347A 0x65D7 # 旗 -0x347B 0x65E2 # 既 -0x347C 0x671F # 期 -0x347D 0x68CB # 棋 -0x347E 0x68C4 # 棄 - -# "65" JIS -0x3521 0x6A5F # 機 -0x3522 0x5E30 # 帰 -0x3523 0x6BC5 # 毅 -0x3524 0x6C17 # 気 -0x3525 0x6C7D # 汽 -0x3526 0x757F # 畿 -0x3527 0x7948 # 祈 -0x3528 0x5B63 # 季 -0x3529 0x7A00 # 稀 -0x352A 0x7D00 # 紀 -0x352B 0x5FBD # 徽 -0x352C 0x898F # 規 -0x352D 0x8A18 # 記 -0x352E 0x8CB4 # 貴 -0x352F 0x8D77 # 起 -0x3530 0x8ECC # 軌 -0x3531 0x8F1D # 輝 -0x3532 0x98E2 # 飢 -0x3533 0x9A0E # 騎 -0x3534 0x9B3C # 鬼 -0x3535 0x4E80 # 亀 -0x3536 0x507D # 偽 -0x3537 0x5100 # 儀 -0x3538 0x5993 # 妓 -0x3539 0x5B9C # 宜 -0x353A 0x622F # 戯 -0x353B 0x6280 # 技 -0x353C 0x64EC # 擬 -0x353D 0x6B3A # 欺 -0x353E 0x72A0 # 犠 -0x353F 0x7591 # 疑 -0x3540 0x7947 # 祇 -0x3541 0x7FA9 # 義 -0x3542 0x87FB # 蟻 -0x3543 0x8ABC # 誼 -0x3544 0x8B70 # 議 -0x3545 0x63AC # 掬 -0x3546 0x83CA # 菊 -0x3547 0x97A0 # 鞠 -0x3548 0x5409 # 吉 -0x3549 0x5403 # 吃 -0x354A 0x55AB # 喫 -0x354B 0x6854 # 桔 -0x354C 0x6A58 # 橘 -0x354D 0x8A70 # 詰 -0x354E 0x7827 # 砧 -0x354F 0x6775 # 杵 -0x3550 0x9ECD # 黍 -0x3551 0x5374 # 却 -0x3552 0x5BA2 # 客 -0x3553 0x811A # 脚 -0x3554 0x8650 # 虐 -0x3555 0x9006 # 逆 -0x3556 0x4E18 # 丘 -0x3557 0x4E45 # 久 -0x3558 0x4EC7 # 仇 -0x3559 0x4F11 # 休 -0x355A 0x53CA # 及 -0x355B 0x5438 # 吸 -0x355C 0x5BAE # 宮 -0x355D 0x5F13 # 弓 -0x355E 0x6025 # 急 -0x355F 0x6551 # 救 -0x3560 0x673D # 朽 -0x3561 0x6C42 # 求 -0x3562 0x6C72 # 汲 -0x3563 0x6CE3 # 泣 -0x3564 0x7078 # 灸 -0x3565 0x7403 # 球 -0x3566 0x7A76 # 究 -0x3567 0x7AAE # 窮 -0x3568 0x7B08 # 笈 -0x3569 0x7D1A # 級 -0x356A 0x7CFE # 糾 -0x356B 0x7D66 # 給 -0x356C 0x65E7 # 旧 -0x356D 0x725B # 牛 -0x356E 0x53BB # 去 -0x356F 0x5C45 # 居 -0x3570 0x5DE8 # 巨 -0x3571 0x62D2 # 拒 -0x3572 0x62E0 # 拠 -0x3573 0x6319 # 挙 -0x3574 0x6E20 # 渠 -0x3575 0x865A # 虚 -0x3576 0x8A31 # 許 -0x3577 0x8DDD # 距 -0x3578 0x92F8 # 鋸 -0x3579 0x6F01 # 漁 -0x357A 0x79A6 # 禦 -0x357B 0x9B5A # 魚 -0x357C 0x4EA8 # 亨 -0x357D 0x4EAB # 享 -0x357E 0x4EAC # 京 - -# "66" JIS -0x3621 0x4F9B # 供 -0x3622 0x4FA0 # 侠 -0x3623 0x50D1 # 僑 -0x3624 0x5147 # 兇 -0x3625 0x7AF6 # 競 -0x3626 0x5171 # 共 -0x3627 0x51F6 # 凶 -0x3628 0x5354 # 協 -0x3629 0x5321 # 匡 -0x362A 0x537F # 卿 -0x362B 0x53EB # 叫 -0x362C 0x55AC # 喬 -0x362D 0x5883 # 境 -0x362E 0x5CE1 # 峡 -0x362F 0x5F37 # 強 -0x3630 0x5F4A # 彊 -0x3631 0x602F # 怯 -0x3632 0x6050 # 恐 -0x3633 0x606D # 恭 -0x3634 0x631F # 挟 -0x3635 0x6559 # 教 -0x3636 0x6A4B # 橋 -0x3637 0x6CC1 # 況 -0x3638 0x72C2 # 狂 -0x3639 0x72ED # 狭 -0x363A 0x77EF # 矯 -0x363B 0x80F8 # 胸 -0x363C 0x8105 # 脅 -0x363D 0x8208 # 興 -0x363E 0x854E # 蕎 -0x363F 0x90F7 # 郷 -0x3640 0x93E1 # 鏡 -0x3641 0x97FF # 響 -0x3642 0x9957 # 饗 -0x3643 0x9A5A # 驚 -0x3644 0x4EF0 # 仰 -0x3645 0x51DD # 凝 -0x3646 0x5C2D # 尭 -0x3647 0x6681 # 暁 -0x3648 0x696D # 業 -0x3649 0x5C40 # 局 -0x364A 0x66F2 # 曲 -0x364B 0x6975 # 極 -0x364C 0x7389 # 玉 -0x364D 0x6850 # 桐 -0x364E 0x7C81 # 粁 -0x364F 0x50C5 # 僅 -0x3650 0x52E4 # 勤 -0x3651 0x5747 # 均 -0x3652 0x5DFE # 巾 -0x3653 0x9326 # 錦 -0x3654 0x65A4 # 斤 -0x3655 0x6B23 # 欣 -0x3656 0x6B3D # 欽 -0x3657 0x7434 # 琴 -0x3658 0x7981 # 禁 -0x3659 0x79BD # 禽 -0x365A 0x7B4B # 筋 -0x365B 0x7DCA # 緊 -0x365C 0x82B9 # 芹 -0x365D 0x83CC # 菌 -0x365E 0x887F # 衿 -0x365F 0x895F # 襟 -0x3660 0x8B39 # 謹 -0x3661 0x8FD1 # 近 -0x3662 0x91D1 # 金 -0x3663 0x541F # 吟 -0x3664 0x9280 # 銀 -0x3665 0x4E5D # 九 -0x3666 0x5036 # 倶 -0x3667 0x53E5 # 句 -0x3668 0x533A # 区 -0x3669 0x72D7 # 狗 -0x366A 0x7396 # 玖 -0x366B 0x77E9 # 矩 -0x366C 0x82E6 # 苦 -0x366D 0x8EAF # 躯 -0x366E 0x99C6 # 駆 -0x366F 0x99C8 # 駈 -0x3670 0x99D2 # 駒 -0x3671 0x5177 # 具 -0x3672 0x611A # 愚 -0x3673 0x865E # 虞 -0x3674 0x55B0 # 喰 -0x3675 0x7A7A # 空 -0x3676 0x5076 # 偶 -0x3677 0x5BD3 # 寓 -0x3678 0x9047 # 遇 -0x3679 0x9685 # 隅 -0x367A 0x4E32 # 串 -0x367B 0x6ADB # 櫛 -0x367C 0x91E7 # 釧 -0x367D 0x5C51 # 屑 -0x367E 0x5C48 # 屈 - -# "67" JIS -0x3721 0x6398 # 掘 -0x3722 0x7A9F # 窟 -0x3723 0x6C93 # 沓 -0x3724 0x9774 # 靴 -0x3725 0x8F61 # 轡 -0x3726 0x7AAA # 窪 -0x3727 0x718A # 熊 -0x3728 0x9688 # 隈 -0x3729 0x7C82 # 粂 -0x372A 0x6817 # 栗 -0x372B 0x7E70 # 繰 -0x372C 0x6851 # 桑 -0x372D 0x936C # 鍬 -0x372E 0x52F2 # 勲 -0x372F 0x541B # 君 -0x3730 0x85AB # 薫 -0x3731 0x8A13 # 訓 -0x3732 0x7FA4 # 群 -0x3733 0x8ECD # 軍 -0x3734 0x90E1 # 郡 -0x3735 0x5366 # 卦 -0x3736 0x8888 # 袈 -0x3737 0x7941 # 祁 -0x3738 0x4FC2 # 係 -0x3739 0x50BE # 傾 -0x373A 0x5211 # 刑 -0x373B 0x5144 # 兄 -0x373C 0x5553 # 啓 -0x373D 0x572D # 圭 -0x373E 0x73EA # 珪 -0x373F 0x578B # 型 -0x3740 0x5951 # 契 -0x3741 0x5F62 # 形 -0x3742 0x5F84 # 径 -0x3743 0x6075 # 恵 -0x3744 0x6176 # 慶 -0x3745 0x6167 # 慧 -0x3746 0x61A9 # 憩 -0x3747 0x63B2 # 掲 -0x3748 0x643A # 携 -0x3749 0x656C # 敬 -0x374A 0x666F # 景 -0x374B 0x6842 # 桂 -0x374C 0x6E13 # 渓 -0x374D 0x7566 # 畦 -0x374E 0x7A3D # 稽 -0x374F 0x7CFB # 系 -0x3750 0x7D4C # 経 -0x3751 0x7D99 # 継 -0x3752 0x7E4B # 繋 -0x3753 0x7F6B # 罫 -0x3754 0x830E # 茎 -0x3755 0x834A # 荊 -0x3756 0x86CD # 蛍 -0x3757 0x8A08 # 計 -0x3758 0x8A63 # 詣 -0x3759 0x8B66 # 警 -0x375A 0x8EFD # 軽 -0x375B 0x981A # 頚 -0x375C 0x9D8F # 鶏 -0x375D 0x82B8 # 芸 -0x375E 0x8FCE # 迎 -0x375F 0x9BE8 # 鯨 -0x3760 0x5287 # 劇 -0x3761 0x621F # 戟 -0x3762 0x6483 # 撃 -0x3763 0x6FC0 # 激 -0x3764 0x9699 # 隙 -0x3765 0x6841 # 桁 -0x3766 0x5091 # 傑 -0x3767 0x6B20 # 欠 -0x3768 0x6C7A # 決 -0x3769 0x6F54 # 潔 -0x376A 0x7A74 # 穴 -0x376B 0x7D50 # 結 -0x376C 0x8840 # 血 -0x376D 0x8A23 # 訣 -0x376E 0x6708 # 月 -0x376F 0x4EF6 # 件 -0x3770 0x5039 # 倹 -0x3771 0x5026 # 倦 -0x3772 0x5065 # 健 -0x3773 0x517C # 兼 -0x3774 0x5238 # 券 -0x3775 0x5263 # 剣 -0x3776 0x55A7 # 喧 -0x3777 0x570F # 圏 -0x3778 0x5805 # 堅 -0x3779 0x5ACC # 嫌 -0x377A 0x5EFA # 建 -0x377B 0x61B2 # 憲 -0x377C 0x61F8 # 懸 -0x377D 0x62F3 # 拳 -0x377E 0x6372 # 捲 - -# "70" JIS -0x3821 0x691C # 検 -0x3822 0x6A29 # 権 -0x3823 0x727D # 牽 -0x3824 0x72AC # 犬 -0x3825 0x732E # 献 -0x3826 0x7814 # 研 -0x3827 0x786F # 硯 -0x3828 0x7D79 # 絹 -0x3829 0x770C # 県 -0x382A 0x80A9 # 肩 -0x382B 0x898B # 見 -0x382C 0x8B19 # 謙 -0x382D 0x8CE2 # 賢 -0x382E 0x8ED2 # 軒 -0x382F 0x9063 # 遣 -0x3830 0x9375 # 鍵 -0x3831 0x967A # 険 -0x3832 0x9855 # 顕 -0x3833 0x9A13 # 験 -0x3834 0x9E78 # 鹸 -0x3835 0x5143 # 元 -0x3836 0x539F # 原 -0x3837 0x53B3 # 厳 -0x3838 0x5E7B # 幻 -0x3839 0x5F26 # 弦 -0x383A 0x6E1B # 減 -0x383B 0x6E90 # 源 -0x383C 0x7384 # 玄 -0x383D 0x73FE # 現 -0x383E 0x7D43 # 絃 -0x383F 0x8237 # 舷 -0x3840 0x8A00 # 言 -0x3841 0x8AFA # 諺 -0x3842 0x9650 # 限 -0x3843 0x4E4E # 乎 -0x3844 0x500B # 個 -0x3845 0x53E4 # 古 -0x3846 0x547C # 呼 -0x3847 0x56FA # 固 -0x3848 0x59D1 # 姑 -0x3849 0x5B64 # 孤 -0x384A 0x5DF1 # 己 -0x384B 0x5EAB # 庫 -0x384C 0x5F27 # 弧 -0x384D 0x6238 # 戸 -0x384E 0x6545 # 故 -0x384F 0x67AF # 枯 -0x3850 0x6E56 # 湖 -0x3851 0x72D0 # 狐 -0x3852 0x7CCA # 糊 -0x3853 0x88B4 # 袴 -0x3854 0x80A1 # 股 -0x3855 0x80E1 # 胡 -0x3856 0x83F0 # 菰 -0x3857 0x864E # 虎 -0x3858 0x8A87 # 誇 -0x3859 0x8DE8 # 跨 -0x385A 0x9237 # 鈷 -0x385B 0x96C7 # 雇 -0x385C 0x9867 # 顧 -0x385D 0x9F13 # 鼓 -0x385E 0x4E94 # 五 -0x385F 0x4E92 # 互 -0x3860 0x4F0D # 伍 -0x3861 0x5348 # 午 -0x3862 0x5449 # 呉 -0x3863 0x543E # 吾 -0x3864 0x5A2F # 娯 -0x3865 0x5F8C # 後 -0x3866 0x5FA1 # 御 -0x3867 0x609F # 悟 -0x3868 0x68A7 # 梧 -0x3869 0x6A8E # 檎 -0x386A 0x745A # 瑚 -0x386B 0x7881 # 碁 -0x386C 0x8A9E # 語 -0x386D 0x8AA4 # 誤 -0x386E 0x8B77 # 護 -0x386F 0x9190 # 醐 -0x3870 0x4E5E # 乞 -0x3871 0x9BC9 # 鯉 -0x3872 0x4EA4 # 交 -0x3873 0x4F7C # 佼 -0x3874 0x4FAF # 侯 -0x3875 0x5019 # 候 -0x3876 0x5016 # 倖 -0x3877 0x5149 # 光 -0x3878 0x516C # 公 -0x3879 0x529F # 功 -0x387A 0x52B9 # 効 -0x387B 0x52FE # 勾 -0x387C 0x539A # 厚 -0x387D 0x53E3 # 口 -0x387E 0x5411 # 向 - -# "71" JIS -0x3921 0x540E # 后 -0x3922 0x5589 # 喉 -0x3923 0x5751 # 坑 -0x3924 0x57A2 # 垢 -0x3925 0x597D # 好 -0x3926 0x5B54 # 孔 -0x3927 0x5B5D # 孝 -0x3928 0x5B8F # 宏 -0x3929 0x5DE5 # 工 -0x392A 0x5DE7 # 巧 -0x392B 0x5DF7 # 巷 -0x392C 0x5E78 # 幸 -0x392D 0x5E83 # 広 -0x392E 0x5E9A # 庚 -0x392F 0x5EB7 # 康 -0x3930 0x5F18 # 弘 -0x3931 0x6052 # 恒 -0x3932 0x614C # 慌 -0x3933 0x6297 # 抗 -0x3934 0x62D8 # 拘 -0x3935 0x63A7 # 控 -0x3936 0x653B # 攻 -0x3937 0x6602 # 昂 -0x3938 0x6643 # 晃 -0x3939 0x66F4 # 更 -0x393A 0x676D # 杭 -0x393B 0x6821 # 校 -0x393C 0x6897 # 梗 -0x393D 0x69CB # 構 -0x393E 0x6C5F # 江 -0x393F 0x6D2A # 洪 -0x3940 0x6D69 # 浩 -0x3941 0x6E2F # 港 -0x3942 0x6E9D # 溝 -0x3943 0x7532 # 甲 -0x3944 0x7687 # 皇 -0x3945 0x786C # 硬 -0x3946 0x7A3F # 稿 -0x3947 0x7CE0 # 糠 -0x3948 0x7D05 # 紅 -0x3949 0x7D18 # 紘 -0x394A 0x7D5E # 絞 -0x394B 0x7DB1 # 綱 -0x394C 0x8015 # 耕 -0x394D 0x8003 # 考 -0x394E 0x80AF # 肯 -0x394F 0x80B1 # 肱 -0x3950 0x8154 # 腔 -0x3951 0x818F # 膏 -0x3952 0x822A # 航 -0x3953 0x8352 # 荒 -0x3954 0x884C # 行 -0x3955 0x8861 # 衡 -0x3956 0x8B1B # 講 -0x3957 0x8CA2 # 貢 -0x3958 0x8CFC # 購 -0x3959 0x90CA # 郊 -0x395A 0x9175 # 酵 -0x395B 0x9271 # 鉱 -0x395C 0x783F # 砿 -0x395D 0x92FC # 鋼 -0x395E 0x95A4 # 閤 -0x395F 0x964D # 降 -0x3960 0x9805 # 項 -0x3961 0x9999 # 香 -0x3962 0x9AD8 # 高 -0x3963 0x9D3B # 鴻 -0x3964 0x525B # 剛 -0x3965 0x52AB # 劫 -0x3966 0x53F7 # 号 -0x3967 0x5408 # 合 -0x3968 0x58D5 # 壕 -0x3969 0x62F7 # 拷 -0x396A 0x6FE0 # 濠 -0x396B 0x8C6A # 豪 -0x396C 0x8F5F # 轟 -0x396D 0x9EB9 # 麹 -0x396E 0x514B # 克 -0x396F 0x523B # 刻 -0x3970 0x544A # 告 -0x3971 0x56FD # 国 -0x3972 0x7A40 # 穀 -0x3973 0x9177 # 酷 -0x3974 0x9D60 # 鵠 -0x3975 0x9ED2 # 黒 -0x3976 0x7344 # 獄 -0x3977 0x6F09 # 漉 -0x3978 0x8170 # 腰 -0x3979 0x7511 # 甑 -0x397A 0x5FFD # 忽 -0x397B 0x60DA # 惚 -0x397C 0x9AA8 # 骨 -0x397D 0x72DB # 狛 -0x397E 0x8FBC # 込 - -# "72" JIS -0x3A21 0x6B64 # 此 -0x3A22 0x9803 # 頃 -0x3A23 0x4ECA # 今 -0x3A24 0x56F0 # 困 -0x3A25 0x5764 # 坤 -0x3A26 0x58BE # 墾 -0x3A27 0x5A5A # 婚 -0x3A28 0x6068 # 恨 -0x3A29 0x61C7 # 懇 -0x3A2A 0x660F # 昏 -0x3A2B 0x6606 # 昆 -0x3A2C 0x6839 # 根 -0x3A2D 0x68B1 # 梱 -0x3A2E 0x6DF7 # 混 -0x3A2F 0x75D5 # 痕 -0x3A30 0x7D3A # 紺 -0x3A31 0x826E # 艮 -0x3A32 0x9B42 # 魂 -0x3A33 0x4E9B # 些 -0x3A34 0x4F50 # 佐 -0x3A35 0x53C9 # 叉 -0x3A36 0x5506 # 唆 -0x3A37 0x5D6F # 嵯 -0x3A38 0x5DE6 # 左 -0x3A39 0x5DEE # 差 -0x3A3A 0x67FB # 査 -0x3A3B 0x6C99 # 沙 -0x3A3C 0x7473 # 瑳 -0x3A3D 0x7802 # 砂 -0x3A3E 0x8A50 # 詐 -0x3A3F 0x9396 # 鎖 -0x3A40 0x88DF # 裟 -0x3A41 0x5750 # 坐 -0x3A42 0x5EA7 # 座 -0x3A43 0x632B # 挫 -0x3A44 0x50B5 # 債 -0x3A45 0x50AC # 催 -0x3A46 0x518D # 再 -0x3A47 0x6700 # 最 -0x3A48 0x54C9 # 哉 -0x3A49 0x585E # 塞 -0x3A4A 0x59BB # 妻 -0x3A4B 0x5BB0 # 宰 -0x3A4C 0x5F69 # 彩 -0x3A4D 0x624D # 才 -0x3A4E 0x63A1 # 採 -0x3A4F 0x683D # 栽 -0x3A50 0x6B73 # 歳 -0x3A51 0x6E08 # 済 -0x3A52 0x707D # 災 -0x3A53 0x91C7 # 采 -0x3A54 0x7280 # 犀 -0x3A55 0x7815 # 砕 -0x3A56 0x7826 # 砦 -0x3A57 0x796D # 祭 -0x3A58 0x658E # 斎 -0x3A59 0x7D30 # 細 -0x3A5A 0x83DC # 菜 -0x3A5B 0x88C1 # 裁 -0x3A5C 0x8F09 # 載 -0x3A5D 0x969B # 際 -0x3A5E 0x5264 # 剤 -0x3A5F 0x5728 # 在 -0x3A60 0x6750 # 材 -0x3A61 0x7F6A # 罪 -0x3A62 0x8CA1 # 財 -0x3A63 0x51B4 # 冴 -0x3A64 0x5742 # 坂 -0x3A65 0x962A # 阪 -0x3A66 0x583A # 堺 -0x3A67 0x698A # 榊 -0x3A68 0x80B4 # 肴 -0x3A69 0x54B2 # 咲 -0x3A6A 0x5D0E # 崎 -0x3A6B 0x57FC # 埼 -0x3A6C 0x7895 # 碕 -0x3A6D 0x9DFA # 鷺 -0x3A6E 0x4F5C # 作 -0x3A6F 0x524A # 削 -0x3A70 0x548B # 咋 -0x3A71 0x643E # 搾 -0x3A72 0x6628 # 昨 -0x3A73 0x6714 # 朔 -0x3A74 0x67F5 # 柵 -0x3A75 0x7A84 # 窄 -0x3A76 0x7B56 # 策 -0x3A77 0x7D22 # 索 -0x3A78 0x932F # 錯 -0x3A79 0x685C # 桜 -0x3A7A 0x9BAD # 鮭 -0x3A7B 0x7B39 # 笹 -0x3A7C 0x5319 # 匙 -0x3A7D 0x518A # 冊 -0x3A7E 0x5237 # 刷 - -# "73" JIS -0x3B21 0x5BDF # 察 -0x3B22 0x62F6 # 拶 -0x3B23 0x64AE # 撮 -0x3B24 0x64E6 # 擦 -0x3B25 0x672D # 札 -0x3B26 0x6BBA # 殺 -0x3B27 0x85A9 # 薩 -0x3B28 0x96D1 # 雑 -0x3B29 0x7690 # 皐 -0x3B2A 0x9BD6 # 鯖 -0x3B2B 0x634C # 捌 -0x3B2C 0x9306 # 錆 -0x3B2D 0x9BAB # 鮫 -0x3B2E 0x76BF # 皿 -0x3B2F 0x6652 # 晒 -0x3B30 0x4E09 # 三 -0x3B31 0x5098 # 傘 -0x3B32 0x53C2 # 参 -0x3B33 0x5C71 # 山 -0x3B34 0x60E8 # 惨 -0x3B35 0x6492 # 撒 -0x3B36 0x6563 # 散 -0x3B37 0x685F # 桟 -0x3B38 0x71E6 # 燦 -0x3B39 0x73CA # 珊 -0x3B3A 0x7523 # 産 -0x3B3B 0x7B97 # 算 -0x3B3C 0x7E82 # 纂 -0x3B3D 0x8695 # 蚕 -0x3B3E 0x8B83 # 讃 -0x3B3F 0x8CDB # 賛 -0x3B40 0x9178 # 酸 -0x3B41 0x9910 # 餐 -0x3B42 0x65AC # 斬 -0x3B43 0x66AB # 暫 -0x3B44 0x6B8B # 残 -0x3B45 0x4ED5 # 仕 -0x3B46 0x4ED4 # 仔 -0x3B47 0x4F3A # 伺 -0x3B48 0x4F7F # 使 -0x3B49 0x523A # 刺 -0x3B4A 0x53F8 # 司 -0x3B4B 0x53F2 # 史 -0x3B4C 0x55E3 # 嗣 -0x3B4D 0x56DB # 四 -0x3B4E 0x58EB # 士 -0x3B4F 0x59CB # 始 -0x3B50 0x59C9 # 姉 -0x3B51 0x59FF # 姿 -0x3B52 0x5B50 # 子 -0x3B53 0x5C4D # 屍 -0x3B54 0x5E02 # 市 -0x3B55 0x5E2B # 師 -0x3B56 0x5FD7 # 志 -0x3B57 0x601D # 思 -0x3B58 0x6307 # 指 -0x3B59 0x652F # 支 -0x3B5A 0x5B5C # 孜 -0x3B5B 0x65AF # 斯 -0x3B5C 0x65BD # 施 -0x3B5D 0x65E8 # 旨 -0x3B5E 0x679D # 枝 -0x3B5F 0x6B62 # 止 -0x3B60 0x6B7B # 死 -0x3B61 0x6C0F # 氏 -0x3B62 0x7345 # 獅 -0x3B63 0x7949 # 祉 -0x3B64 0x79C1 # 私 -0x3B65 0x7CF8 # 糸 -0x3B66 0x7D19 # 紙 -0x3B67 0x7D2B # 紫 -0x3B68 0x80A2 # 肢 -0x3B69 0x8102 # 脂 -0x3B6A 0x81F3 # 至 -0x3B6B 0x8996 # 視 -0x3B6C 0x8A5E # 詞 -0x3B6D 0x8A69 # 詩 -0x3B6E 0x8A66 # 試 -0x3B6F 0x8A8C # 誌 -0x3B70 0x8AEE # 諮 -0x3B71 0x8CC7 # 資 -0x3B72 0x8CDC # 賜 -0x3B73 0x96CC # 雌 -0x3B74 0x98FC # 飼 -0x3B75 0x6B6F # 歯 -0x3B76 0x4E8B # 事 -0x3B77 0x4F3C # 似 -0x3B78 0x4F8D # 侍 -0x3B79 0x5150 # 児 -0x3B7A 0x5B57 # 字 -0x3B7B 0x5BFA # 寺 -0x3B7C 0x6148 # 慈 -0x3B7D 0x6301 # 持 -0x3B7E 0x6642 # 時 - -# "74" JIS -0x3C21 0x6B21 # 次 -0x3C22 0x6ECB # 滋 -0x3C23 0x6CBB # 治 -0x3C24 0x723E # 爾 -0x3C25 0x74BD # 璽 -0x3C26 0x75D4 # 痔 -0x3C27 0x78C1 # 磁 -0x3C28 0x793A # 示 -0x3C29 0x800C # 而 -0x3C2A 0x8033 # 耳 -0x3C2B 0x81EA # 自 -0x3C2C 0x8494 # 蒔 -0x3C2D 0x8F9E # 辞 -0x3C2E 0x6C50 # 汐 -0x3C2F 0x9E7F # 鹿 -0x3C30 0x5F0F # 式 -0x3C31 0x8B58 # 識 -0x3C32 0x9D2B # 鴫 -0x3C33 0x7AFA # 竺 -0x3C34 0x8EF8 # 軸 -0x3C35 0x5B8D # 宍 -0x3C36 0x96EB # 雫 -0x3C37 0x4E03 # 七 -0x3C38 0x53F1 # 叱 -0x3C39 0x57F7 # 執 -0x3C3A 0x5931 # 失 -0x3C3B 0x5AC9 # 嫉 -0x3C3C 0x5BA4 # 室 -0x3C3D 0x6089 # 悉 -0x3C3E 0x6E7F # 湿 -0x3C3F 0x6F06 # 漆 -0x3C40 0x75BE # 疾 -0x3C41 0x8CEA # 質 -0x3C42 0x5B9F # 実 -0x3C43 0x8500 # 蔀 -0x3C44 0x7BE0 # 篠 -0x3C45 0x5072 # 偲 -0x3C46 0x67F4 # 柴 -0x3C47 0x829D # 芝 -0x3C48 0x5C61 # 屡 -0x3C49 0x854A # 蕊 -0x3C4A 0x7E1E # 縞 -0x3C4B 0x820E # 舎 -0x3C4C 0x5199 # 写 -0x3C4D 0x5C04 # 射 -0x3C4E 0x6368 # 捨 -0x3C4F 0x8D66 # 赦 -0x3C50 0x659C # 斜 -0x3C51 0x716E # 煮 -0x3C52 0x793E # 社 -0x3C53 0x7D17 # 紗 -0x3C54 0x8005 # 者 -0x3C55 0x8B1D # 謝 -0x3C56 0x8ECA # 車 -0x3C57 0x906E # 遮 -0x3C58 0x86C7 # 蛇 -0x3C59 0x90AA # 邪 -0x3C5A 0x501F # 借 -0x3C5B 0x52FA # 勺 -0x3C5C 0x5C3A # 尺 -0x3C5D 0x6753 # 杓 -0x3C5E 0x707C # 灼 -0x3C5F 0x7235 # 爵 -0x3C60 0x914C # 酌 -0x3C61 0x91C8 # 釈 -0x3C62 0x932B # 錫 -0x3C63 0x82E5 # 若 -0x3C64 0x5BC2 # 寂 -0x3C65 0x5F31 # 弱 -0x3C66 0x60F9 # 惹 -0x3C67 0x4E3B # 主 -0x3C68 0x53D6 # 取 -0x3C69 0x5B88 # 守 -0x3C6A 0x624B # 手 -0x3C6B 0x6731 # 朱 -0x3C6C 0x6B8A # 殊 -0x3C6D 0x72E9 # 狩 -0x3C6E 0x73E0 # 珠 -0x3C6F 0x7A2E # 種 -0x3C70 0x816B # 腫 -0x3C71 0x8DA3 # 趣 -0x3C72 0x9152 # 酒 -0x3C73 0x9996 # 首 -0x3C74 0x5112 # 儒 -0x3C75 0x53D7 # 受 -0x3C76 0x546A # 呪 -0x3C77 0x5BFF # 寿 -0x3C78 0x6388 # 授 -0x3C79 0x6A39 # 樹 -0x3C7A 0x7DAC # 綬 -0x3C7B 0x9700 # 需 -0x3C7C 0x56DA # 囚 -0x3C7D 0x53CE # 収 -0x3C7E 0x5468 # 周 - -# "75" JIS -0x3D21 0x5B97 # 宗 -0x3D22 0x5C31 # 就 -0x3D23 0x5DDE # 州 -0x3D24 0x4FEE # 修 -0x3D25 0x6101 # 愁 -0x3D26 0x62FE # 拾 -0x3D27 0x6D32 # 洲 -0x3D28 0x79C0 # 秀 -0x3D29 0x79CB # 秋 -0x3D2A 0x7D42 # 終 -0x3D2B 0x7E4D # 繍 -0x3D2C 0x7FD2 # 習 -0x3D2D 0x81ED # 臭 -0x3D2E 0x821F # 舟 -0x3D2F 0x8490 # 蒐 -0x3D30 0x8846 # 衆 -0x3D31 0x8972 # 襲 -0x3D32 0x8B90 # 讐 -0x3D33 0x8E74 # 蹴 -0x3D34 0x8F2F # 輯 -0x3D35 0x9031 # 週 -0x3D36 0x914B # 酋 -0x3D37 0x916C # 酬 -0x3D38 0x96C6 # 集 -0x3D39 0x919C # 醜 -0x3D3A 0x4EC0 # 什 -0x3D3B 0x4F4F # 住 -0x3D3C 0x5145 # 充 -0x3D3D 0x5341 # 十 -0x3D3E 0x5F93 # 従 -0x3D3F 0x620E # 戎 -0x3D40 0x67D4 # 柔 -0x3D41 0x6C41 # 汁 -0x3D42 0x6E0B # 渋 -0x3D43 0x7363 # 獣 -0x3D44 0x7E26 # 縦 -0x3D45 0x91CD # 重 -0x3D46 0x9283 # 銃 -0x3D47 0x53D4 # 叔 -0x3D48 0x5919 # 夙 -0x3D49 0x5BBF # 宿 -0x3D4A 0x6DD1 # 淑 -0x3D4B 0x795D # 祝 -0x3D4C 0x7E2E # 縮 -0x3D4D 0x7C9B # 粛 -0x3D4E 0x587E # 塾 -0x3D4F 0x719F # 熟 -0x3D50 0x51FA # 出 -0x3D51 0x8853 # 術 -0x3D52 0x8FF0 # 述 -0x3D53 0x4FCA # 俊 -0x3D54 0x5CFB # 峻 -0x3D55 0x6625 # 春 -0x3D56 0x77AC # 瞬 -0x3D57 0x7AE3 # 竣 -0x3D58 0x821C # 舜 -0x3D59 0x99FF # 駿 -0x3D5A 0x51C6 # 准 -0x3D5B 0x5FAA # 循 -0x3D5C 0x65EC # 旬 -0x3D5D 0x696F # 楯 -0x3D5E 0x6B89 # 殉 -0x3D5F 0x6DF3 # 淳 -0x3D60 0x6E96 # 準 -0x3D61 0x6F64 # 潤 -0x3D62 0x76FE # 盾 -0x3D63 0x7D14 # 純 -0x3D64 0x5DE1 # 巡 -0x3D65 0x9075 # 遵 -0x3D66 0x9187 # 醇 -0x3D67 0x9806 # 順 -0x3D68 0x51E6 # 処 -0x3D69 0x521D # 初 -0x3D6A 0x6240 # 所 -0x3D6B 0x6691 # 暑 -0x3D6C 0x66D9 # 曙 -0x3D6D 0x6E1A # 渚 -0x3D6E 0x5EB6 # 庶 -0x3D6F 0x7DD2 # 緒 -0x3D70 0x7F72 # 署 -0x3D71 0x66F8 # 書 -0x3D72 0x85AF # 薯 -0x3D73 0x85F7 # 藷 -0x3D74 0x8AF8 # 諸 -0x3D75 0x52A9 # 助 -0x3D76 0x53D9 # 叙 -0x3D77 0x5973 # 女 -0x3D78 0x5E8F # 序 -0x3D79 0x5F90 # 徐 -0x3D7A 0x6055 # 恕 -0x3D7B 0x92E4 # 鋤 -0x3D7C 0x9664 # 除 -0x3D7D 0x50B7 # 傷 -0x3D7E 0x511F # 償 - -# "76" JIS -0x3E21 0x52DD # 勝 -0x3E22 0x5320 # 匠 -0x3E23 0x5347 # 升 -0x3E24 0x53EC # 召 -0x3E25 0x54E8 # 哨 -0x3E26 0x5546 # 商 -0x3E27 0x5531 # 唱 -0x3E28 0x5617 # 嘗 -0x3E29 0x5968 # 奨 -0x3E2A 0x59BE # 妾 -0x3E2B 0x5A3C # 娼 -0x3E2C 0x5BB5 # 宵 -0x3E2D 0x5C06 # 将 -0x3E2E 0x5C0F # 小 -0x3E2F 0x5C11 # 少 -0x3E30 0x5C1A # 尚 -0x3E31 0x5E84 # 庄 -0x3E32 0x5E8A # 床 -0x3E33 0x5EE0 # 廠 -0x3E34 0x5F70 # 彰 -0x3E35 0x627F # 承 -0x3E36 0x6284 # 抄 -0x3E37 0x62DB # 招 -0x3E38 0x638C # 掌 -0x3E39 0x6377 # 捷 -0x3E3A 0x6607 # 昇 -0x3E3B 0x660C # 昌 -0x3E3C 0x662D # 昭 -0x3E3D 0x6676 # 晶 -0x3E3E 0x677E # 松 -0x3E3F 0x68A2 # 梢 -0x3E40 0x6A1F # 樟 -0x3E41 0x6A35 # 樵 -0x3E42 0x6CBC # 沼 -0x3E43 0x6D88 # 消 -0x3E44 0x6E09 # 渉 -0x3E45 0x6E58 # 湘 -0x3E46 0x713C # 焼 -0x3E47 0x7126 # 焦 -0x3E48 0x7167 # 照 -0x3E49 0x75C7 # 症 -0x3E4A 0x7701 # 省 -0x3E4B 0x785D # 硝 -0x3E4C 0x7901 # 礁 -0x3E4D 0x7965 # 祥 -0x3E4E 0x79F0 # 称 -0x3E4F 0x7AE0 # 章 -0x3E50 0x7B11 # 笑 -0x3E51 0x7CA7 # 粧 -0x3E52 0x7D39 # 紹 -0x3E53 0x8096 # 肖 -0x3E54 0x83D6 # 菖 -0x3E55 0x848B # 蒋 -0x3E56 0x8549 # 蕉 -0x3E57 0x885D # 衝 -0x3E58 0x88F3 # 裳 -0x3E59 0x8A1F # 訟 -0x3E5A 0x8A3C # 証 -0x3E5B 0x8A54 # 詔 -0x3E5C 0x8A73 # 詳 -0x3E5D 0x8C61 # 象 -0x3E5E 0x8CDE # 賞 -0x3E5F 0x91A4 # 醤 -0x3E60 0x9266 # 鉦 -0x3E61 0x937E # 鍾 -0x3E62 0x9418 # 鐘 -0x3E63 0x969C # 障 -0x3E64 0x9798 # 鞘 -0x3E65 0x4E0A # 上 -0x3E66 0x4E08 # 丈 -0x3E67 0x4E1E # 丞 -0x3E68 0x4E57 # 乗 -0x3E69 0x5197 # 冗 -0x3E6A 0x5270 # 剰 -0x3E6B 0x57CE # 城 -0x3E6C 0x5834 # 場 -0x3E6D 0x58CC # 壌 -0x3E6E 0x5B22 # 嬢 -0x3E6F 0x5E38 # 常 -0x3E70 0x60C5 # 情 -0x3E71 0x64FE # 擾 -0x3E72 0x6761 # 条 -0x3E73 0x6756 # 杖 -0x3E74 0x6D44 # 浄 -0x3E75 0x72B6 # 状 -0x3E76 0x7573 # 畳 -0x3E77 0x7A63 # 穣 -0x3E78 0x84B8 # 蒸 -0x3E79 0x8B72 # 譲 -0x3E7A 0x91B8 # 醸 -0x3E7B 0x9320 # 錠 -0x3E7C 0x5631 # 嘱 -0x3E7D 0x57F4 # 埴 -0x3E7E 0x98FE # 飾 - -# "77" JIS -0x3F21 0x62ED # 拭 -0x3F22 0x690D # 植 -0x3F23 0x6B96 # 殖 -0x3F24 0x71ED # 燭 -0x3F25 0x7E54 # 織 -0x3F26 0x8077 # 職 -0x3F27 0x8272 # 色 -0x3F28 0x89E6 # 触 -0x3F29 0x98DF # 食 -0x3F2A 0x8755 # 蝕 -0x3F2B 0x8FB1 # 辱 -0x3F2C 0x5C3B # 尻 -0x3F2D 0x4F38 # 伸 -0x3F2E 0x4FE1 # 信 -0x3F2F 0x4FB5 # 侵 -0x3F30 0x5507 # 唇 -0x3F31 0x5A20 # 娠 -0x3F32 0x5BDD # 寝 -0x3F33 0x5BE9 # 審 -0x3F34 0x5FC3 # 心 -0x3F35 0x614E # 慎 -0x3F36 0x632F # 振 -0x3F37 0x65B0 # 新 -0x3F38 0x664B # 晋 -0x3F39 0x68EE # 森 -0x3F3A 0x699B # 榛 -0x3F3B 0x6D78 # 浸 -0x3F3C 0x6DF1 # 深 -0x3F3D 0x7533 # 申 -0x3F3E 0x75B9 # 疹 -0x3F3F 0x771F # 真 -0x3F40 0x795E # 神 -0x3F41 0x79E6 # 秦 -0x3F42 0x7D33 # 紳 -0x3F43 0x81E3 # 臣 -0x3F44 0x82AF # 芯 -0x3F45 0x85AA # 薪 -0x3F46 0x89AA # 親 -0x3F47 0x8A3A # 診 -0x3F48 0x8EAB # 身 -0x3F49 0x8F9B # 辛 -0x3F4A 0x9032 # 進 -0x3F4B 0x91DD # 針 -0x3F4C 0x9707 # 震 -0x3F4D 0x4EBA # 人 -0x3F4E 0x4EC1 # 仁 -0x3F4F 0x5203 # 刃 -0x3F50 0x5875 # 塵 -0x3F51 0x58EC # 壬 -0x3F52 0x5C0B # 尋 -0x3F53 0x751A # 甚 -0x3F54 0x5C3D # 尽 -0x3F55 0x814E # 腎 -0x3F56 0x8A0A # 訊 -0x3F57 0x8FC5 # 迅 -0x3F58 0x9663 # 陣 -0x3F59 0x976D # 靭 -0x3F5A 0x7B25 # 笥 -0x3F5B 0x8ACF # 諏 -0x3F5C 0x9808 # 須 -0x3F5D 0x9162 # 酢 -0x3F5E 0x56F3 # 図 -0x3F5F 0x53A8 # 厨 -0x3F60 0x9017 # 逗 -0x3F61 0x5439 # 吹 -0x3F62 0x5782 # 垂 -0x3F63 0x5E25 # 帥 -0x3F64 0x63A8 # 推 -0x3F65 0x6C34 # 水 -0x3F66 0x708A # 炊 -0x3F67 0x7761 # 睡 -0x3F68 0x7C8B # 粋 -0x3F69 0x7FE0 # 翠 -0x3F6A 0x8870 # 衰 -0x3F6B 0x9042 # 遂 -0x3F6C 0x9154 # 酔 -0x3F6D 0x9310 # 錐 -0x3F6E 0x9318 # 錘 -0x3F6F 0x968F # 随 -0x3F70 0x745E # 瑞 -0x3F71 0x9AC4 # 髄 -0x3F72 0x5D07 # 崇 -0x3F73 0x5D69 # 嵩 -0x3F74 0x6570 # 数 -0x3F75 0x67A2 # 枢 -0x3F76 0x8DA8 # 趨 -0x3F77 0x96DB # 雛 -0x3F78 0x636E # 据 -0x3F79 0x6749 # 杉 -0x3F7A 0x6919 # 椙 -0x3F7B 0x83C5 # 菅 -0x3F7C 0x9817 # 頗 -0x3F7D 0x96C0 # 雀 -0x3F7E 0x88FE # 裾 - -# "100" JIS -0x4021 0x6F84 # 澄 -0x4022 0x647A # 摺 -0x4023 0x5BF8 # 寸 -0x4024 0x4E16 # 世 -0x4025 0x702C # 瀬 -0x4026 0x755D # 畝 -0x4027 0x662F # 是 -0x4028 0x51C4 # 凄 -0x4029 0x5236 # 制 -0x402A 0x52E2 # 勢 -0x402B 0x59D3 # 姓 -0x402C 0x5F81 # 征 -0x402D 0x6027 # 性 -0x402E 0x6210 # 成 -0x402F 0x653F # 政 -0x4030 0x6574 # 整 -0x4031 0x661F # 星 -0x4032 0x6674 # 晴 -0x4033 0x68F2 # 棲 -0x4034 0x6816 # 栖 -0x4035 0x6B63 # 正 -0x4036 0x6E05 # 清 -0x4037 0x7272 # 牲 -0x4038 0x751F # 生 -0x4039 0x76DB # 盛 -0x403A 0x7CBE # 精 -0x403B 0x8056 # 聖 -0x403C 0x58F0 # 声 -0x403D 0x88FD # 製 -0x403E 0x897F # 西 -0x403F 0x8AA0 # 誠 -0x4040 0x8A93 # 誓 -0x4041 0x8ACB # 請 -0x4042 0x901D # 逝 -0x4043 0x9192 # 醒 -0x4044 0x9752 # 青 -0x4045 0x9759 # 静 -0x4046 0x6589 # 斉 -0x4047 0x7A0E # 税 -0x4048 0x8106 # 脆 -0x4049 0x96BB # 隻 -0x404A 0x5E2D # 席 -0x404B 0x60DC # 惜 -0x404C 0x621A # 戚 -0x404D 0x65A5 # 斥 -0x404E 0x6614 # 昔 -0x404F 0x6790 # 析 -0x4050 0x77F3 # 石 -0x4051 0x7A4D # 積 -0x4052 0x7C4D # 籍 -0x4053 0x7E3E # 績 -0x4054 0x810A # 脊 -0x4055 0x8CAC # 責 -0x4056 0x8D64 # 赤 -0x4057 0x8DE1 # 跡 -0x4058 0x8E5F # 蹟 -0x4059 0x78A9 # 碩 -0x405A 0x5207 # 切 -0x405B 0x62D9 # 拙 -0x405C 0x63A5 # 接 -0x405D 0x6442 # 摂 -0x405E 0x6298 # 折 -0x405F 0x8A2D # 設 -0x4060 0x7A83 # 窃 -0x4061 0x7BC0 # 節 -0x4062 0x8AAC # 説 -0x4063 0x96EA # 雪 -0x4064 0x7D76 # 絶 -0x4065 0x820C # 舌 -0x4066 0x8749 # 蝉 -0x4067 0x4ED9 # 仙 -0x4068 0x5148 # 先 -0x4069 0x5343 # 千 -0x406A 0x5360 # 占 -0x406B 0x5BA3 # 宣 -0x406C 0x5C02 # 専 -0x406D 0x5C16 # 尖 -0x406E 0x5DDD # 川 -0x406F 0x6226 # 戦 -0x4070 0x6247 # 扇 -0x4071 0x64B0 # 撰 -0x4072 0x6813 # 栓 -0x4073 0x6834 # 栴 -0x4074 0x6CC9 # 泉 -0x4075 0x6D45 # 浅 -0x4076 0x6D17 # 洗 -0x4077 0x67D3 # 染 -0x4078 0x6F5C # 潜 -0x4079 0x714E # 煎 -0x407A 0x717D # 煽 -0x407B 0x65CB # 旋 -0x407C 0x7A7F # 穿 -0x407D 0x7BAD # 箭 -0x407E 0x7DDA # 線 - -# "101" JIS -0x4121 0x7E4A # 繊 -0x4122 0x7FA8 # 羨 -0x4123 0x817A # 腺 -0x4124 0x821B # 舛 -0x4125 0x8239 # 船 -0x4126 0x85A6 # 薦 -0x4127 0x8A6E # 詮 -0x4128 0x8CCE # 賎 -0x4129 0x8DF5 # 践 -0x412A 0x9078 # 選 -0x412B 0x9077 # 遷 -0x412C 0x92AD # 銭 -0x412D 0x9291 # 銑 -0x412E 0x9583 # 閃 -0x412F 0x9BAE # 鮮 -0x4130 0x524D # 前 -0x4131 0x5584 # 善 -0x4132 0x6F38 # 漸 -0x4133 0x7136 # 然 -0x4134 0x5168 # 全 -0x4135 0x7985 # 禅 -0x4136 0x7E55 # 繕 -0x4137 0x81B3 # 膳 -0x4138 0x7CCE # 糎 -0x4139 0x564C # 噌 -0x413A 0x5851 # 塑 -0x413B 0x5CA8 # 岨 -0x413C 0x63AA # 措 -0x413D 0x66FE # 曾 -0x413E 0x66FD # 曽 -0x413F 0x695A # 楚 -0x4140 0x72D9 # 狙 -0x4141 0x758F # 疏 -0x4142 0x758E # 疎 -0x4143 0x790E # 礎 -0x4144 0x7956 # 祖 -0x4145 0x79DF # 租 -0x4146 0x7C97 # 粗 -0x4147 0x7D20 # 素 -0x4148 0x7D44 # 組 -0x4149 0x8607 # 蘇 -0x414A 0x8A34 # 訴 -0x414B 0x963B # 阻 -0x414C 0x9061 # 遡 -0x414D 0x9F20 # 鼠 -0x414E 0x50E7 # 僧 -0x414F 0x5275 # 創 -0x4150 0x53CC # 双 -0x4151 0x53E2 # 叢 -0x4152 0x5009 # 倉 -0x4153 0x55AA # 喪 -0x4154 0x58EE # 壮 -0x4155 0x594F # 奏 -0x4156 0x723D # 爽 -0x4157 0x5B8B # 宋 -0x4158 0x5C64 # 層 -0x4159 0x531D # 匝 -0x415A 0x60E3 # 惣 -0x415B 0x60F3 # 想 -0x415C 0x635C # 捜 -0x415D 0x6383 # 掃 -0x415E 0x633F # 挿 -0x415F 0x63BB # 掻 -0x4160 0x64CD # 操 -0x4161 0x65E9 # 早 -0x4162 0x66F9 # 曹 -0x4163 0x5DE3 # 巣 -0x4164 0x69CD # 槍 -0x4165 0x69FD # 槽 -0x4166 0x6F15 # 漕 -0x4167 0x71E5 # 燥 -0x4168 0x4E89 # 争 -0x4169 0x75E9 # 痩 -0x416A 0x76F8 # 相 -0x416B 0x7A93 # 窓 -0x416C 0x7CDF # 糟 -0x416D 0x7DCF # 総 -0x416E 0x7D9C # 綜 -0x416F 0x8061 # 聡 -0x4170 0x8349 # 草 -0x4171 0x8358 # 荘 -0x4172 0x846C # 葬 -0x4173 0x84BC # 蒼 -0x4174 0x85FB # 藻 -0x4175 0x88C5 # 装 -0x4176 0x8D70 # 走 -0x4177 0x9001 # 送 -0x4178 0x906D # 遭 -0x4179 0x9397 # 鎗 -0x417A 0x971C # 霜 -0x417B 0x9A12 # 騒 -0x417C 0x50CF # 像 -0x417D 0x5897 # 増 -0x417E 0x618E # 憎 - -# "102" JIS -0x4221 0x81D3 # 臓 -0x4222 0x8535 # 蔵 -0x4223 0x8D08 # 贈 -0x4224 0x9020 # 造 -0x4225 0x4FC3 # 促 -0x4226 0x5074 # 側 -0x4227 0x5247 # 則 -0x4228 0x5373 # 即 -0x4229 0x606F # 息 -0x422A 0x6349 # 捉 -0x422B 0x675F # 束 -0x422C 0x6E2C # 測 -0x422D 0x8DB3 # 足 -0x422E 0x901F # 速 -0x422F 0x4FD7 # 俗 -0x4230 0x5C5E # 属 -0x4231 0x8CCA # 賊 -0x4232 0x65CF # 族 -0x4233 0x7D9A # 続 -0x4234 0x5352 # 卒 -0x4235 0x8896 # 袖 -0x4236 0x5176 # 其 -0x4237 0x63C3 # 揃 -0x4238 0x5B58 # 存 -0x4239 0x5B6B # 孫 -0x423A 0x5C0A # 尊 -0x423B 0x640D # 損 -0x423C 0x6751 # 村 -0x423D 0x905C # 遜 -0x423E 0x4ED6 # 他 -0x423F 0x591A # 多 -0x4240 0x592A # 太 -0x4241 0x6C70 # 汰 -0x4242 0x8A51 # 詑 -0x4243 0x553E # 唾 -0x4244 0x5815 # 堕 -0x4245 0x59A5 # 妥 -0x4246 0x60F0 # 惰 -0x4247 0x6253 # 打 -0x4248 0x67C1 # 柁 -0x4249 0x8235 # 舵 -0x424A 0x6955 # 楕 -0x424B 0x9640 # 陀 -0x424C 0x99C4 # 駄 -0x424D 0x9A28 # 騨 -0x424E 0x4F53 # 体 -0x424F 0x5806 # 堆 -0x4250 0x5BFE # 対 -0x4251 0x8010 # 耐 -0x4252 0x5CB1 # 岱 -0x4253 0x5E2F # 帯 -0x4254 0x5F85 # 待 -0x4255 0x6020 # 怠 -0x4256 0x614B # 態 -0x4257 0x6234 # 戴 -0x4258 0x66FF # 替 -0x4259 0x6CF0 # 泰 -0x425A 0x6EDE # 滞 -0x425B 0x80CE # 胎 -0x425C 0x817F # 腿 -0x425D 0x82D4 # 苔 -0x425E 0x888B # 袋 -0x425F 0x8CB8 # 貸 -0x4260 0x9000 # 退 -0x4261 0x902E # 逮 -0x4262 0x968A # 隊 -0x4263 0x9EDB # 黛 -0x4264 0x9BDB # 鯛 -0x4265 0x4EE3 # 代 -0x4266 0x53F0 # 台 -0x4267 0x5927 # 大 -0x4268 0x7B2C # 第 -0x4269 0x918D # 醍 -0x426A 0x984C # 題 -0x426B 0x9DF9 # 鷹 -0x426C 0x6EDD # 滝 -0x426D 0x7027 # 瀧 -0x426E 0x5353 # 卓 -0x426F 0x5544 # 啄 -0x4270 0x5B85 # 宅 -0x4271 0x6258 # 托 -0x4272 0x629E # 択 -0x4273 0x62D3 # 拓 -0x4274 0x6CA2 # 沢 -0x4275 0x6FEF # 濯 -0x4276 0x7422 # 琢 -0x4277 0x8A17 # 託 -0x4278 0x9438 # 鐸 -0x4279 0x6FC1 # 濁 -0x427A 0x8AFE # 諾 -0x427B 0x8338 # 茸 -0x427C 0x51E7 # 凧 -0x427D 0x86F8 # 蛸 -0x427E 0x53EA # 只 - -# "103" JIS -0x4321 0x53E9 # 叩 -0x4322 0x4F46 # 但 -0x4323 0x9054 # 達 -0x4324 0x8FB0 # 辰 -0x4325 0x596A # 奪 -0x4326 0x8131 # 脱 -0x4327 0x5DFD # 巽 -0x4328 0x7AEA # 竪 -0x4329 0x8FBF # 辿 -0x432A 0x68DA # 棚 -0x432B 0x8C37 # 谷 -0x432C 0x72F8 # 狸 -0x432D 0x9C48 # 鱈 -0x432E 0x6A3D # 樽 -0x432F 0x8AB0 # 誰 -0x4330 0x4E39 # 丹 -0x4331 0x5358 # 単 -0x4332 0x5606 # 嘆 -0x4333 0x5766 # 坦 -0x4334 0x62C5 # 担 -0x4335 0x63A2 # 探 -0x4336 0x65E6 # 旦 -0x4337 0x6B4E # 歎 -0x4338 0x6DE1 # 淡 -0x4339 0x6E5B # 湛 -0x433A 0x70AD # 炭 -0x433B 0x77ED # 短 -0x433C 0x7AEF # 端 -0x433D 0x7BAA # 箪 -0x433E 0x7DBB # 綻 -0x433F 0x803D # 耽 -0x4340 0x80C6 # 胆 -0x4341 0x86CB # 蛋 -0x4342 0x8A95 # 誕 -0x4343 0x935B # 鍛 -0x4344 0x56E3 # 団 -0x4345 0x58C7 # 壇 -0x4346 0x5F3E # 弾 -0x4347 0x65AD # 断 -0x4348 0x6696 # 暖 -0x4349 0x6A80 # 檀 -0x434A 0x6BB5 # 段 -0x434B 0x7537 # 男 -0x434C 0x8AC7 # 談 -0x434D 0x5024 # 値 -0x434E 0x77E5 # 知 -0x434F 0x5730 # 地 -0x4350 0x5F1B # 弛 -0x4351 0x6065 # 恥 -0x4352 0x667A # 智 -0x4353 0x6C60 # 池 -0x4354 0x75F4 # 痴 -0x4355 0x7A1A # 稚 -0x4356 0x7F6E # 置 -0x4357 0x81F4 # 致 -0x4358 0x8718 # 蜘 -0x4359 0x9045 # 遅 -0x435A 0x99B3 # 馳 -0x435B 0x7BC9 # 築 -0x435C 0x755C # 畜 -0x435D 0x7AF9 # 竹 -0x435E 0x7B51 # 筑 -0x435F 0x84C4 # 蓄 -0x4360 0x9010 # 逐 -0x4361 0x79E9 # 秩 -0x4362 0x7A92 # 窒 -0x4363 0x8336 # 茶 -0x4364 0x5AE1 # 嫡 -0x4365 0x7740 # 着 -0x4366 0x4E2D # 中 -0x4367 0x4EF2 # 仲 -0x4368 0x5B99 # 宙 -0x4369 0x5FE0 # 忠 -0x436A 0x62BD # 抽 -0x436B 0x663C # 昼 -0x436C 0x67F1 # 柱 -0x436D 0x6CE8 # 注 -0x436E 0x866B # 虫 -0x436F 0x8877 # 衷 -0x4370 0x8A3B # 註 -0x4371 0x914E # 酎 -0x4372 0x92F3 # 鋳 -0x4373 0x99D0 # 駐 -0x4374 0x6A17 # 樗 -0x4375 0x7026 # 瀦 -0x4376 0x732A # 猪 -0x4377 0x82E7 # 苧 -0x4378 0x8457 # 著 -0x4379 0x8CAF # 貯 -0x437A 0x4E01 # 丁 -0x437B 0x5146 # 兆 -0x437C 0x51CB # 凋 -0x437D 0x558B # 喋 -0x437E 0x5BF5 # 寵 - -# "104" JIS -0x4421 0x5E16 # 帖 -0x4422 0x5E33 # 帳 -0x4423 0x5E81 # 庁 -0x4424 0x5F14 # 弔 -0x4425 0x5F35 # 張 -0x4426 0x5F6B # 彫 -0x4427 0x5FB4 # 徴 -0x4428 0x61F2 # 懲 -0x4429 0x6311 # 挑 -0x442A 0x66A2 # 暢 -0x442B 0x671D # 朝 -0x442C 0x6F6E # 潮 -0x442D 0x7252 # 牒 -0x442E 0x753A # 町 -0x442F 0x773A # 眺 -0x4430 0x8074 # 聴 -0x4431 0x8139 # 脹 -0x4432 0x8178 # 腸 -0x4433 0x8776 # 蝶 -0x4434 0x8ABF # 調 -0x4435 0x8ADC # 諜 -0x4436 0x8D85 # 超 -0x4437 0x8DF3 # 跳 -0x4438 0x929A # 銚 -0x4439 0x9577 # 長 -0x443A 0x9802 # 頂 -0x443B 0x9CE5 # 鳥 -0x443C 0x52C5 # 勅 -0x443D 0x6357 # 捗 -0x443E 0x76F4 # 直 -0x443F 0x6715 # 朕 -0x4440 0x6C88 # 沈 -0x4441 0x73CD # 珍 -0x4442 0x8CC3 # 賃 -0x4443 0x93AE # 鎮 -0x4444 0x9673 # 陳 -0x4445 0x6D25 # 津 -0x4446 0x589C # 墜 -0x4447 0x690E # 椎 -0x4448 0x69CC # 槌 -0x4449 0x8FFD # 追 -0x444A 0x939A # 鎚 -0x444B 0x75DB # 痛 -0x444C 0x901A # 通 -0x444D 0x585A # 塚 -0x444E 0x6802 # 栂 -0x444F 0x63B4 # 掴 -0x4450 0x69FB # 槻 -0x4451 0x4F43 # 佃 -0x4452 0x6F2C # 漬 -0x4453 0x67D8 # 柘 -0x4454 0x8FBB # 辻 -0x4455 0x8526 # 蔦 -0x4456 0x7DB4 # 綴 -0x4457 0x9354 # 鍔 -0x4458 0x693F # 椿 -0x4459 0x6F70 # 潰 -0x445A 0x576A # 坪 -0x445B 0x58F7 # 壷 -0x445C 0x5B2C # 嬬 -0x445D 0x7D2C # 紬 -0x445E 0x722A # 爪 -0x445F 0x540A # 吊 -0x4460 0x91E3 # 釣 -0x4461 0x9DB4 # 鶴 -0x4462 0x4EAD # 亭 -0x4463 0x4F4E # 低 -0x4464 0x505C # 停 -0x4465 0x5075 # 偵 -0x4466 0x5243 # 剃 -0x4467 0x8C9E # 貞 -0x4468 0x5448 # 呈 -0x4469 0x5824 # 堤 -0x446A 0x5B9A # 定 -0x446B 0x5E1D # 帝 -0x446C 0x5E95 # 底 -0x446D 0x5EAD # 庭 -0x446E 0x5EF7 # 廷 -0x446F 0x5F1F # 弟 -0x4470 0x608C # 悌 -0x4471 0x62B5 # 抵 -0x4472 0x633A # 挺 -0x4473 0x63D0 # 提 -0x4474 0x68AF # 梯 -0x4475 0x6C40 # 汀 -0x4476 0x7887 # 碇 -0x4477 0x798E # 禎 -0x4478 0x7A0B # 程 -0x4479 0x7DE0 # 締 -0x447A 0x8247 # 艇 -0x447B 0x8A02 # 訂 -0x447C 0x8AE6 # 諦 -0x447D 0x8E44 # 蹄 -0x447E 0x9013 # 逓 - -# "105" JIS -0x4521 0x90B8 # 邸 -0x4522 0x912D # 鄭 -0x4523 0x91D8 # 釘 -0x4524 0x9F0E # 鼎 -0x4525 0x6CE5 # 泥 -0x4526 0x6458 # 摘 -0x4527 0x64E2 # 擢 -0x4528 0x6575 # 敵 -0x4529 0x6EF4 # 滴 -0x452A 0x7684 # 的 -0x452B 0x7B1B # 笛 -0x452C 0x9069 # 適 -0x452D 0x93D1 # 鏑 -0x452E 0x6EBA # 溺 -0x452F 0x54F2 # 哲 -0x4530 0x5FB9 # 徹 -0x4531 0x64A4 # 撤 -0x4532 0x8F4D # 轍 -0x4533 0x8FED # 迭 -0x4534 0x9244 # 鉄 -0x4535 0x5178 # 典 -0x4536 0x586B # 填 -0x4537 0x5929 # 天 -0x4538 0x5C55 # 展 -0x4539 0x5E97 # 店 -0x453A 0x6DFB # 添 -0x453B 0x7E8F # 纏 -0x453C 0x751C # 甜 -0x453D 0x8CBC # 貼 -0x453E 0x8EE2 # 転 -0x453F 0x985B # 顛 -0x4540 0x70B9 # 点 -0x4541 0x4F1D # 伝 -0x4542 0x6BBF # 殿 -0x4543 0x6FB1 # 澱 -0x4544 0x7530 # 田 -0x4545 0x96FB # 電 -0x4546 0x514E # 兎 -0x4547 0x5410 # 吐 -0x4548 0x5835 # 堵 -0x4549 0x5857 # 塗 -0x454A 0x59AC # 妬 -0x454B 0x5C60 # 屠 -0x454C 0x5F92 # 徒 -0x454D 0x6597 # 斗 -0x454E 0x675C # 杜 -0x454F 0x6E21 # 渡 -0x4550 0x767B # 登 -0x4551 0x83DF # 菟 -0x4552 0x8CED # 賭 -0x4553 0x9014 # 途 -0x4554 0x90FD # 都 -0x4555 0x934D # 鍍 -0x4556 0x7825 # 砥 -0x4557 0x783A # 砺 -0x4558 0x52AA # 努 -0x4559 0x5EA6 # 度 -0x455A 0x571F # 土 -0x455B 0x5974 # 奴 -0x455C 0x6012 # 怒 -0x455D 0x5012 # 倒 -0x455E 0x515A # 党 -0x455F 0x51AC # 冬 -0x4560 0x51CD # 凍 -0x4561 0x5200 # 刀 -0x4562 0x5510 # 唐 -0x4563 0x5854 # 塔 -0x4564 0x5858 # 塘 -0x4565 0x5957 # 套 -0x4566 0x5B95 # 宕 -0x4567 0x5CF6 # 島 -0x4568 0x5D8B # 嶋 -0x4569 0x60BC # 悼 -0x456A 0x6295 # 投 -0x456B 0x642D # 搭 -0x456C 0x6771 # 東 -0x456D 0x6843 # 桃 -0x456E 0x68BC # 梼 -0x456F 0x68DF # 棟 -0x4570 0x76D7 # 盗 -0x4571 0x6DD8 # 淘 -0x4572 0x6E6F # 湯 -0x4573 0x6D9B # 涛 -0x4574 0x706F # 灯 -0x4575 0x71C8 # 燈 -0x4576 0x5F53 # 当 -0x4577 0x75D8 # 痘 -0x4578 0x7977 # 祷 -0x4579 0x7B49 # 等 -0x457A 0x7B54 # 答 -0x457B 0x7B52 # 筒 -0x457C 0x7CD6 # 糖 -0x457D 0x7D71 # 統 -0x457E 0x5230 # 到 - -# "106" JIS -0x4621 0x8463 # 董 -0x4622 0x8569 # 蕩 -0x4623 0x85E4 # 藤 -0x4624 0x8A0E # 討 -0x4625 0x8B04 # 謄 -0x4626 0x8C46 # 豆 -0x4627 0x8E0F # 踏 -0x4628 0x9003 # 逃 -0x4629 0x900F # 透 -0x462A 0x9419 # 鐙 -0x462B 0x9676 # 陶 -0x462C 0x982D # 頭 -0x462D 0x9A30 # 騰 -0x462E 0x95D8 # 闘 -0x462F 0x50CD # 働 -0x4630 0x52D5 # 動 -0x4631 0x540C # 同 -0x4632 0x5802 # 堂 -0x4633 0x5C0E # 導 -0x4634 0x61A7 # 憧 -0x4635 0x649E # 撞 -0x4636 0x6D1E # 洞 -0x4637 0x77B3 # 瞳 -0x4638 0x7AE5 # 童 -0x4639 0x80F4 # 胴 -0x463A 0x8404 # 萄 -0x463B 0x9053 # 道 -0x463C 0x9285 # 銅 -0x463D 0x5CE0 # 峠 -0x463E 0x9D07 # 鴇 -0x463F 0x533F # 匿 -0x4640 0x5F97 # 得 -0x4641 0x5FB3 # 徳 -0x4642 0x6D9C # 涜 -0x4643 0x7279 # 特 -0x4644 0x7763 # 督 -0x4645 0x79BF # 禿 -0x4646 0x7BE4 # 篤 -0x4647 0x6BD2 # 毒 -0x4648 0x72EC # 独 -0x4649 0x8AAD # 読 -0x464A 0x6803 # 栃 -0x464B 0x6A61 # 橡 -0x464C 0x51F8 # 凸 -0x464D 0x7A81 # 突 -0x464E 0x6934 # 椴 -0x464F 0x5C4A # 届 -0x4650 0x9CF6 # 鳶 -0x4651 0x82EB # 苫 -0x4652 0x5BC5 # 寅 -0x4653 0x9149 # 酉 -0x4654 0x701E # 瀞 -0x4655 0x5678 # 噸 -0x4656 0x5C6F # 屯 -0x4657 0x60C7 # 惇 -0x4658 0x6566 # 敦 -0x4659 0x6C8C # 沌 -0x465A 0x8C5A # 豚 -0x465B 0x9041 # 遁 -0x465C 0x9813 # 頓 -0x465D 0x5451 # 呑 -0x465E 0x66C7 # 曇 -0x465F 0x920D # 鈍 -0x4660 0x5948 # 奈 -0x4661 0x90A3 # 那 -0x4662 0x5185 # 内 -0x4663 0x4E4D # 乍 -0x4664 0x51EA # 凪 -0x4665 0x8599 # 薙 -0x4666 0x8B0E # 謎 -0x4667 0x7058 # 灘 -0x4668 0x637A # 捺 -0x4669 0x934B # 鍋 -0x466A 0x6962 # 楢 -0x466B 0x99B4 # 馴 -0x466C 0x7E04 # 縄 -0x466D 0x7577 # 畷 -0x466E 0x5357 # 南 -0x466F 0x6960 # 楠 -0x4670 0x8EDF # 軟 -0x4671 0x96E3 # 難 -0x4672 0x6C5D # 汝 -0x4673 0x4E8C # 二 -0x4674 0x5C3C # 尼 -0x4675 0x5F10 # 弐 -0x4676 0x8FE9 # 迩 -0x4677 0x5302 # 匂 -0x4678 0x8CD1 # 賑 -0x4679 0x8089 # 肉 -0x467A 0x8679 # 虹 -0x467B 0x5EFF # 廿 -0x467C 0x65E5 # 日 -0x467D 0x4E73 # 乳 -0x467E 0x5165 # 入 - -# "107" JIS -0x4721 0x5982 # 如 -0x4722 0x5C3F # 尿 -0x4723 0x97EE # 韮 -0x4724 0x4EFB # 任 -0x4725 0x598A # 妊 -0x4726 0x5FCD # 忍 -0x4727 0x8A8D # 認 -0x4728 0x6FE1 # 濡 -0x4729 0x79B0 # 禰 -0x472A 0x7962 # 祢 -0x472B 0x5BE7 # 寧 -0x472C 0x8471 # 葱 -0x472D 0x732B # 猫 -0x472E 0x71B1 # 熱 -0x472F 0x5E74 # 年 -0x4730 0x5FF5 # 念 -0x4731 0x637B # 捻 -0x4732 0x649A # 撚 -0x4733 0x71C3 # 燃 -0x4734 0x7C98 # 粘 -0x4735 0x4E43 # 乃 -0x4736 0x5EFC # 廼 -0x4737 0x4E4B # 之 -0x4738 0x57DC # 埜 -0x4739 0x56A2 # 嚢 -0x473A 0x60A9 # 悩 -0x473B 0x6FC3 # 濃 -0x473C 0x7D0D # 納 -0x473D 0x80FD # 能 -0x473E 0x8133 # 脳 -0x473F 0x81BF # 膿 -0x4740 0x8FB2 # 農 -0x4741 0x8997 # 覗 -0x4742 0x86A4 # 蚤 -0x4743 0x5DF4 # 巴 -0x4744 0x628A # 把 -0x4745 0x64AD # 播 -0x4746 0x8987 # 覇 -0x4747 0x6777 # 杷 -0x4748 0x6CE2 # 波 -0x4749 0x6D3E # 派 -0x474A 0x7436 # 琶 -0x474B 0x7834 # 破 -0x474C 0x5A46 # 婆 -0x474D 0x7F75 # 罵 -0x474E 0x82AD # 芭 -0x474F 0x99AC # 馬 -0x4750 0x4FF3 # 俳 -0x4751 0x5EC3 # 廃 -0x4752 0x62DD # 拝 -0x4753 0x6392 # 排 -0x4754 0x6557 # 敗 -0x4755 0x676F # 杯 -0x4756 0x76C3 # 盃 -0x4757 0x724C # 牌 -0x4758 0x80CC # 背 -0x4759 0x80BA # 肺 -0x475A 0x8F29 # 輩 -0x475B 0x914D # 配 -0x475C 0x500D # 倍 -0x475D 0x57F9 # 培 -0x475E 0x5A92 # 媒 -0x475F 0x6885 # 梅 -0x4760 0x6973 # 楳 -0x4761 0x7164 # 煤 -0x4762 0x72FD # 狽 -0x4763 0x8CB7 # 買 -0x4764 0x58F2 # 売 -0x4765 0x8CE0 # 賠 -0x4766 0x966A # 陪 -0x4767 0x9019 # 這 -0x4768 0x877F # 蝿 -0x4769 0x79E4 # 秤 -0x476A 0x77E7 # 矧 -0x476B 0x8429 # 萩 -0x476C 0x4F2F # 伯 -0x476D 0x5265 # 剥 -0x476E 0x535A # 博 -0x476F 0x62CD # 拍 -0x4770 0x67CF # 柏 -0x4771 0x6CCA # 泊 -0x4772 0x767D # 白 -0x4773 0x7B94 # 箔 -0x4774 0x7C95 # 粕 -0x4775 0x8236 # 舶 -0x4776 0x8584 # 薄 -0x4777 0x8FEB # 迫 -0x4778 0x66DD # 曝 -0x4779 0x6F20 # 漠 -0x477A 0x7206 # 爆 -0x477B 0x7E1B # 縛 -0x477C 0x83AB # 莫 -0x477D 0x99C1 # 駁 -0x477E 0x9EA6 # 麦 - -# "110" JIS -0x4821 0x51FD # 函 -0x4822 0x7BB1 # 箱 -0x4823 0x7872 # 硲 -0x4824 0x7BB8 # 箸 -0x4825 0x8087 # 肇 -0x4826 0x7B48 # 筈 -0x4827 0x6AE8 # 櫨 -0x4828 0x5E61 # 幡 -0x4829 0x808C # 肌 -0x482A 0x7551 # 畑 -0x482B 0x7560 # 畠 -0x482C 0x516B # 八 -0x482D 0x9262 # 鉢 -0x482E 0x6E8C # 溌 -0x482F 0x767A # 発 -0x4830 0x9197 # 醗 -0x4831 0x9AEA # 髪 -0x4832 0x4F10 # 伐 -0x4833 0x7F70 # 罰 -0x4834 0x629C # 抜 -0x4835 0x7B4F # 筏 -0x4836 0x95A5 # 閥 -0x4837 0x9CE9 # 鳩 -0x4838 0x567A # 噺 -0x4839 0x5859 # 塙 -0x483A 0x86E4 # 蛤 -0x483B 0x96BC # 隼 -0x483C 0x4F34 # 伴 -0x483D 0x5224 # 判 -0x483E 0x534A # 半 -0x483F 0x53CD # 反 -0x4840 0x53DB # 叛 -0x4841 0x5E06 # 帆 -0x4842 0x642C # 搬 -0x4843 0x6591 # 斑 -0x4844 0x677F # 板 -0x4845 0x6C3E # 氾 -0x4846 0x6C4E # 汎 -0x4847 0x7248 # 版 -0x4848 0x72AF # 犯 -0x4849 0x73ED # 班 -0x484A 0x7554 # 畔 -0x484B 0x7E41 # 繁 -0x484C 0x822C # 般 -0x484D 0x85E9 # 藩 -0x484E 0x8CA9 # 販 -0x484F 0x7BC4 # 範 -0x4850 0x91C6 # 釆 -0x4851 0x7169 # 煩 -0x4852 0x9812 # 頒 -0x4853 0x98EF # 飯 -0x4854 0x633D # 挽 -0x4855 0x6669 # 晩 -0x4856 0x756A # 番 -0x4857 0x76E4 # 盤 -0x4858 0x78D0 # 磐 -0x4859 0x8543 # 蕃 -0x485A 0x86EE # 蛮 -0x485B 0x532A # 匪 -0x485C 0x5351 # 卑 -0x485D 0x5426 # 否 -0x485E 0x5983 # 妃 -0x485F 0x5E87 # 庇 -0x4860 0x5F7C # 彼 -0x4861 0x60B2 # 悲 -0x4862 0x6249 # 扉 -0x4863 0x6279 # 批 -0x4864 0x62AB # 披 -0x4865 0x6590 # 斐 -0x4866 0x6BD4 # 比 -0x4867 0x6CCC # 泌 -0x4868 0x75B2 # 疲 -0x4869 0x76AE # 皮 -0x486A 0x7891 # 碑 -0x486B 0x79D8 # 秘 -0x486C 0x7DCB # 緋 -0x486D 0x7F77 # 罷 -0x486E 0x80A5 # 肥 -0x486F 0x88AB # 被 -0x4870 0x8AB9 # 誹 -0x4871 0x8CBB # 費 -0x4872 0x907F # 避 -0x4873 0x975E # 非 -0x4874 0x98DB # 飛 -0x4875 0x6A0B # 樋 -0x4876 0x7C38 # 簸 -0x4877 0x5099 # 備 -0x4878 0x5C3E # 尾 -0x4879 0x5FAE # 微 -0x487A 0x6787 # 枇 -0x487B 0x6BD8 # 毘 -0x487C 0x7435 # 琵 -0x487D 0x7709 # 眉 -0x487E 0x7F8E # 美 - -# "111" JIS -0x4921 0x9F3B # 鼻 -0x4922 0x67CA # 柊 -0x4923 0x7A17 # 稗 -0x4924 0x5339 # 匹 -0x4925 0x758B # 疋 -0x4926 0x9AED # 髭 -0x4927 0x5F66 # 彦 -0x4928 0x819D # 膝 -0x4929 0x83F1 # 菱 -0x492A 0x8098 # 肘 -0x492B 0x5F3C # 弼 -0x492C 0x5FC5 # 必 -0x492D 0x7562 # 畢 -0x492E 0x7B46 # 筆 -0x492F 0x903C # 逼 -0x4930 0x6867 # 桧 -0x4931 0x59EB # 姫 -0x4932 0x5A9B # 媛 -0x4933 0x7D10 # 紐 -0x4934 0x767E # 百 -0x4935 0x8B2C # 謬 -0x4936 0x4FF5 # 俵 -0x4937 0x5F6A # 彪 -0x4938 0x6A19 # 標 -0x4939 0x6C37 # 氷 -0x493A 0x6F02 # 漂 -0x493B 0x74E2 # 瓢 -0x493C 0x7968 # 票 -0x493D 0x8868 # 表 -0x493E 0x8A55 # 評 -0x493F 0x8C79 # 豹 -0x4940 0x5EDF # 廟 -0x4941 0x63CF # 描 -0x4942 0x75C5 # 病 -0x4943 0x79D2 # 秒 -0x4944 0x82D7 # 苗 -0x4945 0x9328 # 錨 -0x4946 0x92F2 # 鋲 -0x4947 0x849C # 蒜 -0x4948 0x86ED # 蛭 -0x4949 0x9C2D # 鰭 -0x494A 0x54C1 # 品 -0x494B 0x5F6C # 彬 -0x494C 0x658C # 斌 -0x494D 0x6D5C # 浜 -0x494E 0x7015 # 瀕 -0x494F 0x8CA7 # 貧 -0x4950 0x8CD3 # 賓 -0x4951 0x983B # 頻 -0x4952 0x654F # 敏 -0x4953 0x74F6 # 瓶 -0x4954 0x4E0D # 不 -0x4955 0x4ED8 # 付 -0x4956 0x57E0 # 埠 -0x4957 0x592B # 夫 -0x4958 0x5A66 # 婦 -0x4959 0x5BCC # 富 -0x495A 0x51A8 # 冨 -0x495B 0x5E03 # 布 -0x495C 0x5E9C # 府 -0x495D 0x6016 # 怖 -0x495E 0x6276 # 扶 -0x495F 0x6577 # 敷 -0x4960 0x65A7 # 斧 -0x4961 0x666E # 普 -0x4962 0x6D6E # 浮 -0x4963 0x7236 # 父 -0x4964 0x7B26 # 符 -0x4965 0x8150 # 腐 -0x4966 0x819A # 膚 -0x4967 0x8299 # 芙 -0x4968 0x8B5C # 譜 -0x4969 0x8CA0 # 負 -0x496A 0x8CE6 # 賦 -0x496B 0x8D74 # 赴 -0x496C 0x961C # 阜 -0x496D 0x9644 # 附 -0x496E 0x4FAE # 侮 -0x496F 0x64AB # 撫 -0x4970 0x6B66 # 武 -0x4971 0x821E # 舞 -0x4972 0x8461 # 葡 -0x4973 0x856A # 蕪 -0x4974 0x90E8 # 部 -0x4975 0x5C01 # 封 -0x4976 0x6953 # 楓 -0x4977 0x98A8 # 風 -0x4978 0x847A # 葺 -0x4979 0x8557 # 蕗 -0x497A 0x4F0F # 伏 -0x497B 0x526F # 副 -0x497C 0x5FA9 # 復 -0x497D 0x5E45 # 幅 -0x497E 0x670D # 服 - -# "112" JIS -0x4A21 0x798F # 福 -0x4A22 0x8179 # 腹 -0x4A23 0x8907 # 複 -0x4A24 0x8986 # 覆 -0x4A25 0x6DF5 # 淵 -0x4A26 0x5F17 # 弗 -0x4A27 0x6255 # 払 -0x4A28 0x6CB8 # 沸 -0x4A29 0x4ECF # 仏 -0x4A2A 0x7269 # 物 -0x4A2B 0x9B92 # 鮒 -0x4A2C 0x5206 # 分 -0x4A2D 0x543B # 吻 -0x4A2E 0x5674 # 噴 -0x4A2F 0x58B3 # 墳 -0x4A30 0x61A4 # 憤 -0x4A31 0x626E # 扮 -0x4A32 0x711A # 焚 -0x4A33 0x596E # 奮 -0x4A34 0x7C89 # 粉 -0x4A35 0x7CDE # 糞 -0x4A36 0x7D1B # 紛 -0x4A37 0x96F0 # 雰 -0x4A38 0x6587 # 文 -0x4A39 0x805E # 聞 -0x4A3A 0x4E19 # 丙 -0x4A3B 0x4F75 # 併 -0x4A3C 0x5175 # 兵 -0x4A3D 0x5840 # 塀 -0x4A3E 0x5E63 # 幣 -0x4A3F 0x5E73 # 平 -0x4A40 0x5F0A # 弊 -0x4A41 0x67C4 # 柄 -0x4A42 0x4E26 # 並 -0x4A43 0x853D # 蔽 -0x4A44 0x9589 # 閉 -0x4A45 0x965B # 陛 -0x4A46 0x7C73 # 米 -0x4A47 0x9801 # 頁 -0x4A48 0x50FB # 僻 -0x4A49 0x58C1 # 壁 -0x4A4A 0x7656 # 癖 -0x4A4B 0x78A7 # 碧 -0x4A4C 0x5225 # 別 -0x4A4D 0x77A5 # 瞥 -0x4A4E 0x8511 # 蔑 -0x4A4F 0x7B86 # 箆 -0x4A50 0x504F # 偏 -0x4A51 0x5909 # 変 -0x4A52 0x7247 # 片 -0x4A53 0x7BC7 # 篇 -0x4A54 0x7DE8 # 編 -0x4A55 0x8FBA # 辺 -0x4A56 0x8FD4 # 返 -0x4A57 0x904D # 遍 -0x4A58 0x4FBF # 便 -0x4A59 0x52C9 # 勉 -0x4A5A 0x5A29 # 娩 -0x4A5B 0x5F01 # 弁 -0x4A5C 0x97AD # 鞭 -0x4A5D 0x4FDD # 保 -0x4A5E 0x8217 # 舗 -0x4A5F 0x92EA # 鋪 -0x4A60 0x5703 # 圃 -0x4A61 0x6355 # 捕 -0x4A62 0x6B69 # 歩 -0x4A63 0x752B # 甫 -0x4A64 0x88DC # 補 -0x4A65 0x8F14 # 輔 -0x4A66 0x7A42 # 穂 -0x4A67 0x52DF # 募 -0x4A68 0x5893 # 墓 -0x4A69 0x6155 # 慕 -0x4A6A 0x620A # 戊 -0x4A6B 0x66AE # 暮 -0x4A6C 0x6BCD # 母 -0x4A6D 0x7C3F # 簿 -0x4A6E 0x83E9 # 菩 -0x4A6F 0x5023 # 倣 -0x4A70 0x4FF8 # 俸 -0x4A71 0x5305 # 包 -0x4A72 0x5446 # 呆 -0x4A73 0x5831 # 報 -0x4A74 0x5949 # 奉 -0x4A75 0x5B9D # 宝 -0x4A76 0x5CF0 # 峰 -0x4A77 0x5CEF # 峯 -0x4A78 0x5D29 # 崩 -0x4A79 0x5E96 # 庖 -0x4A7A 0x62B1 # 抱 -0x4A7B 0x6367 # 捧 -0x4A7C 0x653E # 放 -0x4A7D 0x65B9 # 方 -0x4A7E 0x670B # 朋 - -# "113" JIS -0x4B21 0x6CD5 # 法 -0x4B22 0x6CE1 # 泡 -0x4B23 0x70F9 # 烹 -0x4B24 0x7832 # 砲 -0x4B25 0x7E2B # 縫 -0x4B26 0x80DE # 胞 -0x4B27 0x82B3 # 芳 -0x4B28 0x840C # 萌 -0x4B29 0x84EC # 蓬 -0x4B2A 0x8702 # 蜂 -0x4B2B 0x8912 # 褒 -0x4B2C 0x8A2A # 訪 -0x4B2D 0x8C4A # 豊 -0x4B2E 0x90A6 # 邦 -0x4B2F 0x92D2 # 鋒 -0x4B30 0x98FD # 飽 -0x4B31 0x9CF3 # 鳳 -0x4B32 0x9D6C # 鵬 -0x4B33 0x4E4F # 乏 -0x4B34 0x4EA1 # 亡 -0x4B35 0x508D # 傍 -0x4B36 0x5256 # 剖 -0x4B37 0x574A # 坊 -0x4B38 0x59A8 # 妨 -0x4B39 0x5E3D # 帽 -0x4B3A 0x5FD8 # 忘 -0x4B3B 0x5FD9 # 忙 -0x4B3C 0x623F # 房 -0x4B3D 0x66B4 # 暴 -0x4B3E 0x671B # 望 -0x4B3F 0x67D0 # 某 -0x4B40 0x68D2 # 棒 -0x4B41 0x5192 # 冒 -0x4B42 0x7D21 # 紡 -0x4B43 0x80AA # 肪 -0x4B44 0x81A8 # 膨 -0x4B45 0x8B00 # 謀 -0x4B46 0x8C8C # 貌 -0x4B47 0x8CBF # 貿 -0x4B48 0x927E # 鉾 -0x4B49 0x9632 # 防 -0x4B4A 0x5420 # 吠 -0x4B4B 0x982C # 頬 -0x4B4C 0x5317 # 北 -0x4B4D 0x50D5 # 僕 -0x4B4E 0x535C # 卜 -0x4B4F 0x58A8 # 墨 -0x4B50 0x64B2 # 撲 -0x4B51 0x6734 # 朴 -0x4B52 0x7267 # 牧 -0x4B53 0x7766 # 睦 -0x4B54 0x7A46 # 穆 -0x4B55 0x91E6 # 釦 -0x4B56 0x52C3 # 勃 -0x4B57 0x6CA1 # 没 -0x4B58 0x6B86 # 殆 -0x4B59 0x5800 # 堀 -0x4B5A 0x5E4C # 幌 -0x4B5B 0x5954 # 奔 -0x4B5C 0x672C # 本 -0x4B5D 0x7FFB # 翻 -0x4B5E 0x51E1 # 凡 -0x4B5F 0x76C6 # 盆 -0x4B60 0x6469 # 摩 -0x4B61 0x78E8 # 磨 -0x4B62 0x9B54 # 魔 -0x4B63 0x9EBB # 麻 -0x4B64 0x57CB # 埋 -0x4B65 0x59B9 # 妹 -0x4B66 0x6627 # 昧 -0x4B67 0x679A # 枚 -0x4B68 0x6BCE # 毎 -0x4B69 0x54E9 # 哩 -0x4B6A 0x69D9 # 槙 -0x4B6B 0x5E55 # 幕 -0x4B6C 0x819C # 膜 -0x4B6D 0x6795 # 枕 -0x4B6E 0x9BAA # 鮪 -0x4B6F 0x67FE # 柾 -0x4B70 0x9C52 # 鱒 -0x4B71 0x685D # 桝 -0x4B72 0x4EA6 # 亦 -0x4B73 0x4FE3 # 俣 -0x4B74 0x53C8 # 又 -0x4B75 0x62B9 # 抹 -0x4B76 0x672B # 末 -0x4B77 0x6CAB # 沫 -0x4B78 0x8FC4 # 迄 -0x4B79 0x4FAD # 侭 -0x4B7A 0x7E6D # 繭 -0x4B7B 0x9EBF # 麿 -0x4B7C 0x4E07 # 万 -0x4B7D 0x6162 # 慢 -0x4B7E 0x6E80 # 満 - -# "114" JIS -0x4C21 0x6F2B # 漫 -0x4C22 0x8513 # 蔓 -0x4C23 0x5473 # 味 -0x4C24 0x672A # 未 -0x4C25 0x9B45 # 魅 -0x4C26 0x5DF3 # 巳 -0x4C27 0x7B95 # 箕 -0x4C28 0x5CAC # 岬 -0x4C29 0x5BC6 # 密 -0x4C2A 0x871C # 蜜 -0x4C2B 0x6E4A # 湊 -0x4C2C 0x84D1 # 蓑 -0x4C2D 0x7A14 # 稔 -0x4C2E 0x8108 # 脈 -0x4C2F 0x5999 # 妙 -0x4C30 0x7C8D # 粍 -0x4C31 0x6C11 # 民 -0x4C32 0x7720 # 眠 -0x4C33 0x52D9 # 務 -0x4C34 0x5922 # 夢 -0x4C35 0x7121 # 無 -0x4C36 0x725F # 牟 -0x4C37 0x77DB # 矛 -0x4C38 0x9727 # 霧 -0x4C39 0x9D61 # 鵡 -0x4C3A 0x690B # 椋 -0x4C3B 0x5A7F # 婿 -0x4C3C 0x5A18 # 娘 -0x4C3D 0x51A5 # 冥 -0x4C3E 0x540D # 名 -0x4C3F 0x547D # 命 -0x4C40 0x660E # 明 -0x4C41 0x76DF # 盟 -0x4C42 0x8FF7 # 迷 -0x4C43 0x9298 # 銘 -0x4C44 0x9CF4 # 鳴 -0x4C45 0x59EA # 姪 -0x4C46 0x725D # 牝 -0x4C47 0x6EC5 # 滅 -0x4C48 0x514D # 免 -0x4C49 0x68C9 # 棉 -0x4C4A 0x7DBF # 綿 -0x4C4B 0x7DEC # 緬 -0x4C4C 0x9762 # 面 -0x4C4D 0x9EBA # 麺 -0x4C4E 0x6478 # 摸 -0x4C4F 0x6A21 # 模 -0x4C50 0x8302 # 茂 -0x4C51 0x5984 # 妄 -0x4C52 0x5B5F # 孟 -0x4C53 0x6BDB # 毛 -0x4C54 0x731B # 猛 -0x4C55 0x76F2 # 盲 -0x4C56 0x7DB2 # 網 -0x4C57 0x8017 # 耗 -0x4C58 0x8499 # 蒙 -0x4C59 0x5132 # 儲 -0x4C5A 0x6728 # 木 -0x4C5B 0x9ED9 # 黙 -0x4C5C 0x76EE # 目 -0x4C5D 0x6762 # 杢 -0x4C5E 0x52FF # 勿 -0x4C5F 0x9905 # 餅 -0x4C60 0x5C24 # 尤 -0x4C61 0x623B # 戻 -0x4C62 0x7C7E # 籾 -0x4C63 0x8CB0 # 貰 -0x4C64 0x554F # 問 -0x4C65 0x60B6 # 悶 -0x4C66 0x7D0B # 紋 -0x4C67 0x9580 # 門 -0x4C68 0x5301 # 匁 -0x4C69 0x4E5F # 也 -0x4C6A 0x51B6 # 冶 -0x4C6B 0x591C # 夜 -0x4C6C 0x723A # 爺 -0x4C6D 0x8036 # 耶 -0x4C6E 0x91CE # 野 -0x4C6F 0x5F25 # 弥 -0x4C70 0x77E2 # 矢 -0x4C71 0x5384 # 厄 -0x4C72 0x5F79 # 役 -0x4C73 0x7D04 # 約 -0x4C74 0x85AC # 薬 -0x4C75 0x8A33 # 訳 -0x4C76 0x8E8D # 躍 -0x4C77 0x9756 # 靖 -0x4C78 0x67F3 # 柳 -0x4C79 0x85AE # 薮 -0x4C7A 0x9453 # 鑓 -0x4C7B 0x6109 # 愉 -0x4C7C 0x6108 # 愈 -0x4C7D 0x6CB9 # 油 -0x4C7E 0x7652 # 癒 - -# "115" JIS -0x4D21 0x8AED # 諭 -0x4D22 0x8F38 # 輸 -0x4D23 0x552F # 唯 -0x4D24 0x4F51 # 佑 -0x4D25 0x512A # 優 -0x4D26 0x52C7 # 勇 -0x4D27 0x53CB # 友 -0x4D28 0x5BA5 # 宥 -0x4D29 0x5E7D # 幽 -0x4D2A 0x60A0 # 悠 -0x4D2B 0x6182 # 憂 -0x4D2C 0x63D6 # 揖 -0x4D2D 0x6709 # 有 -0x4D2E 0x67DA # 柚 -0x4D2F 0x6E67 # 湧 -0x4D30 0x6D8C # 涌 -0x4D31 0x7336 # 猶 -0x4D32 0x7337 # 猷 -0x4D33 0x7531 # 由 -0x4D34 0x7950 # 祐 -0x4D35 0x88D5 # 裕 -0x4D36 0x8A98 # 誘 -0x4D37 0x904A # 遊 -0x4D38 0x9091 # 邑 -0x4D39 0x90F5 # 郵 -0x4D3A 0x96C4 # 雄 -0x4D3B 0x878D # 融 -0x4D3C 0x5915 # 夕 -0x4D3D 0x4E88 # 予 -0x4D3E 0x4F59 # 余 -0x4D3F 0x4E0E # 与 -0x4D40 0x8A89 # 誉 -0x4D41 0x8F3F # 輿 -0x4D42 0x9810 # 預 -0x4D43 0x50AD # 傭 -0x4D44 0x5E7C # 幼 -0x4D45 0x5996 # 妖 -0x4D46 0x5BB9 # 容 -0x4D47 0x5EB8 # 庸 -0x4D48 0x63DA # 揚 -0x4D49 0x63FA # 揺 -0x4D4A 0x64C1 # 擁 -0x4D4B 0x66DC # 曜 -0x4D4C 0x694A # 楊 -0x4D4D 0x69D8 # 様 -0x4D4E 0x6D0B # 洋 -0x4D4F 0x6EB6 # 溶 -0x4D50 0x7194 # 熔 -0x4D51 0x7528 # 用 -0x4D52 0x7AAF # 窯 -0x4D53 0x7F8A # 羊 -0x4D54 0x8000 # 耀 -0x4D55 0x8449 # 葉 -0x4D56 0x84C9 # 蓉 -0x4D57 0x8981 # 要 -0x4D58 0x8B21 # 謡 -0x4D59 0x8E0A # 踊 -0x4D5A 0x9065 # 遥 -0x4D5B 0x967D # 陽 -0x4D5C 0x990A # 養 -0x4D5D 0x617E # 慾 -0x4D5E 0x6291 # 抑 -0x4D5F 0x6B32 # 欲 -0x4D60 0x6C83 # 沃 -0x4D61 0x6D74 # 浴 -0x4D62 0x7FCC # 翌 -0x4D63 0x7FFC # 翼 -0x4D64 0x6DC0 # 淀 -0x4D65 0x7F85 # 羅 -0x4D66 0x87BA # 螺 -0x4D67 0x88F8 # 裸 -0x4D68 0x6765 # 来 -0x4D69 0x83B1 # 莱 -0x4D6A 0x983C # 頼 -0x4D6B 0x96F7 # 雷 -0x4D6C 0x6D1B # 洛 -0x4D6D 0x7D61 # 絡 -0x4D6E 0x843D # 落 -0x4D6F 0x916A # 酪 -0x4D70 0x4E71 # 乱 -0x4D71 0x5375 # 卵 -0x4D72 0x5D50 # 嵐 -0x4D73 0x6B04 # 欄 -0x4D74 0x6FEB # 濫 -0x4D75 0x85CD # 藍 -0x4D76 0x862D # 蘭 -0x4D77 0x89A7 # 覧 -0x4D78 0x5229 # 利 -0x4D79 0x540F # 吏 -0x4D7A 0x5C65 # 履 -0x4D7B 0x674E # 李 -0x4D7C 0x68A8 # 梨 -0x4D7D 0x7406 # 理 -0x4D7E 0x7483 # 璃 - -# "116" JIS -0x4E21 0x75E2 # 痢 -0x4E22 0x88CF # 裏 -0x4E23 0x88E1 # 裡 -0x4E24 0x91CC # 里 -0x4E25 0x96E2 # 離 -0x4E26 0x9678 # 陸 -0x4E27 0x5F8B # 律 -0x4E28 0x7387 # 率 -0x4E29 0x7ACB # 立 -0x4E2A 0x844E # 葎 -0x4E2B 0x63A0 # 掠 -0x4E2C 0x7565 # 略 -0x4E2D 0x5289 # 劉 -0x4E2E 0x6D41 # 流 -0x4E2F 0x6E9C # 溜 -0x4E30 0x7409 # 琉 -0x4E31 0x7559 # 留 -0x4E32 0x786B # 硫 -0x4E33 0x7C92 # 粒 -0x4E34 0x9686 # 隆 -0x4E35 0x7ADC # 竜 -0x4E36 0x9F8D # 龍 -0x4E37 0x4FB6 # 侶 -0x4E38 0x616E # 慮 -0x4E39 0x65C5 # 旅 -0x4E3A 0x865C # 虜 -0x4E3B 0x4E86 # 了 -0x4E3C 0x4EAE # 亮 -0x4E3D 0x50DA # 僚 -0x4E3E 0x4E21 # 両 -0x4E3F 0x51CC # 凌 -0x4E40 0x5BEE # 寮 -0x4E41 0x6599 # 料 -0x4E42 0x6881 # 梁 -0x4E43 0x6DBC # 涼 -0x4E44 0x731F # 猟 -0x4E45 0x7642 # 療 -0x4E46 0x77AD # 瞭 -0x4E47 0x7A1C # 稜 -0x4E48 0x7CE7 # 糧 -0x4E49 0x826F # 良 -0x4E4A 0x8AD2 # 諒 -0x4E4B 0x907C # 遼 -0x4E4C 0x91CF # 量 -0x4E4D 0x9675 # 陵 -0x4E4E 0x9818 # 領 -0x4E4F 0x529B # 力 -0x4E50 0x7DD1 # 緑 -0x4E51 0x502B # 倫 -0x4E52 0x5398 # 厘 -0x4E53 0x6797 # 林 -0x4E54 0x6DCB # 淋 -0x4E55 0x71D0 # 燐 -0x4E56 0x7433 # 琳 -0x4E57 0x81E8 # 臨 -0x4E58 0x8F2A # 輪 -0x4E59 0x96A3 # 隣 -0x4E5A 0x9C57 # 鱗 -0x4E5B 0x9E9F # 麟 -0x4E5C 0x7460 # 瑠 -0x4E5D 0x5841 # 塁 -0x4E5E 0x6D99 # 涙 -0x4E5F 0x7D2F # 累 -0x4E60 0x985E # 類 -0x4E61 0x4EE4 # 令 -0x4E62 0x4F36 # 伶 -0x4E63 0x4F8B # 例 -0x4E64 0x51B7 # 冷 -0x4E65 0x52B1 # 励 -0x4E66 0x5DBA # 嶺 -0x4E67 0x601C # 怜 -0x4E68 0x73B2 # 玲 -0x4E69 0x793C # 礼 -0x4E6A 0x82D3 # 苓 -0x4E6B 0x9234 # 鈴 -0x4E6C 0x96B7 # 隷 -0x4E6D 0x96F6 # 零 -0x4E6E 0x970A # 霊 -0x4E6F 0x9E97 # 麗 -0x4E70 0x9F62 # 齢 -0x4E71 0x66A6 # 暦 -0x4E72 0x6B74 # 歴 -0x4E73 0x5217 # 列 -0x4E74 0x52A3 # 劣 -0x4E75 0x70C8 # 烈 -0x4E76 0x88C2 # 裂 -0x4E77 0x5EC9 # 廉 -0x4E78 0x604B # 恋 -0x4E79 0x6190 # 憐 -0x4E7A 0x6F23 # 漣 -0x4E7B 0x7149 # 煉 -0x4E7C 0x7C3E # 簾 -0x4E7D 0x7DF4 # 練 -0x4E7E 0x806F # 聯 - -# "117" JIS -0x4F21 0x84EE # 蓮 -0x4F22 0x9023 # 連 -0x4F23 0x932C # 錬 -0x4F24 0x5442 # 呂 -0x4F25 0x9B6F # 魯 -0x4F26 0x6AD3 # 櫓 -0x4F27 0x7089 # 炉 -0x4F28 0x8CC2 # 賂 -0x4F29 0x8DEF # 路 -0x4F2A 0x9732 # 露 -0x4F2B 0x52B4 # 労 -0x4F2C 0x5A41 # 婁 -0x4F2D 0x5ECA # 廊 -0x4F2E 0x5F04 # 弄 -0x4F2F 0x6717 # 朗 -0x4F30 0x697C # 楼 -0x4F31 0x6994 # 榔 -0x4F32 0x6D6A # 浪 -0x4F33 0x6F0F # 漏 -0x4F34 0x7262 # 牢 -0x4F35 0x72FC # 狼 -0x4F36 0x7BED # 篭 -0x4F37 0x8001 # 老 -0x4F38 0x807E # 聾 -0x4F39 0x874B # 蝋 -0x4F3A 0x90CE # 郎 -0x4F3B 0x516D # 六 -0x4F3C 0x9E93 # 麓 -0x4F3D 0x7984 # 禄 -0x4F3E 0x808B # 肋 -0x4F3F 0x9332 # 録 -0x4F40 0x8AD6 # 論 -0x4F41 0x502D # 倭 -0x4F42 0x548C # 和 -0x4F43 0x8A71 # 話 -0x4F44 0x6B6A # 歪 -0x4F45 0x8CC4 # 賄 -0x4F46 0x8107 # 脇 -0x4F47 0x60D1 # 惑 -0x4F48 0x67A0 # 枠 -0x4F49 0x9DF2 # 鷲 -0x4F4A 0x4E99 # 亙 -0x4F4B 0x4E98 # 亘 -0x4F4C 0x9C10 # 鰐 -0x4F4D 0x8A6B # 詫 -0x4F4E 0x85C1 # 藁 -0x4F4F 0x8568 # 蕨 -0x4F50 0x6900 # 椀 -0x4F51 0x6E7E # 湾 -0x4F52 0x7897 # 碗 -0x4F53 0x8155 # 腕 - -# "120" JIS -0x5021 0x5F0C # 弌 -0x5022 0x4E10 # 丐 -0x5023 0x4E15 # 丕 -0x5024 0x4E2A # 个 -0x5025 0x4E31 # 丱 -0x5026 0x4E36 # 丶 -0x5027 0x4E3C # 丼 -0x5028 0x4E3F # 丿 -0x5029 0x4E42 # 乂 -0x502A 0x4E56 # 乖 -0x502B 0x4E58 # 乘 -0x502C 0x4E82 # 亂 -0x502D 0x4E85 # 亅 -0x502E 0x8C6B # 豫 -0x502F 0x4E8A # 亊 -0x5030 0x8212 # 舒 -0x5031 0x5F0D # 弍 -0x5032 0x4E8E # 于 -0x5033 0x4E9E # 亞 -0x5034 0x4E9F # 亟 -0x5035 0x4EA0 # 亠 -0x5036 0x4EA2 # 亢 -0x5037 0x4EB0 # 亰 -0x5038 0x4EB3 # 亳 -0x5039 0x4EB6 # 亶 -0x503A 0x4ECE # 从 -0x503B 0x4ECD # 仍 -0x503C 0x4EC4 # 仄 -0x503D 0x4EC6 # 仆 -0x503E 0x4EC2 # 仂 -0x503F 0x4ED7 # 仗 -0x5040 0x4EDE # 仞 -0x5041 0x4EED # 仭 -0x5042 0x4EDF # 仟 -0x5043 0x4EF7 # 价 -0x5044 0x4F09 # 伉 -0x5045 0x4F5A # 佚 -0x5046 0x4F30 # 估 -0x5047 0x4F5B # 佛 -0x5048 0x4F5D # 佝 -0x5049 0x4F57 # 佗 -0x504A 0x4F47 # 佇 -0x504B 0x4F76 # 佶 -0x504C 0x4F88 # 侈 -0x504D 0x4F8F # 侏 -0x504E 0x4F98 # 侘 -0x504F 0x4F7B # 佻 -0x5050 0x4F69 # 佩 -0x5051 0x4F70 # 佰 -0x5052 0x4F91 # 侑 -0x5053 0x4F6F # 佯 -0x5054 0x4F86 # 來 -0x5055 0x4F96 # 侖 -0x5056 0x5118 # 儘 -0x5057 0x4FD4 # 俔 -0x5058 0x4FDF # 俟 -0x5059 0x4FCE # 俎 -0x505A 0x4FD8 # 俘 -0x505B 0x4FDB # 俛 -0x505C 0x4FD1 # 俑 -0x505D 0x4FDA # 俚 -0x505E 0x4FD0 # 俐 -0x505F 0x4FE4 # 俤 -0x5060 0x4FE5 # 俥 -0x5061 0x501A # 倚 -0x5062 0x5028 # 倨 -0x5063 0x5014 # 倔 -0x5064 0x502A # 倪 -0x5065 0x5025 # 倥 -0x5066 0x5005 # 倅 -0x5067 0x4F1C # 伜 -0x5068 0x4FF6 # 俶 -0x5069 0x5021 # 倡 -0x506A 0x5029 # 倩 -0x506B 0x502C # 倬 -0x506C 0x4FFE # 俾 -0x506D 0x4FEF # 俯 -0x506E 0x5011 # 們 -0x506F 0x5006 # 倆 -0x5070 0x5043 # 偃 -0x5071 0x5047 # 假 -0x5072 0x6703 # 會 -0x5073 0x5055 # 偕 -0x5074 0x5050 # 偐 -0x5075 0x5048 # 偈 -0x5076 0x505A # 做 -0x5077 0x5056 # 偖 -0x5078 0x506C # 偬 -0x5079 0x5078 # 偸 -0x507A 0x5080 # 傀 -0x507B 0x509A # 傚 -0x507C 0x5085 # 傅 -0x507D 0x50B4 # 傴 -0x507E 0x50B2 # 傲 - -# "121" JIS -0x5121 0x50C9 # 僉 -0x5122 0x50CA # 僊 -0x5123 0x50B3 # 傳 -0x5124 0x50C2 # 僂 -0x5125 0x50D6 # 僖 -0x5126 0x50DE # 僞 -0x5127 0x50E5 # 僥 -0x5128 0x50ED # 僭 -0x5129 0x50E3 # 僣 -0x512A 0x50EE # 僮 -0x512B 0x50F9 # 價 -0x512C 0x50F5 # 僵 -0x512D 0x5109 # 儉 -0x512E 0x5101 # 儁 -0x512F 0x5102 # 儂 -0x5130 0x5116 # 儖 -0x5131 0x5115 # 儕 -0x5132 0x5114 # 儔 -0x5133 0x511A # 儚 -0x5134 0x5121 # 儡 -0x5135 0x513A # 儺 -0x5136 0x5137 # 儷 -0x5137 0x513C # 儼 -0x5138 0x513B # 儻 -0x5139 0x513F # 儿 -0x513A 0x5140 # 兀 -0x513B 0x5152 # 兒 -0x513C 0x514C # 兌 -0x513D 0x5154 # 兔 -0x513E 0x5162 # 兢 -0x513F 0x7AF8 # 竸 -0x5140 0x5169 # 兩 -0x5141 0x516A # 兪 -0x5142 0x516E # 兮 -0x5143 0x5180 # 冀 -0x5144 0x5182 # 冂 -0x5145 0x56D8 # 囘 -0x5146 0x518C # 册 -0x5147 0x5189 # 冉 -0x5148 0x518F # 冏 -0x5149 0x5191 # 冑 -0x514A 0x5193 # 冓 -0x514B 0x5195 # 冕 -0x514C 0x5196 # 冖 -0x514D 0x51A4 # 冤 -0x514E 0x51A6 # 冦 -0x514F 0x51A2 # 冢 -0x5150 0x51A9 # 冩 -0x5151 0x51AA # 冪 -0x5152 0x51AB # 冫 -0x5153 0x51B3 # 决 -0x5154 0x51B1 # 冱 -0x5155 0x51B2 # 冲 -0x5156 0x51B0 # 冰 -0x5157 0x51B5 # 况 -0x5158 0x51BD # 冽 -0x5159 0x51C5 # 凅 -0x515A 0x51C9 # 凉 -0x515B 0x51DB # 凛 -0x515C 0x51E0 # 几 -0x515D 0x8655 # 處 -0x515E 0x51E9 # 凩 -0x515F 0x51ED # 凭 -0x5160 0x51F0 # 凰 -0x5161 0x51F5 # 凵 -0x5162 0x51FE # 凾 -0x5163 0x5204 # 刄 -0x5164 0x520B # 刋 -0x5165 0x5214 # 刔 -0x5166 0x520E # 刎 -0x5167 0x5227 # 刧 -0x5168 0x522A # 刪 -0x5169 0x522E # 刮 -0x516A 0x5233 # 刳 -0x516B 0x5239 # 刹 -0x516C 0x524F # 剏 -0x516D 0x5244 # 剄 -0x516E 0x524B # 剋 -0x516F 0x524C # 剌 -0x5170 0x525E # 剞 -0x5171 0x5254 # 剔 -0x5172 0x526A # 剪 -0x5173 0x5274 # 剴 -0x5174 0x5269 # 剩 -0x5175 0x5273 # 剳 -0x5176 0x527F # 剿 -0x5177 0x527D # 剽 -0x5178 0x528D # 劍 -0x5179 0x5294 # 劔 -0x517A 0x5292 # 劒 -0x517B 0x5271 # 剱 -0x517C 0x5288 # 劈 -0x517D 0x5291 # 劑 -0x517E 0x8FA8 # 辨 - -# "122" JIS -0x5221 0x8FA7 # 辧 -0x5222 0x52AC # 劬 -0x5223 0x52AD # 劭 -0x5224 0x52BC # 劼 -0x5225 0x52B5 # 劵 -0x5226 0x52C1 # 勁 -0x5227 0x52CD # 勍 -0x5228 0x52D7 # 勗 -0x5229 0x52DE # 勞 -0x522A 0x52E3 # 勣 -0x522B 0x52E6 # 勦 -0x522C 0x98ED # 飭 -0x522D 0x52E0 # 勠 -0x522E 0x52F3 # 勳 -0x522F 0x52F5 # 勵 -0x5230 0x52F8 # 勸 -0x5231 0x52F9 # 勹 -0x5232 0x5306 # 匆 -0x5233 0x5308 # 匈 -0x5234 0x7538 # 甸 -0x5235 0x530D # 匍 -0x5236 0x5310 # 匐 -0x5237 0x530F # 匏 -0x5238 0x5315 # 匕 -0x5239 0x531A # 匚 -0x523A 0x5323 # 匣 -0x523B 0x532F # 匯 -0x523C 0x5331 # 匱 -0x523D 0x5333 # 匳 -0x523E 0x5338 # 匸 -0x523F 0x5340 # 區 -0x5240 0x5346 # 卆 -0x5241 0x5345 # 卅 -0x5242 0x4E17 # 丗 -0x5243 0x5349 # 卉 -0x5244 0x534D # 卍 -0x5245 0x51D6 # 凖 -0x5246 0x535E # 卞 -0x5247 0x5369 # 卩 -0x5248 0x536E # 卮 -0x5249 0x5918 # 夘 -0x524A 0x537B # 卻 -0x524B 0x5377 # 卷 -0x524C 0x5382 # 厂 -0x524D 0x5396 # 厖 -0x524E 0x53A0 # 厠 -0x524F 0x53A6 # 厦 -0x5250 0x53A5 # 厥 -0x5251 0x53AE # 厮 -0x5252 0x53B0 # 厰 -0x5253 0x53B6 # 厶 -0x5254 0x53C3 # 參 -0x5255 0x7C12 # 簒 -0x5256 0x96D9 # 雙 -0x5257 0x53DF # 叟 -0x5258 0x66FC # 曼 -0x5259 0x71EE # 燮 -0x525A 0x53EE # 叮 -0x525B 0x53E8 # 叨 -0x525C 0x53ED # 叭 -0x525D 0x53FA # 叺 -0x525E 0x5401 # 吁 -0x525F 0x543D # 吽 -0x5260 0x5440 # 呀 -0x5261 0x542C # 听 -0x5262 0x542D # 吭 -0x5263 0x543C # 吼 -0x5264 0x542E # 吮 -0x5265 0x5436 # 吶 -0x5266 0x5429 # 吩 -0x5267 0x541D # 吝 -0x5268 0x544E # 呎 -0x5269 0x548F # 咏 -0x526A 0x5475 # 呵 -0x526B 0x548E # 咎 -0x526C 0x545F # 呟 -0x526D 0x5471 # 呱 -0x526E 0x5477 # 呷 -0x526F 0x5470 # 呰 -0x5270 0x5492 # 咒 -0x5271 0x547B # 呻 -0x5272 0x5480 # 咀 -0x5273 0x5476 # 呶 -0x5274 0x5484 # 咄 -0x5275 0x5490 # 咐 -0x5276 0x5486 # 咆 -0x5277 0x54C7 # 哇 -0x5278 0x54A2 # 咢 -0x5279 0x54B8 # 咸 -0x527A 0x54A5 # 咥 -0x527B 0x54AC # 咬 -0x527C 0x54C4 # 哄 -0x527D 0x54C8 # 哈 -0x527E 0x54A8 # 咨 - -# "123" JIS -0x5321 0x54AB # 咫 -0x5322 0x54C2 # 哂 -0x5323 0x54A4 # 咤 -0x5324 0x54BE # 咾 -0x5325 0x54BC # 咼 -0x5326 0x54D8 # 哘 -0x5327 0x54E5 # 哥 -0x5328 0x54E6 # 哦 -0x5329 0x550F # 唏 -0x532A 0x5514 # 唔 -0x532B 0x54FD # 哽 -0x532C 0x54EE # 哮 -0x532D 0x54ED # 哭 -0x532E 0x54FA # 哺 -0x532F 0x54E2 # 哢 -0x5330 0x5539 # 唹 -0x5331 0x5540 # 啀 -0x5332 0x5563 # 啣 -0x5333 0x554C # 啌 -0x5334 0x552E # 售 -0x5335 0x555C # 啜 -0x5336 0x5545 # 啅 -0x5337 0x5556 # 啖 -0x5338 0x5557 # 啗 -0x5339 0x5538 # 唸 -0x533A 0x5533 # 唳 -0x533B 0x555D # 啝 -0x533C 0x5599 # 喙 -0x533D 0x5580 # 喀 -0x533E 0x54AF # 咯 -0x533F 0x558A # 喊 -0x5340 0x559F # 喟 -0x5341 0x557B # 啻 -0x5342 0x557E # 啾 -0x5343 0x5598 # 喘 -0x5344 0x559E # 喞 -0x5345 0x55AE # 單 -0x5346 0x557C # 啼 -0x5347 0x5583 # 喃 -0x5348 0x55A9 # 喩 -0x5349 0x5587 # 喇 -0x534A 0x55A8 # 喨 -0x534B 0x55DA # 嗚 -0x534C 0x55C5 # 嗅 -0x534D 0x55DF # 嗟 -0x534E 0x55C4 # 嗄 -0x534F 0x55DC # 嗜 -0x5350 0x55E4 # 嗤 -0x5351 0x55D4 # 嗔 -0x5352 0x5614 # 嘔 -0x5353 0x55F7 # 嗷 -0x5354 0x5616 # 嘖 -0x5355 0x55FE # 嗾 -0x5356 0x55FD # 嗽 -0x5357 0x561B # 嘛 -0x5358 0x55F9 # 嗹 -0x5359 0x564E # 噎 -0x535A 0x5650 # 噐 -0x535B 0x71DF # 營 -0x535C 0x5634 # 嘴 -0x535D 0x5636 # 嘶 -0x535E 0x5632 # 嘲 -0x535F 0x5638 # 嘸 -0x5360 0x566B # 噫 -0x5361 0x5664 # 噤 -0x5362 0x562F # 嘯 -0x5363 0x566C # 噬 -0x5364 0x566A # 噪 -0x5365 0x5686 # 嚆 -0x5366 0x5680 # 嚀 -0x5367 0x568A # 嚊 -0x5368 0x56A0 # 嚠 -0x5369 0x5694 # 嚔 -0x536A 0x568F # 嚏 -0x536B 0x56A5 # 嚥 -0x536C 0x56AE # 嚮 -0x536D 0x56B6 # 嚶 -0x536E 0x56B4 # 嚴 -0x536F 0x56C2 # 囂 -0x5370 0x56BC # 嚼 -0x5371 0x56C1 # 囁 -0x5372 0x56C3 # 囃 -0x5373 0x56C0 # 囀 -0x5374 0x56C8 # 囈 -0x5375 0x56CE # 囎 -0x5376 0x56D1 # 囑 -0x5377 0x56D3 # 囓 -0x5378 0x56D7 # 囗 -0x5379 0x56EE # 囮 -0x537A 0x56F9 # 囹 -0x537B 0x5700 # 圀 -0x537C 0x56FF # 囿 -0x537D 0x5704 # 圄 -0x537E 0x5709 # 圉 - -# "124" JIS -0x5421 0x5708 # 圈 -0x5422 0x570B # 國 -0x5423 0x570D # 圍 -0x5424 0x5713 # 圓 -0x5425 0x5718 # 團 -0x5426 0x5716 # 圖 -0x5427 0x55C7 # 嗇 -0x5428 0x571C # 圜 -0x5429 0x5726 # 圦 -0x542A 0x5737 # 圷 -0x542B 0x5738 # 圸 -0x542C 0x574E # 坎 -0x542D 0x573B # 圻 -0x542E 0x5740 # 址 -0x542F 0x574F # 坏 -0x5430 0x5769 # 坩 -0x5431 0x57C0 # 埀 -0x5432 0x5788 # 垈 -0x5433 0x5761 # 坡 -0x5434 0x577F # 坿 -0x5435 0x5789 # 垉 -0x5436 0x5793 # 垓 -0x5437 0x57A0 # 垠 -0x5438 0x57B3 # 垳 -0x5439 0x57A4 # 垤 -0x543A 0x57AA # 垪 -0x543B 0x57B0 # 垰 -0x543C 0x57C3 # 埃 -0x543D 0x57C6 # 埆 -0x543E 0x57D4 # 埔 -0x543F 0x57D2 # 埒 -0x5440 0x57D3 # 埓 -0x5441 0x580A # 堊 -0x5442 0x57D6 # 埖 -0x5443 0x57E3 # 埣 -0x5444 0x580B # 堋 -0x5445 0x5819 # 堙 -0x5446 0x581D # 堝 -0x5447 0x5872 # 塲 -0x5448 0x5821 # 堡 -0x5449 0x5862 # 塢 -0x544A 0x584B # 塋 -0x544B 0x5870 # 塰 -0x544C 0x6BC0 # 毀 -0x544D 0x5852 # 塒 -0x544E 0x583D # 堽 -0x544F 0x5879 # 塹 -0x5450 0x5885 # 墅 -0x5451 0x58B9 # 墹 -0x5452 0x589F # 墟 -0x5453 0x58AB # 墫 -0x5454 0x58BA # 墺 -0x5455 0x58DE # 壞 -0x5456 0x58BB # 墻 -0x5457 0x58B8 # 墸 -0x5458 0x58AE # 墮 -0x5459 0x58C5 # 壅 -0x545A 0x58D3 # 壓 -0x545B 0x58D1 # 壑 -0x545C 0x58D7 # 壗 -0x545D 0x58D9 # 壙 -0x545E 0x58D8 # 壘 -0x545F 0x58E5 # 壥 -0x5460 0x58DC # 壜 -0x5461 0x58E4 # 壤 -0x5462 0x58DF # 壟 -0x5463 0x58EF # 壯 -0x5464 0x58FA # 壺 -0x5465 0x58F9 # 壹 -0x5466 0x58FB # 壻 -0x5467 0x58FC # 壼 -0x5468 0x58FD # 壽 -0x5469 0x5902 # 夂 -0x546A 0x590A # 夊 -0x546B 0x5910 # 夐 -0x546C 0x591B # 夛 -0x546D 0x68A6 # 梦 -0x546E 0x5925 # 夥 -0x546F 0x592C # 夬 -0x5470 0x592D # 夭 -0x5471 0x5932 # 夲 -0x5472 0x5938 # 夸 -0x5473 0x593E # 夾 -0x5474 0x7AD2 # 竒 -0x5475 0x5955 # 奕 -0x5476 0x5950 # 奐 -0x5477 0x594E # 奎 -0x5478 0x595A # 奚 -0x5479 0x5958 # 奘 -0x547A 0x5962 # 奢 -0x547B 0x5960 # 奠 -0x547C 0x5967 # 奧 -0x547D 0x596C # 奬 -0x547E 0x5969 # 奩 - -# "125" JIS -0x5521 0x5978 # 奸 -0x5522 0x5981 # 妁 -0x5523 0x599D # 妝 -0x5524 0x4F5E # 佞 -0x5525 0x4FAB # 侫 -0x5526 0x59A3 # 妣 -0x5527 0x59B2 # 妲 -0x5528 0x59C6 # 姆 -0x5529 0x59E8 # 姨 -0x552A 0x59DC # 姜 -0x552B 0x598D # 妍 -0x552C 0x59D9 # 姙 -0x552D 0x59DA # 姚 -0x552E 0x5A25 # 娥 -0x552F 0x5A1F # 娟 -0x5530 0x5A11 # 娑 -0x5531 0x5A1C # 娜 -0x5532 0x5A09 # 娉 -0x5533 0x5A1A # 娚 -0x5534 0x5A40 # 婀 -0x5535 0x5A6C # 婬 -0x5536 0x5A49 # 婉 -0x5537 0x5A35 # 娵 -0x5538 0x5A36 # 娶 -0x5539 0x5A62 # 婢 -0x553A 0x5A6A # 婪 -0x553B 0x5A9A # 媚 -0x553C 0x5ABC # 媼 -0x553D 0x5ABE # 媾 -0x553E 0x5ACB # 嫋 -0x553F 0x5AC2 # 嫂 -0x5540 0x5ABD # 媽 -0x5541 0x5AE3 # 嫣 -0x5542 0x5AD7 # 嫗 -0x5543 0x5AE6 # 嫦 -0x5544 0x5AE9 # 嫩 -0x5545 0x5AD6 # 嫖 -0x5546 0x5AFA # 嫺 -0x5547 0x5AFB # 嫻 -0x5548 0x5B0C # 嬌 -0x5549 0x5B0B # 嬋 -0x554A 0x5B16 # 嬖 -0x554B 0x5B32 # 嬲 -0x554C 0x5AD0 # 嫐 -0x554D 0x5B2A # 嬪 -0x554E 0x5B36 # 嬶 -0x554F 0x5B3E # 嬾 -0x5550 0x5B43 # 孃 -0x5551 0x5B45 # 孅 -0x5552 0x5B40 # 孀 -0x5553 0x5B51 # 孑 -0x5554 0x5B55 # 孕 -0x5555 0x5B5A # 孚 -0x5556 0x5B5B # 孛 -0x5557 0x5B65 # 孥 -0x5558 0x5B69 # 孩 -0x5559 0x5B70 # 孰 -0x555A 0x5B73 # 孳 -0x555B 0x5B75 # 孵 -0x555C 0x5B78 # 學 -0x555D 0x6588 # 斈 -0x555E 0x5B7A # 孺 -0x555F 0x5B80 # 宀 -0x5560 0x5B83 # 它 -0x5561 0x5BA6 # 宦 -0x5562 0x5BB8 # 宸 -0x5563 0x5BC3 # 寃 -0x5564 0x5BC7 # 寇 -0x5565 0x5BC9 # 寉 -0x5566 0x5BD4 # 寔 -0x5567 0x5BD0 # 寐 -0x5568 0x5BE4 # 寤 -0x5569 0x5BE6 # 實 -0x556A 0x5BE2 # 寢 -0x556B 0x5BDE # 寞 -0x556C 0x5BE5 # 寥 -0x556D 0x5BEB # 寫 -0x556E 0x5BF0 # 寰 -0x556F 0x5BF6 # 寶 -0x5570 0x5BF3 # 寳 -0x5571 0x5C05 # 尅 -0x5572 0x5C07 # 將 -0x5573 0x5C08 # 專 -0x5574 0x5C0D # 對 -0x5575 0x5C13 # 尓 -0x5576 0x5C20 # 尠 -0x5577 0x5C22 # 尢 -0x5578 0x5C28 # 尨 -0x5579 0x5C38 # 尸 -0x557A 0x5C39 # 尹 -0x557B 0x5C41 # 屁 -0x557C 0x5C46 # 屆 -0x557D 0x5C4E # 屎 -0x557E 0x5C53 # 屓 - -# "126" JIS -0x5621 0x5C50 # 屐 -0x5622 0x5C4F # 屏 -0x5623 0x5B71 # 孱 -0x5624 0x5C6C # 屬 -0x5625 0x5C6E # 屮 -0x5626 0x4E62 # 乢 -0x5627 0x5C76 # 屶 -0x5628 0x5C79 # 屹 -0x5629 0x5C8C # 岌 -0x562A 0x5C91 # 岑 -0x562B 0x5C94 # 岔 -0x562C 0x599B # 妛 -0x562D 0x5CAB # 岫 -0x562E 0x5CBB # 岻 -0x562F 0x5CB6 # 岶 -0x5630 0x5CBC # 岼 -0x5631 0x5CB7 # 岷 -0x5632 0x5CC5 # 峅 -0x5633 0x5CBE # 岾 -0x5634 0x5CC7 # 峇 -0x5635 0x5CD9 # 峙 -0x5636 0x5CE9 # 峩 -0x5637 0x5CFD # 峽 -0x5638 0x5CFA # 峺 -0x5639 0x5CED # 峭 -0x563A 0x5D8C # 嶌 -0x563B 0x5CEA # 峪 -0x563C 0x5D0B # 崋 -0x563D 0x5D15 # 崕 -0x563E 0x5D17 # 崗 -0x563F 0x5D5C # 嵜 -0x5640 0x5D1F # 崟 -0x5641 0x5D1B # 崛 -0x5642 0x5D11 # 崑 -0x5643 0x5D14 # 崔 -0x5644 0x5D22 # 崢 -0x5645 0x5D1A # 崚 -0x5646 0x5D19 # 崙 -0x5647 0x5D18 # 崘 -0x5648 0x5D4C # 嵌 -0x5649 0x5D52 # 嵒 -0x564A 0x5D4E # 嵎 -0x564B 0x5D4B # 嵋 -0x564C 0x5D6C # 嵬 -0x564D 0x5D73 # 嵳 -0x564E 0x5D76 # 嵶 -0x564F 0x5D87 # 嶇 -0x5650 0x5D84 # 嶄 -0x5651 0x5D82 # 嶂 -0x5652 0x5DA2 # 嶢 -0x5653 0x5D9D # 嶝 -0x5654 0x5DAC # 嶬 -0x5655 0x5DAE # 嶮 -0x5656 0x5DBD # 嶽 -0x5657 0x5D90 # 嶐 -0x5658 0x5DB7 # 嶷 -0x5659 0x5DBC # 嶼 -0x565A 0x5DC9 # 巉 -0x565B 0x5DCD # 巍 -0x565C 0x5DD3 # 巓 -0x565D 0x5DD2 # 巒 -0x565E 0x5DD6 # 巖 -0x565F 0x5DDB # 巛 -0x5660 0x5DEB # 巫 -0x5661 0x5DF2 # 已 -0x5662 0x5DF5 # 巵 -0x5663 0x5E0B # 帋 -0x5664 0x5E1A # 帚 -0x5665 0x5E19 # 帙 -0x5666 0x5E11 # 帑 -0x5667 0x5E1B # 帛 -0x5668 0x5E36 # 帶 -0x5669 0x5E37 # 帷 -0x566A 0x5E44 # 幄 -0x566B 0x5E43 # 幃 -0x566C 0x5E40 # 幀 -0x566D 0x5E4E # 幎 -0x566E 0x5E57 # 幗 -0x566F 0x5E54 # 幔 -0x5670 0x5E5F # 幟 -0x5671 0x5E62 # 幢 -0x5672 0x5E64 # 幤 -0x5673 0x5E47 # 幇 -0x5674 0x5E75 # 幵 -0x5675 0x5E76 # 并 -0x5676 0x5E7A # 幺 -0x5677 0x9EBC # 麼 -0x5678 0x5E7F # 广 -0x5679 0x5EA0 # 庠 -0x567A 0x5EC1 # 廁 -0x567B 0x5EC2 # 廂 -0x567C 0x5EC8 # 廈 -0x567D 0x5ED0 # 廐 -0x567E 0x5ECF # 廏 - -# "127" JIS -0x5721 0x5ED6 # 廖 -0x5722 0x5EE3 # 廣 -0x5723 0x5EDD # 廝 -0x5724 0x5EDA # 廚 -0x5725 0x5EDB # 廛 -0x5726 0x5EE2 # 廢 -0x5727 0x5EE1 # 廡 -0x5728 0x5EE8 # 廨 -0x5729 0x5EE9 # 廩 -0x572A 0x5EEC # 廬 -0x572B 0x5EF1 # 廱 -0x572C 0x5EF3 # 廳 -0x572D 0x5EF0 # 廰 -0x572E 0x5EF4 # 廴 -0x572F 0x5EF8 # 廸 -0x5730 0x5EFE # 廾 -0x5731 0x5F03 # 弃 -0x5732 0x5F09 # 弉 -0x5733 0x5F5D # 彝 -0x5734 0x5F5C # 彜 -0x5735 0x5F0B # 弋 -0x5736 0x5F11 # 弑 -0x5737 0x5F16 # 弖 -0x5738 0x5F29 # 弩 -0x5739 0x5F2D # 弭 -0x573A 0x5F38 # 弸 -0x573B 0x5F41 # 彁 -0x573C 0x5F48 # 彈 -0x573D 0x5F4C # 彌 -0x573E 0x5F4E # 彎 -0x573F 0x5F2F # 弯 -0x5740 0x5F51 # 彑 -0x5741 0x5F56 # 彖 -0x5742 0x5F57 # 彗 -0x5743 0x5F59 # 彙 -0x5744 0x5F61 # 彡 -0x5745 0x5F6D # 彭 -0x5746 0x5F73 # 彳 -0x5747 0x5F77 # 彷 -0x5748 0x5F83 # 徃 -0x5749 0x5F82 # 徂 -0x574A 0x5F7F # 彿 -0x574B 0x5F8A # 徊 -0x574C 0x5F88 # 很 -0x574D 0x5F91 # 徑 -0x574E 0x5F87 # 徇 -0x574F 0x5F9E # 從 -0x5750 0x5F99 # 徙 -0x5751 0x5F98 # 徘 -0x5752 0x5FA0 # 徠 -0x5753 0x5FA8 # 徨 -0x5754 0x5FAD # 徭 -0x5755 0x5FBC # 徼 -0x5756 0x5FD6 # 忖 -0x5757 0x5FFB # 忻 -0x5758 0x5FE4 # 忤 -0x5759 0x5FF8 # 忸 -0x575A 0x5FF1 # 忱 -0x575B 0x5FDD # 忝 -0x575C 0x60B3 # 悳 -0x575D 0x5FFF # 忿 -0x575E 0x6021 # 怡 -0x575F 0x6060 # 恠 -0x5760 0x6019 # 怙 -0x5761 0x6010 # 怐 -0x5762 0x6029 # 怩 -0x5763 0x600E # 怎 -0x5764 0x6031 # 怱 -0x5765 0x601B # 怛 -0x5766 0x6015 # 怕 -0x5767 0x602B # 怫 -0x5768 0x6026 # 怦 -0x5769 0x600F # 怏 -0x576A 0x603A # 怺 -0x576B 0x605A # 恚 -0x576C 0x6041 # 恁 -0x576D 0x606A # 恪 -0x576E 0x6077 # 恷 -0x576F 0x605F # 恟 -0x5770 0x604A # 恊 -0x5771 0x6046 # 恆 -0x5772 0x604D # 恍 -0x5773 0x6063 # 恣 -0x5774 0x6043 # 恃 -0x5775 0x6064 # 恤 -0x5776 0x6042 # 恂 -0x5777 0x606C # 恬 -0x5778 0x606B # 恫 -0x5779 0x6059 # 恙 -0x577A 0x6081 # 悁 -0x577B 0x608D # 悍 -0x577C 0x60E7 # 惧 -0x577D 0x6083 # 悃 -0x577E 0x609A # 悚 - -# "130" JIS -0x5821 0x6084 # 悄 -0x5822 0x609B # 悛 -0x5823 0x6096 # 悖 -0x5824 0x6097 # 悗 -0x5825 0x6092 # 悒 -0x5826 0x60A7 # 悧 -0x5827 0x608B # 悋 -0x5828 0x60E1 # 惡 -0x5829 0x60B8 # 悸 -0x582A 0x60E0 # 惠 -0x582B 0x60D3 # 惓 -0x582C 0x60B4 # 悴 -0x582D 0x5FF0 # 忰 -0x582E 0x60BD # 悽 -0x582F 0x60C6 # 惆 -0x5830 0x60B5 # 悵 -0x5831 0x60D8 # 惘 -0x5832 0x614D # 慍 -0x5833 0x6115 # 愕 -0x5834 0x6106 # 愆 -0x5835 0x60F6 # 惶 -0x5836 0x60F7 # 惷 -0x5837 0x6100 # 愀 -0x5838 0x60F4 # 惴 -0x5839 0x60FA # 惺 -0x583A 0x6103 # 愃 -0x583B 0x6121 # 愡 -0x583C 0x60FB # 惻 -0x583D 0x60F1 # 惱 -0x583E 0x610D # 愍 -0x583F 0x610E # 愎 -0x5840 0x6147 # 慇 -0x5841 0x613E # 愾 -0x5842 0x6128 # 愨 -0x5843 0x6127 # 愧 -0x5844 0x614A # 慊 -0x5845 0x613F # 愿 -0x5846 0x613C # 愼 -0x5847 0x612C # 愬 -0x5848 0x6134 # 愴 -0x5849 0x613D # 愽 -0x584A 0x6142 # 慂 -0x584B 0x6144 # 慄 -0x584C 0x6173 # 慳 -0x584D 0x6177 # 慷 -0x584E 0x6158 # 慘 -0x584F 0x6159 # 慙 -0x5850 0x615A # 慚 -0x5851 0x616B # 慫 -0x5852 0x6174 # 慴 -0x5853 0x616F # 慯 -0x5854 0x6165 # 慥 -0x5855 0x6171 # 慱 -0x5856 0x615F # 慟 -0x5857 0x615D # 慝 -0x5858 0x6153 # 慓 -0x5859 0x6175 # 慵 -0x585A 0x6199 # 憙 -0x585B 0x6196 # 憖 -0x585C 0x6187 # 憇 -0x585D 0x61AC # 憬 -0x585E 0x6194 # 憔 -0x585F 0x619A # 憚 -0x5860 0x618A # 憊 -0x5861 0x6191 # 憑 -0x5862 0x61AB # 憫 -0x5863 0x61AE # 憮 -0x5864 0x61CC # 懌 -0x5865 0x61CA # 懊 -0x5866 0x61C9 # 應 -0x5867 0x61F7 # 懷 -0x5868 0x61C8 # 懈 -0x5869 0x61C3 # 懃 -0x586A 0x61C6 # 懆 -0x586B 0x61BA # 憺 -0x586C 0x61CB # 懋 -0x586D 0x7F79 # 罹 -0x586E 0x61CD # 懍 -0x586F 0x61E6 # 懦 -0x5870 0x61E3 # 懣 -0x5871 0x61F6 # 懶 -0x5872 0x61FA # 懺 -0x5873 0x61F4 # 懴 -0x5874 0x61FF # 懿 -0x5875 0x61FD # 懽 -0x5876 0x61FC # 懼 -0x5877 0x61FE # 懾 -0x5878 0x6200 # 戀 -0x5879 0x6208 # 戈 -0x587A 0x6209 # 戉 -0x587B 0x620D # 戍 -0x587C 0x620C # 戌 -0x587D 0x6214 # 戔 -0x587E 0x621B # 戛 - -# "131" JIS -0x5921 0x621E # 戞 -0x5922 0x6221 # 戡 -0x5923 0x622A # 截 -0x5924 0x622E # 戮 -0x5925 0x6230 # 戰 -0x5926 0x6232 # 戲 -0x5927 0x6233 # 戳 -0x5928 0x6241 # 扁 -0x5929 0x624E # 扎 -0x592A 0x625E # 扞 -0x592B 0x6263 # 扣 -0x592C 0x625B # 扛 -0x592D 0x6260 # 扠 -0x592E 0x6268 # 扨 -0x592F 0x627C # 扼 -0x5930 0x6282 # 抂 -0x5931 0x6289 # 抉 -0x5932 0x627E # 找 -0x5933 0x6292 # 抒 -0x5934 0x6293 # 抓 -0x5935 0x6296 # 抖 -0x5936 0x62D4 # 拔 -0x5937 0x6283 # 抃 -0x5938 0x6294 # 抔 -0x5939 0x62D7 # 拗 -0x593A 0x62D1 # 拑 -0x593B 0x62BB # 抻 -0x593C 0x62CF # 拏 -0x593D 0x62FF # 拿 -0x593E 0x62C6 # 拆 -0x593F 0x64D4 # 擔 -0x5940 0x62C8 # 拈 -0x5941 0x62DC # 拜 -0x5942 0x62CC # 拌 -0x5943 0x62CA # 拊 -0x5944 0x62C2 # 拂 -0x5945 0x62C7 # 拇 -0x5946 0x629B # 抛 -0x5947 0x62C9 # 拉 -0x5948 0x630C # 挌 -0x5949 0x62EE # 拮 -0x594A 0x62F1 # 拱 -0x594B 0x6327 # 挧 -0x594C 0x6302 # 挂 -0x594D 0x6308 # 挈 -0x594E 0x62EF # 拯 -0x594F 0x62F5 # 拵 -0x5950 0x6350 # 捐 -0x5951 0x633E # 挾 -0x5952 0x634D # 捍 -0x5953 0x641C # 搜 -0x5954 0x634F # 捏 -0x5955 0x6396 # 掖 -0x5956 0x638E # 掎 -0x5957 0x6380 # 掀 -0x5958 0x63AB # 掫 -0x5959 0x6376 # 捶 -0x595A 0x63A3 # 掣 -0x595B 0x638F # 掏 -0x595C 0x6389 # 掉 -0x595D 0x639F # 掟 -0x595E 0x63B5 # 掵 -0x595F 0x636B # 捫 -0x5960 0x6369 # 捩 -0x5961 0x63BE # 掾 -0x5962 0x63E9 # 揩 -0x5963 0x63C0 # 揀 -0x5964 0x63C6 # 揆 -0x5965 0x63E3 # 揣 -0x5966 0x63C9 # 揉 -0x5967 0x63D2 # 插 -0x5968 0x63F6 # 揶 -0x5969 0x63C4 # 揄 -0x596A 0x6416 # 搖 -0x596B 0x6434 # 搴 -0x596C 0x6406 # 搆 -0x596D 0x6413 # 搓 -0x596E 0x6426 # 搦 -0x596F 0x6436 # 搶 -0x5970 0x651D # 攝 -0x5971 0x6417 # 搗 -0x5972 0x6428 # 搨 -0x5973 0x640F # 搏 -0x5974 0x6467 # 摧 -0x5975 0x646F # 摯 -0x5976 0x6476 # 摶 -0x5977 0x644E # 摎 -0x5978 0x652A # 攪 -0x5979 0x6495 # 撕 -0x597A 0x6493 # 撓 -0x597B 0x64A5 # 撥 -0x597C 0x64A9 # 撩 -0x597D 0x6488 # 撈 -0x597E 0x64BC # 撼 - -# "132" JIS -0x5A21 0x64DA # 據 -0x5A22 0x64D2 # 擒 -0x5A23 0x64C5 # 擅 -0x5A24 0x64C7 # 擇 -0x5A25 0x64BB # 撻 -0x5A26 0x64D8 # 擘 -0x5A27 0x64C2 # 擂 -0x5A28 0x64F1 # 擱 -0x5A29 0x64E7 # 擧 -0x5A2A 0x8209 # 舉 -0x5A2B 0x64E0 # 擠 -0x5A2C 0x64E1 # 擡 -0x5A2D 0x62AC # 抬 -0x5A2E 0x64E3 # 擣 -0x5A2F 0x64EF # 擯 -0x5A30 0x652C # 攬 -0x5A31 0x64F6 # 擶 -0x5A32 0x64F4 # 擴 -0x5A33 0x64F2 # 擲 -0x5A34 0x64FA # 擺 -0x5A35 0x6500 # 攀 -0x5A36 0x64FD # 擽 -0x5A37 0x6518 # 攘 -0x5A38 0x651C # 攜 -0x5A39 0x6505 # 攅 -0x5A3A 0x6524 # 攤 -0x5A3B 0x6523 # 攣 -0x5A3C 0x652B # 攫 -0x5A3D 0x6534 # 攴 -0x5A3E 0x6535 # 攵 -0x5A3F 0x6537 # 攷 -0x5A40 0x6536 # 收 -0x5A41 0x6538 # 攸 -0x5A42 0x754B # 畋 -0x5A43 0x6548 # 效 -0x5A44 0x6556 # 敖 -0x5A45 0x6555 # 敕 -0x5A46 0x654D # 敍 -0x5A47 0x6558 # 敘 -0x5A48 0x655E # 敞 -0x5A49 0x655D # 敝 -0x5A4A 0x6572 # 敲 -0x5A4B 0x6578 # 數 -0x5A4C 0x6582 # 斂 -0x5A4D 0x6583 # 斃 -0x5A4E 0x8B8A # 變 -0x5A4F 0x659B # 斛 -0x5A50 0x659F # 斟 -0x5A51 0x65AB # 斫 -0x5A52 0x65B7 # 斷 -0x5A53 0x65C3 # 旃 -0x5A54 0x65C6 # 旆 -0x5A55 0x65C1 # 旁 -0x5A56 0x65C4 # 旄 -0x5A57 0x65CC # 旌 -0x5A58 0x65D2 # 旒 -0x5A59 0x65DB # 旛 -0x5A5A 0x65D9 # 旙 -0x5A5B 0x65E0 # 无 -0x5A5C 0x65E1 # 旡 -0x5A5D 0x65F1 # 旱 -0x5A5E 0x6772 # 杲 -0x5A5F 0x660A # 昊 -0x5A60 0x6603 # 昃 -0x5A61 0x65FB # 旻 -0x5A62 0x6773 # 杳 -0x5A63 0x6635 # 昵 -0x5A64 0x6636 # 昶 -0x5A65 0x6634 # 昴 -0x5A66 0x661C # 昜 -0x5A67 0x664F # 晏 -0x5A68 0x6644 # 晄 -0x5A69 0x6649 # 晉 -0x5A6A 0x6641 # 晁 -0x5A6B 0x665E # 晞 -0x5A6C 0x665D # 晝 -0x5A6D 0x6664 # 晤 -0x5A6E 0x6667 # 晧 -0x5A6F 0x6668 # 晨 -0x5A70 0x665F # 晟 -0x5A71 0x6662 # 晢 -0x5A72 0x6670 # 晰 -0x5A73 0x6683 # 暃 -0x5A74 0x6688 # 暈 -0x5A75 0x668E # 暎 -0x5A76 0x6689 # 暉 -0x5A77 0x6684 # 暄 -0x5A78 0x6698 # 暘 -0x5A79 0x669D # 暝 -0x5A7A 0x66C1 # 曁 -0x5A7B 0x66B9 # 暹 -0x5A7C 0x66C9 # 曉 -0x5A7D 0x66BE # 暾 -0x5A7E 0x66BC # 暼 - -# "133" JIS -0x5B21 0x66C4 # 曄 -0x5B22 0x66B8 # 暸 -0x5B23 0x66D6 # 曖 -0x5B24 0x66DA # 曚 -0x5B25 0x66E0 # 曠 -0x5B26 0x663F # 昿 -0x5B27 0x66E6 # 曦 -0x5B28 0x66E9 # 曩 -0x5B29 0x66F0 # 曰 -0x5B2A 0x66F5 # 曵 -0x5B2B 0x66F7 # 曷 -0x5B2C 0x670F # 朏 -0x5B2D 0x6716 # 朖 -0x5B2E 0x671E # 朞 -0x5B2F 0x6726 # 朦 -0x5B30 0x6727 # 朧 -0x5B31 0x9738 # 霸 -0x5B32 0x672E # 朮 -0x5B33 0x673F # 朿 -0x5B34 0x6736 # 朶 -0x5B35 0x6741 # 杁 -0x5B36 0x6738 # 朸 -0x5B37 0x6737 # 朷 -0x5B38 0x6746 # 杆 -0x5B39 0x675E # 杞 -0x5B3A 0x6760 # 杠 -0x5B3B 0x6759 # 杙 -0x5B3C 0x6763 # 杣 -0x5B3D 0x6764 # 杤 -0x5B3E 0x6789 # 枉 -0x5B3F 0x6770 # 杰 -0x5B40 0x67A9 # 枩 -0x5B41 0x677C # 杼 -0x5B42 0x676A # 杪 -0x5B43 0x678C # 枌 -0x5B44 0x678B # 枋 -0x5B45 0x67A6 # 枦 -0x5B46 0x67A1 # 枡 -0x5B47 0x6785 # 枅 -0x5B48 0x67B7 # 枷 -0x5B49 0x67EF # 柯 -0x5B4A 0x67B4 # 枴 -0x5B4B 0x67EC # 柬 -0x5B4C 0x67B3 # 枳 -0x5B4D 0x67E9 # 柩 -0x5B4E 0x67B8 # 枸 -0x5B4F 0x67E4 # 柤 -0x5B50 0x67DE # 柞 -0x5B51 0x67DD # 柝 -0x5B52 0x67E2 # 柢 -0x5B53 0x67EE # 柮 -0x5B54 0x67B9 # 枹 -0x5B55 0x67CE # 柎 -0x5B56 0x67C6 # 柆 -0x5B57 0x67E7 # 柧 -0x5B58 0x6A9C # 檜 -0x5B59 0x681E # 栞 -0x5B5A 0x6846 # 框 -0x5B5B 0x6829 # 栩 -0x5B5C 0x6840 # 桀 -0x5B5D 0x684D # 桍 -0x5B5E 0x6832 # 栲 -0x5B5F 0x684E # 桎 -0x5B60 0x68B3 # 梳 -0x5B61 0x682B # 栫 -0x5B62 0x6859 # 桙 -0x5B63 0x6863 # 档 -0x5B64 0x6877 # 桷 -0x5B65 0x687F # 桿 -0x5B66 0x689F # 梟 -0x5B67 0x688F # 梏 -0x5B68 0x68AD # 梭 -0x5B69 0x6894 # 梔 -0x5B6A 0x689D # 條 -0x5B6B 0x689B # 梛 -0x5B6C 0x6883 # 梃 -0x5B6D 0x6AAE # 檮 -0x5B6E 0x68B9 # 梹 -0x5B6F 0x6874 # 桴 -0x5B70 0x68B5 # 梵 -0x5B71 0x68A0 # 梠 -0x5B72 0x68BA # 梺 -0x5B73 0x690F # 椏 -0x5B74 0x688D # 梍 -0x5B75 0x687E # 桾 -0x5B76 0x6901 # 椁 -0x5B77 0x68CA # 棊 -0x5B78 0x6908 # 椈 -0x5B79 0x68D8 # 棘 -0x5B7A 0x6922 # 椢 -0x5B7B 0x6926 # 椦 -0x5B7C 0x68E1 # 棡 -0x5B7D 0x690C # 椌 -0x5B7E 0x68CD # 棍 - -# "134" JIS -0x5C21 0x68D4 # 棔 -0x5C22 0x68E7 # 棧 -0x5C23 0x68D5 # 棕 -0x5C24 0x6936 # 椶 -0x5C25 0x6912 # 椒 -0x5C26 0x6904 # 椄 -0x5C27 0x68D7 # 棗 -0x5C28 0x68E3 # 棣 -0x5C29 0x6925 # 椥 -0x5C2A 0x68F9 # 棹 -0x5C2B 0x68E0 # 棠 -0x5C2C 0x68EF # 棯 -0x5C2D 0x6928 # 椨 -0x5C2E 0x692A # 椪 -0x5C2F 0x691A # 椚 -0x5C30 0x6923 # 椣 -0x5C31 0x6921 # 椡 -0x5C32 0x68C6 # 棆 -0x5C33 0x6979 # 楹 -0x5C34 0x6977 # 楷 -0x5C35 0x695C # 楜 -0x5C36 0x6978 # 楸 -0x5C37 0x696B # 楫 -0x5C38 0x6954 # 楔 -0x5C39 0x697E # 楾 -0x5C3A 0x696E # 楮 -0x5C3B 0x6939 # 椹 -0x5C3C 0x6974 # 楴 -0x5C3D 0x693D # 椽 -0x5C3E 0x6959 # 楙 -0x5C3F 0x6930 # 椰 -0x5C40 0x6961 # 楡 -0x5C41 0x695E # 楞 -0x5C42 0x695D # 楝 -0x5C43 0x6981 # 榁 -0x5C44 0x696A # 楪 -0x5C45 0x69B2 # 榲 -0x5C46 0x69AE # 榮 -0x5C47 0x69D0 # 槐 -0x5C48 0x69BF # 榿 -0x5C49 0x69C1 # 槁 -0x5C4A 0x69D3 # 槓 -0x5C4B 0x69BE # 榾 -0x5C4C 0x69CE # 槎 -0x5C4D 0x5BE8 # 寨 -0x5C4E 0x69CA # 槊 -0x5C4F 0x69DD # 槝 -0x5C50 0x69BB # 榻 -0x5C51 0x69C3 # 槃 -0x5C52 0x69A7 # 榧 -0x5C53 0x6A2E # 樮 -0x5C54 0x6991 # 榑 -0x5C55 0x69A0 # 榠 -0x5C56 0x699C # 榜 -0x5C57 0x6995 # 榕 -0x5C58 0x69B4 # 榴 -0x5C59 0x69DE # 槞 -0x5C5A 0x69E8 # 槨 -0x5C5B 0x6A02 # 樂 -0x5C5C 0x6A1B # 樛 -0x5C5D 0x69FF # 槿 -0x5C5E 0x6B0A # 權 -0x5C5F 0x69F9 # 槹 -0x5C60 0x69F2 # 槲 -0x5C61 0x69E7 # 槧 -0x5C62 0x6A05 # 樅 -0x5C63 0x69B1 # 榱 -0x5C64 0x6A1E # 樞 -0x5C65 0x69ED # 槭 -0x5C66 0x6A14 # 樔 -0x5C67 0x69EB # 槫 -0x5C68 0x6A0A # 樊 -0x5C69 0x6A12 # 樒 -0x5C6A 0x6AC1 # 櫁 -0x5C6B 0x6A23 # 樣 -0x5C6C 0x6A13 # 樓 -0x5C6D 0x6A44 # 橄 -0x5C6E 0x6A0C # 樌 -0x5C6F 0x6A72 # 橲 -0x5C70 0x6A36 # 樶 -0x5C71 0x6A78 # 橸 -0x5C72 0x6A47 # 橇 -0x5C73 0x6A62 # 橢 -0x5C74 0x6A59 # 橙 -0x5C75 0x6A66 # 橦 -0x5C76 0x6A48 # 橈 -0x5C77 0x6A38 # 樸 -0x5C78 0x6A22 # 樢 -0x5C79 0x6A90 # 檐 -0x5C7A 0x6A8D # 檍 -0x5C7B 0x6AA0 # 檠 -0x5C7C 0x6A84 # 檄 -0x5C7D 0x6AA2 # 檢 -0x5C7E 0x6AA3 # 檣 - -# "135" JIS -0x5D21 0x6A97 # 檗 -0x5D22 0x8617 # 蘗 -0x5D23 0x6ABB # 檻 -0x5D24 0x6AC3 # 櫃 -0x5D25 0x6AC2 # 櫂 -0x5D26 0x6AB8 # 檸 -0x5D27 0x6AB3 # 檳 -0x5D28 0x6AAC # 檬 -0x5D29 0x6ADE # 櫞 -0x5D2A 0x6AD1 # 櫑 -0x5D2B 0x6ADF # 櫟 -0x5D2C 0x6AAA # 檪 -0x5D2D 0x6ADA # 櫚 -0x5D2E 0x6AEA # 櫪 -0x5D2F 0x6AFB # 櫻 -0x5D30 0x6B05 # 欅 -0x5D31 0x8616 # 蘖 -0x5D32 0x6AFA # 櫺 -0x5D33 0x6B12 # 欒 -0x5D34 0x6B16 # 欖 -0x5D35 0x9B31 # 鬱 -0x5D36 0x6B1F # 欟 -0x5D37 0x6B38 # 欸 -0x5D38 0x6B37 # 欷 -0x5D39 0x76DC # 盜 -0x5D3A 0x6B39 # 欹 -0x5D3B 0x98EE # 飮 -0x5D3C 0x6B47 # 歇 -0x5D3D 0x6B43 # 歃 -0x5D3E 0x6B49 # 歉 -0x5D3F 0x6B50 # 歐 -0x5D40 0x6B59 # 歙 -0x5D41 0x6B54 # 歔 -0x5D42 0x6B5B # 歛 -0x5D43 0x6B5F # 歟 -0x5D44 0x6B61 # 歡 -0x5D45 0x6B78 # 歸 -0x5D46 0x6B79 # 歹 -0x5D47 0x6B7F # 歿 -0x5D48 0x6B80 # 殀 -0x5D49 0x6B84 # 殄 -0x5D4A 0x6B83 # 殃 -0x5D4B 0x6B8D # 殍 -0x5D4C 0x6B98 # 殘 -0x5D4D 0x6B95 # 殕 -0x5D4E 0x6B9E # 殞 -0x5D4F 0x6BA4 # 殤 -0x5D50 0x6BAA # 殪 -0x5D51 0x6BAB # 殫 -0x5D52 0x6BAF # 殯 -0x5D53 0x6BB2 # 殲 -0x5D54 0x6BB1 # 殱 -0x5D55 0x6BB3 # 殳 -0x5D56 0x6BB7 # 殷 -0x5D57 0x6BBC # 殼 -0x5D58 0x6BC6 # 毆 -0x5D59 0x6BCB # 毋 -0x5D5A 0x6BD3 # 毓 -0x5D5B 0x6BDF # 毟 -0x5D5C 0x6BEC # 毬 -0x5D5D 0x6BEB # 毫 -0x5D5E 0x6BF3 # 毳 -0x5D5F 0x6BEF # 毯 -0x5D60 0x9EBE # 麾 -0x5D61 0x6C08 # 氈 -0x5D62 0x6C13 # 氓 -0x5D63 0x6C14 # 气 -0x5D64 0x6C1B # 氛 -0x5D65 0x6C24 # 氤 -0x5D66 0x6C23 # 氣 -0x5D67 0x6C5E # 汞 -0x5D68 0x6C55 # 汕 -0x5D69 0x6C62 # 汢 -0x5D6A 0x6C6A # 汪 -0x5D6B 0x6C82 # 沂 -0x5D6C 0x6C8D # 沍 -0x5D6D 0x6C9A # 沚 -0x5D6E 0x6C81 # 沁 -0x5D6F 0x6C9B # 沛 -0x5D70 0x6C7E # 汾 -0x5D71 0x6C68 # 汨 -0x5D72 0x6C73 # 汳 -0x5D73 0x6C92 # 沒 -0x5D74 0x6C90 # 沐 -0x5D75 0x6CC4 # 泄 -0x5D76 0x6CF1 # 泱 -0x5D77 0x6CD3 # 泓 -0x5D78 0x6CBD # 沽 -0x5D79 0x6CD7 # 泗 -0x5D7A 0x6CC5 # 泅 -0x5D7B 0x6CDD # 泝 -0x5D7C 0x6CAE # 沮 -0x5D7D 0x6CB1 # 沱 -0x5D7E 0x6CBE # 沾 - -# "136" JIS -0x5E21 0x6CBA # 沺 -0x5E22 0x6CDB # 泛 -0x5E23 0x6CEF # 泯 -0x5E24 0x6CD9 # 泙 -0x5E25 0x6CEA # 泪 -0x5E26 0x6D1F # 洟 -0x5E27 0x884D # 衍 -0x5E28 0x6D36 # 洶 -0x5E29 0x6D2B # 洫 -0x5E2A 0x6D3D # 洽 -0x5E2B 0x6D38 # 洸 -0x5E2C 0x6D19 # 洙 -0x5E2D 0x6D35 # 洵 -0x5E2E 0x6D33 # 洳 -0x5E2F 0x6D12 # 洒 -0x5E30 0x6D0C # 洌 -0x5E31 0x6D63 # 浣 -0x5E32 0x6D93 # 涓 -0x5E33 0x6D64 # 浤 -0x5E34 0x6D5A # 浚 -0x5E35 0x6D79 # 浹 -0x5E36 0x6D59 # 浙 -0x5E37 0x6D8E # 涎 -0x5E38 0x6D95 # 涕 -0x5E39 0x6FE4 # 濤 -0x5E3A 0x6D85 # 涅 -0x5E3B 0x6DF9 # 淹 -0x5E3C 0x6E15 # 渕 -0x5E3D 0x6E0A # 渊 -0x5E3E 0x6DB5 # 涵 -0x5E3F 0x6DC7 # 淇 -0x5E40 0x6DE6 # 淦 -0x5E41 0x6DB8 # 涸 -0x5E42 0x6DC6 # 淆 -0x5E43 0x6DEC # 淬 -0x5E44 0x6DDE # 淞 -0x5E45 0x6DCC # 淌 -0x5E46 0x6DE8 # 淨 -0x5E47 0x6DD2 # 淒 -0x5E48 0x6DC5 # 淅 -0x5E49 0x6DFA # 淺 -0x5E4A 0x6DD9 # 淙 -0x5E4B 0x6DE4 # 淤 -0x5E4C 0x6DD5 # 淕 -0x5E4D 0x6DEA # 淪 -0x5E4E 0x6DEE # 淮 -0x5E4F 0x6E2D # 渭 -0x5E50 0x6E6E # 湮 -0x5E51 0x6E2E # 渮 -0x5E52 0x6E19 # 渙 -0x5E53 0x6E72 # 湲 -0x5E54 0x6E5F # 湟 -0x5E55 0x6E3E # 渾 -0x5E56 0x6E23 # 渣 -0x5E57 0x6E6B # 湫 -0x5E58 0x6E2B # 渫 -0x5E59 0x6E76 # 湶 -0x5E5A 0x6E4D # 湍 -0x5E5B 0x6E1F # 渟 -0x5E5C 0x6E43 # 湃 -0x5E5D 0x6E3A # 渺 -0x5E5E 0x6E4E # 湎 -0x5E5F 0x6E24 # 渤 -0x5E60 0x6EFF # 滿 -0x5E61 0x6E1D # 渝 -0x5E62 0x6E38 # 游 -0x5E63 0x6E82 # 溂 -0x5E64 0x6EAA # 溪 -0x5E65 0x6E98 # 溘 -0x5E66 0x6EC9 # 滉 -0x5E67 0x6EB7 # 溷 -0x5E68 0x6ED3 # 滓 -0x5E69 0x6EBD # 溽 -0x5E6A 0x6EAF # 溯 -0x5E6B 0x6EC4 # 滄 -0x5E6C 0x6EB2 # 溲 -0x5E6D 0x6ED4 # 滔 -0x5E6E 0x6ED5 # 滕 -0x5E6F 0x6E8F # 溏 -0x5E70 0x6EA5 # 溥 -0x5E71 0x6EC2 # 滂 -0x5E72 0x6E9F # 溟 -0x5E73 0x6F41 # 潁 -0x5E74 0x6F11 # 漑 -0x5E75 0x704C # 灌 -0x5E76 0x6EEC # 滬 -0x5E77 0x6EF8 # 滸 -0x5E78 0x6EFE # 滾 -0x5E79 0x6F3F # 漿 -0x5E7A 0x6EF2 # 滲 -0x5E7B 0x6F31 # 漱 -0x5E7C 0x6EEF # 滯 -0x5E7D 0x6F32 # 漲 -0x5E7E 0x6ECC # 滌 - -# "137" JIS -0x5F21 0x6F3E # 漾 -0x5F22 0x6F13 # 漓 -0x5F23 0x6EF7 # 滷 -0x5F24 0x6F86 # 澆 -0x5F25 0x6F7A # 潺 -0x5F26 0x6F78 # 潸 -0x5F27 0x6F81 # 澁 -0x5F28 0x6F80 # 澀 -0x5F29 0x6F6F # 潯 -0x5F2A 0x6F5B # 潛 -0x5F2B 0x6FF3 # 濳 -0x5F2C 0x6F6D # 潭 -0x5F2D 0x6F82 # 澂 -0x5F2E 0x6F7C # 潼 -0x5F2F 0x6F58 # 潘 -0x5F30 0x6F8E # 澎 -0x5F31 0x6F91 # 澑 -0x5F32 0x6FC2 # 濂 -0x5F33 0x6F66 # 潦 -0x5F34 0x6FB3 # 澳 -0x5F35 0x6FA3 # 澣 -0x5F36 0x6FA1 # 澡 -0x5F37 0x6FA4 # 澤 -0x5F38 0x6FB9 # 澹 -0x5F39 0x6FC6 # 濆 -0x5F3A 0x6FAA # 澪 -0x5F3B 0x6FDF # 濟 -0x5F3C 0x6FD5 # 濕 -0x5F3D 0x6FEC # 濬 -0x5F3E 0x6FD4 # 濔 -0x5F3F 0x6FD8 # 濘 -0x5F40 0x6FF1 # 濱 -0x5F41 0x6FEE # 濮 -0x5F42 0x6FDB # 濛 -0x5F43 0x7009 # 瀉 -0x5F44 0x700B # 瀋 -0x5F45 0x6FFA # 濺 -0x5F46 0x7011 # 瀑 -0x5F47 0x7001 # 瀁 -0x5F48 0x700F # 瀏 -0x5F49 0x6FFE # 濾 -0x5F4A 0x701B # 瀛 -0x5F4B 0x701A # 瀚 -0x5F4C 0x6F74 # 潴 -0x5F4D 0x701D # 瀝 -0x5F4E 0x7018 # 瀘 -0x5F4F 0x701F # 瀟 -0x5F50 0x7030 # 瀰 -0x5F51 0x703E # 瀾 -0x5F52 0x7032 # 瀲 -0x5F53 0x7051 # 灑 -0x5F54 0x7063 # 灣 -0x5F55 0x7099 # 炙 -0x5F56 0x7092 # 炒 -0x5F57 0x70AF # 炯 -0x5F58 0x70F1 # 烱 -0x5F59 0x70AC # 炬 -0x5F5A 0x70B8 # 炸 -0x5F5B 0x70B3 # 炳 -0x5F5C 0x70AE # 炮 -0x5F5D 0x70DF # 烟 -0x5F5E 0x70CB # 烋 -0x5F5F 0x70DD # 烝 -0x5F60 0x70D9 # 烙 -0x5F61 0x7109 # 焉 -0x5F62 0x70FD # 烽 -0x5F63 0x711C # 焜 -0x5F64 0x7119 # 焙 -0x5F65 0x7165 # 煥 -0x5F66 0x7155 # 煕 -0x5F67 0x7188 # 熈 -0x5F68 0x7166 # 煦 -0x5F69 0x7162 # 煢 -0x5F6A 0x714C # 煌 -0x5F6B 0x7156 # 煖 -0x5F6C 0x716C # 煬 -0x5F6D 0x718F # 熏 -0x5F6E 0x71FB # 燻 -0x5F6F 0x7184 # 熄 -0x5F70 0x7195 # 熕 -0x5F71 0x71A8 # 熨 -0x5F72 0x71AC # 熬 -0x5F73 0x71D7 # 燗 -0x5F74 0x71B9 # 熹 -0x5F75 0x71BE # 熾 -0x5F76 0x71D2 # 燒 -0x5F77 0x71C9 # 燉 -0x5F78 0x71D4 # 燔 -0x5F79 0x71CE # 燎 -0x5F7A 0x71E0 # 燠 -0x5F7B 0x71EC # 燬 -0x5F7C 0x71E7 # 燧 -0x5F7D 0x71F5 # 燵 -0x5F7E 0x71FC # 燼 - -# "140" JIS -0x6021 0x71F9 # 燹 -0x6022 0x71FF # 燿 -0x6023 0x720D # 爍 -0x6024 0x7210 # 爐 -0x6025 0x721B # 爛 -0x6026 0x7228 # 爨 -0x6027 0x722D # 爭 -0x6028 0x722C # 爬 -0x6029 0x7230 # 爰 -0x602A 0x7232 # 爲 -0x602B 0x723B # 爻 -0x602C 0x723C # 爼 -0x602D 0x723F # 爿 -0x602E 0x7240 # 牀 -0x602F 0x7246 # 牆 -0x6030 0x724B # 牋 -0x6031 0x7258 # 牘 -0x6032 0x7274 # 牴 -0x6033 0x727E # 牾 -0x6034 0x7282 # 犂 -0x6035 0x7281 # 犁 -0x6036 0x7287 # 犇 -0x6037 0x7292 # 犒 -0x6038 0x7296 # 犖 -0x6039 0x72A2 # 犢 -0x603A 0x72A7 # 犧 -0x603B 0x72B9 # 犹 -0x603C 0x72B2 # 犲 -0x603D 0x72C3 # 狃 -0x603E 0x72C6 # 狆 -0x603F 0x72C4 # 狄 -0x6040 0x72CE # 狎 -0x6041 0x72D2 # 狒 -0x6042 0x72E2 # 狢 -0x6043 0x72E0 # 狠 -0x6044 0x72E1 # 狡 -0x6045 0x72F9 # 狹 -0x6046 0x72F7 # 狷 -0x6047 0x500F # 倏 -0x6048 0x7317 # 猗 -0x6049 0x730A # 猊 -0x604A 0x731C # 猜 -0x604B 0x7316 # 猖 -0x604C 0x731D # 猝 -0x604D 0x7334 # 猴 -0x604E 0x732F # 猯 -0x604F 0x7329 # 猩 -0x6050 0x7325 # 猥 -0x6051 0x733E # 猾 -0x6052 0x734E # 獎 -0x6053 0x734F # 獏 -0x6054 0x9ED8 # 默 -0x6055 0x7357 # 獗 -0x6056 0x736A # 獪 -0x6057 0x7368 # 獨 -0x6058 0x7370 # 獰 -0x6059 0x7378 # 獸 -0x605A 0x7375 # 獵 -0x605B 0x737B # 獻 -0x605C 0x737A # 獺 -0x605D 0x73C8 # 珈 -0x605E 0x73B3 # 玳 -0x605F 0x73CE # 珎 -0x6060 0x73BB # 玻 -0x6061 0x73C0 # 珀 -0x6062 0x73E5 # 珥 -0x6063 0x73EE # 珮 -0x6064 0x73DE # 珞 -0x6065 0x74A2 # 璢 -0x6066 0x7405 # 琅 -0x6067 0x746F # 瑯 -0x6068 0x7425 # 琥 -0x6069 0x73F8 # 珸 -0x606A 0x7432 # 琲 -0x606B 0x743A # 琺 -0x606C 0x7455 # 瑕 -0x606D 0x743F # 琿 -0x606E 0x745F # 瑟 -0x606F 0x7459 # 瑙 -0x6070 0x7441 # 瑁 -0x6071 0x745C # 瑜 -0x6072 0x7469 # 瑩 -0x6073 0x7470 # 瑰 -0x6074 0x7463 # 瑣 -0x6075 0x746A # 瑪 -0x6076 0x7476 # 瑶 -0x6077 0x747E # 瑾 -0x6078 0x748B # 璋 -0x6079 0x749E # 璞 -0x607A 0x74A7 # 璧 -0x607B 0x74CA # 瓊 -0x607C 0x74CF # 瓏 -0x607D 0x74D4 # 瓔 -0x607E 0x73F1 # 珱 - -# "141" JIS -0x6121 0x74E0 # 瓠 -0x6122 0x74E3 # 瓣 -0x6123 0x74E7 # 瓧 -0x6124 0x74E9 # 瓩 -0x6125 0x74EE # 瓮 -0x6126 0x74F2 # 瓲 -0x6127 0x74F0 # 瓰 -0x6128 0x74F1 # 瓱 -0x6129 0x74F8 # 瓸 -0x612A 0x74F7 # 瓷 -0x612B 0x7504 # 甄 -0x612C 0x7503 # 甃 -0x612D 0x7505 # 甅 -0x612E 0x750C # 甌 -0x612F 0x750E # 甎 -0x6130 0x750D # 甍 -0x6131 0x7515 # 甕 -0x6132 0x7513 # 甓 -0x6133 0x751E # 甞 -0x6134 0x7526 # 甦 -0x6135 0x752C # 甬 -0x6136 0x753C # 甼 -0x6137 0x7544 # 畄 -0x6138 0x754D # 畍 -0x6139 0x754A # 畊 -0x613A 0x7549 # 畉 -0x613B 0x755B # 畛 -0x613C 0x7546 # 畆 -0x613D 0x755A # 畚 -0x613E 0x7569 # 畩 -0x613F 0x7564 # 畤 -0x6140 0x7567 # 畧 -0x6141 0x756B # 畫 -0x6142 0x756D # 畭 -0x6143 0x7578 # 畸 -0x6144 0x7576 # 當 -0x6145 0x7586 # 疆 -0x6146 0x7587 # 疇 -0x6147 0x7574 # 畴 -0x6148 0x758A # 疊 -0x6149 0x7589 # 疉 -0x614A 0x7582 # 疂 -0x614B 0x7594 # 疔 -0x614C 0x759A # 疚 -0x614D 0x759D # 疝 -0x614E 0x75A5 # 疥 -0x614F 0x75A3 # 疣 -0x6150 0x75C2 # 痂 -0x6151 0x75B3 # 疳 -0x6152 0x75C3 # 痃 -0x6153 0x75B5 # 疵 -0x6154 0x75BD # 疽 -0x6155 0x75B8 # 疸 -0x6156 0x75BC # 疼 -0x6157 0x75B1 # 疱 -0x6158 0x75CD # 痍 -0x6159 0x75CA # 痊 -0x615A 0x75D2 # 痒 -0x615B 0x75D9 # 痙 -0x615C 0x75E3 # 痣 -0x615D 0x75DE # 痞 -0x615E 0x75FE # 痾 -0x615F 0x75FF # 痿 -0x6160 0x75FC # 痼 -0x6161 0x7601 # 瘁 -0x6162 0x75F0 # 痰 -0x6163 0x75FA # 痺 -0x6164 0x75F2 # 痲 -0x6165 0x75F3 # 痳 -0x6166 0x760B # 瘋 -0x6167 0x760D # 瘍 -0x6168 0x7609 # 瘉 -0x6169 0x761F # 瘟 -0x616A 0x7627 # 瘧 -0x616B 0x7620 # 瘠 -0x616C 0x7621 # 瘡 -0x616D 0x7622 # 瘢 -0x616E 0x7624 # 瘤 -0x616F 0x7634 # 瘴 -0x6170 0x7630 # 瘰 -0x6171 0x763B # 瘻 -0x6172 0x7647 # 癇 -0x6173 0x7648 # 癈 -0x6174 0x7646 # 癆 -0x6175 0x765C # 癜 -0x6176 0x7658 # 癘 -0x6177 0x7661 # 癡 -0x6178 0x7662 # 癢 -0x6179 0x7668 # 癨 -0x617A 0x7669 # 癩 -0x617B 0x766A # 癪 -0x617C 0x7667 # 癧 -0x617D 0x766C # 癬 -0x617E 0x7670 # 癰 - -# "142" JIS -0x6221 0x7672 # 癲 -0x6222 0x7676 # 癶 -0x6223 0x7678 # 癸 -0x6224 0x767C # 發 -0x6225 0x7680 # 皀 -0x6226 0x7683 # 皃 -0x6227 0x7688 # 皈 -0x6228 0x768B # 皋 -0x6229 0x768E # 皎 -0x622A 0x7696 # 皖 -0x622B 0x7693 # 皓 -0x622C 0x7699 # 皙 -0x622D 0x769A # 皚 -0x622E 0x76B0 # 皰 -0x622F 0x76B4 # 皴 -0x6230 0x76B8 # 皸 -0x6231 0x76B9 # 皹 -0x6232 0x76BA # 皺 -0x6233 0x76C2 # 盂 -0x6234 0x76CD # 盍 -0x6235 0x76D6 # 盖 -0x6236 0x76D2 # 盒 -0x6237 0x76DE # 盞 -0x6238 0x76E1 # 盡 -0x6239 0x76E5 # 盥 -0x623A 0x76E7 # 盧 -0x623B 0x76EA # 盪 -0x623C 0x862F # 蘯 -0x623D 0x76FB # 盻 -0x623E 0x7708 # 眈 -0x623F 0x7707 # 眇 -0x6240 0x7704 # 眄 -0x6241 0x7729 # 眩 -0x6242 0x7724 # 眤 -0x6243 0x771E # 眞 -0x6244 0x7725 # 眥 -0x6245 0x7726 # 眦 -0x6246 0x771B # 眛 -0x6247 0x7737 # 眷 -0x6248 0x7738 # 眸 -0x6249 0x7747 # 睇 -0x624A 0x775A # 睚 -0x624B 0x7768 # 睨 -0x624C 0x776B # 睫 -0x624D 0x775B # 睛 -0x624E 0x7765 # 睥 -0x624F 0x777F # 睿 -0x6250 0x777E # 睾 -0x6251 0x7779 # 睹 -0x6252 0x778E # 瞎 -0x6253 0x778B # 瞋 -0x6254 0x7791 # 瞑 -0x6255 0x77A0 # 瞠 -0x6256 0x779E # 瞞 -0x6257 0x77B0 # 瞰 -0x6258 0x77B6 # 瞶 -0x6259 0x77B9 # 瞹 -0x625A 0x77BF # 瞿 -0x625B 0x77BC # 瞼 -0x625C 0x77BD # 瞽 -0x625D 0x77BB # 瞻 -0x625E 0x77C7 # 矇 -0x625F 0x77CD # 矍 -0x6260 0x77D7 # 矗 -0x6261 0x77DA # 矚 -0x6262 0x77DC # 矜 -0x6263 0x77E3 # 矣 -0x6264 0x77EE # 矮 -0x6265 0x77FC # 矼 -0x6266 0x780C # 砌 -0x6267 0x7812 # 砒 -0x6268 0x7926 # 礦 -0x6269 0x7820 # 砠 -0x626A 0x792A # 礪 -0x626B 0x7845 # 硅 -0x626C 0x788E # 碎 -0x626D 0x7874 # 硴 -0x626E 0x7886 # 碆 -0x626F 0x787C # 硼 -0x6270 0x789A # 碚 -0x6271 0x788C # 碌 -0x6272 0x78A3 # 碣 -0x6273 0x78B5 # 碵 -0x6274 0x78AA # 碪 -0x6275 0x78AF # 碯 -0x6276 0x78D1 # 磑 -0x6277 0x78C6 # 磆 -0x6278 0x78CB # 磋 -0x6279 0x78D4 # 磔 -0x627A 0x78BE # 碾 -0x627B 0x78BC # 碼 -0x627C 0x78C5 # 磅 -0x627D 0x78CA # 磊 -0x627E 0x78EC # 磬 - -# "143" JIS -0x6321 0x78E7 # 磧 -0x6322 0x78DA # 磚 -0x6323 0x78FD # 磽 -0x6324 0x78F4 # 磴 -0x6325 0x7907 # 礇 -0x6326 0x7912 # 礒 -0x6327 0x7911 # 礑 -0x6328 0x7919 # 礙 -0x6329 0x792C # 礬 -0x632A 0x792B # 礫 -0x632B 0x7940 # 祀 -0x632C 0x7960 # 祠 -0x632D 0x7957 # 祗 -0x632E 0x795F # 祟 -0x632F 0x795A # 祚 -0x6330 0x7955 # 祕 -0x6331 0x7953 # 祓 -0x6332 0x797A # 祺 -0x6333 0x797F # 祿 -0x6334 0x798A # 禊 -0x6335 0x799D # 禝 -0x6336 0x79A7 # 禧 -0x6337 0x9F4B # 齋 -0x6338 0x79AA # 禪 -0x6339 0x79AE # 禮 -0x633A 0x79B3 # 禳 -0x633B 0x79B9 # 禹 -0x633C 0x79BA # 禺 -0x633D 0x79C9 # 秉 -0x633E 0x79D5 # 秕 -0x633F 0x79E7 # 秧 -0x6340 0x79EC # 秬 -0x6341 0x79E1 # 秡 -0x6342 0x79E3 # 秣 -0x6343 0x7A08 # 稈 -0x6344 0x7A0D # 稍 -0x6345 0x7A18 # 稘 -0x6346 0x7A19 # 稙 -0x6347 0x7A20 # 稠 -0x6348 0x7A1F # 稟 -0x6349 0x7980 # 禀 -0x634A 0x7A31 # 稱 -0x634B 0x7A3B # 稻 -0x634C 0x7A3E # 稾 -0x634D 0x7A37 # 稷 -0x634E 0x7A43 # 穃 -0x634F 0x7A57 # 穗 -0x6350 0x7A49 # 穉 -0x6351 0x7A61 # 穡 -0x6352 0x7A62 # 穢 -0x6353 0x7A69 # 穩 -0x6354 0x9F9D # 龝 -0x6355 0x7A70 # 穰 -0x6356 0x7A79 # 穹 -0x6357 0x7A7D # 穽 -0x6358 0x7A88 # 窈 -0x6359 0x7A97 # 窗 -0x635A 0x7A95 # 窕 -0x635B 0x7A98 # 窘 -0x635C 0x7A96 # 窖 -0x635D 0x7AA9 # 窩 -0x635E 0x7AC8 # 竈 -0x635F 0x7AB0 # 窰 -0x6360 0x7AB6 # 窶 -0x6361 0x7AC5 # 竅 -0x6362 0x7AC4 # 竄 -0x6363 0x7ABF # 窿 -0x6364 0x9083 # 邃 -0x6365 0x7AC7 # 竇 -0x6366 0x7ACA # 竊 -0x6367 0x7ACD # 竍 -0x6368 0x7ACF # 竏 -0x6369 0x7AD5 # 竕 -0x636A 0x7AD3 # 竓 -0x636B 0x7AD9 # 站 -0x636C 0x7ADA # 竚 -0x636D 0x7ADD # 竝 -0x636E 0x7AE1 # 竡 -0x636F 0x7AE2 # 竢 -0x6370 0x7AE6 # 竦 -0x6371 0x7AED # 竭 -0x6372 0x7AF0 # 竰 -0x6373 0x7B02 # 笂 -0x6374 0x7B0F # 笏 -0x6375 0x7B0A # 笊 -0x6376 0x7B06 # 笆 -0x6377 0x7B33 # 笳 -0x6378 0x7B18 # 笘 -0x6379 0x7B19 # 笙 -0x637A 0x7B1E # 笞 -0x637B 0x7B35 # 笵 -0x637C 0x7B28 # 笨 -0x637D 0x7B36 # 笶 -0x637E 0x7B50 # 筐 - -# "144" JIS -0x6421 0x7B7A # 筺 -0x6422 0x7B04 # 笄 -0x6423 0x7B4D # 筍 -0x6424 0x7B0B # 笋 -0x6425 0x7B4C # 筌 -0x6426 0x7B45 # 筅 -0x6427 0x7B75 # 筵 -0x6428 0x7B65 # 筥 -0x6429 0x7B74 # 筴 -0x642A 0x7B67 # 筧 -0x642B 0x7B70 # 筰 -0x642C 0x7B71 # 筱 -0x642D 0x7B6C # 筬 -0x642E 0x7B6E # 筮 -0x642F 0x7B9D # 箝 -0x6430 0x7B98 # 箘 -0x6431 0x7B9F # 箟 -0x6432 0x7B8D # 箍 -0x6433 0x7B9C # 箜 -0x6434 0x7B9A # 箚 -0x6435 0x7B8B # 箋 -0x6436 0x7B92 # 箒 -0x6437 0x7B8F # 箏 -0x6438 0x7B5D # 筝 -0x6439 0x7B99 # 箙 -0x643A 0x7BCB # 篋 -0x643B 0x7BC1 # 篁 -0x643C 0x7BCC # 篌 -0x643D 0x7BCF # 篏 -0x643E 0x7BB4 # 箴 -0x643F 0x7BC6 # 篆 -0x6440 0x7BDD # 篝 -0x6441 0x7BE9 # 篩 -0x6442 0x7C11 # 簑 -0x6443 0x7C14 # 簔 -0x6444 0x7BE6 # 篦 -0x6445 0x7BE5 # 篥 -0x6446 0x7C60 # 籠 -0x6447 0x7C00 # 簀 -0x6448 0x7C07 # 簇 -0x6449 0x7C13 # 簓 -0x644A 0x7BF3 # 篳 -0x644B 0x7BF7 # 篷 -0x644C 0x7C17 # 簗 -0x644D 0x7C0D # 簍 -0x644E 0x7BF6 # 篶 -0x644F 0x7C23 # 簣 -0x6450 0x7C27 # 簧 -0x6451 0x7C2A # 簪 -0x6452 0x7C1F # 簟 -0x6453 0x7C37 # 簷 -0x6454 0x7C2B # 簫 -0x6455 0x7C3D # 簽 -0x6456 0x7C4C # 籌 -0x6457 0x7C43 # 籃 -0x6458 0x7C54 # 籔 -0x6459 0x7C4F # 籏 -0x645A 0x7C40 # 籀 -0x645B 0x7C50 # 籐 -0x645C 0x7C58 # 籘 -0x645D 0x7C5F # 籟 -0x645E 0x7C64 # 籤 -0x645F 0x7C56 # 籖 -0x6460 0x7C65 # 籥 -0x6461 0x7C6C # 籬 -0x6462 0x7C75 # 籵 -0x6463 0x7C83 # 粃 -0x6464 0x7C90 # 粐 -0x6465 0x7CA4 # 粤 -0x6466 0x7CAD # 粭 -0x6467 0x7CA2 # 粢 -0x6468 0x7CAB # 粫 -0x6469 0x7CA1 # 粡 -0x646A 0x7CA8 # 粨 -0x646B 0x7CB3 # 粳 -0x646C 0x7CB2 # 粲 -0x646D 0x7CB1 # 粱 -0x646E 0x7CAE # 粮 -0x646F 0x7CB9 # 粹 -0x6470 0x7CBD # 粽 -0x6471 0x7CC0 # 糀 -0x6472 0x7CC5 # 糅 -0x6473 0x7CC2 # 糂 -0x6474 0x7CD8 # 糘 -0x6475 0x7CD2 # 糒 -0x6476 0x7CDC # 糜 -0x6477 0x7CE2 # 糢 -0x6478 0x9B3B # 鬻 -0x6479 0x7CEF # 糯 -0x647A 0x7CF2 # 糲 -0x647B 0x7CF4 # 糴 -0x647C 0x7CF6 # 糶 -0x647D 0x7CFA # 糺 -0x647E 0x7D06 # 紆 - -# "145" JIS -0x6521 0x7D02 # 紂 -0x6522 0x7D1C # 紜 -0x6523 0x7D15 # 紕 -0x6524 0x7D0A # 紊 -0x6525 0x7D45 # 絅 -0x6526 0x7D4B # 絋 -0x6527 0x7D2E # 紮 -0x6528 0x7D32 # 紲 -0x6529 0x7D3F # 紿 -0x652A 0x7D35 # 紵 -0x652B 0x7D46 # 絆 -0x652C 0x7D73 # 絳 -0x652D 0x7D56 # 絖 -0x652E 0x7D4E # 絎 -0x652F 0x7D72 # 絲 -0x6530 0x7D68 # 絨 -0x6531 0x7D6E # 絮 -0x6532 0x7D4F # 絏 -0x6533 0x7D63 # 絣 -0x6534 0x7D93 # 經 -0x6535 0x7D89 # 綉 -0x6536 0x7D5B # 絛 -0x6537 0x7D8F # 綏 -0x6538 0x7D7D # 絽 -0x6539 0x7D9B # 綛 -0x653A 0x7DBA # 綺 -0x653B 0x7DAE # 綮 -0x653C 0x7DA3 # 綣 -0x653D 0x7DB5 # 綵 -0x653E 0x7DC7 # 緇 -0x653F 0x7DBD # 綽 -0x6540 0x7DAB # 綫 -0x6541 0x7E3D # 總 -0x6542 0x7DA2 # 綢 -0x6543 0x7DAF # 綯 -0x6544 0x7DDC # 緜 -0x6545 0x7DB8 # 綸 -0x6546 0x7D9F # 綟 -0x6547 0x7DB0 # 綰 -0x6548 0x7DD8 # 緘 -0x6549 0x7DDD # 緝 -0x654A 0x7DE4 # 緤 -0x654B 0x7DDE # 緞 -0x654C 0x7DFB # 緻 -0x654D 0x7DF2 # 緲 -0x654E 0x7DE1 # 緡 -0x654F 0x7E05 # 縅 -0x6550 0x7E0A # 縊 -0x6551 0x7E23 # 縣 -0x6552 0x7E21 # 縡 -0x6553 0x7E12 # 縒 -0x6554 0x7E31 # 縱 -0x6555 0x7E1F # 縟 -0x6556 0x7E09 # 縉 -0x6557 0x7E0B # 縋 -0x6558 0x7E22 # 縢 -0x6559 0x7E46 # 繆 -0x655A 0x7E66 # 繦 -0x655B 0x7E3B # 縻 -0x655C 0x7E35 # 縵 -0x655D 0x7E39 # 縹 -0x655E 0x7E43 # 繃 -0x655F 0x7E37 # 縷 -0x6560 0x7E32 # 縲 -0x6561 0x7E3A # 縺 -0x6562 0x7E67 # 繧 -0x6563 0x7E5D # 繝 -0x6564 0x7E56 # 繖 -0x6565 0x7E5E # 繞 -0x6566 0x7E59 # 繙 -0x6567 0x7E5A # 繚 -0x6568 0x7E79 # 繹 -0x6569 0x7E6A # 繪 -0x656A 0x7E69 # 繩 -0x656B 0x7E7C # 繼 -0x656C 0x7E7B # 繻 -0x656D 0x7E83 # 纃 -0x656E 0x7DD5 # 緕 -0x656F 0x7E7D # 繽 -0x6570 0x8FAE # 辮 -0x6571 0x7E7F # 繿 -0x6572 0x7E88 # 纈 -0x6573 0x7E89 # 纉 -0x6574 0x7E8C # 續 -0x6575 0x7E92 # 纒 -0x6576 0x7E90 # 纐 -0x6577 0x7E93 # 纓 -0x6578 0x7E94 # 纔 -0x6579 0x7E96 # 纖 -0x657A 0x7E8E # 纎 -0x657B 0x7E9B # 纛 -0x657C 0x7E9C # 纜 -0x657D 0x7F38 # 缸 -0x657E 0x7F3A # 缺 - -# "146" JIS -0x6621 0x7F45 # 罅 -0x6622 0x7F4C # 罌 -0x6623 0x7F4D # 罍 -0x6624 0x7F4E # 罎 -0x6625 0x7F50 # 罐 -0x6626 0x7F51 # 网 -0x6627 0x7F55 # 罕 -0x6628 0x7F54 # 罔 -0x6629 0x7F58 # 罘 -0x662A 0x7F5F # 罟 -0x662B 0x7F60 # 罠 -0x662C 0x7F68 # 罨 -0x662D 0x7F69 # 罩 -0x662E 0x7F67 # 罧 -0x662F 0x7F78 # 罸 -0x6630 0x7F82 # 羂 -0x6631 0x7F86 # 羆 -0x6632 0x7F83 # 羃 -0x6633 0x7F88 # 羈 -0x6634 0x7F87 # 羇 -0x6635 0x7F8C # 羌 -0x6636 0x7F94 # 羔 -0x6637 0x7F9E # 羞 -0x6638 0x7F9D # 羝 -0x6639 0x7F9A # 羚 -0x663A 0x7FA3 # 羣 -0x663B 0x7FAF # 羯 -0x663C 0x7FB2 # 羲 -0x663D 0x7FB9 # 羹 -0x663E 0x7FAE # 羮 -0x663F 0x7FB6 # 羶 -0x6640 0x7FB8 # 羸 -0x6641 0x8B71 # 譱 -0x6642 0x7FC5 # 翅 -0x6643 0x7FC6 # 翆 -0x6644 0x7FCA # 翊 -0x6645 0x7FD5 # 翕 -0x6646 0x7FD4 # 翔 -0x6647 0x7FE1 # 翡 -0x6648 0x7FE6 # 翦 -0x6649 0x7FE9 # 翩 -0x664A 0x7FF3 # 翳 -0x664B 0x7FF9 # 翹 -0x664C 0x98DC # 飜 -0x664D 0x8006 # 耆 -0x664E 0x8004 # 耄 -0x664F 0x800B # 耋 -0x6650 0x8012 # 耒 -0x6651 0x8018 # 耘 -0x6652 0x8019 # 耙 -0x6653 0x801C # 耜 -0x6654 0x8021 # 耡 -0x6655 0x8028 # 耨 -0x6656 0x803F # 耿 -0x6657 0x803B # 耻 -0x6658 0x804A # 聊 -0x6659 0x8046 # 聆 -0x665A 0x8052 # 聒 -0x665B 0x8058 # 聘 -0x665C 0x805A # 聚 -0x665D 0x805F # 聟 -0x665E 0x8062 # 聢 -0x665F 0x8068 # 聨 -0x6660 0x8073 # 聳 -0x6661 0x8072 # 聲 -0x6662 0x8070 # 聰 -0x6663 0x8076 # 聶 -0x6664 0x8079 # 聹 -0x6665 0x807D # 聽 -0x6666 0x807F # 聿 -0x6667 0x8084 # 肄 -0x6668 0x8086 # 肆 -0x6669 0x8085 # 肅 -0x666A 0x809B # 肛 -0x666B 0x8093 # 肓 -0x666C 0x809A # 肚 -0x666D 0x80AD # 肭 -0x666E 0x5190 # 冐 -0x666F 0x80AC # 肬 -0x6670 0x80DB # 胛 -0x6671 0x80E5 # 胥 -0x6672 0x80D9 # 胙 -0x6673 0x80DD # 胝 -0x6674 0x80C4 # 胄 -0x6675 0x80DA # 胚 -0x6676 0x80D6 # 胖 -0x6677 0x8109 # 脉 -0x6678 0x80EF # 胯 -0x6679 0x80F1 # 胱 -0x667A 0x811B # 脛 -0x667B 0x8129 # 脩 -0x667C 0x8123 # 脣 -0x667D 0x812F # 脯 -0x667E 0x814B # 腋 - -# "147" JIS -0x6721 0x968B # 隋 -0x6722 0x8146 # 腆 -0x6723 0x813E # 脾 -0x6724 0x8153 # 腓 -0x6725 0x8151 # 腑 -0x6726 0x80FC # 胼 -0x6727 0x8171 # 腱 -0x6728 0x816E # 腮 -0x6729 0x8165 # 腥 -0x672A 0x8166 # 腦 -0x672B 0x8174 # 腴 -0x672C 0x8183 # 膃 -0x672D 0x8188 # 膈 -0x672E 0x818A # 膊 -0x672F 0x8180 # 膀 -0x6730 0x8182 # 膂 -0x6731 0x81A0 # 膠 -0x6732 0x8195 # 膕 -0x6733 0x81A4 # 膤 -0x6734 0x81A3 # 膣 -0x6735 0x815F # 腟 -0x6736 0x8193 # 膓 -0x6737 0x81A9 # 膩 -0x6738 0x81B0 # 膰 -0x6739 0x81B5 # 膵 -0x673A 0x81BE # 膾 -0x673B 0x81B8 # 膸 -0x673C 0x81BD # 膽 -0x673D 0x81C0 # 臀 -0x673E 0x81C2 # 臂 -0x673F 0x81BA # 膺 -0x6740 0x81C9 # 臉 -0x6741 0x81CD # 臍 -0x6742 0x81D1 # 臑 -0x6743 0x81D9 # 臙 -0x6744 0x81D8 # 臘 -0x6745 0x81C8 # 臈 -0x6746 0x81DA # 臚 -0x6747 0x81DF # 臟 -0x6748 0x81E0 # 臠 -0x6749 0x81E7 # 臧 -0x674A 0x81FA # 臺 -0x674B 0x81FB # 臻 -0x674C 0x81FE # 臾 -0x674D 0x8201 # 舁 -0x674E 0x8202 # 舂 -0x674F 0x8205 # 舅 -0x6750 0x8207 # 與 -0x6751 0x820A # 舊 -0x6752 0x820D # 舍 -0x6753 0x8210 # 舐 -0x6754 0x8216 # 舖 -0x6755 0x8229 # 舩 -0x6756 0x822B # 舫 -0x6757 0x8238 # 舸 -0x6758 0x8233 # 舳 -0x6759 0x8240 # 艀 -0x675A 0x8259 # 艙 -0x675B 0x8258 # 艘 -0x675C 0x825D # 艝 -0x675D 0x825A # 艚 -0x675E 0x825F # 艟 -0x675F 0x8264 # 艤 -0x6760 0x8262 # 艢 -0x6761 0x8268 # 艨 -0x6762 0x826A # 艪 -0x6763 0x826B # 艫 -0x6764 0x822E # 舮 -0x6765 0x8271 # 艱 -0x6766 0x8277 # 艷 -0x6767 0x8278 # 艸 -0x6768 0x827E # 艾 -0x6769 0x828D # 芍 -0x676A 0x8292 # 芒 -0x676B 0x82AB # 芫 -0x676C 0x829F # 芟 -0x676D 0x82BB # 芻 -0x676E 0x82AC # 芬 -0x676F 0x82E1 # 苡 -0x6770 0x82E3 # 苣 -0x6771 0x82DF # 苟 -0x6772 0x82D2 # 苒 -0x6773 0x82F4 # 苴 -0x6774 0x82F3 # 苳 -0x6775 0x82FA # 苺 -0x6776 0x8393 # 莓 -0x6777 0x8303 # 范 -0x6778 0x82FB # 苻 -0x6779 0x82F9 # 苹 -0x677A 0x82DE # 苞 -0x677B 0x8306 # 茆 -0x677C 0x82DC # 苜 -0x677D 0x8309 # 茉 -0x677E 0x82D9 # 苙 - -# "150" JIS -0x6821 0x8335 # 茵 -0x6822 0x8334 # 茴 -0x6823 0x8316 # 茖 -0x6824 0x8332 # 茲 -0x6825 0x8331 # 茱 -0x6826 0x8340 # 荀 -0x6827 0x8339 # 茹 -0x6828 0x8350 # 荐 -0x6829 0x8345 # 荅 -0x682A 0x832F # 茯 -0x682B 0x832B # 茫 -0x682C 0x8317 # 茗 -0x682D 0x8318 # 茘 -0x682E 0x8385 # 莅 -0x682F 0x839A # 莚 -0x6830 0x83AA # 莪 -0x6831 0x839F # 莟 -0x6832 0x83A2 # 莢 -0x6833 0x8396 # 莖 -0x6834 0x8323 # 茣 -0x6835 0x838E # 莎 -0x6836 0x8387 # 莇 -0x6837 0x838A # 莊 -0x6838 0x837C # 荼 -0x6839 0x83B5 # 莵 -0x683A 0x8373 # 荳 -0x683B 0x8375 # 荵 -0x683C 0x83A0 # 莠 -0x683D 0x8389 # 莉 -0x683E 0x83A8 # 莨 -0x683F 0x83F4 # 菴 -0x6840 0x8413 # 萓 -0x6841 0x83EB # 菫 -0x6842 0x83CE # 菎 -0x6843 0x83FD # 菽 -0x6844 0x8403 # 萃 -0x6845 0x83D8 # 菘 -0x6846 0x840B # 萋 -0x6847 0x83C1 # 菁 -0x6848 0x83F7 # 菷 -0x6849 0x8407 # 萇 -0x684A 0x83E0 # 菠 -0x684B 0x83F2 # 菲 -0x684C 0x840D # 萍 -0x684D 0x8422 # 萢 -0x684E 0x8420 # 萠 -0x684F 0x83BD # 莽 -0x6850 0x8438 # 萸 -0x6851 0x8506 # 蔆 -0x6852 0x83FB # 菻 -0x6853 0x846D # 葭 -0x6854 0x842A # 萪 -0x6855 0x843C # 萼 -0x6856 0x855A # 蕚 -0x6857 0x8484 # 蒄 -0x6858 0x8477 # 葷 -0x6859 0x846B # 葫 -0x685A 0x84AD # 蒭 -0x685B 0x846E # 葮 -0x685C 0x8482 # 蒂 -0x685D 0x8469 # 葩 -0x685E 0x8446 # 葆 -0x685F 0x842C # 萬 -0x6860 0x846F # 葯 -0x6861 0x8479 # 葹 -0x6862 0x8435 # 萵 -0x6863 0x84CA # 蓊 -0x6864 0x8462 # 葢 -0x6865 0x84B9 # 蒹 -0x6866 0x84BF # 蒿 -0x6867 0x849F # 蒟 -0x6868 0x84D9 # 蓙 -0x6869 0x84CD # 蓍 -0x686A 0x84BB # 蒻 -0x686B 0x84DA # 蓚 -0x686C 0x84D0 # 蓐 -0x686D 0x84C1 # 蓁 -0x686E 0x84C6 # 蓆 -0x686F 0x84D6 # 蓖 -0x6870 0x84A1 # 蒡 -0x6871 0x8521 # 蔡 -0x6872 0x84FF # 蓿 -0x6873 0x84F4 # 蓴 -0x6874 0x8517 # 蔗 -0x6875 0x8518 # 蔘 -0x6876 0x852C # 蔬 -0x6877 0x851F # 蔟 -0x6878 0x8515 # 蔕 -0x6879 0x8514 # 蔔 -0x687A 0x84FC # 蓼 -0x687B 0x8540 # 蕀 -0x687C 0x8563 # 蕣 -0x687D 0x8558 # 蕘 -0x687E 0x8548 # 蕈 - -# "151" JIS -0x6921 0x8541 # 蕁 -0x6922 0x8602 # 蘂 -0x6923 0x854B # 蕋 -0x6924 0x8555 # 蕕 -0x6925 0x8580 # 薀 -0x6926 0x85A4 # 薤 -0x6927 0x8588 # 薈 -0x6928 0x8591 # 薑 -0x6929 0x858A # 薊 -0x692A 0x85A8 # 薨 -0x692B 0x856D # 蕭 -0x692C 0x8594 # 薔 -0x692D 0x859B # 薛 -0x692E 0x85EA # 藪 -0x692F 0x8587 # 薇 -0x6930 0x859C # 薜 -0x6931 0x8577 # 蕷 -0x6932 0x857E # 蕾 -0x6933 0x8590 # 薐 -0x6934 0x85C9 # 藉 -0x6935 0x85BA # 薺 -0x6936 0x85CF # 藏 -0x6937 0x85B9 # 薹 -0x6938 0x85D0 # 藐 -0x6939 0x85D5 # 藕 -0x693A 0x85DD # 藝 -0x693B 0x85E5 # 藥 -0x693C 0x85DC # 藜 -0x693D 0x85F9 # 藹 -0x693E 0x860A # 蘊 -0x693F 0x8613 # 蘓 -0x6940 0x860B # 蘋 -0x6941 0x85FE # 藾 -0x6942 0x85FA # 藺 -0x6943 0x8606 # 蘆 -0x6944 0x8622 # 蘢 -0x6945 0x861A # 蘚 -0x6946 0x8630 # 蘰 -0x6947 0x863F # 蘿 -0x6948 0x864D # 虍 -0x6949 0x4E55 # 乕 -0x694A 0x8654 # 虔 -0x694B 0x865F # 號 -0x694C 0x8667 # 虧 -0x694D 0x8671 # 虱 -0x694E 0x8693 # 蚓 -0x694F 0x86A3 # 蚣 -0x6950 0x86A9 # 蚩 -0x6951 0x86AA # 蚪 -0x6952 0x868B # 蚋 -0x6953 0x868C # 蚌 -0x6954 0x86B6 # 蚶 -0x6955 0x86AF # 蚯 -0x6956 0x86C4 # 蛄 -0x6957 0x86C6 # 蛆 -0x6958 0x86B0 # 蚰 -0x6959 0x86C9 # 蛉 -0x695A 0x8823 # 蠣 -0x695B 0x86AB # 蚫 -0x695C 0x86D4 # 蛔 -0x695D 0x86DE # 蛞 -0x695E 0x86E9 # 蛩 -0x695F 0x86EC # 蛬 -0x6960 0x86DF # 蛟 -0x6961 0x86DB # 蛛 -0x6962 0x86EF # 蛯 -0x6963 0x8712 # 蜒 -0x6964 0x8706 # 蜆 -0x6965 0x8708 # 蜈 -0x6966 0x8700 # 蜀 -0x6967 0x8703 # 蜃 -0x6968 0x86FB # 蛻 -0x6969 0x8711 # 蜑 -0x696A 0x8709 # 蜉 -0x696B 0x870D # 蜍 -0x696C 0x86F9 # 蛹 -0x696D 0x870A # 蜊 -0x696E 0x8734 # 蜴 -0x696F 0x873F # 蜿 -0x6970 0x8737 # 蜷 -0x6971 0x873B # 蜻 -0x6972 0x8725 # 蜥 -0x6973 0x8729 # 蜩 -0x6974 0x871A # 蜚 -0x6975 0x8760 # 蝠 -0x6976 0x875F # 蝟 -0x6977 0x8778 # 蝸 -0x6978 0x874C # 蝌 -0x6979 0x874E # 蝎 -0x697A 0x8774 # 蝴 -0x697B 0x8757 # 蝗 -0x697C 0x8768 # 蝨 -0x697D 0x876E # 蝮 -0x697E 0x8759 # 蝙 - -# "152" JIS -0x6A21 0x8753 # 蝓 -0x6A22 0x8763 # 蝣 -0x6A23 0x876A # 蝪 -0x6A24 0x8805 # 蠅 -0x6A25 0x87A2 # 螢 -0x6A26 0x879F # 螟 -0x6A27 0x8782 # 螂 -0x6A28 0x87AF # 螯 -0x6A29 0x87CB # 蟋 -0x6A2A 0x87BD # 螽 -0x6A2B 0x87C0 # 蟀 -0x6A2C 0x87D0 # 蟐 -0x6A2D 0x96D6 # 雖 -0x6A2E 0x87AB # 螫 -0x6A2F 0x87C4 # 蟄 -0x6A30 0x87B3 # 螳 -0x6A31 0x87C7 # 蟇 -0x6A32 0x87C6 # 蟆 -0x6A33 0x87BB # 螻 -0x6A34 0x87EF # 蟯 -0x6A35 0x87F2 # 蟲 -0x6A36 0x87E0 # 蟠 -0x6A37 0x880F # 蠏 -0x6A38 0x880D # 蠍 -0x6A39 0x87FE # 蟾 -0x6A3A 0x87F6 # 蟶 -0x6A3B 0x87F7 # 蟷 -0x6A3C 0x880E # 蠎 -0x6A3D 0x87D2 # 蟒 -0x6A3E 0x8811 # 蠑 -0x6A3F 0x8816 # 蠖 -0x6A40 0x8815 # 蠕 -0x6A41 0x8822 # 蠢 -0x6A42 0x8821 # 蠡 -0x6A43 0x8831 # 蠱 -0x6A44 0x8836 # 蠶 -0x6A45 0x8839 # 蠹 -0x6A46 0x8827 # 蠧 -0x6A47 0x883B # 蠻 -0x6A48 0x8844 # 衄 -0x6A49 0x8842 # 衂 -0x6A4A 0x8852 # 衒 -0x6A4B 0x8859 # 衙 -0x6A4C 0x885E # 衞 -0x6A4D 0x8862 # 衢 -0x6A4E 0x886B # 衫 -0x6A4F 0x8881 # 袁 -0x6A50 0x887E # 衾 -0x6A51 0x889E # 袞 -0x6A52 0x8875 # 衵 -0x6A53 0x887D # 衽 -0x6A54 0x88B5 # 袵 -0x6A55 0x8872 # 衲 -0x6A56 0x8882 # 袂 -0x6A57 0x8897 # 袗 -0x6A58 0x8892 # 袒 -0x6A59 0x88AE # 袮 -0x6A5A 0x8899 # 袙 -0x6A5B 0x88A2 # 袢 -0x6A5C 0x888D # 袍 -0x6A5D 0x88A4 # 袤 -0x6A5E 0x88B0 # 袰 -0x6A5F 0x88BF # 袿 -0x6A60 0x88B1 # 袱 -0x6A61 0x88C3 # 裃 -0x6A62 0x88C4 # 裄 -0x6A63 0x88D4 # 裔 -0x6A64 0x88D8 # 裘 -0x6A65 0x88D9 # 裙 -0x6A66 0x88DD # 裝 -0x6A67 0x88F9 # 裹 -0x6A68 0x8902 # 褂 -0x6A69 0x88FC # 裼 -0x6A6A 0x88F4 # 裴 -0x6A6B 0x88E8 # 裨 -0x6A6C 0x88F2 # 裲 -0x6A6D 0x8904 # 褄 -0x6A6E 0x890C # 褌 -0x6A6F 0x890A # 褊 -0x6A70 0x8913 # 褓 -0x6A71 0x8943 # 襃 -0x6A72 0x891E # 褞 -0x6A73 0x8925 # 褥 -0x6A74 0x892A # 褪 -0x6A75 0x892B # 褫 -0x6A76 0x8941 # 襁 -0x6A77 0x8944 # 襄 -0x6A78 0x893B # 褻 -0x6A79 0x8936 # 褶 -0x6A7A 0x8938 # 褸 -0x6A7B 0x894C # 襌 -0x6A7C 0x891D # 褝 -0x6A7D 0x8960 # 襠 -0x6A7E 0x895E # 襞 - -# "153" JIS -0x6B21 0x8966 # 襦 -0x6B22 0x8964 # 襤 -0x6B23 0x896D # 襭 -0x6B24 0x896A # 襪 -0x6B25 0x896F # 襯 -0x6B26 0x8974 # 襴 -0x6B27 0x8977 # 襷 -0x6B28 0x897E # 襾 -0x6B29 0x8983 # 覃 -0x6B2A 0x8988 # 覈 -0x6B2B 0x898A # 覊 -0x6B2C 0x8993 # 覓 -0x6B2D 0x8998 # 覘 -0x6B2E 0x89A1 # 覡 -0x6B2F 0x89A9 # 覩 -0x6B30 0x89A6 # 覦 -0x6B31 0x89AC # 覬 -0x6B32 0x89AF # 覯 -0x6B33 0x89B2 # 覲 -0x6B34 0x89BA # 覺 -0x6B35 0x89BD # 覽 -0x6B36 0x89BF # 覿 -0x6B37 0x89C0 # 觀 -0x6B38 0x89DA # 觚 -0x6B39 0x89DC # 觜 -0x6B3A 0x89DD # 觝 -0x6B3B 0x89E7 # 觧 -0x6B3C 0x89F4 # 觴 -0x6B3D 0x89F8 # 觸 -0x6B3E 0x8A03 # 訃 -0x6B3F 0x8A16 # 訖 -0x6B40 0x8A10 # 訐 -0x6B41 0x8A0C # 訌 -0x6B42 0x8A1B # 訛 -0x6B43 0x8A1D # 訝 -0x6B44 0x8A25 # 訥 -0x6B45 0x8A36 # 訶 -0x6B46 0x8A41 # 詁 -0x6B47 0x8A5B # 詛 -0x6B48 0x8A52 # 詒 -0x6B49 0x8A46 # 詆 -0x6B4A 0x8A48 # 詈 -0x6B4B 0x8A7C # 詼 -0x6B4C 0x8A6D # 詭 -0x6B4D 0x8A6C # 詬 -0x6B4E 0x8A62 # 詢 -0x6B4F 0x8A85 # 誅 -0x6B50 0x8A82 # 誂 -0x6B51 0x8A84 # 誄 -0x6B52 0x8AA8 # 誨 -0x6B53 0x8AA1 # 誡 -0x6B54 0x8A91 # 誑 -0x6B55 0x8AA5 # 誥 -0x6B56 0x8AA6 # 誦 -0x6B57 0x8A9A # 誚 -0x6B58 0x8AA3 # 誣 -0x6B59 0x8AC4 # 諄 -0x6B5A 0x8ACD # 諍 -0x6B5B 0x8AC2 # 諂 -0x6B5C 0x8ADA # 諚 -0x6B5D 0x8AEB # 諫 -0x6B5E 0x8AF3 # 諳 -0x6B5F 0x8AE7 # 諧 -0x6B60 0x8AE4 # 諤 -0x6B61 0x8AF1 # 諱 -0x6B62 0x8B14 # 謔 -0x6B63 0x8AE0 # 諠 -0x6B64 0x8AE2 # 諢 -0x6B65 0x8AF7 # 諷 -0x6B66 0x8ADE # 諞 -0x6B67 0x8ADB # 諛 -0x6B68 0x8B0C # 謌 -0x6B69 0x8B07 # 謇 -0x6B6A 0x8B1A # 謚 -0x6B6B 0x8AE1 # 諡 -0x6B6C 0x8B16 # 謖 -0x6B6D 0x8B10 # 謐 -0x6B6E 0x8B17 # 謗 -0x6B6F 0x8B20 # 謠 -0x6B70 0x8B33 # 謳 -0x6B71 0x97AB # 鞫 -0x6B72 0x8B26 # 謦 -0x6B73 0x8B2B # 謫 -0x6B74 0x8B3E # 謾 -0x6B75 0x8B28 # 謨 -0x6B76 0x8B41 # 譁 -0x6B77 0x8B4C # 譌 -0x6B78 0x8B4F # 譏 -0x6B79 0x8B4E # 譎 -0x6B7A 0x8B49 # 證 -0x6B7B 0x8B56 # 譖 -0x6B7C 0x8B5B # 譛 -0x6B7D 0x8B5A # 譚 -0x6B7E 0x8B6B # 譫 - -# "154" JIS -0x6C21 0x8B5F # 譟 -0x6C22 0x8B6C # 譬 -0x6C23 0x8B6F # 譯 -0x6C24 0x8B74 # 譴 -0x6C25 0x8B7D # 譽 -0x6C26 0x8B80 # 讀 -0x6C27 0x8B8C # 讌 -0x6C28 0x8B8E # 讎 -0x6C29 0x8B92 # 讒 -0x6C2A 0x8B93 # 讓 -0x6C2B 0x8B96 # 讖 -0x6C2C 0x8B99 # 讙 -0x6C2D 0x8B9A # 讚 -0x6C2E 0x8C3A # 谺 -0x6C2F 0x8C41 # 豁 -0x6C30 0x8C3F # 谿 -0x6C31 0x8C48 # 豈 -0x6C32 0x8C4C # 豌 -0x6C33 0x8C4E # 豎 -0x6C34 0x8C50 # 豐 -0x6C35 0x8C55 # 豕 -0x6C36 0x8C62 # 豢 -0x6C37 0x8C6C # 豬 -0x6C38 0x8C78 # 豸 -0x6C39 0x8C7A # 豺 -0x6C3A 0x8C82 # 貂 -0x6C3B 0x8C89 # 貉 -0x6C3C 0x8C85 # 貅 -0x6C3D 0x8C8A # 貊 -0x6C3E 0x8C8D # 貍 -0x6C3F 0x8C8E # 貎 -0x6C40 0x8C94 # 貔 -0x6C41 0x8C7C # 豼 -0x6C42 0x8C98 # 貘 -0x6C43 0x621D # 戝 -0x6C44 0x8CAD # 貭 -0x6C45 0x8CAA # 貪 -0x6C46 0x8CBD # 貽 -0x6C47 0x8CB2 # 貲 -0x6C48 0x8CB3 # 貳 -0x6C49 0x8CAE # 貮 -0x6C4A 0x8CB6 # 貶 -0x6C4B 0x8CC8 # 賈 -0x6C4C 0x8CC1 # 賁 -0x6C4D 0x8CE4 # 賤 -0x6C4E 0x8CE3 # 賣 -0x6C4F 0x8CDA # 賚 -0x6C50 0x8CFD # 賽 -0x6C51 0x8CFA # 賺 -0x6C52 0x8CFB # 賻 -0x6C53 0x8D04 # 贄 -0x6C54 0x8D05 # 贅 -0x6C55 0x8D0A # 贊 -0x6C56 0x8D07 # 贇 -0x6C57 0x8D0F # 贏 -0x6C58 0x8D0D # 贍 -0x6C59 0x8D10 # 贐 -0x6C5A 0x9F4E # 齎 -0x6C5B 0x8D13 # 贓 -0x6C5C 0x8CCD # 賍 -0x6C5D 0x8D14 # 贔 -0x6C5E 0x8D16 # 贖 -0x6C5F 0x8D67 # 赧 -0x6C60 0x8D6D # 赭 -0x6C61 0x8D71 # 赱 -0x6C62 0x8D73 # 赳 -0x6C63 0x8D81 # 趁 -0x6C64 0x8D99 # 趙 -0x6C65 0x8DC2 # 跂 -0x6C66 0x8DBE # 趾 -0x6C67 0x8DBA # 趺 -0x6C68 0x8DCF # 跏 -0x6C69 0x8DDA # 跚 -0x6C6A 0x8DD6 # 跖 -0x6C6B 0x8DCC # 跌 -0x6C6C 0x8DDB # 跛 -0x6C6D 0x8DCB # 跋 -0x6C6E 0x8DEA # 跪 -0x6C6F 0x8DEB # 跫 -0x6C70 0x8DDF # 跟 -0x6C71 0x8DE3 # 跣 -0x6C72 0x8DFC # 跼 -0x6C73 0x8E08 # 踈 -0x6C74 0x8E09 # 踉 -0x6C75 0x8DFF # 跿 -0x6C76 0x8E1D # 踝 -0x6C77 0x8E1E # 踞 -0x6C78 0x8E10 # 踐 -0x6C79 0x8E1F # 踟 -0x6C7A 0x8E42 # 蹂 -0x6C7B 0x8E35 # 踵 -0x6C7C 0x8E30 # 踰 -0x6C7D 0x8E34 # 踴 -0x6C7E 0x8E4A # 蹊 - -# "155" JIS -0x6D21 0x8E47 # 蹇 -0x6D22 0x8E49 # 蹉 -0x6D23 0x8E4C # 蹌 -0x6D24 0x8E50 # 蹐 -0x6D25 0x8E48 # 蹈 -0x6D26 0x8E59 # 蹙 -0x6D27 0x8E64 # 蹤 -0x6D28 0x8E60 # 蹠 -0x6D29 0x8E2A # 踪 -0x6D2A 0x8E63 # 蹣 -0x6D2B 0x8E55 # 蹕 -0x6D2C 0x8E76 # 蹶 -0x6D2D 0x8E72 # 蹲 -0x6D2E 0x8E7C # 蹼 -0x6D2F 0x8E81 # 躁 -0x6D30 0x8E87 # 躇 -0x6D31 0x8E85 # 躅 -0x6D32 0x8E84 # 躄 -0x6D33 0x8E8B # 躋 -0x6D34 0x8E8A # 躊 -0x6D35 0x8E93 # 躓 -0x6D36 0x8E91 # 躑 -0x6D37 0x8E94 # 躔 -0x6D38 0x8E99 # 躙 -0x6D39 0x8EAA # 躪 -0x6D3A 0x8EA1 # 躡 -0x6D3B 0x8EAC # 躬 -0x6D3C 0x8EB0 # 躰 -0x6D3D 0x8EC6 # 軆 -0x6D3E 0x8EB1 # 躱 -0x6D3F 0x8EBE # 躾 -0x6D40 0x8EC5 # 軅 -0x6D41 0x8EC8 # 軈 -0x6D42 0x8ECB # 軋 -0x6D43 0x8EDB # 軛 -0x6D44 0x8EE3 # 軣 -0x6D45 0x8EFC # 軼 -0x6D46 0x8EFB # 軻 -0x6D47 0x8EEB # 軫 -0x6D48 0x8EFE # 軾 -0x6D49 0x8F0A # 輊 -0x6D4A 0x8F05 # 輅 -0x6D4B 0x8F15 # 輕 -0x6D4C 0x8F12 # 輒 -0x6D4D 0x8F19 # 輙 -0x6D4E 0x8F13 # 輓 -0x6D4F 0x8F1C # 輜 -0x6D50 0x8F1F # 輟 -0x6D51 0x8F1B # 輛 -0x6D52 0x8F0C # 輌 -0x6D53 0x8F26 # 輦 -0x6D54 0x8F33 # 輳 -0x6D55 0x8F3B # 輻 -0x6D56 0x8F39 # 輹 -0x6D57 0x8F45 # 轅 -0x6D58 0x8F42 # 轂 -0x6D59 0x8F3E # 輾 -0x6D5A 0x8F4C # 轌 -0x6D5B 0x8F49 # 轉 -0x6D5C 0x8F46 # 轆 -0x6D5D 0x8F4E # 轎 -0x6D5E 0x8F57 # 轗 -0x6D5F 0x8F5C # 轜 -0x6D60 0x8F62 # 轢 -0x6D61 0x8F63 # 轣 -0x6D62 0x8F64 # 轤 -0x6D63 0x8F9C # 辜 -0x6D64 0x8F9F # 辟 -0x6D65 0x8FA3 # 辣 -0x6D66 0x8FAD # 辭 -0x6D67 0x8FAF # 辯 -0x6D68 0x8FB7 # 辷 -0x6D69 0x8FDA # 迚 -0x6D6A 0x8FE5 # 迥 -0x6D6B 0x8FE2 # 迢 -0x6D6C 0x8FEA # 迪 -0x6D6D 0x8FEF # 迯 -0x6D6E 0x9087 # 邇 -0x6D6F 0x8FF4 # 迴 -0x6D70 0x9005 # 逅 -0x6D71 0x8FF9 # 迹 -0x6D72 0x8FFA # 迺 -0x6D73 0x9011 # 逑 -0x6D74 0x9015 # 逕 -0x6D75 0x9021 # 逡 -0x6D76 0x900D # 逍 -0x6D77 0x901E # 逞 -0x6D78 0x9016 # 逖 -0x6D79 0x900B # 逋 -0x6D7A 0x9027 # 逧 -0x6D7B 0x9036 # 逶 -0x6D7C 0x9035 # 逵 -0x6D7D 0x9039 # 逹 -0x6D7E 0x8FF8 # 迸 - -# "156" JIS -0x6E21 0x904F # 遏 -0x6E22 0x9050 # 遐 -0x6E23 0x9051 # 遑 -0x6E24 0x9052 # 遒 -0x6E25 0x900E # 逎 -0x6E26 0x9049 # 遉 -0x6E27 0x903E # 逾 -0x6E28 0x9056 # 遖 -0x6E29 0x9058 # 遘 -0x6E2A 0x905E # 遞 -0x6E2B 0x9068 # 遨 -0x6E2C 0x906F # 遯 -0x6E2D 0x9076 # 遶 -0x6E2E 0x96A8 # 隨 -0x6E2F 0x9072 # 遲 -0x6E30 0x9082 # 邂 -0x6E31 0x907D # 遽 -0x6E32 0x9081 # 邁 -0x6E33 0x9080 # 邀 -0x6E34 0x908A # 邊 -0x6E35 0x9089 # 邉 -0x6E36 0x908F # 邏 -0x6E37 0x90A8 # 邨 -0x6E38 0x90AF # 邯 -0x6E39 0x90B1 # 邱 -0x6E3A 0x90B5 # 邵 -0x6E3B 0x90E2 # 郢 -0x6E3C 0x90E4 # 郤 -0x6E3D 0x6248 # 扈 -0x6E3E 0x90DB # 郛 -0x6E3F 0x9102 # 鄂 -0x6E40 0x9112 # 鄒 -0x6E41 0x9119 # 鄙 -0x6E42 0x9132 # 鄲 -0x6E43 0x9130 # 鄰 -0x6E44 0x914A # 酊 -0x6E45 0x9156 # 酖 -0x6E46 0x9158 # 酘 -0x6E47 0x9163 # 酣 -0x6E48 0x9165 # 酥 -0x6E49 0x9169 # 酩 -0x6E4A 0x9173 # 酳 -0x6E4B 0x9172 # 酲 -0x6E4C 0x918B # 醋 -0x6E4D 0x9189 # 醉 -0x6E4E 0x9182 # 醂 -0x6E4F 0x91A2 # 醢 -0x6E50 0x91AB # 醫 -0x6E51 0x91AF # 醯 -0x6E52 0x91AA # 醪 -0x6E53 0x91B5 # 醵 -0x6E54 0x91B4 # 醴 -0x6E55 0x91BA # 醺 -0x6E56 0x91C0 # 釀 -0x6E57 0x91C1 # 釁 -0x6E58 0x91C9 # 釉 -0x6E59 0x91CB # 釋 -0x6E5A 0x91D0 # 釐 -0x6E5B 0x91D6 # 釖 -0x6E5C 0x91DF # 釟 -0x6E5D 0x91E1 # 釡 -0x6E5E 0x91DB # 釛 -0x6E5F 0x91FC # 釼 -0x6E60 0x91F5 # 釵 -0x6E61 0x91F6 # 釶 -0x6E62 0x921E # 鈞 -0x6E63 0x91FF # 釿 -0x6E64 0x9214 # 鈔 -0x6E65 0x922C # 鈬 -0x6E66 0x9215 # 鈕 -0x6E67 0x9211 # 鈑 -0x6E68 0x925E # 鉞 -0x6E69 0x9257 # 鉗 -0x6E6A 0x9245 # 鉅 -0x6E6B 0x9249 # 鉉 -0x6E6C 0x9264 # 鉤 -0x6E6D 0x9248 # 鉈 -0x6E6E 0x9295 # 銕 -0x6E6F 0x923F # 鈿 -0x6E70 0x924B # 鉋 -0x6E71 0x9250 # 鉐 -0x6E72 0x929C # 銜 -0x6E73 0x9296 # 銖 -0x6E74 0x9293 # 銓 -0x6E75 0x929B # 銛 -0x6E76 0x925A # 鉚 -0x6E77 0x92CF # 鋏 -0x6E78 0x92B9 # 銹 -0x6E79 0x92B7 # 銷 -0x6E7A 0x92E9 # 鋩 -0x6E7B 0x930F # 錏 -0x6E7C 0x92FA # 鋺 -0x6E7D 0x9344 # 鍄 -0x6E7E 0x932E # 錮 - -# "157" JIS -0x6F21 0x9319 # 錙 -0x6F22 0x9322 # 錢 -0x6F23 0x931A # 錚 -0x6F24 0x9323 # 錣 -0x6F25 0x933A # 錺 -0x6F26 0x9335 # 錵 -0x6F27 0x933B # 錻 -0x6F28 0x935C # 鍜 -0x6F29 0x9360 # 鍠 -0x6F2A 0x937C # 鍼 -0x6F2B 0x936E # 鍮 -0x6F2C 0x9356 # 鍖 -0x6F2D 0x93B0 # 鎰 -0x6F2E 0x93AC # 鎬 -0x6F2F 0x93AD # 鎭 -0x6F30 0x9394 # 鎔 -0x6F31 0x93B9 # 鎹 -0x6F32 0x93D6 # 鏖 -0x6F33 0x93D7 # 鏗 -0x6F34 0x93E8 # 鏨 -0x6F35 0x93E5 # 鏥 -0x6F36 0x93D8 # 鏘 -0x6F37 0x93C3 # 鏃 -0x6F38 0x93DD # 鏝 -0x6F39 0x93D0 # 鏐 -0x6F3A 0x93C8 # 鏈 -0x6F3B 0x93E4 # 鏤 -0x6F3C 0x941A # 鐚 -0x6F3D 0x9414 # 鐔 -0x6F3E 0x9413 # 鐓 -0x6F3F 0x9403 # 鐃 -0x6F40 0x9407 # 鐇 -0x6F41 0x9410 # 鐐 -0x6F42 0x9436 # 鐶 -0x6F43 0x942B # 鐫 -0x6F44 0x9435 # 鐵 -0x6F45 0x9421 # 鐡 -0x6F46 0x943A # 鐺 -0x6F47 0x9441 # 鑁 -0x6F48 0x9452 # 鑒 -0x6F49 0x9444 # 鑄 -0x6F4A 0x945B # 鑛 -0x6F4B 0x9460 # 鑠 -0x6F4C 0x9462 # 鑢 -0x6F4D 0x945E # 鑞 -0x6F4E 0x946A # 鑪 -0x6F4F 0x9229 # 鈩 -0x6F50 0x9470 # 鑰 -0x6F51 0x9475 # 鑵 -0x6F52 0x9477 # 鑷 -0x6F53 0x947D # 鑽 -0x6F54 0x945A # 鑚 -0x6F55 0x947C # 鑼 -0x6F56 0x947E # 鑾 -0x6F57 0x9481 # 钁 -0x6F58 0x947F # 鑿 -0x6F59 0x9582 # 閂 -0x6F5A 0x9587 # 閇 -0x6F5B 0x958A # 閊 -0x6F5C 0x9594 # 閔 -0x6F5D 0x9596 # 閖 -0x6F5E 0x9598 # 閘 -0x6F5F 0x9599 # 閙 -0x6F60 0x95A0 # 閠 -0x6F61 0x95A8 # 閨 -0x6F62 0x95A7 # 閧 -0x6F63 0x95AD # 閭 -0x6F64 0x95BC # 閼 -0x6F65 0x95BB # 閻 -0x6F66 0x95B9 # 閹 -0x6F67 0x95BE # 閾 -0x6F68 0x95CA # 闊 -0x6F69 0x6FF6 # 濶 -0x6F6A 0x95C3 # 闃 -0x6F6B 0x95CD # 闍 -0x6F6C 0x95CC # 闌 -0x6F6D 0x95D5 # 闕 -0x6F6E 0x95D4 # 闔 -0x6F6F 0x95D6 # 闖 -0x6F70 0x95DC # 關 -0x6F71 0x95E1 # 闡 -0x6F72 0x95E5 # 闥 -0x6F73 0x95E2 # 闢 -0x6F74 0x9621 # 阡 -0x6F75 0x9628 # 阨 -0x6F76 0x962E # 阮 -0x6F77 0x962F # 阯 -0x6F78 0x9642 # 陂 -0x6F79 0x964C # 陌 -0x6F7A 0x964F # 陏 -0x6F7B 0x964B # 陋 -0x6F7C 0x9677 # 陷 -0x6F7D 0x965C # 陜 -0x6F7E 0x965E # 陞 - -# "160" JIS -0x7021 0x965D # 陝 -0x7022 0x965F # 陟 -0x7023 0x9666 # 陦 -0x7024 0x9672 # 陲 -0x7025 0x966C # 陬 -0x7026 0x968D # 隍 -0x7027 0x9698 # 隘 -0x7028 0x9695 # 隕 -0x7029 0x9697 # 隗 -0x702A 0x96AA # 險 -0x702B 0x96A7 # 隧 -0x702C 0x96B1 # 隱 -0x702D 0x96B2 # 隲 -0x702E 0x96B0 # 隰 -0x702F 0x96B4 # 隴 -0x7030 0x96B6 # 隶 -0x7031 0x96B8 # 隸 -0x7032 0x96B9 # 隹 -0x7033 0x96CE # 雎 -0x7034 0x96CB # 雋 -0x7035 0x96C9 # 雉 -0x7036 0x96CD # 雍 -0x7037 0x894D # 襍 -0x7038 0x96DC # 雜 -0x7039 0x970D # 霍 -0x703A 0x96D5 # 雕 -0x703B 0x96F9 # 雹 -0x703C 0x9704 # 霄 -0x703D 0x9706 # 霆 -0x703E 0x9708 # 霈 -0x703F 0x9713 # 霓 -0x7040 0x970E # 霎 -0x7041 0x9711 # 霑 -0x7042 0x970F # 霏 -0x7043 0x9716 # 霖 -0x7044 0x9719 # 霙 -0x7045 0x9724 # 霤 -0x7046 0x972A # 霪 -0x7047 0x9730 # 霰 -0x7048 0x9739 # 霹 -0x7049 0x973D # 霽 -0x704A 0x973E # 霾 -0x704B 0x9744 # 靄 -0x704C 0x9746 # 靆 -0x704D 0x9748 # 靈 -0x704E 0x9742 # 靂 -0x704F 0x9749 # 靉 -0x7050 0x975C # 靜 -0x7051 0x9760 # 靠 -0x7052 0x9764 # 靤 -0x7053 0x9766 # 靦 -0x7054 0x9768 # 靨 -0x7055 0x52D2 # 勒 -0x7056 0x976B # 靫 -0x7057 0x9771 # 靱 -0x7058 0x9779 # 靹 -0x7059 0x9785 # 鞅 -0x705A 0x977C # 靼 -0x705B 0x9781 # 鞁 -0x705C 0x977A # 靺 -0x705D 0x9786 # 鞆 -0x705E 0x978B # 鞋 -0x705F 0x978F # 鞏 -0x7060 0x9790 # 鞐 -0x7061 0x979C # 鞜 -0x7062 0x97A8 # 鞨 -0x7063 0x97A6 # 鞦 -0x7064 0x97A3 # 鞣 -0x7065 0x97B3 # 鞳 -0x7066 0x97B4 # 鞴 -0x7067 0x97C3 # 韃 -0x7068 0x97C6 # 韆 -0x7069 0x97C8 # 韈 -0x706A 0x97CB # 韋 -0x706B 0x97DC # 韜 -0x706C 0x97ED # 韭 -0x706D 0x9F4F # 齏 -0x706E 0x97F2 # 韲 -0x706F 0x7ADF # 竟 -0x7070 0x97F6 # 韶 -0x7071 0x97F5 # 韵 -0x7072 0x980F # 頏 -0x7073 0x980C # 頌 -0x7074 0x9838 # 頸 -0x7075 0x9824 # 頤 -0x7076 0x9821 # 頡 -0x7077 0x9837 # 頷 -0x7078 0x983D # 頽 -0x7079 0x9846 # 顆 -0x707A 0x984F # 顏 -0x707B 0x984B # 顋 -0x707C 0x986B # 顫 -0x707D 0x986F # 顯 -0x707E 0x9870 # 顰 - -# "161" JIS -0x7121 0x9871 # 顱 -0x7122 0x9874 # 顴 -0x7123 0x9873 # 顳 -0x7124 0x98AA # 颪 -0x7125 0x98AF # 颯 -0x7126 0x98B1 # 颱 -0x7127 0x98B6 # 颶 -0x7128 0x98C4 # 飄 -0x7129 0x98C3 # 飃 -0x712A 0x98C6 # 飆 -0x712B 0x98E9 # 飩 -0x712C 0x98EB # 飫 -0x712D 0x9903 # 餃 -0x712E 0x9909 # 餉 -0x712F 0x9912 # 餒 -0x7130 0x9914 # 餔 -0x7131 0x9918 # 餘 -0x7132 0x9921 # 餡 -0x7133 0x991D # 餝 -0x7134 0x991E # 餞 -0x7135 0x9924 # 餤 -0x7136 0x9920 # 餠 -0x7137 0x992C # 餬 -0x7138 0x992E # 餮 -0x7139 0x993D # 餽 -0x713A 0x993E # 餾 -0x713B 0x9942 # 饂 -0x713C 0x9949 # 饉 -0x713D 0x9945 # 饅 -0x713E 0x9950 # 饐 -0x713F 0x994B # 饋 -0x7140 0x9951 # 饑 -0x7141 0x9952 # 饒 -0x7142 0x994C # 饌 -0x7143 0x9955 # 饕 -0x7144 0x9997 # 馗 -0x7145 0x9998 # 馘 -0x7146 0x99A5 # 馥 -0x7147 0x99AD # 馭 -0x7148 0x99AE # 馮 -0x7149 0x99BC # 馼 -0x714A 0x99DF # 駟 -0x714B 0x99DB # 駛 -0x714C 0x99DD # 駝 -0x714D 0x99D8 # 駘 -0x714E 0x99D1 # 駑 -0x714F 0x99ED # 駭 -0x7150 0x99EE # 駮 -0x7151 0x99F1 # 駱 -0x7152 0x99F2 # 駲 -0x7153 0x99FB # 駻 -0x7154 0x99F8 # 駸 -0x7155 0x9A01 # 騁 -0x7156 0x9A0F # 騏 -0x7157 0x9A05 # 騅 -0x7158 0x99E2 # 駢 -0x7159 0x9A19 # 騙 -0x715A 0x9A2B # 騫 -0x715B 0x9A37 # 騷 -0x715C 0x9A45 # 驅 -0x715D 0x9A42 # 驂 -0x715E 0x9A40 # 驀 -0x715F 0x9A43 # 驃 -0x7160 0x9A3E # 騾 -0x7161 0x9A55 # 驕 -0x7162 0x9A4D # 驍 -0x7163 0x9A5B # 驛 -0x7164 0x9A57 # 驗 -0x7165 0x9A5F # 驟 -0x7166 0x9A62 # 驢 -0x7167 0x9A65 # 驥 -0x7168 0x9A64 # 驤 -0x7169 0x9A69 # 驩 -0x716A 0x9A6B # 驫 -0x716B 0x9A6A # 驪 -0x716C 0x9AAD # 骭 -0x716D 0x9AB0 # 骰 -0x716E 0x9ABC # 骼 -0x716F 0x9AC0 # 髀 -0x7170 0x9ACF # 髏 -0x7171 0x9AD1 # 髑 -0x7172 0x9AD3 # 髓 -0x7173 0x9AD4 # 體 -0x7174 0x9ADE # 髞 -0x7175 0x9ADF # 髟 -0x7176 0x9AE2 # 髢 -0x7177 0x9AE3 # 髣 -0x7178 0x9AE6 # 髦 -0x7179 0x9AEF # 髯 -0x717A 0x9AEB # 髫 -0x717B 0x9AEE # 髮 -0x717C 0x9AF4 # 髴 -0x717D 0x9AF1 # 髱 -0x717E 0x9AF7 # 髷 - -# "162" JIS -0x7221 0x9AFB # 髻 -0x7222 0x9B06 # 鬆 -0x7223 0x9B18 # 鬘 -0x7224 0x9B1A # 鬚 -0x7225 0x9B1F # 鬟 -0x7226 0x9B22 # 鬢 -0x7227 0x9B23 # 鬣 -0x7228 0x9B25 # 鬥 -0x7229 0x9B27 # 鬧 -0x722A 0x9B28 # 鬨 -0x722B 0x9B29 # 鬩 -0x722C 0x9B2A # 鬪 -0x722D 0x9B2E # 鬮 -0x722E 0x9B2F # 鬯 -0x722F 0x9B32 # 鬲 -0x7230 0x9B44 # 魄 -0x7231 0x9B43 # 魃 -0x7232 0x9B4F # 魏 -0x7233 0x9B4D # 魍 -0x7234 0x9B4E # 魎 -0x7235 0x9B51 # 魑 -0x7236 0x9B58 # 魘 -0x7237 0x9B74 # 魴 -0x7238 0x9B93 # 鮓 -0x7239 0x9B83 # 鮃 -0x723A 0x9B91 # 鮑 -0x723B 0x9B96 # 鮖 -0x723C 0x9B97 # 鮗 -0x723D 0x9B9F # 鮟 -0x723E 0x9BA0 # 鮠 -0x723F 0x9BA8 # 鮨 -0x7240 0x9BB4 # 鮴 -0x7241 0x9BC0 # 鯀 -0x7242 0x9BCA # 鯊 -0x7243 0x9BB9 # 鮹 -0x7244 0x9BC6 # 鯆 -0x7245 0x9BCF # 鯏 -0x7246 0x9BD1 # 鯑 -0x7247 0x9BD2 # 鯒 -0x7248 0x9BE3 # 鯣 -0x7249 0x9BE2 # 鯢 -0x724A 0x9BE4 # 鯤 -0x724B 0x9BD4 # 鯔 -0x724C 0x9BE1 # 鯡 -0x724D 0x9C3A # 鰺 -0x724E 0x9BF2 # 鯲 -0x724F 0x9BF1 # 鯱 -0x7250 0x9BF0 # 鯰 -0x7251 0x9C15 # 鰕 -0x7252 0x9C14 # 鰔 -0x7253 0x9C09 # 鰉 -0x7254 0x9C13 # 鰓 -0x7255 0x9C0C # 鰌 -0x7256 0x9C06 # 鰆 -0x7257 0x9C08 # 鰈 -0x7258 0x9C12 # 鰒 -0x7259 0x9C0A # 鰊 -0x725A 0x9C04 # 鰄 -0x725B 0x9C2E # 鰮 -0x725C 0x9C1B # 鰛 -0x725D 0x9C25 # 鰥 -0x725E 0x9C24 # 鰤 -0x725F 0x9C21 # 鰡 -0x7260 0x9C30 # 鰰 -0x7261 0x9C47 # 鱇 -0x7262 0x9C32 # 鰲 -0x7263 0x9C46 # 鱆 -0x7264 0x9C3E # 鰾 -0x7265 0x9C5A # 鱚 -0x7266 0x9C60 # 鱠 -0x7267 0x9C67 # 鱧 -0x7268 0x9C76 # 鱶 -0x7269 0x9C78 # 鱸 -0x726A 0x9CE7 # 鳧 -0x726B 0x9CEC # 鳬 -0x726C 0x9CF0 # 鳰 -0x726D 0x9D09 # 鴉 -0x726E 0x9D08 # 鴈 -0x726F 0x9CEB # 鳫 -0x7270 0x9D03 # 鴃 -0x7271 0x9D06 # 鴆 -0x7272 0x9D2A # 鴪 -0x7273 0x9D26 # 鴦 -0x7274 0x9DAF # 鶯 -0x7275 0x9D23 # 鴣 -0x7276 0x9D1F # 鴟 -0x7277 0x9D44 # 鵄 -0x7278 0x9D15 # 鴕 -0x7279 0x9D12 # 鴒 -0x727A 0x9D41 # 鵁 -0x727B 0x9D3F # 鴿 -0x727C 0x9D3E # 鴾 -0x727D 0x9D46 # 鵆 -0x727E 0x9D48 # 鵈 - -# "163" JIS -0x7321 0x9D5D # 鵝 -0x7322 0x9D5E # 鵞 -0x7323 0x9D64 # 鵤 -0x7324 0x9D51 # 鵑 -0x7325 0x9D50 # 鵐 -0x7326 0x9D59 # 鵙 -0x7327 0x9D72 # 鵲 -0x7328 0x9D89 # 鶉 -0x7329 0x9D87 # 鶇 -0x732A 0x9DAB # 鶫 -0x732B 0x9D6F # 鵯 -0x732C 0x9D7A # 鵺 -0x732D 0x9D9A # 鶚 -0x732E 0x9DA4 # 鶤 -0x732F 0x9DA9 # 鶩 -0x7330 0x9DB2 # 鶲 -0x7331 0x9DC4 # 鷄 -0x7332 0x9DC1 # 鷁 -0x7333 0x9DBB # 鶻 -0x7334 0x9DB8 # 鶸 -0x7335 0x9DBA # 鶺 -0x7336 0x9DC6 # 鷆 -0x7337 0x9DCF # 鷏 -0x7338 0x9DC2 # 鷂 -0x7339 0x9DD9 # 鷙 -0x733A 0x9DD3 # 鷓 -0x733B 0x9DF8 # 鷸 -0x733C 0x9DE6 # 鷦 -0x733D 0x9DED # 鷭 -0x733E 0x9DEF # 鷯 -0x733F 0x9DFD # 鷽 -0x7340 0x9E1A # 鸚 -0x7341 0x9E1B # 鸛 -0x7342 0x9E1E # 鸞 -0x7343 0x9E75 # 鹵 -0x7344 0x9E79 # 鹹 -0x7345 0x9E7D # 鹽 -0x7346 0x9E81 # 麁 -0x7347 0x9E88 # 麈 -0x7348 0x9E8B # 麋 -0x7349 0x9E8C # 麌 -0x734A 0x9E92 # 麒 -0x734B 0x9E95 # 麕 -0x734C 0x9E91 # 麑 -0x734D 0x9E9D # 麝 -0x734E 0x9EA5 # 麥 -0x734F 0x9EA9 # 麩 -0x7350 0x9EB8 # 麸 -0x7351 0x9EAA # 麪 -0x7352 0x9EAD # 麭 -0x7353 0x9761 # 靡 -0x7354 0x9ECC # 黌 -0x7355 0x9ECE # 黎 -0x7356 0x9ECF # 黏 -0x7357 0x9ED0 # 黐 -0x7358 0x9ED4 # 黔 -0x7359 0x9EDC # 黜 -0x735A 0x9EDE # 點 -0x735B 0x9EDD # 黝 -0x735C 0x9EE0 # 黠 -0x735D 0x9EE5 # 黥 -0x735E 0x9EE8 # 黨 -0x735F 0x9EEF # 黯 -0x7360 0x9EF4 # 黴 -0x7361 0x9EF6 # 黶 -0x7362 0x9EF7 # 黷 -0x7363 0x9EF9 # 黹 -0x7364 0x9EFB # 黻 -0x7365 0x9EFC # 黼 -0x7366 0x9EFD # 黽 -0x7367 0x9F07 # 鼇 -0x7368 0x9F08 # 鼈 -0x7369 0x76B7 # 皷 -0x736A 0x9F15 # 鼕 -0x736B 0x9F21 # 鼡 -0x736C 0x9F2C # 鼬 -0x736D 0x9F3E # 鼾 -0x736E 0x9F4A # 齊 -0x736F 0x9F52 # 齒 -0x7370 0x9F54 # 齔 -0x7371 0x9F63 # 齣 -0x7372 0x9F5F # 齟 -0x7373 0x9F60 # 齠 -0x7374 0x9F61 # 齡 -0x7375 0x9F66 # 齦 -0x7376 0x9F67 # 齧 -0x7377 0x9F6C # 齬 -0x7378 0x9F6A # 齪 -0x7379 0x9F77 # 齷 -0x737A 0x9F72 # 齲 -0x737B 0x9F76 # 齶 -0x737C 0x9F95 # 龕 -0x737D 0x9F9C # 龜 -0x737E 0x9FA0 # 龠 diff --git a/unicode/xerox/jis/XCCS-164=JIS.TXT b/unicode/xerox/jis/XCCS-164=JIS.TXT index 53b9acba..043eb9d9 100644 --- a/unicode/xerox/jis/XCCS-164=JIS.TXT +++ b/unicode/xerox/jis/XCCS-164=JIS.TXT @@ -42,195 +42,7 @@ # Any comments or problems, contact -# "165" JIS -0x7521 0x5B57 # 字 -0x7522 0x600E # 怎 -0x7523 0x5FEB # 快 -0x7524 0x5E2B # 師 -0x7525 0x8655 # 處 -0x7526 0x76F8 # 相 -0x7527 0x6D3B # 活 -0x7528 0x89AA # 親 -0x7529 0x6D77 # 海 -0x752A 0x96FB # 電 -0x752B 0x6BCD # 母 -0x752C 0x679C # 果 -0x752D 0x7ACB # 立 -0x752E 0x539F # 原 -0x752F 0x5408 # 合 -0x7530 0x66F8 # 書 -0x7531 0x5165 # 入 -0x7532 0x4E26 # 並 -0x7533 0x5E73 # 平 -0x7534 0x696D # 業 -0x7535 0x5831 # 報 -0x7536 0x8EAB # 身 -0x7537 0x5E02 # 市 -0x7538 0x88AB # 被 -0x7539 0x8A31 # 許 -0x753A 0x8ACB # 請 -0x753B 0x5C11 # 少 -0x753C 0x9593 # 間 -0x753D 0x9AD4 # 體 -0x753E 0x4F4F # 住 -0x753F 0x8ECA # 車 -0x7540 0x8ECD # 軍 -0x7541 0x908A # 邊 -0x7542 0x91CD # 重 -0x7543 0x52A0 # 加 -0x7544 0x5716 # 圖 -0x7545 0x6216 # 或 -0x7546 0x6B21 # 次 -0x7547 0x6BCF # 每 -0x7548 0x7E3D # 總 -0x7549 0x706B # 火 -0x754A 0x6587 # 文 -0x754B 0x5B69 # 孩 -0x754C 0x4E16 # 世 -0x754D 0x5B89 # 安 -0x754E 0x653E # 放 -0x754F 0x6A5F # 機 -0x7550 0x5167 # 內 -0x7551 0x95DC # 關 -0x7552 0x5229 # 利 -0x7553 0x50CF # 像 -0x7554 0x7406 # 理 -0x7555 0x6BD4 # 比 -0x7556 0x611B # 愛 -0x7557 0x738B # 王 -0x7558 0x5225 # 別 -0x7559 0x592B # 夫 -0x755A 0x8207 # 與 -0x755B 0x5149 # 光 -0x755C 0x82B1 # 花 -0x755D 0x83EF # 華 -0x755E 0x8AB2 # 課 -0x755F 0x80B2 # 育 -0x7560 0x6545 # 故 -0x7561 0x5FC5 # 必 -0x7562 0x689D # 條 -0x7563 0x5ABD # 媽 -0x7564 0x5F1F # 弟 -0x7565 0x7236 # 父 -0x7566 0x901A # 通 -0x7567 0x8868 # 表 -0x7568 0x91D1 # 金 -0x7569 0x5BEB # 寫 -0x756A 0x5DF1 # 己 -0x756B 0x624D # 才 -0x756C 0x6CB3 # 河 -0x756D 0x7701 # 省 -0x756E 0x53F0 # 台 -0x756F 0x6C42 # 求 -0x7570 0x6536 # 收 -0x7571 0x842C # 萬 -0x7572 0x4E14 # 且 -0x7573 0x4F55 # 何 -0x7574 0x4EE3 # 代 -0x7575 0x5171 # 共 -0x7576 0x53D7 # 受 -0x7577 0x98A8 # 風 -0x7578 0x6C5F # 江 -0x7579 0x62FF # 拿 -0x757A 0x96E3 # 難 -0x757B 0x754C # 界 -0x757C 0x4FE1 # 信 -0x757D 0x671B # 望 -0x757E 0x7A7A # 空 -0x75A1 0x6B7B # 死 -0x75A2 0x73ED # 班 -0x75A3 0x99AC # 馬 -0x75A4 0x671F # 期 -0x75A5 0x975E # 非 -0x75A6 0x6A39 # 樹 -0x75A7 0x53CA # 及 -0x75A8 0x7D50 # 結 -0x75A9 0x865F # 號 -0x75AA 0x5E36 # 帶 -0x75AB 0x5143 # 元 -0x75AC 0x4EA4 # 交 -0x75AD 0x8A72 # 該 -0x75AE 0x672A # 未 -0x75AF 0x7FA9 # 義 -0x75B0 0x5E9C # 府 -0x75B1 0x5B8C # 完 -0x75B2 0x8AD6 # 論 -0x75B3 0x9322 # 錢 -0x75B4 0x98DB # 飛 -0x75B5 0x547D # 命 -0x75B6 0x5F35 # 張 -0x75B7 0x54E1 # 員 -0x75B8 0x6578 # 數 -0x75B9 0x6797 # 林 -0x75BA 0x63A5 # 接 -0x75BB 0x5C40 # 局 -0x75BC 0x53CB # 友 -0x75BD 0x559C # 喜 -0x75BE 0x6E05 # 清 -0x75BF 0x6D0B # 洋 -0x75C0 0x6A02 # 樂 -0x75C1 0x5A5A # 婚 -0x75C2 0x793E # 社 -0x75C3 0x65E9 # 早 -0x75C4 0x5E03 # 布 -0x75C5 0x6975 # 極 -0x75C6 0x773C # 眼 -0x75C7 0x55CE # 嗎 -0x75C8 0x7522 # 產 -0x75C9 0x544A # 告 -0x75CA 0x54E5 # 哥 -0x75CB 0x8208 # 興 -0x75CC 0x52DE # 勞 -0x75CD 0x9435 # 鐵 -0x75CE 0x53D6 # 取 -0x75CF 0x7B97 # 算 -0x75D0 0x66F4 # 更 -0x75D1 0x5175 # 兵 -0x75D2 0x9020 # 造 -0x75D3 0x7B54 # 答 -0x75D4 0x627E # 找 -0x75D5 0x7F77 # 罷 -0x75D6 0x5931 # 失 -0x75D7 0x904B # 運 -0x75D8 0x5F62 # 形 -0x75D9 0x6613 # 易 -0x75DA 0x7FA3 # 羣 -0x75DB 0x5EA6 # 度 -0x75DC 0x534A # 半 -0x75DD 0x8863 # 衣 -0x75DE 0x82E5 # 若 -0x75DF 0x81F3 # 至 -0x75E0 0x8B70 # 議 -0x75E1 0x8FD1 # 近 -0x75E2 0x7167 # 照 -0x75E3 0x8B8A # 變 -0x75E4 0x59D0 # 姐 -0x75E5 0x670D # 服 -0x75E6 0x5247 # 則 -0x75E7 0x985E # 類 -0x75E8 0x82F1 # 英 -0x75E9 0x7403 # 球 -0x75EA 0x5343 # 千 -0x75EB 0x5F80 # 往 -0x75EC 0x8B1B # 講 -0x75ED 0x8A08 # 計 -0x75EE 0x6230 # 戰 -0x75EF 0x6728 # 木 -0x75F0 0x7B11 # 笑 -0x75F1 0x529F # 功 -0x75F2 0x8209 # 舉 -0x75F3 0x8DDF # 跟 -0x75F4 0x795E # 神 -0x75F5 0x6C7A # 決 -0x75F6 0x6D41 # 流 -0x75F7 0x71B1 # 熱 -0x75F8 0x541B # 君 -0x75F9 0x7A76 # 究 -0x75FA 0x7D04 # 約 -0x75FB 0x96BB # 隻 -0x75FC 0x76F4 # 直 -0x75FD 0x53E4 # 古 -0x75FE 0x9EC3 # 黃 +# "164" JIS 0x742C 0x32E3 # ㋣ CIRCLED KATAKANA TO 0x742D 0x32E0 # ㋠ CIRCLED KATAKANA TI 0x742E 0x32F7 # ㋷ CIRCLED KATAKANA RI diff --git a/unicode/xerox/unihan/XCCS-171=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-171=UNIHAN.TXT new file mode 100644 index 00000000..edae19ff --- /dev/null +++ b/unicode/xerox/unihan/XCCS-171=UNIHAN.TXT @@ -0,0 +1,4 @@ + +# "171" UNIHAN + +0x7963 0xFA20 # 蘒 -- 171,143 diff --git a/unicode/xerox/unihan/XCCS-241=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-241=UNIHAN.TXT new file mode 100644 index 00000000..3437873f --- /dev/null +++ b/unicode/xerox/unihan/XCCS-241=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "241" UNIHAN + +0xA121 0x7684 # 的 -- 241,041 +0xA122 0x4E00 # 一 -- 241,042 +0xA123 0x662F # 是 -- 241,043 +0xA124 0x4E0D # 不 -- 241,044 +0xA125 0x4E86 # 了 -- 241,045 +0xA126 0x6211 # 我 -- 241,046 +0xA127 0x6709 # 有 -- 241,047 +0xA128 0x4ED6 # 他 -- 241,050 +0xA129 0x4EBA # 人 -- 241,051 +0xA12A 0x4E0A # 上 -- 241,052 +0xA12B 0x5728 # 在 -- 241,053 +0xA12C 0x4F86 # 來 -- 241,054 +0xA12D 0x9019 # 這 -- 241,055 +0xA12E 0x570B # 國 -- 241,056 +0xA12F 0x5011 # 們 -- 241,057 +0xA130 0x5927 # 大 -- 241,060 +0xA131 0x5C0F # 小 -- 241,061 +0xA132 0x8AAA # 說 -- 241,062 +0xA133 0x5B50 # 子 -- 241,063 +0xA134 0x500B # 個 -- 241,064 +0xA135 0x5C31 # 就 -- 241,065 +0xA136 0x8981 # 要 -- 241,066 +0xA137 0x53EF # 可 -- 241,067 +0xA138 0x5168 # 全 -- 241,070 +0xA139 0x5230 # 到 -- 241,071 +0xA13A 0x4E8C # 二 -- 241,072 +0xA13B 0x4EE5 # 以 -- 241,073 +0xA13C 0x4E2D # 中 -- 241,074 +0xA13D 0x4F60 # 你 -- 241,075 +0xA13E 0x4E5F # 也 -- 241,076 +0xA13F 0x6642 # 時 -- 241,077 +0xA140 0x90A3 # 那 -- 241,100 +0xA141 0x5341 # 十 -- 241,101 +0xA142 0x88CF # 裏 -- 241,102 +0xA143 0x548C # 和 -- 241,103 +0xA144 0x9053 # 道 -- 241,104 +0xA145 0x8457 # 著 -- 241,105 +0xA146 0x751F # 生 -- 241,106 +0xA147 0x5F97 # 得 -- 241,107 +0xA148 0x5BB6 # 家 -- 241,110 +0xA149 0x53BB # 去 -- 241,111 +0xA14A 0x5929 # 天 -- 241,112 +0xA14B 0x4E09 # 三 -- 241,113 +0xA14C 0x597D # 好 -- 241,114 +0xA14D 0x5B78 # 學 -- 241,115 +0xA14E 0x5730 # 地 -- 241,116 +0xA14F 0x7232 # 爲 -- 241,117 +0xA150 0x4E0B # 下 -- 241,120 +0xA151 0x90FD # 都 -- 241,121 +0xA152 0x9EBC # 麼 -- 241,122 +0xA153 0x4E8B # 事 -- 241,123 +0xA154 0x770B # 看 -- 241,124 +0xA155 0x5E74 # 年 -- 241,125 +0xA156 0x591A # 多 -- 241,126 +0xA157 0x51FA # 出 -- 241,127 +0xA158 0x6703 # 會 -- 241,130 +0xA159 0x7528 # 用 -- 241,131 +0xA15A 0x65E5 # 日 -- 241,132 +0xA15B 0x5F88 # 很 -- 241,133 +0xA15C 0x81EA # 自 -- 241,134 +0xA15D 0x628A # 把 -- 241,135 +0xA15E 0x56DB # 四 -- 241,136 +0xA15F 0x5F8C # 後 -- 241,137 +0xA160 0x904E # 過 -- 241,140 +0xA161 0x6A23 # 樣 -- 241,141 +0xA162 0x4E4B # 之 -- 241,142 +0xA163 0x6240 # 所 -- 241,143 +0xA164 0x5152 # 兒 -- 241,144 +0xA165 0x6C92 # 沒 -- 241,145 +0xA166 0x4E94 # 五 -- 241,146 +0xA167 0x751A # 甚 -- 241,147 +0xA168 0x898B # 見 -- 241,150 +0xA169 0x80FD # 能 -- 241,151 +0xA16A 0x9762 # 面 -- 241,152 +0xA16B 0x53C8 # 又 -- 241,153 +0xA16C 0x65B9 # 方 -- 241,154 +0xA16D 0x8D77 # 起 -- 241,155 +0xA16E 0x505A # 做 -- 241,156 +0xA16F 0x672C # 本 -- 241,157 +0xA170 0x7A2E # 種 -- 241,160 +0xA171 0x8001 # 老 -- 241,161 +0xA172 0x65BC # 於 -- 241,162 +0xA173 0x884C # 行 -- 241,163 +0xA174 0x6C11 # 民 -- 241,164 +0xA175 0x5982 # 如 -- 241,165 +0xA176 0x524D # 前 -- 241,166 +0xA177 0x4F5C # 作 -- 241,167 +0xA178 0x540C # 同 -- 241,170 +0xA179 0x7B2C # 第 -- 241,171 +0xA17A 0x6210 # 成 -- 241,172 +0xA17B 0x660E # 明 -- 241,173 +0xA17C 0x554F # 問 -- 241,174 +0xA17D 0x767C # 發 -- 241,175 +0xA17E 0x6CD5 # 法 -- 241,176 +0xA1A1 0x5F9E # 從 -- 241,241 +0xA1A2 0x897F # 西 -- 241,242 +0xA1A3 0x7136 # 然 -- 241,243 +0xA1A4 0x5FC3 # 心 -- 241,244 +0xA1A5 0x60F3 # 想 -- 241,245 +0xA1A6 0x9577 # 長 -- 241,246 +0xA1A7 0x5169 # 兩 -- 241,247 +0xA1A8 0x4FBF # 便 -- 241,250 +0xA1A9 0x56E0 # 因 -- 241,251 +0xA1AA 0x516B # 八 -- 241,252 +0xA1AB 0x52D5 # 動 -- 241,253 +0xA1AC 0x77E5 # 知 -- 241,254 +0xA1AD 0x6C34 # 水 -- 241,255 +0xA1AE 0x982D # 頭 -- 241,256 +0xA1AF 0x6559 # 教 -- 241,257 +0xA1B0 0x7D93 # 經 -- 241,260 +0xA1B1 0x5C0D # 對 -- 241,261 +0xA1B2 0x5DF2 # 已 -- 241,262 +0xA1B3 0x9084 # 還 -- 241,263 +0xA1B4 0x5916 # 外 -- 241,264 +0xA1B5 0x5206 # 分 -- 241,265 +0xA1B6 0x8A71 # 話 -- 241,266 +0xA1B7 0x53EB # 叫 -- 241,267 +0xA1B8 0x5DE5 # 工 -- 241,270 +0xA1B9 0x7B49 # 等 -- 241,271 +0xA1BA 0x6821 # 校 -- 241,272 +0xA1BB 0x5148 # 先 -- 241,273 +0xA1BC 0x6B64 # 此 -- 241,274 +0xA1BD 0x6708 # 月 -- 241,275 +0xA1BE 0x6771 # 東 -- 241,276 +0xA1BF 0x56DE # 回 -- 241,277 +0xA1C0 0x7576 # 當 -- 241,300 +0xA1C1 0x958B # 開 -- 241,301 +0xA1C2 0x516D # 六 -- 241,302 +0xA1C3 0x800C # 而 -- 241,303 +0xA1C4 0x610F # 意 -- 241,304 +0xA1C5 0x4E3B # 主 -- 241,305 +0xA1C6 0x4F46 # 但 -- 241,306 +0xA1C7 0x5B9A # 定 -- 241,307 +0xA1C8 0x5019 # 候 -- 241,310 +0xA1C9 0x5E7E # 幾 -- 241,311 +0xA1CA 0x5403 # 吃 -- 241,312 +0xA1CB 0x516C # 公 -- 241,313 +0xA1CC 0x7121 # 無 -- 241,314 +0xA1CD 0x4E9B # 些 -- 241,315 +0xA1CE 0x529B # 力 -- 241,316 +0xA1CF 0x5E38 # 常 -- 241,317 +0xA1D0 0x767D # 白 -- 241,320 +0xA1D1 0x5404 # 各 -- 241,321 +0xA1D2 0x5973 # 女 -- 241,322 +0xA1D3 0x8D70 # 走 -- 241,323 +0xA1D4 0x540D # 名 -- 241,324 +0xA1D5 0x9AD8 # 高 -- 241,325 +0xA1D6 0x61C9 # 應 -- 241,326 +0xA1D7 0x53EA # 只 -- 241,327 +0xA1D8 0x9032 # 進 -- 241,330 +0xA1D9 0x624B # 手 -- 241,331 +0xA1DA 0x73FE # 現 -- 241,332 +0xA1DB 0x6700 # 最 -- 241,333 +0xA1DC 0x7D66 # 給 -- 241,334 +0xA1DD 0x5462 # 呢 -- 241,335 +0xA1DE 0x807D # 聽 -- 241,336 +0xA1DF 0x5B98 # 官 -- 241,337 +0xA1E0 0x5C71 # 山 -- 241,340 +0xA1E1 0x7269 # 物 -- 241,341 +0xA1E2 0x4ECA # 今 -- 241,342 +0xA1E3 0x5C07 # 將 -- 241,343 +0xA1E4 0x592A # 太 -- 241,344 +0xA1E5 0x4E03 # 七 -- 241,345 +0xA1E6 0x6C23 # 氣 -- 241,346 +0xA1E7 0x5317 # 北 -- 241,347 +0xA1E8 0x4F4D # 位 -- 241,350 +0xA1E9 0x653F # 政 -- 241,351 +0xA1EA 0x4F7F # 使 -- 241,352 +0xA1EB 0x771E # 眞 -- 241,353 +0xA1EC 0x7F8E # 美 -- 241,354 +0xA1ED 0x5BE6 # 實 -- 241,355 +0xA1EE 0x53E3 # 口 -- 241,356 +0xA1EF 0x7531 # 由 -- 241,357 +0xA1F0 0x4E5D # 九 -- 241,360 +0xA1F1 0x6253 # 打 -- 241,361 +0xA1F2 0x6B63 # 正 -- 241,362 +0xA1F3 0x5357 # 南 -- 241,363 +0xA1F4 0x90E8 # 部 -- 241,364 +0xA1F5 0x8DEF # 路 -- 241,365 +0xA1F6 0x60C5 # 情 -- 241,366 +0xA1F7 0x518D # 再 -- 241,367 +0xA1F8 0x65B0 # 新 -- 241,370 +0xA1F9 0x5411 # 向 -- 241,371 +0xA1FA 0x5176 # 其 -- 241,372 +0xA1FB 0x9EDE # 點 -- 241,373 +0xA1FC 0x767E # 百 -- 241,374 +0xA1FD 0x9580 # 門 -- 241,375 +0xA1FE 0x8072 # 聲 -- 241,376 diff --git a/unicode/xerox/unihan/XCCS-242=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-242=UNIHAN.TXT new file mode 100644 index 00000000..e465f0aa --- /dev/null +++ b/unicode/xerox/unihan/XCCS-242=UNIHAN.TXT @@ -0,0 +1,190 @@ + +# "242" UNIHAN + +0xA221 0x5B57 # 字 -- 242,041 +0xA222 0x600E # 怎 -- 242,042 +0xA223 0x5FEB # 快 -- 242,043 +0xA224 0x5E2B # 師 -- 242,044 +0xA225 0x8655 # 處 -- 242,045 +0xA226 0x76F8 # 相 -- 242,046 +0xA227 0x6D3B # 活 -- 242,047 +0xA228 0x89AA # 親 -- 242,050 +0xA229 0x6D77 # 海 -- 242,051 +0xA22A 0x96FB # 電 -- 242,052 +0xA22B 0x6BCD # 母 -- 242,053 +0xA22C 0x679C # 果 -- 242,054 +0xA22D 0x7ACB # 立 -- 242,055 +0xA22E 0x539F # 原 -- 242,056 +0xA22F 0x5408 # 合 -- 242,057 +0xA230 0x66F8 # 書 -- 242,060 +0xA231 0x5165 # 入 -- 242,061 +0xA233 0x5E73 # 平 -- 242,063 +0xA234 0x696D # 業 -- 242,064 +0xA235 0x5831 # 報 -- 242,065 +0xA236 0x8EAB # 身 -- 242,066 +0xA237 0x5E02 # 市 -- 242,067 +0xA238 0x88AB # 被 -- 242,070 +0xA239 0x8A31 # 許 -- 242,071 +0xA23A 0x8ACB # 請 -- 242,072 +0xA23B 0x5C11 # 少 -- 242,073 +0xA23C 0x9593 # 間 -- 242,074 +0xA23D 0x9AD4 # 體 -- 242,075 +0xA23E 0x4F4F # 住 -- 242,076 +0xA23F 0x8ECA # 車 -- 242,077 +0xA240 0x8ECD # 軍 -- 242,100 +0xA241 0x908A # 邊 -- 242,101 +0xA242 0x91CD # 重 -- 242,102 +0xA243 0x52A0 # 加 -- 242,103 +0xA244 0x5716 # 圖 -- 242,104 +0xA245 0x6216 # 或 -- 242,105 +0xA246 0x6B21 # 次 -- 242,106 +0xA247 0x6BCF # 每 -- 242,107 +0xA248 0x7E3D # 總 -- 242,110 +0xA249 0x706B # 火 -- 242,111 +0xA24A 0x6587 # 文 -- 242,112 +0xA24B 0x5B69 # 孩 -- 242,113 +0xA24C 0x4E16 # 世 -- 242,114 +0xA24D 0x5B89 # 安 -- 242,115 +0xA24E 0x653E # 放 -- 242,116 +0xA24F 0x6A5F # 機 -- 242,117 +0xA250 0x5167 # 內 -- 242,120 +0xA251 0x95DC # 關 -- 242,121 +0xA252 0x5229 # 利 -- 242,122 +0xA253 0x50CF # 像 -- 242,123 +0xA254 0x7406 # 理 -- 242,124 +0xA255 0x6BD4 # 比 -- 242,125 +0xA256 0x611B # 愛 -- 242,126 +0xA257 0x738B # 王 -- 242,127 +0xA258 0x5225 # 別 -- 242,130 +0xA259 0x592B # 夫 -- 242,131 +0xA25A 0x8207 # 與 -- 242,132 +0xA25B 0x5149 # 光 -- 242,133 +0xA25C 0x82B1 # 花 -- 242,134 +0xA25D 0x83EF # 華 -- 242,135 +0xA25E 0x8AB2 # 課 -- 242,136 +0xA25F 0x80B2 # 育 -- 242,137 +0xA260 0x6545 # 故 -- 242,140 +0xA261 0x5FC5 # 必 -- 242,141 +0xA262 0x689D # 條 -- 242,142 +0xA263 0x5ABD # 媽 -- 242,143 +0xA264 0x5F1F # 弟 -- 242,144 +0xA265 0x7236 # 父 -- 242,145 +0xA266 0x901A # 通 -- 242,146 +0xA267 0x8868 # 表 -- 242,147 +0xA268 0x91D1 # 金 -- 242,150 +0xA269 0x5BEB # 寫 -- 242,151 +0xA26A 0x5DF1 # 己 -- 242,152 +0xA26B 0x624D # 才 -- 242,153 +0xA26C 0x6CB3 # 河 -- 242,154 +0xA26D 0x7701 # 省 -- 242,155 +0xA26E 0x53F0 # 台 -- 242,156 +0xA26F 0x6C42 # 求 -- 242,157 +0xA270 0x6536 # 收 -- 242,160 +0xA271 0x842C # 萬 -- 242,161 +0xA272 0x4E14 # 且 -- 242,162 +0xA273 0x4F55 # 何 -- 242,163 +0xA274 0x4EE3 # 代 -- 242,164 +0xA275 0x5171 # 共 -- 242,165 +0xA276 0x53D7 # 受 -- 242,166 +0xA277 0x98A8 # 風 -- 242,167 +0xA278 0x6C5F # 江 -- 242,170 +0xA279 0x62FF # 拿 -- 242,171 +0xA27A 0x96E3 # 難 -- 242,172 +0xA27B 0x754C # 界 -- 242,173 +0xA27C 0x4FE1 # 信 -- 242,174 +0xA27D 0x671B # 望 -- 242,175 +0xA27E 0x7A7A # 空 -- 242,176 +0xA2A1 0x6B7B # 死 -- 242,241 +0xA2A2 0x73ED # 班 -- 242,242 +0xA2A3 0x99AC # 馬 -- 242,243 +0xA2A4 0x671F # 期 -- 242,244 +0xA2A5 0x975E # 非 -- 242,245 +0xA2A6 0x6A39 # 樹 -- 242,246 +0xA2A7 0x53CA # 及 -- 242,247 +0xA2A8 0x7D50 # 結 -- 242,250 +0xA2A9 0x865F # 號 -- 242,251 +0xA2AA 0x5E36 # 帶 -- 242,252 +0xA2AB 0x5143 # 元 -- 242,253 +0xA2AC 0x4EA4 # 交 -- 242,254 +0xA2AD 0x8A72 # 該 -- 242,255 +0xA2AE 0x672A # 未 -- 242,256 +0xA2AF 0x7FA9 # 義 -- 242,257 +0xA2B0 0x5E9C # 府 -- 242,260 +0xA2B1 0x5B8C # 完 -- 242,261 +0xA2B2 0x8AD6 # 論 -- 242,262 +0xA2B3 0x9322 # 錢 -- 242,263 +0xA2B4 0x98DB # 飛 -- 242,264 +0xA2B5 0x547D # 命 -- 242,265 +0xA2B6 0x5F35 # 張 -- 242,266 +0xA2B7 0x54E1 # 員 -- 242,267 +0xA2B8 0x6578 # 數 -- 242,270 +0xA2B9 0x6797 # 林 -- 242,271 +0xA2BA 0x63A5 # 接 -- 242,272 +0xA2BB 0x5C40 # 局 -- 242,273 +0xA2BC 0x53CB # 友 -- 242,274 +0xA2BD 0x559C # 喜 -- 242,275 +0xA2BE 0x6E05 # 清 -- 242,276 +0xA2BF 0x6D0B # 洋 -- 242,277 +0xA2C0 0x6A02 # 樂 -- 242,300 +0xA2C1 0x5A5A # 婚 -- 242,301 +0xA2C2 0x793E # 社 -- 242,302 +0xA2C3 0x65E9 # 早 -- 242,303 +0xA2C4 0x5E03 # 布 -- 242,304 +0xA2C5 0x6975 # 極 -- 242,305 +0xA2C6 0x773C # 眼 -- 242,306 +0xA2C7 0x55CE # 嗎 -- 242,307 +0xA2C8 0x7522 # 產 -- 242,310 +0xA2C9 0x544A # 告 -- 242,311 +0xA2CA 0x54E5 # 哥 -- 242,312 +0xA2CB 0x8208 # 興 -- 242,313 +0xA2CC 0x52DE # 勞 -- 242,314 +0xA2CD 0x9435 # 鐵 -- 242,315 +0xA2CE 0x53D6 # 取 -- 242,316 +0xA2CF 0x7B97 # 算 -- 242,317 +0xA2D0 0x66F4 # 更 -- 242,320 +0xA2D1 0x5175 # 兵 -- 242,321 +0xA2D2 0x9020 # 造 -- 242,322 +0xA2D3 0x7B54 # 答 -- 242,323 +0xA2D4 0x627E # 找 -- 242,324 +0xA2D5 0x7F77 # 罷 -- 242,325 +0xA2D6 0x5931 # 失 -- 242,326 +0xA2D7 0x904B # 運 -- 242,327 +0xA2D8 0x5F62 # 形 -- 242,330 +0xA2D9 0x6613 # 易 -- 242,331 +0xA2DA 0x7FA3 # 羣 -- 242,332 +0xA2DB 0x5EA6 # 度 -- 242,333 +0xA2DC 0x534A # 半 -- 242,334 +0xA2DD 0x8863 # 衣 -- 242,335 +0xA2DE 0x82E5 # 若 -- 242,336 +0xA2DF 0x81F3 # 至 -- 242,337 +0xA2E0 0x8B70 # 議 -- 242,340 +0xA2E1 0x8FD1 # 近 -- 242,341 +0xA2E2 0x7167 # 照 -- 242,342 +0xA2E3 0x8B8A # 變 -- 242,343 +0xA2E4 0x59D0 # 姐 -- 242,344 +0xA2E5 0x670D # 服 -- 242,345 +0xA2E6 0x5247 # 則 -- 242,346 +0xA2E7 0x985E # 類 -- 242,347 +0xA2E8 0x82F1 # 英 -- 242,350 +0xA2E9 0x7403 # 球 -- 242,351 +0xA2EA 0x5343 # 千 -- 242,352 +0xA2EB 0x5F80 # 往 -- 242,353 +0xA2EC 0x8B1B # 講 -- 242,354 +0xA2ED 0x8A08 # 計 -- 242,355 +0xA2EE 0x6230 # 戰 -- 242,356 +0xA2EF 0x6728 # 木 -- 242,357 +0xA2F0 0x7B11 # 笑 -- 242,360 +0xA2F1 0x529F # 功 -- 242,361 +0xA2F2 0x8209 # 舉 -- 242,362 +0xA2F3 0x8DDF # 跟 -- 242,363 +0xA2F4 0x795E # 神 -- 242,364 +0xA2F5 0x6C7A # 決 -- 242,365 +0xA2F6 0x6D41 # 流 -- 242,366 +0xA2F7 0x71B1 # 熱 -- 242,367 +0xA2F8 0x541B # 君 -- 242,370 +0xA2F9 0x7A76 # 究 -- 242,371 +0xA2FA 0x7D04 # 約 -- 242,372 +0xA2FB 0x96BB # 隻 -- 242,373 +0xA2FC 0x76F4 # 直 -- 242,374 +0xA2FD 0x53E4 # 古 -- 242,375 +0xA2FE 0x9EC3 # 黃 -- 242,376 diff --git a/unicode/xerox/unihan/XCCS-243=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-243=UNIHAN.TXT new file mode 100644 index 00000000..6e783d50 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-243=UNIHAN.TXT @@ -0,0 +1,190 @@ + +# "243" UNIHAN + +0xA321 0x661F # 星 -- 243,041 +0xA322 0x984C # 題 -- 243,042 +0xA323 0x4FDD # 保 -- 243,043 +0xA324 0x5012 # 倒 -- 243,044 +0xA325 0x7AE5 # 童 -- 243,045 +0xA326 0x9060 # 遠 -- 243,046 +0xA327 0x5316 # 化 -- 243,047 +0xA328 0x76EE # 目 -- 243,050 +0xA329 0x5750 # 坐 -- 243,051 +0xA32A 0x623F # 房 -- 243,052 +0xA32B 0x5F3A # 强 -- 243,053 +0xA32C 0x8B80 # 讀 -- 243,054 +0xA32D 0x9001 # 送 -- 243,055 +0xA32E 0x672B # 末 -- 243,056 +0xA32F 0x665A # 晚 -- 243,057 +0xA330 0x98DF # 食 -- 243,060 +0xA331 0x96D6 # 雖 -- 243,061 +0xA332 0x97F3 # 音 -- 243,062 +0xA333 0x6EFF # 滿 -- 243,063 +0xA334 0x8FA6 # 辦 -- 243,064 +0xA335 0x6027 # 性 -- 243,065 +0xA336 0x6B61 # 歡 -- 243,066 +0xA337 0x75C5 # 病 -- 243,067 +0xA338 0x9054 # 達 -- 243,070 +0xA339 0x5BB3 # 害 -- 243,071 +0xA33A 0x8CB7 # 買 -- 243,072 +0xA33B 0x9280 # 銀 -- 243,073 +0xA33C 0x52D9 # 務 -- 243,074 +0xA33D 0x5920 # 夠 -- 243,075 +0xA33E 0x4EFB # 任 -- 243,076 +0xA33F 0x9023 # 連 -- 243,077 +0xA340 0x5546 # 商 -- 243,100 +0xA341 0x7279 # 特 -- 243,101 +0xA342 0x82E6 # 苦 -- 243,102 +0xA343 0x5FB7 # 德 -- 243,103 +0xA344 0x9662 # 院 -- 243,104 +0xA345 0x6B0A # 權 -- 243,105 +0xA346 0x6B65 # 步 -- 243,106 +0xA347 0x5440 # 呀 -- 243,107 +0xA348 0x6015 # 怕 -- 243,110 +0xA349 0x77F3 # 石 -- 243,111 +0xA34A 0x8272 # 色 -- 243,112 +0xA34B 0x5EFA # 建 -- 243,113 +0xA34C 0x6B3E # 款 -- 243,114 +0xA34D 0x5A66 # 婦 -- 243,115 +0xA34E 0x8A2D # 設 -- 243,116 +0xA34F 0x7238 # 爸 -- 243,117 +0xA350 0x5DF4 # 巴 -- 243,120 +0xA351 0x571F # 土 -- 243,121 +0xA352 0x8A18 # 記 -- 243,122 +0xA353 0x5E0C # 希 -- 243,123 +0xA354 0x58EB # 士 -- 243,124 +0xA355 0x50B3 # 傳 -- 243,125 +0xA356 0x7FD2 # 習 -- 243,126 +0xA357 0x5236 # 制 -- 243,127 +0xA358 0x63D0 # 提 -- 243,130 +0xA359 0x7BC0 # 節 -- 243,131 +0xA35A 0x5BB9 # 容 -- 243,132 +0xA35B 0x5FF5 # 念 -- 243,133 +0xA35C 0x6307 # 指 -- 243,134 +0xA35D 0x7814 # 研 -- 243,135 +0xA35E 0x6CBB # 治 -- 243,136 +0xA35F 0x89E3 # 解 -- 243,137 +0xA360 0x8239 # 船 -- 243,140 +0xA361 0x904A # 遊 -- 243,141 +0xA362 0x5099 # 備 -- 243,142 +0xA363 0x89C0 # 觀 -- 243,143 +0xA364 0x52DD # 勝 -- 243,144 +0xA365 0x6539 # 改 -- 243,145 +0xA366 0x9664 # 除 -- 243,146 +0xA367 0x967D # 陽 -- 243,147 +0xA368 0x53CD # 反 -- 243,150 +0xA369 0x7D71 # 統 -- 243,151 +0xA36A 0x9B5A # 魚 -- 243,152 +0xA36B 0x5B83 # 它 -- 243,153 +0xA36C 0x5E1D # 帝 -- 243,154 +0xA36D 0x8A9E # 語 -- 243,155 +0xA36E 0x7530 # 田 -- 243,156 +0xA36F 0x52A9 # 助 -- 243,157 +0xA370 0x6CE8 # 注 -- 243,160 +0xA371 0x5348 # 午 -- 243,161 +0xA372 0x8A00 # 言 -- 243,162 +0xA373 0x5EE2 # 廢 -- 243,163 +0xA374 0x54C1 # 品 -- 243,164 +0xA375 0x6599 # 料 -- 243,165 +0xA376 0x5834 # 場 -- 243,166 +0xA377 0x5FD9 # 忙 -- 243,167 +0xA378 0x8DD1 # 跑 -- 243,170 +0xA379 0x66FE # 曾 -- 243,171 +0xA37A 0x52E2 # 勢 -- 243,172 +0xA37B 0x73A9 # 玩 -- 243,173 +0xA37C 0x8B58 # 識 -- 243,174 +0xA37D 0x6D88 # 消 -- 243,175 +0xA37E 0x5C4B # 屋 -- 243,176 +0xA3A1 0x601D # 思 -- 243,241 +0xA3A2 0x8DB3 # 足 -- 243,242 +0xA3A3 0x9808 # 須 -- 243,243 +0xA3A4 0x656C # 敬 -- 243,244 +0xA3A5 0x7CBE # 精 -- 243,245 +0xA3A6 0x7E23 # 縣 -- 243,246 +0xA3A7 0x59B9 # 妹 -- 243,247 +0xA3A8 0x5979 # 她 -- 243,250 +0xA3A9 0x8CBB # 費 -- 243,251 +0xA3AA 0x57CE # 城 -- 243,252 +0xA3AB 0x5668 # 器 -- 243,253 +0xA3AC 0x96E2 # 離 -- 243,254 +0xA3AD 0x9858 # 願 -- 243,255 +0xA3AE 0x76AE # 皮 -- 243,256 +0xA3AF 0x6551 # 救 -- 243,257 +0xA3B0 0x98EF # 飯 -- 243,260 +0xA3B1 0x9ED1 # 黑 -- 243,261 +0xA3B2 0x8FB2 # 農 -- 243,262 +0xA3B3 0x5EE3 # 廣 -- 243,263 +0xA3B4 0x7D1A # 級 -- 243,264 +0xA3B5 0x7A31 # 稱 -- 243,265 +0xA3B6 0x7BA1 # 管 -- 243,266 +0xA3B7 0x50F9 # 價 -- 243,267 +0xA3B8 0x523B # 刻 -- 243,270 +0xA3B9 0x7D44 # 組 -- 243,271 +0xA3BA 0x4E45 # 久 -- 243,272 +0xA3BB 0x7D30 # 細 -- 243,273 +0xA3BC 0x826F # 良 -- 243,274 +0xA3BD 0x9752 # 青 -- 243,275 +0xA3BE 0x9078 # 選 -- 243,276 +0xA3BF 0x6F38 # 漸 -- 243,277 +0xA3C0 0x5F04 # 弄 -- 243,300 +0xA3C1 0x53C3 # 參 -- 243,301 +0xA3C2 0x6562 # 敢 -- 243,302 +0xA3C3 0x5370 # 印 -- 243,303 +0xA3C4 0x6B78 # 歸 -- 243,304 +0xA3C5 0x5207 # 切 -- 243,305 +0xA3C6 0x8077 # 職 -- 243,306 +0xA3C7 0x88DD # 裝 -- 243,307 +0xA3C8 0x756B # 畫 -- 243,310 +0xA3C9 0x5C08 # 專 -- 243,311 +0xA3CA 0x7D05 # 紅 -- 243,312 +0xA3CB 0x96E8 # 雨 -- 243,313 +0xA3CC 0x5373 # 即 -- 243,314 +0xA3CD 0x8A8D # 認 -- 243,315 +0xA3CE 0x6FDF # 濟 -- 243,316 +0xA3CF 0x7247 # 片 -- 243,317 +0xA3D0 0x990A # 養 -- 243,320 +0xA3D1 0x91CF # 量 -- 243,321 +0xA3D3 0x5FFD # 忽 -- 243,323 +0xA3D4 0x822C # 般 -- 243,324 +0xA3D5 0x5305 # 包 -- 243,325 +0xA3D6 0x4EF6 # 件 -- 243,326 +0xA3D7 0x8349 # 草 -- 243,327 +0xA3D8 0x6F22 # 漢 -- 243,330 +0xA3D9 0x723E # 爾 -- 243,331 +0xA3DA 0x904D # 遍 -- 243,332 +0xA3DB 0x6232 # 戲 -- 243,333 +0xA3DC 0x8AF8 # 諸 -- 243,334 +0xA3DD 0x8AB0 # 誰 -- 243,335 +0xA3DE 0x7ADF # 竟 -- 243,336 +0xA3DF 0x65E2 # 既 -- 243,337 +0xA3E0 0x9109 # 鄉 -- 243,340 +0xA3E1 0x80AF # 肯 -- 243,341 +0xA3E2 0x6839 # 根 -- 243,342 +0xA3E3 0x514D # 免 -- 243,343 +0xA3E4 0x722D # 爭 -- 243,344 +0xA3E5 0x5468 # 周 -- 243,345 +0xA3E6 0x5566 # 啦 -- 243,346 +0xA3E7 0x55AE # 單 -- 243,347 +0xA3E8 0x7A7F # 穿 -- 243,350 +0xA3E9 0x584A # 塊 -- 243,351 +0xA3EA 0x521D # 初 -- 243,352 +0xA3EB 0x91CC # 里 -- 243,353 +0xA3EC 0x76E1 # 盡 -- 243,354 +0xA3ED 0x8846 # 衆 -- 243,355 +0xA3EE 0x6BDB # 毛 -- 243,356 +0xA3EF 0x6B72 # 歲 -- 243,357 +0xA3F0 0x8089 # 肉 -- 243,360 +0xA3F1 0x9F4A # 齊 -- 243,361 +0xA3F2 0x96C6 # 集 -- 243,362 +0xA3F3 0x5DDE # 州 -- 243,363 +0xA3F4 0x843D # 落 -- 243,364 +0xA3F5 0x6025 # 急 -- 243,365 +0xA3F6 0x5047 # 假 -- 243,366 +0xA3F7 0x63A8 # 推 -- 243,367 +0xA3F8 0x7968 # 票 -- 243,370 +0xA3F9 0x7834 # 破 -- 243,371 +0xA3FA 0x7537 # 男 -- 243,372 +0xA3FB 0x5531 # 唱 -- 243,373 +0xA3FC 0x5553 # 啓 -- 243,374 +0xA3FD 0x611F # 感 -- 243,375 +0xA3FE 0x554A # 啊 -- 243,376 diff --git a/unicode/xerox/unihan/XCCS-244=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-244=UNIHAN.TXT new file mode 100644 index 00000000..0e73b0d9 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-244=UNIHAN.TXT @@ -0,0 +1,189 @@ + +# "244" UNIHAN + +0xA421 0x4F3C # 似 -- 244,041 +0xA422 0x79D1 # 科 -- 244,042 +0xA423 0x79AE # 禮 -- 244,043 +0xA424 0x798F # 福 -- 244,044 +0xA425 0x9632 # 防 -- 244,045 +0xA426 0x6BBA # 殺 -- 244,046 +0xA427 0x8AC7 # 談 -- 244,047 +0xA428 0x4EE4 # 令 -- 244,050 +0xA429 0x8CC7 # 資 -- 244,051 +0xA42A 0x64DA # 據 -- 244,052 +0xA42B 0x4FC4 # 俄 -- 244,053 +0xA42C 0x7559 # 留 -- 244,054 +0xA42D 0x811A # 脚 -- 244,055 +0xA42E 0x5CF6 # 島 -- 244,056 +0xA42F 0x5718 # 團 -- 244,057 +0xA430 0x8CE3 # 賣 -- 244,060 +0xA431 0x5FD7 # 志 -- 244,061 +0xA432 0x62C9 # 拉 -- 244,062 +0xA433 0x6B66 # 武 -- 244,063 +0xA434 0x602A # 怪 -- 244,064 +0xA435 0x4ED8 # 付 -- 244,065 +0xA436 0x4FC2 # 係 -- 244,066 +0xA437 0x725B # 牛 -- 244,067 +0xA438 0x606F # 息 -- 244,070 +0xA439 0x50B7 # 傷 -- 244,071 +0xA43A 0x5BA2 # 客 -- 244,072 +0xA43B 0x8A0E # 討 -- 244,073 +0xA43C 0x96A8 # 隨 -- 244,074 +0xA43D 0x8336 # 茶 -- 244,075 +0xA43E 0x501F # 借 -- 244,076 +0xA43F 0x885B # 衛 -- 244,077 +0xA440 0x591C # 夜 -- 244,100 +0xA441 0x7063 # 灣 -- 244,101 +0xA442 0x806F # 聯 -- 244,102 +0xA443 0x4E9E # 亞 -- 244,103 +0xA444 0x8D95 # 趕 -- 244,104 +0xA445 0x5C45 # 居 -- 244,105 +0xA446 0x9152 # 酒 -- 244,106 +0xA447 0x968A # 隊 -- 244,107 +0xA448 0x9047 # 遇 -- 244,110 +0xA449 0x5BCC # 富 -- 244,111 +0xA44A 0x8B93 # 讓 -- 244,112 +0xA44B 0x5BDF # 察 -- 244,113 +0xA44C 0x5947 # 奇 -- 244,114 +0xA44D 0x65AF # 斯 -- 244,115 +0xA44E 0x7D00 # 紀 -- 244,116 +0xA44F 0x683C # 格 -- 244,117 +0xA450 0x6DF1 # 深 -- 244,120 +0xA452 0x8FEB # 迫 -- 244,122 +0xA453 0x7DCA # 緊 -- 244,123 +0xA454 0x7E54 # 織 -- 244,124 +0xA455 0x9CE5 # 鳥 -- 244,125 +0xA456 0x6625 # 春 -- 244,126 +0xA458 0x7B46 # 筆 -- 244,130 +0xA459 0x66FF # 替 -- 244,131 +0xA45A 0x5F71 # 影 -- 244,132 +0xA45B 0x7C73 # 米 -- 244,133 +0xA45C 0x4E82 # 亂 -- 244,134 +0xA45D 0x51B7 # 冷 -- 244,135 +0xA45E 0x59CB # 始 -- 244,136 +0xA45F 0x8607 # 蘇 -- 244,137 +0xA460 0x6050 # 恐 -- 244,140 +0xA461 0x6CB9 # 油 -- 244,141 +0xA462 0x65C1 # 旁 -- 244,142 +0xA463 0x820A # 舊 -- 244,143 +0xA464 0x5B97 # 宗 -- 244,144 +0xA465 0x54ED # 哭 -- 244,145 +0xA466 0x963F # 阿 -- 244,146 +0xA467 0x88FD # 製 -- 244,147 +0xA468 0x71C8 # 燈 -- 244,150 +0xA469 0x6B4C # 歌 -- 244,151 +0xA46A 0x7761 # 睡 -- 244,152 +0xA46B 0x5712 # 園 -- 244,153 +0xA46C 0x9DC4 # 鷄 -- 244,154 +0xA46D 0x5F85 # 待 -- 244,155 +0xA46E 0x5C0E # 導 -- 244,156 +0xA46F 0x537B # 卻 -- 244,157 +0xA470 0x9F20 # 鼠 -- 244,160 +0xA471 0x9805 # 項 -- 244,161 +0xA472 0x53E5 # 句 -- 244,162 +0xA473 0x5200 # 刀 -- 244,163 +0xA474 0x5340 # 區 -- 244,164 +0xA475 0x8A34 # 訴 -- 244,165 +0xA476 0x4EA6 # 亦 -- 244,166 +0xA477 0x8003 # 考 -- 244,167 +0xA478 0x589E # 增 -- 244,170 +0xA479 0x9678 # 陸 -- 244,171 +0xA47A 0x5E6B # 幫 -- 244,172 +0xA47B 0x8F15 # 輕 -- 244,173 +0xA47C 0x6628 # 昨 -- 244,174 +0xA47D 0x5E8F # 序 -- 244,175 +0xA47E 0x7DE8 # 編 -- 244,176 +0xA4A1 0x9810 # 預 -- 244,241 +0xA4A2 0x4EAC # 京 -- 244,242 +0xA4A3 0x590F # 夏 -- 244,243 +0xA4A4 0x96F2 # 雲 -- 244,244 +0xA4A5 0x5177 # 具 -- 244,245 +0xA4A6 0x8D8A # 越 -- 244,246 +0xA4A7 0x5BA4 # 室 -- 244,247 +0xA4A8 0x54C8 # 哈 -- 244,250 +0xA4A9 0x8CEA # 質 -- 244,251 +0xA4AA 0x7D19 # 紙 -- 244,252 +0xA4AB 0x9418 # 鐘 -- 244,253 +0xA4AC 0x4EAE # 亮 -- 244,254 +0xA4AD 0x907A # 遺 -- 244,255 +0xA4AE 0x60E1 # 惡 -- 244,256 +0xA4AF 0x674E # 李 -- 244,257 +0xA4B0 0x805E # 聞 -- 244,260 +0xA4B1 0x6557 # 敗 -- 244,261 +0xA4B2 0x4ECD # 仍 -- 244,262 +0xA4B3 0x8CA1 # 財 -- 244,263 +0xA4B4 0x6D32 # 洲 -- 244,264 +0xA4B5 0x8ABF # 調 -- 244,265 +0xA4B6 0x91AB # 醫 -- 244,266 +0xA4B7 0x8CA8 # 貨 -- 244,267 +0xA4B8 0x570D # 圍 -- 244,270 +0xA4B9 0x72D7 # 狗 -- 244,271 +0xA4BA 0x898F # 規 -- 244,272 +0xA4BB 0x58DE # 壞 -- 244,273 +0xA4BC 0x6389 # 掉 -- 244,274 +0xA4BD 0x547C # 呼 -- 244,275 +0xA4BE 0x7A0B # 程 -- 244,276 +0xA4BF 0x5B6B # 孫 -- 244,277 +0xA4C0 0x5144 # 兄 -- 244,300 +0xA4C1 0x6697 # 暗 -- 244,301 +0xA4C2 0x793A # 示 -- 244,302 +0xA4C3 0x532A # 匪 -- 244,303 +0xA4C4 0x8F03 # 較 -- 244,304 +0xA4C5 0x53F8 # 司 -- 244,305 +0xA4C6 0x932F # 錯 -- 244,306 +0xA4C7 0x8A66 # 試 -- 244,307 +0xA4C8 0x9673 # 陳 -- 244,310 +0xA4C9 0x5DEE # 差 -- 244,311 +0xA4CA 0x6295 # 投 -- 244,312 +0xA4CB 0x75DB # 痛 -- 244,313 +0xA4CC 0x7E94 # 纔 -- 244,314 +0xA4CD 0x5BF6 # 寶 -- 244,315 +0xA4CE 0x6C7D # 汽 -- 244,316 +0xA4CF 0x81F4 # 致 -- 244,317 +0xA4D0 0x89D2 # 角 -- 244,320 +0xA4D1 0x7D42 # 終 -- 244,321 +0xA4D2 0x8449 # 葉 -- 244,322 +0xA4D3 0x6D3E # 派 -- 244,323 +0xA4D4 0x8DF3 # 跳 -- 244,324 +0xA4D5 0x505C # 停 -- 244,325 +0xA4D6 0x71D2 # 燒 -- 244,326 +0xA4D7 0x6B62 # 止 -- 244,327 +0xA4D8 0x6E2F # 港 -- 244,330 +0xA4D9 0x5584 # 善 -- 244,331 +0xA4DA 0x5F15 # 引 -- 244,332 +0xA4DB 0x627F # 承 -- 244,333 +0xA4DC 0x670B # 朋 -- 244,334 +0xA4DD 0x8F2A # 輪 -- 244,335 +0xA4DE 0x7AD9 # 站 -- 244,336 +0xA4DF 0x6162 # 慢 -- 244,337 +0xA4E0 0x7368 # 獨 -- 244,340 +0xA4E1 0x7D72 # 絲 -- 244,341 +0xA4E2 0x65B7 # 斷 -- 244,342 +0xA4E3 0x5E78 # 幸 -- 244,343 +0xA4E4 0x6301 # 持 -- 244,344 +0xA4E5 0x8B77 # 護 -- 244,345 +0xA4E6 0x91CE # 野 -- 244,346 +0xA4E7 0x5E97 # 店 -- 244,347 +0xA4E8 0x5FA9 # 復 -- 244,350 +0xA4E9 0x5C24 # 尤 -- 244,351 +0xA4EA 0x655D # 敝 -- 244,352 +0xA4EB 0x9769 # 革 -- 244,353 +0xA4EC 0x67E5 # 查 -- 244,354 +0xA4ED 0x8B1D # 謝 -- 244,355 +0xA4EE 0x76DB # 盛 -- 244,356 +0xA4EF 0x8853 # 術 -- 244,357 +0xA4F0 0x9996 # 首 -- 244,360 +0xA4F1 0x7562 # 畢 -- 244,361 +0xA4F2 0x85CF # 藏 -- 244,362 +0xA4F3 0x7DF4 # 練 -- 244,363 +0xA4F4 0x4F4E # 低 -- 244,364 +0xA4F5 0x4E43 # 乃 -- 244,365 +0xA4F6 0x96D9 # 雙 -- 244,366 +0xA4F7 0x9760 # 靠 -- 244,367 +0xA4F8 0x4FEE # 修 -- 244,370 +0xA4F9 0x6751 # 村 -- 244,371 +0xA4FA 0x52AA # 努 -- 244,372 +0xA4FB 0x4F9D # 依 -- 244,373 +0xA4FC 0x4E4E # 乎 -- 244,374 +0xA4FD 0x5EAD # 庭 -- 244,375 +0xA4FE 0x83DC # 菜 -- 244,376 diff --git a/unicode/xerox/unihan/XCCS-245=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-245=UNIHAN.TXT new file mode 100644 index 00000000..ac63ec77 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-245=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "245" UNIHAN + +0xA521 0x89BA # 覺 -- 245,041 +0xA522 0x7AEF # 端 -- 245,042 +0xA523 0x7956 # 祖 -- 245,043 +0xA524 0x5427 # 吧 -- 245,044 +0xA525 0x71DF # 營 -- 245,045 +0xA526 0x65CF # 族 -- 245,046 +0xA527 0x6D17 # 洗 -- 245,047 +0xA528 0x8CB4 # 貴 -- 245,050 +0xA529 0x6EAB # 溫 -- 245,051 +0xA52A 0x862D # 蘭 -- 245,052 +0xA52B 0x8FA8 # 辨 -- 245,053 +0xA52C 0x8CAC # 責 -- 245,054 +0xA52D 0x6E96 # 準 -- 245,055 +0xA52E 0x6848 # 案 -- 245,056 +0xA52F 0x87F2 # 蟲 -- 245,057 +0xA530 0x8996 # 視 -- 245,060 +0xA531 0x7F8A # 羊 -- 245,061 +0xA532 0x7E8C # 續 -- 245,062 +0xA533 0x63DB # 換 -- 245,063 +0xA534 0x6574 # 整 -- 245,064 +0xA535 0x6E56 # 湖 -- 245,065 +0xA536 0x9644 # 附 -- 245,066 +0xA537 0x5F0F # 式 -- 245,067 +0xA538 0x62B5 # 抵 -- 245,070 +0xA539 0x6B77 # 歷 -- 245,071 +0xA53A 0x5C04 # 射 -- 245,072 +0xA53B 0x5DE6 # 左 -- 245,073 +0xA53C 0x72C0 # 狀 -- 245,074 +0xA53D 0x7F85 # 羅 -- 245,075 +0xA53E 0x81C9 # 臉 -- 245,076 +0xA53F 0x67D0 # 某 -- 245,077 +0xA540 0x6C0F # 氏 -- 245,100 +0xA541 0x9E97 # 麗 -- 245,101 +0xA542 0x62DC # 拜 -- 245,102 +0xA543 0x57FA # 基 -- 245,103 +0xA544 0x80CC # 背 -- 245,104 +0xA545 0x7D55 # 絕 -- 245,105 +0xA546 0x5A18 # 娘 -- 245,106 +0xA547 0x9B27 # 鬧 -- 245,107 +0xA548 0x514B # 克 -- 245,110 +0xA549 0x4E58 # 乘 -- 245,111 +0xA54A 0x6F14 # 演 -- 245,112 +0xA54B 0x5C6C # 屬 -- 245,113 +0xA54C 0x5C55 # 展 -- 245,114 +0xA54D 0x9000 # 退 -- 245,115 +0xA54E 0x6A4B # 橋 -- 245,116 +0xA54F 0x97FF # 響 -- 245,117 +0xA550 0x8070 # 聰 -- 245,120 +0xA551 0x9928 # 館 -- 245,121 +0xA552 0x9003 # 逃 -- 245,122 +0xA553 0x666F # 景 -- 245,123 +0xA554 0x9A5A # 驚 -- 245,124 +0xA555 0x969B # 際 -- 245,125 +0xA556 0x4F9B # 供 -- 245,126 +0xA557 0x8005 # 者 -- 245,127 +0xA558 0x6297 # 抗 -- 245,130 +0xA559 0x8C93 # 貓 -- 245,131 +0xA55A 0x8CFD # 賽 -- 245,132 +0xA55B 0x5B88 # 守 -- 245,133 +0xA55C 0x775B # 睛 -- 245,134 +0xA55D 0x5145 # 充 -- 245,135 +0xA55E 0x8499 # 蒙 -- 245,136 +0xA55F 0x9999 # 香 -- 245,137 +0xA560 0x8B49 # 證 -- 245,140 +0xA561 0x58D3 # 壓 -- 245,141 +0xA562 0x59D4 # 委 -- 245,142 +0xA563 0x9EE8 # 黨 -- 245,143 +0xA564 0x7565 # 略 -- 245,144 +0xA565 0x525B # 剛 -- 245,145 +0xA566 0x51E1 # 凡 -- 245,146 +0xA567 0x5C1A # 尚 -- 245,147 +0xA568 0x5BC6 # 密 -- 245,150 +0xA569 0x93E1 # 鏡 -- 245,151 +0xA56A 0x6C89 # 沉 -- 245,152 +0xA56B 0x5473 # 味 -- 245,153 +0xA56C 0x6D1E # 洞 -- 245,154 +0xA56D 0x7389 # 玉 -- 245,155 +0xA56E 0x5802 # 堂 -- 245,156 +0xA56F 0x5EA7 # 座 -- 245,157 +0xA570 0x64D4 # 擔 -- 245,160 +0xA571 0x8857 # 街 -- 245,161 +0xA572 0x5F8B # 律 -- 245,162 +0xA573 0x9A57 # 驗 -- 245,163 +0xA574 0x53E6 # 另 -- 245,164 +0xA575 0x8033 # 耳 -- 245,165 +0xA576 0x66C9 # 曉 -- 245,166 +0xA577 0x6C38 # 永 -- 245,167 +0xA578 0x6383 # 掃 -- 245,170 +0xA579 0x5FAE # 微 -- 245,171 +0xA57A 0x7F6E # 置 -- 245,172 +0xA57B 0x6563 # 散 -- 245,173 +0xA57C 0x77ED # 短 -- 245,174 +0xA57D 0x9802 # 頂 -- 245,175 +0xA57E 0x9F8D # 龍 -- 245,176 +0xA5A1 0x5CB8 # 岸 -- 245,241 +0xA5A2 0x7E7C # 繼 -- 245,242 +0xA5A3 0x5634 # 嘴 -- 245,243 +0xA5A4 0x9650 # 限 -- 245,244 +0xA5A5 0x6668 # 晨 -- 245,245 +0xA5A6 0x5217 # 列 -- 245,246 +0xA5A7 0x7532 # 甲 -- 245,247 +0xA5A8 0x7AF9 # 竹 -- 245,250 +0xA5A9 0x96AA # 險 -- 245,251 +0xA5AA 0x8C61 # 象 -- 245,252 +0xA5AB 0x975C # 靜 -- 245,253 +0xA5AC 0x5438 # 吸 -- 245,254 +0xA5AD 0x9818 # 領 -- 245,255 +0xA5AE 0x4EFD # 份 -- 245,256 +0xA5AF 0x5065 # 健 -- 245,257 +0xA5B0 0x56FA # 固 -- 245,260 +0xA5B1 0x5371 # 危 -- 245,261 +0xA5B2 0x9E7D # 鹽 -- 245,262 +0xA5B3 0x8FCE # 迎 -- 245,263 +0xA5B4 0x6392 # 排 -- 245,264 +0xA5B5 0x50BE # 傾 -- 245,265 +0xA5B6 0x7C21 # 簡 -- 245,266 +0xA5B7 0x6B50 # 歐 -- 245,267 +0xA5B8 0x6C99 # 沙 -- 245,270 +0xA5B9 0x9285 # 銅 -- 245,271 +0xA5BA 0x6EC5 # 滅 -- 245,272 +0xA5BB 0x65D7 # 旗 -- 245,273 +0xA5BC 0x9014 # 途 -- 245,274 +0xA5BD 0x5B58 # 存 -- 245,275 +0xA5BE 0x8A02 # 訂 -- 245,276 +0xA5BF 0x76CA # 益 -- 245,277 +0xA5C0 0x85E5 # 藥 -- 245,300 +0xA5C1 0x9EBB # 麻 -- 245,301 +0xA5C2 0x5F48 # 彈 -- 245,302 +0xA5C3 0x8A5E # 詞 -- 245,303 +0xA5C4 0x4F38 # 伸 -- 245,304 +0xA5C5 0x81E8 # 臨 -- 245,305 +0xA5C6 0x6349 # 捉 -- 245,306 +0xA5C7 0x592E # 央 -- 245,307 +0xA5C8 0x53F2 # 史 -- 245,310 +0xA5C9 0x5C3A # 尺 -- 245,311 +0xA5CA 0x9069 # 適 -- 245,312 +0xA5CB 0x5EB7 # 康 -- 245,313 +0xA5CC 0x7686 # 皆 -- 245,314 +0xA5CD 0x68C9 # 棉 -- 245,315 +0xA5CE 0x4F11 # 休 -- 245,316 +0xA5CF 0x5C0B # 尋 -- 245,317 +0xA5D0 0x652F # 支 -- 245,320 +0xA5D1 0x59BB # 妻 -- 245,321 +0xA5D2 0x5BA3 # 宣 -- 245,322 +0xA5D3 0x679D # 枝 -- 245,323 +0xA5D4 0x723A # 爺 -- 245,324 +0xA5D5 0x7A4D # 積 -- 245,325 +0xA5D6 0x8CA0 # 負 -- 245,326 +0xA5D7 0x5E2D # 席 -- 245,327 +0xA5D8 0x5439 # 吹 -- 245,330 +0xA5D9 0x8702 # 蜂 -- 245,331 +0xA5DA 0x6416 # 搖 -- 245,332 +0xA5DB 0x5E95 # 底 -- 245,333 +0xA5DC 0x9EA5 # 麥 -- 245,334 +0xA5DD 0x9700 # 需 -- 245,335 +0xA5DE 0x677F # 板 -- 245,336 +0xA5DF 0x51AC # 冬 -- 245,337 +0xA5E0 0x838A # 莊 -- 245,340 +0xA5E1 0x653B # 攻 -- 245,341 +0xA5E2 0x684C # 桌 -- 245,342 +0xA5E3 0x559D # 喝 -- 245,343 +0xA5E4 0x6982 # 概 -- 245,344 +0xA5E5 0x8166 # 腦 -- 245,345 +0xA5E6 0x6236 # 戶 -- 245,346 +0xA5E7 0x69CD # 槍 -- 245,347 +0xA5E8 0x6E38 # 游 -- 245,350 +0xA5E9 0x88DC # 補 -- 245,351 +0xA5EA 0x6068 # 恨 -- 245,352 +0xA5EB 0x7570 # 異 -- 245,353 +0xA5EC 0x8840 # 血 -- 245,354 +0xA5ED 0x6575 # 敵 -- 245,355 +0xA5EE 0x5A01 # 威 -- 245,356 +0xA5EF 0x96C4 # 雄 -- 245,357 +0xA5F0 0x5713 # 圓 -- 245,360 +0xA5F1 0x7518 # 甘 -- 245,361 +0xA5F2 0x5EE0 # 廠 -- 245,362 +0xA5F3 0x8C6C # 豬 -- 245,363 +0xA5F4 0x8C48 # 豈 -- 245,364 +0xA5F5 0x52C7 # 勇 -- 245,365 +0xA5F6 0x7AE0 # 章 -- 245,366 +0xA5F7 0x53F3 # 右 -- 245,367 +0xA5F8 0x7239 # 爹 -- 245,370 +0xA5F9 0x7260 # 牠 -- 245,371 +0xA5FA 0x5024 # 値 -- 245,372 +0xA5FB 0x7BC4 # 範 -- 245,373 +0xA5FC 0x7CD6 # 糖 -- 245,374 +0xA5FD 0x6750 # 材 -- 245,375 +0xA5FE 0x5347 # 升 -- 245,376 diff --git a/unicode/xerox/unihan/XCCS-246=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-246=UNIHAN.TXT new file mode 100644 index 00000000..a8b4d198 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-246=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "246" UNIHAN + +0xA621 0x6F54 # 潔 -- 246,041 +0xA622 0x5883 # 境 -- 246,042 +0xA623 0x6190 # 憐 -- 246,043 +0xA624 0x65BD # 施 -- 246,044 +0xA625 0x62B1 # 抱 -- 246,045 +0xA626 0x80A5 # 肥 -- 246,046 +0xA627 0x54E9 # 哩 -- 246,047 +0xA628 0x9732 # 露 -- 246,050 +0xA629 0x56F0 # 困 -- 246,051 +0xA62A 0x5275 # 創 -- 246,052 +0xA62B 0x9F13 # 鼓 -- 246,053 +0xA62C 0x51B0 # 冰 -- 246,054 +0xA62D 0x9867 # 顧 -- 246,055 +0xA62E 0x822A # 航 -- 246,056 +0xA62F 0x5C01 # 封 -- 246,057 +0xA630 0x7235 # 爵 -- 246,060 +0xA631 0x5B63 # 季 -- 246,061 +0xA632 0x62DB # 招 -- 246,062 +0xA633 0x7BC9 # 築 -- 246,063 +0xA634 0x86CB # 蛋 -- 246,064 +0xA635 0x666E # 普 -- 246,065 +0xA636 0x9806 # 順 -- 246,066 +0xA637 0x5E79 # 幹 -- 246,067 +0xA638 0x5F7C # 彼 -- 246,070 +0xA639 0x901F # 速 -- 246,071 +0xA63A 0x7C89 # 粉 -- 246,072 +0xA63B 0x6163 # 慣 -- 246,073 +0xA63C 0x596C # 奬 -- 246,074 +0xA63D 0x53D4 # 叔 -- 246,075 +0xA63E 0x79C1 # 私 -- 246,076 +0xA63F 0x4F48 # 佈 -- 246,077 +0xA640 0x4F2F # 伯 -- 246,100 +0xA641 0x7159 # 煙 -- 246,101 +0xA642 0x9192 # 醒 -- 246,102 +0xA643 0x7591 # 疑 -- 246,103 +0xA644 0x864E # 虎 -- 246,104 +0xA645 0x96DC # 雜 -- 246,105 +0xA646 0x6CBF # 沿 -- 246,106 +0xA647 0x4FD7 # 俗 -- 246,107 +0xA648 0x7240 # 牀 -- 246,110 +0xA649 0x72E0 # 狠 -- 246,111 +0xA64A 0x6BB5 # 段 -- 246,112 +0xA64B 0x821E # 舞 -- 246,113 +0xA64C 0x7E3E # 績 -- 246,114 +0xA64D 0x79CB # 秋 -- 246,115 +0xA64E 0x767B # 登 -- 246,116 +0xA64F 0x7F6A # 罪 -- 246,117 +0xA650 0x56B4 # 嚴 -- 246,120 +0xA651 0x6BD2 # 毒 -- 246,121 +0xA652 0x64CA # 擊 -- 246,122 +0xA653 0x6CC1 # 況 -- 246,123 +0xA654 0x7AAE # 窮 -- 246,124 +0xA655 0x7DAD # 維 -- 246,125 +0xA656 0x52F8 # 勸 -- 246,126 +0xA657 0x756A # 番 -- 246,127 +0xA658 0x4E39 # 丹 -- 246,130 +0xA659 0x78BA # 確 -- 246,131 +0xA65A 0x7A05 # 稅 -- 246,132 +0xA65B 0x62CD # 拍 -- 246,133 +0xA65C 0x7A97 # 窗 -- 246,134 +0xA65D 0x8DA3 # 趣 -- 246,135 +0xA65E 0x74B0 # 環 -- 246,136 +0xA65F 0x5747 # 均 -- 246,137 +0xA660 0x7D20 # 素 -- 246,140 +0xA661 0x6A6B # 橫 -- 246,141 +0xA662 0x59D1 # 姑 -- 246,142 +0xA663 0x65C5 # 旅 -- 246,143 +0xA664 0x986F # 顯 -- 246,144 +0xA665 0x66F2 # 曲 -- 246,145 +0xA666 0x77A7 # 瞧 -- 246,146 +0xA667 0x558A # 喊 -- 246,147 +0xA668 0x5426 # 否 -- 246,150 +0xA669 0x5BC4 # 寄 -- 246,151 +0xA66A 0x5E55 # 幕 -- 246,152 +0xA66B 0x6012 # 怒 -- 246,153 +0xA66C 0x9B2D # 鬭 -- 246,154 +0xA66D 0x6CE5 # 泥 -- 246,155 +0xA66E 0x614B # 態 -- 246,156 +0xA66F 0x9748 # 靈 -- 246,157 +0xA670 0x695A # 楚 -- 246,160 +0xA671 0x5999 # 妙 -- 246,161 +0xA672 0x639B # 掛 -- 246,162 +0xA673 0x5F31 # 弱 -- 246,163 +0xA674 0x6DE8 # 淨 -- 246,164 +0xA675 0x5FD8 # 忘 -- 246,165 +0xA676 0x6FC0 # 激 -- 246,166 +0xA677 0x9AA8 # 骨 -- 246,167 +0xA678 0x7687 # 皇 -- 246,170 +0xA679 0x7947 # 祇 -- 246,171 +0xA67A 0x54EA # 哪 -- 246,172 +0xA67B 0x59D3 # 姓 -- 246,173 +0xA67C 0x719F # 熟 -- 246,174 +0xA67D 0x4ED9 # 仙 -- 246,175 +0xA67E 0x5949 # 奉 -- 246,176 +0xA6A1 0x9AEE # 髮 -- 246,241 +0xA6A2 0x4E92 # 互 -- 246,242 +0xA6A3 0x6176 # 慶 -- 246,243 +0xA6A4 0x63A1 # 採 -- 246,244 +0xA6A5 0x9813 # 頓 -- 246,245 +0xA6A6 0x7BC7 # 篇 -- 246,246 +0xA6A7 0x4EA1 # 亡 -- 246,247 +0xA6A8 0x7DA0 # 綠 -- 246,250 +0xA6A9 0x5FCD # 忍 -- 246,251 +0xA6AA 0x5974 # 奴 -- 246,252 +0xA6AB 0x84CB # 蓋 -- 246,253 +0xA6AC 0x6309 # 按 -- 246,254 +0xA6AD 0x93AD # 鎭 -- 246,255 +0xA6AE 0x690D # 植 -- 246,256 +0xA6AF 0x7DE3 # 緣 -- 246,257 +0xA6B0 0x8F09 # 載 -- 246,260 +0xA6B1 0x8C50 # 豐 -- 246,261 +0xA6B2 0x5018 # 倘 -- 246,262 +0xA6B3 0x5BD2 # 寒 -- 246,263 +0xA6B4 0x76E3 # 監 -- 246,264 +0xA6B5 0x7D0D # 納 -- 246,265 +0xA6B6 0x6DDA # 淚 -- 246,266 +0xA6B7 0x5E16 # 帖 -- 246,267 +0xA6B8 0x7CE7 # 糧 -- 246,270 +0xA6B9 0x5354 # 協 -- 246,271 +0xA6BA 0x8B66 # 警 -- 246,272 +0xA6BB 0x64CD # 操 -- 246,273 +0xA6BC 0x675F # 束 -- 246,274 +0xA6BD 0x67B6 # 架 -- 246,275 +0xA6BE 0x91DD # 針 -- 246,276 +0xA6BF 0x60DC # 惜 -- 246,277 +0xA6C0 0x9130 # 鄰 -- 246,300 +0xA6C1 0x523A # 刺 -- 246,301 +0xA6C2 0x7070 # 灰 -- 246,302 +0xA6C3 0x70C8 # 烈 -- 246,303 +0xA6C4 0x912D # 鄭 -- 246,304 +0xA6C5 0x6B3A # 欺 -- 246,305 +0xA6C6 0x9663 # 陣 -- 246,306 +0xA6C7 0x638C # 掌 -- 246,307 +0xA6C8 0x7BAD # 箭 -- 246,310 +0xA6C9 0x53DF # 叟 -- 246,311 +0xA6CA 0x8A0A # 訊 -- 246,312 +0xA6CB 0x80E1 # 胡 -- 246,313 +0xA6CC 0x7926 # 礦 -- 246,314 +0xA6CD 0x8056 # 聖 -- 246,315 +0xA6CE 0x58C1 # 壁 -- 246,316 +0xA6CF 0x9031 # 週 -- 246,317 +0xA6D0 0x5BAE # 宮 -- 246,320 +0xA6D1 0x83AB # 莫 -- 246,321 +0xA6D2 0x5C3E # 尾 -- 246,322 +0xA6D3 0x66B4 # 暴 -- 246,323 +0xA6D4 0x5A46 # 婆 -- 246,324 +0xA6D5 0x502B # 倫 -- 246,325 +0xA6D6 0x5283 # 劃 -- 246,326 +0xA6D7 0x8F9B # 辛 -- 246,327 +0xA6D8 0x98EE # 飮 -- 246,330 +0xA6D9 0x5BE7 # 寧 -- 246,331 +0xA6DA 0x8A13 # 訓 -- 246,332 +0xA6DB 0x676F # 杯 -- 246,333 +0xA6DC 0x5DDD # 川 -- 246,334 +0xA6DD 0x542B # 含 -- 246,335 +0xA6DE 0x9670 # 陰 -- 246,336 +0xA6DF 0x9063 # 遣 -- 246,337 +0xA6E0 0x8FAD # 辭 -- 246,340 +0xA6E1 0x4E08 # 丈 -- 246,341 +0xA6E2 0x526F # 副 -- 246,342 +0xA6E3 0x5433 # 吳 -- 246,343 +0xA6E4 0x8B00 # 謀 -- 246,344 +0xA6E5 0x914D # 配 -- 246,345 +0xA6E6 0x984F # 顏 -- 246,346 +0xA6E7 0x526A # 剪 -- 246,347 +0xA6E8 0x9042 # 遂 -- 246,350 +0xA6E9 0x76E4 # 盤 -- 246,351 +0xA6EA 0x5B54 # 孔 -- 246,352 +0xA6EB 0x9694 # 隔 -- 246,353 +0xA6EC 0x68D2 # 棒 -- 246,354 +0xA6ED 0x4FB5 # 侵 -- 246,355 +0xA6EE 0x7981 # 禁 -- 246,356 +0xA6EF 0x5976 # 奶 -- 246,357 +0xA6F0 0x5077 # 偷 -- 246,360 +0xA6F1 0x8EDF # 軟 -- 246,361 +0xA6F2 0x978B # 鞋 -- 246,362 +0xA6F3 0x888B # 袋 -- 246,363 +0xA6F4 0x73E0 # 珠 -- 246,364 +0xA6F5 0x6CE2 # 波 -- 246,365 +0xA6F6 0x7259 # 牙 -- 246,366 +0xA6F7 0x722C # 爬 -- 246,367 +0xA6F8 0x4E59 # 乙 -- 246,370 +0xA6F9 0x52E4 # 勤 -- 246,371 +0xA6FA 0x9B6F # 魯 -- 246,372 +0xA6FB 0x512A # 優 -- 246,373 +0xA6FC 0x7F75 # 罵 -- 246,374 +0xA6FD 0x535A # 博 -- 246,375 +0xA6FE 0x8FF0 # 述 -- 246,376 diff --git a/unicode/xerox/unihan/XCCS-247=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-247=UNIHAN.TXT new file mode 100644 index 00000000..3b407972 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-247=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "247" UNIHAN + +0xA721 0x8D0A # 贊 -- 247,041 +0xA722 0x7248 # 版 -- 247,042 +0xA723 0x6B98 # 殘 -- 247,043 +0xA724 0x6D6A # 浪 -- 247,044 +0xA725 0x596A # 奪 -- 247,045 +0xA726 0x4EC1 # 仁 -- 247,046 +0xA727 0x812B # 脫 -- 247,047 +0xA728 0x6B32 # 欲 -- 247,050 +0xA729 0x594F # 奏 -- 247,051 +0xA72A 0x6ED1 # 滑 -- 247,052 +0xA72B 0x7246 # 牆 -- 247,053 +0xA72C 0x964D # 降 -- 247,054 +0xA72D 0x6E21 # 渡 -- 247,055 +0xA72E 0x50C5 # 僅 -- 247,056 +0xA72F 0x96F6 # 零 -- 247,057 +0xA730 0x6A21 # 模 -- 247,060 +0xA731 0x5F69 # 彩 -- 247,061 +0xA732 0x5509 # 唉 -- 247,062 +0xA733 0x5C64 # 層 -- 247,063 +0xA734 0x6E1B # 減 -- 247,064 +0xA735 0x5E3D # 帽 -- 247,065 +0xA736 0x795D # 祝 -- 247,066 +0xA737 0x7FFB # 翻 -- 247,067 +0xA738 0x5922 # 夢 -- 247,070 +0xA739 0x6101 # 愁 -- 247,071 +0xA73A 0x6D25 # 津 -- 247,072 +0xA73B 0x79FB # 移 -- 247,073 +0xA73C 0x5C3C # 尼 -- 247,074 +0xA73D 0x5C0A # 尊 -- 247,075 +0xA73E 0x5E7C # 幼 -- 247,076 +0xA73F 0x8A69 # 詩 -- 247,077 +0xA740 0x4ED4 # 仔 -- 247,100 +0xA741 0x5805 # 堅 -- 247,101 +0xA742 0x8AA0 # 誠 -- 247,102 +0xA743 0x80DE # 胞 -- 247,103 +0xA744 0x69AE # 榮 -- 247,104 +0xA745 0x6DFA # 淺 -- 247,105 +0xA746 0x70CF # 烏 -- 247,106 +0xA747 0x5DE7 # 巧 -- 247,107 +0xA748 0x5510 # 唐 -- 247,110 +0xA749 0x96F7 # 雷 -- 247,111 +0xA74A 0x7169 # 煩 -- 247,112 +0xA74B 0x7164 # 煤 -- 247,113 +0xA74C 0x5BF8 # 寸 -- 247,114 +0xA74D 0x6D89 # 涉 -- 247,115 +0xA74E 0x8F38 # 輸 -- 247,116 +0xA74F 0x8332 # 茲 -- 247,117 +0xA750 0x95B1 # 閱 -- 247,120 +0xA751 0x8836 # 蠶 -- 247,121 +0xA752 0x518A # 冊 -- 247,122 +0xA753 0x4E4F # 乏 -- 247,123 +0xA754 0x85DD # 藝 -- 247,124 +0xA755 0x559A # 喚 -- 247,125 +0xA756 0x90F5 # 郵 -- 247,126 +0xA757 0x7267 # 牧 -- 247,127 +0xA758 0x5DE8 # 巨 -- 247,130 +0xA759 0x614C # 慌 -- 247,131 +0xA75A 0x6843 # 桃 -- 247,132 +0xA75B 0x4F5B # 佛 -- 247,133 +0xA75C 0x596E # 奮 -- 247,134 +0xA75D 0x74F6 # 瓶 -- 247,135 +0xA75E 0x8FFD # 追 -- 247,136 +0xA75F 0x7D1B # 紛 -- 247,137 +0xA760 0x6C57 # 汗 -- 247,140 +0xA761 0x5192 # 冒 -- 247,141 +0xA762 0x59CA # 姊 -- 247,142 +0xA763 0x96EA # 雪 -- 247,143 +0xA764 0x585E # 塞 -- 247,144 +0xA765 0x57DF # 域 -- 247,145 +0xA766 0x6BEB # 毫 -- 247,146 +0xA767 0x6DB2 # 液 -- 247,147 +0xA768 0x667A # 智 -- 247,150 +0xA769 0x5446 # 呆 -- 247,151 +0xA76A 0x6E90 # 源 -- 247,152 +0xA76B 0x8CDE # 賞 -- 247,153 +0xA76C 0x67F4 # 柴 -- 247,154 +0xA76D 0x6C60 # 池 -- 247,155 +0xA76E 0x51C6 # 准 -- 247,156 +0xA76F 0x72D0 # 狐 -- 247,157 +0xA770 0x8377 # 荷 -- 247,160 +0xA771 0x8A2A # 訪 -- 247,161 +0xA772 0x63DA # 揚 -- 247,162 +0xA773 0x5049 # 偉 -- 247,163 +0xA774 0x81E3 # 臣 -- 247,164 +0xA775 0x66AB # 暫 -- 247,165 +0xA776 0x5E72 # 干 -- 247,166 +0xA777 0x64E1 # 擡 -- 247,167 +0xA778 0x632F # 振 -- 247,170 +0xA779 0x4F0A # 伊 -- 247,171 +0xA77A 0x8805 # 蠅 -- 247,172 +0xA77B 0x7387 # 率 -- 247,173 +0xA77C 0x62FE # 拾 -- 247,174 +0xA77D 0x7B56 # 策 -- 247,175 +0xA77E 0x8CA7 # 貧 -- 247,176 +0xA7A1 0x640D # 損 -- 247,241 +0xA7A2 0x5289 # 劉 -- 247,242 +0xA7A3 0x7897 # 碗 -- 247,243 +0xA7A4 0x5EF3 # 廳 -- 247,244 +0xA7A5 0x6DE1 # 淡 -- 247,245 +0xA7A6 0x74DC # 瓜 -- 247,246 +0xA7A7 0x63A2 # 探 -- 247,247 +0xA7A8 0x677E # 松 -- 247,250 +0xA7A9 0x907F # 避 -- 247,251 +0xA7AA 0x60DF # 惟 -- 247,252 +0xA7AB 0x7CFB # 系 -- 247,253 +0xA7AC 0x8C46 # 豆 -- 247,254 +0xA7AD 0x6234 # 戴 -- 247,255 +0xA7AE 0x871C # 蜜 -- 247,256 +0xA7AF 0x6B20 # 欠 -- 247,257 +0xA7B0 0x8B02 # 謂 -- 247,260 +0xA7B1 0x885D # 衝 -- 247,261 +0xA7B2 0x5FE0 # 忠 -- 247,262 +0xA7B3 0x8015 # 耕 -- 247,263 +0xA7B4 0x5154 # 兔 -- 247,264 +0xA7B5 0x4E8E # 于 -- 247,265 +0xA7B6 0x6696 # 暖 -- 247,266 +0xA7B7 0x7375 # 獵 -- 247,267 +0xA7B8 0x50D1 # 僑 -- 247,270 +0xA7B9 0x8216 # 舖 -- 247,271 +0xA7BA 0x6191 # 憑 -- 247,272 +0xA7BB 0x6148 # 慈 -- 247,273 +0xA7BC 0x707D # 災 -- 247,274 +0xA7BD 0x64AD # 播 -- 247,275 +0xA7BE 0x89BD # 覽 -- 247,276 +0xA7BF 0x9304 # 錄 -- 247,277 +0xA7C0 0x6CF0 # 泰 -- 247,300 +0xA7C1 0x925B # 鉛 -- 247,301 +0xA7C2 0x75BE # 疾 -- 247,302 +0xA7C3 0x73BB # 玻 -- 247,303 +0xA7C4 0x7A3B # 稻 -- 247,304 +0xA7C5 0x4FAE # 侮 -- 247,305 +0xA7C6 0x50B5 # 債 -- 247,306 +0xA7C7 0x5237 # 刷 -- 247,307 +0xA7C8 0x8352 # 荒 -- 247,310 +0xA7C9 0x8108 # 脈 -- 247,311 +0xA7CA 0x8AA4 # 誤 -- 247,312 +0xA7CB 0x5141 # 允 -- 247,313 +0xA7CC 0x5954 # 奔 -- 247,314 +0xA7CD 0x809A # 肚 -- 247,315 +0xA7CE 0x7E69 # 繩 -- 247,316 +0xA7CF 0x90CE # 郎 -- 247,317 +0xA7D0 0x61F7 # 懷 -- 247,320 +0xA7D1 0x8667 # 虧 -- 247,321 +0xA7D2 0x5272 # 割 -- 247,322 +0xA7D3 0x9589 # 閉 -- 247,323 +0xA7D4 0x9010 # 逐 -- 247,324 +0xA7D5 0x984D # 額 -- 247,325 +0xA7D6 0x9920 # 餠 -- 247,326 +0xA7D7 0x7210 # 爐 -- 247,327 +0xA7D8 0x64FA # 擺 -- 247,330 +0xA7D9 0x868A # 蚊 -- 247,331 +0xA7DA 0x8A73 # 詳 -- 247,332 +0xA7DB 0x9072 # 遲 -- 247,333 +0xA7DC 0x865B # 虛 -- 247,334 +0xA7DD 0x606D # 恭 -- 247,335 +0xA7DE 0x9F3B # 鼻 -- 247,336 +0xA7DF 0x9D09 # 鴉 -- 247,337 +0xA7E0 0x61B2 # 憲 -- 247,340 +0xA7E1 0x7A81 # 突 -- 247,341 +0xA7E2 0x79C0 # 秀 -- 247,342 +0xA7E3 0x5806 # 堆 -- 247,343 +0xA7E4 0x9913 # 餓 -- 247,344 +0xA7E5 0x64E6 # 擦 -- 247,345 +0xA7E6 0x4ECB # 介 -- 247,346 +0xA7E7 0x4F54 # 佔 -- 247,347 +0xA7E8 0x4E95 # 井 -- 247,350 +0xA7E9 0x6247 # 扇 -- 247,351 +0xA7EA 0x8A55 # 評 -- 247,352 +0xA7EB 0x8CCA # 賊 -- 247,353 +0xA7EC 0x6108 # 愈 -- 247,354 +0xA7ED 0x4EAB # 享 -- 247,355 +0xA7EE 0x7763 # 督 -- 247,356 +0xA7EF 0x78E8 # 磨 -- 247,357 +0xA7F0 0x798D # 禍 -- 247,360 +0xA7F1 0x7372 # 獲 -- 247,361 +0xA7F2 0x72AF # 犯 -- 247,362 +0xA7F3 0x5BA6 # 宦 -- 247,363 +0xA7F4 0x5957 # 套 -- 247,364 +0xA7F5 0x85A9 # 薩 -- 247,365 +0xA7F6 0x7F3A # 缺 -- 247,366 +0xA7F7 0x80A1 # 股 -- 247,367 +0xA7F8 0x7D22 # 索 -- 247,370 +0xA7F9 0x5287 # 劇 -- 247,371 +0xA7FA 0x57F7 # 執 -- 247,372 +0xA7FB 0x6F01 # 漁 -- 247,373 +0xA7FC 0x67D3 # 染 -- 247,374 +0xA7FD 0x5360 # 占 -- 247,375 +0xA7FE 0x8C9D # 貝 -- 247,376 diff --git a/unicode/xerox/unihan/XCCS-250=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-250=UNIHAN.TXT new file mode 100644 index 00000000..f13fc182 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-250=UNIHAN.TXT @@ -0,0 +1,190 @@ + +# "250" UNIHAN + +0xA821 0x6478 # 摸 -- 250,041 +0xA822 0x63EE # 揮 -- 250,042 +0xA823 0x7AF6 # 競 -- 250,043 +0xA824 0x543E # 吾 -- 250,044 +0xA825 0x6DBC # 涼 -- 250,045 +0xA826 0x737B # 獻 -- 250,046 +0xA827 0x731B # 猛 -- 250,047 +0xA828 0x820D # 舍 -- 250,050 +0xA829 0x6355 # 捕 -- 250,051 +0xA82A 0x8EB1 # 躱 -- 250,052 +0xA82B 0x87FB # 蟻 -- 250,053 +0xA82C 0x76DC # 盜 -- 250,054 +0xA82D 0x7A40 # 穀 -- 250,055 +0xA82E 0x5361 # 卡 -- 250,056 +0xA830 0x71D5 # 燕 -- 250,060 +0xA831 0x5B9C # 宜 -- 250,061 +0xA832 0x5EF6 # 延 -- 250,062 +0xA833 0x4EF0 # 仰 -- 250,063 +0xA834 0x5F90 # 徐 -- 250,064 +0xA835 0x6350 # 捐 -- 250,065 +0xA836 0x778E # 瞎 -- 250,066 +0xA837 0x642C # 搬 -- 250,067 +0xA838 0x5687 # 嚇 -- 250,070 +0xA839 0x7B52 # 筒 -- 250,071 +0xA83A 0x6F6E # 潮 -- 250,072 +0xA83B 0x58A8 # 墨 -- 250,073 +0xA83C 0x8AD2 # 諒 -- 250,074 +0xA83D 0x6065 # 恥 -- 250,075 +0xA83E 0x7C4D # 籍 -- 250,076 +0xA83F 0x73CD # 珍 -- 250,077 +0xA840 0x68EE # 森 -- 250,100 +0xA841 0x5409 # 吉 -- 250,101 +0xA842 0x9D72 # 鵲 -- 250,102 +0xA843 0x8E0F # 踏 -- 250,103 +0xA844 0x5B64 # 孤 -- 250,104 +0xA845 0x7533 # 申 -- 250,105 +0xA846 0x62BD # 抽 -- 250,106 +0xA847 0x8B6F # 譯 -- 250,107 +0xA848 0x65A4 # 斤 -- 250,110 +0xA849 0x63F4 # 援 -- 250,111 +0xA84A 0x4E5E # 乞 -- 250,112 +0xA84B 0x89F8 # 觸 -- 250,113 +0xA84C 0x96C5 # 雅 -- 250,114 +0xA84D 0x7D17 # 紗 -- 250,115 +0xA84E 0x60B2 # 悲 -- 250,116 +0xA84F 0x4ED7 # 仗 -- 250,117 +0xA850 0x694A # 楊 -- 250,120 +0xA851 0x4F34 # 伴 -- 250,121 +0xA852 0x5178 # 典 -- 250,122 +0xA853 0x8085 # 肅 -- 250,123 +0xA854 0x65E8 # 旨 -- 250,124 +0xA855 0x86C7 # 蛇 -- 250,125 +0xA856 0x900F # 透 -- 250,126 +0xA857 0x7483 # 璃 -- 250,127 +0xA858 0x77E3 # 矣 -- 250,130 +0xA859 0x5B8B # 宋 -- 250,131 +0xA85A 0x4E01 # 丁 -- 250,132 +0xA85B 0x9EB5 # 麵 -- 250,133 +0xA85C 0x6436 # 搶 -- 250,134 +0xA85D 0x76C6 # 盆 -- 250,135 +0xA85E 0x96C0 # 雀 -- 250,136 +0xA85F 0x660C # 昌 -- 250,137 +0xA860 0x9326 # 錦 -- 250,140 +0xA861 0x54AC # 咬 -- 250,141 +0xA862 0x6DF7 # 混 -- 250,142 +0xA863 0x7334 # 猴 -- 250,143 +0xA864 0x4E91 # 云 -- 250,144 +0xA865 0x64B2 # 撲 -- 250,145 +0xA866 0x59FB # 姻 -- 250,146 +0xA867 0x7E41 # 繁 -- 250,147 +0xA868 0x5224 # 判 -- 250,150 +0xA869 0x7E31 # 縱 -- 250,151 +0xA86A 0x60A8 # 您 -- 250,152 +0xA86B 0x642D # 搭 -- 250,153 +0xA86C 0x9B3C # 鬼 -- 250,154 +0xA86D 0x79DF # 租 -- 250,155 +0xA86E 0x6170 # 慰 -- 250,156 +0xA86F 0x6A19 # 標 -- 250,157 +0xA870 0x5410 # 吐 -- 250,160 +0xA871 0x6298 # 折 -- 250,161 +0xA872 0x6182 # 憂 -- 250,162 +0xA873 0x78C1 # 磁 -- 250,163 +0xA874 0x5F92 # 徒 -- 250,164 +0xA875 0x609F # 悟 -- 250,165 +0xA876 0x6276 # 扶 -- 250,166 +0xA877 0x81A0 # 膠 -- 250,167 +0xA878 0x5708 # 圈 -- 250,170 +0xA879 0x79D8 # 秘 -- 250,171 +0xA87A 0x963B # 阻 -- 250,172 +0xA87B 0x60A3 # 患 -- 250,173 +0xA87C 0x8CBC # 貼 -- 250,174 +0xA87D 0x62EC # 括 -- 250,175 +0xA87E 0x6F51 # 潑 -- 250,176 +0xA8A1 0x7434 # 琴 -- 250,241 +0xA8A2 0x7A0D # 稍 -- 250,242 +0xA8A3 0x58EF # 壯 -- 250,243 +0xA8A4 0x8036 # 耶 -- 250,244 +0xA8A5 0x7FC1 # 翁 -- 250,245 +0xA8A6 0x687F # 桿 -- 250,246 +0xA8A7 0x60B6 # 悶 -- 250,247 +0xA8A8 0x8D81 # 趁 -- 250,250 +0xA8A9 0x62D6 # 拖 -- 250,251 +0xA8AA 0x61C2 # 懂 -- 250,252 +0xA8AB 0x8DCC # 跌 -- 250,253 +0xA8AC 0x9D28 # 鴨 -- 250,254 +0xA8AD 0x50F1 # 僱 -- 250,255 +0xA8AE 0x8F29 # 輩 -- 250,256 +0xA8AF 0x7C60 # 籠 -- 250,257 +0xA8B0 0x7E5E # 繞 -- 250,260 +0xA8B1 0x88C1 # 裁 -- 250,261 +0xA8B2 0x59A5 # 妥 -- 250,262 +0xA8B3 0x5857 # 塗 -- 250,263 +0xA8B4 0x6127 # 愧 -- 250,264 +0xA8B5 0x84BC # 蒼 -- 250,265 +0xA8B6 0x9A0E # 騎 -- 250,266 +0xA8B7 0x8CC0 # 賀 -- 250,267 +0xA8B8 0x8247 # 艇 -- 250,270 +0xA8B9 0x9A19 # 騙 -- 250,271 +0xA8BA 0x91D8 # 釘 -- 250,272 +0xA8BB 0x6905 # 椅 -- 250,273 +0xA8BC 0x5475 # 呵 -- 250,274 +0xA8BD 0x64C7 # 擇 -- 250,275 +0xA8BE 0x6DFB # 添 -- 250,276 +0xA8BF 0x6070 # 恰 -- 250,277 +0xA8C0 0x504F # 偏 -- 250,300 +0xA8C1 0x66C6 # 曆 -- 250,301 +0xA8C2 0x6FD5 # 濕 -- 250,302 +0xA8C3 0x7DB2 # 網 -- 250,303 +0xA8C4 0x6C6A # 汪 -- 250,304 +0xA8C5 0x59A8 # 妨 -- 250,305 +0xA8C6 0x6D2A # 洪 -- 250,306 +0xA8C7 0x72FC # 狼 -- 250,307 +0xA8C8 0x7C97 # 粗 -- 250,310 +0xA8C9 0x5021 # 倡 -- 250,311 +0xA8CA 0x99D0 # 駐 -- 250,312 +0xA8CB 0x7621 # 瘡 -- 250,313 +0xA8CC 0x66F0 # 曰 -- 250,314 +0xA8CD 0x67CF # 柏 -- 250,315 +0xA8CE 0x51FD # 函 -- 250,316 +0xA8CF 0x63E1 # 握 -- 250,317 +0xA8D0 0x6158 # 慘 -- 250,320 +0xA8D1 0x5EF7 # 廷 -- 250,321 +0xA8D2 0x6842 # 桂 -- 250,322 +0xA8D3 0x4EC7 # 仇 -- 250,323 +0xA8D4 0x4E1F # 丟 -- 250,324 +0xA8D5 0x6BBC # 殼 -- 250,325 +0xA8D6 0x9178 # 酸 -- 250,326 +0xA8D7 0x805A # 聚 -- 250,327 +0xA8D8 0x5C62 # 屢 -- 250,330 +0xA8D9 0x9F52 # 齒 -- 250,331 +0xA8DA 0x6691 # 暑 -- 250,332 +0xA8DB 0x5C16 # 尖 -- 250,333 +0xA8DC 0x6279 # 批 -- 250,334 +0xA8DD 0x5617 # 嘗 -- 250,335 +0xA8DE 0x500D # 倍 -- 250,336 +0xA8DF 0x82D7 # 苗 -- 250,337 +0xA8E0 0x5606 # 嘆 -- 250,340 +0xA8E1 0x968E # 階 -- 250,341 +0xA8E2 0x6212 # 戒 -- 250,342 +0xA8E3 0x81BD # 膽 -- 250,343 +0xA8E4 0x731C # 猜 -- 250,344 +0xA8E5 0x5984 # 妄 -- 250,345 +0xA8E6 0x724C # 牌 -- 250,346 +0xA8E7 0x7832 # 砲 -- 250,347 +0xA8E8 0x8D99 # 趙 -- 250,350 +0xA8E9 0x62C6 # 拆 -- 250,351 +0xA8EA 0x8205 # 舅 -- 250,352 +0xA8EB 0x7BB1 # 箱 -- 250,353 +0xA8EC 0x9E7F # 鹿 -- 250,354 +0xA8ED 0x8FB1 # 辱 -- 250,355 +0xA8EE 0x755C # 畜 -- 250,356 +0xA8EF 0x8776 # 蝶 -- 250,357 +0xA8F0 0x6258 # 托 -- 250,360 +0xA8F1 0x5269 # 剩 -- 250,361 +0xA8F2 0x5375 # 卵 -- 250,362 +0xA8F3 0x8170 # 腰 -- 250,363 +0xA8F4 0x52FF # 勿 -- 250,364 +0xA8F5 0x91CB # 釋 -- 250,365 +0xA8F6 0x53EC # 召 -- 250,366 +0xA8F7 0x6CC9 # 泉 -- 250,367 +0xA8F8 0x6069 # 恩 -- 250,370 +0xA8F9 0x4F10 # 伐 -- 250,371 +0xA8FA 0x5B5D # 孝 -- 250,372 +0xA8FB 0x6F5B # 潛 -- 250,373 +0xA8FC 0x6F0F # 漏 -- 250,374 +0xA8FD 0x5BEE # 寮 -- 250,375 +0xA8FE 0x6280 # 技 -- 250,376 diff --git a/unicode/xerox/unihan/XCCS-251=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-251=UNIHAN.TXT new file mode 100644 index 00000000..595e5739 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-251=UNIHAN.TXT @@ -0,0 +1,190 @@ + +# "251" UNIHAN + +0xA921 0x74E6 # 瓦 -- 251,041 +0xA922 0x5BEC # 寬 -- 251,042 +0xA923 0x63D2 # 插 -- 251,043 +0xA924 0x9811 # 頑 -- 251,044 +0xA925 0x5A36 # 娶 -- 251,045 +0xA926 0x69CB # 構 -- 251,046 +0xA927 0x5EC9 # 廉 -- 251,047 +0xA928 0x906D # 遭 -- 251,050 +0xA929 0x68A7 # 梧 -- 251,051 +0xA92A 0x5BE9 # 審 -- 251,052 +0xA92B 0x786C # 硬 -- 251,053 +0xA92C 0x528D # 劍 -- 251,054 +0xA92D 0x64A5 # 撥 -- 251,055 +0xA92E 0x6293 # 抓 -- 251,056 +0xA92F 0x8C8C # 貌 -- 251,057 +0xA930 0x8CE2 # 賢 -- 251,060 +0xA931 0x8D64 # 赤 -- 251,061 +0xA932 0x721B # 爛 -- 251,062 +0xA933 0x879E # 螞 -- 251,063 +0xA934 0x8FF7 # 迷 -- 251,064 +0xA935 0x99D5 # 駕 -- 251,065 +0xA936 0x817F # 腿 -- 251,066 +0xA937 0x8DE1 # 跡 -- 251,067 +0xA938 0x6736 # 朶 -- 251,070 +0xA939 0x4FF1 # 俱 -- 251,071 +0xA93A 0x92B7 # 銷 -- 251,072 +0xA93B 0x98FD # 飽 -- 251,073 +0xA93C 0x5BBF # 宿 -- 251,074 +0xA93D 0x8523 # 蔣 -- 251,075 +0xA93E 0x52C9 # 勉 -- 251,076 +0xA93F 0x8010 # 耐 -- 251,077 +0xA940 0x9677 # 陷 -- 251,100 +0xA941 0x8569 # 蕩 -- 251,101 +0xA942 0x4F69 # 佩 -- 251,102 +0xA943 0x78B0 # 碰 -- 251,103 +0xA944 0x65CB # 旋 -- 251,104 +0xA945 0x68C4 # 棄 -- 251,105 +0xA946 0x84C4 # 蓄 -- 251,106 +0xA947 0x9ED8 # 默 -- 251,107 +0xA948 0x9CF4 # 鳴 -- 251,110 +0xA949 0x7DBF # 綿 -- 251,111 +0xA94A 0x6D59 # 浙 -- 251,112 +0xA94B 0x55AA # 喪 -- 251,113 +0xA94C 0x8A17 # 託 -- 251,114 +0xA94D 0x8907 # 複 -- 251,115 +0xA94E 0x9214 # 鈔 -- 251,116 +0xA94F 0x7272 # 牲 -- 251,117 +0xA950 0x8CAB # 貫 -- 251,120 +0xA951 0x9B06 # 鬆 -- 251,121 +0xA952 0x95D6 # 闖 -- 251,122 +0xA953 0x81E5 # 臥 -- 251,123 +0xA954 0x7E2E # 縮 -- 251,124 +0xA955 0x6155 # 慕 -- 251,125 +0xA956 0x7345 # 獅 -- 251,126 +0xA957 0x77EE # 矮 -- 251,127 +0xA958 0x5308 # 匈 -- 251,130 +0xA959 0x50D5 # 僕 -- 251,131 +0xA95A 0x9583 # 閃 -- 251,132 +0xA95B 0x7D39 # 紹 -- 251,133 +0xA95C 0x70AD # 炭 -- 251,134 +0xA95D 0x552E # 售 -- 251,135 +0xA95E 0x878D # 融 -- 251,136 +0xA95F 0x52D2 # 勒 -- 251,137 +0xA960 0x8D85 # 超 -- 251,140 +0xA961 0x72C2 # 狂 -- 251,141 +0xA962 0x6EFE # 滾 -- 251,142 +0xA963 0x64A4 # 撤 -- 251,143 +0xA964 0x6597 # 斗 -- 251,144 +0xA965 0x5448 # 呈 -- 251,145 +0xA966 0x4E88 # 予 -- 251,146 +0xA967 0x52F5 # 勵 -- 251,147 +0xA968 0x788E # 碎 -- 251,150 +0xA969 0x8B39 # 謹 -- 251,151 +0xA96A 0x716E # 煮 -- 251,152 +0xA96B 0x60E0 # 惠 -- 251,153 +0xA96C 0x57E0 # 埠 -- 251,154 +0xA96D 0x8F1B # 輛 -- 251,155 +0xA96E 0x9077 # 遷 -- 251,156 +0xA96F 0x5320 # 匠 -- 251,157 +0xA970 0x5132 # 儲 -- 251,160 +0xA971 0x9DF9 # 鷹 -- 251,161 +0xA972 0x8461 # 葡 -- 251,162 +0xA973 0x62D4 # 拔 -- 251,163 +0xA974 0x7C3D # 簽 -- 251,164 +0xA975 0x7DD6 # 緖 -- 251,165 +0xA976 0x8F49 # 轉 -- 251,166 +0xA977 0x5E33 # 帳 -- 251,167 +0xA978 0x8D08 # 贈 -- 251,170 +0xA979 0x6731 # 朱 -- 251,171 +0xA97A 0x8B6C # 譬 -- 251,172 +0xA97B 0x58FD # 壽 -- 251,173 +0xA97C 0x64F4 # 擴 -- 251,174 +0xA97D 0x5948 # 奈 -- 251,175 +0xA97E 0x5147 # 兇 -- 251,176 +0xA9A1 0x9D5D # 鵝 -- 251,241 +0xA9A2 0x95A3 # 閣 -- 251,242 +0xA9A3 0x53AD # 厭 -- 251,243 +0xA9A4 0x7F70 # 罰 -- 251,244 +0xA9A5 0x7378 # 獸 -- 251,245 +0xA9A6 0x71C3 # 燃 -- 251,246 +0xA9A7 0x5AC1 # 嫁 -- 251,247 +0xA9A8 0x8CAA # 貪 -- 251,250 +0xA9A9 0x9592 # 閒 -- 251,251 +0xA9AA 0x9015 # 逕 -- 251,252 +0xA9AB 0x98C4 # 飄 -- 251,253 +0xA9AC 0x67F3 # 柳 -- 251,254 +0xA9AD 0x718A # 熊 -- 251,255 +0xA9AE 0x660F # 昏 -- 251,256 +0xA9AF 0x9707 # 震 -- 251,257 +0xA9B0 0x5F91 # 徑 -- 251,260 +0xA9B1 0x9119 # 鄙 -- 251,261 +0xA9B2 0x615A # 慚 -- 251,262 +0xA9B3 0x4FC3 # 促 -- 251,263 +0xA9B4 0x7720 # 眠 -- 251,264 +0xA9B6 0x819A # 膚 -- 251,266 +0xA9B7 0x81C2 # 臂 -- 251,267 +0xA9B8 0x65F1 # 旱 -- 251,270 +0xA9B9 0x621A # 戚 -- 251,271 +0xA9BA 0x66EC # 曬 -- 251,272 +0xA9BB 0x906E # 遮 -- 251,273 +0xA9BC 0x85AA # 薪 -- 251,274 +0xA9BD 0x4E73 # 乳 -- 251,275 +0xA9BE 0x98FE # 飾 -- 251,276 +0xA9BF 0x67D4 # 柔 -- 251,277 +0xA9C0 0x593E # 夾 -- 251,300 +0xA9C1 0x6649 # 晉 -- 251,301 +0xA9C2 0x88F3 # 裳 -- 251,302 +0xA9C3 0x7AA9 # 窩 -- 251,303 +0xA9C4 0x9686 # 隆 -- 251,304 +0xA9C5 0x5F79 # 役 -- 251,305 +0xA9C6 0x9817 # 頗 -- 251,306 +0xA9C7 0x6E6F # 湯 -- 251,307 +0xA9C8 0x8CA2 # 貢 -- 251,310 +0xA9C9 0x8B7D # 譽 -- 251,311 +0xA9CA 0x50DE # 僞 -- 251,312 +0xA9CB 0x7C4C # 籌 -- 251,313 +0xA9CC 0x7D14 # 純 -- 251,314 +0xA9CD 0x7C92 # 粒 -- 251,315 +0xA9CE 0x6D6E # 浮 -- 251,316 +0xA9CF 0x8FEA # 迪 -- 251,317 +0xA9D0 0x5EDF # 廟 -- 251,320 +0xA9D1 0x6838 # 核 -- 251,321 +0xA9D2 0x96B8 # 隸 -- 251,322 +0xA9D3 0x616E # 慮 -- 251,323 +0xA9D4 0x83CC # 菌 -- 251,324 +0xA9D5 0x62FC # 拼 -- 251,325 +0xA9D6 0x5DFE # 巾 -- 251,326 +0xA9D7 0x8EAC # 躬 -- 251,327 +0xA9D8 0x611A # 愚 -- 251,330 +0xA9D9 0x7DE9 # 緩 -- 251,331 +0xA9DA 0x5377 # 卷 -- 251,332 +0xA9DB 0x7D2F # 累 -- 251,333 +0xA9DC 0x7C3F # 簿 -- 251,334 +0xA9DD 0x654D # 敍 -- 251,335 +0xA9DE 0x95E2 # 闢 -- 251,336 +0xA9DF 0x8E7A # 蹺 -- 251,337 +0xA9E0 0x4F01 # 企 -- 251,340 +0xA9E1 0x5C48 # 屈 -- 251,341 +0xA9E2 0x727D # 牽 -- 251,342 +0xA9E3 0x5AB3 # 媳 -- 251,343 +0xA9E4 0x7FBD # 羽 -- 251,344 +0xA9E5 0x7DA2 # 綢 -- 251,345 +0xA9E6 0x8CDC # 賜 -- 251,346 +0xA9E7 0x845B # 葛 -- 251,347 +0xA9E8 0x6F06 # 漆 -- 251,350 +0xA9E9 0x517C # 兼 -- 251,351 +0xA9EA 0x57F9 # 培 -- 251,352 +0xA9EB 0x8CE0 # 賠 -- 251,353 +0xA9EC 0x9234 # 鈴 -- 251,354 +0xA9ED 0x5EDA # 廚 -- 251,355 +0xA9EE 0x947D # 鑽 -- 251,356 +0xA9EF 0x68F5 # 棵 -- 251,357 +0xA9F0 0x8FD4 # 返 -- 251,360 +0xA9F1 0x8C37 # 谷 -- 251,361 +0xA9F2 0x7336 # 猶 -- 251,362 +0xA9F3 0x7E61 # 繡 -- 251,363 +0xA9F4 0x53DB # 叛 -- 251,364 +0xA9F5 0x5435 # 吵 -- 251,365 +0xA9F6 0x5996 # 妖 -- 251,366 +0xA9F7 0x54B1 # 咱 -- 251,367 +0xA9F8 0x9022 # 逢 -- 251,370 +0xA9F9 0x8896 # 袖 -- 251,371 +0xA9FA 0x5F81 # 征 -- 251,372 +0xA9FB 0x683D # 栽 -- 251,373 +0xA9FC 0x5339 # 匹 -- 251,374 +0xA9FD 0x5DE1 # 巡 -- 251,375 +0xA9FE 0x52A3 # 劣 -- 251,376 diff --git a/unicode/xerox/unihan/XCCS-252=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-252=UNIHAN.TXT new file mode 100644 index 00000000..1c268762 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-252=UNIHAN.TXT @@ -0,0 +1,190 @@ + +# "252" UNIHAN + +0xAA21 0x62D2 # 拒 -- 252,041 +0xAA22 0x540F # 吏 -- 252,042 +0xAA23 0x7709 # 眉 -- 252,043 +0xAA24 0x7A69 # 穩 -- 252,044 +0xAA25 0x54C0 # 哀 -- 252,045 +0xAA26 0x5DBA # 嶺 -- 252,046 +0xAA27 0x8C9E # 貞 -- 252,047 +0xAA28 0x7262 # 牢 -- 252,050 +0xAA29 0x8774 # 蝴 -- 252,051 +0xAA2A 0x9080 # 邀 -- 252,052 +0xAA2B 0x6B96 # 殖 -- 252,053 +0xAA2C 0x6AA2 # 檢 -- 252,054 +0xAA2D 0x92FC # 鋼 -- 252,055 +0xAA2E 0x84B8 # 蒸 -- 252,056 +0xAA2F 0x6548 # 效 -- 252,057 +0xAA30 0x53EE # 叮 -- 252,060 +0xAA31 0x8179 # 腹 -- 252,061 +0xAA32 0x8CED # 賭 -- 252,062 +0xAA33 0x6094 # 悔 -- 252,063 +0xAA34 0x9A55 # 驕 -- 252,064 +0xAA35 0x6F20 # 漠 -- 252,065 +0xAA36 0x5DBC # 嶼 -- 252,066 +0xAA37 0x7F72 # 署 -- 252,067 +0xAA38 0x5E63 # 幣 -- 252,070 +0xAA39 0x9055 # 違 -- 252,071 +0xAA3A 0x903C # 逼 -- 252,072 +0xAA3B 0x6311 # 挑 -- 252,073 +0xAA3C 0x62F3 # 拳 -- 252,074 +0xAA3D 0x9B0D # 鬍 -- 252,075 +0xAA3E 0x613C # 愼 -- 252,076 +0xAA3F 0x6A13 # 樓 -- 252,077 +0xAA40 0x7E2B # 縫 -- 252,100 +0xAA41 0x6BC0 # 毀 -- 252,101 +0xAA42 0x7CCA # 糊 -- 252,102 +0xAA43 0x68CD # 棍 -- 252,103 +0xAA44 0x907C # 遼 -- 252,104 +0xAA45 0x6388 # 授 -- 252,105 +0xAA46 0x8150 # 腐 -- 252,106 +0xAA47 0x651C # 攜 -- 252,107 +0xAA48 0x5BC2 # 寂 -- 252,110 +0xAA49 0x51A0 # 冠 -- 252,111 +0xAA4A 0x7C43 # 籃 -- 252,112 +0xAA4B 0x6E2C # 測 -- 252,113 +0xAA4C 0x97D3 # 韓 -- 252,114 +0xAA4D 0x7586 # 疆 -- 252,115 +0xAA4E 0x72F8 # 狸 -- 252,116 +0xAA4F 0x80F8 # 胸 -- 252,117 +0xAA50 0x97A0 # 鞠 -- 252,120 +0xAA51 0x64FE # 擾 -- 252,121 +0xAA52 0x7626 # 瘦 -- 252,122 +0xAA53 0x9F9C # 龜 -- 252,123 +0xAA54 0x6084 # 悄 -- 252,124 +0xAA55 0x61F8 # 懸 -- 252,125 +0xAA56 0x9951 # 饑 -- 252,126 +0xAA57 0x6263 # 扣 -- 252,127 +0xAA58 0x9846 # 顆 -- 252,130 +0xAA59 0x6674 # 晴 -- 252,131 +0xAA5A 0x7CB5 # 粵 -- 252,132 +0xAA5B 0x6572 # 敲 -- 252,133 +0xAA5C 0x6C41 # 汁 -- 252,134 +0xAA5D 0x5118 # 儘 -- 252,135 +0xAA5E 0x520A # 刊 -- 252,136 +0xAA5F 0x55E3 # 嗣 -- 252,137 +0xAA60 0x9910 # 餐 -- 252,140 +0xAA61 0x91AC # 醬 -- 252,141 +0xAA62 0x7948 # 祈 -- 252,142 +0xAA63 0x800D # 耍 -- 252,143 +0xAA64 0x7CD5 # 糕 -- 252,144 +0xAA65 0x5006 # 倆 -- 252,145 +0xAA66 0x54C7 # 哇 -- 252,146 +0xAA67 0x7919 # 礙 -- 252,147 +0xAA68 0x5740 # 址 -- 252,150 +0xAA69 0x6458 # 摘 -- 252,151 +0xAA6A 0x704C # 灌 -- 252,152 +0xAA6B 0x751C # 甜 -- 252,153 +0xAA6C 0x72E1 # 狡 -- 252,154 +0xAA6D 0x8F4E # 轎 -- 252,155 +0xAA6E 0x5782 # 垂 -- 252,156 +0xAA6F 0x56D1 # 囑 -- 252,157 +0xAA70 0x6B8A # 殊 -- 252,160 +0xAA71 0x8870 # 衰 -- 252,161 +0xAA72 0x9A45 # 驅 -- 252,162 +0xAA73 0x8000 # 耀 -- 252,163 +0xAA74 0x7DDE # 緞 -- 252,164 +0xAA75 0x6C61 # 污 -- 252,165 +0xAA76 0x68AF # 梯 -- 252,166 +0xAA77 0x99DD # 駝 -- 252,167 +0xAA78 0x64C1 # 擁 -- 252,170 +0xAA79 0x4E19 # 丙 -- 252,171 +0xAA7A 0x5AC2 # 嫂 -- 252,172 +0xAA7B 0x64E0 # 擠 -- 252,173 +0xAA7C 0x57CB # 埋 -- 252,174 +0xAA7D 0x820C # 舌 -- 252,175 +0xAA7E 0x532F # 匯 -- 252,176 +0xAAA1 0x7B26 # 符 -- 252,241 +0xAAA2 0x5002 # 倂 -- 252,242 +0xAAA3 0x88C2 # 裂 -- 252,243 +0xAAA4 0x8CF4 # 賴 -- 252,244 +0xAAA5 0x6B47 # 歇 -- 252,245 +0xAAA6 0x61F6 # 懶 -- 252,246 +0xAAA7 0x5490 # 咐 -- 252,247 +0xAAA8 0x511F # 償 -- 252,250 +0xAAA9 0x76DF # 盟 -- 252,251 +0xAAAA 0x7A3F # 稿 -- 252,252 +0xAAAB 0x61B6 # 憶 -- 252,253 +0xAAAC 0x58BE # 墾 -- 252,254 +0xAAAD 0x8F5F # 轟 -- 252,255 +0xAAAE 0x980C # 頌 -- 252,256 +0xAAAF 0x525D # 剝 -- 252,257 +0xAAB0 0x563B # 嘻 -- 252,260 +0xAAB1 0x5076 # 偶 -- 252,261 +0xAAB2 0x6368 # 捨 -- 252,262 +0xAAB3 0x6881 # 梁 -- 252,263 +0xAAB4 0x71ED # 燭 -- 252,264 +0xAAB5 0x9F61 # 齡 -- 252,265 +0xAAB6 0x969C # 障 -- 252,266 +0xAAB7 0x5D07 # 崇 -- 252,267 +0xAAB8 0x78BC # 碼 -- 252,270 +0xAAB9 0x8F1D # 輝 -- 252,271 +0xAABA 0x70B8 # 炸 -- 252,272 +0xAABB 0x72A7 # 犧 -- 252,273 +0xAABC 0x60D1 # 惑 -- 252,274 +0xAABD 0x7FA8 # 羨 -- 252,275 +0xAABE 0x649E # 撞 -- 252,276 +0xAABF 0x934A # 鍊 -- 252,277 +0xAAC0 0x58FA # 壺 -- 252,300 +0xAAC1 0x4F59 # 余 -- 252,301 +0xAAC2 0x8FAF # 辯 -- 252,302 +0xAAC3 0x6ECB # 滋 -- 252,303 +0xAAC4 0x78C5 # 磅 -- 252,304 +0xAAC5 0x916C # 酬 -- 252,305 +0xAAC6 0x9A30 # 騰 -- 252,306 +0xAAC7 0x7A00 # 稀 -- 252,307 +0xAAC8 0x9676 # 陶 -- 252,310 +0xAAC9 0x8404 # 萄 -- 252,311 +0xAACA 0x8CC8 # 賈 -- 252,312 +0xAACB 0x9075 # 遵 -- 252,313 +0xAACC 0x5951 # 契 -- 252,314 +0xAACD 0x8D74 # 赴 -- 252,315 +0xAACE 0x638F # 掏 -- 252,316 +0xAACF 0x60F1 # 惱 -- 252,317 +0xAAD0 0x86D9 # 蛙 -- 252,320 +0xAAD1 0x8266 # 艦 -- 252,321 +0xAAD2 0x8212 # 舒 -- 252,322 +0xAAD3 0x541E # 吞 -- 252,323 +0xAAD4 0x64EC # 擬 -- 252,324 +0xAAD5 0x80A9 # 肩 -- 252,325 +0xAAD6 0x67F1 # 柱 -- 252,326 +0xAAD7 0x6200 # 戀 -- 252,327 +0xAAD8 0x6EF4 # 滴 -- 252,330 +0xAAD9 0x5893 # 墓 -- 252,331 +0xAADA 0x5429 # 吩 -- 252,332 +0xAADB 0x775C # 睜 -- 252,333 +0xAADC 0x5F0A # 弊 -- 252,334 +0xAADD 0x62CB # 拋 -- 252,335 +0xAADE 0x62D8 # 拘 -- 252,336 +0xAADF 0x4F50 # 佐 -- 252,337 +0xAAE0 0x722A # 爪 -- 252,340 +0xAAE1 0x9189 # 醉 -- 252,341 +0xAAE2 0x4F0F # 伏 -- 252,342 +0xAAE3 0x95CA # 闊 -- 252,343 +0xAAE4 0x81D8 # 臘 -- 252,344 +0xAAE5 0x82BD # 芽 -- 252,345 +0xAAE6 0x808C # 肌 -- 252,346 +0xAAE7 0x5582 # 喂 -- 252,347 +0xAAE8 0x7AED # 竭 -- 252,350 +0xAAE9 0x8CD3 # 賓 -- 252,351 +0xAAEA 0x6028 # 怨 -- 252,352 +0xAAEB 0x5EAB # 庫 -- 252,353 +0xAAEC 0x64AB # 撫 -- 252,354 +0xAAED 0x7206 # 爆 -- 252,355 +0xAAEE 0x966A # 陪 -- 252,356 +0xAAEF 0x52AB # 劫 -- 252,357 +0xAAF0 0x5854 # 塔 -- 252,360 +0xAAF2 0x4F8D # 侍 -- 252,362 +0xAAF3 0x6FC3 # 濃 -- 252,363 +0xAAF4 0x659C # 斜 -- 252,364 +0xAAF5 0x5875 # 塵 -- 252,365 +0xAAF6 0x5F13 # 弓 -- 252,366 +0xAAF7 0x59E8 # 姨 -- 252,367 +0xAAF8 0x7E8F # 纏 -- 252,370 +0xAAF9 0x68E7 # 棧 -- 252,371 +0xAAFA 0x7109 # 焉 -- 252,372 +0xAAFB 0x7A74 # 穴 -- 252,373 +0xAAFC 0x5F7F # 彿 -- 252,374 +0xAAFD 0x79E9 # 秩 -- 252,375 +0xAAFE 0x6B3D # 欽 -- 252,376 diff --git a/unicode/xerox/unihan/XCCS-253=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-253=UNIHAN.TXT new file mode 100644 index 00000000..b31b8010 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-253=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "253" UNIHAN + +0xAB21 0x51CD # 凍 -- 253,041 +0xAB22 0x5C4D # 屍 -- 253,042 +0xAB23 0x84B2 # 蒲 -- 253,043 +0xAB24 0x6469 # 摩 -- 253,044 +0xAB25 0x96B1 # 隱 -- 253,045 +0xAB26 0x9BAE # 鮮 -- 253,046 +0xAB27 0x9452 # 鑒 -- 253,047 +0xAB28 0x9B4F # 魏 -- 253,050 +0xAB29 0x827E # 艾 -- 253,051 +0xAB2A 0x68B3 # 梳 -- 253,052 +0xAB2B 0x9A62 # 驢 -- 253,053 +0xAB2C 0x5B85 # 宅 -- 253,054 +0xAB2D 0x723D # 爽 -- 253,055 +0xAB2E 0x5925 # 夥 -- 253,056 +0xAB2F 0x8A8C # 誌 -- 253,057 +0xAB30 0x8271 # 艱 -- 253,060 +0xAB31 0x99B3 # 馳 -- 253,061 +0xAB32 0x8CFA # 賺 -- 253,062 +0xAB33 0x50B2 # 傲 -- 253,063 +0xAB34 0x7CBD # 粽 -- 253,064 +0xAB35 0x8DDD # 距 -- 253,065 +0xAB36 0x7E6B # 繫 -- 253,066 +0xAB37 0x7344 # 獄 -- 253,067 +0xAB38 0x8FB0 # 辰 -- 253,070 +0xAB39 0x8F14 # 輔 -- 253,071 +0xAB3A 0x682A # 株 -- 253,072 +0xAB3B 0x5B5F # 孟 -- 253,073 +0xAB3C 0x6D1B # 洛 -- 253,074 +0xAB3D 0x7051 # 灑 -- 253,075 +0xAB3E 0x51A4 # 冤 -- 253,076 +0xAB3F 0x5609 # 嘉 -- 253,077 +0xAB40 0x5EFF # 廿 -- 253,100 +0xAB41 0x6602 # 昂 -- 253,101 +0xAB42 0x6BBF # 殿 -- 253,102 +0xAB43 0x72AC # 犬 -- 253,103 +0xAB44 0x617E # 慾 -- 253,104 +0xAB45 0x8CA9 # 販 -- 253,105 +0xAB46 0x578B # 型 -- 253,106 +0xAB47 0x6398 # 掘 -- 253,107 +0xAB48 0x8C4E # 豎 -- 253,110 +0xAB49 0x6316 # 挖 -- 253,111 +0xAB4A 0x99F1 # 駱 -- 253,112 +0xAB4B 0x82B3 # 芳 -- 253,113 +0xAB4C 0x905E # 遞 -- 253,114 +0xAB4D 0x66A2 # 暢 -- 253,115 +0xAB4E 0x557C # 啼 -- 253,116 +0xAB4F 0x888D # 袍 -- 253,117 +0xAB50 0x4E10 # 丐 -- 253,120 +0xAB51 0x8CFC # 購 -- 253,121 +0xAB52 0x60F0 # 惰 -- 253,122 +0xAB53 0x5B8F # 宏 -- 253,123 +0xAB54 0x8650 # 虐 -- 253,124 +0xAB55 0x582A # 堪 -- 253,125 +0xAB56 0x932B # 錫 -- 253,126 +0xAB57 0x83CA # 菊 -- 253,127 +0xAB58 0x679A # 枚 -- 253,130 +0xAB59 0x81ED # 臭 -- 253,131 +0xAB5A 0x6DCB # 淋 -- 253,132 +0xAB5B 0x8E22 # 踢 -- 253,133 +0xAB5C 0x7AFD # 竽 -- 253,134 +0xAB5D 0x539A # 厚 -- 253,135 +0xAB5E 0x8517 # 蔗 -- 253,136 +0xAB5F 0x7FFC # 翼 -- 253,137 +0xAB60 0x5CFD # 峽 -- 253,140 +0xAB61 0x760B # 瘋 -- 253,141 +0xAB62 0x79E6 # 秦 -- 253,142 +0xAB63 0x87F9 # 蟹 -- 253,143 +0xAB64 0x95A5 # 閥 -- 253,144 +0xAB65 0x662D # 昭 -- 253,145 +0xAB66 0x540A # 吊 -- 253,146 +0xAB67 0x9952 # 饒 -- 253,147 +0xAB68 0x5431 # 吱 -- 253,150 +0xAB69 0x8017 # 耗 -- 253,151 +0xAB6A 0x8A62 # 詢 -- 253,152 +0xAB6B 0x6AC3 # 櫃 -- 253,153 +0xAB6C 0x7D8F # 綏 -- 253,154 +0xAB6D 0x56B7 # 嚷 -- 253,155 +0xAB6E 0x61C7 # 懇 -- 253,156 +0xAB6F 0x64F2 # 擲 -- 253,157 +0xAB70 0x8859 # 衙 -- 253,160 +0xAB71 0x54B3 # 咳 -- 253,161 +0xAB72 0x5766 # 坦 -- 253,162 +0xAB73 0x9675 # 陵 -- 253,163 +0xAB74 0x75F0 # 痰 -- 253,164 +0xAB75 0x68D7 # 棗 -- 253,165 +0xAB76 0x5C46 # 屆 -- 253,166 +0xAB77 0x8A93 # 誓 -- 253,167 +0xAB78 0x8766 # 蝦 -- 253,170 +0xAB79 0x7D10 # 紐 -- 253,171 +0xAB7A 0x745E # 瑞 -- 253,172 +0xAB7B 0x6566 # 敦 -- 253,173 +0xAB7C 0x6FB3 # 澳 -- 253,174 +0xAB7D 0x5351 # 卑 -- 253,175 +0xAB7E 0x75BC # 疼 -- 253,176 +0xABA1 0x664F # 晏 -- 253,241 +0xABA2 0x75C7 # 症 -- 253,242 +0xABA3 0x6E9D # 溝 -- 253,243 +0xABA4 0x60F9 # 惹 -- 253,244 +0xABA5 0x755D # 畝 -- 253,245 +0xABA6 0x6168 # 慨 -- 253,246 +0xABA7 0x53A6 # 厦 -- 253,247 +0xABA8 0x8DA8 # 趨 -- 253,250 +0xABA9 0x5F77 # 彷 -- 253,251 +0xABAA 0x4E11 # 丑 -- 253,252 +0xABAB 0x80BA # 肺 -- 253,253 +0xABAC 0x7126 # 焦 -- 253,254 +0xABAD 0x8DEA # 跪 -- 253,255 +0xABAE 0x7E1B # 縛 -- 253,256 +0xABAF 0x6020 # 怠 -- 253,257 +0xABB0 0x9ECE # 黎 -- 253,260 +0xABB1 0x5761 # 坡 -- 253,261 +0xABB2 0x6F02 # 漂 -- 253,262 +0xABB3 0x5A62 # 婢 -- 253,263 +0xABB4 0x6C27 # 氧 -- 253,264 +0xABB5 0x6089 # 悉 -- 253,265 +0xABB6 0x62BC # 押 -- 253,266 +0xABB7 0x7965 # 祥 -- 253,267 +0xABB8 0x77AD # 瞭 -- 253,270 +0xABB9 0x586B # 填 -- 253,271 +0xABBA 0x76FC # 盼 -- 253,272 +0xABBB 0x7830 # 砰 -- 253,273 +0xABBC 0x9756 # 靖 -- 253,274 +0xABBD 0x53E8 # 叨 -- 253,275 +0xABBE 0x88D5 # 裕 -- 253,276 +0xABBF 0x5ACC # 嫌 -- 253,277 +0xABC0 0x633D # 挽 -- 253,300 +0xABC1 0x8F2F # 輯 -- 253,301 +0xABC2 0x8B20 # 謠 -- 253,302 +0xABC3 0x6F32 # 漲 -- 253,303 +0xABC4 0x8B0A # 謊 -- 253,304 +0xABC5 0x8CEC # 賬 -- 253,305 +0xABC6 0x6FF1 # 濱 -- 253,306 +0xABC7 0x9B42 # 魂 -- 253,307 +0xABC8 0x58D8 # 壘 -- 253,310 +0xABC9 0x5B0C # 嬌 -- 253,311 +0xABCA 0x821F # 舟 -- 253,312 +0xABCB 0x5F4E # 彎 -- 253,313 +0xABCC 0x9AD2 # 髒 -- 253,314 +0xABCD 0x5967 # 奧 -- 253,315 +0xABCE 0x5BE8 # 寨 -- 253,316 +0xABCF 0x5100 # 儀 -- 253,317 +0xABD0 0x5238 # 券 -- 253,320 +0xABD1 0x81DF # 臟 -- 253,321 +0xABD2 0x84EC # 蓬 -- 253,322 +0xABD3 0x886B # 衫 -- 253,323 +0xABD4 0x6367 # 捧 -- 253,324 +0xABD5 0x6687 # 暇 -- 253,325 +0xABD6 0x540B # 吋 -- 253,326 +0xABD7 0x58E4 # 壤 -- 253,327 +0xABD8 0x51F6 # 凶 -- 253,330 +0xABD9 0x5580 # 喀 -- 253,331 +0xABDA 0x80CE # 胎 -- 253,332 +0xABDB 0x9838 # 頸 -- 253,333 +0xABDC 0x8ECC # 軌 -- 253,334 +0xABDD 0x61A4 # 憤 -- 253,335 +0xABDE 0x6F6D # 潭 -- 253,336 +0xABDF 0x9CF3 # 鳳 -- 253,337 +0xABE0 0x7B4B # 筋 -- 253,340 +0xABE1 0x98FC # 飼 -- 253,341 +0xABE2 0x5824 # 堤 -- 253,342 +0xABE3 0x626F # 扯 -- 253,343 +0xABE4 0x90B1 # 邱 -- 253,344 +0xABE5 0x5353 # 卓 -- 253,345 +0xABE6 0x8AFE # 諾 -- 253,346 +0xABE7 0x5E45 # 幅 -- 253,347 +0xABE8 0x758B # 疋 -- 253,350 +0xABE9 0x7E6A # 繪 -- 253,351 +0xABEA 0x4EA8 # 亨 -- 253,352 +0xABEB 0x6062 # 恢 -- 253,353 +0xABEC 0x66F9 # 曹 -- 253,354 +0xABED 0x676D # 杭 -- 253,355 +0xABEE 0x6F3F # 漿 -- 253,356 +0xABEF 0x6577 # 敷 -- 253,357 +0xABF0 0x5C65 # 履 -- 253,360 +0xABF1 0x8F44 # 轄 -- 253,361 +0xABF2 0x937E # 鍾 -- 253,362 +0xABF3 0x66FC # 曼 -- 253,363 +0xABF4 0x6E3E # 渾 -- 253,364 +0xABF5 0x4F36 # 伶 -- 253,365 +0xABF6 0x90A6 # 邦 -- 253,366 +0xABF7 0x8178 # 腸 -- 253,367 +0xABF8 0x965D # 陝 -- 253,370 +0xABF9 0x68CB # 棋 -- 253,371 +0xABFA 0x83F2 # 菲 -- 253,372 +0xABFB 0x9D3F # 鴿 -- 253,373 +0xABFC 0x8180 # 膀 -- 253,374 +0xABFD 0x80C3 # 胃 -- 253,375 +0xABFE 0x8877 # 衷 -- 253,376 diff --git a/unicode/xerox/unihan/XCCS-254=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-254=UNIHAN.TXT new file mode 100644 index 00000000..7df09acb --- /dev/null +++ b/unicode/xerox/unihan/XCCS-254=UNIHAN.TXT @@ -0,0 +1,190 @@ + +# "254" UNIHAN + +0xAC21 0x6B23 # 欣 -- 254,041 +0xAC22 0x7A1F # 稟 -- 254,042 +0xAC23 0x6A01 # 樁 -- 254,043 +0xAC24 0x4F73 # 佳 -- 254,044 +0xAC25 0x5BB0 # 宰 -- 254,045 +0xAC26 0x5AE9 # 嫩 -- 254,046 +0xAC27 0x54C9 # 哉 -- 254,047 +0xAC28 0x6109 # 愉 -- 254,050 +0xAC29 0x5FBD # 徽 -- 254,051 +0xAC2A 0x64F1 # 擱 -- 254,052 +0xAC2B 0x8993 # 覓 -- 254,053 +0xAC2C 0x6D95 # 涕 -- 254,054 +0xAC2D 0x540E # 后 -- 254,055 +0xAC2E 0x67EF # 柯 -- 254,056 +0xAC2F 0x5BFA # 寺 -- 254,057 +0xAC30 0x51B2 # 冲 -- 254,060 +0xAC31 0x8B9A # 讚 -- 254,061 +0xAC32 0x675C # 杜 -- 254,062 +0xAC33 0x6DEE # 淮 -- 254,063 +0xAC34 0x6885 # 梅 -- 254,064 +0xAC35 0x59FF # 姿 -- 254,065 +0xAC36 0x752B # 甫 -- 254,066 +0xAC37 0x83E9 # 菩 -- 254,067 +0xAC38 0x87BA # 螺 -- 254,070 +0xAC39 0x9EDB # 黛 -- 254,071 +0xAC3A 0x5A1C # 娜 -- 254,072 +0xAC3B 0x75B2 # 疲 -- 254,073 +0xAC3C 0x8CE4 # 賤 -- 254,074 +0xAC3D 0x947F # 鑿 -- 254,075 +0xAC3E 0x5A92 # 媒 -- 254,076 +0xAC3F 0x85CD # 藍 -- 254,077 +0xAC40 0x8521 # 蔡 -- 254,100 +0xAC41 0x6CE1 # 泡 -- 254,101 +0xAC42 0x6583 # 斃 -- 254,102 +0xAC43 0x7D21 # 紡 -- 254,103 +0xAC44 0x63A7 # 控 -- 254,104 +0xAC45 0x5674 # 噴 -- 254,105 +0xAC46 0x8ADC # 諜 -- 254,106 +0xAC47 0x6D66 # 浦 -- 254,107 +0xAC48 0x7FE0 # 翠 -- 254,110 +0xAC49 0x5B87 # 宇 -- 254,111 +0xAC4A 0x59C6 # 姆 -- 254,112 +0xAC4B 0x6CCA # 泊 -- 254,113 +0xAC4C 0x7CFE # 糾 -- 254,114 +0xAC4D 0x99DB # 駛 -- 254,115 +0xAC4E 0x5091 # 傑 -- 254,116 +0xAC4F 0x6E9C # 溜 -- 254,117 +0xAC50 0x5CB3 # 岳 -- 254,120 +0xAC51 0x79B9 # 禹 -- 254,121 +0xAC52 0x8396 # 莖 -- 254,122 +0xAC53 0x7DEC # 緬 -- 254,123 +0xAC55 0x84EE # 蓮 -- 254,125 +0xAC56 0x7642 # 療 -- 254,126 +0xAC57 0x5CF0 # 峰 -- 254,127 +0xAC58 0x7F38 # 缸 -- 254,130 +0xAC59 0x6A61 # 橡 -- 254,131 +0xAC5A 0x758F # 疏 -- 254,132 +0xAC5B 0x82AC # 芬 -- 254,133 +0xAC5C 0x7C98 # 粘 -- 254,134 +0xAC5D 0x8EF8 # 軸 -- 254,135 +0xAC5E 0x7D2B # 紫 -- 254,136 +0xAC5F 0x6046 # 恆 -- 254,137 +0xAC60 0x8755 # 蝕 -- 254,140 +0xAC61 0x8972 # 襲 -- 254,141 +0xAC62 0x5291 # 劑 -- 254,142 +0xAC63 0x90CA # 郊 -- 254,143 +0xAC64 0x6606 # 昆 -- 254,144 +0xAC65 0x5104 # 億 -- 254,145 +0xAC66 0x6676 # 晶 -- 254,146 +0xAC67 0x96C1 # 雁 -- 254,147 +0xAC68 0x9318 # 錘 -- 254,150 +0xAC69 0x7FC5 # 翅 -- 254,151 +0xAC6A 0x7AFF # 竿 -- 254,152 +0xAC6B 0x5821 # 堡 -- 254,153 +0xAC6C 0x53B2 # 厲 -- 254,154 +0xAC6D 0x537F # 卿 -- 254,155 +0xAC6E 0x6DD8 # 淘 -- 254,156 +0xAC6F 0x708E # 炎 -- 254,157 +0xAC70 0x6620 # 映 -- 254,160 +0xAC71 0x76E7 # 盧 -- 254,161 +0xAC72 0x6717 # 朗 -- 254,162 +0xAC73 0x819C # 膜 -- 254,163 +0xAC74 0x9801 # 頁 -- 254,164 +0xAC75 0x6DD1 # 淑 -- 254,165 +0xAC76 0x651D # 攝 -- 254,166 +0xAC77 0x5C4F # 屏 -- 254,167 +0xAC78 0x5CA1 # 岡 -- 254,170 +0xAC79 0x50AD # 傭 -- 254,171 +0xAC7A 0x76D2 # 盒 -- 254,172 +0xAC7B 0x8E10 # 踐 -- 254,173 +0xAC7C 0x5858 # 塘 -- 254,174 +0xAC7D 0x970D # 霍 -- 254,175 +0xAC7E 0x92F8 # 鋸 -- 254,176 +0xACA1 0x8EBA # 躺 -- 254,241 +0xACA2 0x6E24 # 渤 -- 254,242 +0xACA3 0x8D6B # 赫 -- 254,243 +0xACA4 0x7538 # 甸 -- 254,244 +0xACA5 0x6E20 # 渠 -- 254,245 +0xACA6 0x901D # 逝 -- 254,246 +0xACA7 0x9738 # 霸 -- 254,247 +0xACA8 0x935B # 鍛 -- 254,250 +0xACA9 0x8757 # 蝗 -- 254,251 +0xACAA 0x6254 # 扔 -- 254,252 +0xACAB 0x6851 # 桑 -- 254,253 +0xACAC 0x6E34 # 渴 -- 254,254 +0xACAD 0x78DA # 磚 -- 254,255 +0xACAE 0x852C # 蔬 -- 254,256 +0xACAF 0x6D78 # 浸 -- 254,257 +0xACB0 0x846C # 葬 -- 254,260 +0xACB1 0x6FA4 # 澤 -- 254,261 +0xACB2 0x6EB6 # 溶 -- 254,262 +0xACB3 0x6FA1 # 澡 -- 254,263 +0xACB4 0x8881 # 袁 -- 254,264 +0xACB5 0x7802 # 砂 -- 254,265 +0xACB6 0x934B # 鍋 -- 254,266 +0xACB7 0x780D # 砍 -- 254,267 +0xACB8 0x68B0 # 械 -- 254,270 +0xACB9 0x63ED # 揭 -- 254,271 +0xACBA 0x8A95 # 誕 -- 254,272 +0xACBB 0x7D0B # 紋 -- 254,273 +0xACBC 0x6E58 # 湘 -- 254,274 +0xACBD 0x7680 # 皀 -- 254,275 +0xACBE 0x79E4 # 秤 -- 254,276 +0xACBF 0x4E18 # 丘 -- 254,277 +0xACC0 0x4F0D # 伍 -- 254,300 +0xACC1 0x9B54 # 魔 -- 254,301 +0xACC2 0x5E06 # 帆 -- 254,302 +0xACC3 0x78A7 # 碧 -- 254,303 +0xACC4 0x7E73 # 繳 -- 254,304 +0xACC5 0x51F1 # 凱 -- 254,305 +0xACC6 0x80D6 # 胖 -- 254,306 +0xACC7 0x4EF2 # 仲 -- 254,307 +0xACC8 0x918B # 醋 -- 254,310 +0xACC9 0x5BC7 # 寇 -- 254,311 +0xACCA 0x52C3 # 勃 -- 254,312 +0xACCB 0x51DD # 凝 -- 254,313 +0xACCC 0x746A # 瑪 -- 254,314 +0xACCD 0x5A1F # 娟 -- 254,315 +0xACCE 0x641C # 搜 -- 254,316 +0xACCF 0x75AB # 疫 -- 254,317 +0xACD0 0x79D2 # 秒 -- 254,320 +0xACD1 0x9727 # 霧 -- 254,321 +0xACD2 0x5751 # 坑 -- 254,322 +0xACD3 0x860B # 蘋 -- 254,323 +0xACD4 0x582F # 堯 -- 254,324 +0xACD5 0x5CA9 # 岩 -- 254,325 +0xACD6 0x5DF7 # 巷 -- 254,326 +0xACD7 0x8C6A # 豪 -- 254,327 +0xACD8 0x881F # 蠟 -- 254,330 +0xACD9 0x7B28 # 笨 -- 254,331 +0xACDA 0x6167 # 慧 -- 254,332 +0xACDB 0x92D2 # 鋒 -- 254,333 +0xACDC 0x810A # 脊 -- 254,334 +0xACDD 0x95A9 # 閩 -- 254,335 +0xACDE 0x9059 # 遙 -- 254,336 +0xACDF 0x5074 # 側 -- 254,337 +0xACE0 0x796D # 祭 -- 254,340 +0xACE1 0x8482 # 蒂 -- 254,341 +0xACE2 0x790E # 礎 -- 254,342 +0xACE3 0x5C60 # 屠 -- 254,343 +0xACE4 0x5A03 # 娃 -- 254,344 +0xACE5 0x7FD4 # 翔 -- 254,345 +0xACE6 0x5851 # 塑 -- 254,346 +0xACE7 0x6C88 # 沈 -- 254,347 +0xACE8 0x55AC # 喬 -- 254,350 +0xACE9 0x9EF4 # 黴 -- 254,351 +0xACEA 0x59B3 # 妳 -- 254,352 +0xACEB 0x90ED # 郭 -- 254,353 +0xACEC 0x85AF # 薯 -- 254,354 +0xACED 0x665D # 晝 -- 254,355 +0xACEE 0x7149 # 煉 -- 254,356 +0xACEF 0x8CBF # 貿 -- 254,357 +0xACF0 0x840A # 萊 -- 254,360 +0xACF1 0x524A # 削 -- 254,361 +0xACF2 0x64CB # 擋 -- 254,362 +0xACF3 0x6377 # 捷 -- 254,363 +0xACF4 0x54B8 # 咸 -- 254,364 +0xACF5 0x8D1B # 贛 -- 254,365 +0xACF6 0x78B3 # 碳 -- 254,366 +0xACF7 0x9375 # 鍵 -- 254,367 +0xACF8 0x5009 # 倉 -- 254,370 +0xACF9 0x6F2B # 漫 -- 254,371 +0xACFA 0x8861 # 衡 -- 254,372 +0xACFB 0x53E2 # 叢 -- 254,373 +0xACFC 0x5026 # 倦 -- 254,374 +0xACFD 0x79BD # 禽 -- 254,375 +0xACFE 0x8549 # 蕉 -- 254,376 diff --git a/unicode/xerox/unihan/XCCS-255=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-255=UNIHAN.TXT new file mode 100644 index 00000000..0479a268 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-255=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "255" UNIHAN + +0xAD21 0x555E # 啞 -- 255,041 +0xAD22 0x5587 # 喇 -- 255,042 +0xAD23 0x87A2 # 螢 -- 255,043 +0xAD24 0x7F50 # 罐 -- 255,044 +0xAD25 0x654F # 敏 -- 255,045 +0xAD26 0x829D # 芝 -- 255,046 +0xAD27 0x6372 # 捲 -- 255,047 +0xAD28 0x5DE2 # 巢 -- 255,050 +0xAD29 0x7AB0 # 窰 -- 255,051 +0xAD2A 0x6D29 # 洩 -- 255,052 +0xAD2B 0x7F69 # 罩 -- 255,053 +0xAD2C 0x7E96 # 纖 -- 255,054 +0xAD2D 0x8154 # 腔 -- 255,055 +0xAD2E 0x57D4 # 埔 -- 255,056 +0xAD2F 0x5A25 # 娥 -- 255,057 +0xAD30 0x65E6 # 旦 -- 255,060 +0xAD31 0x7D61 # 絡 -- 255,061 +0xAD32 0x5BB4 # 宴 -- 255,062 +0xAD33 0x8A3B # 註 -- 255,063 +0xAD34 0x6BC5 # 毅 -- 255,064 +0xAD35 0x79E7 # 秧 -- 255,065 +0xAD36 0x5211 # 刑 -- 255,066 +0xAD37 0x6876 # 桶 -- 255,067 +0xAD38 0x971E # 霞 -- 255,070 +0xAD39 0x71E5 # 燥 -- 255,071 +0xAD3A 0x8292 # 芒 -- 255,072 +0xAD3B 0x74F7 # 瓷 -- 255,073 +0xAD3C 0x821C # 舜 -- 255,074 +0xAD3D 0x7384 # 玄 -- 255,075 +0xAD3E 0x8302 # 茂 -- 255,076 +0xAD3F 0x68A8 # 梨 -- 255,077 +0xAD40 0x6D69 # 浩 -- 255,100 +0xAD41 0x587E # 塾 -- 255,101 +0xAD42 0x52FE # 勾 -- 255,102 +0xAD43 0x6F8E # 澎 -- 255,103 +0xAD44 0x4FAF # 侯 -- 255,104 +0xAD45 0x7941 # 祁 -- 255,105 +0xAD46 0x508D # 傍 -- 255,106 +0xAD47 0x786B # 硫 -- 255,107 +0xAD48 0x63CF # 描 -- 255,110 +0xAD49 0x7058 # 灘 -- 255,111 +0xAD4A 0x8102 # 脂 -- 255,112 +0xAD4B 0x97AD # 鞭 -- 255,113 +0xAD4C 0x7CDE # 糞 -- 255,114 +0xAD4D 0x863F # 蘿 -- 255,115 +0xAD4E 0x91E3 # 釣 -- 255,116 +0xAD4F 0x5B75 # 孵 -- 255,117 +0xAD50 0x65A7 # 斧 -- 255,120 +0xAD51 0x96B4 # 隴 -- 255,121 +0xAD52 0x9935 # 餵 -- 255,122 +0xAD53 0x6EAA # 溪 -- 255,123 +0xAD54 0x7FBF # 羿 -- 255,124 +0xAD55 0x5075 # 偵 -- 255,125 +0xAD56 0x6DF5 # 淵 -- 255,126 +0xAD57 0x67AF # 枯 -- 255,127 +0xAD58 0x6850 # 桐 -- 255,130 +0xAD59 0x4F19 # 伙 -- 255,131 +0xAD5A 0x9081 # 邁 -- 255,132 +0xAD5B 0x54F2 # 哲 -- 255,133 +0xAD5C 0x86DB # 蛛 -- 255,134 +0xAD5D 0x9AD3 # 髓 -- 255,135 +0xAD5E 0x9ED4 # 黔 -- 255,136 +0xAD5F 0x8A25 # 訥 -- 255,137 +0xAD60 0x5495 # 咕 -- 255,140 +0xAD61 0x5679 # 噹 -- 255,141 +0xAD62 0x902E # 逮 -- 255,142 +0xAD63 0x6016 # 怖 -- 255,143 +0xAD64 0x5915 # 夕 -- 255,144 +0xAD65 0x8FC5 # 迅 -- 255,145 +0xAD66 0x6591 # 斑 -- 255,146 +0xAD67 0x80A2 # 肢 -- 255,147 +0xAD68 0x6E67 # 湧 -- 255,150 +0xAD69 0x8514 # 蔔 -- 255,151 +0xAD6A 0x6817 # 栗 -- 255,152 +0xAD6B 0x8718 # 蜘 -- 255,153 +0xAD6C 0x5E1A # 帚 -- 255,154 +0xAD6D 0x7282 # 犂 -- 255,155 +0xAD6E 0x5937 # 夷 -- 255,156 +0xAD6F 0x9035 # 逵 -- 255,157 +0xAD70 0x6EEC # 滬 -- 255,160 +0xAD71 0x5FAA # 循 -- 255,161 +0xAD72 0x57C3 # 埃 -- 255,162 +0xAD73 0x7A6B # 穫 -- 255,163 +0xAD74 0x6328 # 挨 -- 255,164 +0xAD75 0x8105 # 脅 -- 255,165 +0xAD76 0x5F70 # 彰 -- 255,166 +0xAD77 0x6F86 # 澆 -- 255,167 +0xAD78 0x6DF9 # 淹 -- 255,170 +0xAD79 0x8606 # 蘆 -- 255,171 +0xAD7A 0x522E # 刮 -- 255,172 +0xAD7B 0x7092 # 炒 -- 255,173 +0xAD7C 0x6F58 # 潘 -- 255,174 +0xAD7D 0x543C # 吼 -- 255,175 +0xAD7E 0x5589 # 喉 -- 255,176 +0xADA1 0x8B5A # 譚 -- 255,241 +0xADA2 0x56BC # 嚼 -- 255,242 +0xADA3 0x6DEA # 淪 -- 255,243 +0xADA4 0x5D19 # 崙 -- 255,244 +0xADA5 0x9AAF # 骯 -- 255,245 +0xADA6 0x86DF # 蛟 -- 255,246 +0xADA7 0x6E89 # 溉 -- 255,247 +0xADA8 0x6A38 # 樸 -- 255,250 +0xADA9 0x971C # 霜 -- 255,251 +0xADAA 0x8E64 # 蹤 -- 255,252 +0xADAB 0x5ECA # 廊 -- 255,253 +0xADAC 0x4FD8 # 俘 -- 255,254 +0xADAD 0x5B30 # 嬰 -- 255,255 +0xADAE 0x8303 # 范 -- 255,256 +0xADAF 0x6296 # 抖 -- 255,257 +0xADB0 0x7D68 # 絨 -- 255,260 +0xADB1 0x920E # 鈎 -- 255,261 +0xADB2 0x7CDF # 糟 -- 255,262 +0xADB3 0x4E32 # 串 -- 255,263 +0xADB4 0x7409 # 琉 -- 255,264 +0xADB5 0x9ABC # 骼 -- 255,265 +0xADB6 0x5B38 # 嬸 -- 255,266 +0xADB7 0x80F3 # 胳 -- 255,267 +0xADB8 0x5594 # 喔 -- 255,270 +0xADB9 0x622A # 截 -- 255,271 +0xADBA 0x61F2 # 懲 -- 255,272 +0xADBB 0x9812 # 頒 -- 255,273 +0xADBC 0x5A1B # 娛 -- 255,274 +0xADBD 0x8DE8 # 跨 -- 255,275 +0xADBE 0x6492 # 撒 -- 255,276 +0xADBF 0x8305 # 茅 -- 255,277 +0xADC0 0x9DAF # 鶯 -- 255,300 +0xADC1 0x699C # 榜 -- 255,301 +0xADC2 0x919C # 醜 -- 255,302 +0xADC3 0x62D3 # 拓 -- 255,303 +0xADC4 0x5212 # 划 -- 255,304 +0xADC5 0x8D9F # 趟 -- 255,305 +0xADC6 0x5DEB # 巫 -- 255,306 +0xADC7 0x4F8B # 例 -- 255,307 +0xADC8 0x73B2 # 玲 -- 255,310 +0xADC9 0x549A # 咚 -- 255,311 +0xADCA 0x9D3B # 鴻 -- 255,312 +0xADCB 0x6F70 # 潰 -- 255,313 +0xADCC 0x62AB # 披 -- 255,314 +0xADCD 0x5FB9 # 徹 -- 255,315 +0xADCE 0x5E7D # 幽 -- 255,316 +0xADCF 0x6CF3 # 泳 -- 255,317 +0xADD0 0x7662 # 癢 -- 255,320 +0xADD1 0x6524 # 攤 -- 255,321 +0xADD2 0x5C51 # 屑 -- 255,322 +0xADD3 0x72F9 # 狹 -- 255,323 +0xADD4 0x5EC1 # 廁 -- 255,324 +0xADD5 0x5098 # 傘 -- 255,325 +0xADD6 0x9175 # 酵 -- 255,326 +0xADD7 0x92E4 # 鋤 -- 255,327 +0xADD8 0x6C55 # 汕 -- 255,330 +0xADD9 0x9131 # 鄱 -- 255,331 +0xADDA 0x93C8 # 鏈 -- 255,332 +0xADDB 0x55E1 # 嗡 -- 255,333 +0xADDC 0x63AA # 措 -- 255,334 +0xADDD 0x9102 # 鄂 -- 255,335 +0xADDE 0x6A58 # 橘 -- 255,336 +0xADDF 0x6488 # 撈 -- 255,337 +0xADE0 0x97FB # 韻 -- 255,340 +0xADE1 0x7E6D # 繭 -- 255,341 +0xADE2 0x8ABC # 誼 -- 255,342 +0xADE3 0x50A2 # 傢 -- 255,343 +0xADE4 0x5F6C # 彬 -- 255,344 +0xADE5 0x743F # 琿 -- 255,345 +0xADE6 0x5678 # 噸 -- 255,346 +0xADE7 0x5FCC # 忌 -- 255,347 +0xADE8 0x7A3D # 稽 -- 255,350 +0xADE9 0x6790 # 析 -- 255,351 +0xADEA 0x8A3A # 診 -- 255,352 +0xADEB 0x6607 # 昇 -- 255,353 +0xADEC 0x8258 # 艘 -- 255,354 +0xADED 0x6C5D # 汝 -- 255,355 +0xADEE 0x90E1 # 郡 -- 255,356 +0xADEF 0x4EFF # 仿 -- 255,357 +0xADF0 0x964B # 陋 -- 255,360 +0xADF1 0x832B # 茫 -- 255,361 +0xADF2 0x8E44 # 蹄 -- 255,362 +0xADF3 0x5109 # 儉 -- 255,363 +0xADF4 0x6B6A # 歪 -- 255,364 +0xADF5 0x6A1E # 樞 -- 255,365 +0xADF6 0x9E79 # 鹹 -- 255,366 +0xADF7 0x883B # 蠻 -- 255,367 +0xADF8 0x626D # 扭 -- 255,370 +0xADF9 0x6F64 # 潤 -- 255,371 +0xADFA 0x6454 # 摔 -- 255,372 +0xADFB 0x52C1 # 勁 -- 255,373 +0xADFC 0x745F # 瑟 -- 255,374 +0xADFD 0x6979 # 楹 -- 255,375 +0xADFE 0x6CCC # 泌 -- 255,376 diff --git a/unicode/xerox/unihan/XCCS-256=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-256=UNIHAN.TXT new file mode 100644 index 00000000..9e18a255 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-256=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "256" UNIHAN + +0xAE21 0x75A5 # 疥 -- 256,041 +0xAE22 0x74CA # 瓊 -- 256,042 +0xAE23 0x9640 # 陀 -- 256,043 +0xAE24 0x4EAD # 亭 -- 256,044 +0xAE25 0x9396 # 鎖 -- 256,045 +0xAE26 0x52DF # 募 -- 256,046 +0xAE27 0x8A98 # 誘 -- 256,047 +0xAE28 0x67C4 # 柄 -- 256,050 +0xAE29 0x7C64 # 籤 -- 256,051 +0xAE2A 0x7DB1 # 綱 -- 256,052 +0xAE2B 0x59EA # 姪 -- 256,053 +0xAE2C 0x65A5 # 斥 -- 256,054 +0xAE2D 0x856D # 蕭 -- 256,055 +0xAE2E 0x633A # 挺 -- 256,056 +0xAE2F 0x7D2E # 紮 -- 256,057 +0xAE30 0x79A6 # 禦 -- 256,060 +0xAE31 0x5FA7 # 徧 -- 256,061 +0xAE32 0x8277 # 艷 -- 256,062 +0xAE33 0x6B04 # 欄 -- 256,063 +0xAE34 0x7B77 # 筷 -- 256,064 +0xAE35 0x9699 # 隙 -- 256,065 +0xAE36 0x626E # 扮 -- 256,066 +0xAE37 0x502D # 倭 -- 256,067 +0xAE38 0x52FB # 勻 -- 256,070 +0xAE39 0x924B # 鉋 -- 256,071 +0xAE3A 0x9D51 # 鵑 -- 256,072 +0xAE3B 0x54FC # 哼 -- 256,073 +0xAE3C 0x72C4 # 狄 -- 256,074 +0xAE3D 0x57A3 # 垣 -- 256,075 +0xAE3E 0x51F9 # 凹 -- 256,076 +0xAE3F 0x4F83 # 侃 -- 256,077 +0xAE40 0x8E8D # 躍 -- 256,100 +0xAE41 0x8EAD # 躭 -- 256,101 +0xAE42 0x809D # 肝 -- 256,102 +0xAE43 0x71E6 # 燦 -- 256,103 +0xAE44 0x5D11 # 崑 -- 256,104 +0xAE45 0x7B1B # 笛 -- 256,105 +0xAE46 0x8679 # 虹 -- 256,106 +0xAE47 0x8106 # 脆 -- 256,107 +0xAE48 0x7194 # 熔 -- 256,110 +0xAE49 0x510D # 儍 -- 256,111 +0xAE4A 0x8A79 # 詹 -- 256,112 +0xAE4B 0x77AA # 瞪 -- 256,113 +0xAE4C 0x62CC # 拌 -- 256,114 +0xAE4D 0x7F9E # 羞 -- 256,115 +0xAE4E 0x98B1 # 颱 -- 256,116 +0xAE4F 0x9A2B # 騫 -- 256,117 +0xAE50 0x92BC # 銼 -- 256,120 +0xAE51 0x985B # 顛 -- 256,121 +0xAE52 0x52F3 # 勳 -- 256,122 +0xAE53 0x5F6D # 彭 -- 256,123 +0xAE54 0x91C0 # 釀 -- 256,124 +0xAE55 0x63A9 # 掩 -- 256,125 +0xAE56 0x79B1 # 禱 -- 256,126 +0xAE57 0x6F84 # 澄 -- 256,127 +0xAE58 0x62B9 # 抹 -- 256,130 +0xAE59 0x6495 # 撕 -- 256,131 +0xAE5A 0x58B3 # 墳 -- 256,132 +0xAE5B 0x7D9C # 綜 -- 256,133 +0xAE5C 0x6FFE # 濾 -- 256,134 +0xAE5D 0x6B49 # 歉 -- 256,135 +0xAE5E 0x5F26 # 弦 -- 256,136 +0xAE5F 0x6346 # 捆 -- 256,137 +0xAE60 0x50E7 # 僧 -- 256,140 +0xAE61 0x8D0F # 贏 -- 256,141 +0xAE62 0x5EFB # 廻 -- 256,142 +0xAE63 0x54A8 # 咨 -- 256,143 +0xAE64 0x69A8 # 榨 -- 256,144 +0xAE65 0x6BEF # 毯 -- 256,145 +0xAE66 0x91C7 # 采 -- 256,146 +0xAE67 0x5C6F # 屯 -- 256,147 +0xAE68 0x69D3 # 槓 -- 256,150 +0xAE69 0x624E # 扎 -- 256,151 +0xAE6A 0x8E72 # 蹲 -- 256,152 +0xAE6B 0x9945 # 饅 -- 256,153 +0xAE6C 0x7C72 # 籲 -- 256,154 +0xAE6D 0x544E # 呎 -- 256,155 +0xAE6E 0x51F8 # 凸 -- 256,156 +0xAE6F 0x818A # 膊 -- 256,157 +0xAE70 0x53ED # 叭 -- 256,160 +0xAE71 0x54CE # 哎 -- 256,161 +0xAE72 0x561B # 嘛 -- 256,162 +0xAE73 0x7A1A # 稚 -- 256,163 +0xAE74 0x552F # 唯 -- 256,164 +0xAE75 0x5978 # 奸 -- 256,165 +0xAE76 0x60A0 # 悠 -- 256,166 +0xAE77 0x61FC # 懼 -- 256,167 +0xAE78 0x4FEF # 俯 -- 256,170 +0xAE79 0x9298 # 銘 -- 256,171 +0xAE7A 0x856A # 蕪 -- 256,172 +0xAE7B 0x929C # 銜 -- 256,173 +0xAE7C 0x7D81 # 綁 -- 256,174 +0xAE7D 0x8700 # 蜀 -- 256,175 +0xAE7E 0x5288 # 劈 -- 256,176 +0xAEA1 0x947C # 鑼 -- 256,241 +0xAEA2 0x8073 # 聳 -- 256,242 +0xAEA3 0x840D # 萍 -- 256,243 +0xAEA4 0x8944 # 襄 -- 256,244 +0xAEA5 0x5D29 # 崩 -- 256,245 +0xAEA6 0x865C # 虜 -- 256,246 +0xAEA7 0x6986 # 榆 -- 256,247 +0xAEA8 0x814E # 腎 -- 256,250 +0xAEA9 0x8139 # 脹 -- 256,251 +0xAEAA 0x868C # 蚌 -- 256,252 +0xAEAB 0x4E56 # 乖 -- 256,253 +0xAEAC 0x7B95 # 箕 -- 256,254 +0xAEAD 0x5CD9 # 峙 -- 256,255 +0xAEAE 0x5AE6 # 嫦 -- 256,256 +0xAEAF 0x6BFD # 毽 -- 256,257 +0xAEB0 0x652A # 攪 -- 256,260 +0xAEB1 0x5538 # 唸 -- 256,261 +0xAEB2 0x7B24 # 笤 -- 256,262 +0xAEB3 0x74A6 # 璦 -- 256,263 +0xAEB4 0x9038 # 逸 -- 256,264 +0xAEB5 0x8A1F # 訟 -- 256,265 +0xAEB6 0x8058 # 聘 -- 256,266 +0xAEB7 0x5C09 # 尉 -- 256,267 +0xAEB8 0x5E7B # 幻 -- 256,270 +0xAEB9 0x5960 # 奠 -- 256,271 +0xAEBA 0x8543 # 蕃 -- 256,272 +0xAEBB 0x5EB8 # 庸 -- 256,273 +0xAEBC 0x6749 # 杉 -- 256,274 +0xAEBD 0x5E15 # 帕 -- 256,275 +0xAEBE 0x67D1 # 柑 -- 256,276 +0xAEBF 0x6BB7 # 殷 -- 256,277 +0xAEC0 0x5ED6 # 廖 -- 256,300 +0xAEC1 0x96CC # 雌 -- 256,301 +0xAEC2 0x817A # 腺 -- 256,302 +0xAEC3 0x6241 # 扁 -- 256,303 +0xAEC4 0x5DBD # 嶽 -- 256,304 +0xAEC5 0x5D0E # 崎 -- 256,305 +0xAEC6 0x63C9 # 揉 -- 256,306 +0xAEC7 0x54E8 # 哨 -- 256,307 +0xAEC8 0x8304 # 茄 -- 256,310 +0xAEC9 0x8DBE # 趾 -- 256,311 +0xAECA 0x80AA # 肪 -- 256,312 +0xAECB 0x573E # 圾 -- 256,313 +0xAECC 0x8C79 # 豹 -- 256,314 +0xAECD 0x64CE # 擎 -- 256,315 +0xAECE 0x95C6 # 闆 -- 256,316 +0xAECF 0x92C1 # 鋁 -- 256,317 +0xAED0 0x92B2 # 銲 -- 256,320 +0xAED1 0x9209 # 鈉 -- 256,321 +0xAED2 0x8E66 # 蹦 -- 256,322 +0xAED3 0x59AE # 妮 -- 256,323 +0xAED4 0x5345 # 卅 -- 256,324 +0xAED5 0x9A5F # 驟 -- 256,325 +0xAED6 0x905C # 遜 -- 256,326 +0xAED7 0x896A # 襪 -- 256,327 +0xAED8 0x77E9 # 矩 -- 256,330 +0xAED9 0x96D5 # 雕 -- 256,331 +0xAEDA 0x75D5 # 痕 -- 256,332 +0xAEDB 0x5BB5 # 宵 -- 256,333 +0xAEDC 0x6CDB # 泛 -- 256,334 +0xAEDD 0x535C # 卜 -- 256,335 +0xAEDE 0x69F3 # 槳 -- 256,336 +0xAEDF 0x81A8 # 膨 -- 256,337 +0xAEE0 0x6C83 # 沃 -- 256,340 +0xAEE1 0x5D16 # 崖 -- 256,341 +0xAEE2 0x6664 # 晤 -- 256,342 +0xAEE3 0x584C # 塌 -- 256,343 +0xAEE4 0x81FC # 臼 -- 256,344 +0xAEE5 0x5BDE # 寞 -- 256,345 +0xAEE6 0x7F55 # 罕 -- 256,346 +0xAEE7 0x9F90 # 龐 -- 256,347 +0xAEE8 0x968B # 隋 -- 256,350 +0xAEE9 0x6F31 # 漱 -- 256,351 +0xAEEA 0x86E4 # 蛤 -- 256,352 +0xAEEB 0x8B41 # 譁 -- 256,353 +0xAEEC 0x87CB # 蟋 -- 256,354 +0xAEED 0x9336 # 錶 -- 256,355 +0xAEEE 0x5783 # 垃 -- 256,356 +0xAEEF 0x87C0 # 蟀 -- 256,357 +0xAEF0 0x92B3 # 銳 -- 256,360 +0xAEF1 0x76C8 # 盈 -- 256,361 +0xAEF2 0x56CA # 囊 -- 256,362 +0xAEF3 0x978F # 鞏 -- 256,363 +0xAEF4 0x6514 # 攔 -- 256,364 +0xAEF5 0x6CBD # 沽 -- 256,365 +0xAEF6 0x8932 # 褲 -- 256,366 +0xAEF7 0x6F88 # 澈 -- 256,367 +0xAEF8 0x8A87 # 誇 -- 256,370 +0xAEF9 0x9017 # 逗 -- 256,371 +0xAEFA 0x58E9 # 壩 -- 256,372 +0xAEFB 0x4F51 # 佑 -- 256,373 +0xAEFC 0x51B6 # 冶 -- 256,374 +0xAEFD 0x5992 # 妒 -- 256,375 +0xAEFE 0x5B9B # 宛 -- 256,376 diff --git a/unicode/xerox/unihan/XCCS-257=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-257=UNIHAN.TXT new file mode 100644 index 00000000..37bd90eb --- /dev/null +++ b/unicode/xerox/unihan/XCCS-257=UNIHAN.TXT @@ -0,0 +1,190 @@ + +# "257" UNIHAN + +0xAF21 0x9E7C # 鹼 -- 257,041 +0xAF22 0x8B5C # 譜 -- 257,042 +0xAF23 0x859B # 薛 -- 257,043 +0xAF24 0x6EF2 # 滲 -- 257,044 +0xAF25 0x7D43 # 絃 -- 257,045 +0xAF26 0x96F9 # 雹 -- 257,046 +0xAF27 0x6413 # 搓 -- 257,047 +0xAF28 0x6936 # 椶 -- 257,050 +0xAF29 0x86B1 # 蚱 -- 257,051 +0xAF2A 0x8722 # 蜢 -- 257,052 +0xAF2B 0x67EC # 柬 -- 257,053 +0xAF2C 0x85F9 # 藹 -- 257,054 +0xAF2D 0x9257 # 鉗 -- 257,055 +0xAF2E 0x5A49 # 婉 -- 257,056 +0xAF2F 0x8783 # 螃 -- 257,057 +0xAF30 0x6775 # 杵 -- 257,060 +0xAF31 0x9C57 # 鱗 -- 257,061 +0xAF32 0x714C # 煌 -- 257,062 +0xAF33 0x870A # 蜊 -- 257,063 +0xAF34 0x54E6 # 哦 -- 257,064 +0xAF35 0x6F7C # 潼 -- 257,065 +0xAF36 0x8DF4 # 跴 -- 257,066 +0xAF37 0x97CC # 韌 -- 257,067 +0xAF38 0x8463 # 董 -- 257,070 +0xAF39 0x8CE6 # 賦 -- 257,071 +0xAF3A 0x65EC # 旬 -- 257,072 +0xAF3B 0x8B19 # 謙 -- 257,073 +0xAF3C 0x9177 # 酷 -- 257,074 +0xAF3D 0x61BE # 憾 -- 257,075 +0xAF3E 0x7009 # 瀉 -- 257,076 +0xAF3F 0x6284 # 抄 -- 257,077 +0xAF40 0x63A0 # 掠 -- 257,100 +0xAF41 0x5BE1 # 寡 -- 257,101 +0xAF42 0x6714 # 朔 -- 257,102 +0xAF43 0x9E9F # 麟 -- 257,103 +0xAF44 0x8956 # 襖 -- 257,104 +0xAF45 0x6795 # 枕 -- 257,105 +0xAF46 0x7184 # 熄 -- 257,106 +0xAF47 0x6FC1 # 濁 -- 257,107 +0xAF48 0x76F2 # 盲 -- 257,110 +0xAF49 0x5112 # 儒 -- 257,111 +0xAF4A 0x71C4 # 燄 -- 257,112 +0xAF4B 0x4FCA # 俊 -- 257,113 +0xAF4C 0x5F4C # 彌 -- 257,114 +0xAF4D 0x60A6 # 悦 -- 257,115 +0xAF4E 0x788C # 碌 -- 257,116 +0xAF4F 0x6CB8 # 沸 -- 257,117 +0xAF50 0x6399 # 掙 -- 257,120 +0xAF51 0x789F # 碟 -- 257,121 +0xAF52 0x5C3F # 尿 -- 257,122 +0xAF53 0x93DF # 鏟 -- 257,123 +0xAF54 0x8E48 # 蹈 -- 257,124 +0xAF55 0x6C2B # 氫 -- 257,125 +0xAF56 0x6AC8 # 櫈 -- 257,126 +0xAF57 0x813E # 脾 -- 257,127 +0xAF58 0x59E5 # 姥 -- 257,130 +0xAF59 0x5958 # 奘 -- 257,131 +0xAF5A 0x6C85 # 沅 -- 257,132 +0xAF5B 0x8548 # 蕈 -- 257,133 +0xAF5C 0x54AA # 咪 -- 257,134 +0xAF5D 0x716C # 煬 -- 257,135 +0xAF5E 0x77E2 # 矢 -- 257,136 +0xAF5F 0x6AFB # 櫻 -- 257,137 +0xAF60 0x6031 # 怱 -- 257,140 +0xAF61 0x673D # 朽 -- 257,141 +0xAF62 0x69B4 # 榴 -- 257,142 +0xAF63 0x6688 # 暈 -- 257,143 +0xAF64 0x6756 # 杖 -- 257,144 +0xAF65 0x58AE # 墮 -- 257,145 +0xAF66 0x4F30 # 估 -- 257,146 +0xAF67 0x9B1A # 鬚 -- 257,147 +0xAF68 0x87EC # 蟬 -- 257,150 +0xAF69 0x5D4C # 嵌 -- 257,151 +0xAF6A 0x7B75 # 筵 -- 257,152 +0xAF6B 0x7A57 # 穗 -- 257,153 +0xAF6C 0x6FEB # 濫 -- 257,154 +0xAF6D 0x901B # 逛 -- 257,155 +0xAF6E 0x846B # 葫 -- 257,156 +0xAF6F 0x647A # 摺 -- 257,157 +0xAF70 0x8EC0 # 軀 -- 257,160 +0xAF71 0x83F1 # 菱 -- 257,161 +0xAF72 0x7B8F # 箏 -- 257,162 +0xAF73 0x553E # 唾 -- 257,163 +0xAF74 0x620A # 戊 -- 257,164 +0xAF75 0x86F9 # 蛹 -- 257,165 +0xAF76 0x82A5 # 芥 -- 257,166 +0xAF77 0x6C74 # 汴 -- 257,167 +0xAF78 0x8116 # 脖 -- 257,170 +0xAF79 0x6DAE # 涮 -- 257,171 +0xAF7A 0x620E # 戎 -- 257,172 +0xAF7B 0x978D # 鞍 -- 257,173 +0xAF7C 0x961C # 阜 -- 257,174 +0xAF7D 0x7199 # 熙 -- 257,175 +0xAF7E 0x671D # 朝 -- 257,176 +0xAFA1 0x78EF # 磯 -- 257,241 +0xAFA2 0x964C # 陌 -- 257,242 +0xAFA3 0x5514 # 唔 -- 257,243 +0xAFA4 0x720D # 爍 -- 257,244 +0xAFA5 0x9016 # 逖 -- 257,245 +0xAFA6 0x524C # 剌 -- 257,246 +0xAFA7 0x86A9 # 蚩 -- 257,247 +0xAFA8 0x5D9D # 嶝 -- 257,250 +0xAFA9 0x6C2F # 氯 -- 257,251 +0xAFAA 0x8CB8 # 貸 -- 257,252 +0xAFAB 0x9B91 # 鮑 -- 257,253 +0xAFAC 0x85E4 # 藤 -- 257,254 +0xAFAD 0x541F # 吟 -- 257,255 +0xAFAE 0x6E4A # 湊 -- 257,256 +0xAFAF 0x5BD3 # 寓 -- 257,257 +0xAFB0 0x7DFB # 緻 -- 257,260 +0xAFB1 0x9091 # 邑 -- 257,261 +0xAFB2 0x76BA # 皺 -- 257,262 +0xAFB3 0x6CBE # 沾 -- 257,263 +0xAFB4 0x91DC # 釜 -- 257,264 +0xAFB5 0x5256 # 剖 -- 257,265 +0xAFB6 0x64AE # 撮 -- 257,266 +0xAFB7 0x5B99 # 宙 -- 257,267 +0xAFB8 0x6DDE # 淞 -- 257,270 +0xAFB9 0x543B # 吻 -- 257,271 +0xAFBA 0x5527 # 唧 -- 257,272 +0xAFBB 0x9183 # 醃 -- 257,273 +0xAFBC 0x7FE9 # 翩 -- 257,274 +0xAFBD 0x6930 # 椰 -- 257,275 +0xAFBE 0x5764 # 坤 -- 257,276 +0xAFBF 0x55C5 # 嗅 -- 257,277 +0xAFC0 0x5162 # 兢 -- 257,300 +0xAFC1 0x9834 # 頴 -- 257,301 +0xAFC2 0x79A7 # 禧 -- 257,302 +0xAFC3 0x8471 # 葱 -- 257,303 +0xAFC4 0x7C0D # 簍 -- 257,304 +0xAFC5 0x68AD # 梭 -- 257,305 +0xAFC6 0x7C27 # 簧 -- 257,306 +0xAFC7 0x6E2D # 渭 -- 257,307 +0xAFC8 0x6BD3 # 毓 -- 257,310 +0xAFC9 0x6E44 # 湄 -- 257,311 +0xAFCA 0x88F4 # 裴 -- 257,312 +0xAFCB 0x7015 # 瀕 -- 257,313 +0xAFCC 0x6C9B # 沛 -- 257,314 +0xAFCD 0x93A2 # 鎢 -- 257,315 +0xAFCE 0x9EB4 # 麴 -- 257,316 +0xAFCF 0x838E # 莎 -- 257,317 +0xAFD0 0x750C # 甌 -- 257,320 +0xAFD1 0x5AD8 # 嫘 -- 257,321 +0xAFD2 0x59E6 # 姦 -- 257,322 +0xAFD3 0x56B0 # 嚰 -- 257,323 +0xAFD4 0x9451 # 鑑 -- 257,324 +0xAFD5 0x6D74 # 浴 -- 257,325 +0xAFD6 0x5BE2 # 寢 -- 257,326 +0xAFD7 0x5E25 # 帥 -- 257,327 +0xAFD8 0x7ACA # 竊 -- 257,330 +0xAFD9 0x819D # 膝 -- 257,331 +0xAFDA 0x8F9C # 辜 -- 257,332 +0xAFDB 0x852D # 蔭 -- 257,333 +0xAFDC 0x99AE # 馮 -- 257,334 +0xAFDD 0x588A # 墊 -- 257,335 +0xAFDE 0x797F # 祿 -- 257,336 +0xAFDF 0x75D8 # 痘 -- 257,337 +0xAFE0 0x7627 # 瘧 -- 257,340 +0xAFE1 0x849C # 蒜 -- 257,341 +0xAFE2 0x6A80 # 檀 -- 257,342 +0xAFE3 0x5146 # 兆 -- 257,343 +0xAFE4 0x7AC4 # 竄 -- 257,344 +0xAFE5 0x6490 # 撐 -- 257,345 +0xAFE6 0x68F2 # 棲 -- 257,346 +0xAFE7 0x55FD # 嗽 -- 257,347 +0xAFE8 0x88F9 # 裹 -- 257,350 +0xAFE9 0x5BE5 # 寥 -- 257,351 +0xAFEA 0x51CB # 凋 -- 257,352 +0xAFEB 0x711A # 焚 -- 257,353 +0xAFED 0x8DCB # 跋 -- 257,355 +0xAFEE 0x56AE # 嚮 -- 257,356 +0xAFEF 0x903E # 逾 -- 257,357 +0xAFF0 0x60BC # 悼 -- 257,360 +0xAFF1 0x7E45 # 繅 -- 257,361 +0xAFF2 0x632A # 挪 -- 257,362 +0xAFF3 0x501A # 倚 -- 257,363 +0xAFF4 0x8AA6 # 誦 -- 257,364 +0xAFF5 0x76EA # 盪 -- 257,365 +0xAFF6 0x68B5 # 梵 -- 257,366 +0xAFF7 0x5F65 # 彥 -- 257,367 +0xAFF8 0x9293 # 銓 -- 257,370 +0xAFF9 0x6853 # 桓 -- 257,371 +0xAFFA 0x7435 # 琵 -- 257,372 +0xAFFB 0x7436 # 琶 -- 257,373 +0xAFFC 0x5D69 # 嵩 -- 257,374 +0xAFFD 0x8910 # 褐 -- 257,375 +0xAFFE 0x54C4 # 哄 -- 257,376 diff --git a/unicode/xerox/unihan/XCCS-260=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-260=UNIHAN.TXT new file mode 100644 index 00000000..56b19cad --- /dev/null +++ b/unicode/xerox/unihan/XCCS-260=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "260" UNIHAN + +0xB021 0x83F4 # 菴 -- 260,041 +0xB022 0x7BE1 # 篡 -- 260,042 +0xB023 0x6D87 # 涇 -- 260,043 +0xB024 0x621F # 戟 -- 260,044 +0xB025 0x69AB # 榫 -- 260,045 +0xB026 0x7426 # 琦 -- 260,046 +0xB027 0x9EFB # 黻 -- 260,047 +0xB028 0x9245 # 鉅 -- 260,050 +0xB029 0x804A # 聊 -- 260,051 +0xB02A 0x8086 # 肆 -- 260,052 +0xB02B 0x50FB # 僻 -- 260,053 +0xB02C 0x62EF # 拯 -- 260,054 +0xB02D 0x8ECB # 軋 -- 260,055 +0xB02E 0x816B # 腫 -- 260,056 +0xB02F 0x56DA # 囚 -- 260,057 +0xB030 0x7891 # 碑 -- 260,060 +0xB031 0x61C8 # 懈 -- 260,061 +0xB032 0x6A35 # 樵 -- 260,062 +0xB033 0x6467 # 摧 -- 260,063 +0xB034 0x59DA # 姚 -- 260,064 +0xB035 0x6055 # 恕 -- 260,065 +0xB036 0x76FE # 盾 -- 260,066 +0xB037 0x5EEC # 廬 -- 260,067 +0xB038 0x9B41 # 魁 -- 260,070 +0xB039 0x632B # 挫 -- 260,071 +0xB03A 0x71D9 # 燙 -- 260,072 +0xB03B 0x6E3A # 渺 -- 260,073 +0xB03C 0x5561 # 啡 -- 260,074 +0xB03D 0x733F # 猿 -- 260,075 +0xB03E 0x5F59 # 彙 -- 260,076 +0xB03F 0x6B89 # 殉 -- 260,077 +0xB040 0x7C37 # 簷 -- 260,100 +0xB041 0x650F # 攏 -- 260,101 +0xB042 0x7940 # 祀 -- 260,102 +0xB043 0x51CC # 凌 -- 260,103 +0xB044 0x7C6C # 籬 -- 260,104 +0xB045 0x5703 # 圃 -- 260,105 +0xB046 0x9ECD # 黍 -- 260,106 +0xB047 0x8A60 # 詠 -- 260,107 +0xB048 0x5AC9 # 嫉 -- 260,110 +0xB049 0x5983 # 妃 -- 260,111 +0xB04A 0x7646 # 癆 -- 260,112 +0xB04B 0x7261 # 牡 -- 260,113 +0xB04C 0x9709 # 霉 -- 260,114 +0xB04D 0x8475 # 葵 -- 260,115 +0xB04E 0x6177 # 慷 -- 260,116 +0xB04F 0x5321 # 匡 -- 260,117 +0xB050 0x8708 # 蜈 -- 260,120 +0xB051 0x9C13 # 鰓 -- 260,121 +0xB052 0x56A8 # 嚨 -- 260,122 +0xB053 0x55D3 # 嗓 -- 260,123 +0xB054 0x86A3 # 蚣 -- 260,124 +0xB055 0x5319 # 匙 -- 260,125 +0xB056 0x4F15 # 伕 -- 260,126 +0xB057 0x5496 # 咖 -- 260,127 +0xB058 0x5384 # 厄 -- 260,130 +0xB059 0x7165 # 煥 -- 260,131 +0xB05A 0x8087 # 肇 -- 260,132 +0xB05B 0x85B0 # 薰 -- 260,133 +0xB05C 0x9716 # 霖 -- 260,134 +0xB05D 0x6493 # 撓 -- 260,135 +0xB05E 0x7A46 # 穆 -- 260,136 +0xB05F 0x7274 # 牴 -- 260,137 +0xB060 0x6FEF # 濯 -- 260,140 +0xB061 0x7A20 # 稠 -- 260,141 +0xB062 0x5480 # 咀 -- 260,142 +0xB063 0x7AC7 # 竇 -- 260,143 +0xB064 0x7FDF # 翟 -- 260,144 +0xB065 0x80F0 # 胰 -- 260,145 +0xB066 0x798E # 禎 -- 260,146 +0xB067 0x6F33 # 漳 -- 260,147 +0xB068 0x64BF # 撿 -- 260,150 +0xB069 0x715E # 煞 -- 260,151 +0xB06A 0x879F # 螟 -- 260,152 +0xB06B 0x7D02 # 紂 -- 260,153 +0xB06C 0x81DA # 臚 -- 260,154 +0xB06D 0x5830 # 堰 -- 260,155 +0xB06E 0x82FB # 苻 -- 260,156 +0xB06F 0x5676 # 噶 -- 260,157 +0xB070 0x58F9 # 壹 -- 260,160 +0xB071 0x914C # 酌 -- 260,161 +0xB072 0x5EB6 # 庶 -- 260,162 +0xB073 0x754F # 畏 -- 260,163 +0xB074 0x5378 # 卸 -- 260,164 +0xB075 0x6208 # 戈 -- 260,165 +0xB076 0x50AC # 催 -- 260,166 +0xB077 0x5835 # 堵 -- 260,167 +0xB078 0x5352 # 卒 -- 260,170 +0xB079 0x70D8 # 烘 -- 260,171 +0xB07A 0x818F # 膏 -- 260,172 +0xB07B 0x58C7 # 壇 -- 260,173 +0xB07C 0x8123 # 脣 -- 260,174 +0xB07D 0x896F # 襯 -- 260,175 +0xB07E 0x8235 # 舵 -- 260,176 +0xB0A1 0x7CA5 # 粥 -- 260,241 +0xB0A2 0x6977 # 楷 -- 260,242 +0xB0A3 0x6417 # 搗 -- 260,243 +0xB0A4 0x68DF # 棟 -- 260,244 +0xB0A5 0x62D0 # 拐 -- 260,245 +0xB0A6 0x68A2 # 梢 -- 260,246 +0xB0A7 0x6FB1 # 澱 -- 260,247 +0xB0A8 0x6500 # 攀 -- 260,250 +0xB0A9 0x5D87 # 嶇 -- 260,251 +0xB0AA 0x7DEF # 緯 -- 260,252 +0xB0AB 0x5C90 # 岐 -- 260,253 +0xB0AC 0x65FA # 旺 -- 260,254 +0xB0AD 0x8CBD # 貽 -- 260,255 +0xB0AE 0x6380 # 掀 -- 260,256 +0xB0AF 0x5085 # 傅 -- 260,257 +0xB0B0 0x70E4 # 烤 -- 260,260 +0xB0B1 0x860A # 蘊 -- 260,261 +0xB0B2 0x8F45 # 轅 -- 260,262 +0xB0B3 0x71AC # 熬 -- 260,263 +0xB0B4 0x576A # 坪 -- 260,264 +0xB0B5 0x6DE4 # 淤 -- 260,265 +0xB0B6 0x7E37 # 縷 -- 260,266 +0xB0B7 0x962A # 阪 -- 260,267 +0xB0B8 0x5C5C # 屜 -- 260,270 +0xB0B9 0x5F18 # 弘 -- 260,271 +0xB0BA 0x8713 # 蜓 -- 260,272 +0xB0BB 0x873B # 蜻 -- 260,273 +0xB0BC 0x9BE8 # 鯨 -- 260,274 +0xB0BD 0x5598 # 喘 -- 260,275 +0xB0BE 0x5398 # 厘 -- 260,276 +0xB0BF 0x6291 # 抑 -- 260,277 +0xB0C0 0x9B31 # 鬱 -- 260,300 +0xB0C1 0x98ED # 飭 -- 260,301 +0xB0C2 0x865E # 虞 -- 260,302 +0xB0C3 0x77BB # 瞻 -- 260,303 +0xB0C4 0x786F # 硯 -- 260,304 +0xB0C5 0x55DA # 嗚 -- 260,305 +0xB0C6 0x60F6 # 惶 -- 260,306 +0xB0C7 0x633E # 挾 -- 260,307 +0xB0C8 0x8084 # 肄 -- 260,310 +0xB0C9 0x7CD9 # 糙 -- 260,311 +0xB0CA 0x68FA # 棺 -- 260,312 +0xB0CB 0x70F9 # 烹 -- 260,313 +0xB0CC 0x7960 # 祠 -- 260,314 +0xB0CD 0x7DB4 # 綴 -- 260,315 +0xB0CE 0x5E5F # 幟 -- 260,316 +0xB0CF 0x8155 # 腕 -- 260,317 +0xB0D0 0x6BAE # 殮 -- 260,320 +0xB0D1 0x6BAF # 殯 -- 260,321 +0xB0D2 0x8A50 # 詐 -- 260,322 +0xB0D3 0x86C0 # 蛀 -- 260,323 +0xB0D4 0x4FFE # 俾 -- 260,324 +0xB0D5 0x8B0E # 謎 -- 260,325 +0xB0D6 0x9B44 # 魄 -- 260,326 +0xB0D7 0x8511 # 蔑 -- 260,327 +0xB0D8 0x8A1D # 訝 -- 260,330 +0xB0D9 0x5080 # 傀 -- 260,331 +0xB0DA 0x71EC # 燬 -- 260,332 +0xB0DB 0x5442 # 呂 -- 260,333 +0xB0DC 0x6953 # 楓 -- 260,334 +0xB0DD 0x904F # 遏 -- 260,335 +0xB0DE 0x83E0 # 菠 -- 260,336 +0xB0DF 0x707C # 灼 -- 260,337 +0xB0E0 0x76BF # 皿 -- 260,340 +0xB0E1 0x7766 # 睦 -- 260,341 +0xB0E2 0x7737 # 眷 -- 260,342 +0xB0E3 0x6C1B # 氛 -- 260,343 +0xB0E4 0x6C13 # 氓 -- 260,344 +0xB0E5 0x901E # 逞 -- 260,345 +0xB0E6 0x78BE # 碾 -- 260,346 +0xB0E7 0x851A # 蔚 -- 260,347 +0xB0E8 0x7901 # 礁 -- 260,350 +0xB0E9 0x5121 # 儡 -- 260,351 +0xB0EA 0x780C # 砌 -- 260,352 +0xB0EB 0x854A # 蕊 -- 260,353 +0xB0EC 0x7FF9 # 翹 -- 260,354 +0xB0ED 0x86FE # 蛾 -- 260,355 +0xB0EE 0x57A2 # 垢 -- 260,356 +0xB0EF 0x7779 # 睹 -- 260,357 +0xB0F0 0x576F # 坯 -- 260,360 +0xB0F1 0x7329 # 猩 -- 260,361 +0xB0F2 0x652C # 攬 -- 260,362 +0xB0F3 0x54FA # 哺 -- 260,363 +0xB0F4 0x853D # 蔽 -- 260,364 +0xB0F5 0x9DB4 # 鶴 -- 260,365 +0xB0F6 0x983B # 頻 -- 260,366 +0xB0F7 0x9006 # 逆 -- 260,367 +0xB0F8 0x9444 # 鑄 -- 260,370 +0xB0F9 0x4FB6 # 侶 -- 260,371 +0xB0FA 0x62C2 # 拂 -- 260,372 +0xB0FB 0x6789 # 枉 -- 260,373 +0xB0FC 0x8C6B # 豫 -- 260,374 +0xB0FD 0x6EBA # 溺 -- 260,375 +0xB0FE 0x834A # 荊 -- 260,376 diff --git a/unicode/xerox/unihan/XCCS-261=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-261=UNIHAN.TXT new file mode 100644 index 00000000..8234c0c8 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-261=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "261" UNIHAN + +0xB121 0x8638 # 蘸 -- 261,041 +0xB122 0x6C70 # 汰 -- 261,042 +0xB123 0x6021 # 怡 -- 261,043 +0xB124 0x5FF1 # 忱 -- 261,044 +0xB125 0x5BF5 # 寵 -- 261,045 +0xB126 0x9A37 # 騷 -- 261,046 +0xB127 0x64C5 # 擅 -- 261,047 +0xB128 0x7AC8 # 竈 -- 261,050 +0xB129 0x7D6E # 絮 -- 261,051 +0xB12A 0x9470 # 鑰 -- 261,052 +0xB12B 0x7525 # 甥 -- 261,053 +0xB12C 0x99B4 # 馴 -- 261,054 +0xB12D 0x7C3E # 簾 -- 261,055 +0xB12E 0x5FFF # 忿 -- 261,056 +0xB12F 0x655E # 敞 -- 261,057 +0xB130 0x4EA5 # 亥 -- 261,060 +0xB131 0x5FA1 # 御 -- 261,061 +0xB132 0x6D3D # 洽 -- 261,062 +0xB133 0x8D66 # 赦 -- 261,063 +0xB134 0x61FA # 懺 -- 261,064 +0xB135 0x758A # 疊 -- 261,065 +0xB136 0x77AC # 瞬 -- 261,066 +0xB137 0x8B4F # 譏 -- 261,067 +0xB138 0x589C # 墜 -- 261,070 +0xB139 0x6FE4 # 濤 -- 261,071 +0xB13A 0x82D1 # 苑 -- 261,072 +0xB13B 0x779E # 瞞 -- 261,073 +0xB13C 0x8A6D # 詭 -- 261,074 +0xB13D 0x9BC9 # 鯉 -- 261,075 +0xB13E 0x53C9 # 叉 -- 261,076 +0xB13F 0x54BD # 咽 -- 261,077 +0xB140 0x65AC # 斬 -- 261,100 +0xB141 0x808B # 肋 -- 261,101 +0xB142 0x55BB # 喻 -- 261,102 +0xB143 0x71A8 # 熨 -- 261,103 +0xB144 0x4FDE # 俞 -- 261,104 +0xB145 0x6AE5 # 櫥 -- 261,105 +0xB146 0x6B67 # 歧 -- 261,106 +0xB147 0x634F # 捏 -- 261,107 +0xB148 0x5A9A # 媚 -- 261,110 +0xB149 0x7AAA # 窪 -- 261,111 +0xB14A 0x6CBC # 沼 -- 261,112 +0xB14B 0x76DE # 盞 -- 261,113 +0xB14C 0x9839 # 頹 -- 261,114 +0xB14D 0x8943 # 襃 -- 261,115 +0xB14E 0x6233 # 戳 -- 261,116 +0xB14F 0x8654 # 虔 -- 261,117 +0xB150 0x672D # 札 -- 261,120 +0xB151 0x7BE4 # 篤 -- 261,121 +0xB152 0x8CAF # 貯 -- 261,122 +0xB153 0x7DE0 # 締 -- 261,123 +0xB154 0x6A1F # 樟 -- 261,124 +0xB155 0x66AE # 暮 -- 261,125 +0xB156 0x61E6 # 懦 -- 261,126 +0xB157 0x6ED4 # 滔 -- 261,127 +0xB158 0x85FB # 藻 -- 261,130 +0xB159 0x52BE # 劾 -- 261,131 +0xB15A 0x85D5 # 藕 -- 261,132 +0xB15B 0x7A84 # 窄 -- 261,133 +0xB15C 0x714E # 煎 -- 261,134 +0xB15D 0x63C0 # 揀 -- 261,135 +0xB15E 0x807E # 聾 -- 261,136 +0xB15F 0x7CEF # 糯 -- 261,137 +0xB160 0x6CE3 # 泣 -- 261,140 +0xB161 0x7A62 # 穢 -- 261,141 +0xB162 0x74A7 # 璧 -- 261,142 +0xB163 0x83BD # 莽 -- 261,143 +0xB164 0x5E9A # 庚 -- 261,144 +0xB165 0x9591 # 閑 -- 261,145 +0xB166 0x908F # 邏 -- 261,146 +0xB167 0x52D8 # 勘 -- 261,147 +0xB168 0x6BC6 # 毆 -- 261,150 +0xB169 0x97CB # 韋 -- 261,151 +0xB16A 0x5F17 # 弗 -- 261,152 +0xB16B 0x6846 # 框 -- 261,153 +0xB16C 0x62F1 # 拱 -- 261,154 +0xB16D 0x8A23 # 訣 -- 261,155 +0xB16E 0x8AA8 # 誨 -- 261,156 +0xB16F 0x5203 # 刃 -- 261,157 +0xB170 0x66A8 # 暨 -- 261,160 +0xB171 0x82DB # 苛 -- 261,161 +0xB172 0x8F3F # 輿 -- 261,162 +0xB173 0x6D36 # 洶 -- 261,163 +0xB174 0x533F # 匿 -- 261,164 +0xB175 0x7A98 # 窘 -- 261,165 +0xB176 0x4E4D # 乍 -- 261,166 +0xB177 0x625B # 扛 -- 261,167 +0xB178 0x50F5 # 僵 -- 261,170 +0xB179 0x6E23 # 渣 -- 261,171 +0xB17A 0x6EC4 # 滄 -- 261,172 +0xB17B 0x703E # 瀾 -- 261,173 +0xB17C 0x5B09 # 嬉 -- 261,174 +0xB17D 0x5CFB # 峻 -- 261,175 +0xB17E 0x5544 # 啄 -- 261,176 +0xB1A1 0x4FD0 # 俐 -- 261,241 +0xB1A2 0x97A6 # 鞦 -- 261,242 +0xB1A3 0x4FE0 # 俠 -- 261,243 +0xB1A4 0x6893 # 梓 -- 261,244 +0xB1A5 0x792B # 礫 -- 261,245 +0xB1A6 0x755A # 畚 -- 261,246 +0xB1A7 0x8822 # 蠢 -- 261,247 +0xB1A8 0x6C08 # 氈 -- 261,250 +0xB1A9 0x9112 # 鄒 -- 261,251 +0xB1AA 0x914B # 酋 -- 261,252 +0xB1AB 0x92C5 # 鋅 -- 261,253 +0xB1AC 0x9803 # 頃 -- 261,254 +0xB1AD 0x8CB3 # 貳 -- 261,255 +0xB1AE 0x8CD1 # 賑 -- 261,256 +0xB1AF 0x514C # 兌 -- 261,257 +0xB1B0 0x8ED2 # 軒 -- 261,260 +0xB1B1 0x82DF # 苟 -- 261,261 +0xB1B2 0x6614 # 昔 -- 261,262 +0xB1B3 0x522A # 刪 -- 261,263 +0xB1B4 0x938A # 鎊 -- 261,264 +0xB1B5 0x75E2 # 痢 -- 261,265 +0xB1B6 0x7011 # 瀑 -- 261,266 +0xB1B7 0x67F5 # 柵 -- 261,267 +0xB1B8 0x7ABA # 窺 -- 261,270 +0xB1B9 0x8E89 # 躉 -- 261,271 +0xB1BA 0x9472 # 鑲 -- 261,272 +0xB1BB 0x6B83 # 殃 -- 261,273 +0xB1BC 0x8AE7 # 諧 -- 261,274 +0xB1BD 0x64D2 # 擒 -- 261,275 +0xB1BE 0x68DA # 棚 -- 261,276 +0xB1BF 0x88D9 # 裙 -- 261,277 +0xB1C0 0x6F97 # 澗 -- 261,300 +0xB1C1 0x819B # 膛 -- 261,301 +0xB1C2 0x986B # 顫 -- 261,302 +0xB1C3 0x8354 # 荔 -- 261,303 +0xB1C4 0x8FC4 # 迄 -- 261,304 +0xB1C5 0x65ED # 旭 -- 261,305 +0xB1C6 0x7FF0 # 翰 -- 261,306 +0xB1C7 0x527F # 剿 -- 261,307 +0xB1C8 0x5919 # 夙 -- 261,310 +0xB1C9 0x60BD # 悽 -- 261,311 +0xB1CA 0x86A4 # 蚤 -- 261,312 +0xB1CB 0x5180 # 冀 -- 261,313 +0xB1CC 0x6B79 # 歹 -- 261,314 +0xB1CD 0x5C39 # 尹 -- 261,315 +0xB1CE 0x7316 # 猖 -- 261,316 +0xB1CF 0x66E0 # 曠 -- 261,317 +0xB1D0 0x9761 # 靡 -- 261,320 +0xB1D1 0x8534 # 蔴 -- 261,321 +0xB1D2 0x7CE0 # 糠 -- 261,322 +0xB1D3 0x8513 # 蔓 -- 261,323 +0xB1D4 0x8098 # 肘 -- 261,324 +0xB1D5 0x82AD # 芭 -- 261,325 +0xB1D6 0x8165 # 腥 -- 261,326 +0xB1D7 0x95A4 # 閤 -- 261,327 +0xB1D8 0x8782 # 螂 -- 261,330 +0xB1D9 0x9BFD # 鯽 -- 261,331 +0xB1DA 0x8594 # 薔 -- 261,332 +0xB1DB 0x81BA # 膺 -- 261,333 +0xB1DC 0x66D9 # 曙 -- 261,334 +0xB1DD 0x58D5 # 壕 -- 261,335 +0xB1DE 0x6D8E # 涎 -- 261,336 +0xB1DF 0x8768 # 蝨 -- 261,337 +0xB1E0 0x87B3 # 螳 -- 261,340 +0xB1E1 0x9320 # 錠 -- 261,341 +0xB1E2 0x6582 # 斂 -- 261,342 +0xB1E3 0x7678 # 癸 -- 261,343 +0xB1E4 0x75B9 # 疹 -- 261,344 +0xB1E5 0x574A # 坊 -- 261,345 +0xB1E6 0x6753 # 杓 -- 261,346 +0xB1E7 0x7898 # 碘 -- 261,347 +0xB1E8 0x8C4C # 豌 -- 261,350 +0xB1E9 0x740D # 琍 -- 261,351 +0xB1EA 0x85A6 # 薦 -- 261,352 +0xB1EB 0x6EEF # 滯 -- 261,353 +0xB1EC 0x4FF8 # 俸 -- 261,354 +0xB1ED 0x8B01 # 謁 -- 261,355 +0xB1EE 0x7AE3 # 竣 -- 261,356 +0xB1EF 0x4FDF # 俟 -- 261,357 +0xB1F0 0x90AA # 邪 -- 261,360 +0xB1F1 0x9F4B # 齋 -- 261,361 +0xB1F2 0x79BE # 禾 -- 261,362 +0xB1F3 0x7D79 # 絹 -- 261,363 +0xB1F4 0x8D16 # 贖 -- 261,364 +0xB1F5 0x5B7A # 孺 -- 261,365 +0xB1F6 0x77EF # 矯 -- 261,366 +0xB1F7 0x674F # 杏 -- 261,367 +0xB1F8 0x69D0 # 槐 -- 261,370 +0xB1F9 0x8259 # 艙 -- 261,371 +0xB1FA 0x61CA # 懊 -- 261,372 +0xB1FB 0x8FA3 # 辣 -- 261,373 +0xB1FC 0x77DB # 矛 -- 261,374 +0xB1FD 0x608D # 悍 -- 261,375 +0xB1FE 0x7D5E # 絞 -- 261,376 diff --git a/unicode/xerox/unihan/XCCS-262=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-262=UNIHAN.TXT new file mode 100644 index 00000000..85db8abd --- /dev/null +++ b/unicode/xerox/unihan/XCCS-262=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "262" UNIHAN + +0xB221 0x61AB # 憫 -- 262,041 +0xB222 0x8CB6 # 貶 -- 262,042 +0xB223 0x77A5 # 瞥 -- 262,043 +0xB224 0x991E # 餞 -- 262,044 +0xB225 0x69FD # 槽 -- 262,045 +0xB226 0x541D # 吝 -- 262,046 +0xB227 0x74E3 # 瓣 -- 262,047 +0xB228 0x7DB5 # 綵 -- 262,050 +0xB229 0x56A5 # 嚥 -- 262,051 +0xB22A 0x6252 # 扒 -- 262,052 +0xB22B 0x849E # 蒞 -- 262,053 +0xB22C 0x5E1B # 帛 -- 262,054 +0xB22D 0x92B9 # 銹 -- 262,055 +0xB22E 0x8A6B # 詫 -- 262,056 +0xB22F 0x9F63 # 齣 -- 262,057 +0xB230 0x99C1 # 駁 -- 262,060 +0xB231 0x923A # 鈺 -- 262,061 +0xB232 0x5B55 # 孕 -- 262,062 +0xB233 0x5E87 # 庇 -- 262,063 +0xB234 0x5B5A # 孚 -- 262,064 +0xB235 0x8FC2 # 迂 -- 262,065 +0xB236 0x8FED # 迭 -- 262,066 +0xB237 0x515C # 兜 -- 262,067 +0xB238 0x9310 # 錐 -- 262,070 +0xB239 0x9AB8 # 骸 -- 262,071 +0xB23A 0x6CAB # 沫 -- 262,072 +0xB23B 0x7119 # 焙 -- 262,073 +0xB23C 0x6B16 # 欖 -- 262,074 +0xB23D 0x6A44 # 橄 -- 262,075 +0xB23E 0x8019 # 耙 -- 262,076 +0xB23F 0x5243 # 剃 -- 262,077 +0xB240 0x8DDB # 跛 -- 262,100 +0xB241 0x6A62 # 橢 -- 262,101 +0xB242 0x604D # 恍 -- 262,102 +0xB243 0x7337 # 猷 -- 262,103 +0xB244 0x6770 # 杰 -- 262,104 +0xB245 0x7470 # 瑰 -- 262,105 +0xB246 0x9871 # 顱 -- 262,106 +0xB247 0x516E # 兮 -- 262,107 +0xB248 0x7BC6 # 篆 -- 262,110 +0xB249 0x77C7 # 矇 -- 262,111 +0xB24A 0x6C5E # 汞 -- 262,112 +0xB24B 0x9165 # 酥 -- 262,113 +0xB24C 0x51F0 # 凰 -- 262,114 +0xB24D 0x792C # 礬 -- 262,115 +0xB24E 0x5B7D # 孽 -- 262,116 +0xB24F 0x5543 # 啃 -- 262,117 +0xB250 0x4E38 # 丸 -- 262,120 +0xB251 0x8236 # 舶 -- 262,121 +0xB252 0x6B7F # 歿 -- 262,122 +0xB253 0x6897 # 梗 -- 262,123 +0xB254 0x5962 # 奢 -- 262,124 +0xB255 0x6064 # 恤 -- 262,125 +0xB256 0x7D33 # 紳 -- 262,126 +0xB257 0x6777 # 杷 -- 262,127 +0xB258 0x900D # 逍 -- 262,130 +0xB259 0x55C7 # 嗇 -- 262,131 +0xB25A 0x5016 # 倖 -- 262,132 +0xB25B 0x646F # 摯 -- 262,133 +0xB25C 0x56C2 # 囂 -- 262,134 +0xB25D 0x9EEF # 黯 -- 262,135 +0xB25E 0x533E # 匾 -- 262,136 +0xB25F 0x60B4 # 悴 -- 262,137 +0xB260 0x95E1 # 闡 -- 262,140 +0xB261 0x599D # 妝 -- 262,141 +0xB262 0x7DDD # 緝 -- 262,142 +0xB263 0x8AA3 # 誣 -- 262,143 +0xB264 0x8AA1 # 誡 -- 262,144 +0xB265 0x96A7 # 隧 -- 262,145 +0xB266 0x81A9 # 膩 -- 262,146 +0xB267 0x81BF # 膿 -- 262,147 +0xB268 0x9774 # 靴 -- 262,150 +0xB269 0x6EA2 # 溢 -- 262,151 +0xB26A 0x4F3A # 伺 -- 262,152 +0xB26B 0x6519 # 攙 -- 262,153 +0xB26C 0x9598 # 閘 -- 262,154 +0xB26D 0x840E # 萎 -- 262,155 +0xB26E 0x958F # 閏 -- 262,156 +0xB26F 0x73AB # 玫 -- 262,157 +0xB270 0x6845 # 桅 -- 262,160 +0xB271 0x5506 # 唆 -- 262,161 +0xB272 0x8892 # 袒 -- 262,162 +0xB273 0x7396 # 玖 -- 262,163 +0xB274 0x55DC # 嗜 -- 262,164 +0xB275 0x5653 # 噓 -- 262,165 +0xB276 0x63E9 # 揩 -- 262,166 +0xB277 0x8778 # 蝸 -- 262,167 +0xB278 0x9830 # 頰 -- 262,170 +0xB279 0x5195 # 冕 -- 262,171 +0xB27A 0x6C72 # 汲 -- 262,172 +0xB27B 0x566A # 噪 -- 262,173 +0xB27C 0x6813 # 栓 -- 262,174 +0xB27D 0x80ED # 胭 -- 262,175 +0xB27E 0x6A94 # 檔 -- 262,176 +0xB2A1 0x84C9 # 蓉 -- 262,241 +0xB2A2 0x78FA # 磺 -- 262,242 +0xB2A3 0x98EA # 飪 -- 262,243 +0xB2A4 0x7463 # 瑣 -- 262,244 +0xB2A5 0x4F63 # 佣 -- 262,245 +0xB2A6 0x8373 # 荳 -- 262,246 +0xB2A7 0x884D # 衍 -- 262,247 +0xB2A8 0x7B94 # 箔 -- 262,250 +0xB2A9 0x5D14 # 崔 -- 262,251 +0xB2AA 0x98B6 # 颶 -- 262,252 +0xB2AB 0x99ED # 駭 -- 262,253 +0xB2AC 0x75F3 # 痳 -- 262,254 +0xB2AD 0x7CB3 # 粳 -- 262,255 +0xB2AE 0x99B1 # 馱 -- 262,256 +0xB2AF 0x620C # 戌 -- 262,257 +0xB2B0 0x7C6E # 籮 -- 262,260 +0xB2B1 0x9F0E # 鼎 -- 262,261 +0xB2B2 0x920D # 鈍 -- 262,262 +0xB2B3 0x69BB # 榻 -- 262,263 +0xB2B4 0x7DD8 # 緘 -- 262,264 +0xB2B5 0x5055 # 偕 -- 262,265 +0xB2B6 0x60B5 # 悵 -- 262,266 +0xB2B7 0x78A9 # 碩 -- 262,267 +0xB2B8 0x7B4D # 筍 -- 262,270 +0xB2B9 0x68E0 # 棠 -- 262,271 +0xB2BA 0x840C # 萌 -- 262,272 +0xB2BB 0x5379 # 卹 -- 262,273 +0xB2BC 0x6726 # 朦 -- 262,274 +0xB2BD 0x59DC # 姜 -- 262,275 +0xB2BE 0x59BE # 妾 -- 262,276 +0xB2BF 0x91C1 # 釁 -- 262,277 +0xB2C0 0x6479 # 摹 -- 262,300 +0xB2C1 0x4EDF # 仟 -- 262,301 +0xB2C2 0x6787 # 枇 -- 262,302 +0xB2C3 0x4F88 # 侈 -- 262,303 +0xB2C4 0x88F8 # 裸 -- 262,304 +0xB2C5 0x81B3 # 膳 -- 262,305 +0xB2C6 0x766E # 癮 -- 262,306 +0xB2C7 0x7E55 # 繕 -- 262,307 +0xB2C8 0x67E9 # 柩 -- 262,310 +0xB2C9 0x7C9F # 粟 -- 262,311 +0xB2CA 0x8AC9 # 諉 -- 262,312 +0xB2CB 0x82DE # 苞 -- 262,313 +0xB2CC 0x6EAF # 溯 -- 262,314 +0xB2CD 0x60E6 # 惦 -- 262,315 +0xB2CE 0x8925 # 褥 -- 262,316 +0xB2CF 0x5277 # 剷 -- 262,317 +0xB2D0 0x8591 # 薑 -- 262,320 +0xB2D1 0x58EC # 壬 -- 262,321 +0xB2D2 0x64C4 # 擄 -- 262,322 +0xB2D3 0x975B # 靛 -- 262,323 +0xB2D4 0x9432 # 鐲 -- 262,324 +0xB2D5 0x7AA0 # 窠 -- 262,325 +0xB2D6 0x4ED5 # 仕 -- 262,326 +0xB2D7 0x5F57 # 彗 -- 262,327 +0xB2D8 0x6FFA # 濺 -- 262,330 +0xB2D9 0x8C41 # 豁 -- 262,331 +0xB2DA 0x609A # 悚 -- 262,332 +0xB2DB 0x9F15 # 鼕 -- 262,333 +0xB2DC 0x5323 # 匣 -- 262,334 +0xB2DD 0x7B06 # 笆 -- 262,335 +0xB2DE 0x51E0 # 几 -- 262,336 +0xB2DF 0x787C # 硼 -- 262,337 +0xB2E0 0x84C6 # 蓆 -- 262,340 +0xB2E1 0x75A4 # 疤 -- 262,341 +0xB2E2 0x9D26 # 鴦 -- 262,342 +0xB2E3 0x9D1B # 鴛 -- 262,343 +0xB2E4 0x934D # 鍍 -- 262,344 +0xB2E5 0x9E1E # 鸞 -- 262,345 +0xB2E6 0x95BB # 閻 -- 262,346 +0xB2E7 0x5F1B # 弛 -- 262,347 +0xB2E8 0x5366 # 卦 -- 262,350 +0xB2E9 0x502A # 倪 -- 262,351 +0xB2EA 0x7B19 # 笙 -- 262,352 +0xB2EB 0x5BC5 # 寅 -- 262,353 +0xB2EC 0x7280 # 犀 -- 262,354 +0xB2ED 0x7A37 # 稷 -- 262,355 +0xB2EE 0x7AC5 # 竅 -- 262,356 +0xB2EF 0x776C # 睬 -- 262,357 +0xB2F0 0x8378 # 荸 -- 262,360 +0xB2F1 0x71D0 # 燐 -- 262,361 +0xB2F2 0x6A59 # 橙 -- 262,362 +0xB2F3 0x8816 # 蠖 -- 262,363 +0xB2F4 0x53F1 # 叱 -- 262,364 +0xB2F5 0x5201 # 刁 -- 262,365 +0xB2F6 0x55F6 # 嗶 -- 262,366 +0xB2F7 0x965E # 陞 -- 262,367 +0xB2F8 0x7B8B # 箋 -- 262,370 +0xB2F9 0x53C1 # 叁 -- 262,371 +0xB2FA 0x8477 # 葷 -- 262,372 +0xB2FB 0x6059 # 恙 -- 262,373 +0xB2FC 0x95A8 # 閨 -- 262,374 +0xB2FD 0x708A # 炊 -- 262,375 +0xB2FE 0x5A29 # 娩 -- 262,376 diff --git a/unicode/xerox/unihan/XCCS-263=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-263=UNIHAN.TXT new file mode 100644 index 00000000..530e9f83 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-263=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "263" UNIHAN + +0xB321 0x4F43 # 佃 -- 263,041 +0xB322 0x9163 # 酣 -- 263,042 +0xB323 0x7A9F # 窟 -- 263,043 +0xB324 0x5AE1 # 嫡 -- 263,044 +0xB325 0x5EB5 # 庵 -- 263,045 +0xB326 0x8AF1 # 諱 -- 263,046 +0xB327 0x7E0A # 縊 -- 263,047 +0xB328 0x5254 # 剔 -- 263,050 +0xB329 0x5DD4 # 巔 -- 263,051 +0xB32A 0x7C2B # 簫 -- 263,052 +0xB32B 0x7601 # 瘁 -- 263,053 +0xB32C 0x62D9 # 拙 -- 263,054 +0xB32D 0x5614 # 嘔 -- 263,055 +0xB32E 0x8B04 # 謄 -- 263,056 +0xB32F 0x4E9F # 亟 -- 263,057 +0xB330 0x8F12 # 輒 -- 263,060 +0xB331 0x7F88 # 羈 -- 263,061 +0xB332 0x6DEB # 淫 -- 263,062 +0xB333 0x637A # 捺 -- 263,063 +0xB334 0x8A70 # 詰 -- 263,064 +0xB335 0x9B28 # 鬨 -- 263,065 +0xB336 0x8902 # 褂 -- 263,066 +0xB337 0x8F4D # 轍 -- 263,067 +0xB338 0x9A3E # 騾 -- 263,070 +0xB339 0x67FF # 柿 -- 263,071 +0xB33A 0x69C1 # 槁 -- 263,072 +0xB33B 0x7DBE # 綾 -- 263,073 +0xB33C 0x7B50 # 筐 -- 263,074 +0xB33D 0x9B22 # 鬢 -- 263,075 +0xB33E 0x764C # 癌 -- 263,076 +0xB33F 0x610E # 愎 -- 263,077 +0xB340 0x7A08 # 稈 -- 263,100 +0xB341 0x7BE9 # 篩 -- 263,101 +0xB342 0x753A # 町 -- 263,102 +0xB343 0x7252 # 牒 -- 263,103 +0xB344 0x5F27 # 弧 -- 263,104 +0xB345 0x82D4 # 苔 -- 263,105 +0xB346 0x8B1F # 謟 -- 263,106 +0xB347 0x9157 # 酗 -- 263,107 +0xB348 0x7E82 # 纂 -- 263,110 +0xB349 0x659F # 斟 -- 263,111 +0xB34A 0x513B # 儻 -- 263,112 +0xB34B 0x71FB # 燻 -- 263,113 +0xB34C 0x8F1C # 輜 -- 263,114 +0xB34D 0x7658 # 癘 -- 263,115 +0xB34E 0x8855 # 衕 -- 263,116 +0xB34F 0x7E59 # 繙 -- 263,117 +0xB350 0x9903 # 餃 -- 263,120 +0xB351 0x9DC2 # 鷂 -- 263,121 +0xB352 0x6273 # 扳 -- 263,122 +0xB353 0x7BD9 # 篙 -- 263,123 +0xB354 0x885A # 衚 -- 263,124 +0xB355 0x8A16 # 訖 -- 263,125 +0xB356 0x5993 # 妓 -- 263,126 +0xB357 0x8CC3 # 賃 -- 263,127 +0xB358 0x8AED # 諭 -- 263,130 +0xB359 0x9283 # 銃 -- 263,131 +0xB35A 0x5A3C # 娼 -- 263,132 +0xB35B 0x66DC # 曜 -- 263,133 +0xB35C 0x6BCB # 毋 -- 263,134 +0xB35D 0x733E # 猾 -- 263,135 +0xB35E 0x7661 # 癡 -- 263,136 +0xB35F 0x8CC4 # 賄 -- 263,137 +0xB360 0x8D13 # 贓 -- 263,140 +0xB361 0x9909 # 餉 -- 263,141 +0xB362 0x9149 # 酉 -- 263,142 +0xB363 0x5197 # 冗 -- 263,143 +0xB364 0x66E9 # 曩 -- 263,144 +0xB365 0x7258 # 牘 -- 263,145 +0xB366 0x761F # 瘟 -- 263,146 +0xB367 0x7F44 # 罄 -- 263,147 +0xB368 0x8CD2 # 賒 -- 263,150 +0xB369 0x895F # 襟 -- 263,151 +0xB36A 0x9957 # 饗 -- 263,152 +0xB36B 0x7230 # 爰 -- 263,153 +0xB36C 0x5800 # 堀 -- 263,154 +0xB36D 0x9E93 # 麓 -- 263,155 +0xB36E 0x8AF7 # 諷 -- 263,156 +0xB36F 0x6A9C # 檜 -- 263,157 +0xB370 0x562F # 嘯 -- 263,160 +0xB371 0x7CB9 # 粹 -- 263,161 +0xB372 0x8389 # 莉 -- 263,162 +0xB373 0x6DD2 # 淒 -- 263,163 +0xB374 0x572D # 圭 -- 263,164 +0xB375 0x73CA # 珊 -- 263,165 +0xB376 0x82E7 # 苧 -- 263,166 +0xB377 0x55B2 # 喲 -- 263,167 +0xB378 0x8587 # 薇 -- 263,170 +0xB379 0x80F1 # 胱 -- 263,171 +0xB37A 0x745C # 瑜 -- 263,172 +0xB37B 0x85E9 # 藩 -- 263,173 +0xB37C 0x5D34 # 崴 -- 263,174 +0xB37D 0x54AF # 咯 -- 263,175 +0xB37E 0x6C7E # 汾 -- 263,176 +0xB3A1 0x7C7D # 籽 -- 263,241 +0xB3A2 0x5CB7 # 岷 -- 263,242 +0xB3A3 0x9D6C # 鵬 -- 263,243 +0xB3A4 0x56C9 # 囉 -- 263,244 +0xB3A5 0x7620 # 瘠 -- 263,245 +0xB3A6 0x5583 # 喃 -- 263,246 +0xB3A7 0x5CE8 # 峨 -- 263,247 +0xB3A8 0x80DA # 胚 -- 263,250 +0xB3A9 0x7B4F # 筏 -- 263,251 +0xB3AA 0x70D9 # 烙 -- 263,252 +0xB3AB 0x79BF # 禿 -- 263,253 +0xB3AC 0x92BB # 銻 -- 263,254 +0xB3AD 0x6556 # 敖 -- 263,255 +0xB3AE 0x748B # 璋 -- 263,256 +0xB3AF 0x880D # 蠍 -- 263,257 +0xB3B0 0x911E # 鄞 -- 263,260 +0xB3B1 0x5537 # 唷 -- 263,261 +0xB3B2 0x773A # 眺 -- 263,262 +0xB3B3 0x96DB # 雛 -- 263,263 +0xB3B4 0x6D6C # 浬 -- 263,264 +0xB3B5 0x6F6F # 潯 -- 263,265 +0xB3B6 0x79AA # 禪 -- 263,266 +0xB3B7 0x6D2E # 洮 -- 263,267 +0xB3B8 0x5189 # 冉 -- 263,270 +0xB3B9 0x59EB # 姫 -- 263,271 +0xB3BA 0x9240 # 鉀 -- 263,272 +0xB3BB 0x5ADA # 嫚 -- 263,273 +0xB3BC 0x55B3 # 喳 -- 263,274 +0xB3BD 0x7FCC # 翌 -- 263,275 +0xB3BE 0x962E # 阮 -- 263,276 +0xB3BF 0x66DD # 曝 -- 263,277 +0xB3C0 0x8FAE # 辮 -- 263,300 +0xB3C1 0x54A6 # 咦 -- 263,301 +0xB3C2 0x6734 # 朴 -- 263,302 +0xB3C3 0x69CC # 槌 -- 263,303 +0xB3C4 0x53AE # 厮 -- 263,304 +0xB3C5 0x6643 # 晃 -- 263,305 +0xB3C6 0x78F7 # 磷 -- 263,306 +0xB3C7 0x5C41 # 屁 -- 263,307 +0xB3C8 0x785D # 硝 -- 263,310 +0xB3C9 0x8392 # 莒 -- 263,311 +0xB3CA 0x921E # 鈞 -- 263,312 +0xB3CB 0x9F94 # 龔 -- 263,313 +0xB3CC 0x67DA # 柚 -- 263,314 +0xB3CD 0x79C9 # 秉 -- 263,315 +0xB3CE 0x5862 # 塢 -- 263,316 +0xB3CF 0x8B28 # 謨 -- 263,317 +0xB3D0 0x745B # 瑛 -- 263,320 +0xB3D1 0x97F6 # 韶 -- 263,321 +0xB3D2 0x93B3 # 鎳 -- 263,322 +0xB3D3 0x6CD7 # 泗 -- 263,323 +0xB3D4 0x5B5C # 孜 -- 263,324 +0xB3D5 0x9D61 # 鵡 -- 263,325 +0xB3D6 0x7784 # 瞄 -- 263,326 +0xB3D7 0x55EF # 嗯 -- 263,327 +0xB3D8 0x5944 # 奄 -- 263,330 +0xB3D9 0x7F8C # 羌 -- 263,331 +0xB3DA 0x74CF # 瓏 -- 263,332 +0xB3DB 0x83A8 # 莨 -- 263,333 +0xB3DC 0x610D # 愍 -- 263,334 +0xB3DD 0x8AE6 # 諦 -- 263,335 +0xB3DE 0x6DBF # 涿 -- 263,336 +0xB3DF 0x912F # 鄯 -- 263,337 +0xB3E0 0x561F # 嘟 -- 263,340 +0xB3E1 0x6FFC # 濼 -- 263,341 +0xB3E2 0x6D31 # 洱 -- 263,342 +0xB3E3 0x62C7 # 拇 -- 263,343 +0xB3E4 0x4FCF # 俏 -- 263,344 +0xB3E5 0x7736 # 眶 -- 263,345 +0xB3E6 0x7CDC # 糜 -- 263,346 +0xB3E7 0x64B0 # 撰 -- 263,347 +0xB3E8 0x6960 # 楠 -- 263,350 +0xB3E9 0x72FD # 狽 -- 263,351 +0xB3EA 0x745A # 瑚 -- 263,352 +0xB3EB 0x7A96 # 窖 -- 263,353 +0xB3EC 0x6FEC # 濬 -- 263,354 +0xB3ED 0x6670 # 晰 -- 263,355 +0xB3EE 0x90B8 # 邸 -- 263,356 +0xB3EF 0x91C9 # 釉 -- 263,357 +0xB3F0 0x768E # 皎 -- 263,360 +0xB3F1 0x64A9 # 撩 -- 263,361 +0xB3F2 0x5140 # 兀 -- 263,362 +0xB3F3 0x7A92 # 窒 -- 263,363 +0xB3F4 0x53A5 # 厥 -- 263,364 +0xB3F5 0x55A7 # 喧 -- 263,365 +0xB3F6 0x6F2C # 漬 -- 263,366 +0xB3F7 0x6221 # 戡 -- 263,367 +0xB3F8 0x5A9B # 媛 -- 263,370 +0xB3F9 0x6AB3 # 檳 -- 263,371 +0xB3FA 0x8200 # 舀 -- 263,372 +0xB3FB 0x84BF # 蒿 -- 263,373 +0xB3FC 0x7827 # 砧 -- 263,374 +0xB3FD 0x8466 # 葦 -- 263,375 +0xB3FE 0x5CEA # 峪 -- 263,376 diff --git a/unicode/xerox/unihan/XCCS-264=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-264=UNIHAN.TXT new file mode 100644 index 00000000..2adcdec6 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-264=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "264" UNIHAN + +0xB421 0x742A # 琪 -- 264,041 +0xB422 0x4E98 # 亘 -- 264,042 +0xB423 0x6C40 # 汀 -- 264,043 +0xB424 0x9E1A # 鸚 -- 264,044 +0xB425 0x6840 # 桀 -- 264,045 +0xB426 0x5E62 # 幢 -- 264,046 +0xB427 0x7E43 # 繃 -- 264,047 +0xB428 0x73C0 # 珀 -- 264,050 +0xB429 0x594E # 奎 -- 264,051 +0xB42A 0x752C # 甬 -- 264,052 +0xB42B 0x8B74 # 譴 -- 264,053 +0xB42C 0x637B # 捻 -- 264,054 +0xB42D 0x6E26 # 渦 -- 264,055 +0xB42E 0x74E0 # 瓠 -- 264,056 +0xB42F 0x5632 # 嘲 -- 264,057 +0xB430 0x574E # 坎 -- 264,060 +0xB431 0x7A1C # 稜 -- 264,061 +0xB432 0x602F # 怯 -- 264,062 +0xB433 0x6414 # 搔 -- 264,063 +0xB434 0x547B # 呻 -- 264,064 +0xB435 0x8EFC # 軼 -- 264,065 +0xB436 0x546A # 呪 -- 264,066 +0xB437 0x4E1E # 丞 -- 264,067 +0xB438 0x8A54 # 詔 -- 264,070 +0xB439 0x9704 # 霄 -- 264,071 +0xB43A 0x5477 # 呷 -- 264,072 +0xB43B 0x4F3D # 伽 -- 264,073 +0xB43C 0x542D # 吭 -- 264,074 +0xB43D 0x6CB1 # 沱 -- 264,075 +0xB43E 0x936C # 鍬 -- 264,076 +0xB43F 0x690E # 椎 -- 264,077 +0xB440 0x9354 # 鍔 -- 264,100 +0xB441 0x6FDB # 濛 -- 264,101 +0xB442 0x5695 # 嚕 -- 264,102 +0xB443 0x6FA7 # 澧 -- 264,103 +0xB444 0x9223 # 鈣 -- 264,104 +0xB445 0x993E # 餾 -- 264,105 +0xB446 0x9BC0 # 鯀 -- 264,106 +0xB447 0x729B # 犛 -- 264,107 +0xB448 0x97A3 # 鞣 -- 264,110 +0xB449 0x7740 # 着 -- 264,111 +0xB44A 0x78CB # 磋 -- 264,112 +0xB44B 0x9E92 # 麒 -- 264,113 +0xB44C 0x90B5 # 邵 -- 264,114 +0xB44D 0x7C38 # 簸 -- 264,115 +0xB44E 0x7949 # 祉 -- 264,116 +0xB44F 0x9215 # 鈕 -- 264,117 +0xB450 0x7A4C # 穌 -- 264,120 +0xB451 0x737A # 獺 -- 264,121 +0xB452 0x7FB2 # 羲 -- 264,122 +0xB453 0x70AF # 炯 -- 264,123 +0xB454 0x56EA # 囪 -- 264,124 +0xB455 0x98BC # 颼 -- 264,125 +0xB456 0x606B # 恫 -- 264,126 +0xB457 0x563F # 嘿 -- 264,127 +0xB458 0x9A5B # 驛 -- 264,130 +0xB459 0x97C6 # 韆 -- 264,131 +0xB45A 0x7E9C # 纜 -- 264,132 +0xB45B 0x700F # 瀏 -- 264,133 +0xB45C 0x9698 # 隘 -- 264,134 +0xB45D 0x7469 # 瑩 -- 264,135 +0xB45E 0x99A8 # 馨 -- 264,136 +0xB45F 0x9127 # 鄧 -- 264,137 +0xB460 0x98B3 # 颳 -- 264,140 +0xB461 0x6C3E # 氾 -- 264,141 +0xB462 0x6E1D # 渝 -- 264,142 +0xB463 0x8F3E # 輾 -- 264,143 +0xB464 0x7018 # 瀘 -- 264,144 +0xB465 0x715C # 煜 -- 264,145 +0xB466 0x8FE6 # 迦 -- 264,146 +0xB467 0x741B # 琛 -- 264,147 +0xB468 0x84C0 # 蓀 -- 264,150 +0xB469 0x58E2 # 壢 -- 264,151 +0xB46A 0x6ECC # 滌 -- 264,152 +0xB46B 0x6396 # 掖 -- 264,153 +0xB46C 0x6EC2 # 滂 -- 264,154 +0xB46D 0x520E # 刎 -- 264,155 +0xB46E 0x5CED # 峭 -- 264,156 +0xB46F 0x5239 # 刹 -- 264,157 +0xB470 0x5CAC # 岬 -- 264,160 +0xB471 0x9744 # 靄 -- 264,161 +0xB472 0x7425 # 琥 -- 264,162 +0xB473 0x9713 # 霓 -- 264,163 +0xB474 0x95C8 # 闈 -- 264,164 +0xB475 0x9F07 # 鼇 -- 264,165 +0xB476 0x9B03 # 鬃 -- 264,166 +0xB477 0x6F29 # 漩 -- 264,167 +0xB478 0x6E5F # 湟 -- 264,170 +0xB479 0x73CF # 珏 -- 264,171 +0xB47A 0x90FE # 郾 -- 264,172 +0xB47B 0x9315 # 錕 -- 264,173 +0xB47C 0x6DD9 # 淙 -- 264,174 +0xB47D 0x768B # 皋 -- 264,175 +0xB47E 0x86FA # 蛺 -- 264,176 +0xB4A1 0x8171 # 腱 -- 264,241 +0xB4A2 0x91A3 # 醣 -- 264,242 +0xB4A3 0x4EC6 # 仆 -- 264,243 +0xB4A4 0x6912 # 椒 -- 264,244 +0xB4A5 0x627C # 扼 -- 264,245 +0xB4A6 0x7DBD # 綽 -- 264,246 +0xB4A7 0x6727 # 朧 -- 264,247 +0xB4A8 0x9742 # 靂 -- 264,250 +0xB4A9 0x9739 # 霹 -- 264,251 +0xB4AA 0x77B3 # 瞳 -- 264,252 +0xB4AB 0x9661 # 陡 -- 264,253 +0xB4AC 0x5608 # 嘈 -- 264,254 +0xB4AD 0x9EA9 # 麩 -- 264,255 +0xB4AE 0x7370 # 獰 -- 264,256 +0xB4AF 0x7AFA # 竺 -- 264,257 +0xB4B0 0x95AD # 閭 -- 264,260 +0xB4B1 0x5ED3 # 廓 -- 264,261 +0xB4B2 0x7FE1 # 翡 -- 264,262 +0xB4B3 0x8938 # 褸 -- 264,263 +0xB4B4 0x5630 # 嘰 -- 264,264 +0xB4B5 0x795F # 祟 -- 264,265 +0xB4B6 0x99D2 # 駒 -- 264,266 +0xB4B7 0x6CAC # 沬 -- 264,267 +0xB4B8 0x778C # 瞌 -- 264,270 +0xB4B9 0x942E # 鐮 -- 264,271 +0xB4BA 0x7F4E # 罎 -- 264,272 +0xB4BB 0x598D # 妍 -- 264,273 +0xB4BC 0x7729 # 眩 -- 264,274 +0xB4BD 0x51A5 # 冥 -- 264,275 +0xB4BE 0x8F9F # 辟 -- 264,276 +0xB4BF 0x8096 # 肖 -- 264,277 +0xB4C0 0x8EAA # 躪 -- 264,300 +0xB4C1 0x58C5 # 壅 -- 264,301 +0xB4C2 0x5885 # 墅 -- 264,302 +0xB4C3 0x60CB # 惋 -- 264,303 +0xB4C4 0x5733 # 圳 -- 264,304 +0xB4C5 0x759A # 疚 -- 264,305 +0xB4C6 0x87AB # 螫 -- 264,306 +0xB4C7 0x664C # 晌 -- 264,307 +0xB4C8 0x809B # 肛 -- 264,310 +0xB4C9 0x5C94 # 岔 -- 264,311 +0xB4CA 0x5F6A # 彪 -- 264,312 +0xB4CB 0x9262 # 鉢 -- 264,313 +0xB4CC 0x98E9 # 飩 -- 264,314 +0xB4CD 0x9DFA # 鷺 -- 264,315 +0xB4CE 0x776B # 睫 -- 264,316 +0xB4CF 0x8046 # 聆 -- 264,317 +0xB4D0 0x8E34 # 踴 -- 264,320 +0xB4D1 0x7464 # 瑤 -- 264,321 +0xB4D2 0x7504 # 甄 -- 264,322 +0xB4D3 0x6C90 # 沐 -- 264,323 +0xB4D4 0x7099 # 炙 -- 264,324 +0xB4D5 0x618A # 憊 -- 264,325 +0xB4D6 0x6EA5 # 溥 -- 264,326 +0xB4D7 0x8E42 # 蹂 -- 264,327 +0xB4D8 0x7357 # 獗 -- 264,330 +0xB4D9 0x6590 # 斐 -- 264,331 +0xB4DA 0x62DA # 拚 -- 264,332 +0xB4DB 0x832D # 茭 -- 264,333 +0xB4DC 0x643D # 搽 -- 264,334 +0xB4DD 0x991B # 餛 -- 264,335 +0xB4DE 0x9CF6 # 鳶 -- 264,336 +0xB4DF 0x9912 # 餒 -- 264,337 +0xB4E0 0x6C68 # 汨 -- 264,340 +0xB4E1 0x7728 # 眨 -- 264,341 +0xB4E2 0x68D8 # 棘 -- 264,342 +0xB4E3 0x649A # 撚 -- 264,343 +0xB4E4 0x5436 # 吶 -- 264,344 +0xB4E5 0x600F # 怏 -- 264,345 +0xB4E6 0x7B20 # 笠 -- 264,346 +0xB4E7 0x9C77 # 鱷 -- 264,347 +0xB4E8 0x645C # 摜 -- 264,350 +0xB4E9 0x6DCC # 淌 -- 264,351 +0xB4EA 0x6F80 # 澀 -- 264,352 +0xB4EB 0x71BE # 熾 -- 264,353 +0xB4EC 0x70AC # 炬 -- 264,354 +0xB4ED 0x5F3C # 弼 -- 264,355 +0xB4EE 0x615F # 慟 -- 264,356 +0xB4EF 0x5DCD # 巍 -- 264,357 +0xB4F0 0x623E # 戾 -- 264,360 +0xB4F1 0x9C2D # 鰭 -- 264,361 +0xB4F2 0x8335 # 茵 -- 264,362 +0xB4F3 0x85BA # 薺 -- 264,363 +0xB4F4 0x5241 # 剁 -- 264,364 +0xB4F5 0x6487 # 撇 -- 264,365 +0xB4F6 0x797A # 祺 -- 264,366 +0xB4F7 0x7FB6 # 羶 -- 264,367 +0xB4F8 0x7566 # 畦 -- 264,370 +0xB4F9 0x88B1 # 袱 -- 264,371 +0xB4FA 0x641E # 搞 -- 264,372 +0xB4FB 0x50E5 # 僥 -- 264,373 +0xB4FC 0x81CD # 臍 -- 264,374 +0xB4FD 0x7669 # 癩 -- 264,375 +0xB4FE 0x7DB0 # 綰 -- 264,376 diff --git a/unicode/xerox/unihan/XCCS-265=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-265=UNIHAN.TXT new file mode 100644 index 00000000..225a95fd --- /dev/null +++ b/unicode/xerox/unihan/XCCS-265=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "265" UNIHAN + +0xB521 0x766C # 癬 -- 265,041 +0xB522 0x7C07 # 簇 -- 265,042 +0xB523 0x70B3 # 炳 -- 265,043 +0xB524 0x5F99 # 徙 -- 265,044 +0xB525 0x99FF # 駿 -- 265,045 +0xB526 0x9050 # 遐 -- 265,046 +0xB527 0x6E43 # 湃 -- 265,047 +0xB528 0x7E08 # 縈 -- 265,050 +0xB529 0x55C4 # 嗄 -- 265,051 +0xB52A 0x55FE # 嗾 -- 265,052 +0xB52B 0x7529 # 甩 -- 265,053 +0xB52C 0x9921 # 餡 -- 265,054 +0xB52D 0x5680 # 嚀 -- 265,055 +0xB52E 0x9DE5 # 鷥 -- 265,056 +0xB52F 0x5478 # 呸 -- 265,057 +0xB530 0x64A2 # 撢 -- 265,060 +0xB531 0x70FD # 烽 -- 265,061 +0xB532 0x5420 # 吠 -- 265,062 +0xB533 0x7095 # 炕 -- 265,063 +0xB534 0x7D46 # 絆 -- 265,064 +0xB535 0x9F3E # 鼾 -- 265,065 +0xB536 0x892B # 褫 -- 265,066 +0xB537 0x7656 # 癖 -- 265,067 +0xB538 0x7D0A # 紊 -- 265,070 +0xB539 0x7459 # 瑙 -- 265,071 +0xB53A 0x9EBE # 麾 -- 265,072 +0xB53B 0x6452 # 摒 -- 265,073 +0xB53C 0x87C6 # 蟆 -- 265,074 +0xB53D 0x6371 # 捱 -- 265,075 +0xB53E 0x83A7 # 莧 -- 265,076 +0xB53F 0x74E2 # 瓢 -- 265,077 +0xB540 0x9AB7 # 骷 -- 265,100 +0xB541 0x8331 # 茱 -- 265,101 +0xB542 0x8299 # 芙 -- 265,102 +0xB543 0x9A01 # 騁 -- 265,103 +0xB544 0x816E # 腮 -- 265,104 +0xB545 0x83F0 # 菰 -- 265,105 +0xB546 0x861A # 蘚 -- 265,106 +0xB547 0x63EA # 揪 -- 265,107 +0xB548 0x5950 # 奐 -- 265,110 +0xB549 0x8983 # 覃 -- 265,111 +0xB54A 0x88E8 # 裨 -- 265,112 +0xB54B 0x61FF # 懿 -- 265,113 +0xB54C 0x8AF3 # 諳 -- 265,114 +0xB54D 0x7F58 # 罘 -- 265,115 +0xB54E 0x8B2C # 謬 -- 265,116 +0xB54F 0x8E7C # 蹼 -- 265,117 +0xB550 0x531D # 匝 -- 265,120 +0xB551 0x5C2C # 尬 -- 265,121 +0xB552 0x5C4E # 屎 -- 265,122 +0xB553 0x91E7 # 釧 -- 265,123 +0xB554 0x8435 # 萵 -- 265,124 +0xB555 0x71C9 # 燉 -- 265,125 +0xB556 0x5563 # 啣 -- 265,126 +0xB557 0x6506 # 攆 -- 265,127 +0xB558 0x9394 # 鎔 -- 265,130 +0xB559 0x995E # 饞 -- 265,131 +0xB55A 0x7671 # 癱 -- 265,132 +0xB55B 0x5742 # 坂 -- 265,133 +0xB55C 0x7624 # 瘤 -- 265,134 +0xB55D 0x701B # 瀛 -- 265,135 +0xB55E 0x8584 # 薄 -- 265,136 +0xB55F 0x8E4B # 蹋 -- 265,137 +0xB560 0x7843 # 硃 -- 265,140 +0xB561 0x752D # 甭 -- 265,141 +0xB562 0x54AD # 咭 -- 265,142 +0xB563 0x8611 # 蘑 -- 265,143 +0xB564 0x6525 # 攥 -- 265,144 +0xB565 0x5AD6 # 嫖 -- 265,145 +0xB566 0x88D4 # 裔 -- 265,146 +0xB567 0x6014 # 怔 -- 265,147 +0xB568 0x893B # 褻 -- 265,150 +0xB569 0x89B2 # 覲 -- 265,151 +0xB56A 0x8A4E # 詎 -- 265,152 +0xB56B 0x8CC2 # 賂 -- 265,153 +0xB56C 0x50CD # 働 -- 265,154 +0xB56D 0x592D # 夭 -- 265,155 +0xB56E 0x6ED3 # 滓 -- 265,156 +0xB56F 0x701D # 瀝 -- 265,157 +0xB570 0x4E2B # 丫 -- 265,160 +0xB571 0x5A20 # 娠 -- 265,161 +0xB572 0x5ABC # 媼 -- 265,162 +0xB573 0x5B40 # 孀 -- 265,163 +0xB574 0x5501 # 唁 -- 265,164 +0xB575 0x5EC2 # 廂 -- 265,165 +0xB576 0x643E # 搾 -- 265,166 +0xB577 0x676A # 杪 -- 265,167 +0xB578 0x6B80 # 殀 -- 265,170 +0xB579 0x6C05 # 氅 -- 265,171 +0xB57A 0x6DB5 # 涵 -- 265,172 +0xB57B 0x71FC # 燼 -- 265,173 +0xB57C 0x7292 # 犒 -- 265,174 +0xB57D 0x7594 # 疔 -- 265,175 +0xB57E 0x75D4 # 痔 -- 265,176 +0xB5A1 0x75FF # 痿 -- 265,241 +0xB5A2 0x7696 # 皖 -- 265,242 +0xB5A3 0x77DC # 矜 -- 265,243 +0xB5A4 0x7A3C # 稼 -- 265,244 +0xB5A5 0x7BF7 # 篷 -- 265,245 +0xB5A6 0x7CB1 # 粱 -- 265,246 +0xB5A7 0x7F94 # 羔 -- 265,247 +0xB5A8 0x8338 # 茸 -- 265,250 +0xB5A9 0x8839 # 蠹 -- 265,251 +0xB5AA 0x8A03 # 訃 -- 265,252 +0xB5AB 0x8A1B # 訛 -- 265,253 +0xB5AC 0x8B92 # 讒 -- 265,254 +0xB5AD 0x8C82 # 貂 -- 265,255 +0xB5AE 0x8D05 # 贅 -- 265,256 +0xB5AF 0x8F13 # 輓 -- 265,257 +0xB5B0 0x8FE8 # 迨 -- 265,260 +0xB5B1 0x4F47 # 佇 -- 265,261 +0xB5B2 0x6E6E # 湮 -- 265,262 +0xB5B3 0x6F15 # 漕 -- 265,263 +0xB5B4 0x9051 # 遑 -- 265,264 +0xB5B5 0x907D # 遽 -- 265,265 +0xB5B6 0x9087 # 邇 -- 265,266 +0xB5B7 0x90DD # 郝 -- 265,267 +0xB5B8 0x71CE # 燎 -- 265,270 +0xB5B9 0x9114 # 鄔 -- 265,271 +0xB5BA 0x5FA0 # 徠 -- 265,272 +0xB5BB 0x5FED # 忭 -- 265,273 +0xB5BC 0x6106 # 愆 -- 265,274 +0xB5BD 0x63C6 # 揆 -- 265,275 +0xB5BE 0x7325 # 猥 -- 265,276 +0xB5BF 0x75CA # 痊 -- 265,277 +0xB5C0 0x7D13 # 紓 -- 265,300 +0xB5C1 0x7D40 # 絀 -- 265,301 +0xB5C2 0x80E5 # 胥 -- 265,302 +0xB5C3 0x81C6 # 臆 -- 265,303 +0xB5C4 0x81FB # 臻 -- 265,304 +0xB5C5 0x8862 # 衢 -- 265,305 +0xB5C6 0x8882 # 袂 -- 265,306 +0xB5C7 0x88D8 # 裘 -- 265,307 +0xB5C8 0x8E76 # 蹶 -- 265,310 +0xB5C9 0x8F1F # 輟 -- 265,311 +0xB5CA 0x8FD3 # 迓 -- 265,312 +0xB5CB 0x5E96 # 庖 -- 265,313 +0xB5CC 0x4EC4 # 仄 -- 265,314 +0xB5CD 0x50C9 # 僉 -- 265,315 +0xB5CE 0x6083 # 悃 -- 265,316 +0xB5CF 0x7F79 # 罹 -- 265,317 +0xB5D0 0x8B10 # 謐 -- 265,320 +0xB5D1 0x66F7 # 曷 -- 265,321 +0xB5D2 0x534D # 卍 -- 265,322 +0xB5D3 0x536F # 卯 -- 265,323 +0xB5D4 0x574D # 坍 -- 265,324 +0xB5D5 0x5C38 # 尸 -- 265,325 +0xB5D6 0x5ED1 # 廑 -- 265,326 +0xB5D7 0x6043 # 恃 -- 265,327 +0xB5D8 0x63E3 # 揣 -- 265,330 +0xB5D9 0x642A # 搪 -- 265,331 +0xB5DA 0x67D2 # 柒 -- 265,332 +0xB5DB 0x6DC6 # 淆 -- 265,333 +0xB5DC 0x75E7 # 痧 -- 265,334 +0xB5DD 0x7E10 # 縐 -- 265,335 +0xB5DE 0x8129 # 脩 -- 265,336 +0xB5DF 0x8222 # 舢 -- 265,337 +0xB5E0 0x86D4 # 蛔 -- 265,340 +0xB5E1 0x8856 # 衖 -- 265,341 +0xB5E2 0x9776 # 靶 -- 265,342 +0xB5E3 0x571C # 圜 -- 265,343 +0xB5E4 0x5DF3 # 巳 -- 265,344 +0xB5E5 0x5DF5 # 巵 -- 265,345 +0xB5E6 0x609E # 悞 -- 265,346 +0xB5E7 0x7ADA # 竚 -- 265,347 +0xB5E8 0x7433 # 琳 -- 265,350 +0xB5E9 0x717D # 煽 -- 265,351 +0xB5EA 0x4F09 # 伉 -- 265,352 +0xB5EB 0x619A # 憚 -- 265,353 +0xB5EC 0x7028 # 瀨 -- 265,354 +0xB5ED 0x6194 # 憔 -- 265,355 +0xB5EE 0x4F96 # 侖 -- 265,356 +0xB5EF 0x5E5B # 幛 -- 265,357 +0xB5F0 0x90C1 # 郁 -- 265,360 +0xB5F1 0x6EF8 # 滸 -- 265,361 +0xB5F2 0x6E25 # 渥 -- 265,362 +0xB5F3 0x64E2 # 擢 -- 265,363 +0xB5F4 0x66E6 # 曦 -- 265,364 +0xB5F5 0x7064 # 灤 -- 265,365 +0xB5F6 0x8EA1 # 躡 -- 265,366 +0xB5F7 0x5029 # 倩 -- 265,367 +0xB5F8 0x739F # 玟 -- 265,370 +0xB5F9 0x5914 # 夔 -- 265,371 +0xB5FA 0x58DF # 壟 -- 265,372 +0xB5FB 0x86FB # 蛻 -- 265,373 +0xB5FC 0x923E # 鈾 -- 265,374 +0xB5FD 0x8214 # 舔 -- 265,375 +0xB5FE 0x8815 # 蠕 -- 265,376 diff --git a/unicode/xerox/unihan/XCCS-266=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-266=UNIHAN.TXT new file mode 100644 index 00000000..6fc60d3e --- /dev/null +++ b/unicode/xerox/unihan/XCCS-266=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "266" UNIHAN + +0xB621 0x4E52 # 乒 -- 266,041 +0xB622 0x4E53 # 乓 -- 266,042 +0xB623 0x7F9A # 羚 -- 266,043 +0xB624 0x7DB8 # 綸 -- 266,044 +0xB625 0x77B0 # 瞰 -- 266,045 +0xB626 0x6894 # 梔 -- 266,046 +0xB627 0x943A # 鐺 -- 266,047 +0xB628 0x947E # 鑾 -- 266,050 +0xB629 0x9238 # 鈸 -- 266,051 +0xB62A 0x8964 # 襤 -- 266,052 +0xB62B 0x9821 # 頡 -- 266,053 +0xB62C 0x6C76 # 汶 -- 266,054 +0xB62D 0x8ED4 # 軔 -- 266,055 +0xB62E 0x5EBE # 庾 -- 266,056 +0xB62F 0x5E61 # 幡 -- 266,057 +0xB630 0x8D67 # 赧 -- 266,060 +0xB631 0x60FA # 惺 -- 266,061 +0xB632 0x6FD8 # 濘 -- 266,062 +0xB633 0x9711 # 霑 -- 266,063 +0xB634 0x56B6 # 嚶 -- 266,064 +0xB635 0x9A6A # 驪 -- 266,065 +0xB636 0x8E29 # 踩 -- 266,066 +0xB637 0x525C # 剜 -- 266,067 +0xB638 0x7838 # 砸 -- 266,070 +0xB639 0x9403 # 鐃 -- 266,071 +0xB63A 0x9C31 # 鰱 -- 266,072 +0xB63B 0x746F # 瑯 -- 266,073 +0xB63C 0x9278 # 鉸 -- 266,074 +0xB63D 0x500C # 倌 -- 266,075 +0xB63E 0x73EA # 珪 -- 266,076 +0xB63F 0x781D # 砝 -- 266,077 +0xB640 0x8DB4 # 趴 -- 266,100 +0xB641 0x6123 # 愣 -- 266,101 +0xB642 0x945E # 鑞 -- 266,102 +0xB643 0x7407 # 琇 -- 266,103 +0xB644 0x927B # 鉻 -- 266,104 +0xB645 0x9333 # 錳 -- 266,105 +0xB646 0x6C2E # 氮 -- 266,106 +0xB647 0x567C # 噼 -- 266,107 +0xB648 0x9938 # 餸 -- 266,110 +0xB649 0x5349 # 卉 -- 266,111 +0xB64A 0x696B # 楫 -- 266,112 +0xB64B 0x6AAC # 檬 -- 266,113 +0xB64C 0x9685 # 隅 -- 266,114 +0xB64D 0x6C8C # 沌 -- 266,115 +0xB64E 0x7693 # 皓 -- 266,116 +0xB64F 0x51DC # 凜 -- 266,117 +0xB650 0x7E8D # 纍 -- 266,120 +0xB651 0x83A2 # 莢 -- 266,121 +0xB652 0x50DA # 僚 -- 266,122 +0xB653 0x5BD0 # 寐 -- 266,123 +0xB654 0x9187 # 醇 -- 266,124 +0xB655 0x892A # 褪 -- 266,125 +0xB656 0x5F8A # 徊 -- 266,126 +0xB657 0x66F3 # 曳 -- 266,127 +0xB658 0x5F98 # 徘 -- 266,130 +0xB659 0x8F3B # 輻 -- 266,131 +0xB65A 0x5137 # 儷 -- 266,132 +0xB65B 0x69B7 # 榷 -- 266,133 +0xB65C 0x6E4D # 湍 -- 266,134 +0xB65D 0x56E4 # 囤 -- 266,135 +0xB65E 0x7319 # 猙 -- 266,136 +0xB65F 0x7526 # 甦 -- 266,137 +0xB660 0x5ABE # 媾 -- 266,140 +0xB661 0x96CD # 雍 -- 266,141 +0xB662 0x6A0A # 樊 -- 266,142 +0xB663 0x6ED5 # 滕 -- 266,143 +0xB664 0x6FE0 # 濠 -- 266,144 +0xB665 0x8A52 # 詒 -- 266,145 +0xB666 0x747E # 瑾 -- 266,146 +0xB667 0x965B # 陛 -- 266,147 +0xB668 0x606C # 恬 -- 266,150 +0xB669 0x5486 # 咆 -- 266,151 +0xB66A 0x5D50 # 嵐 -- 266,152 +0xB66B 0x5B71 # 孱 -- 266,153 +0xB66C 0x984E # 顎 -- 266,154 +0xB66D 0x8301 # 茁 -- 266,155 +0xB66E 0x7D62 # 絢 -- 266,156 +0xB66F 0x77D7 # 矗 -- 266,157 +0xB670 0x6AB8 # 檸 -- 266,160 +0xB671 0x57E4 # 埤 -- 266,161 +0xB672 0x6C82 # 沂 -- 266,162 +0xB673 0x678B # 枋 -- 266,163 +0xB674 0x5443 # 呃 -- 266,164 +0xB675 0x5D01 # 崁 -- 266,165 +0xB676 0x7811 # 砑 -- 266,166 +0xB677 0x93DD # 鏝 -- 266,167 +0xB678 0x4F6F # 佯 -- 266,170 +0xB679 0x91D7 # 釗 -- 266,171 +0xB67A 0x64E3 # 擣 -- 266,172 +0xB67B 0x95CC # 闌 -- 266,173 +0xB67C 0x8712 # 蜒 -- 266,174 +0xB67D 0x5DD2 # 巒 -- 266,175 +0xB67E 0x618E # 憎 -- 266,176 +0xB6A1 0x990C # 餌 -- 266,241 +0xB6A2 0x65A1 # 斡 -- 266,242 +0xB6A3 0x4E15 # 丕 -- 266,243 +0xB6A4 0x82AE # 芮 -- 266,244 +0xB6A5 0x5955 # 奕 -- 266,245 +0xB6A6 0x6DF3 # 淳 -- 266,246 +0xB6A7 0x5A11 # 娑 -- 266,247 +0xB6A8 0x7405 # 琅 -- 266,250 +0xB6A9 0x931A # 錚 -- 266,251 +0xB6AA 0x7166 # 煦 -- 266,252 +0xB6AB 0x8734 # 蜴 -- 266,253 +0xB6AC 0x80E4 # 胤 -- 266,254 +0xB6AD 0x5564 # 啤 -- 266,255 +0xB6AE 0x803F # 耿 -- 266,256 +0xB6AF 0x9631 # 阱 -- 266,257 +0xB6B0 0x76D4 # 盔 -- 266,260 +0xB6B1 0x78F4 # 磴 -- 266,261 +0xB6B2 0x97DC # 韜 -- 266,262 +0xB6B3 0x5BB8 # 宸 -- 266,263 +0xB6B4 0x916A # 酪 -- 266,264 +0xB6B5 0x93AC # 鎬 -- 266,265 +0xB6B6 0x4EB3 # 亳 -- 266,266 +0xB6B7 0x84D3 # 蓓 -- 266,267 +0xB6B8 0x50D6 # 僖 -- 266,270 +0xB6B9 0x869C # 蚜 -- 266,271 +0xB6BA 0x6384 # 掄 -- 266,272 +0xB6BB 0x740A # 琊 -- 266,273 +0xB6BC 0x8725 # 蜥 -- 266,274 +0xB6BD 0x6DAA # 涪 -- 266,275 +0xB6BE 0x95D0 # 闐 -- 266,276 +0xB6BF 0x68FB # 棻 -- 266,277 +0xB6C0 0x9FA2 # 龢 -- 266,300 +0xB6C1 0x6600 # 昀 -- 266,301 +0xB6C2 0x6F2F # 漯 -- 266,302 +0xB6C3 0x7457 # 瑗 -- 266,303 +0xB6C4 0x640C # 搌 -- 266,304 +0xB6C5 0x715A # 煚 -- 266,305 +0xB6C6 0x7B84 # 箄 -- 266,306 +0xB6C7 0x57AE # 垮 -- 266,307 +0xB6C8 0x7957 # 祗 -- 266,310 +0xB6C9 0x7CE2 # 糢 -- 266,311 +0xB6CA 0x87DD # 蟝 -- 266,312 +0xB6CB 0x8D76 # 赶 -- 266,313 +0xB6CC 0x9824 # 頤 -- 266,314 +0xB6CD 0x63A3 # 掣 -- 266,315 +0xB6CE 0x81FE # 臾 -- 266,316 +0xB6CF 0x5A7F # 婿 -- 266,317 +0xB6D0 0x6518 # 攘 -- 266,320 +0xB6D1 0x6DAF # 涯 -- 266,321 +0xB6D2 0x63AC # 掬 -- 266,322 +0xB6D3 0x8018 # 耘 -- 266,323 +0xB6D4 0x640F # 搏 -- 266,324 +0xB6D5 0x6627 # 昧 -- 266,325 +0xB6D6 0x8403 # 萃 -- 266,326 +0xB6D7 0x725F # 牟 -- 266,327 +0xB6D8 0x7F54 # 罔 -- 266,330 +0xB6D9 0x6D5A # 浚 -- 266,331 +0xB6DA 0x74BD # 璽 -- 266,332 +0xB6DB 0x8006 # 耆 -- 266,333 +0xB6DC 0x560D # 嘍 -- 266,334 +0xB6DD 0x8076 # 聶 -- 266,335 +0xB6DE 0x8AEB # 諫 -- 266,336 +0xB6DF 0x585A # 塚 -- 266,337 +0xB6E0 0x85D0 # 藐 -- 266,340 +0xB6E1 0x6689 # 暉 -- 266,341 +0xB6E2 0x54EE # 哮 -- 266,342 +0xB6E3 0x6292 # 抒 -- 266,343 +0xB6E4 0x5043 # 偃 -- 266,344 +0xB6E5 0x8A15 # 訕 -- 266,345 +0xB6E6 0x5CAB # 岫 -- 266,346 +0xB6E7 0x6CAE # 沮 -- 266,347 +0xB6E8 0x82BB # 芻 -- 266,350 +0xB6E9 0x6DC7 # 淇 -- 266,351 +0xB6EA 0x80DB # 胛 -- 266,352 +0xB6EB 0x6968 # 楨 -- 266,353 +0xB6EC 0x5331 # 匱 -- 266,354 +0xB6ED 0x60D5 # 惕 -- 266,355 +0xB6EE 0x8A63 # 詣 -- 266,356 +0xB6EF 0x71E7 # 燧 -- 266,357 +0xB6F0 0x5D1B # 崛 -- 266,360 +0xB6F1 0x613E # 愾 -- 266,361 +0xB6F2 0x8559 # 蕙 -- 266,362 +0xB6F3 0x83A0 # 莠 -- 266,363 +0xB6F4 0x6994 # 榔 -- 266,364 +0xB6F5 0x63CD # 揍 -- 266,365 +0xB6F6 0x777D # 睽 -- 266,366 +0xB6F7 0x78AD # 碭 -- 266,367 +0xB6F8 0x6ECE # 滎 -- 266,370 +0xB6F9 0x749C # 璜 -- 266,371 +0xB6FA 0x6C28 # 氨 -- 266,372 +0xB6FB 0x73E3 # 珣 -- 266,373 +0xB6FC 0x5471 # 呱 -- 266,374 +0xB6FD 0x6153 # 慓 -- 266,375 +0xB6FE 0x701F # 瀟 -- 266,376 diff --git a/unicode/xerox/unihan/XCCS-267=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-267=UNIHAN.TXT new file mode 100644 index 00000000..ae9fa517 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-267=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "267" UNIHAN + +0xB721 0x8DDA # 跚 -- 267,041 +0xB722 0x89B7 # 覷 -- 267,042 +0xB723 0x6C50 # 汐 -- 267,043 +0xB724 0x70AB # 炫 -- 267,044 +0xB725 0x5F12 # 弒 -- 267,045 +0xB726 0x77A0 # 瞠 -- 267,046 +0xB727 0x8339 # 茹 -- 267,047 +0xB728 0x8393 # 莓 -- 267,050 +0xB729 0x5D84 # 嶄 -- 267,051 +0xB72A 0x812F # 脯 -- 267,052 +0xB72B 0x6D93 # 涓 -- 267,053 +0xB72C 0x60BB # 悻 -- 267,054 +0xB72D 0x743A # 琺 -- 267,055 +0xB72E 0x75BD # 疽 -- 267,056 +0xB72F 0x8D6D # 赭 -- 267,057 +0xB730 0x7738 # 眸 -- 267,060 +0xB731 0x5664 # 噤 -- 267,061 +0xB732 0x9A4D # 驍 -- 267,062 +0xB733 0x5E4C # 幌 -- 267,063 +0xB734 0x9C78 # 鱸 -- 267,064 +0xB735 0x760D # 瘍 -- 267,065 +0xB736 0x64BC # 撼 -- 267,066 +0xB737 0x72E9 # 狩 -- 267,067 +0xB738 0x839E # 莞 -- 267,070 +0xB739 0x889E # 袞 -- 267,071 +0xB73A 0x5793 # 垓 -- 267,072 +0xB73B 0x6249 # 扉 -- 267,073 +0xB73C 0x7030 # 瀰 -- 267,074 +0xB73D 0x61A9 # 憩 -- 267,075 +0xB73E 0x8E60 # 蹠 -- 267,076 +0xB73F 0x56AD # 嚭 -- 267,077 +0xB740 0x6B59 # 歙 -- 267,100 +0xB741 0x86B6 # 蚶 -- 267,101 +0xB742 0x86C4 # 蛄 -- 267,102 +0xB743 0x695E # 楞 -- 267,103 +0xB744 0x8188 # 膈 -- 267,104 +0xB745 0x5F5D # 彝 -- 267,105 +0xB746 0x97C3 # 韃 -- 267,106 +0xB747 0x80B1 # 肱 -- 267,107 +0xB748 0x6BD7 # 毗 -- 267,110 +0xB749 0x84F4 # 蓴 -- 267,111 +0xB74A 0x548E # 咎 -- 267,112 +0xB74B 0x6DB8 # 涸 -- 267,113 +0xB74C 0x8E35 # 踵 -- 267,114 +0xB74D 0x8A85 # 誅 -- 267,115 +0xB74E 0x6115 # 愕 -- 267,116 +0xB74F 0x622E # 戮 -- 267,117 +0xB750 0x8E59 # 蹙 -- 267,120 +0xB751 0x968D # 隍 -- 267,121 +0xB752 0x608C # 悌 -- 267,122 +0xB753 0x645F # 摟 -- 267,123 +0xB754 0x7441 # 瑁 -- 267,124 +0xB755 0x919E # 醞 -- 267,125 +0xB756 0x8C5A # 豚 -- 267,126 +0xB757 0x90A2 # 邢 -- 267,127 +0xB758 0x60D8 # 惘 -- 267,130 +0xB759 0x8A0C # 訌 -- 267,131 +0xB75A 0x9594 # 閔 -- 267,132 +0xB75B 0x6E5B # 湛 -- 267,133 +0xB75C 0x6F66 # 潦 -- 267,134 +0xB75D 0x5157 # 兗 -- 267,135 +0xB75E 0x8431 # 萱 -- 267,136 +0xB75F 0x8A91 # 誑 -- 267,137 +0xB760 0x54A9 # 咩 -- 267,140 +0xB761 0x81C0 # 臀 -- 267,141 +0xB762 0x61CB # 懋 -- 267,142 +0xB763 0x99A5 # 馥 -- 267,143 +0xB764 0x8026 # 耦 -- 267,144 +0xB765 0x9A65 # 驥 -- 267,145 +0xB766 0x557B # 啻 -- 267,146 +0xB767 0x5533 # 唳 -- 267,147 +0xB768 0x807F # 聿 -- 267,150 +0xB769 0x566C # 噬 -- 267,151 +0xB76A 0x85FA # 藺 -- 267,152 +0xB76B 0x6BB2 # 殲 -- 267,153 +0xB76C 0x995C # 饜 -- 267,154 +0xB76D 0x992C # 餬 -- 267,155 +0xB76E 0x8C62 # 豢 -- 267,156 +0xB76F 0x5FDD # 忝 -- 267,157 +0xB770 0x7A95 # 窕 -- 267,160 +0xB771 0x973D # 霽 -- 267,161 +0xB772 0x9621 # 阡 -- 267,162 +0xB773 0x814B # 腋 -- 267,163 +0xB774 0x8012 # 耒 -- 267,164 +0xB775 0x946B # 鑫 -- 267,165 +0xB776 0x61FE # 懾 -- 267,166 +0xB777 0x9382 # 鎂 -- 267,167 +0xB778 0x68B1 # 梱 -- 267,170 +0xB779 0x76B8 # 皸 -- 267,171 +0xB77A 0x5B34 # 嬴 -- 267,172 +0xB77B 0x9148 # 酈 -- 267,173 +0xB77C 0x6FF0 # 濰 -- 267,174 +0xB77D 0x4F6C # 佬 -- 267,175 +0xB77E 0x69E8 # 槨 -- 267,176 +0xB7A1 0x95B6 # 閶 -- 267,241 +0xB7A2 0x8CE1 # 賡 -- 267,242 +0xB7A3 0x61CD # 懍 -- 267,243 +0xB7A4 0x9E82 # 麂 -- 267,244 +0xB7A5 0x9E8B # 麋 -- 267,245 +0xB7A6 0x9A4A # 驊 -- 267,246 +0xB7A7 0x9785 # 鞅 -- 267,247 +0xB7A8 0x504E # 偎 -- 267,250 +0xB7A9 0x4E69 # 乩 -- 267,251 +0xB7AA 0x7152 # 煒 -- 267,252 +0xB7AB 0x7864 # 硤 -- 267,253 +0xB7AC 0x6C16 # 氖 -- 267,254 +0xB7AD 0x82F3 # 苳 -- 267,255 +0xB7AE 0x87F3 # 蟳 -- 267,256 +0xB7AF 0x92D0 # 鋐 -- 267,257 +0xB7B0 0x6A47 # 橇 -- 267,260 +0xB7B1 0x528C # 劌 -- 267,261 +0xB7B2 0x9E90 # 麐 -- 267,262 +0xB7B3 0x574F # 坏 -- 267,263 +0xB7B4 0x5FEA # 忪 -- 267,264 +0xB7B5 0x8760 # 蝠 -- 267,265 +0xB7B6 0x9433 # 鐳 -- 267,266 +0xB7B7 0x566F # 噯 -- 267,267 +0xB7B8 0x59E3 # 姣 -- 267,270 +0xB7B9 0x616B # 慫 -- 267,271 +0xB7BA 0x6215 # 戕 -- 267,272 +0xB7BB 0x73B3 # 玳 -- 267,273 +0xB7BC 0x5102 # 儂 -- 267,274 +0xB7BD 0x652B # 攫 -- 267,275 +0xB7BE 0x5208 # 刈 -- 267,276 +0xB7BF 0x970E # 霎 -- 267,277 +0xB7C0 0x6D63 # 浣 -- 267,300 +0xB7C1 0x9837 # 頷 -- 267,301 +0xB7C2 0x82B8 # 芸 -- 267,302 +0xB7C3 0x7950 # 祐 -- 267,303 +0xB7C4 0x6369 # 捩 -- 267,304 +0xB7C5 0x6096 # 悖 -- 267,305 +0xB7C6 0x599E # 妞 -- 267,306 +0xB7C7 0x5CB1 # 岱 -- 267,307 +0xB7C8 0x5A41 # 婁 -- 267,310 +0xB7C9 0x6773 # 杳 -- 267,311 +0xB7CA 0x62EE # 拮 -- 267,312 +0xB7CB 0x82D3 # 苓 -- 267,313 +0xB7CC 0x6715 # 朕 -- 267,314 +0xB7CD 0x65CC # 旌 -- 267,315 +0xB7CE 0x5F2D # 弭 -- 267,316 +0xB7CF 0x62FD # 拽 -- 267,317 +0xB7D0 0x5639 # 嘹 -- 267,320 +0xB7D1 0x8490 # 蒐 -- 267,321 +0xB7D2 0x613F # 愿 -- 267,322 +0xB7D3 0x822B # 舫 -- 267,323 +0xB7D4 0x6248 # 扈 -- 267,324 +0xB7D5 0x96C9 # 雉 -- 267,325 +0xB7D6 0x6D79 # 浹 -- 267,326 +0xB7D7 0x64C2 # 擂 -- 267,327 +0xB7D8 0x75B5 # 疵 -- 267,330 +0xB7D9 0x858A # 薊 -- 267,331 +0xB7DA 0x6F62 # 潢 -- 267,332 +0xB7DB 0x83C1 # 菁 -- 267,333 +0xB7DC 0x7DBA # 綺 -- 267,334 +0xB7DD 0x9798 # 鞘 -- 267,335 +0xB7DE 0x6E1A # 渚 -- 267,336 +0xB7DF 0x9AEF # 髯 -- 267,337 +0xB7E0 0x87BB # 螻 -- 267,340 +0xB7E1 0x9438 # 鐸 -- 267,341 +0xB7E2 0x9ACF # 髏 -- 267,342 +0xB7E3 0x7FB8 # 羸 -- 267,343 +0xB7E4 0x699B # 榛 -- 267,344 +0xB7E5 0x9EDC # 黜 -- 267,345 +0xB7E6 0x7511 # 甑 -- 267,346 +0xB7E7 0x93D6 # 鏖 -- 267,347 +0xB7E8 0x873F # 蜿 -- 267,350 +0xB7E9 0x79E3 # 秣 -- 267,351 +0xB7EA 0x777F # 睿 -- 267,352 +0xB7EB 0x8936 # 褶 -- 267,353 +0xB7EC 0x98F4 # 飴 -- 267,354 +0xB7ED 0x90AF # 邯 -- 267,355 +0xB7EE 0x9672 # 陲 -- 267,356 +0xB7EF 0x52D6 # 勖 -- 267,357 +0xB7F0 0x977C # 靼 -- 267,360 +0xB7F1 0x6883 # 梃 -- 267,361 +0xB7F2 0x621B # 戛 -- 267,362 +0xB7F3 0x7FAF # 羯 -- 267,363 +0xB7F4 0x61E3 # 懣 -- 267,364 +0xB7F5 0x9068 # 遨 -- 267,365 +0xB7F6 0x607F # 恿 -- 267,366 +0xB7F7 0x558B # 喋 -- 267,367 +0xB7F8 0x6F82 # 澂 -- 267,370 +0xB7F9 0x6C4A # 汊 -- 267,371 +0xB7FA 0x69AD # 榭 -- 267,372 +0xB7FB 0x532D # 匭 -- 267,373 +0xB7FC 0x9095 # 邕 -- 267,374 +0xB7FD 0x5769 # 坩 -- 267,375 +0xB7FE 0x8DFC # 跼 -- 267,376 diff --git a/unicode/xerox/unihan/XCCS-270=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-270=UNIHAN.TXT new file mode 100644 index 00000000..a706f3ce --- /dev/null +++ b/unicode/xerox/unihan/XCCS-270=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "270" UNIHAN + +0xB821 0x66C7 # 曇 -- 270,041 +0xB822 0x5E84 # 庄 -- 270,042 +0xB823 0x6271 # 扱 -- 270,043 +0xB824 0x5C8C # 岌 -- 270,044 +0xB825 0x8F61 # 轡 -- 270,045 +0xB826 0x9146 # 酆 -- 270,046 +0xB827 0x4F5F # 佟 -- 270,047 +0xB828 0x6ADB # 櫛 -- 270,050 +0xB829 0x6CD0 # 泐 -- 270,051 +0xB82A 0x6FEE # 濮 -- 270,052 +0xB82B 0x9052 # 遒 -- 270,053 +0xB82C 0x9088 # 邈 -- 270,054 +0xB82D 0x6854 # 桔 -- 270,055 +0xB82E 0x88B5 # 袵 -- 270,056 +0xB82F 0x566B # 噫 -- 270,057 +0xB830 0x611C # 愜 -- 270,060 +0xB831 0x64D8 # 擘 -- 270,061 +0xB832 0x6A84 # 檄 -- 270,062 +0xB833 0x7BB4 # 箴 -- 270,063 +0xB834 0x7D73 # 絳 -- 270,064 +0xB835 0x7E79 # 繹 -- 270,065 +0xB836 0x8011 # 耑 -- 270,066 +0xB837 0x8174 # 腴 -- 270,067 +0xB838 0x8F47 # 轇 -- 270,070 +0xB839 0x8F55 # 轕 -- 270,071 +0xB83A 0x99E2 # 駢 -- 270,072 +0xB83B 0x4FCE # 俎 -- 270,073 +0xB83C 0x5028 # 倨 -- 270,074 +0xB83D 0x60D3 # 惓 -- 270,075 +0xB83E 0x61E5 # 懥 -- 270,076 +0xB83F 0x6A3D # 樽 -- 270,077 +0xB840 0x6D35 # 洵 -- 270,100 +0xB841 0x785C # 硜 -- 270,101 +0xB842 0x7B08 # 笈 -- 270,102 +0xB843 0x846D # 葭 -- 270,103 +0xB844 0x8558 # 蕘 -- 270,104 +0xB845 0x8AC4 # 諄 -- 270,105 +0xB846 0x8DC2 # 跂 -- 270,106 +0xB847 0x8EEB # 軫 -- 270,107 +0xB848 0x958E # 閎 -- 270,110 +0xB849 0x95BD # 閽 -- 270,111 +0xB84A 0x9695 # 隕 -- 270,112 +0xB84B 0x4FFA # 俺 -- 270,113 +0xB84C 0x50EE # 僮 -- 270,114 +0xB84D 0x59AF # 妯 -- 270,115 +0xB84E 0x5A0C # 娌 -- 270,116 +0xB84F 0x54FD # 哽 -- 270,117 +0xB850 0x5550 # 啐 -- 270,120 +0xB851 0x55A8 # 喨 -- 270,121 +0xB852 0x5C50 # 屐 -- 270,122 +0xB853 0x5E37 # 帷 -- 270,123 +0xB854 0x5E57 # 幗 -- 270,124 +0xB855 0x5F29 # 弩 -- 270,125 +0xB856 0x5F40 # 彀 -- 270,126 +0xB857 0x60FB # 惻 -- 270,127 +0xB858 0x6147 # 慇 -- 270,130 +0xB859 0x61A8 # 憨 -- 270,131 +0xB85A 0x62C8 # 拈 -- 270,132 +0xB85B 0x62F7 # 拷 -- 270,133 +0xB85C 0x6428 # 搨 -- 270,134 +0xB85D 0x67B7 # 枷 -- 270,135 +0xB85E 0x689F # 梟 -- 270,136 +0xB85F 0x6AD3 # 櫓 -- 270,137 +0xB860 0x6BEC # 毬 -- 270,140 +0xB861 0x6F1A # 漚 -- 270,141 +0xB862 0x7168 # 煨 -- 270,142 +0xB863 0x718F # 熏 -- 270,143 +0xB864 0x7422 # 琢 -- 270,144 +0xB865 0x7515 # 甕 -- 270,145 +0xB866 0x75E3 # 痣 -- 270,146 +0xB867 0x763C # 瘼 -- 270,147 +0xB868 0x76C2 # 盂 -- 270,150 +0xB869 0x7BE6 # 篦 -- 270,151 +0xB86A 0x7C2A # 簪 -- 270,152 +0xB86B 0x7CF4 # 糴 -- 270,153 +0xB86C 0x7D09 # 紉 -- 270,154 +0xB86D 0x7D2C # 紬 -- 270,155 +0xB86E 0x7DBB # 綻 -- 270,156 +0xB86F 0x7FB9 # 羹 -- 270,157 +0xB870 0x7FCE # 翎 -- 270,160 +0xB871 0x801C # 耜 -- 270,161 +0xB872 0x8202 # 舂 -- 270,162 +0xB873 0x828B # 芋 -- 270,163 +0xB874 0x828D # 芍 -- 270,164 +0xB875 0x82B9 # 芹 -- 270,165 +0xB876 0x83C7 # 菇 -- 270,166 +0xB877 0x85C1 # 藁 -- 270,167 +0xB878 0x8671 # 虱 -- 270,170 +0xB879 0x86AA # 蚪 -- 270,171 +0xB87A 0x86C6 # 蛆 -- 270,172 +0xB87B 0x87E0 # 蟠 -- 270,173 +0xB87C 0x87FE # 蟾 -- 270,174 +0xB87D 0x8888 # 袈 -- 270,175 +0xB87E 0x8960 # 襠 -- 270,176 +0xB8A1 0x8A7C # 詼 -- 270,241 +0xB8A2 0x8B17 # 謗 -- 270,242 +0xB8A3 0x8C7A # 豺 -- 270,243 +0xB8A4 0x8F46 # 轆 -- 270,244 +0xB8A5 0x9328 # 錨 -- 270,245 +0xB8A6 0x9582 # 閂 -- 270,246 +0xB8A7 0x994B # 饋 -- 270,247 +0xB8A8 0x99AD # 馭 -- 270,250 +0xB8A9 0x9AFB # 髻 -- 270,251 +0xB8AA 0x9C25 # 鰥 -- 270,252 +0xB8AB 0x9CE9 # 鳩 -- 270,253 +0xB8AC 0x9E9D # 麝 -- 270,254 +0xB8AD 0x9F66 # 齦 -- 270,255 +0xB8AE 0x9F6A # 齪 -- 270,256 +0xB8AF 0x9F77 # 齷 -- 270,257 +0xB8B0 0x54A7 # 咧 -- 270,260 +0xB8B1 0x56E1 # 囡 -- 270,261 +0xB8B2 0x8814 # 蠔 -- 270,262 +0xB8B3 0x4EA2 # 亢 -- 270,263 +0xB8B4 0x5115 # 儕 -- 270,264 +0xB8B5 0x5BA5 # 宥 -- 270,265 +0xB8B6 0x5484 # 咄 -- 270,266 +0xB8B7 0x564E # 噎 -- 270,267 +0xB8B8 0x5669 # 噩 -- 270,270 +0xB8B9 0x584B # 塋 -- 270,271 +0xB8BA 0x59D9 # 姙 -- 270,272 +0xB8BB 0x5C91 # 岑 -- 270,273 +0xB8BC 0x6308 # 挈 -- 270,274 +0xB8BD 0x6677 # 晷 -- 270,275 +0xB8BE 0x6BA4 # 殤 -- 270,276 +0xB8BF 0x6CC5 # 泅 -- 270,277 +0xB8C0 0x6D5C # 浜 -- 270,300 +0xB8C1 0x6E19 # 渙 -- 270,301 +0xB8C2 0x72CE # 狎 -- 270,302 +0xB8C3 0x749E # 璞 -- 270,303 +0xB8C4 0x757F # 畿 -- 270,304 +0xB8C5 0x75DE # 痞 -- 270,305 +0xB8C6 0x76CD # 盍 -- 270,306 +0xB8C7 0x7791 # 瞑 -- 270,307 +0xB8C8 0x77BF # 瞿 -- 270,310 +0xB8C9 0x7A14 # 稔 -- 270,311 +0xB8CA 0x7BCB # 篋 -- 270,312 +0xB8CB 0x8151 # 腑 -- 270,313 +0xB8CC 0x8340 # 荀 -- 270,314 +0xB8CD 0x8398 # 莘 -- 270,315 +0xB8CE 0x83C5 # 菅 -- 270,316 +0xB8CF 0x847A # 葺 -- 270,317 +0xB8D0 0x875F # 蝟 -- 270,320 +0xB8D1 0x887E # 衾 -- 270,321 +0xB8D2 0x891A # 褚 -- 270,322 +0xB8D3 0x8988 # 覈 -- 270,323 +0xB8D4 0x89D4 # 觔 -- 270,324 +0xB8D5 0x8A48 # 詈 -- 270,325 +0xB8D6 0x8ADB # 諛 -- 270,326 +0xB8D7 0x8AEE # 諮 -- 270,327 +0xB8D8 0x8CFB # 賻 -- 270,330 +0xB8D9 0x8D0D # 贍 -- 270,331 +0xB8DA 0x8E30 # 踰 -- 270,332 +0xB8DB 0x8E49 # 蹉 -- 270,333 +0xB8DC 0x8E87 # 躇 -- 270,334 +0xB8DD 0x8E8A # 躊 -- 270,335 +0xB8DE 0x9041 # 遁 -- 270,336 +0xB8DF 0x905B # 遛 -- 270,337 +0xB8E0 0x932E # 錮 -- 270,340 +0xB8E1 0x95D5 # 闕 -- 270,341 +0xB8E2 0x9773 # 靳 -- 270,342 +0xB8E3 0x9BCA # 鯊 -- 270,343 +0xB8E4 0x9D06 # 鴆 -- 270,344 +0xB8E5 0x9F5F # 齟 -- 270,345 +0xB8E6 0x5106 # 儆 -- 270,346 +0xB8E7 0x530D # 匍 -- 270,347 +0xB8E8 0x5310 # 匐 -- 270,350 +0xB8E9 0x5E11 # 帑 -- 270,351 +0xB8EA 0x5EE8 # 廨 -- 270,352 +0xB8EB 0x6214 # 戔 -- 270,353 +0xB8EC 0x6406 # 搆 -- 270,354 +0xB8ED 0x6409 # 搉 -- 270,355 +0xB8EE 0x6621 # 昡 -- 270,356 +0xB8EF 0x6A8E # 檎 -- 270,357 +0xB8F0 0x6F3E # 漾 -- 270,360 +0xB8F1 0x6F41 # 潁 -- 270,361 +0xB8F2 0x714A # 煊 -- 270,362 +0xB8F3 0x7192 # 熒 -- 270,363 +0xB8F4 0x71B9 # 熹 -- 270,364 +0xB8F5 0x71FE # 燾 -- 270,365 +0xB8F6 0x7296 # 犖 -- 270,366 +0xB8F7 0x72D9 # 狙 -- 270,367 +0xB8F8 0x7521 # 甡 -- 270,370 +0xB8F9 0x7540 # 畀 -- 270,371 +0xB8FA 0x759D # 疝 -- 270,372 +0xB8FB 0x75B4 # 疴 -- 270,373 +0xB8FC 0x75FC # 痼 -- 270,374 +0xB8FD 0x7630 # 瘰 -- 270,375 +0xB8FE 0x7667 # 癧 -- 270,376 diff --git a/unicode/xerox/unihan/XCCS-271=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-271=UNIHAN.TXT new file mode 100644 index 00000000..faade548 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-271=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "271" UNIHAN + +0xB921 0x77DA # 矚 -- 271,041 +0xB922 0x7B67 # 筧 -- 271,042 +0xB923 0x7B71 # 筱 -- 271,043 +0xB924 0x7D1C # 紜 -- 271,044 +0xB925 0x7DA6 # 綦 -- 271,045 +0xB926 0x7DAC # 綬 -- 271,046 +0xB927 0x7E09 # 縉 -- 271,047 +0xB928 0x7E46 # 繆 -- 271,050 +0xB929 0x7E9B # 纛 -- 271,051 +0xB92A 0x8201 # 舁 -- 271,052 +0xB92B 0x82D2 # 苒 -- 271,053 +0xB92C 0x834F # 荏 -- 271,054 +0xB92D 0x8446 # 葆 -- 271,055 +0xB92E 0x87C4 # 蟄 -- 271,056 +0xB92F 0x8AD7 # 諗 -- 271,057 +0xB930 0x8CB2 # 貲 -- 271,060 +0xB931 0x8F0A # 輊 -- 271,061 +0xB932 0x9044 # 遄 -- 271,062 +0xB933 0x9074 # 遴 -- 271,063 +0xB934 0x90DB # 郛 -- 271,064 +0xB935 0x913A # 鄺 -- 271,065 +0xB936 0x9A64 # 驤 -- 271,066 +0xB937 0x4E31 # 丱 -- 271,067 +0xB938 0x63F6 # 揶 -- 271,070 +0xB939 0x6E2B # 渫 -- 271,071 +0xB93A 0x9082 # 邂 -- 271,072 +0xB93B 0x90DF # 郟 -- 271,073 +0xB93C 0x80B4 # 肴 -- 271,074 +0xB93D 0x9917 # 餗 -- 271,075 +0xB93E 0x99D1 # 駑 -- 271,076 +0xB93F 0x99D8 # 駘 -- 271,077 +0xB940 0x4F57 # 佗 -- 271,100 +0xB941 0x4FDA # 俚 -- 271,101 +0xB942 0x5228 # 刨 -- 271,102 +0xB943 0x528A # 劊 -- 271,103 +0xB944 0x5A4A # 婊 -- 271,104 +0xB945 0x5B51 # 孑 -- 271,105 +0xB946 0x5969 # 奩 -- 271,106 +0xB947 0x5FD6 # 忖 -- 271,107 +0xB948 0x6063 # 恣 -- 271,110 +0xB949 0x60DA # 惚 -- 271,111 +0xB94A 0x61C3 # 懃 -- 271,112 +0xB94B 0x505D # 偝 -- 271,113 +0xB94C 0x62D5 # 拕 -- 271,114 +0xB94D 0x62ED # 拭 -- 271,115 +0xB94E 0x6336 # 挶 -- 271,116 +0xB94F 0x6390 # 掐 -- 271,117 +0xB950 0x6376 # 捶 -- 271,120 +0xB951 0x63D6 # 揖 -- 271,121 +0xB952 0x6473 # 摳 -- 271,122 +0xB953 0x6504 # 攄 -- 271,123 +0xB954 0x6666 # 晦 -- 271,124 +0xB955 0x667E # 晾 -- 271,125 +0xB956 0x696F # 楯 -- 271,126 +0xB957 0x6EF7 # 滷 -- 271,127 +0xB958 0x6F87 # 澇 -- 271,130 +0xB959 0x75C2 # 痂 -- 271,131 +0xB95A 0x7634 # 瘴 -- 271,132 +0xB95B 0x7812 # 砒 -- 271,133 +0xB95C 0x7ABF # 窿 -- 271,134 +0xB95D 0x7B33 # 笳 -- 271,135 +0xB95E 0x7B8D # 箍 -- 271,136 +0xB95F 0x7B9D # 箝 -- 271,137 +0xB960 0x7DB9 # 綹 -- 271,140 +0xB961 0x7D5B # 絛 -- 271,141 +0xB962 0x7E6E # 繮 -- 271,142 +0xB963 0x812C # 脬 -- 271,143 +0xB964 0x8198 # 膘 -- 271,144 +0xB965 0x81CA # 臊 -- 271,145 +0xB966 0x8244 # 艄 -- 271,146 +0xB967 0x83F8 # 菸 -- 271,147 +0xB968 0x8493 # 蒓 -- 271,150 +0xB969 0x8784 # 螄 -- 271,151 +0xB96A 0x87C8 # 蟈 -- 271,152 +0xB96B 0x87D2 # 蟒 -- 271,153 +0xB96C 0x88F1 # 裱 -- 271,154 +0xB96D 0x8976 # 襶 -- 271,155 +0xB96E 0x89A5 # 覥 -- 271,156 +0xB96F 0x8A46 # 詆 -- 271,157 +0xB970 0x8A86 # 誆 -- 271,160 +0xB971 0x8B05 # 謅 -- 271,161 +0xB972 0x8C47 # 豇 -- 271,162 +0xB973 0x8C49 # 豉 -- 271,163 +0xB974 0x8E39 # 踹 -- 271,164 +0xB975 0x97AC # 鞬 -- 271,165 +0xB976 0x9C0D # 鰍 -- 271,166 +0xB977 0x9C54 # 鱔 -- 271,167 +0xB978 0x9D89 # 鶉 -- 271,170 +0xB979 0x9D70 # 鵰 -- 271,171 +0xB97A 0x9F08 # 鼈 -- 271,172 +0xB97B 0x9F95 # 龕 -- 271,173 +0xB97C 0x7BB8 # 箸 -- 271,174 +0xB97D 0x8494 # 蒔 -- 271,175 +0xB97E 0x8AFA # 諺 -- 271,176 +0xB9A1 0x91F5 # 釵 -- 271,241 +0xB9A2 0x9E75 # 鹵 -- 271,242 +0xB9A3 0x500F # 倏 -- 271,243 +0xB9A4 0x5AD7 # 嫗 -- 271,244 +0xB9A5 0x5B70 # 孰 -- 271,245 +0xB9A6 0x53E9 # 叩 -- 271,246 +0xB9A7 0x5729 # 圩 -- 271,247 +0xB9A8 0x5F01 # 弁 -- 271,250 +0xB9A9 0x5F0B # 弋 -- 271,251 +0xB9AA 0x606A # 恪 -- 271,252 +0xB9AB 0x60B8 # 悸 -- 271,253 +0xB9AC 0x634C # 捌 -- 271,254 +0xB9AD 0x693F # 椿 -- 271,255 +0xB9AE 0x6B86 # 殆 -- 271,256 +0xB9AF 0x7638 # 瘸 -- 271,257 +0xB9B0 0x8546 # 蕆 -- 271,260 +0xB9B1 0x85B9 # 薹 -- 271,261 +0xB9B2 0x8831 # 蠱 -- 271,262 +0xB9B3 0x8FE5 # 迥 -- 271,263 +0xB9B4 0x942B # 鐫 -- 271,264 +0xB9B5 0x9862 # 顢 -- 271,265 +0xB9B6 0x9874 # 顴 -- 271,266 +0xB9B7 0x524B # 剋 -- 271,267 +0xB9B8 0x5372 # 卲 -- 271,270 +0xB9B9 0x5B95 # 宕 -- 271,271 +0xB9BA 0x5D47 # 嵇 -- 271,272 +0xB9BB 0x620D # 戍 -- 271,273 +0xB9BC 0x6549 # 敉 -- 271,274 +0xB9BD 0x66B9 # 暹 -- 271,275 +0xB9BE 0x6A90 # 檐 -- 271,276 +0xB9BF 0x6AAF # 檯 -- 271,277 +0xB9C0 0x6C4D # 汍 -- 271,300 +0xB9C1 0x724B # 牋 -- 271,301 +0xB9C2 0x725D # 牝 -- 271,302 +0xB9C3 0x73E9 # 珩 -- 271,303 +0xB9C4 0x7428 # 琨 -- 271,304 +0xB9C5 0x7489 # 璉 -- 271,305 +0xB9C6 0x74A8 # 璨 -- 271,306 +0xB9C7 0x7672 # 癲 -- 271,307 +0xB9C8 0x7887 # 碇 -- 271,310 +0xB9C9 0x7BE0 # 篠 -- 271,311 +0xB9CA 0x7FE6 # 翦 -- 271,312 +0xB9CB 0x837C # 荼 -- 271,313 +0xB9CC 0x871A # 蜚 -- 271,314 +0xB9CD 0x8832 # 蠲 -- 271,315 +0xB9CE 0x8A67 # 詧 -- 271,316 +0xB9CF 0x9291 # 銑 -- 271,317 +0xB9D0 0x98BB # 颻 -- 271,320 +0xB9D1 0x993D # 餽 -- 271,321 +0xB9D2 0x9A0F # 騏 -- 271,322 +0xB9D3 0x88A2 # 袢 -- 271,323 +0xB9D4 0x9ECC # 黌 -- 271,324 +0xB9D5 0x51CA # 凊 -- 271,325 +0xB9D6 0x5298 # 劘 -- 271,326 +0xB9D7 0x5684 # 嚄 -- 271,327 +0xB9D8 0x60F2 # 惲 -- 271,330 +0xB9D9 0x6684 # 暄 -- 271,331 +0xB9DA 0x595A # 奚 -- 271,332 +0xB9DB 0x6AEC # 櫬 -- 271,333 +0xB9DC 0x6DC4 # 淄 -- 271,334 +0xB9DD 0x6EC1 # 滁 -- 271,335 +0xB9DE 0x7006 # 瀆 -- 271,336 +0xB9DF 0x71EE # 燮 -- 271,337 +0xB9E0 0x726F # 牯 -- 271,340 +0xB9E1 0x7600 # 瘀 -- 271,341 +0xB9E2 0x75F1 # 痱 -- 271,342 +0xB9E3 0x7625 # 瘥 -- 271,343 +0xB9E4 0x765F # 癟 -- 271,344 +0xB9E5 0x7670 # 癰 -- 271,345 +0xB9E6 0x546B # 呫 -- 271,346 +0xB9E7 0x7CF6 # 糶 -- 271,347 +0xB9E8 0x7F7D # 罽 -- 271,350 +0xB9E9 0x8014 # 耔 -- 271,351 +0xB9EA 0x811B # 脛 -- 271,352 +0xB9EB 0x81DD # 臝 -- 271,353 +0xB9EC 0x83A9 # 莩 -- 271,354 +0xB9ED 0x884A # 衊 -- 271,355 +0xB9EE 0x8AD1 # 諑 -- 271,356 +0xB9EF 0x8B07 # 謇 -- 271,357 +0xB9F0 0x8B85 # 讅 -- 271,360 +0xB9F1 0x9210 # 鈐 -- 271,361 +0xB9F2 0x9628 # 阨 -- 271,362 +0xB9F3 0x9768 # 靨 -- 271,363 +0xB9F4 0x9870 # 顰 -- 271,364 +0xB9F5 0x52FD # 勽 -- 271,365 +0xB9F6 0x90D7 # 郗 -- 271,366 +0xB9F7 0x92AC # 銬 -- 271,367 +0xB9F8 0x54CF # 哏 -- 271,370 +0xB9F9 0x552C # 唬 -- 271,371 +0xB9FA 0x6886 # 梆 -- 271,372 +0xB9FB 0x7785 # 瞅 -- 271,373 +0xB9FC 0x81C3 # 臃 -- 271,374 +0xB9FD 0x826E # 艮 -- 271,375 +0xB9FE 0x84A1 # 蒡 -- 271,376 diff --git a/unicode/xerox/unihan/XCCS-272=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-272=UNIHAN.TXT new file mode 100644 index 00000000..e8ac3e1b --- /dev/null +++ b/unicode/xerox/unihan/XCCS-272=UNIHAN.TXT @@ -0,0 +1,190 @@ + +# "272" UNIHAN + +0xBA21 0x896C # 襬 -- 272,041 +0xBA22 0x8C55 # 豕 -- 272,042 +0xBA23 0x8DBF # 趿 -- 272,043 +0xBA24 0x9911 # 餑 -- 272,044 +0xBA25 0x9D15 # 鴕 -- 272,045 +0xBA26 0x5008 # 倈 -- 272,046 +0xBA27 0x50BA # 傺 -- 272,047 +0xBA28 0x5129 # 儩 -- 272,050 +0xBA29 0x513A # 儺 -- 272,051 +0xBA2A 0x515B # 兛 -- 272,052 +0xBA2B 0x53FB # 叻 -- 272,053 +0xBA2C 0x54FF # 哿 -- 272,054 +0xBA2D 0x5683 # 嚃 -- 272,055 +0xBA2E 0x56A6 # 嚦 -- 272,056 +0xBA2F 0x57ED # 埭 -- 272,057 +0xBA30 0x5889 # 墉 -- 272,060 +0xBA31 0x651F # 攟 -- 272,061 +0xBA32 0x659B # 斛 -- 272,062 +0xBA33 0x67B0 # 枰 -- 272,063 +0xBA34 0x6938 # 椸 -- 272,064 +0xBA35 0x6937 # 椷 -- 272,065 +0xBA36 0x6A87 # 檇 -- 272,066 +0xBA37 0x6BAD # 殭 -- 272,067 +0xBA38 0x6C4E # 汎 -- 272,070 +0xBA39 0x6CD9 # 泙 -- 272,071 +0xBA3A 0x5D36 # 崶 -- 272,072 +0xBA3B 0x6EA7 # 溧 -- 272,073 +0xBA3C 0x6FCA # 濊 -- 272,074 +0xBA3D 0x7185 # 熅 -- 272,075 +0xBA3E 0x71FF # 燿 -- 272,076 +0xBA3F 0x7517 # 甗 -- 272,077 +0xBA40 0x752F # 甯 -- 272,100 +0xBA41 0x75E0 # 痠 -- 272,101 +0xBA42 0x76A4 # 皤 -- 272,102 +0xBA43 0x769E # 皞 -- 272,103 +0xBA44 0x76A6 # 皦 -- 272,104 +0xBA45 0x76AD # 皭 -- 272,105 +0xBA46 0x76E6 # 盦 -- 272,106 +0xBA47 0x76FB # 盻 -- 272,107 +0xBA48 0x7752 # 睒 -- 272,110 +0xBA49 0x8918 # 褘 -- 272,111 +0xBA4A 0x7C67 # 籧 -- 272,112 +0xBA4B 0x7E56 # 繖 -- 272,113 +0xBA4C 0x7E91 # 纑 -- 272,114 +0xBA4D 0x7FBC # 羼 -- 272,115 +0xBA4E 0x8264 # 艤 -- 272,116 +0xBA4F 0x826D # 艭 -- 272,117 +0xBA50 0x8604 # 蘄 -- 272,120 +0xBA51 0x8629 # 蘩 -- 272,121 +0xBA52 0x8828 # 蠨 -- 272,122 +0xBA53 0x890C # 褌 -- 272,123 +0xBA54 0x8974 # 襴 -- 272,124 +0xBA55 0x89FC # 觼 -- 272,125 +0xBA56 0x89FF # 觿 -- 272,126 +0xBA57 0x8A0F # 訏 -- 272,127 +0xBA58 0x8B46 # 譆 -- 272,130 +0xBA59 0x8B95 # 讕 -- 272,131 +0xBA5A 0x902F # 逯 -- 272,132 +0xBA5B 0x908B # 邋 -- 272,133 +0xBA5C 0x9136 # 鄶 -- 272,134 +0xBA5D 0x93DE # 鏞 -- 272,135 +0xBA5E 0x9705 # 霅 -- 272,136 +0xBA5F 0x9A2D # 騭 -- 272,137 +0xBA60 0x9C68 # 鱨 -- 272,140 +0xBA61 0x9D96 # 鶖 -- 272,141 +0xBA62 0x4EB6 # 亶 -- 272,142 +0xBA63 0x4F5E # 佞 -- 272,143 +0xBA64 0x4F7B # 佻 -- 272,144 +0xBA65 0x4F91 # 侑 -- 272,145 +0xBA66 0x4FF3 # 俳 -- 272,146 +0xBA67 0x5014 # 倔 -- 272,147 +0xBA68 0x50ED # 僭 -- 272,150 +0xBA69 0x5110 # 儐 -- 272,151 +0xBA6A 0x513C # 儼 -- 272,152 +0xBA6B 0x5A6A # 婪 -- 272,153 +0xBA6C 0x5AE3 # 嫣 -- 272,154 +0xBA6D 0x5B2A # 嬪 -- 272,155 +0xBA6E 0x5B65 # 孥 -- 272,156 +0xBA6F 0x53F6 # 叶 -- 272,157 +0xBA70 0x5401 # 吁 -- 272,160 +0xBA71 0x542E # 吮 -- 272,161 +0xBA72 0x54A4 # 咤 -- 272,162 +0xBA73 0x54AB # 咫 -- 272,163 +0xBA74 0x552A # 唪 -- 272,164 +0xBA75 0x5636 # 嘶 -- 272,165 +0xBA76 0x56FF # 囿 -- 272,166 +0xBA77 0x589F # 墟 -- 272,167 +0xBA78 0x58D1 # 壑 -- 272,170 +0xBA79 0x5D6C # 嵬 -- 272,171 +0xBA7A 0x5E19 # 帙 -- 272,172 +0xBA7B 0x5E43 # 幃 -- 272,173 +0xBA7D 0x5F87 # 徇 -- 272,175 +0xBA7E 0x5FE1 # 忡 -- 272,176 +0xBAA1 0x5FF8 # 忸 -- 272,241 +0xBAA2 0x6019 # 怙 -- 272,242 +0xBAA3 0x6041 # 恁 -- 272,243 +0xBAA4 0x625E # 扞 -- 272,244 +0xBAA5 0x6289 # 抉 -- 272,245 +0xBAA6 0x636B # 捫 -- 272,246 +0xBAA7 0x6387 # 掇 -- 272,247 +0xBAA8 0x6499 # 撙 -- 272,250 +0xBAA9 0x6555 # 敕 -- 272,251 +0xBAAA 0x65C3 # 旃 -- 272,252 +0xBAAB 0x675E # 杞 -- 272,253 +0xBAAC 0x693D # 椽 -- 272,254 +0xBAAD 0x6995 # 榕 -- 272,255 +0xBAAE 0x6B5F # 歟 -- 272,256 +0xBAAF 0x6B84 # 殄 -- 272,257 +0xBAB0 0x6DC0 # 淀 -- 272,260 +0xBAB1 0x6EB7 # 溷 -- 272,261 +0xBAB2 0x6F7A # 潺 -- 272,262 +0xBAB3 0x7256 # 牖 -- 272,263 +0xBAB4 0x72A2 # 犢 -- 272,264 +0xBAB5 0x731D # 猝 -- 272,265 +0xBAB6 0x7455 # 瑕 -- 272,266 +0xBAB7 0x755B # 畛 -- 272,267 +0xBAB8 0x7587 # 疇 -- 272,270 +0xBAB9 0x7664 # 癤 -- 272,271 +0xBABA 0x76C5 # 盅 -- 272,272 +0xBABB 0x76E5 # 盥 -- 272,273 +0xBABC 0x7707 # 眇 -- 272,274 +0xBABD 0x7825 # 砥 -- 272,275 +0xBABE 0x7893 # 碓 -- 272,276 +0xBABF 0x78CA # 磊 -- 272,277 +0xBAC0 0x7A17 # 稗 -- 272,300 +0xBAC1 0x7BFE # 篾 -- 272,301 +0xBAC2 0x7C5F # 籟 -- 272,302 +0xBAC3 0x7C95 # 粕 -- 272,303 +0xBAC4 0x7D06 # 紆 -- 272,304 +0xBAC5 0x7DCB # 緋 -- 272,305 +0xBAC6 0x7E0B # 縋 -- 272,306 +0xBAC7 0x7E1E # 縞 -- 272,307 +0xBAC8 0x7E35 # 縵 -- 272,310 +0xBAC9 0x7E39 # 縹 -- 272,311 +0xBACA 0x7E5A # 繚 -- 272,312 +0xBACB 0x7E6F # 繯 -- 272,313 +0xBACC 0x7FF3 # 翳 -- 272,314 +0xBACD 0x8075 # 聵 -- 272,315 +0xBACE 0x80AB # 肫 -- 272,316 +0xBACF 0x81E0 # 臠 -- 272,317 +0xBAD0 0x8309 # 茉 -- 272,320 +0xBAD1 0x8317 # 茗 -- 272,321 +0xBAD2 0x83D6 # 菖 -- 272,322 +0xBAD3 0x83FD # 菽 -- 272,323 +0xBAD4 0x853B # 蔻 -- 272,324 +0xBAD5 0x85FF # 藿 -- 272,325 +0xBAD6 0x8693 # 蚓 -- 272,326 +0xBAD7 0x86AF # 蚯 -- 272,327 +0xBAD8 0x8703 # 蜃 -- 272,330 +0xBAD9 0x8737 # 蜷 -- 272,331 +0xBADA 0x874C # 蝌 -- 272,332 +0xBADB 0x88DF # 裟 -- 272,333 +0xBADC 0x8913 # 褓 -- 272,334 +0xBADD 0x890A # 褊 -- 272,335 +0xBADE 0x8941 # 襁 -- 272,336 +0xBADF 0x89A6 # 覦 -- 272,337 +0xBAE0 0x89AC # 覬 -- 272,340 +0xBAE1 0x89F4 # 觴 -- 272,341 +0xBAE2 0x8A6C # 詬 -- 272,342 +0xBAE3 0x8A9A # 誚 -- 272,343 +0xBAE4 0x8AA5 # 誥 -- 272,344 +0xBAE5 0x8AB9 # 誹 -- 272,345 +0xBAE6 0x8B14 # 謔 -- 272,346 +0xBAE7 0x8B2B # 謫 -- 272,347 +0xBAE8 0x8B33 # 謳 -- 272,350 +0xBAE9 0x8B3E # 謾 -- 272,351 +0xBAEA 0x8B6B # 譫 -- 272,352 +0xBAEB 0x8B96 # 讖 -- 272,353 +0xBAEC 0x8B9E # 讞 -- 272,354 +0xBAED 0x8C89 # 貉 -- 272,355 +0xBAEE 0x8CBA # 貺 -- 272,356 +0xBAEF 0x8DCE # 跎 -- 272,357 +0xBAF0 0x8E1E # 踞 -- 272,360 +0xBAF1 0x8E74 # 蹴 -- 272,361 +0xBAF2 0x8EFB # 軻 -- 272,362 +0xBAF3 0x8F64 # 轤 -- 272,363 +0xBAF4 0x8FE2 # 迢 -- 272,364 +0xBAF5 0x914A # 酊 -- 272,365 +0xBAF6 0x9162 # 酢 -- 272,366 +0xBAF7 0x9169 # 酩 -- 272,367 +0xBAF8 0x91AE # 醮 -- 272,370 +0xBAF9 0x9477 # 鑷 -- 272,371 +0xBAFA 0x95A1 # 閡 -- 272,372 +0xBAFB 0x965F # 陟 -- 272,373 +0xBAFC 0x9706 # 霆 -- 272,374 +0xBAFD 0x972A # 霪 -- 272,375 +0xBAFE 0x9955 # 饕 -- 272,376 diff --git a/unicode/xerox/unihan/XCCS-273=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-273=UNIHAN.TXT new file mode 100644 index 00000000..834be310 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-273=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "273" UNIHAN + +0xBB21 0x99D9 # 駙 -- 273,041 +0xBB22 0x9A16 # 騖 -- 273,042 +0xBB23 0x9AE6 # 髦 -- 273,043 +0xBB24 0x9B1F # 鬟 -- 273,044 +0xBB25 0x9B2E # 鬮 -- 273,045 +0xBB26 0x9B8E # 鮎 -- 273,046 +0xBB27 0x9BD6 # 鯖 -- 273,047 +0xBB28 0x9D23 # 鴣 -- 273,050 +0xBB29 0x9DD3 # 鷓 -- 273,051 +0xBB2A 0x9DD7 # 鷗 -- 273,052 +0xBB2B 0x9EE0 # 黠 -- 273,053 +0xBB2C 0x9EFF # 黿 -- 273,054 +0xBB2D 0x9F2C # 鼬 -- 273,055 +0xBB2E 0x5C79 # 屹 -- 273,056 +0xBB2F 0x8E81 # 躁 -- 273,057 +0xBB30 0x939A # 鎚 -- 273,060 +0xBB31 0x795A # 祚 -- 273,061 +0xBB32 0x6F23 # 漣 -- 273,062 +0xBB33 0x9B45 # 魅 -- 273,063 +0xBB34 0x9EDD # 黝 -- 273,064 +0xBB35 0x701A # 瀚 -- 273,065 +0xBB36 0x6ABB # 檻 -- 273,066 +0xBB37 0x8E1D # 踝 -- 273,067 +0xBB38 0x8052 # 聒 -- 273,070 +0xBB39 0x562E # 嘮 -- 273,071 +0xBB3A 0x8E31 # 踱 -- 273,072 +0xBB3B 0x6F09 # 漉 -- 273,073 +0xBB3C 0x61F5 # 懵 -- 273,074 +0xBB3D 0x672E # 朮 -- 273,075 +0xBB3E 0x6D82 # 涂 -- 273,076 +0xBB3F 0x5938 # 夸 -- 273,077 +0xBB40 0x6DEC # 淬 -- 273,100 +0xBB41 0x5CD2 # 峒 -- 273,101 +0xBB42 0x6D85 # 涅 -- 273,102 +0xBB43 0x7D07 # 紇 -- 273,103 +0xBB44 0x857E # 蕾 -- 273,104 +0xBB45 0x5096 # 傖 -- 273,105 +0xBB46 0x84C1 # 蓁 -- 273,106 +0xBB47 0x8823 # 蠣 -- 273,107 +0xBB48 0x876E # 蝮 -- 273,110 +0xBB49 0x6F2A # 漪 -- 273,111 +0xBB4A 0x7F4C # 罌 -- 273,112 +0xBB4B 0x58D9 # 壙 -- 273,113 +0xBB4C 0x56C0 # 囀 -- 273,114 +0xBB4D 0x9D12 # 鴒 -- 273,115 +0xBB4E 0x840B # 萋 -- 273,116 +0xBB4F 0x6F78 # 潸 -- 273,117 +0xBB50 0x9251 # 鉑 -- 273,120 +0xBB51 0x69C3 # 槃 -- 273,121 +0xBB52 0x9853 # 顓 -- 273,122 +0xBB53 0x9C3E # 鰾 -- 273,123 +0xBB54 0x6441 # 摁 -- 273,124 +0xBB55 0x7284 # 犄 -- 273,125 +0xBB56 0x55E4 # 嗤 -- 273,126 +0xBB57 0x852B # 蔫 -- 273,127 +0xBB58 0x7787 # 瞇 -- 273,130 +0xBB59 0x91BA # 醺 -- 273,131 +0xBB5A 0x5671 # 噱 -- 273,132 +0xBB5B 0x6DE6 # 淦 -- 273,133 +0xBB5C 0x76B0 # 皰 -- 273,134 +0xBB5D 0x9DBA # 鶺 -- 273,135 +0xBB5E 0x98AF # 颯 -- 273,136 +0xBB5F 0x67DE # 柞 -- 273,137 +0xBB60 0x658C # 斌 -- 273,140 +0xBB61 0x742E # 琮 -- 273,141 +0xBB62 0x663A # 昺 -- 273,142 +0xBB63 0x7098 # 炘 -- 273,143 +0xBB64 0x6AF8 # 櫸 -- 273,144 +0xBB65 0x5D06 # 崆 -- 273,145 +0xBB66 0x5536 # 唶 -- 273,146 +0xBB67 0x7131 # 焱 -- 273,147 +0xBB68 0x8DB5 # 趵 -- 273,150 +0xBB69 0x5A7C # 婼 -- 273,151 +0xBB6A 0x5662 # 噢 -- 273,152 +0xBB6B 0x96EF # 雯 -- 273,153 +0xBB6C 0x9370 # 鍰 -- 273,154 +0xBB6D 0x749F # 璟 -- 273,155 +0xBB6E 0x9BE7 # 鯧 -- 273,156 +0xBB6F 0x935A # 鍚 -- 273,157 +0xBB70 0x64AC # 撬 -- 273,160 +0xBB71 0x63F9 # 揹 -- 273,161 +0xBB72 0x9097 # 邗 -- 273,162 +0xBB73 0x74A0 # 璠 -- 273,163 +0xBB74 0x7652 # 癒 -- 273,164 +0xBB75 0x83EA # 菪 -- 273,165 +0xBB76 0x556A # 啪 -- 273,166 +0xBB77 0x55B5 # 喵 -- 273,167 +0xBB78 0x5519 # 唙 -- 273,170 +0xBB79 0x55E8 # 嗨 -- 273,171 +0xBB7A 0x5658 # 噘 -- 273,172 +0xBB7B 0x92A8 # 銨 -- 273,173 +0xBB7C 0x87F6 # 蟶 -- 273,174 +0xBB7D 0x6C81 # 沁 -- 273,175 +0xBB7E 0x6029 # 怩 -- 273,176 +0xBBA1 0x7F5F # 罟 -- 273,241 +0xBBA2 0x559F # 喟 -- 273,242 +0xBBA3 0x57A0 # 垠 -- 273,243 +0xBBA4 0x5476 # 呶 -- 273,244 +0xBBA5 0x6603 # 昃 -- 273,245 +0xBBA6 0x6339 # 挹 -- 273,246 +0xBBA7 0x5F64 # 彤 -- 273,247 +0xBBA8 0x577C # 坼 -- 273,250 +0xBBA9 0x59DD # 姝 -- 273,251 +0xBBAA 0x5DFD # 巽 -- 273,252 +0xBBAB 0x5556 # 啖 -- 273,253 +0xBBAC 0x5AFB # 嫻 -- 273,254 +0xBBAD 0x7A88 # 窈 -- 273,255 +0xBBAE 0x7C23 # 簣 -- 273,256 +0xBBAF 0x6137 # 愷 -- 273,257 +0xBBB0 0x61AC # 憬 -- 273,260 +0xBBB1 0x6595 # 斕 -- 273,261 +0xBBB2 0x84D1 # 蓑 -- 273,262 +0xBBB3 0x61A7 # 憧 -- 273,263 +0xBBB4 0x85CE # 藎 -- 273,264 +0xBBB5 0x6222 # 戢 -- 273,265 +0xBBB6 0x75CD # 痍 -- 273,266 +0xBBB7 0x61AE # 憮 -- 273,267 +0xBBB8 0x925E # 鉞 -- 273,270 +0xBBB9 0x93B0 # 鎰 -- 273,271 +0xBBBA 0x8328 # 茨 -- 273,272 +0xBBBB 0x90DC # 郜 -- 273,273 +0xBBBC 0x96CB # 雋 -- 273,274 +0xBBBD 0x59CD # 姍 -- 273,275 +0xBBBE 0x52F1 # 勱 -- 273,276 +0xBBBF 0x5F67 # 彧 -- 273,277 +0xBBC0 0x85EA # 藪 -- 273,300 +0xBBC1 0x75D9 # 痙 -- 273,301 +0xBBC2 0x7C1E # 簞 -- 273,302 +0xBBC3 0x5A40 # 婀 -- 273,303 +0xBBC4 0x74A9 # 璩 -- 273,304 +0xBBC5 0x67B4 # 枴 -- 273,305 +0xBBC6 0x7599 # 疙 -- 273,306 +0xBBC7 0x5E18 # 帘 -- 273,307 +0xBBC8 0x62BF # 抿 -- 273,310 +0xBBC9 0x7578 # 畸 -- 273,311 +0xBBCA 0x568E # 嚎 -- 273,312 +0xBBCB 0x7629 # 瘩 -- 273,313 +0xBBCC 0x6ADA # 櫚 -- 273,314 +0xBBCD 0x8568 # 蕨 -- 273,315 +0xBBCE 0x5482 # 咂 -- 273,316 +0xBBCF 0x55C6 # 嗆 -- 273,317 +0xBBD0 0x9296 # 銖 -- 273,320 +0xBBD1 0x6C10 # 氐 -- 273,321 +0xBBD2 0x59D2 # 姒 -- 273,322 +0xBBD3 0x64BE # 撾 -- 273,323 +0xBBD4 0x7579 # 畹 -- 273,324 +0xBBD5 0x6DD6 # 淖 -- 273,325 +0xBBD6 0x8386 # 莆 -- 273,326 +0xBBD7 0x6FAE # 澮 -- 273,327 +0xBBD8 0x7E11 # 縑 -- 273,330 +0xBBD9 0x8E91 # 躑 -- 273,331 +0xBBDA 0x8E85 # 躅 -- 273,332 +0xBBDB 0x9132 # 鄲 -- 273,333 +0xBBDC 0x73EE # 珮 -- 273,334 +0xBBDD 0x677C # 杼 -- 273,335 +0xBBDE 0x660A # 昊 -- 273,336 +0xBBDF 0x82DC # 苜 -- 273,337 +0xBBE0 0x5AB2 # 媲 -- 273,340 +0xBBE1 0x54BB # 咻 -- 273,341 +0xBBE2 0x9826 # 頦 -- 273,342 +0xBBE3 0x5665 # 噥 -- 273,343 +0xBBE4 0x756C # 畬 -- 273,344 +0xBBE5 0x8438 # 萸 -- 273,345 +0xBBE6 0x7613 # 瘓 -- 273,346 +0xBBE7 0x5AF5 # 嫵 -- 273,347 +0xBBE8 0x7B60 # 筠 -- 273,350 +0xBBE9 0x76CE # 盎 -- 273,351 +0xBBEA 0x84FF # 蓿 -- 273,352 +0xBBEB 0x7BAC # 箬 -- 273,353 +0xBBEC 0x5685 # 嚅 -- 273,354 +0xBBED 0x562C # 嘬 -- 273,355 +0xBBEE 0x7BC1 # 篁 -- 273,356 +0xBBEF 0x56C1 # 囁 -- 273,357 +0xBBF0 0x9D9A # 鶚 -- 273,360 +0xBBF1 0x5406 # 吆 -- 273,361 +0xBBF2 0x8DFA # 跺 -- 273,362 +0xBBF3 0x5555 # 啕 -- 273,363 +0xBBF4 0x5F46 # 彆 -- 273,364 +0xBBF5 0x8E6C # 蹬 -- 273,365 +0xBBF6 0x5659 # 噙 -- 273,366 +0xBBF7 0x5C37 # 尷 -- 273,367 +0xBBF8 0x5A9E # 媞 -- 273,370 +0xBBF9 0x5DB2 # 嶲 -- 273,371 +0xBBFA 0x4EE8 # 仨 -- 273,372 +0xBBFB 0x973E # 霾 -- 273,373 +0xBBFC 0x6CC3 # 泃 -- 273,374 +0xBBFD 0x5A96 # 媖 -- 273,375 +0xBBFE 0x7889 # 碉 -- 273,376 diff --git a/unicode/xerox/unihan/XCCS-274=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-274=UNIHAN.TXT new file mode 100644 index 00000000..274fd269 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-274=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "274" UNIHAN + +0xBC21 0x6EF9 # 滹 -- 274,041 +0xBC22 0x6FB6 # 澶 -- 274,042 +0xBC23 0x8DD7 # 跗 -- 274,043 +0xBC24 0x6DDD # 淝 -- 274,044 +0xBC25 0x84CA # 蓊 -- 274,045 +0xBC26 0x705E # 灞 -- 274,046 +0xBC27 0x828E # 芎 -- 274,047 +0xBC28 0x7A79 # 穹 -- 274,050 +0xBC29 0x5777 # 坷 -- 274,051 +0xBC2A 0x4F97 # 侗 -- 274,052 +0xBC2B 0x73A2 # 玢 -- 274,053 +0xBC2C 0x5690 # 嚐 -- 274,054 +0xBC2D 0x62A8 # 抨 -- 274,055 +0xBC2E 0x82E3 # 苣 -- 274,056 +0xBC2F 0x9588 # 閈 -- 274,057 +0xBC30 0x73C8 # 珈 -- 274,060 +0xBC31 0x7967 # 祧 -- 274,061 +0xBC32 0x93DC # 鏜 -- 274,062 +0xBC33 0x59A3 # 妣 -- 274,063 +0xBC34 0x7FA2 # 羢 -- 274,064 +0xBC35 0x6523 # 攣 -- 274,065 +0xBC36 0x71C1 # 燁 -- 274,066 +0xBC37 0x665E # 晞 -- 274,067 +0xBC38 0x6C26 # 氦 -- 274,070 +0xBC39 0x6C2C # 氬 -- 274,071 +0xBC3A 0x719B # 熛 -- 274,072 +0xBC3B 0x779F # 瞟 -- 274,073 +0xBC3C 0x55E5 # 嗥 -- 274,074 +0xBC3D 0x6F8D # 澍 -- 274,075 +0xBC3E 0x6ECF # 滏 -- 274,076 +0xBC3F 0x7481 # 璁 -- 274,077 +0xBC40 0x93E8 # 鏨 -- 274,100 +0xBC41 0x9C63 # 鱣 -- 274,101 +0xBC42 0x82EF # 苯 -- 274,102 +0xBC43 0x7A1E # 稞 -- 274,103 +0xBC44 0x662B # 昫 -- 274,104 +0xBC45 0x7C91 # 粑 -- 274,105 +0xBC46 0x581D # 堝 -- 274,106 +0xBC47 0x509C # 傜 -- 274,107 +0xBC48 0x6EC6 # 滆 -- 274,110 +0xBC49 0x6E12 # 渒 -- 274,111 +0xBC4A 0x6EB3 # 溳 -- 274,112 +0xBC4B 0x6F55 # 潕 -- 274,113 +0xBC4C 0x7055 # 灕 -- 274,114 +0xBC4D 0x923D # 鈽 -- 274,115 +0xBC4E 0x9139 # 鄹 -- 274,116 +0xBC4F 0x6FC9 # 濉 -- 274,117 +0xBC50 0x7CCC # 糌 -- 274,120 +0xBC51 0x7C30 # 簰 -- 274,121 +0xBC52 0x77F8 # 矸 -- 274,122 +0xBC53 0x76EF # 盯 -- 274,123 +0xBC54 0x6C98 # 沘 -- 274,124 +0xBC55 0x73E6 # 珦 -- 274,125 +0xBC56 0x5562 # 啢 -- 274,126 +0xBC57 0x97EE # 韮 -- 274,127 +0xBC58 0x5692 # 嚒 -- 274,130 +0xBC59 0x8473 # 葳 -- 274,131 +0xBC5A 0x5472 # 呲 -- 274,132 +0xBC5B 0x5E65 # 幥 -- 274,133 +0xBC5C 0x6E63 # 湣 -- 274,134 +0xBC5D 0x9C3D # 鰽 -- 274,135 +0xBC5E 0x8E82 # 躂 -- 274,136 +0xBC5F 0x9F5C # 齜 -- 274,137 +0xBC60 0x9D6E # 鵮 -- 274,140 +0xBC61 0x4EDE # 仞 -- 274,141 +0xBC62 0x4F3B # 伻 -- 274,142 +0xBC63 0x4F5A # 佚 -- 274,143 +0xBC64 0x4F8F # 侏 -- 274,144 +0xBC65 0x4FD1 # 俑 -- 274,145 +0xBC66 0x5005 # 倅 -- 274,146 +0xBC67 0x501C # 倜 -- 274,147 +0xBC68 0x5025 # 倥 -- 274,150 +0xBC69 0x4FF5 # 俵 -- 274,151 +0xBC6A 0x509A # 傚 -- 274,152 +0xBC6B 0x50C2 # 僂 -- 274,153 +0xBC6C 0x51BD # 冽 -- 274,154 +0xBC6D 0x5233 # 刳 -- 274,155 +0xBC6E 0x5244 # 剄 -- 274,156 +0xBC6F 0x5249 # 剉 -- 274,157 +0xBC70 0x5257 # 剗 -- 274,160 +0xBC71 0x5274 # 剴 -- 274,161 +0xBC72 0x52AC # 劬 -- 274,162 +0xBC73 0x52E0 # 勠 -- 274,163 +0xBC74 0x530F # 匏 -- 274,164 +0xBC75 0x537A # 卺 -- 274,165 +0xBC76 0x539D # 厝 -- 274,166 +0xBC77 0x5A23 # 娣 -- 274,167 +0xBC78 0x5AA7 # 媧 -- 274,170 +0xBC79 0x5AB5 # 媵 -- 274,171 +0xBC7A 0x5B0B # 嬋 -- 274,172 +0xBC7B 0x5B08 # 嬈 -- 274,173 +0xBC7C 0x5B16 # 嬖 -- 274,174 +0xBC7D 0x5BE4 # 寤 -- 274,175 +0xBC7E 0x5BD8 # 寘 -- 274,176 +0xBCA1 0x5C3B # 尻 -- 274,241 +0xBCA2 0x555C # 啜 -- 274,242 +0xBCA3 0x5581 # 喁 -- 274,243 +0xBCA4 0x5599 # 喙 -- 274,244 +0xBCA5 0x55D4 # 嗔 -- 274,245 +0xBCA6 0x560F # 嘏 -- 274,246 +0xBCA7 0x5616 # 嘖 -- 274,247 +0xBCA8 0x5686 # 嚆 -- 274,250 +0xBCA9 0x56C8 # 囈 -- 274,251 +0xBCAA 0x56D3 # 囓 -- 274,252 +0xBCAB 0x56F9 # 囹 -- 274,253 +0xBCAC 0x5704 # 圄 -- 274,254 +0xBCAD 0x5709 # 圉 -- 274,255 +0xBCAE 0x57D2 # 埒 -- 274,256 +0xBCAF 0x580A # 堊 -- 274,257 +0xBCB0 0x5880 # 墀 -- 274,260 +0xBCB1 0x5C63 # 屣 -- 274,261 +0xBCB2 0x5D22 # 崢 -- 274,262 +0xBCB3 0x5D82 # 嶂 -- 274,263 +0xBCB4 0x5DCB # 巋 -- 274,264 +0xBCB5 0x5E14 # 帔 -- 274,265 +0xBCB6 0x5E40 # 幀 -- 274,266 +0xBCB7 0x5E44 # 幄 -- 274,267 +0xBCB8 0x5E6A # 幪 -- 274,270 +0xBCB9 0x5E8B # 庋 -- 274,271 +0xBCBA 0x5EA0 # 庠 -- 274,272 +0xBCBB 0x5EA5 # 庥 -- 274,273 +0xBCBC 0x5EDB # 廛 -- 274,274 +0xBCBD 0x5F89 # 徉 -- 274,275 +0xBCBE 0x5F9C # 徜 -- 274,276 +0xBCBF 0x5FA8 # 徨 -- 274,277 +0xBCC0 0x5FBC # 徼 -- 274,300 +0xBCC1 0x5FEE # 忮 -- 274,301 +0xBCC2 0x6026 # 怦 -- 274,302 +0xBCC3 0x602B # 怫 -- 274,303 +0xBCC4 0x6042 # 恂 -- 274,304 +0xBCC5 0x605A # 恚 -- 274,305 +0xBCC6 0x609B # 悛 -- 274,306 +0xBCC7 0x60C7 # 惇 -- 274,307 +0xBCC8 0x60C6 # 惆 -- 274,310 +0xBCC9 0x614D # 慍 -- 274,311 +0xBCCA 0x6134 # 愴 -- 274,312 +0xBCCB 0x614A # 慊 -- 274,313 +0xBCCC 0x615D # 慝 -- 274,314 +0xBCCD 0x6173 # 慳 -- 274,315 +0xBCCE 0x6175 # 慵 -- 274,316 +0xBCCF 0x61CC # 懌 -- 274,317 +0xBCD0 0x6229 # 戩 -- 274,320 +0xBCD1 0x6243 # 扃 -- 274,321 +0xBCD2 0x62F6 # 拶 -- 274,322 +0xBCD3 0x634D # 捍 -- 274,323 +0xBCD4 0x6434 # 搴 -- 274,324 +0xBCD5 0x64EF # 擯 -- 274,325 +0xBCD6 0x65C4 # 旄 -- 274,326 +0xBCD7 0x65C6 # 旆 -- 274,327 +0xBCD8 0x6634 # 昴 -- 274,330 +0xBCD9 0x6641 # 晁 -- 274,331 +0xBCDA 0x67B3 # 枳 -- 274,332 +0xBCDB 0x67B5 # 枵 -- 274,333 +0xBCDC 0x67D8 # 柘 -- 274,334 +0xBCDD 0x67DD # 柝 -- 274,335 +0xBCDE 0x684E # 桎 -- 274,336 +0xBCDF 0x6832 # 栲 -- 274,337 +0xBCE0 0x6954 # 楔 -- 274,340 +0xBCE1 0x6963 # 楣 -- 274,341 +0xBCE2 0x6A3A # 樺 -- 274,342 +0xBCE3 0x6AEA # 櫪 -- 274,343 +0xBCE4 0x6B37 # 欷 -- 274,344 +0xBCE5 0x6B46 # 歆 -- 274,345 +0xBCE6 0x6B54 # 歔 -- 274,346 +0xBCE7 0x6B82 # 殂 -- 274,347 +0xBCE8 0x6B8D # 殍 -- 274,350 +0xBCE9 0x6B9B # 殛 -- 274,351 +0xBCEA 0x6BAB # 殫 -- 274,352 +0xBCEB 0x6C24 # 氤 -- 274,353 +0xBCEC 0x6C33 # 氳 -- 274,354 +0xBCED 0x6C93 # 沓 -- 274,355 +0xBCEE 0x6CD3 # 泓 -- 274,356 +0xBCEF 0x6CEE # 泮 -- 274,357 +0xBCF0 0x6D19 # 洙 -- 274,360 +0xBCF1 0x6D0A # 洊 -- 274,361 +0xBCF2 0x6D33 # 洳 -- 274,362 +0xBCF3 0x6E4E # 湎 -- 274,363 +0xBCF4 0x7027 # 瀧 -- 274,364 +0xBCF5 0x71F9 # 燹 -- 274,365 +0xBCF6 0x72C3 # 狃 -- 274,366 +0xBCF7 0x7317 # 猗 -- 274,367 +0xBCF8 0x7350 # 獐 -- 274,370 +0xBCF9 0x73B7 # 玷 -- 274,371 +0xBCFA 0x73C2 # 珂 -- 274,372 +0xBCFB 0x74A3 # 璣 -- 274,373 +0xBCFC 0x74DE # 瓞 -- 274,374 +0xBCFD 0x7688 # 皈 -- 274,375 +0xBCFE 0x7747 # 睇 -- 274,376 diff --git a/unicode/xerox/unihan/XCCS-275=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-275=UNIHAN.TXT new file mode 100644 index 00000000..e14d7308 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-275=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "275" UNIHAN + +0xBD21 0x7768 # 睨 -- 275,041 +0xBD22 0x7765 # 睥 -- 275,042 +0xBD23 0x778B # 瞋 -- 275,043 +0xBD24 0x77CD # 矍 -- 275,044 +0xBD25 0x77E7 # 矧 -- 275,045 +0xBD26 0x78D0 # 磐 -- 275,046 +0xBD27 0x792A # 礪 -- 275,047 +0xBD28 0x7953 # 祓 -- 275,050 +0xBD29 0x795C # 祜 -- 275,051 +0xBD2A 0x798A # 禊 -- 275,052 +0xBD2B 0x79B0 # 禰 -- 275,053 +0xBD2C 0x79B3 # 禳 -- 275,054 +0xBD2D 0x7A70 # 穰 -- 275,055 +0xBD2E 0x7AB3 # 窳 -- 275,056 +0xBD2F 0x7AB6 # 窶 -- 275,057 +0xBD30 0x7B0F # 笏 -- 275,060 +0xBD31 0x7B1E # 笞 -- 275,061 +0xBD32 0x7B25 # 笥 -- 275,062 +0xBD33 0x7B4C # 筌 -- 275,063 +0xBD34 0x7B04 # 笄 -- 275,064 +0xBD35 0x7B51 # 筑 -- 275,065 +0xBD36 0x7B6E # 筮 -- 275,066 +0xBD37 0x7CB2 # 粲 -- 275,067 +0xBD38 0x7D3A # 紺 -- 275,070 +0xBD39 0x7D4F # 絏 -- 275,071 +0xBD3A 0x7D5C # 絜 -- 275,072 +0xBD3B 0x7D86 # 綆 -- 275,073 +0xBD3C 0x7DA3 # 綣 -- 275,074 +0xBD3D 0x7DAE # 綮 -- 275,075 +0xBD3E 0x7DC7 # 緇 -- 275,076 +0xBD3F 0x7E1F # 縟 -- 275,077 +0xBD40 0x7E47 # 繇 -- 275,100 +0xBD41 0x7E3B # 縻 -- 275,101 +0xBD42 0x7E32 # 縲 -- 275,102 +0xBD43 0x7E93 # 纓 -- 275,103 +0xBD44 0x7E98 # 纘 -- 275,104 +0xBD45 0x7FEE # 翮 -- 275,105 +0xBD46 0x8004 # 耄 -- 275,106 +0xBD47 0x8028 # 耨 -- 275,107 +0xBD48 0x80DD # 胝 -- 275,110 +0xBD49 0x80EF # 胯 -- 275,111 +0xBD4A 0x8182 # 膂 -- 275,112 +0xBD4B 0x81BE # 膾 -- 275,113 +0xBD4C 0x8210 # 舐 -- 275,114 +0xBD4D 0x8237 # 舷 -- 275,115 +0xBD4E 0x8238 # 舸 -- 275,116 +0xBD4F 0x829F # 芟 -- 275,117 +0xBD50 0x82EB # 苫 -- 275,120 +0xBD51 0x831C # 茜 -- 275,121 +0xBD52 0x8343 # 荃 -- 275,122 +0xBD53 0x837B # 荻 -- 275,123 +0xBD54 0x8469 # 葩 -- 275,124 +0xBD55 0x84AF # 蒯 -- 275,125 +0xBD56 0x84D0 # 蓐 -- 275,126 +0xBD57 0x84F0 # 蓰 -- 275,127 +0xBD58 0x84FC # 蓼 -- 275,130 +0xBD59 0x851E # 蔞 -- 275,131 +0xBD5A 0x8588 # 薈 -- 275,132 +0xBD5B 0x8599 # 薙 -- 275,133 +0xBD5C 0x85A8 # 薨 -- 275,134 +0xBD5D 0x85A4 # 薤 -- 275,135 +0xBD5E 0x85DC # 藜 -- 275,136 +0xBD5F 0x86A8 # 蚨 -- 275,137 +0xBD60 0x868B # 蚋 -- 275,140 +0xBD61 0x887F # 衿 -- 275,141 +0xBD62 0x88AA # 袪 -- 275,142 +0xBD63 0x88CA # 裊 -- 275,143 +0xBD64 0x88FE # 裾 -- 275,144 +0xBD65 0x89BF # 覿 -- 275,145 +0xBD66 0x89D6 # 觖 -- 275,146 +0xBD67 0x89DA # 觚 -- 275,147 +0xBD68 0x89E5 # 觥 -- 275,150 +0xBD69 0x89EB # 觫 -- 275,151 +0xBD6A 0x89F3 # 觳 -- 275,152 +0xBD6B 0x8A36 # 訶 -- 275,153 +0xBD6C 0x8A3E # 訾 -- 275,154 +0xBD6D 0x8A41 # 詁 -- 275,155 +0xBD6E 0x8A5B # 詛 -- 275,156 +0xBD6F 0x8A6E # 詮 -- 275,157 +0xBD70 0x8ACD # 諍 -- 275,160 +0xBD71 0x8ACF # 諏 -- 275,161 +0xBD72 0x8AE4 # 諤 -- 275,162 +0xBD73 0x8ADE # 諞 -- 275,163 +0xBD74 0x8B56 # 譖 -- 275,164 +0xBD75 0x8C85 # 貅 -- 275,165 +0xBD76 0x8C94 # 貔 -- 275,166 +0xBD77 0x8CC1 # 賁 -- 275,167 +0xBD78 0x8CD9 # 賙 -- 275,170 +0xBD79 0x8D14 # 贔 -- 275,171 +0xBD7A 0x8D73 # 赳 -- 275,172 +0xBD7B 0x8DE3 # 跣 -- 275,173 +0xBD7C 0x8DEB # 跫 -- 275,174 +0xBD7D 0x8DEC # 跬 -- 275,175 +0xBD7E 0x8E09 # 踉 -- 275,176 +0xBDA1 0x8E47 # 蹇 -- 275,241 +0xBDA2 0x8E4A # 蹊 -- 275,242 +0xBDA3 0x8E93 # 躓 -- 275,243 +0xBDA4 0x8EDB # 軛 -- 275,244 +0xBDA5 0x8EFE # 軾 -- 275,245 +0xBDA6 0x8F05 # 輅 -- 275,246 +0xBDA7 0x8F26 # 輦 -- 275,247 +0xBDA8 0x8F33 # 輳 -- 275,250 +0xBDA9 0x8F36 # 輶 -- 275,251 +0xBDAA 0x8F42 # 轂 -- 275,252 +0xBDAB 0x8FE4 # 迤 -- 275,253 +0xBDAC 0x9005 # 逅 -- 275,254 +0xBDAD 0x900B # 逋 -- 275,255 +0xBDAE 0x9021 # 逡 -- 275,256 +0xBDAF 0x9058 # 遘 -- 275,257 +0xBDB0 0x9090 # 邐 -- 275,260 +0xBDB1 0x918D # 醍 -- 275,261 +0xBDB2 0x9190 # 醐 -- 275,262 +0xBDB3 0x91B4 # 醴 -- 275,263 +0xBDB4 0x91E6 # 釦 -- 275,264 +0xBDB5 0x923F # 鈿 -- 275,265 +0xBDB6 0x9266 # 鉦 -- 275,266 +0xBDB7 0x92E9 # 鋩 -- 275,267 +0xBDB8 0x93A7 # 鎧 -- 275,270 +0xBDB9 0x93D8 # 鏘 -- 275,271 +0xBDBA 0x944A # 鑊 -- 275,272 +0xBDBB 0x9460 # 鑠 -- 275,273 +0xBDBC 0x95AB # 閫 -- 275,274 +0xBDBD 0x95DE # 闞 -- 275,275 +0xBDBE 0x9708 # 霈 -- 275,276 +0xBDBF 0x970F # 霏 -- 275,277 +0xBDC0 0x9730 # 霰 -- 275,300 +0xBDC1 0x97AB # 鞫 -- 275,301 +0xBDC2 0x97DE # 韞 -- 275,302 +0xBDC3 0x98EB # 飫 -- 275,303 +0xBDC4 0x9949 # 饉 -- 275,304 +0xBDC5 0x9997 # 馗 -- 275,305 +0xBDC6 0x99DF # 駟 -- 275,306 +0xBDC7 0x9B23 # 鬣 -- 275,307 +0xBDC8 0x9B29 # 鬩 -- 275,310 +0xBDC9 0x9B3B # 鬻 -- 275,311 +0xBDCA 0x9B43 # 魃 -- 275,312 +0xBDCB 0x9B48 # 魈 -- 275,313 +0xBDCC 0x9B4D # 魍 -- 275,314 +0xBDCD 0x9B51 # 魑 -- 275,315 +0xBDCE 0x9BC1 # 鯁 -- 275,316 +0xBDCF 0x9D60 # 鵠 -- 275,317 +0xBDD0 0x9EE5 # 黥 -- 275,320 +0xBDD1 0x9F4E # 齎 -- 275,321 +0xBDD2 0x4EC3 # 仃 -- 275,322 +0xBDD3 0x6420 # 搠 -- 275,323 +0xBDD4 0x6A17 # 樗 -- 275,324 +0xBDD5 0x727E # 牾 -- 275,325 +0xBDD6 0x80AD # 肭 -- 275,326 +0xBDD7 0x86E9 # 蛩 -- 275,327 +0xBDD8 0x8998 # 覘 -- 275,330 +0xBDD9 0x4EB9 # 亹 -- 275,331 +0xBDDA 0x4EC2 # 仂 -- 275,332 +0xBDDB 0x4F0E # 伎 -- 275,333 +0xBDDC 0x4F7C # 佼 -- 275,334 +0xBDDD 0x4F3E # 伾 -- 275,335 +0xBDDE 0x4FF6 # 俶 -- 275,336 +0xBDDF 0x502C # 倬 -- 275,337 +0xBDE0 0x5048 # 偈 -- 275,340 +0xBDE1 0x50E6 # 僦 -- 275,341 +0xBDE2 0x5260 # 剠 -- 275,342 +0xBDE3 0x527D # 剽 -- 275,343 +0xBDE4 0x5282 # 劂 -- 275,344 +0xBDE5 0x5293 # 劓 -- 275,345 +0xBDE6 0x65B8 # 斸 -- 275,346 +0xBDE7 0x52E3 # 勣 -- 275,347 +0xBDE8 0x5396 # 厖 -- 275,350 +0xBDE9 0x5399 # 厙 -- 275,351 +0xBDEA 0x53E1 # 叡 -- 275,352 +0xBDEB 0x85C9 # 藉 -- 275,353 +0xBDEC 0x8986 # 覆 -- 275,354 +0xBDED 0x5AC4 # 嫄 -- 275,355 +0xBDEE 0x5B00 # 嬀 -- 275,356 +0xBDEF 0x5B19 # 嬙 -- 275,357 +0xBDF0 0x5B32 # 嬲 -- 275,360 +0xBDF1 0x5B5B # 孛 -- 275,361 +0xBDF2 0x5B7F # 孿 -- 275,362 +0xBDF3 0x5B84 # 宄 -- 275,363 +0xBDF4 0x5B93 # 宓 -- 275,364 +0xBDF5 0x5C28 # 尨 -- 275,365 +0xBDF6 0x8A10 # 訐 -- 275,366 +0xBDF7 0x54E2 # 哢 -- 275,367 +0xBDF8 0x5586 # 喆 -- 275,370 +0xBDF9 0x55D2 # 嗒 -- 275,371 +0xBDFA 0x5605 # 嘅 -- 275,372 +0xBDFB 0x5642 # 噂 -- 275,373 +0xBDFC 0x5638 # 嘸 -- 275,374 +0xBDFD 0x5672 # 噲 -- 275,375 +0xBDFE 0x566D # 噭 -- 275,376 diff --git a/unicode/xerox/unihan/XCCS-276=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-276=UNIHAN.TXT new file mode 100644 index 00000000..d1eba4f1 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-276=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "276" UNIHAN + +0xBE21 0x568F # 嚏 -- 276,041 +0xBE22 0x570A # 圊 -- 276,042 +0xBE23 0x571B # 圛 -- 276,043 +0xBE24 0x573B # 圻 -- 276,044 +0xBE25 0x57F4 # 埴 -- 276,045 +0xBE26 0x57F5 # 埵 -- 276,046 +0xBE27 0x5797 # 垗 -- 276,047 +0xBE28 0x5879 # 塹 -- 276,050 +0xBE29 0x587F # 塿 -- 276,051 +0xBE2A 0x58BA # 墺 -- 276,052 +0xBE2B 0x58CE # 壎 -- 276,053 +0xBE2C 0x58DA # 壚 -- 276,054 +0xBE2D 0x8759 # 蝙 -- 276,055 +0xBE2E 0x5981 # 妁 -- 276,056 +0xBE2F 0x5C7A # 屺 -- 276,057 +0xBE30 0x5DA2 # 嶢 -- 276,060 +0xBE31 0x5DAE # 嶮 -- 276,061 +0xBE32 0x5E28 # 帨 -- 276,062 +0xBE33 0x5ECB # 廋 -- 276,063 +0xBE34 0x5EE1 # 廡 -- 276,064 +0xBE35 0x5F08 # 弈 -- 276,065 +0xBE36 0x601B # 怛 -- 276,066 +0xBE37 0x6049 # 恉 -- 276,067 +0xBE38 0x6081 # 悁 -- 276,070 +0xBE39 0x60DD # 惝 -- 276,071 +0xBE3A 0x6142 # 慂 -- 276,072 +0xBE3B 0x6165 # 慥 -- 276,073 +0xBE3C 0x617C # 慼 -- 276,074 +0xBE3D 0x619D # 憝 -- 276,075 +0xBE3E 0x61C6 # 懆 -- 276,076 +0xBE3F 0x63AE # 掮 -- 276,077 +0xBE40 0x6426 # 搦 -- 276,100 +0xBE41 0x6425 # 搥 -- 276,101 +0xBE42 0x6516 # 攖 -- 276,102 +0xBE43 0x6581 # 斁 -- 276,103 +0xBE44 0x65D2 # 旒 -- 276,104 +0xBE45 0x65DB # 旛 -- 276,105 +0xBE46 0x65DD # 旝 -- 276,106 +0xBE47 0x66D6 # 曖 -- 276,107 +0xBE48 0x674C # 杌 -- 276,110 +0xBE49 0x4F70 # 佰 -- 276,111 +0xBE4A 0x6829 # 栩 -- 276,112 +0xBE4B 0x6874 # 桴 -- 276,113 +0xBE4C 0x68F0 # 棰 -- 276,114 +0xBE4D 0x69CE # 槎 -- 276,115 +0xBE4E 0x6A48 # 橈 -- 276,116 +0xBE4F 0x6AAE # 檮 -- 276,117 +0xBE50 0x6ADC # 櫜 -- 276,120 +0xBE51 0x6A64 # 橤 -- 276,121 +0xBE52 0x6BF3 # 毳 -- 276,122 +0xBE53 0x6C9A # 沚 -- 276,123 +0xBE54 0x6CB4 # 沴 -- 276,124 +0xBE55 0x6D38 # 洸 -- 276,125 +0xBE56 0x6E5C # 湜 -- 276,126 +0xBE57 0x6F8C # 澌 -- 276,127 +0xBE58 0x6FA3 # 澣 -- 276,130 +0xBE59 0x6FB9 # 澹 -- 276,131 +0xBE5A 0x7005 # 瀅 -- 276,132 +0xBE5B 0x7032 # 瀲 -- 276,133 +0xBE5C 0x705D # 灝 -- 276,134 +0xBE5D 0x73FA # 珺 -- 276,135 +0xBE5E 0x736A # 獪 -- 276,136 +0xBE5F 0x7487 # 璇 -- 276,137 +0xBE60 0x7503 # 甃 -- 276,140 +0xBE61 0x750D # 甍 -- 276,141 +0xBE62 0x7665 # 癥 -- 276,142 +0xBE63 0x769A # 皚 -- 276,143 +0xBE64 0x7708 # 眈 -- 276,144 +0xBE65 0x7722 # 眢 -- 276,145 +0xBE66 0x7725 # 眥 -- 276,146 +0xBE67 0x775E # 睞 -- 276,147 +0xBE68 0x7762 # 睢 -- 276,150 +0xBE69 0x776A # 睪 -- 276,151 +0xBE6A 0x77A2 # 瞢 -- 276,152 +0xBE6B 0x7994 # 禔 -- 276,153 +0xBE6C 0x79A8 # 禨 -- 276,154 +0xBE6D 0x7A02 # 稂 -- 276,155 +0xBE6E 0x7A19 # 稙 -- 276,156 +0xBE6F 0x7A49 # 穉 -- 276,157 +0xBE70 0x7AE6 # 竦 -- 276,160 +0xBE71 0x7C1F # 簟 -- 276,161 +0xBE72 0x7C40 # 籀 -- 276,162 +0xBE73 0x7CCE # 糎 -- 276,163 +0xBE74 0x7D32 # 紲 -- 276,164 +0xBE75 0x7D7A # 絺 -- 276,165 +0xBE76 0x7D88 # 綈 -- 276,166 +0xBE77 0x7E44 # 繄 -- 276,167 +0xBE78 0x7F6B # 罫 -- 276,170 +0xBE79 0x7FD5 # 翕 -- 276,171 +0xBE7A 0x7FFD # 翽 -- 276,172 +0xBE7B 0x800B # 耋 -- 276,173 +0xBE7C 0x8107 # 脇 -- 276,174 +0xBE7D 0x8146 # 腆 -- 276,175 +0xBE7E 0x8234 # 舴 -- 276,176 +0xBEA1 0x82A1 # 芡 -- 276,241 +0xBEA2 0x83C0 # 菀 -- 276,242 +0xBEA3 0x854E # 蕎 -- 276,243 +0xBEA4 0x874E # 蝎 -- 276,244 +0xBEA5 0x880B # 蠋 -- 276,245 +0xBEA6 0x8897 # 袗 -- 276,246 +0xBEA7 0x88EF # 裯 -- 276,247 +0xBEA8 0x8930 # 褰 -- 276,250 +0xBEA9 0x895E # 襞 -- 276,251 +0xBEAA 0x8A12 # 訒 -- 276,252 +0xBEAB 0x8B1A # 謚 -- 276,253 +0xBEAC 0x8AF6 # 諶 -- 276,254 +0xBEAD 0x8B26 # 謦 -- 276,255 +0xBEAE 0x8CDA # 賚 -- 276,256 +0xBEAF 0x6EC7 # 滇 -- 276,257 +0xBEB0 0x8E50 # 蹐 -- 276,260 +0xBEB1 0x9085 # 邅 -- 276,261 +0xBEB2 0x90B4 # 邴 -- 276,262 +0xBEB3 0x9321 # 錡 -- 276,263 +0xBEB4 0x9419 # 鐙 -- 276,264 +0xBEB5 0x9436 # 鐶 -- 276,265 +0xBEB6 0x5FB5 # 徵 -- 276,266 +0xBEB7 0x9654 # 陔 -- 276,267 +0xBEB8 0x9688 # 隈 -- 276,270 +0xBEB9 0x9697 # 隗 -- 276,271 +0xBEBA 0x96F0 # 雰 -- 276,272 +0xBEBB 0x9746 # 靆 -- 276,273 +0xBEBC 0x9749 # 靉 -- 276,274 +0xBEBD 0x99F8 # 駸 -- 276,275 +0xBEBE 0x9A42 # 驂 -- 276,276 +0xBEBF 0x9A40 # 驀 -- 276,277 +0xBEC0 0x9A69 # 驩 -- 276,300 +0xBEC1 0x9AD1 # 髑 -- 276,301 +0xBEC2 0x9AF9 # 髹 -- 276,302 +0xBEC3 0x9B92 # 鮒 -- 276,303 +0xBEC4 0x9BAB # 鮫 -- 276,304 +0xBEC5 0x9C3B # 鰻 -- 276,305 +0xBEC6 0x9DF2 # 鷲 -- 276,306 +0xBEC7 0x9E83 # 麃 -- 276,307 +0xBEC8 0x9E88 # 麈 -- 276,310 +0xBEC9 0x9F72 # 齲 -- 276,311 +0xBECA 0x504C # 偌 -- 276,312 +0xBECB 0x5108 # 儈 -- 276,313 +0xBECC 0x51DF # 凟 -- 276,314 +0xBECD 0x526E # 剮 -- 276,315 +0xBECE 0x5A09 # 娉 -- 276,316 +0xBECF 0x5A77 # 婷 -- 276,317 +0xBED0 0x5B4C # 孌 -- 276,320 +0xBED1 0x5B73 # 孳 -- 276,321 +0xBED2 0x5BF0 # 寰 -- 276,322 +0xBED3 0x53F5 # 叵 -- 276,323 +0xBED4 0x54C2 # 哂 -- 276,324 +0xBED5 0x54C6 # 哆 -- 276,325 +0xBED6 0x55DF # 嗟 -- 276,326 +0xBED7 0x56EB # 囫 -- 276,327 +0xBED8 0x5707 # 圇 -- 276,330 +0xBED9 0x62D7 # 拗 -- 276,331 +0xBEDA 0x579B # 垛 -- 276,332 +0xBEDB 0x584D # 塍 -- 276,333 +0xBEDC 0x58A9 # 墩 -- 276,334 +0xBEDD 0x5D3D # 崽 -- 276,335 +0xBEDE 0x5D4B # 嵋 -- 276,336 +0xBEDF 0x5E54 # 幔 -- 276,337 +0xBEE0 0x5ED5 # 廕 -- 276,340 +0xBEE1 0x5FAD # 徭 -- 276,341 +0xBEE2 0x600D # 怍 -- 276,342 +0xBEE3 0x6035 # 怵 -- 276,343 +0xBEE4 0x60F4 # 惴 -- 276,344 +0xBEE5 0x6192 # 憒 -- 276,345 +0xBEE6 0x6207 # 戇 -- 276,346 +0xBEE7 0x6225 # 戥 -- 276,347 +0xBEE8 0x6286 # 抆 -- 276,350 +0xBEE9 0x62C4 # 拄 -- 276,351 +0xBEEA 0x634B # 捋 -- 276,352 +0xBEEB 0x634E # 捎 -- 276,353 +0xBEEC 0x6382 # 掂 -- 276,354 +0xBEED 0x6522 # 攢 -- 276,355 +0xBEEE 0x66B1 # 暱 -- 276,356 +0xBEEF 0x6748 # 杈 -- 276,357 +0xBEF0 0x67C1 # 柁 -- 276,360 +0xBEF1 0x6A5B # 橛 -- 276,361 +0xBEF2 0x6A28 # 樨 -- 276,362 +0xBEF3 0x6AFA # 櫺 -- 276,363 +0xBEF4 0x6BBD # 殽 -- 276,364 +0xBEF5 0x6CD4 # 泔 -- 276,365 +0xBEF6 0x6CEF # 泯 -- 276,366 +0xBEF7 0x6E98 # 溘 -- 276,367 +0xBEF8 0x7078 # 灸 -- 276,370 +0xBEF9 0x733A # 猺 -- 276,371 +0xBEFA 0x75A3 # 疣 -- 276,372 +0xBEFB 0x75BF # 疿 -- 276,373 +0xBEFC 0x7643 # 癃 -- 276,374 +0xBEFD 0x76B4 # 皴 -- 276,375 +0xBEFE 0x77BD # 瞽 -- 276,376 diff --git a/unicode/xerox/unihan/XCCS-277=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-277=UNIHAN.TXT new file mode 100644 index 00000000..62bd146a --- /dev/null +++ b/unicode/xerox/unihan/XCCS-277=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "277" UNIHAN + +0xBF21 0x7A61 # 穡 -- 277,041 +0xBF22 0x7B0A # 笊 -- 277,042 +0xBF23 0x7CF2 # 糲 -- 277,043 +0xBF24 0x7D08 # 紈 -- 277,044 +0xBF25 0x7D3C # 紼 -- 277,045 +0xBF26 0x7DF2 # 緲 -- 277,046 +0xBF27 0x7F61 # 罡 -- 277,047 +0xBF28 0x7F63 # 罣 -- 277,050 +0xBF29 0x7F7E # 罾 -- 277,051 +0xBF2A 0x7FF1 # 翱 -- 277,052 +0xBF2B 0x814C # 腌 -- 277,053 +0xBF2C 0x81EC # 臬 -- 277,054 +0xBF2D 0x82A9 # 芩 -- 277,055 +0xBF2E 0x82AA # 芪 -- 277,056 +0xBF2F 0x82B7 # 芷 -- 277,057 +0xBF30 0x82AF # 芯 -- 277,060 +0xBF31 0x82F4 # 苴 -- 277,061 +0xBF32 0x832F # 茯 -- 277,062 +0xBF33 0x8334 # 茴 -- 277,063 +0xBF34 0x8406 # 萆 -- 277,064 +0xBF35 0x843C # 萼 -- 277,065 +0xBF36 0x845A # 葚 -- 277,066 +0xBF37 0x858F # 薏 -- 277,067 +0xBF38 0x86B0 # 蚰 -- 277,070 +0xBF39 0x86C9 # 蛉 -- 277,071 +0xBF3A 0x86ED # 蛭 -- 277,072 +0xBF3B 0x86D0 # 蛐 -- 277,073 +0xBF3C 0x8707 # 蜇 -- 277,074 +0xBF3D 0x8706 # 蜆 -- 277,075 +0xBF3E 0x87CA # 蟊 -- 277,076 +0xBF3F 0x87E3 # 蟣 -- 277,077 +0xBF40 0x87EE # 蟮 -- 277,100 +0xBF41 0x8821 # 蠡 -- 277,101 +0xBF42 0x8869 # 衩 -- 277,102 +0xBF43 0x8872 # 衲 -- 277,103 +0xBF44 0x8919 # 褙 -- 277,104 +0xBF45 0x8926 # 褦 -- 277,105 +0xBF46 0x8921 # 褡 -- 277,106 +0xBF47 0x8933 # 褳 -- 277,107 +0xBF48 0x8A84 # 誄 -- 277,110 +0xBF49 0x8B54 # 譔 -- 277,111 +0xBF4A 0x8C9B # 貛 -- 277,112 +0xBF4B 0x8D04 # 贄 -- 277,113 +0xBF4C 0x8DE4 # 跤 -- 277,114 +0xBF4D 0x8E69 # 蹩 -- 277,115 +0xBF4E 0x8E6D # 蹭 -- 277,116 +0xBF4F 0x8E90 # 躐 -- 277,117 +0xBF50 0x91B5 # 醵 -- 277,120 +0xBF51 0x93F9 # 鏹 -- 277,121 +0xBF52 0x95B9 # 閹 -- 277,122 +0xBF53 0x9642 # 陂 -- 277,123 +0xBF54 0x9658 # 陘 -- 277,124 +0xBF55 0x994C # 饌 -- 277,125 +0xBF56 0x9A38 # 騸 -- 277,126 +0xBF57 0x9B58 # 魘 -- 277,127 +0xBF58 0x9BFF # 鯿 -- 277,130 +0xBF59 0x9C23 # 鰣 -- 277,131 +0xBF5A 0x9C5F # 鱟 -- 277,132 +0xBF5B 0x9D1E # 鴞 -- 277,133 +0xBF5C 0x9D1F # 鴟 -- 277,134 +0xBF5D 0x9D53 # 鵓 -- 277,135 +0xBF5E 0x9D6A # 鵪 -- 277,136 +0xBF5F 0x9DD9 # 鷙 -- 277,137 +0xBF60 0x9DF8 # 鷸 -- 277,140 +0xBF61 0x9E1B # 鸛 -- 277,141 +0xBF62 0x9E1D # 鸝 -- 277,142 +0xBF63 0x9F09 # 鼉 -- 277,143 +0xBF64 0x9F41 # 齁 -- 277,144 +0xBF65 0x4E5C # 乜 -- 277,145 +0xBF66 0x4EF5 # 仵 -- 277,146 +0xBF67 0x4F0B # 伋 -- 277,147 +0xBF68 0x4F58 # 佘 -- 277,150 +0xBF69 0x4F7E # 佾 -- 277,151 +0xBF6A 0x4F94 # 侔 -- 277,152 +0xBF6B 0x50B4 # 傴 -- 277,153 +0xBF6C 0x50C7 # 僇 -- 277,154 +0xBF6D 0x50E8 # 僨 -- 277,155 +0xBF6E 0x5107 # 儇 -- 277,156 +0xBF6F 0x5114 # 儔 -- 277,157 +0xBF70 0x5133 # 儳 -- 277,160 +0xBF71 0x5155 # 兕 -- 277,161 +0xBF72 0x51AA # 冪 -- 277,162 +0xBF73 0x5216 # 刖 -- 277,163 +0xBF74 0x525E # 剞 -- 277,164 +0xBF75 0x5261 # 剡 -- 277,165 +0xBF76 0x52AD # 劭 -- 277,166 +0xBF77 0x5363 # 卣 -- 277,167 +0xBF78 0x5394 # 厔 -- 277,170 +0xBF79 0x5A13 # 娓 -- 277,171 +0xBF7A 0x5A6D # 婭 -- 277,172 +0xBF7B 0x5A7A # 婺 -- 277,173 +0xBF7C 0x5AB8 # 媸 -- 277,174 +0xBF7D 0x5ACB # 嫋 -- 277,175 +0xBF7E 0x5ADC # 嫜 -- 277,176 +0xBFA1 0x5AE0 # 嫠 -- 277,241 +0xBFA2 0x5B24 # 嬤 -- 277,242 +0xBFA3 0x5466 # 呦 -- 277,243 +0xBFA4 0x548B # 咋 -- 277,244 +0xBFA5 0x54BF # 咿 -- 277,245 +0xBFA6 0x557E # 啾 -- 277,246 +0xBFA7 0x5588 # 喈 -- 277,247 +0xBFA8 0x558F # 喏 -- 277,250 +0xBFA9 0x55D1 # 嗑 -- 277,251 +0xBFAA 0x55F7 # 嗷 -- 277,252 +0xBFAB 0x560E # 嘎 -- 277,253 +0xBFAC 0x5635 # 嘵 -- 277,254 +0xBFAD 0x564D # 噍 -- 277,255 +0xBFAE 0x56AC # 嚬 -- 277,256 +0xBFAF 0x572F # 圯 -- 277,257 +0xBFB0 0x577B # 坻 -- 277,260 +0xBFB1 0x57C2 # 埂 -- 277,261 +0xBFB2 0x5924 # 夤 -- 277,262 +0xBFB3 0x592F # 夯 -- 277,263 +0xBFB4 0x5997 # 妗 -- 277,264 +0xBFB5 0x5CCB # 峋 -- 277,265 +0xBFB6 0x5D1A # 崚 -- 277,266 +0xBFB7 0x5D4E # 嵎 -- 277,267 +0xBFB8 0x5D99 # 嶙 -- 277,270 +0xBFB9 0x5DA0 # 嶠 -- 277,271 +0xBFBA 0x5D92 # 嶒 -- 277,272 +0xBFBB 0x5D94 # 嶔 -- 277,273 +0xBFBC 0x5DB7 # 嶷 -- 277,274 +0xBFBD 0x5DB8 # 嶸 -- 277,275 +0xBFBE 0x5DC7 # 巇 -- 277,276 +0xBFBF 0x5DC9 # 巉 -- 277,277 +0xBFC0 0x5E21 # 帡 -- 277,300 +0xBFC1 0x5EC4 # 廄 -- 277,301 +0xBFC2 0x5F07 # 弇 -- 277,302 +0xBFC3 0x5FAC # 徬 -- 277,303 +0xBFC4 0x5FD2 # 忒 -- 277,304 +0xBFC5 0x5FD0 # 忐 -- 277,305 +0xBFC6 0x5FD1 # 忑 -- 277,306 +0xBFC7 0x605D # 恝 -- 277,307 +0xBFC8 0x6067 # 恧 -- 277,310 +0xBFC9 0x6092 # 悒 -- 277,311 +0xBFCA 0x60B1 # 悱 -- 277,312 +0xBFCB 0x60F8 # 惸 -- 277,313 +0xBFCC 0x6100 # 愀 -- 277,314 +0xBFCD 0x612B # 愫 -- 277,315 +0xBFCE 0x61DF # 懟 -- 277,316 +0xBFCF 0x623D # 戽 -- 277,317 +0xBFD0 0x62CA # 拊 -- 277,320 +0xBFD1 0x637D # 捽 -- 277,321 +0xBFD2 0x638A # 掊 -- 277,322 +0xBFD3 0x63BE # 掾 -- 277,323 +0xBFD4 0x646D # 摭 -- 277,324 +0xBFD5 0x6476 # 摶 -- 277,325 +0xBFD6 0x649D # 撝 -- 277,326 +0xBFD7 0x64BB # 撻 -- 277,327 +0xBFD8 0x64FB # 擻 -- 277,330 +0xBFD9 0x64F7 # 擷 -- 277,331 +0xBFDA 0x5910 # 夐 -- 277,332 +0xBFDB 0x65B2 # 斲 -- 277,333 +0xBFDC 0x65C2 # 旂 -- 277,334 +0xBFDD 0x6609 # 昉 -- 277,335 +0xBFDE 0x6615 # 昕 -- 277,336 +0xBFDF 0x6661 # 晡 -- 277,337 +0xBFE0 0x668D # 暍 -- 277,340 +0xBFE1 0x669D # 暝 -- 277,341 +0xBFE2 0x66B5 # 暵 -- 277,342 +0xBFE3 0x66BE # 暾 -- 277,343 +0xBFE4 0x66DB # 曛 -- 277,344 +0xBFE5 0x6798 # 枘 -- 277,345 +0xBFE6 0x67B2 # 枲 -- 277,346 +0xBFE7 0x67E2 # 柢 -- 277,347 +0xBFE8 0x688F # 梏 -- 277,350 +0xBFE9 0x68D6 # 棖 -- 277,351 +0xBFEA 0x68E3 # 棣 -- 277,352 +0xBFEB 0x68E8 # 棨 -- 277,353 +0xBFEC 0x696E # 楮 -- 277,354 +0xBFED 0x6978 # 楸 -- 277,355 +0xBFEE 0x695B # 楛 -- 277,356 +0xBFEF 0x6966 # 楦 -- 277,357 +0xBFF0 0x69CA # 槊 -- 277,360 +0xBFF1 0x69C5 # 槅 -- 277,361 +0xBFF2 0x69FF # 槿 -- 277,362 +0xBFF3 0x69D4 # 槔 -- 277,363 +0xBFF4 0x6AA0 # 檠 -- 277,364 +0xBFF5 0x6AA3 # 檣 -- 277,365 +0xBFF6 0x6ADE # 櫞 -- 277,366 +0xBFF7 0x6ADF # 櫟 -- 277,367 +0xBFF8 0x6AF3 # 櫳 -- 277,370 +0xBFF9 0x6B3F # 欿 -- 277,371 +0xBFFA 0x6B43 # 歃 -- 277,372 +0xBFFB 0x6B9E # 殞 -- 277,373 +0xBFFC 0x6BD6 # 毖 -- 277,374 +0xBFFD 0x6BF9 # 毹 -- 277,375 +0xBFFE 0x6C0D # 氍 -- 277,376 diff --git a/unicode/xerox/unihan/XCCS-300=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-300=UNIHAN.TXT new file mode 100644 index 00000000..24243518 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-300=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "300" UNIHAN + +0xC021 0x6C46 # 汆 -- 300,041 +0xC022 0x6C69 # 汩 -- 300,042 +0xC023 0x6C94 # 沔 -- 300,043 +0xC024 0x6CEB # 泫 -- 300,044 +0xC025 0x6CF1 # 泱 -- 300,045 +0xC026 0x6D0E # 洎 -- 300,046 +0xC027 0x6D2B # 洫 -- 300,047 +0xC028 0x6D7C # 浼 -- 300,050 +0xC029 0x6D94 # 涔 -- 300,051 +0xC02A 0x6D98 # 涘 -- 300,052 +0xC02B 0x6DC5 # 淅 -- 300,053 +0xC02C 0x6C8D # 沍 -- 300,054 +0xC02D 0x6E54 # 湔 -- 300,055 +0xC02E 0x6E6B # 湫 -- 300,056 +0xC02F 0x6EB2 # 溲 -- 300,057 +0xC030 0x6EBD # 溽 -- 300,060 +0xC031 0x6E8F # 溏 -- 300,061 +0xC032 0x6F5E # 潞 -- 300,062 +0xC033 0x6F59 # 潙 -- 300,063 +0xC034 0x6FE1 # 濡 -- 300,064 +0xC035 0x7039 # 瀹 -- 300,065 +0xC036 0x70DD # 烝 -- 300,066 +0xC037 0x7162 # 煢 -- 300,067 +0xC038 0x71AF # 熯 -- 300,070 +0xC039 0x71B8 # 熸 -- 300,071 +0xC03A 0x71E0 # 燠 -- 300,072 +0xC03B 0x721D # 爝 -- 300,073 +0xC03C 0x7263 # 牣 -- 300,074 +0xC03D 0x72F7 # 狷 -- 300,075 +0xC03E 0x72FA # 狺 -- 300,076 +0xC03F 0x731E # 猞 -- 300,077 +0xC040 0x7322 # 猢 -- 300,100 +0xC041 0x733B # 猻 -- 300,101 +0xC042 0x734D # 獍 -- 300,102 +0xC043 0x737C # 獼 -- 300,103 +0xC044 0x73DE # 珞 -- 300,104 +0xC045 0x73E5 # 珥 -- 300,105 +0xC046 0x7462 # 瑢 -- 300,106 +0xC047 0x74D4 # 瓔 -- 300,107 +0xC048 0x74F4 # 瓴 -- 300,110 +0xC049 0x7513 # 甓 -- 300,111 +0xC04A 0x754B # 畋 -- 300,112 +0xC04B 0x7554 # 畔 -- 300,113 +0xC04C 0x756F # 畯 -- 300,114 +0xC04D 0x75A2 # 疢 -- 300,115 +0xC04E 0x75B3 # 疳 -- 300,116 +0xC04F 0x7608 # 瘈 -- 300,117 +0xC050 0x7616 # 瘖 -- 300,120 +0xC051 0x7622 # 瘢 -- 300,121 +0xC052 0x761E # 瘞 -- 300,122 +0xC053 0x7633 # 瘳 -- 300,123 +0xC054 0x7635 # 瘵 -- 300,124 +0xC055 0x7647 # 癇 -- 300,125 +0xC056 0x766F # 癯 -- 300,126 +0xC057 0x76F1 # 盱 -- 300,127 +0xC058 0x7719 # 眙 -- 300,130 +0xC059 0x775A # 睚 -- 300,131 +0xC05A 0x77EC # 矬 -- 300,132 +0xC05B 0x77F1 # 矱 -- 300,133 +0xC05C 0x782D # 砭 -- 300,134 +0xC05D 0x78D4 # 磔 -- 300,135 +0xC05E 0x78E7 # 磧 -- 300,136 +0xC05F 0x78EC # 磬 -- 300,137 +0xC060 0x7954 # 祔 -- 300,140 +0xC061 0x79D5 # 秕 -- 300,141 +0xC062 0x79EB # 秫 -- 300,142 +0xC063 0x7A2D # 稭 -- 300,143 +0xC064 0x7A78 # 穸 -- 300,144 +0xC065 0x7A80 # 窀 -- 300,145 +0xC066 0x7A86 # 窆 -- 300,146 +0xC067 0x7AAC # 窬 -- 300,147 +0xC068 0x7AA8 # 窨 -- 300,150 +0xC069 0x7AB5 # 窵 -- 300,151 +0xC06A 0x7B2B # 笫 -- 300,152 +0xC06B 0x7B91 # 箑 -- 300,153 +0xC06C 0x7B9C # 箜 -- 300,154 +0xC06D 0x7BA0 # 箠 -- 300,155 +0xC06E 0x7B90 # 箐 -- 300,156 +0xC06F 0x7BCC # 篌 -- 300,157 +0xC070 0x7C00 # 簀 -- 300,160 +0xC071 0x7C0B # 簋 -- 300,161 +0xC072 0x7C59 # 籙 -- 300,162 +0xC073 0x7C5C # 籜 -- 300,163 +0xC074 0x7C65 # 籥 -- 300,164 +0xC075 0x7C69 # 籩 -- 300,165 +0xC076 0x7CA2 # 粢 -- 300,166 +0xC077 0x7CC5 # 糅 -- 300,167 +0xC078 0x7CF0 # 糰 -- 300,170 +0xC079 0x7D35 # 紵 -- 300,171 +0xC07A 0x7D3F # 紿 -- 300,172 +0xC07B 0x7D70 # 絰 -- 300,173 +0xC07C 0x7D83 # 綃 -- 300,174 +0xC07D 0x7DE1 # 緡 -- 300,175 +0xC07E 0x7DE6 # 緦 -- 300,176 +0xC0A1 0x7E1D # 縝 -- 300,241 +0xC0A2 0x7E22 # 縢 -- 300,242 +0xC0A3 0x7E36 # 縶 -- 300,243 +0xC0A4 0x7E7D # 繽 -- 300,244 +0xC0A5 0x7E87 # 纇 -- 300,245 +0xC0A6 0x7F45 # 罅 -- 300,246 +0xC0A7 0x7F4D # 罍 -- 300,247 +0xC0A8 0x7F68 # 罨 -- 300,250 +0xC0A9 0x7F86 # 羆 -- 300,251 +0xC0AA 0x7F9D # 羝 -- 300,252 +0xC0AB 0x7FDB # 翛 -- 300,253 +0xC0AC 0x7FE5 # 翥 -- 300,254 +0xC0AD 0x8043 # 聃 -- 300,255 +0xC0AE 0x8093 # 肓 -- 300,256 +0xC0AF 0x80D9 # 胙 -- 300,257 +0xC0B0 0x8127 # 脧 -- 300,260 +0xC0B1 0x80FC # 胼 -- 300,261 +0xC0B2 0x8160 # 腠 -- 300,262 +0xC0B3 0x8186 # 膆 -- 300,263 +0xC0B4 0x825F # 艟 -- 300,264 +0xC0B5 0x8268 # 艨 -- 300,265 +0xC0B6 0x82AB # 芫 -- 300,266 +0xC0B7 0x82E1 # 苡 -- 300,267 +0xC0B8 0x8347 # 荇 -- 300,270 +0xC0B9 0x837D # 荽 -- 300,271 +0xC0BA 0x83AA # 莪 -- 300,272 +0xC0BB 0x83D4 # 菔 -- 300,273 +0xC0BC 0x83D8 # 菘 -- 300,274 +0xC0BD 0x8401 # 萁 -- 300,275 +0xC0BE 0x8451 # 葑 -- 300,276 +0xC0BF 0x8478 # 葸 -- 300,277 +0xC0C0 0x84B9 # 蒹 -- 300,300 +0xC0C1 0x84BA # 蒺 -- 300,301 +0xC0C2 0x84CD # 蓍 -- 300,302 +0xC0C3 0x84FD # 蓽 -- 300,303 +0xC0C4 0x855E # 蕞 -- 300,304 +0xC0C5 0x8564 # 蕤 -- 300,305 +0xC0C6 0x8555 # 蕕 -- 300,306 +0xC0C7 0x8605 # 蘅 -- 300,307 +0xC0C8 0x8627 # 蘧 -- 300,310 +0xC0C9 0x863C # 蘼 -- 300,311 +0xC0CA 0x8662 # 虢 -- 300,312 +0xC0CB 0x867A # 虺 -- 300,313 +0xC0CC 0x8709 # 蜉 -- 300,314 +0xC0CD 0x8723 # 蜣 -- 300,315 +0xC0CE 0x8729 # 蜩 -- 300,316 +0xC0CF 0x872E # 蜮 -- 300,317 +0xC0D0 0x8721 # 蜡 -- 300,320 +0xC0D1 0x871E # 蜞 -- 300,321 +0xC0D2 0x87AF # 螯 -- 300,322 +0xC0D3 0x87BD # 螽 -- 300,323 +0xC0D4 0x87DB # 蟛 -- 300,324 +0xC0D5 0x8806 # 蠆 -- 300,325 +0xC0D6 0x8844 # 衄 -- 300,326 +0xC0D7 0x8852 # 衒 -- 300,327 +0xC0D8 0x88B7 # 袷 -- 300,330 +0xC0D9 0x88D2 # 裒 -- 300,331 +0xC0DA 0x89A1 # 覡 -- 300,332 +0xC0DB 0x89AF # 覯 -- 300,333 +0xC0DC 0x8A61 # 詡 -- 300,334 +0xC0DD 0x8AB6 # 誶 -- 300,335 +0xC0DE 0x8AE2 # 諢 -- 300,336 +0xC0DF 0x8AFC # 諼 -- 300,337 +0xC0E0 0x8B16 # 謖 -- 300,340 +0xC0E1 0x8B4E # 譎 -- 300,341 +0xC0E2 0x8B8E # 讎 -- 300,342 +0xC0E3 0x8B9C # 讜 -- 300,343 +0xC0E4 0x8B9F # 讟 -- 300,344 +0xC0E5 0x8C73 # 豳 -- 300,345 +0xC0E6 0x8C8A # 貊 -- 300,346 +0xC0E7 0x8CB0 # 貰 -- 300,347 +0xC0E8 0x8CC5 # 賅 -- 300,350 +0xC0E9 0x8CEE # 賮 -- 300,351 +0xC0EA 0x8D84 # 趄 -- 300,352 +0xC0EB 0x8DBA # 趺 -- 300,353 +0xC0EC 0x8DCF # 跏 -- 300,354 +0xC0ED 0x8DFD # 跽 -- 300,355 +0xC0EE 0x8E1F # 踟 -- 300,356 +0xC0EF 0x8E23 # 踣 -- 300,357 +0xC0F0 0x8E4C # 蹌 -- 300,360 +0xC0F1 0x8E55 # 蹕 -- 300,361 +0xC0F2 0x8E63 # 蹣 -- 300,362 +0xC0F3 0x8E70 # 蹰 -- 300,363 +0xC0F4 0x8E8B # 躋 -- 300,364 +0xC0F5 0x8EFA # 軺 -- 300,365 +0xC0F6 0x8F62 # 轢 -- 300,366 +0xC0F7 0x9011 # 逑 -- 300,367 +0xC0F8 0x902D # 逭 -- 300,370 +0xC0F9 0x9036 # 逶 -- 300,371 +0xC0FA 0x905D # 遝 -- 300,372 +0xC0FB 0x9062 # 遢 -- 300,373 +0xC0FC 0x909B # 邛 -- 300,374 +0xC0FD 0x90A0 # 邠 -- 300,375 +0xC0FE 0x90C4 # 郄 -- 300,376 diff --git a/unicode/xerox/unihan/XCCS-301=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-301=UNIHAN.TXT new file mode 100644 index 00000000..43a64553 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-301=UNIHAN.TXT @@ -0,0 +1,190 @@ + +# "301" UNIHAN + +0xC121 0x9116 # 鄖 -- 301,041 +0xC122 0x9134 # 鄴 -- 301,042 +0xC123 0x9172 # 酲 -- 301,043 +0xC124 0x9174 # 酴 -- 301,044 +0xC125 0x9179 # 酹 -- 301,045 +0xC126 0x91AA # 醪 -- 301,046 +0xC127 0x9200 # 鈀 -- 301,047 +0xC128 0x93C3 # 鏃 -- 301,050 +0xC129 0x93D7 # 鏗 -- 301,051 +0xC12A 0x93E4 # 鏤 -- 301,052 +0xC12B 0x93D1 # 鏑 -- 301,053 +0xC12C 0x9455 # 鑕 -- 301,054 +0xC12D 0x95CB # 闋 -- 301,055 +0xC12E 0x95E0 # 闠 -- 301,056 +0xC12F 0x95E4 # 闤 -- 301,057 +0xC130 0x95E5 # 闥 -- 301,060 +0xC131 0x96B0 # 隰 -- 301,061 +0xC132 0x96B3 # 隳 -- 301,062 +0xC133 0x96BC # 隼 -- 301,063 +0xC134 0x9766 # 靦 -- 301,064 +0xC135 0x97D9 # 韙 -- 301,065 +0xC136 0x980F # 頏 -- 301,066 +0xC137 0x9859 # 顙 -- 301,067 +0xC138 0x98BA # 颺 -- 301,070 +0xC139 0x992E # 餮 -- 301,071 +0xC13A 0x9948 # 饈 -- 301,072 +0xC13B 0x9954 # 饔 -- 301,073 +0xC13C 0x9998 # 馘 -- 301,074 +0xC13D 0x9A2E # 騮 -- 301,075 +0xC13E 0x9A41 # 驁 -- 301,076 +0xC13F 0x9AC0 # 髀 -- 301,077 +0xC140 0x9AE0 # 髠 -- 301,100 +0xC141 0x9AEB # 髫 -- 301,101 +0xC142 0x9AED # 髭 -- 301,102 +0xC143 0x9B08 # 鬈 -- 301,103 +0xC144 0x9B0E # 鬎 -- 301,104 +0xC145 0x9B4E # 魎 -- 301,105 +0xC146 0x9CE7 # 鳧 -- 301,106 +0xC147 0x9DA9 # 鶩 -- 301,107 +0xC148 0x9DBC # 鶼 -- 301,110 +0xC149 0x9E15 # 鸕 -- 301,111 +0xC14A 0x9E7A # 鹺 -- 301,112 +0xC14B 0x9EE7 # 黧 -- 301,113 +0xC14C 0x9EF7 # 黷 -- 301,114 +0xC14D 0x9EFC # 黼 -- 301,115 +0xC14E 0x9F4F # 齏 -- 301,116 +0xC14F 0x9F54 # 齔 -- 301,117 +0xC150 0x9F55 # 齕 -- 301,120 +0xC151 0x9F57 # 齗 -- 301,121 +0xC152 0x5B53 # 孓 -- 301,122 +0xC153 0x6E53 # 湓 -- 301,123 +0xC154 0x55D0 # 嗐 -- 301,124 +0xC155 0x55DD # 嗝 -- 301,125 +0xC156 0x55E6 # 嗦 -- 301,126 +0xC157 0x56CC # 囌 -- 301,127 +0xC158 0x5E7A # 幺 -- 301,130 +0xC159 0x616A # 慪 -- 301,131 +0xC15A 0x643F # 搿 -- 301,132 +0xC15B 0x651B # 攛 -- 301,133 +0xC15C 0x77FD # 矽 -- 301,134 +0xC15D 0x6A81 # 檁 -- 301,135 +0xC15E 0x6B38 # 欸 -- 301,136 +0xC15F 0x71DC # 燜 -- 301,137 +0xC160 0x71F4 # 燴 -- 301,140 +0xC161 0x764D # 癍 -- 301,141 +0xC162 0x774F # 睏 -- 301,142 +0xC163 0x7E68 # 繨 -- 301,143 +0xC164 0x81CC # 臌 -- 301,144 +0xC165 0x82F6 # 苶 -- 301,145 +0xC166 0x82E4 # 苤 -- 301,146 +0xC167 0x867C # 虼 -- 301,147 +0xC168 0x8698 # 蚘 -- 301,150 +0xC169 0x897B # 襻 -- 301,151 +0xC16A 0x8E67 # 蹧 -- 301,152 +0xC16B 0x9029 # 逩 -- 301,153 +0xC16C 0x91C5 # 釅 -- 301,154 +0xC16D 0x9358 # 鍘 -- 301,155 +0xC16E 0x9410 # 鐐 -- 301,156 +0xC16F 0x9427 # 鐧 -- 301,157 +0xC170 0x9807 # 頇 -- 301,160 +0xC171 0x5306 # 匆 -- 301,161 +0xC172 0x993F # 餿 -- 301,162 +0xC173 0x995D # 饝 -- 301,163 +0xC174 0x9B9D # 鮝 -- 301,164 +0xC175 0x9C35 # 鰵 -- 301,165 +0xC176 0x9D30 # 鴰 -- 301,166 +0xC177 0x9EF9 # 黹 -- 301,167 +0xC178 0x5853 # 塓 -- 301,170 +0xC179 0x530B # 匋 -- 301,171 +0xC17A 0x53AA # 厪 -- 301,172 +0xC17B 0x59C5 # 姅 -- 301,173 +0xC17C 0x550F # 唏 -- 301,174 +0xC17D 0x5535 # 唵 -- 301,175 +0xC17E 0x6C87 # 沇 -- 301,176 +0xC1A1 0x57FC # 埼 -- 301,241 +0xC1A2 0x602D # 怭 -- 301,242 +0xC1A3 0x61BA # 憺 -- 301,243 +0xC1A4 0x636C # 捬 -- 301,244 +0xC1A5 0x5281 # 劁 -- 301,245 +0xC1A6 0x6834 # 栴 -- 301,246 +0xC1A7 0x684B # 桋 -- 301,247 +0xC1A8 0x7439 # 琹 -- 301,250 +0xC1A9 0x6CAD # 沭 -- 301,251 +0xC1AA 0x75C3 # 痃 -- 301,252 +0xC1AB 0x75B1 # 疱 -- 301,253 +0xC1AC 0x7B9A # 箚 -- 301,254 +0xC1AD 0x7C81 # 粁 -- 301,255 +0xC1AE 0x7CA8 # 粨 -- 301,256 +0xC1AF 0x7CFA # 糺 -- 301,257 +0xC1B0 0x7D31 # 紱 -- 301,260 +0xC1B1 0x8D18 # 贘 -- 301,261 +0xC1B2 0x8D0B # 贋 -- 301,262 +0xC1B3 0x8FEF # 迯 -- 301,263 +0xC1B4 0x91B1 # 醱 -- 301,264 +0xC1B5 0x747D # 瑽 -- 301,265 +0xC1B6 0x9BAD # 鮭 -- 301,266 +0xC1B7 0x4F89 # 侉 -- 301,267 +0xC1B8 0x52D1 # 勑 -- 301,270 +0xC1B9 0x5315 # 匕 -- 301,271 +0xC1BA 0x710C # 焌 -- 301,272 +0xC1BB 0x5565 # 啥 -- 301,273 +0xC1BC 0x55D9 # 嗙 -- 301,274 +0xC1BD 0x5ED2 # 廒 -- 301,275 +0xC1BE 0x5F82 # 徂 -- 301,276 +0xC1BF 0x6039 # 怹 -- 301,277 +0xC1C0 0x618B # 憋 -- 301,300 +0xC1C1 0x6164 # 慤 -- 301,301 +0xC1C2 0x63AD # 掭 -- 301,302 +0xC1C3 0x65EE # 旮 -- 301,303 +0xC1C4 0x65EF # 旯 -- 301,304 +0xC1C5 0x6AC2 # 櫂 -- 301,305 +0xC1C6 0x6C5B # 汛 -- 301,306 +0xC1C7 0x6C8F # 沏 -- 301,307 +0xC1C8 0x723B # 爻 -- 301,310 +0xC1CA 0x7349 # 獉 -- 301,312 +0xC1CB 0x74BA # 璺 -- 301,313 +0xC1CC 0x7931 # 礱 -- 301,314 +0xC1CD 0x70EF # 烯 -- 301,315 +0xC1CE 0x7C09 # 簉 -- 301,316 +0xC1CF 0x7C75 # 籵 -- 301,317 +0xC1D0 0x7CE8 # 糨 -- 301,320 +0xC1D1 0x7E52 # 繒 -- 301,321 +0xC1D2 0x7F36 # 缶 -- 301,322 +0xC1D3 0x7F87 # 羇 -- 301,323 +0xC1D4 0x80F4 # 胴 -- 301,324 +0xC1D5 0x81E2 # 臢 -- 301,325 +0xC1D6 0x93E2 # 鏢 -- 301,326 +0xC1D7 0x8617 # 蘗 -- 301,327 +0xC1D8 0x866C # 虬 -- 301,330 +0xC1D9 0x867B # 虻 -- 301,331 +0xC1DA 0x8A92 # 誒 -- 301,332 +0xC1DB 0x8C78 # 豸 -- 301,333 +0xC1DC 0x9106 # 鄆 -- 301,334 +0xC1DD 0x9463 # 鑣 -- 301,335 +0xC1DE 0x95C3 # 闃 -- 301,336 +0xC1DF 0x95C7 # 闇 -- 301,337 +0xC1E0 0x9B01 # 鬁 -- 301,340 +0xC1E1 0x9B2F # 鬯 -- 301,341 +0xC1E2 0x9EDF # 黟 -- 301,342 +0xC1E3 0x9EFD # 黽 -- 301,343 +0xC1E4 0x9F10 # 鼐 -- 301,344 +0xC1E5 0x4EE1 # 仡 -- 301,345 +0xC1E6 0x4EF3 # 仳 -- 301,346 +0xC1E7 0x4F08 # 伈 -- 301,347 +0xC1E8 0x4F03 # 伃 -- 301,350 +0xC1E9 0x4F49 # 佉 -- 301,351 +0xC1EA 0x4F4C # 佌 -- 301,352 +0xC1EB 0x4F7D # 佽 -- 301,353 +0xC1EC 0x4F81 # 侁 -- 301,354 +0xC1ED 0x4F98 # 侘 -- 301,355 +0xC1EE 0x4F9C # 侜 -- 301,356 +0xC1EF 0x4F74 # 佴 -- 301,357 +0xC1F0 0x4F79 # 佹 -- 301,360 +0xC1F1 0x4F90 # 侐 -- 301,361 +0xC1F2 0x4FC5 # 俅 -- 301,362 +0xC1F3 0x4FC1 # 俁 -- 301,363 +0xC1F4 0x4FD4 # 俔 -- 301,364 +0xC1F5 0x4FB7 # 侷 -- 301,365 +0xC1F6 0x5000 # 倀 -- 301,366 +0xC1F7 0x5022 # 倢 -- 301,367 +0xC1F8 0x502E # 倮 -- 301,370 +0xC1F9 0x4FF4 # 俴 -- 301,371 +0xC1FA 0x501E # 倞 -- 301,372 +0xC1FB 0x5041 # 偁 -- 301,373 +0xC1FC 0x5072 # 偲 -- 301,374 +0xC1FD 0x506D # 偭 -- 301,375 +0xC1FE 0x506F # 偯 -- 301,376 diff --git a/unicode/xerox/unihan/XCCS-302=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-302=UNIHAN.TXT new file mode 100644 index 00000000..b11d5880 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-302=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "302" UNIHAN + +0xC221 0x5092 # 傒 -- 302,041 +0xC222 0x508E # 傎 -- 302,042 +0xC223 0x5094 # 傔 -- 302,043 +0xC224 0x509E # 傞 -- 302,044 +0xC225 0x50CE # 僎 -- 302,045 +0xC226 0x50EC # 僬 -- 302,046 +0xC227 0x50F4 # 僴 -- 302,047 +0xC228 0x50FE # 僾 -- 302,050 +0xC229 0x510B # 儋 -- 302,051 +0xC22A 0x5101 # 儁 -- 302,052 +0xC22B 0x510C # 儌 -- 302,053 +0xC22C 0x5159 # 兙 -- 302,054 +0xC22D 0x515D # 兝 -- 302,055 +0xC22E 0x515E # 兞 -- 302,056 +0xC22F 0x5161 # 兡 -- 302,057 +0xC230 0x5163 # 兣 -- 302,060 +0xC231 0x80C4 # 胄 -- 302,061 +0xC232 0x5193 # 冓 -- 302,062 +0xC233 0x5194 # 冔 -- 302,063 +0xC234 0x51D3 # 凓 -- 302,064 +0xC235 0x51F7 # 凷 -- 302,065 +0xC236 0x5213 # 刓 -- 302,066 +0xC237 0x5232 # 刲 -- 302,067 +0xC238 0x5235 # 刵 -- 302,070 +0xC239 0x525A # 剚 -- 302,071 +0xC23A 0x5296 # 劖 -- 302,072 +0xC23B 0x52BB # 劻 -- 302,073 +0xC23C 0x52BC # 劼 -- 302,074 +0xC23D 0x52CD # 勍 -- 302,075 +0xC23E 0x52E9 # 勩 -- 302,076 +0xC23F 0x52F0 # 勰 -- 302,077 +0xC240 0x52F7 # 勷 -- 302,100 +0xC241 0x530A # 匊 -- 302,101 +0xC242 0x531C # 匜 -- 302,102 +0xC243 0x5335 # 匵 -- 302,103 +0xC244 0x536C # 卬 -- 302,104 +0xC245 0x53B9 # 厹 -- 302,105 +0xC246 0x5412 # 吒 -- 302,106 +0xC247 0x548D # 咍 -- 302,107 +0xC248 0x5488 # 咈 -- 302,110 +0xC249 0x54A2 # 咢 -- 302,111 +0xC24A 0x54BC # 咼 -- 302,112 +0xC24B 0x54A5 # 咥 -- 302,113 +0xC24C 0x54AE # 咮 -- 302,114 +0xC24D 0x54B7 # 咷 -- 302,115 +0xC24E 0x54A1 # 咡 -- 302,116 +0xC24F 0x54BA # 咺 -- 302,117 +0xC250 0x5504 # 唄 -- 302,120 +0xC251 0x5541 # 啁 -- 302,121 +0xC252 0x554D # 啍 -- 302,122 +0xC253 0x553C # 唼 -- 302,123 +0xC254 0x5591 # 喑 -- 302,124 +0xC255 0x5593 # 喓 -- 302,125 +0xC256 0x55A4 # 喤 -- 302,126 +0xC257 0x55B4 # 喴 -- 302,127 +0xC258 0x55AD # 喭 -- 302,130 +0xC259 0x55DB # 嗛 -- 302,131 +0xC25A 0x55C9 # 嗉 -- 302,132 +0xC25B 0x55F9 # 嗹 -- 302,133 +0xC25C 0x5610 # 嘐 -- 302,134 +0xC25D 0x5612 # 嘒 -- 302,135 +0xC25E 0x5613 # 嘓 -- 302,136 +0xC25F 0x5611 # 嘑 -- 302,137 +0xC260 0x563D # 嘽 -- 302,140 +0xC261 0x5649 # 噉 -- 302,141 +0xC262 0x5640 # 噀 -- 302,142 +0xC263 0x564C # 噌 -- 302,143 +0xC264 0x5666 # 噦 -- 302,144 +0xC265 0x5660 # 噠 -- 302,145 +0xC266 0x568C # 嚌 -- 302,146 +0xC267 0x5699 # 嚙 -- 302,147 +0xC268 0x569A # 嚚 -- 302,150 +0xC269 0x56B3 # 嚳 -- 302,151 +0xC26A 0x56B2 # 嚲 -- 302,152 +0xC26B 0x56C5 # 囅 -- 302,153 +0xC26C 0x56EE # 囮 -- 302,154 +0xC26D 0x56F7 # 囷 -- 302,155 +0xC26E 0x5702 # 圂 -- 302,156 +0xC26F 0x5715 # 圕 -- 302,157 +0xC270 0x571D # 圝 -- 302,160 +0xC271 0x572C # 圬 -- 302,161 +0xC272 0x576B # 坫 -- 302,162 +0xC273 0x5770 # 坰 -- 302,163 +0xC274 0x5775 # 坵 -- 302,164 +0xC275 0x579D # 垝 -- 302,165 +0xC276 0x5795 # 垕 -- 302,166 +0xC277 0x57A4 # 垤 -- 302,167 +0xC278 0x579E # 垞 -- 302,170 +0xC279 0x579A # 垚 -- 302,171 +0xC27A 0x57C6 # 埆 -- 302,172 +0xC27B 0x57CF # 埏 -- 302,173 +0xC27C 0x57F8 # 埸 -- 302,174 +0xC27D 0x5809 # 堉 -- 302,175 +0xC27E 0x5819 # 堙 -- 302,176 +0xC2A1 0x581E # 堞 -- 302,241 +0xC2A2 0x5820 # 堠 -- 302,242 +0xC2A3 0x5827 # 堧 -- 302,243 +0xC2A4 0x5864 # 塤 -- 302,244 +0xC2A5 0x584F # 塏 -- 302,245 +0xC2A6 0x5852 # 塒 -- 302,246 +0xC2A7 0x587C # 塼 -- 302,247 +0xC2A8 0x5881 # 墁 -- 302,250 +0xC2A9 0x5848 # 塈 -- 302,251 +0xC2AA 0x5890 # 墐 -- 302,252 +0xC2AB 0x587D # 塽 -- 302,253 +0xC2AC 0x58A6 # 墦 -- 302,254 +0xC2AD 0x58A0 # 墠 -- 302,255 +0xC2AE 0x58C8 # 壈 -- 302,256 +0xC2AF 0x592C # 夬 -- 302,257 +0xC2B0 0x5961 # 奡 -- 302,260 +0xC2B1 0x596D # 奭 -- 302,261 +0xC2B2 0x59A4 # 妤 -- 302,262 +0xC2B3 0x59B2 # 妲 -- 302,263 +0xC2B4 0x59C1 # 姁 -- 302,264 +0xC2B5 0x59F9 # 姹 -- 302,265 +0xC2B6 0x59E4 # 姤 -- 302,266 +0xC2B7 0x59FA # 姺 -- 302,267 +0xC2B8 0x5A00 # 娀 -- 302,270 +0xC2B9 0x59F1 # 姱 -- 302,271 +0xC2BA 0x5A55 # 婕 -- 302,272 +0xC2BB 0x5A5E # 婞 -- 302,273 +0xC2BC 0x5AA2 # 媢 -- 302,274 +0xC2BD 0x5A95 # 媕 -- 302,275 +0xC2BE 0x5A9F # 媟 -- 302,276 +0xC2BF 0x5ABA # 媺 -- 302,277 +0xC2C0 0x5AC8 # 嫈 -- 302,300 +0xC2C1 0x5ACF # 嫏 -- 302,301 +0xC2C2 0x5AEA # 嫪 -- 302,302 +0xC2C3 0x5AEB # 嫫 -- 302,303 +0xC2C4 0x5B03 # 嬃 -- 302,304 +0xC2C5 0x5AFD # 嫽 -- 302,305 +0xC2C6 0x5AFF # 嫿 -- 302,306 +0xC2C7 0x5B1B # 嬛 -- 302,307 +0xC2C8 0x5B17 # 嬗 -- 302,310 +0xC2C9 0x5B2D # 嬭 -- 302,311 +0xC2CA 0x5B45 # 孅 -- 302,312 +0xC2CB 0x5BAC # 宬 -- 302,313 +0xC2CC 0x5B81 # 宁 -- 302,314 +0xC2CD 0x5BC1 # 寁 -- 302,315 +0xC2CE 0x5BC0 # 寀 -- 302,316 +0xC2CF 0x5BA7 # 宧 -- 302,317 +0xC2D0 0x5BD6 # 寖 -- 302,320 +0xC2D1 0x5BEA # 寪 -- 302,321 +0xC2D2 0x5C00 # 尀 -- 302,322 +0xC2D3 0x5C1F # 尟 -- 302,323 +0xC2D4 0x5C2A # 尪 -- 302,324 +0xC2D5 0x5C44 # 屄 -- 302,325 +0xC2D6 0x5C67 # 屧 -- 302,326 +0xC2D7 0x5C68 # 屨 -- 302,327 +0xC2D8 0x5C69 # 屩 -- 302,330 +0xC2D9 0x5C6D # 屭 -- 302,331 +0xC2DA 0x5CA3 # 岣 -- 302,332 +0xC2DB 0x5CB5 # 岵 -- 302,333 +0xC2DC 0x5CA2 # 岢 -- 302,334 +0xC2DD 0x5CA7 # 岧 -- 302,335 +0xC2DE 0x5C8D # 岍 -- 302,336 +0xC2DF 0x5CDD # 峝 -- 302,337 +0xC2E0 0x5CEB # 峫 -- 302,340 +0xC2E1 0x5CF4 # 峴 -- 302,341 +0xC2E2 0x5D1E # 崞 -- 302,342 +0xC2E3 0x5D24 # 崤 -- 302,343 +0xC2E4 0x5D26 # 崦 -- 302,344 +0xC2E5 0x5D1F # 崟 -- 302,345 +0xC2E6 0x5D3F # 崿 -- 302,346 +0xC2E7 0x5D42 # 嵂 -- 302,347 +0xC2E8 0x5D4A # 嵊 -- 302,350 +0xC2E9 0x5D6B # 嵫 -- 302,351 +0xC2EA 0x5D81 # 嶁 -- 302,352 +0xC2EB 0x5D93 # 嶓 -- 302,353 +0xC2EC 0x5DA7 # 嶧 -- 302,354 +0xC2ED 0x5DB0 # 嶰 -- 302,355 +0xC2EE 0x5DD8 # 巘 -- 302,356 +0xC2EF 0x5E1F # 帟 -- 302,357 +0xC2F0 0x5E58 # 幘 -- 302,360 +0xC2F1 0x5E5E # 幞 -- 302,361 +0xC2F2 0x5E6C # 幬 -- 302,362 +0xC2F3 0x5E70 # 幰 -- 302,363 +0xC2F4 0x5E80 # 庀 -- 302,364 +0xC2F5 0x5EA4 # 庤 -- 302,365 +0xC2F6 0x5EB3 # 庳 -- 302,366 +0xC2F7 0x5ECC # 廌 -- 302,367 +0xC2F8 0x5ECE # 廎 -- 302,370 +0xC2F9 0x5898 # 墘 -- 302,371 +0xC2FA 0x5EF1 # 廱 -- 302,372 +0xC2FB 0x5F06 # 弆 -- 302,373 +0xC2FC 0x5F0C # 弌 -- 302,374 +0xC2FD 0x5F22 # 弢 -- 302,375 +0xC2FE 0x5F28 # 弨 -- 302,376 diff --git a/unicode/xerox/unihan/XCCS-303=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-303=UNIHAN.TXT new file mode 100644 index 00000000..260b7303 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-303=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "303" UNIHAN + +0xC321 0x5F24 # 弤 -- 303,041 +0xC322 0x5F30 # 弰 -- 303,042 +0xC323 0x5F44 # 彄 -- 303,043 +0xC324 0x5F56 # 彖 -- 303,044 +0xC325 0x5F58 # 彘 -- 303,045 +0xC326 0x5F72 # 彲 -- 303,046 +0xC327 0x5FAF # 徯 -- 303,047 +0xC328 0x5FC9 # 忉 -- 303,050 +0xC329 0x5FE4 # 忤 -- 303,051 +0xC32A 0x6017 # 怗 -- 303,052 +0xC32B 0x604C # 恌 -- 303,053 +0xC32C 0x6054 # 恔 -- 303,054 +0xC32D 0x6047 # 恇 -- 303,055 +0xC32E 0x6053 # 恓 -- 303,056 +0xC32F 0x609D # 悝 -- 303,057 +0xC330 0x60C4 # 惄 -- 303,060 +0xC331 0x60CE # 惎 -- 303,061 +0xC332 0x60DB # 惛 -- 303,062 +0xC333 0x60B3 # 悳 -- 303,063 +0xC334 0x60BE # 悾 -- 303,064 +0xC335 0x60D4 # 惔 -- 303,065 +0xC336 0x60D9 # 惙 -- 303,066 +0xC337 0x60B0 # 悰 -- 303,067 +0xC338 0x610A # 愊 -- 303,070 +0xC339 0x6114 # 愔 -- 303,071 +0xC33A 0x6141 # 慁 -- 303,072 +0xC33B 0x6149 # 慉 -- 303,073 +0xC33C 0x618D # 憍 -- 303,074 +0xC33D 0x6196 # 憖 -- 303,075 +0xC33E 0x61AF # 憯 -- 303,076 +0xC33F 0x61B8 # 憸 -- 303,077 +0xC340 0x61AD # 憭 -- 303,100 +0xC341 0x6201 # 戁 -- 303,101 +0xC342 0x6223 # 戣 -- 303,102 +0xC343 0x6224 # 戤 -- 303,103 +0xC344 0x623A # 戺 -- 303,104 +0xC345 0x6246 # 扆 -- 303,105 +0xC346 0x6245 # 扅 -- 303,106 +0xC347 0x624A # 扊 -- 303,107 +0xC348 0x6260 # 扠 -- 303,110 +0xC349 0x6283 # 抃 -- 303,111 +0xC34A 0x6294 # 抔 -- 303,112 +0xC34B 0x62B6 # 抶 -- 303,113 +0xC34C 0x630D # 挍 -- 303,114 +0xC34D 0x62F4 # 拴 -- 303,115 +0xC34E 0x633C # 挼 -- 303,116 +0xC34F 0x6344 # 捄 -- 303,117 +0xC350 0x6331 # 挱 -- 303,120 +0xC351 0x636D # 捭 -- 303,121 +0xC352 0x638E # 掎 -- 303,122 +0xC353 0x63AB # 掫 -- 303,123 +0xC354 0x639E # 掞 -- 303,124 +0xC355 0x63AF # 掯 -- 303,125 +0xC356 0x63C4 # 揄 -- 303,126 +0xC357 0x63DC # 揜 -- 303,127 +0xC358 0x63E0 # 揠 -- 303,130 +0xC359 0x63CE # 揎 -- 303,131 +0xC35A 0x63D5 # 揕 -- 303,132 +0xC35B 0x63F2 # 揲 -- 303,133 +0xC35C 0x63F8 # 揸 -- 303,134 +0xC35D 0x6422 # 搢 -- 303,135 +0xC35E 0x6424 # 搤 -- 303,136 +0xC35F 0x6435 # 搵 -- 303,137 +0xC360 0x640A # 搊 -- 303,140 +0xC361 0x6410 # 搐 -- 303,141 +0xC362 0x6412 # 搒 -- 303,142 +0xC363 0x6418 # 搘 -- 303,143 +0xC364 0x6430 # 搰 -- 303,144 +0xC365 0x6427 # 搧 -- 303,145 +0xC366 0x6421 # 搡 -- 303,146 +0xC367 0x645B # 摛 -- 303,147 +0xC368 0x647B # 摻 -- 303,150 +0xC369 0x647D # 摽 -- 303,151 +0xC36A 0x6451 # 摑 -- 303,152 +0xC36B 0x6485 # 撅 -- 303,153 +0xC36C 0x64D0 # 擐 -- 303,154 +0xC36D 0x64D7 # 擗 -- 303,155 +0xC36E 0x64EB # 擫 -- 303,156 +0xC36F 0x64F0 # 擰 -- 303,157 +0xC370 0x6567 # 敧 -- 303,160 +0xC371 0x6538 # 攸 -- 303,161 +0xC372 0x6542 # 敂 -- 303,162 +0xC373 0x6554 # 敔 -- 303,163 +0xC374 0x656B # 敫 -- 303,164 +0xC375 0x657F # 敿 -- 303,165 +0xC376 0x6585 # 斅 -- 303,166 +0xC377 0x659D # 斝 -- 303,167 +0xC378 0x65A0 # 斠 -- 303,170 +0xC379 0x65A8 # 斨 -- 303,171 +0xC37A 0x65AE # 斮 -- 303,172 +0xC37B 0x65BF # 斿 -- 303,173 +0xC37C 0x65CE # 旎 -- 303,174 +0xC37D 0x65D0 # 旐 -- 303,175 +0xC37E 0x65D6 # 旖 -- 303,176 +0xC3A1 0x65DC # 旜 -- 303,241 +0xC3A2 0x65DF # 旟 -- 303,242 +0xC3A3 0x65F0 # 旰 -- 303,243 +0xC3A4 0x6635 # 昵 -- 303,244 +0xC3A5 0x661D # 昝 -- 303,245 +0xC3A6 0x6631 # 昱 -- 303,246 +0xC3A7 0x6667 # 晧 -- 303,247 +0xC3A8 0x665F # 晟 -- 303,250 +0xC3A9 0x665B # 晛 -- 303,251 +0xC3AA 0x665C # 晜 -- 303,252 +0xC3AB 0x666C # 晬 -- 303,253 +0xC3AC 0x6698 # 暘 -- 303,254 +0xC3AD 0x66AC # 暬 -- 303,255 +0xC3AE 0x66C0 # 曀 -- 303,256 +0xC3AF 0x66C4 # 曄 -- 303,257 +0xC3B0 0x66CF # 曏 -- 303,260 +0xC3B1 0x66DA # 曚 -- 303,261 +0xC3B2 0x66E8 # 曨 -- 303,262 +0xC3B3 0x6705 # 朅 -- 303,263 +0xC3B4 0x670F # 朏 -- 303,264 +0xC3B5 0x6713 # 朓 -- 303,265 +0xC3B6 0x6722 # 朢 -- 303,266 +0xC3B7 0x6755 # 杕 -- 303,267 +0xC3B8 0x6759 # 杙 -- 303,270 +0xC3B9 0x6772 # 杲 -- 303,271 +0xC3BA 0x678C # 枌 -- 303,272 +0xC3BB 0x67AC # 枬 -- 303,273 +0xC3BC 0x67B8 # 枸 -- 303,274 +0xC3BD 0x67B9 # 枹 -- 303,275 +0xC3BE 0x67CE # 柎 -- 303,276 +0xC3BF 0x67D9 # 柙 -- 303,277 +0xC3C0 0x67BB # 枻 -- 303,300 +0xC3C1 0x6944 # 楄 -- 303,301 +0xC3C2 0x67F6 # 柶 -- 303,302 +0xC3C3 0x6812 # 栒 -- 303,303 +0xC3C4 0x681D # 栝 -- 303,304 +0xC3C5 0x6841 # 桁 -- 303,305 +0xC3C6 0x6844 # 桄 -- 303,306 +0xC3C7 0x6814 # 栔 -- 303,307 +0xC3C8 0x6833 # 栳 -- 303,310 +0xC3C9 0x6835 # 栵 -- 303,311 +0xC3CA 0x68B2 # 梲 -- 303,312 +0xC3CB 0x686E # 桮 -- 303,313 +0xC3CC 0x68A9 # 梩 -- 303,314 +0xC3CD 0x686F # 桯 -- 303,315 +0xC3CE 0x68D0 # 棐 -- 303,316 +0xC3CF 0x68EB # 棫 -- 303,317 +0xC3D0 0x68EC # 棬 -- 303,320 +0xC3D1 0x68FC # 棼 -- 303,321 +0xC3D2 0x690F # 椏 -- 303,322 +0xC3D3 0x6913 # 椓 -- 303,323 +0xC3D4 0x6939 # 椹 -- 303,324 +0xC3D5 0x6942 # 楂 -- 303,325 +0xC3D6 0x6945 # 楅 -- 303,326 +0xC3D7 0x696C # 楬 -- 303,327 +0xC3D8 0x6958 # 楘 -- 303,330 +0xC3D9 0x6959 # 楙 -- 303,331 +0xC3DA 0x695D # 楝 -- 303,332 +0xC3DB 0x6969 # 楩 -- 303,333 +0xC3DC 0x69A7 # 榧 -- 303,334 +0xC3DD 0x69BC # 榼 -- 303,335 +0xC3DE 0x69B1 # 榱 -- 303,336 +0xC3DF 0x69BE # 榾 -- 303,337 +0xC3E0 0x69E5 # 槥 -- 303,340 +0xC3E1 0x69E7 # 槧 -- 303,341 +0xC3E2 0x6A1B # 樛 -- 303,342 +0xC3E3 0x69F1 # 槱 -- 303,343 +0xC3E4 0x6A05 # 樅 -- 303,344 +0xC3E5 0x6A32 # 樲 -- 303,345 +0xC3E6 0x6A3E # 樾 -- 303,346 +0xC3E7 0x6A50 # 橐 -- 303,347 +0xC3E8 0x6AB4 # 檴 -- 303,350 +0xC3E9 0x6A5A # 橚 -- 303,351 +0xC3EA 0x6A89 # 檉 -- 303,352 +0xC3EB 0x6A9D # 檝 -- 303,353 +0xC3EC 0x6ADD # 櫝 -- 303,354 +0xC3ED 0x6AFD # 櫽 -- 303,355 +0xC3EE 0x6B12 # 欒 -- 303,356 +0xC3EF 0x6B2C # 欬 -- 303,357 +0xC3F0 0x6B3B # 欻 -- 303,360 +0xC3F1 0x6B48 # 歈 -- 303,361 +0xC3F2 0x6B4A # 歊 -- 303,362 +0xC3F3 0x6B5C # 歜 -- 303,363 +0xC3F4 0x6B60 # 歠 -- 303,364 +0xC3F5 0x6BA3 # 殣 -- 303,365 +0xC3F6 0x6BA2 # 殢 -- 303,366 +0xC3F7 0x6BAA # 殪 -- 303,367 +0xC3F8 0x6BC8 # 毈 -- 303,370 +0xC3F9 0x6BDA # 毚 -- 303,371 +0xC3FA 0x6BFF # 毿 -- 303,372 +0xC3FB 0x6C04 # 氄 -- 303,373 +0xC3FC 0x6C1D # 氝 -- 303,374 +0xC3FD 0x6C54 # 汔 -- 303,375 +0xC3FE 0x6C6D # 汭 -- 303,376 diff --git a/unicode/xerox/unihan/XCCS-304=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-304=UNIHAN.TXT new file mode 100644 index 00000000..1e1ef988 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-304=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "304" UNIHAN + +0xC421 0x6C86 # 沆 -- 304,041 +0xC422 0x6C95 # 沕 -- 304,042 +0xC423 0x6CC2 # 泂 -- 304,043 +0xC424 0x6CDA # 泚 -- 304,044 +0xC425 0x6CE0 # 泠 -- 304,045 +0xC426 0x6CF2 # 泲 -- 304,046 +0xC427 0x6CC6 # 泆 -- 304,047 +0xC428 0x6CD6 # 泖 -- 304,050 +0xC429 0x6CDD # 泝 -- 304,051 +0xC42A 0x6D04 # 洄 -- 304,052 +0xC42B 0x6D1A # 洚 -- 304,053 +0xC42C 0x6D27 # 洧 -- 304,054 +0xC42D 0x6D39 # 洹 -- 304,055 +0xC42E 0x6D3F # 洿 -- 304,056 +0xC42F 0x6D0C # 洌 -- 304,057 +0xC430 0x6D0F # 洏 -- 304,060 +0xC431 0x6D1F # 洟 -- 304,061 +0xC432 0x6C67 # 汧 -- 304,062 +0xC433 0x6D11 # 洑 -- 304,063 +0xC434 0x6D61 # 浡 -- 304,064 +0xC435 0x6D65 # 浥 -- 304,065 +0xC436 0x6D91 # 涑 -- 304,066 +0xC437 0x6D6D # 浭 -- 304,067 +0xC438 0x6D8A # 涊 -- 304,070 +0xC439 0x6D92 # 涒 -- 304,071 +0xC43A 0x6DFC # 淼 -- 304,072 +0xC43B 0x6DDF # 淟 -- 304,073 +0xC43C 0x6DF6 # 淶 -- 304,074 +0xC43D 0x6D34 # 洴 -- 304,075 +0xC43E 0x6DB4 # 涴 -- 304,076 +0xC43F 0x6E1F # 渟 -- 304,077 +0xC440 0x6E72 # 湲 -- 304,100 +0xC441 0x6E30 # 渰 -- 304,101 +0xC442 0x6E32 # 渲 -- 304,102 +0xC443 0x6E3C # 渼 -- 304,103 +0xC444 0x6E51 # 湑 -- 304,104 +0xC445 0x6E62 # 湢 -- 304,105 +0xC446 0x6E9F # 溟 -- 304,106 +0xC447 0x6EB1 # 溱 -- 304,107 +0xC448 0x6EC3 # 滃 -- 304,110 +0xC449 0x6EA0 # 溠 -- 304,111 +0xC44A 0x6E8E # 溎 -- 304,112 +0xC44B 0x6EB4 # 溴 -- 304,113 +0xC44C 0x6F08 # 漈 -- 304,114 +0xC44D 0x6F18 # 漘 -- 304,115 +0xC44E 0x6F19 # 漙 -- 304,116 +0xC44F 0x6F26 # 漦 -- 304,117 +0xC450 0x6F35 # 漵 -- 304,120 +0xC451 0x6F36 # 漶 -- 304,121 +0xC452 0x6F2D # 漭 -- 304,122 +0xC453 0x6F92 # 澒 -- 304,123 +0xC454 0x6F94 # 澔 -- 304,124 +0xC455 0x6F5A # 潚 -- 304,125 +0xC456 0x6F89 # 澉 -- 304,126 +0xC457 0x6F90 # 澐 -- 304,127 +0xC458 0x6FA0 # 澠 -- 304,130 +0xC459 0x6FA5 # 澥 -- 304,131 +0xC45A 0x6FA6 # 澦 -- 304,132 +0xC45B 0x6FA8 # 澨 -- 304,133 +0xC45C 0x6FBC # 澼 -- 304,134 +0xC45D 0x6FE9 # 濩 -- 304,135 +0xC45E 0x6FDE # 濞 -- 304,136 +0xC45F 0x7001 # 瀁 -- 304,137 +0xC460 0x700D # 瀍 -- 304,140 +0xC461 0x7023 # 瀣 -- 304,141 +0xC462 0x7026 # 瀦 -- 304,142 +0xC463 0x703C # 瀼 -- 304,143 +0xC464 0x703A # 瀺 -- 304,144 +0xC465 0x7043 # 灃 -- 304,145 +0xC466 0x7069 # 灩 -- 304,146 +0xC467 0x7085 # 炅 -- 304,147 +0xC468 0x70B1 # 炱 -- 304,150 +0xC469 0x70B7 # 炷 -- 304,151 +0xC46A 0x70A4 # 炤 -- 304,152 +0xC46B 0x70B0 # 炰 -- 304,153 +0xC46C 0x70CB # 烋 -- 304,154 +0xC46D 0x70DC # 烜 -- 304,155 +0xC46E 0x7104 # 焄 -- 304,156 +0xC46F 0x70FA # 烺 -- 304,157 +0xC470 0x711C # 焜 -- 304,160 +0xC471 0x712E # 焮 -- 304,161 +0xC472 0x7120 # 焠 -- 304,162 +0xC473 0x712F # 焯 -- 304,163 +0xC474 0x7141 # 煁 -- 304,164 +0xC475 0x71A0 # 熠 -- 304,165 +0xC476 0x71BA # 熺 -- 304,166 +0xC477 0x71D4 # 燔 -- 304,167 +0xC478 0x71D6 # 燖 -- 304,170 +0xC479 0x7207 # 爇 -- 304,171 +0xC47A 0x7213 # 爓 -- 304,172 +0xC47B 0x721A # 爚 -- 304,173 +0xC47C 0x721F # 爟 -- 304,174 +0xC47D 0x7225 # 爥 -- 304,175 +0xC47E 0x7228 # 爨 -- 304,176 +0xC4A1 0x7242 # 牂 -- 304,241 +0xC4A2 0x724F # 牏 -- 304,242 +0xC4A3 0x7250 # 牐 -- 304,243 +0xC4A4 0x7253 # 牓 -- 304,244 +0xC4A5 0x726E # 牮 -- 304,245 +0xC4A6 0x7277 # 牷 -- 304,246 +0xC4A7 0x727C # 牼 -- 304,247 +0xC4A8 0x727F # 牿 -- 304,250 +0xC4A9 0x7289 # 犉 -- 304,251 +0xC4AA 0x728D # 犍 -- 304,252 +0xC4AB 0x72A8 # 犨 -- 304,253 +0xC4AC 0x72B4 # 犴 -- 304,254 +0xC4AD 0x72C1 # 狁 -- 304,255 +0xC4AE 0x72C9 # 狉 -- 304,256 +0xC4AF 0x72EB # 狫 -- 304,257 +0xC4B0 0x72E5 # 狥 -- 304,260 +0xC4B1 0x72F4 # 狴 -- 304,261 +0xC4B2 0x72FB # 狻 -- 304,262 +0xC4B3 0x7301 # 猁 -- 304,263 +0xC4B4 0x7318 # 猘 -- 304,264 +0xC4B5 0x730A # 猊 -- 304,265 +0xC4B6 0x7331 # 猱 -- 304,266 +0xC4B7 0x7352 # 獒 -- 304,267 +0xC4B8 0x7358 # 獘 -- 304,270 +0xC4B9 0x7360 # 獠 -- 304,271 +0xC4BA 0x7362 # 獢 -- 304,272 +0xC4BB 0x7367 # 獧 -- 304,273 +0xC4BC 0x736C # 獬 -- 304,274 +0xC4BD 0x736B # 獫 -- 304,275 +0xC4BE 0x736E # 獮 -- 304,276 +0xC4BF 0x736F # 獯 -- 304,277 +0xC4C0 0x7377 # 獷 -- 304,300 +0xC4C1 0x7381 # 玁 -- 304,301 +0xC4C2 0x7388 # 玈 -- 304,302 +0xC4C3 0x738E # 玎 -- 304,303 +0xC4C4 0x7395 # 玕 -- 304,304 +0xC4C5 0x73A0 # 玠 -- 304,305 +0xC4C6 0x73A6 # 玦 -- 304,306 +0xC4C7 0x7393 # 玓 -- 304,307 +0xC4C8 0x73BC # 玼 -- 304,310 +0xC4C9 0x73C9 # 珉 -- 304,311 +0xC4CA 0x73D3 # 珓 -- 304,312 +0xC4CB 0x73D9 # 珙 -- 304,313 +0xC4CC 0x7416 # 琖 -- 304,314 +0xC4CD 0x73F7 # 珷 -- 304,315 +0xC4CE 0x7431 # 琱 -- 304,316 +0xC4CF 0x742C # 琬 -- 304,317 +0xC4D0 0x742F # 琯 -- 304,320 +0xC4D1 0x744B # 瑋 -- 304,321 +0xC4D2 0x7451 # 瑑 -- 304,322 +0xC4D3 0x7471 # 瑱 -- 304,323 +0xC4D4 0x7472 # 瑲 -- 304,324 +0xC4D5 0x7473 # 瑳 -- 304,325 +0xC4D6 0x7474 # 瑴 -- 304,326 +0xC4D7 0x7460 # 瑠 -- 304,327 +0xC4D8 0x7480 # 璀 -- 304,330 +0xC4D9 0x7485 # 璅 -- 304,331 +0xC4DA 0x7486 # 璆 -- 304,332 +0xC4DB 0x7488 # 璈 -- 304,333 +0xC4DC 0x7490 # 璐 -- 304,334 +0xC4DD 0x7498 # 璘 -- 304,335 +0xC4DE 0x749A # 璚 -- 304,336 +0xC4DF 0x74AA # 璪 -- 304,337 +0xC4E0 0x74AB # 璫 -- 304,340 +0xC4E1 0x74B5 # 璵 -- 304,341 +0xC4E2 0x74BF # 璿 -- 304,342 +0xC4E3 0x74C8 # 瓈 -- 304,343 +0xC4E4 0x74D8 # 瓘 -- 304,344 +0xC4E5 0x74DA # 瓚 -- 304,345 +0xC4E6 0x74DB # 瓛 -- 304,346 +0xC4E7 0x74E4 # 瓤 -- 304,347 +0xC4E8 0x74FB # 瓻 -- 304,350 +0xC4E9 0x74FF # 瓿 -- 304,351 +0xC4EA 0x750F # 甏 -- 304,352 +0xC4EB 0x7516 # 甖 -- 304,353 +0xC4EC 0x752A # 甪 -- 304,354 +0xC4ED 0x753F # 甿 -- 304,355 +0xC4EE 0x7547 # 畇 -- 304,356 +0xC4EF 0x7548 # 畈 -- 304,357 +0xC4F0 0x7564 # 畤 -- 304,360 +0xC4F1 0x7583 # 疃 -- 304,361 +0xC4F2 0x7590 # 疐 -- 304,362 +0xC4F3 0x7598 # 疘 -- 304,363 +0xC4F4 0x75B8 # 疸 -- 304,364 +0xC4F5 0x75C1 # 痁 -- 304,365 +0xC4F6 0x75D0 # 痐 -- 304,366 +0xC4F7 0x75D7 # 痗 -- 304,367 +0xC4F8 0x75E1 # 痡 -- 304,370 +0xC4F9 0x75FE # 痾 -- 304,371 +0xC4FA 0x7602 # 瘂 -- 304,372 +0xC4FB 0x760F # 瘏 -- 304,373 +0xC4FC 0x761D # 瘝 -- 304,374 +0xC4FD 0x762F # 瘯 -- 304,375 +0xC4FE 0x7649 # 癉 -- 304,376 diff --git a/unicode/xerox/unihan/XCCS-305=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-305=UNIHAN.TXT new file mode 100644 index 00000000..9aa23bd2 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-305=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "305" UNIHAN + +0xC521 0x7659 # 癙 -- 305,041 +0xC522 0x766D # 癭 -- 305,042 +0xC523 0x769C # 皜 -- 305,043 +0xC524 0x748A # 璊 -- 305,044 +0xC525 0x76E9 # 盩 -- 305,045 +0xC526 0x76EC # 盬 -- 305,046 +0xC527 0x76ED # 盭 -- 305,047 +0xC528 0x7704 # 眄 -- 305,050 +0xC529 0x770A # 眊 -- 305,051 +0xC52A 0x771A # 眚 -- 305,052 +0xC52B 0x772F # 眯 -- 305,053 +0xC52C 0x7734 # 眴 -- 305,054 +0xC52D 0x7745 # 睅 -- 305,055 +0xC52E 0x774A # 睊 -- 305,056 +0xC52F 0x774D # 睍 -- 305,057 +0xC530 0x7758 # 睘 -- 305,060 +0xC531 0x775F # 睟 -- 305,061 +0xC532 0x7760 # 睠 -- 305,062 +0xC533 0x7780 # 瞀 -- 305,063 +0xC534 0x778D # 瞍 -- 305,064 +0xC535 0x77AF # 瞯 -- 305,065 +0xC536 0x77D9 # 矙 -- 305,066 +0xC537 0x77DE # 矞 -- 305,067 +0xC538 0x77F0 # 矰 -- 305,070 +0xC539 0x77F4 # 矴 -- 305,071 +0xC53A 0x7809 # 砉 -- 305,072 +0xC53B 0x7806 # 砆 -- 305,073 +0xC53C 0x7826 # 砦 -- 305,074 +0xC53D 0x7820 # 砠 -- 305,075 +0xC53E 0x7822 # 砢 -- 305,076 +0xC53F 0x784E # 硎 -- 305,077 +0xC540 0x786D # 硭 -- 305,100 +0xC541 0x7868 # 硨 -- 305,101 +0xC542 0x7894 # 碔 -- 305,102 +0xC543 0x788F # 碏 -- 305,103 +0xC544 0x78A3 # 碣 -- 305,104 +0xC545 0x78AA # 碪 -- 305,105 +0xC546 0x78D5 # 磕 -- 305,106 +0xC547 0x78BB # 碻 -- 305,107 +0xC548 0x78D2 # 磒 -- 305,110 +0xC549 0x78E1 # 磡 -- 305,111 +0xC54A 0x78FD # 磽 -- 305,112 +0xC54B 0x78F2 # 磲 -- 305,113 +0xC54C 0x78FB # 磻 -- 305,114 +0xC54D 0x7904 # 礄 -- 305,115 +0xC54E 0x793D # 礽 -- 305,116 +0xC54F 0x793F # 礿 -- 305,117 +0xC550 0x7945 # 祅 -- 305,120 +0xC551 0x794F # 祏 -- 305,121 +0xC552 0x796B # 祫 -- 305,122 +0xC553 0x7972 # 祲 -- 305,123 +0xC554 0x797C # 祼 -- 305,124 +0xC555 0x798B # 禋 -- 305,125 +0xC556 0x7996 # 禖 -- 305,126 +0xC557 0x7998 # 禘 -- 305,127 +0xC558 0x79AB # 禫 -- 305,130 +0xC559 0x79B4 # 禴 -- 305,131 +0xC55A 0x79BA # 禺 -- 305,132 +0xC55B 0x79D4 # 秔 -- 305,133 +0xC55C 0x79EC # 秬 -- 305,134 +0xC55D 0x79ED # 秭 -- 305,135 +0xC55E 0x7A0A # 稊 -- 305,136 +0xC55F 0x7A0C # 稌 -- 305,137 +0xC560 0x7A11 # 稑 -- 305,140 +0xC561 0x7A39 # 稹 -- 305,141 +0xC562 0x7A48 # 穈 -- 305,142 +0xC563 0x7A4B # 穋 -- 305,143 +0xC564 0x7A60 # 穠 -- 305,144 +0xC565 0x7A5F # 穟 -- 305,145 +0xC566 0x7A67 # 穧 -- 305,146 +0xC567 0x7A75 # 穵 -- 305,147 +0xC568 0x7A85 # 窅 -- 305,150 +0xC569 0x7A9E # 窞 -- 305,151 +0xC56A 0x7AA3 # 窣 -- 305,152 +0xC56B 0x7AB8 # 窸 -- 305,153 +0xC56C 0x7ABE # 窾 -- 305,154 +0xC56D 0x7AD1 # 竑 -- 305,155 +0xC56E 0x7AFE # 竾 -- 305,156 +0xC56F 0x7B2A # 笪 -- 305,157 +0xC570 0x7B31 # 笱 -- 305,160 +0xC571 0x7B2E # 笮 -- 305,161 +0xC572 0x7B35 # 笵 -- 305,162 +0xC573 0x7B47 # 筇 -- 305,163 +0xC574 0x7B45 # 筅 -- 305,164 +0xC575 0x7B4A # 筊 -- 305,165 +0xC576 0x7B65 # 筥 -- 305,166 +0xC577 0x7B6D # 筭 -- 305,167 +0xC578 0x7B74 # 筴 -- 305,170 +0xC579 0x7B66 # 筦 -- 305,171 +0xC57A 0x7BBE # 箾 -- 305,172 +0xC57B 0x7BDA # 篚 -- 305,173 +0xC57C 0x7BDD # 篝 -- 305,174 +0xC57D 0x7BE5 # 篥 -- 305,175 +0xC57E 0x7BE8 # 篨 -- 305,176 +0xC5A1 0x7BEA # 篪 -- 305,241 +0xC5A2 0x7BD4 # 篔 -- 305,242 +0xC5A3 0x7BD8 # 篘 -- 305,243 +0xC5A4 0x7BF2 # 篲 -- 305,244 +0xC5A5 0x7BF3 # 篳 -- 305,245 +0xC5A6 0x7C03 # 簃 -- 305,246 +0xC5A7 0x7C0F # 簏 -- 305,247 +0xC5A8 0x7C0C # 簌 -- 305,250 +0xC5A9 0x7C20 # 簠 -- 305,251 +0xC5AA 0x7C26 # 簦 -- 305,252 +0xC5AB 0x7C3B # 簻 -- 305,253 +0xC5AC 0x7C5B # 籛 -- 305,254 +0xC5AD 0x7C5D # 籝 -- 305,255 +0xC5AE 0x7C78 # 籸 -- 305,256 +0xC5AF 0x7C8E # 粎 -- 305,257 +0xC5B0 0x7C8D # 粍 -- 305,260 +0xC5B1 0x7C9E # 粞 -- 305,261 +0xC5B2 0x7CBA # 粺 -- 305,262 +0xC5B3 0x7CBC # 粼 -- 305,263 +0xC5B4 0x7CC8 # 糈 -- 305,264 +0xC5B5 0x7CD7 # 糗 -- 305,265 +0xC5B6 0x7CDD # 糝 -- 305,266 +0xC5B7 0x7D03 # 紃 -- 305,267 +0xC5B8 0x7D15 # 紕 -- 305,270 +0xC5B9 0x7D18 # 紘 -- 305,271 +0xC5BA 0x7D1D # 紝 -- 305,272 +0xC5BB 0x7D29 # 紩 -- 305,273 +0xC5BC 0x7D3D # 紽 -- 305,274 +0xC5BD 0x7D45 # 絅 -- 305,275 +0xC5BE 0x7D3E # 紾 -- 305,276 +0xC5BF 0x7D53 # 絓 -- 305,277 +0xC5C0 0x7D6A # 絪 -- 305,300 +0xC5C1 0x7D5A # 絚 -- 305,301 +0xC5C2 0x7D7B # 絻 -- 305,302 +0xC5C3 0x7D7F # 絿 -- 305,303 +0xC5C4 0x7D85 # 綅 -- 305,304 +0xC5C5 0x7D8C # 綌 -- 305,305 +0xC5C6 0x7D8D # 綍 -- 305,306 +0xC5C7 0x7D96 # 綖 -- 305,307 +0xC5C8 0x7DAF # 綯 -- 305,310 +0xC5C9 0x7DD7 # 緗 -- 305,311 +0xC5CA 0x7DF9 # 緹 -- 305,312 +0xC5CB 0x7DE4 # 緤 -- 305,313 +0xC5CC 0x7DE5 # 緥 -- 305,314 +0xC5CD 0x7DD9 # 緙 -- 305,315 +0xC5CE 0x7E15 # 縕 -- 305,316 +0xC5CF 0x7E1A # 縚 -- 305,317 +0xC5D0 0x7E17 # 縗 -- 305,320 +0xC5D1 0x7E20 # 縠 -- 305,321 +0xC5D2 0x7E2D # 縭 -- 305,322 +0xC5D3 0x7E34 # 縴 -- 305,323 +0xC5D4 0x7E62 # 繢 -- 305,324 +0xC5D5 0x7E50 # 繐 -- 305,325 +0xC5D6 0x7E7B # 繻 -- 305,326 +0xC5D7 0x7E7E # 繾 -- 305,327 +0xC5D8 0x7E81 # 纁 -- 305,330 +0xC5D9 0x7E88 # 纈 -- 305,331 +0xC5DA 0x7E8A # 纊 -- 305,332 +0xC5DB 0x7F3E # 缾 -- 305,333 +0xC5DC 0x7F43 # 罃 -- 305,334 +0xC5DD 0x7F47 # 罇 -- 305,335 +0xC5DE 0x7F4F # 罏 -- 305,336 +0xC5DF 0x7F5D # 罝 -- 305,337 +0xC5E0 0x7F65 # 罥 -- 305,340 +0xC5E1 0x7F6D # 罭 -- 305,341 +0xC5E2 0x7F73 # 罳 -- 305,342 +0xC5E3 0x7F76 # 罶 -- 305,343 +0xC5E4 0x7F91 # 羑 -- 305,344 +0xC5E5 0x7F96 # 羖 -- 305,345 +0xC5E6 0x7FC3 # 翃 -- 305,346 +0xC5E7 0x7FE3 # 翣 -- 305,347 +0xC5E8 0x7FEB # 翫 -- 305,350 +0xC5E9 0x7FEC # 翬 -- 305,351 +0xC5EA 0x7FFE # 翾 -- 305,352 +0xC5EB 0x7FFF # 翿 -- 305,353 +0xC5EC 0x8008 # 耈 -- 305,354 +0xC5ED 0x800F # 耏 -- 305,355 +0xC5EE 0x800E # 耎 -- 305,356 +0xC5EF 0x8024 # 耤 -- 305,357 +0xC5F0 0x8030 # 耰 -- 305,360 +0xC5F1 0x8053 # 聓 -- 305,361 +0xC5F2 0x8071 # 聱 -- 305,362 +0xC5F3 0x80B8 # 肸 -- 305,363 +0xC5F4 0x80CF # 胏 -- 305,364 +0xC5F5 0x80E0 # 胠 -- 305,365 +0xC5F6 0x80D7 # 胗 -- 305,366 +0xC5F7 0x80D4 # 胔 -- 305,367 +0xC5F8 0x80F9 # 胹 -- 305,370 +0xC5F9 0x80FE # 胾 -- 305,371 +0xC5FA 0x8118 # 脘 -- 305,372 +0xC5FB 0x8130 # 脰 -- 305,373 +0xC5FC 0x811D # 脝 -- 305,374 +0xC5FD 0x811E # 脞 -- 305,375 +0xC5FE 0x8124 # 脤 -- 305,376 diff --git a/unicode/xerox/unihan/XCCS-306=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-306=UNIHAN.TXT new file mode 100644 index 00000000..8a84f3c4 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-306=UNIHAN.TXT @@ -0,0 +1,190 @@ + +# "306" UNIHAN + +0xC621 0x8153 # 腓 -- 306,041 +0xC622 0x816F # 腯 -- 306,042 +0xC623 0x8176 # 腶 -- 306,043 +0xC624 0x81B0 # 膰 -- 306,044 +0xC625 0x81B4 # 膴 -- 306,045 +0xC626 0x81C4 # 臄 -- 306,046 +0xC627 0x81CF # 臏 -- 306,047 +0xC628 0x81E7 # 臧 -- 306,050 +0xC629 0x81F2 # 臲 -- 306,051 +0xC62A 0x8204 # 舄 -- 306,052 +0xC62B 0x820B # 舋 -- 306,053 +0xC62C 0x821D # 舝 -- 306,054 +0xC62D 0x8220 # 舠 -- 306,055 +0xC62E 0x8232 # 舲 -- 306,056 +0xC62F 0x8233 # 舳 -- 306,057 +0xC630 0x824B # 艋 -- 306,060 +0xC631 0x824E # 艎 -- 306,061 +0xC632 0x8257 # 艗 -- 306,062 +0xC633 0x8263 # 艣 -- 306,063 +0xC634 0x826B # 艫 -- 306,064 +0xC635 0x8274 # 艴 -- 306,065 +0xC636 0x827D # 艽 -- 306,066 +0xC637 0x8283 # 芃 -- 306,067 +0xC638 0x8284 # 芄 -- 306,070 +0xC639 0x8291 # 芑 -- 306,071 +0xC63A 0x828A # 芊 -- 306,072 +0xC63B 0x82A3 # 芣 -- 306,073 +0xC63C 0x82B0 # 芰 -- 306,074 +0xC63D 0x82BE # 芾 -- 306,075 +0xC63E 0x82BC # 芼 -- 306,076 +0xC63F 0x82A8 # 芨 -- 306,077 +0xC640 0x82D5 # 苕 -- 306,100 +0xC641 0x4F42 # 佂 -- 306,101 +0xC642 0x82FA # 苺 -- 306,102 +0xC643 0x82FE # 苾 -- 306,103 +0xC644 0x8306 # 茆 -- 306,104 +0xC645 0x82D9 # 苙 -- 306,105 +0xC646 0x8300 # 茀 -- 306,106 +0xC647 0x8307 # 茇 -- 306,107 +0xC648 0x831E # 茞 -- 306,110 +0xC649 0x8344 # 荄 -- 306,111 +0xC64A 0x59EE # 姮 -- 306,112 +0xC64B 0x834D # 荍 -- 306,113 +0xC64C 0x8351 # 荑 -- 306,114 +0xC64D 0x832C # 茬 -- 306,115 +0xC64E 0x8322 # 茢 -- 306,116 +0xC64F 0x839B # 莛 -- 306,117 +0xC650 0x83D1 # 菑 -- 306,120 +0xC651 0x83DF # 菟 -- 306,121 +0xC652 0x83F9 # 菹 -- 306,122 +0xC653 0x8407 # 萇 -- 306,123 +0xC654 0x83C6 # 菆 -- 306,124 +0xC655 0x83E1 # 菡 -- 306,125 +0xC656 0x83F6 # 菶 -- 306,126 +0xC657 0x83FC # 菼 -- 306,127 +0xC658 0x8460 # 葠 -- 306,130 +0xC659 0x847D # 葽 -- 306,131 +0xC65A 0x8429 # 萩 -- 306,132 +0xC65B 0x8479 # 葹 -- 306,133 +0xC65C 0x844A # 葊 -- 306,134 +0xC65D 0x84B1 # 蒱 -- 306,135 +0xC65E 0x84C2 # 蓂 -- 306,136 +0xC65F 0x8500 # 蔀 -- 306,137 +0xC660 0x8526 # 蔦 -- 306,140 +0xC661 0x8507 # 蔇 -- 306,141 +0xC662 0x84E7 # 蓧 -- 306,142 +0xC663 0x850C # 蔌 -- 306,143 +0xC664 0x853E # 蔾 -- 306,144 +0xC665 0x8551 # 蕑 -- 306,145 +0xC666 0x8556 # 蕖 -- 306,146 +0xC667 0x855D # 蕝 -- 306,147 +0xC668 0x8561 # 蕡 -- 306,150 +0xC669 0x8562 # 蕢 -- 306,151 +0xC66A 0x8590 # 薐 -- 306,152 +0xC66B 0x8580 # 薀 -- 306,153 +0xC66C 0x8577 # 蕷 -- 306,154 +0xC66D 0x857A # 蕺 -- 306,155 +0xC66E 0x8585 # 薅 -- 306,156 +0xC66F 0x858C # 薌 -- 306,157 +0xC670 0x859C # 薜 -- 306,160 +0xC671 0x8586 # 薆 -- 306,161 +0xC672 0x8596 # 薖 -- 306,162 +0xC673 0x85B3 # 薳 -- 306,163 +0xC674 0x85DF # 藟 -- 306,164 +0xC675 0x85DA # 藚 -- 306,165 +0xC676 0x8600 # 蘀 -- 306,166 +0xC677 0x8624 # 蘤 -- 306,167 +0xC678 0x8640 # 虀 -- 306,170 +0xC679 0x8646 # 虆 -- 306,171 +0xC67A 0x8653 # 虓 -- 306,172 +0xC67B 0x8656 # 虖 -- 306,173 +0xC67C 0x8661 # 虡 -- 306,174 +0xC67D 0x8663 # 虣 -- 306,175 +0xC67E 0x8669 # 虩 -- 306,176 +0xC6A1 0x866F # 虯 -- 306,241 +0xC6A2 0x86A1 # 蚡 -- 306,242 +0xC6A4 0x86F8 # 蛸 -- 306,244 +0xC6A5 0x870D # 蜍 -- 306,245 +0xC6A6 0x870E # 蜎 -- 306,246 +0xC6A7 0x86CC # 蛌 -- 306,247 +0xC6A8 0x873E # 蜾 -- 306,250 +0xC6A9 0x8740 # 蝀 -- 306,251 +0xC6AA 0x873A # 蜺 -- 306,252 +0xC6AB 0x8743 # 蝃 -- 306,253 +0xC6AC 0x8758 # 蝘 -- 306,254 +0xC6AD 0x8763 # 蝣 -- 306,255 +0xC6AE 0x8764 # 蝤 -- 306,256 +0xC6AF 0x8765 # 蝥 -- 306,257 +0xC6B0 0x877B # 蝻 -- 306,260 +0xC6B1 0x8793 # 螓 -- 306,261 +0xC6B2 0x8797 # 螗 -- 306,262 +0xC6B3 0x8798 # 螘 -- 306,263 +0xC6B4 0x87A3 # 螣 -- 306,264 +0xC6B5 0x87AC # 螬 -- 306,265 +0xC6B6 0x87AD # 螭 -- 306,266 +0xC6B7 0x87AE # 螮 -- 306,267 +0xC6B8 0x87B5 # 螵 -- 306,270 +0xC6B9 0x87BF # 螿 -- 306,271 +0xC6BA 0x87E2 # 蟢 -- 306,272 +0xC6BB 0x87EA # 蟪 -- 306,273 +0xC6BC 0x87DC # 蟜 -- 306,274 +0xC6BD 0x8810 # 蠐 -- 306,275 +0xC6BE 0x8813 # 蠓 -- 306,276 +0xC6BF 0x881C # 蠜 -- 306,277 +0xC6C0 0x881B # 蠛 -- 306,300 +0xC6C1 0x8841 # 衁 -- 306,301 +0xC6C2 0x8228 # 舨 -- 306,302 +0xC6C3 0x884E # 衎 -- 306,303 +0xC6C4 0x8875 # 衵 -- 306,304 +0xC6C5 0x88A4 # 袤 -- 306,305 +0xC6C6 0x88BD # 袽 -- 306,306 +0xC6C7 0x88C0 # 裀 -- 306,307 +0xC6C8 0x88CE # 裎 -- 306,310 +0xC6C9 0x88CC # 裌 -- 306,311 +0xC6CA 0x88FC # 裼 -- 306,312 +0xC6CB 0x88F0 # 裰 -- 306,313 +0xC6CC 0x8927 # 褧 -- 306,314 +0xC6CD 0x895B # 襛 -- 306,315 +0xC6CE 0x895D # 襝 -- 306,316 +0xC6CF 0x8966 # 襦 -- 306,317 +0xC6D0 0x8965 # 襥 -- 306,320 +0xC6D1 0x896E # 襮 -- 306,321 +0xC6D2 0x896D # 襭 -- 306,322 +0xC6D3 0x897C # 襼 -- 306,323 +0xC6D4 0x899C # 覜 -- 306,324 +0xC6D5 0x89B5 # 覵 -- 306,325 +0xC6D6 0x89BC # 覼 -- 306,326 +0xC6D7 0x89E9 # 觩 -- 306,327 +0xC6D8 0x89ED # 觭 -- 306,330 +0xC6D9 0x89F1 # 觱 -- 306,331 +0xC6DA 0x89F6 # 觶 -- 306,332 +0xC6DB 0x8A07 # 訇 -- 306,333 +0xC6DC 0x8A11 # 訑 -- 306,334 +0xC6DD 0x8A22 # 訢 -- 306,335 +0xC6DE 0x8A29 # 訩 -- 306,336 +0xC6DF 0x8A27 # 訧 -- 306,337 +0xC6E0 0x8A56 # 詖 -- 306,340 +0xC6E1 0x8A58 # 詘 -- 306,341 +0xC6E2 0x8A57 # 詗 -- 306,342 +0xC6E3 0x8A7F # 詿 -- 306,343 +0xC6E4 0x8A75 # 詵 -- 306,344 +0xC6E5 0x8A7B # 詻 -- 306,345 +0xC6E6 0x8ABE # 誾 -- 306,346 +0xC6E7 0x8AC6 # 諆 -- 306,347 +0xC6E8 0x8AD0 # 諐 -- 306,350 +0xC6E9 0x8ADF # 諟 -- 306,351 +0xC6EA 0x8AE0 # 諠 -- 306,352 +0xC6EB 0x8AF4 # 諴 -- 306,353 +0xC6EC 0x8B0F # 謏 -- 306,354 +0xC6ED 0x8B59 # 譙 -- 306,355 +0xC6EE 0x8B5F # 譟 -- 306,356 +0xC6EF 0x8B4D # 譍 -- 306,357 +0xC6F0 0x8B78 # 譸 -- 306,360 +0xC6F1 0x8B7E # 譾 -- 306,361 +0xC6F2 0x8B8B # 讋 -- 306,362 +0xC6F3 0x8B99 # 讙 -- 306,363 +0xC6F4 0x8C4B # 豋 -- 306,364 +0xC6F5 0x8C4F # 豏 -- 306,365 +0xC6F6 0x8C57 # 豗 -- 306,366 +0xC6F7 0x8C5D # 豝 -- 306,367 +0xC6F8 0x8C5C # 豜 -- 306,370 +0xC6F9 0x8C68 # 豨 -- 306,371 +0xC6FA 0x8C6D # 豭 -- 306,372 +0xC6FB 0x8C75 # 豵 -- 306,373 +0xC6FC 0x8C76 # 豶 -- 306,374 +0xC6FD 0x8C7B # 豻 -- 306,375 +0xC6FE 0x8C86 # 貆 -- 306,376 diff --git a/unicode/xerox/unihan/XCCS-307=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-307=UNIHAN.TXT new file mode 100644 index 00000000..93d5325f --- /dev/null +++ b/unicode/xerox/unihan/XCCS-307=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "307" UNIHAN + +0xC721 0x8CA4 # 貤 -- 307,041 +0xC722 0x8CD5 # 賕 -- 307,042 +0xC723 0x8CEB # 賫 -- 307,043 +0xC724 0x8CFE # 賾 -- 307,044 +0xC725 0x8D07 # 贇 -- 307,045 +0xC726 0x8D09 # 贉 -- 307,046 +0xC727 0x8240 # 艀 -- 307,047 +0xC728 0x8D6C # 赬 -- 307,050 +0xC729 0x8DAF # 趯 -- 307,051 +0xC72A 0x8DD6 # 跖 -- 307,052 +0xC72B 0x8DC5 # 跅 -- 307,053 +0xC72C 0x8DBC # 趼 -- 307,054 +0xC72D 0x8E16 # 踖 -- 307,055 +0xC72E 0x8E14 # 踔 -- 307,056 +0xC72F 0x8E18 # 踘 -- 307,057 +0xC730 0x8E26 # 踦 -- 307,060 +0xC731 0x8E27 # 踧 -- 307,061 +0xC732 0x8E3D # 踽 -- 307,062 +0xC733 0x8E36 # 踶 -- 307,063 +0xC734 0x8E40 # 蹀 -- 307,064 +0xC735 0x8E41 # 蹁 -- 307,065 +0xC736 0x5290 # 劐 -- 307,066 +0xC737 0x8E54 # 蹔 -- 307,067 +0xC738 0x8E62 # 蹢 -- 307,070 +0xC739 0x8E7B # 蹻 -- 307,071 +0xC73A 0x8E6F # 蹯 -- 307,072 +0xC73B 0x8E84 # 躄 -- 307,073 +0xC73C 0x8E94 # 躔 -- 307,074 +0xC73D 0x8E9A # 躚 -- 307,075 +0xC73E 0x8E9E # 躞 -- 307,076 +0xC73F 0x8EA7 # 躧 -- 307,077 +0xC740 0x8EA9 # 躩 -- 307,100 +0xC741 0x8ECF # 軏 -- 307,101 +0xC742 0x8EF9 # 軹 -- 307,102 +0xC743 0x8F00 # 輀 -- 307,103 +0xC744 0x8F08 # 輈 -- 307,104 +0xC745 0x8F07 # 輇 -- 307,105 +0xC746 0x8F17 # 輗 -- 307,106 +0xC747 0x8F1E # 輞 -- 307,107 +0xC748 0x8F20 # 輠 -- 307,110 +0xC749 0x8F27 # 輧 -- 307,111 +0xC74A 0x8F2E # 輮 -- 307,112 +0xC74B 0x8F40 # 轀 -- 307,113 +0xC74C 0x8F54 # 轔 -- 307,114 +0xC74D 0x8F56 # 轖 -- 307,115 +0xC74E 0x8F31 # 輱 -- 307,116 +0xC74F 0x8FCB # 迋 -- 307,117 +0xC750 0x8FCD # 迍 -- 307,120 +0xC751 0x8FD5 # 迕 -- 307,121 +0xC752 0x8FEE # 迮 -- 307,122 +0xC753 0x9002 # 适 -- 307,123 +0xC754 0x900C # 逌 -- 307,124 +0xC755 0x8FFB # 迻 -- 307,125 +0xC756 0x9079 # 遹 -- 307,126 +0xC757 0x907B # 遻 -- 307,127 +0xC758 0x9099 # 邙 -- 307,130 +0xC759 0x90A1 # 邡 -- 307,131 +0xC75A 0x90B0 # 邰 -- 307,132 +0xC75B 0x90B2 # 邲 -- 307,133 +0xC75C 0x90B3 # 邳 -- 307,134 +0xC75D 0x90B6 # 邶 -- 307,135 +0xC75E 0x90BD # 邽 -- 307,136 +0xC75F 0x90BE # 邾 -- 307,137 +0xC760 0x90C5 # 郅 -- 307,140 +0xC761 0x90C7 # 郇 -- 307,141 +0xC762 0x90C3 # 郃 -- 307,142 +0xC763 0x90E2 # 郢 -- 307,143 +0xC764 0x90D5 # 郕 -- 307,144 +0xC765 0x90EA # 郪 -- 307,145 +0xC766 0x90F3 # 郳 -- 307,146 +0xC767 0x90EB # 郫 -- 307,147 +0xC768 0x90EF # 郯 -- 307,150 +0xC769 0x90F4 # 郴 -- 307,151 +0xC76A 0x90FF # 郿 -- 307,152 +0xC76B 0x9100 # 鄀 -- 307,153 +0xC76C 0x9104 # 鄄 -- 307,154 +0xC76D 0x910B # 鄋 -- 307,155 +0xC76E 0x9118 # 鄘 -- 307,156 +0xC76F 0x9120 # 鄠 -- 307,157 +0xC770 0x9122 # 鄢 -- 307,160 +0xC771 0x911C # 鄜 -- 307,161 +0xC772 0x912B # 鄫 -- 307,162 +0xC773 0x9143 # 酃 -- 307,163 +0xC774 0x914E # 酎 -- 307,164 +0xC775 0x9156 # 酖 -- 307,165 +0xC776 0x9164 # 酤 -- 307,166 +0xC777 0x9161 # 酡 -- 307,167 +0xC778 0x917A # 酺 -- 307,170 +0xC779 0x9181 # 醁 -- 307,171 +0xC77A 0x9185 # 醅 -- 307,172 +0xC77B 0x918A # 醊 -- 307,173 +0xC77C 0x9193 # 醓 -- 307,174 +0xC77D 0x91A2 # 醢 -- 307,175 +0xC77E 0x91AF # 醯 -- 307,176 +0xC7A1 0x91C2 # 釂 -- 307,241 +0xC7A2 0x91C4 # 釄 -- 307,242 +0xC7A3 0x9207 # 鈇 -- 307,243 +0xC7A4 0x9212 # 鈒 -- 307,244 +0xC7A5 0x9249 # 鉉 -- 307,245 +0xC7A6 0x924F # 鉏 -- 307,246 +0xC7A7 0x9276 # 鉶 -- 307,247 +0xC7A8 0x928D # 銍 -- 307,250 +0xC7A9 0x929A # 銚 -- 307,251 +0xC7AA 0x929B # 銛 -- 307,252 +0xC7AB 0x92CF # 鋏 -- 307,253 +0xC7AC 0x92C8 # 鋈 -- 307,254 +0xC7AD 0x92DF # 鋟 -- 307,255 +0xC7AE 0x931E # 錞 -- 307,256 +0xC7AF 0x9364 # 鍤 -- 307,257 +0xC7B0 0x9365 # 鍥 -- 307,260 +0xC7B1 0x936A # 鍪 -- 307,261 +0xC7B2 0x937C # 鍼 -- 307,262 +0xC7B3 0x9360 # 鍠 -- 307,263 +0xC7B4 0x936D # 鍭 -- 307,264 +0xC7B5 0x939B # 鎛 -- 307,265 +0xC7B6 0x93A1 # 鎡 -- 307,266 +0xC7B7 0x938C # 鎌 -- 307,267 +0xC7B8 0x9389 # 鎉 -- 307,270 +0xC7B9 0x93D0 # 鏐 -- 307,271 +0xC7BA 0x9464 # 鑤 -- 307,272 +0xC7BB 0x946A # 鑪 -- 307,273 +0xC7BC 0x9471 # 鑱 -- 307,274 +0xC7BD 0x959F # 閟 -- 307,275 +0xC7BE 0x95AC # 閬 -- 307,276 +0xC7BF 0x95BC # 閼 -- 307,277 +0xC7C0 0x95BE # 閾 -- 307,300 +0xC7C1 0x95C9 # 闉 -- 307,301 +0xC7C2 0x95CD # 闍 -- 307,302 +0xC7C3 0x95D1 # 闑 -- 307,303 +0xC7C4 0x95D3 # 闓 -- 307,304 +0xC7C5 0x95D2 # 闒 -- 307,305 +0xC7C6 0x963C # 阼 -- 307,306 +0xC7C7 0x966C # 陬 -- 307,307 +0xC7C8 0x9674 # 陴 -- 307,310 +0xC7C9 0x9689 # 隉 -- 307,311 +0xC7CA 0x967B # 陻 -- 307,312 +0xC7CB 0x9683 # 隃 -- 307,313 +0xC7CC 0x96A4 # 隤 -- 307,314 +0xC7CD 0x96A9 # 隩 -- 307,315 +0xC7CE 0x96AE # 隮 -- 307,316 +0xC7CF 0x96CE # 雎 -- 307,317 +0xC7D0 0x96CA # 雊 -- 307,320 +0xC7D1 0x96D2 # 雒 -- 307,321 +0xC7D2 0x96D8 # 雘 -- 307,322 +0xC7D3 0x96DD # 雝 -- 307,323 +0xC7D4 0x96E9 # 雩 -- 307,324 +0xC7D5 0x96F1 # 雱 -- 307,325 +0xC7D6 0x9724 # 霤 -- 307,326 +0xC7D7 0x9728 # 霨 -- 307,327 +0xC7D8 0x9736 # 霶 -- 307,330 +0xC7D9 0x975A # 靚 -- 307,331 +0xC7DA 0x9767 # 靧 -- 307,332 +0xC7DB 0x9777 # 靷 -- 307,333 +0xC7DC 0x9778 # 靸 -- 307,334 +0xC7DD 0x9789 # 鞉 -- 307,335 +0xC7DE 0x97AE # 鞮 -- 307,336 +0xC7DF 0x97B6 # 鞶 -- 307,337 +0xC7E0 0x97B9 # 鞹 -- 307,340 +0xC7E1 0x977A # 靺 -- 307,341 +0xC7E2 0x97C9 # 韉 -- 307,342 +0xC7E3 0x97CE # 韎 -- 307,343 +0xC7E4 0x97CD # 韍 -- 307,344 +0xC7E5 0x97D0 # 韐 -- 307,345 +0xC7E6 0x97D4 # 韔 -- 307,346 +0xC7E7 0x97DD # 韝 -- 307,347 +0xC7E8 0x97E0 # 韠 -- 307,350 +0xC7E9 0x980A # 頊 -- 307,351 +0xC7EA 0x980D # 頍 -- 307,352 +0xC7EB 0x980E # 頎 -- 307,353 +0xC7EC 0x981E # 頞 -- 307,354 +0xC7ED 0x982B # 頫 -- 307,355 +0xC7EE 0x9832 # 頲 -- 307,356 +0xC7EF 0x9865 # 顥 -- 307,357 +0xC7F0 0x9866 # 顦 -- 307,360 +0xC7F1 0x98AD # 颭 -- 307,361 +0xC7F2 0x98B8 # 颸 -- 307,362 +0xC7F3 0x98BF # 颿 -- 307,363 +0xC7F4 0x98C0 # 飀 -- 307,364 +0xC7F5 0x98E3 # 飣 -- 307,365 +0xC7F6 0x70CA # 烊 -- 307,366 +0xC7F7 0x98E7 # 飧 -- 307,367 +0xC7F8 0x9902 # 餂 -- 307,370 +0xC7F9 0x9914 # 餔 -- 307,371 +0xC7FA 0x9916 # 餖 -- 307,372 +0xC7FB 0x9915 # 餕 -- 307,373 +0xC7FC 0x991F # 餟 -- 307,374 +0xC7FD 0x991C # 餜 -- 307,375 +0xC7FE 0x991A # 餚 -- 307,376 diff --git a/unicode/xerox/unihan/XCCS-310=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-310=UNIHAN.TXT new file mode 100644 index 00000000..105fd2eb --- /dev/null +++ b/unicode/xerox/unihan/XCCS-310=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "310" UNIHAN + +0xC821 0x9931 # 餱 -- 310,041 +0xC822 0x9932 # 餲 -- 310,042 +0xC823 0x9933 # 餳 -- 310,043 +0xC824 0x993C # 餼 -- 310,044 +0xC825 0x9941 # 饁 -- 310,045 +0xC826 0x9939 # 餹 -- 310,046 +0xC827 0x9950 # 饐 -- 310,047 +0xC828 0x994E # 饎 -- 310,050 +0xC829 0x99A1 # 馡 -- 310,051 +0xC82A 0x99B9 # 馹 -- 310,052 +0xC82B 0x99EA # 駪 -- 310,053 +0xC82C 0x99EC # 駬 -- 310,054 +0xC82D 0x99F0 # 駰 -- 310,055 +0xC82E 0x99EE # 駮 -- 310,056 +0xC82F 0x9A02 # 騂 -- 310,057 +0xC830 0x9A03 # 騃 -- 310,060 +0xC831 0x9A04 # 騄 -- 310,061 +0xC832 0x9A05 # 騅 -- 310,062 +0xC833 0x9A0B # 騋 -- 310,063 +0xC834 0x9A11 # 騑 -- 310,064 +0xC835 0x9A27 # 騧 -- 310,065 +0xC836 0x9A23 # 騣 -- 310,066 +0xC837 0x9A24 # 騤 -- 310,067 +0xC838 0x9A35 # 騵 -- 310,070 +0xC839 0x9A36 # 騶 -- 310,071 +0xC83A 0x9A44 # 驄 -- 310,072 +0xC83B 0x9A43 # 驃 -- 310,073 +0xC83C 0x9A56 # 驖 -- 310,074 +0xC83D 0x9AAD # 骭 -- 310,075 +0xC83E 0x9AA9 # 骩 -- 310,076 +0xC83F 0x9AB0 # 骰 -- 310,077 +0xC840 0x9ABE # 骾 -- 310,100 +0xC841 0x9ABD # 骽 -- 310,101 +0xC842 0x9AD6 # 髖 -- 310,102 +0xC843 0x9AE2 # 髢 -- 310,103 +0xC844 0x9AE8 # 髨 -- 310,104 +0xC845 0x9B0B # 鬋 -- 310,105 +0xC846 0x9B12 # 鬒 -- 310,106 +0xC847 0x9B11 # 鬑 -- 310,107 +0xC848 0x9B18 # 鬘 -- 310,110 +0xC849 0x9B37 # 鬷 -- 310,111 +0xC84A 0x9B90 # 鮐 -- 310,112 +0xC84B 0x9BAA # 鮪 -- 310,113 +0xC84C 0x9B9A # 鮚 -- 310,114 +0xC84D 0x9BE4 # 鯤 -- 310,115 +0xC84E 0x9BEB # 鯫 -- 310,116 +0xC84F 0x9C08 # 鰈 -- 310,117 +0xC850 0x9C02 # 鰂 -- 310,120 +0xC851 0x9C44 # 鱄 -- 310,121 +0xC852 0x9C49 # 鱉 -- 310,122 +0xC853 0x9C58 # 鱘 -- 310,123 +0xC854 0x9C60 # 鱠 -- 310,124 +0xC855 0x9CF2 # 鳲 -- 310,125 +0xC856 0x9D03 # 鴃 -- 310,126 +0xC857 0x9D3D # 鴽 -- 310,127 +0xC858 0x9D42 # 鵂 -- 310,130 +0xC859 0x9D52 # 鵒 -- 310,131 +0xC85A 0x9D5C # 鵜 -- 310,132 +0xC85B 0x9D8A # 鶊 -- 310,133 +0xC85C 0x9D69 # 鵩 -- 310,134 +0xC85D 0x9D7E # 鵾 -- 310,135 +0xC85E 0x9D98 # 鶘 -- 310,136 +0xC85F 0x9DAC # 鶬 -- 310,137 +0xC860 0x9DBB # 鶻 -- 310,140 +0xC861 0x9DBF # 鶿 -- 310,141 +0xC862 0x9DC1 # 鷁 -- 310,142 +0xC863 0x9DB9 # 鶹 -- 310,143 +0xC864 0x9DC3 # 鷃 -- 310,144 +0xC865 0x9DC7 # 鷇 -- 310,145 +0xC866 0x9DD6 # 鷖 -- 310,146 +0xC867 0x9DDF # 鷟 -- 310,147 +0xC868 0x9DE6 # 鷦 -- 310,150 +0xC869 0x9DEF # 鷯 -- 310,151 +0xC86A 0x51C7 # 凇 -- 310,152 +0xC86B 0x9DFD # 鷽 -- 310,153 +0xC86C 0x9E07 # 鸇 -- 310,154 +0xC86D 0x9E11 # 鸑 -- 310,155 +0xC86E 0x9E80 # 麀 -- 310,156 +0xC86F 0x9E8C # 麌 -- 310,157 +0xC870 0x9E91 # 麑 -- 310,160 +0xC871 0x9ED3 # 黓 -- 310,161 +0xC872 0x9EC8 # 黈 -- 310,162 +0xC873 0x9EF6 # 黶 -- 310,163 +0xC874 0x9F02 # 鼂 -- 310,164 +0xC875 0x9F12 # 鼒 -- 310,165 +0xC876 0x9F17 # 鼗 -- 310,166 +0xC877 0x9F16 # 鼖 -- 310,167 +0xC878 0x9F19 # 鼙 -- 310,170 +0xC879 0x9F1A # 鼚 -- 310,171 +0xC87A 0x9F1B # 鼛 -- 310,172 +0xC87B 0x9F2B # 鼫 -- 310,173 +0xC87C 0x9F2F # 鼯 -- 310,174 +0xC87D 0x9F37 # 鼷 -- 310,175 +0xC87E 0x9F3D # 鼽 -- 310,176 +0xC8A1 0x9F45 # 齅 -- 310,241 +0xC8A2 0x9F60 # 齠 -- 310,242 +0xC8A3 0x9F67 # 齧 -- 310,243 +0xC8A4 0x9FA0 # 龠 -- 310,244 +0xC8A5 0x4E33 # 丳 -- 310,245 +0xC8A6 0x6C39 # 氹 -- 310,246 +0xC8A7 0x4E84 # 亄 -- 310,247 +0xC8A8 0x4EC8 # 仈 -- 310,250 +0xC8A9 0x4F00 # 伀 -- 310,251 +0xC8AA 0x4F80 # 侀 -- 310,252 +0xC8AB 0x4F6B # 佫 -- 310,253 +0xC8AC 0x4F9A # 侚 -- 310,254 +0xC8AD 0x4F7A # 佺 -- 310,255 +0xC8AE 0x4F6A # 佪 -- 310,256 +0xC8AF 0x4F76 # 佶 -- 310,257 +0xC8B0 0x4F78 # 佸 -- 310,260 +0xC8B1 0x4FCC # 俌 -- 310,261 +0xC8B2 0x4FE4 # 俤 -- 310,262 +0xC8B3 0x4FB4 # 侴 -- 310,263 +0xC8B4 0x5069 # 偩 -- 310,264 +0xC8B5 0x506B # 偫 -- 310,265 +0xC8B6 0x4FDC # 俜 -- 310,266 +0xC8B7 0x5081 # 傁 -- 310,267 +0xC8B8 0x50E4 # 僤 -- 310,270 +0xC8B9 0x50F0 # 僰 -- 310,271 +0xC8BA 0x50FC # 僼 -- 310,272 +0xC8BB 0x510E # 儎 -- 310,273 +0xC8BC 0x5124 # 儤 -- 310,274 +0xC8BD 0x518F # 冏 -- 310,275 +0xC8BE 0x519E # 冞 -- 310,276 +0xC8BF 0x51BC # 冼 -- 310,277 +0xC8C0 0x521C # 刜 -- 310,300 +0xC8C1 0x5245 # 剅 -- 310,301 +0xC8C2 0x5278 # 剸 -- 310,302 +0xC8C3 0x52E1 # 勡 -- 310,303 +0xC8C4 0x536D # 卭 -- 310,304 +0xC8C5 0x5414 # 吔 -- 310,305 +0xC8C6 0x5430 # 吰 -- 310,306 +0xC8C7 0x542A # 吪 -- 310,307 +0xC8C8 0x5467 # 呧 -- 310,310 +0xC8C9 0x549F # 咟 -- 310,311 +0xC8CA 0x550E # 唎 -- 310,312 +0xC8CB 0x5508 # 唈 -- 310,313 +0xC8CC 0x54E4 # 哤 -- 310,314 +0xC8CD 0x558C # 喌 -- 310,315 +0xC8CE 0x55C0 # 嗀 -- 310,316 +0xC8CF 0x55C8 # 嗈 -- 310,317 +0xC8D0 0x55CA # 嗊 -- 310,320 +0xC8D1 0x55C3 # 嗃 -- 310,321 +0xC8D2 0x560C # 嘌 -- 310,322 +0xC8D3 0x561C # 嘜 -- 310,323 +0xC8D4 0x55FF # 嗿 -- 310,324 +0xC8D5 0x564F # 噏 -- 310,325 +0xC8D6 0x5673 # 噳 -- 310,326 +0xC8D7 0x56E5 # 囥 -- 310,327 +0xC8D8 0x570C # 圌 -- 310,330 +0xC8D9 0x5787 # 垇 -- 310,331 +0xC8DA 0x576D # 坭 -- 310,332 +0xC8DB 0x5771 # 坱 -- 310,333 +0xC8DC 0x5774 # 坴 -- 310,334 +0xC8DD 0x578C # 垌 -- 310,335 +0xC8DE 0x57C7 # 埇 -- 310,336 +0xC8DF 0x579F # 垟 -- 310,337 +0xC8E0 0x57B8 # 垸 -- 310,340 +0xC8E1 0x57DD # 埝 -- 310,341 +0xC8E2 0x57E6 # 埦 -- 310,342 +0xC8E3 0x580C # 堌 -- 310,343 +0xC8E4 0x57F0 # 埰 -- 310,344 +0xC8E5 0x57D7 # 埗 -- 310,345 +0xC8E6 0x5828 # 堨 -- 310,346 +0xC8E7 0x580E # 堎 -- 310,347 +0xC8E8 0x5804 # 堄 -- 310,350 +0xC8E9 0x580B # 堋 -- 310,351 +0xC8EA 0x5832 # 堲 -- 310,352 +0xC8EB 0x5833 # 堳 -- 310,353 +0xC8EC 0x583F # 堿 -- 310,354 +0xC8ED 0x584E # 塎 -- 310,355 +0xC8EE 0x5865 # 塥 -- 310,356 +0xC8EF 0x585D # 塝 -- 310,357 +0xC8F0 0x5884 # 墄 -- 310,360 +0xC8F1 0x58AB # 墫 -- 310,361 +0xC8F2 0x6C5C # 汜 -- 310,362 +0xC8F3 0x58CB # 壋 -- 310,363 +0xC8F4 0x5905 # 夅 -- 310,364 +0xC8F5 0x593C # 夼 -- 310,365 +0xC8F6 0x5953 # 奓 -- 310,366 +0xC8F7 0x595C # 奜 -- 310,367 +0xC8F8 0x5970 # 奰 -- 310,370 +0xC8F9 0x59B5 # 妵 -- 310,371 +0xC8FA 0x59B8 # 妸 -- 310,372 +0xC8FB 0x80BD # 肽 -- 310,373 +0xC8FC 0x59DE # 姞 -- 310,374 +0xC8FD 0x5A2C # 娬 -- 310,375 +0xC8FE 0x5A12 # 娒 -- 310,376 diff --git a/unicode/xerox/unihan/XCCS-311=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-311=UNIHAN.TXT new file mode 100644 index 00000000..f5cde3b8 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-311=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "311" UNIHAN + +0xC921 0x5A64 # 婤 -- 311,041 +0xC922 0x5A65 # 婥 -- 311,042 +0xC923 0x5A35 # 娵 -- 311,043 +0xC924 0x5A50 # 婐 -- 311,044 +0xC925 0x5A8A # 媊 -- 311,045 +0xC926 0x5AF3 # 嫳 -- 311,046 +0xC927 0x5B56 # 孖 -- 311,047 +0xC928 0x5B7B # 孻 -- 311,050 +0xC929 0x5C15 # 尕 -- 311,051 +0xC92A 0x537C # 卼 -- 311,052 +0xC92B 0x5C30 # 尰 -- 311,053 +0xC92C 0x5C5D # 屝 -- 311,054 +0xC92D 0x5C6A # 屪 -- 311,055 +0xC92E 0x5C7C # 屼 -- 311,056 +0xC92F 0x5C8A # 岊 -- 311,057 +0xC930 0x5CA8 # 岨 -- 311,060 +0xC931 0x5C9E # 岞 -- 311,061 +0xC932 0x5DC3 # 巃 -- 311,062 +0xC933 0x5C74 # 屴 -- 311,063 +0xC934 0x5CC7 # 峇 -- 311,064 +0xC935 0x5CF9 # 峹 -- 311,065 +0xC936 0x5D2E # 崮 -- 311,066 +0xC937 0x5D31 # 崱 -- 311,067 +0xC938 0x5D59 # 嵙 -- 311,070 +0xC939 0x5D7E # 嵾 -- 311,071 +0xC93A 0x5D7C # 嵼 -- 311,072 +0xC93B 0x5DB4 # 嶴 -- 311,073 +0xC93C 0x5DA5 # 嶥 -- 311,074 +0xC93D 0x5D9E # 嶞 -- 311,075 +0xC93E 0x5E17 # 帗 -- 311,076 +0xC93F 0x5E23 # 帣 -- 311,077 +0xC940 0x5E4B # 幋 -- 311,100 +0xC941 0x5E48 # 幈 -- 311,101 +0xC942 0x5E69 # 幩 -- 311,102 +0xC943 0x5E6D # 幭 -- 311,103 +0xC944 0x5E66 # 幦 -- 311,104 +0xC945 0x5E68 # 幨 -- 311,105 +0xC946 0x5E6F # 幯 -- 311,106 +0xC947 0x5ED4 # 廔 -- 311,107 +0xC948 0x5ECD # 廍 -- 311,110 +0xC949 0x5F74 # 彴 -- 311,111 +0xC94A 0x5F7D # 彽 -- 311,112 +0xC94B 0x8668 # 虨 -- 311,113 +0xC94C 0x6032 # 怲 -- 311,114 +0xC94D 0x60F7 # 惷 -- 311,115 +0xC94E 0x6103 # 愃 -- 311,116 +0xC94F 0x6112 # 愒 -- 311,117 +0xC950 0x6183 # 憃 -- 311,120 +0xC951 0x6169 # 慩 -- 311,121 +0xC952 0x618F # 憏 -- 311,122 +0xC953 0x615C # 慜 -- 311,123 +0xC954 0x61A6 # 憦 -- 311,124 +0xC955 0x61D3 # 懓 -- 311,125 +0xC956 0x61E0 # 懠 -- 311,126 +0xC957 0x61F0 # 懰 -- 311,127 +0xC958 0x6204 # 戄 -- 311,130 +0xC959 0x622D # 戭 -- 311,131 +0xC95A 0x5F38 # 弸 -- 311,132 +0xC95B 0x6250 # 扐 -- 311,133 +0xC95C 0x6261 # 扡 -- 311,134 +0xC95D 0x6262 # 扢 -- 311,135 +0xC95E 0x6264 # 扤 -- 311,136 +0xC95F 0x62C3 # 拃 -- 311,137 +0xC960 0x6358 # 捘 -- 311,140 +0xC961 0x63A4 # 掤 -- 311,141 +0xC962 0x6397 # 掗 -- 311,142 +0xC963 0x63D7 # 揗 -- 311,143 +0xC964 0x63F5 # 揵 -- 311,144 +0xC965 0x63E5 # 揥 -- 311,145 +0xC966 0x63F0 # 揰 -- 311,146 +0xC967 0x7130 # 焰 -- 311,147 +0xC968 0x6460 # 摠 -- 311,150 +0xC969 0x6477 # 摷 -- 311,151 +0xC96A 0x6472 # 摲 -- 311,152 +0xC96B 0x6466 # 摦 -- 311,153 +0xC96C 0x644F # 摏 -- 311,154 +0xC96D 0x9211 # 鈑 -- 311,155 +0xC96E 0x64B1 # 撱 -- 311,156 +0xC96F 0x64D6 # 擖 -- 311,157 +0xC970 0x655C # 敜 -- 311,160 +0xC971 0x6573 # 敳 -- 311,161 +0xC972 0x6579 # 敹 -- 311,162 +0xC973 0x65A2 # 斢 -- 311,163 +0xC974 0x6604 # 昄 -- 311,164 +0xC975 0x6645 # 晅 -- 311,165 +0xC976 0x668C # 暌 -- 311,166 +0xC977 0x6694 # 暔 -- 311,167 +0xC978 0x66B2 # 暲 -- 311,170 +0xC979 0x66C8 # 曈 -- 311,171 +0xC97A 0x80A6 # 肦 -- 311,172 +0xC97B 0x6710 # 朐 -- 311,173 +0xC97C 0x6723 # 朣 -- 311,174 +0xC97D 0x673E # 朾 -- 311,175 +0xC97E 0x675D # 杝 -- 311,176 +0xC9A1 0x6745 # 杅 -- 311,241 +0xC9A2 0x6776 # 杶 -- 311,242 +0xC9A3 0x6C3D # 氽 -- 311,243 +0xC9A4 0x6793 # 枓 -- 311,244 +0xC9A5 0x6792 # 枒 -- 311,245 +0xC9A6 0x67C2 # 柂 -- 311,246 +0xC9A7 0x67F0 # 柰 -- 311,247 +0xC9A8 0x67F7 # 柷 -- 311,250 +0xC9A9 0x67C5 # 柅 -- 311,251 +0xC9AA 0x67E3 # 柣 -- 311,252 +0xC9AB 0x67F2 # 柲 -- 311,253 +0xC9AC 0x682B # 栫 -- 311,254 +0xC9AD 0x682D # 栭 -- 311,255 +0xC9AE 0x6831 # 栱 -- 311,256 +0xC9AF 0x683B # 栻 -- 311,257 +0xC9B0 0x6898 # 梘 -- 311,260 +0xC9B1 0x686B # 桫 -- 311,261 +0xC9B2 0x689C # 梜 -- 311,262 +0xC9B3 0x6890 # 梐 -- 311,263 +0xC9B4 0x6879 # 桹 -- 311,264 +0xC9B5 0x6877 # 桷 -- 311,265 +0xC9B6 0x686D # 桭 -- 311,266 +0xC9B7 0x68A1 # 梡 -- 311,267 +0xC9B8 0x68B4 # 梴 -- 311,270 +0xC9B9 0x68D3 # 棓 -- 311,271 +0xC9BA 0x6910 # 椐 -- 311,272 +0xC9BB 0x68EA # 棪 -- 311,273 +0xC9BC 0x68F8 # 棸 -- 311,274 +0xC9BD 0x6970 # 楰 -- 311,275 +0xC9BE 0x690C # 椌 -- 311,276 +0xC9BF 0x68DC # 棜 -- 311,277 +0xC9C0 0x6911 # 椑 -- 311,300 +0xC9C1 0x6940 # 楀 -- 311,301 +0xC9C2 0x694E # 楎 -- 311,302 +0xC9C3 0x6957 # 楗 -- 311,303 +0xC9C4 0x6962 # 楢 -- 311,304 +0xC9C5 0x698E # 榎 -- 311,305 +0xC9C6 0x69A5 # 榥 -- 311,306 +0xC9C7 0x6A15 # 樕 -- 311,307 +0xC9C8 0x6A0F # 樏 -- 311,310 +0xC9C9 0x69A4 # 榤 -- 311,311 +0xC9CA 0x6A20 # 樠 -- 311,312 +0xC9CB 0x6A3F # 樿 -- 311,313 +0xC9CC 0x6A33 # 樳 -- 311,314 +0xC9CD 0x6A52 # 橒 -- 311,315 +0xC9CE 0x6A99 # 檙 -- 311,316 +0xC9CF 0x6A91 # 檑 -- 311,317 +0xC9D0 0x6ABF # 檿 -- 311,320 +0xC9D1 0x6ACC # 櫌 -- 311,321 +0xC9D2 0x6B11 # 欑 -- 311,322 +0xC9D3 0x6B03 # 欃 -- 311,323 +0xC9D4 0x6B19 # 欙 -- 311,324 +0xC9D5 0x6B3C # 欼 -- 311,325 +0xC9D6 0x6B5D # 歝 -- 311,326 +0xC9D7 0x6B7E # 歾 -- 311,327 +0xC9D8 0x6B88 # 殈 -- 311,330 +0xC9D9 0x6B95 # 殕 -- 311,331 +0xC9DA 0x6BF8 # 毸 -- 311,332 +0xC9DB 0x6C25 # 氥 -- 311,333 +0xC9DC 0x6C3F # 氿 -- 311,334 +0xC9DD 0x6C4B # 汋 -- 311,335 +0xC9DE 0x7640 # 癀 -- 311,336 +0xC9DF 0x6C97 # 沗 -- 311,337 +0xC9E0 0x6CDC # 泜 -- 311,340 +0xC9E1 0x6CD2 # 泒 -- 311,341 +0xC9E2 0x6CE9 # 泩 -- 311,342 +0xC9E3 0x6D24 # 洤 -- 311,343 +0xC9E4 0x6D60 # 浠 -- 311,344 +0xC9E5 0x6D67 # 浧 -- 311,345 +0xC9E6 0x6D64 # 浤 -- 311,346 +0xC9E7 0x6DD3 # 淓 -- 311,347 +0xC9E8 0x6DE0 # 淠 -- 311,350 +0xC9E9 0x6DE2 # 淢 -- 311,351 +0xC9EA 0x6DE5 # 淥 -- 311,352 +0xC9EB 0x6DF0 # 淰 -- 311,353 +0xC9EC 0x6DDC # 淜 -- 311,354 +0xC9ED 0x6E2E # 渮 -- 311,355 +0xC9EE 0x6E73 # 湳 -- 311,356 +0xC9EF 0x6E4B # 湋 -- 311,357 +0xC9F0 0x6E45 # 湅 -- 311,360 +0xC9F1 0x6E5D # 湝 -- 311,361 +0xC9F2 0x6E22 # 渢 -- 311,362 +0xC9F3 0x6E69 # 湩 -- 311,363 +0xC9F4 0x6ECA # 滊 -- 311,364 +0xC9F5 0x6EA6 # 溦 -- 311,365 +0xC9F6 0x6ED8 # 滘 -- 311,366 +0xC9F7 0x6EEB # 滫 -- 311,367 +0xC9F8 0x6F37 # 漷 -- 311,370 +0xC9F9 0x6EEE # 滮 -- 311,371 +0xC9FA 0x6EFA # 滺 -- 311,372 +0xC9FB 0x6F30 # 漰 -- 311,373 +0xC9FC 0x6F4C # 潌 -- 311,374 +0xC9FD 0x6F0E # 漎 -- 311,375 +0xC9FE 0x6F0A # 漊 -- 311,376 diff --git a/unicode/xerox/unihan/XCCS-312=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-312=UNIHAN.TXT new file mode 100644 index 00000000..d4e397f4 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-312=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "312" UNIHAN + +0xCA21 0x6F4F # 潏 -- 312,041 +0xCA22 0x6F5D # 潝 -- 312,042 +0xCA23 0x6F60 # 潠 -- 312,043 +0xCA24 0x6F48 # 潈 -- 312,044 +0xCA25 0x6F7E # 潾 -- 312,045 +0xCA26 0x6FB0 # 澰 -- 312,046 +0xCA27 0x6FB4 # 澴 -- 312,047 +0xCA28 0x6FC8 # 濈 -- 312,050 +0xCA29 0x6F0B # 漋 -- 312,051 +0xCA2A 0x6FAC # 澬 -- 312,052 +0xCA2B 0x6FDA # 濚 -- 312,053 +0xCA2C 0x6FD9 # 濙 -- 312,054 +0xCA2D 0x700C # 瀌 -- 312,055 +0xCA2E 0x7020 # 瀠 -- 312,056 +0xCA2F 0x701E # 瀞 -- 312,057 +0xCA30 0x7035 # 瀵 -- 312,060 +0xCA31 0x7044 # 灄 -- 312,061 +0xCA32 0x7065 # 灥 -- 312,062 +0xCA33 0x707A # 灺 -- 312,063 +0xCA34 0x70D3 # 烓 -- 312,064 +0xCA35 0x70D5 # 烕 -- 312,065 +0xCA36 0x712B # 焫 -- 312,066 +0xCA37 0x70F3 # 烳 -- 312,067 +0xCA38 0x713B # 焻 -- 312,070 +0xCA39 0x7134 # 焴 -- 312,071 +0xCA3A 0x7143 # 煃 -- 312,072 +0xCA3B 0x715D # 煝 -- 312,073 +0xCA3C 0x7150 # 煐 -- 312,074 +0xCA3D 0x715F # 煟 -- 312,075 +0xCA3E 0x71CF # 燏 -- 312,076 +0xCA3F 0x714F # 煏 -- 312,077 +0xCA40 0x7180 # 熀 -- 312,100 +0xCA41 0x7187 # 熇 -- 312,101 +0xCA42 0x71B2 # 熲 -- 312,102 +0xCA43 0x71B3 # 熳 -- 312,103 +0xCA44 0x71C0 # 燀 -- 312,104 +0xCA45 0x71C2 # 燂 -- 312,105 +0xCA46 0x71CB # 燋 -- 312,106 +0xCA47 0x71E1 # 燡 -- 312,107 +0xCA48 0x71EB # 燫 -- 312,110 +0xCA49 0x722E # 爮 -- 312,111 +0xCA4A 0x7241 # 牁 -- 312,112 +0xCA4B 0x7273 # 牳 -- 312,113 +0xCA4C 0x7276 # 牶 -- 312,114 +0xCA4D 0x7286 # 犆 -- 312,115 +0xCA4E 0x7294 # 犔 -- 312,116 +0xCA4F 0x72B5 # 犵 -- 312,117 +0xCA50 0x72BA # 犺 -- 312,120 +0xCA51 0x72D8 # 狘 -- 312,121 +0xCA52 0x730B # 猋 -- 312,122 +0xCA53 0x7306 # 猆 -- 312,123 +0xCA54 0x7308 # 猈 -- 312,124 +0xCA55 0x7332 # 猲 -- 312,125 +0xCA56 0x7340 # 獀 -- 312,126 +0xCA57 0x735D # 獝 -- 312,127 +0xCA58 0x7373 # 獳 -- 312,130 +0xCA59 0x7380 # 玀 -- 312,131 +0xCA5A 0x7397 # 玗 -- 312,132 +0xCA5B 0x7394 # 玔 -- 312,133 +0xCA5C 0x73A5 # 玥 -- 312,134 +0xCA5D 0x73A4 # 玤 -- 312,135 +0xCA5E 0x73B6 # 玶 -- 312,136 +0xCA5F 0x73C7 # 珇 -- 312,137 +0xCA60 0x73CC # 珌 -- 312,140 +0xCA61 0x73DB # 珛 -- 312,141 +0xCA62 0x73D4 # 珔 -- 312,142 +0xCA63 0x73D6 # 珖 -- 312,143 +0xCA64 0x73E7 # 珧 -- 312,144 +0xCA65 0x73FD # 珽 -- 312,145 +0xCA66 0x73F6 # 珶 -- 312,146 +0xCA67 0x7437 # 琷 -- 312,147 +0xCA68 0x7424 # 琤 -- 312,150 +0xCA69 0x742D # 琭 -- 312,151 +0xCA6A 0x742B # 琫 -- 312,152 +0xCA6B 0x7454 # 瑔 -- 312,153 +0xCA6C 0x7442 # 瑂 -- 312,154 +0xCA6D 0x7415 # 琕 -- 312,155 +0xCA6E 0x746C # 瑬 -- 312,156 +0xCA6F 0x74AD # 璭 -- 312,157 +0xCA70 0x74AF # 璯 -- 312,160 +0xCA71 0x74B2 # 璲 -- 312,161 +0xCA72 0x74A5 # 璥 -- 312,162 +0xCA73 0x74B8 # 璸 -- 312,163 +0xCA74 0x74D6 # 瓖 -- 312,164 +0xCA75 0x7500 # 甀 -- 312,165 +0xCA76 0x7512 # 甒 -- 312,166 +0xCA77 0x753E # 甾 -- 312,167 +0xCA78 0x755F # 畟 -- 312,170 +0xCA79 0x7577 # 畷 -- 312,171 +0xCA7A 0x757D # 畽 -- 312,172 +0xCA7B 0x75B7 # 疷 -- 312,173 +0xCA7C 0x75B6 # 疶 -- 312,174 +0xCA7D 0x75DA # 痚 -- 312,175 +0xCA7E 0x75E4 # 痤 -- 312,176 +0xCAA1 0x7603 # 瘃 -- 312,241 +0xCAA2 0x75F5 # 痵 -- 312,242 +0xCAA3 0x75FB # 痻 -- 312,243 +0xCAA4 0x760C # 瘌 -- 312,244 +0xCAA5 0x7604 # 瘄 -- 312,245 +0xCAA6 0x75EF # 痯 -- 312,246 +0xCAA7 0x75FA # 痺 -- 312,247 +0xCAA8 0x7607 # 瘇 -- 312,250 +0xCAA9 0x7615 # 瘕 -- 312,251 +0xCAAA 0x762D # 瘭 -- 312,252 +0xCAAB 0x7636 # 瘶 -- 312,253 +0xCAAC 0x762C # 瘬 -- 312,254 +0xCAAD 0x763B # 瘻 -- 312,255 +0xCAAE 0x765C # 癜 -- 312,256 +0xCAAF 0x764F # 癏 -- 312,257 +0xCAB0 0x7660 # 癠 -- 312,260 +0xCAB1 0x7673 # 癳 -- 312,261 +0xCAB2 0x767F # 癿 -- 312,262 +0xCAB3 0x76AB # 皫 -- 312,263 +0xCAB4 0x76BD # 皽 -- 312,264 +0xCAB5 0x76DA # 盚 -- 312,265 +0xCAB6 0x76DD # 盝 -- 312,266 +0xCAB7 0x76F9 # 盹 -- 312,267 +0xCAB8 0x7705 # 眅 -- 312,270 +0xCAB9 0x770F # 眏 -- 312,271 +0xCABA 0x7715 # 眕 -- 312,272 +0xCABB 0x7735 # 眵 -- 312,273 +0xCABC 0x772D # 眭 -- 312,274 +0xCABD 0x7759 # 睙 -- 312,275 +0xCABE 0x7746 # 睆 -- 312,276 +0xCABF 0x777B # 睻 -- 312,277 +0xCAC0 0x776F # 睯 -- 312,300 +0xCAC1 0x77AB # 瞫 -- 312,301 +0xCAC2 0x77D3 # 矓 -- 312,302 +0xCAC3 0x77D4 # 矔 -- 312,303 +0xCAC4 0x77DF # 矟 -- 312,304 +0xCAC5 0x77FB # 矻 -- 312,305 +0xCAC6 0x7803 # 砃 -- 312,306 +0xCAC7 0x7805 # 砅 -- 312,307 +0xCAC8 0x65AB # 斫 -- 312,310 +0xCAC9 0x781F # 砟 -- 312,311 +0xCACA 0x781E # 砞 -- 312,312 +0xCACB 0x7835 # 砵 -- 312,313 +0xCACC 0x7823 # 砣 -- 312,314 +0xCACD 0x784D # 硍 -- 312,315 +0xCACE 0x7845 # 硅 -- 312,316 +0xCACF 0x784B # 硋 -- 312,317 +0xCAD0 0x786A # 硪 -- 312,320 +0xCAD1 0x7888 # 碈 -- 312,321 +0xCAD2 0x7896 # 碖 -- 312,322 +0xCAD3 0x78D8 # 磘 -- 312,323 +0xCAD4 0x7886 # 碆 -- 312,324 +0xCAD5 0x787E # 硾 -- 312,325 +0xCAD6 0x78B6 # 碶 -- 312,326 +0xCAD7 0x78B4 # 碴 -- 312,327 +0xCAD8 0x78A1 # 碡 -- 312,330 +0xCAD9 0x78AC # 碬 -- 312,331 +0xCADA 0x78AF # 碯 -- 312,332 +0xCADB 0x78C7 # 磇 -- 312,333 +0xCADC 0x78D3 # 磓 -- 312,334 +0xCADD 0x78C9 # 磉 -- 312,335 +0xCADE 0x78D1 # 磑 -- 312,336 +0xCADF 0x78C8 # 磈 -- 312,337 +0xCAE0 0x78E0 # 磠 -- 312,340 +0xCAE1 0x78DB # 磛 -- 312,341 +0xCAE2 0x78DF # 磟 -- 312,342 +0xCAE3 0x78F9 # 磹 -- 312,343 +0xCAE4 0x791E # 礞 -- 312,344 +0xCAE5 0x7927 # 礧 -- 312,345 +0xCAE6 0x794A # 祊 -- 312,346 +0xCAE7 0x7959 # 祙 -- 312,347 +0xCAE8 0x7986 # 禆 -- 312,350 +0xCAE9 0x79A0 # 禠 -- 312,351 +0xCAEA 0x799A # 禚 -- 312,352 +0xCAEB 0x799C # 禜 -- 312,353 +0xCAEC 0x79A2 # 禢 -- 312,354 +0xCAED 0x79C6 # 秆 -- 312,355 +0xCAEE 0x79E0 # 秠 -- 312,356 +0xCAEF 0x79F4 # 秴 -- 312,357 +0xCAF0 0x79F7 # 秷 -- 312,360 +0xCAF1 0x79F8 # 秸 -- 312,361 +0xCAF2 0x7A1B # 稛 -- 312,362 +0xCAF3 0x7A44 # 穄 -- 312,363 +0xCAF4 0x7A5C # 穜 -- 312,364 +0xCAF5 0x7A6E # 穮 -- 312,365 +0xCAF6 0x7A6D # 穭 -- 312,366 +0xCAF7 0x7A8B # 窋 -- 312,367 +0xCAF8 0x7A8C # 窌 -- 312,370 +0xCAF9 0x7A94 # 窔 -- 312,371 +0xCAFA 0x7AC1 # 竁 -- 312,372 +0xCAFB 0x7AC2 # 竂 -- 312,373 +0xCAFC 0x6181 # 憁 -- 312,374 +0xCAFD 0x7B0E # 笎 -- 312,375 +0xCAFE 0x7B30 # 笰 -- 312,376 diff --git a/unicode/xerox/unihan/XCCS-313=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-313=UNIHAN.TXT new file mode 100644 index 00000000..16b3dcd7 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-313=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "313" UNIHAN + +0xCB21 0x7B32 # 笲 -- 313,041 +0xCB22 0x7B4E # 筎 -- 313,042 +0xCB23 0x7B73 # 筳 -- 313,043 +0xCB24 0x7B64 # 筤 -- 313,044 +0xCB25 0x7B99 # 箙 -- 313,045 +0xCB26 0x7B82 # 箂 -- 313,046 +0xCB27 0x7B8A # 箊 -- 313,047 +0xCB28 0x574C # 坌 -- 313,050 +0xCB29 0x7D9E # 綞 -- 313,051 +0xCB2A 0x7C06 # 簆 -- 313,052 +0xCB2B 0x7BF9 # 篹 -- 313,053 +0xCB2C 0x7BF0 # 篰 -- 313,054 +0xCB2D 0x7C1A # 簚 -- 313,055 +0xCB2E 0x7C1C # 簜 -- 313,056 +0xCB2F 0x7C25 # 簥 -- 313,057 +0xCB30 0x7C28 # 簨 -- 313,060 +0xCB31 0x7C39 # 簹 -- 313,061 +0xCB32 0x7C32 # 簲 -- 313,062 +0xCB33 0x7C35 # 簵 -- 313,063 +0xCB34 0x7C4A # 籊 -- 313,064 +0xCB35 0x7C53 # 籓 -- 313,065 +0xCB36 0x7C5A # 籚 -- 313,066 +0xCB37 0x7C63 # 籣 -- 313,067 +0xCB38 0x7C6D # 籭 -- 313,070 +0xCB39 0x7C6B # 籫 -- 313,071 +0xCB3A 0x7C6F # 籯 -- 313,072 +0xCB3B 0x7CBB # 粻 -- 313,073 +0xCB3C 0x7CD4 # 糔 -- 313,074 +0xCB3D 0x7CE6 # 糦 -- 313,075 +0xCB3E 0x7CF1 # 糱 -- 313,076 +0xCB3F 0x7D11 # 紑 -- 313,077 +0xCB40 0x7D16 # 紖 -- 313,100 +0xCB41 0x7D0F # 紏 -- 313,101 +0xCB42 0x7D1E # 紞 -- 313,102 +0xCB43 0x7D41 # 絁 -- 313,103 +0xCB44 0x7D8E # 綎 -- 313,104 +0xCB45 0x7DAA # 綪 -- 313,105 +0xCB46 0x7DC4 # 緄 -- 313,106 +0xCB47 0x7DCC # 緌 -- 313,107 +0xCB48 0x7DCE # 緎 -- 313,110 +0xCB49 0x7DF1 # 緱 -- 313,111 +0xCB4A 0x7DF0 # 緰 -- 313,112 +0xCB4B 0x7DF6 # 緶 -- 313,113 +0xCB4C 0x7E07 # 縇 -- 313,114 +0xCB4D 0x7DD3 # 緓 -- 313,115 +0xCB4E 0x7DF5 # 緵 -- 313,116 +0xCB4F 0x7E3F # 縿 -- 313,117 +0xCB50 0x7E30 # 縰 -- 313,120 +0xCB51 0x7E58 # 繘 -- 313,121 +0xCB52 0x7E48 # 繈 -- 313,122 +0xCB53 0x7E95 # 纕 -- 313,123 +0xCB54 0x7E99 # 纙 -- 313,124 +0xCB55 0x7E9A # 纚 -- 313,125 +0xCB56 0x7F41 # 罁 -- 313,126 +0xCB57 0x7F5B # 罛 -- 313,127 +0xCB58 0x7F66 # 罦 -- 313,130 +0xCB59 0x7F7B # 罻 -- 313,131 +0xCB5A 0x6438 # 搸 -- 313,132 +0xCB5B 0x7F7F # 罿 -- 313,133 +0xCB5C 0x7F9C # 羜 -- 313,134 +0xCB5D 0x7FAD # 羭 -- 313,135 +0xCB5E 0x7FB1 # 羱 -- 313,136 +0xCB5F 0x7FB5 # 羵 -- 313,137 +0xCB60 0x7FBE # 羾 -- 313,140 +0xCB61 0x7FC0 # 翀 -- 313,141 +0xCB62 0x801E # 耞 -- 313,142 +0xCB63 0x802F # 耯 -- 313,143 +0xCB64 0x805D # 聝 -- 313,144 +0xCB65 0x809C # 肜 -- 313,145 +0xCB66 0x80B5 # 肵 -- 313,146 +0xCB67 0x80CD # 胍 -- 313,147 +0xCB68 0x80DF # 胟 -- 313,150 +0xCB69 0x8104 # 脄 -- 313,151 +0xCB6A 0x8121 # 脡 -- 313,152 +0xCB6B 0x8122 # 脢 -- 313,153 +0xCB6C 0x814D # 腍 -- 313,154 +0xCB6D 0x8152 # 腒 -- 313,155 +0xCB6E 0x8187 # 膇 -- 313,156 +0xCB6F 0x818B # 膋 -- 313,157 +0xCB70 0x819F # 膟 -- 313,160 +0xCB71 0x8195 # 膕 -- 313,161 +0xCB72 0x81B7 # 膷 -- 313,162 +0xCB73 0x81BB # 膻 -- 313,163 +0xCB74 0x81D0 # 臐 -- 313,164 +0xCB75 0x81D1 # 臑 -- 313,165 +0xCB76 0x81DB # 臛 -- 313,166 +0xCB77 0x8221 # 舡 -- 313,167 +0xCB78 0x8251 # 艑 -- 313,170 +0xCB79 0x8256 # 艖 -- 313,171 +0xCB7A 0x8269 # 艩 -- 313,172 +0xCB7B 0x8298 # 芘 -- 313,173 +0xCB7C 0x686C # 桬 -- 313,174 +0xCB7D 0x82A4 # 芤 -- 313,175 +0xCB7E 0x82E0 # 苠 -- 313,176 +0xCBA1 0x82A7 # 芧 -- 313,241 +0xCBA2 0x82D0 # 苐 -- 313,242 +0xCBA3 0x8308 # 茈 -- 313,243 +0xCBA4 0x8341 # 荁 -- 313,244 +0xCBA5 0x8337 # 茷 -- 313,245 +0xCBA6 0x8326 # 茦 -- 313,246 +0xCBA7 0x84D6 # 蓖 -- 313,247 +0xCBA8 0x83FB # 菻 -- 313,250 +0xCBA9 0x8411 # 萑 -- 313,251 +0xCBAA 0x8410 # 萐 -- 313,252 +0xCBAB 0x8439 # 萹 -- 313,253 +0xCBAC 0x8444 # 葄 -- 313,254 +0xCBAD 0x8453 # 葓 -- 313,255 +0xCBAE 0x844D # 葍 -- 313,256 +0xCBAF 0x8458 # 葘 -- 313,257 +0xCBB0 0x84EA # 蓪 -- 313,260 +0xCBB1 0x84A2 # 蒢 -- 313,261 +0xCBB2 0x6A41 # 橁 -- 313,262 +0xCBB3 0x849F # 蒟 -- 313,263 +0xCBB4 0x84DE # 蓞 -- 313,264 +0xCBB5 0x84EB # 蓫 -- 313,265 +0xCBB6 0x84EF # 蓯 -- 313,266 +0xCBB7 0x84F7 # 蓷 -- 313,267 +0xCBB8 0x8506 # 蔆 -- 313,270 +0xCBB9 0x8502 # 蔂 -- 313,271 +0xCBBA 0x8512 # 蔒 -- 313,272 +0xCBBB 0x85A7 # 薧 -- 313,273 +0xCBBC 0x85A2 # 薢 -- 313,274 +0xCBBD 0x85C7 # 藇 -- 313,275 +0xCBBE 0x85B8 # 薸 -- 313,276 +0xCBBF 0x85BE # 薾 -- 313,277 +0xCBC0 0x85BF # 薿 -- 313,300 +0xCBC1 0x7E64 # 繤 -- 313,301 +0xCBC2 0x85D9 # 藙 -- 313,302 +0xCBC3 0x8608 # 蘈 -- 313,303 +0xCBC4 0x85FE # 藾 -- 313,304 +0xCBC5 0x861E # 蘞 -- 313,305 +0xCBC6 0x8622 # 蘢 -- 313,306 +0xCBC7 0x8649 # 虉 -- 313,307 +0xCBC8 0x8666 # 虦 -- 313,310 +0xCBC9 0x868D # 蚍 -- 313,311 +0xCBCA 0x86B3 # 蚳 -- 313,312 +0xCBCB 0x8692 # 蚒 -- 313,313 +0xCBCC 0x86D3 # 蛓 -- 313,314 +0xCBCD 0x86D1 # 蛑 -- 313,315 +0xCBCE 0x86E3 # 蛣 -- 313,316 +0xCBCF 0x5B3F # 嬿 -- 313,317 +0xCBD0 0x876F # 蝯 -- 313,320 +0xCBD1 0x6A96 # 檖 -- 313,321 +0xCBD2 0x8753 # 蝓 -- 313,322 +0xCBD3 0x874F # 蝏 -- 313,323 +0xCBD4 0x8789 # 螉 -- 313,324 +0xCBD5 0x87A5 # 螥 -- 313,325 +0xCBD6 0x87B1 # 螱 -- 313,326 +0xCBD7 0x87ED # 蟭 -- 313,327 +0xCBD8 0x8801 # 蠁 -- 313,330 +0xCBD9 0x87FF # 蟿 -- 313,331 +0xCBDA 0x8819 # 蠙 -- 313,332 +0xCBDB 0x882E # 蠮 -- 313,333 +0xCBDC 0x8887 # 袇 -- 313,334 +0xCBDD 0x889A # 袚 -- 313,335 +0xCBDE 0x88B2 # 袲 -- 313,336 +0xCBDF 0x88BA # 袺 -- 313,337 +0xCBE0 0x88BF # 袿 -- 313,340 +0xCBE1 0x88CB # 裋 -- 313,341 +0xCBE2 0x8915 # 褕 -- 313,342 +0xCBE3 0x8909 # 褉 -- 313,343 +0xCBE4 0x893D # 褽 -- 313,344 +0xCBE5 0x8954 # 襔 -- 313,345 +0xCBE6 0x895A # 襚 -- 313,346 +0xCBE7 0x894F # 襏 -- 313,347 +0xCBE8 0x8961 # 襡 -- 313,350 +0xCBE9 0x895C # 襜 -- 313,351 +0xCBEA 0x894B # 襋 -- 313,352 +0xCBEB 0x89E1 # 觡 -- 313,353 +0xCBEC 0x89F7 # 觷 -- 313,354 +0xCBED 0x8A06 # 訆 -- 313,355 +0xCBEE 0x8A49 # 詉 -- 313,356 +0xCBEF 0x8A3D # 訽 -- 313,357 +0xCBF0 0x8A7E # 詾 -- 313,360 +0xCBF1 0x8A4A # 詊 -- 313,361 +0xCBF2 0x8A82 # 誂 -- 313,362 +0xCBF3 0x8A68 # 詨 -- 313,363 +0xCBF4 0x8A90 # 誐 -- 313,364 +0xCBF5 0x8ADD # 諝 -- 313,365 +0xCBF6 0x8AF5 # 諵 -- 313,366 +0xCBF7 0x8B37 # 謷 -- 313,367 +0xCBF8 0x8B06 # 謆 -- 313,370 +0xCBF9 0x8B48 # 譈 -- 313,371 +0xCBFA 0x8B52 # 譒 -- 313,372 +0xCBFB 0x8B45 # 譅 -- 313,373 +0xCBFC 0x8B91 # 讑 -- 313,374 +0xCBFD 0x8B9B # 讛 -- 313,375 +0xCBFE 0x8C52 # 豒 -- 313,376 diff --git a/unicode/xerox/unihan/XCCS-314=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-314=UNIHAN.TXT new file mode 100644 index 00000000..76753f7c --- /dev/null +++ b/unicode/xerox/unihan/XCCS-314=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "314" UNIHAN + +0xCC21 0x7524 # 甤 -- 314,041 +0xCC22 0x8C77 # 豷 -- 314,042 +0xCC23 0x8C9C # 貜 -- 314,043 +0xCC24 0x8CDF # 賟 -- 314,044 +0xCC25 0x8DA1 # 趡 -- 314,045 +0xCC26 0x8DA6 # 趦 -- 314,046 +0xCC27 0x8DAB # 趫 -- 314,047 +0xCC28 0x8DC1 # 跁 -- 314,050 +0xCC29 0x8DB9 # 趹 -- 314,051 +0xCC2A 0x8DD5 # 跕 -- 314,052 +0xCC2B 0x8DF2 # 跲 -- 314,053 +0xCC2C 0x8DE6 # 跦 -- 314,054 +0xCC2D 0x8DE7 # 跧 -- 314,055 +0xCC2E 0x8DF1 # 跱 -- 314,056 +0xCC2F 0x8E21 # 踡 -- 314,057 +0xCC30 0x8E46 # 蹆 -- 314,060 +0xCC31 0x8E5C # 蹜 -- 314,061 +0xCC32 0x8E5A # 蹚 -- 314,062 +0xCC33 0x8E77 # 蹷 -- 314,063 +0xCC34 0x8E97 # 躗 -- 314,064 +0xCC35 0x8E92 # 躒 -- 314,065 +0xCC36 0x8E98 # 躘 -- 314,066 +0xCC37 0x8EC3 # 軃 -- 314,067 +0xCC38 0x8ED8 # 軘 -- 314,070 +0xCC39 0x8EDC # 軜 -- 314,071 +0xCC3A 0x8EDD # 軝 -- 314,072 +0xCC3B 0x8EE5 # 軥 -- 314,073 +0xCC3C 0x8EE8 # 軨 -- 314,074 +0xCC3D 0x8EF7 # 軷 -- 314,075 +0xCC3E 0x8F25 # 輥 -- 314,076 +0xCC3F 0x8F39 # 輹 -- 314,077 +0xCC40 0x8F34 # 輴 -- 314,100 +0xCC41 0x8F4A # 轊 -- 314,101 +0xCC42 0x8F51 # 轑 -- 314,102 +0xCC43 0x8F58 # 轘 -- 314,103 +0xCC44 0x9034 # 逴 -- 314,104 +0xCC45 0x906B # 遫 -- 314,105 +0xCC46 0x9070 # 遰 -- 314,106 +0xCC47 0x90A7 # 邧 -- 314,107 +0xCC48 0x90BF # 邿 -- 314,110 +0xCC49 0x90C8 # 郈 -- 314,111 +0xCC4A 0x90DA # 郚 -- 314,112 +0xCC4B 0x90D9 # 郙 -- 314,113 +0xCC4C 0x90D4 # 郔 -- 314,114 +0xCC4D 0x9107 # 鄇 -- 314,115 +0xCC4E 0x9108 # 鄈 -- 314,116 +0xCC4F 0x910D # 鄍 -- 314,117 +0xCC50 0x910E # 鄎 -- 314,120 +0xCC51 0x910F # 鄏 -- 314,121 +0xCC52 0x9110 # 鄐 -- 314,122 +0xCC53 0x9111 # 鄑 -- 314,123 +0xCC54 0x9117 # 鄗 -- 314,124 +0xCC55 0x9124 # 鄤 -- 314,125 +0xCC56 0x9129 # 鄩 -- 314,126 +0xCC57 0x912C # 鄬 -- 314,127 +0xCC58 0x911A # 鄚 -- 314,130 +0xCC59 0x913E # 鄾 -- 314,131 +0xCC5A 0x9145 # 酅 -- 314,132 +0xCC5B 0x9147 # 酇 -- 314,133 +0xCC5C 0x914F # 酏 -- 314,134 +0xCC5D 0x91A1 # 醡 -- 314,135 +0xCC5E 0x919D # 醝 -- 314,136 +0xCC5F 0x91B2 # 醲 -- 314,137 +0xCC60 0x91B9 # 醹 -- 314,140 +0xCC61 0x91D9 # 釙 -- 314,141 +0xCC62 0x91EC # 釬 -- 314,142 +0xCC63 0x91ED # 釭 -- 314,143 +0xCC64 0x920A # 鈊 -- 314,144 +0xCC65 0x9203 # 鈃 -- 314,145 +0xCC66 0x9204 # 鈄 -- 314,146 +0xCC67 0x924C # 鉌 -- 314,147 +0xCC68 0x9265 # 鉥 -- 314,150 +0xCC69 0x924E # 鉎 -- 314,151 +0xCC6A 0x9241 # 鉁 -- 314,152 +0xCC6B 0x9288 # 銈 -- 314,153 +0xCC6C 0x9277 # 鉷 -- 314,154 +0xCC6D 0x928E # 銎 -- 314,155 +0xCC6E 0x92C2 # 鋂 -- 314,156 +0xCC6F 0x92D5 # 鋕 -- 314,157 +0xCC70 0x92DD # 鋝 -- 314,160 +0xCC71 0x92B6 # 銶 -- 314,161 +0xCC72 0x92CC # 鋌 -- 314,162 +0xCC73 0x92D8 # 鋘 -- 314,163 +0xCC74 0x92D9 # 鋙 -- 314,164 +0xCC75 0x932A # 錪 -- 314,165 +0xCC76 0x9301 # 錁 -- 314,166 +0xCC77 0x9306 # 錆 -- 314,167 +0xCC78 0x931F # 錟 -- 314,170 +0xCC79 0x9302 # 錂 -- 314,171 +0xCC7A 0x9314 # 錔 -- 314,172 +0xCC7B 0x9316 # 錖 -- 314,173 +0xCC7C 0x930F # 錏 -- 314,174 +0xCC7D 0x9348 # 鍈 -- 314,175 +0xCC7E 0x9379 # 鍹 -- 314,176 +0xCCA1 0x9347 # 鍇 -- 314,241 +0xCCA2 0x93A4 # 鎤 -- 314,242 +0xCCA3 0x93A3 # 鎣 -- 314,243 +0xCCA4 0x938F # 鎏 -- 314,244 +0xCCA5 0x93DA # 鏚 -- 314,245 +0xCCA6 0x93DB # 鏛 -- 314,246 +0xCCA7 0x9404 # 鐄 -- 314,247 +0xCCA8 0x940F # 鐏 -- 314,250 +0xCCA9 0x9409 # 鐉 -- 314,251 +0xCCAA 0x9413 # 鐓 -- 314,252 +0xCCAB 0x93FB # 鏻 -- 314,253 +0xCCAC 0x943B # 鐻 -- 314,254 +0xCCAD 0x944C # 鑌 -- 314,255 +0xCCAE 0x9462 # 鑢 -- 314,256 +0xCCAF 0x946F # 鑯 -- 314,257 +0xCCB0 0x961E # 阞 -- 314,260 +0xCCB1 0x9624 # 阤 -- 314,261 +0xCCB2 0x963D # 阽 -- 314,262 +0xCCB3 0x9651 # 陑 -- 314,263 +0xCCB4 0x96B5 # 隵 -- 314,264 +0xCCB5 0x96C2 # 雂 -- 314,265 +0xCCB6 0x972E # 霮 -- 314,266 +0xCCB7 0x9740 # 靀 -- 314,267 +0xCCB8 0x975D # 靝 -- 314,270 +0xCCB9 0x976E # 靮 -- 314,271 +0xCCBA 0x979B # 鞛 -- 314,272 +0xCCBB 0x979A # 鞚 -- 314,273 +0xCCBC 0x97B1 # 鞱 -- 314,274 +0xCCBD 0x979E # 鞞 -- 314,275 +0xCCBE 0x97D8 # 韘 -- 314,276 +0xCCBF 0x97D2 # 韒 -- 314,277 +0xCCC0 0x97E3 # 韣 -- 314,300 +0xCCC1 0x97FA # 韺 -- 314,301 +0xCCC2 0x9800 # 頀 -- 314,302 +0xCCC3 0x9804 # 頄 -- 314,303 +0xCCC4 0x9833 # 頳 -- 314,304 +0xCCC5 0x9847 # 顇 -- 314,305 +0xCCC6 0x98AE # 颮 -- 314,306 +0xCCC7 0x98BD # 颽 -- 314,307 +0xCCC8 0x98E5 # 飥 -- 314,310 +0xCCC9 0x98E6 # 飦 -- 314,311 +0xCCCA 0x9929 # 餩 -- 314,312 +0xCCCB 0x98F6 # 飶 -- 314,313 +0xCCCC 0x9924 # 餤 -- 314,314 +0xCCCD 0x992B # 餫 -- 314,315 +0xCCCE 0x993A # 餺 -- 314,316 +0xCCCF 0x75F4 # 痴 -- 314,317 +0xCCD0 0x999D # 馝 -- 314,320 +0xCCD1 0x99A3 # 馣 -- 314,321 +0xCCD2 0x99C3 # 駃 -- 314,322 +0xCCD3 0x99D3 # 駓 -- 314,323 +0xCCD4 0x99CB # 駋 -- 314,324 +0xCCD5 0x99DC # 駜 -- 314,325 +0xCCD6 0x99C9 # 駉 -- 314,326 +0xCCD7 0x99D7 # 駗 -- 314,327 +0xCCD8 0x99FD # 駽 -- 314,330 +0xCCD9 0x99FE # 駾 -- 314,331 +0xCCDA 0x99F5 # 駵 -- 314,332 +0xCCDB 0x9A06 # 騆 -- 314,333 +0xCCDC 0x9A20 # 騠 -- 314,334 +0xCCDD 0x9A2F # 騯 -- 314,335 +0xCCDE 0x9A54 # 驔 -- 314,336 +0xCCDF 0x9A59 # 驙 -- 314,337 +0xCCE0 0x9A6B # 驫 -- 314,340 +0xCCE1 0x9AB1 # 骱 -- 314,341 +0xCCE2 0x9AC1 # 髁 -- 314,342 +0xCCE3 0x9AF3 # 髳 -- 314,343 +0xCCE4 0x9B32 # 鬲 -- 314,344 +0xCCE5 0x9B34 # 鬴 -- 314,345 +0xCCE6 0x9B46 # 魆 -- 314,346 +0xCCE7 0x9B4A # 魊 -- 314,347 +0xCCE8 0x9B50 # 魐 -- 314,350 +0xCCE9 0x9B57 # 魗 -- 314,351 +0xCCEA 0x9B68 # 魨 -- 314,352 +0xCCEB 0x9B80 # 鮀 -- 314,353 +0xCCEC 0x9B93 # 鮓 -- 314,354 +0xCCED 0x9B86 # 鮆 -- 314,355 +0xCCEE 0x9B7A # 魺 -- 314,356 +0xCCEF 0x9B9E # 鮞 -- 314,357 +0xCCF0 0x9BE2 # 鯢 -- 314,360 +0xCCF1 0x9BD4 # 鯔 -- 314,361 +0xCCF2 0x9C0B # 鰋 -- 314,362 +0xCCF3 0x9C2E # 鰮 -- 314,363 +0xCCF4 0x9C39 # 鰹 -- 314,364 +0xCCF5 0x9C37 # 鰷 -- 314,365 +0xCCF6 0x98E0 # 飠 -- 314,366 +0xCCF7 0x9CE6 # 鳦 -- 314,367 +0xCCF8 0x9D04 # 鴄 -- 314,370 +0xCCF9 0x9D40 # 鵀 -- 314,371 +0xCCFA 0x9D39 # 鴹 -- 314,372 +0xCCFB 0x9D83 # 鶃 -- 314,373 +0xCCFC 0x9DCA # 鷊 -- 314,374 +0xCCFD 0x9DB1 # 鶱 -- 314,375 +0xCCFE 0x9DD5 # 鷕 -- 314,376 diff --git a/unicode/xerox/unihan/XCCS-315=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-315=UNIHAN.TXT new file mode 100644 index 00000000..38ba247d --- /dev/null +++ b/unicode/xerox/unihan/XCCS-315=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "315" UNIHAN + +0xCD21 0x9E87 # 麇 -- 315,041 +0xCD22 0x9E9B # 麛 -- 315,042 +0xCD23 0x9E9A # 麚 -- 315,043 +0xCD24 0x9EA2 # 麢 -- 315,044 +0xCD25 0x9EB0 # 麰 -- 315,045 +0xCD26 0x9ED0 # 黐 -- 315,046 +0xCD27 0x9EEE # 黮 -- 315,047 +0xCD28 0x9EF0 # 黰 -- 315,050 +0xCD29 0x9F0F # 鼏 -- 315,051 +0xCD2A 0x9F2A # 鼪 -- 315,052 +0xCD2B 0x9F76 # 齶 -- 315,053 +0xCD2C 0x9FA1 # 龡 -- 315,054 +0xCD2D 0x4E99 # 亙 -- 315,055 +0xCD2E 0x4EC9 # 仉 -- 315,056 +0xCD2F 0x50E9 # 僩 -- 315,057 +0xCD30 0x52E6 # 勦 -- 315,060 +0xCD31 0x52FA # 勺 -- 315,061 +0xCD32 0x535E # 卞 -- 315,062 +0xCD33 0x538E # 厎 -- 315,063 +0xCD34 0x8A01 # 訁 -- 315,064 +0xCD35 0x546D # 呭 -- 315,065 +0xCD36 0x5602 # 嘂 -- 315,066 +0xCD37 0x5629 # 嘩 -- 315,067 +0xCD38 0x9D77 # 鵷 -- 315,070 +0xCD39 0x57F6 # 埶 -- 315,071 +0xCD3A 0x5803 # 堃 -- 315,072 +0xCD3B 0x7CBF # 粿 -- 315,073 +0xCD3C 0x58FC # 壼 -- 315,074 +0xCD3D 0x5906 # 夆 -- 315,075 +0xCD3E 0x9BDB # 鯛 -- 315,076 +0xCD3F 0x746D # 瑭 -- 315,077 +0xCD40 0x5940 # 奀 -- 315,100 +0xCD41 0x583D # 堽 -- 315,101 +0xCD42 0x68A5 # 梥 -- 315,102 +0xCD43 0x5BD4 # 寔 -- 315,103 +0xCD44 0x5BCE # 寎 -- 315,104 +0xCD45 0x548F # 咏 -- 315,105 +0xCD46 0x5768 # 坨 -- 315,106 +0xCD47 0x5D17 # 崗 -- 315,107 +0xCD48 0x5CD3 # 峓 -- 315,110 +0xCD49 0x5CE2 # 峢 -- 315,111 +0xCD4A 0x543D # 吽 -- 315,112 +0xCD4B 0x6CF5 # 泵 -- 315,113 +0xCD4C 0x5D6F # 嵯 -- 315,114 +0xCD4D 0x5DD6 # 巖 -- 315,115 +0xCD4E 0x5D97 # 嶗 -- 315,116 +0xCD4F 0x6D3A # 洺 -- 315,117 +0xCD50 0x5E76 # 并 -- 315,120 +0xCD51 0x5EAC # 庬 -- 315,121 +0xCD52 0x5EB4 # 庴 -- 315,122 +0xCD53 0x5F0D # 弍 -- 315,123 +0xCD54 0x5F14 # 弔 -- 315,124 +0xCD55 0x5F23 # 弣 -- 315,125 +0xCD56 0x9398 # 鎘 -- 315,126 +0xCD57 0x5F73 # 彳 -- 315,127 +0xCD58 0x5FFB # 忻 -- 315,130 +0xCD59 0x6008 # 怈 -- 315,131 +0xCD5A 0x91E9 # 釩 -- 315,132 +0xCD5B 0x92F0 # 鋰 -- 315,133 +0xCD5C 0x6144 # 慄 -- 315,134 +0xCD5D 0x6146 # 慆 -- 315,135 +0xCD5E 0x926C # 鉬 -- 315,136 +0xCD5F 0x61FD # 懽 -- 315,137 +0xCD60 0x92C3 # 鋃 -- 315,140 +0xCD61 0x82E2 # 苢 -- 315,141 +0xCD62 0x6394 # 掔 -- 315,142 +0xCD63 0x6474 # 摴 -- 315,143 +0xCD64 0x64ED # 擭 -- 315,144 +0xCD65 0x9237 # 鈷 -- 315,145 +0xCD66 0x65F4 # 旴 -- 315,146 +0xCD67 0x671E # 朞 -- 315,147 +0xCD68 0x6746 # 杆 -- 315,150 +0xCD69 0x6757 # 杗 -- 315,151 +0xCD6A 0x9D7B # 鵻 -- 315,152 +0xCD6B 0x6799 # 枙 -- 315,153 +0xCD6C 0x67DC # 柜 -- 315,154 +0xCD6D 0x67EE # 柮 -- 315,155 +0xCD6E 0x68F9 # 棹 -- 315,156 +0xCD6F 0x69A6 # 榦 -- 315,157 +0xCD70 0x6A11 # 樑 -- 315,160 +0xCD71 0x6A67 # 橧 -- 315,161 +0xCD72 0x6A9F # 檟 -- 315,162 +0xCD73 0x6AF1 # 櫱 -- 315,163 +0xCD74 0x6B39 # 欹 -- 315,164 +0xCD75 0x6BB3 # 殳 -- 315,165 +0xCD76 0x6BE7 # 毧 -- 315,166 +0xCD77 0x6C02 # 氂 -- 315,167 +0xCD78 0x9DEB # 鷫 -- 315,170 +0xCD79 0x4E7E # 乾 -- 315,171 +0xCD7A 0x6CC4 # 泄 -- 315,172 +0xCD7B 0x76CC # 盌 -- 315,173 +0xCD7C 0x6DE9 # 淩 -- 315,174 +0xCD7D 0x6E71 # 湱 -- 315,175 +0xCD7E 0x6E9B # 溛 -- 315,176 +0xCDA1 0x7F40 # 罀 -- 315,241 +0xCDA2 0x6EA4 # 溤 -- 315,242 +0xCDA3 0x6F9D # 澝 -- 315,243 +0xCDA4 0x6F5F # 潟 -- 315,244 +0xCDA5 0x6FC6 # 濆 -- 315,245 +0xCDA6 0x6FC2 # 濂 -- 315,246 +0xCDA7 0x6FD4 # 濔 -- 315,247 +0xCDA8 0x7060 # 灠 -- 315,250 +0xCDA9 0x9927 # 餧 -- 315,251 +0xCDAA 0x7049 # 灉 -- 315,252 +0xCDAB 0x8E2A # 踪 -- 315,253 +0xCDAC 0x6D12 # 洒 -- 315,254 +0xCDAD 0x70AE # 炮 -- 315,255 +0xCDAE 0x70A7 # 炧 -- 315,256 +0xCDAF 0x711E # 焞 -- 315,257 +0xCDB0 0x7145 # 煅 -- 315,260 +0xCDB1 0x7995 # 禕 -- 315,261 +0xCDB2 0x741A # 琚 -- 315,262 +0xCDB3 0x7432 # 琲 -- 315,263 +0xCDB4 0x7440 # 瑀 -- 315,264 +0xCDB5 0x91D2 # 釒 -- 315,265 +0xCDB6 0x74A1 # 璡 -- 315,266 +0xCDB7 0x7507 # 甇 -- 315,267 +0xCDB8 0x7514 # 甔 -- 315,270 +0xCDB9 0x74E9 # 瓩 -- 315,271 +0xCDBA 0x754E # 畎 -- 315,272 +0xCDBB 0x758E # 疎 -- 315,273 +0xCDBC 0x759E # 疞 -- 315,274 +0xCDBD 0x7595 # 疕 -- 315,275 +0xCDBE 0x75A7 # 疧 -- 315,276 +0xCDBF 0x75CC # 痌 -- 315,277 +0xCDC0 0x7610 # 瘐 -- 315,300 +0xCDC1 0x7628 # 瘨 -- 315,301 +0xCDC2 0x7651 # 癑 -- 315,302 +0xCDC3 0x7699 # 皙 -- 315,303 +0xCDC4 0x76AA # 皪 -- 315,304 +0xCDC5 0x76F0 # 盰 -- 315,305 +0xCDC6 0x771B # 眛 -- 315,306 +0xCDC7 0x9F34 # 鼴 -- 315,307 +0xCDC8 0x7739 # 眹 -- 315,310 +0xCDC9 0x77B6 # 瞶 -- 315,311 +0xCDCA 0x77FC # 矼 -- 315,312 +0xCDCB 0x782E # 砮 -- 315,313 +0xCDCC 0x7934 # 礴 -- 315,314 +0xCDCD 0x78B1 # 碱 -- 315,315 +0xCDCE 0x79A1 # 禡 -- 315,316 +0xCDCF 0x799D # 禝 -- 315,317 +0xCDD0 0x79BB # 离 -- 315,320 +0xCDD1 0x79C8 # 秈 -- 315,321 +0xCDD2 0x9B4B # 魋 -- 315,322 +0xCDD3 0x7A8A # 窊 -- 315,323 +0xCDD4 0x7ADD # 竝 -- 315,324 +0xCDD5 0x7B72 # 筲 -- 315,325 +0xCDD6 0x7B9B # 箛 -- 315,326 +0xCDD7 0x7B98 # 箘 -- 315,327 +0xCDD8 0x7BAF # 箯 -- 315,330 +0xCDD9 0x7BE7 # 篧 -- 315,331 +0xCDDA 0x7C54 # 籔 -- 315,332 +0xCDDB 0x7C79 # 籹 -- 315,333 +0xCDDC 0x7CA7 # 粧 -- 315,334 +0xCDDD 0x7CF3 # 糳 -- 315,335 +0xCDDE 0x7CF5 # 糵 -- 315,336 +0xCDDF 0x795B # 祛 -- 315,337 +0xCDE0 0x7DDA # 線 -- 315,340 +0xCDE1 0x7FEF # 翯 -- 315,341 +0xCDE2 0x7D5D # 絝 -- 315,342 +0xCDE3 0x7D91 # 綑 -- 315,343 +0xCDE4 0x7DAB # 綫 -- 315,344 +0xCDE5 0x7DC5 # 緅 -- 315,345 +0xCDE6 0x7E0F # 縏 -- 315,346 +0xCDE7 0x7E33 # 縳 -- 315,347 +0xCDE8 0x7E86 # 纆 -- 315,350 +0xCDE9 0x5EE9 # 廩 -- 315,351 +0xCDEA 0x7FCA # 翊 -- 315,352 +0xCDEB 0x803D # 耽 -- 315,353 +0xCDEC 0x9D21 # 鴡 -- 315,354 +0xCDED 0x9AFD # 髽 -- 315,355 +0xCDEE 0x814A # 腊 -- 315,356 +0xCDEF 0x9D25 # 鴥 -- 315,357 +0xCDF0 0x81F6 # 臶 -- 315,360 +0xCDF1 0x81FA # 臺 -- 315,361 +0xCDF2 0x8218 # 舘 -- 315,362 +0xCDF3 0x821B # 舛 -- 315,363 +0xCDF4 0x84E2 # 蓢 -- 315,364 +0xCDF5 0x8278 # 艸 -- 315,365 +0xCDF6 0x9BD5 # 鯕 -- 315,366 +0xCDF7 0x7BFA # 篺 -- 315,367 +0xCDF8 0x9A66 # 驦 -- 315,370 +0xCDF9 0x8350 # 荐 -- 315,371 +0xCDFA 0x83C9 # 菉 -- 315,372 +0xCDFB 0x83D3 # 菓 -- 315,373 +0xCDFC 0x5807 # 堇 -- 315,374 +0xCDFD 0x84A8 # 蒨 -- 315,375 +0xCDFE 0x84AD # 蒭 -- 315,376 diff --git a/unicode/xerox/unihan/XCCS-316=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-316=UNIHAN.TXT new file mode 100644 index 00000000..71b4f590 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-316=UNIHAN.TXT @@ -0,0 +1,190 @@ + +# "316" UNIHAN + +0xCE21 0x84CC # 蓌 -- 316,041 +0xCE22 0x84CF # 蓏 -- 316,042 +0xCE23 0x851F # 蔟 -- 316,043 +0xCE24 0x8581 # 薁 -- 316,044 +0xCE25 0x8578 # 蕸 -- 316,045 +0xCE26 0x85BD # 薽 -- 316,046 +0xCE27 0x85C4 # 藄 -- 316,047 +0xCE28 0x853F # 蔿 -- 316,050 +0xCE29 0x8628 # 蘨 -- 316,051 +0xCE2A 0x86A7 # 蚧 -- 316,052 +0xCE2B 0x875D # 蝝 -- 316,053 +0xCE2C 0x8803 # 蠃 -- 316,054 +0xCE2D 0x890E # 褎 -- 316,055 +0xCE2E 0x894C # 襌 -- 316,056 +0xCE2F 0x896B # 襫 -- 316,057 +0xCE30 0x8AAF # 誯 -- 316,060 +0xCE31 0x8C3F # 谿 -- 316,061 +0xCE32 0x8CDD # 賝 -- 316,062 +0xCE33 0x8C8D # 貍 -- 316,063 +0xCE34 0x8CF5 # 賵 -- 316,064 +0xCE35 0x8CF8 # 賸 -- 316,065 +0xCE36 0x8D11 # 贑 -- 316,066 +0xCE37 0x8E5F # 蹟 -- 316,067 +0xCE38 0x8E5D # 蹝 -- 316,070 +0xCE39 0x9C6E # 鱮 -- 316,071 +0xCE3A 0x9A22 # 騢 -- 316,072 +0xCE3B 0x9BBF # 鮿 -- 316,073 +0xCE3C 0x9BC8 # 鯈 -- 316,074 +0xCE3D 0x8F4F # 轏 -- 316,075 +0xCE3E 0x8F52 # 轒 -- 316,076 +0xCE3F 0x8F5E # 轞 -- 316,077 +0xCE40 0x8FF8 # 迸 -- 316,100 +0xCE41 0x8FF9 # 迹 -- 316,101 +0xCE42 0x8FFA # 迺 -- 316,102 +0xCE43 0x9083 # 邃 -- 316,103 +0xCE44 0x9CF7 # 鳷 -- 316,104 +0xCE45 0x8677 # 虷 -- 316,105 +0xCE46 0x90E4 # 郤 -- 316,106 +0xCE47 0x913F # 鄿 -- 316,107 +0xCE48 0x91A9 # 醩 -- 316,110 +0xCE49 0x91BD # 醽 -- 316,111 +0xCE4A 0x92EA # 鋪 -- 316,112 +0xCE4B 0x9319 # 錙 -- 316,113 +0xCE4C 0x5571 # 啱 -- 316,114 +0xCE4D 0x939E # 鎞 -- 316,115 +0xCE4E 0x93E6 # 鏦 -- 316,116 +0xCE4F 0x93F5 # 鏵 -- 316,117 +0xCE50 0x72E8 # 狨 -- 316,120 +0xCE51 0x9429 # 鐩 -- 316,121 +0xCE52 0x86B5 # 蚵 -- 316,122 +0xCE53 0x9C67 # 鱧 -- 316,123 +0xCE54 0x95D4 # 闔 -- 316,124 +0xCE55 0x74C0 # 瓀 -- 316,125 +0xCE56 0x967C # 陼 -- 316,126 +0xCE57 0x5481 # 咁 -- 316,127 +0xCE58 0x96B9 # 隹 -- 316,130 +0xCE59 0x9722 # 霢 -- 316,131 +0xCE5A 0x9731 # 霱 -- 316,132 +0xCE5B 0x9780 # 鞀 -- 316,133 +0xCE5C 0x9797 # 鞗 -- 316,134 +0xCE5D 0x9799 # 鞙 -- 316,135 +0xCE5E 0x97ED # 韭 -- 316,136 +0xCE5F 0x97F1 # 韱 -- 316,137 +0xCE60 0x9C10 # 鰐 -- 316,140 +0xCE61 0x985C # 顜 -- 316,141 +0xCE62 0x9C09 # 鰉 -- 316,142 +0xCE63 0x98C6 # 飆 -- 316,143 +0xCE64 0x990B # 餋 -- 316,144 +0xCE65 0x9C50 # 鱐 -- 316,145 +0xCE66 0x9A48 # 驈 -- 316,146 +0xCE67 0x9A4C # 驌 -- 316,147 +0xCE68 0x9A52 # 驒 -- 316,150 +0xCE69 0x9AC6 # 髆 -- 316,151 +0xCE6A 0x9AE3 # 髣 -- 316,152 +0xCE6B 0x9AE7 # 髧 -- 316,153 +0xCE6C 0x9AF4 # 髴 -- 316,154 +0xCE6D 0x9B05 # 鬅 -- 316,155 +0xCE6E 0x9B10 # 鬐 -- 316,156 +0xCE6F 0x9B14 # 鬔 -- 316,157 +0xCE70 0x55EE # 嗮 -- 316,160 +0xCE71 0x7021 # 瀡 -- 316,161 +0xCE72 0x9B35 # 鬵 -- 316,162 +0xCE73 0x9B74 # 魴 -- 316,163 +0xCE74 0x9C0C # 鰌 -- 316,164 +0xCE75 0x9C1C # 鰜 -- 316,165 +0xCE76 0x9B19 # 鬙 -- 316,166 +0xCE77 0x9C32 # 鰲 -- 316,167 +0xCE78 0x9C56 # 鱖 -- 316,170 +0xCE79 0x9D07 # 鴇 -- 316,171 +0xCE7A 0x9CF8 # 鳸 -- 316,172 +0xCE7B 0x9D1D # 鴝 -- 316,173 +0xCE7C 0x9DE9 # 鷩 -- 316,174 +0xCE7D 0x9DF3 # 鷳 -- 316,175 +0xCE7E 0x9C12 # 鰒 -- 316,176 +0xCEA1 0x4F84 # 侄 -- 316,241 +0xCEA2 0x9E95 # 麕 -- 316,242 +0xCEA3 0x9EA4 # 麤 -- 316,243 +0xCEA4 0x9EAF # 麯 -- 316,244 +0xCEA5 0x9EC1 # 黁 -- 316,245 +0xCEA6 0x9ECF # 黏 -- 316,246 +0xCEA7 0x9F22 # 鼢 -- 316,247 +0xCEA8 0x9F6C # 齬 -- 316,250 +0xCEA9 0x9F6E # 齮 -- 316,251 +0xCEAA 0x4E0C # 丌 -- 316,252 +0xCEAB 0x6C30 # 氰 -- 316,253 +0xCEAC 0x4E8D # 亍 -- 316,254 +0xCEAD 0x4E93 # 亓 -- 316,255 +0xCEAE 0x9B77 # 魷 -- 316,256 +0xCEAF 0x506C # 偬 -- 316,257 +0xCEB0 0x5126 # 儦 -- 316,260 +0xCEB1 0x4FE5 # 俥 -- 316,261 +0xCEB2 0x924D # 鉍 -- 316,262 +0xCEB3 0x52D4 # 勔 -- 316,263 +0xCEB4 0x5C58 # 屘 -- 316,264 +0xCEB5 0x56DD # 囝 -- 316,265 +0xCEB6 0x580D # 堍 -- 316,266 +0xCEB7 0x57D5 # 埕 -- 316,267 +0xCEB8 0x572E # 圮 -- 316,270 +0xCEB9 0x57CC # 埌 -- 316,271 +0xCEBA 0x58D2 # 壒 -- 316,272 +0xCEBB 0x57E7 # 埧 -- 316,273 +0xCEBC 0x59FD # 姽 -- 316,274 +0xCEBD 0x5A38 # 娸 -- 316,275 +0xCEBE 0x5B21 # 嬡 -- 316,276 +0xCEBF 0x59D8 # 姘 -- 316,277 +0xCEC0 0x5B43 # 孃 -- 316,300 +0xCEC1 0x5C6B # 屫 -- 316,301 +0xCEC2 0x5CF1 # 峱 -- 316,302 +0xCEC3 0x9DA1 # 鶡 -- 316,303 +0xCEC4 0x5E88 # 庈 -- 316,304 +0xCEC5 0x7CF9 # 糹 -- 316,305 +0xCEC6 0x5EE7 # 廧 -- 316,306 +0xCEC7 0x5F02 # 异 -- 316,307 +0xCEC8 0x5F0E # 弎 -- 316,310 +0xCEC9 0x60FD # 惽 -- 316,311 +0xCECA 0x6113 # 愓 -- 316,312 +0xCECB 0x61EE # 懮 -- 316,313 +0xCECC 0x6199 # 憙 -- 316,314 +0xCECD 0x6337 # 挷 -- 316,315 +0xCECE 0x6310 # 挐 -- 316,316 +0xCECF 0x9C6D # 鱭 -- 316,317 +0xCED0 0x648A # 撊 -- 316,320 +0xCED1 0x648F # 撏 -- 316,321 +0xCED2 0x9C7B # 鱻 -- 316,322 +0xCED3 0x65FC # 旼 -- 316,323 +0xCED4 0x6662 # 晢 -- 316,324 +0xCED5 0x677B # 杻 -- 316,325 +0xCED6 0x67E4 # 柤 -- 316,326 +0xCED7 0x710A # 焊 -- 316,327 +0xCED8 0x91F7 # 釷 -- 316,330 +0xCED9 0x9226 # 鈦 -- 316,331 +0xCEDA 0x6A63 # 橣 -- 316,332 +0xCEDB 0x71CA # 燊 -- 316,333 +0xCEDC 0x67F8 # 柸 -- 316,334 +0xCEDD 0x681F # 栟 -- 316,335 +0xCEDE 0x7833 # 砳 -- 316,336 +0xCEDF 0x9C6F # 鱯 -- 316,337 +0xCEE0 0x7837 # 砷 -- 316,340 +0xCEE1 0x6D81 # 涁 -- 316,341 +0xCEE2 0x92C7 # 鋇 -- 316,342 +0xCEE3 0x6EC9 # 滉 -- 316,343 +0xCEE4 0x7033 # 瀳 -- 316,344 +0xCEE5 0x71A4 # 熤 -- 316,345 +0xCEE6 0x72C5 # 狅 -- 316,346 +0xCEE7 0x7444 # 瑄 -- 316,347 +0xCEE8 0x6C1F # 氟 -- 316,350 +0xCEE9 0x7430 # 琰 -- 316,351 +0xCEEA 0x9E18 # 鸘 -- 316,352 +0xCEEB 0x76F5 # 盵 -- 316,353 +0xCEEC 0x778F # 瞏 -- 316,354 +0xCEED 0x789A # 碚 -- 316,355 +0xCEEE 0x7850 # 硐 -- 316,356 +0xCEEF 0x54D6 # 哖 -- 316,357 +0xCEF0 0x7BDC # 篜 -- 316,360 +0xCEF1 0x7BE2 # 篢 -- 316,361 +0xCEF2 0x5E60 # 幠 -- 316,362 +0xCEF3 0x7DDC # 緜 -- 316,363 +0xCEF4 0x7E60 # 繠 -- 316,364 +0xCEF5 0x7F8B # 羋 -- 316,365 +0xCEF6 0x7FEA # 翪 -- 316,366 +0xCEF8 0x80FA # 胺 -- 316,370 +0xCEF9 0x9098 # 邘 -- 316,371 +0xCEFA 0x823A # 舺 -- 316,372 +0xCEFB 0x824C # 艌 -- 316,373 +0xCEFC 0x8265 # 艥 -- 316,374 +0xCEFD 0x825A # 艚 -- 316,375 +0xCEFE 0x8345 # 荅 -- 316,376 diff --git a/unicode/xerox/unihan/XCCS-317=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-317=UNIHAN.TXT new file mode 100644 index 00000000..7111095b --- /dev/null +++ b/unicode/xerox/unihan/XCCS-317=UNIHAN.TXT @@ -0,0 +1,191 @@ + +# "317" UNIHAN + +0xCF21 0x8434 # 萴 -- 317,041 +0xCF22 0x8509 # 蔉 -- 317,042 +0xCF23 0x85D8 # 藘 -- 317,043 +0xCF24 0x863A # 蘺 -- 317,044 +0xCF25 0x8652 # 虒 -- 317,045 +0xCF26 0x86A0 # 蚠 -- 317,046 +0xCF27 0x8711 # 蜑 -- 317,047 +0xCF28 0x89DC # 觜 -- 317,050 +0xCF29 0x8A83 # 誃 -- 317,051 +0xCF2A 0x8518 # 蔘 -- 317,052 +0xCF2B 0x8C40 # 豀 -- 317,053 +0xCF2C 0x8CE9 # 賩 -- 317,054 +0xCF2D 0x8DB2 # 趲 -- 317,055 +0xCF2E 0x83BF # 莿 -- 317,056 +0xCF2F 0x8F57 # 轗 -- 317,057 +0xCF30 0x83CE # 菎 -- 317,060 +0xCF31 0x9004 # 逄 -- 317,061 +0xCF32 0x9E02 # 鸂 -- 317,062 +0xCF33 0x7551 # 畑 -- 317,063 +0xCF34 0x90E0 # 郠 -- 317,064 +0xCF35 0x9113 # 鄓 -- 317,065 +0xCF36 0x9123 # 鄣 -- 317,066 +0xCF37 0x913B # 鄻 -- 317,067 +0xCF38 0x918E # 醎 -- 317,070 +0xCF39 0x9191 # 醑 -- 317,071 +0xCF3A 0x91C3 # 釃 -- 317,072 +0xCF3B 0x9239 # 鈹 -- 317,073 +0xCF3C 0x927C # 鉼 -- 317,074 +0xCF3D 0x9329 # 錩 -- 317,075 +0xCF3E 0x93A9 # 鎩 -- 317,076 +0xCF3F 0x93C7 # 鏇 -- 317,077 +0xCF40 0x9414 # 鐔 -- 317,100 +0xCF41 0x92C6 # 鋆 -- 317,101 +0xCF42 0x9201 # 鈁 -- 317,102 +0xCF43 0x95BF # 閿 -- 317,103 +0xCF44 0x967E # 陾 -- 317,104 +0xCF45 0x96C3 # 雃 -- 317,105 +0xCF46 0x9719 # 霙 -- 317,106 +0xCF47 0x93CA # 鏊 -- 317,107 +0xCF48 0x9723 # 霣 -- 317,110 +0xCF49 0x9702 # 霂 -- 317,111 +0xCF4A 0x9783 # 鞃 -- 317,112 +0xCF4B 0x97A8 # 鞨 -- 317,113 +0xCF4C 0x97C5 # 韅 -- 317,114 +0xCF4D 0x97E1 # 韡 -- 317,115 +0xCF4E 0x981C # 頜 -- 317,116 +0xCF4F 0x9820 # 頠 -- 317,117 +0xCF50 0x982F # 頯 -- 317,120 +0xCF51 0x9857 # 顗 -- 317,121 +0xCF52 0x9852 # 顒 -- 317,122 +0xCF53 0x992A # 餪 -- 317,123 +0xCF54 0x9958 # 饘 -- 317,124 +0xCF55 0x99B5 # 馵 -- 317,125 +0xCF56 0x99D4 # 駔 -- 317,126 +0xCF57 0x99F4 # 駴 -- 317,127 +0xCF58 0x9A09 # 騉 -- 317,130 +0xCF59 0x5773 # 坳 -- 317,131 +0xCF5A 0x7942 # 祂 -- 317,132 +0xCF5B 0x6086 # 悆 -- 317,133 +0xCF5C 0x6733 # 朳 -- 317,134 +0xCF5D 0x692A # 椪 -- 317,135 +0xCF5E 0x6AA8 # 檨 -- 317,136 +0xCF5F 0x6B09 # 欉 -- 317,137 +0xCF60 0x5187 # 冇 -- 317,140 +0xCF61 0x5B6C # 孬 -- 317,141 +0xCF62 0x54CB # 哋 -- 317,142 +0xCF63 0x4E47 # 乇 -- 317,143 +0xCF64 0x56DF # 囟 -- 317,144 +0xCF65 0x777E # 睾 -- 317,145 +0xCF66 0x4EEB # 仫 -- 317,146 +0xCF67 0x4F22 # 伢 -- 317,147 +0xCF68 0x4F62 # 佢 -- 317,150 +0xCF69 0x4F64 # 佤 -- 317,151 +0xCF6A 0x4F67 # 佧 -- 317,152 +0xCF6B 0x4F5D # 佝 -- 317,153 +0xCF6C 0x4F32 # 伲 -- 317,154 +0xCF6D 0x565D # 噝 -- 317,155 +0xCF6E 0x50A3 # 傣 -- 317,156 +0xCF6F 0x5088 # 傈 -- 317,157 +0xCF70 0x50F3 # 僳 -- 317,160 +0xCF71 0x50EF # 僯 -- 317,161 +0xCF72 0x7572 # 畲 -- 317,162 +0xCF73 0x4F61 # 佡 -- 317,163 +0xCF74 0x4E0F # 丏 -- 317,164 +0xCF75 0x52D0 # 勐 -- 317,165 +0xCF76 0x51AE # 冮 -- 317,166 +0xCF77 0x53B4 # 厴 -- 317,167 +0xCF78 0x535F # 卟 -- 317,170 +0xCF79 0x53FC # 叼 -- 317,171 +0xCF7A 0x5416 # 吖 -- 317,172 +0xCF7B 0x5454 # 呔 -- 317,173 +0xCF7C 0x5423 # 吣 -- 317,174 +0xCF7D 0x5432 # 吲 -- 317,175 +0xCF7E 0x5487 # 咇 -- 317,176 +0xCFA1 0x5494 # 咔 -- 317,241 +0xCFA2 0x5421 # 吡 -- 317,242 +0xCFA3 0x5464 # 呤 -- 317,243 +0xCFA4 0x7076 # 灶 -- 317,244 +0xCFA5 0x54D0 # 哐 -- 317,245 +0xCFA6 0x54B4 # 咴 -- 317,246 +0xCFA7 0x54A3 # 咣 -- 317,247 +0xCFA8 0x54CC # 哌 -- 317,250 +0xCFA9 0x54DA # 哚 -- 317,251 +0xCFAA 0x54DE # 哞 -- 317,252 +0xCFAB 0x54E7 # 哧 -- 317,253 +0xCFAC 0x54F3 # 哳 -- 317,254 +0xCFAD 0x5523 # 唣 -- 317,255 +0xCFAE 0x5511 # 唑 -- 317,256 +0xCFAF 0x55BA # 喺 -- 317,257 +0xCFB0 0x5572 # 啲 -- 317,260 +0xCFB1 0x5549 # 啉 -- 317,261 +0xCFB2 0x554C # 啌 -- 317,262 +0xCFB3 0x5540 # 啀 -- 317,263 +0xCFB4 0x553F # 唿 -- 317,264 +0xCFB5 0x5575 # 啵 -- 317,265 +0xCFB6 0x5576 # 啶 -- 317,266 +0xCFB7 0x5577 # 啷 -- 317,267 +0xCFB8 0x5530 # 唰 -- 317,270 +0xCFB9 0x55B1 # 喱 -- 317,271 +0xCFBA 0x55B9 # 喹 -- 317,272 +0xCFBB 0x55D6 # 嗖 -- 317,273 +0xCFBC 0x55E9 # 嗩 -- 317,274 +0xCFBD 0x55EA # 嗪 -- 317,275 +0xCFBE 0x55F2 # 嗲 -- 317,276 +0xCFBF 0x55CC # 嗌 -- 317,277 +0xCFC0 0x55CD # 嗍 -- 317,300 +0xCFC1 0x55EC # 嗬 -- 317,301 +0xCFC2 0x55F5 # 嗵 -- 317,302 +0xCFC3 0x561E # 嘞 -- 317,303 +0xCFC4 0x5601 # 嘁 -- 317,304 +0xCFC5 0x5623 # 嘣 -- 317,305 +0xCFC6 0x5627 # 嘧 -- 317,306 +0xCFC7 0x5600 # 嘀 -- 317,307 +0xCFC8 0x5657 # 噗 -- 317,310 +0xCFC9 0x562D # 嘭 -- 317,311 +0xCFCA 0x5654 # 噔 -- 317,312 +0xCFCB 0x567B # 噻 -- 317,313 +0xCFCC 0x5693 # 嚓 -- 317,314 +0xCFCD 0x5641 # 噁 -- 317,315 +0xCFCE 0x56AF # 嚯 -- 317,316 +0xCFCF 0x56D4 # 囔 -- 317,317 +0xCFD0 0x572A # 圪 -- 317,320 +0xCFD1 0x5776 # 坶 -- 317,321 +0xCFD2 0x57A1 # 垡 -- 317,322 +0xCFD3 0x57A7 # 垧 -- 317,323 +0xCFD4 0x57EF # 埯 -- 317,324 +0xCFD5 0x5816 # 堖 -- 317,325 +0xCFD6 0x5844 # 塄 -- 317,326 +0xCFD7 0x57E1 # 埡 -- 317,327 +0xCFD8 0x583A # 堺 -- 317,330 +0xCFD9 0x5859 # 塙 -- 317,331 +0xCFDA 0x586C # 塬 -- 317,332 +0xCFDB 0x5892 # 墒 -- 317,333 +0xCFDC 0x589A # 墚 -- 317,334 +0xCFDD 0x58BC # 墼 -- 317,335 +0xCFDE 0x58E0 # 壠 -- 317,336 +0xCFDF 0x8037 # 耷 -- 317,337 +0xCFE0 0x5A67 # 婧 -- 317,340 +0xCFE1 0x80EC # 胬 -- 317,341 +0xCFE2 0x5B62 # 孢 -- 317,342 +0xCFE3 0x5C1C # 尜 -- 317,343 +0xCFE4 0x5C25 # 尥 -- 317,344 +0xCFE5 0x5C59 # 屙 -- 317,345 +0xCFE6 0x5C88 # 岈 -- 317,346 +0xCFE7 0x5CC1 # 峁 -- 317,347 +0xCFE8 0x5D2C # 崬 -- 317,350 +0xCFE9 0x5D27 # 崧 -- 317,351 +0xCFEA 0x5D3E # 崾 -- 317,352 +0xCFEB 0x5D5B # 嵛 -- 317,353 +0xCFEC 0x5D74 # 嵴 -- 317,354 +0xCFED 0x5DF0 # 巰 -- 317,355 +0xCFEE 0x5EB9 # 庹 -- 317,356 +0xCFEF 0x7519 # 甙 -- 317,357 +0xCFF0 0x5CFF # 峿 -- 317,360 +0xCFF1 0x5F33 # 弳 -- 317,361 +0xCFF2 0x9208 # 鈈 -- 317,362 +0xCFF3 0x91E4 # 釤 -- 317,363 +0xCFF4 0x600A # 怊 -- 317,364 +0xCFF5 0x605F # 恟 -- 317,365 +0xCFF6 0x6171 # 慱 -- 317,366 +0xCFF7 0x61B7 # 憷 -- 317,367 +0xCFF8 0x61E8 # 懨 -- 317,370 +0xCFF9 0x6227 # 戧 -- 317,371 +0xCFFA 0x63B0 # 掰 -- 317,372 +0xCFFB 0x6266 # 扦 -- 317,373 +0xCFFC 0x62CE # 拎 -- 317,374 +0xCFFD 0x62BB # 抻 -- 317,375 +0xCFFE 0x630E # 挎 -- 317,376 diff --git a/unicode/xerox/unihan/XCCS-320=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-320=UNIHAN.TXT new file mode 100644 index 00000000..cd960395 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-320=UNIHAN.TXT @@ -0,0 +1,190 @@ + +# "320" UNIHAN + +0xD021 0x630C # 挌 -- 320,041 +0xD022 0x6342 # 捂 -- 320,042 +0xD023 0x6345 # 捅 -- 320,043 +0xD024 0x63C3 # 揃 -- 320,044 +0xD025 0x63DE # 揞 -- 320,045 +0xD026 0x889C # 袜 -- 320,046 +0xD027 0x640B # 搋 -- 320,047 +0xD028 0x641B # 搛 -- 320,050 +0xD029 0x6482 # 撂 -- 320,051 +0xD02A 0x645E # 摞 -- 320,052 +0xD02B 0x649F # 撟 -- 320,053 +0xD02C 0x64B3 # 撳 -- 320,054 +0xD02D 0x6496 # 撖 -- 320,055 +0xD02E 0x64C0 # 擀 -- 320,056 +0xD02F 0x64E4 # 擤 -- 320,057 +0xD030 0x64FC # 擼 -- 320,060 +0xD031 0x6509 # 攉 -- 320,061 +0xD032 0x652E # 攮 -- 320,062 +0xD033 0x5507 # 唇 -- 320,063 +0xD034 0x6657 # 晗 -- 320,064 +0xD035 0x809F # 肟 -- 320,065 +0xD036 0x80BC # 肼 -- 320,066 +0xD037 0x670A # 朊 -- 320,067 +0xD038 0x80B7 # 肷 -- 320,070 +0xD039 0x80E9 # 胩 -- 320,071 +0xD03A 0x80C2 # 胂 -- 320,072 +0xD03B 0x810E # 脎 -- 320,073 +0xD03C 0x80F2 # 胲 -- 320,074 +0xD03D 0x8132 # 脲 -- 320,075 +0xD03E 0x8156 # 腖 -- 320,076 +0xD03F 0x8148 # 腈 -- 320,077 +0xD040 0x8159 # 腙 -- 320,100 +0xD041 0x815A # 腚 -- 320,101 +0xD042 0x8161 # 腡 -- 320,102 +0xD043 0x8169 # 腩 -- 320,103 +0xD044 0x817C # 腼 -- 320,104 +0xD045 0x8167 # 腧 -- 320,105 +0xD046 0x8183 # 膃 -- 320,106 +0xD047 0x81A3 # 膣 -- 320,107 +0xD048 0x81AA # 膪 -- 320,110 +0xD049 0x81C1 # 臁 -- 320,111 +0xD04A 0x81A6 # 膦 -- 320,112 +0xD04B 0x67C3 # 柃 -- 320,113 +0xD04C 0x6855 # 桕 -- 320,114 +0xD04D 0x684A # 桊 -- 320,115 +0xD04E 0x6802 # 栂 -- 320,116 +0xD04F 0x6849 # 桉 -- 320,117 +0xD050 0x690B # 椋 -- 320,120 +0xD051 0x6908 # 椈 -- 320,121 +0xD052 0x68EF # 棯 -- 320,122 +0xD053 0x696A # 楪 -- 320,123 +0xD054 0x6971 # 楱 -- 320,124 +0xD055 0x6980 # 榀 -- 320,125 +0xD056 0x6934 # 椴 -- 320,126 +0xD057 0x69BF # 榿 -- 320,127 +0xD058 0x698D # 榍 -- 320,130 +0xD059 0x69AA # 榪 -- 320,131 +0xD05A 0x69ED # 槭 -- 320,132 +0xD05B 0x6A18 # 樘 -- 320,133 +0xD05C 0x69F2 # 槲 -- 320,134 +0xD05D 0x5622 # 嘢 -- 320,135 +0xD05E 0x6AAB # 檫 -- 320,136 +0xD05F 0x6AE8 # 櫨 -- 320,137 +0xD060 0x6AE7 # 櫧 -- 320,140 +0xD061 0x6AEB # 櫫 -- 320,141 +0xD062 0x6B0F # 欏 -- 320,142 +0xD063 0x544B # 呋 -- 320,143 +0xD064 0x6BEA # 毪 -- 320,144 +0xD065 0x6C06 # 氆 -- 320,145 +0xD066 0x6C0C # 氌 -- 320,146 +0xD067 0x6C15 # 氕 -- 320,147 +0xD068 0x6C18 # 氘 -- 320,150 +0xD069 0x6C19 # 氙 -- 320,151 +0xD06A 0x6C1A # 氚 -- 320,152 +0xD06B 0x6C21 # 氡 -- 320,153 +0xD06C 0x6C2A # 氪 -- 320,154 +0xD06D 0x6CB2 # 沲 -- 320,155 +0xD06E 0x6CBA # 沺 -- 320,156 +0xD06F 0x6D6F # 浯 -- 320,157 +0xD070 0x6D5E # 浞 -- 320,160 +0xD071 0x6DAB # 涫 -- 320,161 +0xD072 0x6E5E # 湞 -- 320,162 +0xD073 0x6EBB # 溻 -- 320,163 +0xD074 0x6F13 # 漓 -- 320,164 +0xD075 0x6F77 # 潷 -- 320,165 +0xD076 0x6F72 # 潲 -- 320,166 +0xD077 0x6F7F # 潿 -- 320,167 +0xD078 0x6FA9 # 澩 -- 320,170 +0xD079 0x7094 # 炔 -- 320,171 +0xD07A 0x7096 # 炖 -- 320,172 +0xD07B 0x70BB # 炻 -- 320,173 +0xD07C 0x70C0 # 烀 -- 320,174 +0xD07D 0x70F4 # 烴 -- 320,175 +0xD07E 0x7110 # 焐 -- 320,176 +0xD0A1 0x7113 # 焓 -- 320,241 +0xD0A2 0x70F7 # 烷 -- 320,242 +0xD0A3 0x7173 # 煳 -- 320,243 +0xD0A4 0x7172 # 煲 -- 320,244 +0xD0A5 0x7178 # 煸 -- 320,245 +0xD0A6 0x7197 # 熗 -- 320,246 +0xD0A7 0x7198 # 熘 -- 320,247 +0xD0A8 0x7193 # 熓 -- 320,250 +0xD0A9 0x71B5 # 熵 -- 320,251 +0xD0AA 0x55A5 # 喥 -- 320,252 +0xD0AB 0x4EC0 # 什 -- 320,253 +0xD0AC 0x729F # 犟 -- 320,254 +0xD0AD 0x728B # 犋 -- 320,255 +0xD0AE 0x728F # 犏 -- 320,256 +0xD0AF 0x72B0 # 犰 -- 320,257 +0xD0B0 0x72CD # 狍 -- 320,260 +0xD0B1 0x72D2 # 狒 -- 320,261 +0xD0B2 0x72F3 # 狳 -- 320,262 +0xD0B3 0x7313 # 猓 -- 320,263 +0xD0B4 0x7339 # 猹 -- 320,264 +0xD0B5 0x732C # 猬 -- 320,265 +0xD0B6 0x7338 # 猸 -- 320,266 +0xD0B7 0x7341 # 獁 -- 320,267 +0xD0B8 0x6EFB # 滻 -- 320,270 +0xD0B9 0x74F0 # 瓰 -- 320,271 +0xD0BA 0x75C4 # 痄 -- 320,272 +0xD0BB 0x75B0 # 疰 -- 320,273 +0xD0BC 0x75E6 # 痦 -- 320,274 +0xD0BD 0x760A # 瘊 -- 320,275 +0xD0BE 0x7619 # 瘙 -- 320,276 +0xD0BF 0x761B # 瘛 -- 320,277 +0xD0C0 0x7654 # 癔 -- 320,300 +0xD0C1 0x7743 # 睃 -- 320,301 +0xD0C2 0x7771 # 睱 -- 320,302 +0xD0C3 0x7798 # 瞘 -- 320,303 +0xD0C4 0x77BC # 瞼 -- 320,304 +0xD0C5 0x77B5 # 瞵 -- 320,305 +0xD0C6 0x85F6 # 藶 -- 320,306 +0xD0C7 0x7818 # 砘 -- 320,307 +0xD0C8 0x63B1 # 掱 -- 320,310 +0xD0C9 0x783C # 砼 -- 320,311 +0xD0CA 0x782C # 砬 -- 320,312 +0xD0CB 0x7829 # 砩 -- 320,313 +0xD0CC 0x7839 # 砹 -- 320,314 +0xD0CD 0x7852 # 硒 -- 320,315 +0xD0CE 0x784C # 硌 -- 320,316 +0xD0CF 0x78B8 # 碸 -- 320,317 +0xD0D0 0x78B2 # 碲 -- 320,320 +0xD0D1 0x78B9 # 碹 -- 320,321 +0xD0D2 0x78A5 # 碥 -- 320,322 +0xD0D3 0x78D9 # 磙 -- 320,323 +0xD0D4 0x78E3 # 磣 -- 320,324 +0xD0D5 0x7905 # 礅 -- 320,325 +0xD0D6 0x7913 # 礓 -- 320,326 +0xD0D7 0x7924 # 礤 -- 320,327 +0xD0D8 0x7A06 # 稆 -- 320,330 +0xD0D9 0x7A03 # 稃 -- 320,331 +0xD0DA 0x7B38 # 笸 -- 320,332 +0xD0DB 0x7B39 # 笹 -- 320,333 +0xD0DC 0x7B48 # 筈 -- 320,334 +0xD0DD 0x7B70 # 筰 -- 320,335 +0xD0DE 0x7B7B # 筻 -- 320,336 +0xD0DF 0x7B62 # 筢 -- 320,337 +0xD0E0 0x7B85 # 箅 -- 320,340 +0xD0E1 0x7BA2 # 箢 -- 320,341 +0xD0E2 0x7BFC # 篼 -- 320,342 +0xD0E3 0x7C6A # 籪 -- 320,343 +0xD0E4 0x7CCD # 糍 -- 320,344 +0xD0E5 0x7D4E # 絎 -- 320,345 +0xD0E6 0x7DD4 # 緔 -- 320,346 +0xD0E8 0x7E70 # 繰 -- 320,350 +0xD0E9 0x7F60 # 罠 -- 320,351 +0xD0EA 0x7F71 # 罱 -- 320,352 +0xD0EB 0x7FA5 # 羥 -- 320,353 +0xD0EC 0x7FA7 # 羧 -- 320,354 +0xD0ED 0x7FB0 # 羰 -- 320,355 +0xD0EE 0x8016 # 耖 -- 320,356 +0xD0EF 0x8020 # 耠 -- 320,357 +0xD0F0 0x8025 # 耥 -- 320,360 +0xD0F1 0x8029 # 耩 -- 320,361 +0xD0F2 0x802A # 耪 -- 320,362 +0xD0F3 0x802C # 耬 -- 320,363 +0xD0F4 0x802E # 耮 -- 320,364 +0xD0F5 0x8031 # 耱 -- 320,365 +0xD0F6 0x8035 # 耵 -- 320,366 +0xD0F7 0x8079 # 聹 -- 320,367 +0xD0F8 0x822F # 舯 -- 320,370 +0xD0F9 0x822D # 舭 -- 320,371 +0xD0FA 0x823E # 舾 -- 320,372 +0xD0FB 0x8249 # 艉 -- 320,373 +0xD0FC 0x824F # 艏 -- 320,374 +0xD0FD 0x827F # 艿 -- 320,375 +0xD0FE 0x828F # 芏 -- 320,376 diff --git a/unicode/xerox/unihan/XCCS-321=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-321=UNIHAN.TXT new file mode 100644 index 00000000..f93860d8 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-321=UNIHAN.TXT @@ -0,0 +1,189 @@ + +# "321" UNIHAN + +0xD121 0x82CA # 苊 -- 321,041 +0xD122 0x82B4 # 芴 -- 321,042 +0xD123 0x82C4 # 苄 -- 321,043 +0xD124 0x82F7 # 苷 -- 321,044 +0xD126 0x6ABE # 檾 -- 321,046 +0xD127 0x830C # 茌 -- 321,047 +0xD128 0x831A # 茚 -- 321,050 +0xD129 0x706F # 灯 -- 321,051 +0xD12A 0x833C # 茼 -- 321,052 +0xD12B 0x833A # 茺 -- 321,053 +0xD12C 0x8333 # 茳 -- 321,054 +0xD12D 0x8316 # 茖 -- 321,055 +0xD12E 0x831B # 茛 -- 321,056 +0xD12F 0x83B0 # 莰 -- 321,057 +0xD130 0x839C # 莜 -- 321,060 +0xD131 0x83E5 # 菥 -- 321,061 +0xD132 0x8418 # 萘 -- 321,062 +0xD133 0x83DD # 菝 -- 321,063 +0xD134 0x841C # 萜 -- 321,064 +0xD135 0x6FDC # 濜 -- 321,065 +0xD136 0x6652 # 晒 -- 321,066 +0xD137 0x62C5 # 担 -- 321,067 +0xD138 0x8452 # 葒 -- 321,070 +0xD139 0x8464 # 葤 -- 321,071 +0xD13A 0x845C # 葜 -- 321,072 +0xD13B 0x8459 # 葙 -- 321,073 +0xD13C 0x8488 # 蒈 -- 321,074 +0xD13D 0x8476 # 葶 -- 321,075 +0xD13E 0x848E # 蒎 -- 321,076 +0xD13F 0x84BD # 蒽 -- 321,077 +0xD140 0x84B4 # 蒴 -- 321,100 +0xD141 0x8497 # 蒗 -- 321,101 +0xD142 0x80C6 # 胆 -- 321,102 +0xD143 0x84BB # 蒻 -- 321,103 +0xD144 0x8538 # 蔸 -- 321,104 +0xD145 0x55F0 # 嗰 -- 321,105 +0xD146 0x8541 # 蕁 -- 321,106 +0xD147 0x8552 # 蕒 -- 321,107 +0xD148 0x857B # 蕻 -- 321,110 +0xD149 0x8579 # 蕹 -- 321,111 +0xD14A 0x859F # 薟 -- 321,112 +0xD14B 0x85B7 # 薷 -- 321,113 +0xD14C 0x8691 # 蚑 -- 321,114 +0xD14D 0x86BF # 蚿 -- 321,115 +0xD14E 0x86BA # 蚺 -- 321,116 +0xD14F 0x86B4 # 蚴 -- 321,117 +0xD150 0x86DE # 蛞 -- 321,120 +0xD151 0x86D8 # 蛘 -- 321,121 +0xD152 0x871B # 蜛 -- 321,122 +0xD153 0x8731 # 蜱 -- 321,123 +0xD154 0x877D # 蝽 -- 321,124 +0xD155 0x8770 # 蝰 -- 321,125 +0xD156 0x878B # 螋 -- 321,126 +0xD157 0x8785 # 螅 -- 321,127 +0xD158 0x8788 # 螈 -- 321,130 +0xD159 0x87D1 # 蟑 -- 321,131 +0xD15A 0x87CE # 蟎 -- 321,132 +0xD15B 0x87EF # 蟯 -- 321,133 +0xD15C 0x87E5 # 蟥 -- 321,134 +0xD15D 0x87D3 # 蟓 -- 321,135 +0xD15E 0x880A # 蠊 -- 321,136 +0xD15F 0x8811 # 蠑 -- 321,137 +0xD160 0x883C # 蠼 -- 321,140 +0xD161 0x88BC # 袼 -- 321,141 +0xD162 0x88C9 # 裉 -- 321,142 +0xD163 0x8947 # 襇 -- 321,143 +0xD164 0x808F # 肏 -- 321,144 +0xD165 0x8C98 # 貘 -- 321,145 +0xD166 0x8CE7 # 賧 -- 321,146 +0xD167 0x8D94 # 趔 -- 321,147 +0xD168 0x8DC6 # 跆 -- 321,150 +0xD169 0x8E05 # 踅 -- 321,151 +0xD16A 0x8E2E # 踮 -- 321,152 +0xD16B 0x8E3A # 踺 -- 321,153 +0xD16C 0x8EA5 # 躥 -- 321,154 +0xD16D 0x8EA6 # 躦 -- 321,155 +0xD16E 0x8EF2 # 軲 -- 321,156 +0xD16F 0x8EE4 # 軤 -- 321,157 +0xD170 0x8ECE # 軎 -- 321,160 +0xD171 0x91FA # 釺 -- 321,161 +0xD172 0x9150 # 酐 -- 321,162 +0xD173 0x915E # 酞 -- 321,163 +0xD174 0x915A # 酚 -- 321,164 +0xD175 0x916E # 酮 -- 321,165 +0xD176 0x9170 # 酰 -- 321,166 +0xD177 0x916F # 酯 -- 321,167 +0xD178 0x9176 # 酶 -- 321,170 +0xD179 0x918C # 醌 -- 321,171 +0xD17A 0x919B # 醛 -- 321,172 +0xD17B 0x919A # 醚 -- 321,173 +0xD17C 0x91AD # 醭 -- 321,174 +0xD17D 0x91D3 # 釓 -- 321,175 +0xD17E 0x91D4 # 釔 -- 321,176 +0xD1A1 0x91D5 # 釕 -- 321,241 +0xD1A2 0x91F9 # 釹 -- 321,242 +0xD1A3 0x9227 # 鈧 -- 321,243 +0xD1A4 0x9225 # 鈥 -- 321,244 +0xD1A5 0x9233 # 鈳 -- 321,245 +0xD1A6 0x9255 # 鉕 -- 321,246 +0xD1A7 0x926D # 鉭 -- 321,247 +0xD1A8 0x925A # 鉚 -- 321,250 +0xD1A9 0x9230 # 鈰 -- 321,251 +0xD1AA 0x9248 # 鉈 -- 321,252 +0xD1AB 0x922E # 鈮 -- 321,253 +0xD1AC 0x92A0 # 銠 -- 321,254 +0xD1AD 0x927A # 鉺 -- 321,255 +0xD1AE 0x92AA # 銪 -- 321,256 +0xD1AF 0x92EE # 鋮 -- 321,257 +0xD1B0 0x92E3 # 鋣 -- 321,260 +0xD1B1 0x92B1 # 銱 -- 321,261 +0xD1B2 0x92A6 # 銦 -- 321,262 +0xD1B3 0x92A9 # 銩 -- 321,263 +0xD1B4 0x927F # 鉿 -- 321,264 +0xD1B5 0x92AB # 銫 -- 321,265 +0xD1B6 0x92A5 # 銥 -- 321,266 +0xD1B7 0x92A3 # 銣 -- 321,267 +0xD1B8 0x9346 # 鍆 -- 321,270 +0xD1B9 0x92F1 # 鋱 -- 321,271 +0xD1BA 0x92E5 # 鋥 -- 321,272 +0xD1BB 0x92EF # 鋯 -- 321,273 +0xD1BC 0x92E8 # 鋨 -- 321,274 +0xD1BD 0x92F6 # 鋶 -- 321,275 +0xD1BE 0x92E6 # 鋦 -- 321,276 +0xD1BF 0x9312 # 錒 -- 321,277 +0xD1C0 0x931B # 錛 -- 321,300 +0xD1C1 0x9340 # 鍀 -- 321,301 +0xD1C2 0x9341 # 鍁 -- 321,302 +0xD1C3 0x9343 # 鍃 -- 321,303 +0xD1C4 0x9307 # 錇 -- 321,304 +0xD1C5 0x9308 # 錈 -- 321,305 +0xD1C6 0x9338 # 錸 -- 321,306 +0xD1C7 0x937A # 鍺 -- 321,307 +0xD1C8 0x9369 # 鍩 -- 321,310 +0xD1C9 0x9376 # 鍶 -- 321,311 +0xD1CA 0x9384 # 鎄 -- 321,312 +0xD1CB 0x9387 # 鎇 -- 321,313 +0xD1CC 0x93BF # 鎿 -- 321,314 +0xD1CD 0x93A6 # 鎦 -- 321,315 +0xD1CE 0x93B5 # 鎵 -- 321,316 +0xD1CF 0x93CD # 鏍 -- 321,317 +0xD1D0 0x9426 # 鐦 -- 321,320 +0xD1D1 0x93CC # 鏌 -- 321,321 +0xD1D2 0x940B # 鐋 -- 321,322 +0xD1D3 0x9412 # 鐒 -- 321,323 +0xD1D4 0x9428 # 鐨 -- 321,324 +0xD1D5 0x941D # 鐝 -- 321,325 +0xD1D6 0x93F7 # 鏷 -- 321,326 +0xD1D7 0x9420 # 鐠 -- 321,327 +0xD1D8 0x9465 # 鑥 -- 321,330 +0xD1D9 0x946D # 鑭 -- 321,331 +0xD1DA 0x943F # 鐿 -- 321,332 +0xD1DB 0x943E # 鐾 -- 321,333 +0xD1DC 0x9454 # 鑔 -- 321,334 +0xD1DD 0x9479 # 鑹 -- 321,335 +0xD1DE 0x958C # 閌 -- 321,336 +0xD1DF 0x9622 # 阢 -- 321,337 +0xD1E0 0x9A0D # 騍 -- 321,340 +0xD1E1 0x9A4F # 驏 -- 321,341 +0xD1E2 0x9794 # 鞔 -- 321,342 +0xD1E4 0x97B2 # 鞲 -- 321,344 +0xD1E5 0x97B4 # 鞴 -- 321,345 +0xD1E6 0x97BD # 鞽 -- 321,346 +0xD1E7 0x986C # 顬 -- 321,347 +0xD1E8 0x9873 # 顳 -- 321,350 +0xD1E9 0x9937 # 餷 -- 321,351 +0xD1EA 0x9943 # 饃 -- 321,352 +0xD1EB 0x994A # 饊 -- 321,353 +0xD1EC 0x9962 # 饢 -- 321,354 +0xD1ED 0x9AB6 # 骶 -- 321,355 +0xD1EE 0x9ABA # 骺 -- 321,356 +0xD1EF 0x9AC2 # 髂 -- 321,357 +0xD1F0 0x9AD5 # 髕 -- 321,360 +0xD1F1 0x9B0F # 鬏 -- 321,361 +0xD1F2 0x9B5F # 魟 -- 321,362 +0xD1F3 0x9B81 # 鮁 -- 321,363 +0xD1F4 0x9B83 # 鮃 -- 321,364 +0xD1F5 0x9BC7 # 鯇 -- 321,365 +0xD1F6 0x9BEA # 鯪 -- 321,366 +0xD1F7 0x9BE1 # 鯡 -- 321,367 +0xD1F8 0x9BDD # 鯝 -- 321,370 +0xD1F9 0x9BF0 # 鯰 -- 321,371 +0xD1FA 0x9BF4 # 鯴 -- 321,372 +0xD1FB 0x9C20 # 鰠 -- 321,373 +0xD1FC 0x9C28 # 鰨 -- 321,374 +0xD1FD 0x9C29 # 鰩 -- 321,375 +0xD1FE 0x9C33 # 鰳 -- 321,376 diff --git a/unicode/xerox/unihan/XCCS-322=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-322=UNIHAN.TXT new file mode 100644 index 00000000..311ac51b --- /dev/null +++ b/unicode/xerox/unihan/XCCS-322=UNIHAN.TXT @@ -0,0 +1,180 @@ + +# "322" UNIHAN + +0xD221 0x9C48 # 鱈 -- 322,041 +0xD222 0x9C45 # 鱅 -- 322,042 +0xD223 0x9C52 # 鱒 -- 322,043 +0xD224 0x9C5D # 鱝 -- 322,044 +0xD225 0x9C7A # 鱺 -- 322,045 +0xD226 0x9D2F # 鴯 -- 322,046 +0xD228 0x9D87 # 鶇 -- 322,050 +0xD229 0x9D93 # 鶓 -- 322,051 +0xD22A 0x9D6F # 鵯 -- 322,052 +0xD22B 0x9DA5 # 鶥 -- 322,053 +0xD22C 0x9DDA # 鷚 -- 322,054 +0xD22D 0x9E0C # 鸌 -- 322,055 +0xD22E 0x9EE2 # 黢 -- 322,056 +0xD22F 0x9EF2 # 黲 -- 322,057 +0xD230 0x9F44 # 齄 -- 322,060 +0xD231 0x9F59 # 齙 -- 322,061 +0xD23B 0x6630 # 昰 -- 322,073 +0xD23C 0x7B87 # 箇 -- 322,074 +0xD23D 0x88E1 # 裡 -- 322,075 +0xD23E 0x885C # 衜 -- 322,076 +0xD23F 0x4EDD # 仝 -- 322,077 +0xD240 0x704B # 灋 -- 322,100 +0xD241 0x56EC # 囬 -- 322,101 +0xD242 0x55AB # 喫 -- 322,102 +0xD243 0x7081 # 炁 -- 322,103 +0xD244 0x60E3 # 惣 -- 322,104 +0xD245 0x62CF # 拏 -- 322,105 +0xD246 0x8C9F # 貟 -- 322,106 +0xD247 0x5F4A # 彊 -- 322,107 +0xD248 0x63C5 # 揅 -- 322,110 +0xD249 0x8229 # 舩 -- 322,111 +0xD24A 0x6E4F # 湏 -- 322,112 +0xD24B 0x68F1 # 棱 -- 322,113 +0xD24C 0x773E # 眾 -- 322,114 +0xD24D 0x4E9D # 亝 -- 322,115 +0xD24E 0x8173 # 腳 -- 322,116 +0xD24F 0x51A8 # 冨 -- 322,117 +0xD250 0x5EF9 # 廹 -- 322,120 +0xD251 0x8B0C # 謌 -- 322,121 +0xD252 0x96DE # 雞 -- 322,122 +0xD253 0x612C # 愬 -- 322,123 +0xD254 0x6537 # 攷 -- 322,124 +0xD255 0x5E0B # 帋 -- 322,125 +0xD256 0x69FC # 槼 -- 322,126 +0xD257 0x90A8 # 邨 -- 322,127 +0xD258 0x770E # 眎 -- 322,130 +0xD259 0x577F # 坿 -- 322,131 +0xD25A 0x9599 # 閙 -- 322,132 +0xD25B 0x8A3C # 証 -- 322,133 +0xD25C 0x7567 # 畧 -- 322,134 +0xD25D 0x57FD # 埽 -- 322,135 +0xD25E 0x7ADC # 竜 -- 322,136 +0xD25F 0x846F # 葯 -- 322,137 +0xD260 0x882D # 蠭 -- 322,140 +0xD261 0x69E9 # 槩 -- 322,141 +0xD262 0x9397 # 鎗 -- 322,142 +0xD263 0x5231 # 刱 -- 322,143 +0xD264 0x76B7 # 皷 -- 322,144 +0xD265 0x6C37 # 氷 -- 322,145 +0xD266 0x894D # 襍 -- 322,146 +0xD267 0x5E8A # 床 -- 322,147 +0xD268 0x8FA0 # 辠 -- 322,150 +0xD269 0x51B5 # 况 -- 322,151 +0xD26A 0x7255 # 牕 -- 322,152 +0xD26B 0x9B25 # 鬥 -- 322,153 +0xD26C 0x7385 # 玅 -- 322,154 +0xD26D 0x51C8 # 凈 -- 322,155 +0xD26E 0x79EA # 秪 -- 322,156 +0xD26F 0x50CA # 僊 -- 322,157 +0xD270 0x8462 # 葢 -- 322,160 +0xD271 0x96A3 # 隣 -- 322,161 +0xD272 0x945B # 鑛 -- 322,162 +0xD273 0x76C3 # 盃 -- 322,163 +0xD274 0x7CAE # 粮 -- 322,164 +0xD275 0x5AAE # 媮 -- 322,165 +0xD276 0x8F2D # 輭 -- 322,166 +0xD277 0x58BB # 墻 -- 322,167 +0xD278 0x98DC # 飜 -- 322,170 +0xD279 0x9741 # 靁 -- 322,171 +0xD27A 0x84FA # 蓺 -- 322,172 +0xD27B 0x59C9 # 姉 -- 322,173 +0xD27C 0x7343 # 獃 -- 322,174 +0xD27D 0x656D # 敭 -- 322,175 +0xD27E 0x6900 # 椀 -- 322,176 +0xD2A1 0x754A # 畊 -- 322,241 +0xD2A2 0x7156 # 煖 -- 322,242 +0xD2A3 0x70D6 # 烖 -- 322,243 +0xD2A4 0x8847 # 衇 -- 322,244 +0xD2A5 0x7287 # 犇 -- 322,245 +0xD2A6 0x981F # 頟 -- 322,246 +0xD2A7 0x87C1 # 蟁 -- 322,247 +0xD2A8 0x7CD3 # 糓 -- 322,250 +0xD2A9 0x7B69 # 筩 -- 322,251 +0xD2AA 0x9EAA # 麪 -- 322,252 +0xD2AB 0x9F69 # 齩 -- 322,253 +0xD2AC 0x5A63 # 婣 -- 322,254 +0xD2AD 0x7955 # 祕 -- 322,255 +0xD2AE 0x9076 # 遶 -- 322,256 +0xD2AF 0x5ABF # 媿 -- 322,257 +0xD2B0 0x6EBC # 溼 -- 322,260 +0xD2B1 0x89D5 # 觕 -- 322,261 +0xD2B2 0x6822 # 栢 -- 322,262 +0xD2B3 0x5705 # 圅 -- 322,263 +0xD2B4 0x751E # 甞 -- 322,264 +0xD2B5 0x6B4E # 歎 -- 322,265 +0xD2B6 0x5826 # 堦 -- 322,266 +0xD2B7 0x792E # 礮 -- 322,267 +0xD2B8 0x8728 # 蜨 -- 322,270 +0xD2B9 0x6FF3 # 濳 -- 322,271 +0xD2BA 0x4FDB # 俛 -- 322,272 +0xD2BB 0x63BD # 掽 -- 322,273 +0xD2BC 0x4E26 # 並 -- 322,274 +0xD2BD 0x6159 # 慙 -- 322,275 +0xD2BE 0x507A # 偺 -- 322,276 +0xD2BF 0x52B9 # 効 -- 322,277 +0xD2C0 0x506A # 偪 -- 322,300 +0xD2C1 0x681E # 栞 -- 322,301 +0xD2C2 0x98E1 # 飡 -- 322,302 +0xD2C3 0x993B # 餻 -- 322,303 +0xD2C4 0x962F # 阯 -- 322,304 +0xD2C5 0x657A # 敺 -- 322,305 +0xD2C6 0x6ED9 # 滙 -- 322,306 +0xD2C8 0x5B3E # 嬾 -- 322,310 +0xD2C9 0x7147 # 煇 -- 322,311 +0xD2CA 0x91BB # 醻 -- 322,312 +0xD2CB 0x642F # 搯 -- 322,313 +0xD2CC 0x9F03 # 鼃 -- 322,314 +0xD2CD 0x5117 # 儗 -- 322,315 +0xD2CE 0x6FF6 # 濶 -- 322,316 +0xD2CF 0x81C8 # 臈 -- 322,317 +0xD2D0 0x5226 # 刦 -- 322,320 +0xD2D1 0x7CC9 # 糉 -- 322,321 +0xD2D2 0x5BC3 # 寃 -- 322,322 +0xD2D3 0x5344 # 卄 -- 322,323 +0xD2D4 0x7AEA # 竪 -- 322,324 +0xD2D5 0x55C1 # 嗁 -- 322,325 +0xD2D6 0x5303 # 匃 -- 322,326 +0xD2D7 0x9C15 # 鰕 -- 322,327 +0xD2D8 0x756E # 畮 -- 322,330 +0xD2D9 0x6C31 # 氱 -- 322,331 +0xD2DA 0x7AB4 # 窴 -- 322,332 +0xD2DB 0x8A64 # 詤 -- 322,333 +0xD2DC 0x9684 # 隄 -- 322,334 +0xD2DD 0x64A6 # 撦 -- 322,335 +0xD2DE 0x7881 # 碁 -- 322,336 +0xD2DF 0x6B55 # 歕 -- 322,337 +0xD2E0 0x5CEF # 峯 -- 322,340 +0xD2E1 0x9D08 # 鴈 -- 322,341 +0xD2E2 0x8987 # 覇 -- 322,342 +0xD2E3 0x750E # 甎 -- 322,343 +0xD2E4 0x6449 # 摉 -- 322,344 +0xD2E5 0x962C # 阬 -- 322,345 +0xD2E6 0x789E # 碞 -- 322,346 +0xD2E7 0x8515 # 蔕 -- 322,347 +0xD2E8 0x85F7 # 藷 -- 322,350 +0xD2E9 0x6529 # 攩 -- 322,351 +0xD2EA 0x7F46 # 罆 -- 322,352 +0xD2EB 0x8B8C # 讌 -- 322,353 +0xD2EC 0x7506 # 甆 -- 322,354 +0xD2ED 0x7B92 # 箒 -- 322,355 +0xD2EE 0x9264 # 鉤 -- 322,356 +0xD2EF 0x8090 # 肐 -- 322,357 +0xD2F0 0x53A0 # 厠 -- 322,360 +0xD2F1 0x8021 # 耡 -- 322,361 +0xD2F2 0x5023 # 倣 -- 322,362 +0xD2F3 0x8E4F # 蹏 -- 322,363 +0xD2F4 0x8C54 # 豔 -- 322,364 +0xD2F5 0x5058 # 偘 -- 322,365 +0xD2F6 0x5D10 # 崐 -- 322,366 +0xD2F7 0x7BF4 # 篴 -- 322,367 +0xD2F8 0x8103 # 脃 -- 322,370 +0xD2F9 0x8FF4 # 迴 -- 322,371 +0xD2FA 0x9FA5 # 龥 -- 322,372 +0xD2FB 0x7A3A # 稺 -- 322,373 +0xD2FC 0x97C8 # 韈 -- 322,374 +0xD2FD 0x6998 # 榘 -- 322,375 +0xD2FE 0x5F6B # 彫 -- 322,376 diff --git a/unicode/xerox/unihan/XCCS-323=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-323=UNIHAN.TXT new file mode 100644 index 00000000..0c785ff9 --- /dev/null +++ b/unicode/xerox/unihan/XCCS-323=UNIHAN.TXT @@ -0,0 +1,190 @@ + +# "323" UNIHAN + +0xD321 0x5393 # 厓 -- 323,041 +0xD322 0x9F8E # 龎 -- 323,042 +0xD323 0x88B4 # 袴 -- 323,043 +0xD324 0x59AC # 妬 -- 323,044 +0xD325 0x8FAA # 辪 -- 323,045 +0xD326 0x68D5 # 棕 -- 323,046 +0xD327 0x62D1 # 拑 -- 323,047 +0xD328 0x71BF # 熿 -- 323,050 +0xD329 0x976D # 靭 -- 323,051 +0xD32A 0x978C # 鞌 -- 323,052 +0xD32B 0x9037 # 逷 -- 323,053 +0xD32C 0x7C50 # 籐 -- 323,054 +0xD32D 0x5EBD # 庽 -- 323,055 +0xD32E 0x8117 # 脗 -- 323,056 +0xD32F 0x8525 # 蔥 -- 323,057 +0xD330 0x7328 # 猨 -- 323,060 +0xD331 0x6239 # 戹 -- 323,061 +0xD332 0x89DD # 觝 -- 323,062 +0xD333 0x5C85 # 岅 -- 323,063 +0xD334 0x91D0 # 釐 -- 323,064 +0xD335 0x6B1D # 欝 -- 323,065 +0xD336 0x8602 # 蘂 -- 323,066 +0xD337 0x89A9 # 覩 -- 323,067 +0xD338 0x64E5 # 擥 -- 323,070 +0xD339 0x66E1 # 曡 -- 323,071 +0xD33A 0x7A68 # 穨 -- 323,072 +0xD33B 0x8912 # 褒 -- 323,073 +0xD33C 0x8589 # 薉 -- 323,074 +0xD33D 0x8F5D # 轝 -- 323,075 +0xD33E 0x95DA # 闚 -- 323,076 +0xD33F 0x870B # 蜋 -- 323,077 +0xD340 0x6B5B # 歛 -- 323,100 +0xD341 0x7AE2 # 竢 -- 323,101 +0xD342 0x887A # 衺 -- 323,102 +0xD343 0x6D96 # 涖 -- 323,103 +0xD344 0x6033 # 怳 -- 323,104 +0xD345 0x74CC # 瓌 -- 323,105 +0xD346 0x92BE # 銾 -- 323,106 +0xD347 0x5B7C # 孼 -- 323,107 +0xD348 0x8CC9 # 賉 -- 323,110 +0xD349 0x97BE # 鞾 -- 323,111 +0xD34A 0x8962 # 襢 -- 323,112 +0xD34B 0x81D9 # 臙 -- 323,113 +0xD34C 0x8EB6 # 躶 -- 323,114 +0xD34D 0x994D # 饍 -- 323,115 +0xD34E 0x9061 # 遡 -- 323,116 +0xD34F 0x9586 # 閆 -- 323,117 +0xD350 0x7CA6 # 粦 -- 323,120 +0xD351 0x8F19 # 輙 -- 323,121 +0xD352 0x898A # 覊 -- 323,122 +0xD353 0x5A6C # 婬 -- 323,123 +0xD354 0x95A7 # 閧 -- 323,124 +0xD355 0x9A58 # 驘 -- 323,125 +0xD356 0x8B87 # 讇 -- 323,126 +0xD357 0x995F # 饟 -- 323,127 +0xD358 0x6B57 # 歗 -- 323,130 +0xD359 0x80A7 # 肧 -- 323,131 +0xD35A 0x9DB5 # 鶵 -- 323,132 +0xD35B 0x9696 # 隖 -- 323,133 +0xD35C 0x668B # 暋 -- 323,134 +0xD35D 0x67DF # 柟 -- 323,135 +0xD35E 0x6673 # 晳 -- 323,136 +0xD35F 0x8B3F # 謿 -- 323,137 +0xD360 0x936B # 鍫 -- 323,140 +0xD361 0x97D6 # 韖 -- 323,141 +0xD362 0x70F1 # 烱 -- 323,142 +0xD363 0x73A8 # 玨 -- 323,143 +0xD364 0x4FA2 # 侢 -- 323,144 +0xD365 0x58DC # 壜 -- 323,145 +0xD366 0x6A97 # 檗 -- 323,146 +0xD367 0x7F3D # 缽 -- 323,147 +0xD368 0x6FC7 # 濇 -- 323,150 +0xD369 0x531F # 匟 -- 323,151 +0xD36A 0x984B # 顋 -- 323,152 +0xD36B 0x82FD # 苽 -- 323,153 +0xD36C 0x63EB # 揫 -- 323,154 +0xD36D 0x5DFF # 巿 -- 323,155 +0xD36E 0x9B40 # 魀 -- 323,156 +0xD36F 0x8B4C # 譌 -- 323,157 +0xD370 0x8637 # 蘷 -- 323,160 +0xD371 0x8761 # 蝡 -- 323,161 +0xD372 0x7A7D # 穽 -- 323,162 +0xD373 0x58FB # 壻 -- 323,163 +0xD374 0x6BD8 # 毘 -- 323,164 +0xD375 0x90C9 # 郉 -- 323,165 +0xD376 0x6174 # 慴 -- 323,166 +0xD377 0x7447 # 瑇 -- 323,167 +0xD378 0x52D7 # 勗 -- 323,170 +0xD379 0x7F4B # 罋 -- 323,171 +0xD37A 0x906F # 遯 -- 323,172 +0xD37B 0x6353 # 捓 -- 323,173 +0xD37C 0x5333 # 匳 -- 323,174 +0xD37D 0x7E27 # 縧 -- 323,175 +0xD37E 0x97C1 # 韁 -- 323,176 +0xD3A1 0x9C53 # 鱓 -- 323,241 +0xD3A2 0x7B6F # 筯 -- 323,242 +0xD3A3 0x5C05 # 尅 -- 323,243 +0xD3A4 0x8C44 # 豄 -- 323,244 +0xD3A5 0x88A0 # 袠 -- 323,245 +0xD3A6 0x52C5 # 勅 -- 323,246 +0xD3A7 0x8B81 # 讁 -- 323,247 +0xD3A8 0x8109 # 脉 -- 323,250 +0xD3A9 0x7609 # 瘉 -- 323,251 +0xD3AA 0x5557 # 啗 -- 323,252 +0xD3AB 0x5AFA # 嫺 -- 323,253 +0xD3AC 0x7C44 # 籄 -- 323,254 +0xD3AD 0x7C11 # 簑 -- 323,255 +0xD3AE 0x5C32 # 尲 -- 323,256 +0xD3AF 0x58F3 # 壳 -- 323,257 +0xD3B0 0x685A # 桚 -- 323,260 +0xD3B1 0x51B8 # 冸 -- 323,261 +0xD3B2 0x9E9E # 麞 -- 323,262 +0xD3B3 0x5BE0 # 寠 -- 323,263 +0xD3B4 0x8739 # 蜹 -- 323,264 +0xD3B5 0x529A # 劚 -- 323,265 +0xD3B6 0x5EC0 # 廀 -- 323,266 +0xD3B7 0x7726 # 眦 -- 323,267 +0xD3B8 0x8AE1 # 諡 -- 323,270 +0xD3B9 0x855A # 蕚 -- 323,271 +0xD3BA 0x7F83 # 羃 -- 323,272 +0xD3BB 0x5B1D # 嬝 -- 323,273 +0xD3BC 0x55F8 # 嗸 -- 323,274 +0xD3BD 0x7B0B # 笋 -- 323,275 +0xD3BE 0x5F60 # 彠 -- 323,276 +0xD3BF 0x7C83 # 粃 -- 323,277 +0xD3C0 0x8842 # 衂 -- 323,300 +0xD3C1 0x8D10 # 贐 -- 323,301 +0xD3C2 0x8E61 # 蹡 -- 323,302 +0xD3C3 0x983F # 頿 -- 323,303 +0xD3C4 0x4E48 # 么 -- 323,304 +0xD3C5 0x98C8 # 飈 -- 323,305 +0xD3C6 0x8D17 # 贗 -- 323,306 +0xD3C7 0x53AB # 厫 -- 323,307 +0xD3C8 0x6128 # 愨 -- 323,310 +0xD3C9 0x7932 # 礲 -- 323,311 +0xD3CA 0x8771 # 蝱 -- 323,312 +0xD3CB 0x6747 # 杇 -- 323,313 +0xD3CC 0x58D6 # 壖 -- 323,314 +0xD3CD 0x5C20 # 尠 -- 323,315 +0xD3CE 0x723F # 爿 -- 323,316 +0xD3CF 0x6332 # 挲 -- 323,317 +0xD3D0 0x659A # 斚 -- 323,320 +0xD3D1 0x68D1 # 棑 -- 323,321 +0xD3D2 0x72AB # 犫 -- 323,322 +0xD3D3 0x9186 # 醆 -- 323,323 +0xD3D4 0x589D # 墝 -- 323,324 +0xD3D5 0x8935 # 褵 -- 323,325 +0xD3D6 0x7D56 # 絖 -- 323,326 +0xD3D7 0x7C34 # 簴 -- 323,327 +0xD3D8 0x8A51 # 詑 -- 323,330 +0xD3D9 0x982E # 頮 -- 323,331 +0xD3DA 0x979F # 鞟 -- 323,332 +0xD3DB 0x97B8 # 鞸 -- 323,333 +0xD3DC 0x9A0C # 騌 -- 323,334 +0xD3DD 0x9C4F # 鱏 -- 323,335 +0xD3DE 0x763A # 瘺 -- 323,336 +0xD3DF 0x56CD # 囍 -- 323,337 +0xD3E0 0x5D52 # 嵒 -- 323,340 +0xD3E1 0x6D07 # 洇 -- 323,341 +0xD3E2 0x753D # 甽 -- 323,342 +0xD3E3 0x9A3B # 騻 -- 323,343 +0xD3E4 0x5EFC # 廼 -- 323,344 +0xD3E5 0x9E84 # 麄 -- 323,345 +0xD3E6 0x9908 # 餈 -- 323,346 +0xD3E7 0x82D8 # 苘 -- 323,347 +0xD3E8 0x56D8 # 囘 -- 323,350 +0xD3E9 0x53C5 # 叅 -- 323,351 +0xD3EA 0x7702 # 眂 -- 323,352 +0xD3EB 0x9475 # 鑵 -- 323,353 +0xD3EC 0x91BC # 醼 -- 323,354 +0xD3ED 0x8FA5 # 辥 -- 323,355 +0xD3EE 0x60A4 # 悤 -- 323,356 +0xD3EF 0x8A4B # 詋 -- 323,357 +0xD3F0 0x7C68 # 籨 -- 323,360 +0xD3F1 0x7346 # 獆 -- 323,361 +0xD3F2 0x9816 # 頖 -- 323,362 +0xD3F3 0x98E2 # 飢 -- 323,363 +0xD3F4 0x5845 # 塅 -- 323,364 +0xD3F5 0x583C # 堼 -- 323,365 +0xD3F6 0x5842 # 塂 -- 323,366 +0xD3F7 0x53E0 # 叠 -- 323,367 +0xD3F9 0x4E28 # 丨 -- 323,371 +0xD3FA 0x4E36 # 丶 -- 323,372 +0xD3FB 0x4E3F # 丿 -- 323,373 +0xD3FC 0x4E85 # 亅 -- 323,374 +0xD3FD 0x4EA0 # 亠 -- 323,375 +0xD3FE 0x513F # 儿 -- 323,376 diff --git a/unicode/xerox/unihan/XCCS-324=UNIHAN.TXT b/unicode/xerox/unihan/XCCS-324=UNIHAN.TXT new file mode 100644 index 00000000..9060a81b --- /dev/null +++ b/unicode/xerox/unihan/XCCS-324=UNIHAN.TXT @@ -0,0 +1,189 @@ + +# "324" UNIHAN + +0xD421 0x5182 # 冂 -- 324,041 +0xD422 0x5196 # 冖 -- 324,042 +0xD423 0x51AB # 冫 -- 324,043 +0xD424 0x51F5 # 凵 -- 324,044 +0xD425 0x52F9 # 勹 -- 324,045 +0xD426 0x531A # 匚 -- 324,046 +0xD427 0x5338 # 匸 -- 324,047 +0xD428 0x5369 # 卩 -- 324,050 +0xD429 0x5382 # 厂 -- 324,051 +0xD42A 0x53B6 # 厶 -- 324,052 +0xD42B 0x56D7 # 囗 -- 324,053 +0xD42C 0x5902 # 夂 -- 324,054 +0xD42D 0x590A # 夊 -- 324,055 +0xD42E 0x5B80 # 宀 -- 324,056 +0xD42F 0x5C22 # 尢 -- 324,057 +0xD430 0x5C6E # 屮 -- 324,060 +0xD431 0x5DDB # 巛 -- 324,061 +0xD432 0x5E7F # 广 -- 324,062 +0xD433 0x5EF4 # 廴 -- 324,063 +0xD434 0x5EFE # 廾 -- 324,064 +0xD435 0x5F50 # 彐 -- 324,065 +0xD436 0x5F61 # 彡 -- 324,066 +0xD437 0x8845 # 衅 -- 324,067 +0xD438 0x6534 # 攴 -- 324,070 +0xD439 0x65E0 # 无 -- 324,071 +0xD43A 0x6C14 # 气 -- 324,072 +0xD43B 0x7592 # 疒 -- 324,073 +0xD43C 0x7676 # 癶 -- 324,074 +0xD43D 0x79B8 # 禸 -- 324,075 +0xD43E 0x7CF8 # 糸 -- 324,076 +0xD43F 0x7F51 # 网 -- 324,077 +0xD440 0x864D # 虍 -- 324,100 +0xD441 0x897E # 襾 -- 324,101 +0xD442 0x8FB5 # 辵 -- 324,102 +0xD443 0x91C6 # 釆 -- 324,103 +0xD444 0x961D # 阝 -- 324,104 +0xD445 0x96B6 # 隶 -- 324,105 +0xD446 0x9ADF # 髟 -- 324,106 +0xD447 0x4E1A # 业 -- 324,107 +0xD448 0x5EC8 # 廈 -- 324,110 +0xD449 0x6C96 # 沖 -- 324,111 +0xD44A 0x51CF # 减 -- 324,112 +0xD44B 0x79CD # 种 -- 324,113 +0xD44C 0x4E2A # 个 -- 324,114 +0xD44D 0x7B8E # 箎 -- 324,115 +0xD44E 0x70DF # 烟 -- 324,116 +0xD44F 0x8385 # 莅 -- 324,117 +0xD450 0x8AC2 # 諂 -- 324,120 +0xD451 0x9918 # 餘 -- 324,121 +0xD452 0x52DB # 勛 -- 324,122 +0xD453 0x57EB # 埫 -- 324,123 +0xD454 0x58EA # 壪 -- 324,124 +0xD455 0x5888 # 墈 -- 324,125 +0xD456 0x5D0D # 崍 -- 324,126 +0xD457 0x5CE7 # 峧 -- 324,127 +0xD458 0x5D00 # 崀 -- 324,130 +0xD459 0x5D05 # 崅 -- 324,131 +0xD45A 0x5D0C # 崌 -- 324,132 +0xD45B 0x5D85 # 嶅 -- 324,133 +0xD45C 0x7014 # 瀔 -- 324,134 +0xD45D 0x62E4 # 拤 -- 324,135 +0xD45E 0x5843 # 塃 -- 324,136 +0xD45F 0x668E # 暎 -- 324,137 +0xD460 0x65FB # 旻 -- 324,140 +0xD461 0x67C8 # 柈 -- 324,141 +0xD462 0x68A0 # 梠 -- 324,142 +0xD463 0x673F # 朿 -- 324,143 +0xD464 0x6A0B # 樋 -- 324,144 +0xD465 0x69FE # 槾 -- 324,145 +0xD466 0x6A66 # 橦 -- 324,146 +0xD467 0x6935 # 椵 -- 324,147 +0xD468 0x6EAE # 溮 -- 324,150 +0xD469 0x6D28 # 洨 -- 324,151 +0xD46A 0x6D5B # 浛 -- 324,152 +0xD46B 0x6DAD # 涭 -- 324,153 +0xD46C 0x6EE7 # 滧 -- 324,154 +0xD46D 0x6EB5 # 溵 -- 324,155 +0xD46E 0x6F56 # 潖 -- 324,156 +0xD46F 0x7002 # 瀂 -- 324,157 +0xD470 0x6F75 # 潵 -- 324,160 +0xD471 0x709E # 炞 -- 324,161 +0xD472 0x7808 # 砈 -- 324,162 +0xD473 0x85E0 # 藠 -- 324,163 +0xD474 0x72E2 # 狢 -- 324,164 +0xD475 0x7314 # 猔 -- 324,165 +0xD476 0x6983 # 榃 -- 324,166 +0xD477 0x78DC # 磜 -- 324,167 +0xD478 0x7933 # 礳 -- 324,170 +0xD479 0x7C15 # 簕 -- 324,171 +0xD47A 0x8112 # 脒 -- 324,172 +0xD47B 0x813F # 脿 -- 324,173 +0xD47C 0x8399 # 莙 -- 324,174 +0xD47D 0x8705 # 蜅 -- 324,175 +0xD47E 0x569C # 嚜 -- 324,176 +0xD4A1 0x898E # 覎 -- 324,241 +0xD4A2 0x7847 # 硇 -- 324,242 +0xD4A3 0x8E53 # 蹓 -- 324,243 +0xD4A4 0x910C # 鄌 -- 324,244 +0xD4A5 0x9770 # 靰 -- 324,245 +0xD4A6 0x97A1 # 鞡 -- 324,246 +0xD4A7 0x7CAC # 粬 -- 324,247 +0xD4A8 0x9904 # 餄 -- 324,250 +0xD4A9 0x990E # 餎 -- 324,251 +0xD4AA 0x990F # 餏 -- 324,252 +0xD4AB 0x9BA6 # 鮦 -- 324,253 +0xD4AC 0x9B9C # 鮜 -- 324,254 +0xD4AD 0x9BB3 # 鮳 -- 324,255 +0xD4AE 0x9BF7 # 鯷 -- 324,256 +0xD4AF 0x6E9A # 溚 -- 324,257 +0xD4B0 0x83FE # 菾 -- 324,260 +0xD4B1 0x695F # 楟 -- 324,261 +0xD4B2 0x7903 # 礃 -- 324,262 +0xD4B3 0x5034 # 倴 -- 324,263 +0xD4B4 0x51C3 # 凃 -- 324,264 +0xD4B5 0x5871 # 塱 -- 324,265 +0xD4B6 0x5895 # 墕 -- 324,266 +0xD4B7 0x5A84 # 媄 -- 324,267 +0xD4B8 0x5C72 # 屲 -- 324,270 +0xD4B9 0x5DA8 # 嶨 -- 324,271 +0xD4BA 0x658F # 斏 -- 324,272 +0xD4BB 0x6C1E # 氞 -- 324,273 +0xD4BC 0x939D # 鎝 -- 324,274 +0xD4BD 0x7A16 # 稖 -- 324,275 +0xD4BE 0x8313 # 茓 -- 324,276 +0xD4BF 0x9BBA # 鮺 -- 324,277 +0xD4C0 0x9C3C # 鰼 -- 324,300 +0xD4C1 0x556B # 啫 -- 324,301 +0xD4C2 0x56B8 # 嚸 -- 324,302 +0xD4C3 0x56C4 # 囄 -- 324,303 +0xD4C4 0x56B9 # 嚹 -- 324,304 +0xD4C5 0x5528 # 唨 -- 324,305 +0xD4C7 0x4EBB # 亻 -- 324,307 +0xD4C8 0x5202 # 刂 -- 324,310 +0xD4C9 0x5FC4 # 忄 -- 324,311 +0xD4CA 0x624C # 扌 -- 324,312 +0xD4CB 0x6C35 # 氵 -- 324,313 +0xD4CC 0x706C # 灬 -- 324,314 +0xD4CD 0x72AD # 犭 -- 324,315 +0xD4CE 0x793B # 礻 -- 324,316 +0xD4CF 0x91E2 # 釢 -- 324,317 +0xD4D0 0x7F52 # 罒 -- 324,320 +0xD4D1 0x8080 # 肀 -- 324,321 +0xD4D2 0x8279 # 艹 -- 324,322 +0xD4D3 0x8864 # 衤 -- 324,323 +0xD4D4 0x5710 # 圐 -- 324,324 +0xD4D5 0x5719 # 圙 -- 324,325 +0xD4D6 0x576C # 坬 -- 324,326 +0xD4D7 0x57BE # 垾 -- 324,327 +0xD4D9 0x91FE # 釾 -- 324,331 +0xD4DA 0x9273 # 鉳 -- 324,332 +0xD4DB 0x9272 # 鉲 -- 324,333 +0xD4DC 0x92B0 # 銰 -- 324,334 +0xD4DD 0x92A7 # 銧 -- 324,335 +0xD4DE 0x9345 # 鍅 -- 324,336 +0xD4DF 0x933C # 錼 -- 324,337 +0xD4E0 0x9357 # 鍗 -- 324,340 +0xD4E1 0x62AC # 抬 -- 324,341 +0xD4E2 0x9440 # 鑀 -- 324,342 +0xD4E3 0x6535 # 攵 -- 324,343 +0xD4E4 0x7FA4 # 群 -- 324,344 +0xD4E5 0x816D # 腭 -- 324,345 +0xD4E6 0x866B # 虫 -- 324,346 +0xD4E7 0x4E42 # 乂 -- 324,347 +0xD4E8 0x83A6 # 莦 -- 324,350 +0xD4E9 0x70D4 # 烔 -- 324,351 +0xD4EA 0x51A2 # 冢 -- 324,352 +0xD4EB 0x536E # 卮 -- 324,353 +0xD4EC 0x6996 # 榖 -- 324,354 +0xD4ED 0x5C9C # 岜 -- 324,355 +0xD4EE 0x572B # 圫 -- 324,356 +0xD4EF 0x717A # 煺 -- 324,357 +0xD4F0 0x6D8C # 涌 -- 324,360 +0xD4F1 0x7A4E # 穎 -- 324,361 +0xD4F2 0x64A3 # 撣 -- 324,362 +0xD4F3 0x93AA # 鎪 -- 324,363 +0xD4F4 0x673A # 机 -- 324,364 +0xD4F5 0x788D # 碍 -- 324,365 +0xD4F6 0x700B # 瀋 -- 324,366 +0xD4F7 0x8FB6 # 辶 -- 324,367 +0xD4F8 0x527A # 剺 -- 324,370 +0xD4F9 0x5A3F # 娿 -- 324,371 +0xD4FA 0x5CDE # 峞 -- 324,372 +0xD4FB 0x80EE # 胮 -- 324,373 +0xD4FC 0x89F0 # 觰 -- 324,374 +0xD4FD 0x8E06 # 踆 -- 324,375 +0xD4FE 0x88DB # 裛 -- 324,376