enotez (2jan13)

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

5 files changed, 57 insertions, 19 deletions

diff --git a/Master/texmf-dist/doc/latex/enotez/README b/Master/texmf-dist/doc/latex/enotez/README
index e493f6da32d..b31236b513e 100644
--- a/Master/texmf-dist/doc/latex/enotez/README
+++ b/Master/texmf-dist/doc/latex/enotez/README
@@ -3,7 +3,7 @@ the ENOTEZ package
 
   Endnotes for LaTeX2e
 
-2012/07/24 v0.3a
+2012/12/30 v0.4
 --------------------------------------------------------------------------
 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 c482b1a6379..d12c08660cd 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 edeac9d55a7..a949b6cae48 100644
--- a/Master/texmf-dist/doc/latex/enotez/enotez_en.tex
+++ b/Master/texmf-dist/doc/latex/enotez/enotez_en.tex
@@ -56,6 +56,8 @@
   endnotemark,
   endnotetext,
   enmark,
+  enmarkstyle,
+  enotezwritemark,
   kant,
   phantomsection,
   printendnotes,
@@ -63,17 +65,12 @@
   splitendnotes,
   textsuperscript
 }
-
+\setenotez{mark-cs=\textsu}
 \DeclareInstance{enotez-list}{addsec}{paragraph}{heading=\addsec{#1}}
 
 % Layout:
-\usepackage[osf]{libertine}
-\cnpkgcolors{
-  main   => cnpkgred ,
-  key    => yellow!40!brown ,
-  module => cnpkgblue ,
-  link   => black!90
-}
+% \usepackage{libertine}
+\cnpkgusecolorscheme{friendly}
 \renewcommand*\othersectionlevelsformat[3]{%
   \textcolor{main}{#3\autodot}\enskip}
 \renewcommand*\partformat{%
@@ -249,6 +246,12 @@ or with the setup command.
    \cmd{printendnotes} has been invoked.
  \Option{counter-format}{arabic|alph|Alph|roman|Roman}\Default{arabic}
    Change the format of the endnote counter.
+ \Option{mark-format}{<code>}\Default
+   Redefine \cmd{enmarkstyle} to execute \code{<code>}. This command is placed
+   directly before the endnote mark in the text.
+ \Option{mark-cs}{<command>}\Default{\cmd{textsuperscript}}
+   Lets \cmd{enotezwritemark} to be equal to \code{<command>}. This command is
+   used to typeset the endnote marks in the text and should take one argument.
  \Option{totoc}{section|chapter|false}\Default{false}
    Add an entry to the table of contents.
  \Option{list-style}{<style>}\Default{plain}
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 df130cb1dcd..13d1da6e65e 100644
--- a/Master/texmf-dist/doc/latex/enotez/enotez_split_example.tex
+++ b/Master/texmf-dist/doc/latex/enotez/enotez_split_example.tex
@@ -1,4 +1,7 @@
 \documentclass{scrartcl}
+% \documentclass{memoir}
+% \documentclass{article}
+% \usepackage{caption}
 \usepackage[T1]{fontenc}
 \usepackage{libertine}
 
@@ -8,7 +11,10 @@
 \DeclareInstance{enotez-list}{section}{paragraph}{heading=\section{#1}}
 \setenotez{split=section,list-style=section,reset}
 % customize the titles in between, e.g.:
-% \setenotez{split-sectioning=textbf,split-title=\par\noindent<name> <ref>:}
+\setenotez{
+  split-sectioning=textbf,
+  split-title=\par\noindent<name> <ref>:
+}
 
 \usepackage{fnpct}
 \AdaptNote\endnote\multendnote
@@ -17,6 +23,21 @@
 \usepackage[colorlinks]{hyperref}
 
 \begin{document}
+\section{Test}
+Text\endnote{\kant[1]}. Text\endnote{\kant[2]}. Text\endnote{This time
+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.}.}
+\end{figure}
+
+\appendix
+\printendnotes
+\end{document}
 
 \tableofcontents
 
diff --git a/Master/texmf-dist/tex/latex/enotez/enotez.sty b/Master/texmf-dist/tex/latex/enotez/enotez.sty
index 4436a0ba41f..10ea9a1bc5b 100644
--- a/Master/texmf-dist/tex/latex/enotez/enotez.sty
+++ b/Master/texmf-dist/tex/latex/enotez/enotez.sty
@@ -31,8 +31,8 @@
 \RequirePackage{ expl3 , xparse , l3keys2e , xtemplate }
 \ProvidesExplPackage
   {enotez}
-  {2012/07/24}
-  {0.3a}
+  {2012/12/30}
+  {0.4}
   {Endnotes for LaTeX2e}
 
 % --------------------------------------------------------------------------
@@ -87,6 +87,10 @@
       \cs_set_eq:Nc \enotez_counter_format:n { int_to_ \l_keys_choice_tl :n }    ,
     counter-format   .generate_choices:n =
       { arabic , alph , Alph , roman , Roman }                                   ,
+    mark-format      .code:n             =
+      \cs_set:Npn \enmarkstyle { #1 }                                            ,
+    mark-cs          .code:n             =
+      \cs_set:Npn \enotezwritemark { #1 }                                        ,
     totoc            .choice_code:n      =
       \tl_if_eq:VnTF \l_keys_choice_tl { false }
         { \bool_set_false:N \l_enotez_totoc_bool }
@@ -117,8 +121,8 @@
 \cs_new:Npn \enotez_write_mark:nn #1#2
   {
     \bool_if:NTF \l_enotez_hyperfootnotes_bool
-      { \textsuperscript { \hyperlink { enz.#1 } { #2 } } }
-      { \textsuperscript { #2 } }
+      { \enotezwritemark { \hyperlink { enz.#1 } { \enmarkstyle #2 } } }
+      { \enotezwritemark { \enmarkstyle #2 } }
   }
 
 % the internal endnote:
@@ -132,7 +136,8 @@
           { \int_use:N \g_enotez_endnote_id_int }
           { \enotez_counter_format:V \g_enotez_endnote_mark_int }
         \tl_set:Nn \l_tmpa_tl { chapter }
-        \bool_if:nTF { \l_enotez_split_bool && \tl_if_eq_p:NN \l_enotez_split_tl \l_tmpa_tl }
+        \bool_if:nTF
+          { \l_enotez_split_bool && \tl_if_eq_p:NN \l_enotez_split_tl \l_tmpa_tl }
           {
             \enotez_save_note:xxxxnn
               { \int_use:N \g_enotez_endnote_id_int }
@@ -155,7 +160,8 @@
       {
         \enotez_write_mark:nn { \int_use:N \g_enotez_endnote_id_int } { #1 }
         \tl_set:Nn \l_tmpa_tl { chapter }
-        \bool_if:nTF { \l_enotez_split_bool && \tl_if_eq_p:NN \l_enotez_split_tl \l_tmpa_tl }
+        \bool_if:nTF
+          { \l_enotez_split_bool && \tl_if_eq_p:NN \l_enotez_split_tl \l_tmpa_tl }
           {
             \enotez_save_note:xnxxnn
               { \int_use:N \g_enotez_endnote_id_int }
@@ -183,7 +189,7 @@
 
 \cs_new:Npn \enotez_caption_endnote:nn #1#2
   {
-    \IfNoValueTF { #1 }
+    \quark_if_no_value:nTF { #1 }
       {
         \enotez_write_mark:nn
           { \int_use:N \g_enotez_endnote_id_int }
@@ -517,8 +523,12 @@
     \prop_get:NnN \g_enotez_endnote_split_prop { #1 } \l_enotez_tmpb_tl
   }
 
-% the mark in the list:
-\cs_new:Npn \enmark #1 { #1 . }
+% the marks in the list:
+\cs_new:Npn   \enmark #1 { #1 . }
+
+% the marks in the text:
+\cs_new:Npn   \enmarkstyle { }
+\cs_new_eq:NN \enotezwritemark \textsuperscript
 
 % internal printendnotes:
 \cs_new:Npn \enotez_print_endnotes:nn #1#2
@@ -600,6 +610,10 @@
 2012/07/07 v0.3  - list-building rewritten due to a design flaw
 2012/07/24 v0.3a - adapted to deprecated functions in l3kernel and l3packages,
                    removed debugging leftover
+2012/12/14 v0.3b - bug fix: works again when used with a KOMA class and an
+                   endnote is used inside a caption
+2012/12/30 v0.4  - new options `mark-cs' and `mark-format', redefinable
+                   commands \enmarkstyle and \enotezwritemark
 
 % --------------------------------------------------------------------------
 % TODO: