fixjfm (27dec17)

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

4 files changed, 22 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/generic/fixjfm/README.txt b/Master/texmf-dist/doc/generic/fixjfm/README
index 2f0b4d90efb..e68c5b5aaa6 100644
--- a/Master/texmf-dist/doc/generic/fixjfm/README.txt
+++ b/Master/texmf-dist/doc/generic/fixjfm/README
@@ -6,7 +6,7 @@ CTAN Homepage: https://ctan.org/pkg/fixjfm
 
 Repository: https://github.com/Man-Ting-Fang/fixjfm
 
-Version: 2017-09-21 v0.6
+Version: 2017-12-27 v0.7
 
 Copyright 2017 Yue ZHANG
 
diff --git a/Master/texmf-dist/doc/generic/fixjfm/fixjfm-doc.pdf b/Master/texmf-dist/doc/generic/fixjfm/fixjfm-doc.pdf
index 2f279032ba9..045fc18f29e 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 bd591acb947..3f48bbc1ae5 100644
--- a/Master/texmf-dist/doc/generic/fixjfm/fixjfm-doc.tex
+++ b/Master/texmf-dist/doc/generic/fixjfm/fixjfm-doc.tex
@@ -19,6 +19,8 @@
 
 \AtBeginEnvironment{verbatim}{\microtypesetup{activate=false}}
 
+\abovetopsep=\medskipamount
+
 \newcommand\NormalSans{\normalfont\sffamily}
 \newcommand\pkg[1]{{\protect\NormalSans#1}}
 
@@ -69,7 +71,7 @@
 \font\sans=SourceSansPro-Semibold-tlf-ot1 at 10pt
 
 \newenvironment{history}[1]%
-  {\noindent\textbf{#1}\begin{itemize}}%
+  {\noindent\textbf{#1}\nopagebreak\relax\begin{itemize}}%
   {\end{itemize}}
 
 \begin{document}
@@ -78,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-09-21\quad v0.6}
+\date{2017-12-27\quad v0.7}
 
 \maketitle
 
@@ -98,18 +100,17 @@ there are still at least two bugs:
 \item Bug 2: the spacing between two consecutive fullwidth punctuation marks
   cannot be adjusted if the font is changed there, see Table \ref{tab:adj}.
 \end{itemize}
-\begin{figure}[ht]\centering
+\begin{figure}[!ht]\centering
 \demotext{3}\demotext{2.5}
 \caption{Comparison of the indentation produced without this package (left) and
   with this package (right)}
 \label{fig:ind}
 \end{figure}
 \vskip-20pt\relax
-\begin{table}[ht]\centering
+\begin{table}[!ht]\centering
 \caption{Comparison of the adjustment of the spacing between two consecutive
   fullwidth punctuation marks}
 \label{tab:adj}
-\medskip
 \begin{tabular}{ccll}
 \toprule
 Font change & This package        & Input          & Output                  \\
@@ -257,6 +258,8 @@ Finally, there are several macros that may be useful for \TeX nicians:
     \FixJFMParindent
     \EveryparPreHook
     \EveryparPostHook
+    \ifUseFixJFMCJKTextFontCommands
+    \ifUseStandardCJKTextFontCommands
 \end{verbatim}
 They are worthless for ordinary use. If you are interested in them, please have
 a look at the source code.
@@ -332,4 +335,9 @@ Thanks to Hironobu Yamashita for suggesting all these changes:
     https://github.com/Man-Ting-Fang/fixjfm/pull/4
 \end{verbatim}
 
+\begin{history}{2017-12-27 v0.7}
+\item Add \verb|\ifUseFixJFMCJKTextFontCommands| and
+  \verb|\ifUseStandardCJKTextFontCommands|.
+\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 08e6f6f3d5b..fccfa52e0a2 100644
--- a/Master/texmf-dist/tex/generic/fixjfm/fixjfm.sty
+++ b/Master/texmf-dist/tex/generic/fixjfm/fixjfm.sty
@@ -11,7 +11,7 @@
 \begingroup\expandafter\expandafter\expandafter\endgroup
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
   \else
-    \ProvidesPackage{fixjfm}[2017/09/21 v0.6 Fix JFM (for *pTeX)]%
+    \ProvidesPackage{fixjfm}[2017/12/27 v0.7 Fix JFM (for *pTeX)]%
   \fi
 
 \edef\FIXJFMDOTSTYRESTORECATCODE{\catcode`\noexpand\@=\the\catcode`\@\relax}
@@ -183,6 +183,9 @@
   \def\SetFixJFMSpacingShrink#1{}%
 \fi
 
+\newif\ifUseFixJFMCJKTextFontCommands
+\newif\ifUseStandardCJKTextFontCommands
+
 \begingroup\expandafter\expandafter\expandafter\endgroup
   \expandafter\ifx\csname DeclareTextFontCommand\endcsname\relax
     \def\DeclareFixJFMCJKTextFontCommand#1#2{}%
@@ -198,9 +201,13 @@
       \DeclareRobustCommand#1[1]{%
         \relax\ifmmode\expandafter\nfss@text\fi{#2##1}}}%
     \def\UseFixJFMCJKTextFontCommands{%
+      \UseFixJFMCJKTextFontCommandstrue
+      \UseStandardCJKTextFontCommandsfalse
       \DeclareFixJFMCJKTextFontCommand\textmc{\mcfamily}%
       \DeclareFixJFMCJKTextFontCommand\textgt{\gtfamily}}%
     \def\UseStandardCJKTextFontCommands{%
+      \UseStandardCJKTextFontCommandstrue
+      \UseFixJFMCJKTextFontCommandsfalse
       \DeclareStandardCJKTextFontCommand\textmc{\mcfamily}%
       \DeclareStandardCJKTextFontCommand\textgt{\gtfamily}}%
     \UseFixJFMCJKTextFontCommands