diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/multiaudience/README | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/multiaudience/multiaudience.pdf | bin | 267154 -> 290727 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/multiaudience/sample-admins,devs.pdf | bin | 0 -> 155054 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/multiaudience/sample-admins,execs.pdf | bin | 0 -> 153721 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/multiaudience/sample-admins.pdf | bin | 144175 -> 155055 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/multiaudience/sample-devs.pdf | bin | 149651 -> 161370 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/multiaudience/sample-execs,devs.pdf | bin | 0 -> 160072 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/multiaudience/sample-execs.pdf | bin | 148195 -> 159900 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/multiaudience/Makefile (renamed from Master/texmf-dist/doc/latex/multiaudience/Makefile) | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/multiaudience/multiaudience.dtx | 57 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/multiaudience/multiaudience.sty | 13 |
11 files changed, 60 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/latex/multiaudience/README b/Master/texmf-dist/doc/latex/multiaudience/README index 48e74efbb19..ad3ee7a5c86 100644 --- a/Master/texmf-dist/doc/latex/multiaudience/README +++ b/Master/texmf-dist/doc/latex/multiaudience/README @@ -3,3 +3,7 @@ The multiaudience package allows to generate several versions of the same document for different audiences. + +Changes + +Version 1.04: Added support for a list of current audiences
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/multiaudience/multiaudience.pdf b/Master/texmf-dist/doc/latex/multiaudience/multiaudience.pdf Binary files differindex ff0d56538f3..1c08b79f587 100644 --- a/Master/texmf-dist/doc/latex/multiaudience/multiaudience.pdf +++ b/Master/texmf-dist/doc/latex/multiaudience/multiaudience.pdf diff --git a/Master/texmf-dist/doc/latex/multiaudience/sample-admins,devs.pdf b/Master/texmf-dist/doc/latex/multiaudience/sample-admins,devs.pdf Binary files differnew file mode 100644 index 00000000000..b87e7476d74 --- /dev/null +++ b/Master/texmf-dist/doc/latex/multiaudience/sample-admins,devs.pdf diff --git a/Master/texmf-dist/doc/latex/multiaudience/sample-admins,execs.pdf b/Master/texmf-dist/doc/latex/multiaudience/sample-admins,execs.pdf Binary files differnew file mode 100644 index 00000000000..53c4a367a1e --- /dev/null +++ b/Master/texmf-dist/doc/latex/multiaudience/sample-admins,execs.pdf diff --git a/Master/texmf-dist/doc/latex/multiaudience/sample-admins.pdf b/Master/texmf-dist/doc/latex/multiaudience/sample-admins.pdf Binary files differindex 45eaf05b442..6a1e50df4bb 100644 --- a/Master/texmf-dist/doc/latex/multiaudience/sample-admins.pdf +++ b/Master/texmf-dist/doc/latex/multiaudience/sample-admins.pdf diff --git a/Master/texmf-dist/doc/latex/multiaudience/sample-devs.pdf b/Master/texmf-dist/doc/latex/multiaudience/sample-devs.pdf Binary files differindex 3c0c46d282d..d4d1657f38f 100644 --- a/Master/texmf-dist/doc/latex/multiaudience/sample-devs.pdf +++ b/Master/texmf-dist/doc/latex/multiaudience/sample-devs.pdf diff --git a/Master/texmf-dist/doc/latex/multiaudience/sample-execs,devs.pdf b/Master/texmf-dist/doc/latex/multiaudience/sample-execs,devs.pdf Binary files differnew file mode 100644 index 00000000000..d052a0c4109 --- /dev/null +++ b/Master/texmf-dist/doc/latex/multiaudience/sample-execs,devs.pdf diff --git a/Master/texmf-dist/doc/latex/multiaudience/sample-execs.pdf b/Master/texmf-dist/doc/latex/multiaudience/sample-execs.pdf Binary files differindex 6ded1224d69..c4da4461e75 100644 --- a/Master/texmf-dist/doc/latex/multiaudience/sample-execs.pdf +++ b/Master/texmf-dist/doc/latex/multiaudience/sample-execs.pdf diff --git a/Master/texmf-dist/doc/latex/multiaudience/Makefile b/Master/texmf-dist/source/latex/multiaudience/Makefile index 042984e8af7..91ea935010a 100644 --- a/Master/texmf-dist/doc/latex/multiaudience/Makefile +++ b/Master/texmf-dist/source/latex/multiaudience/Makefile @@ -2,11 +2,11 @@ # # This file is in public domain # -# $Id: Makefile,v 1.3 2015/08/02 23:00:13 boris Exp $ +# $Id: Makefile,v 1.4 2021/10/02 22:18:28 boris Exp $ # PACKAGE=multiaudience -PDF = sample-execs.pdf sample-devs.pdf sample-admins.pdf +PDF = sample-execs.pdf sample-devs.pdf sample-admins.pdf sample-admins,execs.pdf sample-admins,devs.pdf sample-execs,devs.pdf all: $(PACKAGE).pdf ${PDF} @@ -59,4 +59,4 @@ archive: all clean zip: all clean ${MAKE} $(PACKAGE).sty $(RM) *.log - zip -r $(PACKAGE).zip * -x '*~' -x '*.tgz' -x '*.zip' -x CVS -x 'CVS/*'
\ No newline at end of file + zip -r $(PACKAGE).zip * -x '*~' -x '*.tgz' -x '*.zip' -x CVS -x 'CVS/*' diff --git a/Master/texmf-dist/source/latex/multiaudience/multiaudience.dtx b/Master/texmf-dist/source/latex/multiaudience/multiaudience.dtx index 15ef56e89fd..04128b728cc 100644 --- a/Master/texmf-dist/source/latex/multiaudience/multiaudience.dtx +++ b/Master/texmf-dist/source/latex/multiaudience/multiaudience.dtx @@ -1,7 +1,7 @@ % \iffalse -% $Id: multiaudience.dtx,v 1.6 2015/08/02 23:02:42 boris Exp $ +% $Id: multiaudience.dtx,v 1.9 2021/10/02 22:21:51 boris Exp $ % -%% Copyright 2015, Boris Veytsman <borisv@lk.net +%% Copyright 2015-2021, Boris Veytsman <borisv@lk.net %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.3 of this license or (at your option) any @@ -22,13 +22,13 @@ %</gobble> %<style>\ProvidesPackage{multiaudience} %<*style> -[2015/08/02 v1.02 Generating versions for different audiences from the +[2021/10/02 v1.04 Generating versions for different audiences from the same source] % \end{macrocode} %</style> %<*gobble> % \fi -% \CheckSum{81} +% \CheckSum{85} % % %% \CharacterTable @@ -134,8 +134,8 @@ same source] % This trick allows one to generate all versions of output from the % command line: % \begin{verbatim} -% pdflatex -jobnane file-execs "\def\CurrentAudience{execs}\input{file}" -% pdflatex -jobnane file-devs "\def\CurrentAudience{devs}\input{file}" +% pdflatex -jobname file-execs "\def\CurrentAudience{execs}\input{file}" +% pdflatex -jobname file-devs "\def\CurrentAudience{devs}\input{file}" % ... % \end{verbatim} % @@ -201,7 +201,7 @@ same source] % TEXT~1 will be visible only to devs and execs, while TEXT~2 only to % devs. % \begin{verbatim} -% \begin{shownto}{devs, execs} +% \begin{shownto}{devs,execs} % TEXT 1 % \begin{shownto}{devs} % TEXT 2 @@ -298,6 +298,38 @@ same source] % \begin{verbatim} % \NewMultiaudienceSectionEnv{Section}{\section} % \end{verbatim} +% +% \subsection{Combined audiences} +% \label{ug:combinations} +% +% Sometimes one wants to create a document for several audiences. You +% can do this using comma-separated lists in \cs{CurrentAudience}, for +% example, +% \begin{verbatim} +% \DefCurrentAudience{execs,admins} +% \end{verbatim} +% +% +% \emph{Important:} there should be no spaces in the definition. The +% definition |\DefCurrentAudience{execs, admins}| will \emph{not} work! +% +% The resulting audience is the union of the audiences in the +% definition. Thus a fragment is included if either: +% \begin{enumerate} +% \item The list of audiences for the fragment does not start with +% |-|, and at least one of the current audiences is mentioned in the +% list. +% \item The list of audiences for the fragment starts with |-|, and +% none of the current audiences is mentioned in the list. +% \end{enumerate} +% For example, suppose the current audience is |execs,admins|. Then +% the following is true: +% \begin{enumerate} +% \item |\showto{devs}{...}|---excluded. +% \item |\showto{devs,admins}{...}|---included. +% \item |\showto{-, devs}{...}|---included. +% \item |\showto{-, devs, admins}{...}|---excluded. +% \end{enumerate} % % %\StopEventually{\clearpage} @@ -380,20 +412,23 @@ same source] % \end{macro} % % \begin{macro}{\SetNewAudience} +% \changes{v1.04}{2021/10/02}{Added facility for a list of current +% audiences} % Definition of a new audience. We create a new key that switches % visibility on or off. % \begin{macrocode} \def\SetNewAudience#1{% \define@key{MULTAU}{#1}[]{% \def\@MULTAU@currkey{#1}% - \ifx\@MULTAU@currkey\CurrentAudience\relax + \@for\@tempa:=\CurrentAudience \do{% + \ifx\@MULTAU@currkey\@tempa\relax \if@MULTAU@include \@MULTAU@showntrue \else \@MULTAU@shownfalse - \fi - \fi}% -} + \fi% + \fi% +}}} % \end{macrocode} % % \end{macro} diff --git a/Master/texmf-dist/tex/latex/multiaudience/multiaudience.sty b/Master/texmf-dist/tex/latex/multiaudience/multiaudience.sty index f0691df3efc..6861e8a3552 100644 --- a/Master/texmf-dist/tex/latex/multiaudience/multiaudience.sty +++ b/Master/texmf-dist/tex/latex/multiaudience/multiaudience.sty @@ -20,7 +20,7 @@ %% original source files, as listed above, are part of the %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) -%% Copyright 2015, Boris Veytsman <borisv@lk.net +%% Copyright 2015-2021, Boris Veytsman <borisv@lk.net %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.3 of this license or (at your option) any @@ -36,7 +36,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{multiaudience} -[2015/08/02 v1.02 Generating versions for different audiences from the +[2021/10/02 v1.04 Generating versions for different audiences from the same source] \providecommand*\CurrentAudience{default} \def\DefCurrentAudience#1{\def\CurrentAudience{#1}} @@ -49,14 +49,15 @@ same source] \def\SetNewAudience#1{% \define@key{MULTAU}{#1}[]{% \def\@MULTAU@currkey{#1}% - \ifx\@MULTAU@currkey\CurrentAudience\relax + \@for\@tempa:=\CurrentAudience \do{% + \ifx\@MULTAU@currkey\@tempa\relax \if@MULTAU@include \@MULTAU@showntrue \else \@MULTAU@shownfalse - \fi - \fi}% -} + \fi% + \fi% +}}} \long\def\showto#1#2{\@MULTAU@shownfalse\@MULTAU@includetrue \setkeys{MULTAU}{#1}% \if@MULTAU@shown#2\fi |