[latex3-commits] [git/LaTeX3-latex3-latex2e] counterwithin: update the typical test files (1b97dac9)

Frank Mittelbach frank.mittelbach at latex-project.org
Thu Jul 8 21:29:26 CEST 2021


Repository : https://github.com/latex3/latex2e
On branch  : counterwithin
Link       : https://github.com/latex3/latex2e/commit/1b97dac912433396ec4cb84f3e1e6620a8c2e752

>---------------------------------------------------------------

commit 1b97dac912433396ec4cb84f3e1e6620a8c2e752
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu Jul 8 21:29:26 2021 +0200

    update the typical test files


>---------------------------------------------------------------

1b97dac912433396ec4cb84f3e1e6620a8c2e752
 base/changes.txt                                   |   7 ++
 base/doc/ltnews34.tex                              |  11 +++
 base/ltcounts.dtx                                  | 110 +++++++++++----------
 base/testfiles/github-0479-often.luatex.tlg        |   3 +
 base/testfiles/github-0479-often.tlg               |   3 +
 base/testfiles/github-0479-often.xetex.tlg         |   3 +
 base/testfiles/github-robust-0123.luatex.tlg       |   4 +
 base/testfiles/github-robust-0123.lvt              |   4 +-
 base/testfiles/github-robust-0123.tlg              |   4 +
 base/testfiles/github-robust-0123.xetex.tlg        |   4 +
 .../tlb-latexrelease-rollback-003-often.luatex.tlg |   6 ++
 .../tlb-latexrelease-rollback-003-often.tlg        |   6 ++
 .../tlb-latexrelease-rollback-003-often.xetex.tlg  |   6 ++
 base/testfiles/tlb-remreset-004.lvt                |   2 +-
 base/testfiles/tlb-remreset-004.tlg                |   2 +-
 base/testfiles/tlb-rollback-004-often.luatex.tlg   |   3 +
 base/testfiles/tlb-rollback-004-often.tlg          |   3 +
 base/testfiles/tlb-rollback-004-often.xetex.tlg    |   3 +
 base/testfiles/tlb-rollback-005.luatex.tlg         |   3 +
 base/testfiles/tlb-rollback-005.tlg                |   3 +
 base/testfiles/tlb-rollback-005.xetex.tlg          |   3 +
 21 files changed, 139 insertions(+), 54 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index 85ec9f09..8f08cc44 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,6 +6,13 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 ================================================================================
 
+2021-07-08  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* ltcounts.dtx (subsection{Environment Counter Macros}):
+	New implementation for \counterwithout and \counterwithin
+	with an additional optional arg so it becomes a drop-in
+	replacement for amsmath \numberwithin
+
 2021-06-21  David Carlisle  <David.Carlisle at latex-project.org>
 
 	* base/utf8ienc.dtx: additional characters for gh/593
diff --git a/base/doc/ltnews34.tex b/base/doc/ltnews34.tex
index 215ddadc..2519c446 100644
--- a/base/doc/ltnews34.tex
+++ b/base/doc/ltnews34.tex
@@ -145,6 +145,17 @@
 
 \section{New or improved commands}
 
+
+\subsection{New implementation for \cs{counterwithin}}
+
+New implementation for \cs{counterwithout} and \cs{counterwithin} with
+an additional optional arg so it becomes a drop-in replacement for
+amsmath \cs{numberwithin}.
+
+\emph{write appropriate description}
+  
+
+
 \subsection{???}
 
 %
diff --git a/base/ltcounts.dtx b/base/ltcounts.dtx
index 7e3f9ae4..32f73d7e 100644
--- a/base/ltcounts.dtx
+++ b/base/ltcounts.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltcounts.dtx}
-             [2020/12/04 v1.1l LaTeX Kernel (Counters)]
+             [2021/07/08 v1.1m LaTeX Kernel (Counters)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltcounts.dtx}
@@ -373,60 +373,35 @@
         #3}}}
 %    \end{macrocode}
 %  \end{macro}
-
-
-%  \begin{macro}{\counterwithout}
 %
-%    \changes{v1.1k}{2018/03/08}{Interface added}
 %    \begin{macrocode}
