summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-02-11 22:41:46 +0000
committerKarl Berry <karl@freefriends.org>2018-02-11 22:41:46 +0000
commit4b2209e5473b671c06eee20488258739a67796ec (patch)
tree5471eba1505a78bf4a25f782bf5aa66890e73e81 /Master/texmf-dist/tex/platex
parentff84279ea895ba7f1be6c8e233b23c168889099f (diff)
japanese-otf-uptex (11feb18)
git-svn-id: svn://tug.org/texlive/trunk@46597 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.sty14
-rw-r--r--Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty99
2 files changed, 74 insertions, 39 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 d978aa57f63..85c262fcfd4 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.18 ttk]
+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.19 ttk]
%force catcode of \" be 12
\count@\catcode`\"
\catcode`\"=12
@@ -45,14 +45,14 @@
\Declare@FontShape{utfk}{bx}{0123456789abcdef}{utfkgr}
\DeclareKanjiFamily{\otf@JYn}{utfc}{}
\DeclareKanjiFamily{\otf@JTn}{utfc}{}
-\Declare@FontShape{utfc}{m}{0123456789abcdefjklmnopqrstuvz}{utfcmr}
-\Declare@FontShape{utfc}{bx}{0123456789abcdefjklmnopqrstuvz}{utfcgr}
+\Declare@FontShape{utfc}{m}{0123456789abcdefklmo}{utfcmr}
+\Declare@FontShape{utfc}{bx}{0123456789abcdefklmo}{utfcgr}
\DeclareKanjiFamily{\otf@JYn}{utft}{}
\DeclareKanjiFamily{\otf@JTn}{utft}{}
-\Declare@FontShape{utft}{m}{0123456789abcdefjklmnopqrstuvz}{utftmr}
-\Declare@FontShape{utft}{bx}{0123456789abcdefjklmnopqrstuvz}{utftgr}
+\Declare@FontShape{utft}{m}{0123456789abcdefklmnopqrstuvwxz}{utftmr}
+\Declare@FontShape{utft}{bx}{0123456789abcdefklmnopqrstuvwxz}{utftgr}
\DeclareKanjiFamily{\otf@JYn}{utf}{}
\DeclareKanjiFamily{\otf@JTn}{utf}{}
-\Declare@FontShape{utf}{m}{0123456789abcdefjklmnopqrstuvz}{utfmr}
-\Declare@FontShape{utf}{bx}{0123456789abcdefjklmnopqrstuvz}{utfgr}
+\Declare@FontShape{utf}{m}{0123456789abcdefjklmnopqrstuvwxyz}{utfmr}
+\Declare@FontShape{utf}{bx}{0123456789abcdefjklmnopqrstuvwxyz}{utfgr}
\endinput
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 fe81bf40f45..203b073fda0 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}[2013/11/17 v1.7b6 psitau, u0.18 ttk]
+\ProvidesPackage{otf}[2018/02/01 v1.7b7 psitau, u0.19 ttk]
\RequirePackage{keyval}
%for processing options
\newif\if@kana \@kanafalse
@@ -10,6 +10,7 @@
\newif\if@burasage \@burasagefalse
\newif\if@newglyph \@newglyphfalse
\newif\if@otf@uplatex \@otf@uplatexfalse
+\newif\if@otf@autodetect \@otf@autodetectfalse
\newif\if@otf@scale \@otf@scalefalse
\newif\if@jsclasses \@jsclassesfalse
@@ -22,6 +23,7 @@
\DeclareOption{multi}{\AtEndOfPackage{\RequirePackage{mlutf}\RequirePackage{mlcid}}}
\DeclareOption{burasage}{\@burasagetrue}
\DeclareOption{uplatex}{\@otf@uplatextrue}
+\DeclareOption{autodetect-engine}{\@otf@autodetecttrue}
\DeclareOption{jis2004}{\@newglyphtrue}
\DeclareOption*{\otfpkg@setkey}
\def\otfpkg@setkey{\expandafter\otfpkg@setkey@a\expandafter{\CurrentOption}}
@@ -30,10 +32,40 @@
\def\otf@JYn{\if@otf@uplatex JY2\else JY1\fi}
\def\otf@JTn{\if@otf@uplatex JT2\else JT1\fi}
+\def\otf@OTorT{\if@otf@uplatex T\else OT\fi}
\def\otf@pfx@{\if@otf@uplatex up\else \fi}
\def\brsg@pfx@{\if@burasage brsg\else\fi}
\def\nlck@sfx@{\if@newglyph n\else\fi}
\ProcessOptions\relax
+
+% Autodetect engine
+\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000 %upTeX
+ \if@otf@autodetect
+ \PackageInfo{otf}{Autodetected engine: upLaTeX}
+ \@otf@uplatextrue
+ \fi
+ \if@otf@uplatex\else
+ \PackageError{otf}
+ {You are running upLaTeX.\MessageBreak
+ Please use pLaTeX instead, or add 'uplatex' to\MessageBreak
+ the package option list}
+ {\@ehc}
+ \@otf@uplatextrue
+ \fi
+\else %pTeX
+ \if@otf@autodetect
+ \PackageInfo{otf}{Autodetected engine: pLaTeX}
+ \@otf@uplatexfalse
+ \fi
+ \if@otf@uplatex
+ \PackageError{otf}
+ {You are running pLaTeX.\MessageBreak
+ Please use upLaTeX instead, or remove 'uplatex' from\MessageBreak
+ the package option list}
+ {\@ehc}
+ \@otf@uplatexfalse
+ \fi
+\fi
%user interface
%force catcode of \" be 12
\count@\catcode`\"
@@ -239,10 +271,13 @@
\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
+ \@ifundefined{Cjascale}{%
+ %for jsclasses
+ \@ifclassloaded{jsreport}{\@jsclassestrue}{}
+ \@ifclassloaded{jsarticle}{\@jsclassestrue}{}
+ \@ifclassloaded{jsbook}{\@jsclassestrue}{}
+ \if@jsclasses\def\utf@sc@le{0.92469}\else\def\utf@sc@le{0.962216}\fi
+ }{\edef\utf@sc@le{\Cjascale}}
\fi
%definitions of alt-normal font family
\@ifundefined{if@enablejfam}{%
@@ -258,20 +293,20 @@
\DeclareKanjiFamily{\otf@JTn}{hmc}{}
\DeclareKanjiFamily{\otf@JYn}{hgt}{}
\DeclareKanjiFamily{\otf@JTn}{hgt}{}
- \DeclareRelationFont{\otf@JYn}{hmc}{m}{}{OT1}{cmr}{m}{}
- \DeclareRelationFont{\otf@JTn}{hmc}{m}{}{OT1}{cmr}{m}{}
- \DeclareRelationFont{\otf@JYn}{hmc}{bx}{}{OT1}{cmr}{bx}{}
- \DeclareRelationFont{\otf@JTn}{hmc}{bx}{}{OT1}{cmr}{bx}{}
+ \DeclareRelationFont{\otf@JYn}{hmc}{m}{}{\otf@OTorT1}{cmr}{m}{}
+ \DeclareRelationFont{\otf@JTn}{hmc}{m}{}{\otf@OTorT1}{cmr}{m}{}
+ \DeclareRelationFont{\otf@JYn}{hmc}{bx}{}{\otf@OTorT1}{cmr}{bx}{}
+ \DeclareRelationFont{\otf@JTn}{hmc}{bx}{}{\otf@OTorT1}{cmr}{bx}{}
\if@deluxe
- \DeclareRelationFont{\otf@JYn}{hgt}{m}{}{OT1}{cmss}{m}{}
- \DeclareRelationFont{\otf@JTn}{hgt}{m}{}{OT1}{cmss}{m}{}
- \DeclareRelationFont{\otf@JYn}{hgt}{bx}{}{OT1}{cmss}{bx}{}
- \DeclareRelationFont{\otf@JTn}{hgt}{bx}{}{OT1}{cmss}{bx}{}
+ \DeclareRelationFont{\otf@JYn}{hgt}{m}{}{\otf@OTorT1}{cmss}{m}{}
+ \DeclareRelationFont{\otf@JTn}{hgt}{m}{}{\otf@OTorT1}{cmss}{m}{}
+ \DeclareRelationFont{\otf@JYn}{hgt}{bx}{}{\otf@OTorT1}{cmss}{bx}{}
+ \DeclareRelationFont{\otf@JTn}{hgt}{bx}{}{\otf@OTorT1}{cmss}{bx}{}
\else
- \DeclareRelationFont{\otf@JYn}{hgt}{m}{}{OT1}{cmr}{bx}{}
- \DeclareRelationFont{\otf@JTn}{hgt}{m}{}{OT1}{cmr}{bx}{}
- \DeclareRelationFont{\otf@JYn}{hgt}{bx}{}{OT1}{cmr}{bx}{}
- \DeclareRelationFont{\otf@JTn}{hgt}{bx}{}{OT1}{cmr}{bx}{}
+ \DeclareRelationFont{\otf@JYn}{hgt}{m}{}{\otf@OTorT1}{cmr}{bx}{}
+ \DeclareRelationFont{\otf@JTn}{hgt}{m}{}{\otf@OTorT1}{cmr}{bx}{}
+ \DeclareRelationFont{\otf@JYn}{hgt}{bx}{}{\otf@OTorT1}{cmr}{bx}{}
+ \DeclareRelationFont{\otf@JTn}{hgt}{bx}{}{\otf@OTorT1}{cmr}{bx}{}
\fi
\@ifpackageloaded{jisx0213}{\relax}{\def\mcdefault{hmc}\def\gtdefault{hgt}}
\if@jfam@used
@@ -292,8 +327,8 @@
\if@deluxe
\DeclareKanjiFamily{\otf@JYn}{rubyg}{}
\DeclareKanjiFamily{\otf@JTn}{rubyg}{}
- \DeclareRelationFont{\otf@JYn}{rubyg}{m}{}{OT1}{cmss}{m}{}
- \DeclareRelationFont{\otf@JTn}{rubyg}{m}{}{OT1}{cmss}{m}{}
+ \DeclareRelationFont{\otf@JYn}{rubyg}{m}{}{\otf@OTorT1}{cmss}{m}{}
+ \DeclareRelationFont{\otf@JTn}{rubyg}{m}{}{\otf@OTorT1}{cmss}{m}{}
\DeclareRobustCommand\rubyfamily{\edef\reserved@a{\gtdefault}%
\edef\reserved@b{\mgdefault}%
\ifx\k@family\reserved@a \kanjifamily{rubyg}\else\ifx\k@family\reserved@b
@@ -375,16 +410,16 @@
\def\ltdefault{l}
\DeclareKanjiFamily{\otf@JYn}{mg}{}
\DeclareKanjiFamily{\otf@JTn}{mg}{}
- \DeclareRelationFont{\otf@JYn}{mg}{m}{}{OT1}{cmss}{m}{}
- \DeclareRelationFont{\otf@JTn}{mg}{m}{}{OT1}{cmss}{m}{}
+ \DeclareRelationFont{\otf@JYn}{mg}{m}{}{\otf@OTorT1}{cmss}{m}{}
+ \DeclareRelationFont{\otf@JTn}{mg}{m}{}{\otf@OTorT1}{cmss}{m}{}
\DeclareMathAlphabet{\mathmg}{\otf@JYn}{mg}{m}{n}
\DeclareRobustCommand\mgfamily{\not@math@alphabet\mgfamily\mathmg%
\kanjifamily\mgdefault\selectfont}
\DeclareTextFontCommand{\textmg}{\mgfamily}
\DeclareKanjiFamily{\otf@JYn}{rubymg}{}
\DeclareKanjiFamily{\otf@JTn}{rubymg}{}
- \DeclareRelationFont{\otf@JYn}{rubymg}{m}{}{OT1}{cmss}{m}{}
- \DeclareRelationFont{\otf@JTn}{rubymg}{m}{}{OT1}{cmss}{m}{}
+ \DeclareRelationFont{\otf@JYn}{rubymg}{m}{}{\otf@OTorT1}{cmss}{m}{}
+ \DeclareRelationFont{\otf@JTn}{rubymg}{m}{}{\otf@OTorT1}{cmss}{m}{}
\DeclareRobustCommand\propshape
{\not@math@alphabet\propshape\relax
\kanjishape\propdefault\selectfont}
@@ -429,36 +464,36 @@
\DeclareKanjiFamily{\otf@JTn}{utfj}{}
\DeclareKanjiFamily{\otf@JYn}{cidj}{}
\DeclareKanjiFamily{\otf@JTn}{cidj}{}
-\Declare@FontShape{utfj}{m}{0123456789abcdefjklmnopqrstuvz}{utfjmr\nlck@sfx@}
+\Declare@FontShape{utfj}{m}{0123456789abcdefjklmnopqrstuvxyz}{utfjmr\nlck@sfx@}
\Declare@FontShape{cidj}{m}{012345}{cidjmr}
%definition of other utf/cid fonts
\if@deluxe
- \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjmb\nlck@sfx@}
+ \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz}{utfjmb\nlck@sfx@}
\Declare@FontShape{cidj}{bx}{012345}{cidjmb}
\DeclareKanjiFamily{\otf@JYn}{utfjg}{}
\DeclareKanjiFamily{\otf@JTn}{utfjg}{}
\DeclareKanjiFamily{\otf@JYn}{cidjg}{}
\DeclareKanjiFamily{\otf@JTn}{cidjg}{}
- \Declare@FontShape{utfjg}{m}{0123456789abcdefjklmnopqrstuvz}{utfjgr\nlck@sfx@}
+ \Declare@FontShape{utfjg}{m}{0123456789abcdefjklmnopqrstuvxyz}{utfjgr\nlck@sfx@}
\Declare@FontShape{cidjg}{m}{012345}{cidjgr}
- \Declare@FontShape{utfjg}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@}
+ \Declare@FontShape{utfjg}{bx}{0123456789abcdefjklmnopqrstuvxyz}{utfjgb\nlck@sfx@}
\Declare@FontShape{cidjg}{bx}{012345}{cidjgb}
- \Declare@FontShape{utfjg}{eb}{0123456789abcdefjklmnopqrstuvz}{utfjge\nlck@sfx@}
+ \Declare@FontShape{utfjg}{eb}{0123456789abcdefjklmnopqrstuvxyz}{utfjge\nlck@sfx@}
\Declare@FontShape{cidjg}{eb}{012345}{cidjge}
\DeclareKanjiFamily{\otf@JYn}{utfjmg}{}
\DeclareKanjiFamily{\otf@JTn}{utfjmg}{}
\DeclareKanjiFamily{\otf@JYn}{cidjmg}{}
\DeclareKanjiFamily{\otf@JTn}{cidjmg}{}
- \Declare@FontShape{utfjmg}{m}{0123456789abcdefjklmnopqrstuvz}{utfjmgr\nlck@sfx@}
+ \Declare@FontShape{utfjmg}{m}{0123456789abcdefjklmnopqrstuvxyz}{utfjmgr\nlck@sfx@}
\Declare@FontShape{cidjmg}{m}{012345}{cidjmgr}
- \Declare@FontShape{utfj}{l}{0123456789abcdefjklmnopqrstuvz}{utfjml\nlck@sfx@}
+ \Declare@FontShape{utfj}{l}{0123456789abcdefjklmnopqrstuvxyz}{utfjml\nlck@sfx@}
\Declare@FontShape{cidj}{l}{012345}{cidjml}
\else
\if@bold
- \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@}
+ \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz}{utfjgb\nlck@sfx@}
\Declare@FontShape{cidj}{bx}{012345}{cidjgb}
\else
- \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgr\nlck@sfx@}
+ \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz}{utfjgr\nlck@sfx@}
\Declare@FontShape{cidj}{bx}{012345}{cidjgr}
\fi
\fi