summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-08-27 23:51:19 +0000
committerKarl Berry <karl@freefriends.org>2017-08-27 23:51:19 +0000
commit9b25d514e38a322ca702b78f5f9880b85127c4a2 (patch)
treedc4f75d07c833ab6a54d27e5bb591a0e699636b9 /Master/texmf-dist/tex/platex
parent54dde81f3764e1d19fb8383ef9f337a39766407b (diff)
platex (27aug17)
git-svn-id: svn://tug.org/texlive/trunk@45139 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex')
-rw-r--r--Master/texmf-dist/tex/platex/base/exppl2e.sty282
-rw-r--r--Master/texmf-dist/tex/platex/base/kinsoku.tex8
-rw-r--r--Master/texmf-dist/tex/platex/base/platexrelease.sty58
-rw-r--r--Master/texmf-dist/tex/platex/base/plcore.ltx25
-rw-r--r--Master/texmf-dist/tex/platex/base/pldefs.ltx21
-rw-r--r--Master/texmf-dist/tex/platex/base/ptrace.sty39
6 files changed, 393 insertions, 40 deletions
diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty
index d3e4a30d35d..05887655212 100644
--- a/Master/texmf-dist/tex/platex/base/exppl2e.sty
+++ b/Master/texmf-dist/tex/platex/base/exppl2e.sty
@@ -34,7 +34,7 @@
% case 1: This file must be a normal package
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{exppl2e}
- [2017/07/29 v1.0n Experimental pLaTeX2e features]
+ [2017/08/26 v1.0p Experimental pLaTeX2e features]
\PackageWarningNoLine{exppl2e}{%
This is the unstable, experimental part of pLaTeX2e.\MessageBreak
This package may contain:\MessageBreak
@@ -131,7 +131,7 @@
% \begin{macrocode}
%<platexrelease>\plIncludeInRelease{????/??/??}{\pltx@isletter}
%<platexrelease> {Support PD1 encoding}%
-%<*pldefs|platexrelease>
+%<*plcore|platexrelease>
\def\pltx@mark{\pltx@mark@}
\let\pltx@scanstop\relax
\long\def\pltx@cond#1\fi{%
@@ -157,7 +157,7 @@
\pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
{\@firstoftwo}{\pltx@composite@chkenc}%
}{\pltx@composite@chkenc}}
-%</pldefs|platexrelease>
+%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{2016/06/10}{\pltx@isletter}
%<platexrelease> {Added \pltx@isletter}%
@@ -188,7 +188,7 @@
% \begin{macrocode}
%<platexrelease>\plIncludeInRelease{????/??/??}{\@text@composite@x}
%<platexrelease> {Fix for non-zero baselineshift}%
-%<*pldefs|platexrelease>
+%<*plcore|platexrelease>
\def\@text@composite@x#1#2{%
\ifx#1\relax
#2%
@@ -242,7 +242,7 @@
\endgroup}%
\fi
}
-%</pldefs|platexrelease>
+%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
% \end{macrocode}
% \end{macro}
@@ -347,12 +347,63 @@
% $B9TF,6XB'J8;z$NA0$G$N(B|\linebreak|$B$N5sF0$N=$@5$O!"(B
% p\LaTeXe{}$B%+!<%M%k(B(2017/05/05)$B$KF3F~$7$?$?$a:o=|!#(B
%
+% $B>e5-$N=$@5$K$h$j(B|\nolinebreak|$B$G(B|\(x)kanjiskip|$B$,(B
+% $BF~$i$J$/$J$C$F$$$?%P%0$N=$@5$O!"(B
+% p\LaTeXe{}$B%+!<%M%k(B(2017/07/29+1)$B$KF3F~$7$?$?$a:o=|!#(B
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% \section{$BAj8_;2>H(B}
%
% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B
%
+% $B$5$i$K!"Nc$($P(B``see Appendix A.''$B$N$h$&$J5-=R$,J8Kv$K$"$j!"$+$D(B
+% ``A''$B$rAj8_;2>H$G<hF@$7$?>l9g$N%9%Z!<%9%U%!%/%?!<$rJd@5$9$k$?$a!"(B
+% |\spacefactor\@m{}|$B$K=$@5$7$^$7$?!#$3$l$G!"(B``A.''$B$N8e$N%9%Z!<%9$,(B
+% $BJ8Kv$H$7$F07$o$l$^$9!#(B
+% $B!J;29M!'(B\LaTeXe{}$B%^%/%m(B\&$B%/%i%9(B $B%W%m%0%i%_%s%0<BA)2r@b!K(B
+% \changes{v????}{????/??/??}{$B%9%Z!<%9%U%!%/%?!<$rJd@5(B}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{????/??/??}{\@setref}
+%<platexrelease> {Spacing after \ref in moving arguments}%
+%<*plcore|platexrelease>
+\def\@setref#1#2#3{%
+ \ifx#1\relax
+ \protect\G@refundefinedtrue
+ \nfss@text{\reset@font\bfseries ??}%
+ \@latex@warning{Reference `#3' on page \thepage \space
+ undefined}%
+ \else
+ \expandafter#2#1\spacefactor\@m{}% change \null to \spacefactor\@m{}
+ \fi}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2017/04/08}{\@setref}
+%<platexrelease> {Spacing after \ref in moving arguments}%
+%<platexrelease>\def\@setref#1#2#3{%
+%<platexrelease> \ifx#1\relax
+%<platexrelease> \protect\G@refundefinedtrue
+%<platexrelease> \nfss@text{\reset@font\bfseries ??}%
+%<platexrelease> \@latex@warning{Reference `#3' on page \thepage \space
+%<platexrelease> undefined}%
+%<platexrelease> \else
+%<platexrelease> \expandafter#2#1\relax{}% change \null to \relax{}
+%<platexrelease> \fi}
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@setref}
+%<platexrelease> {Spacing after \ref in moving arguments}%
+%<platexrelease>\def\@setref#1#2#3{%
+%<platexrelease> \ifx#1\relax
+%<platexrelease> \protect\G@refundefinedtrue
+%<platexrelease> \nfss@text{\reset@font\bfseries ??}%
+%<platexrelease> \@latex@warning{Reference `#3' on page \thepage \space
+%<platexrelease> undefined}%
+%<platexrelease> \else
+%<platexrelease> \expandafter#2#1\relax% change \null to \relax
+%<platexrelease> \fi}
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% \section{$B5SCm$H%\%H%`%U%m!<%H$N=g=x$*$h$S?bD>0LCV(B}
@@ -373,10 +424,231 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
+% \section{verb$B$NKAF,$N%9%Z!<%9(B}
+%
+% \begin{macro}{\verb}
+% \changes{v1.1b}{1995/04/05}{$B8_49%b!<%I$N$H$-$O!"(Bpl209.def$B$NDj5A$r;H$&(B}
+% \changes{v1.1g}{1997/01/16}
+% {\cs{verb}$B%3%^%s%I$r(B\LaTeX\ \texttt{!<1996/06/01!>}$B$K9g$o$;$F=$@5(B}
+% \LaTeX{}$B$N(B|\verb|$B%3%^%s%I$G$O!"?t<0%b!<%I$G$J$$$H$-$O!"(B
+% |\leavevmode|$B$G?eJ?%b!<%I$KF~$C$?$"$H!"(B|\null|$B$r=PNO$7$F$$$^$9!#(B
+% $B%^%/%m(B|\null|$B$O(B|\hbox{}|$B$H$7$FDj5A$5$l$F$$$^$9$N$G!"(B
+% $B$3$3$K$OOB2$J84V%9%Z!<%9!J(B|\xkanjiskip|$B!K$,F~$j$^$;$s!#(B
+%
+% $B$7$+$7!"C1$K(B|\null|$B$r=|$$$F$7$^$&$H!":#EY$O(B|\verb+ abc+|$B$N$h$&$K(B
+% |\verb|$B$NKAF,$KH>3Q6uGr$,$"$k>l9g$K$3$l$,>C$($F$7$^$$$^$9(B(TeX.SX 170245)$B!#(B
+% $B$=$3$G!"(Bp\LaTeX{}$B$G$O(B|\null|$B$NBe$o$j$K(B
+% \begin{enumerate}
+% \item $BOB2$J84V%9%Z!<%9$NA^F~=hM}$OF)2a$9$k(B
+% \item $B9TJ,3d;~$K>C$($k(B(discardable)$B%N!<%I$G$O$J$$(B
+% \end{enumerate}
+% $B$NN>>r7o$rK~$?$9%N!<%I$rA^F~$7$^$9!#$3$3$G$O(B|\vadjust{}|$B$H$7$^$7$?!#(B
+%
+% $B$3$N%^%/%m$O!"(B\file{ltmiscen.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+% \changes{v????}{????/??/??}{\cs{verb}$B$NKAF,$NH>3Q6uGr$rJ];}(B}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{????/??/??}{\verb}
+%<platexrelease> {Preserve beginning space characters}%
+%<*plcore|platexrelease>
+\if@compatibility\else
+\def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi
+ \bgroup
+ \verb@eol@error \let\do\@makeother \dospecials
+ \verbatim@font\@noligs
+% \end{macrocode}
+% \LaTeXe\ 2017-04-15$B$KDI?o$7$F!"(B|\verb|$B$NESCf$G%O%$%U%M!<%7%g%s$,5/$-$J$$(B
+% $B$h$&$K(B|\language|$B$r@_Dj$7$^$9!J;29M!'(Blatex2e svn r1405$B!K!#(B
+% \changes{v1.2m}{2017/03/19}{\cs{verb}$B$NESCf$G%O%$%U%M!<%7%g%s$,5/$-$J$$(B
+% $B$h$&$K(B\cs{language}$B$r@_Dj(B(sync with ltmiscen.dtx 2017/03/09 v1.1m)}
+% \begin{macrocode}
+ \language\l@nohyphenation
+ \@ifstar\@sverb\@verb}
+\fi
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2017/04/08}{\verb}
+%<platexrelease> {Disable hyphenation in verb}%
+%<platexrelease>\if@compatibility\else
+%<platexrelease>\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi
+%<platexrelease> \bgroup
+%<platexrelease> \verb@eol@error \let\do\@makeother \dospecials
+%<platexrelease> \verbatim@font\@noligs
+%<platexrelease> \language\l@nohyphenation
+%<platexrelease> \@ifstar\@sverb\@verb}
+%<platexrelease>\fi
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\verb}
+%<platexrelease> {Disable hyphenation in verb}%
+%<platexrelease>\if@compatibility\else
+%<platexrelease>\def\verb{\relax\ifmmode\hbox\else\leavevmode\fi
+%<platexrelease> \bgroup
+%<platexrelease> \verb@eol@error \let\do\@makeother \dospecials
+%<platexrelease> \verbatim@font\@noligs
+%<platexrelease> \@ifstar\@sverb\@verb}
+%<platexrelease>\fi
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
% \section{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=(B}
%
% p\LaTeXe{}$B%+!<%M%k(B(2017/07/29)$B$KF3F~$7$?$?$a:o=|!#(B
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
+% \section{tabbing$B4D6-$N9TKAF,$N(BJFM$B%0%k!=(B}
+%
+% \begin{macro}{\@startline}
+% tabbing$B4D6-$N9T$G!"Cf?H$,;O$a3g8LN`$J$I$G;O$^$k>l9g!"(B
+% $B:G=i$N9`L\$@$1(BJFM$B%0%k!<$,>C$($J$$8=>]$KBP=h$7$^$9!#(B
+% \changes{v????}{????/??/??}{tabbing$B4D6-$N9TKAF,$N(BJFM$B%0%k!=$r:o=|(B}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{????/??/??}{\@startline}
+%<platexrelease> {Inhibit JFM glue at the beginning}%
+%<*plcore|platexrelease>
+\gdef\@startline{%
+ \ifnum \@nxttabmar >\@hightab
+ \@badtab
+ \global\@nxttabmar \@hightab
+ \fi
+ \global\@curtabmar \@nxttabmar
+ \global\@curtab \@curtabmar
+ \global\setbox\@curline \hbox {}%
+ \@startfield
+ \strut\inhibitglue}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@startline}
+%<platexrelease> {Inhibit JFM glue at the beginning}%
+%<platexrelease>\gdef\@startline{%
+%<platexrelease> \ifnum \@nxttabmar >\@hightab
+%<platexrelease> \@badtab
+%<platexrelease> \global\@nxttabmar \@hightab
+%<platexrelease> \fi
+%<platexrelease> \global\@curtabmar \@nxttabmar
+%<platexrelease> \global\@curtab \@curtabmar
+%<platexrelease> \global\setbox\@curline \hbox {}%
+%<platexrelease> \@startfield
+%<platexrelease> \strut}
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% \section{\cs{inhibitglue}$B$N4JN,7A(B}
+%
+% \begin{macro}{\<}
+% 2014$BG/$N(Bp\TeX{}$B$N(B|\inhibitglue|$B$N%P%0=$@5$KH<$$!"(B
+% |\inhibitglue|$B$,?bD>%b!<%I$G$O8z$+$J$/$J$j$^$7$?!#(B
+% \LaTeX{}$B$G$O?bD>%b!<%I$H?eJ?%b!<%I$N6hJL$,1#$5$l$F$$$^$9$N$G!"(B
+% p\LaTeX{}$B$NDI2CL?Na$G$"$k(B|\<|$B$OCJMnF,$G$b8z$/$h$&$K=$@5$7$^$9!#(B
+%
+% |\DeclareRobustCommand|$B$r;H$&$H(B|\protect|$B$N1F6A$GA0J}$NJ8;z$KBP$9$k(B
+% |\inhibitglue|$B$,8z$+$J$/$J$k$N$G!"(Be-\TeX{}$B$N(B|\protected|$B$,I,MW$G$9!#(B
+% \changes{v????}{????/??/??}{\cs{<}$B$,CJMnF,$G$b8z$/$h$&$K$7$?(B}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{????/??/??}{\<}
+%<platexrelease> {\inhibitglue in vertical mode}%
+%<*pldefs|platexrelease>
+\ifx\protected\@undefined
+\def\<{\inhibitglue}
+\else
+\protected\def\<{\ifvmode\leavevmode\fi\inhibitglue}
+\fi
+%</pldefs|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\<}
+%<platexrelease> {\inhibitglue in vertical mode}%
+%<platexrelease>\def\<{\inhibitglue}
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% \section{$B%$%?%j%C%/Jd@5$H(B\cs{xkanjiskip}}
+%
+% \begin{macro}{\check@nocorr@}
+% $B!V(B\verb|$B$"(B\texttt{abc}$B$$(B|$B!W$H$7$?$H$-!"=qBN$NJQ99$r;XDj$5$l$?2$J8$N:8B&$K(B
+% $BOB2$J84V%9%Z!<%9$,F~$i$J$$$N$r=$@5$7$^$9!#(B
+% \changes{v1.3i}{2000/07/13}{\cs{text..}$B%3%^%s%I$N:8B&$K(B\cs{xkanjiskip}$B$,(B
+% $BF~$i$J$$$N$r=$@5!J$"$j$,$H$&!"25It!wElBg$5$s!K(B}
+%
+% $B%3%_%e%K%F%#HG$N=$@5!'(Bp\TeX{}$B$N%P!<%8%g%s(Bp3.1.11$B0JA0$O!"%$%?%j%C%/Jd@5(B
+% $B!J0J2<(B|\/|$B$H5-$9!K$H(B|\xkanjiskip|$B$NA^F~$,>WFM(B\footnote{$BOBJ8$N%$%?%j%C%/(B
+% $BJd@5MQ(Bkern$B$,!"DL>o$N(Bexplicit$B$J!J(B\cs{kern}$B$K$h$k!K(Bkern$B$HF1$807$$$r<u$1$F(B
+% $B$$$?$?$a!#(B}$B$7(B
+% \begin{enumerate}
+% \item $B!V2$J8J8;z(B $B"*(B |\/|$B!W$N>l9g$K$O(B|\/|$B$rL5;k$9$k(B
+% $B!J$D$^$j8e$K(B|\xkanjiskip|$BA^F~2DG=!K(B
+% \item $B!VOBJ8J8;z(B $B"*(B |\/|$B!W$N>l9g$K$O$3$N8e$K(B|\xkanjiskip|$B$OA^F~$G$-$J$$(B
+% \end{enumerate}
+% $B$H$$$&5sF0$K$J$C$F$$$^$7$?!#(Bp3.2$B!J(B2010$BG/!K$N=$@5$G(B
+% \begin{itemize}
+% \item |\xkanjiskip|$BA^F~;~$K$O$$$+$J$k>l9g$b(B|\/|$B$rL5;k$9$k(B
+% \end{itemize}
+% $B$H$$$&5sF0$KJQ99$5$l$^$7$?!#(Bp\LaTeX{}$B%+!<%M%k$N(B|\check@nocorr@|$B$N=$@5$O!"(B
+% p3.1.11$B0JA0$N(B2.$B$X$NBP=h$G$7$?$,!"$3$l$O!V(B|\text...{}|$B$N:8$X$N(B|\/|$BA^F~!W$r(B
+% $BL58z2=$7$F$$$k$N$G!"(B|\textit{f\textup{a}}|$B$GK\MhF~$k$Y$-%$%?%j%C%/Jd@5$,(B
+% $BF~$j$^$;$s$G$7$?!#(Bp3.2$B0J9_$G$O(Bp\TeX{}$B$N(B|\xkanjiskip|$BBP:v$,ITMW$K$J$C$F(B
+% $B$$$^$9$N$G!"%3%_%e%K%F%#HG$G$O:o=|$7$^$7$?!#(B
+% \changes{v????}{????/??/??}{2010$BG/$N(Bp\TeX{}$BK\BN$N=$@5$K$h$j!"(Bv1.3i$B$GF~$l$?(B
+% $BBP=h$,ITMW$K$J$C$F$$$?$N$G:o=|(B}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{????/??/??}{\check@nocorr@}
+%<platexrelease> {Italic correction before \textt...}%
+%<*pldefs|platexrelease>
+\def \check@nocorr@ #1#2\nocorr#3\@nil {%
+ \let \check@icl \maybe@ic
+ \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}%
+ \def \reserved@a {\nocorr}%
+ \def \reserved@b {#1}%
+ \def \reserved@c {#3}%
+ \ifx \reserved@a \reserved@b
+ \ifx \reserved@c \@empty
+ \let \check@icl \@empty
+ \else
+ \let \check@icl \@empty
+ \let \check@icr \@empty
+ \fi
+ \else
+ \ifx \reserved@c \@empty
+ \else
+ \let \check@icr \@empty
+ \fi
+ \fi
+}
+%</pldefs|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\check@nocorr@}
+%<platexrelease> {Italic correction before \textt...}%
+%<platexrelease>\def \check@nocorr@ #1#2\nocorr#3\@nil {%
+%<platexrelease> \let \check@icl \relax% \maybe@ic $B$+$iJQ99(B
+%<platexrelease> \def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}%
+%<platexrelease> \def \reserved@a {\nocorr}%
+%<platexrelease> \def \reserved@b {#1}%
+%<platexrelease> \def \reserved@c {#3}%
+%<platexrelease> \ifx \reserved@a \reserved@b
+%<platexrelease> \ifx \reserved@c \@empty
+%<platexrelease> \let \check@icl \@empty
+%<platexrelease> \else
+%<platexrelease> \let \check@icl \@empty
+%<platexrelease> \let \check@icr \@empty
+%<platexrelease> \fi
+%<platexrelease> \else
+%<platexrelease> \ifx \reserved@c \@empty
+%<platexrelease> \else
+%<platexrelease> \let \check@icr \@empty
+%<platexrelease> \fi
+%<platexrelease> \fi
+%<platexrelease>}
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
\endinput
diff --git a/Master/texmf-dist/tex/platex/base/kinsoku.tex b/Master/texmf-dist/tex/platex/base/kinsoku.tex
index 6d03b0d7339..5d0767aa1f1 100644
--- a/Master/texmf-dist/tex/platex/base/kinsoku.tex
+++ b/Master/texmf-dist/tex/platex/base/kinsoku.tex
@@ -17,8 +17,8 @@
\prebreakpenalty`"=10000
\postbreakpenalty`\#=500
\postbreakpenalty`\$=500
-\postbreakpenalty`\%=500
-\postbreakpenalty`\&=500
+\prebreakpenalty`\%=500
+\prebreakpenalty`\&=500
\postbreakpenalty`\`=10000
\prebreakpenalty`'=10000
\prebreakpenalty`)=10000
@@ -80,8 +80,8 @@
\prebreakpenalty`$B!a(B=200
\postbreakpenalty`$B!t(B=200
\postbreakpenalty`$B!p(B=200
-\postbreakpenalty`$B!s(B=200
-\postbreakpenalty`$B!u(B=200
+\prebreakpenalty`$B!s(B=200
+\prebreakpenalty`$B!u(B=200
\prebreakpenalty`$B$!(B=150
\prebreakpenalty`$B$#(B=150
\prebreakpenalty`$B$%(B=150
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty
index 4d61e65b9ed..a7bfdde6ed3 100644
--- a/Master/texmf-dist/tex/platex/base/platexrelease.sty
+++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty
@@ -214,6 +214,48 @@ of this package available from CTAN}
\@height.7\baselineskip \@depth.3\baselineskip}%
\let\size@update\relax}}
\plEndIncludeInRelease
+\plIncludeInRelease{2017/07/29}{\adjustbaseline}
+ {Change zenkaku reference}%
+\def\adjustbaseline{%
+ \setbox\adjust@box\hbox{\char\jis"3441}%"
+ \cht\ht\adjust@box
+ \cdp\dp\adjust@box
+ \cwd\wd\adjust@box
+ \cvs\normalbaselineskip
+ \chs\cwd
+ \cHT\cht \advance\cHT\cdp
+ \iftdir
+ \setbox\adjust@box\hbox{\tbaselineshift\z@ M}%
+ \adjust@dimen\ht\adjust@box
+ \advance\adjust@dimen\dp\adjust@box
+ \advance\adjust@dimen-\cHT
+ \divide\adjust@dimen\tw@
+ \advance\adjust@dimen\cdp
+ \advance\adjust@dimen-\dp\adjust@box
+ \tbaselineshift\adjust@dimen
+ \fi}
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\adjustbaseline}
+ {Change zenkaku reference}%
+\def\adjustbaseline{%
+ \setbox\adjust@box\hbox{\char\euc"A1A1}%"
+ \cht\ht\adjust@box
+ \cdp\dp\adjust@box
+ \cwd\wd\adjust@box
+ \cvs\normalbaselineskip
+ \chs\cwd
+ \cHT\cht \advance\cHT\cdp
+ \iftdir
+ \setbox\adjust@box\hbox{\tbaselineshift\z@ M}%
+ \adjust@dimen\ht\adjust@box
+ \advance\adjust@dimen\dp\adjust@box
+ \advance\adjust@dimen-\cHT
+ \divide\adjust@dimen\tw@
+ \advance\adjust@dimen\cdp
+ \advance\adjust@dimen-\dp\adjust@box
+ \tbaselineshift\adjust@dimen
+ \fi}
+\plEndIncludeInRelease
\plIncludeInRelease{2017/04/08}{\textunderscore}
{Baseline shift for \textunderscore}%
\DeclareTextCommandDefault{\textunderscore}{%
@@ -393,6 +435,22 @@ of this package available from CTAN}
\let\eminnershape\@undefined
\plEndIncludeInRelease
%% File: plcore.dtx
+\plIncludeInRelease{2017/07/29}{\@no@lnbk}
+ {Break before prebreakpenalty}%
+\def\@no@lnbk #1[#2]{%
+ \ifvmode
+ \@nolnerr
+ \else
+ \@tempskipa\lastskip
+ \unskip
+ \penalty #1\@getpen{#2}%
+ \penalty\z@\relax %% added (2017/08/25)
+ \ifdim\@tempskipa>\z@
+ \hskip\@tempskipa
+ \ignorespaces
+ \fi
+ \fi}
+\plEndIncludeInRelease
\plIncludeInRelease{2017/05/05}{\@no@lnbk}
{Break before prebreakpenalty}%
\def\@no@lnbk #1[#2]{%
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index 1c31dd0bf52..ec3728105f6 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -19,7 +19,7 @@
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
{2017/07/29}
-\def\ppatch@level{0}
+\def\ppatch@level{1}
\def\plIncludeInRelease#1{\kernel@ifnextchar[%
{\@plIncludeInRelease{#1}}
{\@plIncludeInRelease{#1}[#1]}}
@@ -444,7 +444,7 @@
\newbox\adjust@box
\newdimen\adjust@dimen
\def\adjustbaseline{%
- \setbox\adjust@box\hbox{\char\euc"A1A1}%"
+ \setbox\adjust@box\hbox{\char\jis"3441}%"
\cht\ht\adjust@box
\cdp\dp\adjust@box
\cwd\wd\adjust@box
@@ -640,6 +640,25 @@
\else\tbaselineshift\fi
\else\ybaselineshift\fi
\vbox{\hrule\@width.3em}}
+\def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi}
+\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#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}}
\InputIfFileExists{pldefs.cfg}
{\typeout{*************************************^^J%
* Local config file pldefs.cfg used^^J%
@@ -700,7 +719,7 @@
\@tempskipa\lastskip
\unskip
\penalty #1\@getpen{#2}%
- \hskip\z@\relax %% added (2017/05/03)
+ \penalty\z@\relax %% added (2017/08/25)
\ifdim\@tempskipa>\z@
\hskip\@tempskipa
\ignorespaces
diff --git a/Master/texmf-dist/tex/platex/base/pldefs.ltx b/Master/texmf-dist/tex/platex/base/pldefs.ltx
index 6eca8060621..4558c474e0f 100644
--- a/Master/texmf-dist/tex/platex/base/pldefs.ltx
+++ b/Master/texmf-dist/tex/platex/base/pldefs.ltx
@@ -14,26 +14,7 @@
%%
%% File: plfonts.dtx
\ProvidesFile{pldefs.ltx}
- [2016/06/26 v1.6e pLaTeX Kernel (Default settings)]
-\def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi}
-\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#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}}
+ [2017/08/05 v1.6h pLaTeX Kernel (Default settings)]
\def \check@nocorr@ #1#2\nocorr#3\@nil {%
\let \check@icl \relax% \maybe@ic $B$+$iJQ99(B
\def \check@icr {\ifvmode \else \aftergroup \maybe@ic \fi}%
diff --git a/Master/texmf-dist/tex/platex/base/ptrace.sty b/Master/texmf-dist/tex/platex/base/ptrace.sty
index 18fca273f86..013b7af7976 100644
--- a/Master/texmf-dist/tex/platex/base/ptrace.sty
+++ b/Master/texmf-dist/tex/platex/base/ptrace.sty
@@ -15,7 +15,7 @@
%% File: plfonts.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{ptrace}
- [2017/02/20 v1.6f Standard pLaTeX package (font tracing)]
+ [2017/08/05 v1.6h Standard pLaTeX package (font tracing)]
\RequirePackageWithOptions{tracefnt}
\DeclareRobustCommand\selectfont{%
\let\tmp@error@fontshape\error@fontshape
@@ -72,8 +72,6 @@
\set@fontsize\baselinestretch\f@size\f@baselineskip
\fi
\size@update}
-\def\KanjiEncodingPair#1#2{\@namedef{t@enc@#1}{#2}\@namedef{y@enc@#2}{#1}}
-\KanjiEncodingPair{JY1}{JT1}
\plIncludeInRelease{2017/04/08}{\set@fontsize}
{Construct \ystrutbox}%
\def\set@fontsize#1#2#3{%
@@ -144,8 +142,32 @@
\fi
\let\size@update\relax}}
\plEndIncludeInRelease
-\newbox\adjust@box
-\newdimen\adjust@dimen
+\plIncludeInRelease{2017/07/29}{\adjustbaseline}
+ {Change zenkaku reference}%
+\def\adjustbaseline{%
+ \setbox\adjust@box\hbox{\char\jis"3441}%"
+ \cht\ht\adjust@box
+ \cdp\dp\adjust@box
+ \cwd\wd\adjust@box
+ \cvs\normalbaselineskip
+ \chs\cwd
+ \cHT\cht \advance\cHT\cdp
+ \iftdir
+ \setbox\adjust@box\hbox{\tbaselineshift\z@ M}%
+ \adjust@dimen\ht\adjust@box
+ \advance\adjust@dimen\dp\adjust@box
+ \advance\adjust@dimen-\cHT
+ \divide\adjust@dimen\tw@
+ \advance\adjust@dimen\cdp
+ \advance\adjust@dimen-\dp\adjust@box
+ \tbaselineshift\adjust@dimen
+ \ifnum \tracingfonts>\tw@
+ \typeout{baselineshift:\the\tbaselineshift}%
+ \fi
+ \fi}
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\adjustbaseline}
+ {Change zenkaku reference}%
\def\adjustbaseline{%
\setbox\adjust@box\hbox{\char\euc"A1A1}%"
\cht\ht\adjust@box
@@ -163,10 +185,11 @@
\advance\adjust@dimen\cdp
\advance\adjust@dimen-\dp\adjust@box
\tbaselineshift\adjust@dimen
- \ifnum \tracingfonts>\tw@
- \typeout{baselineshift:\the\tbaselineshift}
- \fi
+ \ifnum \tracingfonts>\tw@
+ \typeout{baselineshift:\the\tbaselineshift}
+ \fi
\fi}
+\plEndIncludeInRelease
\endinput
%%
%% End of file `ptrace.sty'.