summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/platex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-09-27 23:03:53 +0000
committerKarl Berry <karl@freefriends.org>2017-09-27 23:03:53 +0000
commit370e3406b980531c0dd271e5531f39573ac3be70 (patch)
tree1fd203c3a2141e014c9ef60641b44a54b4f1caa9 /Master/texmf-dist/source/platex
parent84648b2a3848ee4ddf34f67f927d4437a1bf4c9c (diff)
platex (26sep17)
git-svn-id: svn://tug.org/texlive/trunk@45413 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/platex')
-rw-r--r--Master/texmf-dist/source/platex/base/jclasses.dtx38
-rw-r--r--Master/texmf-dist/source/platex/base/platexrelease.dtx13
-rw-r--r--Master/texmf-dist/source/platex/base/plcore.dtx43
-rw-r--r--Master/texmf-dist/source/platex/base/plvers.dtx4
4 files changed, 73 insertions, 25 deletions
diff --git a/Master/texmf-dist/source/platex/base/jclasses.dtx b/Master/texmf-dist/source/platex/base/jclasses.dtx
index 390cf78695c..739c334d3ef 100644
--- a/Master/texmf-dist/source/platex/base/jclasses.dtx
+++ b/Master/texmf-dist/source/platex/base/jclasses.dtx
@@ -91,6 +91,8 @@
% \changes{v1.7e}{2017/03/05}{$B%H%s%\$KI=<($9$k%8%g%V>pJs$N=q<0$rJQ99(B}
% \changes{v1.7e}{2017/03/05}{\cs{frontmatter}$B$H(B\cs{mainmatter}$B$r(B
% $B4q?t%Z!<%8$KAw$k$h$&$KJQ99(B}
+% \changes{v1.7f}{2017/08/31}{$BOBJ8=qBN$N4p=`$rA43Q6uGr$+$i!V4A!W$KJQ99(B}
+% \changes{v1.7g}{2017/09/19}{$BFbIt=hM}$G;H$C$?%\%C%/%9(B0$B$r6u$K$7$?(B}
% \fi
%
% \iffalse
@@ -120,7 +122,7 @@
%<11pt&bk>\ProvidesFile{tbk11.clo}
%<12pt&bk>\ProvidesFile{tbk12.clo}
%</tate>
- [2017/03/05 v1.7e
+ [2017/09/19 v1.7g
%<article|report|book> Standard pLaTeX class]
%<10pt|11pt|12pt> Standard pLaTeX file (size option)]
%<*driver>
@@ -611,14 +613,18 @@
% \begin{macro}{\Cvs}
% \begin{macro}{\Chs}
% $B4p=`$H$J$kD9$5$N@_Dj$r$7$^$9!#$3$l$i$N%Q%i%a!<%?$O(B\file{plfonts.dtx}$B$GDj5A(B
-% $B$5$l$F$$$^$9!#(B
+% $B$5$l$F$$$^$9!#4p=`$H$9$kJ8;z$r!VA43Q6uGr!W!J(BEUC$B%3!<%I(B\texttt{0xA1A1}$B!K$+$i(B
+% $B!V4A!W!J(BJIS$B%3!<%I(B\texttt{0x3441}$B!K$XJQ99$7$^$7$?!#(B
+% \changes{v1.7f}{2017/08/31}{$BOBJ8=qBN$N4p=`$rA43Q6uGr$+$i!V4A!W$KJQ99(B}
+% \changes{v1.7g}{2017/09/19}{$BFbIt=hM}$G;H$C$?%\%C%/%9(B0$B$r6u$K$7$?(B}
% \begin{macrocode}
-\setbox0\hbox{\char\euc"A1A1}%
+\setbox0\hbox{\char\jis"3441}%
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb@x
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1826,7 +1832,7 @@
%
% \pstyle{jpl@in}$B%9%?%$%k$O!"%/%i%9%U%!%$%kFbIt$G;HMQ$9$k$b$N$G$9!#(B
% \LaTeX{}$B$G$O!"(Bbook$B%/%i%9$r(B\pstyle{headings}$B$H$7$F$$$^$9!#(B
-% $B$7$+$7!"(B\cs{tableofcontnts}$B%3%^%s%I$NFbIt$G$O(B\pstyle{plain}$B$H$7$F(B
+% $B$7$+$7!"(B\cs{tableofcontents}$B%3%^%s%I$NFbIt$G$O(B\pstyle{plain}$B$H$7$F(B
% $B@_Dj$5$l$k$?$a!"0l$D$NJ8=q$G$N%Z!<%8HV9f$N0LCV$,>e2<$K=PNO$5$l$k(B
% $B$3$H$K$J$j$^$9!#(B
%
@@ -2392,8 +2398,8 @@
%\newcommand*{\sectionmark}[1]{}
%\newcommand*{\subsectionmark}[1]{}
%\newcommand*{\subsubsectionmark}[1]{}
-%\newcommand*{\paragraph}[1]{}
-%\newcommand*{\subparagraph}[1]{}
+%\newcommand*{\paragraphmark}[1]{}
+%\newcommand*{\subparagraphmark}[1]{}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -2461,10 +2467,10 @@
% |\alph{|\Lcount{COUNTER}|}|$B$O!"(B\Lcount{COUNTER}$B$NCM$r(B
% $1=$~a, $2=$~b $B$N$h$&$K$7$F=PNO$7$^$9!#(B
%
-% |\Roman{|\Lcount{COUNTER}|}|$B$O!"(B\Lcount{COUNTER}$B$NCM$r(B
+% |\Alph{|\Lcount{COUNTER}|}|$B$O!"(B\Lcount{COUNTER}$B$NCM$r(B
% $1=$~A, $2=$~B $B$N$h$&$K$7$F=PNO$7$^$9!#(B
%
-% |\kansuji{|\Lcount{COUNTER}|}|$B$O!"(B\Lcount{COUNTER}$B$NCM$r(B
+% |\Kanji{|\Lcount{COUNTER}|}|$B$O!"(B\Lcount{COUNTER}$B$NCM$r(B
% $B4A?t;z$G=PNO$7$^$9!#(B
%
% |\rensuji{|\meta{obj}|}|$B$O!"(B\meta{obj}$B$r2#$KJB$Y$F=PNO$7$^$9!#(B
@@ -3889,10 +3895,12 @@
% |\@tempdima|$B$K$7$F$$$^$9$,!"$3$NJQ?t$O$$$m$$$m$J2U=j$G;H$o$l$^$9$N$G!"(B
% $B4|BT$7$?CM$,F~$i$J$$>l9g$,$"$j$^$9!#(B
%
-% $B$?$H$($P!"(Bp\LaTeXe{}$B$G$N(B|\selectfont|$B$O!"OB2$J8$N%Y!<%9%i%$%s$rD4@0$9$k(B
-% $B$?$a$K(B|\@tempdima|$BJQ?t$rMQ$$$F$$$^$9!#$=$N$?$a!"(B|\l@...|$B%^%/%m$NCf$G(B
-% $B%U%)%s%H$r@ZBX$($k$H!"(B|\numberline|$B%^%/%m$N%\%C%/%9(B
-% $B$NI}$,!"%Y!<%9%i%$%s$rD4@0$9$k$H$-$K7W;;$7$?CM$K$J$C$F$7$^$$$^$9!#(B
+% ^^A $B$?$H$($P!"(Bp\LaTeXe{}$B$G$N(B|\selectfont|$B$O!"OB2$J8$N%Y!<%9%i%$%s$rD4@0$9$k(B
+% ^^A $B$?$a$K(B|\@tempdima|$BJQ?t$rMQ$$$F$$$^$9!#$=$N$?$a!"(B|\l@...|$B%^%/%m$NCf$G(B
+% ^^A $B%U%)%s%H$r@ZBX$($k$H!"(B|\numberline|$B%^%/%m$N%\%C%/%9(B
+% ^^A $B$NI}$,!"%Y!<%9%i%$%s$rD4@0$9$k$H$-$K7W;;$7$?CM$K$J$C$F$7$^$$$^$9!#(B
+% ^^A $B"*=$@5(B(texjporg)$B!':G6a$N(B|\adjustbaseline|$B$G$O(B|\adjust@dimen|$B$,;H$o$l$F(B
+% ^^A $B$$$k$?$a!"5-=R$r%3%a%s%H%"%&%H$7$^$7$?!#(B
%
% $B%U%)%s%HA*Br%3%^%s%I$N8e!"$"$k$$$O(B|\numberline|$B%^%/%m$NCf$G%U%)%s%H$r(B
% $B@ZBX$($F$b$h$$$N$G$9$,!"0l;~JQ?t$r0U<1$7$?$/$J$$$N$G!"(B
@@ -3931,9 +3939,9 @@
% \end{macro}
%
% \begin{macro}{\addcontentsline}
-% $B%Z!<%8HV9f$r(B|\rensuji|$B$G0O$`$h$&$KJQ99$7$^$9!#(B
-% $B2#AH$N$H$-$K$b(B`|\rensuji|'$B%3%^%s%I$,=PNO$5$l$^$9$,!"(B
-% $B$3$N%3%^%s%I$K$h$k1F6A$O$"$j$^$;$s!#(B
+% $B=DAH$N>l9g$K%Z!<%8HV9f$r(B|\rensuji|$B$G0O$`$h$&$KJQ99$7$^$9!#(B
+% ^^A $B2#AH$N$H$-$K$b(B`|\rensuji|'$B%3%^%s%I$,=PNO$5$l$^$9$,!"(B
+% ^^A $B$3$N%3%^%s%I$K$h$k1F6A$O$"$j$^$;$s!#(B
%
% $B$3$N%^%/%m$O(B\file{ltsect.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/platex/base/platexrelease.dtx b/Master/texmf-dist/source/platex/base/platexrelease.dtx
index 68acdf86b8b..7fefa85b723 100644
--- a/Master/texmf-dist/source/platex/base/platexrelease.dtx
+++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx
@@ -20,6 +20,7 @@
% \changes{v1.0f}{2016/07/05}{$B8E$$(Bplatexrelease$B$N7Y9p$K(B\cs{pfmtversion}$B$G(B
% $B$J$/(B\cs{platexreleaseversion}$B$r;HMQ(B(\LaTeXe\ r1207)}
% \changes{v1.0g}{2016/09/08}{p\LaTeX\ \texttt{!<2016/09/03!>}$BHG$K7Y9p(B}
+% \changes{v1.0h}{2017/09/26}{p\LaTeX\ \texttt{!<2017/07/29!>}$BHG$K7Y9p(B}
% \fi
%
% \iffalse
@@ -28,7 +29,7 @@
\ProvidesFile{platexrelease.dtx}
%</driver>
%<platexrelease>\ProvidesPackage{platexrelease}
- [2016/09/08 v1.0g latexrelease support for pLaTeX Kernel]
+ [2017/09/26 v1.0h latexrelease support for pLaTeX Kernel]
%<*driver>
\documentclass{jltxdoc}
\GetFileInfo{platexrelease.dtx}
@@ -296,7 +297,17 @@ of this package available from CTAN}
% p\LaTeX\ \texttt{!<2016/05/07!>}$BHG$K7Y9p(B}
% \changes{v1.0e}{2016/06/30}{p\LaTeX\ \texttt{!<2016/06/10!>}$BHG$K7Y9p(B}
% \changes{v1.0g}{2016/09/08}{p\LaTeX\ \texttt{!<2016/09/03!>}$BHG$K7Y9p(B}
+% \changes{v1.0h}{2017/09/26}{p\LaTeX\ \texttt{!<2017/07/29!>}$BHG$K7Y9p(B}
% \begin{macrocode}
+\plIncludeInRelease{2017/09/26}{\PackageWarning}{pLaTeX Info}%
+\plEndIncludeInRelease
+\plIncludeInRelease{2016/07/29}{\PackageWarning}{pLaTeX Info}%
+ \PackageWarningNoLine{platexrelease}{%
+ You selected pLaTeX2e <\pfmtversion>, but\MessageBreak
+ this version of pLaTeX2e is known to have\MessageBreak
+ some critical bugs. We advise you to\MessageBreak
+ select another format date}
+\plEndIncludeInRelease
\plIncludeInRelease{2016/09/08}{\PackageWarning}{pLaTeX Info}%
\plEndIncludeInRelease
\plIncludeInRelease{2016/09/03}{\PackageWarning}{pLaTeX Info}%
diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx
index bac04240e68..d305f1403d3 100644
--- a/Master/texmf-dist/source/platex/base/plcore.dtx
+++ b/Master/texmf-dist/source/platex/base/plcore.dtx
@@ -70,13 +70,15 @@
% \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B}
% \changes{v1.2q}{2017/08/25}{\cs{nolinebreak}$B$N>l9g$K(B\cs{(x)kanjiskip}$B$,(B
% $BF~$i$J$/$J$C$F$$$?$N$r=$@5(B}
+% \changes{v1.2r}{2017/09/26}{tabular$B4D6-$N1&B7$((B(r)$B$G7S@~$,$:$l$k$h$&$K(B
+% $B$J$C$F$$$?%P%0$r=$@5(B}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plcore.dtx}[2017/08/25 v1.2q pLaTeX core file]
+\ProvidesFile{plcore.dtx}[2017/09/26 v1.2r pLaTeX core file]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plcore.dtx}
@@ -1511,12 +1513,13 @@
% $B$7$^$&$N$G!"(Bp\LaTeX{}$B$G$ODI2C$NBP=h$rF~$l$^$9!#(B
%
% $B$^$:!"(B|l|, |c|, |r|$B$N>l9g$G$9!#(B
-% $B:G=i$K(B|\inhibitglue|$B$rH/9T$7!":G8e$KM>J,$J(B|\unskip|$B$rH/9T$9$k(B
-% $B$3$H$G!"%;%kMWAG$N<~0O$N(BJFM$B%0%k!=$r>C$7$^$9!#(B
+% $B%;%k$NMWAG$r(B|\mbox|$B$KF~$l!"$=$N:G=i$G(B|\inhibitglue|$B$rH/9T$7$^$9!#(B
% \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B}
+% \changes{v1.2r}{2017/09/26}{tabular$B4D6-$N1&B7$((B(r)$B$G7S@~$,$:$l$k$h$&$K(B
+% $B$J$C$F$$$?%P%0$r=$@5(B}
% \begin{macrocode}
%</plcore>
-%<platexrelease>\plIncludeInRelease{2017/07/29}{\@tabclassz}
+%<platexrelease>\plIncludeInRelease{2017/09/26}{\@tabclassz}
%<platexrelease> {Inhibit JFM glue in tabular cells}%
%<*plcore|platexrelease>
\def\@tabclassz{%
@@ -1536,14 +1539,40 @@
\edef\@preamble{%
\@preamble{%
\ifcase\@chnum
- \hfil\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % c
+ \hfil\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % c
\or
- \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % l
+ \hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % l
\or
- \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip % r
+ \hfil\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}% % r
\fi}}}
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2017/07/29}{\@tabclassz}
+%<platexrelease> {Inhibit JFM glue in tabular cells}%
+%<platexrelease>\def\@tabclassz{%
+%<platexrelease> \ifcase\@lastchclass
+%<platexrelease> \@acolampacol
+%<platexrelease> \or
+%<platexrelease> \@ampacol
+%<platexrelease> \or
+%<platexrelease> \or
+%<platexrelease> \or
+%<platexrelease> \@addamp
+%<platexrelease> \or
+%<platexrelease> \@acolampacol
+%<platexrelease> \or
+%<platexrelease> \@firstampfalse\@acol
+%<platexrelease> \fi
+%<platexrelease> \edef\@preamble{%
+%<platexrelease> \@preamble{%
+%<platexrelease> \ifcase\@chnum
+%<platexrelease> \hfil\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % c
+%<platexrelease> \or
+%<platexrelease> \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % l
+%<platexrelease> \or
+%<platexrelease> \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip % r
+%<platexrelease> \fi}}}
+%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{0000/00/00}{\@tabclassz}
%<platexrelease> {Inhibit JFM glue in tabular cells}%
%<platexrelease>\def\@tabclassz{%
diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx
index 6143a5ee9a6..88ed34c8f8c 100644
--- a/Master/texmf-dist/source/platex/base/plvers.dtx
+++ b/Master/texmf-dist/source/platex/base/plvers.dtx
@@ -127,10 +127,10 @@
%</plcore>
%<platexrelease>\edef\platexreleaseversion
%<*plcore|platexrelease>
- {2017/07/29}
+ {2017/09/26}
%</plcore|platexrelease>
%<*plcore>
-\def\ppatch@level{1}
+\def\ppatch@level{0}
%</plcore>
% \end{macrocode}
% \end{macro}