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.ltx56
1 files changed, 31 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx
index 1057d4b0614..5881f4c7f43 100644
--- a/Master/texmf-dist/tex/latex/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex/base/latex.ltx
@@ -44,7 +44,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -52,12 +52,12 @@
%% --------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This file has the LPPL maintenance status "maintained".
%%
@@ -498,6 +498,11 @@
\def\ooalign{\lineskiplimit-\maxdimen \oalign}
\def\sh@ft#1{\dimen@.00#1ex\multiply\dimen@\fontdimen1\font
\kern-.0156\dimen@} % compensate for slant in lowered accents
+\def\ltx@sh@ft #1{%
+ \dimen@ #1%
+ \kern \strip@pt
+ \fontdimen1\font \dimen@
+ } % kern by #1 times the current slant
\def\hrulefill{\leavevmode\leaders\hrule\hfill\kern\z@}
\def\dotfill{%
\leavevmode
@@ -516,7 +521,7 @@
\nonfrenchspacing
%%% From File: ltvers.dtx
\def\fmtname{LaTeX2e}
-\edef\fmtversion{2003/12/01}
+\edef\fmtversion{2005/12/01}
\iftrue
\def\reserved@a#1/#2/#3\@nil{%
\count@\year
@@ -1734,6 +1739,8 @@ Type H <return> for immediate help.}%
\DeclareTextSymbolDefault{\ae}{OT1}
\DeclareTextSymbolDefault{\i}{OT1}
\DeclareTextSymbolDefault{\j}{OT1}
+\DeclareTextSymbolDefault{\ij}{OT1}
+\DeclareTextSymbolDefault{\IJ}{OT1}
\DeclareTextSymbolDefault{\l}{OT1}
\DeclareTextSymbolDefault{\oe}{OT1}
\DeclareTextSymbolDefault{\o}{OT1}
@@ -2780,7 +2787,7 @@ Type H <return> for immediate help.}%
}
\@onlypreamble\init@restore@version
\gdef\non@alpherr#1{\@latex@error{%
- \expandafter\@firstoftwo\string#1 allowed only in math mode}\@ehd}
+ \string#1allowed only in math mode}\@ehd}
\def\dorestore@version
{\ifmmode
\aftergroup\dorestore@version
@@ -3031,8 +3038,8 @@ Type H <return> for immediate help.}%
\new@mathalphabet#1{#2}{#3}{#4}{#5}%
\else
\edef\reserved@a{\noexpand\in@{\string\select@group}%
- {\expandafter\meaning\csname @\expandafter
- \@gobble\string#1\endcsname}}%
+ {\expandafter\meaning\csname \expandafter
+ \@gobble\string#1\space\endcsname}}%
\reserved@a
\ifin@
\@font@info{Redeclaring math alphabet \string#1}%
@@ -3040,12 +3047,12 @@ Type H <return> for immediate help.}%
\expandafter\SetMathAlphabet@\expandafter
##1\csname#2/#3/#4/#5\expandafter\endcsname
\csname M@#2\expandafter\endcsname
- \csname @\expandafter\@gobble\string#1\endcsname#1}%
+ \csname \expandafter\@gobble\string#1\space\endcsname#1}%
\version@list
\else
\edef\reserved@a{\noexpand\in@{\string\use@mathgroup}%
- {\expandafter\meaning\csname @\expandafter
- \@gobble\string#1\endcsname}}%
+ {\expandafter\meaning\csname \expandafter
+ \@gobble\string#1\space\endcsname}}%
\reserved@a
\ifin@
\@font@info{Redeclaring math alphabet \string#1}%
@@ -3062,8 +3069,8 @@ Type H <return> for immediate help.}%
\@onlypreamble\DeclareMathAlphabet
\def\new@mathalphabet#1#2#3#4#5{%
\toks@\expandafter{\alpha@list}%
- \edef#1{\expandafter\noexpand\csname @\expandafter
- \@gobble\string#1\endcsname
+ \edef#1{\expandafter\noexpand\csname \expandafter
+ \@gobble\string#1\space\endcsname
\if/#5/%
\noexpand\no@alphabet@error
\noexpand\no@alphabet@error
@@ -3077,8 +3084,8 @@ Type H <return> for immediate help.}%
\def\version@elt##1{\toks@\expandafter{##1}%
\edef##1{\the\toks@\install@mathalphabet
\expandafter\noexpand
- \csname @\expandafter\@gobble
- \string#1\endcsname
+ \csname \expandafter\@gobble
+ \string#1\space\endcsname
{\if/#5/%
\noexpand\no@alphabet@error
\noexpand#1%
@@ -3087,16 +3094,16 @@ Type H <return> for immediate help.}%
\fi}}%
}%
\version@list
- \expandafter\edef\csname @\expandafter\@gobble
- \string#1\endcsname{\if/#5/%
+ \expandafter\edef\csname \expandafter\@gobble
+ \string#1\space\endcsname{\if/#5/%
\noexpand\no@alphabet@error
\noexpand#1%
\else
\noexpand\select@group\the\toks2
\fi}%
\edef#1{\noexpand\protect
- \expandafter\noexpand\csname @\expandafter
- \@gobble\string#1\endcsname}%
+ \expandafter\noexpand\csname \expandafter
+ \@gobble\string#1\space\endcsname}%
}
\@onlypreamble\new@mathalphabet
\def\SetMathAlphabet#1#2#3#4#5#6{%
@@ -3109,7 +3116,7 @@ Type H <return> for immediate help.}%
\expandafter\SetMathAlphabet@
\csname mv@#2\expandafter\endcsname\csname#3/#4/#5/#6\expandafter
\endcsname \csname M@#3\expandafter\endcsname
- \csname @\expandafter\@gobble\string#1\endcsname#1%
+ \csname \expandafter\@gobble\string#1\space\endcsname#1%
\else
\@latex@error{Encoding scheme `#3' unknown}\@eha
\fi
@@ -3468,7 +3475,7 @@ Type H <return> for immediate help.}%
\@onlypreamble\mathchar@type
\def\DeclareSymbolFontAlphabet#1#2{%
\expandafter\DeclareSymbolFontAlphabet@
- \csname @\expandafter\@gobble\string#1\endcsname{#2}#1}
+ \csname \expandafter\@gobble\string#1\space\endcsname{#2}#1}
\@onlypreamble\DeclareSymbolFontAlphabet
\def\DeclareSymbolFontAlphabet@#1#2#3{%
\@tempswatrue
@@ -3499,7 +3506,7 @@ Type H <return> for immediate help.}%
\version@list
\else
\expandafter\ifx
- \csname\expandafter\@gobble\string#1\endcsname
+ \csname\expandafter\@gobble\string#1\space\endcsname
\relax
\else
\edef\reserved@a{%
@@ -4213,7 +4220,7 @@ Type H <return> for immediate help.}%
\else
\ifvmode
\nointerlineskip
- \makebox[.6\linewidth]%
+ \makebox[.6\linewidth]{}%
\fi
$$%%$$ BRACE MATCH HACK
\fi
@@ -4709,7 +4716,7 @@ Type H <return> for immediate help.}%
\@begin@tempboxa\vbox{\hsize\@tempdima\@parboxrestore#5\@@par}%
\ifx\relax#2\else
\setlength\@tempdimb{#2}%
- \def\@parboxto{to\@tempdimb}%
+ \edef\@parboxto{to\the\@tempdimb}%
\fi
\if#1b\vbox
\else\if #1t\vtop
@@ -6520,7 +6527,6 @@ Type H <return> for immediate help.}%
\else
\setbox\@outputbox \vbox {%
\boxmaxdepth \@maxdepth
- \@tempdima\dp\@cclv
\unvbox \@cclv
\vskip \skip\footins
\color@begingroup