diff options
author | Karl Berry <karl@freefriends.org> | 2017-04-16 22:05:53 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-04-16 22:05:53 +0000 |
commit | 8e7cee93b8e73580a81e4d353d4843345b2c2998 (patch) | |
tree | 2fc7e286869016f51b0a334d7d085740cbc3576b /Master/texmf-dist/tex/platex/base/plcore.ltx | |
parent | d1a1a8aa97b00e8dfb3d1b8366c29591e0a65ea7 (diff) |
platex (16apr17)
git-svn-id: svn://tug.org/texlive/trunk@43852 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex/base/plcore.ltx')
-rw-r--r-- | Master/texmf-dist/tex/platex/base/plcore.ltx | 49 |
1 files changed, 36 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 57453dce9d3..775b33fd921 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 - {2016/11/29} + {2017/04/08} \def\ppatch@level{0} \def\plIncludeInRelease#1{\kernel@ifnextchar[% {\@plIncludeInRelease{#1}} @@ -82,9 +82,11 @@ \let\notffam@list\kfam@list \newbox\tstrutbox \newbox\zstrutbox +\newbox\ystrutbox +\def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi} \def\strut{\relax \ifydir - \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi \else \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi \fi} @@ -92,6 +94,8 @@ \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}} \def\zstrut{\relax\hbox{\tate \ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}} +\def\ystrut{\relax\hbox{\yoko + \ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}} \def\DeclareFontEncoding{% \begingroup \nfss@catcodes @@ -427,7 +431,7 @@ \baselineskip\f@linespread\baselineskip \normalbaselineskip\baselineskip \adjustbaseline - \setbox\strutbox\hbox{\yoko + \setbox\ystrutbox\hbox{\yoko \vrule\@width\z@ \@height.7\baselineskip \@depth.3\baselineskip}% \setbox\tstrutbox\hbox{\tate @@ -632,7 +636,9 @@ \@onlypreamble\kanjiprocess@table \DeclareTextCommandDefault{\textunderscore}{% \leavevmode\kern.06em - \iftdir\raise-\tbaselineshift\fi + \raise-\iftdir\ifmdir\ybaselineshift + \else\tbaselineshift\fi + \else\ybaselineshift\fi \vbox{\hrule\@width.3em}} \InputIfFileExists{pldefs.cfg} {\typeout{*************************************^^J% @@ -689,9 +695,25 @@ \fi} \gdef\@makecol{% \setbox\@outputbox\box\@cclv% + \let\@elt\relax % added on LaTeX (ltoutput.dtx 2003/12/16 v1.2k) \xdef\@freelist{\@freelist\@midlist}% \global \let \@midlist \@empty \@combinefloats + \let\pltx@textbottom\@textbottom % save (pLaTeX 2017/02/25) + \ifvoid\footins\else % changed (pLaTeX 2017/02/25) + \setbox\@outputbox \vbox {% + \boxmaxdepth \@maxdepth + \unvbox \@outputbox + \@textbottom % inserted here (pLaTeX 2017/02/25) + \vskip \skip\footins + \color@begingroup + \normalcolor + \footnoterule + \unvbox \footins + \color@endgroup + }% + \let\@textbottom\relax % disable temporarily (pLaTeX 2017/02/25) + \fi \ifvbox\@kludgeins \@makespecialcolbox \else @@ -702,16 +724,9 @@ \iftdir\vbox{\hskip\z@}\fi \vskip -\dimen@ \@textbottom - \ifvoid\footins\else % for pLaTeX - \vskip \skip\footins - \color@begingroup - \normalcolor - \footnoterule - \unvbox \footins - \color@endgroup - \fi }% \fi + \let\@textbottom\pltx@textbottom % restore (pLaTeX 2017/02/25) \global \maxdepth \@maxdepth } \gdef\@makespecialcolbox{% @@ -849,6 +864,7 @@ \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@ \fi \let \protect \noexpand + \language\document@default@language \@resetactivechars \global\let\@@if@newlist\if@newlist \global\@newlistfalse @@ -963,13 +979,14 @@ \@latex@warning{Reference `#3' on page \thepage \space undefined}% \else - \expandafter#2#1\relax% change \null to \relax + \expandafter#2#1\relax{}% change \null to \relax{} \fi} \if@compatibility\else \def\verb{\relax\ifmmode\hbox\else\leavevmode\fi \bgroup \verb@eol@error \let\do\@makeother \dospecials \verbatim@font\@noligs + \language\l@nohyphenation \@ifstar\@sverb\@verb} \fi \gdef\@stopfield{\null\color@endgroup\egroup} @@ -1058,6 +1075,12 @@ } \expandafter \endgroup \platexTMP +\ifx\l@nohyphenation \@undefined + \newlanguage\l@nohyphenation +\fi +\ifx\document@default@language \@undefined + \let\document@default@language\m@ne +\fi \AtBeginDocument{% \@ifpackageloaded{latexrelease}{% \@ifpackageloaded{platexrelease}{}{% |