From f0bb6f0e87cde9bf981b1c104388d3931c934e74 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 11 Apr 2012 06:22:55 +0000 Subject: update otf.sty for new 1.7b5 otf package git-svn-id: svn://tug.org/texlive/trunk@25912 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/platex/japanese-otf-uptex/otf.sty | 28 ++++++++++++---------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'Master/texmf-dist/tex/platex') diff --git a/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty b/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty index ec805a18689..022322437aa 100644 --- a/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty +++ b/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty @@ -1,5 +1,5 @@ \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{otf}[2010/03/25 v1.7b1 psitau, u0.09 ttk] +\ProvidesPackage{otf}[2012/04/11 v1.7b5 psitau, u0.09 ttk] %for processing options \newif\if@kana \@kanafalse \newif\if@macro \@macrotrue @@ -100,6 +100,11 @@ \@ifclassloaded{jsbook}{\@jsclassestrue}{} \if@jsclasses\def\utf@sc@le{0.92469}\else\def\utf@sc@le{0.962216}\fi %definitions of alt-normal font family +\@ifundefined{if@enablejfam}{% + \let\if@jfam@used\iffalse +}{% + \let\if@jfam@used\if@enablejfam +} \if@replace \DeclareErrorKanjiFont{\otf@JYn}{hmc}{m}{n}{10} \DeclareKanjiSubstitution{\otf@JYn}{hmc}{m}{n} @@ -124,19 +129,16 @@ \DeclareRelationFont{\otf@JTn}{hgt}{bx}{}{OT1}{cmr}{bx}{} \fi \@ifpackageloaded{jisx0213}{\relax}{\def\mcdefault{hmc}\def\gtdefault{hgt}} - \@ifundefined{if@enablejfam}{%if disablejfam option is not available, do nothing. - }{% - \if@enablejfam - \if@compatibility\else - \DeclareSymbolFont{mincho}{\otf@JYn}{hmc}{m}{n} - \DeclareSymbolFontAlphabet{\mathmc}{mincho} - \SetSymbolFont{mincho}{bold}{\otf@JYn}{hmc}{bx}{n} - \DeclareMathAlphabet{\mathgt}{\otf@JYn}{hgt}{m}{n} - \SetMathAlphabet{\mathgt}{bold}{\otf@JYn}{hgt}{bx}{n} - \jfam\symmincho - \fi + \if@jfam@used + \if@compatibility\else + \DeclareSymbolFont{mincho}{\otf@JYn}{hmc}{m}{n} + \DeclareSymbolFontAlphabet{\mathmc}{mincho} + \SetSymbolFont{mincho}{bold}{\otf@JYn}{hmc}{bx}{n} + \DeclareMathAlphabet{\mathgt}{\otf@JYn}{hgt}{m}{n} + \SetMathAlphabet{\mathgt}{bold}{\otf@JYn}{hgt}{bx}{n} + \jfam\symmincho \fi - } + \fi \fi \if@kana \DeclareKanjiFamily{\otf@JYn}{ruby}{} -- cgit v1.2.3