diff options
author | Karl Berry <karl@freefriends.org> | 2016-05-15 22:08:12 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-05-15 22:08:12 +0000 |
commit | a7d586c95a2abcb15eac95c2a2531b158fe19a1b (patch) | |
tree | 4f717671246a1eff3c111c43171d6b4fac5c305c /Master/texmf-dist/tex/latex/ctex/engine | |
parent | f36e4b262397fbc107ecd9c73f0366fb286c4857 (diff) |
ctex (15may16)
git-svn-id: svn://tug.org/texlive/trunk@41156 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/engine')
5 files changed, 32 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def index 44b50915e3b..4048b7951e4 100644 --- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def +++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx f745b21 2016-05-14 12:17:18 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx f12457f 2016-05-16 00:55:34 +0800 Qing Lee <sobenlee@gmail.com> $ {Asian pTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-aptex.def} - {\ExplFileDate}{2.4.1}{\ExplFileDescription} + {\ExplFileDate}{2.4.2}{\ExplFileDescription} \cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1 { \AtBeginDvi { #1 } @@ -51,9 +51,17 @@ } \tl_set:Nn \kanjifamilydefault { \CJKfamilydefault } \ctex_at_end_preamble:n { \ctex_update_default_family: } -\ctex_patch_cmd:Nnn \em - { \mcfamily \upshape \else \gtfamily \itshape } +\ctex_patch_cmd_once:NnnnTF \em + { \ExplSyntaxOff } + { \eminnershape \else \gtfamily \itshape } { \eminnershape \else \itshape } + { } + { + \ctex_patch_cmd:Nnn \em + { \mcfamily \upshape \else \gtfamily \itshape } + { \eminnershape \else \itshape } + } +\cs_set_nopar:Npn \eminnershape { \upshape } \cs_new_protected_nopar:Npn \ctex_set_upfamily:nnn #1 #2 #3 { \DeclareKanjiFamily{JY2}{#1}{} diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def index 665914d7d9e..c2073b9422f 100644 --- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def +++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx f745b21 2016-05-14 12:17:18 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx f12457f 2016-05-16 00:55:34 +0800 Qing Lee <sobenlee@gmail.com> $ {LuaLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-luatex.def} - {\ExplFileDate}{2.4.1}{\ExplFileDescription} + {\ExplFileDate}{2.4.2}{\ExplFileDescription} \msg_new:nnn { ctex } { luatexja-loaded } { Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\ @@ -83,6 +83,8 @@ } \AtEndUTFCommand { \group_end: } \RequirePackage { lltjp-fontspec } +\cs_set:Npn \emshape { \itshape } +\cs_set:Npn \eminnershape { \upshape } \cs_new_protected_nopar:Npn \__ctex_ltj_um_define_math_chars: { \group_begin: diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def index 976b01b9c4b..d44850fcb40 100644 --- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def +++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx f745b21 2016-05-14 12:17:18 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx f12457f 2016-05-16 00:55:34 +0800 Qing Lee <sobenlee@gmail.com> $ {(pdf)LaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-pdftex.def} - {\ExplFileDate}{2.4.1}{\ExplFileDescription} + {\ExplFileDate}{2.4.2}{\ExplFileDescription} \cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1 { \AtBeginDvi { #1 } diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def index 581fd65f11b..e79e27077f6 100644 --- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def +++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx f745b21 2016-05-14 12:17:18 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx f12457f 2016-05-16 00:55:34 +0800 Qing Lee <sobenlee@gmail.com> $ {upTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-uptex.def} - {\ExplFileDate}{2.4.1}{\ExplFileDescription} + {\ExplFileDate}{2.4.2}{\ExplFileDescription} \cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1 { \AtBeginDvi { #1 } @@ -51,9 +51,17 @@ } \tl_set:Nn \kanjifamilydefault { \CJKfamilydefault } \ctex_at_end_preamble:n { \ctex_update_default_family: } -\ctex_patch_cmd:Nnn \em - { \mcfamily \upshape \else \gtfamily \itshape } +\ctex_patch_cmd_once:NnnnTF \em + { \ExplSyntaxOff } + { \eminnershape \else \gtfamily \itshape } { \eminnershape \else \itshape } + { } + { + \ctex_patch_cmd:Nnn \em + { \mcfamily \upshape \else \gtfamily \itshape } + { \eminnershape \else \itshape } + } +\cs_set_nopar:Npn \eminnershape { \upshape } \cs_new_protected_nopar:Npn \ctex_set_upfamily:nnn #1 #2 #3 { \DeclareKanjiFamily{JY2}{#1}{} diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def index 216baf15a94..c731ba3fdc0 100644 --- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def +++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx f745b21 2016-05-14 12:17:18 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx f12457f 2016-05-16 00:55:34 +0800 Qing Lee <sobenlee@gmail.com> $ {XeLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-xetex.def} - {\ExplFileDate}{2.4.1}{\ExplFileDescription} + {\ExplFileDate}{2.4.2}{\ExplFileDescription} \RequirePackage { xeCJK } \exp_args:Nx \xeCJKsetup { |