summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/platex/base/plfonts.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-06-11 23:06:18 +0000
committerKarl Berry <karl@freefriends.org>2016-06-11 23:06:18 +0000
commit95b471835523e634d7a1a09c433dbd827d3af0ef (patch)
tree8e1c39f3c53a06451694de32a64f14b3ed735acb /Master/texmf-dist/source/platex/base/plfonts.dtx
parent9e59fe5cbd2d8d2eb3abb95254ead13c5334bad2 (diff)
platex (11jun16)
git-svn-id: svn://tug.org/texlive/trunk@41369 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/platex/base/plfonts.dtx')
-rw-r--r--Master/texmf-dist/source/platex/base/plfonts.dtx165
1 files changed, 134 insertions, 31 deletions
diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx
index e43b05c988d..1e63249ef9a 100644
--- a/Master/texmf-dist/source/platex/base/plfonts.dtx
+++ b/Master/texmf-dist/source/platex/base/plfonts.dtx
@@ -10,7 +10,7 @@
%
% \fi
%
-% \CheckSum{1811}
+% \CheckSum{2030}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -69,13 +69,15 @@
% \cs{AA}$B$J$I0lIt$N9g@.J8;z$,$*$+$7$/$J$k$3$H$X$NBP1~!#(B}
% \changes{v1.6b}{2016/04/30}{ptrace.sty$B$NKAF,$G(Btracefnt.sty$B$r(B
% \cs{RequirePackageWithOptions}$B$9$k$h$&$K$7$?(B}
+% \changes{v1.6c}{2016/06/06}{v1.6a$B$G$N=$@5$G(B\'e $B$J$IA4$F$N%"%/%;%s%HIU$-J8;z$G(B
+% $B<~0O$K(B\cs{xkanjiskip}$B$,F~$i$J$/$J$C$F$$$?$N$r=$@5!#(B}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plfonts.dtx}[2016/04/30 v1.6b pLaTeX New Font Selection Scheme]
+\ProvidesFile{plfonts.dtx}[2016/06/06 v1.6c pLaTeX New Font Selection Scheme]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plfonts.dtx}
@@ -1637,51 +1639,152 @@
% \begin{macrocode}
%<*pldefs>
\ProvidesFile{pldefs.ltx}
- [2016/04/01 v1.6a pLaTeX Kernel (Default settings)]
+ [2016/06/06 v1.6c pLaTeX Kernel (Default settings)]
+%</pldefs>
% \end{macrocode}
%
% \subsection{$B9g@.J8;z(B}
-% \begin{macro}{\@text@composite}
-% \begin{macro}{\@text@composite@x}
% \LaTeXe{}$B$N%+!<%M%k$N%3!<%I$r$=$N$^$^;H$&$H!"(Bp\TeX{}$B$N%Y!<%9%i%$%s(B
% $BJd@5NL$,%<%m$G$J$$$H$-$K9g@.J8;z$,$*$+$7$/$J$C$F$$$?$?$a!"BP:v$7$^$9!#(B
-% \changes{v1.6a}{2016/04/01}{$B%Y!<%9%i%$%sJd@5NL$,(B0$B$G$J$$$H$-$K(B
-% \cs{AA}$B$J$I0lIt$N9g@.J8;z$,$*$+$7$/$J$k$3$H$X$NBP1~!#(B}
% \begin{macrocode}
-%</pldefs>
-%<platexrelease>\plIncludeInRelease{2016/04/17}{\@text@composite}
+%<platexrelease>\plIncludeInRelease{2016/06/10}{\@text@composite}
%<platexrelease> {Fix for non-zero baselineshift}%
%<*pldefs|platexrelease>
-\def\@text@composite#1#2#3#{%
- \begingroup
- \setbox\z@=\hbox\bgroup%
- \ybaselineshift\z@\tbaselineshift\z@
- \expandafter\@text@composite@x
- \csname\string#1-\string#2\endcsname}
+% \end{macrocode}
+% \begin{macro}{\g@tlastchart@}
+% \TeX\ Live 2015$B$GDI2C$5$l$?(B\cs{lastnodechar}$B$rMxMQ$7$F!"(B
+% $B!VD>A0$NJ8;z!W$NId9f0LCV$rF@$k%3!<%I$G$9!#(B\cs{lastnodechar}$B$,L$Dj5A$N>l9g$O(B
+% $-1$$B$,JV$j$^$9!#(B
+% \changes{v1.6c}{2016/06/06}{$B%^%/%mDI2C(B}
+% \begin{macrocode}
+\def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\pltx@isletter}
+% $BBh0l0z?t$N%^%/%m(B(|#1|)$B$NCV49%F%-%9%H$,!"%+%F%4%j%3!<%I(B11$B$+(B12$B$NJ8;z%H!<%/%s(B1$BJ8;z$G$"$C$?(B
+% $B>l9g$KBhFs0z?t$NFbMF$KE83+$5$l!"$=$&$G$J$$>l9g$OBh;00z?t$NFbMF$KE83+$5$l$^$9!#(B
+% \changes{v1.6c}{2016/06/06}{$B%^%/%mDI2C(B}
+% \begin{macrocode}
+\def\pltx@mark{\pltx@mark@}
+\let\pltx@scanstop\relax
+\long\def\pltx@cond#1\fi{%
+ #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
+\long\def\pltx@isletter#1{%
+ \expandafter\pltx@isletter@i\romannumeral-`0#1\pltx@scanstop}
+\long\def\pltx@isletter@i#1\pltx@scanstop{%
+ \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}%
+ {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}}
+\long\def\pltx@isletter@ii#1\pltx@scanstop#{%
+ \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi%
+ {\pltx@isletter@iii}{\pltx@isletter@iv}}
+\long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo}
+\long\def\pltx@isletter@iv#1#2#3\pltx@mark{%
+ \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{%
+ \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
+ {\@firstoftwo}{\@secondoftwo}%
+ }{\@secondoftwo}}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\@text@composite}
+% \begin{macro}{\@text@composite@x}
+% \changes{v1.6a}{2016/04/01}{$B%Y!<%9%i%$%sJd@5NL$,(B0$B$G$J$$$H$-$K(B
+% \cs{AA}$B$J$I0lIt$N9g@.J8;z$,$*$+$7$/$J$k$3$H$X$NBP1~!#(B}
+% \changes{v1.6c}{2016/06/06}{v1.6a$B$G$N=$@5$G(B\'e $B$J$IA4$F$N%"%/%;%s%HIU$-J8;z$G(B
+% $B<~0O$K(B\cs{xkanjiskip}$B$,F~$i$J$/$J$C$F$$$?$N$r=$@5!#(B}
+% \begin{macrocode}
+%<platexrelease>\def\@text@composite#1#2#3\@text@composite{%
+%<platexrelease> \expandafter\@text@composite@x
+%<platexrelease> \csname\string#1-\string#2\endcsname}
\def\@text@composite@x#1#2{%
\ifx#1\relax
- \expandafter\@secondoftwo
- \else
- \expandafter\@firstoftwo
- \fi
- #1{#2}\egroup
- \leavevmode
- \expandafter\lower
- \iftdir
- \ifmdir
- \ifmmode\tbaselineshift\else\ybaselineshift\fi
- \else
- \tbaselineshift
- \fi
+ #2%
+ \else\pltx@isletter{#1}{#1}{%
+ \begingroup
+ \setbox\z@\hbox\bgroup%
+ \ybaselineshift\z@\tbaselineshift\z@
+ #1%
+ \g@tlastchart@\@tempcntb
+ \xdef\pltx@composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}%
+ \aftergroup\pltx@composite@temp
+ \egroup
+% \end{macrocode}
+% \begin{macrocode}
+ \ifnum\@tempcntb<\z@
+ \@tempdima=\iftdir
+ \ifmdir
+ \ifmmode\tbaselineshift\else\ybaselineshift\fi
+ \else
+ \tbaselineshift
+ \fi
+ \else
+ \ybaselineshift
+ \fi
+ \@tempcntb=\@cclvi
+ \else\@tempdima=\z@
+ \fi
+% \end{macrocode}
+% $B%"%/%;%s%H$,IU$/!VK\BN$NJ8;z!W$,2$J8J8;z$H?dB,$5$l$k>l9g$K$O!"(B
+% $B0lC6?t<0%b!<%I$KF~$k$3$H$K$h$C$F(B\cs{xkanjiskip}$B$,A08e$KF~$k$h$&$K$7$^$9!#(B
+% $BI,MW$J$i!"?t<0%b!<%I$NA08e$K(B\cs{null}$B$rJd$C$F(B\cs{xkanjiskip}$B$NA^F~$rM^@)$7$^$9!#(B
+% \begin{macrocode}
+ \ifnum\@tempcntb<\@cclvi
+ \ifnum\@tempcntb>\m@ne\ifnum\@tempcntb<\@cclvi
+ \ifodd\xspcode\@tempcntb\else\leavevmode\hbox{}\fi
+ \fi\fi
+ \begingroup\mathsurround\z@$%
+ \ifx\textbaselineshiftfactor\@undefined\else
+ \textbaselineshiftfactor\z@\fi
+ \box\z@
+ $\endgroup%
+ \ifnum\@tempcntb>\m@ne\ifnum\@tempcntb<\@cclvi
+ \ifnum\xspcode\@tempcntb<2\hbox{}\fi
+ \fi\fi
+% \end{macrocode}
+% \begin{macrocode}
\else
- \ybaselineshift
+ \ifdim\@tempdima=\z@{\ybaselineshift\z@\tbaselineshift\z@#1}%
+ \else\lower\@tempdima\box\z@\fi
\fi
- \box\z@
- \endgroup}
+ \endgroup}%
+ \fi
+}
%</pldefs|platexrelease>
%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2016/04/17}{\@text@composite}
+%<platexrelease> {Fix for non-zero baselineshift}%
+%<platexrelease>\let\g@tlastchart@\@undefined
+%<platexrelease>\let\pltx@isletter\@undefined
+%<platexrelease>\def\@text@composite#1#2#3#{%
+%<platexrelease> \begingroup
+%<platexrelease> \setbox\z@=\hbox\bgroup%
+%<platexrelease> \ybaselineshift\z@\tbaselineshift\z@
+%<platexrelease> \expandafter\@text@composite@x
+%<platexrelease> \csname\string#1-\string#2\endcsname}
+%<platexrelease>\def\@text@composite@x#1#2{%
+%<platexrelease> \ifx#1\relax
+%<platexrelease> \expandafter\@secondoftwo
+%<platexrelease> \else
+%<platexrelease> \expandafter\@firstoftwo
+%<platexrelease> \fi
+%<platexrelease> #1{#2}\egroup
+%<platexrelease> \leavevmode
+%<platexrelease> \expandafter\lower
+%<platexrelease> \iftdir
+%<platexrelease> \ifmdir
+%<platexrelease> \ifmmode\tbaselineshift\else\ybaselineshift\fi
+%<platexrelease> \else
+%<platexrelease> \tbaselineshift
+%<platexrelease> \fi
+%<platexrelease> \else
+%<platexrelease> \ybaselineshift
+%<platexrelease> \fi
+%<platexrelease> \box\z@
+%<platexrelease> \endgroup}
+%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{0000/00/00}{\@text@composite}
%<platexrelease> {Fix for non-zero baselineshift}%
+%<platexrelease>\let\g@tlastchart@\@undefined
+%<platexrelease>\let\pltx@isletter\@undefined
%<platexrelease>\def\@text@composite#1#2#3\@text@composite{%
%<platexrelease> \expandafter\@text@composite@x
%<platexrelease> \csname\string#1-\string#2\endcsname}