enotez (29jul15)

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

5 files changed, 33 insertions, 27 deletions

diff --git a/Master/texmf-dist/doc/latex/enotez/README b/Master/texmf-dist/doc/latex/enotez/README
index 595ff2d6052..dd1c9a50e53 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.8
+the ENOTEZ package v0.8a
 
   Endnotes for LaTeX2e
 
-2015/06/24
+2015/07/29
 --------------------------------------------------------------------------
 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 2ed65fd8fa8..02796da2baa 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 d95b28bd494..0ac37941110 100644
--- a/Master/texmf-dist/doc/latex/enotez/enotez_en.tex
+++ b/Master/texmf-dist/doc/latex/enotez/enotez_en.tex
@@ -9,7 +9,7 @@
 % 
 % --------------------------------------------------------------------------
 % Clemens Niederberger
-% Web:    https://bitbucket.org/cgnieder/enotez/
+% Web:    http://www.mychemistry.eu/forums/forum/enotez/
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
 % Copyright 2012-2015 Clemens Niederberger
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 f84f22b8c60..7332f007b9a 100644
--- a/Master/texmf-dist/doc/latex/enotez/enotez_split_example.tex
+++ b/Master/texmf-dist/doc/latex/enotez/enotez_split_example.tex
@@ -1,5 +1,5 @@
-% \documentclass{scrartcl}
-\documentclass{memoir}
+\documentclass{scrartcl}
+% \documentclass{memoir}
 % \documentclass{article}
 \usepackage[english]{babel}
 \usepackage{caption}
@@ -69,4 +69,4 @@ with a \textbf{nested}\endnote{\kant[10]} endnote.}. Text\endnote{\kant[11]}.
 \printendnotes
 
 
-\end{document}
\ No newline at end of file
+\end{document}
diff --git a/Master/texmf-dist/tex/latex/enotez/enotez.sty b/Master/texmf-dist/tex/latex/enotez/enotez.sty
index ee11727c9da..1252d7466ab 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 , etoolbox , xpatch , scrlfile }
 \ProvidesExplPackage
   {enotez}
-  {2015/06/24}
-  {0.8}
+  {2015/07/29}
+  {0.8a}
   {Endnotes for LaTeX2e}
 
 % --------------------------------------------------------------------------
@@ -177,29 +177,34 @@
     list-name        .tl_set:N           = \l__enotez_list_name_tl ,
     reset            .bool_set:N         = \l__enotez_reset_bool ,
     % TODO: add symbols and other possible formats, use cntformats?
-    counter-format   .choice_code:n      =
-      \cs_set_eq:Nc \enotez_counter_format:n
-        { __enotez_int_to_ \l_keys_choice_tl :n } ,
-    counter-format   .generate_choices:n =
-      { arabic , alph , Alph , roman , Roman , symbols } ,
+    counter-format   .choices:nn         =
+      { arabic , alph , Alph , roman , Roman , symbols }
+      {
+        \cs_set_eq:Nc \enotez_counter_format:n
+          { __enotez_int_to_ \l_keys_choice_tl :n }
+      } ,
     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 }
-        {
-          \bool_set_true:N \l__enotez_totoc_bool
-          \tl_set_eq:NN \l__enotez_totoc_tl \l_keys_choice_tl
-        } ,
-    totoc            .generate_choices:n = { section , chapter , false } ,
+    totoc            .choices:nn         =
+      { section , chapter , false }
+      {
+        \tl_if_eq:VnTF \l_keys_choice_tl { false }
+          { \bool_set_false:N \l__enotez_totoc_bool }
+          {
+            \bool_set_true:N \l__enotez_totoc_bool
+            \tl_set_eq:NN \l__enotez_totoc_tl \l_keys_choice_tl
+          }
+      } ,
     list-heading     .code:n             =
       \cs_set:Npn \enotezlistheading ##1 {#1} ,
-    split            .choice_code:n      =
-      \tl_if_eq:VnTF \l_keys_choice_tl { false }
-        { \bool_set_false:N \l__enotez_split_bool }
-        { \bool_set_true:N \l__enotez_split_bool }
-      \tl_set_eq:NN \l__enotez_split_tl \l_keys_choice_tl ,
-    split            .generate_choices:n = { section , chapter , false } ,
+    split            .choices:nn          =
+      { section , chapter , false }
+      {
+        \tl_if_eq:VnTF \l_keys_choice_tl { false }
+          { \bool_set_false:N \l__enotez_split_bool }
+          { \bool_set_true:N \l__enotez_split_bool }
+        \tl_set_eq:NN \l__enotez_split_tl \l_keys_choice_tl
+      } ,
     split-sectioning .code:n             =
       \enotez_option_deprecated:nn { split-sectioning } { split-heading }
       \cs_set:Npn \enotezsplitlistheading ##1 {#1}
@@ -1059,6 +1064,7 @@
                    list
 2015/06/24 v0.8  - bug fix in typesetting the split-headings
                  - new command \NewSplitTitleTag
+2015/07/29 v0.8a - adapt to deprecated choice selection in keys
 
 % --------------------------------------------------------------------------
 % TODO: