xassoccnt (29oct16)

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

20 files changed, 77 insertions, 75 deletions

diff --git a/Master/texmf-dist/doc/latex/xassoccnt/README b/Master/texmf-dist/doc/latex/xassoccnt/README
index a0d3f99da59..158bd2f9de4 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/README
+++ b/Master/texmf-dist/doc/latex/xassoccnt/README
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.0 (2016/07/28 -- 21/05/18)
+%% LaTeX package xassoccnt - version 1.1 (2016/10/29 -- 13:34:52)
 %% README file for xassoccnt.sty
 %%
 %%
 %% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2015 -- 2016 by Dr. Christian Hupfer <christian dot hupfer at yahoo dot de>
+%% Copyright (c) 2015 -- 2016 by Dr. Christian Hupfer <typography dot with dot latex at gmail dot com>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -26,7 +26,7 @@ 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.
 
-As of 2016/07/28 xassoccnt does not supersede the package assoccnt by the same author, however, 
-the older package isn't declared obsolete as of 2016/07/28
+As of 2016/10/29 xassoccnt does not supersede the package assoccnt by the same author, however, 
+the older package isn't declared obsolete as of 2016/10/29
 
 
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_backupcounters_example.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_backupcounters_example.pdf
index 4d3cd64eb03..0c60f6573dd 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_backupcounters_example.pdf
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_backupcounters_example.pdf
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_backupcounters_example.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_backupcounters_example.tex
index 40a7a63fd19..a2adce4330a 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_backupcounters_example.tex
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_backupcounters_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.0 (2016/07/28 -- 21/05/18)
+%% LaTeX package xassoccnt - version 1.1 (2016/10/29 -- 13:34:52)
 %% Example file for backup counters file for xassoccnt.sty
 %%
 %%
 %% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2016 by Dr. Christian Hupfer <christian dot hupfer at yahoo dot de>
+%% Copyright (c) 2016 by Dr. Christian Hupfer <typography dot with dot latex at gmail dot com>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -107,6 +107,8 @@ Checking for existence of a backup counter group:
 
 \BackupCounterGroup[backup-id={firstchaptertree},cascading=true]{chaptertree}
 
+
+
 \chapter{First chapter after backup command}
 
 \section{1st section in 1st backup chapter}
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_coupledcounters_example.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_coupledcounters_example.pdf
index d22985a9876..b5e546ed582 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_coupledcounters_example.pdf
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_coupledcounters_example.pdf
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_coupledcounters_example.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_coupledcounters_example.tex
index 54bf7bb03b1..b6c3679e6f9 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_coupledcounters_example.tex
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_coupledcounters_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.0 (2016/07/28 -- 21/05/18)
+%% LaTeX package xassoccnt - version 1.1 (2016/10/29 -- 13:34:52)
 %% Example file for coupled counters file for xassoccnt.sty
 %%
 %%
 %% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2016 by Dr. Christian Hupfer <christian dot hupfer at yahoo dot de>
+%% Copyright (c) 2016 by Dr. Christian Hupfer <typography dot with dot latex at gmail dot com>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_doc.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_doc.pdf
index 45cedfbe713..55b204204a2 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_doc.pdf
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_doc.pdf
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_doc.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_doc.tex
index 4fc5cf8a3da..60a1a2d8d08 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_doc.tex
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_doc.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.0 (2016/07/28 -- 21/05/18)
+%% LaTeX package xassoccnt - version 1.1 (2016/10/29 -- 13:34:52)
 %% Documentation file for xassoccnt.sty
 %%
 %%
 %% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2015 -- 2016 by Dr. Christian Hupfer <christian dot hupfer at yahoo dot de>
+%% Copyright (c) 2015 -- 2016 by Dr. Christian Hupfer <typography dot with dot latex at gmail dot com>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -75,9 +75,9 @@
 }
 
 
-\@namedef{xassoccntversion0.1}{v0.1 2015-11-07}
+\@namedef{xassoccntversion0.1}{v0.1 2016-11-07}
 
