summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/platex/base/plfonts.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/platex/base/plfonts.dtx')
-rw-r--r--Master/texmf-dist/source/platex/base/plfonts.dtx215
1 files changed, 188 insertions, 27 deletions
diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx
index c7a40e3cf50..7e116ebb358 100644
--- a/Master/texmf-dist/source/platex/base/plfonts.dtx
+++ b/Master/texmf-dist/source/platex/base/plfonts.dtx
@@ -3,7 +3,7 @@
%
% Copyright 1994-2006 ASCII Corporation.
% Copyright (c) 2010 ASCII MEDIA WORKS
-% Copyright (c) 2016 Japanese TeX Development Community
+% Copyright (c) 2016-2017 Japanese TeX Development Community
%
% This file is part of the pLaTeX2e system (community edition).
% -------------------------------------------------------------
@@ -57,13 +57,20 @@
% \changes{v1.6d}{2016/06/19}{$B%"%/%;%s%HIU$-J8;z$r$5$i$K=$@5(B(forum:1951)}
% \changes{v1.6e}{2016/06/26}{v1.6a$B0J9_$N=$@5$GA4$F$N%"%/%;%s%HIU$-J8;z$G(B
% $B%H%i%V%k$,Aj<!$$$@$?$a!"$$$C$?$s%Q%C%A$r=|5n!#(B}
+% \changes{v1.6f}{2017/02/20}{ptrace.sty$B$N(Bplatexrelease$BBP1~(B}
+% \changes{v1.6f}{2017/02/20}{\cs{ystrutbox}$B$rDI2C(B}
+% \changes{v1.6f}{2017/02/20}{\cs{strutbox}$B$r=D2#N>BP1~$K(B}
+% \changes{v1.6f}{2017/02/20}{\cs{strutbox}$B$NBe$o$j$K(B\cs{ystrutbox}$B$r;HMQ(B}
+% \changes{v1.6f}{2017/02/20}{\cs{ystrut}$B$rDI2C(B}
+% \changes{v1.6f}{2017/02/20}{\cs{ystrutbox}$B$rAH$_N)$F$k$h$&$K(B}
+% \changes{v1.6g}{2017/03/07}{$B%Y!<%9%i%$%sJd@5NL$r=$@5(B}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plfonts.dtx}[2016/06/26 v1.6e pLaTeX New Font Selection Scheme]
+\ProvidesFile{plfonts.dtx}[2017/03/07 v1.6g pLaTeX New Font Selection Scheme]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plfonts.dtx}
@@ -137,7 +144,7 @@
%<*trace>
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{ptrace}
- [2016/04/30 v1.6b Standard pLaTeX package (font tracing)]
+ [2017/02/20 v1.6f Standard pLaTeX package (font tracing)]
\RequirePackageWithOptions{tracefnt}
%</trace>
% \end{macrocode}
@@ -406,12 +413,25 @@
%
% $B%U%)%s%H%5%$%:$,JQ99$5$l$?$H$-$K!"(B|\set@fontsize|$B%3%^%s%I$G99?7$5$l$^$9!#(B
%
+% $B=>Mh!"2#AH%\%C%/%9MQ$N;YCl$O(B|\strutbox|$B$G!"9b$5$H?<$5$,(B7$BBP(B3$B$H$J$C$F$$$^$7$?!#(B
+% $B$3$l$O(Bp\LaTeX{}$BC1BN$G$OLdBj$K$J$j$^$;$s$G$7$?$,!"3$30@=$N(B\LaTeX{}$B%Q%C%1!<%8$r(B
+% $B=DAH$G;HMQ$7$?>l9g$K!"0U?^$7$J$$I}$d9b$5$,<hF@$5$l$k$3$H$,$"$j$^$7$?!#(B
+% $B$3$NITET9g$r2sHr$9$k$?$a!"%3%_%e%K%F%#HG(Bp\LaTeX{}$B$G$O<!$NJ}K!$r$H$j$^$9!#(B
+% \begin{itemize}
+% \item |\ystrutbox|$B!J?7@_!K!'9b$5$H?<$5$,(B7$BBP(B3$B$N2#AH%\%C%/%9MQ$N;YCl(B
+% \item |\tstrutbox|$B!'9b$5$H?<$5$,(B5$BBP(B5$B$N=DAH%\%C%/%9MQ$N;YCl(B
+% \item |\zstrutbox|$B!'9b$5$H?<$5$,(B7$BBP(B3$B$N=DAH%\%C%/%9MQ$N;YCl(B
+% \item |\strutbox|$B!J;EMMJQ99!K!'=D2#$N%G%#%l%/%7%g%s$K1~$8$F(B
+% |\tstrutbox|$B$^$?$O(B|\ystrutbox|$B$KE83+$5$l$k%^%/%m(B
+% \end{itemize}
+% $B$9$J$o$A!"=>Mh$N(Bp\LaTeX{}$B$K$*$1$k(B|\strutbox|$B$HF1$85sF0$r<($9$N$,!"(B
+% $B?7@_$5$l$?(B|\ystrutbox|$B$H$$$&$3$H$K$J$j$^$9!#(B
+%
% \begin{macro}{\tstrutbox}
% \begin{macro}{\zstrutbox}
-% |\tstrutbox|$B$O9b$5$H?<$5$,#5BP#5!"(B
-% |\zstrutbox|$B$O9b$5$H?<$5$,#7BP#3$N;YCl%\%C%/%9$H$J$j$^$9!#(B
+% |\tstrutbox|$B$O9b$5$H?<$5$,(B5$BBP(B5$B!"(B
+% |\zstrutbox|$B$O9b$5$H?<$5$,(B7$BBP(B3$B$N;YCl%\%C%/%9$H$J$j$^$9!#(B
% $B$3$l$i$O=DAH%\%C%/%9$N9T4V$ND4@0$J$I$K;H$$$^$9!#(B
-% $B$J$*!"2#AH%\%C%/%9MQ$N;YCl$O(B|\strutbox|$B$G!"9b$5$H?<$5$,#7BP#3$H$J$C$F$$$^$9!#(B
% \begin{macrocode}
\newbox\tstrutbox
\newbox\zstrutbox
@@ -419,24 +439,80 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\ystrutbox}
+% |\ystrutbox|$B$O9b$5$H?<$5$,(B7$BBP(B3$B$N2#AH%\%C%/%9MQ$N;YCl$G$9!#(B
+% \changes{v1.6f}{2017/02/20}{\cs{ystrutbox}$B$rDI2C(B}
+% \begin{macrocode}
+%</plcore>
+%<platexrelease>\plIncludeInRelease{2017/04/08}{\ystrutbox}
+%<platexrelease> {Add \ystrutbox}%
+%<*plcore|platexrelease>
+\newbox\ystrutbox
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\ystrutbox}
+%<platexrelease> {Add \ystrutbox}%
+%<platexrelease>\let\ystrutbox\@undefined
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\strutbox}
+% |\strutbox|$B$O=D2#N>BP1~$G$9!#(B
+% \changes{v1.6f}{2017/02/20}{\cs{strutbox}$B$r=D2#N>BP1~$K(B}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2017/04/08}{\strutbox}
+%<platexrelease> {Add \strutbox}%
+%<*plcore|platexrelease>
+\def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\strutbox}
+%<platexrelease> {Add \strutbox}%
+%<platexrelease>\newbox\strutbox % emulation purpose only
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\strut}
-% \begin{macro}{\tstrut}
-% \begin{macro}{\zstrut}
-% |\strutbox|$B$O(B|\yoko|$B%G%#%l%/%7%g%s$GAH$^$l$F$$$^$9$N$G!"(B
-% $B=DAH%\%C%/%9Fb$G(B|\unhcopy|$B$r$9$k$H%(%i!<$H$J$j$^$9!#(B
-% $B$3$N%^%/%m$O(B\file{ltplain.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+% $B%G%#%l%/%7%g%s$K1~$8$F(B|\ystrutbox|$B$H(B|\tstrutbox|$B$r;H$$J,$1$^$9!#(B
+% ^^A |\strutbox|$B$O(B|\yoko|$B%G%#%l%/%7%g%s$GAH$^$l$F$$$^$9$N$G!"(B
+% ^^A $B=DAH%\%C%/%9Fb$G(B|\unhcopy|$B$r$9$k$H%(%i!<$H$J$j$^$9!#(B
+% $B85!9$3$N%^%/%m$O(B\file{ltplain.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
%
% \changes{v1.1c}{1995/08/24}{``\cs{centerling}~\cs{strut}''$B$NI}$,%<%m$K(B
% $B$J$C$F$7$^$&$N$r=$@5(B}
% \changes{v1.3h}{1999/08/09}{$B=DAH$N$H$-!"I}$N$"$k%\%C%/%9$K$J$C$F$7$^$&(B
% $B$N$r=$@5(B}
+% \changes{v1.6f}{2017/02/20}{\cs{strutbox}$B$NBe$o$j$K(B\cs{ystrutbox}$B$r;HMQ(B}
% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2017/04/08}{\strut}
+%<platexrelease> {Use \ystrutbox}%
+%<*plcore|platexrelease>
\def\strut{\relax
\ifydir
- \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi
+ \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi
\else
\ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi
\fi}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\strut}
+%<platexrelease> {Use \ystrutbox}%
+%<platexrelease>\def\strut{\relax
+%<platexrelease> \ifydir
+%<platexrelease> \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi
+%<platexrelease> \else
+%<platexrelease> \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi
+%<platexrelease> \fi}
+%<platexrelease>\plEndIncludeInRelease
+%<*plcore>
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\tstrut}
+% \begin{macro}{\zstrut}
+% \begin{macrocode}
\def\tstrut{\relax\hbox{\tate
\ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}}
\def\zstrut{\relax\hbox{\tate
@@ -444,6 +520,24 @@
% \end{macrocode}
% \end{macro}
% \end{macro}
+%
+% \begin{macro}{\ystrut}
+% \changes{v1.6f}{2017/02/20}{\cs{ystrut}$B$rDI2C(B}
+% \begin{macrocode}
+%</plcore>
+%<platexrelease>\plIncludeInRelease{2017/04/08}{\ystrut}
+%<platexrelease> {Add \ystrut}%
+%<*plcore|platexrelease>
+\def\ystrut{\relax\hbox{\yoko
+ \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\ystrut}
+%<platexrelease> {Add \ystrut}%
+%<platexrelease>\let\ystrut\@undefined
+%<platexrelease>\plEndIncludeInRelease
+%<*plcore>
+% \end{macrocode}
% \end{macro}
%
%
@@ -1069,6 +1163,10 @@
% |\fontsize|$B%3%^%s%I$NFbIt7A<0$G$9!#(B
% $B%Y!<%9%i%$%s$N@_Dj$H!";YCl$N@_Dj$r9T$J$$$^$9!#(B
% \begin{macrocode}
+%</plcore|trace>
+%<platexrelease|trace>\plIncludeInRelease{2017/04/08}{\set@fontsize}
+%<platexrelease|trace> {Construct \ystrutbox}%
+%<*plcore|platexrelease|trace>
\def\set@fontsize#1#2#3{%
\@defaultunits\@tempdimb#2pt\relax\@nnil
\edef\f@size{\strip@pt\@tempdimb}%
@@ -1082,9 +1180,10 @@
\normalbaselineskip\baselineskip
% \end{macrocode}
% $B$3$3$G!"%Y!<%9%i%$%s%7%U%H$ND4@0$H;YCl$rAH$_N)$F$^$9!#(B
+% \changes{v1.6f}{2017/02/20}{\cs{ystrutbox}$B$rAH$_N)$F$k$h$&$K(B}
% \begin{macrocode}
\adjustbaseline
- \setbox\strutbox\hbox{\yoko
+ \setbox\ystrutbox\hbox{\yoko
\vrule\@width\z@
\@height.7\baselineskip \@depth.3\baselineskip}%
\setbox\tstrutbox\hbox{\tate
@@ -1097,18 +1196,58 @@
% $B%U%)%s%H%5%$%:$H%Y!<%9%i%$%s$K4X$9$k?GCG>pJs$r=PNO$7$^$9!#(B
% \begin{macrocode}
%<*trace>
- \ifnum \tracingfonts>\tw@
- \ifx\f@linespread\@empty
- \let\reserved@a\@empty
- \else
- \def\reserved@a{\f@linespread x}%
- \fi
- \@font@info{Changing size to\space
- \f@size/\reserved@a \f@baselineskip}%
- \aftergroup\type@restoreinfo
- \fi
+ \ifnum \tracingfonts>\tw@
+ \ifx\f@linespread\@empty
+ \let\reserved@a\@empty
+ \else
+ \def\reserved@a{\f@linespread x}%
+ \fi
+ \@font@info{Changing size to\space
+ \f@size/\reserved@a \f@baselineskip}%
+ \aftergroup\type@restoreinfo
+ \fi
%</trace>
\let\size@update\relax}}
+%</plcore|platexrelease|trace>
+%<platexrelease|trace>\plEndIncludeInRelease
+%<platexrelease|trace>\plIncludeInRelease{0000/00/00}{\set@fontsize}
+%<platexrelease|trace> {Construct \ystrutbox}%
+%<platexrelease|trace>\def\set@fontsize#1#2#3{%
+%<platexrelease|trace> \@defaultunits\@tempdimb#2pt\relax\@nnil
+%<platexrelease|trace> \edef\f@size{\strip@pt\@tempdimb}%
+%<platexrelease|trace> \@defaultunits\@tempskipa#3pt\relax\@nnil
+%<platexrelease|trace> \edef\f@baselineskip{\the\@tempskipa}%
+%<platexrelease|trace> \edef\f@linespread{#1}%
+%<platexrelease|trace> \let\baselinestretch\f@linespread
+%<platexrelease|trace> \def\size@update{%
+%<platexrelease|trace> \baselineskip\f@baselineskip\relax
+%<platexrelease|trace> \baselineskip\f@linespread\baselineskip
+%<platexrelease|trace> \normalbaselineskip\baselineskip
+%<platexrelease|trace> \adjustbaseline
+%<platexrelease|trace> \setbox\strutbox\hbox{\yoko
+%<platexrelease|trace> \vrule\@width\z@
+%<platexrelease|trace> \@height.7\baselineskip \@depth.3\baselineskip}%
+%<platexrelease|trace> \setbox\tstrutbox\hbox{\tate
+%<platexrelease|trace> \vrule\@width\z@
+%<platexrelease|trace> \@height.5\baselineskip \@depth.5\baselineskip}%
+%<platexrelease|trace> \setbox\zstrutbox\hbox{\tate
+%<platexrelease|trace> \vrule\@width\z@
+%<platexrelease|trace> \@height.7\baselineskip \@depth.3\baselineskip}%
+%<*trace>
+%<platexrelease|trace> \ifnum \tracingfonts>\tw@
+%<platexrelease|trace> \ifx\f@linespread\@empty
+%<platexrelease|trace> \let\reserved@a\@empty
+%<platexrelease|trace> \else
+%<platexrelease|trace> \def\reserved@a{\f@linespread x}%
+%<platexrelease|trace> \fi
+%<platexrelease|trace> \@font@info{Changing size to\space
+%<platexrelease|trace> \f@size/\reserved@a \f@baselineskip}%
+%<platexrelease|trace> \aftergroup\type@restoreinfo
+%<platexrelease|trace> \fi
+%</trace>
+%<platexrelease|trace> \let\size@update\relax}}
+%<platexrelease|trace>\plEndIncludeInRelease
+%<*plcore|trace>
% \end{macrocode}
% \end{macro}
%
@@ -1132,7 +1271,8 @@
% $B$7$^$&$?$a!"7W;;$7$?CM$,Bg$-$/$J$C$F$7$^$$$^$9!#$=$3$G!"$3$N%\%C%/%9(B
% $B$NCf$G%<%m$K$9$k$h$&$K$7$^$7$?!#$^$?!"(B``/''$B$HHf3S$7$F$$$?$N$r(B``M''$B$K(B
% $B$7$^$7$?!#(B
-% \changes{v1.3k}{2001/05/10}{\cs{adjustbaseline}$B$ND4@0NL(B}
+% \changes{v1.3k}{2001/05/10}{\cs{adjustbaseline}$B$ND4@0NL(B
+% $B!J:F$S(B`M'$B$r4p=`$K$7$?!K(B}
% \begin{macrocode}
\newbox\adjust@box
\newdimen\adjust@dimen
@@ -1154,9 +1294,9 @@
%
% \begin{eqnarray*}
% \textmc{$B%Y!<%9%i%$%s%7%U%HNL(B} &=&
-% \{ (\textmc{$BA43Q6uGr$N?<$5(B}) - (\textmc{/$B$N?<$5(B}) \} \\
+% \{ (\textmc{$BA43Q6uGr$N?<$5(B}) - (\textmc{M$B$N?<$5(B}) \} \\
% &&- \frac{(\textmc{$BA43Q6uGr$N9b$5(B$+$$B?<$5(B})
-% - (\textmc{/$B$N9b$5(B$+$$B?<$5(B})}{2}
+% - (\textmc{M$B$N9b$5(B$+$$B?<$5(B})}{2}
% \end{eqnarray*}
%
% \begin{macrocode}
@@ -1584,11 +1724,32 @@
% $B$b$H$O(B\file{ltoutenc.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
%
% $B$J$*!"(B|\_|$B$r?t<0%b!<%I$G;H$&$H(B|\mathunderscore|$B$,<B9T$5$l$^$9!#(B
+%
+% $B%3%_%e%K%F%#HG$G$O=D?t<0%G%#%l%/%7%g%s$G%Y!<%9%i%$%sJd@5NL$,(B
+% $BJQ$@$C$?$N$rD>$7$^$7$?!#$"$o$;$F2#%G%#%l%/%7%g%s$G$b%Y!<%9%i%$%s(B
+% $BJd@5$KDI?o$9$k$h$&$K$7$F$$$^$9!#(B
+% \changes{v1.6g}{2017/03/07}{$B%Y!<%9%i%$%sJd@5NL$r=$@5(B}
% \begin{macrocode}
+%</plcore>
+%<platexrelease>\plIncludeInRelease{2017/04/08}{\textunderscore}
+%<platexrelease> {Baseline shift for \textunderscore}%
+%<*plcore|platexrelease>
\DeclareTextCommandDefault{\textunderscore}{%
\leavevmode\kern.06em
- \iftdir\raise-\tbaselineshift\fi
+ \raise-\iftdir\ifmdir\ybaselineshift
+ \else\tbaselineshift\fi
+ \else\ybaselineshift\fi
\vbox{\hrule\@width.3em}}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\textunderscore}
+%<platexrelease> {Baseline shift for \textunderscore}%
+%<platexrelease>\DeclareTextCommandDefault{\textunderscore}{%
+%<platexrelease> \leavevmode\kern.06em
+%<platexrelease> \iftdir\raise-\tbaselineshift\fi
+%<platexrelease> \vbox{\hrule\@width.3em}}
+%<platexrelease>\plEndIncludeInRelease
+%<*plcore>
% \end{macrocode}
% \end{macro}
%