From 1bea5926931cacb1ac5323dc459a8c297f3b9871 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 22 Nov 2017 22:42:40 +0000 Subject: xecjk (22nov17) git-svn-id: svn://tug.org/texlive/trunk@45885 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf | Bin 1248236 -> 1236910 bytes .../doc/xelatex/xecjk/xunicode-symbols.pdf | Bin 293121 -> 293122 bytes Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx | 33 ++++++++++++++++----- .../tex/xelatex/xecjk/xeCJK-listings.sty | 4 +-- Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg | 4 +-- Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty | 23 ++++++++++---- Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty | 4 +-- .../tex/xelatex/xecjk/xunicode-addon.sty | 4 +-- .../tex/xelatex/xecjk/xunicode-extra.def | 4 +-- 9 files changed, 53 insertions(+), 23 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf index 0218b6b13db..fb50f586dfd 100644 Binary files a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf and b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf differ diff --git a/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf b/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf index d478236a2c5..89ce9e7a833 100644 Binary files a/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf and b/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf differ diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx index 5d2008047f3..530421a2b08 100644 --- a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx +++ b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx @@ -194,7 +194,7 @@ Copyright and Licence %<*package|config|fntef|listings|xunicode|xunextra> %\NeedsTeXFormat{LaTeX2e} %\RequirePackage{expl3} -%<+!driver>\GetIdInfo$Id: xeCJK.dtx 8b5e450 2017-08-07 17:02:18 +0800 Qing Lee $ +%<+!driver>\GetIdInfo$Id: xeCJK.dtx 5a18688 2017-11-22 19:12:51 +0800 Qing Lee $ % {Typesetting CJK scripts with XeLaTeX} % {Configuration file for xeCJK package} % {xeCJK font effect} @@ -207,7 +207,7 @@ Copyright and Licence %\ProvidesExplPackage{xeCJK-listings} %\ProvidesExplPackage{xunicode-addon} %\ProvidesExplFile{xunicode-extra.def} -% {\ExplFileDate}{3.5.0}{\ExplFileDescription} +% {\ExplFileDate}{3.5.1}{\ExplFileDescription} % %<*driver> \documentclass{ctxdoc} @@ -278,7 +278,7 @@ Copyright and Licence % \changes{v3.5.0}{2017/07/22}{使用 \texttt{lazy} 函数对 Boolean 表达式 % 进行最小化运算(\hologo{LaTeX3} 2017/07/19)。} % -% \CheckSum{10170} +% \CheckSum{10190} % \GetFileId{xeCJK.sty} % % \title{\bfseries\pkg{xeCJK} 宏包} @@ -5523,15 +5523,34 @@ Copyright and Licence \xeCJK_glyph_if_exist:NTF {#1} { \@@_fallback_save_CJKsymbol:N {#1} } { - \xeCJK_class_group_begin: - \tl_set_eq:NN \l_@@_fallback_family_tl \l_xeCJK_family_tl - \xeCJK_fallback_loop:Nn {#1} { \l_xeCJK_family_tl/FallBack } - \xeCJK_class_group_end: + \group_begin: + \xeCJK_aftergroup_reset_Boundary:N {#1} + \tl_set_eq:NN \l_@@_fallback_family_tl \l_xeCJK_family_tl + \xeCJK_fallback_loop:Nn {#1} { \l_xeCJK_family_tl/FallBack } + \group_end: } } % \end{macrocode} % \end{macro} % +% \changes{v3.5.1}{2017/11/16}{修正 fallback 字体后无法忽略空格的错误。} +% +% \begin{macro}[internal]{\xeCJK_aftergroup_reset_Boundary:N} +% 在分组中暂时清空 |#1| 与边界的 toks,分组后恢复。 +% \begin{macrocode} +\cs_new_protected_nopar:Npn \xeCJK_aftergroup_reset_Boundary:N #1 + { + \tl_set:Nx \l_@@_tmp_tl + { \tex_the:D \xetex_charclass:D `#1 ~ \xeCJK_class_num:n { Boundary } } + \tl_gset:Nx \g_@@_aftergroup_Boundary_tl + { \tex_the:D \xetex_interchartoks:D \l_@@_tmp_tl } + \xetex_interchartoks:D \l_@@_tmp_tl = { \prg_do_nothing: } + \group_insert_after:N \g_@@_aftergroup_Boundary_tl + } +\tl_new:N \g_@@_aftergroup_Boundary_tl +% \end{macrocode} +% \end{macro} +% % \changes{v3.2.12}{2014/05/12}{更新 \cs{int_to_Hex:n}。} % % \begin{macro}[internal]{\xeCJK_fallback_loop:Nn} diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty index 22ced35096f..92fe13cbd7b 100644 --- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty +++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty @@ -29,10 +29,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xeCJK.dtx 8b5e450 2017-08-07 17:02:18 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 5a18688 2017-11-22 19:12:51 +0800 Qing Lee $ {xeCJK patch file for listings} \ProvidesExplPackage{xeCJK-listings} - {\ExplFileDate}{3.5.0}{\ExplFileDescription} + {\ExplFileDate}{3.5.1}{\ExplFileDescription} \DeclareOption* { \PassOptionsToPackage { \CurrentOption } { xeCJK } } \ProcessOptions \scan_stop: \RequirePackage { xeCJK } diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg index 4f128de5d21..354fb8b2156 100644 --- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg +++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg @@ -6,10 +6,10 @@ %% %% xeCJK.dtx (with options: `config') %% -\GetIdInfo$Id: xeCJK.dtx 8b5e450 2017-08-07 17:02:18 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 5a18688 2017-11-22 19:12:51 +0800 Qing Lee $ {Configuration file for xeCJK package} \ProvidesExplFile{\ExplFileName.cfg} - {\ExplFileDate}{3.5.0}{\ExplFileDescription} + {\ExplFileDate}{3.5.1}{\ExplFileDescription} %% %% diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty index eb360adc1f0..00dc7a2c4e6 100644 --- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty +++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty @@ -29,10 +29,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xeCJK.dtx 8b5e450 2017-08-07 17:02:18 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 5a18688 2017-11-22 19:12:51 +0800 Qing Lee $ {Typesetting CJK scripts with XeLaTeX} \ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{3.5.0}{\ExplFileDescription} + {\ExplFileDate}{3.5.1}{\ExplFileDescription} \msg_new:nnn { xeCJK } { Require-XeTeX } { The~xeCJK~package~requires~XeTeX~to~function.\\\\ @@ -2479,12 +2479,23 @@ \xeCJK_glyph_if_exist:NTF {#1} { \__xeCJK_fallback_save_CJKsymbol:N {#1} } { - \xeCJK_class_group_begin: - \tl_set_eq:NN \l__xeCJK_fallback_family_tl \l_xeCJK_family_tl - \xeCJK_fallback_loop:Nn {#1} { \l_xeCJK_family_tl/FallBack } - \xeCJK_class_group_end: + \group_begin: + \xeCJK_aftergroup_reset_Boundary:N {#1} + \tl_set_eq:NN \l__xeCJK_fallback_family_tl \l_xeCJK_family_tl + \xeCJK_fallback_loop:Nn {#1} { \l_xeCJK_family_tl/FallBack } + \group_end: } } +\cs_new_protected_nopar:Npn \xeCJK_aftergroup_reset_Boundary:N #1 + { + \tl_set:Nx \l__xeCJK_tmp_tl + { \tex_the:D \xetex_charclass:D `#1 ~ \xeCJK_class_num:n { Boundary } } + \tl_gset:Nx \g__xeCJK_aftergroup_Boundary_tl + { \tex_the:D \xetex_interchartoks:D \l__xeCJK_tmp_tl } + \xetex_interchartoks:D \l__xeCJK_tmp_tl = { \prg_do_nothing: } + \group_insert_after:N \g__xeCJK_aftergroup_Boundary_tl + } +\tl_new:N \g__xeCJK_aftergroup_Boundary_tl \cs_new_protected_nopar:Npn \xeCJK_fallback_loop:Nn #1#2 { \xeCJK_family_if_exist:xTF {#2} diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty index 2c4834cbf38..827bf5e5f01 100644 --- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty +++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty @@ -29,10 +29,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xeCJK.dtx 8b5e450 2017-08-07 17:02:18 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 5a18688 2017-11-22 19:12:51 +0800 Qing Lee $ {xeCJK font effect} \ProvidesExplPackage{xeCJKfntef} - {\ExplFileDate}{3.5.0}{\ExplFileDescription} + {\ExplFileDate}{3.5.1}{\ExplFileDescription} \PassOptionsToPackage { normalem } { ulem } \DeclareOption* { \PassOptionsToPackage { \CurrentOption } { ulem } } \ProcessOptions \scan_stop: diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty index 78221c88d01..a552e9929c0 100644 --- a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty +++ b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty @@ -29,10 +29,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xeCJK.dtx 8b5e450 2017-08-07 17:02:18 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 5a18688 2017-11-22 19:12:51 +0800 Qing Lee $ {addon file for xunicode} \ProvidesExplPackage{xunicode-addon} - {\ExplFileDate}{3.5.0}{\ExplFileDescription} + {\ExplFileDate}{3.5.1}{\ExplFileDescription} \bool_lazy_or:nnF { \sys_if_engine_xetex_p: } { \sys_if_engine_luatex_p: } diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def index 7b96d42684e..2baaceb1e05 100644 --- a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def +++ b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def @@ -27,10 +27,10 @@ %% %% ---------------------------------------------------------------------- %% -\GetIdInfo$Id: xeCJK.dtx 8b5e450 2017-08-07 17:02:18 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 5a18688 2017-11-22 19:12:51 +0800 Qing Lee $ {extra definition for xunicode} \ProvidesExplFile{xunicode-extra.def} - {\ExplFileDate}{3.5.0}{\ExplFileDescription} + {\ExplFileDate}{3.5.1}{\ExplFileDescription} \DeclareUTFComposite\textsuperscript \DeclareUTFComposite\textsubscript \DeclareUTFEncodedAccent\textsbleftarrow{"20EE}{"20FF} -- cgit v1.2.3