texlive[47595] Master: ctex[.tds.zip] (3may18)
commits+karl at tug.org
commits+karl at tug.org
Thu May 3 23:02:37 CEST 2018
Revision: 47595
http://tug.org/svn/texlive?view=revision&revision=47595
Author: karl
Date: 2018-05-03 23:02:36 +0200 (Thu, 03 May 2018)
Log Message:
-----------
ctex[.tds.zip] (3may18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/ctex/README.md
trunk/Master/texmf-dist/doc/latex/ctex/ctex.pdf
trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx
trunk/Master/texmf-dist/source/latex/ctex/ctex.ins
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
trunk/Master/tlpkg/libexec/ctan2tds
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
Modified: trunk/Master/texmf-dist/doc/latex/ctex/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/ctex/README.md 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/doc/latex/ctex/README.md 2018-05-03 21:02:36 UTC (rev 47595)
@@ -95,6 +95,8 @@
ctex-fontset-adobe.def,
ctex-fontset-fandol.def,
ctex-fontset-mac.def,
+ ctex-fontset-macnew.def,
+ ctex-fontset-macold.def,
ctex-fontset-founder.def,
ctex-fontset-ubuntu.def,
ctexspa.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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx 2018-05-03 21:02:36 UTC (rev 47595)
@@ -123,6 +123,8 @@
ctex-fontset-adobe.def,
ctex-fontset-fandol.def,
ctex-fontset-mac.def,
+ ctex-fontset-macnew.def,
+ ctex-fontset-macold.def,
ctex-fontset-founder.def,
ctex-fontset-ubuntu.def,
ctexspa.def,
@@ -226,6 +228,8 @@
ctex-fontset-adobe.def,
ctex-fontset-fandol.def,
ctex-fontset-mac.def,
+ ctex-fontset-macnew.def,
+ ctex-fontset-macold.def,
ctex-fontset-founder.def,
ctex-fontset-ubuntu.def,
ctexspa.def,
@@ -295,6 +299,8 @@
\file{ctex-fontset-adobe.def} {\from{\jobname.dtx}{fontset,adobe}}
\file{ctex-fontset-fandol.def} {\from{\jobname.dtx}{fontset,fandol}}
\file{ctex-fontset-mac.def} {\from{\jobname.dtx}{fontset,mac}}
+ \file{ctex-fontset-macold.def} {\from{\jobname.dtx}{fontset,macold}}
+ \file{ctex-fontset-macnew.def} {\from{\jobname.dtx}{fontset,macnew}}
\file{ctex-fontset-founder.def} {\from{\jobname.dtx}{fontset,founder}}
\file{ctex-fontset-ubuntu.def} {\from{\jobname.dtx}{fontset,ubuntu}}
\file{translator-theorem-dictionary-ChineseGBK.dict}
@@ -383,6 +389,8 @@
\Msg{* ctex-fontset-adobe.def *}
\Msg{* ctex-fontset-fandol.def *}
\Msg{* ctex-fontset-mac.def *}
+\Msg{* ctex-fontset-macold.def *}
+\Msg{* ctex-fontset-macnew.def *}
\Msg{* ctex-fontset-founder.def *}
\Msg{* ctex-fontset-ubuntu.def *}
\Msg{* ctexspa.def *}
@@ -413,7 +421,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 dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+%<+!driver>\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
%<ctxdoc> {ctex documentation (CTEX)}
%<ctxdoc>\ProvidesExplClass{ctxdoc}
%<ctex> {Chinese adapter in LaTeX (CTEX)}
@@ -498,11 +506,15 @@
%<fandol>\ProvidesExplFile{ctex-fontset-fandol.def}
%<mac> {Mac OS X fonts definition (CTEX)}
%<mac>\ProvidesExplFile{ctex-fontset-mac.def}
+%<macnew> {Mac OS X fonts definition for El Capitan or later version (CTEX)}
+%<macnew>\ProvidesExplFile{ctex-fontset-macnew.def}
+%<macold> {Mac OS X fonts definition for Yosemite or earlier version (CTEX)}
+%<macold>\ProvidesExplFile{ctex-fontset-macold.def}
%<founder> {Founder fonts definition (CTEX)}
%<founder>\ProvidesExplFile{ctex-fontset-founder.def}
%<ubuntu> {Ubuntu fonts definition (CTEX)}
%<ubuntu>\ProvidesExplFile{ctex-fontset-ubuntu.def}
-%<!driver> {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{2.4.14}{\ExplFileDescription}
%</!(c19|c70|ctexspa|dict)>
%<c19&rm>\ProvidesFile{c19rm.fd}%
%<c19&sf>\ProvidesFile{c19sf.fd}%
@@ -513,9 +525,9 @@
%<ctexspa>\ProvidesFile{ctexspa.def}%
%<dict&theorem&GBK>\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
%<dict&theorem&UTF8>\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
-%<c19|c70> [2018/01/28 v2.4.12 Chinese font definition (CTEX)]
-%<ctexspa> [2018/01/28 v2.4.12 Space info for CJKpunct (CTEX)]
-%<dict&theorem> [2018/01/28 v2.4.12 Chinese translation for theorem name (CTEX)]
+%<c19|c70> [2018/05/01 v2.4.14 Chinese font definition (CTEX)]
+%<ctexspa> [2018/05/01 v2.4.14 Space info for CJKpunct (CTEX)]
+%<dict&theorem> [2018/05/01 v2.4.14 Chinese translation for theorem name (CTEX)]
%</!(driver|readme|install|zhmap|spa|docstrip)>
%<*driver>
\documentclass{ctxdoc}
@@ -538,7 +550,7 @@
% \changes{v2.4.12}{2018/01/13}{同步 \LaTeXiii{} 2017/12/16。}
%
%
-% \CheckSum{5909}
+% \CheckSum{5933}
%
% \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
@@ -955,7 +967,7 @@
% \begin{function}[added=2014-03-08]{fontset}
% \begin{syntax}
% fontset =^^A
-% <none|adobe|fandol|founder|mac|ubuntu|windows|windowsnew|windowsold|...>
+% <none|adobe|fandol|founder|mac|macnew|macold|ubuntu|windows|windowsnew|windowsold|...>
% \end{syntax}
% 指定 \CTeX{} 宏集加载的字库。
%
@@ -969,7 +981,9 @@
% \item[adobe] 使用 Adobe 公司的四款中文字体，\emph{不支持 \pdfLaTeX}。
% \item[fandol] 使用 Fandol 中文字体，\emph{不支持 \pdfLaTeX}。
% \item[founder] 使用方正公司的中文字体。
-% \item[mac] 使用 Mac OS X 系统下的华文字体，\emph{不支持 (pdf)\LaTeX}。
+% \item[mac] 使用 Mac OS X 系统下的字体，\emph{不支持 (pdf)\LaTeX}。
+% \item[macnew] 使用 El Capitan 或之后的多字重宋体、苹方黑体。
+% \item[macold] 使用 Yosemite 或之前的华文字库。
% \item[ubuntu] 使用 Ubuntu 系统下的文泉驿和文鼎字体。
% \item[windows] 使用简体中文 Windows 系统下的中文字体，自动判断 Windows 系
% 统版本，采用 |windowsnew| 或 |windowsold| 的设置。
@@ -1008,7 +1022,8 @@
% \end{document}
% \end{ctexexam}
%
-% \CTeX{} 宏集预定义的中文字库还定义了一些字体命令。
+% \CTeX{} 宏集预定义的中文字库还定义了一些字体命令。除了在 \opt{ubuntu} 字库中没有
+% \tn{fangsong} 的定义外，所有字库都有以下四个字体命令。
%
% \begin{optdesc}
% \item[\tn{songti}] 宋体，CJK 等价命令 |\CJKfamily{zhsong}|。
@@ -1016,17 +1031,23 @@
% \item[\tn{fangsong}] 仿宋，CJK 等价命令 |\CJKfamily{zhfs}|。
% \item[\tn{kaishu}] 楷书，CJK 等价命令 |\CJKfamily{zhkai}|。
% \end{optdesc}
-% 其中 \tn{fangsong} 在 \opt{ubuntu} 字库中没有定义。在
-% \opt{windows} 和 \opt{founder} 字库中，还有 \tn{lishu} 和 \tn{youyuan}。
+%
+% 在 \opt{windows} 和 \opt{founder} 字库中，额外定义了 \tn{lishu} 和 \tn{youyuan}。
% \begin{optdesc}
% \item[\tn{lishu}] 隶书，CJK 等价命令 |\CJKfamily{zhli}|。
% \item[\tn{youyuan}] 圆体，CJK 等价命令 |\CJKfamily{zhyou}|。
% \end{optdesc}
-% 在 \opt{windowsnew} 字库中，还有 \tn{yahei}。
+% 在 \opt{windowsnew} 和 \opt{macnew} 字库中，还有 \tn{yahei}。
+% 其中在 \opt{macnew} 字库中，\tn{yahei} 实际调用苹方黑体。此举乃是为了更好的兼容性而设。
% \begin{optdesc}
% \item[\tn{yahei}] 微软雅黑，CJK 等价命令 |\CJKfamily{zhyahei}|。
% \end{optdesc}
%
+% 在 \opt{macnew} 字库中，还定义了 \tn{pingfang}。
+% \begin{optdesc}
+% \item[\tn{pingfang}] 苹方黑体，CJK 等价命令 |\CJKfamily{zhpf}|。
+% \end{optdesc}
+%
% \section{排版格式设定}
% \label{sec:format-settings}
% \subsection{文档默认字号}
@@ -2866,31 +2887,33 @@
% \item \pkg{zhmCJK} 宏包，它还依赖 \pkg{oberdiek} 宏集。
% \item[\ding{229}] 以上是使用 \pdfLaTeX{} 或 \LaTeX{} + \dvipdfmx{} 的编译方式所需要
% 的依赖项，其中 \pkg{zhmCJK} 是可选的。
-% \item \pkg{xeCJK} 宏包，它还依赖
+% \item \pkg{xeCJK} 宏集，它还依赖
% \begin{itemize}
-% \item \pkg{fontspec} 宏包，它还依赖
-% \begin{itemize}
-% \item \pkg{euenc} 宏包。
-% \item \pkg{xunicode} 宏包，它还依赖
-% \begin{itemize}
-% \item \pkg{graphics} 宏集。
-% \item \pkg{graphics-cfg} 宏包。
-% \item \pkg{graphics-def} 宏包。
-% \end{itemize}
-% \end{itemize}
+% \item \pkg{xtemplate} 宏包，它属于 \pkg{l3packages} 宏集。
+% \item \pkg{fontspec} 宏包。
% \end{itemize}
% \item \pkg{environ} 宏包，它还依赖 \pkg{trimspaces} 宏包。
% \item[\ding{229}] 以上是使用 \XeLaTeX{} 编译时的依赖项。
-% \item \pkg{LuaTeX-ja} 宏集，它还依赖
+% \item \pkg{luatexja} 宏包，它还依赖
% \begin{itemize}
% \item \pkg{adobemapping} 宏包。
-% \item \pkg{fontspec} 宏包。
% \item \pkg{lualibs} 宏包。
% \item \pkg{luaotfload} 宏包。
% \item \pkg{luatexbase} 宏包，它还依赖 \pkg{ctablestack} 宏包。
% \item \pkg{oberdiek} 宏集。
% \item \pkg{xkeyval} 宏包。
+% \item \pkg{etoolbox} 宏包。
% \end{itemize}
+% \item \pkg{fontspec} 宏包。
+% \item \pkg{xunicode-addon} 宏包，属于 \pkg{xeCJK} 宏集，它还依赖
+% \begin{itemize}
+% \item \pkg{xunicode} 宏包，它还依赖
+% \begin{itemize}
+% \item \pkg{graphics} 宏集。
+% \item \pkg{graphics-cfg} 宏包。
+% \item \pkg{graphics-def} 宏包。
+% \end{itemize}
+% \end{itemize}
% \item[\ding{229}] 以上是使用 \LuaLaTeX{} 编译时的依赖项。
% \item \pkg{pxeverysel} 宏包，属于 \pkg{platex-tools} 宏集。
% \item \pkg{zhmetrics-uptex} 宏包。
@@ -5763,6 +5786,11 @@
\ctex_at_end_preamble:n { \ctex_update_default_family: }
% \end{macrocode}
%
+% 使修改立刻生效，保证导言区字体族正确。
+% \begin{macrocode}
+\normalfont
+% \end{macrocode}
+%
% \begin{macro}[int]{\em}
% \changes{v2.4.2}{2016/05/15}{兼容 \upLaTeX{} 2016/05/07u00 的定义。}
% 取消 \upLaTeX{} 对 \tn{em} 使用 |\mcfamily|、|\gtfamily| 命令的重定义，恢复
@@ -6281,6 +6309,8 @@
%
% \subsubsection{其它}
%
+% \changes{v2.4.13}{2018/03/23}{修正导言区 \tn{selectfont} 钩子位置。}
+%
% \begin{macro}[int]{\ctex_add_to_selectfont:n,\CTEX at selectfont@hook}
% \tn{EverySelectfont} 直到文档开始时才有效。为了 \tn{ccwd} 和 \pkg{LuaTeX-ja} 的
% 字体设置在导言区也可用，我们还需要在这里手工修改 \tn{selectfont}。\pkg{everysel}
@@ -6309,8 +6339,10 @@
}
\ctex_parse_name:NN \@@_tmp:N \selectfont
\exp_last_unbraced:NNo \group_end:
- \ctex_preto_cmd:NnnTF { \l_@@_tmp_tl } { \ExplSyntaxOff }
- { \CTEX at selectfont@hook }
+ \ctex_patch_cmd_once:NnnnTF { \l_@@_tmp_tl }
+ { \ExplSyntaxOff }
+ { \size at update }
+ { \CTEX at selectfont@hook \size at update }
{ \@@_restore_selectfont: }
{ \ctex_patch_failure:N \selectfont }
\fi:
@@ -9740,11 +9772,25 @@
%
% \begin{macrocode}
%</fandol>
-%<*mac>
% \end{macrocode}
%
% \subsubsection{\pkg{ctex-fontset-mac.def}}
+% \changes{v2.4.14}{2018/05/01}{区分 \texttt{macold} 及 \texttt{macnew}。}
%
+% 按 \href{https://github.com/CTeX-org/ctex-kit/issues/351}{Issue 351}
+% 的讨论，以 El Capitan 为分界，分别设置 |macold|（El Capitan 之前）
+% 和 |macnew|（El Capitan 及之后）。检测方式则以 El Capitan 及之后
+% 的苹方字体为准。
+% \begin{macrocode}
+%<*mac>
+\file_if_exist:nTF { /System/Library/Fonts/PingFang.ttc }
+ { \ctex_file_input:n { ctex-fontset-macnew.def } }
+ { \ctex_file_input:n { ctex-fontset-macold.def } }
+%</mac>
+% \end{macrocode}
+%
+% \subsubsection{\pkg{ctex-fontset-macold.def}}
+%
% OS X Mavericks (10.9) 预装的主要简体中文字体如下^^A
% \footnote{\url{http://support.apple.com/kb/HT5944}}：
% \begin{verbatim}
@@ -9813,6 +9859,7 @@
% \begingroup\makeatletter\@makeother\#\@firstofone{\endgroup
% \footnote{\url{https://github.com/clerkma/ptex-ng/blob/master/texk/libdpx/cidtype2.c#L597}}}。
% \begin{macrocode}
+%<*macold>
\sys_if_engine_pdftex:TF
{ \ctex_fontset_error:n { mac } }
{
@@ -9828,10 +9875,45 @@
\setCJKfamilyfont { zhkai } { STKaiti }
}
}
+%</macold>
% \end{macrocode}
%
+% \subsubsection{\pkg{ctex-fontset-macnew.def}}
+% \changes{v2.4.14}{2018/05/01}{配置 \texttt{macnew} 的默认字体设置。}
+%
+% |macnew| 在默认字体设置方面，引入了多字重的宋体作为罗马字族，
+% 以及引入了苹方黑体作为无衬线字族。
+%
% \begin{macrocode}
-%</mac>
+%<*macnew>
+\sys_if_engine_pdftex:TF
+ { \ctex_fontset_error:n { mac } }
+ {
+ \sys_if_engine_uptex:TF
+ { \ctex_fontset_error:n { mac } }
+ {
+ \setCJKmainfont
+ [
+ UprightFont = Songti~SC~Light,
+ ItalicFont = Kaiti~SC,
+ BoldItalicFont = Kaiti~SC~Bold
+ ] { Songti~SC }
+ \setCJKsansfont { PingFang~SC }
+ \setCJKmonofont { STFangsong }
+ \setCJKfamilyfont { zhsong }
+ [
+ UprightFont = Songti~SC~Light,
+ ] { Songti~SC }
+ \setCJKfamilyfont { zhhei } { Heiti~SC }
+ \setCJKfamilyfont { zhpf } { PingFang~SC }
+ \setCJKfamilyfont { zhfs } { STFangsong }
+ \setCJKfamilyfont { zhkai } { Kaiti~SC }
+ }
+ }
+%</macnew>
+% \end{macrocode}
+%
+% \begin{macrocode}
%<*founder>
% \end{macrocode}
%
@@ -9983,9 +10065,10 @@
% \end{macrocode}
%
% \subsubsection{中文字体命令}
+% \changes{v2.4.14}{2018/05/01}{为 \texttt{macnew} 配置字体命令。}
%
% \begin{macrocode}
-%<*!windows>
+%<*!windows&!mac>
% \end{macrocode}
%
% \begin{macrocode}
@@ -9998,10 +10081,12 @@
\NewDocumentCommand \youyuan { } { \CJKfamily { zhyou } }
%</windowsnew|windowsold|founder>
%<windowsnew>\NewDocumentCommand \yahei { } { \CJKfamily { zhyahei } }
+%<macnew>\NewDocumentCommand \yahei { } { \CJKfamily { zhpf } }
+%<macnew>\NewDocumentCommand \pingfang { } { \CJKfamily { zhpf } }
% \end{macrocode}
%
% \begin{macrocode}
-%</!windows>
+%</!windows&!mac>
%</fontset>
%<*zhmap>
% \end{macrocode}
@@ -10073,7 +10158,7 @@
% \begin{macrocode}
%<*windows>
\ProvidesFile{zhwindowsfonts.tex}%
- [2018/01/28 v2.4.12 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2018/05/01 v2.4.14 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <simsun.ttc}
@@ -10145,7 +10230,7 @@
% \begin{macrocode}
%<*adobe>
\ProvidesFile{zhadobefonts.tex}%
- [2018/01/28 v2.4.12 Adobe font map loader for DVIPDFMx (CTEX)]
+ [2018/05/01 v2.4.14 Adobe font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
@@ -10181,7 +10266,7 @@
% \begin{macrocode}
%<*fandol>
\ProvidesFile{zhfandolfonts.tex}%
- [2018/01/28 v2.4.12 Fandol font map loader for DVIPDFMx (CTEX)]
+ [2018/05/01 v2.4.14 Fandol font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
@@ -10217,7 +10302,7 @@
% \begin{macrocode}
%<*founder>
\ProvidesFile{zhfounderfonts.tex}%
- [2018/01/28 v2.4.12 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2018/05/01 v2.4.14 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <FZSSK.TTF}
@@ -10289,7 +10374,7 @@
% \begin{macrocode}
%<*ubuntu>
\ProvidesFile{zhubuntufonts.tex}%
- [2018/01/28 v2.4.12 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2018/05/01 v2.4.14 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <uming.ttc}
Modified: trunk/Master/texmf-dist/source/latex/ctex/ctex.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/ctex/ctex.ins 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/source/latex/ctex/ctex.ins 2018-05-03 21:02:36 UTC (rev 47595)
@@ -105,6 +105,8 @@
ctex-fontset-adobe.def,
ctex-fontset-fandol.def,
ctex-fontset-mac.def,
+ ctex-fontset-macnew.def,
+ ctex-fontset-macold.def,
ctex-fontset-founder.def,
ctex-fontset-ubuntu.def,
ctexspa.def,
@@ -174,6 +176,8 @@
\file{ctex-fontset-adobe.def} {\from{\jobname.dtx}{fontset,adobe}}
\file{ctex-fontset-fandol.def} {\from{\jobname.dtx}{fontset,fandol}}
\file{ctex-fontset-mac.def} {\from{\jobname.dtx}{fontset,mac}}
+ \file{ctex-fontset-macold.def} {\from{\jobname.dtx}{fontset,macold}}
+ \file{ctex-fontset-macnew.def} {\from{\jobname.dtx}{fontset,macnew}}
\file{ctex-fontset-founder.def} {\from{\jobname.dtx}{fontset,founder}}
\file{ctex-fontset-ubuntu.def} {\from{\jobname.dtx}{fontset,ubuntu}}
\file{translator-theorem-dictionary-ChineseGBK.dict}
@@ -256,6 +260,8 @@
\Msg{* ctex-fontset-adobe.def *}
\Msg{* ctex-fontset-fandol.def *}
\Msg{* ctex-fontset-mac.def *}
+\Msg{* ctex-fontset-macold.def *}
+\Msg{* ctex-fontset-macnew.def *}
\Msg{* ctex-fontset-founder.def *}
\Msg{* ctex-fontset-ubuntu.def *}
\Msg{* ctexspa.def *}
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex 2018-05-03 21:02:36 UTC (rev 47595)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhadobefonts.tex}%
- [2018/01/28 v2.4.12 Adobe font map loader for DVIPDFMx (CTEX)]
+ [2018/05/01 v2.4.14 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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex 2018-05-03 21:02:36 UTC (rev 47595)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhfandolfonts.tex}%
- [2018/01/28 v2.4.12 Fandol font map loader for DVIPDFMx (CTEX)]
+ [2018/05/01 v2.4.14 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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex 2018-05-03 21:02:36 UTC (rev 47595)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhfounderfonts.tex}%
- [2018/01/28 v2.4.12 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2018/05/01 v2.4.14 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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex 2018-05-03 21:02:36 UTC (rev 47595)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhubuntufonts.tex}%
- [2018/01/28 v2.4.12 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2018/05/01 v2.4.14 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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex 2018-05-03 21:02:36 UTC (rev 47595)
@@ -76,7 +76,7 @@
\fi
\endgroup
\ProvidesFile{zhwindowsfonts.tex}%
- [2018/01/28 v2.4.12 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2018/05/01 v2.4.14 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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Caption with encoding GBK (CTEX)}
\ProvidesExplFile{ctex-name-gbk.cfg}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Caption with encoding UTF8 (CTEX)}
\ProvidesExplFile{ctex-name-utf8.cfg}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Configuration file (CTEX)}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
%%
%%
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Option configuration file (CTEX)}
\ProvidesExplFile{ctexopts.cfg}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-article.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Heading modification for article (CTEX)}
\ProvidesExplFile{ctex-article.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Heading modification for beamer (CTEX)}
\ProvidesExplFile{ctex-beamer.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_headings_seq
{ part , section , subsection }
\cs_new_protected_nopar:Npn \__ctex_initial_heading:n #1
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Heading modification for book (CTEX)}
\ProvidesExplFile{ctex-book.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{c5size option (CTEX)}
\ProvidesExplFile{ctex-c5size.clo}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{cs4size option (CTEX)}
\ProvidesExplFile{ctex-cs4size.clo}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-report.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Heading modification for report (CTEX)}
\ProvidesExplFile{ctex-report.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty 2018-05-03 21:02:36 UTC (rev 47595)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 }
@@ -874,6 +874,8 @@
%% ctex-fontset-adobe.def,
%% ctex-fontset-fandol.def,
%% ctex-fontset-mac.def,
+%% ctex-fontset-macnew.def,
+%% ctex-fontset-macold.def,
%% ctex-fontset-founder.def,
%% ctex-fontset-ubuntu.def,
%% ctexspa.def,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls 2018-05-03 21:02:36 UTC (rev 47595)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Chinese adapter for class article (CTEX)}
\ProvidesExplClass{ctexart}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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
@@ -1436,6 +1436,8 @@
%% ctex-fontset-adobe.def,
%% ctex-fontset-fandol.def,
%% ctex-fontset-mac.def,
+%% ctex-fontset-macnew.def,
+%% ctex-fontset-macold.def,
%% ctex-fontset-founder.def,
%% ctex-fontset-ubuntu.def,
%% ctexspa.def,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls 2018-05-03 21:02:36 UTC (rev 47595)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Chinese adapter for class beamer (CTEX)}
\ProvidesExplClass{ctexbeamer}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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
@@ -993,6 +993,8 @@
%% ctex-fontset-adobe.def,
%% ctex-fontset-fandol.def,
%% ctex-fontset-mac.def,
+%% ctex-fontset-macnew.def,
+%% ctex-fontset-macold.def,
%% ctex-fontset-founder.def,
%% ctex-fontset-ubuntu.def,
%% ctexspa.def,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls 2018-05-03 21:02:36 UTC (rev 47595)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Chinese adapter for class book (CTEX)}
\ProvidesExplClass{ctexbook}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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
@@ -1558,6 +1558,8 @@
%% ctex-fontset-adobe.def,
%% ctex-fontset-fandol.def,
%% ctex-fontset-mac.def,
+%% ctex-fontset-macnew.def,
+%% ctex-fontset-macold.def,
%% ctex-fontset-founder.def,
%% ctex-fontset-ubuntu.def,
%% ctexspa.def,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty 2018-05-03 21:02:36 UTC (rev 47595)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{ctexcap}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty 2018-05-03 21:02:36 UTC (rev 47595)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Heading style modification (CTEX)}
\ProvidesExplPackage{ctexheading}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\RequirePackage { xparse , l3keys2e }
\RequirePackage { ctexhook , ctexpatch }
\tl_clear_new:N \l__ctex_tmp_tl
@@ -164,6 +164,8 @@
%% ctex-fontset-adobe.def,
%% ctex-fontset-fandol.def,
%% ctex-fontset-mac.def,
+%% ctex-fontset-macnew.def,
+%% ctex-fontset-macold.def,
%% ctex-fontset-founder.def,
%% ctex-fontset-ubuntu.def,
%% ctexspa.def,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty 2018-05-03 21:02:36 UTC (rev 47595)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Document and package hooks (CTEX)}
\ProvidesExplPackage{ctexhook}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty 2018-05-03 21:02:36 UTC (rev 47595)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Patching commands (CTEX)}
\ProvidesExplPackage{ctexpatch}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\cs_if_exist:NF \str_new:N { \RequirePackage { l3str } }
\cs_new_protected:Npn \ctex_patch_cmd_once:NnnnTF #1#2
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls 2018-05-03 21:02:36 UTC (rev 47595)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Chinese adapter for class report (CTEX)}
\ProvidesExplClass{ctexrep}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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
@@ -1553,6 +1553,8 @@
%% ctex-fontset-adobe.def,
%% ctex-fontset-fandol.def,
%% ctex-fontset-mac.def,
+%% ctex-fontset-macnew.def,
+%% ctex-fontset-macold.def,
%% ctex-fontset-founder.def,
%% ctex-fontset-ubuntu.def,
%% ctexspa.def,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty 2018-05-03 21:02:36 UTC (rev 47595)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Chinese font size definition (CTEX)}
\ProvidesExplPackage{ctexsize}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\RequirePackage { xparse , l3keys2e }
\int_new:N \g__ctex_font_size_flag
\int_set:Nn \g__ctex_font_size_flag { -1 }
@@ -210,6 +210,8 @@
%% ctex-fontset-adobe.def,
%% ctex-fontset-fandol.def,
%% ctex-fontset-mac.def,
+%% ctex-fontset-macnew.def,
+%% ctex-fontset-macold.def,
%% ctex-fontset-founder.def,
%% ctex-fontset-ubuntu.def,
%% ctexspa.def,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -28,7 +28,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{ctexspa.def}%
- [2018/01/28 v2.4.12 Space info for CJKpunct (CTEX)]
+ [2018/05/01 v2.4.14 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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls 2018-05-03 21:02:36 UTC (rev 47595)
@@ -28,10 +28,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{ctex documentation (CTEX)}
\ProvidesExplClass{ctxdoc}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\ExplSyntaxOff
\let\pdfmdfivesum\mdfivesum
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{l3doc}}
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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict 2018-05-03 21:02:36 UTC (rev 47595)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
- [2018/01/28 v2.4.12 Chinese translation for theorem name (CTEX)]
+ [2018/05/01 v2.4.14 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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict 2018-05-03 21:02:36 UTC (rev 47595)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
- [2018/01/28 v2.4.12 Chinese translation for theorem name (CTEX)]
+ [2018/05/01 v2.4.14 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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Asian pTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-aptex.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1
{
\AtBeginDvi {#1}
@@ -64,6 +64,7 @@
}
\tl_set:Nn \kanjifamilydefault { \CJKfamilydefault }
\ctex_at_end_preamble:n { \ctex_update_default_family: }
+\normalfont
\ctex_patch_cmd_once:NnnnTF \em
{ \ExplSyntaxOff }
{ \eminnershape \else \gtfamily \itshape }
@@ -196,8 +197,10 @@
}
\ctex_parse_name:NN \__ctex_tmp:N \selectfont
\exp_last_unbraced:NNo \group_end:
- \ctex_preto_cmd:NnnTF { \l__ctex_tmp_tl } { \ExplSyntaxOff }
- { \CTEX at selectfont@hook }
+ \ctex_patch_cmd_once:NnnnTF { \l__ctex_tmp_tl }
+ { \ExplSyntaxOff }
+ { \size at update }
+ { \CTEX at selectfont@hook \size at update }
{ \__ctex_restore_selectfont: }
{ \ctex_patch_failure:N \selectfont }
\fi:
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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{LuaLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-luatex.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\msg_new:nnn { ctex } { luatexja-loaded }
{
Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\
@@ -1090,8 +1090,10 @@
}
\ctex_parse_name:NN \__ctex_tmp:N \selectfont
\exp_last_unbraced:NNo \group_end:
- \ctex_preto_cmd:NnnTF { \l__ctex_tmp_tl } { \ExplSyntaxOff }
- { \CTEX at selectfont@hook }
+ \ctex_patch_cmd_once:NnnnTF { \l__ctex_tmp_tl }
+ { \ExplSyntaxOff }
+ { \size at update }
+ { \CTEX at selectfont@hook \size at update }
{ \__ctex_restore_selectfont: }
{ \ctex_patch_failure:N \selectfont }
\fi:
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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{(pdf)LaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-pdftex.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1
{
\AtBeginDvi {#1}
@@ -397,8 +397,10 @@
}
\ctex_parse_name:NN \__ctex_tmp:N \selectfont
\exp_last_unbraced:NNo \group_end:
- \ctex_preto_cmd:NnnTF { \l__ctex_tmp_tl } { \ExplSyntaxOff }
- { \CTEX at selectfont@hook }
+ \ctex_patch_cmd_once:NnnnTF { \l__ctex_tmp_tl }
+ { \ExplSyntaxOff }
+ { \size at update }
+ { \CTEX at selectfont@hook \size at update }
{ \__ctex_restore_selectfont: }
{ \ctex_patch_failure:N \selectfont }
\fi:
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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{upTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-uptex.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1
{
\AtBeginDvi {#1}
@@ -64,6 +64,7 @@
}
\tl_set:Nn \kanjifamilydefault { \CJKfamilydefault }
\ctex_at_end_preamble:n { \ctex_update_default_family: }
+\normalfont
\ctex_patch_cmd_once:NnnnTF \em
{ \ExplSyntaxOff }
{ \eminnershape \else \gtfamily \itshape }
@@ -206,8 +207,10 @@
}
\ctex_parse_name:NN \__ctex_tmp:N \selectfont
\exp_last_unbraced:NNo \group_end:
- \ctex_preto_cmd:NnnTF { \l__ctex_tmp_tl } { \ExplSyntaxOff }
- { \CTEX at selectfont@hook }
+ \ctex_patch_cmd_once:NnnnTF { \l__ctex_tmp_tl }
+ { \ExplSyntaxOff }
+ { \size at update }
+ { \CTEX at selectfont@hook \size at update }
{ \__ctex_restore_selectfont: }
{ \ctex_patch_failure:N \selectfont }
\fi:
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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{XeLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-xetex.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\RequirePackage { xeCJK }
\exp_args:Nx \xeCJKsetup
{
@@ -131,8 +131,10 @@
}
\ctex_parse_name:NN \__ctex_tmp:N \selectfont
\exp_last_unbraced:NNo \group_end:
- \ctex_preto_cmd:NnnTF { \l__ctex_tmp_tl } { \ExplSyntaxOff }
- { \CTEX at selectfont@hook }
+ \ctex_patch_cmd_once:NnnnTF { \l__ctex_tmp_tl }
+ { \ExplSyntaxOff }
+ { \size at update }
+ { \CTEX at selectfont@hook \size at update }
{ \__ctex_restore_selectfont: }
{ \ctex_patch_failure:N \selectfont }
\fi:
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd 2018-05-03 21:02:36 UTC (rev 47595)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19rm.fd}%
- [2018/01/28 v2.4.12 Chinese font definition (CTEX)]
+ [2018/05/01 v2.4.14 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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd 2018-05-03 21:02:36 UTC (rev 47595)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19sf.fd}%
- [2018/01/28 v2.4.12 Chinese font definition (CTEX)]
+ [2018/05/01 v2.4.14 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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd 2018-05-03 21:02:36 UTC (rev 47595)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c19tt.fd}%
- [2018/01/28 v2.4.12 Chinese font definition (CTEX)]
+ [2018/05/01 v2.4.14 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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd 2018-05-03 21:02:36 UTC (rev 47595)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70rm.fd}%
- [2018/01/28 v2.4.12 Chinese font definition (CTEX)]
+ [2018/05/01 v2.4.14 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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd 2018-05-03 21:02:36 UTC (rev 47595)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70sf.fd}%
- [2018/01/28 v2.4.12 Chinese font definition (CTEX)]
+ [2018/05/01 v2.4.14 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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd 2018-05-03 21:02:36 UTC (rev 47595)
@@ -27,7 +27,7 @@
%% ------------------------------------------------------------------------------
%%
\ProvidesFile{c70tt.fd}%
- [2018/01/28 v2.4.12 Chinese font definition (CTEX)]
+ [2018/05/01 v2.4.14 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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Adobe fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-adobe.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Fandol fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-fandol.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\sys_if_engine_pdftex:TF
{
\sys_if_output_pdf:TF
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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Founder fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-founder.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,29 +26,13 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Mac OS X fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-mac.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
-\sys_if_engine_pdftex:TF
- { \ctex_fontset_error:n { mac } }
- {
- \sys_if_engine_uptex:TF
- { \ctex_fontset_error:n { mac } }
- {
- \setCJKmainfont [ BoldFont = STHeiti , ItalicFont = STKaiti ] { STSong }
- \setCJKsansfont [ BoldFont = STHeiti ] { STXihei }
- \setCJKmonofont { STFangsong }
- \setCJKfamilyfont { zhsong } { STSong }
- \setCJKfamilyfont { zhhei } { STHeiti }
- \setCJKfamilyfont { zhfs } { STFangsong }
- \setCJKfamilyfont { zhkai } { STKaiti }
- }
- }
-\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
-\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
-\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
-\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+\file_if_exist:nTF { /System/Library/Fonts/PingFang.ttc }
+ { \ctex_file_input:n { ctex-fontset-macnew.def } }
+ { \ctex_file_input:n { ctex-fontset-macold.def } }
%%
%%
%% End of file `ctex-fontset-mac.def'.
Added: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -0,0 +1,65 @@
+%%
+%% This is file `ctex-fontset-macnew.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ctex.dtx (with options: `fontset,macnew')
+%%
+%% Copyright (C) 2003--2018
+%% CTEX.ORG and any individual authors listed in the documentation.
+%% ------------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. This version of this license is in
+%% http://www.latex-project.org/lppl/lppl-1-3c.txt
+%% and the latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%%
+%% ------------------------------------------------------------------------------
+%%
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
+ {Mac OS X fonts definition for El Capitan or later version (CTEX)}
+\ProvidesExplFile{ctex-fontset-macnew.def}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+\sys_if_engine_pdftex:TF
+ { \ctex_fontset_error:n { mac } }
+ {
+ \sys_if_engine_uptex:TF
+ { \ctex_fontset_error:n { mac } }
+ {
+ \setCJKmainfont
+ [
+ UprightFont = Songti~SC~Light,
+ ItalicFont = Kaiti~SC,
+ BoldItalicFont = Kaiti~SC~Bold
+ ] { Songti~SC }
+ \setCJKsansfont { PingFang~SC }
+ \setCJKmonofont { STFangsong }
+ \setCJKfamilyfont { zhsong }
+ [
+ UprightFont = Songti~SC~Light,
+ ] { Songti~SC }
+ \setCJKfamilyfont { zhhei } { Heiti~SC }
+ \setCJKfamilyfont { zhpf } { PingFang~SC }
+ \setCJKfamilyfont { zhfs } { STFangsong }
+ \setCJKfamilyfont { zhkai } { Kaiti~SC }
+ }
+ }
+\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
+\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
+\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
+\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
+\NewDocumentCommand \yahei { } { \CJKfamily { zhpf } }
+\NewDocumentCommand \pingfang { } { \CJKfamily { zhpf } }
+%%
+%%
+%% End of file `ctex-fontset-macnew.def'.
Property changes on: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -0,0 +1,54 @@
+%%
+%% This is file `ctex-fontset-macold.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ctex.dtx (with options: `fontset,macold')
+%%
+%% Copyright (C) 2003--2018
+%% CTEX.ORG and any individual authors listed in the documentation.
+%% ------------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. This version of this license is in
+%% http://www.latex-project.org/lppl/lppl-1-3c.txt
+%% and the latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%%
+%% ------------------------------------------------------------------------------
+%%
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
+ {Mac OS X fonts definition for Yosemite or earlier version (CTEX)}
+\ProvidesExplFile{ctex-fontset-macold.def}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+\sys_if_engine_pdftex:TF
+ { \ctex_fontset_error:n { mac } }
+ {
+ \sys_if_engine_uptex:TF
+ { \ctex_fontset_error:n { mac } }
+ {
+ \setCJKmainfont [ BoldFont = STHeiti , ItalicFont = STKaiti ] { STSong }
+ \setCJKsansfont [ BoldFont = STHeiti ] { STXihei }
+ \setCJKmonofont { STFangsong }
+ \setCJKfamilyfont { zhsong } { STSong }
+ \setCJKfamilyfont { zhhei } { STHeiti }
+ \setCJKfamilyfont { zhfs } { STFangsong }
+ \setCJKfamilyfont { zhkai } { STKaiti }
+ }
+ }
+\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
+\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
+\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
+\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
+%%
+%%
+%% End of file `ctex-fontset-macold.def'.
Property changes on: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Ubuntu fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-ubuntu.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Windows fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-windows.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Windows fonts definition for Vista or later version (CTEX)}
\ProvidesExplFile{ctex-fontset-windowsnew.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 }
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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Windows fonts definition for XP or earlier version (CTEX)}
\ProvidesExplFile{ctex-fontset-windowsold.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Chinese scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-article.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Chinese scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-beamer.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Chinese scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-book.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Chinese scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-report.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\keys_set:nn { ctex / part }
{
aftertitle = \par ,
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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Chinese scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
\keys_set:nn { ctex } { today = small }
\ctex_if_autoindent_touched:F
{ \keys_set:nn { ctex } { autoindent = true } }
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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Plain scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-article.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Plain scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-beamer.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Plain scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-book.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Plain scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-report.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\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 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def 2018-05-03 21:02:36 UTC (rev 47595)
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx dd8349e 2018-01-28 19:10:52 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205 at gmail.com> $
{Plain scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-plain.def}
- {\ExplFileDate}{2.4.12}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.14}{\ExplFileDescription}
%%
%%
%% End of file `ctex-scheme-plain.def'.
Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds 2018-05-03 17:50:38 UTC (rev 47594)
+++ trunk/Master/tlpkg/libexec/ctan2tds 2018-05-03 21:02:36 UTC (rev 47595)
@@ -2462,7 +2462,7 @@
'babel' => 'etex',
'babel-greek' => 'latex', # requires interaction
'babel-serbianc' => 'latex',# requires interaction
- 'babel-ukrainian' => 'etex',# requires interaction
+ 'babel-ukrainianx' => 'etex',# requires interaction
'beamersubframe' => 'latex',# requires interaction
'basque-book' => 'latex', # requires interaction
'basque-date' => 'latex', # requires interaction
More information about the tex-live-commits
mailing list