summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-01-27 00:11:49 +0000
committerKarl Berry <karl@freefriends.org>2012-01-27 00:11:49 +0000
commitbe826ba2b4031f0ad0e5dc34ec103d707bf13cec (patch)
tree3e7faebf0ed6342514c85d34a62d8781091a888b /Master
parentf5e32672613d47ce06b98e5508356670a9d5f6f0 (diff)
silence (26jan12)
git-svn-id: svn://tug.org/texlive/trunk@25210 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/silence/silence-doc.pdfbin494089 -> 494431 bytes
-rw-r--r--Master/texmf-dist/source/latex/silence/silence-doc.dtx17
-rw-r--r--Master/texmf-dist/tex/latex/silence/silence.sty10
3 files changed, 25 insertions, 2 deletions
diff --git a/Master/texmf-dist/doc/latex/silence/silence-doc.pdf b/Master/texmf-dist/doc/latex/silence/silence-doc.pdf
index b700b6fb8e4..b53248a3cc6 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 3004c024ab9..2be90905a9f 100644
--- a/Master/texmf-dist/source/latex/silence/silence-doc.dtx
+++ b/Master/texmf-dist/source/latex/silence/silence-doc.dtx
@@ -73,6 +73,7 @@
%\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}
+%\Change{v1.4}{2012/01/26}{Fixed the \texttt{\string\@gobble} error (same as before, spotted with biblatex)}
%
%\section{Introduction}
%When working with \LaTeX, messages are utterly important.
@@ -1349,13 +1350,24 @@
% (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.
+% suffix, if any, thus avoiding error when "\edef"ing.
% (The "\@gobbletwo" occurs in some \LaTeX\ messages for
-% some obscure reason.)
+% some obscure reason.) ... And at least in biblatex "\@gobble"
+% was also found, which also ruined everything, so it is removed
+% too if found at the end of a message.
% We do this in a group because, well, you know,
% you shouldn't do that...
%
% \begin{macrocode}
+\def\sl@RemoveGobble#1\@gobble\sl@Terminator#2\sl@Terminator{%
+ \def\sl@Tempb{#2}%
+ \ifx\sl@Tempb\@empty
+ \else
+ \def\sl@Tempa{#1}%
+ \expandafter\@gobble
+ \fi
+ }
+
\def\sl@RemoveGobbletwo#1\@gobbletwo\sl@Terminator#2\sl@Terminator{%
\def\sl@Tempb{#2}%
\ifx\sl@Tempb\@empty
@@ -1374,6 +1386,7 @@
\let\protect\string
\let\noexpand\string
\def\sl@Tempa{#1}%
+ \sl@RemoveGobble#1\sl@Terminator\@gobble\sl@Terminator\sl@Terminator
\sl@RemoveGobbletwo#1\sl@Terminator\@gobbletwo\sl@Terminator\sl@Terminator
\edef\sl@Tempa{\sl@Tempa}%
\global\expandafter\sl@Message\expandafter{\sl@Tempa}%
diff --git a/Master/texmf-dist/tex/latex/silence/silence.sty b/Master/texmf-dist/tex/latex/silence/silence.sty
index 0d6b081cb04..7139fba8732 100644
--- a/Master/texmf-dist/tex/latex/silence/silence.sty
+++ b/Master/texmf-dist/tex/latex/silence/silence.sty
@@ -343,6 +343,15 @@
\fi
\fi\sl@next}
+\def\sl@RemoveGobble#1\@gobble\sl@Terminator#2\sl@Terminator{%
+ \def\sl@Tempb{#2}%
+ \ifx\sl@Tempb\@empty
+ \else
+ \def\sl@Tempa{#1}%
+ \expandafter\@gobble
+ \fi
+ }
+
\def\sl@RemoveGobbletwo#1\@gobbletwo\sl@Terminator#2\sl@Terminator{%
\def\sl@Tempb{#2}%
\ifx\sl@Tempb\@empty
@@ -361,6 +370,7 @@
\let\protect\string
\let\noexpand\string
\def\sl@Tempa{#1}%
+ \sl@RemoveGobble#1\sl@Terminator\@gobble\sl@Terminator\sl@Terminator
\sl@RemoveGobbletwo#1\sl@Terminator\@gobbletwo\sl@Terminator\sl@Terminator
\edef\sl@Tempa{\sl@Tempa}%
\global\expandafter\sl@Message\expandafter{\sl@Tempa}%