From 55ce2577d4277b51f7ba1ecaf4cd044879d1a5db Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 6 Jan 2018 21:55:26 +0000 Subject: xcntperchap (6jan18) git-svn-id: svn://tug.org/texlive/trunk@46236 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/xcntperchap/README | 8 +-- .../latex/xcntperchap/xcntperchap_basicusage.pdf | Bin 39062 -> 39064 bytes .../latex/xcntperchap/xcntperchap_basicusage.tex | 4 +- .../doc/latex/xcntperchap/xcntperchap_doc.pdf | Bin 227488 -> 226116 bytes .../doc/latex/xcntperchap/xcntperchap_doc.tex | 29 ++++------ .../doc/latex/xcntperchap/xcntperchap_driver.pdf | Bin 58592 -> 58597 bytes .../doc/latex/xcntperchap/xcntperchap_driver.tex | 4 +- .../latex/xcntperchap/xcntperchap_labelusage.pdf | Bin 40469 -> 40469 bytes .../latex/xcntperchap/xcntperchap_labelusage.tex | 4 +- .../tex/latex/xcntperchap/xcntperchap.sty | 63 +++++++++++++-------- 10 files changed, 58 insertions(+), 54 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/xcntperchap/README b/Master/texmf-dist/doc/latex/xcntperchap/README index 520a63a371c..af8ed3a21ce 100644 --- a/Master/texmf-dist/doc/latex/xcntperchap/README +++ b/Master/texmf-dist/doc/latex/xcntperchap/README @@ -1,9 +1,9 @@ -%% LaTeX package xcntperchap - version 0.4 (2017/04/30 -- 00:53:36) +%% LaTeX package xcntperchap - version 0.5 (2018/01/05 -- 22:04:12) %% README file for xcntperchap.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2016 -- 2017 by Dr. Christian Hupfer +%% Copyright (c) 2016 -- 2018 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -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/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 +As of 2018/01/05 xcntperchap does not supersede the package cntperchap by the same author, however, +the older package isn't declared obsolete as of 2018/01/05 diff --git a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_basicusage.pdf b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_basicusage.pdf index 5ca4513a7fc..66984397d3e 100644 Binary files a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_basicusage.pdf and b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_basicusage.pdf differ diff --git a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_basicusage.tex b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_basicusage.tex index 518bf123915..42d66520106 100644 --- a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_basicusage.tex +++ b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_basicusage.tex @@ -1,9 +1,9 @@ -%% LaTeX package xcntperchap - version 0.4 (2017/04/30 -- 00:53:36) +%% LaTeX package xcntperchap - version 0.5 (2018/01/05 -- 22:04:12) %% Basic usage example file for xcntperchap.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2017 by Dr. Christian Hupfer +%% Copyright (c) 2017 -- 2018 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_doc.pdf b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_doc.pdf index e4dd030c22d..47967536c57 100644 Binary files a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_doc.pdf and b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_doc.tex b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_doc.tex index 949c7735d0c..31fe1df3e91 100644 --- a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_doc.tex +++ b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_doc.tex @@ -1,9 +1,9 @@ -%% LaTeX package xcntperchap - version 0.4 (2017/04/30 -- 00:53:36) +%% LaTeX package xcntperchap - version 0.5 (2018/01/05 -- 22:04:12) %% Documentation file for xcntperchap.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2016 -- 2017 by Dr. Christian Hupfer +%% Copyright (c) 2016 -- 2018 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -82,6 +82,9 @@ \@namedef{xcntperchapversion0.4}{v0.4 2017-04-19} + +\@namedef{xcntperchapversion0.5}{v0.5 2018-01-05} + \newcommand{\authorname}{Autor} @@ -114,7 +117,6 @@ #1 } - \presetkeys{chdoc}{packageauthor={Christian Hupfer}}{}% \NewDocumentCommand{\CHPackageTitlePage}{O{}mO{}}{% \setkeys{chdoc}{packageauthor={Christian Hupfer},filepurpose={Documentation},#1}% @@ -309,8 +311,6 @@ \newcommand{\PackageDocName}{xcntperchap}% - - \newcommand{\mymailtoaddress}{% typography.with.latex@gmail.com } @@ -328,7 +328,7 @@ \hypersetup{breaklinks=true, pdftitle={\jobname.pdf -- version \packageversion}, - pdfauthor={PACKAGEAUTHOR}, + pdfauthor={Dr. Christian Hupfer}, pdfsubject={Documentation of \PackageDocName\ package}, pdfkeywords={LaTeX, counters}, pdfcreator={LaTeX} @@ -699,20 +699,8 @@ don't hesitate and contact me via \makeatletter christian.hupfer@yahoo.de\makeat \section{Acknowledgments} I would like to express my gratitudes to the developpers of fine \LaTeX{} packages and of course -to the users at tex.stackexchange.com, especially to +to the users at tex.stackexchange.com, especially: -\begin{itemize} - \item Paulo Roberto Massa Cereda - \item Enrico Gregorio - \item Joseph Wright - \item David Carlisle - \item Werner Grundlingh - \item Gonzalo Medina -\end{itemize} - -for their invaluable help on many questions on macros. - -\vspace{2\baselineskip} \begin{marker} A special gratitude goes to Prof. Dr. Dr. Thomas Sturm for providing the wonderful \CHDocPackage{tcolorbox} package which was used to write this documentation. @@ -724,6 +712,9 @@ write this documentation. \begin{itemize}[itemsep=15pt] +\item \CHDocFullVersion{0.5} + Improved the core \cs{setcounter} in order to grab changes for relevant counters there as well. + \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} diff --git a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.pdf b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.pdf index 9dfddb23f2e..505d741b7f0 100644 Binary files a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.pdf and b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.pdf differ diff --git a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.tex b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.tex index 2364f94cef0..d9a62863692 100644 --- a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.tex +++ b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_driver.tex @@ -1,9 +1,9 @@ -%% LaTeX package xcntperchap - version 0.4 (2017/04/30 -- 00:53:36) +%% LaTeX package xcntperchap - version 0.5 (2018/01/05 -- 22:04:12) %% Driver examples file for xcntperchap.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2016 -- 2017 by Dr. Christian Hupfer +%% Copyright (c) 2016 -- 2018 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_labelusage.pdf b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_labelusage.pdf index c708723c1ed..b6d0defd96d 100644 Binary files a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_labelusage.pdf and b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_labelusage.pdf differ diff --git a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_labelusage.tex b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_labelusage.tex index e75352f541f..ec245701b3f 100644 --- a/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_labelusage.tex +++ b/Master/texmf-dist/doc/latex/xcntperchap/xcntperchap_labelusage.tex @@ -1,9 +1,9 @@ -%% LaTeX package xcntperchap - version 0.4 (2017/04/30 -- 00:53:36) +%% LaTeX package xcntperchap - version 0.5 (2018/01/05 -- 22:04:12) %% Label usage example file for xcntperchap.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2017 by Dr. Christian Hupfer +%% Copyright (c) 2017 -- 2018 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/tex/latex/xcntperchap/xcntperchap.sty b/Master/texmf-dist/tex/latex/xcntperchap/xcntperchap.sty index 2f8a4de1cba..01bd26aff44 100644 --- a/Master/texmf-dist/tex/latex/xcntperchap/xcntperchap.sty +++ b/Master/texmf-dist/tex/latex/xcntperchap/xcntperchap.sty @@ -1,9 +1,9 @@ -%% LaTeX package xcntperchap - version 0.4 (2017/04/30 -- 00:53:36) +%% LaTeX package xcntperchap - version 0.5 (2018/01/05 -- 22:04:12) %% Source file for xcntperchap.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2016 -- 2017 by Dr. Christian Hupfer +%% Copyright (c) 2016 -- 2018 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -19,10 +19,10 @@ %% %% -\def\xcntperchappackageversion{0.4} +\def\xcntperchappackageversion{0.5} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{xcntperchap}[2017/04/30 - v\xcntperchappackageversion] +\ProvidesPackage{xcntperchap}[2018/01/05 - v\xcntperchappackageversion] \RequirePackage[counter]{zref} \RequirePackage{l3keys2e} @@ -33,11 +33,9 @@ \ExplSyntaxOn -%\let\latex@@stepcounter\stepcounter -%\let\latex@@addtocounter\addtocounter - \cs_set_eq:NN \latex@@stepcounter \stepcounter \cs_set_eq:NN \latex@@addtocounter \addtocounter +\cs_set_eq:NN \latex@@setcounter \setcounter \cs_generate_variant:Nn \int_set:Nn {NV, Nx} @@ -102,20 +100,23 @@ \tl_clear:N \l_tmpa_tl \int_zero:N \l_tmpa_int \int_zero:N \l_tmpb_int - \seq_if_in:NnT \g_xcntperchap_tracklevel_seq {#1} {% - \tl_put_right:Nn \l_tmpa_tl {#1,}% - \int_set:Nx \l_tmpb_int {\seq_count:c {g_xcntperchap_tracklevel_#1_seq} } - \int_compare:nNnT { \value{#1} } > {\c_zero }{% - \int_zero:N \l_tmpa_int - \seq_map_inline:cn {g_xcntperchap_tracklevel_#1_seq} {% - \int_incr:N \l_tmpa_int - \int_compare:nNnTF {\l_tmpa_int } < { \l_tmpb_int } - { \tl_gput_right:Nx \l_tmpa_tl { \number\value{cps@@#1total##1}, } } { \tl_gput_right:Nx \l_tmpa_tl { \number\value{cps@@#1total##1} } } - } - \iow_now:Nx \g_trackfile_storage_write {\l_tmpa_tl}% - } - \seq_map_inline:cn {g_xcntperchap_tracklevel_#1_seq} { - \setcounter{cps@@#1total##1}{\c_zero}% Reset the total counter values + \seq_if_exist:cT {g_xcntperchap_tracklevel_#1_seq} { + \seq_if_in:NnT \g_xcntperchap_tracklevel_seq {#1} {% + \tl_put_right:Nn \l_tmpa_tl {#1,}% + \int_set:Nx \l_tmpb_int {\seq_count:c {g_xcntperchap_tracklevel_#1_seq} } + \int_compare:nNnT { \number\value{#1} } > {0 }{% + \int_zero:N \l_tmpa_int + \seq_map_inline:cn {g_xcntperchap_tracklevel_#1_seq} {% + \int_incr:N \l_tmpa_int + \int_compare:nNnTF {\l_tmpa_int } < { \l_tmpb_int } + { \tl_gput_right:Nx \l_tmpa_tl { \number\value{cps@@#1total##1}, } } { \tl_gput_right:Nx \l_tmpa_tl { \number\value{cps@@#1total##1} } } + } + % Store the value list to the file + \iow_now:Nx \g_trackfile_storage_write {\tl_use:N \l_tmpa_tl}% + } + \seq_map_inline:cn {g_xcntperchap_tracklevel_#1_seq} { + \setcounter{cps@@#1total##1}{\c_zero}% Reset the total counter values + } } } \group_end: @@ -130,7 +131,6 @@ % Redefine again, to provide the storage feature \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 {% @@ -142,12 +142,24 @@ \latex@@stepcounter{#1}% } -\let\foo\stepcounter -\RenewDocumentCommand{\stepcounter}{m}{% +\cs_set:Npn \stepcounter #1{% \xcntperchap_internal_stepcounter{#1}% } +% Added in Version 0.5 +\cs_set:Npn \setcounter #1#2{% + % This might be necessary later on -> check in next updates +% \__xassoccnt_getresetlist:n{#1}% +% \seq_map_inline:Nn \g_xcntperchap_tracklevel_seq {% +% \seq_if_in:NnT \l__xassoccnt_counterreset_seq {##1} {% +% \StoreCounterValues{##1}% +% } +% } + \StoreCounterValues{#1}% + \latex@@setcounter{#1}{#2}% +} + \NewDocumentCommand{\AddToTrackedCounters}{mm}{% \seq_set_from_clist:Nn \l_tmpa_seq {#1} \seq_map_inline:Nn \l_tmpa_seq {% @@ -159,7 +171,7 @@ -\cs_new_nopar:Nn \xcntperchap_trackcounters: {% +\cs_new:Nn \xcntperchap_trackcounters: {% \seq_map_inline:cn {g_xcntperchap_tracklevel_seq} {% \xcntperchap_storetracked_values:n{##1}% } @@ -192,6 +204,7 @@ } + \cs_new:Nn \xcntperchap_open_trackfile_for_read:n {% \ior_open:Nn \g_trackfile_storage_read {#1} } -- cgit v1.2.3