From 40ff7747893db36bf2fdf14a1f8171d8470cdeee Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 15 May 2017 21:14:50 +0000 Subject: xecjk (15may17) git-svn-id: svn://tug.org/texlive/trunk@44370 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf | Bin 1246502 -> 1246034 bytes .../doc/xelatex/xecjk/xunicode-symbols.pdf | Bin 298073 -> 293124 bytes Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx | 44 +++++++++++++++------ .../tex/xelatex/xecjk/xeCJK-listings.sty | 27 +++++++++---- Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg | 4 +- Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty | 4 +- Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty | 6 +-- .../tex/xelatex/xecjk/xunicode-addon.sty | 4 +- .../tex/xelatex/xecjk/xunicode-extra.def | 4 +- 9 files changed, 62 insertions(+), 31 deletions(-) diff --git a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf index 64ac5246c3f..d103606ab9f 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 d9cc38e10e5..e828b18c590 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 e73a8c7ce6b..6a6e16387e3 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 832988e 2017-04-01 21:33:23 +0800 Qing Lee $ +%<+!driver>\GetIdInfo$Id: xeCJK.dtx 18af4a5 2017-05-15 20:12:35 +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.4.7}{\ExplFileDescription} +% {\ExplFileDate}{3.4.8}{\ExplFileDescription} % %<*driver> \documentclass{ctxdoc} @@ -275,7 +275,7 @@ Copyright and Licence % \changes{v3.3.2}{2015/05/15}{随 Unicode 7.0.0 更新简繁汉字映射。} % \changes{v3.3.3}{2015/09/25}{更新 \hologo{LaTeX3} 代码。} % -% \CheckSum{10155} +% \CheckSum{10169} % \GetFileId{xeCJK.sty} % % \title{\bfseries\pkg{xeCJK} 宏包} @@ -8208,7 +8208,7 @@ Copyright and Licence \cs_new_protected_nopar:Npn \@@_ulem_end: { \c_group_end_token - \hbox_set_end: + \c_group_end_token \tex_unskip:D \tex_unskip:D \tex_unskip:D \xeCJK_ulem_right_skip: \xeCJK_ulem_group_end: @@ -9836,17 +9836,24 @@ Copyright and Licence % \end{macrocode} % \end{macro} % -% \begin{macro}[internal]{\@@_listings_inside_convert:nw,\@@_listings_inline_group:w} +% \begin{macro}[internal]{\@@_listings_rescan:Nn, +% \@@_listings_inside_convert:nw,\@@_listings_inline_group:w} % 当 \tn{lstinline} 被使用在参数中时,\pkg{listings} 会使用一个循环逐个将 % \tn{lstinline} 参数中的字符设置为活动字符。我们可以通过 \cs{tl_set_rescan:Nnn} % 来完成这里的 \tn{catcode} 转换,避免将 \tn{charcode} 超过 $255$ 的字符都设置为 % 活动字符。 % \begin{macrocode} +\cs_new_protected:Npn \@@_listings_rescan:Nn #1#2 + { + \@@_listings_set_escape: + \tl_set:Nn \l_@@_tmp_tl {#2} + \@@_listings_escape_backslash: + \tl_set_rescan:Nno #1 { } { \l_@@_tmp_tl } + } \cs_new_protected:Npn \@@_listings_inside_convert:nw #1 ~ \@empty { - \tl_set_rescan:Nnn \l_@@_tmp_tl { } {#1} - \@@_set_listings_escape: - \tl_put_right:NV \lst@arg \l_@@_tmp_tl + \@@_listings_rescan:Nn \l_@@_tmp_tl {#1} + \tl_put_right:No \lst@arg { \l_@@_tmp_tl } } \cs_set_eq:NN \lst@InsideConvert@ \@@_listings_inside_convert:nw \cs_new_protected_nopar:Npn \@@_listings_inline_group:w @@ -9857,14 +9864,13 @@ Copyright and Licence \cs_set_eq:NN \lst@InlineGJ \@@_listings_inline_group:w \cs_new_protected:Npn \@@_listings_inline_group:n #1 { - \tl_set_rescan:Nnn \lst@arg { } {#1} - \@@_set_listings_escape: + \@@_listings_rescan:Nn \lst@arg {#1} \lst@InlineGJEnd } % \end{macrocode} % \end{macro} % -% \begin{macro}[internal]{\@@_set_listings_escape:} +% \begin{macro}[internal]{\@@_listings_set_escape:} % 由于我们在上面的修改,需要保留 |\| 用于转义 \tn{lstinline} 参数中的某些 \TeX % 特殊字符,与原来宏包一致。 % \begin{macrocode} @@ -9872,7 +9878,7 @@ Copyright and Licence \cs_set:Npn \@@_tmp:w #1 { \group_end: - \cs_new_protected:Npn \@@_set_listings_escape: + \cs_new_protected_nopar:Npn \@@_listings_set_escape: { \xeCJK_swap_cs:NN #1 \@@_listings_escape:N } \cs_new_protected:Npn \@@_listings_escape:N ##1 { \cs_if_eq:NNTF #1 ##1 { \@@_listings_escape:N } {##1} } @@ -9886,6 +9892,20 @@ Copyright and Licence % \end{macrocode} % \end{macro} % +% +% \changes{v3.4.8}{2017/05/15}{转义 \tn{lstinline} 参数中的 $\texttt{\textbackslash}_{12}$。} +% \begin{macro}[internal]{\@@_listings_escape_backslash:} +% \tn{catcode} 为 $12$ 的 |\| 需要双写转义。 +% \begin{macrocode} +\cs_new_protected_nopar:Npx \@@_listings_escape_backslash: + { + \tl_replace_all:Nnn \exp_not:N \l_@@_tmp_tl + { \c_backslash_str } + { \c_backslash_str \c_backslash_str } + } +% \end{macrocode} +% \end{macro} +% % \begin{macrocode} % % \end{macrocode} diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty index c5982eb3de4..a41f8e2d322 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 832988e 2017-04-01 21:33:23 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 18af4a5 2017-05-15 20:12:35 +0800 Qing Lee $ {xeCJK patch file for listings} \ProvidesExplPackage{xeCJK-listings} - {\ExplFileDate}{3.4.7}{\ExplFileDescription} + {\ExplFileDate}{3.4.8}{\ExplFileDescription} \DeclareOption* { \PassOptionsToPackage { \CurrentOption } { xeCJK } } \ProcessOptions \scan_stop: \RequirePackage { xeCJK } @@ -293,11 +293,17 @@ } } \cs_set_eq:NN \lst@IfNextCharActive \__xeCJK_listings_peek_active_loop:TF +\cs_new_protected:Npn \__xeCJK_listings_rescan:Nn #1#2 + { + \__xeCJK_listings_set_escape: + \tl_set:Nn \l__xeCJK_tmp_tl {#2} + \__xeCJK_listings_escape_backslash: + \tl_set_rescan:Nno #1 { } { \l__xeCJK_tmp_tl } + } \cs_new_protected:Npn \__xeCJK_listings_inside_convert:nw #1 ~ \@empty { - \tl_set_rescan:Nnn \l__xeCJK_tmp_tl { } {#1} - \__xeCJK_set_listings_escape: - \tl_put_right:NV \lst@arg \l__xeCJK_tmp_tl + \__xeCJK_listings_rescan:Nn \l__xeCJK_tmp_tl {#1} + \tl_put_right:No \lst@arg { \l__xeCJK_tmp_tl } } \cs_set_eq:NN \lst@InsideConvert@ \__xeCJK_listings_inside_convert:nw \cs_new_protected_nopar:Npn \__xeCJK_listings_inline_group:w @@ -308,15 +314,14 @@ \cs_set_eq:NN \lst@InlineGJ \__xeCJK_listings_inline_group:w \cs_new_protected:Npn \__xeCJK_listings_inline_group:n #1 { - \tl_set_rescan:Nnn \lst@arg { } {#1} - \__xeCJK_set_listings_escape: + \__xeCJK_listings_rescan:Nn \lst@arg {#1} \lst@InlineGJEnd } \group_begin: \cs_set:Npn \__xeCJK_tmp:w #1 { \group_end: - \cs_new_protected:Npn \__xeCJK_set_listings_escape: + \cs_new_protected_nopar:Npn \__xeCJK_listings_set_escape: { \xeCJK_swap_cs:NN #1 \__xeCJK_listings_escape:N } \cs_new_protected:Npn \__xeCJK_listings_escape:N ##1 { \cs_if_eq:NNTF #1 ##1 { \__xeCJK_listings_escape:N } {##1} } @@ -327,6 +332,12 @@ \__xeCJK_tmp:w } { \ } +\cs_new_protected_nopar:Npx \__xeCJK_listings_escape_backslash: + { + \tl_replace_all:Nnn \exp_not:N \l__xeCJK_tmp_tl + { \c_backslash_str } + { \c_backslash_str \c_backslash_str } + } %% %% This package consists of the files xeCJK.dtx, %% full-stop.map, diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg index 38bf54a521e..800fc7a9bbb 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 832988e 2017-04-01 21:33:23 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 18af4a5 2017-05-15 20:12:35 +0800 Qing Lee $ {Configuration file for xeCJK package} \ProvidesExplFile{\ExplFileName.cfg} - {\ExplFileDate}{3.4.7}{\ExplFileDescription} + {\ExplFileDate}{3.4.8}{\ExplFileDescription} %% %% diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty index 97c9e4ff557..c50b1246acf 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 832988e 2017-04-01 21:33:23 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 18af4a5 2017-05-15 20:12:35 +0800 Qing Lee $ {Typesetting CJK scripts with XeLaTeX} \ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{3.4.7}{\ExplFileDescription} + {\ExplFileDate}{3.4.8}{\ExplFileDescription} \msg_new:nnn { xeCJK } { Require-XeTeX } { The~xeCJK~package~requires~XeTeX~to~function.\\\\ diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty index c048f9fbf83..16d6642f86d 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 832988e 2017-04-01 21:33:23 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 18af4a5 2017-05-15 20:12:35 +0800 Qing Lee $ {xeCJK font effect} \ProvidesExplPackage{xeCJKfntef} - {\ExplFileDate}{3.4.7}{\ExplFileDescription} + {\ExplFileDate}{3.4.8}{\ExplFileDescription} \PassOptionsToPackage { normalem } { ulem } \DeclareOption* { \PassOptionsToPackage { \CurrentOption } { ulem } } \ProcessOptions \scan_stop: @@ -113,7 +113,7 @@ \cs_new_protected_nopar:Npn \__xeCJK_ulem_end: { \c_group_end_token - \hbox_set_end: + \c_group_end_token \tex_unskip:D \tex_unskip:D \tex_unskip:D \xeCJK_ulem_right_skip: \xeCJK_ulem_group_end: diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty index 6349f80d8bd..8e82ebe46bd 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 832988e 2017-04-01 21:33:23 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 18af4a5 2017-05-15 20:12:35 +0800 Qing Lee $ {addon file for xunicode} \ProvidesExplPackage{xunicode-addon} - {\ExplFileDate}{3.4.7}{\ExplFileDescription} + {\ExplFileDate}{3.4.8}{\ExplFileDescription} \bool_if:nF { \sys_if_engine_xetex_p: || diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def index 43810b49b6a..8fa6a558016 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 832988e 2017-04-01 21:33:23 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 18af4a5 2017-05-15 20:12:35 +0800 Qing Lee $ {extra definition for xunicode} \ProvidesExplFile{xunicode-extra.def} - {\ExplFileDate}{3.4.7}{\ExplFileDescription} + {\ExplFileDate}{3.4.8}{\ExplFileDescription} \DeclareUTFComposite\textsuperscript \DeclareUTFComposite\textsubscript \DeclareUTFEncodedAccent\textsbleftarrow{"20EE}{"20FF} -- cgit v1.2.3