fixjfm (24mar18)

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

4 files changed, 30 insertions, 6 deletions

diff --git a/Master/texmf-dist/doc/generic/fixjfm/README b/Master/texmf-dist/doc/generic/fixjfm/README
index e68c5b5aaa6..3b68f21c0b5 100644
--- a/Master/texmf-dist/doc/generic/fixjfm/README
+++ b/Master/texmf-dist/doc/generic/fixjfm/README
@@ -6,9 +6,9 @@ CTAN Homepage: https://ctan.org/pkg/fixjfm
 
 Repository: https://github.com/Man-Ting-Fang/fixjfm
 
-Version: 2017-12-27 v0.7
+Version: 2018-03-24 v0.8
 
-Copyright 2017 Yue ZHANG
+Copyright 2017--2018 Yue ZHANG
 
 License: Knuth License (https://ctan.org/license/knuth)
 
diff --git a/Master/texmf-dist/doc/generic/fixjfm/fixjfm-doc.pdf b/Master/texmf-dist/doc/generic/fixjfm/fixjfm-doc.pdf
index 045fc18f29e..43147b99de9 100644
--- a/Master/texmf-dist/doc/generic/fixjfm/fixjfm-doc.pdf
+++ b/Master/texmf-dist/doc/generic/fixjfm/fixjfm-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/fixjfm/fixjfm-doc.tex b/Master/texmf-dist/doc/generic/fixjfm/fixjfm-doc.tex
index 3f48bbc1ae5..d52f8367212 100644
--- a/Master/texmf-dist/doc/generic/fixjfm/fixjfm-doc.tex
+++ b/Master/texmf-dist/doc/generic/fixjfm/fixjfm-doc.tex
@@ -80,7 +80,7 @@
   \thanks{CTAN Homepage: \texttt{https://ctan.org/pkg/fixjfm}}
   \thanks{Repository: \texttt{https://github.com/Man-Ting-Fang/fixjfm}}}
 \author{Yue \textsc{Zhang}}
-\date{2017-12-27\quad v0.7}
+\date{2018-03-24\quad v0.8}
 
 \maketitle
 
@@ -249,7 +249,16 @@ and \verb|\textgt| is similar. In contrast,
     \DeclareStandardCJKTextFontCommand
 \end{verbatim}
 (re)defines a CJK text font command like the standard version of \verb|\textmc|
-and \verb|\textgt|.
+and \verb|\textgt|. But there is a more convenient way: Suppose that you have a
+new CJK text font command \verb|\xyfamily|, then
+\begin{verbatim}
+    \AppendToUseXCJKTextFontCommands{\textxy}{\xyfamily}
+\end{verbatim}
+will do all you need and makes \verb|\Use...CJKTextFontCommands| also apply to
+\verb|\textxy|. This command and \verb|\Use...CJKTextFontCommands| can be given
+in any order, so you do not need to redeclare
+\verb|\UseFixJFMCJKTextFontCommands| (which is the default behaviour) if that is
+what you want.
 
 Finally, there are several macros that may be useful for \TeX nicians:
 \begin{verbatim}
@@ -340,4 +349,8 @@ Thanks to Hironobu Yamashita for suggesting all these changes:
   \verb|\ifUseStandardCJKTextFontCommands|.
 \end{history}
 
+\begin{history}{2018-03-24 v0.8}
+\item Add \verb|\AppendToUseXCJKTextFontCommands|.
+\end{history}
+
 \end{document}
diff --git a/Master/texmf-dist/tex/generic/fixjfm/fixjfm.sty b/Master/texmf-dist/tex/generic/fixjfm/fixjfm.sty
index fccfa52e0a2..11887daafca 100644
--- a/Master/texmf-dist/tex/generic/fixjfm/fixjfm.sty
+++ b/Master/texmf-dist/tex/generic/fixjfm/fixjfm.sty
@@ -1,7 +1,7 @@
 
 
 % fixjfm.sty
-% Copyright 2017 Yue ZHANG
+% Copyright 2017--2018 Yue ZHANG
 % License: Knuth License (https://ctan.org/license/knuth)
 
 \csname ENDINPUTFIXJFMDOTSTY\endcsname
@@ -11,7 +11,7 @@
 \begingroup\expandafter\expandafter\expandafter\endgroup
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
   \else
-    \ProvidesPackage{fixjfm}[2017/12/27 v0.7 Fix JFM (for *pTeX)]%
+    \ProvidesPackage{fixjfm}[2018/03/24 v0.8 Fix JFM (for *pTeX)]%
   \fi
 
 \edef\FIXJFMDOTSTYRESTORECATCODE{\catcode`\noexpand\@=\the\catcode`\@\relax}
@@ -192,6 +192,7 @@
     \def\DeclareStandardCJKTextFontCommand#1#2{}%
     \let\UseFixJFMCJKTextFontCommands=\fixjfm@empty
     \let\UseStandardCJKTextFontCommands=\fixjfm@empty
+    \def\AppendToUseXCJKTextFontCommands#1#2{}%
   \else
     \def\DeclareFixJFMCJKTextFontCommand#1#2{%
       \DeclareRobustCommand#1[1]{%
@@ -210,6 +211,16 @@
       \UseFixJFMCJKTextFontCommandsfalse
       \DeclareStandardCJKTextFontCommand\textmc{\mcfamily}%
       \DeclareStandardCJKTextFontCommand\textgt{\gtfamily}}%
+    \def\AppendToUseXCJKTextFontCommands#1#2{%
+      \g@addto@macro\UseFixJFMCJKTextFontCommands{%
+        \DeclareFixJFMCJKTextFontCommand#1{#2}}%
+      \g@addto@macro\UseStandardCJKTextFontCommands{%
+        \DeclareStandardCJKTextFontCommand#1{#2}}%
+      \ifUseFixJFMCJKTextFontCommands
+        \DeclareFixJFMCJKTextFontCommand#1{#2}%
+      \else
+        \DeclareStandardCJKTextFontCommand#1{#2}%
+      \fi}%
     \UseFixJFMCJKTextFontCommands
   \fi