ctex (1apr17)

git-svn-id: svn://tug.org/texlive/trunk@43669 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 43 insertions, 41 deletions

diff --git a/Master/texmf-dist/source/latex/ctex/ctex.dtx b/Master/texmf-dist/source/latex/ctex/ctex.dtx
index 18a215df3d6..8a10831b690 100644
--- a/Master/texmf-dist/source/latex/ctex/ctex.dtx
+++ b/Master/texmf-dist/source/latex/ctex/ctex.dtx
@@ -413,7 +413,7 @@ Copyright and Licence
 %<*!(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 d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee@gmail.com> $
+%<+!driver>\GetIdInfo$Id: ctex.dtx c498d8c 2017-04-01 21:33:50 +0800 Qing Lee <sobenlee@gmail.com> $
 %<ctxdoc>  {ctex documentation (CTEX)}
 %<ctxdoc>\ProvidesExplClass{ctxdoc}
 %<ctex>  {Chinese adapter in LaTeX (CTEX)}
@@ -502,7 +502,7 @@ Copyright and Licence
 %<founder>\ProvidesExplFile{ctex-fontset-founder.def}
 %<ubuntu>  {Ubuntu fonts definition (CTEX)}
 %<ubuntu>\ProvidesExplFile{ctex-fontset-ubuntu.def}
-%<!driver>  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
+%<!driver>  {\ExplFileDate}{2.4.9}{\ExplFileDescription}
 %</!(c19|c70|ctexspa|dict)>
 %<c19&rm>\ProvidesFile{c19rm.fd}%
 %<c19&sf>\ProvidesFile{c19sf.fd}%
@@ -513,9 +513,9 @@ Copyright and Licence
 %<ctexspa>\ProvidesFile{ctexspa.def}%
 %<dict&theorem&GBK>\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
 %<dict&theorem&UTF8>\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
-%<c19|c70>  [2017/02/23 v2.4.8 Chinese font definition (CTEX)]
-%<ctexspa>  [2017/02/23 v2.4.8 Space info for CJKpunct (CTEX)]
-%<dict&theorem>  [2017/02/23 v2.4.8 Chinese translation for theorem name (CTEX)]
+%<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)]
 %</!(driver|readme|install|zhmap|spa|docstrip)>
 %<*driver>
 \documentclass{ctxdoc}
@@ -4285,37 +4285,6 @@ Copyright and Licence
 %    \end{macrocode}
 % \end{macro}
 %
