diff options
author | Karl Berry <karl@freefriends.org> | 2020-08-23 20:53:47 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-08-23 20:53:47 +0000 |
commit | b1cf361795a720dbfa84ca6546355be360964437 (patch) | |
tree | 0f4e7ab3eb499669e27d35feb127efc305f2c69c /Master/texmf-dist/tex/latex/ctex/engine | |
parent | 20b89567543c9ede8bcd65a562ce3abff8eaa617 (diff) |
ctex (23aug20)
git-svn-id: svn://tug.org/texlive/trunk@56161 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/engine')
5 files changed, 38 insertions, 50 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 281e9d49110..674b7a70a46 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 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $ {Asian pTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-aptex.def} - {\ExplFileDate}{2.5.3}{\ExplFileDescription} + {\ExplFileDate}{2.5.4}{\ExplFileDescription} \cs_new_protected:Npn \ctex_set_zhmap:n { \tl_gput_right:Nx \g__ctex_zhmap_tl } \cs_new_protected:Npn \ctex_use_zhmap: @@ -123,7 +123,7 @@ \tl_new:N #1 \cs_if_exist:NTF #3 { \tl_gput_right:Nn #3 {#1} } - { \ctex_patch_cmd:Nnn #2 {#4} { #1#4 } } + { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } } } \ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont \ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont 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 5d0e587c18d..51d88db1d5c 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 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $ {LuaLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-luatex.def} - {\ExplFileDate}{2.5.3}{\ExplFileDescription} + {\ExplFileDate}{2.5.4}{\ExplFileDescription} \msg_new:nnn { ctex } { luatexja-loaded } { Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\ @@ -42,6 +42,7 @@ \RequirePackage { fontspec } \@ifpackagelater { fontspec } { 2020/02/21 } { } { \msg_error:nnn { ctex } { package-too-old } { fontspec } } +\ctex_at_end:n { \char_set_catcode_comment:n { \ltjlineendcomment } } \ExplSyntaxOff \ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF} \ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF} @@ -65,16 +66,20 @@ "00B7, "2018, "2019, "201C, "201D, "2013, "2014, "2025, "2026, "2027, "2E3A} \ltjsetparameter{jacharrange={-1, -2, -3, -4, -5, +6, +7, -8, +9}} \directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end} -\directlua{ - local s = kpse.find_file('ltj-kinsoku.lua', 'tex') - luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {} -} -\ltjsetparameter{kanjiskip=\z@ plus .4pt minus .5pt, - xkanjiskip=.25\zw plus 1pt minus 1pt, - autospacing, autoxspacing, jacharrange={-1}, - yalbaselineshift=\z@, yjabaselineshift=\z@, - jcharwidowpenalty=500, differentjfm=paverage -} +\@ifpackagelater{luatexja}{2020/08/08} + { \ltjsetparameter { autospacing, autoxspacing, differentjfm = paverage } } + { + \directlua{ + local s = kpse.find_file('ltj-kinsoku.lua', 'tex') + luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {} + } + \ltjsetparameter{kanjiskip=\z@ plus .4pt minus .5pt, + xkanjiskip=.25\zw plus 1pt minus 1pt, + autospacing, autoxspacing, jacharrange={-1}, + yalbaselineshift=\z@, yjabaselineshift=\z@, + jcharwidowpenalty=500, differentjfm=paverage + } + } \ExplSyntaxOn \cs_new_protected:Npn \CTEX@alchar #1 { \CTEX@beginallalchar #1 \CTEX@endallalchar } @@ -1092,7 +1097,7 @@ \tl_new:N #1 \cs_if_exist:NTF #3 { \tl_gput_right:Nn #3 {#1} } - { \ctex_patch_cmd:Nnn #2 {#4} { #1#4 } } + { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } } } \ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont \ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont 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 d88ff8bbdbf..f2504965632 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 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $ {(pdf)LaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-pdftex.def} - {\ExplFileDate}{2.5.3}{\ExplFileDescription} + {\ExplFileDate}{2.5.4}{\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,37 +102,20 @@ \tl_set:Nn \CJKrmdefault {#1} \tl_set:Nn \CJKsfdefault {#2} \tl_set:Nn \CJKttdefault {#3} - \ctex_set_zhmap:n { \ctex_zhmap_input:n { ctex-zhmap- #4 .tex } } + \ctex_set_zhmap:n { \ctex_file_input:n { ctex-zhmap- #4 .tex } } } \@onlypreamble \ctex_load_zhmap:nnnn - \cs_new_protected:Npn \ctex_zhmap_input:n #1 - { - \ctex_file_wrapper:nnn - { - \char_set_catcode_comment:n { 37 } % % - \char_set_catcode_escape:n { 92 } % \ - } - { \file_input:n {#1} } - { - \char_set_catcode:nn { 37 } { \char_value_catcode:n { 37 } } - \char_set_catcode:nn { 92 } { \char_value_catcode:n { 92 } } - } - } \fi: \cs_new_protected:Npn \ctex_CJK_input:n #1 { - \ctex_file_wrapper:nnn - { - \char_set_catcode_other:n { 60 } % < - \char_set_catcode_math_superscript:n { 94 } % ^ - \int_set:Nn \tex_endlinechar:D { -1 } - } - { \file_input:n {#1} } - { - \char_set_catcode:nn { 60 } { \char_value_catcode:n { 60 } } - \char_set_catcode:nn { 94 } { \char_value_catcode:n { 94 } } - \int_set:Nn \tex_endlinechar:D { \int_use:N \tex_endlinechar:D } - } + \cctab_begin:N \c__ctex_CJK_cctab + \file_input:n {#1} + \cctab_end: + } +\cctab_const:Nn \c__ctex_CJK_cctab + { + \cctab_select:N \c__ctex_package_cctab + \int_set:Nn \tex_endlinechar:D { -1 } } \cs_set_eq:NN \CJK@input \ctex_CJK_input:n \if_cs_exist:N \CJK@surr @@ -249,7 +232,7 @@ \tl_new:N #1 \cs_if_exist:NTF #3 { \tl_gput_right:Nn #3 {#1} } - { \ctex_patch_cmd:Nnn #2 {#4} { #1#4 } } + { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } } } \ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont \ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont 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 eec8040b270..15fd28982cc 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 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $ {upTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-uptex.def} - {\ExplFileDate}{2.5.3}{\ExplFileDescription} + {\ExplFileDate}{2.5.4}{\ExplFileDescription} \cs_new_protected:Npn \ctex_set_zhmap:n { \tl_gput_right:Nx \g__ctex_zhmap_tl } \cs_new_protected:Npn \ctex_use_zhmap: @@ -123,7 +123,7 @@ \tl_new:N #1 \cs_if_exist:NTF #3 { \tl_gput_right:Nn #3 {#1} } - { \ctex_patch_cmd:Nnn #2 {#4} { #1#4 } } + { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } } } \ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont \ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont 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 cb6eba6a18c..fdfdaa5bfe0 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 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $ {XeLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-xetex.def} - {\ExplFileDate}{2.5.3}{\ExplFileDescription} + {\ExplFileDate}{2.5.4}{\ExplFileDescription} \RequirePackage { xeCJK } \exp_args:Nx \xeCJKsetup { |