10 files changed, 55 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/latex/xcntperchap/README b/Master/texmf-dist/doc/latex/xcntperchap/README
index 3940e159a1d..520a63a371c 100644
--- a/Master/texmf-dist/doc/latex/xcntperchap/README
+++ b/Master/texmf-dist/doc/latex/xcntperchap/README
@@ -1,4 +1,4 @@
-%% LaTeX package xcntperchap - version 0.3 (2017/01/13 -- 23:24:36)
+%% LaTeX package xcntperchap - version 0.4 (2017/04/30 -- 00:53:36)
 %% README file for xcntperchap.sty
 %%
 %%
@@ -22,7 +22,7 @@
 
 The package xcntperchap provides a way of investigating how many subsections per chapter etc. are in a certain chapter etc beforehand, i.e. at the begin of the second compilation run this is information is available. 
 
-As of 2017/01/13 xcntperchap does not supersede the package cntperchap by the same author, however, 
-the older package isn't declared obsolete as of 2017/01/13
+As of 2017/04/30 xcntperchap does not supersede the package cntperchap by the same author, however, 
+the older package isn't declared obsolete as of 2017/04/30
 
 
diff --git a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_basicusage.pdf b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_basicusage.pdf
index 86e3bcc2c2a..5ca4513a7fc 100644
--- a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_basicusage.pdf
+++ b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_basicusage.pdf
diff --git a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_basicusage.tex b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_basicusage.tex
index 4827bf7016d..518bf123915 100644
--- a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_basicusage.tex
+++ b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_basicusage.tex
@@ -1,4 +1,4 @@
-%% LaTeX package xcntperchap - version 0.3 (2017/01/13 -- 23:24:36)
+%% LaTeX package xcntperchap - version 0.4 (2017/04/30 -- 00:53:36)
 %% Basic usage example file for xcntperchap.sty
 %%
 %%
@@ -21,14 +21,16 @@
 
 \documentclass{article}
 
-\usepackage{xcntperchap}
 \usepackage{enumitem}
+\usepackage{xcntperchap}
 
 
 
 \RegisterCounters{section}{enumi}
 \RegisterCounters{subsection}{enumi}
 
+
+
 \begin{document}
 \tableofcontents
 
diff --git a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_doc.pdf b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_doc.pdf
index 94f3593d929..e4dd030c22d 100644
--- a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_doc.pdf
+++ b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_doc.pdf
diff --git a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_doc.tex b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_doc.tex
index 9699d256600..949c7735d0c 100644
--- a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_doc.tex
+++ b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_doc.tex
@@ -1,4 +1,4 @@
-%% LaTeX package xcntperchap - version 0.3 (2017/01/13 -- 23:24:36)
+%% LaTeX package xcntperchap - version 0.4 (2017/04/30 -- 00:53:36)
 %% Documentation file for xcntperchap.sty
 %%
 %%
@@ -80,6 +80,8 @@
 
 \@namedef{xcntperchapversion0.3}{v0.3 2017-01-09}
 
+\@namedef{xcntperchapversion0.4}{v0.4 2017-04-19}
+
 \newcommand{\authorname}{Autor}
 
 
@@ -288,6 +290,19 @@
 }
 
 
+\newcommand{\CHDocExperimentalFeature}[1][Experimental]{%
+  \tcbdocmarginnote[doclang/new={N},
+  colframe=yellow!50!blue,
+  halign=left,
+  colback={blue!10!yellow},
+  fontupper={\tiny}
+  ]{%
+    #1%
+  }%
+}
+
+
+
 
 \usepackage{xcntperchap}
 \usepackage{cleveref}
@@ -375,7 +390,7 @@ As of version \packageversion~ the package has no package options.
 
 \subsection{Required packages}
 
-Since \CHDocPackage{\PackageDocName} is written using \CHDocPackage{expl3}, it requires the \CHDocPackage{xparse} package. It relies on the features of associated counters introduced by \CHDocPackage{xassoccnt}, this package is also needed%
+Since \CHDocPackage{\PackageDocName} is written using \CHDocPackage{expl3}, it requires the \CHDocPackage{xparse} package. It relies on the features of associated counters introduced by \CHDocPackage{xassoccnt} v1.4. 
 
 \begin{itemize}
 \item \CHDocPackage{zref}%
@@ -707,6 +722,10 @@ write this documentation.
 \section{Version history}
 
 \begin{itemize}[itemsep=15pt]
+
+
+\item \CHDocFullVersion{0.4}
+  Improved the core \cs{stepcounter} in order to fit the \CHDocPackage{expl3} and \CHDocPackage{xparse} changes of Februar - April 2017. 
 \item   \CHDocFullVersion{0.3}
   \begin{itemize}
   \item \CHDocNew{0.3} Support for obtaining a tracked value level by using labels with \refCom{tracklabel}, \refCom{tracklabel*} and \refCom{ObtainTrackedValueByLabel}
