texlive[63486] Master/texmf-dist: xecjk (4jun22)
commits+karl at tug.org
commits+karl at tug.org
Sat Jun 4 22:26:22 CEST 2022
Revision: 63486
http://tug.org/svn/texlive?view=revision&revision=63486
Author: karl
Date: 2022-06-04 22:26:21 +0200 (Sat, 04 Jun 2022)
Log Message:
-----------
xecjk (4jun22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/xelatex/xecjk/README.md
trunk/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
trunk/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf
trunk/Master/texmf-dist/fonts/misc/xetex/fontmapping/xecjk/han-simp.map
trunk/Master/texmf-dist/fonts/misc/xetex/fontmapping/xecjk/han-simp.tec
trunk/Master/texmf-dist/fonts/misc/xetex/fontmapping/xecjk/han-trad.map
trunk/Master/texmf-dist/fonts/misc/xetex/fontmapping/xecjk/han-trad.tec
trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg
trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
Modified: trunk/Master/texmf-dist/doc/xelatex/xecjk/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/xecjk/README.md 2022-06-04 20:25:35 UTC (rev 63485)
+++ trunk/Master/texmf-dist/doc/xelatex/xecjk/README.md 2022-06-04 20:26:21 UTC (rev 63486)
@@ -20,8 +20,8 @@
---------------------
Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
- Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
- Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
+ Copyright (C) 2009--2022 by Leo Liu <leoliu.pku at gmail.com>
+ Copyright (C) 2012--2022 by Qing Lee <sobenlee at gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
Modified: trunk/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/misc/xetex/fontmapping/xecjk/han-simp.map
===================================================================
--- trunk/Master/texmf-dist/fonts/misc/xetex/fontmapping/xecjk/han-simp.map 2022-06-04 20:25:35 UTC (rev 63485)
+++ trunk/Master/texmf-dist/fonts/misc/xetex/fontmapping/xecjk/han-simp.map 2022-06-04 20:26:21 UTC (rev 63486)
@@ -2,8 +2,8 @@
; from the Unicode Unihan database: <http://www.unicode.org/Public/UNIDATA/Unihan.zip>
;
; Unihan_Variants.txt
-; Date: 2020-02-18 18:27:33 GMT [JHJ]
-; Unicode version: 13.0.0
+; Date: 2021-08-06 16:32:36 GMT [JHJ]
+; Unicode version: 14.0.0
;
LHSName "traditional"
@@ -601,8 +601,9 @@
U+4DB2 <> U+2B733
U+4E1F <> U+4E22
U+4E26 <> U+5E76
-U+4E7E <> U+5E72
+U+4E7E <> U+4E7E
U+4E82 <> U+4E71
+U+4E91 <> U+4E91
U+4E9E <> U+4E9A
U+4F47 <> U+4F2B
U+4F59 <> U+4F59
@@ -635,6 +636,7 @@
U+5096 <> U+4F27
U+5098 <> U+4F1E
U+5099 <> U+5907
+U+50A2 <> U+5BB6
U+50AA <> U+2B8BA
U+50AD <> U+4F63
U+50AF <> U+506C
@@ -760,11 +762,13 @@
U+53C3 <> U+53C2
U+53C4 <> U+53C1
U+53E2 <> U+4E1B
+U+53EA <> U+53EA
U+53F0 <> U+53F0
U+540C <> U+540C
U+540E <> U+540E
U+5411 <> U+5411
U+5412 <> U+54A4
+U+5413 <> U+5413
U+5433 <> U+5434
U+5436 <> U+5450
U+5442 <> U+5415
@@ -950,6 +954,7 @@
U+58FD <> U+5BFF
U+5920 <> U+591F
U+5922 <> U+68A6
+U+5925 <> U+4F19
U+593E <> U+5939
U+5950 <> U+5942
U+5967 <> U+5965
@@ -1038,6 +1043,7 @@
U+5C0E <> U+5BFC
U+5C35 <> U+2AA07
U+5C37 <> U+5C34
+U+5C38 <> U+5C38
U+5C46 <> U+5C4A
U+5C4D <> U+5C38
U+5C53 <> U+5C43
@@ -1075,6 +1081,7 @@
U+5DA2 <> U+5CE3
U+5DA4 <> U+30394
U+5DA7 <> U+5CC4
+U+5DA8 <> U+5CC3
U+5DA9 <> U+3039E
U+5DAA <> U+30391
U+5DAE <> U+5D04
@@ -1124,6 +1131,7 @@
U+5EC2 <> U+53A2
U+5EC4 <> U+53A9
U+5EC8 <> U+53A6
+U+5ECE <> U+5EBC
U+5ED4 <> U+2BDF9
U+5ED5 <> U+2BDEE
U+5ED7 <> U+303FC
@@ -1235,6 +1243,7 @@
U+61D8 <> U+30492
U+61D9 <> U+2BE6E
U+61DC <> U+227FC
+U+61DE <> U+8499
U+61DF <> U+603C
U+61E0 <> U+2BE8A
U+61E3 <> U+61D1
@@ -1268,6 +1277,7 @@
U+633E <> U+631F
U+6368 <> U+820D
U+636B <> U+626A
+U+6372 <> U+5377
U+6381 <> U+304C4
U+6383 <> U+626B
U+6384 <> U+62A1
@@ -1281,6 +1291,7 @@
U+63DA <> U+626C
U+63DB <> U+6362
U+63EE <> U+6325
+U+63FE <> U+63FE
U+640A <> U+2BF1D
U+640D <> U+635F
U+640E <> U+304E7
@@ -1303,6 +1314,7 @@
U+6472 <> U+304FC
U+6473 <> U+62A0
U+6476 <> U+629F
+U+647A <> U+6298
U+647B <> U+63BA
U+647C <> U+304F1
U+6488 <> U+635E
@@ -1425,6 +1437,7 @@
U+6703 <> U+4F1A
U+6725 <> U+266E8
U+6727 <> U+80E7
+U+6770 <> U+6770
U+6771 <> U+4E1C
U+677F <> U+677F
U+6781 <> U+6781
@@ -1708,6 +1721,7 @@
U+6FD5 <> U+6E7F
U+6FD8 <> U+6CDE
U+6FDA <> U+6E81
+U+6FDB <> U+8499
U+6FDC <> U+6D55
U+6FDF <> U+6D4E
U+6FE4 <> U+6D9B
@@ -1988,6 +2002,7 @@
U+76EA <> U+8361
U+7725 <> U+7726
U+773E <> U+4F17
+U+7740 <> U+7740
U+774D <> U+2AFA2
U+774F <> U+56F0
U+7754 <> U+2C446
@@ -2002,11 +2017,13 @@
U+779E <> U+7792
U+77A1 <> U+3096A
U+77A4 <> U+251A7
+U+77AD <> U+4E86
U+77AF <> U+30968
U+77B1 <> U+2C453
U+77B6 <> U+7786
U+77B7 <> U+2C457
U+77BC <> U+7751
+U+77C7 <> U+8499
U+77C9 <> U+2AFB8
U+77CA <> U+2C467
U+77D1 <> U+2AFA6
@@ -2017,6 +2034,7 @@
U+77DA <> U+77A9
U+77EF <> U+77EB
U+77F2 <> U+3099C
+U+7843 <> U+6731
U+785C <> U+7841
U+7864 <> U+7856
U+7868 <> U+7817
@@ -2111,6 +2129,7 @@
U+7AC4 <> U+7A9C
U+7AC5 <> U+7A8D
U+7AC7 <> U+7AA6
+U+7AC8 <> U+7076
U+7AC9 <> U+30A45
U+7ACA <> U+7A83
U+7AF1 <> U+2B05F
@@ -2169,6 +2188,7 @@
U+7C6D <> U+2C544
U+7C6E <> U+7BA9
U+7C6F <> U+30AA3
+U+7C72 <> U+5401
U+7CAF <> U+2C591
U+7CB5 <> U+7CA4
U+7CBB <> U+30AAD
@@ -2183,6 +2203,7 @@
U+7CF7 <> U+30AD6
U+7CF9 <> U+7E9F
U+7CFA <> U+2B119
+U+7CFB <> U+7CFB
U+7CFD <> U+30AFC
U+7CFE <> U+7EA0
U+7D00 <> U+7EAA
@@ -2475,6 +2496,7 @@
U+7E8F <> U+7F20
U+7E91 <> U+2E261
U+7E93 <> U+7F28
+U+7E94 <> U+624D
U+7E95 <> U+2C64B
U+7E96 <> U+7EA4
U+7E97 <> U+2B139
@@ -2619,6 +2641,7 @@
U+84FD <> U+835C
U+8504 <> U+2C72C
U+850E <> U+30C3A
+U+8514 <> U+535C
U+851E <> U+848C
U+8520 <> U+30C5B
U+8523 <> U+848B
@@ -2656,6 +2679,7 @@
U+858A <> U+84DF
U+858B <> U+30C71
U+858C <> U+8297
+U+8591 <> U+59DC
U+8594 <> U+8537
U+8596 <> U+30C3E
U+8598 <> U+8359
@@ -2670,6 +2694,7 @@
U+85B5 <> U+44D3
U+85BA <> U+8360
U+85C7 <> U+30C20
+U+85C9 <> U+501F
U+85CD <> U+84DD
U+85CE <> U+8369
U+85D6 <> U+2C73E
@@ -2680,6 +2705,7 @@
U+85E5 <> U+836F
U+85EA <> U+85AE
U+85EC <> U+2C798
+U+85ED <> U+44D6
U+85F0 <> U+30C39
U+85F6 <> U+82C8
U+85F7 <> U+2B244
@@ -2780,6 +2806,7 @@
U+8836 <> U+8695
U+883B <> U+86EE
U+883E <> U+2744F
+U+884A <> U+8511
U+8853 <> U+672F
U+8855 <> U+540C
U+885A <> U+80E1
@@ -2791,7 +2818,7 @@
U+88CC <> U+2C852
U+88DC <> U+8865
U+88DD <> U+88C5
-U+88E1 <> U+91CC
+U+88E1 <> U+88E1
U+88F2 <> U+2E581
U+88FD <> U+5236
U+8907 <> U+590D
@@ -3454,6 +3481,7 @@
U+8FAE <> U+8FAB
U+8FAF <> U+8FA9
U+8FB2 <> U+519C
+U+8FF4 <> U+56DE
U+9015 <> U+8FF3
U+9019 <> U+8FD9
U+9023 <> U+8FDE
@@ -3522,6 +3550,7 @@
U+91C1 <> U+8845
U+91C3 <> U+917E
U+91C5 <> U+917D
+U+91C7 <> U+91C7
U+91CB <> U+91CA
U+91D0 <> U+5398
U+91D2 <> U+9485
@@ -3863,7 +3892,7 @@
U+93C2 <> U+30F5C
U+93C3 <> U+955E
U+93C6 <> U+28C4C
-U+93C7 <> U+955F
+U+93C7 <> U+65CB
U+93C8 <> U+94FE
U+93C9 <> U+28C52
U+93CC <> U+9546
@@ -4016,7 +4045,7 @@
U+959F <> U+2E932
U+95A1 <> U+9602
U+95A3 <> U+9601
-U+95A4 <> U+2CBA4
+U+95A4 <> U+5408
U+95A5 <> U+9600
U+95A6 <> U+2CBA5
U+95A7 <> U+2CBA2
@@ -4120,6 +4149,7 @@
U+9780 <> U+9F17
U+978F <> U+5DE9
U+979D <> U+7EF1
+U+97A6 <> U+79CB
U+97B8 <> U+31074
U+97BB <> U+3107A
U+97BC <> U+31079
@@ -4127,7 +4157,7 @@
U+97BE <> U+2B587
U+97C1 <> U+7F30
U+97C3 <> U+9791
-U+97C6 <> U+31076
+U+97C6 <> U+5343
U+97C7 <> U+31077
U+97C9 <> U+97AF
U+97CA <> U+3107E
@@ -5037,6 +5067,7 @@
U+9EDE <> U+70B9
U+9EE8 <> U+515A
U+9EF2 <> U+9EEA
+U+9EF4 <> U+9709
U+9EF6 <> U+9EE1
U+9EF7 <> U+9EE9
U+9EF8 <> U+312F6
@@ -5050,6 +5081,7 @@
U+9F08 <> U+31307
U+9F09 <> U+9F0D
U+9F0A <> U+31309
+U+9F15 <> U+51AC
U+9F1A <> U+3130A
U+9F32 <> U+3130F
U+9F34 <> U+9F39
@@ -5119,7 +5151,7 @@
U+9FBD <> U+307B3
U+9FC1 <> U+4724
U+9FD0 <> U+4CA4
-U+9FD2 <> U+9FD3
+U+9FD3 <> U+9FD2
U+20054 <> U+2BDD8
U+2005E <> U+2003E
U+20325 <> U+201BF
@@ -5662,6 +5694,7 @@
U+2844A <> U+2BBD2
U+2860C <> U+2CA4E
U+287A8 <> U+28755
+U+287AA <> U+2B737
U+287BA <> U+2B7EB
U+287CA <> U+2B7EC
U+288BF <> U+28859
@@ -5681,6 +5714,7 @@
U+2897A <> U+2CB42
U+289A1 <> U+30F7D
U+289AB <> U+4980
+U+289B1 <> U+30F8A
U+289C0 <> U+2CB4A
U+289D0 <> U+30F87
U+289DA <> U+2CB50
Modified: trunk/Master/texmf-dist/fonts/misc/xetex/fontmapping/xecjk/han-simp.tec
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/misc/xetex/fontmapping/xecjk/han-trad.map
===================================================================
--- trunk/Master/texmf-dist/fonts/misc/xetex/fontmapping/xecjk/han-trad.map 2022-06-04 20:25:35 UTC (rev 63485)
+++ trunk/Master/texmf-dist/fonts/misc/xetex/fontmapping/xecjk/han-trad.map 2022-06-04 20:26:21 UTC (rev 63486)
@@ -2,8 +2,8 @@
; from the Unicode Unihan database: <http://www.unicode.org/Public/UNIDATA/Unihan.zip>
;
; Unihan_Variants.txt
-; Date: 2020-02-18 18:27:33 GMT [JHJ]
-; Unicode version: 13.0.0
+; Date: 2021-08-06 16:32:36 GMT [JHJ]
+; Unicode version: 14.0.0
;
LHSName "simplified"
@@ -107,6 +107,7 @@
U+442A <> U+81C7
U+44D3 <> U+85B5
U+44D5 <> U+85B3
+U+44D6 <> U+85ED
U+45BC <> U+27355
U+45D6 <> U+87AE
U+461B <> U+2775E
@@ -190,10 +191,12 @@
U+4E66 <> U+66F8
U+4E70 <> U+8CB7
U+4E71 <> U+4E82
+U+4E7E <> U+4E7E
+U+4E86 <> U+77AD
U+4E89 <> U+722D
U+4E8E <> U+65BC
U+4E8F <> U+8667
-U+4E91 <> U+96F2
+U+4E91 <> U+4E91
U+4E9A <> U+4E9E
U+4EA7 <> U+7522
U+4EA9 <> U+755D
@@ -211,6 +214,7 @@
U+4EF7 <> U+50F9
U+4F17 <> U+773E
U+4F18 <> U+512A
+U+4F19 <> U+5925
U+4F1A <> U+6703
U+4F1B <> U+50B4
U+4F1E <> U+5098
@@ -244,6 +248,7 @@
U+4FEA <> U+5137
U+4FEB <> U+5008
U+4FED <> U+5109
+U+501F <> U+85C9
U+503A <> U+50B5
U+503E <> U+50BE
U+506C <> U+50AF
@@ -272,6 +277,7 @@
U+5199 <> U+5BEB
U+519B <> U+8ECD
U+519C <> U+8FB2
+U+51AC <> U+9F15
U+51AF <> U+99AE
U+51B2 <> U+6C96
U+51B3 <> U+6C7A
@@ -329,14 +335,17 @@
U+532E <> U+5331
U+533A <> U+5340
U+533B <> U+91AB
+U+5343 <> U+97C6
U+534E <> U+83EF
U+534F <> U+5354
U+5355 <> U+55AE
U+5356 <> U+8CE3
+U+535C <> U+8514
U+5362 <> U+76E7
U+5364 <> U+9E75
U+536B <> U+885B
U+5374 <> U+537B
+U+5377 <> U+6372
U+5382 <> U+5EE0
U+5385 <> U+5EF3
U+5386 <> U+66C6
@@ -363,16 +372,18 @@
U+53D8 <> U+8B8A
U+53D9 <> U+6558
U+53E0 <> U+758A
-U+53EA <> U+96BB
+U+53EA <> U+53EA
U+53F0 <> U+53F0
U+53F6 <> U+8449
U+53F7 <> U+865F
U+53F9 <> U+5606
U+53FD <> U+5630
+U+5401 <> U+7C72
+U+5408 <> U+95A4
U+540C <> U+540C
U+540E <> U+540E
U+5411 <> U+5411
-U+5413 <> U+5687
+U+5413 <> U+5413
U+5415 <> U+5442
U+5417 <> U+55CE
U+5423 <> U+551A
@@ -431,6 +442,7 @@
U+5631 <> U+56D1
U+565C <> U+5695
U+56A3 <> U+56C2
+U+56DE <> U+8FF4
U+56E2 <> U+5718
U+56ED <> U+5712
U+56F0 <> U+774F
@@ -500,6 +512,7 @@
U+59AA <> U+5AD7
U+59AB <> U+5AAF
U+59D7 <> U+59CD
+U+59DC <> U+8591
U+59F9 <> U+597C
U+5A04 <> U+5A41
U+5A05 <> U+5A6D
@@ -529,6 +542,7 @@
U+5BA1 <> U+5BE9
U+5BAA <> U+61B2
U+5BAB <> U+5BAE
+U+5BB6 <> U+50A2
U+5BBD <> U+5BEC
U+5BBE <> U+8CD3
U+5BDD <> U+5BE2
@@ -542,7 +556,7 @@
U+5C1D <> U+5617
U+5C27 <> U+582F
U+5C34 <> U+5C37
-U+5C38 <> U+5C4D
+U+5C38 <> U+5C38
U+5C3D <> U+5118
U+5C42 <> U+5C64
U+5C43 <> U+5C53
@@ -563,6 +577,7 @@
U+5CAD <> U+5DBA
U+5CBD <> U+5D2C
U+5CBF <> U+5DCB
+U+5CC3 <> U+5DA8
U+5CC4 <> U+5DA7
U+5CE1 <> U+5CFD
U+5CE3 <> U+5DA2
@@ -605,6 +620,7 @@
U+5E99 <> U+5EDF
U+5E9E <> U+9F90
U+5E9F <> U+5EE2
+U+5EBC <> U+5ECE
U+5EEA <> U+5EE9
U+5F00 <> U+958B
U+5F02 <> U+7570
@@ -628,6 +644,7 @@
U+5F84 <> U+5F91
U+5F95 <> U+5FA0
U+5FA1 <> U+79A6
+U+5FA9 <> U+5FA9
U+5FB5 <> U+5FB5
U+5FC6 <> U+61B6
U+5FCF <> U+61FA
@@ -687,6 +704,7 @@
U+622C <> U+6229
U+622F <> U+6231
U+6237 <> U+6236
+U+624D <> U+7E94
U+6251 <> U+64B2
U+6267 <> U+57F7
U+6269 <> U+64F4
@@ -694,6 +712,7 @@
U+626B <> U+6383
U+626C <> U+63DA
U+6270 <> U+64FE
+U+6298 <> U+647A
U+629A <> U+64AB
U+629B <> U+62CB
U+629F <> U+6476
@@ -741,7 +760,7 @@
U+63BA <> U+647B
U+63BC <> U+645C
U+63FD <> U+652C
-U+63FE <> U+6435
+U+63FE <> U+63FE
U+63FF <> U+64B3
U+6400 <> U+6519
U+6401 <> U+64F1
@@ -772,6 +791,7 @@
U+6597 <> U+9B25
U+65A9 <> U+65AC
U+65AD <> U+65B7
+U+65CB <> U+93C7
U+65E0 <> U+7121
U+65E7 <> U+820A
U+65F6 <> U+6642
@@ -792,6 +812,7 @@
U+66A7 <> U+66D6
U+66F2 <> U+66F2
U+672F <> U+8853
+U+6731 <> U+7843
U+6734 <> U+6A38
U+673A <> U+6A5F
U+6740 <> U+6BBA
@@ -1010,6 +1031,7 @@
U+706D <> U+6EC5
U+706F <> U+71C8
U+7075 <> U+9748
+U+7076 <> U+7AC8
U+707E <> U+707D
U+707F <> U+71E6
U+7080 <> U+716C
@@ -1134,7 +1156,7 @@
U+770D <> U+7798
U+7726 <> U+7725
U+772C <> U+77D3
-U+7740 <> U+8457
+U+7740 <> U+7740
U+7741 <> U+775C
U+7750 <> U+775E
U+7751 <> U+77BC
@@ -1141,6 +1163,7 @@
U+7786 <> U+77B6
U+7792 <> U+779E
U+77A9 <> U+77DA
+U+77AD <> U+77AD
U+77EB <> U+77EF
U+77F6 <> U+78EF
U+77FE <> U+792C
@@ -1180,6 +1203,7 @@
U+79BB <> U+96E2
U+79C3 <> U+79BF
U+79C6 <> U+7A08
+U+79CB <> U+97A6
U+79CD <> U+7A2E
U+79EF <> U+7A4D
U+79F0 <> U+7A31
@@ -1531,11 +1555,13 @@
U+8426 <> U+7E08
U+8427 <> U+856D
U+8428 <> U+85A9
+U+8457 <> U+8457
U+8471 <> U+8525
U+8487 <> U+8546
U+8489 <> U+8562
U+848B <> U+8523
U+848C <> U+851E
+U+8499 <> U+61DE
U+84DD <> U+85CD
U+84DF <> U+858A
U+84E0 <> U+863A
@@ -1543,6 +1569,7 @@
U+84E5 <> U+93A3
U+84E6 <> U+9A40
U+8502 <> U+8646
+U+8511 <> U+884A
U+8537 <> U+8594
U+8539 <> U+861E
U+853A <> U+85FA
@@ -1551,6 +1578,7 @@
U+8572 <> U+8604
U+8574 <> U+860A
U+85AE <> U+85EA
+U+85C9 <> U+85C9
U+85D3 <> U+861A
U+8616 <> U+6AF1
U+864F <> U+865C
@@ -1603,6 +1631,7 @@
U+88C5 <> U+88DD
U+88C6 <> U+8960
U+88C8 <> U+890C
+U+88E1 <> U+88E1
U+88E2 <> U+8933
U+88E3 <> U+895D
U+88E4 <> U+8932
@@ -1611,6 +1640,7 @@
U+891D <> U+894C
U+8934 <> U+8964
U+8955 <> U+8974
+U+8986 <> U+8986
U+89C1 <> U+898B
U+89C2 <> U+89C0
U+89C3 <> U+898E
@@ -2316,6 +2346,7 @@
U+96F3 <> U+9742
U+96FE <> U+9727
U+9701 <> U+973D
+U+9709 <> U+9EF4
U+9721 <> U+9722
U+972D <> U+9744
U+9753 <> U+975A
@@ -2745,7 +2776,7 @@
U+9F9F <> U+9F9C
U+9FCE <> U+40EE
U+9FCF <> U+4951
-U+9FD3 <> U+9FD2
+U+9FD2 <> U+9FD3
U+9FD4 <> U+93B6
U+9FD5 <> U+311A5
U+9FED <> U+9268
@@ -3723,6 +3754,7 @@
U+2B730 <> U+9F7E
U+2B732 <> U+9F93
U+2B733 <> U+4DB2
+U+2B737 <> U+287AA
U+2B748 <> U+346E
U+2B74B <> U+2040A
U+2B761 <> U+214D7
@@ -5740,6 +5772,7 @@
U+30F87 <> U+289D0
U+30F88 <> U+492C
U+30F89 <> U+2B4A2
+U+30F8A <> U+289B1
U+30F8B <> U+9FB2
U+30F8C <> U+93E9
U+30F8D <> U+9336
Modified: trunk/Master/texmf-dist/fonts/misc/xetex/fontmapping/xecjk/han-trad.tec
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
===================================================================
--- trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx 2022-06-04 20:25:35 UTC (rev 63485)
+++ trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx 2022-06-04 20:26:21 UTC (rev 63486)
@@ -26,8 +26,8 @@
---------------------
Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
- Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
- Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
+ Copyright (C) 2009--2022 by Leo Liu <leoliu.pku at gmail.com>
+ Copyright (C) 2012--2022 by Qing Lee <sobenlee at gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
@@ -92,8 +92,8 @@
\preamble
Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
- Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
- Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
+ Copyright (C) 2009--2022 by Leo Liu <leoliu.pku at gmail.com>
+ Copyright (C) 2012--2022 by Qing Lee <sobenlee at gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
@@ -194,7 +194,7 @@
%<*package|config|fntef|listings|xunicode|xunextra>
%<!(config|xunextra)>\NeedsTeXFormat{LaTeX2e}
%<!(config|xunextra)>\RequirePackage{expl3}
-%<+!driver>\GetIdInfo$Id: xeCJK.dtx d45555d 2021-12-12 18:20:36 +0800 Qing Lee <sobenlee at gmail.com> $
+%<+!driver>\GetIdInfo$Id: xeCJK.dtx de49417 2022-06-04 19:40:54 +0800 Qing Lee <sobenlee at gmail.com> $
%<package> {Typesetting CJK scripts with XeLaTeX}
%<config> {Configuration file for xeCJK package}
%<fntef> {xeCJK font effect}
@@ -207,7 +207,7 @@
%<listings>\ProvidesExplPackage{xeCJK-listings}
%<xunicode>\ProvidesExplPackage{xunicode-addon}
%<xunextra>\ProvidesExplFile{xunicode-extra.def}
-%<!driver> {\ExplFileDate}{3.8.8}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{3.8.9}{\ExplFileDescription}
%</package|config|fntef|listings|xunicode|xunextra>
%<*driver>
\documentclass{ctxdoc}
@@ -287,7 +287,7 @@
% \changes{v3.8.0}{2020/02/09}{清理过时的兼容性补丁代码。}
% \changes{v3.8.3}{2020/04/07}{删除 \texttt{\_nopar}。}
%
-% \CheckSum{10934}
+% \CheckSum{10962}
% \GetFileId{xeCJK.sty}
%
% \title{\bfseries\pkg{xeCJK} 宏包}
@@ -380,11 +380,10 @@
% \end{ctexexam}
% \end{function}
%
-% 有些选项或命令后面带有 \exptarget\expstar{} 号，这表示这
-% 个选项或命令只能在导言区中使用，而 \rexptarget\rexpstar{}
-% 号则表示这个选项或命令只能在导言区使用，并且只影响随后定义的 CJK 字体。其余不带特殊标记的
-% 选项或命令，如果没有特别说明，可以在导言区或正文中使用。%
-% 使用粗体来表示 \pkg{xeCJK} 的默认设置。
+% 带有 \exptarget\expstar{} 或者 \rexptarget\rexpstar{} 标记的选项或命令
+% 只能在导言区中使用，其中 \rexptarget\rexpstar{} 还表示这个选项或命令只
+% 影响随后定义的 CJK 字体。其余不带特殊标记的选项或命令，如果没有特别说明，
+% 则可以在导言区或正文中使用。\textbf{粗体}表示 \pkg{xeCJK} 的默认设置。
%
% \begin{function}[EXP,added=2012-11-22]{LocalConfig}
% \begin{syntax}
@@ -3733,7 +3732,7 @@
{
\@@_punct_if_middle:NTF \g_@@_last_punct_tl
{
- \@@_punct_bound_rule:NN \c_@@_right_tl \g_@@_last_punct_tl
+ \@@_punct_rule:NN \c_@@_right_tl \g_@@_last_punct_tl
\xeCJK_class_group_end:
\exp_after:wN \xeCJK_punct_node:N \g_@@_last_punct_tl
\xeCJK_no_break:
@@ -4007,7 +4006,7 @@
{
\@@_punct_if_middle:NTF \g_@@_last_punct_tl
{
- \@@_punct_bound_rule:NN \c_@@_right_tl \g_@@_last_punct_tl
+ \@@_punct_rule:NN \c_@@_right_tl \g_@@_last_punct_tl
\xeCJK_no_break:
\@@_punct_glue:NN \c_@@_left_tl \g_@@_last_punct_tl
}
@@ -4026,7 +4025,7 @@
{
\@@_punct_if_middle:NTF \g_@@_last_punct_tl
{
- \@@_punct_bound_rule:NN \c_@@_right_tl \g_@@_last_punct_tl
+ \@@_punct_rule:NN \c_@@_right_tl \g_@@_last_punct_tl
\xeCJK_class_group_end: \xeCJK_no_break:
\@@_punct_glue:NN \c_@@_left_tl \g_@@_last_punct_tl
}
@@ -4157,27 +4156,43 @@
%
% \begin{macro}{\@@_bound_type_1_glue:Nn}
% \changes{v3.8.5}{2020/06/26}{增加盒子高度判断。}
+% \changes{v3.8.9}{2022/05/26}{增加位于段首的支架盒子判断。}
% $1$ 表示 hlist node，在这里用来判断是否位于段首。基于正常情况下，\TeX 会在段落开头插入宽度为
% \tn{parindent} 的水平盒子用于缩进。
% \begin{macrocode}
\cs_new_protected:cpn { @@_bound_type_ 1 _glue:Nn } #1
{
- \box_set_to_last:N \l_@@_tmp_box
+ \int_do_while:nNnn \tex_lastnodetype:D = \c_one_int
+ { \@@_bound_hbox_auxi: }
\int_compare:nNnTF \tex_lastnodetype:D = { -1 }
{
- \dim_compare:nNnTF
- { \box_wd:N \l_@@_tmp_box } = \tex_parindent:D
+ \dim_case:nnF { \box_wd:N \l_@@_indent_box }
{
- \dim_compare:nNnTF
- { \box_ht:N \l_@@_tmp_box } = \c_zero_dim
- { \use_i:nn }
- { \use:nn }
+ { \tex_parindent:D } { \@@_bound_hbox_auxii:nn }
+ { \c_zero_dim } { \use_i:nn }
}
{ \use:nn }
}
{ \use:nn }
- { \box_use_drop:N \l_@@_tmp_box }
+ { \hbox_unpack_drop:N \l_@@_indent_box }
}
+\cs_new_protected:Npn \@@_bound_hbox_auxi:
+ {
+ \box_set_to_last:N \l_@@_tmp_box
+ \hbox_set:Nn \l_@@_indent_box
+ {
+ \box_use:N \l_@@_tmp_box
+ \hbox_unpack:N \l_@@_indent_box
+ }
+ }
+\cs_new_protected:Npn \@@_bound_hbox_auxii:nn
+ {
+ \dim_compare:nNnTF
+ { \box_ht:N \l__xeCJK_tmp_box } = \c_zero_dim
+ { \use_i:nn }
+ { \use:nn }
+ }
+\box_new:N \l_@@_indent_box
% \end{macrocode}
% \end{macro}
%
@@ -4478,7 +4493,7 @@
{
\CJKglue
\@@_punct_glue:NN \c_@@_right_tl #1
- \@@_punct_bound_rule:NN \c_@@_left_tl #1
+ \@@_punct_rule:NN \c_@@_left_tl #1
}
}
\cs_new_protected:Npn \@@_Default_and_FullRight_glue:N #1
@@ -4489,7 +4504,7 @@
\@@_punct_if_middle:NT #1
{
\@@_punct_glue:NN \c_@@_right_tl #1
- \@@_punct_bound_rule:NN \c_@@_left_tl #1
+ \@@_punct_rule:NN \c_@@_left_tl #1
}
}
% \end{macrocode}
@@ -5494,10 +5509,11 @@
{ \exp_last_unbraced:NNo \xeCJK_get_punct_bounds:NN }
\cs_new_protected:Npn \@@_save_punct_margin_plain:NN #1#2
{
- \@@_save_punct_dim:nNNn { rule } #1 #2 { \c_zero_dim }
\@@_save_punct_dim:nNNn { glue } #1 #2 { \c_zero_dim }
\@@_save_punct_dim:nNNn { offset } #1 #2 { \c_zero_dim }
\@@_save_punct_dim:nNNn { margin } #1 #2 { \c_zero_dim }
+ \@@_save_punct_dim:nNNn { rule } \c_@@_left_tl {#2} { \c_zero_dim }
+ \@@_save_punct_dim:nNNn { rule } \c_@@_right_tl {#2} { \c_zero_dim }
\@@_save_punct_dim:nNNn { bound } \c_@@_left_tl {#2} { \c_zero_dim }
\@@_save_punct_dim:nNNn { bound } \c_@@_right_tl {#2} { \c_zero_dim }
\@@_save_punct_skip:nNNn { glue } #1 #2 { \c_zero_skip }
@@ -5511,13 +5527,11 @@
\group_end:
\dim_set:Nn \l_@@_bound_dim
{ \@@_use_punct_dim:nNN { bound } #1 #2 }
+ \tl_if_eq:NNTF #1 \c_@@_right_tl
+ { \tl_set_eq:NN \l_@@_reverse_tl \c_@@_left_tl }
+ { \tl_set_eq:NN \l_@@_reverse_tl \c_@@_right_tl }
\dim_set:Nn \l_@@_reverse_bound_dim
- {
- \tl_if_eq:NNTF #1 \c_@@_left_tl
- { \@@_use_punct_dim:nNN { bound } \c_@@_right_tl }
- { \@@_use_punct_dim:nNN { bound } \c_@@_left_tl }
- #2
- }
+ { \@@_use_punct_dim:nNN { bound } \l_@@_reverse_tl #2 }
\UseInstance { xeCJK / punctuation } { \l_xeCJK_punct_style_tl }
\xeCJK_punct_margin_process:NN #1 #2
\xeCJK_punct_offset_process:NN #1 #2
@@ -5524,6 +5538,7 @@
\@@_punct_if_long:NT #2
{ \@@_long_punct_kerning:N #2 }
}
+\tl_new:N \l_@@_reverse_tl
\dim_new:N \l_@@_bound_dim
\dim_new:N \l_@@_reverse_bound_dim
% \end{macrocode}
@@ -5680,10 +5695,8 @@
\dim_compare:nNnTF \l_@@_middle_margin_width_dim < \c_max_dim
{ \l_@@_middle_margin_width_dim }
{
- \fp_use:N \l_@@_middle_margin_ratio_fp
- \tex_dimexpr:D
- ( \l_@@_bound_dim + \l_@@_reverse_bound_dim ) / 2
- \scan_stop:
+ \@@_dim_ratio:Nn \l_@@_middle_margin_ratio_fp
+ { ( \l_@@_bound_dim + \l_@@_reverse_bound_dim ) / 2 }
}
}
{
@@ -5695,6 +5708,16 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\@@_dim_ratio:Nn}
+% \begin{macrocode}
+\cs_new:Npn \@@_dim_ratio:Nn #1#2
+ { \fp_to_dim:n { #1 \dim_to_fp:n {#2} } }
+\cs_generate_variant:Nn \@@_dim_ratio:Nn { c }
+% \end{macrocode}
+% \end{macro}
+%
+% \changes{v3.8.9}{2022/05/26}{修正居中标点悬挂错误。}
+%
% \begin{macro}[int]{\xeCJK_punct_offset_process:NN}
% \begin{macrocode}
\cs_new_protected:Npn \xeCJK_punct_offset_process:NN #1#2
@@ -5744,6 +5767,8 @@
{ \l_@@_tmp_dim }
\@@_save_punct_dim:nNNn { rule } #1 #2
{ \l_@@_tmp_dim - \l_@@_bound_dim }
+ \@@_save_punct_dim:nNNn { rule } \l_@@_reverse_tl #2
+ { \l_@@_tmp_dim - \l_@@_reverse_bound_dim }
\@@_save_punct_dim:nNNn { glue } #1 #2
{ \l_@@_margin_dim - \l_@@_tmp_dim }
\@@_save_punct_skip:nNNnnn { glue } #1 #2
@@ -5759,7 +5784,7 @@
}
{
\@@_punct_if_middle:NTF #2
- { .5 \l_@@_margin_dim }
+ { \l_@@_margin_dim / 2 }
{ \l_@@_margin_dim - \l_@@_reverse_bound_dim }
}
}
@@ -5779,8 +5804,9 @@
\fp_if_nan:nTF { \use:c { l_@@_#1_punct_ratio_fp } }
{ \c_max_dim }
{
- \fp_use:c { l_@@_#1_punct_ratio_fp }
- \tex_dimexpr:D \@@_use_punct_dim:nN { width } #2 \scan_stop:
+ \@@_dim_ratio:cn
+ { l_@@_#1_punct_ratio_fp }
+ { \@@_use_punct_dim:nN { width } #2 }
}
}
}
@@ -5794,8 +5820,9 @@
\dim_compare:nNnTF { \use:c { l_@@_#1_margin_width_dim } } < \c_max_dim
{ \use:c { l_@@_#1_margin_width_dim } }
{
- \fp_use:c { l_@@_#1_margin_ratio_fp }
- \tex_dimexpr:D \l_@@_bound_dim \scan_stop:
+ \@@_dim_ratio:cn
+ { l_@@_#1_margin_ratio_fp }
+ { \l_@@_bound_dim }
}
\bool_if:NT \l_@@_add_min_bound_to_margin_bool
{ + \dim_min:nn \l_@@_bound_dim \l_@@_reverse_bound_dim }
@@ -5928,11 +5955,11 @@
{
\@@_calc_kerning_margin:nNN
{
- \fp_use:N \l_@@_kerning_total_ratio_fp
- \tex_dimexpr:D
- \@@_use_punct_dim:nN { width } #1 +
- \@@_use_punct_dim:nN { width } #2
- \scan_stop:
+ \@@_dim_ratio:Nn \l_@@_kerning_total_ratio_fp
+ {
+ \@@_use_punct_dim:nN { width } #1 +
+ \@@_use_punct_dim:nN { width } #2
+ }
}
}
}
@@ -5952,9 +5979,9 @@
{
\dim_compare:nNnTF \l_@@_kerning_margin_width_dim < \c_max_dim
{ \l_@@_kerning_margin_width_dim \use_none:n }
- { \fp_use:N \l_@@_kerning_margin_ratio_fp \use:n }
+ { \@@_dim_ratio:Nn \l_@@_kerning_margin_ratio_fp }
}
- { \fp_use:c { l_@@_#1_align_ratio_fp } \use:n }
+ { \@@_dim_ratio:cn { l_@@_#1_align_ratio_fp } }
{ \l_@@_margin_dim }
}
}
@@ -7886,7 +7913,7 @@
}
{
\skip_set_eq:NN \l_@@_ccglue_skip \l_@@_verb_exspace_skip
- \skip_set:Nn \l_@@_ecglue_skip { .5 \l_@@_verb_exspace_skip }
+ \skip_set:Nn \l_@@_ecglue_skip { \l_@@_verb_exspace_skip / 2 }
\cs_set_eq:NN \CJKglue \@@_nobreak_ccglue:
\cs_set_eq:NN \CJKecglue \@@_nobreak_ecglue:
}
@@ -8505,13 +8532,13 @@
% 使主要 |CJK| 字体族能随西文主要字体更新，之后的版本可以使用 \tn{@rmfamilyhook} 等新钩子处理。
% \LaTeXe\ 2020/10/01 提供了新的的 \pkg{NFSS} 钩子。
% \begin{macrocode}
-\@ifl at t@r \fmtversion { 2020/10/01 }
+\ctex_if_format_at_least:nTF { 2020/10/01 }
{
\cs_set_eq:NN \xeCJK at family \xeCJK_switch_family:x
- \AddToHook { rmfamily } { \xeCJK at family { \CJKrmdefault } }
- \AddToHook { sffamily } { \xeCJK at family { \CJKsfdefault } }
- \AddToHook { ttfamily } { \xeCJK at family { \CJKttdefault } }
- \AddToHook { normalfont } { \xeCJK at family { \CJKfamilydefault } }
+ \ctex_gadd_ltxhook:nn { rmfamily } { \xeCJK at family { \CJKrmdefault } }
+ \ctex_gadd_ltxhook:nn { sffamily } { \xeCJK at family { \CJKsfdefault } }
+ \ctex_gadd_ltxhook:nn { ttfamily } { \xeCJK at family { \CJKttdefault } }
+ \ctex_gadd_ltxhook:nn { normalfont } { \xeCJK at family { \CJKfamilydefault } }
}
{
\cs_if_exist:NTF \@rmfamilyhook
@@ -9668,7 +9695,7 @@
\@@_punct_if_middle:NT #1
{
\@@_punct_glue:NN \c_@@_right_tl #1
- \@@_punct_bound_rule:NN \c_@@_left_tl #1
+ \@@_punct_rule:NN \c_@@_left_tl #1
}
\UL at start
}
@@ -9694,7 +9721,7 @@
{
\@@_ulem_punct_ccglue:
\@@_punct_glue:NN \c_@@_right_tl #1
- \@@_punct_bound_rule:NN \c_@@_left_tl #1
+ \@@_punct_rule:NN \c_@@_left_tl #1
}
\UL at start
\@@_ulem_class_group_begin:
@@ -9714,7 +9741,7 @@
\@@_punct_if_middle:NTF \g_@@_last_punct_tl
{
\xeCJK_get_punct_bounds:No \c_@@_left_tl \g_@@_last_punct_tl
- \@@_punct_bound_rule:NN \c_@@_right_tl \g_@@_last_punct_tl
+ \@@_punct_rule:NN \c_@@_right_tl \g_@@_last_punct_tl
\xeCJK_class_group_end: \UL at stop \xeCJK_no_break:
\@@_punct_glue:NN \c_@@_left_tl \g_@@_last_punct_tl
}
@@ -9737,7 +9764,7 @@
\@@_punct_if_middle:NTF \g_@@_last_punct_tl
{
\xeCJK_get_punct_bounds:No \c_@@_left_tl \g_@@_last_punct_tl
- \@@_punct_bound_rule:NN \c_@@_right_tl \g_@@_last_punct_tl
+ \@@_punct_rule:NN \c_@@_right_tl \g_@@_last_punct_tl
\xeCJK_class_group_end: \UL at stop \xeCJK_no_break:
\@@_punct_glue:NN \c_@@_left_tl \g_@@_last_punct_tl
}
Modified: trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
===================================================================
--- trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins 2022-06-04 20:25:35 UTC (rev 63485)
+++ trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins 2022-06-04 20:26:21 UTC (rev 63486)
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `install')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
-%% Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
-%% Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
+%% Copyright (C) 2009--2022 by Leo Liu <leoliu.pku at gmail.com>
+%% Copyright (C) 2012--2022 by Qing Lee <sobenlee at gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -33,8 +33,8 @@
\preamble
Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
- Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
- Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
+ Copyright (C) 2009--2022 by Leo Liu <leoliu.pku at gmail.com>
+ Copyright (C) 2012--2022 by Qing Lee <sobenlee at gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty 2022-06-04 20:25:35 UTC (rev 63485)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty 2022-06-04 20:26:21 UTC (rev 63486)
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `listings')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
-%% Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
-%% Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
+%% Copyright (C) 2009--2022 by Leo Liu <leoliu.pku at gmail.com>
+%% Copyright (C) 2012--2022 by Qing Lee <sobenlee at gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx d45555d 2021-12-12 18:20:36 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx de49417 2022-06-04 19:40:54 +0800 Qing Lee <sobenlee at gmail.com> $
{xeCJK patch file for listings}
\ProvidesExplPackage{xeCJK-listings}
- {\ExplFileDate}{3.8.8}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.9}{\ExplFileDescription}
\DeclareOption* { \PassOptionsToPackage { \CurrentOption } { xeCJK } }
\ProcessOptions \scan_stop:
\RequirePackage { xeCJK }
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg 2022-06-04 20:25:35 UTC (rev 63485)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg 2022-06-04 20:26:21 UTC (rev 63486)
@@ -6,10 +6,10 @@
%%
%% xeCJK.dtx (with options: `config')
%%
-\GetIdInfo$Id: xeCJK.dtx d45555d 2021-12-12 18:20:36 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx de49417 2022-06-04 19:40:54 +0800 Qing Lee <sobenlee at gmail.com> $
{Configuration file for xeCJK package}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{3.8.8}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.9}{\ExplFileDescription}
%%
%%
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty 2022-06-04 20:25:35 UTC (rev 63485)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty 2022-06-04 20:26:21 UTC (rev 63486)
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `package')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
-%% Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
-%% Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
+%% Copyright (C) 2009--2022 by Leo Liu <leoliu.pku at gmail.com>
+%% Copyright (C) 2012--2022 by Qing Lee <sobenlee at gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx d45555d 2021-12-12 18:20:36 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx de49417 2022-06-04 19:40:54 +0800 Qing Lee <sobenlee at gmail.com> $
{Typesetting CJK scripts with XeLaTeX}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{3.8.8}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.9}{\ExplFileDescription}
\msg_new:nnn { xeCJK } { Require-XeTeX }
{
The~xeCJK~package~requires~XeTeX~to~function.\\\\
@@ -1169,7 +1169,7 @@
{
\__xeCJK_punct_if_middle:NTF \g__xeCJK_last_punct_tl
{
- \__xeCJK_punct_bound_rule:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
+ \__xeCJK_punct_rule:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\xeCJK_class_group_end:
\exp_after:wN \xeCJK_punct_node:N \g__xeCJK_last_punct_tl
\xeCJK_no_break:
@@ -1348,7 +1348,7 @@
{
\__xeCJK_punct_if_middle:NTF \g__xeCJK_last_punct_tl
{
- \__xeCJK_punct_bound_rule:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
+ \__xeCJK_punct_rule:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\xeCJK_no_break:
\__xeCJK_punct_glue:NN \c__xeCJK_left_tl \g__xeCJK_last_punct_tl
}
@@ -1359,7 +1359,7 @@
{
\__xeCJK_punct_if_middle:NTF \g__xeCJK_last_punct_tl
{
- \__xeCJK_punct_bound_rule:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
+ \__xeCJK_punct_rule:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\xeCJK_class_group_end: \xeCJK_no_break:
\__xeCJK_punct_glue:NN \c__xeCJK_left_tl \g__xeCJK_last_punct_tl
}
@@ -1444,22 +1444,37 @@
{ \__xeCJK_zero_glue: }
\cs_new_protected:cpn { __xeCJK_bound_type_ 1 _glue:Nn } #1
{
- \box_set_to_last:N \l__xeCJK_tmp_box
+ \int_do_while:nNnn \tex_lastnodetype:D = \c_one_int
+ { \__xeCJK_bound_hbox_auxi: }
\int_compare:nNnTF \tex_lastnodetype:D = { -1 }
{
- \dim_compare:nNnTF
- { \box_wd:N \l__xeCJK_tmp_box } = \tex_parindent:D
+ \dim_case:nnF { \box_wd:N \l__xeCJK_indent_box }
{
- \dim_compare:nNnTF
- { \box_ht:N \l__xeCJK_tmp_box } = \c_zero_dim
- { \use_i:nn }
- { \use:nn }
+ { \tex_parindent:D } { \__xeCJK_bound_hbox_auxii:nn }
+ { \c_zero_dim } { \use_i:nn }
}
{ \use:nn }
}
{ \use:nn }
- { \box_use_drop:N \l__xeCJK_tmp_box }
+ { \hbox_unpack_drop:N \l__xeCJK_indent_box }
}
+\cs_new_protected:Npn \__xeCJK_bound_hbox_auxi:
+ {
+ \box_set_to_last:N \l__xeCJK_tmp_box
+ \hbox_set:Nn \l__xeCJK_indent_box
+ {
+ \box_use:N \l__xeCJK_tmp_box
+ \hbox_unpack:N \l__xeCJK_indent_box
+ }
+ }
+\cs_new_protected:Npn \__xeCJK_bound_hbox_auxii:nn
+ {
+ \dim_compare:nNnTF
+ { \box_ht:N \l__xeCJK_tmp_box } = \c_zero_dim
+ { \use_i:nn }
+ { \use:nn }
+ }
+\box_new:N \l__xeCJK_indent_box
\cs_new_protected:cpn { __xeCJK_bound_type_ 11 _glue:Nn } #1#2
{
\skip_if_finite:nTF { \tex_lastskip:D }
@@ -1692,7 +1707,7 @@
{
\CJKglue
\__xeCJK_punct_glue:NN \c__xeCJK_right_tl #1
- \__xeCJK_punct_bound_rule:NN \c__xeCJK_left_tl #1
+ \__xeCJK_punct_rule:NN \c__xeCJK_left_tl #1
}
}
\cs_new_protected:Npn \__xeCJK_Default_and_FullRight_glue:N #1
@@ -1703,7 +1718,7 @@
\__xeCJK_punct_if_middle:NT #1
{
\__xeCJK_punct_glue:NN \c__xeCJK_right_tl #1
- \__xeCJK_punct_bound_rule:NN \c__xeCJK_left_tl #1
+ \__xeCJK_punct_rule:NN \c__xeCJK_left_tl #1
}
}
\cs_new_protected:Npn \xeCJK_FullLeft_and_FullLeft:N #1
@@ -2423,10 +2438,11 @@
{ \exp_last_unbraced:NNo \xeCJK_get_punct_bounds:NN }
\cs_new_protected:Npn \__xeCJK_save_punct_margin_plain:NN #1#2
{
- \__xeCJK_save_punct_dim:nNNn { rule } #1 #2 { \c_zero_dim }
\__xeCJK_save_punct_dim:nNNn { glue } #1 #2 { \c_zero_dim }
\__xeCJK_save_punct_dim:nNNn { offset } #1 #2 { \c_zero_dim }
\__xeCJK_save_punct_dim:nNNn { margin } #1 #2 { \c_zero_dim }
+ \__xeCJK_save_punct_dim:nNNn { rule } \c__xeCJK_left_tl {#2} { \c_zero_dim }
+ \__xeCJK_save_punct_dim:nNNn { rule } \c__xeCJK_right_tl {#2} { \c_zero_dim }
\__xeCJK_save_punct_dim:nNNn { bound } \c__xeCJK_left_tl {#2} { \c_zero_dim }
\__xeCJK_save_punct_dim:nNNn { bound } \c__xeCJK_right_tl {#2} { \c_zero_dim }
\__xeCJK_save_punct_skip:nNNn { glue } #1 #2 { \c_zero_skip }
@@ -2440,13 +2456,11 @@
\group_end:
\dim_set:Nn \l__xeCJK_bound_dim
{ \__xeCJK_use_punct_dim:nNN { bound } #1 #2 }
+ \tl_if_eq:NNTF #1 \c__xeCJK_right_tl
+ { \tl_set_eq:NN \l__xeCJK_reverse_tl \c__xeCJK_left_tl }
+ { \tl_set_eq:NN \l__xeCJK_reverse_tl \c__xeCJK_right_tl }
\dim_set:Nn \l__xeCJK_reverse_bound_dim
- {
- \tl_if_eq:NNTF #1 \c__xeCJK_left_tl
- { \__xeCJK_use_punct_dim:nNN { bound } \c__xeCJK_right_tl }
- { \__xeCJK_use_punct_dim:nNN { bound } \c__xeCJK_left_tl }
- #2
- }
+ { \__xeCJK_use_punct_dim:nNN { bound } \l__xeCJK_reverse_tl #2 }
\UseInstance { xeCJK / punctuation } { \l_xeCJK_punct_style_tl }
\xeCJK_punct_margin_process:NN #1 #2
\xeCJK_punct_offset_process:NN #1 #2
@@ -2453,6 +2467,7 @@
\__xeCJK_punct_if_long:NT #2
{ \__xeCJK_long_punct_kerning:N #2 }
}
+\tl_new:N \l__xeCJK_reverse_tl
\dim_new:N \l__xeCJK_bound_dim
\dim_new:N \l__xeCJK_reverse_bound_dim
\cs_new_protected:Npn \__xeCJK_long_punct_kerning:N #1
@@ -2578,10 +2593,8 @@
\dim_compare:nNnTF \l__xeCJK_middle_margin_width_dim < \c_max_dim
{ \l__xeCJK_middle_margin_width_dim }
{
- \fp_use:N \l__xeCJK_middle_margin_ratio_fp
- \tex_dimexpr:D
- ( \l__xeCJK_bound_dim + \l__xeCJK_reverse_bound_dim ) / 2
- \scan_stop:
+ \__xeCJK_dim_ratio:Nn \l__xeCJK_middle_margin_ratio_fp
+ { ( \l__xeCJK_bound_dim + \l__xeCJK_reverse_bound_dim ) / 2 }
}
}
{
@@ -2590,6 +2603,9 @@
{ \__xeCJK_margin_width_or_ratio:n { fixed } }
}
}
+\cs_new:Npn \__xeCJK_dim_ratio:Nn #1#2
+ { \fp_to_dim:n { #1 \dim_to_fp:n {#2} } }
+\cs_generate_variant:Nn \__xeCJK_dim_ratio:Nn { c }
\cs_new_protected:Npn \xeCJK_punct_offset_process:NN #1#2
{
\dim_set:Nn \l__xeCJK_tmp_dim
@@ -2637,6 +2653,8 @@
{ \l__xeCJK_tmp_dim }
\__xeCJK_save_punct_dim:nNNn { rule } #1 #2
{ \l__xeCJK_tmp_dim - \l__xeCJK_bound_dim }
+ \__xeCJK_save_punct_dim:nNNn { rule } \l__xeCJK_reverse_tl #2
+ { \l__xeCJK_tmp_dim - \l__xeCJK_reverse_bound_dim }
\__xeCJK_save_punct_dim:nNNn { glue } #1 #2
{ \l__xeCJK_margin_dim - \l__xeCJK_tmp_dim }
\__xeCJK_save_punct_skip:nNNnnn { glue } #1 #2
@@ -2652,7 +2670,7 @@
}
{
\__xeCJK_punct_if_middle:NTF #2
- { .5 \l__xeCJK_margin_dim }
+ { \l__xeCJK_margin_dim / 2 }
{ \l__xeCJK_margin_dim - \l__xeCJK_reverse_bound_dim }
}
}
@@ -2664,8 +2682,9 @@
\fp_if_nan:nTF { \use:c { l__xeCJK_#1_punct_ratio_fp } }
{ \c_max_dim }
{
- \fp_use:c { l__xeCJK_#1_punct_ratio_fp }
- \tex_dimexpr:D \__xeCJK_use_punct_dim:nN { width } #2 \scan_stop:
+ \__xeCJK_dim_ratio:cn
+ { l__xeCJK_#1_punct_ratio_fp }
+ { \__xeCJK_use_punct_dim:nN { width } #2 }
}
}
}
@@ -2674,8 +2693,9 @@
\dim_compare:nNnTF { \use:c { l__xeCJK_#1_margin_width_dim } } < \c_max_dim
{ \use:c { l__xeCJK_#1_margin_width_dim } }
{
- \fp_use:c { l__xeCJK_#1_margin_ratio_fp }
- \tex_dimexpr:D \l__xeCJK_bound_dim \scan_stop:
+ \__xeCJK_dim_ratio:cn
+ { l__xeCJK_#1_margin_ratio_fp }
+ { \l__xeCJK_bound_dim }
}
\bool_if:NT \l__xeCJK_add_min_bound_to_margin_bool
{ + \dim_min:nn \l__xeCJK_bound_dim \l__xeCJK_reverse_bound_dim }
@@ -2781,11 +2801,11 @@
{
\__xeCJK_calc_kerning_margin:nNN
{
- \fp_use:N \l__xeCJK_kerning_total_ratio_fp
- \tex_dimexpr:D
- \__xeCJK_use_punct_dim:nN { width } #1 +
- \__xeCJK_use_punct_dim:nN { width } #2
- \scan_stop:
+ \__xeCJK_dim_ratio:Nn \l__xeCJK_kerning_total_ratio_fp
+ {
+ \__xeCJK_use_punct_dim:nN { width } #1 +
+ \__xeCJK_use_punct_dim:nN { width } #2
+ }
}
}
}
@@ -2800,9 +2820,9 @@
{
\dim_compare:nNnTF \l__xeCJK_kerning_margin_width_dim < \c_max_dim
{ \l__xeCJK_kerning_margin_width_dim \use_none:n }
- { \fp_use:N \l__xeCJK_kerning_margin_ratio_fp \use:n }
+ { \__xeCJK_dim_ratio:Nn \l__xeCJK_kerning_margin_ratio_fp }
}
- { \fp_use:c { l__xeCJK_#1_align_ratio_fp } \use:n }
+ { \__xeCJK_dim_ratio:cn { l__xeCJK_#1_align_ratio_fp } }
{ \l__xeCJK_margin_dim }
}
}
@@ -4232,7 +4252,7 @@
}
{
\skip_set_eq:NN \l__xeCJK_ccglue_skip \l__xeCJK_verb_exspace_skip
- \skip_set:Nn \l__xeCJK_ecglue_skip { .5 \l__xeCJK_verb_exspace_skip }
+ \skip_set:Nn \l__xeCJK_ecglue_skip { \l__xeCJK_verb_exspace_skip / 2 }
\cs_set_eq:NN \CJKglue \__xeCJK_nobreak_ccglue:
\cs_set_eq:NN \CJKecglue \__xeCJK_nobreak_ecglue:
}
@@ -4628,13 +4648,13 @@
\__xeCJK_math_robust:N \endmath
}
\__xeCJK_math_robust:N \ensuremath
-\@ifl at t@r \fmtversion { 2020/10/01 }
+\ctex_if_format_at_least:nTF { 2020/10/01 }
{
\cs_set_eq:NN \xeCJK at family \xeCJK_switch_family:x
- \AddToHook { rmfamily } { \xeCJK at family { \CJKrmdefault } }
- \AddToHook { sffamily } { \xeCJK at family { \CJKsfdefault } }
- \AddToHook { ttfamily } { \xeCJK at family { \CJKttdefault } }
- \AddToHook { normalfont } { \xeCJK at family { \CJKfamilydefault } }
+ \ctex_gadd_ltxhook:nn { rmfamily } { \xeCJK at family { \CJKrmdefault } }
+ \ctex_gadd_ltxhook:nn { sffamily } { \xeCJK at family { \CJKsfdefault } }
+ \ctex_gadd_ltxhook:nn { ttfamily } { \xeCJK at family { \CJKttdefault } }
+ \ctex_gadd_ltxhook:nn { normalfont } { \xeCJK at family { \CJKfamilydefault } }
}
{
\cs_if_exist:NTF \@rmfamilyhook
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty 2022-06-04 20:25:35 UTC (rev 63485)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty 2022-06-04 20:26:21 UTC (rev 63486)
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `fntef')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
-%% Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
-%% Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
+%% Copyright (C) 2009--2022 by Leo Liu <leoliu.pku at gmail.com>
+%% Copyright (C) 2012--2022 by Qing Lee <sobenlee at gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx d45555d 2021-12-12 18:20:36 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx de49417 2022-06-04 19:40:54 +0800 Qing Lee <sobenlee at gmail.com> $
{xeCJK font effect}
\ProvidesExplPackage{xeCJKfntef}
- {\ExplFileDate}{3.8.8}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.9}{\ExplFileDescription}
\PassOptionsToPackage { normalem } { ulem }
\DeclareOption* { \PassOptionsToPackage { \CurrentOption } { ulem } }
\ProcessOptions \scan_stop:
@@ -472,7 +472,7 @@
\__xeCJK_punct_if_middle:NT #1
{
\__xeCJK_punct_glue:NN \c__xeCJK_right_tl #1
- \__xeCJK_punct_bound_rule:NN \c__xeCJK_left_tl #1
+ \__xeCJK_punct_rule:NN \c__xeCJK_left_tl #1
}
\UL at start
}
@@ -492,7 +492,7 @@
{
\__xeCJK_ulem_punct_ccglue:
\__xeCJK_punct_glue:NN \c__xeCJK_right_tl #1
- \__xeCJK_punct_bound_rule:NN \c__xeCJK_left_tl #1
+ \__xeCJK_punct_rule:NN \c__xeCJK_left_tl #1
}
\UL at start
\__xeCJK_ulem_class_group_begin:
@@ -507,7 +507,7 @@
\__xeCJK_punct_if_middle:NTF \g__xeCJK_last_punct_tl
{
\xeCJK_get_punct_bounds:No \c__xeCJK_left_tl \g__xeCJK_last_punct_tl
- \__xeCJK_punct_bound_rule:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
+ \__xeCJK_punct_rule:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\xeCJK_class_group_end: \UL at stop \xeCJK_no_break:
\__xeCJK_punct_glue:NN \c__xeCJK_left_tl \g__xeCJK_last_punct_tl
}
@@ -525,7 +525,7 @@
\__xeCJK_punct_if_middle:NTF \g__xeCJK_last_punct_tl
{
\xeCJK_get_punct_bounds:No \c__xeCJK_left_tl \g__xeCJK_last_punct_tl
- \__xeCJK_punct_bound_rule:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
+ \__xeCJK_punct_rule:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\xeCJK_class_group_end: \UL at stop \xeCJK_no_break:
\__xeCJK_punct_glue:NN \c__xeCJK_left_tl \g__xeCJK_last_punct_tl
}
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty 2022-06-04 20:25:35 UTC (rev 63485)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty 2022-06-04 20:26:21 UTC (rev 63486)
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `xunicode')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
-%% Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
-%% Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
+%% Copyright (C) 2009--2022 by Leo Liu <leoliu.pku at gmail.com>
+%% Copyright (C) 2012--2022 by Qing Lee <sobenlee at gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx d45555d 2021-12-12 18:20:36 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx de49417 2022-06-04 19:40:54 +0800 Qing Lee <sobenlee at gmail.com> $
{addon file for xunicode}
\ProvidesExplPackage{xunicode-addon}
- {\ExplFileDate}{3.8.8}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.9}{\ExplFileDescription}
\bool_lazy_or:nnF
{ \sys_if_engine_xetex_p: }
{ \sys_if_engine_luatex_p: }
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def 2022-06-04 20:25:35 UTC (rev 63485)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def 2022-06-04 20:26:21 UTC (rev 63486)
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `xunextra')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch at nankai.edu.cn>
-%% Copyright (C) 2009--2021 by Leo Liu <leoliu.pku at gmail.com>
-%% Copyright (C) 2012--2021 by Qing Lee <sobenlee at gmail.com>
+%% Copyright (C) 2009--2022 by Leo Liu <leoliu.pku at gmail.com>
+%% Copyright (C) 2012--2022 by Qing Lee <sobenlee at gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -27,10 +27,10 @@
%%
%% ----------------------------------------------------------------------
%%
-\GetIdInfo$Id: xeCJK.dtx d45555d 2021-12-12 18:20:36 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx de49417 2022-06-04 19:40:54 +0800 Qing Lee <sobenlee at gmail.com> $
{extra definition for xunicode}
\ProvidesExplFile{xunicode-extra.def}
- {\ExplFileDate}{3.8.8}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.9}{\ExplFileDescription}
\DeclareUTFSymbol\texthyphenationpoint{"2027}
\DeclareUTFSymbol\texttwoemdash{"2E3A}
\DeclareUTFComposite\textsuperscript
More information about the tex-live-commits
mailing list.