summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/base/lterror.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/base/lterror.dtx')
-rw-r--r--Master/texmf-dist/source/latex/base/lterror.dtx141
1 files changed, 43 insertions, 98 deletions
diff --git a/Master/texmf-dist/source/latex/base/lterror.dtx b/Master/texmf-dist/source/latex/base/lterror.dtx
index 249c4e5848a..01fb44575ab 100644
--- a/Master/texmf-dist/source/latex/base/lterror.dtx
+++ b/Master/texmf-dist/source/latex/base/lterror.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993-2014
+% Copyright 1993-2015
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -29,12 +29,10 @@
%
% \iffalse
%%% From File: lterror.dtx
-%<def>\ProvidesFile{autoerr.sty}
-%<def> [1995/11/28 v1.2l LaTeX error autoload file]
%<*driver>
% \fi
\ProvidesFile{lterror.dtx}
- [2014/09/29 v1.2n LaTeX Kernel (errors)]
+ [2015/02/21 v1.2o LaTeX Kernel (errors)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{lterror.dtx}
@@ -49,13 +47,14 @@
Chris Rowley\and
Rainer Sch\"opf}
\begin{document}
-\maketitle
+ \MaintainedByLaTeXTeam{latex}
+ \maketitle
\DocInput{\filename}
\end{document}
%</driver>
% \fi
%
-% \CheckSum{442}
+% \CheckSum{375}
%
% \changes{v1.1a}{1994/05/16}{(ASAJ) Split from ltinit.dtx.}
% \changes{v1.1a}{1994/05/16}{(ASAJ) Completely new error interface.}
@@ -84,6 +83,8 @@
% {Add autoload support}
% \changes{v1.2j}{1995/10/09}
% {Modify autoload support}
+% \changes{v1.2o}{2015/02/21}
+% {Removed autoload support}
%
% \section{Error handling}
%
@@ -92,17 +93,21 @@
% \StopEventually{}
%
%
+% \begin{macrocode}
+%<*2ekernel>
+% \end{macrocode}
+%
% The `2ekernel' code ensures that a |\usepackage{autoerr}| is
% essentially ignored if a `full' format is being used that has
% the error messages already in the format.
-% \begin{macrocode}
-%<2ekernel>\expandafter\let\csname ver@autoerr.sty\endcsname\fmtversion
-% \end{macrocode}
%
+% These days we don't support autoloading approach any longer, but
+% this part bit is kept in case it is used in old documents.
% \begin{macrocode}
-%<*2ekernel|autoload>
+\expandafter\let\csname ver@autoerr.sty\endcsname\fmtversion
% \end{macrocode}
%
+%
% \subsection{General commands}
%
% \begin{macro}{\MessageBreak}
@@ -143,7 +148,6 @@
\immediate\write\@unused{^^J#2\on@line.^^J}%
\endgroup
}
-%</2ekernel|autoload>
% \end{macrocode}
% \end{macro}
%
@@ -159,8 +163,6 @@
% \changes{v1.2d}{1994/05/22}
% {(DPC) Alternative version added for old TeXs}
% \begin{macrocode}
-%<autoload>\def\GenericError{\@autoerr\GenericError}
-%<*2ekernel|def>
\bgroup
\lccode`\@=`\ %
\lccode`\~=`\ %
@@ -257,7 +259,6 @@ Type H <return> for immediate help.}%
%
% \begin{macrocode}
\fi}%
-%</2ekernel|def>
% \end{macrocode}
% \end{macro}
%
@@ -302,8 +303,6 @@ Type H <return> for immediate help.}%
% \end{verbatim}
%
% \begin{macrocode}
-%<autoload>\def\PackageError{\@autoerr\PackageError}
-%<*2ekernel|def>
\gdef\PackageError#1#2#3{%
\GenericError{%
(#1)\@spaces\@spaces\@spaces\@spaces
@@ -313,11 +312,9 @@ Type H <return> for immediate help.}%
See the #1 package documentation for explanation.%
}{#3}%
}
-%</2ekernel|def>
% \end{macrocode}
%
% \begin{macrocode}
-%<*2ekernel|autoload>
\def\PackageWarning#1#2{%
\GenericWarning{%
(#1)\@spaces\@spaces\@spaces\@spaces
@@ -335,14 +332,9 @@ Type H <return> for immediate help.}%
Package #1 Info: #2%
}%
}
-%</2ekernel|autoload>
% \end{macrocode}
%
-% \changes{v1.2l}{1995/11/28}
-% {Typo in autoload code /1985}
% \begin{macrocode}
-%<autoload>\def\ClassError{\@autoerr\ClassError}
-%<*2ekernel|def>
\gdef\ClassError#1#2#3{%
\GenericError{%
(#1) \space\@spaces\@spaces\@spaces
@@ -352,11 +344,9 @@ Type H <return> for immediate help.}%
See the #1 class documentation for explanation.%
}{#3}%
}
-%</2ekernel|def>
% \end{macrocode}
%
% \begin{macrocode}
-%<*2ekernel|autoload>
\def\ClassWarning#1#2{%
\GenericWarning{%
(#1) \space\@spaces\@spaces\@spaces
@@ -374,7 +364,6 @@ Type H <return> for immediate help.}%
Class #1 Info: #2%
}%
}
-%</2ekernel|autoload>
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -393,8 +382,6 @@ Type H <return> for immediate help.}%
% \changes{v1.2e}{1994/05/24}{Macro added}
% Errors and other info, for use in the \LaTeX{} core.
% \begin{macrocode}
-%<autoload>\def\@latex@error{\@autoerr\@latex@error}
-%<*2ekernel|def>
\gdef\@latex@error#1#2{%
\GenericError{%
\space\space\space\@spaces\@spaces\@spaces
@@ -404,11 +391,9 @@ Type H <return> for immediate help.}%
See the LaTeX manual or LaTeX Companion for explanation.%
}{#2}%
}
-%</2ekernel|def>
% \end{macrocode}
%
% \begin{macrocode}
-%<*2ekernel|autoload>
\def\@latex@warning#1{%
\GenericWarning{%
\space\space\space\@spaces\@spaces\@spaces
@@ -500,7 +485,6 @@ Type H <return> for immediate help.}%
% \begin{macrocode}
\let\@warning\@latex@warning
\let\@@warning\@latex@warning@no@line
-%</2ekernel|autoload>
\global\let\@latexerr\@latex@error
% \end{macrocode}
% \end{macro}
@@ -510,9 +494,7 @@ Type H <return> for immediate help.}%
% \begin{macro}{\@spaces}
% Four spaces.
% \begin{macrocode}
-%<*2ekernel|autoload>
\def\@spaces{\space\space\space\space}
-%</2ekernel|autoload>
% \end{macrocode}
% \end{macro}
%
@@ -524,7 +506,6 @@ Type H <return> for immediate help.}%
% \begin{macro}{\@ehd}
% The more common error help messages.
% \begin{macrocode}
-%<*2ekernel|def>
\gdef\@eha{%
Your command was ignored.\MessageBreak
Type \space I <command> <return> \space to replace it %
@@ -538,28 +519,12 @@ Type H <return> for immediate help.}%
If that doesn't work, type \space X <return> \space to quit.}
\gdef\@ehd{%
You're in trouble here. \space\@ehc}
-%</2ekernel|def>
-% \end{macrocode}
-% As |\latex@error| triggers the autoload, these definitions
-% should not be needed in the autoload format, but just to be safe\ldots
-% \begin{macrocode}
-%<*autoload>
-\let\@eha\@empty\let\@ehb\@empty\let\@ehc\@empty\let\@ehd\@empty
-%</autoload>
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
% \end{macro}
%
-% Here are most of the error message-generating commands of \LaTeX.
-% \begin{macro}{\@autoerr}
-% Make this autoload command robust, as it may be read in at
-% unpredictable times.
-% \begin{macrocode}
-%<autoload>\def\@autoerr{\protect\@autoload{err}\protect}
-% \end{macrocode}
-% \end{macro}
%
% \begin{macro}{\@notdefinable}
% Error message generated in |\@ifdefinable| from calls
@@ -569,12 +534,11 @@ Type H <return> for immediate help.}%
% \changes{v1.2n}{1998/05/28}{Added message re `end...' pr/1555}
% \begin{macrocode}
\gdef\@notdefinable{%
-%<!autoload> \@latex@error{%
-%<!autoload> Command \@backslashchar\reserved@a\space
-%<!autoload> already defined.\MessageBreak
-%<!autoload> Or name \@backslashchar\@qend... illegal,
-%<!autoload> see p.192 of the manual}\@eha}
-%<autoload> \@autoerr\@notdefinable}
+ \@latex@error{%
+ Command \@backslashchar\reserved@a\space
+ already defined.\MessageBreak
+ Or name \@backslashchar\@qend... illegal,
+ see p.192 of the manual}\@eha}
% \end{macrocode}
% \end{macro}
%
@@ -582,8 +546,7 @@ Type H <return> for immediate help.}%
% Generated by |\newline| and |\\| when called in vertical mode.
% \begin{macrocode}
\gdef\@nolnerr{%
-%<!autoload> \@latex@error{There's no line here to end}\@eha}
-%<autoload> \@autoerr\@nolnerr}
+ \@latex@error{There's no line here to end}\@eha}
% \end{macrocode}
% \end{macro}
%
@@ -601,8 +564,7 @@ Type H <return> for immediate help.}%
% Use |\@nocounterr|\marg{cnt} instead.
% \begin{macrocode}
\gdef\@nocounterr#1{%
-%<!autoload> \@latex@error{No counter '#1' defined}\@eha}
-%<autoload> \@autoerr\@nocounterr}
+ \@latex@error{No counter '#1' defined}\@eha}
\gdef\@nocnterr{\@nocounterr?}
% \end{macrocode}
% \end{macro}
@@ -613,8 +575,7 @@ Type H <return> for immediate help.}%
% numbered by letters that's greater than 26.
% \begin{macrocode}
\gdef\@ctrerr{%
-%<!autoload> \@latex@error{Counter too large}\@ehb}
-%<autoload> \@autoerr\@ctrerr}
+ \@latex@error{Counter too large}\@ehb}
% \end{macrocode}
% \end{macro}
%
@@ -623,8 +584,8 @@ Type H <return> for immediate help.}%
% \changes{v1.2m}{1996/11/04}{Always define \cs{@nodocument}
% in kernel, so that it can be cleared by \cs{document}.}
% \begin{macrocode}
-%<!def>\gdef\@nodocument{%
-%<!def> \@latex@error{Missing \protect\begin{document}}\@ehd}
+\gdef\@nodocument{%
+ \@latex@error{Missing \protect\begin{document}}\@ehd}
% \end{macrocode}
% \end{macro}
%
@@ -635,9 +596,8 @@ Type H <return> for immediate help.}%
% FMi 1993/01/14: missing space added.
% \begin{macrocode}
\gdef\@badend#1{%
-%<!autoload> \@latex@error{\protect\begin{\@currenvir}\@currenvline
-%<!autoload> \space ended by \protect\end{#1}}\@eha}
-%<autoload> \@autoerr\@badend}
+ \@latex@error{\protect\begin{\@currenvir}\@currenvline
+ \space ended by \protect\end{#1}}\@eha}
% \end{macrocode}
% \end{macro}
%
@@ -645,8 +605,7 @@ Type H <return> for immediate help.}%
% Called by |\[|, |\]|, |\(| or |\)| when used in wrong mode.
% \begin{macrocode}
\gdef\@badmath{%
-%<!autoload> \@latex@error{Bad math environment delimiter}\@eha}
-%<autoload> \@autoerr\@badmath}
+ \@latex@error{Bad math environment delimiter}\@eha}
% \end{macrocode}
% \end{macro}
%
@@ -655,8 +614,7 @@ Type H <return> for immediate help.}%
% deep, or an enumerate or itemize nested more than four levels.
% \begin{macrocode}
\gdef\@toodeep{%
-%<!autoload> \@latex@error{Too deeply nested}\@ehd}
-%<autoload> \@autoerr\@toodeep}
+ \@latex@error{Too deeply nested}\@ehd}
% \end{macrocode}
% \end{macro}
%
@@ -665,9 +623,8 @@ Type H <return> for immediate help.}%
% occurred, or by |\poptabs| when too many have occurred.
% \begin{macrocode}
\gdef\@badpoptabs{%
-%<!autoload> \@latex@error{\protect\pushtabs\space and \protect\poptabs
-%<!autoload> \space don't match}\@ehd}
-%<autoload> \@autoerr\@badpoptabs}
+ \@latex@error{\protect\pushtabs\space and \protect\poptabs
+ \space don't match}\@ehd}
% \end{macrocode}
% \end{macro}
%
@@ -675,14 +632,11 @@ Type H <return> for immediate help.}%
% Called by |\>|, |\+| , |\-| or |\<| when stepping to an undefined tab.
% \begin{macrocode}
\gdef\@badtab{%
-%<!autoload> \@latex@error{Undefined tab position}\@ehd}
-%<autoload> \@autoerr\@badtab}
+ \@latex@error{Undefined tab position}\@ehd}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\@preamerr}
-% \changes{v1.2k}{1995/10/24}
-% {Modify autoload support}
% This error is special: it appears in places where we normally have
% to |\protect| expansions. However, to prevent a protection of
% the error message itself (which would result in the message
@@ -692,12 +646,9 @@ Type H <return> for immediate help.}%
\gdef\@preamerr#1{%
\begingroup
\let\protect\relax
-%<*!autoload>
\@latex@error{\ifcase #1 Illegal character\or
Missing @-exp\or Missing p-arg\fi\space
in array arg}\@ehd
-%</!autoload>
-%<autoload> \@autoerr\@preamerr{#1}%
\endgroup}
% \end{macrocode}
% \end{macro}
@@ -707,10 +658,9 @@ Type H <return> for immediate help.}%
% argument is encountered.
% \begin{macrocode}
\gdef\@badlinearg{%
-%<!autoload> \@latex@error{%
-%<!autoload> Bad \protect\line\space or \protect\vector
-%<!autoload> \space argument}\@ehb}
-%<autoload> \@autoerr\@badlinearg}
+ \@latex@error{%
+ Bad \protect\line\space or \protect\vector
+ \space argument}\@ehb}
% \end{macrocode}
% \end{macro}
%
@@ -719,8 +669,7 @@ Type H <return> for immediate help.}%
% encountered in inner vertical mode.
% \begin{macrocode}
\gdef\@parmoderr{%
-%<!autoload> \@latex@error{Not in outer par mode}\@ehb}
-%<autoload> \@autoerr\@parmoderr}
+ \@latex@error{Not in outer par mode}\@ehb}
% \end{macrocode}
% \end{macro}
%
@@ -729,8 +678,7 @@ Type H <return> for immediate help.}%
% are no more free boxes for storing floats.
% \begin{macrocode}
\gdef\@fltovf{%
-%<!autoload> \@latex@error{Too many unprocessed floats}\@ehb}
-%<autoload> \@autoerr\@fltovf}
+ \@latex@error{Too many unprocessed floats}\@ehb}
% \end{macrocode}
% \end{macro}
%
@@ -738,8 +686,7 @@ Type H <return> for immediate help.}%
% Occurs in output routine. This is bad news.
% \begin{macrocode}
\gdef\@latexbug{%
-%<!autoload> \@latex@error{This may be a LaTeX bug}{Call for help}}
-%<autoload> \@autoerr\@latexbug}
+ \@latex@error{This may be a LaTeX bug}{Call for help}}
% \end{macrocode}
% \end{macro}
%
@@ -756,9 +703,8 @@ Type H <return> for immediate help.}%
% vmode. Probably caused by a missing |\item|.
% \begin{macrocode}
\gdef\@noitemerr{%
-%<!autoload> \@latex@error{Something's wrong--perhaps a missing %
-%<!autoload> \protect\item}\@ehc}
-%<autoload> \@autoerr\@noitemerr}
+ \@latex@error{Something's wrong--perhaps a missing %
+ \protect\item}\@ehc}
% \end{macrocode}
% \end{macro}
%
@@ -767,8 +713,7 @@ Type H <return> for immediate help.}%
% appears after the command |\begin{document}|.
% \begin{macrocode}
\gdef\@notprerr{%
-%<!autoload> \@latex@error{Can be used only in preamble}\@eha}
-%<autoload> \@autoerr\@notprerr}
+ \@latex@error{Can be used only in preamble}\@eha}
% \end{macrocode}
% \end{macro}
%
@@ -782,8 +727,7 @@ Type H <return> for immediate help.}%
\gdef\@inmatherr#1{%
\relax
\ifmmode
-%<!autoload> \@latex@error{Command \protect#1 invalid in math mode}\@ehc
-%<autoload> \@autoerr\@inmatherr#1%
+ \@latex@error{Command \protect#1 invalid in math mode}\@ehc
\fi}
% \end{macrocode}
% \end{macro}
@@ -797,6 +741,7 @@ Type H <return> for immediate help.}%
% out, since we decided to use catcode 15 instead.
% \begin{macrocode}
%\def\@invalidchar{\@latex@error{Invalid character in input}\@ehc}
+%</2ekernel>
% \end{macrocode}
% \end{macro}
%