summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/base/latexrelease.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-22 23:37:33 +0000
committerKarl Berry <karl@freefriends.org>2017-01-22 23:37:33 +0000
commitb2ba0afced5c10391750914c16a2aa06cfaa6a96 (patch)
tree8a87b0b92f0038639e1078486bb4c2a56bcea2d3 /Master/texmf-dist/tex/latex/base/latexrelease.sty
parentbc46c8f4627710df445115626d25161dcb2df985 (diff)
latex2e (22jan17)
git-svn-id: svn://tug.org/texlive/trunk@43024 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/base/latexrelease.sty')
-rw-r--r--Master/texmf-dist/tex/latex/base/latexrelease.sty321
1 files changed, 288 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty
index 2b373673db6..d0c4ba71b84 100644
--- a/Master/texmf-dist/tex/latex/base/latexrelease.sty
+++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty
@@ -16,6 +16,7 @@
%% ltlength.dtx (with options: `latexrelease')
%% ltfloat.dtx (with options: `latexrelease')
%% ltoutput.dtx (with options: `latexrelease')
+%% ltclass.dtx (with options: `latexrelease')
%% ltspace.dtx (with options: `latexrelease')
%% ltplain.dtx (with options: `latexrelease')
%% ltfssdcl.dtx (with options: `latexrelease')
@@ -62,7 +63,7 @@
%% extension .ins) which are part of the distribution.
%%% From File: ltvers.dtx
\edef\latexreleaseversion
- {2016/03/31}
+ {2017/01/01}
\def\IncludeInRelease#1{\kernel@ifnextchar[%
{\@IncludeInRelease{#1}}
{\@IncludeInRelease{#1}[#1]}}
@@ -86,7 +87,7 @@
\long\def\@gobble@IncludeInRelease#1\EndIncludeInRelease{}
\let\EndIncludeInRelease\relax
\ProvidesPackage{latexrelease}
- [2016/07/04 v1.0g LaTeX release emulation and tests]
+ [2016/12/29 v1.0h LaTeX release emulation and tests]
\NeedsTeXFormat{LaTeX2e}[1996/06/01]
\DeclareOption*{%
\def\@IncludeInRelease#1[#2]{\@IncludeInRele@se{#1}}%
@@ -218,6 +219,7 @@ of this package available from CTAN}
\@ifnextchar(%)
\@makepicbox
{\@ifnextchar[\@makebox\mbox}}%
+\expandafter\let\csname makebox \endcsname\@undefined
\EndIncludeInRelease
\IncludeInRelease{2015/01/01}%
{\savebox}{Make \savebox robust}%
@@ -230,6 +232,7 @@ of this package available from CTAN}
\def\savebox#1{%
\@ifnextchar(%)
{\@savepicbox#1}{\@ifnextchar[{\@savebox#1}{\sbox#1}}}%
+\expandafter\let\csname savebox \endcsname\@undefined
\EndIncludeInRelease
\IncludeInRelease{2015/01/01}%
{\framebox}{Make \framebox robust}%
@@ -242,6 +245,7 @@ of this package available from CTAN}
\def\framebox{%
\@ifnextchar(%)
\@framepicbox{\@ifnextchar[\@framebox\fbox}}%
+\expandafter\let\csname framebox \endcsname\@undefined
\EndIncludeInRelease
\IncludeInRelease{2015/01/01}%
{\parbox}{Make \parbox robust}%
@@ -256,6 +260,7 @@ of this package available from CTAN}
\@ifnextchar[%]
\@iparbox
{\@iiiparbox c\relax[s]}}%
+\expandafter\let\csname parbox \endcsname\@undefined
\EndIncludeInRelease
\IncludeInRelease{2015/01/01}%
{\rule}{Make \rule robust}%
@@ -264,6 +269,7 @@ of this package available from CTAN}
\IncludeInRelease{0000/00/00}%
{\rule}{Make \rule robust}%
\def\rule{\@ifnextchar[\@rule{\@rule[\z@]}}%
+\expandafter\let\csname rule \endcsname\@undefined
\EndIncludeInRelease
\IncludeInRelease{2015/01/01}%
{\raisebox}{Make \raisebox robust}%
@@ -276,6 +282,7 @@ of this package available from CTAN}
\def\raisebox#1{%
\leavevmode
\@ifnextchar[{\@rsbox{#1}}{\@irsbox{#1}[]}}
+\expandafter\let\csname raisebox \endcsname\@undefined
\EndIncludeInRelease
%%% From File: ltmath.dtx
\IncludeInRelease{2015/01/01}{\(}{Make \( robust}%
@@ -287,8 +294,10 @@ of this package available from CTAN}
\IncludeInRelease{0000/00/00}{\(}{Make \( robust}%
\def\({%
\relax\ifmmode\@badmath\else$\fi}%
+\expandafter\let\csname\string( \endcsname\@undefined
\def\){%
\relax\ifmmode\ifinner$\else\@badmath\fi\else \@badmath\fi}%
+\expandafter\let\csname\string) \endcsname\@undefined
\EndIncludeInRelease
\IncludeInRelease{2015/01/01}{\[}{Make \[ robust}%
\DeclareRobustCommand\[{%
@@ -327,6 +336,7 @@ of this package available from CTAN}
$$%%$$ BRACE MATCH HACK
\fi
}%
+\expandafter\let\csname\string[ \endcsname\@undefined
\def\]{%
\relax\ifmmode
\ifinner
@@ -339,6 +349,7 @@ of this package available from CTAN}
\fi
\ignorespaces
}%
+\expandafter\let\csname\string] \endcsname\@undefined
\EndIncludeInRelease
%%% From File: ltpictur.dtx
\IncludeInRelease{2016/03/31}%
@@ -435,15 +446,24 @@ of this package available from CTAN}
\EndIncludeInRelease
\IncludeInRelease{0000/00/00}{\textcommabelow}{comma accent}%
\let\textcommabelow\@undefined
-\expandafter\let\csname\string\T1\string\c-G\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-K\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-k\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-L\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-l\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-N\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-n\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-R\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-r\endcsname\@undefined
+\expandafter
+ \let\csname\string\T1\string\c-G\endcsname\@undefined
+\expandafter
+ \let\csname\string\T1\string\c-K\endcsname\@undefined
+\expandafter
+ \let\csname\string\T1\string\c-k\endcsname\@undefined
+\expandafter
+ \let\csname\string\T1\string\c-L\endcsname\@undefined
+\expandafter
+ \let\csname\string\T1\string\c-l\endcsname\@undefined
+\expandafter
+ \let\csname\string\T1\string\c-N\endcsname\@undefined
+\expandafter
+ \let\csname\string\T1\string\c-n\endcsname\@undefined
+\expandafter
+ \let\csname\string\T1\string\c-R\endcsname\@undefined
+\expandafter
+ \let\csname\string\T1\string\c-r\endcsname\@undefined
\EndIncludeInRelease
\IncludeInRelease{2016/02/01}{\textcommaabove}{comma above}%
\DeclareTextCommandDefault\textcommaabove[1]{%
@@ -461,8 +481,10 @@ of this package available from CTAN}
\EndIncludeInRelease
\IncludeInRelease{0000/00/00}{\textcommaabove}{comma above}%
\let\textcommaabove\@undefined
-\expandafter\let\csname\string\OT1\string\c-g\endcsname\@undefined
-\expandafter\let\csname\string\T1\string\c-g\endcsname\@undefined
+\expandafter
+ \let\csname\string\OT1\string\c-g\endcsname\@undefined
+\expandafter
+ \let\csname\string\T1\string\c-g\endcsname\@undefined
\EndIncludeInRelease
%%% From File: ltcounts.dtx
\IncludeInRelease{2015/01/01}{\@stpelt}
@@ -495,7 +517,7 @@ of this package available from CTAN}
\EndIncludeInRelease
\IncludeInRelease{2015/01/01}{\TextOrMath}{\TextOrMath}%
\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname eTeXversion\endcsname\relax
+\expandafter\ifx\csname protected\endcsname\relax
\DeclareRobustCommand\TextOrMath{%
\ifmmode \expandafter\@secondoftwo
\else \expandafter\@firstoftwo \fi}
@@ -1241,6 +1263,26 @@ of this package available from CTAN}
\endgroup
}%
\EndIncludeInRelease
+\IncludeInRelease{2017/01/01}%
+ {\@makefcolumn}{negative height floats}%
+\def\@makefcolumn #1{%
+ \begingroup
+ \@fpmin -\maxdimen
+ \let \@testfp \@gobble
+ \@tryfcolumn #1%
+ \endgroup
+}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+ {\@makefcolumn}{negative height floats}%
+\def\@makefcolumn #1{%
+ \begingroup
+ \@fpmin \z@
+ \let \@testfp \@gobble
+ \@tryfcolumn #1%
+ \endgroup
+}
+\EndIncludeInRelease
\IncludeInRelease{2015/01/01}%
{\@outputdblcol}{2 column marks}%
\def\@outputdblcol{%
@@ -1314,6 +1356,112 @@ of this package available from CTAN}
\fi
}%
\EndIncludeInRelease
+%%% From File: ltclass.dtx
+\IncludeInRelease{2017/01/01}%
+ {\@if@pti@ns}{Spaces in option clash check}%
+\def\@if@pti@ns#1#2{%
+ \let\reserved@a\@firstoftwo
+ \edef\reserved@b{\zap@space#2 \@empty}%
+ \@for\reserved@b:=\reserved@b\do{%
+ \ifx\reserved@b\@empty
+ \else
+ \expandafter\in@\expandafter{\expandafter,\reserved@b,}{,#1,}%
+ \ifin@
+ \else
+ \let\reserved@a\@secondoftwo
+ \fi
+ \fi
+ }%
+ \reserved@a}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+ {\@if@pti@ns}{Spaces in option clash check}%
+\def\@if@pti@ns#1#2{%
+ \let\reserved@a\@firstoftwo
+ \@for\reserved@b:=#2\do{%
+ \ifx\reserved@b\@empty
+ \else
+ \expandafter\in@\expandafter
+ {\expandafter,\reserved@b,}{,#1,}%
+ \ifin@
+ \else
+ \let\reserved@a\@secondoftwo
+ \fi
+ \fi
+ }%
+ \reserved@a}
+\IncludeInRelease{2017/01/01}%
+ {\@if@pti@ns}{Spaces in \ExecuteOptions}%
+\def\ExecuteOptions#1{%
+ \edef\@fortmp{\zap@space#1 \@empty}%
+ \def\reserved@a##1\@nil{%
+ \@for\CurrentOption:=\@fortmp\do
+ {\csname ds@\CurrentOption\endcsname}%
+ \edef\CurrentOption{##1}}%
+ \expandafter\reserved@a\CurrentOption\@nil}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+ {\@if@pti@ns}{Spaces in \ExecuteOptions}%
+\def\ExecuteOptions#1{%
+ \def\reserved@a##1\@nil{%
+ \@for\CurrentOption:=#1\do
+ {\csname ds@\CurrentOption\endcsname}%
+ \edef\CurrentOption{##1}}%
+ \expandafter\reserved@a\CurrentOption\@nil}
+\IncludeInRelease{2017/01/01}%
+ {\@fileswith@pti@ns}{ifx tests in \@fileswith@pti@ns}%
+\def\@fileswith@pti@ns#1[#2]#3[#4]{%
+ \ifx#1\@clsextension
+ \ifx\@classoptionslist\relax
+ \xdef\@classoptionslist{\zap@space#2 \@empty}%
+ \def\reserved@a{%
+ \@onefilewithoptions#3[{#2}][{#4}]#1%
+ \@documentclasshook}%
+ \else
+ \def\reserved@a{%
+ \@onefilewithoptions#3[{#2}][{#4}]#1}%
+ \fi
+ \else
+ \def\reserved@b##1,{%
+ \ifx\@nnil##1\relax\else
+ \ifx\@nnil##1\@nnil\else
+ \noexpand\@onefilewithoptions##1[{#2}][{#4}]%
+ \noexpand\@pkgextension
+ \fi
+ \expandafter\reserved@b
+ \fi}%
+ \edef\reserved@a{\zap@space#3 \@empty}%
+ \edef\reserved@a{\expandafter\reserved@b\reserved@a,\@nnil,}%
+ \fi
+ \reserved@a}
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+ {\@fileswith@pti@ns}{ifx tests in \@fileswith@pti@ns}%
+\def\@fileswith@pti@ns#1[#2]#3[#4]{%
+ \ifx#1\@clsextension
+ \ifx\@classoptionslist\relax
+ \xdef\@classoptionslist{\zap@space#2 \@empty}%
+ \def\reserved@a{%
+ \@onefilewithoptions#3[{#2}][{#4}]#1%
+ \@documentclasshook}%
+ \else
+ \def\reserved@a{%
+ \@onefilewithoptions#3[{#2}][{#4}]#1}%
+ \fi
+ \else
+ \def\reserved@b##1,{%
+ \ifx\@nil##1\relax\else
+ \ifx\relax##1\relax\else
+ \noexpand\@onefilewithoptions##1[{#2}][{#4}]%
+ \noexpand\@pkgextension
+ \fi
+ \expandafter\reserved@b
+ \fi}%
+ \edef\reserved@a{\zap@space#3 \@empty}%
+ \edef\reserved@a{%
+ \expandafter\reserved@b\reserved@a,\@nil,}%
+ \fi
+ \reserved@a}
%%% From File: ltspace.dtx
\IncludeInRelease{2015/10/01}%
{\@esphack}{hyphenation after space hack}%
@@ -1470,8 +1618,12 @@ of this package available from CTAN}
\fi
\def\new@mathgroup
{\e@alloc\mathgroup\chardef{\count18}\m@ne\e@mathgroup@top}
-\def\newlanguage {\e@alloc\language \chardef{\count19}\m@ne\@cclvi}
\let\newfam\new@mathgroup
+\ifx\directlua\@undefined
+ \def\newlanguage {\e@alloc\language \chardef{\count19}\m@ne\@cclvi}
+\else
+ \def\newlanguage {\e@alloc\language \chardef{\count19}\m@ne{16384}}
+\fi
\EndIncludeInRelease
\IncludeInRelease{0000/00/00}%
{\newcount}{Extended Allocation}%
@@ -1984,6 +2136,78 @@ of this package available from CTAN}
\csname\curr@fontshape/\f@size\endcsname}%
\pickup@font}
\EndIncludeInRelease
+\IncludeInRelease{2017/01/01}{\showhyphens}%
+ {XeTeX support for \showhyphens}%
+\ifx\XeTeXcharclass\@undefined
+\gdef\showhyphens#1{%
+ \setbox0\vbox{%
+ \color@begingroup
+ \everypar{}%
+ \parfillskip\z@skip\hsize\maxdimen
+ \normalfont
+ \pretolerance\m@ne\tolerance\m@ne\hbadness\z@\showboxdepth\z@\ #1%
+ \color@endgroup}}
+\else
+\long\def\showhyphens#1{%
+ \setbox0\vbox{%
+ \usefont{TU}{lmr}{m}{n}%
+ \hsize 1sp %
+ \hbadness\@M
+ \hfuzz\maxdimen
+ \tracingonline\z@
+ \everypar={}%
+ \leftskip\z@skip
+ \rightskip\z@skip
+ \parfillskip\z@skip
+ \hyphenpenalty=-\@M
+ \pretolerance\m@ne
+ \interlinepenalty\z@
+ \clubpenalty\z@
+ \widowpenalty\z@
+ \brokenpenalty1127 %
+ \setbox\z@\hbox{}%
+ \noindent
+ \hskip\z@skip
+ #1%
+ \par
+ \loop
+ \@tempswafalse
+ \ifnum\lastnodetype=11\unskip\@tempswatrue\fi
+ \ifnum\lastnodetype=12\unkern\@tempswatrue\fi
+ \ifnum\lastnodetype=13 %
+ \count@\lastpenalty
+ \unpenalty\@tempswatrue
+ \fi
+ \ifnum\lastnodetype=\@ne
+ \setbox\tw@\lastbox\@tempswatrue
+ \setbox0\hbox{\unhbox\tw@\unskip\unskip\unpenalty
+ \ifnum\count@=1127 \else\ \fi
+ \unhbox0}%
+ \count@\z@
+ \fi
+ \if@tempswa
+ \repeat
+ \hbadness\z@
+ \hsize\maxdimen
+ \showboxdepth\z@
+ \tolerance\m@ne
+ \hyphenpenalty\z@
+ \noindent\unhbox\z@
+}}
+\fi
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}{\showhyphens}%
+ {XeTeX support for \showhyphens}%
+\gdef\showhyphens#1{%
+ \setbox0\vbox{%
+ \color@begingroup
+ \everypar{}%
+ \parfillskip\z@skip\hsize\maxdimen
+ \normalfont
+ \pretolerance\m@ne\tolerance\m@ne
+ \hbadness\z@\showboxdepth\z@\ #1%
+ \color@endgroup}}
+\EndIncludeInRelease
%%% From File: ltfsscmp.dtx
%% Copyright (C) 1989-1995 Frank Mittelbach and Rainer Sch\"opf,
%% all rights reserved.
@@ -2307,6 +2531,37 @@ of this package available from CTAN}
\let\e@alloc@luachunk@count\@undefined
\directlua{luatexbase.uninstall()}
\EndIncludeInRelease
+\IncludeInRelease{2017/01/01}%
+ {\fontencoding}{TU in everyjob}%
+\fontencoding{TU}\let\encodingdefault\f@encoding
+\ifx\directlua\@undefined\else
+ \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 %
+ local _void = luaotfload.main ()%
+ else %
+ 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
+\fi
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+ {\fontencoding}{TU in everyjob}%
+\fontencoding{OT1}\let\encodingdefault\f@encoding
+\EndIncludeInRelease
\fi
%%% From File: ltfinal.dtx
\IncludeInRelease{2015/01/01}%
@@ -2412,24 +2667,24 @@ of this package available from CTAN}
{\XeTeXintercharclasses}{XeTeX character classes}%
\ifx\XeTeXinterchartoks\undefined
\else
- \input{load-unicode-xetex-classes}
- \gdef\xtxHanGlue{\hskip0pt plus 0.1em\relax}
- \gdef\xtxHanSpace{\hskip0.2em plus 0.2em minus 0.1em\relax}
- \global\XeTeXinterchartoks 0 1 = {\xtxHanSpace}
- \global\XeTeXinterchartoks 0 2 = {\xtxHanSpace}
- \global\XeTeXinterchartoks 0 3 = {\nobreak\xtxHanSpace}
- \global\XeTeXinterchartoks 1 0 = {\xtxHanSpace}
- \global\XeTeXinterchartoks 2 0 = {\nobreak\xtxHanSpace}
- \global\XeTeXinterchartoks 3 0 = {\xtxHanSpace}
- \global\XeTeXinterchartoks 1 1 = {\xtxHanGlue}
- \global\XeTeXinterchartoks 1 2 = {\xtxHanGlue}
- \global\XeTeXinterchartoks 1 3 = {\nobreak\xtxHanGlue}
- \global\XeTeXinterchartoks 2 1 = {\nobreak\xtxHanGlue}
- \global\XeTeXinterchartoks 2 2 = {\nobreak\xtxHanGlue}
- \global\XeTeXinterchartoks 2 3 = {\xtxHanGlue}
- \global\XeTeXinterchartoks 3 1 = {\xtxHanGlue}
- \global\XeTeXinterchartoks 3 2 = {\xtxHanGlue}
- \global\XeTeXinterchartoks 3 3 = {\nobreak\xtxHanGlue}
+ \input{load-unicode-xetex-classes}
+ \gdef\xtxHanGlue{\hskip0pt plus 0.1em\relax}
+ \gdef\xtxHanSpace{\hskip0.2em plus 0.2em minus 0.1em\relax}
+ \global\XeTeXinterchartoks 0 1 = {\xtxHanSpace}
+ \global\XeTeXinterchartoks 0 2 = {\xtxHanSpace}
+ \global\XeTeXinterchartoks 0 3 = {\nobreak\xtxHanSpace}
+ \global\XeTeXinterchartoks 1 0 = {\xtxHanSpace}
+ \global\XeTeXinterchartoks 2 0 = {\nobreak\xtxHanSpace}
+ \global\XeTeXinterchartoks 3 0 = {\xtxHanSpace}
+ \global\XeTeXinterchartoks 1 1 = {\xtxHanGlue}
+ \global\XeTeXinterchartoks 1 2 = {\xtxHanGlue}
+ \global\XeTeXinterchartoks 1 3 = {\nobreak\xtxHanGlue}
+ \global\XeTeXinterchartoks 2 1 = {\nobreak\xtxHanGlue}
+ \global\XeTeXinterchartoks 2 2 = {\nobreak\xtxHanGlue}
+ \global\XeTeXinterchartoks 2 3 = {\xtxHanGlue}
+ \global\XeTeXinterchartoks 3 1 = {\xtxHanGlue}
+ \global\XeTeXinterchartoks 3 2 = {\xtxHanGlue}
+ \global\XeTeXinterchartoks 3 3 = {\nobreak\xtxHanGlue}
\fi
\EndIncludeInRelease
\endinput