diff options
author | Karl Berry <karl@freefriends.org> | 2017-07-06 21:26:34 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-07-06 21:26:34 +0000 |
commit | f691078fbf5a14c2afb87e0a2598f0654c4bf8e1 (patch) | |
tree | 7dda89680ea4c6a61c01308a9033c786b2eb8341 /Master/texmf-dist/tex/platex/pxbase/pxbasenc.def | |
parent | 201746f75cb68b0737d5ae9c77c1b4719cb30881 (diff) |
pxbase (6jul17)
git-svn-id: svn://tug.org/texlive/trunk@44756 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex/pxbase/pxbasenc.def')
-rw-r--r-- | Master/texmf-dist/tex/platex/pxbase/pxbasenc.def | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/platex/pxbase/pxbasenc.def b/Master/texmf-dist/tex/platex/pxbase/pxbasenc.def index 64709af2b9c..55f1ac1130d 100644 --- a/Master/texmf-dist/tex/platex/pxbase/pxbasenc.def +++ b/Master/texmf-dist/tex/platex/pxbase/pxbasenc.def @@ -4,7 +4,7 @@ %% file declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesFile{pxbasenc.def}[2017/06/19 v1.1a PX encoding library] +\ProvidesFile{pxbasenc.def}[2017/07/03 v1.1b PX encoding library] \def\pxec@pkgname{PXbase} % bundle name %% code guards @@ -136,7 +136,7 @@ \pxec@starinvoke\pxec@DeclareExtraCJKFamily} \@onlypreamble\pxec@DeclareBasicCJKFamily \def\pxec@DeclareExtraCJKFamily#1#2#3#4{% - \DeclareKanjiFamily{#1}{#2}{}% + \pxDeclareKanjiFamily{#1}{#2}% \pxec@DeclareBasicCJKShape{#1}{#2}{m}{#3}% \pxec@DeclareBasicCJKShape{#1}{#2}{bx}{#4}} @@ -229,6 +229,14 @@ % It should be t except when other values are needed. \let\pxForceFontDeclaration=t +%%<+> \pxDeclareKanjiFamily{<enc>}{<fam>} +\def\pxDeclareKanjiFamily#1#2{% + \expandafter\ifx\csname#1+#2\endcsname\relax + \DeclareKanjiFamily{#1}{#2}{}% + \else\if e\pxForceFontDeclaration + \pxec@error{Font family #1/#2 already defined}\@ehc + \fi\fi} + %%<+> \pxDeclareFontShape{<enc>}{<fam>}{<ser>}{<shape>}{<spec>} \def\pxDeclareFontShape#1#2#3#4#5{% \expandafter\ifx\csname #1/#2/#3/#4\endcsname\relax @@ -308,10 +316,10 @@ \@onlypreamble\pxec@DeclareBasicCJKFamilyNE \def\pxec@DeclareExtraCJKFamilyNE#1#2#3#4#5#6{% \pxBothEncodingsFromName\pxec@y\pxec@t{#1}% - \DeclareKanjiFamily{\pxec@y}{#2}{}% + \pxDeclareKanjiFamily{\pxec@y}{#2}% \pxec@DeclareBasicCJKShape{\pxec@y}{#2}{m}{#3}% \pxec@DeclareBasicCJKShape{\pxec@y}{#2}{bx}{#4}% - \DeclareKanjiFamily{\pxec@t}{#2}{}% + \pxDeclareKanjiFamily{\pxec@t}{#2}% \pxec@supdef\pxec@vm{#5}{#3}\pxec@supdef\pxec@vb{#6}{#4}% \pxec@DeclareBasicCJKShape{\pxec@t}{#2}{m}{\pxec@vm}% \pxec@DeclareBasicCJKShape{\pxec@t}{#2}{bx}{\pxec@vb}} |