From 97656a2657944b66f012dccafc52c2914806dd63 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 1 Mar 2010 01:50:20 +0000 Subject: silence update (28feb10) git-svn-id: svn://tug.org/texlive/trunk@17242 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/silence/silence-doc.pdf | Bin 260298 -> 269039 bytes .../source/latex/silence/silence-doc.dtx | 563 ++++++++++----------- Master/texmf-dist/source/latex/silence/silence.ins | 54 +- Master/texmf-dist/tex/latex/silence/silence.sty | 554 ++++++++++---------- 4 files changed, 585 insertions(+), 586 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/silence/silence-doc.pdf b/Master/texmf-dist/doc/latex/silence/silence-doc.pdf index e6c0c6e00ae..1c7354969d0 100644 Binary files a/Master/texmf-dist/doc/latex/silence/silence-doc.pdf and b/Master/texmf-dist/doc/latex/silence/silence-doc.pdf differ diff --git a/Master/texmf-dist/source/latex/silence/silence-doc.dtx b/Master/texmf-dist/source/latex/silence/silence-doc.dtx index 2b87358ccb3..52e5854479b 100644 --- a/Master/texmf-dist/source/latex/silence/silence-doc.dtx +++ b/Master/texmf-dist/source/latex/silence/silence-doc.dtx @@ -2,7 +2,7 @@ % ****************************************************************************** % ****************************************************************************** % ** ** -% ** silence v.1.2 by Paul Isambert ** +% ** silence v.1.3 by Paul Isambert ** % ** See the documentation for a comment on the implementation. ** % ** ** % ** This set of macros is published under the LaTeX Project Public License. ** @@ -21,7 +21,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e} -%\ProvidesPackage{silence}[2009/04/02 v1.2 Selective filtering of warnings and error messages] +%\ProvidesPackage{silence}[2010/02/28 v1.3 Selective filtering of warnings and error messages] %<*driver> \documentclass[a4paper]{ltxdoc} \usepackage[T1]{fontenc} @@ -47,7 +47,7 @@ % \bgroup % \raggedleft % \small -% \textit{`Errare humanum est, perseverare diabolicum'}\\ Proverb (attributed to Seneca) +% \textit{`Errare humanum est, perseverare diabolicum.'}\\ Proverb (attributed to Seneca) % % \textit{`Marginpar on page 3 moved.'}\\\LaTeX % @@ -71,6 +71,7 @@ % %\Change{v1.1}{2009/03/20}{Initial version} %\Change{v1.2}{2009/04/02}{\texttt{LaTeX Font Warning}s can be filtered} +%\Change{v1.3}{2010/02/28}{Compatibility with Lua\TeX} % %\section{Introduction} %When working with \LaTeX, messages are utterly important. @@ -615,12 +616,12 @@ \DeclareOption{debrief}{\sl@Debrieftrue} \DeclareOption{immediate}{\sl@Immediatetrue} \DeclareOption{safe}{\sl@SafeModetrue} -\DeclareOption{save}{\sl@Save1% -\newwrite\sl@Write% -\immediate\openout\sl@Write=\jobname.sil} -\DeclareOption{saveall}{\sl@Save2% -\newwrite\sl@Write% -\immediate\openout\sl@Write=\jobname.sil} +\DeclareOption{save}{\sl@Save1 + \newwrite\sl@Write + \immediate\openout\sl@Write=\jobname.sil} +\DeclareOption{saveall}{\sl@Save2 + \newwrite\sl@Write + \immediate\openout\sl@Write=\jobname.sil} \DeclareOption{showwarnings}{\sl@ShowWarningstrue} \DeclareOption{showerrors}{\sl@ShowErrorstrue} \ProcessOptions\relax @@ -653,7 +654,7 @@ % \begin{macrocode} \def\sl@end{sl@end} \def\sl@latex{latex} -\def\sl@Terminator{£} +\def\sl@Terminator{\sl@Terminator} \gdef\sl@active{active} \gdef\sl@safe{safe} \gdef\sl@PackageName{NoPackage} @@ -704,12 +705,12 @@ % \begin{macrocode} \def\WarningsOn{% \@ifnextchar[% - {\ifsl@WarningsOff% + {\ifsl@WarningsOff \def\sl@next{\sl@Add\sl@ProtectedWarnings}% - \else% + \else \def\sl@next{\sl@Remove\sl@UnwantedWarnings}% \fi\sl@next}% - {\global\sl@WarningsOfffalse% + {\global\sl@WarningsOfffalse \gdef\sl@ProtectedWarnings{}% \gdef\sl@UnwantedWarnings{}}} % \end{macrocode} @@ -722,17 +723,17 @@ % % \begin{macrocode} \def\WarningsOff{% - \@ifstar% + \@ifstar {\global\sl@WarningsOfftrue \gdef\sl@UnwantedWarnings{}% \gdef\sl@ProtectedWarnings{}}% {\@ifnextchar[{% - \ifsl@WarningsOff% + \ifsl@WarningsOff \def\sl@next{\sl@Remove\sl@ProtectedWarnings}% - \else% + \else \def\sl@next{\sl@Add\sl@UnwantedWarnings}% \fi\sl@next}% - {\global\sl@WarningsOfftrue% + {\global\sl@WarningsOfftrue \gdef\sl@UnwantedWarnings{}% \gdef\sl@ProtectedWarnings{latex,}}}} % \end{macrocode} @@ -761,7 +762,7 @@ % % \begin{macrocode} \def\sl@Remove#1[#2]{% - \def\sl@Items{#2} + \def\sl@Items{#2}% \def\sl@TempNewList{}% \expandafter\sl@@Remove#1sl@end,% \let#1\sl@TempNewList} @@ -780,15 +781,15 @@ % \begin{macrocode} \def\sl@@Remove#1,{% \def\sl@Tempa{#1}% - \ifx\sl@Tempa\sl@end% - \let\sl@next\relax% + \ifx\sl@Tempa\sl@end + \let\sl@next\relax % \end{macrocode} % % \noindent Otherwise, we launch "\sl@ListCheck" on the element. % % \begin{macrocode} - \else% - \sl@Checkfalse% + \else + \sl@Checkfalse \expandafter\sl@ListCheck\sl@Items,sl@end,% % \end{macrocode} % @@ -797,11 +798,11 @@ % itself repeated to keep the former elements. % % \begin{macrocode} - \ifsl@Check% - \else% + \ifsl@Check + \else \xdef\sl@TempNewList{\sl@TempNewList#1,}% - \fi% - \let\sl@next\sl@@Remove% + \fi + \let\sl@next\sl@@Remove \fi\sl@next}% % \end{macrocode} @@ -819,8 +820,8 @@ % \begin{macrocode} \def\sl@ListCheck#1,{% \def\sl@Tempb{#1}% - \ifx\sl@Tempb\sl@end% - \let\sl@next\relax% + \ifx\sl@Tempb\sl@end + \let\sl@next\relax % \end{macrocode} % % \noindent If the item is not the terminator, @@ -828,18 +829,18 @@ % match, we confirm the test and gobble. % % \begin{macrocode} - \else% - \ifx\sl@Tempa\sl@Tempb% + \else + \ifx\sl@Tempa\sl@Tempb \sl@Checktrue - \let\sl@next\sl@Gobble% + \let\sl@next\sl@Gobble % \end{macrocode} % % \noindent Otherwise we repeat. % % \begin{macrocode} - \else% - \let\sl@next\sl@ListCheck% - \fi% + \else + \let\sl@next\sl@ListCheck + \fi \fi\sl@next} % \end{macrocode} @@ -862,8 +863,8 @@ % % \begin{macrocode} \def\WarningFilter{% - \global\advance\sl@WarningNumber1% - \@ifstar% + \global\advance\sl@WarningNumber1 + \@ifstar {\expandafter\gdef\csname\the\sl@WarningNumber:WarningMode\endcsname{safe}% \sl@WarningFilter}% {\sl@WarningFilter}} @@ -895,12 +896,12 @@ % % \begin{macrocode} \def\sl@@WarningFilter[#1]#2{% - \expandafter\ifx\csname #2@WarningFilter\endcsname\relax% + \expandafter\ifx\csname #2@WarningFilter\endcsname\relax \expandafter\xdef\csname #2@WarningFilter\endcsname{\the\sl@WarningNumber:sl@#1}% - \else% + \else \expandafter\xdef\csname #2@WarningFilter\endcsname{% \csname #2@WarningFilter\endcsname,\the\sl@WarningNumber:sl@#1}% - \fi% + \fi % \end{macrocode} % % \noindent Now, if "\"\meta{family}":WarningState" is undefined, this means @@ -909,22 +910,22 @@ % its deactivating counterpart. % % \begin{macrocode} - \expandafter\ifx\csname #1:WarningState\endcsname\relax% + \expandafter\ifx\csname #1:WarningState\endcsname\relax \sl@Add\sl@WarningNames[#1]% - \fi% + \fi % \end{macrocode} % % \noindent Next, we check "WarningState" again; if it's not active, we change it, % depending on whether we're in "immediate" mode or not. % \begin{macrocode} - \expandafter\ifx\csname #1:WarningState\endcsname\sl@active% - \else% - \ifsl@Immediate% + \expandafter\ifx\csname #1:WarningState\endcsname\sl@active + \else + \ifsl@Immediate \expandafter\gdef\csname #1:WarningState\endcsname{active}% - \else% + \else \expandafter\gdef\csname #1:WarningState\endcsname{inactive}% - \fi% - \fi% + \fi + \fi % \end{macrocode} % % \noindent Finally, we prepare the storage of the filter's message. @@ -937,12 +938,12 @@ % with "\catcode" 12 (including the escape character) that the starless % filter will match. % \begin{macrocode} - \begingroup% - \expandafter\ifx\csname\the\sl@WarningNumber:WarningMode\endcsname\sl@safe% - \makeatletter% - \else% - \catcode`\\12\relax% - \fi% + \begingroup + \expandafter\ifx\csname\the\sl@WarningNumber:WarningMode\endcsname\sl@safe + \makeatletter + \else + \catcode`\\12 + \fi \sl@AddToBankOfWarnings} % \end{macrocode} @@ -969,9 +970,9 @@ \sl@TempBOW{#1}% \edef\sl@act{% \global\noexpand\sl@BankOfWarnings{% - \the\sl@BankOfWarnings% + \the\sl@BankOfWarnings (:sl@\the\sl@WarningNumber:)\the\sl@TempBOW(:sl@\the\sl@WarningNumber:)}}% - \sl@act% + \sl@act \endgroup} % \end{macrocode} @@ -987,13 +988,13 @@ % % \begin{macrocode} \def\ActivateWarningFilters{% - \sl@StateNumber0\relax% + \sl@StateNumber0\relax \@ifnextchar[% {\sl@ChangeState}% {\sl@ChangeState[\sl@WarningNames]}} \def\DeactivateWarningFilters{% - \sl@StateNumber1\relax% + \sl@StateNumber1\relax \@ifnextchar[% {\sl@ChangeState}% {\sl@ChangeState[\sl@WarningNames]}} @@ -1014,19 +1015,19 @@ \def\sl@@ChangeState#1,{% \def\sl@Tempa{#1}% - \ifx\sl@Tempa\sl@end% - \let\sl@next\relax% - \else% - \ifcase\sl@StateNumber% + \ifx\sl@Tempa\sl@end + \let\sl@next\relax + \else + \ifcase\sl@StateNumber \expandafter\gdef\csname #1:WarningState\endcsname{active}% - \or% + \or \expandafter\gdef\csname #1:WarningState\endcsname{inactive}% - \or% + \or \expandafter\gdef\csname #1:ErrorState\endcsname{active}% - \or% + \or \expandafter\gdef\csname #1:ErrorState\endcsname{inactive}% - \fi% - \let\sl@next\sl@@ChangeState% + \fi + \let\sl@next\sl@@ChangeState \fi\sl@next} % \end{macrocode} @@ -1047,31 +1048,31 @@ % \begin{macrocode} \def\ActivateFilters{% \@ifnextchar[% - {\sl@StateNumber0% + {\sl@StateNumber0 \sl@RetrieveArgument}% - {\sl@StateNumber0\relax% + {\sl@StateNumber0 \sl@ChangeState[\sl@WarningNames]% - \sl@StateNumber2\relax% + \sl@StateNumber2 \sl@ChangeState[\sl@ErrorNames]}} \def\DeactivateFilters{% \@ifnextchar[% - {\sl@StateNumber1% + {\sl@StateNumber1 \sl@RetrieveArgument}% - {\sl@StateNumber1\relax% + {\sl@StateNumber1 \sl@ChangeState[\sl@WarningNames]% - \sl@StateNumber3\relax% + \sl@StateNumber3 \sl@ChangeState[\sl@ErrorNames]}} \def\sl@RetrieveArgument[#1]{% - \def\sl@Argument{#1} - \ifcase\sl@StateNumber% + \def\sl@Argument{#1}% + \ifcase\sl@StateNumber \sl@ChangeState[\sl@Argument]% - \sl@StateNumber2\relax% + \sl@StateNumber2\relax \sl@ChangeState[\sl@Argument]% - \or% + \or \sl@ChangeState[\sl@Argument]% - \sl@StateNumber3\relax% + \sl@StateNumber3\relax \sl@ChangeState[\sl@Argument]% \fi} % \end{macrocode} @@ -1104,15 +1105,15 @@ % % \begin{macrocode} \def\sl@GetNumber#1:sl@#2,{% - \ifnum#1>0% - \expandafter% - \ifx\csname #2:\ifcase\sl@StateNumber Warning\or Error\fi State\endcsname\sl@active% + \ifnum#1>0 + \expandafter + \ifx\csname #2:\ifcase\sl@StateNumber Warning\or Error\fi State\endcsname\sl@active \sl@GetMessage{#1}% - \else% - \let\sl@next\sl@GetNumber% - \fi% - \else% - \let\sl@next\relax% + \else + \let\sl@next\sl@GetNumber + \fi + \else + \let\sl@next\relax \fi\sl@next} % \end{macrocode} @@ -1130,25 +1131,23 @@ % creates "\sl@@GetMessage" with the arguments delimited by "(:sl@15:)". % The first and the third arguments are discarded, while the second % one, which is the message of the filter, is stored in the "\sl@Filter" -% token list, along with a terminator.\footnote{This terminator -% is the \texttt{\pounds} symbol, unfortunately totally unverbatimizable. So -% it appears as "£".} +% token list, along with a terminator. % % \begin{macrocode} \def\sl@GetMessage#1{% - \def\sl@@GetMessage##1(:sl@#1:)##2(:sl@#1:)##3(:sl@end:){\sl@Filter={##2£}}% + \def\sl@@GetMessage##1(:sl@#1:)##2(:sl@#1:)##3(:sl@end:){\sl@Filter={##2\sl@Terminator}}% % \end{macrocode} % % \noindent Now we launch this command on the bank of warnings (or errors) % expanded one step, thanks to the same "\edef" trick as above. % % \begin{macrocode} - \ifcase\sl@StateNumber% + \ifcase\sl@StateNumber \edef\sl@act{\noexpand\sl@@GetMessage\the\sl@BankOfWarnings(:sl@end:)}% - \or% + \or \edef\sl@act{\noexpand\sl@@GetMessage\the\sl@BankOfErrors(:sl@end:)}% - \fi% - \sl@act% + \fi + \sl@act % \end{macrocode} % % \noindent When a warning is sent, its message is stored in two forms, @@ -1165,20 +1164,20 @@ % At the end of this macro, we call the string tester. % % \begin{macrocode} - \ifsl@SafeMode% - \sl@SafeTesttrue% - \edef\sl@act{\noexpand\sl@Mess@ge{\the\sl@UnexpandedMessage£}}% - \else% - \expandafter% + \ifsl@SafeMode + \sl@SafeTesttrue + \edef\sl@act{\noexpand\sl@Mess@ge{\the\sl@UnexpandedMessage\noexpand\sl@Terminator}}% + \else + \expandafter \ifx\csname #1:\ifcase\sl@StateNumber Warning\or Error\fi Mode\endcsname\sl@safe% - \sl@SafeTesttrue% - \edef\sl@act{\noexpand\sl@Mess@ge{\the\sl@UnexpandedMessage£}}% - \else% - \sl@SafeTestfalse% - \edef\sl@act{\noexpand\sl@Mess@ge{\the\sl@Message£}}% - \fi% - \fi% - \sl@act% + \sl@SafeTesttrue + \edef\sl@act{\noexpand\sl@Mess@ge{\the\sl@UnexpandedMessage\noexpand\sl@Terminator}}% + \else + \sl@SafeTestfalse + \edef\sl@act{\noexpand\sl@Mess@ge{\the\sl@Message\noexpand\sl@Terminator}}% + \fi + \fi + \sl@act \sl@TestStrings} % \end{macrocode} @@ -1196,9 +1195,9 @@ % \begin{macrocode} \def\sl@TestStrings{% \edef\sl@act{% - \noexpand\sl@Slice\the\sl@Filter(:sl@mid:)\noexpand\sl@Filter\noexpand\sl@FilterToken% + \noexpand\sl@Slice\the\sl@Filter(:sl@mid:)\noexpand\sl@Filter\noexpand\sl@FilterToken \noexpand\sl@Slice\the\sl@Mess@ge(:sl@mid:)\noexpand\sl@Mess@ge\noexpand\sl@MessageToken}% - \sl@act% + \sl@act % \end{macrocode} % % \noindent Then we simply run some conditional. @@ -1211,10 +1210,10 @@ % and "silence" grins with cruelty. % % \begin{macrocode} - \ifx\sl@FilterToken\sl@Terminator% - \sl@KillMessagetrue% - \let\sl@@next\relax% - \let\sl@next\sl@Gobble% + \ifx\sl@FilterToken\sl@Terminator + \sl@KillMessagetrue + \let\sl@@next\relax + \let\sl@next\sl@Gobble % \end{macrocode} % % \noindent On the other hand, if we reach the terminator in the warning text, @@ -1226,9 +1225,9 @@ % % \begin{macrocode} \else - \ifx\sl@MessageToken\sl@Terminator% - \let\sl@@next\relax% - \let\sl@next\sl@GetNumber% + \ifx\sl@MessageToken\sl@Terminator + \let\sl@@next\relax + \let\sl@next\sl@GetNumber % \end{macrocode} % % \noindent Now, if none of the tokens is a terminator, then we @@ -1243,14 +1242,14 @@ % test further), and we call "\sl@GetNumber" on the next pair. % % \begin{macrocode} - \else% - \ifsl@SafeTest% - \ifx\sl@FilterToken\sl@MessageToken% - \let\sl@@next\sl@TestStrings% - \else% - \let\sl@@next\relax% - \let\sl@next\sl@GetNumber% - \fi% + \else + \ifsl@SafeTest + \ifx\sl@FilterToken\sl@MessageToken + \let\sl@@next\sl@TestStrings + \else + \let\sl@@next\relax + \let\sl@next\sl@GetNumber + \fi % \end{macrocode} % % \noindent If we're in bold mode and the filter is starless, @@ -1264,15 +1263,15 @@ % (like all "\string"'ed characters). % % \begin{macrocode} - \else% - \if\sl@FilterToken\sl@MessageToken% - \let\sl@@next\sl@TestStrings% - \else% - \let\sl@@next\relax% - \let\sl@next\sl@GetNumber% - \fi% - \fi% - \fi% + \else + \if\sl@FilterToken\sl@MessageToken + \let\sl@@next\sl@TestStrings + \else + \let\sl@@next\relax + \let\sl@next\sl@GetNumber + \fi + \fi + \fi \fi\sl@@next} % \end{macrocode} @@ -1325,16 +1324,16 @@ % % \begin{macrocode} \def\sl@Belong#1,{% - \def\sl@Tempa{#1} - \ifx\sl@Tempa\sl@end% - \let\sl@next\relax% - \else% - \ifx\sl@Tempa\sl@PackageName% - \sl@Belongtrue% - \let\sl@next\sl@Gobble% - \else% - \let\sl@next\sl@Belong% - \fi% + \def\sl@Tempa{#1}% + \ifx\sl@Tempa\sl@end + \let\sl@next\relax + \else + \ifx\sl@Tempa\sl@PackageName + \sl@Belongtrue + \let\sl@next\sl@Gobble + \else + \let\sl@next\sl@Belong + \fi \fi\sl@next} % \end{macrocode} @@ -1353,16 +1352,16 @@ % % \begin{macrocode} \def\sl@StoreMessage#1{% - \ifsl@SafeMode% + \ifsl@SafeMode \sl@UnexpandedMessage{#1}% - \else% + \else \sl@UnexpandedMessage{#1}% - \bgroup% - \let\protect\string% - \let\noexpand\string% + \bgroup + \let\protect\string + \let\noexpand\string \edef\sl@Tempa{#1}% \global\expandafter\sl@Message\expandafter{\sl@Tempa}% - \egroup% + \egroup \fi} % \end{macrocode} @@ -1426,11 +1425,11 @@ % \begin{macrocode} \def\PackageWarning#1#2{% \def\sl@PackageName{#1}% - \ifsl@NoLine% - \sl@NoLinefalse% - \else% + \ifsl@NoLine + \sl@NoLinefalse + \else \sl@StoreMessage{#2}% - \fi% + \fi \sl@PackageWarning{#1}{#2}} % \end{macrocode} @@ -1444,7 +1443,7 @@ % \begin{macrocode} \def\PackageWarningNoLine#1#2{% \sl@StoreMessage{#2}% - \sl@NoLinetrue% + \sl@NoLinetrue \PackageWarning{#1}{#2\@gobble}} % \end{macrocode} @@ -1457,30 +1456,30 @@ % \begin{macrocode} \def\ClassWarning#1#2{% \def\sl@PackageName{#1}% - \ifsl@NoLine% - \sl@NoLinefalse% - \else% + \ifsl@NoLine + \sl@NoLinefalse + \else \sl@StoreMessage{#2}% - \fi% + \fi \sl@ClassWarning{#1}{#2}} \def\ClassWarningNoLine#1#2{% \sl@StoreMessage{#2}% - \sl@NoLinetrue% + \sl@NoLinetrue \ClassWarning{#1}{#2\@gobble}} \def\@latex@warning#1{% \def\sl@PackageName{latex}% - \ifsl@NoLine% - \sl@NoLinefalse% - \else% + \ifsl@NoLine + \sl@NoLinefalse + \else \sl@StoreMessage{#1}% - \fi% + \fi \sl@latex@warning{#1}} \def\@latex@warning@no@line#1{% \sl@StoreMessage{#1}% - \sl@NoLinetrue% + \sl@NoLinetrue \@latex@warning{#1\@gobble}} \def\@font@warning#1{% @@ -1511,9 +1510,9 @@ % % \begin{macrocode} \DeclareRobustCommand{\GenericWarning}[2]{% - \advance\sl@WarningCount1\relax% - \sl@KillMessagefalse% - \sl@Belongfalse% + \global\advance\sl@WarningCount1 + \sl@KillMessagefalse + \sl@Belongfalse % \end{macrocode} % % \noindent Next, we launch "\sl@Belong" on the expanded @@ -1525,18 +1524,18 @@ % in "jobname.sil".) % % \begin{macrocode} - \ifsl@WarningsOff% + \ifsl@WarningsOff \expandafter\sl@Belong\sl@ProtectedWarnings sl@end,% - \ifsl@Belong% - \else% - \sl@KillMessagetrue% - \fi% - \else% + \ifsl@Belong + \else + \sl@KillMessagetrue + \fi + \else \expandafter\sl@Belong\sl@UnwantedWarnings sl@end,% - \ifsl@Belong% - \sl@KillMessagetrue% - \fi% - \fi% + \ifsl@Belong + \sl@KillMessagetrue + \fi + \fi % \end{macrocode} % % \noindent If the preceding operation is not enough, @@ -1546,15 +1545,15 @@ % If there are some, we test them with "\sl@GetNumber" as defined above. % % \begin{macrocode} - \ifsl@KillMessage% - \else% - \expandafter\ifx\csname\sl@PackageName @WarningFilter\endcsname\relax% - \else% - \sl@StateNumber0\relax% - \expandafter\expandafter\expandafter% + \ifsl@KillMessage + \else + \expandafter\ifx\csname\sl@PackageName @WarningFilter\endcsname\relax + \else + \sl@StateNumber0 + \expandafter\expandafter\expandafter \sl@GetNumber\csname\sl@PackageName @WarningFilter\endcsname,0:sl@sl@end,% - \fi% - \fi% + \fi + \fi % \end{macrocode} % % \noindent Now the message's fate is sealed. If it has @@ -1563,11 +1562,11 @@ % to enlighten the user's log file. % % \begin{macrocode} - \ifsl@KillMessage% - \advance\sl@WarningCasualties1% - \else% + \ifsl@KillMessage + \global\advance\sl@WarningCasualties1 + \else \sl@GenericWarning{#1}{#2}% - \fi% + \fi % \end{macrocode} % % \noindent Finally, we consider saving it. "\sl@Save" is 0 @@ -1581,20 +1580,20 @@ % locally, of course. % % \begin{macrocode} - \ifcase\sl@Save% - \or% - \ifsl@KillMessage% - \bgroup% - \let\@unused\sl@Write% + \ifcase\sl@Save + \or + \ifsl@KillMessage + \bgroup + \let\@unused\sl@Write \sl@GenericWarning{#1}{#2}% - \egroup% - \fi% - \or% - \bgroup% - \let\@unused\sl@Write% + \egroup + \fi + \or + \bgroup + \let\@unused\sl@Write \sl@GenericWarning{#1}{#2}% - \egroup% - \fi% + \egroup + \fi % \end{macrocode} % % \noindent Before closing, we set "\sl@PackageName" to @@ -1612,7 +1611,7 @@ % \subsection{Errors} % Errors are implemented just like warnings, so I don't -% command the code. See you at the end of the package +% comment the code. See you at the end of the package % for the last macro. % % \begin{macrocode} @@ -1637,12 +1636,12 @@ % \begin{macrocode} \def\ErrorsOn{% \@ifnextchar[% - {\ifsl@ErrorsOff% + {\ifsl@ErrorsOff \def\sl@next{\sl@Add\sl@ProtectedErrors}% - \else% + \else \def\sl@next{\sl@Remove\sl@UnwantedErrors}% \fi\sl@next}% - {\global\sl@ErrorsOfffalse% + {\global\sl@ErrorsOfffalse \gdef\sl@ProtectedErrors{}% \gdef\sl@UnwantedErrors{}}} % \end{macrocode} @@ -1651,17 +1650,17 @@ % \macskip % \begin{macrocode} \def\ErrorsOff{% - \@ifstar% + \@ifstar {\global\sl@ErrorsOfftrue \gdef\sl@UnwantedErrors{}% \gdef\sl@ProtectedErrors{}}% {\@ifnextchar[{% - \ifsl@ErrorsOff% + \ifsl@ErrorsOff \def\sl@next{\sl@Remove\sl@ProtectedErrors}% - \else% + \else \def\sl@next{\sl@Add\sl@UnwantedErrors}% \fi\sl@next}% - {\global\sl@ErrorsOfftrue% + {\global\sl@ErrorsOfftrue \gdef\sl@UnwantedErrors{}% \gdef\sl@ProtectedErrors{latex,}}}} % \end{macrocode} @@ -1672,8 +1671,8 @@ % \macskip % \begin{macrocode} \def\ErrorFilter{% - \global\advance\sl@ErrorNumber1% - \@ifstar% + \global\advance\sl@ErrorNumber1 + \@ifstar {\expandafter\gdef\csname\the\sl@ErrorNumber:ErrorMode\endcsname{safe}\sl@ErrorFilter}% {\sl@ErrorFilter}} @@ -1683,29 +1682,29 @@ {\sl@@ErrorFilter[sl@family]}} \def\sl@@ErrorFilter[#1]#2{% - \expandafter\ifx\csname #2@ErrorFilter\endcsname\relax% + \expandafter\ifx\csname #2@ErrorFilter\endcsname\relax \expandafter\xdef\csname #2@ErrorFilter\endcsname{\the\sl@ErrorNumber:sl@#1}% - \else% + \else \expandafter\xdef\csname #2@ErrorFilter\endcsname{% \csname #2@ErrorFilter\endcsname,\the\sl@ErrorNumber:sl@#1}% - \fi% - \expandafter\ifx\csname #1:ErrorState\endcsname\relax% + \fi + \expandafter\ifx\csname #1:ErrorState\endcsname\relax \sl@Add\sl@ErrorNames[#1]% - \fi% - \expandafter\ifx\csname #1:ErrorState\endcsname\sl@active% - \else% - \ifsl@Immediate% + \fi + \expandafter\ifx\csname #1:ErrorState\endcsname\sl@active + \else + \ifsl@Immediate \expandafter\gdef\csname #1:ErrorState\endcsname{active}% - \else% + \else \expandafter\gdef\csname #1:ErrorState\endcsname{inactive}% - \fi% - \fi% - \begingroup% - \expandafter\ifx\csname\the\sl@ErrorNumber:ErrorMode\endcsname\sl@safe% - \makeatletter% - \else% - \catcode`\\12\relax% - \fi% + \fi + \fi + \begingroup + \expandafter\ifx\csname\the\sl@ErrorNumber:ErrorMode\endcsname\sl@safe + \makeatletter + \else + \catcode`\\12 + \fi \sl@AddToBankOfErrors} % \end{macrocode} @@ -1716,9 +1715,9 @@ \sl@TempBOE{#1}% \edef\sl@act{% \global\noexpand\sl@BankOfErrors{% - \the\sl@BankOfErrors% + \the\sl@BankOfErrors (:sl@\the\sl@ErrorNumber:)\the\sl@TempBOE(:sl@\the\sl@ErrorNumber:)}}% - \sl@act% + \sl@act \endgroup} % \end{macrocode} @@ -1726,7 +1725,7 @@ % \macskip % \begin{macrocode} \def\ActivateErrorFilters{% - \sl@StateNumber2\relax% + \sl@StateNumber2 \@ifnextchar[% {\sl@ChangeState}% {\sl@ChangeState[\sl@ErrorNames]}} @@ -1736,7 +1735,7 @@ % \macskip % \begin{macrocode} \def\DeactivateErrorFilters{% - \sl@StateNumber3\relax% + \sl@StateNumber3 \@ifnextchar[% {\sl@ChangeState}% {\sl@ChangeState[\sl@ErrorNames]}} @@ -1774,49 +1773,49 @@ % \macskip % \begin{macrocode} \DeclareRobustCommand{\GenericError}[4]{% - \advance\sl@ErrorCount1\relax% - \sl@KillMessagefalse% - \sl@Belongfalse% - \ifsl@ErrorsOff% + \global\advance\sl@ErrorCount1 + \sl@KillMessagefalse + \sl@Belongfalse + \ifsl@ErrorsOff \expandafter\sl@Belong\sl@ProtectedErrors,sl@end,% - \ifsl@Belong% - \else% - \sl@KillMessagetrue% - \fi% - \else% + \ifsl@Belong + \else + \sl@KillMessagetrue + \fi + \else \expandafter\sl@Belong\sl@UnwantedErrors,sl@end,% - \ifsl@Belong% - \sl@KillMessagetrue% - \fi% - \fi% - \ifsl@KillMessage% - \else% - \expandafter\ifx\csname\sl@PackageName @ErrorFilter\endcsname\relax% - \else% - \sl@StateNumber1\relax% - \expandafter\expandafter\expandafter% + \ifsl@Belong + \sl@KillMessagetrue + \fi + \fi + \ifsl@KillMessage + \else + \expandafter\ifx\csname\sl@PackageName @ErrorFilter\endcsname\relax + \else + \sl@StateNumber1 + \expandafter\expandafter\expandafter \sl@GetNumber\csname\sl@PackageName @ErrorFilter\endcsname,0:sl@sl@end,% - \fi% - \fi% - \ifsl@KillMessage% - \advance\sl@ErrorCasualties1% - \else% + \fi + \fi + \ifsl@KillMessage + \global\advance\sl@ErrorCasualties1 + \else \sl@GenericError{#1}{#2}{#3}{#4}% - \fi% - \ifcase\sl@Save% - \or% - \ifsl@KillMessage% - \bgroup% - \let\@unused\sl@Write% + \fi + \ifcase\sl@Save + \or + \ifsl@KillMessage + \bgroup + \let\@unused\sl@Write \sl@GenericError{#1}{#2}{#3}{#4}% - \egroup% - \fi% - \or% - \bgroup% - \let\@unused\sl@Write% + \egroup + \fi + \or + \bgroup + \let\@unused\sl@Write \sl@GenericError{#1}{#2}{#3}{#4}% - \egroup% - \fi% + \egroup + \fi \gdef\sl@PackageName{NoPackage}}% \fi % \end{macrocode} @@ -1832,8 +1831,8 @@ % % \begin{macrocode} \AtEndDocument{% - \ifsl@Debrief% - \clearpage% + \ifsl@Debrief + \clearpage % \end{macrocode} % % \noindent Then we do some arithmetics and if messages @@ -1843,24 +1842,24 @@ % And we say goodbye. % % \begin{macrocode} - \sl@MessageCount\sl@WarningCount% - \advance\sl@MessageCount\sl@ErrorCount% - \sl@Casualties\sl@WarningCasualties% - \advance\sl@Casualties\sl@ErrorCasualties% - \ifnum\sl@MessageCount>0% - \ifnum\sl@Casualties>0% - \advance\sl@WarningCount-1% + \sl@MessageCount\sl@WarningCount + \advance\sl@MessageCount\sl@ErrorCount + \sl@Casualties\sl@WarningCasualties + \advance\sl@Casualties\sl@ErrorCasualties + \ifnum\sl@MessageCount>0 + \ifnum\sl@Casualties>0 + \advance\sl@WarningCount-1 \PackageWarningNoLine{silence}{% There were \the\sl@WarningCount\space warning(s) - and \the\sl@ErrorCount\space error(s).\MessageBreak% - \ifnum\sl@Casualties=\sl@MessageCount% + and \the\sl@ErrorCount\space error(s).\MessageBreak + \ifnum\sl@Casualties=\sl@MessageCount None survived. This is a violent world% - \else% + \else I've killed \the\sl@WarningCasualties\space warning(s) and \the\sl@ErrorCasualties\space error(s)% \fi}% - \fi% - \fi% + \fi + \fi \fi} \makeatother diff --git a/Master/texmf-dist/source/latex/silence/silence.ins b/Master/texmf-dist/source/latex/silence/silence.ins index 128d0cc28cd..5e46cc23d1a 100644 --- a/Master/texmf-dist/source/latex/silence/silence.ins +++ b/Master/texmf-dist/source/latex/silence/silence.ins @@ -1,27 +1,27 @@ -\input docstrip.tex -\askforoverwritefalse -\keepsilent -\preamble - -****************************************************************************** -****************************************************************************** -** ** -** silence v.1.2 by Paul Isambert ** -** See the documentation for a comment on the implementation. ** -** ** -** This set of macros is published under the LaTeX Project Public License. ** -** ** -** Comments, suggestions and bugs: ** -** ** -** zappathustra@free.fr ** -** ** -** http://paulisambert.free.fr/ ** -** ** -** Enjoy! ** -** ** -****************************************************************************** -****************************************************************************** - -\endpreamble -\generate{\file{silence.sty}{\from{silence-doc.dtx}{package}}} -\endbatchfile +\input docstrip.tex +\askforoverwritefalse +%\keepsilent +\preamble + +****************************************************************************** +****************************************************************************** +** ** +** silence v.1.3 by Paul Isambert ** +** See the documentation for a comment on the implementation. ** +** ** +** This set of macros is published under the LaTeX Project Public License. ** +** ** +** Comments, suggestions and bugs: ** +** ** +** zappathustra@free.fr ** +** ** +** http://paulisambert.free.fr/ ** +** ** +** Enjoy! ** +** ** +****************************************************************************** +****************************************************************************** + +\endpreamble +\generate{\file{silence.sty}{\from{silence-doc.dtx}{package}}} +\endbatchfile diff --git a/Master/texmf-dist/tex/latex/silence/silence.sty b/Master/texmf-dist/tex/latex/silence/silence.sty index 0119b5bd0e1..22720008669 100644 --- a/Master/texmf-dist/tex/latex/silence/silence.sty +++ b/Master/texmf-dist/tex/latex/silence/silence.sty @@ -9,7 +9,7 @@ %% ****************************************************************************** %% ****************************************************************************** %% ** ** -%% ** silence v.1.2 by Paul Isambert ** +%% ** silence v.1.3 by Paul Isambert ** %% ** See the documentation for a comment on the implementation. ** %% ** ** %% ** This set of macros is published under the LaTeX Project Public License. ** @@ -27,7 +27,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{silence}[2009/04/02 v1.2 Selective filtering of warnings and error messages] +\ProvidesPackage{silence}[2010/02/28 v1.3 Selective filtering of warnings and error messages] \makeatletter \newcount\sl@Save @@ -40,12 +40,12 @@ \DeclareOption{debrief}{\sl@Debrieftrue} \DeclareOption{immediate}{\sl@Immediatetrue} \DeclareOption{safe}{\sl@SafeModetrue} -\DeclareOption{save}{\sl@Save1% -\newwrite\sl@Write% -\immediate\openout\sl@Write=\jobname.sil} -\DeclareOption{saveall}{\sl@Save2% -\newwrite\sl@Write% -\immediate\openout\sl@Write=\jobname.sil} +\DeclareOption{save}{\sl@Save1 + \newwrite\sl@Write + \immediate\openout\sl@Write=\jobname.sil} +\DeclareOption{saveall}{\sl@Save2 + \newwrite\sl@Write + \immediate\openout\sl@Write=\jobname.sil} \DeclareOption{showwarnings}{\sl@ShowWarningstrue} \DeclareOption{showerrors}{\sl@ShowErrorstrue} \ProcessOptions\relax @@ -66,7 +66,7 @@ \def\sl@end{sl@end} \def\sl@latex{latex} -\def\sl@Terminator{^^a3} +\def\sl@Terminator{\sl@Terminator} \gdef\sl@active{active} \gdef\sl@safe{safe} \gdef\sl@PackageName{NoPackage} @@ -91,27 +91,27 @@ \def\WarningsOn{% \@ifnextchar[% - {\ifsl@WarningsOff% + {\ifsl@WarningsOff \def\sl@next{\sl@Add\sl@ProtectedWarnings}% - \else% + \else \def\sl@next{\sl@Remove\sl@UnwantedWarnings}% \fi\sl@next}% - {\global\sl@WarningsOfffalse% + {\global\sl@WarningsOfffalse \gdef\sl@ProtectedWarnings{}% \gdef\sl@UnwantedWarnings{}}} \def\WarningsOff{% - \@ifstar% + \@ifstar {\global\sl@WarningsOfftrue \gdef\sl@UnwantedWarnings{}% \gdef\sl@ProtectedWarnings{}}% {\@ifnextchar[{% - \ifsl@WarningsOff% + \ifsl@WarningsOff \def\sl@next{\sl@Remove\sl@ProtectedWarnings}% - \else% + \else \def\sl@next{\sl@Add\sl@UnwantedWarnings}% \fi\sl@next}% - {\global\sl@WarningsOfftrue% + {\global\sl@WarningsOfftrue \gdef\sl@UnwantedWarnings{}% \gdef\sl@ProtectedWarnings{latex,}}}} @@ -119,41 +119,41 @@ \xdef#1{#1#2,}} \def\sl@Remove#1[#2]{% - \def\sl@Items{#2} + \def\sl@Items{#2}% \def\sl@TempNewList{}% \expandafter\sl@@Remove#1sl@end,% \let#1\sl@TempNewList} \def\sl@@Remove#1,{% \def\sl@Tempa{#1}% - \ifx\sl@Tempa\sl@end% - \let\sl@next\relax% - \else% - \sl@Checkfalse% + \ifx\sl@Tempa\sl@end + \let\sl@next\relax + \else + \sl@Checkfalse \expandafter\sl@ListCheck\sl@Items,sl@end,% - \ifsl@Check% - \else% + \ifsl@Check + \else \xdef\sl@TempNewList{\sl@TempNewList#1,}% - \fi% - \let\sl@next\sl@@Remove% + \fi + \let\sl@next\sl@@Remove \fi\sl@next}% \def\sl@ListCheck#1,{% \def\sl@Tempb{#1}% - \ifx\sl@Tempb\sl@end% - \let\sl@next\relax% - \else% - \ifx\sl@Tempa\sl@Tempb% + \ifx\sl@Tempb\sl@end + \let\sl@next\relax + \else + \ifx\sl@Tempa\sl@Tempb \sl@Checktrue - \let\sl@next\sl@Gobble% - \else% - \let\sl@next\sl@ListCheck% - \fi% + \let\sl@next\sl@Gobble + \else + \let\sl@next\sl@ListCheck + \fi \fi\sl@next} \def\WarningFilter{% - \global\advance\sl@WarningNumber1% - \@ifstar% + \global\advance\sl@WarningNumber1 + \@ifstar {\expandafter\gdef\csname\the\sl@WarningNumber:WarningMode\endcsname{safe}% \sl@WarningFilter}% {\sl@WarningFilter}} @@ -164,48 +164,48 @@ {\sl@@WarningFilter[sl@family]}} \def\sl@@WarningFilter[#1]#2{% - \expandafter\ifx\csname #2@WarningFilter\endcsname\relax% + \expandafter\ifx\csname #2@WarningFilter\endcsname\relax \expandafter\xdef\csname #2@WarningFilter\endcsname{\the\sl@WarningNumber:sl@#1}% - \else% + \else \expandafter\xdef\csname #2@WarningFilter\endcsname{% \csname #2@WarningFilter\endcsname,\the\sl@WarningNumber:sl@#1}% - \fi% - \expandafter\ifx\csname #1:WarningState\endcsname\relax% + \fi + \expandafter\ifx\csname #1:WarningState\endcsname\relax \sl@Add\sl@WarningNames[#1]% - \fi% - \expandafter\ifx\csname #1:WarningState\endcsname\sl@active% - \else% - \ifsl@Immediate% + \fi + \expandafter\ifx\csname #1:WarningState\endcsname\sl@active + \else + \ifsl@Immediate \expandafter\gdef\csname #1:WarningState\endcsname{active}% - \else% + \else \expandafter\gdef\csname #1:WarningState\endcsname{inactive}% - \fi% - \fi% - \begingroup% - \expandafter\ifx\csname\the\sl@WarningNumber:WarningMode\endcsname\sl@safe% - \makeatletter% - \else% - \catcode`\\12\relax% - \fi% + \fi + \fi + \begingroup + \expandafter\ifx\csname\the\sl@WarningNumber:WarningMode\endcsname\sl@safe + \makeatletter + \else + \catcode`\\12 + \fi \sl@AddToBankOfWarnings} \long\def\sl@AddToBankOfWarnings#1{% \sl@TempBOW{#1}% \edef\sl@act{% \global\noexpand\sl@BankOfWarnings{% - \the\sl@BankOfWarnings% + \the\sl@BankOfWarnings (:sl@\the\sl@WarningNumber:)\the\sl@TempBOW(:sl@\the\sl@WarningNumber:)}}% - \sl@act% + \sl@act \endgroup} \def\ActivateWarningFilters{% - \sl@StateNumber0\relax% + \sl@StateNumber0\relax \@ifnextchar[% {\sl@ChangeState}% {\sl@ChangeState[\sl@WarningNames]}} \def\DeactivateWarningFilters{% - \sl@StateNumber1\relax% + \sl@StateNumber1\relax \@ifnextchar[% {\sl@ChangeState}% {\sl@ChangeState[\sl@WarningNames]}} @@ -215,145 +215,145 @@ \def\sl@@ChangeState#1,{% \def\sl@Tempa{#1}% - \ifx\sl@Tempa\sl@end% - \let\sl@next\relax% - \else% - \ifcase\sl@StateNumber% + \ifx\sl@Tempa\sl@end + \let\sl@next\relax + \else + \ifcase\sl@StateNumber \expandafter\gdef\csname #1:WarningState\endcsname{active}% - \or% + \or \expandafter\gdef\csname #1:WarningState\endcsname{inactive}% - \or% + \or \expandafter\gdef\csname #1:ErrorState\endcsname{active}% - \or% + \or \expandafter\gdef\csname #1:ErrorState\endcsname{inactive}% - \fi% - \let\sl@next\sl@@ChangeState% + \fi + \let\sl@next\sl@@ChangeState \fi\sl@next} \def\ActivateFilters{% \@ifnextchar[% - {\sl@StateNumber0% + {\sl@StateNumber0 \sl@RetrieveArgument}% - {\sl@StateNumber0\relax% + {\sl@StateNumber0 \sl@ChangeState[\sl@WarningNames]% - \sl@StateNumber2\relax% + \sl@StateNumber2 \sl@ChangeState[\sl@ErrorNames]}} \def\DeactivateFilters{% \@ifnextchar[% - {\sl@StateNumber1% + {\sl@StateNumber1 \sl@RetrieveArgument}% - {\sl@StateNumber1\relax% + {\sl@StateNumber1 \sl@ChangeState[\sl@WarningNames]% - \sl@StateNumber3\relax% + \sl@StateNumber3 \sl@ChangeState[\sl@ErrorNames]}} \def\sl@RetrieveArgument[#1]{% - \def\sl@Argument{#1} - \ifcase\sl@StateNumber% + \def\sl@Argument{#1}% + \ifcase\sl@StateNumber \sl@ChangeState[\sl@Argument]% - \sl@StateNumber2\relax% + \sl@StateNumber2\relax \sl@ChangeState[\sl@Argument]% - \or% + \or \sl@ChangeState[\sl@Argument]% - \sl@StateNumber3\relax% + \sl@StateNumber3\relax \sl@ChangeState[\sl@Argument]% \fi} \def\sl@GetNumber#1:sl@#2,{% - \ifnum#1>0% - \expandafter% - \ifx\csname #2:\ifcase\sl@StateNumber Warning\or Error\fi State\endcsname\sl@active% + \ifnum#1>0 + \expandafter + \ifx\csname #2:\ifcase\sl@StateNumber Warning\or Error\fi State\endcsname\sl@active \sl@GetMessage{#1}% - \else% - \let\sl@next\sl@GetNumber% - \fi% - \else% - \let\sl@next\relax% + \else + \let\sl@next\sl@GetNumber + \fi + \else + \let\sl@next\relax \fi\sl@next} \def\sl@GetMessage#1{% - \def\sl@@GetMessage##1(:sl@#1:)##2(:sl@#1:)##3(:sl@end:){\sl@Filter={##2^^a3}}% - \ifcase\sl@StateNumber% + \def\sl@@GetMessage##1(:sl@#1:)##2(:sl@#1:)##3(:sl@end:){\sl@Filter={##2\sl@Terminator}}% + \ifcase\sl@StateNumber \edef\sl@act{\noexpand\sl@@GetMessage\the\sl@BankOfWarnings(:sl@end:)}% - \or% + \or \edef\sl@act{\noexpand\sl@@GetMessage\the\sl@BankOfErrors(:sl@end:)}% - \fi% - \sl@act% - \ifsl@SafeMode% - \sl@SafeTesttrue% - \edef\sl@act{\noexpand\sl@Mess@ge{\the\sl@UnexpandedMessage^^a3}}% - \else% - \expandafter% + \fi + \sl@act + \ifsl@SafeMode + \sl@SafeTesttrue + \edef\sl@act{\noexpand\sl@Mess@ge{\the\sl@UnexpandedMessage\noexpand\sl@Terminator}}% + \else + \expandafter \ifx\csname #1:\ifcase\sl@StateNumber Warning\or Error\fi Mode\endcsname\sl@safe% - \sl@SafeTesttrue% - \edef\sl@act{\noexpand\sl@Mess@ge{\the\sl@UnexpandedMessage^^a3}}% - \else% - \sl@SafeTestfalse% - \edef\sl@act{\noexpand\sl@Mess@ge{\the\sl@Message^^a3}}% - \fi% - \fi% - \sl@act% + \sl@SafeTesttrue + \edef\sl@act{\noexpand\sl@Mess@ge{\the\sl@UnexpandedMessage\noexpand\sl@Terminator}}% + \else + \sl@SafeTestfalse + \edef\sl@act{\noexpand\sl@Mess@ge{\the\sl@Message\noexpand\sl@Terminator}}% + \fi + \fi + \sl@act \sl@TestStrings} \def\sl@TestStrings{% \edef\sl@act{% - \noexpand\sl@Slice\the\sl@Filter(:sl@mid:)\noexpand\sl@Filter\noexpand\sl@FilterToken% + \noexpand\sl@Slice\the\sl@Filter(:sl@mid:)\noexpand\sl@Filter\noexpand\sl@FilterToken \noexpand\sl@Slice\the\sl@Mess@ge(:sl@mid:)\noexpand\sl@Mess@ge\noexpand\sl@MessageToken}% - \sl@act% - \ifx\sl@FilterToken\sl@Terminator% - \sl@KillMessagetrue% - \let\sl@@next\relax% - \let\sl@next\sl@Gobble% + \sl@act + \ifx\sl@FilterToken\sl@Terminator + \sl@KillMessagetrue + \let\sl@@next\relax + \let\sl@next\sl@Gobble \else - \ifx\sl@MessageToken\sl@Terminator% - \let\sl@@next\relax% - \let\sl@next\sl@GetNumber% - \else% - \ifsl@SafeTest% - \ifx\sl@FilterToken\sl@MessageToken% - \let\sl@@next\sl@TestStrings% - \else% - \let\sl@@next\relax% - \let\sl@next\sl@GetNumber% - \fi% - \else% - \if\sl@FilterToken\sl@MessageToken% - \let\sl@@next\sl@TestStrings% - \else% - \let\sl@@next\relax% - \let\sl@next\sl@GetNumber% - \fi% - \fi% - \fi% + \ifx\sl@MessageToken\sl@Terminator + \let\sl@@next\relax + \let\sl@next\sl@GetNumber + \else + \ifsl@SafeTest + \ifx\sl@FilterToken\sl@MessageToken + \let\sl@@next\sl@TestStrings + \else + \let\sl@@next\relax + \let\sl@next\sl@GetNumber + \fi + \else + \if\sl@FilterToken\sl@MessageToken + \let\sl@@next\sl@TestStrings + \else + \let\sl@@next\relax + \let\sl@next\sl@GetNumber + \fi + \fi + \fi \fi\sl@@next} \def\sl@Slice#1#2(:sl@mid:)#3#4{\def#4{#1}#3={#2}} \def\sl@Belong#1,{% - \def\sl@Tempa{#1} - \ifx\sl@Tempa\sl@end% - \let\sl@next\relax% - \else% - \ifx\sl@Tempa\sl@PackageName% - \sl@Belongtrue% - \let\sl@next\sl@Gobble% - \else% - \let\sl@next\sl@Belong% - \fi% + \def\sl@Tempa{#1}% + \ifx\sl@Tempa\sl@end + \let\sl@next\relax + \else + \ifx\sl@Tempa\sl@PackageName + \sl@Belongtrue + \let\sl@next\sl@Gobble + \else + \let\sl@next\sl@Belong + \fi \fi\sl@next} \def\sl@StoreMessage#1{% - \ifsl@SafeMode% + \ifsl@SafeMode \sl@UnexpandedMessage{#1}% - \else% + \else \sl@UnexpandedMessage{#1}% - \bgroup% - \let\protect\string% - \let\noexpand\string% + \bgroup + \let\protect\string + \let\noexpand\string \edef\sl@Tempa{#1}% \global\expandafter\sl@Message\expandafter{\sl@Tempa}% - \egroup% + \egroup \fi} \ifsl@ShowWarnings @@ -366,44 +366,44 @@ \def\PackageWarning#1#2{% \def\sl@PackageName{#1}% - \ifsl@NoLine% - \sl@NoLinefalse% - \else% + \ifsl@NoLine + \sl@NoLinefalse + \else \sl@StoreMessage{#2}% - \fi% + \fi \sl@PackageWarning{#1}{#2}} \def\PackageWarningNoLine#1#2{% \sl@StoreMessage{#2}% - \sl@NoLinetrue% + \sl@NoLinetrue \PackageWarning{#1}{#2\@gobble}} \def\ClassWarning#1#2{% \def\sl@PackageName{#1}% - \ifsl@NoLine% - \sl@NoLinefalse% - \else% + \ifsl@NoLine + \sl@NoLinefalse + \else \sl@StoreMessage{#2}% - \fi% + \fi \sl@ClassWarning{#1}{#2}} \def\ClassWarningNoLine#1#2{% \sl@StoreMessage{#2}% - \sl@NoLinetrue% + \sl@NoLinetrue \ClassWarning{#1}{#2\@gobble}} \def\@latex@warning#1{% \def\sl@PackageName{latex}% - \ifsl@NoLine% - \sl@NoLinefalse% - \else% + \ifsl@NoLine + \sl@NoLinefalse + \else \sl@StoreMessage{#1}% - \fi% + \fi \sl@latex@warning{#1}} \def\@latex@warning@no@line#1{% \sl@StoreMessage{#1}% - \sl@NoLinetrue% + \sl@NoLinetrue \@latex@warning{#1\@gobble}} \def\@font@warning#1{% @@ -412,49 +412,49 @@ \sl@font@warning{#1}} \DeclareRobustCommand{\GenericWarning}[2]{% - \advance\sl@WarningCount1\relax% - \sl@KillMessagefalse% - \sl@Belongfalse% - \ifsl@WarningsOff% + \global\advance\sl@WarningCount1 + \sl@KillMessagefalse + \sl@Belongfalse + \ifsl@WarningsOff \expandafter\sl@Belong\sl@ProtectedWarnings sl@end,% - \ifsl@Belong% - \else% - \sl@KillMessagetrue% - \fi% - \else% + \ifsl@Belong + \else + \sl@KillMessagetrue + \fi + \else \expandafter\sl@Belong\sl@UnwantedWarnings sl@end,% - \ifsl@Belong% - \sl@KillMessagetrue% - \fi% - \fi% - \ifsl@KillMessage% - \else% - \expandafter\ifx\csname\sl@PackageName @WarningFilter\endcsname\relax% - \else% - \sl@StateNumber0\relax% - \expandafter\expandafter\expandafter% + \ifsl@Belong + \sl@KillMessagetrue + \fi + \fi + \ifsl@KillMessage + \else + \expandafter\ifx\csname\sl@PackageName @WarningFilter\endcsname\relax + \else + \sl@StateNumber0 + \expandafter\expandafter\expandafter \sl@GetNumber\csname\sl@PackageName @WarningFilter\endcsname,0:sl@sl@end,% - \fi% - \fi% - \ifsl@KillMessage% - \advance\sl@WarningCasualties1% - \else% + \fi + \fi + \ifsl@KillMessage + \global\advance\sl@WarningCasualties1 + \else \sl@GenericWarning{#1}{#2}% - \fi% - \ifcase\sl@Save% - \or% - \ifsl@KillMessage% - \bgroup% - \let\@unused\sl@Write% + \fi + \ifcase\sl@Save + \or + \ifsl@KillMessage + \bgroup + \let\@unused\sl@Write \sl@GenericWarning{#1}{#2}% - \egroup% - \fi% - \or% - \bgroup% - \let\@unused\sl@Write% + \egroup + \fi + \or + \bgroup + \let\@unused\sl@Write \sl@GenericWarning{#1}{#2}% - \egroup% - \fi% + \egroup + \fi \gdef\sl@PackageName{NoPackage}}% \fi @@ -475,33 +475,33 @@ \def\ErrorsOn{% \@ifnextchar[% - {\ifsl@ErrorsOff% + {\ifsl@ErrorsOff \def\sl@next{\sl@Add\sl@ProtectedErrors}% - \else% + \else \def\sl@next{\sl@Remove\sl@UnwantedErrors}% \fi\sl@next}% - {\global\sl@ErrorsOfffalse% + {\global\sl@ErrorsOfffalse \gdef\sl@ProtectedErrors{}% \gdef\sl@UnwantedErrors{}}} \def\ErrorsOff{% - \@ifstar% + \@ifstar {\global\sl@ErrorsOfftrue \gdef\sl@UnwantedErrors{}% \gdef\sl@ProtectedErrors{}}% {\@ifnextchar[{% - \ifsl@ErrorsOff% + \ifsl@ErrorsOff \def\sl@next{\sl@Remove\sl@ProtectedErrors}% - \else% + \else \def\sl@next{\sl@Add\sl@UnwantedErrors}% \fi\sl@next}% - {\global\sl@ErrorsOfftrue% + {\global\sl@ErrorsOfftrue \gdef\sl@UnwantedErrors{}% \gdef\sl@ProtectedErrors{latex,}}}} \def\ErrorFilter{% - \global\advance\sl@ErrorNumber1% - \@ifstar% + \global\advance\sl@ErrorNumber1 + \@ifstar {\expandafter\gdef\csname\the\sl@ErrorNumber:ErrorMode\endcsname{safe}\sl@ErrorFilter}% {\sl@ErrorFilter}} @@ -511,48 +511,48 @@ {\sl@@ErrorFilter[sl@family]}} \def\sl@@ErrorFilter[#1]#2{% - \expandafter\ifx\csname #2@ErrorFilter\endcsname\relax% + \expandafter\ifx\csname #2@ErrorFilter\endcsname\relax \expandafter\xdef\csname #2@ErrorFilter\endcsname{\the\sl@ErrorNumber:sl@#1}% - \else% + \else \expandafter\xdef\csname #2@ErrorFilter\endcsname{% \csname #2@ErrorFilter\endcsname,\the\sl@ErrorNumber:sl@#1}% - \fi% - \expandafter\ifx\csname #1:ErrorState\endcsname\relax% + \fi + \expandafter\ifx\csname #1:ErrorState\endcsname\relax \sl@Add\sl@ErrorNames[#1]% - \fi% - \expandafter\ifx\csname #1:ErrorState\endcsname\sl@active% - \else% - \ifsl@Immediate% + \fi + \expandafter\ifx\csname #1:ErrorState\endcsname\sl@active + \else + \ifsl@Immediate \expandafter\gdef\csname #1:ErrorState\endcsname{active}% - \else% + \else \expandafter\gdef\csname #1:ErrorState\endcsname{inactive}% - \fi% - \fi% - \begingroup% - \expandafter\ifx\csname\the\sl@ErrorNumber:ErrorMode\endcsname\sl@safe% - \makeatletter% - \else% - \catcode`\\12\relax% - \fi% + \fi + \fi + \begingroup + \expandafter\ifx\csname\the\sl@ErrorNumber:ErrorMode\endcsname\sl@safe + \makeatletter + \else + \catcode`\\12 + \fi \sl@AddToBankOfErrors} \long\def\sl@AddToBankOfErrors#1{% \sl@TempBOE{#1}% \edef\sl@act{% \global\noexpand\sl@BankOfErrors{% - \the\sl@BankOfErrors% + \the\sl@BankOfErrors (:sl@\the\sl@ErrorNumber:)\the\sl@TempBOE(:sl@\the\sl@ErrorNumber:)}}% - \sl@act% + \sl@act \endgroup} \def\ActivateErrorFilters{% - \sl@StateNumber2\relax% + \sl@StateNumber2 \@ifnextchar[% {\sl@ChangeState}% {\sl@ChangeState[\sl@ErrorNames]}} \def\DeactivateErrorFilters{% - \sl@StateNumber3\relax% + \sl@StateNumber3 \@ifnextchar[% {\sl@ChangeState}% {\sl@ChangeState[\sl@ErrorNames]}} @@ -580,72 +580,72 @@ \sl@latex@error{#1}{#2}} \DeclareRobustCommand{\GenericError}[4]{% - \advance\sl@ErrorCount1\relax% - \sl@KillMessagefalse% - \sl@Belongfalse% - \ifsl@ErrorsOff% + \global\advance\sl@ErrorCount1 + \sl@KillMessagefalse + \sl@Belongfalse + \ifsl@ErrorsOff \expandafter\sl@Belong\sl@ProtectedErrors,sl@end,% - \ifsl@Belong% - \else% - \sl@KillMessagetrue% - \fi% - \else% + \ifsl@Belong + \else + \sl@KillMessagetrue + \fi + \else \expandafter\sl@Belong\sl@UnwantedErrors,sl@end,% - \ifsl@Belong% - \sl@KillMessagetrue% - \fi% - \fi% - \ifsl@KillMessage% - \else% - \expandafter\ifx\csname\sl@PackageName @ErrorFilter\endcsname\relax% - \else% - \sl@StateNumber1\relax% - \expandafter\expandafter\expandafter% + \ifsl@Belong + \sl@KillMessagetrue + \fi + \fi + \ifsl@KillMessage + \else + \expandafter\ifx\csname\sl@PackageName @ErrorFilter\endcsname\relax + \else + \sl@StateNumber1 + \expandafter\expandafter\expandafter \sl@GetNumber\csname\sl@PackageName @ErrorFilter\endcsname,0:sl@sl@end,% - \fi% - \fi% - \ifsl@KillMessage% - \advance\sl@ErrorCasualties1% - \else% + \fi + \fi + \ifsl@KillMessage + \global\advance\sl@ErrorCasualties1 + \else \sl@GenericError{#1}{#2}{#3}{#4}% - \fi% - \ifcase\sl@Save% - \or% - \ifsl@KillMessage% - \bgroup% - \let\@unused\sl@Write% + \fi + \ifcase\sl@Save + \or + \ifsl@KillMessage + \bgroup + \let\@unused\sl@Write \sl@GenericError{#1}{#2}{#3}{#4}% - \egroup% - \fi% - \or% - \bgroup% - \let\@unused\sl@Write% + \egroup + \fi + \or + \bgroup + \let\@unused\sl@Write \sl@GenericError{#1}{#2}{#3}{#4}% - \egroup% - \fi% + \egroup + \fi \gdef\sl@PackageName{NoPackage}}% \fi \AtEndDocument{% - \ifsl@Debrief% - \clearpage% - \sl@MessageCount\sl@WarningCount% - \advance\sl@MessageCount\sl@ErrorCount% - \sl@Casualties\sl@WarningCasualties% - \advance\sl@Casualties\sl@ErrorCasualties% - \ifnum\sl@MessageCount>0% - \ifnum\sl@Casualties>0% - \advance\sl@WarningCount-1% + \ifsl@Debrief + \clearpage + \sl@MessageCount\sl@WarningCount + \advance\sl@MessageCount\sl@ErrorCount + \sl@Casualties\sl@WarningCasualties + \advance\sl@Casualties\sl@ErrorCasualties + \ifnum\sl@MessageCount>0 + \ifnum\sl@Casualties>0 + \advance\sl@WarningCount-1 \PackageWarningNoLine{silence}{% There were \the\sl@WarningCount\space warning(s) - and \the\sl@ErrorCount\space error(s).\MessageBreak% - \ifnum\sl@Casualties=\sl@MessageCount% + and \the\sl@ErrorCount\space error(s).\MessageBreak + \ifnum\sl@Casualties=\sl@MessageCount None survived. This is a violent world% - \else% + \else I've killed \the\sl@WarningCasualties\space warning(s) and \the\sl@ErrorCasualties\space error(s)% \fi}% - \fi% - \fi% + \fi + \fi \fi} \makeatother -- cgit v1.2.3