From 1a4a24b8f06ee63757ee0fc7e0ce2e6291733e37 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 19 Jul 2020 21:25:23 +0000 Subject: xassoccnt (19jul20) git-svn-id: svn://tug.org/texlive/trunk@55876 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/xassoccnt/README | 8 +- .../xassoccnt/xassoccnt_counterformats_example.pdf | Bin 11903 -> 11903 bytes .../xassoccnt/xassoccnt_counterformats_example.tex | 4 +- .../xassoccnt_counterhierarchy_example.pdf | Bin 14012 -> 14012 bytes .../xassoccnt_counterhierarchy_example.tex | 4 +- .../xassoccnt/xassoccnt_counternames_example.pdf | Bin 15994 -> 0 bytes .../xassoccnt/xassoccnt_counternames_example.tex | 45 ---------- .../xassoccnt_coupledcounters_example.pdf | Bin 94247 -> 94248 bytes .../xassoccnt_coupledcounters_example.tex | 4 +- .../doc/latex/xassoccnt/xassoccnt_doc.pdf | Bin 558370 -> 542720 bytes .../doc/latex/xassoccnt/xassoccnt_doc.tex | 26 ++++-- .../latex/xassoccnt/xassoccnt_driver_example.pdf | Bin 81113 -> 79453 bytes .../latex/xassoccnt/xassoccnt_driver_example.tex | 4 +- .../doc/latex/xassoccnt/xassoccnt_example.pdf | Bin 68392 -> 68361 bytes .../doc/latex/xassoccnt/xassoccnt_example.tex | 4 +- .../xassoccnt_getparentcounter_example.pdf | Bin 46908 -> 46906 bytes .../xassoccnt_getparentcounter_example.tex | 4 +- .../latex/xassoccnt/xassoccnt_label_example.pdf | Bin 42916 -> 42917 bytes .../latex/xassoccnt/xassoccnt_label_example.tex | 4 +- .../xassoccnt_parentcounterchain_example.pdf | Bin 40835 -> 0 bytes .../xassoccnt_parentcounterchain_example.tex | 94 --------------------- .../xassoccnt_periodiccounters_example.pdf | Bin 31637 -> 31635 bytes .../xassoccnt_periodiccounters_example.tex | 4 +- .../xassoccnt/xassoccnt_resetlist_example.pdf | Bin 66318 -> 64628 bytes .../xassoccnt/xassoccnt_resetlist_example.tex | 4 +- .../xassoccnt/xassoccnt_resetloop_example.pdf | Bin 35595 -> 35598 bytes .../xassoccnt/xassoccnt_resetloop_example.tex | 4 +- .../xassoccnt_suspendedcounters_example.pdf | Bin 60530 -> 60534 bytes .../xassoccnt_suspendedcounters_example.tex | 4 +- .../xassoccnt/xassoccnt_totalcounters_example.pdf | Bin 63550 -> 65140 bytes .../xassoccnt/xassoccnt_totalcounters_example.tex | 4 +- .../texmf-dist/tex/latex/xassoccnt/xassoccnt.sty | 60 ++++++------- 32 files changed, 76 insertions(+), 205 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counternames_example.pdf delete mode 100644 Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counternames_example.tex delete mode 100644 Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_parentcounterchain_example.pdf delete mode 100644 Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_parentcounterchain_example.tex diff --git a/Master/texmf-dist/doc/latex/xassoccnt/README b/Master/texmf-dist/doc/latex/xassoccnt/README index 67cd8fa1f50..eb1a01a37e8 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.7 (2018/12/28 -- 06:45:16) +%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30) %% README file for xassoccnt.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2017 -- 2018 by Dr. Christian Hupfer +%% Copyright (c) 2017 -- 2020 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% 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 2018/12/28 xassoccnt does not supersede the package assoccnt by the same author, however, -the older package isn't declared obsolete as of 2018/12/28 +As of 2020/07/19 xassoccnt does not supersede the package assoccnt by the same author, however, +the older package isn't declared obsolete as of 2020/07/19 diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counterformats_example.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counterformats_example.pdf index 428b3644c48..3f5df833d7b 100644 Binary files a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counterformats_example.pdf and b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counterformats_example.pdf differ diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counterformats_example.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counterformats_example.tex index b03e7db9f07..91c10623323 100644 --- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counterformats_example.tex +++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counterformats_example.tex @@ -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) %% Example file for defining new counter formats file for xassoccnt.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2017 -- 2018 by Dr. Christian Hupfer +%% Copyright (c) 2017 -- 2020 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counterhierarchy_example.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counterhierarchy_example.pdf index fa5045cd5c8..4b294bdcae7 100644 Binary files a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counterhierarchy_example.pdf and b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counterhierarchy_example.pdf differ diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counterhierarchy_example.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counterhierarchy_example.tex index e8d703efa80..87e67e83eac 100644 --- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counterhierarchy_example.tex +++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counterhierarchy_example.tex @@ -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) %% Example file for defining new counter hierarchies file for xassoccnt.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2017 -- 2018 by Dr. Christian Hupfer +%% Copyright (c) 2017 -- 2020 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counternames_example.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counternames_example.pdf deleted file mode 100644 index 363fc5e2bd2..00000000000 Binary files a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counternames_example.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counternames_example.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counternames_example.tex deleted file mode 100644 index f8bf25c7935..00000000000 --- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_counternames_example.tex +++ /dev/null @@ -1,45 +0,0 @@ -%% LaTeX package xassoccnt - version 1.7 (2018/12/28 -- 06:45:16) -%% Example file the the usage of counter names file for xassoccnt.sty -%% -%% -%% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2017 -- 2018 by Dr. Christian Hupfer -%% ------------------------------------------------------------------------------------------- -%% -%% 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` -%% -%% - -\documentclass{book} - -\usepackage[utf8]{inputenc} -\usepackage{xassoccnt} - -\DeclareDocumentCounter[map-name=german,counter-name={Müller}]{foo} - -\DeclareLanguageMappings{german}{part;;;;;;Teil;;Teile , chapter;;Kapitel, section;;Abschnitt, subsection;;Unterabschnitt, subsubsection;;Unterabschnitt, paragraph;;Parragraph, subparagraph;; Unterparagraph;; figure;;Abbildung, table;;Tabelle, page;;Seite, equation;;Gleichung } - -\begin{document} - -\ExplSyntaxOn - \typeout{Mapname~is~\prop_item:Nn \g_xassoccnt_module_data_prop {map-name},~counter-name~is~\prop_item:Nn \g_xassoccnt_module_data_prop {counter-name}} -\ExplSyntaxOff -\setcounter{foo}{17} - -\ShowLanguageMappings{german} - -\RetrieveCounterSingularName{german}{chapter} - - - - -\end{document} 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 703094207d5..4e75803758d 100644 Binary files a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_coupledcounters_example.pdf and b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_coupledcounters_example.pdf differ 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 a7eda584dce..b5338ac8e33 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.7 (2018/12/28 -- 06:45:16) +%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30) %% Example file for coupled counters file for xassoccnt.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2016 -- 2018 by Dr. Christian Hupfer +%% Copyright (c) 2016 -- 2020 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% 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 fdb97d923c0..f7ec391d94c 100644 Binary files a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_doc.pdf and b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_doc.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_doc.tex index 80db2224afc..2d896814515 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.7 (2018/12/28 -- 06:45:16) +%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30) %% Documentation file for xassoccnt.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2015 -- 2018 by Dr. Christian Hupfer +%% Copyright (c) 2015 -- 2020 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -34,7 +34,6 @@ \usepackage[x11names]{xcolor} \usepackage{imakeidx} \usepackage{fontawesome} -\usepackage[most,documentation]{tcolorbox} \usepackage[tikz]{bclogo} \usepackage{marginnote} \usepackage{fancyhdr} @@ -44,11 +43,14 @@ \usepackage{xparse} \usepackage{totcount} \usepackage{enumitem} -\usepackage{microtype} \usepackage{caption} +\usepackage{microtype} \usepackage[T1]{fontenc} \usepackage[scaled=0.92]{helvet} +\usepackage[most,documentation]{tcolorbox} + + \newlist{codeoptionsenum}{enumerate}{1} \setlist[codeoptionsenum,1]{label={\textcolor{blue}{\#\arabic*}}} @@ -115,6 +117,8 @@ \@namedef{xassoccntversion1.7}{v1.7 2018-12-28} +\@namedef{xassoccntversion1.8}{v1.8 2019-01-01} + \newcommand{\authorname}{Autor} @@ -190,8 +194,8 @@ colframe=yellow!20!black, sharp corners,rounded corners=southeast,arc is angular,arc=3mm, underlay={% - \path[fill=tcbcol@back!80!black] ([yshift=3mm]interior.south east)--++(-0.4,-0.1)--++(0.1,-0.2); - \path[draw=tcbcol@frame,shorten <=-0.05mm,shorten >=-0.05mm] ([yshift=3mm]interior.south east)--++(-0.4,-0.1)--++(0.1,-0.2); + \path[fill=tcbcolback!80!black] ([yshift=3mm]interior.south east)--++(-0.4,-0.1)--++(0.1,-0.2); + \path[draw=tcbcolframe,shorten <=-0.05mm,shorten >=-0.05mm] ([yshift=3mm]interior.south east)--++(-0.4,-0.1)--++(0.1,-0.2); \path[fill=yellow!50!black,draw=none] (interior.south west) rectangle node[white]{\Huge\bfseries !} ([xshift=4mm]interior.north west); }, drop fuzzy shadow,#1} @@ -344,14 +348,13 @@ \usepackage{bookmark} \usepackage{cleveref} \usetikzlibrary{mindmap} -\usepackage{url} \setcounter{tocdepth}{3} \newcommand{\PackageDocName}{xassoccnt}% \newcommand{\mymailtoaddress}{% - typography.with.latex@gmail.com% + dr.christian.hupfer@gmail.com% } \doparttoc @@ -2442,6 +2445,13 @@ write this documentation. \begin{itemize}[itemsep=15pt] +\item \CHDocFullVersion{1.8} + \begin{itemize} + \item Maintenance update due to updates to \CHDocPackage{expl3}. + + Changed from \verb!\c_one! to \verb!\c_one_int! and \verb!\c_zero! to \verb!\c_zero_int! + \end{itemize} + \item \CHDocFullVersion{1.7} \begin{itemize} \item Maintenance update due to updates to \CHDocPackage{expl3}. diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_driver_example.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_driver_example.pdf index 8a8d137b977..ddb1e0550a5 100644 Binary files a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_driver_example.pdf and b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_driver_example.pdf differ diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_driver_example.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_driver_example.tex index 6e4d5c6a0eb..bfac214ed84 100644 --- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_driver_example.tex +++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_driver_example.tex @@ -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) %% Driver file for xassoccnt.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2015 -- 2018 by Dr. Christian Hupfer +%% Copyright (c) 2015 -- 2020 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_example.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_example.pdf index 3f0e97538a5..a9c04268a13 100644 Binary files a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_example.pdf and b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_example.pdf differ diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_example.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_example.tex index cb17a1af17b..fb3755b9cef 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.7 (2018/12/28 -- 06:45:16) +%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30) %% Example file for xassoccnt.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2015 -- 2018 by Dr. Christian Hupfer +%% Copyright (c) 2015 -- 2020 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_getparentcounter_example.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_getparentcounter_example.pdf index 66ebc389db3..966f4d9917d 100644 Binary files a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_getparentcounter_example.pdf and b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_getparentcounter_example.pdf differ diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_getparentcounter_example.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_getparentcounter_example.tex index 43d54676086..6b1bf2d6718 100644 --- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_getparentcounter_example.tex +++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_getparentcounter_example.tex @@ -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) %% Example file for determing the parent counter of a counter and referring to it file for xassoccnt.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2017 -- 2018 by Dr. Christian Hupfer +%% Copyright (c) 2017 -- 2020 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_label_example.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_label_example.pdf index 87c463a2205..0a2d10633ff 100644 Binary files a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_label_example.pdf and b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_label_example.pdf differ diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_label_example.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_label_example.tex index 0fdaf74b221..dc07d862c82 100644 --- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_label_example.tex +++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_label_example.tex @@ -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) %% Example file the the usage of labels with associated counters file for xassoccnt.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2017 -- 2018 by Dr. Christian Hupfer +%% Copyright (c) 2017 -- 2020 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_parentcounterchain_example.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_parentcounterchain_example.pdf deleted file mode 100644 index 173cbb0c176..00000000000 Binary files a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_parentcounterchain_example.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_parentcounterchain_example.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_parentcounterchain_example.tex deleted file mode 100644 index be05d1921c8..00000000000 --- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_parentcounterchain_example.tex +++ /dev/null @@ -1,94 +0,0 @@ -%% LaTeX package xassoccnt - version 1.7 (2018/12/28 -- 06:45:16) -%% Example file for determing the parent counter chain of a counter file for xassoccnt.sty -%% -%% -%% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2017 -- 2018 by Dr. Christian Hupfer -%% ------------------------------------------------------------------------------------------- -%% -%% 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` -%% -%% - -\documentclass{book} -%\usepackage{mathtools} - -\usepackage[utf8]{inputenc} - - - -\usepackage[standardcounterformats=on]{xassoccnt} - - -\AddCounterFormats{H!\HexValue} - - -\setcounter{secnumdepth}{6} - -\GetAllResetLists - -%\CounterWithout{subparagraph}{paragraph} -\begin{document} - - \DeclareLanguageMappings{ngerman}{% - part;;Teil;;Teile;;Teil;;Teile, - chapter;;Kapitel;;, - section;;Abschnitt;;Abschnitte, - subsection;;Unterabschnitt;;Unterabschnitte;;, - subsubsection, - Absatz, - subsubparagraph;;Einrückung, - equation, - table, - footnote, - page, - figure;;%figure;;figures;;Figure;;Figures - } - - \ShowLanguageMappings{ngerman} - - -\xassingularname{ngerman}{part} - -\setcounter{chapter}{3} - - -%\CounterFormat[recursive]{subparagraph!n} - -\CounterFormat{subparagraph!H} - - - -\chapter{The chapter} - -\section{The section} - -\subsection{The subsection} - -\subsubsection{The subsubsection} - -\setcounter{paragraph}{2} -\setcounter{subsubsection}{7} -\setcounter{subsection}{5} -\setcounter{section}{2} - -\paragraph{The paragraph} - -\setcounter{subparagraph}{128} - -\subparagraph{A subparagraph} - - - -%\GetParentCounter{paragraph} - -\end{document} \ No newline at end of file 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 e23099aca47..59de023e183 100644 Binary files a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_periodiccounters_example.pdf and b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_periodiccounters_example.pdf differ 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 38c97eb304a..b42acc9ef96 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.7 (2018/12/28 -- 06:45:16) +%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30) %% Example file for periodic counters file for xassoccnt.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2016 -- 2018 by Dr. Christian Hupfer +%% Copyright (c) 2016 -- 2020 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% 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 65ec958997c..95b57ffccb0 100644 Binary files a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetlist_example.pdf and b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetlist_example.pdf differ 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 96843408a0d..83bca1e8e2b 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.7 (2018/12/28 -- 06:45:16) +%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30) %% Example file for reset list features file for xassoccnt.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2016 -- 2018 by Dr. Christian Hupfer +%% Copyright (c) 2016 -- 2020 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetloop_example.pdf b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetloop_example.pdf index d4e7d3c5401..acfc104ff21 100644 Binary files a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetloop_example.pdf and b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetloop_example.pdf differ diff --git a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetloop_example.tex b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetloop_example.tex index cf1438ff1f6..55c433ef118 100644 --- a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetloop_example.tex +++ b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_resetloop_example.tex @@ -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) %% Example file for looping through the reset list file for xassoccnt.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2017 -- 2018 by Dr. Christian Hupfer +%% Copyright (c) 2017 -- 2020 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% 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 d4418eafab9..ee242f21548 100644 Binary files a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_suspendedcounters_example.pdf and b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_suspendedcounters_example.pdf differ 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 7b972de3936..c8da874567e 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.7 (2018/12/28 -- 06:45:16) +%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30) %% Example file for suspended counters file for xassoccnt.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2016 -- 2018 by Dr. Christian Hupfer +%% Copyright (c) 2016 -- 2020 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% 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 87b83073d61..7790bed21be 100644 Binary files a/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_totalcounters_example.pdf and b/Master/texmf-dist/doc/latex/xassoccnt/xassoccnt_totalcounters_example.pdf differ 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 5d5a12b5db1..56c7443c3a3 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.7 (2018/12/28 -- 06:45:16) +%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30) %% Example file for total counters file for xassoccnt.sty %% %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2015 -- 2018 by Dr. Christian Hupfer +%% Copyright (c) 2015 -- 2020 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% 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 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 +%% Copyright (c) 2017 -- 2020 by Dr. Christian Hupfer %% ------------------------------------------------------------------------------------------- %% %% 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} } -- cgit v1.2.3