-\@namedef{xassoccntversion0.2}{v0.2 2015-11-14}
+\@namedef{xassoccntversion0.2}{v0.2 2016-11-14}
 
 \@namedef{xassoccntversion0.3}{v0.3 2016-01-08}
 
@@ -93,9 +93,10 @@
 
 \@namedef{xassoccntversion0.9}{v0.9 2016-06-19}
 
-
 \@namedef{xassoccntversion1.0}{v1.0 2016-07-28}
 
+\@namedef{xassoccntversion1.1}{v1.1 2016-10-29}
+
 
 \makeatother
 
@@ -316,7 +317,7 @@
 
 
 \newcommand{\mymailtoaddress}{%
-  christian.hupfer@yahoo.de
+  typography.with.latex@gmail.com
 }
 
 \doparttoc
@@ -492,6 +493,9 @@ For potential problems see \cref{subsection:incompatibilities}
 
 \item This package does not work really well with the \CHDocPackage{calc} package if that one is loaded after \CHDocPackage{\PackageDocName}. Load \CHDocPackage{calc} \textbf{before} \CHDocPackage{\PackageDocName}! 
 
+Especially the \CHDocPackage{tcolorbox} bundle loads \CHDocPackage{calc} indirectly, so placing any loading of \CHDocPackage{tcolorbox} modules before \CHDocPackage{\PackageDocName} is mandatory!
+
+
 \begin{marker}
 \tcbdocmarginnote{\bcbombe\tcbdocupdated{2015-11-10}}
   As of version \packageversion\ \CHDocPackage{\PackageDocName} will abort compilation if \CHDocPackage{calc} is loaded after this package, but will issue a warning only if \CHDocPackage{calc} is loaded first. 
@@ -2262,8 +2266,15 @@ write this documentation.
 
 \section{Version history}
 
+
 \begin{itemize}[itemsep=15pt]
-\item   \CHDocFullVersion{1.0a}
+
+\item   \CHDocFullVersion{1.1}
+\begin{itemize}
+  \item Added some missing basic functions needed after the more restrictive \CHDocPackage{expl3} update from 2016/10/19
+  \item Added a statement about the requirement to load \CHDocPackage{tcolorbox} before \CHDocPackage{xassoccnt} in the documentation (i.e. this file!)
+\end{itemize}
+\item   \CHDocFullVersion{1.0}
 \begin{itemize}
 \item \CHDocNew{1.0} Restructured the \CHDocPackage{xassoccnt} manual file.
 \item \CHDocNew{1.0} Added some improvements for counter reset lists macros
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_driver.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_driver.pdf
index 38795f5406f..362c5dcc4a1 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_driver.pdf
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_driver.pdf
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_driver.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_driver.tex
index c463401af5d..aed48fa537e 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_driver.tex
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_driver.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.0 (2016/07/28 -- 21/05/18)
+%% LaTeX package xassoccnt - version 1.1 (2016/10/29 -- 13:34:52)
 %% Driver file for xassoccnt.sty
 %%
 %%
 %% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2015 -- 2016 by Dr. Christian Hupfer <christian dot hupfer at yahoo dot de>
+%% Copyright (c) 2015 -- 2016 by Dr. Christian Hupfer <typography dot with dot latex at gmail dot com>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -106,12 +106,6 @@ In \cref{section::dummylabel} we will see that
 \TotalValue{equations}
 
 
-%\SetDocumentCounter[associatedtoo=true,onlycounters={totalsections,gandalf},associatedtoo=true]{section}{17}
-
-%\SetDocumentCounter[associatedtoo=true,onlycounters={totalsections,gandalf,equations}]{section}{21}
-
-%\SetDocumentCounter{equations}{17}
-%\setcounter{equations}{17}
 
 \TotalValue{equations}
 
@@ -192,6 +186,19 @@ Internal name: \TotalCounterInternalName{equations}
 
 
 
+\chapter{A new chapter}
+
+\begin{equation}
+  E=mc^2
+\end{equation}
+
+\chapter{Another new chapter}
+
+\begin{equation}
+  E=mc^2
+\end{equation}
+
+
 
 
 \end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_example.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_example.pdf
