From 9b8353e31b46b623df1ea38e13ba248700524b1b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 25 Jun 2023 22:29:53 +0000 Subject: japanese-otf (26jun23) git-svn-id: svn://tug.org/texlive/trunk@67475 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/platex/japanese-otf/mlcid.sty | 139 +++++++++++++++++---- .../texmf-dist/tex/platex/japanese-otf/mlutf.sty | 10 +- Master/texmf-dist/tex/platex/japanese-otf/otf.sty | 79 +++++++----- 3 files changed, 171 insertions(+), 57 deletions(-) (limited to 'Master/texmf-dist/tex/platex') diff --git a/Master/texmf-dist/tex/platex/japanese-otf/mlcid.sty b/Master/texmf-dist/tex/platex/japanese-otf/mlcid.sty index 4964b82d1ad..aa2b9f32260 100644 --- a/Master/texmf-dist/tex/platex/japanese-otf/mlcid.sty +++ b/Master/texmf-dist/tex/platex/japanese-otf/mlcid.sty @@ -1,35 +1,130 @@ \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{mlcid}[2004/04/17 v1.0.2 psitau] +\ProvidesPackage{mlcid}[2004/04/17 v1.0.2 psitau, u0.29 ttk] %force catcode of \" be 12 \count@\catcode`\" \catcode`\"=12 -\DeclareRobustCommand{\CIDK}[1]{\begingroup% - \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% - \kanjifamily{cidk}\set@character=#1% - \endgroup% -} -\DeclareRobustCommand{\CIDC}[1]{\begingroup% - \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% - \kanjifamily{cidc}\set@character=#1% - \endgroup% -} -\DeclareRobustCommand{\CIDT}[1]{\begingroup% - \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% - \kanjifamily{cidt}\set@character=#1% - \endgroup% -} +\if@otf@uplatex +\if@deluxe + \DeclareRobustCommand{\CIDK}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}% + \ifx\k@family\reserved@a \kanjifamily{cidkg}\else\ifx\k@family\reserved@b + \kanjifamily{cidkmg}\else\kanjifamily{cidk}\fi\fi% + \set@character@=#1% + \endgroup% + } + \DeclareRobustCommand{\CIDC}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}% + \ifx\k@family\reserved@a \kanjifamily{cidcg}\else\ifx\k@family\reserved@b + \kanjifamily{cidcmg}\else\kanjifamily{cidc}\fi\fi% + \set@character@=#1% + \endgroup% + } + \DeclareRobustCommand{\CIDT}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}% + \ifx\k@family\reserved@a \kanjifamily{cidtg}\else\ifx\k@family\reserved@b + \kanjifamily{cidtmg}\else\kanjifamily{cidt}\fi\fi% + \set@character@=#1% + \endgroup% + } +\else + \DeclareRobustCommand{\CIDK}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% + \kanjifamily{cidk}\set@character@=#1% + \endgroup% + } + \DeclareRobustCommand{\CIDC}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% + \kanjifamily{cidc}\set@character@=#1% + \endgroup% + } + \DeclareRobustCommand{\CIDT}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% + \kanjifamily{cidt}\set@character@=#1% + \endgroup% + } +\fi +\else% for pLaTeX + \DeclareRobustCommand{\CIDK}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% + \kanjifamily{cidk}\set@character=#1% + \endgroup% + } + \DeclareRobustCommand{\CIDC}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% + \kanjifamily{cidc}\set@character=#1% + \endgroup% + } + \DeclareRobustCommand{\CIDT}[1]{\begingroup% + \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% + \kanjifamily{cidt}\set@character=#1% + \endgroup% + } +\fi \catcode`\"=\count@ %end of changing catcode of \" \DeclareKanjiFamily{\otf@JYn}{cidk}{} \DeclareKanjiFamily{\otf@JTn}{cidk}{} -\Declare@FontShape{cidk}{m}{01234}{cidkmr} -\Declare@FontShape{cidk}{bx}{01234}{cidkgr} \DeclareKanjiFamily{\otf@JYn}{cidc}{} \DeclareKanjiFamily{\otf@JTn}{cidc}{} -\Declare@FontShape{cidc}{m}{01234567}{cidcmr} -\Declare@FontShape{cidc}{bx}{01234567}{cidcgr} \DeclareKanjiFamily{\otf@JYn}{cidt}{} \DeclareKanjiFamily{\otf@JTn}{cidt}{} -\Declare@FontShape{cidt}{m}{01234}{cidtmr} -\Declare@FontShape{cidt}{bx}{01234}{cidtgr} +\if@otf@uplatex + \Declare@FontShape{cidk}{m}{-}{cidkmr} + \Declare@FontShape{cidc}{m}{-}{cidcmr} + \Declare@FontShape{cidt}{m}{-}{cidtmr} + \if@deluxe + \Declare@FontShape{cidk}{bx}{-}{cidkmb} + \DeclareKanjiFamily{\otf@JYn}{cidkg}{} + \DeclareKanjiFamily{\otf@JTn}{cidkg}{} + \Declare@FontShape{cidkg}{m}{-}{cidkgr} + \Declare@FontShape{cidkg}{bx}{-}{cidkgb} + \Declare@FontShape{cidkg}{eb}{-}{cidkge} + \DeclareKanjiFamily{\otf@JYn}{cidkmg}{} + \DeclareKanjiFamily{\otf@JTn}{cidkmg}{} + \Declare@FontShape{cidkmg}{m}{-}{cidkmgr} + \Declare@FontShape{cidk}{l}{-}{cidkml} + \Declare@FontShape{cidc}{bx}{-}{cidcmb} + \DeclareKanjiFamily{\otf@JYn}{cidcg}{} + \DeclareKanjiFamily{\otf@JTn}{cidcg}{} + \Declare@FontShape{cidcg}{m}{-}{cidcgr} + \Declare@FontShape{cidcg}{bx}{-}{cidcgb} + \Declare@FontShape{cidcg}{eb}{-}{cidcge} + \DeclareKanjiFamily{\otf@JYn}{cidcmg}{} + \DeclareKanjiFamily{\otf@JTn}{cidcmg}{} + \Declare@FontShape{cidcmg}{m}{-}{cidcmgr} + \Declare@FontShape{cidc}{l}{-}{cidcml} + \Declare@FontShape{cidt}{bx}{-}{cidtmb} + \DeclareKanjiFamily{\otf@JYn}{cidtg}{} + \DeclareKanjiFamily{\otf@JTn}{cidtg}{} + \Declare@FontShape{cidtg}{m}{-}{cidtgr} + \Declare@FontShape{cidtg}{bx}{-}{cidtgb} + \Declare@FontShape{cidtg}{eb}{-}{cidtge} + \DeclareKanjiFamily{\otf@JYn}{cidtmg}{} + \DeclareKanjiFamily{\otf@JTn}{cidtmg}{} + \Declare@FontShape{cidtmg}{m}{-}{cidtmgr} + \Declare@FontShape{cidt}{l}{-}{cidtml} + \else + \if@bold + \Declare@FontShape{cidk}{bx}{-}{cidkgb} + \Declare@FontShape{cidc}{bx}{-}{cidcgb} + \Declare@FontShape{cidt}{bx}{-}{cidtgb} + \else + \Declare@FontShape{cidk}{bx}{-}{cidkgr} + \Declare@FontShape{cidc}{bx}{-}{cidcgr} + \Declare@FontShape{cidt}{bx}{-}{cidtgr} + \fi + \fi +\else + \if@deluxe + \Declare@FontShape{cidk}{l}{01234}{cidkmr} + \Declare@FontShape{cidc}{l}{01234567}{cidcmr} + \Declare@FontShape{cidt}{l}{01234}{cidtmr} + \fi + \Declare@FontShape{cidk}{m}{01234}{cidkmr} + \Declare@FontShape{cidk}{bx}{01234}{cidkgr} + \Declare@FontShape{cidc}{m}{01234567}{cidcmr} + \Declare@FontShape{cidc}{bx}{01234567}{cidcgr} + \Declare@FontShape{cidt}{m}{01234}{cidtmr} + \Declare@FontShape{cidt}{bx}{01234}{cidtgr} +\fi \endinput diff --git a/Master/texmf-dist/tex/platex/japanese-otf/mlutf.sty b/Master/texmf-dist/tex/platex/japanese-otf/mlutf.sty index 28538d0d285..e777a9c3981 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.28 ttk] +\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.29 ttk] %force catcode of \" be 12 \count@\catcode`\" \catcode`\"=12 @@ -134,6 +134,11 @@ \fi \fi \else + \if@deluxe + \Declare@FontShape{utfk}{l}{0123456789abcdef}{utfkmr} + \Declare@FontShape{utfc}{l}{0123456789abcdefklmo}{utfcmr} + \Declare@FontShape{utft}{l}{0123456789abcdefklmnopqrstuvwxz}{utftmr} + \fi \Declare@FontShape{utfk}{m}{0123456789abcdef}{utfkmr} \Declare@FontShape{utfk}{bx}{0123456789abcdef}{utfkgr} \Declare@FontShape{utfc}{m}{0123456789abcdefklmo}{utfcmr} @@ -143,6 +148,9 @@ \fi \DeclareKanjiFamily{\otf@JYn}{utf}{} \DeclareKanjiFamily{\otf@JTn}{utf}{} +\if@deluxe + \Declare@FontShape{utf}{l}{0123456789abcdefjklmnopqrstuvwxyz}{utfmr} +\fi \Declare@FontShape{utf}{m}{0123456789abcdefjklmnopqrstuvwxyz}{utfmr} \Declare@FontShape{utf}{bx}{0123456789abcdefjklmnopqrstuvwxyz}{utfgr} \endinput diff --git a/Master/texmf-dist/tex/platex/japanese-otf/otf.sty b/Master/texmf-dist/tex/platex/japanese-otf/otf.sty index 27ceb01d0d7..39a2beaa900 100644 --- a/Master/texmf-dist/tex/platex/japanese-otf/otf.sty +++ b/Master/texmf-dist/tex/platex/japanese-otf/otf.sty @@ -1,8 +1,9 @@ \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{otf}[2023/02/23 TeX JP org, v1.7b8 psitau, u0.28 ttk] +\ProvidesPackage{otf}[2023/06/25 TeX JP org, v1.7b8 psitau, u0.29 ttk] \RequirePackage{keyval} %for processing options \newif\if@kana \@kanafalse +\newif\if@ruby \@rubytrue \newif\if@macro \@macrotrue \newif\if@deluxe \@deluxefalse \newif\if@replace \@replacetrue @@ -16,6 +17,7 @@ \DeclareOption{nomacro}{\@macrofalse} \DeclareOption{nomacros}{\@macrofalse} \DeclareOption{noreplace}{\@replacefalse} +\DeclareOption{noruby}{\@rubyfalse} \DeclareOption{bold}{\@replacetrue\@boldtrue} \DeclareOption{expert}{\@replacetrue\@kanatrue} \DeclareOption{deluxe}{\@boldfalse\@replacetrue\@deluxetrue} @@ -36,6 +38,7 @@ \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\ruby@pfx@{\if@ruby ruby\else nml\fi} \def\nlck@sfx@{\if@newglyph n\else\fi} \ProcessOptions\relax @@ -94,7 +97,8 @@ \edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}% \ifx\k@family\reserved@a \kanjifamily{cidjg}\else\ifx\k@family\reserved@b \kanjifamily{cidjmg}\else\kanjifamily{cidj}\fi\fi% - \set@character=#1% +% \set@character=#1% (1) pLaTeX, upLaTeXともに\CID{}に従来のsubfontを使う + \if@otf@uplatex\set@character@\else\set@character\fi=#1% (2) upLaTeXでは\CID{}に新vfを使う \endgroup% } \else @@ -107,7 +111,9 @@ } \DeclareRobustCommand{\CID}[1]{\begingroup% \edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi% - \kanjifamily{cidj}\set@character=#1% + \kanjifamily{cidj}% +% \set@character=#1% (1) pLaTeX, upLaTeXともに\CID{}に従来のsubfontを使う + \if@otf@uplatex\set@character@\else\set@character\fi=#1% (2) upLaTeXでは\CID{}に新vfを使う \endgroup% } \fi @@ -251,11 +257,16 @@ \AtBeginDocument{\Redefine@UTF} %internal macros %macros by iNOUE Koich! +\ifx\kanjishapeforce\@undefined + \let\otf@kanjishape\kanjishape +\else + \let\otf@kanjishape\kanjishapeforce +\fi \newcommand\set@character{\afterassignment\put@character\@tempcnta} \newcommand\put@character{% \@tempcntb=\@tempcnta \divide\@tempcntb by "1000 - \kanjishape{\ifcase\@tempcntb0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or a\or b\or c\or d\or e\or f\or + \otf@kanjishape{\ifcase\@tempcntb0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or a\or b\or c\or d\or e\or f\or \or \or \or \or \or \or \or \or \or \or \or g\or \or h\or i\or j\or k\or l\or m\or n\or o\or p\or q\or r\or s\or t\or u\or v\or w\or x\or y\or z\fi}% \selectfont% @@ -275,7 +286,7 @@ } \newcommand\set@character@{\afterassignment\put@character@\@tempcnta} \newcommand\put@character@{% - \kanjishape{-}\selectfont% + \otf@kanjishape{-}\selectfont% \kchar\@tempcnta% } \catcode`\"=\count@ @@ -364,8 +375,8 @@ \if@kana \DeclareFontShape{\otf@JYn}{hmc}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminr\nlck@sfx@-h}{} \DeclareFontShape{\otf@JTn}{hmc}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminr\nlck@sfx@-v}{} - \DeclareFontShape{\otf@JYn}{ruby}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminr-h}{} - \DeclareFontShape{\otf@JTn}{ruby}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminr-v}{} + \DeclareFontShape{\otf@JYn}{ruby}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ minr-h}{} + \DeclareFontShape{\otf@JTn}{ruby}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ minr-v}{} \else \if@replace \DeclareFontShape{\otf@JYn}{hmc}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlminr\nlck@sfx@-h}{} @@ -380,12 +391,12 @@ \DeclareFontShape{\otf@JTn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothr\nlck@sfx@-v}{} \DeclareFontShape{\otf@JYn}{hgt}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothb\nlck@sfx@-h}{} \DeclareFontShape{\otf@JTn}{hgt}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothb\nlck@sfx@-v}{} - \DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminb-h}{} - \DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminb-v}{} - \DeclareFontShape{\otf@JYn}{rubyg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothr-h}{} - \DeclareFontShape{\otf@JTn}{rubyg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothr-v}{} - \DeclareFontShape{\otf@JYn}{rubyg}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothb-h}{} - \DeclareFontShape{\otf@JTn}{rubyg}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothb-v}{} + \DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ minb-h}{} + \DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ minb-v}{} + \DeclareFontShape{\otf@JYn}{rubyg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gothr-h}{} + \DeclareFontShape{\otf@JTn}{rubyg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gothr-v}{} + \DeclareFontShape{\otf@JYn}{rubyg}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gothb-h}{} + \DeclareFontShape{\otf@JTn}{rubyg}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gothb-v}{} \else \DeclareFontShape{\otf@JYn}{hmc}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlminb\nlck@sfx@-h}{} \DeclareFontShape{\otf@JTn}{hmc}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlminb\nlck@sfx@-v}{} @@ -399,13 +410,13 @@ \if@bold \DeclareFontShape{\otf@JYn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothb\nlck@sfx@-h}{} \DeclareFontShape{\otf@JTn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothb\nlck@sfx@-v}{} - \DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothb-h}{} - \DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothb-v}{} + \DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gothb-h}{} + \DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gothb-v}{} \else \DeclareFontShape{\otf@JYn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothr\nlck@sfx@-h}{} \DeclareFontShape{\otf@JTn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothr\nlck@sfx@-v}{} - \DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothr-h}{} - \DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothr-v}{} + \DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gothr-h}{} + \DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gothr-v}{} \fi \else \if@bold @@ -451,22 +462,22 @@ \if@kana \DeclareFontShape{\otf@JYn}{mg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expmgothr\nlck@sfx@-h}{} \DeclareFontShape{\otf@JTn}{mg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expmgothr\nlck@sfx@-v}{} - \DeclareFontShape{\otf@JYn}{rubymg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubymgothr-h}{} - \DeclareFontShape{\otf@JTn}{rubymg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubymgothr-v}{} + \DeclareFontShape{\otf@JYn}{rubymg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ mgothr-h}{} + \DeclareFontShape{\otf@JTn}{rubymg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ mgothr-v}{} \DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-h}{} \DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-v}{} \DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-h}{} \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-v}{} - \DeclareFontShape{\otf@JYn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-h}{} - \DeclareFontShape{\otf@JTn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-v}{} + \DeclareFontShape{\otf@JYn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ minl-h}{} + \DeclareFontShape{\otf@JTn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ minl-v}{} \else \DeclareFontShape{\otf@JYn}{mg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlmgothr\nlck@sfx@-h}{} \DeclareFontShape{\otf@JTn}{mg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlmgothr\nlck@sfx@-v}{} - \DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-h}{} - \DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-v}{} + \DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlminl\nlck@sfx@-h}{} + \DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlminl\nlck@sfx@-v}{} + \DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-h}{} + \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-v}{} \fi - \DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-h}{} - \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-v}{} \DeclareFontShape{\otf@JYn}{hmc}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw3-h}{} \DeclareFontShape{\otf@JYn}{hmc}{bx}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw6-h}{} \DeclareFontShape{\otf@JYn}{hgt}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phirakakuw3-h}{} @@ -484,36 +495,36 @@ \DeclareKanjiFamily{\otf@JYn}{cidj}{} \DeclareKanjiFamily{\otf@JTn}{cidj}{} \Declare@FontShape{utfj}{m}{0123456789abcdefjklmnopqrstuvxyz-}{utfjmr\nlck@sfx@} -\Declare@FontShape{cidj}{m}{012345}{cidjmr} +\Declare@FontShape{cidj}{m}{012345-}{cidjmr} %definition of other utf/cid fonts \if@deluxe \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjmb\nlck@sfx@} - \Declare@FontShape{cidj}{bx}{012345}{cidjmb} + \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{cidjg}{m}{012345}{cidjgr} + \Declare@FontShape{cidjg}{m}{012345-}{cidjgr} \Declare@FontShape{utfjg}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgb\nlck@sfx@} - \Declare@FontShape{cidjg}{bx}{012345}{cidjgb} + \Declare@FontShape{cidjg}{bx}{012345-}{cidjgb} \Declare@FontShape{utfjg}{eb}{0123456789abcdefjklmnopqrstuvxyz-}{utfjge\nlck@sfx@} - \Declare@FontShape{cidjg}{eb}{012345}{cidjge} + \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{cidjmg}{m}{012345}{cidjmgr} + \Declare@FontShape{cidjmg}{m}{012345-}{cidjmgr} \Declare@FontShape{utfj}{l}{0123456789abcdefjklmnopqrstuvxyz-}{utfjml\nlck@sfx@} - \Declare@FontShape{cidj}{l}{012345}{cidjml} + \Declare@FontShape{cidj}{l}{012345-}{cidjml} \else \if@bold \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgb\nlck@sfx@} - \Declare@FontShape{cidj}{bx}{012345}{cidjgb} + \Declare@FontShape{cidj}{bx}{012345-}{cidjgb} \else \Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgr\nlck@sfx@} - \Declare@FontShape{cidj}{bx}{012345}{cidjgr} + \Declare@FontShape{cidj}{bx}{012345-}{cidjgr} \fi \fi \if@macro -- cgit v1.2.3