censor (31jul13)

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

3 files changed, 11 insertions, 2 deletions

diff --git a/Master/texmf-dist/doc/latex/censor/censor.pdf b/Master/texmf-dist/doc/latex/censor/censor.pdf
index e846a0a2578..807fa99be10 100644
--- a/Master/texmf-dist/doc/latex/censor/censor.pdf
+++ b/Master/texmf-dist/doc/latex/censor/censor.pdf
diff --git a/Master/texmf-dist/doc/latex/censor/censor.tex b/Master/texmf-dist/doc/latex/censor/censor.tex
index 50ee40bfc31..b8425a92d34 100644
--- a/Master/texmf-dist/doc/latex/censor/censor.tex
+++ b/Master/texmf-dist/doc/latex/censor/censor.tex
@@ -602,7 +602,10 @@ If such a phrase is to be used repeatedly through a document,
 it is most convenient to place it as a keyword identifier:\\
 \verb|   \def\Name{\blackout{Little Bo Peep}}|\\
 such that subsequent reference is done indirectly:\\
-\verb|   We examine the life of {\Name} in this report|
+\verb|   We examine the life of {\Name} in this report|\\
+(Even so, it should be noted that censoring can still affect text
+justification, because censored words are never hyphenated across line
+boundaries, whereas the original text may have been.)
 
 The source code for \textsf{censor} is so short as to be included below:
 
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}}}}