summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex/base/plcore.ltx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/platex/base/plcore.ltx')
-rw-r--r--Master/texmf-dist/tex/platex/base/plcore.ltx92
1 files changed, 75 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index 000ae2fb325..288406422f2 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -10,7 +10,7 @@
%% plvers.dtx (with options: `plfinal')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -18,10 +18,18 @@
%% File: plvers.dtx
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
- {2017/10/28}
-\def\ppatch@level{4}
+ {2018/03/09}
+\def\ppatch@level{0}
\edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner
-\def\plIncludeInRelease#1{\kernel@ifnextchar[%
+\newif\if@plincludeinrelease
+\@plincludeinreleasefalse
+\def\plIncludeInRelease#1{%
+ \if@plincludeinrelease
+ \PackageError{platexrelease}
+ {mis-matched \string\plIncludeInRelease}{}%
+ \@plincludeinreleasefalse
+ \fi
+ \kernel@ifnextchar[%
{\@plIncludeInRelease{#1}}
{\@plIncludeInRelease{#1}[#1]}}
\def\@plIncludeInRelease#1[#2]{\@plIncludeInRele@se{#2}}
@@ -34,6 +42,7 @@
\expandafter\expandafter\expandafter\@gobble@plIncludeInRelease
\else
\GenericInfo{}{Applying: \the\toks@}%
+ \@plincludeinreleasetrue
\expandafter\let\csname\string#2+\@currname+plIIR\endcsname\@empty
\fi
\else
@@ -41,8 +50,23 @@
\expandafter\@gobble@plIncludeInRelease
\fi
}
-\long\def\@gobble@plIncludeInRelease#1\plEndIncludeInRelease{}
-\let\plEndIncludeInRelease\relax
+\def\plEndIncludeInRelease{%
+ \if@plincludeinrelease
+ \@plincludeinreleasefalse
+ \else
+ \PackageError{platexrelease}
+ {mis-matched \string\plEndIncludeInRelease}{}%
+ \fi}
+\long\def\@gobble@plIncludeInRelease#1\plEndIncludeInRelease{%
+ \@plincludeinreleasefalse
+ \@check@plIncludeInRelease#1\plIncludeInRelease
+ \@check@plIncludeInRelease\@end@check@plIncludeInRelease}
+\long\def\@check@plIncludeInRelease#1\plIncludeInRelease
+ #2#3\@end@check@plIncludeInRelease{%
+ \ifx\@check@plIncludeInRelease#2\else
+ \PackageError{platexrelease}
+ {skipped \string\plIncludeInRelease}{}%
+ \fi}
%% File: plfonts.dtx
\let\k@encoding\@empty
\let\ck@encoding\@empty
@@ -659,11 +683,6 @@
\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%
- *************************************}}%
- {\input{pldefs.ltx}}
%% File: plcore.dtx
\def\NeedsTeXFormat#1{%
\def\reserved@a{#1}%
@@ -693,6 +712,18 @@
\def\documentstyle{%
\makeatletter\input{pl209.def}\makeatother
\documentclass}
+\ifx\lastnodesubtype\@undefined
+ \let\removejfmglue\@undefined
+\else
+ \def\pltx@gluetype{11}
+ \def\pltx@jfmgluesubtype{21}
+ \protected\def\removejfmglue{%
+ \ifnum\lastnodetype=\pltx@gluetype\relax
+ \ifnum\lastnodesubtype=\pltx@jfmgluesubtype\relax
+ \unskip
+ \fi
+ \fi}
+\fi
\def\cleardoublepage{\clearpage\if@twoside
\ifodd\c@page
\iftdir
@@ -1023,6 +1054,7 @@
\newcommand\printglossary{\@input@{\jobname.gls}}
\newcount\hour
\newcount\minute
+\ifx\removejfmglue\@undefined
\def\@tabclassz{%
\ifcase\@lastchclass
\@acolampacol
@@ -1046,8 +1078,39 @@
\or
\hfil\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}% % r
\fi}}}
-\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces
+\else
+\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\removejfmglue\hfil % c
+ \or
+ \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue\hfil % l
+ \or
+ \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue % r
+ \fi}}}
+\fi
+\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\pltx@next@inhibitglue\ignorespaces
\@sharp\unskip\@endpbox}}
+\protected\def\pltx@next@inhibitglue{%
+ \ifhmode\inhibitglue\else
+ \edef\@tempa{\everypar{\inhibitglue
+ \everypar{\unexpanded\expandafter{\the\everypar}}%
+ \unexpanded\expandafter{\the\everypar}}}%
+ \@tempa\fi}
\def\@tabular{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol
\let\@classz\@tabclassz
\let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray}
@@ -1085,13 +1148,8 @@
\let\e@alloc@chardef\mathchardef
\fi
\else
- \ifx\enablecjktoken\@undefined % pTeX
\omathchardef\e@alloc@top=65535
\let\e@alloc@chardef\omathchardef
- \else % upTeX
- \chardef\e@alloc@top=65535
- \let\e@alloc@chardef\chardef
- \fi
\fi
\ifx\omathchar\@undefined
\chardef\e@mathgroup@top=16 % LaTeX2e kernel standard