assoccnt (27sep15)

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

7 files changed, 73 insertions, 42 deletions

diff --git a/Master/texmf-dist/doc/latex/assoccnt/README b/Master/texmf-dist/doc/latex/assoccnt/README
index 14001d01bde..8463904d384 100644
--- a/Master/texmf-dist/doc/latex/assoccnt/README
+++ b/Master/texmf-dist/doc/latex/assoccnt/README
@@ -1,8 +1,8 @@
-%% LaTeX package assoccnt - version 0.5a (2014/09/22)
+%% LaTeX package assoccnt - version 0.6 (2015/09/27)
 %%
 %% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2014 by Dr. Christian Hupfer <christian dot hupfer at yahoo dot de>
-%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2015 by Dr. Christian Hupfer <christian dot hupfer at yahoo dot de>
+%% ------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -12,32 +12,30 @@
 %% and version 1.3 or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
 %%
-%% This work has the LPPL maintenance status `author-maintained'.
+%% This work has the LPPL maintenance status `maintained'.
 %%
 %% This work consists of all files listed in README
 %%
 
+
 The package assoccnt provides a way of associating counters to an 
 existing driver counter, such incrementing the driver counter will increase
 the associated counters as well. This package can be regarded as a supplement
 to the totcount package by Vasileios Koutavas (http://www.ctan.org/pkg/totcount), but
 can be used without it too.
 
-Further improvements will follow
-
-
-This version provides 
+This version provides
 
--- Informational routines for the last counter being stepped, refstepped, added or set 
+-- A major bug fix in `assoccnt` since it stepped counters too that are on the reset list (\@addtoreset) and this caused troubles with the package calc.sty too. 
 
--- A section on minimal requirements and incompatibilities with other packages
+-- Some improved documentation
 
--- Improved manual (reordered descriptions)
+Note: This is perhaps the last version before a complete rewrite with `expl3` and LaTeX 3 - features will take place. 
 
 Directory listing:
 
-     assoccntdoc.pdf     264685   09/22/14   14:14:36
-     assoccntdoc.tex      32859   09/22/14   14:14:37
-assoccnt_example.pdf      77420   09/22/14   14:14:37
-assoccnt_example.tex       4769   09/22/14   14:14:32
-        assoccnt.sty      15709   09/22/14   14:11:28
+              assoccnt_doc.pdf     267586   09/27/15   17:12:34
+              assoccnt_doc.tex      33572   09/27/15   17:10:38
+          assoccnt_example.pdf      78981   09/27/15   17:12:29
+          assoccnt_example.tex       4589   09/27/15   17:10:38
+                  assoccnt.sty      16516   09/27/15   17:12:34
diff --git a/Master/texmf-dist/doc/latex/assoccnt/assoccnt_doc.pdf b/Master/texmf-dist/doc/latex/assoccnt/assoccnt_doc.pdf
new file mode 100644
index 00000000000..59a2a2fa2aa
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/assoccnt/assoccnt_doc.pdf
diff --git a/Master/texmf-dist/doc/latex/assoccnt/assoccntdoc.tex b/Master/texmf-dist/doc/latex/assoccnt/assoccnt_doc.tex
index 3039d9c46ee..f3f0611c7e9 100644
--- a/Master/texmf-dist/doc/latex/assoccnt/assoccntdoc.tex
+++ b/Master/texmf-dist/doc/latex/assoccnt/assoccnt_doc.tex
@@ -1,9 +1,10 @@
+%% LaTeX package assoccnt - version 0.6 (2014/09/27)
 %% Documentation for assoccnt.sty
 %%
 %%
 %%
 %% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2014 by Dr. Christian Hupfer <christian dot hupfer at yahoo dot de>
+%% Copyright (c) 2015 by Dr. Christian Hupfer <christian dot hupfer at yahoo dot de>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -74,7 +75,7 @@
 \newtcolorbox{docCommandArgs}[1]{colbacktitle={blue},coltitle={white},title={Description of arguments of command \cs{#1}}}
 
 
-\def\packageversion{0.5a}%
+\def\packageversion{0.6}%
 
 \makeindex
 
@@ -841,6 +842,7 @@ I would like to express my gratitudes to the developpers of fine \LaTeX{} packag
 to the users at tex.stackexchange.com, especially to
 
 \begin{itemize}
+  \item Paulo Roberto Massa Cereda
   \item Enrico Gregorio
   \item Joseph Wright
   \item David Carlisle
@@ -855,11 +857,25 @@ write this documentation.
 
 \clearpage
 
+\section{Version history}
+Note the pre - 0.6 - version history has to be reestablished 
+\begin{itemize}
+\item 0.6: \begin{itemize}
+    \item A major bug fixed due to some error in usage together with \packagename{calc} when the driven counters are not stepped any longer. 
+      The culprit was in \PackageDocName that the counter reset list was not really disabled. 
+      
+      Thanks to this question \url{http://tex.stackexchange.com/questions/269731/calc-breaks-assoccnt} this bug was detected. 
+      \item The documentation was renamed from `assoccntdoc` to `\url{assoccnt_doc}`
+        \end{itemize}
+\end{itemize}
+
+
 \phantomsection
 \appendix\label{examplesappendix}
 
 
 
+
 \section[Total number of sections]{Example: Total number of sections}
 In this example, all sections of this document are counted, i.e. the current one as well as all following ones.
 \begin{dispExample}
diff --git a/Master/texmf-dist/doc/latex/assoccnt/assoccnt_example.pdf b/Master/texmf-dist/doc/latex/assoccnt/assoccnt_example.pdf
index 5e3a1142c71..36d390d99f6 100644
--- a/Master/texmf-dist/doc/latex/assoccnt/assoccnt_example.pdf
+++ b/Master/texmf-dist/doc/latex/assoccnt/assoccnt_example.pdf
diff --git a/Master/texmf-dist/doc/latex/assoccnt/assoccnt_example.tex b/Master/texmf-dist/doc/latex/assoccnt/assoccnt_example.tex
index a7669731ba5..99eaafa68b4 100644
--- a/Master/texmf-dist/doc/latex/assoccnt/assoccnt_example.tex
+++ b/Master/texmf-dist/doc/latex/assoccnt/assoccnt_example.tex
@@ -1,7 +1,7 @@
 %% Example file for assoccnt.sty
 %%
 %% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2014 by Dr. Christian Hupfer <christian dot hupfer at yahoo dot de>
+%% Copyright (c) 2015 by Dr. Christian Hupfer <christian dot hupfer at yahoo dot de>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -18,15 +18,6 @@
 %%
 
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-% $Date: 2014-08-21 18:12:22 +0200 (Thu, 21 Aug 2014) $
-%
-% $Revision: 55 $
-%
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper,12pt]{book}%
 
 
diff --git a/Master/texmf-dist/doc/latex/assoccnt/assoccntdoc.pdf b/Master/texmf-dist/doc/latex/assoccnt/assoccntdoc.pdf
deleted file mode 100644
index f7a93013d6d..00000000000
--- a/Master/texmf-dist/doc/latex/assoccnt/assoccntdoc.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/assoccnt/assoccnt.sty b/Master/texmf-dist/tex/latex/assoccnt/assoccnt.sty
index 3c736ac9288..4839a05ef06 100644
--- a/Master/texmf-dist/tex/latex/assoccnt/assoccnt.sty
+++ b/Master/texmf-dist/tex/latex/assoccnt/assoccnt.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{assoccnt}[2014/09/22 v0.5a -- Associate counters stepping]%
+\ProvidesPackage{assoccnt}[2015/09/27 v0.6 -- Associate counters stepping]%
 %%%
 %% License: LaTeX Project Public License version 1.3 
 %% Copyright (2014) Dr. Christian Hupfer 
@@ -55,6 +55,16 @@
 \let\@@assoccnt@@standardaddtocounter\addtocounter%
 
 
+% Unused so far
+\newcommand{\IsInResetList}[4]{%
+  \IfSubStr{\csname cl@#1\endcsname}{{#2}}{%
+    #3%
+  }{%
+    #4%
+  }%
+}
+
+
 % Just for a quick suffix
 \newcommand{\@@assoccnt@@associatedcounterslistsuffix}{%
 AssociatedCountersList%
@@ -65,7 +75,7 @@ AssociatedCountersList%
 %%% Internal macro to generate the name of the list of associated counters
 \newcommand{\@@assoccnt@@generatelistname}[1]{%
 % #1 Name of the driver counter
-  @@#1@@\@@assoccnt@@associatedcounterslistsuffix
+  @@#1@@\@@assoccnt@@associatedcounterslistsuffix%
 }%
 
 \newcommand{\@@assoccnt@@drivercounterlist}{%
@@ -270,7 +280,7 @@ AssociatedCountersList%
 
 \newcommand{\IsAssociatedCounter}[3]{%
   \ifcsdef{\@@assoccnt@@generateboundtocounterslist{#1}}{% true branch
-    \setcounter{@@assoccnt@@internalcounter}{0}%
+    \@@assoccnt@@standardsetcounter{@@assoccnt@@internalcounter}{0}%
     \renewcommand*{\do}[1]{%
       \@@assoccnt@@standardstepcounter{@@assoccnt@@internalcounter}%
     }%
@@ -342,7 +352,7 @@ AssociatedCountersList%
 
 
 \newcommand{\GetDriverCounter}[1]{%
-  \setcounter{@@assoccnt@@internalcounter}{0}%
+  \@@assoccnt@@standardsetcounter{@@assoccnt@@internalcounter}{0}%
   \renewcommand*{\do}[1]{%
     ##1%
     \ifnumequal{\number\value{@@assoccnt@@internalcounter}}{1}{%
@@ -402,10 +412,14 @@ AssociatedCountersList%
 
 %%% The stepcounter wrapper for the standard stepcounter command
 %%% This is just for convenience, if the command as to be improved/extended later on in future
-\newcommand{\@@assoccnt@@stepcounter}[1]{%  
-  \@@assoccnt@@standardstepcounter{#1}%
+\newcommand{\@@assoccnt@@stepcounter}[1]{% 
+  \@ifundefined{cl@#1}{% There is no reset list for this driver counter
+    \@@assoccnt@@standardstepcounter{#1}%
+  }{%
+    \csletcs{cl@#1}{relax}% Yes, there is reset list, but we drop it in this group, preventing that the counters from `\@addtoreset` are stepped anyway. 
+    \@@assoccnt@@standardstepcounter{#1}%    
+  }%
   \gdef\@@assoccnt@@storagemacro@@laststeppedcounter{#1}%
-%  \gdef\@@assoccnt@@storagemacro@@laststeppedcounter{#1}%
 }%
 
 \renewcommand{\stepcounter}[1]{%
@@ -426,10 +440,12 @@ AssociatedCountersList%
     \IsSuspendedCounter{#2}{%
       % Nothing to be done
     }{%
+      \csletcs{cl@#2}{relax}%
       \@@assoccnt@@standardaddtocounter{#2}{#1}%
       \gdef\@@assoccnt@@storagemacro@@lastaddtocounter{#2}%
     }%
   }{%
+    \csletcs{cl@#2}{relax}%
     \@@assoccnt@@standardaddtocounter{#2}{#1}%
     \gdef\@@assoccnt@@storagemacro@@lastaddtocounter{#2}%
   }%
@@ -464,16 +480,26 @@ AssociatedCountersList%
     }{%
       \@@assoccnt@@standardaddtocounter{#1}{#2}%
       \gdef\@@assoccnt@@storagemacro@@lastaddtocounter{#1}%
-    }
+    }%
   }{%
     \@@assoccnt@@standardaddtocounter{#1}{#2}%
     \gdef\@@assoccnt@@storagemacro@@lastaddtocounter{#1}%
   }%
-  \ifcsdef{\@@assoccnt@@generatelistname{#1}}{%    Check first, whether the list exists at all, 
-    \forlistcsloop{\@@assoccnt@@addtocounter{#2}}{\@@assoccnt@@generatelistname{#1}}%  March through the list
-  }{% 
-    % No list -> do nothing at all
-  }%
+  \@ifundefined{cl@#1}{%
+    \ifcsdef{\@@assoccnt@@generatelistname{#1}}{%    Check first, whether the list exists at all, 
+      \forlistcsloop{\@@assoccnt@@addtocounter{#2}}{\@@assoccnt@@generatelistname{#1}}%  March through the list
+    }{% 
+      % No list -> do nothing at all
+    }%
+  }{%
+    %\csletcs{temp@cllist}{cl@#1}
+    \csletcs{cl@#1}{relax}%
+    \ifcsdef{\@@assoccnt@@generatelistname{#1}}{%    Check first, whether the list exists at all, 
+      \forlistcsloop{\@@assoccnt@@addtocounter{#2}}{\@@assoccnt@@generatelistname{#1}}%  March through the list
+    }{% 
+      % No list -> do nothing at all
+    }%
+  }%	
 }%
 
 \listgadd{\@@assoccnt@@tempcounterlist}{}% This should be renamed later one... treated more generally
@@ -522,7 +548,7 @@ AssociatedCountersList%
   \ifdef{%
     \@@assoccnt@@storagemacro@@laststeppedcounter%
   }{%
-    \@@assoccnt@@storagemacro@@laststeppedcounter\typeout{Hello}%
+    \@@assoccnt@@storagemacro@@laststeppedcounter%
   }{%
     Undefined/unknown%
   }%