diff options
author | Karl Berry <karl@freefriends.org> | 2019-04-07 21:22:23 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-04-07 21:22:23 +0000 |
commit | fc7eee8c175b307abf9396aed71c1d49bd1c0fe4 (patch) | |
tree | 6173e8f922c539a792fcbde24e58cb8db06dd5e2 /Master/texmf-dist/tex/latex/ctex/engine | |
parent | bb3a18a8791a2f32a6c8a3e0c9ee15a643aefd89 (diff) |
ctex (7apr19)
git-svn-id: svn://tug.org/texlive/trunk@50843 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/engine')
5 files changed, 129 insertions, 143 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 792efb9a6cb..58a354885a6 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `aptex') %% -%% Copyright (C) 2003--2018 +%% Copyright (C) 2003--2019 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $ +\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ {Asian pTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-aptex.def} - {\ExplFileDate}{2.4.14}{\ExplFileDescription} + {\ExplFileDate}{2.4.15}{\ExplFileDescription} \cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1 { \AtBeginDvi {#1} @@ -37,32 +37,43 @@ { \AtBeginShipoutFirst {#1} } } \@onlypreamble \ctex_set_zhmap:n -\tl_set:Nn \CJKrmdefault { rm } -\tl_set:Nn \CJKsfdefault { sf } -\tl_set:Nn \CJKttdefault { tt } +\tl_set:Nn \CJKrmdefault { zhrm } +\tl_set:Nn \CJKsfdefault { zhsf } +\tl_set:Nn \CJKttdefault { zhtt } \tl_set:Nn \CJKfamilydefault { \CJKrmdefault } -\ctex_preto_cmd:NnnTF \rmfamily { \ExplSyntaxOff } - { \kanjifamily { \CJKrmdefault } } - { } - { \ctex_patch_failure:N \rmfamily } -\ctex_preto_cmd:NnnTF \sffamily { \ExplSyntaxOff } - { \kanjifamily { \CJKsfdefault } } - { } - { \ctex_patch_failure:N \sffamily } -\ctex_preto_cmd:NnnTF \ttfamily { \ExplSyntaxOff } - { \kanjifamily { \CJKttdefault } } - { } - { \ctex_patch_failure:N \ttfamily } -\ctex_preto_cmd:NnnTF \normalfont { \ExplSyntaxOff } - { \kanjifamily { \CJKfamilydefault } } - { \cs_set_eq:NN \reset@font \normalfont } - { \ctex_patch_failure:N \normalfont } +\tl_set:Nn \kanjifamilydefault { \CJKfamilydefault } +\RenewDocumentCommand \rmfamily { } + { + \not@math@alphabet \rmfamily \mathrm + \romanfamily \rmdefault + \kanjifamily \CJKrmdefault + \selectfont + } +\RenewDocumentCommand \sffamily { } + { + \not@math@alphabet \sffamily \mathsf + \romanfamily \sfdefault + \kanjifamily \CJKsfdefault + \selectfont + } +\RenewDocumentCommand \ttfamily { } + { + \not@math@alphabet \ttfamily \mathtt + \romanfamily \ttdefault + \kanjifamily \CJKttdefault + \selectfont + } \NewDocumentCommand \CJKfamily { m } { - \kanjifamily { #1 } + \kanjifamily {#1} \selectfont } -\tl_set:Nn \kanjifamilydefault { \CJKfamilydefault } +\DeclareErrorKanjiFont{JY2}{zhrm}{m}{n}{10} +\DeclareKanjiSubstitution{JY2}{zhrm}{m}{n} +\DeclareKanjiSubstitution{JT2}{zhrm}{m}{n} +\DeclareSymbolFont{mincho}{JY2}{zhrm}{m}{n} +\SetSymbolFont{mincho}{bold}{JY2}{zhrm}{bx}{n} +\jfam \symmincho \ctex_at_end_preamble:n { \ctex_update_default_family: } \normalfont \ctex_patch_cmd_once:NnnnTF \em @@ -164,14 +175,14 @@ \cs_new_eq:NN \CTEXfilltwosides \use_none:n \cs_new_eq:NN \endCTEXfilltwosides \prg_do_nothing: \cs_new_protected_nopar:Npn \ctex_update_ccwd: - { \skip_set:Nn \ccwd { 1zw + \ptex_kanjiskip:D } } + { \skip_set:Nn \ccwd { 1zw + \tex_kanjiskip:D } } \dim_new:N \ccwd \cs_new_protected_nopar:Npn \ctex_update_ccglue: - { \skip_set_eq:NN \ptex_kanjiskip:D \l__ctex_ccglue_skip } + { \skip_set_eq:NN \tex_kanjiskip:D \l__ctex_ccglue_skip } \skip_new:N \l__ctex_ccglue_skip \prg_new_conditional:Npnn \ctex_if_ccglue_touched: { TF } { - \skip_if_eq:nnTF { \l__ctex_ccglue_skip } { \ptex_kanjiskip:D } + \skip_if_eq:nnTF { \l__ctex_ccglue_skip } { \tex_kanjiskip:D } { \prg_return_false: } { \prg_return_true: } } \cs_new_protected_nopar:Npn \ctex_update_em_unit: @@ -208,10 +219,10 @@ \cs_new_protected_nopar:Npn \ctex_update_xkanjiskip: { \skip_if_eq:nnT - { \ptex_xkanjiskip:D } { \l__ctex_xkanjiskip_skip } + { \tex_xkanjiskip:D } { \l__ctex_xkanjiskip_skip } { \skip_set:Nn \l__ctex_xkanjiskip_skip { \l__ctex_xkanjiskip_tl } - \skip_set_eq:NN \ptex_xkanjiskip:D \l__ctex_xkanjiskip_skip + \skip_set_eq:NN \tex_xkanjiskip:D \l__ctex_xkanjiskip_skip } } \tl_new:N \l__ctex_xkanjiskip_tl @@ -219,7 +230,7 @@ { .25zw plus 1pt minus 1pt } \skip_new:N \l__ctex_xkanjiskip_skip \skip_set:Nn \l__ctex_xkanjiskip_skip - { \ptex_xkanjiskip:D } + { \tex_xkanjiskip:D } \ctex_add_to_selectfont:n { \ctex_update_xkanjiskip: } \keys_define:nn { ctex } { @@ -236,24 +247,6 @@ punct .default:n = { quanjiao } , } \tl_set:Nn \l__ctex_encoding_tl { UTF8 } -\DeclareKanjiFamily{JY2}{rm}{} -\DeclareKanjiFamily{JY2}{sf}{} -\DeclareKanjiFamily{JY2}{tt}{} -\DeclareKanjiFamily{JT2}{rm}{} -\DeclareKanjiFamily{JT2}{sf}{} -\DeclareKanjiFamily{JT2}{tt}{} -\DeclareFontShape{JY2}{rm}{m}{n}{<-> upzhserif-h}{} -\DeclareFontShape{JY2}{rm}{m}{it}{<-> upzhserifit-h}{} -\DeclareFontShape{JY2}{rm}{bx}{n}{<-> upzhserifb-h}{} -\DeclareFontShape{JT2}{rm}{m}{n}{<-> upzhserif-v}{} -\DeclareFontShape{JT2}{rm}{m}{it}{<-> upzhserifit-v}{} -\DeclareFontShape{JT2}{rm}{bx}{n}{<-> upzhserifb-v}{} -\DeclareFontShape{JY2}{sf}{m}{n}{<-> upzhsans-h}{} -\DeclareFontShape{JY2}{sf}{bx}{n}{<-> upzhsansb-h}{} -\DeclareFontShape{JT2}{sf}{m}{n}{<-> upzhsans-v}{} -\DeclareFontShape{JT2}{sf}{bx}{n}{<-> upzhsansb-v}{} -\DeclareFontShape{JY2}{tt}{m}{n}{<-> upzhmono-h}{} -\DeclareFontShape{JT2}{tt}{m}{n}{<-> upzhmono-v}{} %% %% %% End of file `ctex-engine-aptex.def'. 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 931d4739967..bcdc2e50814 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `luatex') %% -%% Copyright (C) 2003--2018 +%% Copyright (C) 2003--2019 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $ +\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ {LuaLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-luatex.def} - {\ExplFileDate}{2.4.14}{\ExplFileDescription} + {\ExplFileDate}{2.4.15}{\ExplFileDescription} \msg_new:nnn { ctex } { luatexja-loaded } { Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\ @@ -81,13 +81,13 @@ \AtBeginUTFCommand { \group_begin: - \lua_now_x:n { tex.globaldefs = 0 } + \lua_now:e { tex.globaldefs = 0 } \ltj@allalchar } \AtEndUTFCommand { \group_end: } \cs_set_protected:Npn \fontspec_visible_space: { - \etex_iffontchar:D \tex_font:D "2423 \exp_stop_f: + \tex_iffontchar:D \tex_font:D "2423 \exp_stop_f: \ltjalchar "2423 \exp_stop_f: \else: \fontspec_visible_space_fallback: @@ -155,7 +155,7 @@ } \exp_after:wN \globaljfont \font@name \external@font \scan_stop: \font@name - \lua_now_x:n { font.current(tex.getattribute('ltj@curjfnt')) } + \lua_now:e { font.current(tex.getattribute('ltj@curjfnt')) } \use:c { \f@encoding + \f@family } \use:c { \curr@fontshape } } @@ -181,21 +181,21 @@ } \prg_new_conditional:Npnn \ctex_ltj_if_alternate_shape_exist:n #1 { T , F , TF } { - \lua_now_x:n { luatexja.jfont.does_alt_set ('\lua_escape_x:n {#1}') } + \lua_now:e { luatexja.jfont.does_alt_set ('\lua_escape:e {#1}') } \prg_return_true: \else: \prg_return_false: \fi: } \cs_new_nopar:Npn \__ctex_ltj_patch_external_font:w #1 ~ at - { #1 \lua_now_x:n { luatexja.jfont.print_aftl_address() } ~ at } + { #1 \lua_now:e { luatexja.jfont.print_aftl_address() } ~ at } \cs_new_protected_nopar:Npn \ctex_ltj_select_alternate_font: { \ctex_ltj_if_alternate_shape_exist:nT { \l__ctex_ltj_current_shape_tl } { - \lua_now_x:n + \lua_now:e { luatexja.jfont.output_alt_font_cmd - ('y', '\lua_escape_x:n { \l__ctex_ltj_current_shape_tl }') + ('y', '\lua_escape:e { \l__ctex_ltj_current_shape_tl }') } - \lua_now_x:n { luatexja.jfont.pickup_alt_font_a ('\f@size') } + \lua_now:e { luatexja.jfont.pickup_alt_font_a ('\f@size') } } } \tl_new:N \l__ctex_ltj_current_shape_tl @@ -216,16 +216,16 @@ \cs_new_protected_nopar:Npn \ltj@pickup@altfont@copy #1#2 { \ltj@@getjfontnumber #1 - \lua_now_x:n + \lua_now:e { luatexja.jfont.pickup_alt_font_b - ( \int_use:N \ltj@tempcntc, '\lua_escape_x:n {#2}' ) + ( \int_use:N \ltj@tempcntc, '\lua_escape:e {#2}' ) } } \cs_new:Npn \ctex_ltj_if_jfont:nTF #1 { - \lua_now_x:n - { luatexja.jfont.is_kenc( string.match('\lua_escape_x:n {#1}', '[^/]+') ) } + \lua_now:e + { luatexja.jfont.is_kenc( string.match('\lua_escape:e {#1}', '[^/]+') ) } \ifin@ \exp_after:wN \use_i:nn \else: \exp_after:wN \use_ii:nn \fi: } \cs_new:Npn \ctex_ltj_if_jfont_math:NTF #1 @@ -315,7 +315,7 @@ \exp_not:N \DeclareFontSubstitution { \CJK@encoding } { song } { \mddefault } { \updefault } } -\lua_now_x:n { luatexja.jfont.add_kyenc_list('\CJK@encoding') } +\lua_now:e { luatexja.jfont.add_kyenc_list('\CJK@encoding') } \cs_new_protected_nopar:Npn \__ctex_ltj_change_encoding: { \tl_set_eq:NN \g_fontspec_encoding_tl \CJK@encoding } \DeclareFontFamily { \CJK@encoding } { song } { } @@ -462,7 +462,7 @@ } \cs_new_nopar:Npn \__ctex_ltj_msg_def_family_map:n #1 { - \str_case_x:nnF {#1} + \str_case_e:nnF {#1} { \CJKrmdefault { \token_to_str:N \setCJKmainfont } \CJKsfdefault { \token_to_str:N \setCJKsansfont } @@ -473,7 +473,7 @@ } \cs_new_nopar:Npn \__ctex_ltj_msg_family_map:n #1 { - \str_case_x:nnF {#1} + \str_case_e:nnF {#1} { \CJKrmdefault { \token_to_str:N \CJKrmdefault } \CJKsfdefault { \token_to_str:N \CJKsfdefault } @@ -636,7 +636,7 @@ } \cs_new_protected_nopar:Npn \__ctex_ltj_update_family_aux: { - \str_case_x:nn { \f@family } + \str_case_e:nn { \f@family } { { \rmdefault } { \CJKfamily { \CJKrmdefault } } { \sfdefault } { \CJKfamily { \CJKsfdefault } } @@ -651,7 +651,7 @@ { \ctex_ltj_family_if_exist:xNF { \CJKfamilydefault } \l__ctex_ltj_tmp_tl { - \str_if_eq_x:nnTF { \CJKfamilydefault } { \CJKrmdefault } + \str_if_eq:eeTF { \CJKfamilydefault } { \CJKrmdefault } { \use:n } { \ctex_ltj_family_if_exist:xNTF { \CJKrmdefault } \l__ctex_ltj_tmp_tl @@ -832,10 +832,10 @@ \__ctex_ltj_save_alternate_shape:cnn { \__ctex_ltj_alternate_cs:n { clear / \l__ctex_ltj_base_CJKfamily_tl } } { luatexja.jfont.clear_alt_font_latex } - { '\lua_escape_x:n { \CJK@encoding/#2/#3/#4 }' } + { '\lua_escape:e { \CJK@encoding/#2/#3/#4 }' } } \NewDocumentCommand \ctex_ltj_set_alternate_shape:nnn - { m m > { \SplitArgument { \c_one } { -> } } m } + { m m > { \SplitArgument { 1 } { -> } } m } { \ctex_ltj_set_alternate_shape:nnnn {#1} {#2} #3 } \cs_new_protected_nopar:Npn \ctex_ltj_set_alternate_shape:nnnn #1#2#3#4 { @@ -847,13 +847,13 @@ \int_eval:n { \tl_if_blank:nTF {#3} { "80 } {#3} } , \int_eval:n { \tl_if_blank:nTF {#4} { "10FFFF } {#4} } , } - '\lua_escape_x:n { \CJK@encoding/#2 }' , - '\lua_escape_x:n { \CJK@encoding/#1 }' + '\lua_escape:e { \CJK@encoding/#2 }' , + '\lua_escape:e { \CJK@encoding/#1 }' } } \cs_new_protected_nopar:Npn \ctex_ltj_set_alternate_shape:n #1 { - \lua_now_x:n { luatexja.jfont.set_alt_font_latex ( #1 ) } + \lua_now:e { luatexja.jfont.set_alt_font_latex ( #1 ) } \__ctex_ltj_save_alternate_shape:cnn { \__ctex_ltj_alternate_cs:n { reset / \l__ctex_ltj_base_CJKfamily_tl } } { luatexja.jfont.set_alt_font_latex } {#1} @@ -865,8 +865,8 @@ \ctex_ltj_set_alternate_shape:n { ##1 , - '\lua_escape_x:n { \CJK@encoding/#2 }' , - '\lua_escape_x:n { \CJK@encoding/#1 }' + '\lua_escape:e { \CJK@encoding/#2 }' , + '\lua_escape:e { \CJK@encoding/#1 }' } } } @@ -875,9 +875,9 @@ \group_begin: \cs_if_exist:NF #1 { \cs_set_eq:NN #1 \prg_do_nothing: } \cs_set_eq:NN \l__ctex_ltj_base_family_tl \scan_stop: - \cs_set_eq:NN \lua_escape_x:n \scan_stop: + \cs_set_eq:NN \lua_escape:e \scan_stop: \cs_gset_protected_nopar:Npx #1 - { \exp_not:o {#1} \exp_not:N \lua_now_x:n { #2 ( #3 ) } } + { \exp_not:o {#1} \exp_not:N \lua_now:e { #2 ( #3 ) } } \group_end: } \cs_generate_variant:Nn \__ctex_ltj_save_alternate_shape:Nnn { c } @@ -940,7 +940,7 @@ \tl_new:N \l__ctex_ltj_char_range_tl \prop_new:N \g__ctex_ltj_char_range_prop \NewDocumentCommand \ctex_ltj_save_char_range:n - { > { \SplitArgument { \c_one } { -> } } m } + { > { \SplitArgument { 1 } { -> } } m } { \ctex_ltj_save_char_range:nn #1 } \cs_new_protected_nopar:Npn \ctex_ltj_save_char_range:nn #1#2 { @@ -1035,7 +1035,7 @@ { \tl_gset:Nx \g__ctex_fontset_tl { - \lua_now_x:n + \lua_now:e { if ~ os.name == 'windows' then ~ tex.sprint ( 'windows' ) @@ -1127,7 +1127,7 @@ \newluafunction \g__ctex_kanjisize_func \group_begin: \char_set_catcode_space:n { 32 } -\lua_now_x:n +\lua_now:e { local nulltable = { } local t = lua.get_functions_table() @@ -1145,7 +1145,7 @@ } \group_end: \cs_new_protected_nopar:Npn \ctex_update_kanjisize: - { \luatex_luafunction:D \g__ctex_kanjisize_func } + { \tex_luafunction:D \g__ctex_kanjisize_func } \ctex_add_to_selectfont:n { \ctex_update_kanjisize: } \keys_define:nn { ctex } { 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 83bbd3cc2a1..8e2dd5f65c6 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `pdftex') %% -%% Copyright (C) 2003--2018 +%% Copyright (C) 2003--2019 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $ +\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ {(pdf)LaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-pdftex.def} - {\ExplFileDate}{2.4.14}{\ExplFileDescription} + {\ExplFileDate}{2.4.15}{\ExplFileDescription} \cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1 { \AtBeginDvi {#1} @@ -63,11 +63,11 @@ \cs_new_protected_nopar:Npn \__ctex_save_cmap:Nn #1#2 { \tl_set:Nx \l__ctex_tmp_tl { \str_lower_case:n {#2} \CJK@plane } - \tex_immediate:D \pdftex_pdfobj:D stream ~ file { \l__ctex_tmp_tl .cmap } + \tex_immediate:D \tex_pdfobj:D stream ~ file { \l__ctex_tmp_tl .cmap } \cs_new_protected_nopar:Npx #1 { - \exp_not:N \pdftex_pdffontattr:D \exp_not:N \tex_font:D - { /ToUnicode ~ \int_use:N \pdftex_pdflastobj:D \c_space_tl 0 ~ R } + \exp_not:N \tex_pdffontattr:D \exp_not:N \tex_font:D + { /ToUnicode ~ \int_use:N \tex_pdflastobj:D \c_space_tl 0 ~ R } } } \group_begin: @@ -157,16 +157,16 @@ \tl_set:Nx \l__ctex_tmp_tl {#2} \int_set:Nn \l__ctex_tmp_int { \exp_args:No \int_from_hex:n { \l__ctex_tmp_tl } } - \int_compare:nNnTF \l__ctex_tmp_int < \c_two_hundred_fifty_six + \int_compare:nNnTF \l__ctex_tmp_int < { 256 } { \tl_gset:Nx #1 { \int_to_Hex:n { \l__ctex_tmp_int } } } { - \int_sub:Nn \l__ctex_tmp_int { \c_two_hundred_fifty_six } + \int_sub:Nn \l__ctex_tmp_int { 256 } \tl_gset:Nx #1 { \int_to_Hex:n - { \int_div_truncate:nn { \l__ctex_tmp_int } { \c_four } + "D800 } + { \int_div_truncate:nn { \l__ctex_tmp_int } { 4 } + "D800 } \int_to_Hex:n - { \int_mod:nn { \l__ctex_tmp_int } { \c_four } + "DC } + { \int_mod:nn { \l__ctex_tmp_int } { 4 } + "DC } } } } @@ -174,7 +174,7 @@ \fi: \AtBeginDocument { - \str_if_eq_x:nnF { \l__ctex_punct_tl } { quanjiao } + \str_if_eq:eeF { \l__ctex_punct_tl } { quanjiao } { \punctstyle { \l__ctex_punct_tl } } } \ctex_at_end_preamble:n { \ctex_update_default_family: } 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 21f4ff1d648..45203929a3c 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `uptex') %% -%% Copyright (C) 2003--2018 +%% Copyright (C) 2003--2019 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $ +\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ {upTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-uptex.def} - {\ExplFileDate}{2.4.14}{\ExplFileDescription} + {\ExplFileDate}{2.4.15}{\ExplFileDescription} \cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1 { \AtBeginDvi {#1} @@ -37,32 +37,43 @@ { \AtBeginShipoutFirst {#1} } } \@onlypreamble \ctex_set_zhmap:n -\tl_set:Nn \CJKrmdefault { rm } -\tl_set:Nn \CJKsfdefault { sf } -\tl_set:Nn \CJKttdefault { tt } +\tl_set:Nn \CJKrmdefault { zhrm } +\tl_set:Nn \CJKsfdefault { zhsf } +\tl_set:Nn \CJKttdefault { zhtt } \tl_set:Nn \CJKfamilydefault { \CJKrmdefault } -\ctex_preto_cmd:NnnTF \rmfamily { \ExplSyntaxOff } - { \kanjifamily { \CJKrmdefault } } - { } - { \ctex_patch_failure:N \rmfamily } -\ctex_preto_cmd:NnnTF \sffamily { \ExplSyntaxOff } - { \kanjifamily { \CJKsfdefault } } - { } - { \ctex_patch_failure:N \sffamily } -\ctex_preto_cmd:NnnTF \ttfamily { \ExplSyntaxOff } - { \kanjifamily { \CJKttdefault } } - { } - { \ctex_patch_failure:N \ttfamily } -\ctex_preto_cmd:NnnTF \normalfont { \ExplSyntaxOff } - { \kanjifamily { \CJKfamilydefault } } - { \cs_set_eq:NN \reset@font \normalfont } - { \ctex_patch_failure:N \normalfont } +\tl_set:Nn \kanjifamilydefault { \CJKfamilydefault } +\RenewDocumentCommand \rmfamily { } + { + \not@math@alphabet \rmfamily \mathrm + \romanfamily \rmdefault + \kanjifamily \CJKrmdefault + \selectfont + } +\RenewDocumentCommand \sffamily { } + { + \not@math@alphabet \sffamily \mathsf + \romanfamily \sfdefault + \kanjifamily \CJKsfdefault + \selectfont + } +\RenewDocumentCommand \ttfamily { } + { + \not@math@alphabet \ttfamily \mathtt + \romanfamily \ttdefault + \kanjifamily \CJKttdefault + \selectfont + } \NewDocumentCommand \CJKfamily { m } { - \kanjifamily { #1 } + \kanjifamily {#1} \selectfont } -\tl_set:Nn \kanjifamilydefault { \CJKfamilydefault } +\DeclareErrorKanjiFont{JY2}{zhrm}{m}{n}{10} +\DeclareKanjiSubstitution{JY2}{zhrm}{m}{n} +\DeclareKanjiSubstitution{JT2}{zhrm}{m}{n} +\DeclareSymbolFont{mincho}{JY2}{zhrm}{m}{n} +\SetSymbolFont{mincho}{bold}{JY2}{zhrm}{bx}{n} +\jfam \symmincho \ctex_at_end_preamble:n { \ctex_update_default_family: } \normalfont \ctex_patch_cmd_once:NnnnTF \em @@ -174,14 +185,14 @@ \cs_new_eq:NN \CTEXfilltwosides \use_none:n \cs_new_eq:NN \endCTEXfilltwosides \prg_do_nothing: \cs_new_protected_nopar:Npn \ctex_update_ccwd: - { \skip_set:Nn \ccwd { 1zw + \ptex_kanjiskip:D } } + { \skip_set:Nn \ccwd { 1zw + \tex_kanjiskip:D } } \dim_new:N \ccwd \cs_new_protected_nopar:Npn \ctex_update_ccglue: - { \skip_set_eq:NN \ptex_kanjiskip:D \l__ctex_ccglue_skip } + { \skip_set_eq:NN \tex_kanjiskip:D \l__ctex_ccglue_skip } \skip_new:N \l__ctex_ccglue_skip \prg_new_conditional:Npnn \ctex_if_ccglue_touched: { TF } { - \skip_if_eq:nnTF { \l__ctex_ccglue_skip } { \ptex_kanjiskip:D } + \skip_if_eq:nnTF { \l__ctex_ccglue_skip } { \tex_kanjiskip:D } { \prg_return_false: } { \prg_return_true: } } \cs_new_protected_nopar:Npn \ctex_update_em_unit: @@ -218,10 +229,10 @@ \cs_new_protected_nopar:Npn \ctex_update_xkanjiskip: { \skip_if_eq:nnT - { \ptex_xkanjiskip:D } { \l__ctex_xkanjiskip_skip } + { \tex_xkanjiskip:D } { \l__ctex_xkanjiskip_skip } { \skip_set:Nn \l__ctex_xkanjiskip_skip { \l__ctex_xkanjiskip_tl } - \skip_set_eq:NN \ptex_xkanjiskip:D \l__ctex_xkanjiskip_skip + \skip_set_eq:NN \tex_xkanjiskip:D \l__ctex_xkanjiskip_skip } } \tl_new:N \l__ctex_xkanjiskip_tl @@ -229,7 +240,7 @@ { .25zw plus 1pt minus 1pt } \skip_new:N \l__ctex_xkanjiskip_skip \skip_set:Nn \l__ctex_xkanjiskip_skip - { \ptex_xkanjiskip:D } + { \tex_xkanjiskip:D } \ctex_add_to_selectfont:n { \ctex_update_xkanjiskip: } \keys_define:nn { ctex } { @@ -246,24 +257,6 @@ punct .default:n = { quanjiao } , } \tl_set:Nn \l__ctex_encoding_tl { UTF8 } -\DeclareKanjiFamily{JY2}{rm}{} -\DeclareKanjiFamily{JY2}{sf}{} -\DeclareKanjiFamily{JY2}{tt}{} -\DeclareKanjiFamily{JT2}{rm}{} -\DeclareKanjiFamily{JT2}{sf}{} -\DeclareKanjiFamily{JT2}{tt}{} -\DeclareFontShape{JY2}{rm}{m}{n}{<-> upzhserif-h}{} -\DeclareFontShape{JY2}{rm}{m}{it}{<-> upzhserifit-h}{} -\DeclareFontShape{JY2}{rm}{bx}{n}{<-> upzhserifb-h}{} -\DeclareFontShape{JT2}{rm}{m}{n}{<-> upzhserif-v}{} -\DeclareFontShape{JT2}{rm}{m}{it}{<-> upzhserifit-v}{} -\DeclareFontShape{JT2}{rm}{bx}{n}{<-> upzhserifb-v}{} -\DeclareFontShape{JY2}{sf}{m}{n}{<-> upzhsans-h}{} -\DeclareFontShape{JY2}{sf}{bx}{n}{<-> upzhsansb-h}{} -\DeclareFontShape{JT2}{sf}{m}{n}{<-> upzhsans-v}{} -\DeclareFontShape{JT2}{sf}{bx}{n}{<-> upzhsansb-v}{} -\DeclareFontShape{JY2}{tt}{m}{n}{<-> upzhmono-h}{} -\DeclareFontShape{JT2}{tt}{m}{n}{<-> upzhmono-v}{} %% %% %% End of file `ctex-engine-uptex.def'. 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 977282b3f70..e5dd620e88b 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `xetex') %% -%% Copyright (C) 2003--2018 +%% Copyright (C) 2003--2019 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $ +\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ {XeLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-xetex.def} - {\ExplFileDate}{2.4.14}{\ExplFileDescription} + {\ExplFileDate}{2.4.15}{\ExplFileDescription} \RequirePackage { xeCJK } \exp_args:Nx \xeCJKsetup { |