From be5bf6a52f48b97cb795ff0fa128da79cc5d9f66 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 12 Feb 2016 00:26:43 +0000 Subject: xecjk (10feb16) git-svn-id: svn://tug.org/texlive/trunk@39685 c570f23f-e606-0410-a88d-b1316a301751 --- Master/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 | 18 +++++++++++------- Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty | 4 ++-- Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty | 4 ++-- Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def | 4 ++-- 6 files changed, 21 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex/xelatex/xecjk') diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty index e4b52dd35c6..1d5affa3d8a 100644 --- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty +++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty @@ -31,11 +31,11 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xeCJK.dtx 2667062 2016-02-01 12:02:59 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 8518191 2016-02-10 16:25:31 +0800 Qing Lee $ {xeCJK patch file for listings} \ProvidesExplPackage {xeCJK-listings} - {\ExplFileDate}{3.3.3}{\ExplFileDescription} + {\ExplFileDate}{3.3.4}{\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 76461f6fdd3..e374933479d 100644 --- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg +++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg @@ -6,11 +6,11 @@ %% %% xeCJK.dtx (with options: `config') %% -\GetIdInfo$Id: xeCJK.dtx 2667062 2016-02-01 12:02:59 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 8518191 2016-02-10 16:25:31 +0800 Qing Lee $ {Configuration file for xeCJK package} \ProvidesExplFile {\ExplFileName.cfg} - {\ExplFileDate}{3.3.3}{\ExplFileDescription} + {\ExplFileDate}{3.3.4}{\ExplFileDescription} %% %% diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty index 78ae492ed29..18f0c54e2aa 100644 --- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty +++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty @@ -31,11 +31,11 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xeCJK.dtx 2667062 2016-02-01 12:02:59 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 8518191 2016-02-10 16:25:31 +0800 Qing Lee $ {Typesetting CJK scripts with XeLaTeX} \ProvidesExplPackage {\ExplFileName} - {\ExplFileDate}{3.3.3}{\ExplFileDescription} + {\ExplFileDate}{3.3.4}{\ExplFileDescription} \msg_new:nnn { xeCJK } { Require-XeTeX } { The~xeCJK~package~requires~XeTeX~to~function.\\\\ @@ -410,12 +410,16 @@ XeTeX~character~class~`#1'~has~been~already~defined.\\\\ Please~take~another~name. \\ } -\xeCJK_save_class:nn { Default } { \c_zero } -\xeCJK_save_class:nn { Boundary } { \c_two_hundred_fifty_five } +\xeCJK_save_class:nn { Default } { \c_zero } +\tl_set:Nx \l__xeCJK_tmp_tl + { \int_use:N \xetex_XeTeXversion:D \xetex_XeTeXrevision:D } +\fp_compare:nNnTF { \l__xeCJK_tmp_tl } > { 0.99993 } + { \xeCJK_save_class:nn { Boundary } { 4095 } } + { \xeCJK_save_class:nn { Boundary } { \c_two_hundred_fifty_five } } \int_compare:nNnTF { \xetex_charclass:D "4E00 } = \c_one { - \xeCJK_save_class:nn { CJK } { \c_one } - \xeCJK_save_class:nn { FullLeft } { \c_two } + \xeCJK_save_class:nn { CJK } { \c_one } + \xeCJK_save_class:nn { FullLeft } { \c_two } \xeCJK_save_class:nn { FullRight } { \c_three } \int_const:Nn \c__xeCJK_class_begin_int { \c_three } } @@ -3546,7 +3550,7 @@ AllowBreakBetweenPuncts = false } \defaultCJKfontfeatures { Script = CJK } -\xeCJKsetwidth{^^^^2013}{0.5em} +\xeCJKsetwidth { ^^^^2013 } { 0.5 em } \ProcessKeysOptions { xeCJK / options } \RequirePackage { fontspec } [ 2012/05/01 ] \RequirePackage { xunicode-addon } diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty index 6eb48c1f651..18afb61899e 100644 --- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty +++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty @@ -31,11 +31,11 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xeCJK.dtx 2667062 2016-02-01 12:02:59 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 8518191 2016-02-10 16:25:31 +0800 Qing Lee $ {xeCJK font effect} \ProvidesExplPackage {xeCJKfntef} - {\ExplFileDate}{3.3.3}{\ExplFileDescription} + {\ExplFileDate}{3.3.4}{\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 e033226ccfe..be3750f1aca 100644 --- a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty +++ b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty @@ -31,11 +31,11 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xeCJK.dtx 2667062 2016-02-01 12:02:59 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 8518191 2016-02-10 16:25:31 +0800 Qing Lee $ {addon file for xunicode} \ProvidesExplPackage {xunicode-addon} - {\ExplFileDate}{3.3.3}{\ExplFileDescription} + {\ExplFileDate}{3.3.4}{\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 242904283f7..767654b9d2b 100644 --- a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def +++ b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def @@ -29,11 +29,11 @@ %% The Current Maintainer of this work are Leo Liu and Qing Lee. %% ----------------------------------------------------------------- %% -\GetIdInfo$Id: xeCJK.dtx 2667062 2016-02-01 12:02:59 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 8518191 2016-02-10 16:25:31 +0800 Qing Lee $ {extra definition for xunicode} \ProvidesExplFile {xunicode-extra.def} - {\ExplFileDate}{3.3.3}{\ExplFileDescription} + {\ExplFileDate}{3.3.4}{\ExplFileDescription} \ExplSyntaxOff \DeclareUTFComposite\textsuperscript \DeclareUTFComposite\textsubscript -- cgit v1.2.3