handout (21apr17)

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

10 files changed, 28 insertions, 6 deletions

diff --git a/Master/texmf-dist/doc/latex/handout/examples/example1-minimal.pdf b/Master/texmf-dist/doc/latex/handout/examples/example1-minimal.pdf
index f408de6599b..02e809f3c5e 100644
--- a/Master/texmf-dist/doc/latex/handout/examples/example1-minimal.pdf
+++ b/Master/texmf-dist/doc/latex/handout/examples/example1-minimal.pdf
diff --git a/Master/texmf-dist/doc/latex/handout/examples/example2-cancel-quotation.pdf b/Master/texmf-dist/doc/latex/handout/examples/example2-cancel-quotation.pdf
index c46324d6232..b20e2f83f44 100644
--- a/Master/texmf-dist/doc/latex/handout/examples/example2-cancel-quotation.pdf
+++ b/Master/texmf-dist/doc/latex/handout/examples/example2-cancel-quotation.pdf
diff --git a/Master/texmf-dist/doc/latex/handout/examples/example3-defined-path.pdf b/Master/texmf-dist/doc/latex/handout/examples/example3-defined-path.pdf
index 86d88403ea9..c9ab4c9c8cd 100644
--- a/Master/texmf-dist/doc/latex/handout/examples/example3-defined-path.pdf
+++ b/Master/texmf-dist/doc/latex/handout/examples/example3-defined-path.pdf
diff --git a/Master/texmf-dist/doc/latex/handout/examples/example4-sectioning.pdf b/Master/texmf-dist/doc/latex/handout/examples/example4-sectioning.pdf
index 1fb10b050dc..fa80671d510 100644
--- a/Master/texmf-dist/doc/latex/handout/examples/example4-sectioning.pdf
+++ b/Master/texmf-dist/doc/latex/handout/examples/example4-sectioning.pdf
diff --git a/Master/texmf-dist/doc/latex/handout/examples/example5-numbering.pdf b/Master/texmf-dist/doc/latex/handout/examples/example5-numbering.pdf
index b0832fec25c..d38d4a94a15 100644
--- a/Master/texmf-dist/doc/latex/handout/examples/example5-numbering.pdf
+++ b/Master/texmf-dist/doc/latex/handout/examples/example5-numbering.pdf
diff --git a/Master/texmf-dist/doc/latex/handout/examples/example6-not-and-only.pdf b/Master/texmf-dist/doc/latex/handout/examples/example6-not-and-only.pdf
index 4773818f9f2..ba60bd2ae2a 100644
--- a/Master/texmf-dist/doc/latex/handout/examples/example6-not-and-only.pdf
+++ b/Master/texmf-dist/doc/latex/handout/examples/example6-not-and-only.pdf
diff --git a/Master/texmf-dist/doc/latex/handout/examples/example7-biblatex.pdf b/Master/texmf-dist/doc/latex/handout/examples/example7-biblatex.pdf
index e83ee90bd8b..2d4eb01c315 100644
--- a/Master/texmf-dist/doc/latex/handout/examples/example7-biblatex.pdf
+++ b/Master/texmf-dist/doc/latex/handout/examples/example7-biblatex.pdf
diff --git a/Master/texmf-dist/doc/latex/handout/handout.pdf b/Master/texmf-dist/doc/latex/handout/handout.pdf
index c43bd706121..19c248beb36 100644
--- a/Master/texmf-dist/doc/latex/handout/handout.pdf
+++ b/Master/texmf-dist/doc/latex/handout/handout.pdf
diff --git a/Master/texmf-dist/doc/latex/handout/handout.tex b/Master/texmf-dist/doc/latex/handout/handout.tex
index 37a3852c54e..dc483101d14 100644
--- a/Master/texmf-dist/doc/latex/handout/handout.tex
+++ b/Master/texmf-dist/doc/latex/handout/handout.tex
@@ -16,8 +16,8 @@
   subtitle={to support your talk},
   email={maieul <at> maieul <dot> net},
   author={Maïeul Rouquette},
-  revision={1.5.0},
-  date={15/11/2016},
+  revision={1.6.0},
+  date={21/04/2017},
   url={https://github.com/maieul/handout}}
 
 
@@ -145,10 +145,11 @@ The package option \opt{disabled} allows you to disable the handout's generation
 The argument of a  \cmd{onlyhandout} command will be printed only in the handout. Conversely, the argument of a command \cmd{nothandout} will be printed only in the main text. See example~6.
 
 \subsection{Insert code in the handout}
-
+\subsubsection{\cmd{forhandout} and \cmd{forhandout*}}\label{forhandout}
 The argument of the  \cmd{forhandout} command will be added to the handout, even if used outside any included file.
 
-\emph{Be careful}: if the content of the argument starts with a command, this command won't be run before the handout.
+All the commands inside will be expanded, except the one which starts argument..
+
 
 The \cmd{forhandout} command is quite complex to manage, but can be useful if you want to insert bibliographic references automatically into your handout. If you use \emph{biblatex} to manage your bibliography, you can define a \cmd{citehandout} command with this code:
 
@@ -176,10 +177,24 @@ You can call the \cmd{citehandout} command before citation commands when you wan
 
 Note that the citation tracker is automatically reset at the beginning of the handout.
 
+The starred version of \cmd{citehandout} command will not expand any macro inside the argument. For example, if you need to write instructions for readers:
+\begin{minted}{latex}
+\forhandout{Read the three following texts, looking for:
+\begin{itemize}
+	\item Places.
+	\item Topics.
+	\item Characters.
+\end{itemize}
+}
+\end{minted}
+\subsubsection{\cmd{AtEveryHandout}}\label{forhandout}
 You can also add define a \cs{AtEveryHandout} command to be executed in the handout, before each content added to the handout.
 \section{Change history}
 
 \begin{changelog}
+\begin{release}{1.6.0}{2017-04-21}
+\item Add starred version of \cs{forhandout} macro \see{forhandout}. 
+\end{release}
 
 \begin{release}{1.5.0}{2016-11-15}
 \item Reset automatically table and figure counters before typesetting handout.
diff --git a/Master/texmf-dist/tex/latex/handout/handout.sty b/Master/texmf-dist/tex/latex/handout/handout.sty
index b2483d39ce1..88e407c870c 100644
--- a/Master/texmf-dist/tex/latex/handout/handout.sty
+++ b/Master/texmf-dist/tex/latex/handout/handout.sty
@@ -13,8 +13,8 @@
 % The Current Maintainer of this work is Maïeul Rouquette
 % This work consists of the files handout.sty and example and documentation files.
 
-\ProvidesPackage{handout}[2016/11/15 1.5.0 Handout package]
-\RequirePackage{kvoptions,etoolbox}
+\ProvidesPackage{handout}[2017/04/21 1.6.0 Handout package]
+\RequirePackage{kvoptions,etoolbox,suffix}
 
 % Options
 \DeclareBoolOption[false]{disabled}
@@ -64,6 +64,13 @@
 	  \fi%
 	\fi%
 }
+\WithSuffix\newcommand\forhandout*[1]{%
+	\ifhandout@disabled\else%
+	  \ifhandout@printing%
+	    \immediate\write\@handout{\unexpanded{#1}}%
+	  \fi%
+	\fi%
+}
 
 % The command written in the .handout file
 \newcommand{\handout@input}[1]{%