diff options
author | Karl Berry <karl@freefriends.org> | 2023-02-23 21:32:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-02-23 21:32:39 +0000 |
commit | 7e2eed42b674c097c9672d1b543f259476cebe9d (patch) | |
tree | e94df160e9cdeded38f7668dd54b0f8af9544dd1 /Master/texmf-dist/tex | |
parent | b2c100d2ba92e126ad3b2f5315259b97b1c608b6 (diff) |
japanese-otf (23feb23) (branch)
git-svn-id: svn://tug.org/texlive/branches/branch2022.final@66102 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/platex/japanese-otf/mlutf.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/japanese-otf/otf.sty | 27 |
2 files changed, 20 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/platex/japanese-otf/mlutf.sty b/Master/texmf-dist/tex/platex/japanese-otf/mlutf.sty index 78a6b2353db..28538d0d285 100644 --- a/Master/texmf-dist/tex/platex/japanese-otf/mlutf.sty +++ b/Master/texmf-dist/tex/platex/japanese-otf/mlutf.sty @@ -1,5 +1,5 @@ \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.27 ttk] +\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.28 ttk] %force catcode of \" be 12 \count@\catcode`\" \catcode`\"=12 diff --git a/Master/texmf-dist/tex/platex/japanese-otf/otf.sty b/Master/texmf-dist/tex/platex/japanese-otf/otf.sty index e302cea8868..27ceb01d0d7 100644 --- a/Master/texmf-dist/tex/platex/japanese-otf/otf.sty +++ b/Master/texmf-dist/tex/platex/japanese-otf/otf.sty @@ -1,7 +1,7 @@ \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{otf}[2022/03/05 TeX JP org, v1.7b8 psitau, u0.27 ttk] +\ProvidesPackage{otf}[2023/02/23 TeX JP org, v1.7b8 psitau, u0.28 ttk] \RequirePackage{keyval} -%for processing options +%for processing options \newif\if@kana \@kanafalse \newif\if@macro \@macrotrue \newif\if@deluxe \@deluxefalse @@ -10,7 +10,6 @@ \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,8 +21,10 @@ \DeclareOption{deluxe}{\@boldfalse\@replacetrue\@deluxetrue} \DeclareOption{multi}{\AtEndOfPackage{\RequirePackage{mlutf}\RequirePackage{mlcid}}} \DeclareOption{burasage}{\@burasagetrue} -\DeclareOption{uplatex}{\@otf@uplatextrue} -\DeclareOption{autodetect-engine}{\@otf@autodetecttrue} +\let\@otf@engine@given=* +\DeclareOption{platex}{\let\@otf@engine@given=p\@otf@uplatexfalse} +\DeclareOption{uplatex}{\let\@otf@engine@given=u\@otf@uplatextrue} +\DeclareOption{autodetect-engine}{\let\@otf@engine@given=*} \DeclareOption{jis2004}{\@newglyphtrue} \DeclareOption*{\otfpkg@setkey} \def\otfpkg@setkey{\expandafter\otfpkg@setkey@a\expandafter{\CurrentOption}} @@ -40,23 +41,33 @@ % Autodetect engine \ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000 %upTeX - \if@otf@autodetect + \ifx *\@otf@engine@given \PackageInfo{otf}{Autodetected engine: upLaTeX} \@otf@uplatextrue \fi + \ifx p\@otf@engine@given + \PackageError{otf} + {Option 'platex' is specified but you are running upLaTeX.} + {\@ehc} + \fi \if@otf@uplatex\else \PackageError{otf} {You are running upLaTeX.\MessageBreak - Please use pLaTeX instead, or add 'uplatex' to\MessageBreak + Please use pLaTeX instead, or remove 'platex' from\MessageBreak the package option list} {\@ehc} \@otf@uplatextrue \fi \else %pTeX - \if@otf@autodetect + \ifx *\@otf@engine@given \PackageInfo{otf}{Autodetected engine: pLaTeX} \@otf@uplatexfalse \fi + \ifx u\@otf@engine@given + \PackageError{otf} + {Option 'uplatex' is specified but you are running pLaTeX.} + {\@ehc} + \fi \if@otf@uplatex \PackageError{otf} {You are running pLaTeX.\MessageBreak |