crossrefenum (20feb23) (branch)

git-svn-id: svn://tug.org/texlive/branches/branch2022.final@65973 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 26 insertions, 6 deletions

diff --git a/Master/texmf-dist/doc/generic/crossrefenum/CHANGELOG.md b/Master/texmf-dist/doc/generic/crossrefenum/CHANGELOG.md
index 05df28e8bbc..264537fd9e1 100644
--- a/Master/texmf-dist/doc/generic/crossrefenum/CHANGELOG.md
+++ b/Master/texmf-dist/doc/generic/crossrefenum/CHANGELOG.md
@@ -1,3 +1,7 @@
 ## Changes
 
 ### 2022/11/11: Version 1.0
+
+### 2023/02/20: Version 1.0.1
+
+`\crossrefenum` is now protected against early expansion.
diff --git a/Master/texmf-dist/doc/generic/crossrefenum/README.md b/Master/texmf-dist/doc/generic/crossrefenum/README.md
index ea649b53841..44f74cbcd93 100644
--- a/Master/texmf-dist/doc/generic/crossrefenum/README.md
+++ b/Master/texmf-dist/doc/generic/crossrefenum/README.md
@@ -1,4 +1,4 @@
-# crossrefenum 2022/11/11 v1.0
+# crossrefenum 2023/02/20 v1.0.1
 
 Smart typesetting of enumerated cross-references for various TeX formats.
 
@@ -38,7 +38,7 @@ For the moment, it works out of the box with ConTeXt and LaTeX.
   * `crossrefenum.md`: _Markdown source of the user guide to be typeset with Pandoc._
   * `crossrefenum.pdf`: _User guide typeset with ConTeXt._
   * `fixes.lua`: _Lua filter to be used with Pandoc for some typographic improvements._
-  * `LICENSE_FLD_1-3.md`: _GNU Free Documentation License_
+  * `LICENSE_FDL_1-3.md`: _GNU Free Documentation License_
   * `Makefile`: _Provides the target `crossrefenum.pdf` with the required instructions for Pandoc_
   * `TEMPLATE_crossrefenum.context`: _Template to be used with Pandoc._
 * `test/`:
diff --git a/Master/texmf-dist/tex/generic/crossrefenum/crossrefenum.sty b/Master/texmf-dist/tex/generic/crossrefenum/crossrefenum.sty
index 3d6ca15ae01..808f04ffa86 100644
--- a/Master/texmf-dist/tex/generic/crossrefenum/crossrefenum.sty
+++ b/Master/texmf-dist/tex/generic/crossrefenum/crossrefenum.sty
@@ -1,3 +1,6 @@
+% This file cannot be loaded in main-test.tex for it would load the version of crossrefenum.tex
+% installed in the texmf tree.
+% As a consequence, it should not be changed to correct bugs or implement new features.
 \input crossrefenum.tex
 \ProvidesPackage{crossrefenum}[\crfnmDate{} v\crfnmVersion{} Enumeration of cross-references]
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/crossrefenum/crossrefenum.tex b/Master/texmf-dist/tex/generic/crossrefenum/crossrefenum.tex
index 2b8d424a675..be36bfac4a2 100644
--- a/Master/texmf-dist/tex/generic/crossrefenum/crossrefenum.tex
+++ b/Master/texmf-dist/tex/generic/crossrefenum/crossrefenum.tex
@@ -2,8 +2,8 @@
 \def\crfnmName{crossrefenum}
 \def\crfnmShortDesc{Smart typesetting of enumerated cross-references for various TeX formats}
 \def\crfnmAuthor{Bastien Dumont}
-\def\crfnmDate{2022/11/11}
-\def\crfnmVersion{0.1}
+\def\crfnmDate{2023/02/20}
+\def\crfnmVersion{1.0.1}
 %
 % Copyright 2022 by Bastien Dumont (bastien.dumont@posteo.net)
 %
@@ -524,13 +524,22 @@
 
 %%% \crossrefenum: Public macro with optional arguments %%%
 
+\crfnm@case[\fmtname]
+  \crfnm@context: {
+    \unexpanded\def\crossrefenum{\crfnm@crossrefenum}
+  }
+  \crfnm@latex: {
+    \protected\def\crossrefenum{\crfnm@crossrefenum}
+  }
+\crfnm@endCases
+
 % \crossrefenum has two optional arguments.
 % See the definition of \crfnm@enum below for the recognized values.
 
 \def\crfnm@firstArg@default{page}
 \def\crfnm@secondArg@default{withprefix}
 
-\def\crossrefenum{%
+\def\crfnm@crossrefenum{%
   \futurelet\crfnm@nextToken\crfnm@setEnumMacro
 }
 
diff --git a/Master/texmf-dist/tex/generic/crossrefenum/t-crossrefenum.tex b/Master/texmf-dist/tex/generic/crossrefenum/t-crossrefenum.tex
index 3f44e64f889..9629faf04cd 100644
--- a/Master/texmf-dist/tex/generic/crossrefenum/t-crossrefenum.tex
+++ b/Master/texmf-dist/tex/generic/crossrefenum/t-crossrefenum.tex
@@ -9,10 +9,14 @@
 %D    copyright=Bastien Dumont,
 %D      license=GNU Public License v. 3.0 or higher]
 
+% This file cannot be loaded in main-test.tex for it would load the version of crossrefenum.tex
+% installed in the texmf tree.
+% As a consequence, it should not be changed to correct bugs or implement new features.
+
 \startmodule[crossrefenum]
 \unprotect
 
-\input ../crossrefenum.tex
+\input crossrefenum.tex
 
 \protect
 \stopmodule
\ No newline at end of file