index 718f8cfafd7..2b62ede7a5a 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_example.pdf
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_example.pdf
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_example.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_example.tex
index 2045a13e5ba..b98d7b76894 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_example.tex
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.0 (2016/07/28 -- 21/05/18)
+%% LaTeX package xassoccnt - version 1.1 (2016/10/29 -- 13:34:52)
 %% Example file for xassoccnt.sty
 %%
 %%
 %% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2015 -- 2016 by Dr. Christian Hupfer <christian dot hupfer at yahoo dot de>
+%% Copyright (c) 2015 -- 2016 by Dr. Christian Hupfer <typography dot with dot latex at gmail dot com>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -19,26 +19,6 @@
 %%
 %%
 
-%% Example file for xassoccnt.sty v0.2 (2015/11/10)
-%%
-%% -------------------------------------------------------------------------------------------
-%% 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
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% 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 consists of all files listed in README
-%%
-
-
 \documentclass[a4paper,12pt]{book}%
 
 
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_periodiccounters_example.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_periodiccounters_example.pdf
index e4e8a5292d0..d7008f5b500 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_periodiccounters_example.pdf
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_periodiccounters_example.pdf
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_periodiccounters_example.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_periodiccounters_example.tex
index 3d73c470b9a..e6fbff6feca 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_periodiccounters_example.tex
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_periodiccounters_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.0 (2016/07/28 -- 21/05/18)
+%% LaTeX package xassoccnt - version 1.1 (2016/10/29 -- 13:34:52)
 %% Example file for periodic counters file for xassoccnt.sty
 %%
 %%
 %% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2016 by Dr. Christian Hupfer <christian dot hupfer at yahoo dot de>
+%% Copyright (c) 2016 by Dr. Christian Hupfer <typography dot with dot latex at gmail dot com>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetlist_example.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetlist_example.pdf
index 0beff930ee2..a0b1d0d43a9 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetlist_example.pdf
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetlist_example.pdf
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetlist_example.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetlist_example.tex
index 800a130d827..4ec7cc9c88d 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetlist_example.tex
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetlist_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.0 (2016/07/28 -- 21/05/18)
+%% LaTeX package xassoccnt - version 1.1 (2016/10/29 -- 13:34:52)
 %% Example file for reset list features file for xassoccnt.sty
 %%
 %%
 %% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2016 by Dr. Christian Hupfer <christian dot hupfer at yahoo dot de>
+%% Copyright (c) 2016 by Dr. Christian Hupfer <typography dot with dot latex at gmail dot com>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_suspendedcounters_example.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_suspendedcounters_example.pdf
index 0a21b82596a..09427de8a2f 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_suspendedcounters_example.pdf
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_suspendedcounters_example.pdf
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_suspendedcounters_example.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_suspendedcounters_example.tex
index 3be58383f1d..381669576fc 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_suspendedcounters_example.tex
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_suspendedcounters_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.0 (2016/07/28 -- 21/05/18)
+%% LaTeX package xassoccnt - version 1.1 (2016/10/29 -- 13:34:52)
 %% Example file for suspended counters file for xassoccnt.sty
 %%
 %%
 %% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2016 by Dr. Christian Hupfer <christian dot hupfer at yahoo dot de>
+%% Copyright (c) 2016 by Dr. Christian Hupfer <typography dot with dot latex at gmail dot com>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_totalcounters_example.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_totalcounters_example.pdf
index bce7c3f905c..70a2368b73c 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_totalcounters_example.pdf
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_totalcounters_example.pdf
diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_totalcounters_example.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_totalcounters_example.tex
index 058fed07182..297e59b6559 100644
--- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_totalcounters_example.tex
+++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_totalcounters_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.0 (2016/07/28 -- 21/05/18)
+%% LaTeX package xassoccnt - version 1.1 (2016/10/29 -- 13:34:52)
 %% Example file for total counters file for xassoccnt.sty
 %%
 %%
 %% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2015 -- 2016 by Dr. Christian Hupfer <christian dot hupfer at yahoo dot de>
