texlive[63126] Master/texmf-dist: censor
commits+karl at tug.org
commits+karl at tug.org
Sun Apr 24 22:16:45 CEST 2022
Revision: 63126
http://tug.org/svn/texlive?view=revision&revision=63126
Author: karl
Date: 2022-04-24 22:16:44 +0200 (Sun, 24 Apr 2022)
Log Message:
-----------
censor
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/censor/censor.pdf
trunk/Master/texmf-dist/doc/latex/censor/censor.tex
trunk/Master/texmf-dist/tex/latex/censor/censor.sty
Modified: trunk/Master/texmf-dist/doc/latex/censor/censor.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/censor/censor.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/censor/censor.tex 2022-04-24 20:12:31 UTC (rev 63125)
+++ trunk/Master/texmf-dist/doc/latex/censor/censor.tex 2022-04-24 20:16:44 UTC (rev 63126)
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{verbatimbox,xcolor}
+\usepackage{verbatimbox,xcolor,mathtools}
\usepackage{censor}
\parindent 0in
@@ -13,7 +13,7 @@
\small \rule{0in}{1em}Tools for Producing Redacted Documents\\
\large \rule{0in}{2em} Steven B. Segletes\\
SSegletes at verizon.net\\
-\rule{0em}{2em}\today\\
+\rule{0em}{2em}\censorversiondate\\
v\censorversionnumber
\end{center}
@@ -21,8 +21,8 @@
The \textsf{censor} package allows a convenient redaction/censor
capability to be employed, for those who need to protect restricted
-information, as well as for those who are forced to work in a more
-inefficient environment when dealing with restricted information.
+information, as well as for those who are forced to work in a less
+efficient environment when dealing with restricted information.
Let us assume you have a document for internal use, containing some
restricted (\textit{i.e.}, private, sensitive, proprietary or
@@ -195,10 +195,11 @@
As of version 2.0, there is provided a block-censor
-capability, for redacting larger blocks of text. This new command
-is \verb|\blackout|, and is used in the form
-\verb|\blackout{Block of text}|. This nice thing about this command is
-that it can stretch across line and paragraph boundaries conveniently.
+ capability, for redacting larger blocks of text.
+This new command is \verb|\blackout|, and is used in the form
+ \verb|\blackout{Block of text}|. This nice thing about this command
+ is that it can stretch across line, paragraph, and page boundaries
+ conveniently.
For example,
{\addtolength{\leftskip}{2.3em}
@@ -227,21 +228,32 @@
}
Prior to V4.0, \verb|\blackout| did not conveniently work across
- environment boundaries, such as math or tabular mode.
-One inconvenient option had been to \verb|\censor| text in the \texttt{tabular},
- cell by cell.
-Alternatively, to blackout the whole tabular environment, you should use
+ environment boundaries, such as math or tabular.
+To blackout the whole tabular environment, one could use
the \verb|\censorbox| command as has been shown.
-Presently, there is a third option---to censor cell-by-cell using a
- shorthand notation.
+Presently, however, there is another option---to censor
+ cell-by-cell using a shorthand notation.
The \verb|\blackout| macro now allows uncensored content to be \textit{escaped}
- from its argument by delimiting it between \verb+|...|+ bars.
-Thus, the censoring directive \verb+\blackout{This |is a| test}+ renders as
- \blackout{This |is a| test}.
+ from its argument by delimiting it between \verb+|...|+ bars (note: the
+ closing escape bar must be in the same grouping level).
+Thus, the censoring directive {\ttfamily\detokenize
+ {\blackout{This |is a| test}}}
+ renders as \blackout{This |is a| test}.
+This escaping of text becomes essential if one wishes to execute
+ environments within a \verb|\blackout| argument.
+Unless the environment name is escaped, it will break the command,
+ since the environment name itself would be replaced with censoring
+ commands.
+As of v4.2, tokens of catcode 4 (the \verb|&| token) are intercepted
+ and automatically passed through to the output stream, which can
+ be of use in censoring \verb|tabular| expressions.
+Here shows how a partial and full censor could be accomplished, with
+ the use of appropriate text-escaping delimiters, instead of a
+ \verb|\censorbox|:
+
\begingroup
-
\begin{verbatim}
\blackout{
|\begin{tabular}{|c|c|}
@@ -248,10 +260,18 @@
\hline
Title 1 & Title 2 \\
\hline
-|a| & |bbb|\\
-|cc| & dd\\
+a & |bbb\\
+cc| & dd\\
\hline
\end{tabular}|
+|\begin{tabular}{|c|c|}|
+\hline
+Title 1 & Title 2 \\
+\hline
+ a & bbb \\
+ cc & dd\\
+\hline
+|\end{tabular}|
}
\end{verbatim}
@@ -260,12 +280,24 @@
\hline
Title 1 & Title 2 \\
\hline
-|a| & |bbb|\\
-|cc| & dd\\
+a & |bbb\\
+cc| & dd\\
\hline
\end{tabular}|
+|\begin{tabular}{|c|c|}|
+\hline
+Title 1 & Title 2 \\
+\hline
+ a & bbb \\
+ cc & dd\\
+\hline
+|\end{tabular}|
}
+
\StopCensoring
+
+For comparison, the uncensored tabulars are:
+
\blackout{
|\begin{tabular}{|c|c|}
\hline
@@ -275,6 +307,14 @@
|cc| & dd\\
\hline
\end{tabular}|
+|\begin{tabular}{|c|c|}|
+\hline
+Title 1 & Title 2 \\
+\hline
+a&bbb\\
+cc&dd\\
+\hline
+|\end{tabular}|
}
\endgroup
@@ -291,76 +331,6 @@
the censoring of macro content with this package.
-The author received some negative feedback concerning the appearance
- resulting from a \verb|\blackout| command. Generally, people did not
- like the fact that spaces were not blacked out.
-To this end, the \verb|\xblackout| command is introduced in V3.10, which
- \textit{cosmetically} blacks out the text more completely
- (note, however, that underneath the more complete blackout are still
- the word-length blackouts that otherwise compose \verb|\blackout|).
-
-As of v4.0 of the package,
- the additional blacking-out of the \verb|\xblackout| macro is controlled
- by one resettable length which laps additional blacking atop the
- result of \verb|\blackout|.
-This length is defined in the macro \verb|\spacelap|, with
- a default value of \spacelap.
-
-During \verb|\xblackout|, a
- right- and left-lapped blacking of dimension \verb|\spacelap| is
- applied before and after each space character, respectively.
-
-The blacking from \verb|\xblackout| is intended to be less ``choppy''
-than that of \verb|\blackout|. However, it too has some drawbacks. The
-x-blacking will extend past the margin(s). It is also
-possible that not all margin extensions will be uniform in size.
-With all these caveats,
-it may still be found preferable to the \verb|\blackout| macro, as
- shown in the example below.
-
-{\addtolength{\leftskip}{2.3em}
-UNCENSORED RESTRICTED SOURCE: \hrulefill
-
-
-\verb|{%|\\
-\verb|The Liberty missile, with charge diameter (CD) of 80~mm,|\\
-\verb|revealed a penetration capability of 1.30, 1.19, and 1.37~CD|\\
-\verb|in recent testing here. The tests were into armor steel.}|\\
-\verb| |\\
-\verb|New paragraph} with open text.|
-
-UNCENSORED RESTRICTED OUTPUT: \hrulefill
-
-{%
-The Liberty missile, with charge diameter (CD) of
-80~mm, revealed a penetration capability of 1.30, 1.19, and
-1.37~CD in recent testing here. The tests were into armor steel.
-
-New paragraph} with open text.
-
-CENSORED UNRESTRICTED OUTPUT (\verb|\blackout{}|): \hrulefill
-
-\blackout{%
-The Liberty missile, with charge diameter (CD) of
-80~mm, revealed a penetration capability of 1.30, 1.19, and
-1.37~CD in recent testing here. The tests were into armor steel.
-
-New paragraph} with open text.
-
-CENSORED UNRESTRICTED OUTPUT (\verb|\xblackout{}|): \hrulefill
-
-\xblackout{%
-The Liberty missile, with charge diameter (CD) of
-80~mm, revealed a penetration capability of 1.30, 1.19, and
-1.37~CD in recent testing here. The tests were into armor steel.
-
-New paragraph} with open text.
-
-\hrulefill
-
-}
-
-\clearpage
\section{Mode II: Public/Unsecure Source (.tex file)}
This mode is envisioned for users who must bear a large level of
@@ -430,10 +400,11 @@
affect the size of the an ex and \verb|\baselineskip|.
Because the redaction width is only approximate, it is possible that the
-censored and uncensored originals might have differing text
-justification. In the text, the curly braces may be added after the
-keyword identifiers so as to produce the proper interaction with the
-surrounding whitespace and punctuation.
+ censored and uncensored originals might have differing text
+ justification.
+In the text, empty braces may be added after the
+ keyword identifier macros so as to produce the proper interaction
+ with the subsequent whitespace and punctuation.
Because the source (.tex) file contains no restricted information, the
use of \verb|\StopCensoring| cannot (in and of itself) produce the
@@ -473,7 +444,7 @@
and the addition of the \verb|\StopCensoring| command to the file will
produce the uncensored, restricted result:
-\clearpage{\addtolength{\leftskip}{2.3em}
+{\addtolength{\leftskip}{2.3em}
UNCENSORED NO-LONGER-UNRESTRICTED SOURCE: \hrulefill
\verb|\StopCensoring|\\
@@ -541,10 +512,89 @@
may also be obtained from the no-longer-unrestricted source by removing
the \verb|\StopCensoring| command at the beginning of the file.
-It is not envisioned that the \verb|\blackout| or \verb|\xblackout|
-commands, discussed in the prior section, are used in this mode, where
+It is not envisioned that the \verb|\blackout|
+command, discussed in the prior section, is used in this mode, where
the source file is in an unsecure environment.
+\section{Contiguous Blackout}
+
+The author received some negative feedback concerning the appearance
+ resulting from the \verb|\blackout| command. Generally, people did not
+ like the fact that spaces were not blacked out.
+To this end, the \verb|\xblackout| command is introduced in V3.10, which
+ \textit{cosmetically} blacks out the text more completely
+ (note, however, that underneath the more complete blackout are still
+ the word-length blackouts that otherwise compose \verb|\blackout|).
+
+As of v4.2 of this package,
+ additional blacking-out provided by the \verb|\xblackout| macro
+ does not make use of any tunable parameters, but merely employs
+ the \verb|\fontdimen| parameters already provided by each font.
+% is controlled
+% by one resettable length which laps additional blacking atop the
+% result of \verb|\blackout|.
+%This length is defined in the macro \verb|\spacelap|, with
+% a default value of \spacelap.
+
+%During \verb|\xblackout|, a
+% right- and left-lapped blacking of dimension \verb|\spacelap| is
+% applied before and after each space character, respectively.
+
+The blacking from \verb|\xblackout| is intended to be less ``choppy''
+than that of \verb|\blackout|. However, it too has some drawbacks.
+Importantly, because spaces are now subject to blackout, any
+ space that would otherwise be ignored by \verb|\ignorespaces| or
+ \verb|\ignorespacesafterend| will not be ignored during
+ the \verb|\xblackout|.
+These will include bounding spaces in \verb|tabular| cells as well
+as trailing spaces after the \verb|\end| of environments.
+
+With these caveats,
+it may still be found preferable to the \verb|\blackout| macro, as
+ shown in the example below.
+
+{\addtolength{\leftskip}{2.3em}
+UNCENSORED RESTRICTED SOURCE: \hrulefill
+
+
+\verb|\|\textit{x}\verb|blackout{|\\
+\verb|The Liberty missile, with charge diameter (CD) of 80~mm,|\\
+\verb|revealed a penetration capability of 1.30, 1.19, and 1.37~CD|\\
+\verb|in recent testing here. The tests were into armor steel.}|\\
+\verb| |\\
+\verb|New paragraph} with open text.|
+
+UNCENSORED RESTRICTED OUTPUT: \hrulefill
+
+{
+The Liberty missile, with charge diameter (CD) of
+80~mm, revealed a penetration capability of 1.30, 1.19, and
+1.37~CD in recent testing here. The tests were into armor steel.
+
+New paragraph} with open text.
+
+CENSORED UNRESTRICTED OUTPUT (\verb|\blackout{}|): \hrulefill
+
+\blackout{
+The Liberty missile, with charge diameter (CD) of
+80~mm, revealed a penetration capability of 1.30, 1.19, and
+1.37~CD in recent testing here. The tests were into armor steel.
+
+New paragraph} with open text.
+
+CENSORED UNRESTRICTED OUTPUT (\verb|\xblackout{}|): \hrulefill
+
+\xblackout{
+The Liberty missile, with charge diameter (CD) of
+80~mm, revealed a penetration capability of 1.30, 1.19, and
+1.37~CD in recent testing here. The tests were into armor steel.
+
+New paragraph} with open text.
+
+\hrulefill
+
+}
+
\section{Can I Censor Control Sequences?\label{S:A}}
In general, the \textsf{censor} package is designed to operate on
@@ -574,12 +624,11 @@
Consider the following line of \LaTeX{} code:
-\verb|This is \textit{italic text}|\\
+\verb|\blackout{This is \textit{italic text}}|\\
\blackout{|This is \textit{italic text}|\\This is \textit{italic text}}
-It would normally render as in the 2nd line.
-When included as part of the \verb|\blackout| argument, it renders as the
- 3rd line.
+With censoring disabled, it would normally render as in the 2nd line.
+When enabled, it renders as the 3rd line.
The \verb|\textit| is still part of the blackout rendering, but the
\textit{input} to \verb|\textit| has been censored and the
censor rule does not change its presented shape under the influence
@@ -589,9 +638,10 @@
Because macros are, by default, carried literally into the output, they
will only expand into text \textit{after} the censoring has been
applied.
-Consider the following line of \LaTeX{} code:
+Consider the following line of \LaTeX{} code, in which the macro
+ \verb|\today| is not rendered until after censoring is complete:
-\verb|Today's date is \today.|\\
+\verb|\blackout{Today's date is \today.}|\\
\blackout{|Today's date is \today.|\\Today's date is \today.}
If the macro is expandable (and not all are), the \verb|\blackout|
@@ -600,7 +650,7 @@
Therefore, with one small change to the above example, the problem
can be remedied:
-\verb|Today's date is \expanded{\today}.|\\
+\verb|\blackout{Today's date is \expanded{\today}.}|\\
\blackout{|Today's date is \expanded{\today}.|\\%
Today's date is \expanded{\today}.}
@@ -615,19 +665,53 @@
\verb|\ref| and its argument are escaped from the blackout.
%\settcEscapechar{|}
-\verb+In Section |\ref{S:A}|, we discuss censored macros+\\
+\verb+\blackout{In Section |\ref{S:A}|, we discuss censored macros}+\\
\StopCensoring
\blackout{In Section |\ref{S:A}|, we discuss censored macros}\\
\RestartCensoring
\blackout{In Section |\ref{S:A}|, we discuss censored macros}
+\section{Can I Censor Math?}
-\section{Censor Marks}
+As of v4.2, the package makes an attempt to facilitate the
+ censoring of mathematical expressions, when given as part of the
+ argument to \verb|\blackout| and \verb|\xblackout|.
+Namely, tokens with catcodes 3, 7 and 8 (typically,
+ \verb|$|, \verb|^|, and \verb|_|) are intercepted and passed
+ through to the output stream without censoring
+(Note: the same is true of catcode 4, the \verb|&| token, which can
+ be of use in censoring \verb|tabular| as well as
+ \verb|amsmath| expressions.)
+Because macros are, likewise, passed through by default without
+ censoring, this means the expression
+ ``\verb|the equation $\frac{E}{m}=c^{2}$,|'' will be rendered under
+ \verb|\blackout| as \blackout{the equation $\frac{E}{m}=c^{2}$,}.
+There are several points that \textbf{\textit{must}} be noted in
+ a case such as this. First, the arguments to super/sub-scripts
+ must be embraced, even if a single character in length.
+Secondly, censored math scripts will not be reduced to script size, but
+ will be censored using the height and depth of the pre-defined
+ censor rule (this can
+ affect the vertical spacing of lines).
+Finally, customary math spacing associated with operators,
+ punctuation, etc., may be lost, depending on the expression.
+
+As of v4.2, \verb|\blackout| will, by default, automatically
+ detect and censor macros of math-mode Greek letters, such as
+ \verb|\alpha|, \verb|\beta|, etc.
+If one, however, wishes to not waste compilation time searching
+ for such instances, one may disable the feature with the switch
+ \verb|\censormathgreekfalse|.
+
+
+\section{Censor-Rule Marks}
+
The censor (blacking) mark is a \verb|\rule| which has a depth
-\(-\)0.3ex (\textit{i.e.}, below the baseline), and a height of 2.1ex,
-by default. The characteristics of that rule may be changed by setting
-the following two lengths.
+ \(-\)0.3ex (\textit{i.e.}, below the baseline), and a total height
+ of 2.1ex, by default.
+The characteristics of that rule may be changed by setting
+ the following two lengths.
\itshape
\verb| \censorruledepth=|length\\
@@ -659,8 +743,9 @@
\verb| \RestartCensoring|\\
\verb| \censorruledepth=|\it length\\
\verb| \censorruleheight=|length\\
-\verb| \renewcommand\spacelap{|\it length\tt\}\\
+%\verb| \renewcommand\spacelap{|\it length expression\tt\}\\
\verb| \renewcommand\censordot{|\it token or instruction\tt\}\\
+\verb| \censormathgreektrue| \rm(default) or \verb|\censormathgreekfalse|\\
~\\}
The star ({\tt*}) version of the commands is envisioned when the source
document is being created in an unsecure environment, whereas, the
@@ -704,10 +789,6 @@
the documented \textsf{tokcycle}-package commands.
-\item I have found that, in certain cases (for example, with captions created
-using the \textsf{boxhandler} package), the censorbox command needs to
-be protected by way of \verb|\protect\blackout{...}|.
-
\item It is preferable not to apply \verb|\censor| to whitespace, or text
justification could be adversely affected. If one wishes to censor a
multi-word phrase, such as ``Little Bo Peep,'' it is recommended to do
@@ -715,17 +796,26 @@
\verb| \xblackout{Little Bo Peep}|\\
If such a phrase is to be used repeatedly through a document,
it is most convenient to place it as a macro:\\
-\verb| \def\Name{\xblackout{Little Bo Peep}}|\\
+\verb| \newcommand\CenName{\xblackout{Little Bo Peep}}|\\
such that subsequent reference is done indirectly:\\
-\verb| We examine the life of \Name{} in this report,|\\
-\verb| assured that \Name{} line breaks.|\\
-\def\Name{\xblackout{Little Bo Peep}}
-\verb| |We examine the life of \Name{} in this report, assured that
- \Name{} line breaks.\\
-(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.)
+\verb| We examine the life of \CenName{} in this report,|\\
+\verb| assured that \CenName{} line breaks.|\\
+\newcommand\CenName{\xblackout{Little Bo Peep}}
+\verb| |We examine the life of \CenName{} in this report, assured that
+ \CenName{} line breaks.
+\item Censoring can still affect text justification, because
+ censored words are never hyphenated across line
+ boundaries, whereas the original text may have been.
+For this reason, both \verb|\blackout| and \verb|\xblackout|
+ operate locally in \verb|\sloppy| mode, to minimize instances
+ of overfull \verb|\hbox|es.
+(Note however, that effects of \verb|\sloppy| will take hold only
+ for blacked-out text that closes out a paragraph.)
+If necessary, hyphenation points (\verb|\-|) or
+ \verb|\allowbreak| may be added to words subject to blackout
+ or xblackout, to facilitate manual hyphenation.
+
\item Users have asked for color support in the package.
I do not wish to hardwire color into the package---however,
if the \textsf{xcolor} package is loaded,
@@ -752,10 +842,11 @@
\end{itemize}
+\clearpage
\section{Source Code}
-The source code for \textsf{censor} is so short as to be included below:
+The source code for \textsf{censor} is included below:
-\verbatiminput{censor.sty}
+\verbfilenobox[\small]{censor.sty}
\end{document}
Modified: trunk/Master/texmf-dist/tex/latex/censor/censor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/censor/censor.sty 2022-04-24 20:12:31 UTC (rev 63125)
+++ trunk/Master/texmf-dist/tex/latex/censor/censor.sty 2022-04-24 20:16:44 UTC (rev 63126)
@@ -1,9 +1,9 @@
% censor.sty
-\def\censorversionnumber{4.1}
+\def\censorversionnumber{4.2}
+\def\censorversiondate{2022/04/21}
\ProvidesPackage{censor}
-[2022/02/09 \censorversionnumber\
+[\censorversiondate\ \censorversionnumber\
Provides capability for redaction of sensitive information]
-
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -24,11 +24,11 @@
\censorruledepth=-0.3ex% -0.3ex DEFAULT
\censorruleheight=2.1ex% 2.1ex DEFAULT
-\def\censordot{\censor{.}}% versus \def\censordot{ }%
+\def\censordot{\censor{.}}% versus \def\censordot{.}%
\newcommand\censorrule[1]{\protect\rule[\censorruledepth]{#1}{\censorruleheight}}
-\newcommand\censor{\@ifstar{\@cenlen}{\@cenword}}
+\DeclareRobustCommand\censor{\@ifstar{\@cenlen}{\@cenword}}
\newcommand\@cenlen[1]{\censorrule{#1 ex}}
\newcommand\@cenword[1]{\censorrule{\widthofpbox{#1}}}
@@ -56,91 +56,163 @@
\addcytoks[1]{\expandafter\censor\expandafter{#1}}\fi\def#1{}}
\def\@append#1#2{\tc at defx#1{#1#2}}
-\def\spacelap{0.6ex}
-\def\censpace{\rlap{\censorrule{\spacelap}} \llap{\censorrule{\spacelap}}}
+\def\censpace{%
+ \leaders\hrule height \dimexpr\censorruleheight+\censorruledepth\relax
+ depth -\censorruledepth
+ \hskip\fontdimen2\font plus \fontdimen3\font minus \fontdimen4\font
+ \mbox{}}
\let\sv at censpace\censpace
-\long\def\blackout#1{\blackoutenv#1\endblackoutenv}
-\long\def\xblackout#1{\xblackoutenv#1\endxblackoutenv}
+\long\def\blackout#1{\protect\blackoutenv#1\endblackoutenv}
+\long\def\xblackout#1{\protect\xblackoutenv#1\endxblackoutenv}
\newif\ifexpandarg
\xtokcycleenvironment\blackoutenv
{\ifx.##1\@dump\censored at word\addcytoks[1]{\censordot}\else
+ \ifnum\catcode`##1=3\relax\@dump\censored at word\addcytoks{##1}\else
+ \ifnum\catcode`##1=4\relax\@dump\censored at word\addcytoks{##1}\else
+ \ifnum\catcode`##1=7\relax\@dump\censored at word\addcytoks{##1}\else
+ \ifnum\catcode`##1=8\relax\@dump\censored at word\addcytoks{##1}\else
\@append\censored at word{##1}%
- \tcpeek\@next\ifx\@next\@tcEscapeptr\@dump\censored at word\fi\fi}
+ \tcpeek\@next\ifx\@next\@tcEscapeptr\@dump\censored at word\fi
+ \fi\fi\fi\fi\fi}
{\tctestifcon\ifexpandarg{\expandafter\processtoks\expandafter
{\expanded{##1}}\@dump\censored at word}{\groupedcytoks{\processtoks{##1}%
\@dump\censored at word}}\expandargfalse}
{\tctestifx{~##1}{\@append\censored at word{##1}}%
{\tctestifx{\expanded##1}{\@dump\censored at word\expandargtrue}%
- {\test at chars{##1}\ifchar\@append\censored at word{##1}\else
- \test at accents{##1}\ifaccent\@append\censored at word{##1}\tcpop\tc at popped
+ {\test at chars{##1}\if at char\if at mathgreek
+ \@append\censored at word{\ensuremath{##1}}\else
+ \@append\censored at word{##1}\fi\else
+ \test at accents{##1}\if at accent\@append\censored at word{##1}\tcpop\tc at popped
\expandafter\@append\expandafter\censored at word\expandafter{\tc at popped}%
\else\@dump\censored at word\addcytoks{##1}\fi\fi}}}
- {\@dump\censored at word\addcytoks{##1}}
- {\stripgroupingtrue\def\censored at word{}}
+ {\@dump\censored at word\addcytoks{##1}}
+ {\stripgroupingtrue\def\censored at word{}\sloppy}
{\@dump\censored at word}
\xtokcycleenvironment\xblackoutenv
{\ifx.##1\@dump\censored at word\addcytoks[1]{\censordot}\else
+ \ifnum\catcode`##1=3\relax\@dump\censored at word\addcytoks{##1}\else
+ \ifnum\catcode`##1=4\relax\@dump\censored at word\addcytoks{##1}\else
+ \ifnum\catcode`##1=7\relax\@dump\censored at word\addcytoks{##1}\else
+ \ifnum\catcode`##1=8\relax\@dump\censored at word\addcytoks{##1}\else
\@append\censored at word{##1}%
- \tcpeek\@next\ifx\@next\@tcEscapeptr\@dump\censored at word\fi\fi}
+ \tcpeek\@next\ifx\@next\@tcEscapeptr\@dump\censored at word\fi
+ \fi\fi\fi\fi\fi}
{\tctestifcon\ifexpandarg{\expandafter\processtoks\expandafter
{\expanded{##1}}\@dump\censored at word}{\groupedcytoks{\processtoks{##1}%
\@dump\censored at word}}\expandargfalse}
{\tctestifx{~##1}{\@append\censored at word{##1}}%
{\tctestifx{\expanded##1}{\@dump\censored at word\expandargtrue}%
- {\test at chars{##1}\ifchar\@append\censored at word{##1}\else
- \test at accents{##1}\ifaccent\@append\censored at word{##1}\tcpop\tc at popped
+ {\test at chars{##1}\if at char\if at mathgreek
+ \@append\censored at word{\ensuremath{##1}}\else
+ \@append\censored at word{##1}\fi\else
+ \test at accents{##1}\if at accent\@append\censored at word{##1}\tcpop\tc at popped
\expandafter\@append\expandafter\censored at word\expandafter{\tc at popped}%
\else\@dump\censored at word\addcytoks{##1}\fi\fi}}}
- {\@dump\censored at word\addcytoks{\censpace}}
- {\stripgroupingtrue\def\censored at word{}}
+ {\@dump\censored at word\addcytoks{\ccenspace}}
+ {\stripgroupingtrue\def\censored at word{}\sloppy}
{\@dump\censored at word}
-\newif\ifchar
-\newcommand\test at chars[1]{\charfalse
- \ifx\$#1\chartrue\else
- \ifx\\chartrue\else
- \ifx\##1\chartrue\else
- \ifx\%#1\chartrue\else
- \ifx\_#1\chartrue\else
- \ifx\o#1\chartrue\else
- \ifx\O#1\chartrue\else
- \ifx\oe#1\chartrue\else
- \ifx\OE#1\chartrue\else
- \ifx\aa#1\chartrue\else
- \ifx\AA#1\chartrue\else
- \ifx\ae#1\chartrue\else
- \ifx\AE#1\chartrue\else
- \ifx\l#1\chartrue\else
- \ifx\L#1\chartrue
+\newcommand\ccenspace{\ifhmode\ifmmode\else\censpace\fi\fi}
+
+\newif\if at char
+\newif\if at mathgreek
+\newif\if at accent
+
+\newcommand\test at chars[1]{\@charfalse\@mathgreekfalse
+ \ifx\$#1\@chartrue\else
+ \ifx\\@chartrue\else
+ \ifx\##1\@chartrue\else
+ \ifx\%#1\@chartrue\else
+ \ifx\_#1\@chartrue\else
+ \ifx\o#1\@chartrue\else
+ \ifx\O#1\@chartrue\else
+ \ifx\oe#1\@chartrue\else
+ \ifx\OE#1\@chartrue\else
+ \ifx\aa#1\@chartrue\else
+ \ifx\AA#1\@chartrue\else
+ \ifx\ae#1\@chartrue\else
+ \ifx\AE#1\@chartrue\else
+ \ifx\l#1\@chartrue\else
+ \ifx\L#1\@chartrue\else
+ \ifcensormathgreek\test at mathgreek{#1}\if at mathgreek\@chartrue\fi\fi%
\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
}
-\newif\ifaccent
-\newcommand\test at accents[1]{\accentfalse
- \ifx\`#1\accenttrue\else
- \ifx\=#1\accenttrue\else
- \ifx\'#1\accenttrue\else
- \ifx\.#1\accenttrue\else
- \ifx\^#1\accenttrue\else
- \ifx\"#1\accenttrue\else
- \ifx\u#1\accenttrue\else
- \ifx\d#1\accenttrue\else
- \ifx\v#1\accenttrue\else
- \ifx\b#1\accenttrue\else
- \ifx\H#1\accenttrue\else
- \ifx\t#1\accenttrue\else
- \ifx\~#1\accenttrue\else
- \ifx\c#1\accenttrue
+\newcommand\test at mathgreek[1]{%
+ \ifx\alpha#1\@mathgreektrue\else
+ \ifx\beta#1\@mathgreektrue\else
+ \ifx\gamma#1\@mathgreektrue\else
+ \ifx\delta#1\@mathgreektrue\else
+ \ifx\epsilon#1\@mathgreektrue\else
+ \ifx\varepsilon#1\@mathgreektrue\else
+ \ifx\zeta#1\@mathgreektrue\else
+ \ifx\eta#1\@mathgreektrue\else
+ \ifx\theta#1\@mathgreektrue\else
+ \ifx\vartheta#1\@mathgreektrue\else
+ \ifx\iota#1\@mathgreektrue\else
+ \ifx\kappa#1\@mathgreektrue\else
+ \ifx\lambda#1\@mathgreektrue\else
+ \ifx\mu#1\@mathgreektrue\else
+ \ifx\nu#1\@mathgreektrue\else
+ \ifx\xi#1\@mathgreektrue\else
+ \ifx\pi#1\@mathgreektrue\else
+ \ifx\varpi#1\@mathgreektrue\else
+ \ifx\rho#1\@mathgreektrue\else
+ \ifx\varrho#1\@mathgreektrue\else
+ \ifx\sigma#1\@mathgreektrue\else
+ \ifx\varsigma#1\@mathgreektrue\else
+ \ifx\tau#1\@mathgreektrue\else
+ \ifx\upsilon#1\@mathgreektrue\else
+ \ifx\phi#1\@mathgreektrue\else
+ \ifx\varphi#1\@mathgreektrue\else
+ \ifx\chi#1\@mathgreektrue\else
+ \ifx\psi#1\@mathgreektrue\else
+ \ifx\omega#1\@mathgreektrue\else
+ \ifx\Gamma#1\@mathgreektrue\else
+ \ifx\Delta#1\@mathgreektrue\else
+ \ifx\Theta#1\@mathgreektrue\else
+ \ifx\Lambda#1\@mathgreektrue\else
+ \ifx\Xi#1\@mathgreektrue\else
+ \ifx\Pi#1\@mathgreektrue\else
+ \ifx\Sigma#1\@mathgreektrue\else
+ \ifx\Upsilon#1\@mathgreektrue\else
+ \ifx\Phi#1\@mathgreektrue\else
+ \ifx\Psi#1\@mathgreektrue\else
+ \ifx\Omega#1\@mathgreektrue
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+}
+
+\newcommand\test at accents[1]{\@accentfalse
+ \ifx\`#1\@accenttrue\else
+ \ifx\=#1\@accenttrue\else
+ \ifx\'#1\@accenttrue\else
+ \ifx\.#1\@accenttrue\else
+ \ifx\^#1\@accenttrue\else
+ \ifx\"#1\@accenttrue\else
+ \ifx\u#1\@accenttrue\else
+ \ifx\d#1\@accenttrue\else
+ \ifx\v#1\@accenttrue\else
+ \ifx\b#1\@accenttrue\else
+ \ifx\H#1\@accenttrue\else
+ \ifx\t#1\@accenttrue\else
+ \ifx\~#1\@accenttrue\else
+ \ifx\c#1\@accenttrue
\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
}
+
+\newif\ifcensormathgreek
+
+\censormathgreektrue
+
%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand\censorbox{\@ifstar{\censor at dim}{\censor at box}}
+\DeclareRobustCommand\censorbox{\@ifstar{\censor at dim}{\censor at box}}
\newcommand\censor at dim[4][]{{#1%
\rule[-#4\baselineskip]{#2ex}{#3\baselineskip}}}
\newcommand\censor at box[2][]{#1\setbox0\hbox{#2}%
@@ -152,7 +224,6 @@
\rule{#2ex}{0ex}}}}
\newcommand\un at censor@box[2][]{#1#2}
-% NOTE: A \protect\censorbox{} MAY BE REQUIRED INSIDE SOME ENVIRONMENTS
\endinput
VERSION:
@@ -175,4 +246,15 @@
etc. and character accents such as \', etc. See \test at chars and
\test at accents for details.
- Fixed bug in which \expanded arguments remained inside a TeX group
+4.2 - Extended capability (via switch) to autocensor Greek math (see
+ \test at mathgreek).
+ - In (x)blackout macros/environments, auto-intercepts catcode 3,4,7
+ and 8 characters and passes them through unchanged, to help facilitate
+ general censoring of math and tabular content.
+ - Switched \censpace, used in \xblackout, to a leader rather than a
+ lapped rule, which allows automatically for glue associated with
+ \fontdim.
+ - Made \censor and \censorbox robust, which will allow censoring
+ to occur across, for example, section headers, tocs, etc.
+ - Revisited the documentation, bringing it up to date.
More information about the tex-live-commits
mailing list.