diff options
| author | Karl Berry <karl@freefriends.org> | 2017-09-04 21:44:37 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-09-04 21:44:37 +0000 |
| commit | bcda35605553f3c49a16e9ebfafe378c4e270c2a (patch) | |
| tree | 1d1c7c1d9c49c988b5302fe204308929833913e2 /Master/texmf-dist/tex/generic/fixjfm | |
| parent | 8df9c434780b2d6ba9b711f34b8213416cdabe6c (diff) | |
fixjfm (4sep17)
git-svn-id: svn://tug.org/texlive/trunk@45212 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/fixjfm')
| -rw-r--r-- | Master/texmf-dist/tex/generic/fixjfm/fixjfm.sty | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/generic/fixjfm/fixjfm.sty b/Master/texmf-dist/tex/generic/fixjfm/fixjfm.sty index 02cd455fc7b..c4921fcfead 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/02 v0.2 Fix JFM (for *pTeX)]% + \ProvidesPackage{fixjfm}[2017/09/04 v0.4 Fix JFM (for *pTeX)]% \fi \edef\FIXJFMDOTSTYRESTORECATCODE{\catcode`\noexpand\@=\the\catcode`\@\relax} @@ -99,21 +99,23 @@ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname DeclareTextFontCommand\endcsname\relax \def\DeclareFixJFMCJKTextFontCommand#1#2{}% + \def\DeclareStandardCJKTextFontCommand#1#2{}% \let\UseFixJFMCJKTextFontCommands=\fixjfm@empty \let\UseStandardCJKTextFontCommands=\fixjfm@empty \else \def\DeclareFixJFMCJKTextFontCommand#1#2{% \DeclareRobustCommand#1[1]{% - \relax\ifmmode\nfss@text\fi{#2\fixjfmspacing##1}\fixjfmspacing}}% + \relax\ifmmode\expandafter\nfss@text\fi + {#2\fixjfmspacing##1}\fixjfmspacing}}% + \def\DeclareStandardCJKTextFontCommand#1#2{% + \DeclareRobustCommand#1[1]{% + \relax\ifmmode\expandafter\nfss@text\fi{#2##1}}}% \def\UseFixJFMCJKTextFontCommands{% \DeclareFixJFMCJKTextFontCommand\textmc{\mcfamily}% \DeclareFixJFMCJKTextFontCommand\textgt{\gtfamily}}% \def\UseStandardCJKTextFontCommands{% - \DeclareTextFontCommand\textmc{\mcfamily}% - \DeclareTextFontCommand\textgt{\gtfamily}}% - \@onlypreamble\DeclareFixJFMCJKTextFontCommand - \@onlypreamble\UseFixJFMCJKTextFontCommands - \@onlypreamble\UseStandardCJKTextFontCommands + \DeclareStandardCJKTextFontCommand\textmc{\mcfamily}% + \DeclareStandardCJKTextFontCommand\textgt{\gtfamily}}% \UseFixJFMCJKTextFontCommands \fi |