[latex3-commits] [git/LaTeX3-latex3-latex2e] master: correct issue/38 (4738b15)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : master
Link       : https://github.com/latex3/latex2e/commit/4738b15f9476f7abb9c25c3bc9a67faa19c71dba

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

commit 4738b15f9476f7abb9c25c3bc9a67faa19c71dba
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Sun Apr 22 11:34:13 2018 +0200

    correct issue/38


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

4738b15f9476f7abb9c25c3bc9a67faa19c71dba
 base/changes.txt                    |    5 +++++
 base/ltcounts.dtx                   |    4 +++-
 base/testfiles/tlb-remreset-002.tlg |    4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index ebd7eeb..53c637a 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -4,6 +4,11 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+2018-04-22  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* ltcounts.dtx: added missing '.' in default for \the<counter>
+	when using \counterwithin (issue/38)
+
 2018-04-10  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
 	* docstrip.dtx (subsection{Batchfile commands}): Read 8bit input
diff --git a/base/ltcounts.dtx b/base/ltcounts.dtx
index 02f411c..8158ef7 100644
--- a/base/ltcounts.dtx
+++ b/base/ltcounts.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltcounts.dtx}
-             [2018/03/08 v1.1k LaTeX Kernel (Counters)]
+             [2018/04/22 v1.1l LaTeX Kernel (Counters)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltcounts.dtx}
@@ -410,6 +410,7 @@
   \@ifbothcounters{#1}{#2}{\@addtoreset{#1}{#2}}}
 %    \end{macrocode}
 %    
+%    \changes{v1.1l}{2018/04/11}{Correct default (issue/38)}
 %    \begin{macrocode}
 \def\counterwithin at x#1#2{%
   \@ifbothcounters{#1}{#2}%
@@ -417,6 +418,7 @@
        \expandafter
        \gdef\csname the#1\expandafter\endcsname\expandafter
             {\csname the#2\expandafter\endcsname\expandafter
+             .\expandafter
              \@arabic\csname c@#1\endcsname}}}
 %    \end{macrocode}
 %  \end{macro}
diff --git a/base/testfiles/tlb-remreset-002.tlg b/base/testfiles/tlb-remreset-002.tlg
index 76eac1e..72b47c9 100644
--- a/base/testfiles/tlb-remreset-002.tlg
+++ b/base/testfiles/tlb-remreset-002.tlg
@@ -103,7 +103,7 @@ l. ...\show\cl at subsection
 l. ...\show\cl at section
                          % now empty
 > \thefootnote=macro:
-->\thesubsection \@arabic \c at footnote .
+->\thesubsection .\@arabic \c at footnote .
 l. ...\show\thefootnote
                          % \thesubsection.\arabic{footnote}
 > \cl at subsection=macro:
@@ -149,7 +149,7 @@ l. ...\show\thefootnot
 l. ...\show\cl at subsection
                          % unchanged
 > \thefootnote=macro:
-->\thesubsection \@arabic \c at footnote .
+->\thesubsection .\@arabic \c at footnote .
 l. ...\show\thefootnote
                          % \thesubsection.\arabic{footnote}
 > \cl at subsection=macro: