From fe7efeccec7bd54cac9d94e865baa75cad828542 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 20 Jul 2014 22:11:42 +0000 Subject: cntformats (20jul14) git-svn-id: svn://tug.org/texlive/trunk@34668 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/cntformats/README | 31 ++ .../doc/latex/cntformats/cntformats_en.pdf | Bin 0 -> 422953 bytes .../doc/latex/cntformats/cntformats_en.tex | 343 +++++++++++++++++++++ .../texmf-dist/tex/latex/cntformats/cntformats.sty | 273 ++++++++++++++++ Master/tlpkg/bin/tlpkg-ctan-check | 3 +- Master/tlpkg/tlpsrc/cntformats.tlpsrc | 0 Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc | 1 + 7 files changed, 650 insertions(+), 1 deletion(-) create mode 100644 Master/texmf-dist/doc/latex/cntformats/README create mode 100644 Master/texmf-dist/doc/latex/cntformats/cntformats_en.pdf create mode 100644 Master/texmf-dist/doc/latex/cntformats/cntformats_en.tex create mode 100644 Master/texmf-dist/tex/latex/cntformats/cntformats.sty create mode 100644 Master/tlpkg/tlpsrc/cntformats.tlpsrc (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/cntformats/README b/Master/texmf-dist/doc/latex/cntformats/README new file mode 100644 index 00000000000..66cb38c206b --- /dev/null +++ b/Master/texmf-dist/doc/latex/cntformats/README @@ -0,0 +1,31 @@ +-------------------------------------------------------------------------- +the CNTFORMATS package v0.7 2014/07/20 + + A different way to read counters. + +-------------------------------------------------------------------------- +Clemens Niederberger +Web: https://github.com/cgnieder/cntformats/ +E-Mail: contact@mychemistry.eu +-------------------------------------------------------------------------- +Copyright 2012-2014 Clemens Niederberger + +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 `maintained'. + +The Current Maintainer of this work is Clemens Niederberger. +-------------------------------------------------------------------------- +The cntformats package consists of the files + - cntformats.sty, cntformats_en.tex, cntformats_en.pdf + - README +-------------------------------------------------------------------------- +If you have any ideas, questions, suggestions or bugs to report, please +feel free to contact me. +-------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/cntformats/cntformats_en.pdf b/Master/texmf-dist/doc/latex/cntformats/cntformats_en.pdf new file mode 100644 index 00000000000..c9b2232d332 Binary files /dev/null and b/Master/texmf-dist/doc/latex/cntformats/cntformats_en.pdf differ diff --git a/Master/texmf-dist/doc/latex/cntformats/cntformats_en.tex b/Master/texmf-dist/doc/latex/cntformats/cntformats_en.tex new file mode 100644 index 00000000000..e59f7bc00e0 --- /dev/null +++ b/Master/texmf-dist/doc/latex/cntformats/cntformats_en.tex @@ -0,0 +1,343 @@ +% arara: pdflatex +% !arara: biber +% !arara: pdflatex +% arara: pdflatex +% -------------------------------------------------------------------------- +% the CNTFORMATS package +% +% A different way to read counters +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: https://github.com/cgnieder/cntformats/ +% E-Mail: contact@mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2012-2014 Clemens Niederberger +% +% 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 `maintained'. +% +% The Current Maintainer of this work is Clemens Niederberger. +% -------------------------------------------------------------------------- +% If you have any ideas, questions, suggestions or bugs to report, please +% feel free to contact me. +% -------------------------------------------------------------------------- +\documentclass[load-preamble+]{cnltx-doc} +\usepackage{cntformats} + +\setcnltx{ + package = {cntformats} , + authors = Clemens Niederberger , + email = {contact@mychemistry.eu} , + url = {https://github.com/cgnieder/cntformats/} , + info = {A different way to read counters} , + add-cmds = { + @cntfmts@parsed@pattern, AddCounterPattern, + eSaveCounterPattern, + NewCounterPattern, NewPatternFormat, + ReadCounterFrom, ReadCounterPattern, ReadCounterPatternFrom, + SaveCounterPattern + } , + add-silent-cmds = { + alphalph, + cs, + ExplSyntaxOff, ExplSyntaxOn, + int, + myoddnumber, + numexpr, ordinalnum, + relax, + somesetupcommand, + tmpa, tmpb, the + } +} + +\defbibheading{bibliography}[\bibname]{\addsec{#1}} + +\newcommand*\at{\cnltxat} + +\usepackage[biblatex]{embrac}[2012/06/29] + \ChangeEmph{[}[,.02em]{]}[.055em,-.08em] + \ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em] + +\usepackage{booktabs,array,ragged2e} +\usepackage{subcaption} + +% ---------------------------------------------------------------------------- +% example definitions that have to be done in the preamble: +\usepackage{alphalph} +\NewPatternFormat{aa}{\alphalph} +\usepackage{fmtcount} +\NewPatternFormat{o}{\ordinalnum} +\newcommand*\myoddnumber[1]{\the\numexpr2*(#1)-1\relax} +\NewPatternFormat{x}{\myoddnumber} +\NewCounterPattern{test}{t} + +\begin{document} + +\section{Motivation} +\cntformats\ provides a way to format counters with what I will call patterns. +This does not in any way effect the usual \LaTeXe\ way of treating counters +and does not use \cs*{the\meta{counter}} nor is it affected by the +redefinition of them. + +This package is aimed at package or class authors and probably not very useful +for document authors. + +When I first had the idea for this package the idea of what it does already +existed as part of the \pkg{exsheets}~\cite{bnd:exsheets} package. I can't +recall why I came up with the idea in the first place or why I originally +wanted a new syntax for formatting the \code{question} counter. I am also not +convinced any more that it is a good idea. Anyway, here we are. + +Until and including v0.6\changedversion{0.7} \cntformats{} used to be part of +the \pkg{exsheets} bundle. Since version 0.7 it is distributed as a package +of its own. + +\section{License and Requirements}\label{sec:license} +\license + +\cntformats\ requires the \needpackage{etoolbox} package~\cite{pkg:etoolbox} +and the \pkg*{cnltx-base}\footnote{\CTANurl{cnltx}} package~\cite{bnd:cnltx}. + +\section{Example} +A use case typically looks as follows: +\begin{example}[side-by-side] + \ReadCounterPattern{se.sse} +\end{example} +where the key \code{se} stands for the current value of the \code{section} +counter and \code{sse} for \code{subsection}, respectively. \code{se.sse} is +an example for what will be called \emph{pattern}. The keys for the counters +can have optional arguments that specify the format: +\begin{example}[side-by-side] + \stepcounter{subsection} + \ReadCounterPattern{se[A](sse[r])} +\end{example} +\code{A} stands for \cs*{Alph} and \code{r} for \cs*{roman}. A complete list +can be found in table~\ref{tab:predefined:formats} on +page~\pageref{tab:predefined:formats}. As you can see you can insert +arbitrary other tokens in a pattern that won't be changed. It is important to +notice, though, that the patterns are only replaced if they're \emph{not} +placed in a braced group! + +\begin{example}[side-by-side] + \ReadCounterPattern{{se[A](sse[r])}} +\end{example} + +I would imagine that the argument to \cs{ReadCounterPattern} is usually +supplied by a user setting an option \ldots +\begin{sourcecode} + \somesetupcommand{ + counter-format = se[A](sse[r]) + } +\end{sourcecode} +\ldots{} and then internally used by the corresponding package or class. + + +\section{Usage} +In the following description of the available commands the symbol +\textcolor{expandable}{\expandablesign} means that the command is expandable. + +In order to make counters known to \cntformats\ the following commands are used: +\begin{commands} + \command{AddCounterPattern}[\sarg\oarg{module}\marg{counter}\marg{pattern}] + This command will make the (existing) counter \meta{counter} known to + \cntformats\ and assign the pattern \meta{pattern} to it. + \command{NewCounterPattern}[\sarg\oarg{module}\marg{counter}\marg{pattern}] + This command will create a new counter \meta{counter}, make it known to + \cntformats\ and assign the pattern \meta{pattern} to it. + \command{ReadCounterFrom}[\oarg{module}\marg{counter}\marg{internal cmd}] + If you use one of the commands above with the starred version the number + for the pattern is \emph{not automatically fetched} from the internal + \cs*{c@\meta{counter}}. This can (and must) now be assigned with + \cs{ReadCounterFrom} where \meta{internal cmd} is the macro that holds + the number. +\end{commands} +The commands above can only be used in the document preamble. + +After the creation of these pattern markers one wants to be able to use them. +There are a number of macros that allow different aspects of usage. +\begin{commands} + \command{ReadCounterPattern}[\oarg{module}\marg{pattern}] + Reads, interprets and prints a pattern. + \expandable\command{\at cntfmts\at parsed\at pattern} + After \cs{ReadCounterPattern} has been used the current pattern + interpretation is stored in this macro. The \emph{interpretation} is + \emph{not} what is printed. See the examples below for details. + \command{ReadCounterPatternFrom}[\oarg{module}\marg{macro that holds + pattern}] + Reads, interprets and prints a pattern that's stored in a macro.\\ + Otherwise the same as \cs{ReadCounterPattern}. + \command{SaveCounterPattern}[\marg{cmd a}\marg{cmd b}\marg{pattern}] + Saves the \meta{pattern} in \meta{cmd a} and the interpreted pattern in + \meta{cmd b}. + \command{eSaveCounterPattern}[\oarg{module}\marg{cmd a}\marg{cmd + b}\marg{pattern}] + Saves the \meta{pattern} in \meta{cmd a} and the expanded pattern in + \meta{cmd b}. + \command{SaveCounterPatternFrom}[\oarg{module}\marg{cmd a}\marg{cmd + b}\marg{macro that holds pattern}] + Like \cs{SaveCounterPattern} but reads the pattern from a macro. + \command{eSaveCounterPatternFrom}[\oarg{module}\marg{cmd a}\marg{cmd + b}\marg{macro that holds pattern}] + Like \cs{eSaveCounterPattern} but reads the pattern from a macro. +\end{commands} + +The optional argument \meta{module} should be specific for a package, say, so +that different patterns for the \code{section} counter for example don't +interfer with each other. This means: \cs{ReadCounterPattern} and friends +\emph{only} read the patterns known to the specified module! If you leave the +argument the default module \code{cntfmts} is used. + +The \pkg{exsheets} package uses the commands with the module \code{exsheets}. +You can find the following lines in \pkg{exsheets}' code: +\begin{sourcecode} + \AddCounterPattern*[exsheets]{section}{se} + \ReadCounterFrom[exsheets]{section} \l__exsheets_counter_sec_int + \NewCounterPattern*[exsheets]{question}{qu} + \ReadCounterFrom[exsheets]{question} \l__exsheets_counter_qu_int +\end{sourcecode} + +Another example would be the \pkg{tasks} package~\cite{pkg:tasks}: +\begin{sourcecode} + \NewCounterPattern*[tasks]{task}{tsk} + \ReadCounterFrom[tasks]{task} \g__tasks_int +\end{sourcecode} + +In fact \pkg{exsheets} loads the \pkg{tasks} package and also does the +following +\begin{sourcecode} + \AddCounterPattern*[tasks]{question}{qu} + \ReadCounterFrom[tasks]{question}\l__exsheets_counter_qu_int +\end{sourcecode} +so \pkg{tasks} knows about the question counter and uses the same pattern as +\pkg{exsheets} does. + +Now let's see a short example that hopefully explains what the other macros +do: +\begin{example} + % preamble + % \NewCounterPattern{test}{t} + \setcounter{test}{11} + \ReadCounterPattern{t} + \ReadCounterPattern{t[a]} \\ + \ttfamily\makeatletter + \meaning\@cntfmts@parsed@pattern + + \bigskip + \SaveCounterPattern\tmpa\tmpb{t[a]} + \meaning\tmpa \\ + \meaning\tmpb + + \bigskip + \eSaveCounterPattern\tmpa\tmpb{t[a]} + \meaning\tmpa \\ + \meaning\tmpb +\end{example} +You can see that somehow an additional \cs*{@empty} found its way into the +interpreted pattern. This is due to the fact that reading optional arguments +expandably isn't easy and must have some safety net. In this case looking for +an optional argument is done by reading the token following the command as +argument. If there is no option then \cs*{@empty} is found so no other tokens +provided by users get read which might otherwise lead to strange +effects/outcome/errors\footnote{Imagine for example there would be \emph{no} + token following the command -- nasty error messages could follow.}. On the +other hand the grabbing of the next token can lead to spaces after the pattern +being ignored, see the next example: if there is no optional argument then the +next token is grabbed ignoring the spaces as is normal for a \TeX{} macro. +The next example demonstrates this. + +A word of caution: although I used a one-letter pattern in the above example I +would not recommend this. The pattern should consist of two or more +characters otherwise it might get inconvenient hiding the characters that you +\emph{don't} want replaced: +\begin{example} + \setcounter{test}{3} + Where is the first space: \ReadCounterPattern{t t[r] t}?\par + \ReadCounterPattern{every instance of the letter t{} is replaced} +\end{example} + +\section{Predefined and New Patterns and Format Keys} +\subsection{Predefined Patterns and Format Keys} +\cntformats\ predefines a number of pattern keys. These are listed in +table~\ref{tab:predefined:patterns}. + +\subsection{New Patterns and Format Keys} +Table~\ref{tab:predefined:formats} lists the predefined formats. If you want +you can add own formats. +\begin{commands} + \command{NewPatternFormat}[\marg{pattern}\marg{format}] + \meta{format} is a number presentation command like \cs*{@alph}, \ie, + it needs a mandatory argument that takes a number. It is used in + \meta{format} \emph{without} its argument. This command can only be used + in the preamble. +\end{commands} + +\begin{table} + \centering + \caption{Predefined Patterns and Format Keys.} + \addtocounter{table}{-1}% necessary fix for subcaption and KOMA + \begin{minipage}{.48\linewidth} + \centering + \subcaption{Predefined Patterns for the module \code{cntfmts}.} + \label{tab:predefined:patterns} + \begin{tabular}{>{\ttfamily}l>{\ttfamily}l} + \toprule + \normalfont\bfseries counter & \normalfont\bfseries pattern \\ + \midrule + chapter & ch \\ + section & se \\ + subsection & sse \\ + subsubsection & ssse \\ + paragraph & pg \\ + \bottomrule + \end{tabular} + \end{minipage} + \begin{minipage}{.48\linewidth} + \centering + \subcaption{Predefined Format Keys} + \label{tab:predefined:formats} + \begin{tabular}{>{\ttfamily}ll} + \toprule + \normalfont\bfseries key & \normalfont\bfseries format \\ + \midrule + 1 & \cs*{arabic} \\ + a & \cs*{alph} \\ + A & \cs*{Alph} \\ + r & \cs*{roman} \\ + R & \cs*{Roman} \\ + \bottomrule + \end{tabular} + \end{minipage} +\end{table} + +Here are now a few examples of possible new patterns. Suppose the following code +in the preamble: +\begin{sourcecode} + \usepackage{alphalph,fmtcount} + \newcommand*\myoddnumber[1]{\the\numexpr2*(#1)-1\relax} + + \NewPatternFormat{aa}{\alphalph} + \NewPatternFormat{o}{\ordinalnum} + \NewPatternFormat{x}{\myoddnumber} + + \newcounter{test} + \NewCounterPattern{test}{t} + \setcounter{test}{4} +\end{sourcecode} + +Then we can use the new pattern and the new formats as +follows:\setcounter{test}{4} +\begin{example} + \ReadCounterPattern{t[aa]} + \ReadCounterPattern{t[o]} + \ReadCounterPattern{t[x]} +\end{example} + +\end{document} diff --git a/Master/texmf-dist/tex/latex/cntformats/cntformats.sty b/Master/texmf-dist/tex/latex/cntformats/cntformats.sty new file mode 100644 index 00000000000..cd3e5eb08c7 --- /dev/null +++ b/Master/texmf-dist/tex/latex/cntformats/cntformats.sty @@ -0,0 +1,273 @@ +% -------------------------------------------------------------------------- +% the CNTFORMATS package +% +% A different way to read counters +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: https://github.com/cgnieder/cntformats/ +% E-Mail: contact@mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2012-2014 Clemens Niederberger +% +% 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 `maintained'. +% +% The Current Maintainer of this work is Clemens Niederberger. +% -------------------------------------------------------------------------- +% If you have any ideas, questions, suggestions or bugs to report, please +% feel free to contact me. +% -------------------------------------------------------------------------- +\def\@cntfmts@date{2014/07/20} +\def\@cntfmts@version{v0.7} + +\ProvidesPackage{cntformats}[% + \@cntfmts@date\space + \@cntfmts@version\space + A different way to read counters. (CN)] +\RequirePackage{etoolbox,cnltx-base} +% -------------------------------------------------------------------------- +% message handling +\newcommand*\@cntfmts@error@message{% + For details have a look at the `cntformats' manual.% +} + +\cnltx@create@generic@message{@cntfmts}{cntformats}{Error}{\@cntfmts@error@message} +\cnltx@create@generic@message{@cntfmts}{cntformats}{Warning}{} +\cnltx@create@generic@message{@cntfmts}{cntformats}{WarningNoLine}{} +\cnltx@create@generic@message{@cntfmts}{cntformats}{Info}{} + +\newrobustcmd*\@cntfmts@err@already@defined[1]{% + \@cntfmts@error{The counter `#1' already exists!}% +} +\newrobustcmd*\@cntfmts@err@unknown@counter[1]{% + \@cntfmts@error{The counter `#1' is undefined!}% +} +\newrobustcmd*\@cntfmts@err@pattern@defined[2]{% + \@cntfmts@error{The pattern `#2' for module `#1' is already defined!}% +} +\newrobustcmd*\@cntfmts@err@pattern@undefined[2]{% + \@cntfmts@error{The pattern `#2' for module `#1' is undefined!}% +} + +% ---------------------------------------------------------------------------- +% #1: module +% #2: counter +\newrobustcmd*\@cntfmts@def@counter@read[3]{% + \cnltx@expandargs(no)\csdef + {@#1@read@#3@counter}% + {\csname @#1@read@#2@counter\endcsname}% +} + +% create pattern for an existing counter: +% #1: module +% #2: counter +% #3: id +\newrobustcmd*\@cntfmts@add@counter@pattern[3][cntfmts]{% + \ifcsdef{c@#2} + {}{\@cntfmts@err@unknown@counter{#2}}% + \ifcsdef{@#1@#2@counter} + {\@cntfmts@err@pattern@defined{#1}{#2}} + {\csdef{@#1@#2@counter}{}}% + \listcsadd{@#1@counter@ids}{#3}% + \@cntfmts@def@counter@read{#1}{#2}{#3}% +} + +\newrobustcmd*\@cntfmts@add@counter@pattern@nostar[3][cntfmts]{% + \@cntfmts@add@counter@pattern[#1]{#2}{#3}% + \cnltx@expandargs(nno)\@cntfmts@create@read@counter{#1}{#2}{\csname c@#2\endcsname}% +} + +\newrobustcmd*\AddCounterPattern{% + \@ifstar + {\@cntfmts@add@counter@pattern} + {\@cntfmts@add@counter@pattern@nostar}% +} +\@onlypreamble\AddCounterPattern + +% create pattern for a new counter +% #1: counter +% #2: id +\newrobustcmd*\@cntfmts@new@counter@pattern[3][cntfmts]{% + \ifcsdef{the#2} + {\@cntfmts@err@counter@defined{#2}}{}% + \newcounter{#2}% + \listcsadd{@#1@counter@ids}{#3}% + \@cntfmts@def@counter@read{#1}{#2}{#3}% + \csdef{@#1@#2@counter}{} +} + +\newrobustcmd*\@cntfmts@new@counter@pattern@nostar[3][cntfmts]{% + \@cntfmts@new@counter@pattern[#1]{#2}{#3}% + \cnltx@expandargs(nno)\@cntfmts@create@read@counter{#1}{#2}{\csname c@#2\endcsname}% +} + +\newrobustcmd*\NewCounterPattern{% + \@ifstar + {\@cntfmts@new@counter@pattern} + {\@cntfmts@new@counter@pattern@nostar}% +} +\@onlypreamble\NewCounterPattern + +% renew pattern: +\newrobustcmd*\@cntfmts@renew@counter@pattern[3][cntfmts]{% + \ifcsdef{the#2} + {}{\@cntfmts@err@unknown@counter{#2}}% + \ifcsdef{@#1@#2@counter}{} + {\@cntfmts@err@pattern@undefined{#1}{#2}}% + \ifinlistcs{@#1@counter@ids}{#3} + {}{\listcsadd{@#1@counter@ids}{#3}}% + \@cntfmts@def@counter@read{#1}{#2}{#3}% +} + +\newrobustcmd*\@cntfmts@renew@counter@pattern@nostar[3][cntfmts]{% + \@cntfmts@renew@counter@pattern[#1]{#2}{#3}% + \cnltx@expandargs(nno)\@cntfmts@create@read@counter{#1}{#2}{\csname c@#2\endcsname}% +} + +\newrobustcmd\RenewCounterPattern{% + \@ifstar + {\@cntfmts@renew@counter@pattern} + {\@cntfmts@renew@counter@pattern@nostar}% +} +\@onlypreamble\RenewCounterPattern + +% ---------------------------------------------------------------------------- +% assign a different internal command to than \c@ +% can/must be used after a call from \AddCounterPattern* or +% \NewCounterPattern* +% #1: module +% #2: counter +% #3: internal command +\newrobustcmd*\@cntfmts@create@read@counter[3]{% + \expandafter\newexpandablecmd + \expandafter*\csname @#1@read@#2@counter\endcsname[1][]{% + \ifblank{##1} + {\@arabic{#3}} + {\csuse{@cntfmts@counter@type@##1}{#3}}% + }% +} + +\newrobustcmd*\ReadCounterFrom[3][cntfmts]{% + \@cntfmts@create@read@counter{#1}{#2}{#3}% +} + +% ---------------------------------------------------------------------------- +% pattern formats +% #1: key +% #2: number presentation command like \@alph +\newrobustcmd*\@cntfmts@new@pattern@format[2]{% + \csdef{@cntfmts@counter@type@#1}{#2}% +} + +\newrobustcmd*\NewPatternFormat[2]{% + \@cntfmts@new@pattern@format{#1}{#2}% +} +\@onlypreamble\NewPatternFormat + +% ---------------------------------------------------------------------------- +% interpret and print pattern: +% #1: module +% #2: list +% #3: pattern +\newrobustcmd*\@cntfmts@read@counter@pattern[3]{% + \def\@cntfmts@parsed@pattern{#3\@empty}% + \forlistcsloop{\@cntfmts@replace@pattern{#1}}{#2}% +} +% #1: module +% #2: pattern-key +\newrobustcmd*\@cntfmts@replace@pattern[2]{% + \cnltx@replace@all\@cntfmts@parsed@pattern + {#2}{\csuse{@#1@read@#2@counter}}% +} + +\newrobustcmd*\ReadCounterPattern[2][cntfmts]{% + \@cntfmts@read@counter@pattern{#1}{@#1@counter@ids}{#2}\@cntfmts@parsed@pattern +} + +\newrobustcmd*\ReadCounterPatternFrom[2][cntfmts]{% + \cnltx@expandargs(nno)\@cntfmts@read@counter@pattern{#1}{@#1@counter@ids}{#2}% + \@cntfmts@parsed@pattern +} + +% #1: save pattern in +% #2: save interpretation in +% #3: pattern +% #4: module +\newrobustcmd*\@cntfmts@save@counter@pattern[4]{% + \@cntfmts@read@counter@pattern{#4}{@#4@counter@ids}{#3}% + \let#2\@cntfmts@parsed@pattern + \def#1{#3}% +} + +\newrobustcmd*\@cntfmts@esave@counter@pattern[4]{% + \@cntfmts@read@counter@pattern{#4}{@#4@counter@ids}{#3}% + \edef#2{\@cntfmts@parsed@pattern}% + \def#1{#3}% +} + +\newrobustcmd*\SaveCounterPattern[4][cntfmts]{% + \@cntfmts@save@counter@pattern{#2}{#3}{#4}{#1}% +} + +\newrobustcmd*\SaveCounterPatternFrom[4][cntfmts]{% + \cnltx@expandargs(nno)\@cntfmts@save@counter@pattern{#2}{#3}{#4}{#1}% +} + +\newrobustcmd*\eSaveCounterPattern[4][cntfmts]{% + \@cntfmts@esave@counter@pattern{#2}{#3}{#4}{#1}% +} + +\newrobustcmd*\eSaveCounterPatternFrom[4][cntfmts]{% + \cnltx@expandargs(nno)\@cntfmts@esave@counter@pattern{#2}{#3}{#4}{#1}% +} + +% ---------------------------------------------------------------------------- +% predefined formats and pattern +\NewPatternFormat{a}{\@alph} +\NewPatternFormat{A}{\@Alph} +\NewPatternFormat{1}{\@arabic} +\NewPatternFormat{r}{\@roman} +\NewPatternFormat{R}{\@Roman} + +\ifdef\c@paragraph + {\AddCounterPattern{paragraph}{pg}}{} +\ifdef\c@subsubsection + {\AddCounterPattern{subsubsection}{ssse}}{} +\ifdef\c@subsection + {\AddCounterPattern{subsection}{sse}}{} +\ifdef\c@section + {\AddCounterPattern{section}{se}}{} +\ifdef\c@chapter + {\AddCounterPattern{chapter}{ch}}{} + +\endinput + +% HISTORY: +2012/09/30 v0.2beta - first version (as part of the `exsheets' bundle) +2012/11/08 v0.4 - stepped number with `exsheets' until now; next stepping + won't synchronize but will step to whatever deems + appropriate +2012/04/23 v0.5 - changed tests for heading commands to test explicitly for + the associated counters + - change test for counter in \@cntfmts@add@counter@pattern + from \the to \c@ + - rename tokenlist test macros to use cntformats' + namespace +2013/10/11 v0.6 - use my `cnltx-base' package for the programming tools it + provides; this allows to get rid of the artefacts in the + expanded patterns +2014/07/20 v0.7 - remove package from the `exsheets' bundle and distribute + it as package of its own + - robustify non-expandably commands that weren't defined + robust, yet + - replace \def with \newcommand or \newrobustcmd where + possible + diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index dab3d446f4c..a411e739374 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -124,7 +124,8 @@ my @TLP_working = qw( clearsans clefval cleveref clipboard clock clrscode cm-lgc cm-super cm-unicode cmap cmarrows cmbright cmcyr - cmdstring cmdtrack cmextra cmll cmpica cmpj cmsd cmtiup cnbwp cnltx + cmdstring cmdtrack cmextra cmll cmpica cmpj cmsd cmtiup + cnbwp cnltx cntformats codedoc codepage codesection codicefiscaleitaliano collcell collectbox collref colordoc colorinfo colorsep colortab colortbl colorwav colorweb colourchange diff --git a/Master/tlpkg/tlpsrc/cntformats.tlpsrc b/Master/tlpkg/tlpsrc/cntformats.tlpsrc new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc index 063e1faedf6..8702341f8cc 100644 --- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc @@ -128,6 +128,7 @@ depend cmdstring depend cmdtrack depend cmsd depend cnltx +depend cntformats depend codedoc depend codepage depend codesection -- cgit v1.2.3