ctex: upTeX 下不影响 \em 的用户定义。

ctex/ctex.dtx

@@ -821,7 +821,7 @@ This package consists of the file ctex.dtx, and the derived files
 % \changes{v2.4}{2015/02/19}{加强 \pkg{beamer} 宏包支持。}
 %
 %
-% \CheckSum{5509}
+% \CheckSum{5506}
 %
 % \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
@@ -5843,11 +5843,13 @@ This package consists of the file ctex.dtx, and the derived files
 %    \end{macrocode}
 %
 % \begin{macro}{\em}
-% 恢复 \LaTeXe{} 对 \tn{em} 的原始定义。
+% 取消 \upLaTeX{} 对 \tn{em} 使用 |\mcfamily|、|\gtfamily| 命令的重定义，恢复
+% \LaTeXe{} 对 \tn{em} 的原始定义。如果用户已经重定义了 \tn{em}，则新定义保持
+% 不变。
 %    \begin{macrocode}
-\DeclareRobustCommand\em
-        {\@nomath\em \ifdim \fontdimen\@ne\font >\z@
-                       \eminnershape \else \itshape \fi}
+\ctex_patch_cmd:Nnn \em
+  { \mcfamily \upshape \else \gtfamily \itshape }
+  { \eminnershape \else \itshape }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -8885,12 +8887,14 @@ This package consists of the file ctex.dtx, and the derived files
 % \upTeX{} 使用的字体族。\upLaTeX 在 NFSS 下使用字体编码 |JY2| 和 |JT2| 来分别
 % 表示横排与直排的日文。
 %    \begin{macrocode}
-%<uptex>\DeclareKanjiFamily{JY2}{rm}{}
-%<uptex>\DeclareKanjiFamily{JY2}{sf}{}
-%<uptex>\DeclareKanjiFamily{JY2}{tt}{}
-%<uptex>\DeclareKanjiFamily{JT2}{rm}{}
-%<uptex>\DeclareKanjiFamily{JT2}{sf}{}
-%<uptex>\DeclareKanjiFamily{JT2}{tt}{}
+%<*uptex>
+\DeclareKanjiFamily{JY2}{rm}{}
+\DeclareKanjiFamily{JY2}{sf}{}
+\DeclareKanjiFamily{JY2}{tt}{}
+\DeclareKanjiFamily{JT2}{rm}{}
+\DeclareKanjiFamily{JT2}{sf}{}
+\DeclareKanjiFamily{JT2}{tt}{}
+%</uptex>
 %    \end{macrocode}
 %
 %