-\def\counterwithout {\@ifstar\counterwithout at s\counterwithout at x}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000-00-00}
+%<latexrelease>                 {\@removefromreset}{Add interfaces}%
+%<latexrelease>\let \@removefromreset \undefined
+%<latexrelease>\let \@ifbothcounters  \undefined
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
 %    \end{macrocode}
 %
-%    \begin{macrocode}
-\def\counterwithout at s#1#2{%
-  \@ifbothcounters{#1}{#2}{\@removefromreset{#1}{#2}}}
-%    \end{macrocode}
 %
-%    \begin{macrocode}
-\def\counterwithout at x#1#2{%
-  \@ifbothcounters{#1}{#2}%
-      {\@removefromreset{#1}{#2}%
-       \expandafter
-       \gdef\csname the#1\expandafter\endcsname\expandafter
-            {\expandafter
-             \@arabic\csname c@#1\endcsname}}}
-%    \end{macrocode}
-%  \end{macro}
-
-
-
-%  \begin{macro}{\counterwithin}
 %
-%    \changes{v1.1k}{2018/03/08}{Interface added}
-%    \begin{macrocode}
-\def\counterwithin{\@ifstar\counterwithin at s\counterwithin at x}
-%    \end{macrocode}
 %
+%  \begin{macro}{\counterwithout,\counterwithin}
+%     New implementation using xparse and supporting an optional
+%    format argument.
+%    \changes{v1.1m}{2021/07/08}{New implementation for
+%          \cs{counterwithout} and \cs{counterwithin}}
 %    \begin{macrocode}
-\def\counterwithin at s#1#2{%
-  \@ifbothcounters{#1}{#2}{\@addtoreset{#1}{#2}}}
+%</2ekernel>
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2021/11/15}%
+%<latexrelease>                 {\counterwithout}{counter without/within}%
 %    \end{macrocode}
 %
-%    \changes{v1.1l}{2018/04/11}{Correct default (issue/38)}
 %    \begin{macrocode}
-\def\counterwithin at x#1#2{%
-  \@ifbothcounters{#1}{#2}%
-      {\@addtoreset{#1}{#2}%
-       \expandafter
-       \gdef\csname the#1\expandafter\endcsname\expandafter
-            {\csname the#2\expandafter\endcsname\expandafter
-             .\expandafter
-             \@arabic\csname c@#1\endcsname}}}
-%    \end{macrocode}
-%  \end{macro}
-
-
-\RenewDocumentCommand\counterwithout{sO{\arabic}mm}{%
+\NewDocumentCommand \counterwithout {sO{\arabic}mm}{%
   \@ifbothcounters{#3}{#4}{%
     \@removefromreset{#3}{#4}%
     \IfBooleanF #1%
@@ -434,9 +409,10 @@
          \gdef\csname the#3\endcsname {#2{#3}}}%
   }%
 }
-
-
-\RenewDocumentCommand\counterwithin{sO{\arabic}mm}{%
+%    \end{macrocode}
+%    
+%    \begin{macrocode}
+\NewDocumentCommand \counterwithin {sO{\arabic}mm}{%
   \@ifbothcounters{#3}{#4}{%
     \@addtoreset{#3}{#4}%
     \IfBooleanF #1%
@@ -446,14 +422,45 @@
              {\csname the#4\endcsname .#2{#3}}}%
   }%
 }
+%    \end{macrocode}
 %
+%    \changes{v1.1k}{2018/03/08}{Interface added}
 %    \begin{macrocode}
 %</2ekernel|latexrelease>
 %<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2018-04-01}
+%<latexrelease>                 {\counterwithout}{counter without/within}%
+%<latexrelease>
+%<latexrelease>\def\counterwithout {\@ifstar\counterwithout at s\counterwithout at x}
+%<latexrelease>\def\counterwithout at s#1#2{%
+%<latexrelease>  \@ifbothcounters{#1}{#2}{\@removefromreset{#1}{#2}}}
+%<latexrelease>\def\counterwithout at x#1#2{%
+%<latexrelease>  \@ifbothcounters{#1}{#2}%
+%<latexrelease>      {\@removefromreset{#1}{#2}%
+%<latexrelease>       \expandafter
+%<latexrelease>       \gdef\csname the#1\expandafter\endcsname\expandafter
+%<latexrelease>            {\expandafter
+%<latexrelease>             \@arabic\csname c@#1\endcsname}}}
+%<latexrelease>
+%<latexrelease>\def\counterwithin{\@ifstar\counterwithin at s\counterwithin at x}
+%<latexrelease>\def\counterwithin at s#1#2{%
+%<latexrelease>  \@ifbothcounters{#1}{#2}{\@addtoreset{#1}{#2}}}
+%    \end{macrocode}
+%
+%    \changes{v1.1l}{2018/04/11}{Correct default (issue/38)}
+%    \begin{macrocode}
+%<latexrelease>\def\counterwithin at x#1#2{%
+%<latexrelease>  \@ifbothcounters{#1}{#2}%
+%<latexrelease>      {\@addtoreset{#1}{#2}%
+%<latexrelease>       \expandafter
+%<latexrelease>       \gdef\csname the#1\expandafter\endcsname\expandafter
+%<latexrelease>            {\csname the#2\expandafter\endcsname\expandafter
+%<latexrelease>             .\expandafter
+%<latexrelease>             \@arabic\csname c@#1\endcsname}}}
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
 %<latexrelease>\IncludeInRelease{0000-00-00}
-%<latexrelease>                 {\@removefromreset}{Add interfaces}%
-%<latexrelease>\let \@removefromreset \undefined
-%<latexrelease>\let \@ifbothcounters  \undefined
+%<latexrelease>                 {\counterwithout}{counter without/within}%
 %<latexrelease>\let \counterwithout   \undefined
 %<latexrelease>\let \counterwithout at s \undefined
 %<latexrelease>\let \counterwithout at x \undefined
@@ -463,6 +470,9 @@
 %<latexrelease>\EndIncludeInRelease
 %<*2ekernel>
 %    \end{macrocode}
+%  \end{macro}
+%
+%
 %
 %
 %    Numbering commands for definitions of |\theCOUNTER| and |\list|
diff --git a/base/testfiles/github-0479-often.luatex.tlg b/base/testfiles/github-0479-often.luatex.tlg
index e5900f87..a16013d0 100644
--- a/base/testfiles/github-0479-often.luatex.tlg
+++ b/base/testfiles/github-0479-often.luatex.tlg
@@ -193,6 +193,9 @@ Applying: [....-..-..] Reset nested counters on input line ....
 Already applied: [....-..-..] Reset nested counters on input line ....
 Applying: [....-..-..] Add interfaces on input line ....
 Already applied: [....-..-..] Add interfaces on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Applying: [....-..-..] counter without/within on input line ....
+Already applied: [....-..-..] counter without/within on input line ....
 Applying: [....-..-..] Use \TexOrMath  on input line ....
 Already applied: [....-..-..] Use \TexOrMath  on input line ....
 Applying: [....-..-..] \TextOrMath  on input line ....
diff --git a/base/testfiles/github-0479-often.tlg b/base/testfiles/github-0479-often.tlg
index f5dcc979..82cdef35 100644
--- a/base/testfiles/github-0479-often.tlg
+++ b/base/testfiles/github-0479-often.tlg
@@ -183,6 +183,9 @@ Applying: [....-..-..] Reset nested counters on input line ....
 Already applied: [....-..-..] Reset nested counters on input line ....
 Applying: [....-..-..] Add interfaces on input line ....
 Already applied: [....-..-..] Add interfaces on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Applying: [....-..-..] counter without/within on input line ....
+Already applied: [....-..-..] counter without/within on input line ....
 Applying: [....-..-..] Use \TexOrMath  on input line ....
 Already applied: [....-..-..] Use \TexOrMath  on input line ....
 Applying: [....-..-..] \TextOrMath  on input line ....
diff --git a/base/testfiles/github-0479-often.xetex.tlg b/base/testfiles/github-0479-often.xetex.tlg
index 922a7c07..57bae092 100644
--- a/base/testfiles/github-0479-often.xetex.tlg
+++ b/base/testfiles/github-0479-often.xetex.tlg
@@ -183,6 +183,9 @@ Applying: [....-..-..] Reset nested counters on input line ....
 Already applied: [....-..-..] Reset nested counters on input line ....
 Applying: [....-..-..] Add interfaces on input line ....
 Already applied: [....-..-..] Add interfaces on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Applying: [....-..-..] counter without/within on input line ....
+Already applied: [....-..-..] counter without/within on input line ....
 Applying: [....-..-..] Use \TexOrMath  on input line ....
 Already applied: [....-..-..] Use \TexOrMath  on input line ....
 Applying: [....-..-..] \TextOrMath  on input line ....
diff --git a/base/testfiles/github-robust-0123.luatex.tlg b/base/testfiles/github-robust-0123.luatex.tlg
index 810206b2..5401e3f8 100644
--- a/base/testfiles/github-robust-0123.luatex.tlg
+++ b/base/testfiles/github-robust-0123.luatex.tlg
@@ -87,6 +87,10 @@ l. ...\mruntest{ccc}
 > \\ccc =undefined.
 <recently read> \\ccc  
 l. ...\mruntest{ccc}
+\counterwithin{section}{footnote} -> \counterwithin {section}{footnote}
+---------------------------------------
+\counterwithout{section}{footnote} -> \counterwithout {section}{footnote}
+---------------------------------------
 ====================================
  Not worth making robust ...
 ====================================
diff --git a/base/testfiles/github-robust-0123.lvt b/base/testfiles/github-robust-0123.lvt
index 574d2f85..a917136d 100644
--- a/base/testfiles/github-robust-0123.lvt
+++ b/base/testfiles/github-robust-0123.lvt
@@ -68,8 +68,8 @@
 %%\test{\cleardoublepage}     -- breaks badly
 %%\test{\clearpage}     -- breaks badly
 %%\test{\contentsline}     -- breaks badly
-%%\test{\counterwithin{section}{footnote}}     -- breaks badly
-%%\test{\counterwithout{section}{footnote}}     -- breaks badly
+\test{\counterwithin{section}{footnote}}      %  -- breaks badly no longer
+\test{\counterwithout{section}{footnote}}     %  -- breaks badly no longer
 %%\test{\displaylines{foo}}     -- breaks badly
 %%\test{\enlargethispage{5pt}}     -- breaks badly
 %%\test{\enumerate}     -- breaks badly
diff --git a/base/testfiles/github-robust-0123.tlg b/base/testfiles/github-robust-0123.tlg
index f91361bc..2afb3959 100644
--- a/base/testfiles/github-robust-0123.tlg
+++ b/base/testfiles/github-robust-0123.tlg
@@ -87,6 +87,10 @@ l. ...\mruntest{ccc}
 > \\ccc =undefined.
 <recently read> \\ccc  
 l. ...\mruntest{ccc}
+\counterwithin{section}{footnote} -> \counterwithin {section}{footnote}
+---------------------------------------
+\counterwithout{section}{footnote} -> \counterwithout {section}{footnote}
+---------------------------------------
 ====================================
  Not worth making robust ...
 ====================================
diff --git a/base/testfiles/github-robust-0123.xetex.tlg b/base/testfiles/github-robust-0123.xetex.tlg
index dc3bf5dd..d8b5041b 100644
--- a/base/testfiles/github-robust-0123.xetex.tlg
+++ b/base/testfiles/github-robust-0123.xetex.tlg
@@ -87,6 +87,10 @@ l. ...\mruntest{ccc}
 > \\ccc =undefined.
 <recently read> \\ccc  
 l. ...\mruntest{ccc}
+\counterwithin{section}{footnote} -> \counterwithin {section}{footnote}
+---------------------------------------
+\counterwithout{section}{footnote} -> \counterwithout {section}{footnote}
+---------------------------------------
 ====================================
  Not worth making robust ...
 ====================================
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index 2cf0a67b..a03c67a6 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -166,6 +166,9 @@ Skipping: [....-..-..] Reset nested counters on input line ....
 Applying: [....-..-..] Reset nested counters on input line ....
 Skipping: [....-..-..] Add interfaces on input line ....
 Applying: [....-..-..] Add interfaces on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Applying: [....-..-..] counter without/within on input line ....
 Skipping: [....-..-..] Use \TexOrMath  on input line ....
 Applying: [....-..-..] Use \TexOrMath  on input line ....
 Skipping: [....-..-..] \TextOrMath  on input line ....
@@ -710,6 +713,9 @@ Applying: [....-..-..] Reset nested counters on input line ....
 Already applied: [....-..-..] Reset nested counters on input line ....
 Applying: [....-..-..] Add interfaces on input line ....
 Already applied: [....-..-..] Add interfaces on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Applying: [....-..-..] counter without/within on input line ....
+Already applied: [....-..-..] counter without/within on input line ....
 Applying: [....-..-..] Use \TexOrMath  on input line ....
 Already applied: [....-..-..] Use \TexOrMath  on input line ....
 Applying: [....-..-..] \TextOrMath  on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index 8d92130d..d35920df 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -160,6 +160,9 @@ Skipping: [....-..-..] Reset nested counters on input line ....
 Applying: [....-..-..] Reset nested counters on input line ....
 Skipping: [....-..-..] Add interfaces on input line ....
 Applying: [....-..-..] Add interfaces on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Applying: [....-..-..] counter without/within on input line ....
 Skipping: [....-..-..] Use \TexOrMath  on input line ....
 Applying: [....-..-..] Use \TexOrMath  on input line ....
 Skipping: [....-..-..] \TextOrMath  on input line ....
@@ -694,6 +697,9 @@ Applying: [....-..-..] Reset nested counters on input line ....
 Already applied: [....-..-..] Reset nested counters on input line ....
 Applying: [....-..-..] Add interfaces on input line ....
 Already applied: [....-..-..] Add interfaces on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Applying: [....-..-..] counter without/within on input line ....
+Already applied: [....-..-..] counter without/within on input line ....
 Applying: [....-..-..] Use \TexOrMath  on input line ....
 Already applied: [....-..-..] Use \TexOrMath  on input line ....
 Applying: [....-..-..] \TextOrMath  on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
index aa7008c1..86416953 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -160,6 +160,9 @@ Skipping: [....-..-..] Reset nested counters on input line ....
 Applying: [....-..-..] Reset nested counters on input line ....
 Skipping: [....-..-..] Add interfaces on input line ....
 Applying: [....-..-..] Add interfaces on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Applying: [....-..-..] counter without/within on input line ....
 Skipping: [....-..-..] Use \TexOrMath  on input line ....
 Applying: [....-..-..] Use \TexOrMath  on input line ....
 Skipping: [....-..-..] \TextOrMath  on input line ....
@@ -703,6 +706,9 @@ Applying: [....-..-..] Reset nested counters on input line ....
 Already applied: [....-..-..] Reset nested counters on input line ....
 Applying: [....-..-..] Add interfaces on input line ....
 Already applied: [....-..-..] Add interfaces on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Applying: [....-..-..] counter without/within on input line ....
+Already applied: [....-..-..] counter without/within on input line ....
 Applying: [....-..-..] Use \TexOrMath  on input line ....
 Already applied: [....-..-..] Use \TexOrMath  on input line ....
 Applying: [....-..-..] \TextOrMath  on input line ....
diff --git a/base/testfiles/tlb-remreset-004.lvt b/base/testfiles/tlb-remreset-004.lvt
index 5e9b62b1..2da1d251 100644
--- a/base/testfiles/tlb-remreset-004.lvt
+++ b/base/testfiles/tlb-remreset-004.lvt
@@ -44,7 +44,7 @@
 
 \counterwithout[\roman]{section}{subsection}
 
-\show\thesection    % \roman --- even though there is nothing else happening
+\show\thesection    % \roman --- even though there is no without
 \show\cl at subsection % unchanged
 \show\cl at section    % unchanged
 
diff --git a/base/testfiles/tlb-remreset-004.tlg b/base/testfiles/tlb-remreset-004.tlg
index 738004eb..e111d3a7 100644
--- a/base/testfiles/tlb-remreset-004.tlg
+++ b/base/testfiles/tlb-remreset-004.tlg
@@ -78,7 +78,7 @@ Next case is weird, perhaps a check after all?
 > \thesection=macro:
 ->\roman {section}.
 l. ...\show\thesection
-                         % \roman --- even though there is nothing else happ...
+                         % \roman --- even though there is no without
 > \cl at subsection=macro:
 ->\@elt {subsubsection}.
 l. ...\show\cl at subsection
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index 91600746..720fb8f2 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -194,6 +194,9 @@ Applying: [....-..-..] Reset nested counters on input line ....
 Already applied: [....-..-..] Reset nested counters on input line ....
 Applying: [....-..-..] Add interfaces on input line ....
 Already applied: [....-..-..] Add interfaces on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Applying: [....-..-..] counter without/within on input line ....
+Already applied: [....-..-..] counter without/within on input line ....
 Applying: [....-..-..] Use \TexOrMath  on input line ....
 Already applied: [....-..-..] Use \TexOrMath  on input line ....
 Applying: [....-..-..] \TextOrMath  on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index 63d1c0c5..97e4c648 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -183,6 +183,9 @@ Applying: [....-..-..] Reset nested counters on input line ....
 Already applied: [....-..-..] Reset nested counters on input line ....
 Applying: [....-..-..] Add interfaces on input line ....
 Already applied: [....-..-..] Add interfaces on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Applying: [....-..-..] counter without/within on input line ....
+Already applied: [....-..-..] counter without/within on input line ....
 Applying: [....-..-..] Use \TexOrMath  on input line ....
 Already applied: [....-..-..] Use \TexOrMath  on input line ....
 Applying: [....-..-..] \TextOrMath  on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index 1ba0e5b2..d703144d 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -183,6 +183,9 @@ Applying: [....-..-..] Reset nested counters on input line ....
 Already applied: [....-..-..] Reset nested counters on input line ....
 Applying: [....-..-..] Add interfaces on input line ....
 Already applied: [....-..-..] Add interfaces on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Applying: [....-..-..] counter without/within on input line ....
+Already applied: [....-..-..] counter without/within on input line ....
 Applying: [....-..-..] Use \TexOrMath  on input line ....
 Already applied: [....-..-..] Use \TexOrMath  on input line ....
 Applying: [....-..-..] \TextOrMath  on input line ....
diff --git a/base/testfiles/tlb-rollback-005.luatex.tlg b/base/testfiles/tlb-rollback-005.luatex.tlg
index 6f54c4e8..b419de2b 100644
--- a/base/testfiles/tlb-rollback-005.luatex.tlg
+++ b/base/testfiles/tlb-rollback-005.luatex.tlg
@@ -197,6 +197,9 @@ Applying: [....-..-..] Reset nested counters on input line ....
 Already applied: [....-..-..] Reset nested counters on input line ....
 Applying: [....-..-..] Add interfaces on input line ....
 Already applied: [....-..-..] Add interfaces on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Applying: [....-..-..] counter without/within on input line ....
+Already applied: [....-..-..] counter without/within on input line ....
 Applying: [....-..-..] Use \TexOrMath  on input line ....
 Already applied: [....-..-..] Use \TexOrMath  on input line ....
 Applying: [....-..-..] \TextOrMath  on input line ....
diff --git a/base/testfiles/tlb-rollback-005.tlg b/base/testfiles/tlb-rollback-005.tlg
index 21059410..028d3da8 100644
--- a/base/testfiles/tlb-rollback-005.tlg
+++ b/base/testfiles/tlb-rollback-005.tlg
@@ -187,6 +187,9 @@ Applying: [....-..-..] Reset nested counters on input line ....
 Already applied: [....-..-..] Reset nested counters on input line ....
 Applying: [....-..-..] Add interfaces on input line ....
 Already applied: [....-..-..] Add interfaces on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Applying: [....-..-..] counter without/within on input line ....
+Already applied: [....-..-..] counter without/within on input line ....
 Applying: [....-..-..] Use \TexOrMath  on input line ....
 Already applied: [....-..-..] Use \TexOrMath  on input line ....
 Applying: [....-..-..] \TextOrMath  on input line ....
diff --git a/base/testfiles/tlb-rollback-005.xetex.tlg b/base/testfiles/tlb-rollback-005.xetex.tlg
index 75cd4fed..7132784d 100644
--- a/base/testfiles/tlb-rollback-005.xetex.tlg
+++ b/base/testfiles/tlb-rollback-005.xetex.tlg
@@ -187,6 +187,9 @@ Applying: [....-..-..] Reset nested counters on input line ....
 Already applied: [....-..-..] Reset nested counters on input line ....
 Applying: [....-..-..] Add interfaces on input line ....
 Already applied: [....-..-..] Add interfaces on input line ....
+Skipping: [....-..-..] counter without/within on input line ....
+Applying: [....-..-..] counter without/within on input line ....
+Already applied: [....-..-..] counter without/within on input line ....
 Applying: [....-..-..] Use \TexOrMath  on input line ....
 Already applied: [....-..-..] Use \TexOrMath  on input line ....
 Applying: [....-..-..] \TextOrMath  on input line ....





More information about the latex3-commits mailing list.