From c64dcfd4c1dd2ef21b787e6833694f68a9ac418f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 23 Aug 2020 20:54:58 +0000 Subject: xecjk (23aug20) git-svn-id: svn://tug.org/texlive/trunk@56162 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/xelatex/xecjk/xeCJK-listings.sty | 4 +-- Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg | 4 +-- Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty | 39 +++++++++++++++------- Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty | 4 +-- .../tex/xelatex/xecjk/xunicode-addon.sty | 4 +-- .../tex/xelatex/xecjk/xunicode-extra.def | 4 +-- 6 files changed, 37 insertions(+), 22 deletions(-) (limited to 'Master/texmf-dist/tex/xelatex') diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty index a601ffff36a..9742f0f48a3 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 94baac7 2020-06-06 23:21:05 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee $ {xeCJK patch file for listings} \ProvidesExplPackage{xeCJK-listings} - {\ExplFileDate}{3.8.4}{\ExplFileDescription} + {\ExplFileDate}{3.8.5}{\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 de040c0a3dd..f9ecbd90008 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 94baac7 2020-06-06 23:21:05 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee $ {Configuration file for xeCJK package} \ProvidesExplFile{\ExplFileName.cfg} - {\ExplFileDate}{3.8.4}{\ExplFileDescription} + {\ExplFileDate}{3.8.5}{\ExplFileDescription} %% %% diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty index 1f278796fa8..6bb521e33d4 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 94baac7 2020-06-06 23:21:05 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee $ {Typesetting CJK scripts with XeLaTeX} \ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{3.8.4}{\ExplFileDescription} + {\ExplFileDate}{3.8.5}{\ExplFileDescription} \msg_new:nnn { xeCJK } { Require-XeTeX } { The~xeCJK~package~requires~XeTeX~to~function.\\\\ @@ -1446,17 +1446,23 @@ \tl_new:N \c__xeCJK_alignii_tl \cs_new_protected:cpn { __xeCJK_bound_type_ -1 _glue:Nn } #1#2 { \__xeCJK_zero_glue: } -\cs_new_protected:cpn { __xeCJK_bound_type_ 1 _glue:Nn } #1#2 +\cs_new_protected:cpn { __xeCJK_bound_type_ 1 _glue:Nn } #1 { \box_set_to_last:N \l__xeCJK_tmp_box \int_compare:nNnTF \tex_lastnodetype:D = { -1 } { \dim_compare:nNnTF { \box_wd:N \l__xeCJK_tmp_box } = \tex_parindent:D - { \box_use_drop:N \l__xeCJK_tmp_box } - { \box_use_drop:N \l__xeCJK_tmp_box #2 } + { + \dim_compare:nNnTF + { \box_ht:N \l__xeCJK_tmp_box } = \c_zero_dim + { \use_i:nn } + { \use:nn } + } + { \use:nn } } - { \box_use_drop:N \l__xeCJK_tmp_box #2 } + { \use:nn } + { \box_use_drop:N \l__xeCJK_tmp_box } } \cs_new_protected:cpn { __xeCJK_bound_type_ 11 _glue:Nn } #1#2 { @@ -3418,10 +3424,16 @@ \cs_new_protected:Npn \__xeCJK_font_initial:Nn #1#2 { \group_begin: + \__xeCJK_font_initial_hook: \__xeCJK_family_use:n {#2} \xeCJK_font_gset_to_current:N #1 \group_end: } +\cs_new_protected:Npn \__xeCJK_font_initial_hook: + { \tl_use:N \g__xeCJK_font_initial_hook_tl } +\cs_new_protected:Npn \__xeCJK_gadd_font_initial_hook:n + { \tl_gput_right:Nn \g__xeCJK_font_initial_hook_tl } +\tl_new:N \g__xeCJK_font_initial_hook_tl \cs_new_eq:NN \xeCJK_select_punct_font: \xeCJK_select_font: \cs_new_protected:Npn \__xeCJK_select_punct_font_aux: { @@ -4921,11 +4933,6 @@ { \tex_global:D \tex_Umathcodenum:D #1 = #2 ~ } } } -\__xeCJK_package_hook:nn { microtype } - { - \cs_if_free:NF \MT@get@slot@ - { \__xeCJK_patch_microtype_get_slot: } - } \cs_new_protected:Npn \__xeCJK_patch_microtype_get_slot: { \cs_new_eq:NN \xeCJK@original@get@slot \MT@get@slot@ @@ -4944,6 +4951,14 @@ { \MT@encoding - \tex_the:D \MT@toks } \l__xeCJK_tmp_tl { \cs_set_eq:NN \MT@char \l__xeCJK_tmp_tl } } +\cs_new_protected:Npn \xeCJK@microtype@restore@pickupfont + { \__xeCJK_gadd_font_initial_hook:n { \MT@ltx@pickupfont } } +\__xeCJK_package_hook:nn { microtype } + { + \cs_if_free:NF \MT@get@slot@ + { \__xeCJK_patch_microtype_get_slot: } + \MT@addto@setup { \xeCJK@microtype@restore@pickupfont } + } \__xeCJK_package_hook:nn { hyperref } { \pdfstringdefDisableCommands @@ -4952,7 +4967,7 @@ \xeCJK_cs_clear:N \__xeCJK_inactive_group_begin: \xeCJK_cs_clear:N \__xeCJK_inactive_group_end: \xeCJK_cs_clear:N \makexeCJKinactive - \xeCJK_cs_clear:N \xeCJK@composite@patch + \xeCJK_cs_clear:N \xeCJK_text_composite_patch: } } \__xeCJK_package_hook:nn { cprotect } diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty index f9b3da127f9..2ba36ebc832 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 94baac7 2020-06-06 23:21:05 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee $ {xeCJK font effect} \ProvidesExplPackage{xeCJKfntef} - {\ExplFileDate}{3.8.4}{\ExplFileDescription} + {\ExplFileDate}{3.8.5}{\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 fd7c39dd6b9..f882bf810e7 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 94baac7 2020-06-06 23:21:05 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee $ {addon file for xunicode} \ProvidesExplPackage{xunicode-addon} - {\ExplFileDate}{3.8.4}{\ExplFileDescription} + {\ExplFileDate}{3.8.5}{\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 1b632efafa3..efddf0397ee 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 94baac7 2020-06-06 23:21:05 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee $ {extra definition for xunicode} \ProvidesExplFile{xunicode-extra.def} - {\ExplFileDate}{3.8.4}{\ExplFileDescription} + {\ExplFileDate}{3.8.5}{\ExplFileDescription} \DeclareUTFSymbol\texthyphenationpoint{"2027} \DeclareUTFSymbol\texttwoemdash{"2E3A} \DeclareUTFComposite\textsuperscript -- cgit v1.2.3