From 64a86b6f5f34949239097b2846e6f1867b95e651 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 25 Mar 2018 21:27:41 +0000 Subject: fixjfm (24mar18) git-svn-id: svn://tug.org/texlive/trunk@47113 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/fixjfm/fixjfm.sty | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'Master/texmf-dist/tex/generic/fixjfm') 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 -- cgit v1.2.3