summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/base/latex.ltx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/base/latex.ltx')
-rw-r--r--Master/texmf-dist/tex/latex/base/latex.ltx81
1 files changed, 56 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx
index 32a77c5d1ff..2d76c20aff3 100644
--- a/Master/texmf-dist/tex/latex/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex/base/latex.ltx
@@ -342,8 +342,11 @@
\def\newwrite {\e@alloc\write \chardef{\count17}\m@ne\sixt@@n}
\else
\def\newwrite {\e@alloc\write
- {\ifnum\allocationnumber=18 \allocationnumber19\fi
- \global\chardef}%
+ {\ifnum\allocationnumber=18
+ \advance\count17\@ne
+ \allocationnumber\count17 %
+ \fi
+ \global\chardef}%
{\count17}%
\m@ne
{128}}
@@ -421,7 +424,7 @@
\fi}%
\fi
\def\alloc@#1#2#3#4#5{\global\advance\count1#1\@ne
- \ch@ck#1#4#2% make sure there's still room
+ \ch@ck#1#4#2%
\allocationnumber\count1#1%
\global#3#5\allocationnumber
\wlog{\string#5=\string#2\the\allocationnumber}}
@@ -697,8 +700,8 @@
%%% From File: ltvers.dtx
\def\fmtname{LaTeX2e}
\edef\fmtversion
- {2017/01/01}
-\def\patch@level{3}
+ {2017-04-15}
+\def\patch@level{0}
\iffalse
\def\reserved@a#1/#2/#3\@nil{%
\count@\year
@@ -769,9 +772,7 @@
\immediate\write\@unused{#1}\endgroup}
\newlinechar`\^^J
\let\@@par=\par
-\let\@@hyph=\- % Save original primitive definition
-\def\-{\discretionary{-}{}{}}
-\let\@dischyph=\-
+\let\@@hyph=\-
\let\@@italiccorr=\/
\def\@height{height} \def\@depth{depth} \def\@width{width}
\def\@minus{minus}
@@ -1071,6 +1072,17 @@
\edef #1{\expandafter\strip@prefix
\meaning #1}%
}
+\def\@latex@info#1{}
+\DeclareRobustCommand{\-}{%
+ \discretionary{%
+ \char \ifnum\hyphenchar\font<\z@
+ \defaulthyphenchar
+ \else
+ \hyphenchar\font
+ \fi
+ }{}{}%
+}
+\let\@dischyph=\-
%%% From File: ltalloc.dtx
\chardef\@xxxii=32
\mathchardef\@Mi=10001
@@ -1641,6 +1653,9 @@ Type H <return> for immediate help.}%
\let\normalsfcodes\nonfrenchspacing
\fi
\fi
+ \ifx\document@default@language\m@ne
+ \chardef\document@default@language\language
+ \fi
\@noskipsecfalse
\let \@refundefined \relax
\let\AtBeginDocument\@firstofone
@@ -1895,6 +1910,12 @@ Type H <return> for immediate help.}%
\def\hmode@bgroup{\leavevmode\bgroup}
\def\DeclareTextCompositeCommand#1#2#3#4{%
\expandafter\let\expandafter\reserved@a\csname#2\string#1\endcsname
+ \ifx\reserved@a\relax
+ \DeclareTextCommand#1{#2}{%
+ \@latex@error{\string#1 undeclared in encoding #2}\@eha}%
+ \@latex@info{Composite with undeclared \string#1 in encoding #2}%
+ \expandafter\let\expandafter\reserved@a\csname#2\string#1\endcsname
+ \fi
\expandafter\expandafter\expandafter\ifx
\expandafter\@car\reserved@a\relax\relax\@nil \@text@composite \else
\edef\reserved@b##1{%
@@ -1907,7 +1928,8 @@ Type H <return> for immediate help.}%
\expandafter\reserved@b\expandafter{\reserved@a{##1}}%
\fi
\expandafter\def\csname\expandafter\string\csname
- #2\endcsname\string#1-\string#3\@empty\endcsname{#4}}
+ #2\endcsname\string#1-\string#3\@empty\endcsname{#4}%
+ }
\@onlypreamble\DeclareTextCompositeCommand
\def\@text@composite#1#2#3\@text@composite{%
\expandafter\@text@composite@x
@@ -4199,6 +4221,7 @@ Type H <return> for immediate help.}%
\leftskip\@totalleftmargin\rightskip\z@skip
\parindent\z@\parfillskip\@flushglue\parskip\z@skip
\@@par
+ \language\l@nohyphenation
\@tempswafalse
\def\par{%
\if@tempswa
@@ -4209,7 +4232,6 @@ Type H <return> for immediate help.}%
\fi}%
\let\do\@makeother \dospecials
\obeylines \verbatim@font \@noligs
- \hyphenchar\font\m@ne
\everypar \expandafter{\the\everypar \unpenalty}%
}
\def\verbatim{\@verbatim \frenchspacing\@vobeyspaces \@xverbatim}
@@ -4230,6 +4252,7 @@ Type H <return> for immediate help.}%
\bgroup
\verb@eol@error \let\do\@makeother \dospecials
\verbatim@font\@noligs
+ \language\l@nohyphenation
\@ifstar\@sverb\@verb}
\def\@sverb#1{%
\catcode`#1\active
@@ -4943,7 +4966,9 @@ Type H <return> for immediate help.}%
\linewidth\hsize
\@totalleftmargin\z@
\leftskip\z@skip \rightskip\z@skip \@rightskip\z@skip
- \parfillskip\@flushglue \lineskip\normallineskip
+ \parfillskip\@flushglue
+ \lineskip\normallineskip
+ \lineskiplimit\normallineskiplimit
\baselineskip\normalbaselineskip
\sloppy}
\def\@parboxrestore{\@arrayparboxrestore\let\\\@normalcr}
@@ -6569,6 +6594,14 @@ Type H <return> for immediate help.}%
\fi
\if@nobreak \@nobreakfalse \everypar{}\fi
\par
+ \ifdim\prevdepth>\z@
+ \vskip -%
+ \ifdim\prevdepth>\maxdepth
+ \maxdepth
+ \else
+ \prevdepth
+ \fi
+ \fi
\vfil
\penalty -\@M}
\def \@emptycol {\vbox{}\penalty -\@M}
@@ -6837,8 +6870,9 @@ Type H <return> for immediate help.}%
\let'\active@math@prime}%
\endgroup
\def\@outputpage{%
-\begingroup % the \endgroup is put in by \aftergroup
+\begingroup
\let \protect \noexpand
+ \language\document@default@language
\@resetactivechars
\global\let\@@if@newlist\if@newlist
\global\@newlistfalse
@@ -6847,8 +6881,6 @@ Type H <return> for immediate help.}%
\set@typeset@protect
\aftergroup \endgroup
\aftergroup \set@typeset@protect
- % correct? or just restore by ending
- % the group?
\if@specialpage
\global\@specialpagefalse\@nameuse{ps@\@specialstyle}%
\fi
@@ -6875,7 +6907,7 @@ Type H <return> for immediate help.}%
\normalcolor
\hb@xt@\textwidth{\@thehead}%
\color@endbox
- }% %% 22 Feb 87
+ }%
\dp\@tempboxa \z@
\box\@tempboxa
\vskip \headsep
@@ -7555,7 +7587,11 @@ Type H <return> for immediate help.}%
\expandafter\@firstoftwo
\fi}
\@onlypreamble\@ifl@t@r
-\def\@parse@version#1/#2/#3#4#5\@nil{#1#2#3#4 }
+\def\@parse@version#1/#2/#3#4#5\@nil{%
+\@parse@version@dash#1-#2-#3#4\@nil
+}
+\def\@parse@version@dash#1-#2-#3#4#5\@nil{%
+ \if\relax#2\relax\else#1\fi#2#3#4 }
\def\@ifpackagewith{\@if@ptions\@pkgextension}
\def\@ifclasswith{\@if@ptions\@clsextension}
\@onlypreamble\@ifpackagewith
@@ -8167,14 +8203,6 @@ Type H <return> for immediate help.}%
\everyjob\expandafter{%
\the\everyjob
\directlua{%
-%% Horrible hack, locally reset the luatex version number
-%% This is not required for the source version of luaotfload
-%% but is required due to an error in the version check in the
-%% public version (January 2017)
-%% https://github.com/lualatex/luaotfload/issues/387
-%% It is expected that this will be removed before TeXLive 2017
- local tmp_version=tex.luatexversion %
- tex.luatexversion=199 %
if xpcall(function ()%
require('luaotfload-main')%
end,texio.write_nl) then %
@@ -8183,7 +8211,6 @@ Type H <return> for immediate help.}%
texio.write_nl('Error in luaotfload: reverting to OT1')%
tex.print('\string\\def\string\\encodingdefault{OT1}')%
end %
- tex.luatexversion=tmp_version%
}%
\let\f@encoding\encodingdefault
\expandafter\let\csname ver@luaotfload.sty\endcsname\fmtversion
@@ -8287,6 +8314,10 @@ Type H <return> for immediate help.}%
}
{\input{hyphen.ltx}}
\let\@addtofilelist\@gobble
+\ifx\l@nohyphenation \@undefined
+ \newlanguage\l@nohyphenation
+\fi
+\let\document@default@language\m@ne
\ifdim \font@submax >\z@
\@font@warning{Size substitutions with differences\MessageBreak
up to \font@submax\space have occurred.\MessageBreak