diff options
author | Karl Berry <karl@freefriends.org> | 2016-05-14 22:03:09 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-05-14 22:03:09 +0000 |
commit | 1ffd29c330984928904e5f95a4033d334fba974b (patch) | |
tree | da2c8a81497119292b01e00a76fb78727f65da93 /Master/texmf-dist/tex/latex/ctex/scheme | |
parent | 1bafd95e83267f9e55b47de90fa004d4db84971d (diff) |
ctex (14may16)
git-svn-id: svn://tug.org/texlive/trunk@41120 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/scheme')
10 files changed, 54 insertions, 64 deletions
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def index 74052f63371..96793e2e0a1 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang <leoliu.pku@gmail.com> $ +\GetIdInfo$Id: ctex.dtx f745b21 2016-05-14 12:17:18 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for article (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-article.def} - {\ExplFileDate}{2.4}{\ExplFileDescription} + {\ExplFileDate}{2.4.1}{\ExplFileDescription} \keys_set:nn { ctex / part } { aftertitle = \par , @@ -127,16 +127,16 @@ \keys_set:nn { ctex / appendix } { number = \@Alph \c@section } \pagestyle { headings } +\keys_set:nn { ctex } { today = small } +\ctex_if_autoindent_touched:F + { \keys_set:nn { ctex } { autoindent = true } } \str_if_eq:onTF { \l__ctex_encoding_tl } { GBK } { \ctex_file_input:n { ctex-name-gbk.cfg } } { \ctex_file_input:n { ctex-name-utf8.cfg } } -\keys_set:nn { ctex } { today = small } \int_compare:nNnF \g__ctex_font_size_flag > \c_minus_one { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero } \fp_compare:nNnT { \l__ctex_line_spread_fp } ? { \c_zero_fp } - { \keys_set:nn { ctex / option } { linespread = 1.3 } } -\ctex_if_autoindent_touched:F - { \keys_set:nn { ctex } { autoindent = true } } + { \fp_set:Nn \l__ctex_line_spread_fp { 1.3 } } \ctex_patch_cmd:Nnn \verse { -1.5em } { -2 \ccwd } \ctex_patch_cmd:Nnn \verse { 1.5em } { 2 \ccwd } \ctex_patch_cmd:Nnn \quotation { 1.5em } { 2 \ccwd } diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def index a2c5108e1e3..dc5ea1af9c5 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang <leoliu.pku@gmail.com> $ +\GetIdInfo$Id: ctex.dtx f745b21 2016-05-14 12:17:18 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for beamer (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-beamer.def} - {\ExplFileDate}{2.4}{\ExplFileDescription} + {\ExplFileDate}{2.4.1}{\ExplFileDescription} \keys_set:nn { ctex / part } { aftertitle = \par , @@ -60,6 +60,9 @@ titleformat = \usebeamerfont { subsection ~ title } , aftertitle = \par } +\keys_set:nn { ctex } { today = small } +\ctex_if_autoindent_touched:F + { \keys_set:nn { ctex } { autoindent = true } } \str_if_eq:onTF { \l__ctex_encoding_tl } { GBK } { \uselanguage { ChineseGBK } @@ -72,13 +75,6 @@ \ctex_file_input:n { ctex-name-utf8.cfg } } \clist_put_left:Nn \trans@languagepath { chinese } -\keys_set:nn { ctex } { today = small } -\int_compare:nNnF \g__ctex_font_size_flag > \c_minus_one - { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero } -\fp_compare:nNnT { \l__ctex_line_spread_fp } ? { \c_zero_fp } - { \keys_set:nn { ctex / option } { linespread = 1.3 } } -\ctex_if_autoindent_touched:F - { \keys_set:nn { ctex } { autoindent = true } } %% %% %% End of file `ctex-scheme-chinese-beamer.def'. diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def index 4bd8d9c9fd1..1875794792e 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang <leoliu.pku@gmail.com> $ +\GetIdInfo$Id: ctex.dtx f745b21 2016-05-14 12:17:18 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for book (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-book.def} - {\ExplFileDate}{2.4}{\ExplFileDescription} + {\ExplFileDate}{2.4.1}{\ExplFileDescription} \keys_set:nn { ctex / part } { aftertitle = \par , @@ -141,16 +141,16 @@ number = \@Alph \c@chapter } \pagestyle { headings } +\keys_set:nn { ctex } { today = small } +\ctex_if_autoindent_touched:F + { \keys_set:nn { ctex } { autoindent = true } } \str_if_eq:onTF { \l__ctex_encoding_tl } { GBK } { \ctex_file_input:n { ctex-name-gbk.cfg } } { \ctex_file_input:n { ctex-name-utf8.cfg } } -\keys_set:nn { ctex } { today = small } \int_compare:nNnF \g__ctex_font_size_flag > \c_minus_one { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero } \fp_compare:nNnT { \l__ctex_line_spread_fp } ? { \c_zero_fp } - { \keys_set:nn { ctex / option } { linespread = 1.3 } } -\ctex_if_autoindent_touched:F - { \keys_set:nn { ctex } { autoindent = true } } + { \fp_set:Nn \l__ctex_line_spread_fp { 1.3 } } \ctex_patch_cmd:Nnn \verse { -1.5em } { -2 \ccwd } \ctex_patch_cmd:Nnn \verse { 1.5em } { 2 \ccwd } \ctex_patch_cmd:Nnn \quotation { 1.5em } { 2 \ccwd } diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def index d825a37678e..9f372276648 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang <leoliu.pku@gmail.com> $ +\GetIdInfo$Id: ctex.dtx f745b21 2016-05-14 12:17:18 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for report (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-report.def} - {\ExplFileDate}{2.4}{\ExplFileDescription} + {\ExplFileDate}{2.4.1}{\ExplFileDescription} \keys_set:nn { ctex / part } { aftertitle = \par , @@ -141,16 +141,16 @@ number = \@Alph \c@chapter } \pagestyle { headings } +\keys_set:nn { ctex } { today = small } +\ctex_if_autoindent_touched:F + { \keys_set:nn { ctex } { autoindent = true } } \str_if_eq:onTF { \l__ctex_encoding_tl } { GBK } { \ctex_file_input:n { ctex-name-gbk.cfg } } { \ctex_file_input:n { ctex-name-utf8.cfg } } -\keys_set:nn { ctex } { today = small } \int_compare:nNnF \g__ctex_font_size_flag > \c_minus_one { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero } \fp_compare:nNnT { \l__ctex_line_spread_fp } ? { \c_zero_fp } - { \keys_set:nn { ctex / option } { linespread = 1.3 } } -\ctex_if_autoindent_touched:F - { \keys_set:nn { ctex } { autoindent = true } } + { \fp_set:Nn \l__ctex_line_spread_fp { 1.3 } } \ctex_patch_cmd:Nnn \verse { -1.5em } { -2 \ccwd } \ctex_patch_cmd:Nnn \verse { 1.5em } { 2 \ccwd } \ctex_patch_cmd:Nnn \quotation { 1.5em } { 2 \ccwd } diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def index d2ef35d84c6..b82dbebda32 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def @@ -26,46 +26,40 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang <leoliu.pku@gmail.com> $ +\GetIdInfo$Id: ctex.dtx f745b21 2016-05-14 12:17:18 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for generic (CTEX)} \ProvidesExplFile{ctex-scheme-chinese.def} - {\ExplFileDate}{2.4}{\ExplFileDescription} -\tl_if_exist:NTF \c__ctex_std_class_tl + {\ExplFileDate}{2.4.1}{\ExplFileDescription} +\keys_set:nn { ctex } { today = small } +\ctex_if_autoindent_touched:F + { \keys_set:nn { ctex } { autoindent = true } } +\tl_set:Nn \l__ctex_tmp_tl { beamer } +\tl_if_eq:NNTF \c__ctex_std_class_tl \l__ctex_tmp_tl { - \str_if_eq:onTF { \c__ctex_std_class_tl } { beamer } + \str_if_eq:onTF { \l__ctex_encoding_tl } { GBK } { - \str_if_eq:onTF { \l__ctex_encoding_tl } { GBK } - { - \uselanguage { ChineseGBK } - \languagealias { chinese } { ChineseGBK } - \ctex_file_input:n { ctex-name-gbk.cfg } - } - { - \uselanguage { ChineseUTF8 } - \languagealias { chinese } { ChineseUTF8 } - \ctex_file_input:n { ctex-name-utf8.cfg } - } - \clist_put_left:Nn \trans@languagepath { chinese } + \uselanguage { ChineseGBK } + \languagealias { chinese } { ChineseGBK } + \ctex_file_input:n { ctex-name-gbk.cfg } } { - \str_if_eq:onTF { \l__ctex_encoding_tl } { GBK } - { \ctex_file_input:n { ctex-name-gbk.cfg } } - { \ctex_file_input:n { ctex-name-utf8.cfg } } - \RequirePackage { indentfirst } + \uselanguage { ChineseUTF8 } + \languagealias { chinese } { ChineseUTF8 } + \ctex_file_input:n { ctex-name-utf8.cfg } } + \clist_put_left:Nn \trans@languagepath { chinese } } { \str_if_eq:onTF { \l__ctex_encoding_tl } { GBK } { \ctex_file_input:n { ctex-name-gbk.cfg } } { \ctex_file_input:n { ctex-name-utf8.cfg } } + \int_compare:nNnF \g__ctex_font_size_flag > \c_minus_one + { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero } + \fp_compare:nNnT { \l__ctex_line_spread_fp } ? { \c_zero_fp } + { \fp_set:Nn \l__ctex_line_spread_fp { 1.3 } } + \tl_if_exist:NT \c__ctex_std_class_tl + { \RequirePackage { indentfirst } } } -\keys_set:nn { ctex } { today = small } -\int_compare:nNnF \g__ctex_font_size_flag > \c_minus_one - { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero } -\fp_compare:nNnT { \l__ctex_line_spread_fp } ? { \c_zero_fp } - { \keys_set:nn { ctex / option } { linespread = 1.3 } } -\ctex_if_autoindent_touched:F - { \keys_set:nn { ctex } { autoindent = true } } %% %% %% End of file `ctex-scheme-chinese.def'. diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def index ab11b96b27a..efdc2209d03 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang <leoliu.pku@gmail.com> $ +\GetIdInfo$Id: ctex.dtx f745b21 2016-05-14 12:17:18 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for article (CTEX)} \ProvidesExplFile{ctex-scheme-plain-article.def} - {\ExplFileDate}{2.4}{\ExplFileDescription} + {\ExplFileDate}{2.4.1}{\ExplFileDescription} \keys_set:nn { ctex / part } { aftertitle = \par , diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def index 796c4b81aac..19beb27cb20 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang <leoliu.pku@gmail.com> $ +\GetIdInfo$Id: ctex.dtx f745b21 2016-05-14 12:17:18 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for beamer (CTEX)} \ProvidesExplFile{ctex-scheme-plain-beamer.def} - {\ExplFileDate}{2.4}{\ExplFileDescription} + {\ExplFileDate}{2.4.1}{\ExplFileDescription} \keys_set:nn { ctex / part } { aftertitle = \par , diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def index 8903bebe106..19b8fa165f5 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang <leoliu.pku@gmail.com> $ +\GetIdInfo$Id: ctex.dtx f745b21 2016-05-14 12:17:18 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for book (CTEX)} \ProvidesExplFile{ctex-scheme-plain-book.def} - {\ExplFileDate}{2.4}{\ExplFileDescription} + {\ExplFileDate}{2.4.1}{\ExplFileDescription} \keys_set:nn { ctex / part } { aftertitle = \par , diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def index 846177eaa15..380b3ea7c1a 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang <leoliu.pku@gmail.com> $ +\GetIdInfo$Id: ctex.dtx f745b21 2016-05-14 12:17:18 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for report (CTEX)} \ProvidesExplFile{ctex-scheme-plain-report.def} - {\ExplFileDate}{2.4}{\ExplFileDescription} + {\ExplFileDate}{2.4.1}{\ExplFileDescription} \keys_set:nn { ctex / part } { aftertitle = \par , diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def index 1823e0390e3..bdf82e589ce 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang <leoliu.pku@gmail.com> $ +\GetIdInfo$Id: ctex.dtx f745b21 2016-05-14 12:17:18 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for generic (CTEX)} \ProvidesExplFile{ctex-scheme-plain.def} - {\ExplFileDate}{2.4}{\ExplFileDescription} + {\ExplFileDate}{2.4.1}{\ExplFileDescription} %% %% %% End of file `ctex-scheme-plain.def'. |