-% \changes{v2.4.3}{2016/08/25}{更新 \pkg{unicode-math} 补丁。}
-% 对 \pkg{unicode-math} 的补丁主要是将 \file{unicode-math-table.tex} 中的数学符号设置为
-% \pkg{luatexja} 中的数学字母。
-%    \begin{macrocode}
-\cs_new_protected:Npn \ctex_ltj_set_math_letter:NN #1#2
-  {
-    \group_begin:
-      \cs_set_protected:Npn #1 ##1##2##3
-        { \ltjsetmathletter { ##1 } }
-      #2
-    \group_end:
-  }
-\ctex_at_end_package:nn { unicode-math }
-  {
-    \cs_if_exist:NTF \um_input_math_symbol_table:
-      {
-        \ctex_ltj_set_math_letter:NN
-          \um_sym:nnn
-          \um_input_math_symbol_table:
-      }
-      {
-        \cs_set_eq:NN \use@mathgroup \ctex_ltj_use_math_group:Nn
-        \cs_set_protected_nopar:Npn \ctex_ltj_math_group_hook:
-          { \__um_switchto_literal: }
-        \ctex_ltj_set_math_letter:NN
-          \__um_sym:nnn
-          \__um_input_math_symbol_table:
-      }
-  }
-%    \end{macrocode}
-%
 % 对 \pkg{listings} 的补丁是让代码环境支持 JAchar 类。\pkg{LuaTeX-ja} 的补丁会将
 % 代码目录标题改为日文，我们不需要。
 %    \begin{macrocode}
@@ -4670,6 +4639,39 @@ Copyright and Licence
 %    \end{macrocode}
 % \end{macro}
 %
+% \changes{v2.4.3}{2016/08/25}{更新 \pkg{unicode-math} 补丁。}
+% \changes{v2.4.9}{2017/02/27}{调整 \pkg{unicode-math} 补丁的代码顺序。}
+% 对 \pkg{unicode-math} 的补丁主要是将 \file{unicode-math-table.tex} 中的数学符号设置为
+% \pkg{luatexja} 中的数学字母。
+% 本段代码应放在 \cs{ctex_ltj_math_group_hook:} 的定义之后，避免因宏包载入顺序而造成的编译错误。
+%    \begin{macrocode}
+\cs_new_protected:Npn \ctex_ltj_set_math_letter:NN #1#2
+  {
+    \group_begin:
+      \cs_set_protected:Npn #1 ##1##2##3
+        { \ltjsetmathletter { ##1 } }
+      #2
+    \group_end:
+  }
+\ctex_at_end_package:nn { unicode-math }
+  {
+    \cs_if_exist:NTF \um_input_math_symbol_table:
+      {
+        \ctex_ltj_set_math_letter:NN
+          \um_sym:nnn
+          \um_input_math_symbol_table:
+      }
+      {
+        \cs_set_eq:NN \use@mathgroup \ctex_ltj_use_math_group:Nn
+        \cs_set_protected_nopar:Npn \ctex_ltj_math_group_hook:
+          { \__um_switchto_literal: }
+        \ctex_ltj_set_math_letter:NN
+          \__um_sym:nnn
+          \__um_input_math_symbol_table:
+      }
+  }
+%    \end{macrocode}
+%
 % \paragraph{字体族的定义与使用}
 %
 % \begin{macro}[int]{\ctex_mono_jfm:n,\l_@@_jfm_tl}
@@ -9995,7 +9997,7 @@ Copyright and Licence
 %    \begin{macrocode}
 %<*windows>
 \ProvidesFile{zhwindowsfonts.tex}%
-  [2017/02/23 v2.4.8 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+  [2017/04/01 v2.4.9 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
 
 \ifzhmappdf
   \pdfmapline{=gbk@UGBK@     <simsun.ttc}
@@ -10067,7 +10069,7 @@ Copyright and Licence
 %    \begin{macrocode}
 %<*adobe>
 \ProvidesFile{zhadobefonts.tex}%
-  [2017/02/23 v2.4.8 Adobe font map loader for DVIPDFMx (CTEX)]
+  [2017/04/01 v2.4.9 Adobe font map loader for DVIPDFMx (CTEX)]
 
 \ifzhmappdf
 %% pdfTeX does not support OTF fonts
@@ -10103,7 +10105,7 @@ Copyright and Licence
 %    \begin{macrocode}
 %<*fandol>
 \ProvidesFile{zhfandolfonts.tex}%
-  [2017/02/23 v2.4.8 Fandol font map loader for DVIPDFMx (CTEX)]
+  [2017/04/01 v2.4.9 Fandol font map loader for DVIPDFMx (CTEX)]
 
 \ifzhmappdf
 %% pdfTeX does not support OTF fonts
@@ -10139,7 +10141,7 @@ Copyright and Licence
 %    \begin{macrocode}
 %<*founder>
 \ProvidesFile{zhfounderfonts.tex}%
-  [2017/02/23 v2.4.8 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+  [2017/04/01 v2.4.9 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
 
 \ifzhmappdf
   \pdfmapline{=gbk@UGBK@     <FZSSK.TTF}
@@ -10211,7 +10213,7 @@ Copyright and Licence
 %    \begin{macrocode}
 %<*ubuntu>
 \ProvidesFile{zhubuntufonts.tex}%
-  [2017/02/23 v2.4.8 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
+  [2017/04/01 v2.4.9 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
 
 \ifzhmappdf
   \pdfmapline{=gbk@UGBK@     <uming.ttc}