From 97b9c9030418ed2fc48ccdd6ae63a6e27709b5aa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 22 Feb 2017 23:04:25 +0000 Subject: xecjk (22feb17) git-svn-id: svn://tug.org/texlive/trunk@43308 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty | 4 ++-- Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg | 4 ++-- Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty | 19 ++++++++++++++----- Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty | 4 ++-- .../texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty | 4 ++-- .../texmf-dist/tex/xelatex/xecjk/xunicode-extra.def | 4 ++-- 6 files changed, 24 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty index e04176de6cd..bf6b628fc37 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 649d857 2017-01-02 09:25:53 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx efd7a18 2017-02-23 02:07:20 +0800 Qing Lee $ {xeCJK patch file for listings} \ProvidesExplPackage{xeCJK-listings} - {\ExplFileDate}{3.4.5}{\ExplFileDescription} + {\ExplFileDate}{3.4.6}{\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 731de277304..1795c6bb4f2 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 649d857 2017-01-02 09:25:53 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx efd7a18 2017-02-23 02:07:20 +0800 Qing Lee $ {Configuration file for xeCJK package} \ProvidesExplFile{\ExplFileName.cfg} - {\ExplFileDate}{3.4.5}{\ExplFileDescription} + {\ExplFileDate}{3.4.6}{\ExplFileDescription} %% %% diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty index 8c535cc0cab..6b30d8f253f 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 649d857 2017-01-02 09:25:53 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx efd7a18 2017-02-23 02:07:20 +0800 Qing Lee $ {Typesetting CJK scripts with XeLaTeX} \ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{3.4.5}{\ExplFileDescription} + {\ExplFileDate}{3.4.6}{\ExplFileDescription} \msg_new:nnn { xeCJK } { Require-XeTeX } { The~xeCJK~package~requires~XeTeX~to~function.\\\\ @@ -2734,7 +2734,7 @@ \cs_gset_protected_nopar:cpx { \__xeCJK_family_csname:n {#1} } { \group_begin: - \exp_not:n { \cs_set_eq:NN \__xeCJK_update_family:nn \use_none:nn } + \exp_not:n { \cs_set_eq:NN \xeCJK@fontfamily \use_none:n } \exp_not:n { \fontspec_set_family:Nnn \l__xeCJK_fontspec_family_tl } { \exp_not:V \l__xeCJK_fontspec_options_clist } { \exp_not:V \l__xeCJK_font_name_tl } @@ -4025,7 +4025,17 @@ \RenewDocumentCommand \fontfamily { m } { \tl_set:Nx \f@family {#1} - \__xeCJK_update_family:nn {#1} + \xeCJK@fontfamily {#1} + } +\cs_new_protected_nopar:Npn \xeCJK@fontfamily #1 + { + \str_if_eq:nnTF {#1} { \familydefault } + { \xeCJK_switch_family:n { \CJKfamilydefault } } + { \__xeCJK_update_family_aux: } + } +\cs_new_protected_nopar:Npn \__xeCJK_update_family_aux: + { + \str_case_x:nn { \f@family } { { \rmdefault } { \xeCJK_switch_family:n { \CJKrmdefault } } { \sfdefault } { \xeCJK_switch_family:n { \CJKsfdefault } } @@ -4033,7 +4043,6 @@ { \familydefault } { \xeCJK_switch_family:n { \CJKfamilydefault } } } } -\cs_new_eq:NN \__xeCJK_update_family:nn \str_case:nn \cs_new_eq:NN \xeCJK@fix@penalty \fix@penalty \tl_replace_once:Nnn \xeCJK@fix@penalty { \@@italiccorr } { \xeCJK@italiccorr } \tl_replace_once:Nnn \sw@slant { \fix@penalty } { \xeCJK@fix@penalty } diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty index 0a76eb66c22..f27c1418121 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 649d857 2017-01-02 09:25:53 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx efd7a18 2017-02-23 02:07:20 +0800 Qing Lee $ {xeCJK font effect} \ProvidesExplPackage{xeCJKfntef} - {\ExplFileDate}{3.4.5}{\ExplFileDescription} + {\ExplFileDate}{3.4.6}{\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 8ab2d505cfd..5346e0e9b11 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 649d857 2017-01-02 09:25:53 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx efd7a18 2017-02-23 02:07:20 +0800 Qing Lee $ {addon file for xunicode} \ProvidesExplPackage{xunicode-addon} - {\ExplFileDate}{3.4.5}{\ExplFileDescription} + {\ExplFileDate}{3.4.6}{\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 e279c2072f9..58c57c48d3e 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 649d857 2017-01-02 09:25:53 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx efd7a18 2017-02-23 02:07:20 +0800 Qing Lee $ {extra definition for xunicode} \ProvidesExplFile{xunicode-extra.def} - {\ExplFileDate}{3.4.5}{\ExplFileDescription} + {\ExplFileDate}{3.4.6}{\ExplFileDescription} \DeclareUTFComposite\textsuperscript \DeclareUTFComposite\textsubscript \DeclareUTFEncodedAccent\textsbleftarrow{"20EE}{"20FF} -- cgit v1.2.3