From ed989c4c4dc0df22914662670328af0fa88c508b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 29 Oct 2016 22:46:55 +0000 Subject: xassoccnt (29oct16) git-svn-id: svn://tug.org/texlive/trunk@42377 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/xassoccnt/xassoccnt.sty | 46 +++++++++++----------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'Master/texmf-dist/tex/latex/xassoccnt') 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 +%% Copyright (c) 2015 -- 2016 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% 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 -- cgit v1.2.3