enotez (8nov16)

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

4 files changed, 49 insertions, 44 deletions

diff --git a/Master/texmf-dist/doc/latex/enotez/README b/Master/texmf-dist/doc/latex/enotez/README
index ed2d1d8ac17..18493ed1c23 100644
--- a/Master/texmf-dist/doc/latex/enotez/README
+++ b/Master/texmf-dist/doc/latex/enotez/README
@@ -1,9 +1,9 @@
 --------------------------------------------------------------------------
-the ENOTEZ package v0.8b
+the ENOTEZ package v0.9
 
   Endnotes for LaTeX2e
 
-2016/01/07
+2016/11/08
 --------------------------------------------------------------------------
 Clemens Niederberger
 Web:    https://bitbucket.org/cgnieder/enotez/
diff --git a/Master/texmf-dist/doc/latex/enotez/enotez_en.pdf b/Master/texmf-dist/doc/latex/enotez/enotez_en.pdf
index ff312f0fe69..d11c7f09d19 100644
--- a/Master/texmf-dist/doc/latex/enotez/enotez_en.pdf
+++ b/Master/texmf-dist/doc/latex/enotez/enotez_en.pdf
diff --git a/Master/texmf-dist/doc/latex/enotez/enotez_en.tex b/Master/texmf-dist/doc/latex/enotez/enotez_en.tex
index 0ac37941110..ed87a7dd1d4 100644
--- a/Master/texmf-dist/doc/latex/enotez/enotez_en.tex
+++ b/Master/texmf-dist/doc/latex/enotez/enotez_en.tex
@@ -69,7 +69,7 @@
   index-setup = {
      othercode = \footnotesize ,
      level = \addsec ,
-     noclearpage
+     % noclearpage
   } ,
   makeindex-setup = {
      columns = 3 ,
@@ -128,23 +128,28 @@ note mark.
 \begin{commands}
   \command{endnote}[\oarg{mark}\marg{text}]
     Add an endnote in the text.
+  \command{endnotemark}[\oarg{mark}]
+    \sinceversion{0.9}Add an endnotemark.
+  \command{endnotetext}[\marg{text}]
+    \sinceversion{0.9}Add text to an endnote placed with \cs{endnotemark}.
 \end{commands}
 \begin{example}
   This is some text.\endnote{With an endnote.}
 \end{example}
 There's not really much more to it.  It is possible to add a custom mark by
 using the optional argument but that shouldn't be needed too often.
-\cs{endnote} works fine inside tables, minipages, floats and
-captions\footnote{This has been tested with the standard classes,
-  \cls{memoir}, and the \cls{KOMA-Script} classes, with and without the
-  \pkg*{caption} package.  If you're using another package that redefines
-  \cs*{caption} or are using another class it might not work.  Before you
-  place a note in a caption you should re-think the idea anyway.}.  Endnotes
+% \cs{endnote} works fine inside tables, minipages, floats and
+% captions\footnote{This has been tested with the standard classes,
+%   \cls{memoir}, and the \cls{KOMA-Script} classes, with and without the
+%   \pkg*{caption} package.  If you're using another package that redefines
+%   \cs*{caption} or are using another class it might not work.  Before you
+%   place a note in a caption you should re-think the idea anyway.}.
+Endnotes
 can also be nested.
 
-Since this functionality seemed making a pair
-\cs{endnotemark}/\cs{endnotetext} superfluous they are \emph{not} defined by
-\enotez.
+% Since this functionality seemed making a pair
+% \cs{endnotemark}/\cs{endnotetext} superfluous they are \emph{not} defined by
+% \enotez.
 \begin{example}
   This is some text.\endnote{With another endnote.\endnote{This is a
       nested\endnote{And another level deeper\ldots} endnote!}}
@@ -157,32 +162,32 @@ The marks of the endnotes in the running text are printed through the command
 contains the current mark which is preceded by \cs{enmarkstyle}.  Both of
 these commands can be redefined of course to adapt to custom settings.  This
 can also be done using options, see section~\ref{sec:options}.  The mark of
-the endnote that has been set last is stored in \cs{theendnote} and in
+the endnote that has been set last is stored in % \cs{theendnote} and in
 \verbcode+\@currentlabel+.\sinceversion{0.6}
 
-This could be used to define a command which writes a mark:
-\begin{example}
-  % we cannot use \newcommand -- the command starts with \end...
-  \makeatletter
-  \def\endnotemark{\@ifnextchar[{\@endnotemark}{\@endnotemark[\theendnote]}}
-  \def\@endnotemark[#1]{\enotezwritemark{\enmarkstyle#1}}
-  \makeatother
-  Text\endnotemark
-\end{example}
-Please note that this definition \emph{does not} step the endnote counter but
-either refers to the last number (no optional argument) or uses the one
-provided in the optional argument.
-
-\makeatletter
-\def\endnotemark{\@ifnextchar[{\@endnotemark}{\@endnotemark[\theendnote]}}
-\def\@endnotemark[#1]{\enotezwritemark{\enmarkstyle#1}}
-\makeatother
+% This could be used to define a command which writes a mark:
+% \begin{example}
+%   % we cannot use \newcommand -- the command starts with \end...
+%   \makeatletter
+%   \def\endnotemark{\@ifnextchar[{\@endnotemark}{\@endnotemark[\theendnote]}}
+%   \def\@endnotemark[#1]{\enotezwritemark{\enmarkstyle#1}}
+%   \makeatother
+%   Text\endnotemark
+% \end{example}
+% Please note that this definition \emph{does not} step the endnote counter but
+% either refers to the last number (no optional argument) or uses the one
+% provided in the optional argument.
+
+% \makeatletter
+% \def\endnotemark{\@ifnextchar[{\@endnotemark}{\@endnotemark[\theendnote]}}
+% \def\@endnotemark[#1]{\enotezwritemark{\enmarkstyle#1}}
+% \makeatother
 
 Endnotes can also be labelled and later be referred to:
 \begin{example}
   The next endnote\endnote{This endnote gets a label.}\label{en:test} has
-  the number~\ref{en:test}.  We can use this with the previous definition
-  of \cs{endnotemark}\endnotemark[\ref{en:test}].
+  the number~\ref{en:test}.  Let's now test
+  \cs{endnotemark}\endnotemark[\ref{en:test}].
 \end{example}
 
 \subsection{Printing the Notes}
@@ -515,4 +520,3 @@ to the marks in the text.
 \printendnotes[addsec]
 
 \end{document}
-
diff --git a/Master/texmf-dist/doc/latex/enotez/enotez_split_example.tex b/Master/texmf-dist/doc/latex/enotez/enotez_split_example.tex
index 7332f007b9a..12740ede289 100644
--- a/Master/texmf-dist/doc/latex/enotez/enotez_split_example.tex
+++ b/Master/texmf-dist/doc/latex/enotez/enotez_split_example.tex
@@ -1,8 +1,8 @@
-\documentclass{scrartcl}
+\documentclass{article}
+% \documentclass{scrartcl}
 % \documentclass{memoir}
-% \documentclass{article}
 \usepackage[english]{babel}
-\usepackage{caption}
+% \usepackage{caption}
 \usepackage[T1]{fontenc}
 \usepackage{libertine}
 
@@ -14,21 +14,18 @@
   split=section,
   list-style=section,
   reset,
+  backref
 % customize the titles in between, e.g.:
 %   split-sectioning=addsec,
 %   split-title=\par\noindent<name> <ref>:
 }
 
 \usepackage{fnpct}
-% \AdaptNote\endnote\multendnote
 
 \usepackage{mwe}
 \usepackage[colorlinks]{hyperref}
 
 \begin{document}
-\makeatletter
-% \texttt{\meaning\@@makecaption}
-\makeatother
 
 \tableofcontents
 
@@ -38,10 +35,14 @@ with a \textbf{nested}\multendnote{\kant[3];\kant[4]} endnote.}.
 Text\multendnote{\kant[5];\kant[6]}.
 
 \begin{figure}[htp]
- \centering
- \includegraphics[width=.4\linewidth]{example-image-a}
- \caption[caption]{Some text\endnote{An endnote with a nested endnote\endnote{\kant[7]}
- inside a figure caption.}.}
+  \centering
+  \includegraphics[width=.4\linewidth]{example-image-a}
+  % \addtocounter{endnote}{-1} % <<< need this in memoir class and with
+                               % `caption' package when using an endnote
+                               % inside a caption
+  \caption[caption]{Some text\endnotemark.}
+  \endnotetext{An endnote with a nested endnote\endnote{\kant[7]} inside a
+    figure caption.}
 \end{figure}
 
 \appendix