texlive[44974] Master/texmf-dist: ctex (7aug17)
commits+karl at tug.org
commits+karl at tug.org
Mon Aug 7 23:08:30 CEST 2017
Revision: 44974
http://tug.org/svn/texlive?view=revision&revision=44974
Author: karl
Date: 2017-08-07 23:08:29 +0200 (Mon, 07 Aug 2017)
Log Message:
-----------
ctex (7aug17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/ctex/ctex.pdf
trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx
trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex
trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
trunk/Master/texmf-dist/tex/latex/ctex/ctex-article.def
trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def
trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def
trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
trunk/Master/texmf-dist/tex/latex/ctex/ctex-report.def
trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls
trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def
trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls
trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def
trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
Modified: trunk/Master/texmf-dist/doc/latex/ctex/ctex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx 2017-08-07 21:08:29 UTC (rev 44974)
@@ -413,7 +413,7 @@
%<*!(c19|c70|ctexspa|dict)>
%<class|style|ctexcap|ctexhook|ctexpatch|ctxdoc>\NeedsTeXFormat{LaTeX2e}
%<class|style|ctexcap|ctexhook|ctexpatch|ctxdoc>\RequirePackage{expl3}
-%<+!driver>\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+%<+!driver>\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
%<ctxdoc> {ctex documentation (CTEX)}
%<ctxdoc>\ProvidesExplClass{ctxdoc}
%<ctex> {Chinese adapter in LaTeX (CTEX)}
@@ -502,7 +502,7 @@
%<founder>\ProvidesExplFile{ctex-fontset-founder.def}
%<ubuntu> {Ubuntu fonts definition (CTEX)}
%<ubuntu>\ProvidesExplFile{ctex-fontset-ubuntu.def}
-%<!driver> {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{2.4.10}{\ExplFileDescription}
%</!(c19|c70|ctexspa|dict)>
%<c19&rm>\ProvidesFile{c19rm.fd}%
%<c19&sf>\ProvidesFile{c19sf.fd}%
@@ -513,9 +513,9 @@
%<ctexspa>\ProvidesFile{ctexspa.def}%
%<dict&theorem&GBK>\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
%<dict&theorem&UTF8>\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
-%<c19|c70> [2017/04/01 v2.4.9 Chinese font definition (CTEX)]
-%<ctexspa> [2017/04/01 v2.4.9 Space info for CJKpunct (CTEX)]
-%<dict&theorem> [2017/04/01 v2.4.9 Chinese translation for theorem name (CTEX)]
+%<c19|c70> [2017/08/07 v2.4.10 Chinese font definition (CTEX)]
+%<ctexspa> [2017/08/07 v2.4.10 Space info for CJKpunct (CTEX)]
+%<dict&theorem> [2017/08/07 v2.4.10 Chinese translation for theorem name (CTEX)]
%</!(driver|readme|install|zhmap|spa|docstrip)>
%<*driver>
\documentclass{ctxdoc}
@@ -537,7 +537,7 @@
% \changes{v2.4}{2015/02/19}{加强 \pkg{beamer} 宏包支持。}
%
%
-% \CheckSum{5898}
+% \CheckSum{5923}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -3005,6 +3005,9 @@
% \end{macrocode}
%
% \changes{v2.3}{2015/12/20}{与 \LaTeXiii{} (2015/12/20) 同步。}
+% \changes{v2.4.10}{2017/07/19}{常数 \cs{c_minus_one} 已过时。}
+% \changes{v2.4.10}{2017/07/22}{使用 \texttt{lazy} 函数对 Boolean 表达式
+% 进行最小化运算（\hologo{LaTeX3} 2017/07/19）。}
%
% 检查 \pkg{expl3} 和 \pkg{l3keys2e} 的版本。
% \begin{macrocode}
@@ -3015,7 +3018,7 @@
`l3kernel'~and~`l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2015/12/20 } { }
+\@ifpackagelater { expl3 } { 2017/07/19 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { expl3 } }
%<*class>
\@ifpackagelater { l3keys2e } { 2015/12/20 } { }
@@ -3058,7 +3061,7 @@
% \begin{variable}[int]{\l_@@_tmp_tl,\l_@@_tmp_int,\l_@@_tmp_box,\l_@@_tmp_dim}
% 临时变量。
% \begin{macrocode}
-\tl_new:N \l_@@_tmp_tl
+\tl_clear_new:N \l_@@_tmp_tl
\int_new:N \l_@@_tmp_int
\box_new:N \l_@@_tmp_box
%<!ctexheading>\dim_new:N \l_@@_tmp_dim
@@ -3276,7 +3279,8 @@
% 表示 \opt{zihao} 选项未初始化，会在将来根据文档类决定初值。
% \begin{macrocode}
%<*class|ctex|ctexsize>
-\cs_new_eq:NN \g_@@_font_size_flag \c_minus_one
+\int_new:N \g_@@_font_size_flag
+\int_set:Nn \g_@@_font_size_flag { -1 }
%</class|ctex|ctexsize>
% \end{macrocode}
% \end{variable}
@@ -3620,7 +3624,7 @@
% 使 \pkg{ctex} 和 \pkg{ctexsize} 可以接受文档类的全局选项，不修改默认字体大小。
% 在文档类下还将参数传给标准文档类。
% \begin{macrocode}
-\tl_clear:N \l_@@_tmp_tl
+\tl_clear_new:N \l_@@_tmp_tl
\clist_map_inline:nn
{
10pt , 11pt , 12pt ,
@@ -3898,7 +3902,7 @@
{
\char_set_catcode_other:n { 60 } % <
\char_set_catcode_math_superscript:n { 94 } % ^
- \int_set_eq:NN \tex_endlinechar:D \c_minus_one
+ \int_set:Nn \tex_endlinechar:D { -1 }
}
{ \file_input:n {#1} }
{
@@ -4278,9 +4282,11 @@
% \begin{macrocode}
\cs_set_protected:Npn \fontspec_visible_space:
{
- \font_glyph_if_exist:NnTF \font { "2423 }
- { \ltjalchar "2423 \exp_stop_f: }
- { \fontspec_visible_space_fallback: }
+ \etex_iffontchar:D \tex_font:D "2423 \exp_stop_f:
+ \ltjalchar "2423 \exp_stop_f:
+ \else:
+ \fontspec_visible_space_fallback:
+ \fi:
}
% \end{macrocode}
% \end{macro}
@@ -4847,7 +4853,7 @@
{ \ctex_ltj_switch_family:x {#1} \tex_ignorespaces:D }
\cs_new_protected_nopar:Npn \ctex_ltj_switch_family:n #1
{
- \ctex_ltj_family_if_exist:xNTF {#1} \CJK at family
+ \ctex_ltj_family_if_exist:nNTF {#1} \CJK at family
{
\tl_set:Nn \l_ctex_ltj_family_tl {#1}
\selectfont
@@ -4859,12 +4865,12 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[int,TF]{\ctex_ltj_family_if_exist:n}
+% \begin{macro}[int,TF]{\ctex_ltj_family_if_exist:nN}
% 判断 CJK 字体族 |#1| 是否存在，若存在则把实际族名保存到 |#2| 中。
% \begin{macrocode}
-\prg_new_protected_conditional:Npnn \ctex_ltj_family_if_exist:xN #1#2 { T , F , TF }
+\prg_new_protected_conditional:Npnn \ctex_ltj_family_if_exist:nN #1#2 { T , F , TF }
{
- \prop_get:NxNTF \g_@@_family_name_prop {#1} #2
+ \prop_get:NnNTF \g_@@_family_name_prop {#1} #2
{ \prg_return_true: }
{
\cs_if_exist_use:cTF { \@@_family_csname:n {#1} }
@@ -4875,7 +4881,9 @@
{ \prg_return_false: }
}
}
-\cs_generate_variant:Nn \prop_get:NnNTF { Nx }
+\cs_generate_variant:Nn \ctex_ltj_family_if_exist:nNT { x }
+\cs_generate_variant:Nn \ctex_ltj_family_if_exist:nNF { x }
+\cs_generate_variant:Nn \ctex_ltj_family_if_exist:nNTF { x }
% \end{macrocode}
% \end{macro}
%
@@ -6345,6 +6353,42 @@
%</luatex|uptex|aptex>
% \end{macrocode}
%
+% \changes{v2.4.10}{2017/07/23}{定义 \tn{cht}，\tn{cdp} 和 \tn{cwd}。}
+%
+% \begin{macro}[int]{\cht,\cdp,\cwd}
+% 分别从 \file{.jfm} 中读取字符高度、深度和宽度，目前仅考虑横排的情况。
+% \begin{macrocode}
+%<*luatex>
+\dim_new:N \cht
+\dim_new:N \cdp
+\dim_new:N \cwd
+\newluafunction \g_@@_kanjisize_func
+\group_begin:
+\char_set_catcode_space:n { 32 }
+\lua_now_x:n
+ {
+ local nulltable = { }
+ local t = lua.get_functions_table()
+ local fmt = luatexja.jfont.font_metric_table
+ local getattribute = tex.getattribute
+ local setdimen = tex.setdimen
+ t[\int_use:N \g_@@_kanjisize_func] = function ()
+ local ft = fmt[getattribute('ltj at curjfnt')] or nulltable
+ local ft = ft and ft.char_type or nulltable
+ local fk = ft and ft[0] or nulltable
+ setdimen('cht', fk.height or 0)
+ setdimen('cdp', fk.depth or 0)
+ setdimen('cwd', fk.width or ft.zw or 0)
+ end
+ }
+\group_end:
+\cs_new_protected_nopar:Npn \ctex_update_kanjisize:
+ { \luatex_luafunction:D \g_@@_kanjisize_func }
+\ctex_add_to_selectfont:n { \ctex_update_kanjisize: }
+%</luatex>
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{space}
% 在导言区或正文中设置忽略空格方式。
% \pdfTeX{} 和 \XeTeX{} 下初始设置为 \opt{auto}，\LuaTeX{}、\upTeX{} 下是无效
@@ -8141,7 +8185,8 @@
\defbeamertemplate*{part page}{CTEX}[1][]{
\begingroup
% \centering
-% {\usebeamerfont{part name}\usebeamercolor[fg]{part name}\partname~\insertromanpartnumber}
+% {\usebeamerfont{part name}%
+% \usebeamercolor[fg]{part name}\partname~\insertromanpartnumber}
% \vskip1em\par
\par \addvspace{\glueexpr\CTEX at part@beforeskip\relax}%
\parindent \dimexpr \CTEX at part@indent \relax
@@ -8163,7 +8208,8 @@
\defbeamertemplate*{section page}{CTEX}[1][]{
\begingroup
% \centering
-% {\usebeamerfont{section name}\usebeamercolor[fg]{section name}\sectionname~\insertsectionnumber}
+% {\usebeamerfont{section name}%
+% \usebeamercolor[fg]{section name}\sectionname~\insertsectionnumber}
% \vskip1em\par
\par \addvspace{\glueexpr\CTEX at section@beforeskip\relax}%
\parindent \dimexpr \CTEX at section@indent \relax
@@ -8185,7 +8231,8 @@
\defbeamertemplate*{subsection page}{CTEX}[1][]{
\begingroup
% \centering
-% {\usebeamerfont{subsection name}\usebeamercolor[fg]{subsection name}\subsectionname~\insertsubsectionnumber}
+% {\usebeamerfont{subsection name}%
+% \usebeamercolor[fg]{subsection name}\subsectionname~\insertsubsectionnumber}
% \vskip1em\par
\par \addvspace{\glueexpr\CTEX at subsection@beforeskip\relax}%
\parindent \dimexpr \CTEX at subsection@indent \relax
@@ -8726,7 +8773,7 @@
% 对 \cls{beamer} 以外的文档类，若用户未设置宏包选项 \opt{zihao}，则设置 \tn{normalsize}
% 为五号字。\cls{beamer} 不调整默认字体大小。
% \begin{macrocode}
-\int_compare:nNnF \g_@@_font_size_flag > \c_minus_one
+\int_compare:nNnF \g_@@_font_size_flag > { -1 }
{ \cs_gset_eq:NN \g_@@_font_size_flag \c_zero }
% \end{macrocode}
%
@@ -8763,7 +8810,7 @@
\str_if_eq:onTF { \l_@@_encoding_tl } { GBK }
{ \ctex_file_input:n { ctex-name-gbk.cfg } }
{ \ctex_file_input:n { ctex-name-utf8.cfg } }
- \int_compare:nNnF \g_@@_font_size_flag > \c_minus_one
+ \int_compare:nNnF \g_@@_font_size_flag > { -1 }
{ \cs_gset_eq:NN \g_@@_font_size_flag \c_zero }
\fp_compare:nNnT { \l_@@_line_spread_fp } ? { \c_zero_fp }
{ \fp_set:Nn \l_@@_line_spread_fp { 1.3 } }
@@ -9375,8 +9422,7 @@
%<*fontset>
% \end{macrocode}
%
-% \subsubsection{\pkg{ctex-fontset-windows.def},
-% \pkg{ctex-fontset-windowsnew.def}, \pkg{ctex-fontset-windowsold.def}}
+% \subsubsection{\pkg{ctex-fontset-windows.def} 等}
%
% \changes{v2.4.1}{2016/05/14}{使用 \file{bootfont.bin} 判断 Windows XP 以避免
% 权限问题。}
@@ -9418,7 +9464,8 @@
\ctex_punct_map_family:nn { \CJKsfdefault } { zhhei }
%</windowsold>
%<*windowsnew>
- \setCJKsansfont [ BoldFont = msyhbd\l_@@_msyh_suffix_tl ] { msyh\l_@@_msyh_suffix_tl }
+ \setCJKsansfont
+ [ BoldFont = msyhbd\l_@@_msyh_suffix_tl ] { msyh\l_@@_msyh_suffix_tl }
\setCJKfamilyfont { zhyahei }
[ BoldFont = msyhbd\l_@@_msyh_suffix_tl ] { msyh\l_@@_msyh_suffix_tl }
\ctex_punct_map_family:nn { \CJKsfdefault } { zhyahei }
@@ -9648,9 +9695,13 @@
}
{
\setCJKmainfont
- [ Extension = .otf , BoldFont = FandolSong-Bold , ItalicFont = FandolKai-Regular ]
+ [
+ Extension = .otf ,
+ BoldFont = FandolSong-Bold , ItalicFont = FandolKai-Regular
+ ]
{ FandolSong-Regular }
- \setCJKsansfont [ Extension = .otf , BoldFont = FandolHei-Bold ] { FandolHei-Regular }
+ \setCJKsansfont
+ [ Extension = .otf , BoldFont = FandolHei-Bold ] { FandolHei-Regular }
\setCJKmonofont [ Extension = .otf ] { FandolFang-Regular }
\setCJKfamilyfont { zhsong }
[ Extension = .otf , BoldFont = FandolSong-Bold ] { FandolSong-Regular }
@@ -9997,7 +10048,7 @@
% \begin{macrocode}
%<*windows>
\ProvidesFile{zhwindowsfonts.tex}%
- [2017/04/01 v2.4.9 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2017/08/07 v2.4.10 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <simsun.ttc}
@@ -10069,7 +10120,7 @@
% \begin{macrocode}
%<*adobe>
\ProvidesFile{zhadobefonts.tex}%
- [2017/04/01 v2.4.9 Adobe font map loader for DVIPDFMx (CTEX)]
+ [2017/08/07 v2.4.10 Adobe font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
@@ -10105,7 +10156,7 @@
% \begin{macrocode}
%<*fandol>
\ProvidesFile{zhfandolfonts.tex}%
- [2017/04/01 v2.4.9 Fandol font map loader for DVIPDFMx (CTEX)]
+ [2017/08/07 v2.4.10 Fandol font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
@@ -10141,7 +10192,7 @@
% \begin{macrocode}
%<*founder>
\ProvidesFile{zhfounderfonts.tex}%
- [2017/04/01 v2.4.9 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2017/08/07 v2.4.10 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <FZSSK.TTF}
@@ -10213,7 +10264,7 @@
% \begin{macrocode}
%<*ubuntu>
\ProvidesFile{zhubuntufonts.tex}%
- [2017/04/01 v2.4.9 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2017/08/07 v2.4.10 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <uming.ttc}
@@ -10753,12 +10804,10 @@
{
\cs_new_protected:Npn \ctex_parse_name:NNn ##1##2##3
{
- \bool_if:nTF
+ \bool_lazy_or:nnTF
+ { \cs_if_exist_p:c { ##3 ~ } }
+ { \cs_if_exist_p:c { #1##3 } }
{
- \cs_if_exist_p:c { ##3 ~ } ||
- \cs_if_exist_p:c { #1##3 }
- }
- {
\group_begin:
\use:x
{
@@ -11421,7 +11470,7 @@
{ \if at inlabel \leavevmode \fi }
{ \partopsep \z at skip }
\group_begin:
- \int_set_eq:NN \tex_endlinechar:D \c_minus_one
+ \int_set:Nn \tex_endlinechar:D { -1 }
\use:n
{
\char_set_catcode_active:n { 32 }
@@ -11459,6 +11508,13 @@
\@@_verbatim_read_line:w
}
}
+ \cs_new_protected:Npn \@@_swap_cr:
+ { \exp_after:wN \@@_swap_cr:w \l_@@_verbatim_line_tl }
+ \cs_new_protected:Npn \@@_swap_cr:w #1 ^^M
+ {
+ \group_insert_after:N ^^M
+ \tl_set:Nn \l_@@_verbatim_line_tl {#1}
+ }
\tl_const:Nn \c_@@_active_cr_tl { ^^M }
\group_end:
\tl_new:N \l_@@_verbatim_line_tl
@@ -11479,7 +11535,10 @@
\cs_gset_eq:NN \@@_verbatim_process_line: \@@_process_normal_line:
\@@_output_module:nn
{ \color { verb at guard } }
- { \@@_module_pop:n { \l_@@_verbatim_line_tl } }
+ {
+ \@@_swap_cr:
+ \@@_module_pop:n { \l_@@_verbatim_line_tl }
+ }
}
{ \tl_use:N \l_@@_verbatim_line_tl }
}
@@ -11556,7 +11615,10 @@
{ \c_percent_str \tl_tail:n {#1} }
\@@_output_module:nn
{ \color { verb at guard } }
- { \@@_module_push:n { \l_@@_verbatim_line_tl } }
+ {
+ \@@_swap_cr:
+ \@@_module_push:n { \l_@@_verbatim_line_tl }
+ }
}
\group_end:
\cs_new_protected_nopar:Npn \@@_output_line:
@@ -11596,6 +11658,7 @@
\tex_noindent:D
\group_begin:
\color { code at gray }
+ \@@_swap_cr:
\str_if_eq_x:nnTF { \f at shape } { \updefault }
{ \slshape }
{ \upshape }
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex 2017-08-07 21:08:29 UTC (rev 44974)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhadobefonts.tex}%
- [2017/04/01 v2.4.9 Adobe font map loader for DVIPDFMx (CTEX)]
+ [2017/08/07 v2.4.10 Adobe font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex 2017-08-07 21:08:29 UTC (rev 44974)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhfandolfonts.tex}%
- [2017/04/01 v2.4.9 Fandol font map loader for DVIPDFMx (CTEX)]
+ [2017/08/07 v2.4.10 Fandol font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex 2017-08-07 21:08:29 UTC (rev 44974)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhfounderfonts.tex}%
- [2017/04/01 v2.4.9 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2017/08/07 v2.4.10 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <FZSSK.TTF}
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex 2017-08-07 21:08:29 UTC (rev 44974)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhubuntufonts.tex}%
- [2017/04/01 v2.4.9 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2017/08/07 v2.4.10 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <uming.ttc}
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex 2017-08-07 21:08:29 UTC (rev 44974)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhwindowsfonts.tex}%
- [2017/04/01 v2.4.9 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2017/08/07 v2.4.10 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <simsun.ttc}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Caption with encoding GBK (CTEX)}
\ProvidesExplFile{ctex-name-gbk.cfg}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\keys_set_known:nn { ctex }
{
contentsname = Ŀ¼ ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Caption with encoding UTF8 (CTEX)}
\ProvidesExplFile{ctex-name-utf8.cfg}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\keys_set_known:nn { ctex }
{
contentsname = 目录 ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Configuration file (CTEX)}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
%%
%%
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Option configuration file (CTEX)}
\ProvidesExplFile{ctexopts.cfg}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
%%
%% \keys_set:nn { ctex / option } { fontset = windowsnew }
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-article.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-article.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-article.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for article (CTEX)}
\ProvidesExplFile{ctex-article.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\seq_new:N \c__ctex_section_headings_seq
\seq_gset_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for beamer (CTEX)}
\ProvidesExplFile{ctex-beamer.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\seq_new:N \c__ctex_headings_seq
\seq_gset_from_clist:Nn \c__ctex_headings_seq
{ part , section , subsection }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for book (CTEX)}
\ProvidesExplFile{ctex-book.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\seq_new:N \c__ctex_section_headings_seq
\seq_gset_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{c5size option (CTEX)}
\ProvidesExplFile{ctex-c5size.clo}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\ctex_set_font_size:Nnn \normalsize { 5 }
{
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{cs4size option (CTEX)}
\ProvidesExplFile{ctex-cs4size.clo}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\ctex_set_font_size:Nnn \normalsize { -4 }
{
\abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-report.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-report.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-report.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for report (CTEX)}
\ProvidesExplFile{ctex-report.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\seq_new:N \c__ctex_section_headings_seq
\seq_gset_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty 2017-08-07 21:08:29 UTC (rev 44974)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\msg_new:nnnn { ctex } { subpackage-loaded }
@@ -54,7 +54,7 @@
`l3kernel'~and~`l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2015/12/20 } { }
+\@ifpackagelater { expl3 } { 2017/07/19 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { expl3 } }
\str_const:Nx \c__ctex_engine_str
{ \cs_if_exist:NTF \ngostype { aptex } { \c_sys_engine_str } }
@@ -69,7 +69,7 @@
{ \msg_critical:nnx { ctex } { engine-not-supported } { \c__ctex_engine_str } }
\RequirePackage { ctexhook , ctexpatch }
\RequirePackage { fix-cm , everysel }
-\tl_new:N \l__ctex_tmp_tl
+\tl_clear_new:N \l__ctex_tmp_tl
\int_new:N \l__ctex_tmp_int
\box_new:N \l__ctex_tmp_box
\dim_new:N \l__ctex_tmp_dim
@@ -153,7 +153,8 @@
{ Command~ #1 is~ deprecated.\\ #2 }
\msg_new:nnn { ctex } { deprecated-environment }
{ Environment~ `#1'~ is~ deprecated.\\ #2 }
-\cs_new_eq:NN \g__ctex_font_size_flag \c_minus_one
+\int_new:N \g__ctex_font_size_flag
+\int_set:Nn \g__ctex_font_size_flag { -1 }
\keys_define:nn { ctex / option }
{
zihao .choice: ,
@@ -345,7 +346,7 @@
\ctex_at_end_preamble:n { \RequirePackage { hyperref } }
} ,
}
-\tl_clear:N \l__ctex_tmp_tl
+\tl_clear_new:N \l__ctex_tmp_tl
\clist_map_inline:nn
{
10pt , 11pt , 12pt ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls 2017-08-07 21:08:29 UTC (rev 44974)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class article (CTEX)}
\ProvidesExplClass{ctexart}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver at ctex. \@pkgextension } \c__ctex_version_tl
@@ -46,7 +46,7 @@
`l3kernel'~and~`l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2015/12/20 } { }
+\@ifpackagelater { expl3 } { 2017/07/19 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { expl3 } }
\@ifpackagelater { l3keys2e } { 2015/12/20 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { l3keys2e } }
@@ -63,7 +63,7 @@
{ \msg_critical:nnx { ctex } { engine-not-supported } { \c__ctex_engine_str } }
\RequirePackage { ctexhook , ctexpatch }
\RequirePackage { fix-cm , everysel }
-\tl_new:N \l__ctex_tmp_tl
+\tl_clear_new:N \l__ctex_tmp_tl
\int_new:N \l__ctex_tmp_int
\box_new:N \l__ctex_tmp_box
\dim_new:N \l__ctex_tmp_dim
@@ -148,7 +148,8 @@
{ Command~ #1 is~ deprecated.\\ #2 }
\msg_new:nnn { ctex } { deprecated-environment }
{ Environment~ `#1'~ is~ deprecated.\\ #2 }
-\cs_new_eq:NN \g__ctex_font_size_flag \c_minus_one
+\int_new:N \g__ctex_font_size_flag
+\int_set:Nn \g__ctex_font_size_flag { -1 }
\keys_define:nn { ctex / option }
{
zihao .choice: ,
@@ -340,7 +341,7 @@
\ctex_at_end_preamble:n { \RequirePackage { hyperref } }
} ,
}
-\tl_clear:N \l__ctex_tmp_tl
+\tl_clear_new:N \l__ctex_tmp_tl
\clist_map_inline:nn
{
10pt , 11pt , 12pt ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls 2017-08-07 21:08:29 UTC (rev 44974)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class beamer (CTEX)}
\ProvidesExplClass{ctexbeamer}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver at ctex. \@pkgextension } \c__ctex_version_tl
@@ -46,7 +46,7 @@
`l3kernel'~and~`l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2015/12/20 } { }
+\@ifpackagelater { expl3 } { 2017/07/19 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { expl3 } }
\@ifpackagelater { l3keys2e } { 2015/12/20 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { l3keys2e } }
@@ -63,7 +63,7 @@
{ \msg_critical:nnx { ctex } { engine-not-supported } { \c__ctex_engine_str } }
\RequirePackage { ctexhook , ctexpatch }
\RequirePackage { fix-cm , everysel }
-\tl_new:N \l__ctex_tmp_tl
+\tl_clear_new:N \l__ctex_tmp_tl
\int_new:N \l__ctex_tmp_int
\box_new:N \l__ctex_tmp_box
\dim_new:N \l__ctex_tmp_dim
@@ -147,7 +147,8 @@
{ Command~ #1 is~ deprecated.\\ #2 }
\msg_new:nnn { ctex } { deprecated-environment }
{ Environment~ `#1'~ is~ deprecated.\\ #2 }
-\cs_new_eq:NN \g__ctex_font_size_flag \c_minus_one
+\int_new:N \g__ctex_font_size_flag
+\int_set:Nn \g__ctex_font_size_flag { -1 }
\keys_define:nn { ctex / option }
{
zihao .choice: ,
@@ -333,7 +334,7 @@
\ctex_at_end_preamble:n { \RequirePackage { hyperref } }
} ,
}
-\tl_clear:N \l__ctex_tmp_tl
+\tl_clear_new:N \l__ctex_tmp_tl
\clist_map_inline:nn
{
10pt , 11pt , 12pt ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls 2017-08-07 21:08:29 UTC (rev 44974)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class book (CTEX)}
\ProvidesExplClass{ctexbook}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver at ctex. \@pkgextension } \c__ctex_version_tl
@@ -46,7 +46,7 @@
`l3kernel'~and~`l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2015/12/20 } { }
+\@ifpackagelater { expl3 } { 2017/07/19 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { expl3 } }
\@ifpackagelater { l3keys2e } { 2015/12/20 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { l3keys2e } }
@@ -63,7 +63,7 @@
{ \msg_critical:nnx { ctex } { engine-not-supported } { \c__ctex_engine_str } }
\RequirePackage { ctexhook , ctexpatch }
\RequirePackage { fix-cm , everysel }
-\tl_new:N \l__ctex_tmp_tl
+\tl_clear_new:N \l__ctex_tmp_tl
\int_new:N \l__ctex_tmp_int
\box_new:N \l__ctex_tmp_box
\dim_new:N \l__ctex_tmp_dim
@@ -148,7 +148,8 @@
{ Command~ #1 is~ deprecated.\\ #2 }
\msg_new:nnn { ctex } { deprecated-environment }
{ Environment~ `#1'~ is~ deprecated.\\ #2 }
-\cs_new_eq:NN \g__ctex_font_size_flag \c_minus_one
+\int_new:N \g__ctex_font_size_flag
+\int_set:Nn \g__ctex_font_size_flag { -1 }
\keys_define:nn { ctex / option }
{
zihao .choice: ,
@@ -340,7 +341,7 @@
\ctex_at_end_preamble:n { \RequirePackage { hyperref } }
} ,
}
-\tl_clear:N \l__ctex_tmp_tl
+\tl_clear_new:N \l__ctex_tmp_tl
\clist_map_inline:nn
{
10pt , 11pt , 12pt ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty 2017-08-07 21:08:29 UTC (rev 44974)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{ctexcap}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\clist_new:N \l__ctex_ctexcap_options_clist
\clist_set:Nx \l__ctex_ctexcap_options_clist
{ \exp_not:v { opt@ \@currname . \@currext } , heading }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty 2017-08-07 21:08:29 UTC (rev 44974)
@@ -28,13 +28,13 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading style modification (CTEX)}
\ProvidesExplPackage{ctexheading}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\RequirePackage { xparse , l3keys2e }
\RequirePackage { ctexhook , ctexpatch }
-\tl_new:N \l__ctex_tmp_tl
+\tl_clear_new:N \l__ctex_tmp_tl
\int_new:N \l__ctex_tmp_int
\box_new:N \l__ctex_tmp_box
\cs_new_protected:Npn \ctex_file_wrapper:nnn #1#2#3
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty 2017-08-07 21:08:29 UTC (rev 44974)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Document and package hooks (CTEX)}
\ProvidesExplPackage{ctexhook}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\cs_new_protected:Npn \ctex_at_end_preamble:n #1
{ \tl_gput_right:Nn \g__ctex_end_preamble_hook_tl {#1} }
\cs_new_protected:Npn \ctex_after_end_preamble:n #1
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty 2017-08-07 21:08:29 UTC (rev 44974)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Patching commands (CTEX)}
\ProvidesExplPackage{ctexpatch}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\cs_if_exist:NF \str_new:N { \RequirePackage { l3str } }
\cs_new_protected:Npn \ctex_patch_cmd_once:NnnnTF #1#2
{
@@ -85,12 +85,10 @@
{
\cs_new_protected:Npn \ctex_parse_name:NNn ##1##2##3
{
- \bool_if:nTF
+ \bool_lazy_or:nnTF
+ { \cs_if_exist_p:c { ##3 ~ } }
+ { \cs_if_exist_p:c { #1##3 } }
{
- \cs_if_exist_p:c { ##3 ~ } ||
- \cs_if_exist_p:c { #1##3 }
- }
- {
\group_begin:
\use:x
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls 2017-08-07 21:08:29 UTC (rev 44974)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class report (CTEX)}
\ProvidesExplClass{ctexrep}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver at ctex. \@pkgextension } \c__ctex_version_tl
@@ -46,7 +46,7 @@
`l3kernel'~and~`l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2015/12/20 } { }
+\@ifpackagelater { expl3 } { 2017/07/19 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { expl3 } }
\@ifpackagelater { l3keys2e } { 2015/12/20 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { l3keys2e } }
@@ -63,7 +63,7 @@
{ \msg_critical:nnx { ctex } { engine-not-supported } { \c__ctex_engine_str } }
\RequirePackage { ctexhook , ctexpatch }
\RequirePackage { fix-cm , everysel }
-\tl_new:N \l__ctex_tmp_tl
+\tl_clear_new:N \l__ctex_tmp_tl
\int_new:N \l__ctex_tmp_int
\box_new:N \l__ctex_tmp_box
\dim_new:N \l__ctex_tmp_dim
@@ -148,7 +148,8 @@
{ Command~ #1 is~ deprecated.\\ #2 }
\msg_new:nnn { ctex } { deprecated-environment }
{ Environment~ `#1'~ is~ deprecated.\\ #2 }
-\cs_new_eq:NN \g__ctex_font_size_flag \c_minus_one
+\int_new:N \g__ctex_font_size_flag
+\int_set:Nn \g__ctex_font_size_flag { -1 }
\keys_define:nn { ctex / option }
{
zihao .choice: ,
@@ -340,7 +341,7 @@
\ctex_at_end_preamble:n { \RequirePackage { hyperref } }
} ,
}
-\tl_clear:N \l__ctex_tmp_tl
+\tl_clear_new:N \l__ctex_tmp_tl
\clist_map_inline:nn
{
10pt , 11pt , 12pt ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty 2017-08-07 21:08:29 UTC (rev 44974)
@@ -28,12 +28,13 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese font size definition (CTEX)}
\ProvidesExplPackage{ctexsize}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\RequirePackage { xparse , l3keys2e }
-\cs_new_eq:NN \g__ctex_font_size_flag \c_minus_one
+\int_new:N \g__ctex_font_size_flag
+\int_set:Nn \g__ctex_font_size_flag { -1 }
\keys_define:nn { ctex / option }
{
zihao .choice: ,
@@ -42,7 +43,7 @@
zihao / -4 .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_one } ,
zihao / false .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_two } ,
}
-\tl_clear:N \l__ctex_tmp_tl
+\tl_clear_new:N \l__ctex_tmp_tl
\clist_map_inline:nn
{
10pt , 11pt , 12pt ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -28,7 +28,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{ctexspa.def}%
- [2017/04/01 v2.4.9 Space info for CJKpunct (CTEX)]
+ [2017/08/07 v2.4.10 Space info for CJKpunct (CTEX)]
\ctexspadef{adobezhsong}{70,15,61,8,63,14,58,7,64,13,62,12,60,11,61,15,62,14,51,6,58,5,58,8,7,5,12,12,10,68,13,63,17,63,20,69,19,69,17,63,19,70,17,55,10,10,14,63,10,65,10,61,13,62,15,61,7,49,7,56,8,58,15,69,8,61,14,63,8,57,,,}
\ctexspadef{adobezhhei}{78,3,64,3,64,2,61,3,72,3,70,3,72,3,70,3,60,3,51,3,62,3,66,3,0,0,10,10,3,70,5,70,6,75,6,78,17,67,13,67,17,67,4,50,8,8,3,72,3,70,3,72,3,70,3,60,3,51,3,62,3,66,3,78,7,62,3,63,3,61,,,}
\ctexspadef{adobezhkai}{76,10,55,8,63,4,62,4,71,4,65,4,71,4,74,4,54,4,54,4,62,4,62,4,0,0,11,11,5,72,6,71,7,78,7,79,18,68,18,68,18,68,2,46,14,12,4,71,4,65,4,71,4,74,4,54,4,54,4,62,4,62,10,76,8,55,4,63,4,62,,,}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls 2017-08-07 21:08:29 UTC (rev 44974)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{ctex documentation (CTEX)}
\ProvidesExplClass{ctxdoc}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\ExplSyntaxOff
\let\pdfmdfivesum\mdfivesum
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{l3doc}}
@@ -438,7 +438,7 @@
{ \if at inlabel \leavevmode \fi }
{ \partopsep \z at skip }
\group_begin:
- \int_set_eq:NN \tex_endlinechar:D \c_minus_one
+ \int_set:Nn \tex_endlinechar:D { -1 }
\use:n
{
\char_set_catcode_active:n { 32 }
@@ -476,6 +476,13 @@
\__ctxdoc_verbatim_read_line:w
}
}
+ \cs_new_protected:Npn \__ctxdoc_swap_cr:
+ { \exp_after:wN \__ctxdoc_swap_cr:w \l__ctxdoc_verbatim_line_tl }
+ \cs_new_protected:Npn \__ctxdoc_swap_cr:w #1 ^^M
+ {
+ \group_insert_after:N ^^M
+ \tl_set:Nn \l__ctxdoc_verbatim_line_tl {#1}
+ }
\tl_const:Nn \c__ctxdoc_active_cr_tl { ^^M }
\group_end:
\tl_new:N \l__ctxdoc_verbatim_line_tl
@@ -496,7 +503,10 @@
\cs_gset_eq:NN \__ctxdoc_verbatim_process_line: \__ctxdoc_process_normal_line:
\__ctxdoc_output_module:nn
{ \color { verb at guard } }
- { \__ctxdoc_module_pop:n { \l__ctxdoc_verbatim_line_tl } }
+ {
+ \__ctxdoc_swap_cr:
+ \__ctxdoc_module_pop:n { \l__ctxdoc_verbatim_line_tl }
+ }
}
{ \tl_use:N \l__ctxdoc_verbatim_line_tl }
}
@@ -573,7 +583,10 @@
{ \c_percent_str \tl_tail:n {#1} }
\__ctxdoc_output_module:nn
{ \color { verb at guard } }
- { \__ctxdoc_module_push:n { \l__ctxdoc_verbatim_line_tl } }
+ {
+ \__ctxdoc_swap_cr:
+ \__ctxdoc_module_push:n { \l__ctxdoc_verbatim_line_tl }
+ }
}
\group_end:
\cs_new_protected_nopar:Npn \__ctxdoc_output_line:
@@ -613,6 +626,7 @@
\tex_noindent:D
\group_begin:
\color { code at gray }
+ \__ctxdoc_swap_cr:
\str_if_eq_x:nnTF { \f at shape } { \updefault }
{ \slshape }
{ \upshape }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict 2017-08-07 21:08:29 UTC (rev 44974)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
- [2017/04/01 v2.4.9 Chinese translation for theorem name (CTEX)]
+ [2017/08/07 v2.4.10 Chinese translation for theorem name (CTEX)]
\providetranslation{Comments}{\xC6\xC0\xC2\xDB}
\providetranslation{comments}{\xC6\xC0\xC2\xDB}
\providetranslation{Comment}{\xC6\xC0\xC2\xDB}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict 2017-08-07 21:08:29 UTC (rev 44974)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
- [2017/04/01 v2.4.9 Chinese translation for theorem name (CTEX)]
+ [2017/08/07 v2.4.10 Chinese translation for theorem name (CTEX)]
\providetranslation{Comments}{评论}
\providetranslation{comments}{评论}
\providetranslation{Comment}{评论}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Asian pTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-aptex.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1
{
\AtBeginDvi {#1}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{LuaLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-luatex.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\msg_new:nnn { ctex } { luatexja-loaded }
{
Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\
@@ -84,9 +84,11 @@
\AtEndUTFCommand { \group_end: }
\cs_set_protected:Npn \fontspec_visible_space:
{
- \font_glyph_if_exist:NnTF \font { "2423 }
- { \ltjalchar "2423 \exp_stop_f: }
- { \fontspec_visible_space_fallback: }
+ \etex_iffontchar:D \tex_font:D "2423 \exp_stop_f:
+ \ltjalchar "2423 \exp_stop_f:
+ \else:
+ \fontspec_visible_space_fallback:
+ \fi:
}
\ctex_at_end_package:nn { listings }
{
@@ -415,7 +417,7 @@
{ \ctex_ltj_switch_family:x {#1} \tex_ignorespaces:D }
\cs_new_protected_nopar:Npn \ctex_ltj_switch_family:n #1
{
- \ctex_ltj_family_if_exist:xNTF {#1} \CJK at family
+ \ctex_ltj_family_if_exist:nNTF {#1} \CJK at family
{
\tl_set:Nn \l_ctex_ltj_family_tl {#1}
\selectfont
@@ -424,9 +426,9 @@
}
\tl_new:N \l_ctex_ltj_family_tl
\cs_generate_variant:Nn \ctex_ltj_switch_family:n { x }
-\prg_new_protected_conditional:Npnn \ctex_ltj_family_if_exist:xN #1#2 { T , F , TF }
+\prg_new_protected_conditional:Npnn \ctex_ltj_family_if_exist:nN #1#2 { T , F , TF }
{
- \prop_get:NxNTF \g__ctex_ltj_family_name_prop {#1} #2
+ \prop_get:NnNTF \g__ctex_ltj_family_name_prop {#1} #2
{ \prg_return_true: }
{
\cs_if_exist_use:cTF { \__ctex_ltj_family_csname:n {#1} }
@@ -437,7 +439,9 @@
{ \prg_return_false: }
}
}
-\cs_generate_variant:Nn \prop_get:NnNTF { Nx }
+\cs_generate_variant:Nn \ctex_ltj_family_if_exist:nNT { x }
+\cs_generate_variant:Nn \ctex_ltj_family_if_exist:nNF { x }
+\cs_generate_variant:Nn \ctex_ltj_family_if_exist:nNTF { x }
\cs_new_protected_nopar:Npn \__ctex_ltj_family_unknown_warning:n #1
{
\prop_if_empty:NF \g__ctex_ltj_family_font_name_prop
@@ -1110,6 +1114,32 @@
\skip_set:Nn \l__ctex_xkanjiskip_skip
{ \ltjgetparameter { xkanjiskip } }
\ctex_add_to_selectfont:n { \ctex_update_xkanjiskip: }
+\dim_new:N \cht
+\dim_new:N \cdp
+\dim_new:N \cwd
+\newluafunction \g__ctex_kanjisize_func
+\group_begin:
+\char_set_catcode_space:n { 32 }
+\lua_now_x:n
+ {
+ local nulltable = { }
+ local t = lua.get_functions_table()
+ local fmt = luatexja.jfont.font_metric_table
+ local getattribute = tex.getattribute
+ local setdimen = tex.setdimen
+ t[\int_use:N \g__ctex_kanjisize_func] = function ()
+ local ft = fmt[getattribute('ltj at curjfnt')] or nulltable
+ local ft = ft and ft.char_type or nulltable
+ local fk = ft and ft[0] or nulltable
+ setdimen('cht', fk.height or 0)
+ setdimen('cdp', fk.depth or 0)
+ setdimen('cwd', fk.width or ft.zw or 0)
+ end
+ }
+\group_end:
+\cs_new_protected_nopar:Npn \ctex_update_kanjisize:
+ { \luatex_luafunction:D \g__ctex_kanjisize_func }
+\ctex_add_to_selectfont:n { \ctex_update_kanjisize: }
\keys_define:nn { ctex }
{
space .code:n =
Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{(pdf)LaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-pdftex.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1
{
\AtBeginDvi {#1}
@@ -142,7 +142,7 @@
{
\char_set_catcode_other:n { 60 } % <
\char_set_catcode_math_superscript:n { 94 } % ^
- \int_set_eq:NN \tex_endlinechar:D \c_minus_one
+ \int_set:Nn \tex_endlinechar:D { -1 }
}
{ \file_input:n {#1} }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{upTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-uptex.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1
{
\AtBeginDvi {#1}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{XeLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-xetex.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\RequirePackage { xeCJK }
\exp_args:Nx \xeCJKsetup
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd 2017-08-07 21:08:29 UTC (rev 44974)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19rm.fd}%
- [2017/04/01 v2.4.9 Chinese font definition (CTEX)]
+ [2017/08/07 v2.4.10 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd 2017-08-07 21:08:29 UTC (rev 44974)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19sf.fd}%
- [2017/04/01 v2.4.9 Chinese font definition (CTEX)]
+ [2017/08/07 v2.4.10 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd 2017-08-07 21:08:29 UTC (rev 44974)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19tt.fd}%
- [2017/04/01 v2.4.9 Chinese font definition (CTEX)]
+ [2017/08/07 v2.4.10 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd 2017-08-07 21:08:29 UTC (rev 44974)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70rm.fd}%
- [2017/04/01 v2.4.9 Chinese font definition (CTEX)]
+ [2017/08/07 v2.4.10 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd 2017-08-07 21:08:29 UTC (rev 44974)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70sf.fd}%
- [2017/04/01 v2.4.9 Chinese font definition (CTEX)]
+ [2017/08/07 v2.4.10 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd 2017-08-07 21:08:29 UTC (rev 44974)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70tt.fd}%
- [2017/04/01 v2.4.9 Chinese font definition (CTEX)]
+ [2017/08/07 v2.4.10 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Adobe fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-adobe.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{
\sys_if_output_pdf:TF
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Fandol fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-fandol.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{
\sys_if_output_pdf:TF
@@ -95,9 +95,13 @@
}
{
\setCJKmainfont
- [ Extension = .otf , BoldFont = FandolSong-Bold , ItalicFont = FandolKai-Regular ]
+ [
+ Extension = .otf ,
+ BoldFont = FandolSong-Bold , ItalicFont = FandolKai-Regular
+ ]
{ FandolSong-Regular }
- \setCJKsansfont [ Extension = .otf , BoldFont = FandolHei-Bold ] { FandolHei-Regular }
+ \setCJKsansfont
+ [ Extension = .otf , BoldFont = FandolHei-Bold ] { FandolHei-Regular }
\setCJKmonofont [ Extension = .otf ] { FandolFang-Regular }
\setCJKfamilyfont { zhsong }
[ Extension = .otf , BoldFont = FandolSong-Bold ] { FandolSong-Regular }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Founder fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-founder.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{
\ctex_zhmap_case:nnn
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Mac OS X fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-mac.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{ \ctex_fontset_error:n { mac } }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Ubuntu fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-ubuntu.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{
\ctex_zhmap_case:nnn
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Windows fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-windows.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\file_if_exist:nTF { C:/bootfont.bin }
{ \ctex_file_input:n { ctex-fontset-windowsold.def } }
{ \ctex_file_input:n { ctex-fontset-windowsnew.def } }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Windows fonts definition for Vista or later version (CTEX)}
\ProvidesExplFile{ctex-fontset-windowsnew.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\tl_new:N \l__ctex_msyh_suffix_tl
\tl_set:Nn \l__ctex_msyh_suffix_tl { .ttc }
\file_if_exist:nF { C:/Windows/Fonts/msyh.ttc }
@@ -44,7 +44,8 @@
\ctex_punct_set:n { windows }
\setCJKmainfont
[ BoldFont = simhei.ttf , ItalicFont = simkai.ttf ] { simsun.ttc }
- \setCJKsansfont [ BoldFont = msyhbd\l__ctex_msyh_suffix_tl ] { msyh\l__ctex_msyh_suffix_tl }
+ \setCJKsansfont
+ [ BoldFont = msyhbd\l__ctex_msyh_suffix_tl ] { msyh\l__ctex_msyh_suffix_tl }
\setCJKfamilyfont { zhyahei }
[ BoldFont = msyhbd\l__ctex_msyh_suffix_tl ] { msyh\l__ctex_msyh_suffix_tl }
\ctex_punct_map_family:nn { \CJKsfdefault } { zhyahei }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Windows fonts definition for XP or earlier version (CTEX)}
\ProvidesExplFile{ctex-fontset-windowsold.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{
\ctex_zhmap_case:nnn
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-article.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
@@ -138,7 +138,7 @@
\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
+\int_compare:nNnF \g__ctex_font_size_flag > { -1 }
{ \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 } }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-beamer.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-book.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
@@ -156,7 +156,7 @@
\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
+\int_compare:nNnF \g__ctex_font_size_flag > { -1 }
{ \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 } }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-report.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
@@ -156,7 +156,7 @@
\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
+\int_compare:nNnF \g__ctex_font_size_flag > { -1 }
{ \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 } }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\keys_set:nn { ctex } { today = small }
\ctex_if_autoindent_touched:F
{ \keys_set:nn { ctex } { autoindent = true } }
@@ -53,7 +53,7 @@
\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
+ \int_compare:nNnF \g__ctex_font_size_flag > { -1 }
{ \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 } }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-article.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-beamer.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-book.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-report.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def 2017-08-07 21:08:10 UTC (rev 44973)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def 2017-08-07 21:08:29 UTC (rev 44974)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx e177d82 2017-08-07 16:58:14 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-plain.def}
- {\ExplFileDate}{2.4.9}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.10}{\ExplFileDescription}
%%
%%
%% End of file `ctex-scheme-plain.def'.
More information about the tex-live-commits
mailing list