diff --git a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.pdf b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.pdf
index 09dc7d44378..9dfddb23f2e 100644
--- a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.pdf
+++ b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.pdf
diff --git a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.tex b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.tex
index 5fcd4ae873c..2364f94cef0 100644
--- a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.tex
+++ b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.tex
@@ -1,4 +1,4 @@
-%% LaTeX package xcntperchap - version 0.3 (2017/01/13 -- 23:24:36)
+%% LaTeX package xcntperchap - version 0.4 (2017/04/30 -- 00:53:36)
 %% Driver examples file for xcntperchap.sty
 %%
 %%
diff --git a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_labelusage.pdf b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_labelusage.pdf
index 585e31ee894..c708723c1ed 100644
--- a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_labelusage.pdf
+++ b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_labelusage.pdf
diff --git a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_labelusage.tex b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_labelusage.tex
index 8ae65de86d1..e75352f541f 100644
--- a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_labelusage.tex
+++ b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_labelusage.tex
@@ -1,4 +1,4 @@
-%% LaTeX package xcntperchap - version 0.3 (2017/01/13 -- 23:24:36)
+%% LaTeX package xcntperchap - version 0.4 (2017/04/30 -- 00:53:36)
 %% Label usage example file for xcntperchap.sty
 %%
 %%
diff --git a/Master/texmf-dist/tex/latex/xcntperchap/xcntperchap.sty b/Master/texmf-dist/tex/latex/xcntperchap/xcntperchap.sty
index 20edfe8187a..2f8a4de1cba 100644
--- a/Master/texmf-dist/tex/latex/xcntperchap/xcntperchap.sty
+++ b/Master/texmf-dist/tex/latex/xcntperchap/xcntperchap.sty
@@ -1,4 +1,4 @@
-%% LaTeX package xcntperchap - version 0.3 (2017/01/13 -- 23:24:36)
+%% LaTeX package xcntperchap - version 0.4 (2017/04/30 -- 00:53:36)
 %% Source file for xcntperchap.sty
 %%
 %%
@@ -19,22 +19,25 @@
 %%
 %%
 
-\def\xcntperchappackageversion{0.3}
+\def\xcntperchappackageversion{0.4}
 \NeedsTeXFormat{LaTeX2e}
 
-\ProvidesPackage{xcntperchap}[2017/01/13 - v\xcntperchappackageversion]
+\ProvidesPackage{xcntperchap}[2017/04/30 - v\xcntperchappackageversion]
 
 \RequirePackage[counter]{zref}
-\RequirePackage{xparse}
 \RequirePackage{l3keys2e}
-\RequirePackage[nonumberofruns]{xassoccnt}
+\RequirePackage{xparse}
+\RequirePackage{xassoccnt}
 
 
 \ExplSyntaxOn
 
 
-\let\latex@@stepcounter\stepcounter
-\let\latex@@addtocounter\addtocounter
+%\let\latex@@stepcounter\stepcounter
+%\let\latex@@addtocounter\addtocounter
+
+\cs_set_eq:NN \latex@@stepcounter \stepcounter
+\cs_set_eq:NN \latex@@addtocounter \addtocounter
 
 
 \cs_generate_variant:Nn \int_set:Nn {NV, Nx}
@@ -95,6 +98,7 @@
 
 
 \cs_new:Nn \xcntperchap_storetracked_values:n{%
+  \group_begin:
   \tl_clear:N \l_tmpa_tl
   \int_zero:N \l_tmpa_int
   \int_zero:N \l_tmpb_int
@@ -114,6 +118,7 @@
       \setcounter{cps@@#1total##1}{\c_zero}% Reset the total counter values
     }
   }
+  \group_end:
 }
 
 
@@ -123,18 +128,25 @@
 
 
 % Redefine again, to provide the storage feature
-\RenewDocumentCommand{\stepcounter}{m}{%
+
+\cs_set:Npn \xcntperchap_internal_stepcounter #1 {%
+%\RenewDocumentCommand{\stepcounter}{m}{%
   % Must get reset list first
   \__xassoccnt_getresetlist:n{#1}% 
   \seq_map_inline:Nn \g_xcntperchap_tracklevel_seq {%
-    \seq_if_in:NnT \l__xassoccnt_counterreset_seq {##1} {%
-      \StoreCounterValues{##1}%
-    }
+     \seq_if_in:NnT \l__xassoccnt_counterreset_seq {##1} {%
+     \StoreCounterValues{##1}%
+   }
   }
   \StoreCounterValues{#1}%
   \latex@@stepcounter{#1}%
 }
 
+\let\foo\stepcounter
+
+\RenewDocumentCommand{\stepcounter}{m}{%
+  \xcntperchap_internal_stepcounter{#1}%
+}
 
 \NewDocumentCommand{\AddToTrackedCounters}{mm}{%
   \seq_set_from_clist:Nn \l_tmpa_seq {#1} 
@@ -284,9 +296,9 @@
 
 \AtBeginDocument{%
   \@ifpackageloaded{cleveref}{%
-    \@cpscleverefloadedtrue
+    \global\@cpscleverefloadedtrue
   }{%
-    \@cpscleverefloadedfalse
+    \global\@cpscleverefloadedfalse
   }
 }