summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-11-27 22:23:00 +0000
committerKarl Berry <karl@freefriends.org>2013-11-27 22:23:00 +0000
commit04dbd87044210791fa8fecaa3c7254779add856b (patch)
tree72352dcea6056ced27bae3127f61eb2d8aeff06b /Master/texmf-dist/tex/platex
parentd24b893b0eb0daa12507892704e043964dcc73fb (diff)
japanese-otf-uptex (27nov13)
git-svn-id: svn://tug.org/texlive/trunk@32255 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex')
-rw-r--r--Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty2
-rw-r--r--Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty50
2 files changed, 31 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty b/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty
index 077153c39f9..f41f813ad6f 100644
--- a/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty
+++ b/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.12 ttk]
+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.13 ttk]
%force catcode of \" be 12
\count@\catcode`\"
\catcode`\"=12
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 1e6a0faf9a9..3834fe48458 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,6 @@
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{otf}[2012/04/11 v1.7b5 psitau, u0.12 ttk]
+\ProvidesPackage{otf}[2013/11/17 v1.7b6 psitau, u0.13 ttk]
+\RequirePackage{keyval}
%for processing options
\newif\if@kana \@kanafalse
\newif\if@macro \@macrotrue
@@ -9,6 +10,9 @@
\newif\if@burasage \@burasagefalse
\newif\if@newglyph \@newglyphfalse
\newif\if@otf@uplatex \@otf@uplatexfalse
+\newif\if@otf@scale \@otf@scalefalse
+\newif\if@jsclasses \@jsclassesfalse
+
\DeclareOption{nomacro}{\@macrofalse}
\DeclareOption{nomacros}{\@macrofalse}
\DeclareOption{noreplace}{\@replacefalse}
@@ -19,6 +23,11 @@
\DeclareOption{burasage}{\@burasagetrue}
\DeclareOption{uplatex}{\@otf@uplatextrue}
\DeclareOption{jis2004}{\@newglyphtrue}
+\DeclareOption*{\otfpkg@setkey}
+\def\otfpkg@setkey{\expandafter\otfpkg@setkey@a\expandafter{\CurrentOption}}
+\def\otfpkg@setkey@a{\setkeys{otfpkg}}
+\define@key{otfpkg}{scale}{\@otf@scaletrue\def\utf@sc@le{#1}}
+
\def\otf@JYn{\if@otf@uplatex JY2\else JY1\fi}
\def\otf@JTn{\if@otf@uplatex JT2\else JT1\fi}
\def\otf@pfx@{\if@otf@uplatex up\else \fi}
@@ -227,17 +236,15 @@
\DeclareFontShape{#1}{#2}{#3}{#6}{<->s*[\utf@sc@le]#4#6-#5}{}%
\Declare@FontShape@Enc{#1}{#2}{#3}{#4}{#5}\fi}
\def\Declare@FontShape@Enc#1\fi{\fi\Declare@FontShapeEnc#1}
-%for jsclasses
-\newif\if@jsclasses \@jsclassesfalse
-\@ifclassloaded{jsarticle}{\@jsclassestrue}{}
-\@ifclassloaded{jsbook}{\@jsclassestrue}{}
-\if@jsclasses\def\utf@sc@le{0.92469}\else\def\utf@sc@le{0.962216}\fi
+\if@otf@scale
+ \relax
+\else
+ %for jsclasses
+ \@ifclassloaded{jsarticle}{\@jsclassestrue}{}
+ \@ifclassloaded{jsbook}{\@jsclassestrue}{}
+ \if@jsclasses\def\utf@sc@le{0.92469}\else\def\utf@sc@le{0.962216}\fi
+\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}
@@ -262,16 +269,19 @@
\DeclareRelationFont{\otf@JTn}{hgt}{bx}{}{OT1}{cmr}{bx}{}
\fi
\@ifpackageloaded{jisx0213}{\relax}{\def\mcdefault{hmc}\def\gtdefault{hgt}}
- \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
+ \@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
\fi
- \fi
+ }
\fi
\if@kana
\DeclareKanjiFamily{\otf@JYn}{ruby}{}