+%% Copyright (c) 2015 -- 2016 by Dr. Christian Hupfer <typography dot with dot latex at gmail dot com>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/latex/xassoccnt/xassoccnt.sty b/Master/texmf-dist/tex/latex/xassoccnt/xassoccnt.sty
index 63119ca1d62..47f1da6ae8c 100644
--- a/Master/texmf-dist/tex/latex/xassoccnt/xassoccnt.sty
+++ b/Master/texmf-dist/tex/latex/xassoccnt/xassoccnt.sty
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.0 (2016/07/28 -- 21/05/18)
+%% LaTeX package xassoccnt - version 1.1 (2016/10/29 -- 13:34:52)
 %% Source file for xassoccnt.sty
 %%
 %%
 %% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2015 -- 2016 by Dr. Christian Hupfer <christian dot hupfer at yahoo dot de>
+%% Copyright (c) 2015 -- 2016 by Dr. Christian Hupfer <typography dot with dot latex at gmail dot com>
 %% -------------------------------------------------------------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -19,10 +19,10 @@
 %%
 %%
 
-\def\xassoccntpackageversion{1.0}
+\def\xassoccntpackageversion{1.1}
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 
-\ProvidesPackage{xassoccnt}[2016/07/28 - v\xassoccntpackageversion]
+\ProvidesPackage{xassoccnt}[2016/10/29 - v\xassoccntpackageversion]
 \RequirePackage{xcolor}
 \RequirePackage{xparse}
 \RequirePackage{l3keys2e}
@@ -37,7 +37,7 @@
 
 \cs_generate_variant:Nn \seq_remove_all:Nn { cV, NV }
 \cs_generate_variant:Nn \seq_gremove_all:Nn { cV, NV }
-\cs_generate_variant:Nn \seq_gput_right:cn {cx}%
+\cs_generate_variant:Nn \seq_gput_right:cn {cx}
 \cs_generate_variant:Nn \prop_put:Nnn {cxx}
 \cs_generate_variant:Nn \prop_remove:Nn {cx,Nx}
 \cs_generate_variant:Nn \prop_item:Nn {NV,cV,cx}
