summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-12-07 23:05:18 +0000
committerKarl Berry <karl@freefriends.org>2011-12-07 23:05:18 +0000
commit9243c71452f770c56d13ca0db3b5165a580add68 (patch)
tree43eaecf2182fbaf58be6bca0730416140d251771
parent4eea78f0176ac3961e09a5428ce7096b1938ce63 (diff)
silence (7dec11)
git-svn-id: svn://tug.org/texlive/trunk@24792 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/silence/silence-doc.pdfbin269039 -> 494089 bytes
-rw-r--r--Master/texmf-dist/source/latex/silence/silence-doc.dtx24
-rw-r--r--Master/texmf-dist/source/latex/silence/silence.ins2
-rw-r--r--Master/texmf-dist/tex/latex/silence/silence.sty17
4 files changed, 35 insertions, 8 deletions
diff --git a/Master/texmf-dist/doc/latex/silence/silence-doc.pdf b/Master/texmf-dist/doc/latex/silence/silence-doc.pdf
index 1c7354969d0..b700b6fb8e4 100644
--- a/Master/texmf-dist/doc/latex/silence/silence-doc.pdf
+++ b/Master/texmf-dist/doc/latex/silence/silence-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/silence/silence-doc.dtx b/Master/texmf-dist/source/latex/silence/silence-doc.dtx
index 52e5854479b..3004c024ab9 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.3 by Paul Isambert **
+% ** silence v.1.4 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
%<package>\NeedsTeXFormat{LaTeX2e}
-%<package>\ProvidesPackage{silence}[2010/02/28 v1.3 Selective filtering of warnings and error messages]
+%<package>\ProvidesPackage{silence}[2011/12/06 v1.4 Selective filtering of warnings and error messages]
%<*driver>
\documentclass[a4paper]{ltxdoc}
\usepackage[T1]{fontenc}
@@ -72,6 +72,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}
+%\Change{v1.4}{2011/12/06}{Fixed the \texttt{\string\@gobbletwo} error}
%
%\section{Introduction}
%When working with \LaTeX, messages are utterly important.
@@ -1347,10 +1348,23 @@
% prefix will be turned into sequences of characters
% (remember that no control sequence is formed in the
% text of a starless filter, only strings of characters).
+% This expanded version is first stripped of a "\@gobbletwo"
+% prefix, if any, thus avoiding error when "\edef"ing.
+% (The "\@gobbletwo" occurs in some \LaTeX\ messages for
+% some obscure reason.)
% We do this in a group because, well, you know,
% you shouldn't do that...
%
% \begin{macrocode}
+\def\sl@RemoveGobbletwo#1\@gobbletwo\sl@Terminator#2\sl@Terminator{%
+ \def\sl@Tempb{#2}%
+ \ifx\sl@Tempb\@empty
+ \else
+ \def\sl@Tempa{#1}%
+ \expandafter\@gobble
+ \fi
+ }
+
\def\sl@StoreMessage#1{%
\ifsl@SafeMode
\sl@UnexpandedMessage{#1}%
@@ -1359,7 +1373,9 @@
\bgroup
\let\protect\string
\let\noexpand\string
- \edef\sl@Tempa{#1}%
+ \def\sl@Tempa{#1}%
+ \sl@RemoveGobbletwo#1\sl@Terminator\@gobbletwo\sl@Terminator\sl@Terminator
+ \edef\sl@Tempa{\sl@Tempa}%
\global\expandafter\sl@Message\expandafter{\sl@Tempa}%
\egroup
\fi}
@@ -1863,4 +1879,4 @@
\fi}
\makeatother
-% \end{macrocode} \ No newline at end of file
+% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/silence/silence.ins b/Master/texmf-dist/source/latex/silence/silence.ins
index 5e46cc23d1a..1412763cdd8 100644
--- a/Master/texmf-dist/source/latex/silence/silence.ins
+++ b/Master/texmf-dist/source/latex/silence/silence.ins
@@ -6,7 +6,7 @@
******************************************************************************
******************************************************************************
** **
-** silence v.1.3 by Paul Isambert **
+** silence v.1.4 by Paul Isambert **
** See the documentation for a comment on the implementation. **
** **
** This set of macros is published under the LaTeX Project Public License. **
diff --git a/Master/texmf-dist/tex/latex/silence/silence.sty b/Master/texmf-dist/tex/latex/silence/silence.sty
index 22720008669..0d6b081cb04 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.3 by Paul Isambert **
+%% ** silence v.1.4 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}[2010/02/28 v1.3 Selective filtering of warnings and error messages]
+\ProvidesPackage{silence}[2011/12/06 v1.4 Selective filtering of warnings and error messages]
\makeatletter
\newcount\sl@Save
@@ -343,6 +343,15 @@
\fi
\fi\sl@next}
+\def\sl@RemoveGobbletwo#1\@gobbletwo\sl@Terminator#2\sl@Terminator{%
+ \def\sl@Tempb{#2}%
+ \ifx\sl@Tempb\@empty
+ \else
+ \def\sl@Tempa{#1}%
+ \expandafter\@gobble
+ \fi
+ }
+
\def\sl@StoreMessage#1{%
\ifsl@SafeMode
\sl@UnexpandedMessage{#1}%
@@ -351,7 +360,9 @@
\bgroup
\let\protect\string
\let\noexpand\string
- \edef\sl@Tempa{#1}%
+ \def\sl@Tempa{#1}%
+ \sl@RemoveGobbletwo#1\sl@Terminator\@gobbletwo\sl@Terminator\sl@Terminator
+ \edef\sl@Tempa{\sl@Tempa}%
\global\expandafter\sl@Message\expandafter{\sl@Tempa}%
\egroup
\fi}