summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/xassoccnt
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-07-19 21:25:23 +0000
committerKarl Berry <karl@freefriends.org>2020-07-19 21:25:23 +0000
commit1a4a24b8f06ee63757ee0fc7e0ce2e6291733e37 (patch)
tree59c5803c1ba49d02dbc128faa91a9f3436b24322 /Master/texmf-dist/tex/latex/xassoccnt
parent9b122e1ac034268eaf760803bc63b478f623bdfc (diff)
xassoccnt (19jul20)
git-svn-id: svn://tug.org/texlive/trunk@55876 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/xassoccnt')
-rw-r--r--Master/texmf-dist/tex/latex/xassoccnt/xassoccnt.sty60
1 files changed, 30 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/latex/xassoccnt/xassoccnt.sty b/Master/texmf-dist/tex/latex/xassoccnt/xassoccnt.sty
index ca21180ebc6..2150dc6e460 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.7 (2018/12/28 -- 06:45:16)
+%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30)
%% Source file for xassoccnt.sty
%%
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2017 -- 2018 by Dr. Christian Hupfer <typography dot with dot latex at gmail dot com>
+%% Copyright (c) 2017 -- 2020 by Dr. Christian Hupfer <dr dot christian dot hupfer at gmail dot com>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -19,10 +19,10 @@
%%
%%
-\def\xassoccntpackageversion{1.7}
+\def\xassoccntpackageversion{1.8}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{xassoccnt}[2018/12/28 - v\xassoccntpackageversion]
+\ProvidesPackage{xassoccnt}[2020/07/19 - v\xassoccntpackageversion]
\RequirePackage{etoolbox}
\RequirePackage{letltxmacro}
\RequirePackage{xcolor}
@@ -424,16 +424,16 @@
\seq_set_from_clist:Nn \l_tmpa_seq {#1}
\seq_map_inline:Nn \l_tmpa_seq {%
\@ifpackageloaded{##1}{%
- \prop_gput:Nnn \g__xassoccnt_loadedpackages_prop {##1} {\c_one}
+ \prop_gput:Nnn \g__xassoccnt_loadedpackages_prop {##1} {\c_one_int}
}{%
- \prop_gput:Nnn \g__xassoccnt_loadedpackages_prop {##1} {\c_zero}
+ \prop_gput:Nnn \g__xassoccnt_loadedpackages_prop {##1} {\c_zero_int}
}
}
}
\prg_new_conditional:Nnn \xassoccnt_package_loaded:n {T,F,TF}{%
\prop_if_in:NnTF \g__xassoccnt_loadedpackages_prop {#1} {%
- \int_compare:nNnTF {\prop_item:Nn \g__xassoccnt_loadedpackages_prop {#1}} = {\c_zero } {\prg_return_false:} {\prg_return_true:}%
+ \int_compare:nNnTF {\prop_item:Nn \g__xassoccnt_loadedpackages_prop {#1}} = {\c_zero_int } {\prg_return_false:} {\prg_return_true:}%
}{%
\prg_return_false:
}
@@ -441,7 +441,7 @@
\prg_new_conditional:Nnn \xassoccnt_package_notloaded:n {T,F,TF}{%
\prop_if_in:NnTF \g__xassoccnt_loadedpackages_prop {#1} {%
- \int_compare:nNnTF {\prop_item:Nn \g__xassoccnt_loadedpackages_prop {#1}} = {\c_zero } {\prg_return_true:} {\prg_return_false:}%
+ \int_compare:nNnTF {\prop_item:Nn \g__xassoccnt_loadedpackages_prop {#1}} = {\c_zero_int } {\prg_return_true:} {\prg_return_false:}%
}{%
\prg_return_true:
}
@@ -708,7 +708,7 @@
}{}
\AtEndOfPackage{
- \PackageInfo{xassoccnt}{2018/12/28 - v\xassoccntpackageversion -- stepping counters simultaneously and other features}
+ \PackageInfo{xassoccnt}{2020/07/19 - v\xassoccntpackageversion -- stepping counters simultaneously and other features}
\xassoccnt_trackloadedpackages:n{alphalph,calc,cleveref,hyperref}
\@ifpackageloaded{calc}{%
\msg_warning:nnn{xassoccnt}{incompatiblepackagenonfatal}{calc}% Warning
@@ -919,7 +919,7 @@
\cs_new:Nn \__xassoccnt_newcounter_ltx:nn{%
\group_begin:
- \keys_set:nn {xassoccnt}{sloppy=false,initial=\c_zero,#1}
+ \keys_set:nn {xassoccnt}{sloppy=false,initial=\c_zero_int,#1}
% \__xassoccnt_declare_language_map:nn {\prop_item:Nn \g_xassoccnt_module_data_prop {map-name} }{#2;;\prop_item:Nn \g_xassoccnt_module_data_prop {counter-name}}
\cs_if_exist:cTF{c@#2}{%
\bool_if:nF {\l__xassoccnt_sloppy_newcounter }{
@@ -936,7 +936,7 @@
\ifexplversionnew
\cs_new:Nn \__xassoccnt_newcounter_ltx:nnn{%
\group_begin:
- \keys_set:nn {xassoccnt}{map-name=default,counter-name=#2,sloppy=false,initial=\c_zero,#1}
+ \keys_set:nn {xassoccnt}{map-name=default,counter-name=#2,sloppy=false,initial=\c_zero_int,#1}
\str_set:Nx \l_tmpa_str {#3}%
\__xassoccnt_latexcounter_exists:nTF{#2}{%
\bool_if:nF {\l__xassoccnt_sloppy_newcounter }{%
@@ -954,7 +954,7 @@
}
\else
\cs_new:Nn \__xassoccnt_newcounter_ltx:nnn{%
- \keys_set:nn {xassoccnt}{sloppy=false,initial=\c_zero,#1}
+ \keys_set:nn {xassoccnt}{sloppy=false,initial=\c_zero_int,#1}
\tl_set:Nx \l_tmpa_tl {#3}
\__xassoccnt_latexcounter_exists:nTF{#2}{%
\bool_if:nF {\l__xassoccnt_sloppy_newcounter }{
@@ -1294,7 +1294,7 @@
\seq_if_exist:cT { \__xassoccnt_drivercontainer:n{#1} }
{ \seq_map_inline:cn {\__xassoccnt_drivercontainer:n{#1} }
{%
- \xassoccnt_addtocounter{##1}{\c_one}
+ \xassoccnt_addtocounter{##1}{\c_one_int}
}%
}%
% End of \seq_if_exist
@@ -1611,8 +1611,8 @@
\xassoccnt_create_container:nc {feature=true} { \xassoccnt_featurename:n { #2 } }
\bool_if:NTF \l__xassoccnt_sublists_bool {
\xassoccnt_create_container:nc {feature=false} {\xassoccnt_feature_group_container:n{#2} }
- \seq_gput_right:NV \g__xassoccnt_sublists_seq {\c_one }
- } { \seq_gput_right:NV \g__xassoccnt_sublists_seq {\c_zero }}
+ \seq_gput_right:NV \g__xassoccnt_sublists_seq {\c_one_int }
+ } { \seq_gput_right:NV \g__xassoccnt_sublists_seq {\c_zero_int }}
}% End of \seq_if_in
}
}
@@ -1917,7 +1917,7 @@
\xassoccnt_backupstore_property:cxx {\l_xassoccnt_countergroup_name_tl}{\__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}%
+ \setcounter{##1}{\c_zero_int}%
}
}%
}
@@ -1948,7 +1948,7 @@
\xassoccnt_backupstore_property:Nnn {#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}%
+ \setcounter{##1}{\c_zero_int}%
}%
}%
}
@@ -2302,7 +2302,7 @@
\cs_new:Nn \xassoccnt_stepcounter_periodiccounter:n {%
\xassoccnt_is_periodiccounter:nT {#1}{%
\int_compare:nNnT {\prop_item:Nn \g_xassoccnt_periodiccounter_prop {#1}} = {\use:c{c@#1}}%
- { \__xassoccnt_setdocumentcounter:nnn {} {#1}{\c_zero} }
+ { \__xassoccnt_setdocumentcounter:nnn {} {#1}{\c_zero_int} }
}
}
\cs_new:Nn \xassoccnt_addtocounter_periodiccounter:nnn {%
@@ -2321,7 +2321,7 @@
\keys_set:nn {xassoccnt_periodiccounter} {reset=true,#1}
% Reset the periodic counter if requested (by default this is true!)
\bool_if:NT \l_xassoccnt_resetperiodiccounters_bool {%
- \__xassoccnt_setdocumentcounter:nnn {} {#2} {\c_zero}%
+ \__xassoccnt_setdocumentcounter:nnn {} {#2} {\c_zero_int}%
}
}
@@ -2400,15 +2400,15 @@
\__xassoccnt_getresetlist:n {\l_tmpa_tl}%
\seq_if_empty:NTF \l__xassoccnt_counterreset_seq
{%
- \xassoccnt_standardaddtocounter{\l_tmpa_tl}{\c_one}% Use the original one!
+ \xassoccnt_standardaddtocounter{\l_tmpa_tl}{\c_one_int}% Use the original one!
\int_gset:Nn \g__xassoccnt_lastcountervalue_int {\number\value{\l_tmpa_tl}}%
\__xassoccnt_step_associatedcounters:n {\l_tmpa_tl}
}{ % reset list is not empty!
% This is the replacement of \csname cl@#1\endcsname
- \xassoccnt_standardaddtocounter{\l_tmpa_tl}{\c_one}
+ \xassoccnt_standardaddtocounter{\l_tmpa_tl}{\c_one_int}
\seq_map_inline:Nn \l__xassoccnt_counterreset_seq {%
\xassoccnt_is_drivercounter:nTF{##1}{%
- \csname c@##1\endcsname\c_zero % Reset but do not increase
+ \csname c@##1\endcsname\c_zero_int % Reset but do not increase
}{%
\csname c@##1\endcsname-1
\xassoccnt_standardstepcounter{##1}%
@@ -2581,7 +2581,7 @@
%%%%% Wrappers for \newcounter etc.
-\NewDocumentCommand{\NewDocumentCounter}{O{initial=\c_zero}mo}{%
+\NewDocumentCommand{\NewDocumentCounter}{O{initial=\c_zero_int}mo}{%
\group_begin:
\seq_set_from_clist:Nx \l_tmpa_seq {#2}
\seq_map_inline:Nn \l_tmpa_seq {%
@@ -3054,7 +3054,7 @@
% Prevent multiple addition of a counter name
\seq_if_in:NnF #1 {#2}
{
- \seq_gput_right:Nn \l__xassoccnt_backupresetlist_seq {\c_one}
+ \seq_gput_right:Nn \l__xassoccnt_backupresetlist_seq {\c_one_int}
\seq_gput_right:Nn #1 { #2 }
}
}
@@ -3064,7 +3064,7 @@
% Prevent multiple addition of a counter name
\seq_if_in:NnF #1 {#2}
{
- \seq_gput_right:Nn \l__xassoccnt_backupresetlist_seq {\c_zero}
+ \seq_gput_right:Nn \l__xassoccnt_backupresetlist_seq {\c_zero_int}
\seq_gput_right:NV #1 {#2}
}
}
@@ -3109,10 +3109,10 @@
\__xassoccnt_renew_theHmacros:n {##1 }
\seq_gput_right:Nx \l__xassoccnt_countervaluesbackup_seq { \number\value{##1} }
% Check first if the counter name is starred -> no resetting then
- \int_compare:nNnF { \seq_item:Nn \l__xassoccnt_backupresetlist_seq {\int_use:N \l_tmpa_int }} = { \c_zero }
+ \int_compare:nNnF { \seq_item:Nn \l__xassoccnt_backupresetlist_seq {\int_use:N \l_tmpa_int }} = { \c_zero_int }
{%
\bool_if:NT \l__xassoccnt_resetbackupcounters_bool {%
- \setcounter{##1}{\c_zero}%
+ \setcounter{##1}{\c_zero_int}%
}%
}%
}{%
@@ -3129,10 +3129,10 @@
\__xassoccnt_renew_theHmacros:n { #1 }
\seq_gput_right:Nx \l__xassoccnt_countervaluesbackup_seq { \number\value{#1} }
% Check first if the counter name is starred -> no resetting then
- \int_compare:nNnF { \seq_item:Nn \l__xassoccnt_backupresetlist_seq {\int_use:N \l_tmpa_int }} = { \c_zero }
+ \int_compare:nNnF { \seq_item:Nn \l__xassoccnt_backupresetlist_seq {\int_use:N \l_tmpa_int }} = { \c_zero_int }
{%
\bool_if:NT \l__xassoccnt_resetbackupcounters_bool {%
- \setcounter{#1}{\c_zero}%
+ \setcounter{#1}{\c_zero_int}%
}%
}%
}{%
@@ -3809,7 +3809,7 @@
\group_begin:
\seq_set_split:Nnn \l_tmpb_seq {;;} {#2}
\seq_gput_right:cx {g_xassoccnt_language_map_#1_seq } { \seq_item:Nn \l_tmpb_seq {1}}
- \int_compare:nNnT { \seq_count:N \l_tmpb_seq } = { \c_one }
+ \int_compare:nNnT { \seq_count:N \l_tmpb_seq } = { \c_one_int }
{
% Append the first element to be the reference entry
\seq_put_right:Nx \l_tmpb_seq { \seq_item:Nn \l_tmpb_seq {1} }