summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-07-29 21:39:00 +0000
committerKarl Berry <karl@freefriends.org>2017-07-29 21:39:00 +0000
commit374414f65a92b39427b6ae8e3fb08e9f042f8b83 (patch)
tree3950d5a018f756acee40bf5bec9cf1836bb2f5b1 /Master/texmf-dist/tex/platex
parent6ee6197fa058cb894250c66be74b3a63c11069fc (diff)
platex (29jul17)
git-svn-id: svn://tug.org/texlive/trunk@44913 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex')
-rw-r--r--Master/texmf-dist/tex/platex/base/ascmac.sty2
-rw-r--r--Master/texmf-dist/tex/platex/base/exppl2e.sty8
-rw-r--r--Master/texmf-dist/tex/platex/base/platexrelease.sty64
-rw-r--r--Master/texmf-dist/tex/platex/base/plcore.ltx27
-rw-r--r--Master/texmf-dist/tex/platex/base/plext.sty16
-rw-r--r--Master/texmf-dist/tex/platex/base/tascmac.sty15
6 files changed, 123 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/platex/base/ascmac.sty b/Master/texmf-dist/tex/platex/base/ascmac.sty
index ac5639a4ebc..5ee8fa6a08b 100644
--- a/Master/texmf-dist/tex/platex/base/ascmac.sty
+++ b/Master/texmf-dist/tex/platex/base/ascmac.sty
@@ -16,7 +16,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{ascmac}
- [2016/08/21 v2.0c
+ [2017/07/22 v2.0d
ascmac wrapper (community edition)
]
\RequirePackage{tascmac}
diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty
index 55ddf96abd2..d3e4a30d35d 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/05/04 v1.0l Experimental pLaTeX2e features]
+ [2017/07/29 v1.0n Experimental pLaTeX2e features]
\PackageWarningNoLine{exppl2e}{%
This is the unstable, experimental part of pLaTeX2e.\MessageBreak
This package may contain:\MessageBreak
@@ -373,4 +373,10 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
+% \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
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
\endinput
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty
index 2609700d438..4d61e65b9ed 100644
--- a/Master/texmf-dist/tex/platex/base/platexrelease.sty
+++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty
@@ -18,7 +18,7 @@
\edef\p@known@latexreleaseversion
{2017/04/15}
\edef\platexreleaseversion
- {2017/05/05}
+ {2017/07/29}
\def\plIncludeInRelease#1{\kernel@ifnextchar[%
{\@plIncludeInRelease{#1}}
{\@plIncludeInRelease{#1}[#1]}}
@@ -914,6 +914,68 @@ of this package available from CTAN}
\@ifstar\@sverb\@verb}
\fi
\plEndIncludeInRelease
+\plIncludeInRelease{2017/07/29}{\@tabclassz}
+ {Inhibit JFM glue in tabular cells}%
+\def\@tabclassz{%
+ \ifcase\@lastchclass
+ \@acolampacol
+ \or
+ \@ampacol
+ \or
+ \or
+ \or
+ \@addamp
+ \or
+ \@acolampacol
+ \or
+ \@firstampfalse\@acol
+ \fi
+ \edef\@preamble{%
+ \@preamble{%
+ \ifcase\@chnum
+ \hfil\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % c
+ \or
+ \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % l
+ \or
+ \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip % r
+ \fi}}}
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\@tabclassz}
+ {Inhibit JFM glue in tabular cells}%
+\def\@tabclassz{%
+ \ifcase\@lastchclass
+ \@acolampacol
+ \or
+ \@ampacol
+ \or
+ \or
+ \or
+ \@addamp
+ \or
+ \@acolampacol
+ \or
+ \@firstampfalse\@acol
+ \fi
+ \edef\@preamble{%
+ \@preamble{%
+ \ifcase\@chnum
+ \hfil\ignorespaces\@sharp\unskip\hfil
+ \or
+ \hskip1sp\ignorespaces\@sharp\unskip\hfil
+ \or
+ \hfil\hskip1sp\ignorespaces\@sharp\unskip
+ \fi}}}
+\plEndIncludeInRelease
+\plIncludeInRelease{2017/07/29}{\@classv}
+ {Inhibit JFM glue in tabular cells}%
+\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces
+\@sharp\unskip\@endpbox}}
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\@classv}
+ {Inhibit JFM glue in tabular cells}%
+\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\ignorespaces
+\@sharp\@endpbox}}
+\plEndIncludeInRelease
\plIncludeInRelease{2016/04/17}{\@tabular}
{Remove extra \xkanjiskip}%
\def\@tabular{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index 50ea96a1821..1c31dd0bf52 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -18,7 +18,7 @@
%% File: plvers.dtx
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
- {2017/05/05}
+ {2017/07/29}
\def\ppatch@level{0}
\def\plIncludeInRelease#1{\kernel@ifnextchar[%
{\@plIncludeInRelease{#1}}
@@ -1006,6 +1006,31 @@
\newcommand\printglossary{\@input@{\jobname.gls}}
\newcount\hour
\newcount\minute
+\def\@tabclassz{%
+ \ifcase\@lastchclass
+ \@acolampacol
+ \or
+ \@ampacol
+ \or
+ \or
+ \or
+ \@addamp
+ \or
+ \@acolampacol
+ \or
+ \@firstampfalse\@acol
+ \fi
+ \edef\@preamble{%
+ \@preamble{%
+ \ifcase\@chnum
+ \hfil\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % c
+ \or
+ \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip\hfil % l
+ \or
+ \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\unskip % r
+ \fi}}}
+\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces
+\@sharp\unskip\@endpbox}}
\def\@tabular{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol
\let\@classz\@tabclassz
\let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray}
diff --git a/Master/texmf-dist/tex/platex/base/plext.sty b/Master/texmf-dist/tex/platex/base/plext.sty
index 071980ec497..fc28a40f256 100644
--- a/Master/texmf-dist/tex/platex/base/plext.sty
+++ b/Master/texmf-dist/tex/platex/base/plext.sty
@@ -15,7 +15,7 @@
%% File: plext.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{plext}
- [2017/05/04 v1.2g pLaTeX package file (community edition)]
+ [2017/07/21 v1.2h pLaTeX package file (community edition)]
\newif\if@rotsw
\def\array{\let\@acol\@arrayacol \let\@classz\@arrayclassz
\let\@classiv\@arrayclassiv
@@ -90,10 +90,18 @@
\fi\fi
\else\if #1z\relax\let\box@dir\relax\@rotswtrue
\if #2t\relax
- \def\@begin@alignbox{\raise\cdp\vtop\bgroup\kern\z@\vbox}%
+ \def\@begin@alignbox{%
+ \@tempdima=\tbaselineshift
+ \advance\@tempdima-\ybaselineshift
+ \advance\@tempdima\ht\tstrutbox
+ \raise\arraystretch\@tempdima\vtop\bgroup\kern\z@\vtop}%
\let\@end@alignbox\egroup
\else\if #2b\relax
- \def\@begin@alignbox{\lower\cdp\vbox\bgroup\vbox}%
+ \def\@begin@alignbox{%
+ \@tempdima=\tbaselineshift
+ \advance\@tempdima-\ybaselineshift
+ \advance\@tempdima-\dp\tstrutbox
+ \raise\arraystretch\@tempdima\vbox\bgroup\vbox}%
\def\@end@alignbox{\kern\z@\egroup}%
\else
\let\@begin@alignbox\vcenter
@@ -353,7 +361,7 @@
\fi\fi\fi
\else\if #1z\relax\@rotswtrue \let\box@dir\relax
\if #2t\relax
- \def\@begin@parbox{\raise\cdp\vtop\bgroup\kern\z@\vtop}%
+ \def\@begin@parbox{\raise\cht\vtop\bgroup\kern\z@\vtop}%
\let\@end@parbox\egroup
\else\if #2b\relax
\def\@begin@parbox{\lower\cdp\vbox\bgroup\vbox}%
diff --git a/Master/texmf-dist/tex/platex/base/tascmac.sty b/Master/texmf-dist/tex/platex/base/tascmac.sty
index 3d5d9e1f8ee..3fcd103cc9f 100644
--- a/Master/texmf-dist/tex/platex/base/tascmac.sty
+++ b/Master/texmf-dist/tex/platex/base/tascmac.sty
@@ -23,7 +23,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{tascmac}
- [2016/08/21 v2.0c
+ [2017/07/22 v2.0d
ascmac package (community edition)
]
%%
@@ -190,6 +190,19 @@ Q \iftdir\yoko\fi
\kern.33ex\hrule height.1ex width.98\wd0\kern.45ex}}}
%%
%% return-key
+\begingroup
+\def\ascmac@definable{\PackageInfo{ascmac}{Command
+ \@backslashchar\reserved@a\space already defined, but
+ compatible with\MessageBreak ascmac package, overwriting}}
+\def\ascmac@check#1{\ifx#1\@undefined\else\ascmac@parse{#1}\fi}
+\def\ascmac@parse#1{\edef\reserved@a{\expandafter\@gobble\string #1}%
+ \edef\ascmac@parse@tmp{\meaning#1 \string\@ascgrp}%
+ \expandafter\ascmac@parse@i\ascmac@parse@tmp\@nil}
+\expandafter\def\expandafter\ascmac@parse@i
+ \expandafter#\expandafter1\string\@ascgrp#2\@nil{\ifx\relax#2\relax
+ \@notdefinable\else\ascmac@definable\fi}
+\ascmac@check{\Return}
+\endgroup
\def\return{\leavevmode\hbox{%
Q \iftdir\yoko\fi
\@ascgrp\char"20}}