diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/engine')
5 files changed, 121 insertions, 54 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 24584de60d4..ea96488d56d 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 @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Asian pTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-aptex.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \cs_new_protected:Npn \ctex_set_zhmap:n { \tl_gput_right:Nx \g__ctex_zhmap_tl } \cs_new_protected:Npn \ctex_use_zhmap: @@ -42,15 +42,6 @@ } \tl_new:N \g__ctex_zhmap_tl \@onlypreamble \ctex_set_zhmap:n -\tl_if_exist:NF \CJKfamilydefault - { \tl_const:Nn \CJKfamilydefault { \CJKrmdefault } } -\tl_if_exist:NF \CJKrmdefault { \tl_const:Nn \CJKrmdefault { zhrm } } -\tl_if_exist:NF \CJKsfdefault { \tl_const:Nn \CJKsfdefault { zhsf } } -\tl_if_exist:NF \CJKttdefault { \tl_const:Nn \CJKttdefault { zhtt } } -\tl_set:Nn \kanjifamilydefault { \CJKfamilydefault } -\g@addto@macro \@rmfamilyhook { \kanjifamily { \CJKrmdefault } } -\g@addto@macro \@sffamilyhook { \kanjifamily { \CJKsfdefault } } -\g@addto@macro \@ttfamilyhook { \kanjifamily { \CJKttdefault } } \NewDocumentCommand \CJKfamily { m } { \kanjifamily {#1} \selectfont } \DeclareErrorKanjiFont {JY2}{zhrm}{m}{n}{10} @@ -59,8 +50,6 @@ \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 { \ExplSyntaxOff } { \eminnershape \else \gtfamily \itshape } @@ -124,6 +113,32 @@ \@onlypreamble \ctex_set_upmap_unicode:nnn \@onlypreamble \ctex_set_upfonts:nnnnnn \RequirePackage { pxeverysel } +\cs_new_protected:Npn \ctex_provide_font_hook:NNN #1#2 + { + \exp_args:Nc \__ctex_provide_font_hook_aux:NNNN + { CTEX \cs_to_str:N #2 } #1#2 + } +\cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4 + { + \tl_new:N #1 + \cs_if_exist:NTF #3 + { \tl_gput_right:Nn #3 {#1} } + { \ctex_patch_cmd:Nnn #2 {#4} { #1#4 } } + } +\ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont +\ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont +\ctex_provide_font_hook:NNN \ttfamily \@ttfamilyhook \selectfont +\tl_if_exist:NF \CJKfamilydefault + { \tl_const:Nn \CJKfamilydefault { \CJKrmdefault } } +\tl_if_exist:NF \CJKrmdefault { \tl_const:Nn \CJKrmdefault { zhrm } } +\tl_if_exist:NF \CJKsfdefault { \tl_const:Nn \CJKsfdefault { zhsf } } +\tl_if_exist:NF \CJKttdefault { \tl_const:Nn \CJKttdefault { zhtt } } +\tl_gput_right:Nn \CTEX@rmfamilyhook { \kanjifamily { \CJKrmdefault } } +\tl_gput_right:Nn \CTEX@sffamilyhook { \kanjifamily { \CJKsfdefault } } +\tl_gput_right:Nn \CTEX@ttfamilyhook { \kanjifamily { \CJKttdefault } } +\tl_gset:Nn \kanjifamilydefault { \CJKfamilydefault } +\normalfont +\ctex_at_end_preamble:n { \ctex_update_default_family: } \cs_new_protected:Npn \ctex_update_default_family: { \tl_if_eq:NNT \CJKfamilydefault \l__ctex_family_default_init_tl 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 6ccee7c96a2..75208abd224 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 @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {LuaLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-luatex.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \msg_new:nnn { ctex } { luatexja-loaded } { Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\ @@ -679,16 +679,6 @@ \@onlypreamble \setCJKmathfont \@onlypreamble \setCJKromanfont \@onlypreamble \defaultCJKfontfeatures -\tl_if_exist:NF \CJKfamilydefault - { \tl_const:Nn \CJKfamilydefault { \CJKrmdefault } } -\tl_if_exist:NF \CJKrmdefault { \tl_const:Nn \CJKrmdefault { rm } } -\tl_if_exist:NF \CJKsfdefault { \tl_const:Nn \CJKsfdefault { sf } } -\tl_if_exist:NF \CJKttdefault { \tl_const:Nn \CJKttdefault { tt } } -\g@addto@macro \@rmfamilyhook { \CJKfamily { \CJKrmdefault } } -\g@addto@macro \@sffamilyhook { \CJKfamily { \CJKsfdefault } } -\g@addto@macro \@ttfamilyhook { \CJKfamily { \CJKttdefault } } -\g@addto@macro \@defaultfamilyhook { \CJKfamily { \CJKfamilydefault } } -\ctex_at_end_preamble:n { \ctex_update_default_family: } \cs_new_protected:Npn \ctex_ltj_ensure_default_family: { \prop_if_empty:NF \g__ctex_ltj_family_font_name_prop @@ -966,7 +956,7 @@ { \clist_map_inline:nn {#1} { \__ctex_ltj_declare_char_range:nn ##1 } } \cs_generate_variant:Nn \ctex_ltj_declare_char_range:n { e } \cs_new_protected:Npn \__ctex_ltj_declare_char_range:nn #1 - { \exp_args:Ne \ctex_ltj_declare_char_range:nn { \tl_trim_spaces:n {#1} } } + { \tl_trim_spaces_apply:nN {#1} \ctex_ltj_declare_char_range:nn } \cs_new_protected:Npn \ctex_ltj_declare_char_range:nn #1#2 { \tl_clear:N \l__ctex_ltj_char_range_tl @@ -1028,6 +1018,33 @@ { \ltj@setpar@global \ltjsetkanjiskip } \cs_new_protected:Npn \ctex_ltj_set_xkanjiskip:N { \ltj@setpar@global \ltjsetxkanjiskip } +\cs_new_protected:Npn \ctex_provide_font_hook:NNN #1#2 + { + \exp_args:Nc \__ctex_provide_font_hook_aux:NNNN + { CTEX \cs_to_str:N #2 } #1#2 + } +\cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4 + { + \tl_new:N #1 + \cs_if_exist:NTF #3 + { \tl_gput_right:Nn #3 {#1} } + { \ctex_patch_cmd:Nnn #2 {#4} { #1#4 } } + } +\ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont +\ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont +\ctex_provide_font_hook:NNN \ttfamily \@ttfamilyhook \selectfont +\ctex_provide_font_hook:NNN \normalfont \@defaultfamilyhook \usefont +\tl_if_exist:NF \CJKfamilydefault + { \tl_const:Nn \CJKfamilydefault { \CJKrmdefault } } +\tl_if_exist:NF \CJKrmdefault { \tl_const:Nn \CJKrmdefault { rm } } +\tl_if_exist:NF \CJKsfdefault { \tl_const:Nn \CJKsfdefault { sf } } +\tl_if_exist:NF \CJKttdefault { \tl_const:Nn \CJKttdefault { tt } } +\tl_gput_right:Nn \CTEX@rmfamilyhook { \CJKfamily { \CJKrmdefault } } +\tl_gput_right:Nn \CTEX@sffamilyhook { \CJKfamily { \CJKsfdefault } } +\tl_gput_right:Nn \CTEX@ttfamilyhook { \CJKfamily { \CJKttdefault } } +\tl_gput_right:Nn \CTEX@defaultfamilyhook { \CJKfamily { \CJKfamilydefault } } +\normalfont +\ctex_at_end_preamble:n { \ctex_update_default_family: } \cs_new_protected:Npn \ctex_update_default_family: { \tl_if_eq:NNT \CJKfamilydefault \l__ctex_family_default_init_tl 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 e447c91fff9..7f65e702fbb 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 @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {(pdf)LaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-pdftex.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \cs_new_protected:Npn \ctex_set_zhmap:n { \tl_gput_right:Nx \g__ctex_zhmap_tl } \cs_new_protected:Npn \ctex_use_zhmap: @@ -102,7 +102,7 @@ \tl_set:Nn \CJKrmdefault {#1} \tl_set:Nn \CJKsfdefault {#2} \tl_set:Nn \CJKttdefault {#3} - \ctex_set_zhmap:n { \ctex_zhmap_input:n {#4} } + \ctex_set_zhmap:n { \ctex_zhmap_input:n { ctex-zhmap- #4 .tex } } } \@onlypreamble \ctex_load_zhmap:nnnn \cs_new_protected:Npn \ctex_zhmap_input:n #1 @@ -118,15 +118,6 @@ \char_set_catcode:nn { 92 } { \char_value_catcode:n { 92 } } } } - \tl_if_exist:NF \CJKfamilydefault - { \tl_const:Nn \CJKfamilydefault { \CJKrmdefault } } - \tl_if_exist:NF \CJKrmdefault { \tl_new:N \CJKrmdefault } - \tl_if_exist:NF \CJKsfdefault { \tl_new:N \CJKsfdefault } - \tl_if_exist:NF \CJKttdefault { \tl_new:N \CJKttdefault } - \g@addto@macro \@rmfamilyhook { \CJKfamily { \CJKrmdefault } } - \g@addto@macro \@sffamilyhook { \CJKfamily { \CJKsfdefault } } - \g@addto@macro \@ttfamilyhook { \CJKfamily { \CJKttdefault } } - \g@addto@macro \@defaultfamilyhook { \CJKfamily { \CJKfamilydefault } } \fi: \cs_new_protected:Npn \ctex_CJK_input:n #1 { @@ -209,7 +200,8 @@ \clist_const:Nn \c__ctex_punct_family_clist { zhsong , zhhei , zhfs , zhkai , zhli , zhyou , - zhsongb , zhheil , zhheib , zhyoub , zhyahei , zhyaheib + zhsongb , zhheil , zhheib , zhyoub , + zhyahei , zhyaheib , zhpf , zhpfb } \cs_new_protected:Npn \ctex_punct_map_family:nn #1#2 { @@ -246,6 +238,34 @@ { \tl_const:cn { c__ctex_ #1 _punct_spaces_tl } {#2} } \cs_new_eq:NN \ctexspadef \ctex_punct_space:nn \ctex_file_input:n { ctexspa.def } +\reverse_if:N \if_bool:N \g__ctex_zhmCJK_bool +\cs_new_protected:Npn \ctex_provide_font_hook:NNN #1#2 + { + \exp_args:Nc \__ctex_provide_font_hook_aux:NNNN + { CTEX \cs_to_str:N #2 } #1#2 + } +\cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4 + { + \tl_new:N #1 + \cs_if_exist:NTF #3 + { \tl_gput_right:Nn #3 {#1} } + { \ctex_patch_cmd:Nnn #2 {#4} { #1#4 } } + } +\ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont +\ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont +\ctex_provide_font_hook:NNN \ttfamily \@ttfamilyhook \selectfont +\ctex_provide_font_hook:NNN \normalfont \@defaultfamilyhook \usefont +\tl_if_exist:NF \CJKfamilydefault + { \tl_const:Nn \CJKfamilydefault { \CJKrmdefault } } +\tl_if_exist:NF \CJKrmdefault { \tl_const:Nn \CJKrmdefault { rm } } +\tl_if_exist:NF \CJKsfdefault { \tl_const:Nn \CJKsfdefault { sf } } +\tl_if_exist:NF \CJKttdefault { \tl_const:Nn \CJKttdefault { tt } } +\tl_gput_right:Nn \CTEX@rmfamilyhook { \CJKfamily { \CJKrmdefault } } +\tl_gput_right:Nn \CTEX@sffamilyhook { \CJKfamily { \CJKsfdefault } } +\tl_gput_right:Nn \CTEX@ttfamilyhook { \CJKfamily { \CJKttdefault } } +\tl_gput_right:Nn \CTEX@defaultfamilyhook { \CJKfamily { \CJKfamilydefault } } +\fi: +\normalfont \cs_new_protected:Npn \ctex_update_default_family: { \tl_if_eq:NNT \CJKfamilydefault \l__ctex_family_default_init_tl 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 7f24ee2da25..ca849f22698 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 @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {upTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-uptex.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \cs_new_protected:Npn \ctex_set_zhmap:n { \tl_gput_right:Nx \g__ctex_zhmap_tl } \cs_new_protected:Npn \ctex_use_zhmap: @@ -42,15 +42,6 @@ } \tl_new:N \g__ctex_zhmap_tl \@onlypreamble \ctex_set_zhmap:n -\tl_if_exist:NF \CJKfamilydefault - { \tl_const:Nn \CJKfamilydefault { \CJKrmdefault } } -\tl_if_exist:NF \CJKrmdefault { \tl_const:Nn \CJKrmdefault { zhrm } } -\tl_if_exist:NF \CJKsfdefault { \tl_const:Nn \CJKsfdefault { zhsf } } -\tl_if_exist:NF \CJKttdefault { \tl_const:Nn \CJKttdefault { zhtt } } -\tl_set:Nn \kanjifamilydefault { \CJKfamilydefault } -\g@addto@macro \@rmfamilyhook { \kanjifamily { \CJKrmdefault } } -\g@addto@macro \@sffamilyhook { \kanjifamily { \CJKsfdefault } } -\g@addto@macro \@ttfamilyhook { \kanjifamily { \CJKttdefault } } \NewDocumentCommand \CJKfamily { m } { \kanjifamily {#1} \selectfont } \DeclareErrorKanjiFont {JY2}{zhrm}{m}{n}{10} @@ -59,8 +50,6 @@ \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 { \ExplSyntaxOff } { \eminnershape \else \gtfamily \itshape } @@ -124,6 +113,32 @@ \@onlypreamble \ctex_set_upmap_unicode:nnn \@onlypreamble \ctex_set_upfonts:nnnnnn \RequirePackage { pxeverysel } +\cs_new_protected:Npn \ctex_provide_font_hook:NNN #1#2 + { + \exp_args:Nc \__ctex_provide_font_hook_aux:NNNN + { CTEX \cs_to_str:N #2 } #1#2 + } +\cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4 + { + \tl_new:N #1 + \cs_if_exist:NTF #3 + { \tl_gput_right:Nn #3 {#1} } + { \ctex_patch_cmd:Nnn #2 {#4} { #1#4 } } + } +\ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont +\ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont +\ctex_provide_font_hook:NNN \ttfamily \@ttfamilyhook \selectfont +\tl_if_exist:NF \CJKfamilydefault + { \tl_const:Nn \CJKfamilydefault { \CJKrmdefault } } +\tl_if_exist:NF \CJKrmdefault { \tl_const:Nn \CJKrmdefault { zhrm } } +\tl_if_exist:NF \CJKsfdefault { \tl_const:Nn \CJKsfdefault { zhsf } } +\tl_if_exist:NF \CJKttdefault { \tl_const:Nn \CJKttdefault { zhtt } } +\tl_gput_right:Nn \CTEX@rmfamilyhook { \kanjifamily { \CJKrmdefault } } +\tl_gput_right:Nn \CTEX@sffamilyhook { \kanjifamily { \CJKsfdefault } } +\tl_gput_right:Nn \CTEX@ttfamilyhook { \kanjifamily { \CJKttdefault } } +\tl_gset:Nn \kanjifamilydefault { \CJKfamilydefault } +\normalfont +\ctex_at_end_preamble:n { \ctex_update_default_family: } \cs_new_protected:Npn \ctex_update_default_family: { \tl_if_eq:NNT \CJKfamilydefault \l__ctex_family_default_init_tl 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 26435410903..9c584a63b48 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 @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {XeLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-xetex.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \RequirePackage { xeCJK } \exp_args:Nx \xeCJKsetup { |