censor (31jul13)

git-svn-id: svn://tug.org/texlive/trunk@31332 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 7 insertions, 1 deletions

diff --git a/Master/texmf-dist/tex/latex/censor/censor.sty b/Master/texmf-dist/tex/latex/censor/censor.sty
index 9caeae26cf8..2cf837b0d94 100644
--- a/Master/texmf-dist/tex/latex/censor/censor.sty
+++ b/Master/texmf-dist/tex/latex/censor/censor.sty
@@ -1,5 +1,5 @@
 % censor.sty
-\def\censorversionnumber{3.20}
+\def\censorversionnumber{3.21}
 \ProvidesPackage{censor}
 [2013/06/24 \censorversionnumber
  Provides capability for redaction of sensitive information]
@@ -27,6 +27,8 @@
 % 3.10 - Made \blackout work with \par in argument.  Introduced 
 %        \xblackout
 % 3.20 - Specify depth/height of censor rule.  Introduced \def\censordot{}
+% 3.21 - Fixed bug regarding \xblackout rules remaining after a
+%        \StopCensoring
 \usepackage{pbox}
 \usepackage{ifnextok}
 
@@ -50,10 +52,12 @@
 \newcommand\StopCensoring{%
            \let\censor\un@censor%
            \let\censorbox\un@censorbox%
+           \let\xblackout\blackout%
 }
 \newcommand\RestartCensoring{%
            \renewcommand\censor{\@ifstar{\@cenlen}{\@cenword}}%
            \renewcommand\censorbox{\@ifstar{\censor@dim}{\censor@box}}%
+           \let\xblackout\sv@xblackout%
 }
 
 \let\sv@tilde~
@@ -83,6 +87,8 @@
   \let~\sv@tilde%
  }
 
+\let\sv@xblackout\xblackout
+
 \long\def\xcensor@Block{\IfNextToken\stringend{\@gobble}%
   {\IfNextToken\@sptoken{ \def\@justspace{T}\xbl@t{\xcensor@Block}}%
   {\xbl@t{\xcensor@Block}}}}