From 5622d8475184e19eaec3342dc3b3362f1f1e04c8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 14 Nov 2020 22:15:20 +0000 Subject: japanese-otf-uptex (14nov20) git-svn-id: svn://tug.org/texlive/trunk@56932 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/platex/japanese-otf-uptex/mlutf.sty | 134 +++++++++++++++++---- .../tex/platex/japanese-otf-uptex/otf.sty | 34 ++++-- 2 files changed, 133 insertions(+), 35 deletions(-) (limited to 'Master/texmf-dist/tex/platex') 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 cf6a7e7b03e..79d0a61c91f 100644 --- a/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty +++ b/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty @@ -1,23 +1,65 @@ \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.25 ttk] +\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.26 ttk] %force catcode of \" be 12 \count@\catcode`\" \catcode`\"=12 -\DeclareRobustCommand{\UTFK}[1]{\begingroup% - \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% - \kanjifamily{utfk}\uppercase{\set@character="#1}% - \endgroup% -} -\DeclareRobustCommand{\UTFC}[1]{\begingroup% - \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% - \kanjifamily{utfc}\uppercase{\set@character="#1}% - \endgroup% -} -\DeclareRobustCommand{\UTFT}[1]{\begingroup% - \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% - \kanjifamily{utft}\uppercase{\set@character="#1}% - \endgroup% -} +\if@otf@uplatex +\if@deluxe + \DeclareRobustCommand{\UTFK}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}% + \ifx\k@family\reserved@a \kanjifamily{utfkg}\else\ifx\k@family\reserved@b + \kanjifamily{utfkmg}\else\kanjifamily{utfk}\fi\fi% + \uppercase{\set@character@="#1}% + \endgroup% + } + \DeclareRobustCommand{\UTFC}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}% + \ifx\k@family\reserved@a \kanjifamily{utfcg}\else\ifx\k@family\reserved@b + \kanjifamily{utfcmg}\else\kanjifamily{utfc}\fi\fi% + \uppercase{\set@character@="#1}% + \endgroup% + } + \DeclareRobustCommand{\UTFT}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}% + \ifx\k@family\reserved@a \kanjifamily{utftg}\else\ifx\k@family\reserved@b + \kanjifamily{utftmg}\else\kanjifamily{utft}\fi\fi% + \uppercase{\set@character@="#1}% + \endgroup% + } +\else + \DeclareRobustCommand{\UTFK}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% + \kanjifamily{utfk}\uppercase{\set@character@="#1}% + \endgroup% + } + \DeclareRobustCommand{\UTFC}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% + \kanjifamily{utfc}\uppercase{\set@character@="#1}% + \endgroup% + } + \DeclareRobustCommand{\UTFT}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% + \kanjifamily{utft}\uppercase{\set@character@="#1}% + \endgroup% + } +\fi +\else% for pLaTeX + \DeclareRobustCommand{\UTFK}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% + \kanjifamily{utfk}\uppercase{\set@character="#1}% + \endgroup% + } + \DeclareRobustCommand{\UTFC}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% + \kanjifamily{utfc}\uppercase{\set@character="#1}% + \endgroup% + } + \DeclareRobustCommand{\UTFT}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% + \kanjifamily{utft}\uppercase{\set@character="#1}% + \endgroup% + } +\fi \DeclareRobustCommand{\UTFM}[1]{\begingroup% \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% \kanjifamily{utf}\uppercase{\set@character="#1}% @@ -41,16 +83,64 @@ \DeclareKanjiFamily{\otf@JYn}{utfk}{} \DeclareKanjiFamily{\otf@JTn}{utfk}{} -\Declare@FontShape{utfk}{m}{0123456789abcdef}{utfkmr} -\Declare@FontShape{utfk}{bx}{0123456789abcdef}{utfkgr} \DeclareKanjiFamily{\otf@JYn}{utfc}{} \DeclareKanjiFamily{\otf@JTn}{utfc}{} -\Declare@FontShape{utfc}{m}{0123456789abcdefklmo}{utfcmr} -\Declare@FontShape{utfc}{bx}{0123456789abcdefklmo}{utfcgr} \DeclareKanjiFamily{\otf@JYn}{utft}{} \DeclareKanjiFamily{\otf@JTn}{utft}{} -\Declare@FontShape{utft}{m}{0123456789abcdefklmnopqrstuvwxz}{utftmr} -\Declare@FontShape{utft}{bx}{0123456789abcdefklmnopqrstuvwxz}{utftgr} +\if@otf@uplatex + \Declare@FontShape{utfk}{m}{-}{utfkmr} + \Declare@FontShape{utfc}{m}{-}{utfcmr} + \Declare@FontShape{utft}{m}{-}{utftmr} + \if@deluxe + \Declare@FontShape{utfk}{bx}{-}{utfkmb} + \DeclareKanjiFamily{\otf@JYn}{utfkg}{} + \DeclareKanjiFamily{\otf@JTn}{utfkg}{} + \Declare@FontShape{utfkg}{m}{-}{utfkgr} + \Declare@FontShape{utfkg}{bx}{-}{utfkgb} + \Declare@FontShape{utfkg}{eb}{-}{utfkge} + \DeclareKanjiFamily{\otf@JYn}{utfkmg}{} + \DeclareKanjiFamily{\otf@JTn}{utfkmg}{} + \Declare@FontShape{utfkmg}{m}{-}{utfkmgr} + \Declare@FontShape{utfk}{l}{-}{utfkml} + \Declare@FontShape{utfc}{bx}{-}{utfcmb} + \DeclareKanjiFamily{\otf@JYn}{utfcg}{} + \DeclareKanjiFamily{\otf@JTn}{utfcg}{} + \Declare@FontShape{utfcg}{m}{-}{utfcgr} + \Declare@FontShape{utfcg}{bx}{-}{utfcgb} + \Declare@FontShape{utfcg}{eb}{-}{utfcge} + \DeclareKanjiFamily{\otf@JYn}{utfcmg}{} + \DeclareKanjiFamily{\otf@JTn}{utfcmg}{} + \Declare@FontShape{utfcmg}{m}{-}{utfcmgr} + \Declare@FontShape{utfc}{l}{-}{utfcml} + \Declare@FontShape{utft}{bx}{-}{utftmb} + \DeclareKanjiFamily{\otf@JYn}{utftg}{} + \DeclareKanjiFamily{\otf@JTn}{utftg}{} + \Declare@FontShape{utftg}{m}{-}{utftgr} + \Declare@FontShape{utftg}{bx}{-}{utftgb} + \Declare@FontShape{utftg}{eb}{-}{utftge} + \DeclareKanjiFamily{\otf@JYn}{utftmg}{} + \DeclareKanjiFamily{\otf@JTn}{utftmg}{} + \Declare@FontShape{utftmg}{m}{-}{utftmgr} + \Declare@FontShape{utft}{l}{-}{utftml} + \else + \if@bold + \Declare@FontShape{utfk}{bx}{-}{utfkgb} + \Declare@FontShape{utfc}{bx}{-}{utfcgb} + \Declare@FontShape{utft}{bx}{-}{utftgb} + \else + \Declare@FontShape{utfk}{bx}{-}{utfkgr} + \Declare@FontShape{utfc}{bx}{-}{utfcgr} + \Declare@FontShape{utft}{bx}{-}{utftgr} + \fi + \fi +\else + \Declare@FontShape{utfk}{m}{0123456789abcdef}{utfkmr} + \Declare@FontShape{utfk}{bx}{0123456789abcdef}{utfkgr} + \Declare@FontShape{utfc}{m}{0123456789abcdefklmo}{utfcmr} + \Declare@FontShape{utfc}{bx}{0123456789abcdefklmo}{utfcgr} + \Declare@FontShape{utft}{m}{0123456789abcdefklmnopqrstuvwxz}{utftmr} + \Declare@FontShape{utft}{bx}{0123456789abcdefklmnopqrstuvwxz}{utftgr} +\fi \DeclareKanjiFamily{\otf@JYn}{utf}{} \DeclareKanjiFamily{\otf@JTn}{utf}{} \Declare@FontShape{utf}{m}{0123456789abcdefjklmnopqrstuvwxyz}{utfmr} 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 b92d4037184..13f2911b912 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}[2019/04/01 v1.7b8 psitau, u0.25 ttk] +\ProvidesPackage{otf}[2019/04/01 v1.7b8 psitau, u0.26 ttk] \RequirePackage{keyval} %for processing options \newif\if@kana \@kanafalse @@ -75,7 +75,8 @@ \edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}% \ifx\k@family\reserved@a \kanjifamily{utfjg}\else\ifx\k@family\reserved@b \kanjifamily{utfjmg}\else\kanjifamily{utfj}\fi\fi% - \uppercase{\set@character="#1}% +% \uppercase{\set@character="#1}% (1) pLaTeX, upLaTeXともに\UTF{}に従来のsubfontを使う + \uppercase{\if@otf@uplatex\set@character@\else\set@character\fi="#1}% (2) upLaTeXでは\UTF{}に新vfを使う \endgroup% } \DeclareRobustCommand{\CID}[1]{\begingroup% @@ -88,7 +89,9 @@ \else \DeclareRobustCommand{\UTF}[1]{\begingroup% \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% - \kanjifamily{utfj}\uppercase{\set@character="#1}% + \kanjifamily{utfj}% +% \uppercase{\set@character="#1}% (1) pLaTeX, upLaTeXともに\UTF{}に従来のsubfontを使う + \uppercase{\if@otf@uplatex\set@character@\else\set@character\fi="#1}% (2) upLaTeXでは\UTF{}に新vfを使う \endgroup% } \DeclareRobustCommand{\CID}[1]{\begingroup% @@ -253,12 +256,17 @@ \advance\@tempcnta by \@tempcntb \if@otf@uplatex \advance\@tempcnta by "113030 - \char\@tempcnta% + \kchar\@tempcnta% \else \advance\@tempcnta by "3030 \char\jis\@tempcnta% \fi } +\newcommand\set@character@{\afterassignment\put@character@\@tempcnta} +\newcommand\put@character@{% + \kanjishape{-}\selectfont% + \kchar\@tempcnta% +} \catcode`\"=\count@ %end of changing catcode of \" \def\Declare@FontShape#1#2#3#4{% @@ -464,36 +472,36 @@ \DeclareKanjiFamily{\otf@JTn}{utfj}{} \DeclareKanjiFamily{\otf@JYn}{cidj}{} \DeclareKanjiFamily{\otf@JTn}{cidj}{} -\Declare@FontShape{utfj}{m}{0123456789abcdefjklmnopqrstuvxyz}{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}{0123456789abcdefjklmnopqrstuvxyz}{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}{0123456789abcdefjklmnopqrstuvxyz}{utfjgr\nlck@sfx@} + \Declare@FontShape{utfjg}{m}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgr\nlck@sfx@} \Declare@FontShape{cidjg}{m}{012345}{cidjgr} - \Declare@FontShape{utfjg}{bx}{0123456789abcdefjklmnopqrstuvxyz}{utfjgb\nlck@sfx@} + \Declare@FontShape{utfjg}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgb\nlck@sfx@} \Declare@FontShape{cidjg}{bx}{012345}{cidjgb} - \Declare@FontShape{utfjg}{eb}{0123456789abcdefjklmnopqrstuvxyz}{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}{0123456789abcdefjklmnopqrstuvxyz}{utfjmgr\nlck@sfx@} + \Declare@FontShape{utfjmg}{m}{0123456789abcdefjklmnopqrstuvxyz-}{utfjmgr\nlck@sfx@} \Declare@FontShape{cidjmg}{m}{012345}{cidjmgr} - \Declare@FontShape{utfj}{l}{0123456789abcdefjklmnopqrstuvxyz}{utfjml\nlck@sfx@} + \Declare@FontShape{utfj}{l}{0123456789abcdefjklmnopqrstuvxyz-}{utfjml\nlck@sfx@} \Declare@FontShape{cidj}{l}{012345}{cidjml} \else \if@bold - \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz}{utfjgb\nlck@sfx@} + \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgb\nlck@sfx@} \Declare@FontShape{cidj}{bx}{012345}{cidjgb} \else - \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz}{utfjgr\nlck@sfx@} + \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgr\nlck@sfx@} \Declare@FontShape{cidj}{bx}{012345}{cidjgr} \fi \fi -- cgit v1.2.3