summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/uplatex/base/uplcore.ltx')
-rw-r--r--Master/texmf-dist/tex/uplatex/base/uplcore.ltx58
1 files changed, 44 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
index aeeb9c746b3..6fd6af1b9e1 100644
--- a/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
+++ b/Master/texmf-dist/tex/uplatex/base/uplcore.ltx
@@ -19,7 +19,7 @@
%% File: uplvers.dtx
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
- {2016/11/29u01}
+ {2017/04/08u01}
\def\ppatch@level{0}
\def\plIncludeInRelease#1{\kernel@ifnextchar[%
{\@plIncludeInRelease{#1}}
@@ -83,9 +83,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}
@@ -93,6 +95,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
@@ -428,7 +432,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
@@ -633,7 +637,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{upldefs.cfg}
{\typeout{*************************************^^J%
@@ -690,9 +696,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
@@ -703,16 +725,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{%
@@ -850,6 +865,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
@@ -964,13 +980,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}
@@ -1029,7 +1046,14 @@
\fi
%% File: uplvers.dtx
\def\documentstyle{%
- \@latex@error{upLaTeX does NOT support LaTeX 2.09 compatibility mode}\@ehc
+ \@latex@error{upLaTeX does NOT support LaTeX 2.09 compatibility
+ mode.\MessageBreak Use \noexpand\documentclass instead}{%
+ \noexpand\documentstyle is an old convention of LaTeX 2.09,
+ which has been\MessageBreak obsolete since 1995. upLaTeX is
+ first released in 2007, so we do\MessageBreak not provide any
+ emulation of the LaTeX 2.09 author environment.\MessageBreak
+ New documents should use Standard LaTeX conventions, and
+ start\MessageBreak with the \noexpand\documentclass command.}%
\documentclass}
\ifx\patch@level\@undefined % fallback if undefined in LaTeX
\def\patch@level{0}\fi
@@ -1062,6 +1086,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}{}{%