@@ -465,7 +465,7 @@
 }{}
 
 \AtEndOfPackage{
-  \PackageInfo{xassoccnt}{2016/07/28 - v\xassoccntpackageversion -- stepping counters simultaneously and other features}
+  \PackageInfo{xassoccnt}{2016/10/29 - v\xassoccntpackageversion -- stepping counters simultaneously and other features}
   \@ifpackageloaded{calc}{%
     \msg_warning:nnn{xassoccnt}{incompatiblepackagenonfatal}{calc}% Warning
     \bool_set_true:N \l__xassoccnt_calcpackage_loaded
@@ -1054,15 +1054,18 @@
 }
 
 
-\cs_new_nopar:Nn \__xassoccnt_translate_countername:cn {%
-  \tl_set:cn {#1}{#2}%
+\cs_new_nopar:Nn \__xassoccnt_translate_countername:nn {%
+  \tl_set:Nn #1 {#2}%
   \seq_if_in:NxTF \g__xassoccnt_supertotalcounter_container {#2} {%
-    \tl_set:cn {#1}{\__xassoccnt_expand_totalcountername:n {#2} }%
+    \tl_set:Nn #1 {\__xassoccnt_expand_totalcountername:n {#2} }%
   }{%
   }
 }
 
 
+\cs_generate_variant:Nn \__xassoccnt_translate_countername:nn {cn}
+
+
 %% More generic macros (hidding the internal features of the lists)
 
 
@@ -1589,7 +1592,7 @@
   #1#2#3
 }
 
-\cs_new:Nn \xassoccnt_feature_subproplist:nn {%
+\cs_new:Nn \xassoccnt_feature_subproplist:NN {%
   l_#1_#2_prop%
 }
 
@@ -1600,20 +1603,21 @@
 
 
 
-\cs_new:Nn \xassoccnt_backupstore_property:cnn{%
+
+\cs_new:Nn \xassoccnt_backupstore_property:nnn{%
   \prop_gput:cnn {\xassoccnt_feature_subproplist:nn{\xassoccnt_extract_moduledata:n{backupfeaturename}}{#1}} { #2 } {#3}% Must be expanded
 }
- 
-
 
+\cs_generate_variant:Nn \xassoccnt_backupstore_property:nnn {cnn,cxx,nxx}
 \cs_generate_variant:Nn \xassoccnt_backup_subproplist:n {V}
-\cs_generate_variant:Nn \xassoccnt_backupstore_property:cnn {cxx} %
+\cs_generate_variant:Nn \xassoccnt_feature_subproplist:NN {nn,cn}
 \cs_generate_variant:Nn \__xassoccnt_backup_restore_theHmacros:nn {nx,cn,cx}
 
 
 \NewDocumentCommand{\BackupCounterValues}{O{}m}{%
-  \keys_set:nn {xassoccnt_container} {backup-id={},
-    restore_id={},
+  \keys_set:nn {xassoccnt_container} {
+    backup-id={},
+    restore-id={},
     resetbackup=true,
     cascading=false,
     multiple=false,
@@ -1655,7 +1659,9 @@
 
 
 \NewDocumentCommand{\BackupCounterGroup}{O{}m}{%
-  \keys_set:nn {xassoccnt_container} {backup-id={},
+  \keys_set:nn {xassoccnt_container} 
+  {
+    backup-id={},
     restore-id={},
     resetbackup=true,
     cascading=false,
@@ -1674,7 +1680,7 @@
     \seq_remove_duplicates:c {\xassoccnt_backup_id_seq:n{#2}}
   }
   \seq_map_inline:cn {\xassoccnt_feature_subcontainer:nn{\xassoccnt_extract_moduledata:n{backupfeaturename}}{#2}} {%
-    \xassoccnt_backupstore_property:cxx {#2}{\__xassoccnt_prepare_backupid:nn{##1}{\__xassoccnt_backup_id_tl}} {\number\value{##1}}% Must be expanded!
+    \xassoccnt_backupstore_property:nxx {#2}{\__xassoccnt_prepare_backupid:nn{##1}{\__xassoccnt_backup_id_tl}} {\number\value{##1}}% Must be expanded!
     \__xassoccnt_backup_renew_theHmacros:nn {##1}{\__xassoccnt_prepare_backupid:nn{##1}{\__xassoccnt_backup_id_tl}}% 
     \bool_if:NT \l__xassoccnt_resetbackupcounters_bool {%
       \setcounter{##1}{\c_zero}%
@@ -2286,7 +2292,6 @@
   \int_gset:Nn \g__xassoccnt_lastcountervalue_int {\number\value{\l_tmpb_tl}}%
   \__xassoccnt_is_totalcounter:nT {#1} {%
     \__xassoccnt_store_totalcounter_value:n {#1}%
-    %\prop_put:Nnn \g_xassoccnt_totalcounter_prop {#1} {\number\value{\tl_use:N \l_tmpa_tl}}
   }
 }
 
@@ -2464,7 +2469,6 @@
     \xassoccnt_declaredocumentcounter:nn{sloppy=false,initial={\c_minus_one}}{\__xassoccnt_expand_totalcountername:n{#2}}%
     \seq_gput_right:Nx \g__xassoccnt_totalcounter_container {\__xassoccnt_expand_totalcountername:n{#2}}%
     \__xassoccnt_store_totalcounter_value:n {#2}%
-    %\prop_put:Nnn \g_xassoccnt_totalcounter_prop {#2} {\number\value{\__xassoccnt_expand_totalcountername:n{#2}}}
     \bool_if:NT \l__xassoccnt_is_supertotalcounter_bool {%
       \__xassoccnt_add_supertotalcounter:n {#2}
     }
@@ -2888,8 +2892,6 @@
 
 
 
-
-
 \AddFeature[sublists=true,publicname={Coupled Counters Feature}]{coupledcounters}
 \AddFeature[sublists=true,publicname={Backup Counters Feature}]{backupcounters}  % New style, not fully implemented so far