diff options
Diffstat (limited to 'macros/latex')
53 files changed, 1859 insertions, 129 deletions
diff --git a/macros/latex/contrib/colorist/README.md b/macros/latex/contrib/colorist/README.md index c72a30f9fd..432754821b 100644 --- a/macros/latex/contrib/colorist/README.md +++ b/macros/latex/contrib/colorist/README.md @@ -49,12 +49,12 @@ latex colorist-doc.ins Compared with usual document classes, it has the following features: -- Several carefully designed styles -- Native multi-language support: Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish - > In particular, for simplified Chinese, traditional Chinese and Japanese, the fonts of the corresponding glyphs can be automatically switched -- Ready-to-use theorem-like environments, with clever referencing support -- Support both the standard and the AMS writing fashion -- ... and so much more... +- Several carefully designed styles. +- Native multilingual support: Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish. + > In particular, for simplified Chinese, traditional Chinese and Japanese, the fonts of the corresponding glyphs can be automatically switched. +- Ready-to-use theorem-type environments, with clever referencing supported. +- Support both the standard and the AMS writing fashion. +- ... and much more... # License diff --git a/macros/latex/contrib/colorist/colorart.cls b/macros/latex/contrib/colorist/colorart.cls index 278cf0f335..4153a79860 100644 --- a/macros/latex/contrib/colorist/colorart.cls +++ b/macros/latex/contrib/colorist/colorart.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {colorart} - {2023/07/14} {} + {2023/09/26} {} {A colorful article style} \tl_const:Nn \l__colorclass_base_class_tl { article } diff --git a/macros/latex/contrib/colorist/colorbook.cls b/macros/latex/contrib/colorist/colorbook.cls index 1c39ab987f..9a27ceb896 100644 --- a/macros/latex/contrib/colorist/colorbook.cls +++ b/macros/latex/contrib/colorist/colorbook.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {colorbook} - {2023/07/14} {} + {2023/09/26} {} {A colorful book style} \tl_const:Nn \l__colorclass_base_class_tl { book } diff --git a/macros/latex/contrib/colorist/colorist-fancy.sty b/macros/latex/contrib/colorist/colorist-fancy.sty index 1fddb04d17..5323c9b881 100644 --- a/macros/latex/contrib/colorist/colorist-fancy.sty +++ b/macros/latex/contrib/colorist/colorist-fancy.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {colorist-fancy} - {2023/07/14} {} + {2023/09/26} {} {The fancy style of colorist} \IfPackageLoadedTF { colorist } {} @@ -498,17 +498,21 @@ \setlist{noitemsep, topsep=.33\topsep-.5\parskip} \setlist[enumerate]{labelsep=*, leftmargin=*} \setlist[enumerate,1]{label = \normalfont\arabic*$\mskip-.5mu\big)$, - ref = \normalfont\color{.!45!paper}\arabic*$\mskip-.5mu\big)$} -\setlist[enumerate,2]{label = \normalfont\emph{\roman*}$\mskip-.5mu\big)$, - ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman*}$\mskip-.5mu\big)$} + ref = \normalfont\color{.!45!paper}\arabic*$\mskip-.5mu\big)$, + leftmargin= \l__colorist_item_indentation_dim + \maxof{\parindent}{1.5em} } + % labelindent= \l__colorist_item_indentation_dim } +\setlist[enumerate,2]{label = \normalfont\roman*$\mskip-.5mu\big)$, + ref = \normalfont\color{.!45!paper}\arabic{enumi}.\roman*$\mskip-.5mu\big)$} \setlist[enumerate,3]{label = \normalfont\emph{\alph*}$\mskip-.5mu\big)$, - ref = \normalfont\color{.!45!paper}\arabic{enumi}.\emph{\roman{enumii}}.\emph{\alph*}$\mskip-.5mu\big)$} -\setlist[description]{font=\normalfont\colorist_bfseries:} + ref = \normalfont\color{.!45!paper}\arabic{enumi}.\roman{enumii}.\emph{\alph*}$\mskip-.5mu\big)$} + +\setlist[description]{font=\normalfont\colorist_bfseries: , + labelindent= \l__colorist_item_indentation_dim } \renewlist{itemize}{itemize}{10} \setlist[itemize]{leftmargin=*,label=\textcolor{.!27!paper}{$\cdot$}} -\AddLanguageSetting { \setlist[itemize,1]{label=\textcolor{.!27!paper}{$\bullet$},leftmargin=\maxof{\parindent}{1.5em}} } -\AddLanguageSetting [french] { \setlist[itemize,1]{label=\textcolor{.!39!paper}{\rule[.2\baselineskip]{.8em}{.75pt}},leftmargin=\maxof{\parindent}{1.5em}} } +\AddLanguageSetting { \setlist[itemize,1]{label=\textcolor{.!27!paper}{$\bullet$},leftmargin= \l__colorist_item_indentation_dim + \maxof{\parindent}{1.5em}} } +\AddLanguageSetting [french] { \setlist[itemize,1]{label=\textcolor{.!39!paper}{\rule[.2\baselineskip]{.8em}{.75pt}},leftmargin= \l__colorist_item_indentation_dim + \maxof{\parindent}{1.5em} } } \setlist[itemize,2]{label=\textcolor{.!27!paper}{\rule[.2\baselineskip]{.55em}{.75pt}}} \setlist[itemize,3]{label=\textcolor{.!27!paper}{$\circ$}} \setlist[itemize,4]{label=\textcolor{.!27!paper}{$\ast$}} @@ -709,6 +713,17 @@ heading_suffix "}\n" {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}} }}\hbox{\strut}\vspace{0pt}}} } + \newtheoremstyle{simple-var} + {}{} + { \bool_if:NTF \l__colorist_emphasis_theorem_bool { \itshape } { \normalfont } }{} + {\normalfont}{} + {0pt} + { + \rlap{\vbox{\hbox{\parbox{\linewidth}{ + {\thmname{#1}\thmnumber{\nobreakspace #2}} + {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}} + }}\hbox{\strut}\vspace{0pt}}} + } } { \newtheoremstyle{simple} @@ -718,6 +733,13 @@ heading_suffix "}\n" {0pt} {{\thmname{#1}\nobreakspace\thmnumber{#2}} {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace} + \newtheoremstyle{simple-var} + {}{} + { \bool_if:NTF \l__colorist_emphasis_theorem_bool { \itshape } { \normalfont } }{} + {\normalfont}{} + {0pt} + {{\thmname{#1}\nobreakspace\thmnumber{#2}} + {\color{main-text!50!paper}\thmnote{\hspace{.4em}$($#3$)$}}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace} } \newcommand{\customqedsymbol}{ @@ -737,10 +759,28 @@ heading_suffix "}\n" \thmnote{\normalfont\sffamily\color{main-text}\nobreakspace(#3)} }}\hbox{\strut}\vspace{0pt}}} } + \newtheoremstyle{basic-var} + {}{} + { \bool_if:NTF \l__colorist_emphasis_theorem_bool { \itshape } { \normalfont } }{} + {}{} + {0pt} + { + \rlap{\vbox{\hbox{\parbox{\linewidth}{ + {\thmname{#1}\nobreakspace\thmnumber{\textup{#2}}} + \thmnote{\normalfont\sffamily\color{main-text}\nobreakspace(#3)} + }}\hbox{\strut}\vspace{0pt}}} + } } { \newtheoremstyle{basic} - {0pt}{0pt}{\normalfont}{0pt} + {0pt}{0pt} + {\normalfont}{0pt} + {}{\;}{0.25em} + {{\thmname{#1}\nobreakspace\thmnumber{\textup{#2}}} + \thmnote{\normalfont\sffamily\color{main-text}\nobreakspace(#3)}} + \newtheoremstyle{basic-var} + {0pt}{0pt} + { \bool_if:NTF \l__colorist_emphasis_theorem_bool { \itshape } { \normalfont } }{0pt} {}{\;}{0.25em} {{\thmname{#1}\nobreakspace\thmnumber{\textup{#2}}} \thmnote{\normalfont\sffamily\color{main-text}\nobreakspace(#3)}} @@ -799,6 +839,7 @@ heading_suffix "}\n" theorem style = { , remark = emphasis , observation = emphasis + , theorem = basic-var, lemma = basic-var, proposition = basic-var, corollary = basic-var, property = basic-var, axiom = basic-var, construction = basic-var, theorem-with-name = basic-var } } { projlib-theorem } diff --git a/macros/latex/contrib/colorist/colorist.sty b/macros/latex/contrib/colorist/colorist.sty index b750f4d1ef..d9019557c2 100644 --- a/macros/latex/contrib/colorist/colorist.sty +++ b/macros/latex/contrib/colorist/colorist.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {colorist} - {2023/07/14} {} + {2023/09/26} {} {A colorful style for articles and books} \keys_define:nn { colorist } @@ -56,6 +56,25 @@ , runin .bool_set:N = \l__colorist_runin_bool , runin .initial:n = { false } + , indent-items .dim_set:N = \l__colorist_item_indentation_dim + , indent-items .initial:n = { 0pt } + , indent-items .default:n = { \parindent } + , indent~items .dim_set:N = \l__colorist_item_indentation_dim + , indent~items .default:n = { \parindent } + , indent items .dim_set:N = \l__colorist_item_indentation_dim + , indent items .default:n = { \parindent } + , indent-lists .dim_set:N = \l__colorist_item_indentation_dim + , indent-lists .default:n = { \parindent } + , indent~lists .dim_set:N = \l__colorist_item_indentation_dim + , indent~lists .default:n = { \parindent } + , indent lists .dim_set:N = \l__colorist_item_indentation_dim + , indent lists .default:n = { \parindent } + + , emphasis-theorems .bool_set:N = \l__colorist_emphasis_theorem_bool + , emphasis-theorems .initial:n = { false } + , emphasis~theorems .bool_set:N = \l__colorist_emphasis_theorem_bool + , emphasis theorems .bool_set:N = \l__colorist_emphasis_theorem_bool + , theorem-in-new-line .bool_set:N = \l__colorist_theorem_in_new_line_bool , theorem-in-new-line .initial:n = { false } , theorem~in~new~line .bool_set:N = \l__colorist_theorem_in_new_line_bool diff --git a/macros/latex/contrib/minimalist/README.md b/macros/latex/contrib/minimalist/README.md index 06fa31ae8e..2d12534ec5 100644 --- a/macros/latex/contrib/minimalist/README.md +++ b/macros/latex/contrib/minimalist/README.md @@ -54,12 +54,12 @@ latex minimalist-doc.ins Compared with usual document classes, it has the following features: -- Several carefully designed styles -- Native multi-language support: Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish - > In particular, for simplified Chinese, traditional Chinese and Japanese, the fonts of the corresponding glyphs can be automatically switched -- Ready-to-use theorem-like environments, with clever referencing support -- Support both the standard and the AMS writing fashion -- ... and so much more... +- Several carefully designed styles. +- Native multilingual support: Chinese (simplified and traditional), English, French, German, Italian, Japanese, Portuguese (European and Brazilian), Russian and Spanish. + > In particular, for simplified Chinese, traditional Chinese and Japanese, the fonts of the corresponding glyphs can be automatically switched. +- Ready-to-use theorem-type environments, with clever referencing supported. +- Support both the standard and the AMS writing fashion. +- ... and much more... # License diff --git a/macros/latex/contrib/minimalist/minimalist-classical.sty b/macros/latex/contrib/minimalist/minimalist-classical.sty index 22304137f1..5c935bcbdc 100644 --- a/macros/latex/contrib/minimalist/minimalist-classical.sty +++ b/macros/latex/contrib/minimalist/minimalist-classical.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist-classical} - {2023/09/25} {} + {2023/09/26} {} {The "classical" style of minimalist} \IfPackageLoadedTF { minimalist } {} diff --git a/macros/latex/contrib/minimalist/minimalist-flow.sty b/macros/latex/contrib/minimalist/minimalist-flow.sty index 5a3a6d34ed..3f1c271515 100644 --- a/macros/latex/contrib/minimalist/minimalist-flow.sty +++ b/macros/latex/contrib/minimalist/minimalist-flow.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist-flow} - {2023/09/25} {} + {2023/09/26} {} {The "flow" style of minimalist} \IfPackageLoadedTF { minimalist } {} diff --git a/macros/latex/contrib/minimalist/minimalist-plain.sty b/macros/latex/contrib/minimalist/minimalist-plain.sty index e13c1a202b..94a7920a63 100644 --- a/macros/latex/contrib/minimalist/minimalist-plain.sty +++ b/macros/latex/contrib/minimalist/minimalist-plain.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist-plain} - {2023/09/25} {} + {2023/09/26} {} {The "plain" style of minimalist} \IfPackageLoadedTF { minimalist } {} diff --git a/macros/latex/contrib/minimalist/minimalist-stream.sty b/macros/latex/contrib/minimalist/minimalist-stream.sty index 6cd01bde45..958e96e75c 100644 --- a/macros/latex/contrib/minimalist/minimalist-stream.sty +++ b/macros/latex/contrib/minimalist/minimalist-stream.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist-stream} - {2023/09/25} {} + {2023/09/26} {} {The "stream" style of minimalist} \IfPackageLoadedTF { minimalist } {} diff --git a/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty index c970e8b701..81d7e8095c 100644 --- a/macros/latex/contrib/minimalist/minimalist.sty +++ b/macros/latex/contrib/minimalist/minimalist.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage {minimalist} - {2023/09/25} {} + {2023/09/26} {} {A simple and clear style for articles and books} \keys_define:nn { minimalist } diff --git a/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls index 1d58f80e46..e6257793f0 100644 --- a/macros/latex/contrib/minimalist/minimart.cls +++ b/macros/latex/contrib/minimalist/minimart.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {minimart} - {2023/09/25} {} + {2023/09/26} {} {A simple and clear article style} \tl_const:Nn \l__minimclass_base_class_tl { article } diff --git a/macros/latex/contrib/minimalist/minimbook.cls b/macros/latex/contrib/minimalist/minimbook.cls index ca98fb5e38..724b7029b6 100644 --- a/macros/latex/contrib/minimalist/minimbook.cls +++ b/macros/latex/contrib/minimalist/minimbook.cls @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {minimbook} - {2023/09/25} {} + {2023/09/26} {} {A simple and clear book style} \tl_const:Nn \l__minimclass_base_class_tl { book } diff --git a/macros/latex/contrib/non-decimal-units/README.md b/macros/latex/contrib/non-decimal-units/README.md new file mode 100644 index 0000000000..16bb099f73 --- /dev/null +++ b/macros/latex/contrib/non-decimal-units/README.md @@ -0,0 +1,13 @@ +Non-decimal unit macros for LaTeX +================================= + +Macros for displaying and manipulating historical non-decimal units. + +See [non-decimal-units.pdf](docs/non-decimal-units.pdf) for the documentation. + +Contents last updated 2023-09-26. + +<!-- Package available via CTAN at https://www.ctan.org/pkg/non-decimal-units --> + +License: CC-BY-SA 4.0 +Author: Mikkel Eide Eriksen <mikkel.eriksen@gmail.com> diff --git a/macros/latex/contrib/non-decimal-units/docs/non-decimal-units.pdf b/macros/latex/contrib/non-decimal-units/docs/non-decimal-units.pdf Binary files differnew file mode 100644 index 0000000000..309a4651d8 --- /dev/null +++ b/macros/latex/contrib/non-decimal-units/docs/non-decimal-units.pdf diff --git a/macros/latex/contrib/non-decimal-units/docs/non-decimal-units.tex b/macros/latex/contrib/non-decimal-units/docs/non-decimal-units.tex new file mode 100644 index 0000000000..06a83532fb --- /dev/null +++ b/macros/latex/contrib/non-decimal-units/docs/non-decimal-units.tex @@ -0,0 +1,584 @@ +% !TEX TS-program = LuaLaTeX-shell-escape +\documentclass{article} + +\usepackage{non-decimal-units.preamble} + +\title{Non-Decimal Units for \LaTeX} +\author{Mikkel Eide Eriksen\\\href{mailto:mikkel.eriksen@gmail.com}{\texttt{mikkel.eriksen@gmail.com}}} + +\nduset{ + set aligned for environment=tabular, + aliases/danish rigsdaler, + restrict segment depth=2, +} + +\begin{document} + +\maketitle + +\section{Preface} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +Many historical unit systems were non-decimal. For example, the Danish rigsdaler\footnote{\url{https://en.wikipedia.org/wiki/Danish_rigsdaler}} --- where 1 \nduName{danish rigsdaler}{0} consists of \nduFactor{danish rigsdaler}{0} \nduName{danish rigsdaler}{1}, each again consisting of \nduFactor{danish rigsdaler}{1} \nduName{danish rigsdaler}{2} for a total of 96 \nduName{danish rigsdaler}{2} or per \nduName{danish rigsdaler}{0} --- was used from 1625 to 1875, when currency was decimalised to the current system of 1 krone = 100 øre. + +% https://en.wikipedia.org/wiki/Non-decimal_currency + +Units for such measures as length, area, weight, and so on were also often non-decimal, and in fact remain so in the few places of the world that have not made the change to the metric system. + +The non-decimal numbers were chosen due to their larger number of division factors, which simplified mental arithmetic --- eg. when sharing an amount of money or dividing goods. + +This package enables creation and configuration of such units to facilitate their presentation in textual and tabular contexts, as well as simple arithmetic. + +In order to do this, values are divided into \emph{segments}, which are separated by decimal points: for example, the historical Danish monetary value \nduValue{danish rigsdaler}{1.2.3} is entered as \texttt{1.2.3}, which the code then formats appropriately. + +Issues can be reported at \url{https://github.com/mikkelee/latex-units/issues} but keep in mind I am not very experienced with \LaTeX ;) + +\clearpage +\section{Configuration} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +The package is configured in the following manner: + +\begin{docCommand} + {usepackage} + {\oarg{options}\brackets{non-decimal-units}} + +Where \meta{options} may contain one or more of the following unit systems. See \cpageref{units:included} for details. + +\begin{description} +\item[british] Currencies +\item[danish] Currencies and areas +\item[german] Currencies +\end{description} + +Alternately, one may configure new units via \refCom{nduNewUnit}. + +\end{docCommand} + +\begin{docCommand} + {nduset} + {\marg{options}} + + Can be used to set options globally (in the preamble) or locally (in a group). See further documentation for possible keys/values. + +\end{docCommand} + +\clearpage +\section{Usage} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\subsection{Formatting Values} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +The central macro is \docAuxCommand*{nduValue}. It formats values for display and is configurable in a number of ways. + +\begin{docCommand} + {nduValue} + {\marg{unit name}\oarg{options}\marg{value}} + +Formats \meta{value} according to the setup configured for the \meta{unit name}, as well as any provided \meta{options}. The number of decimal points and the values between them determine how many and which segments are displayed. + +Empty segments are skipped, unless the \refKey{replace nil with} key is set. + +\begin{dispExample*}{ + title=Example usage: \docAuxCommand*{nduValue} macro +} +\nduValue{danish rigsdaler}{1.2.3}\\ +\nduValue{danish rigsdaler}{1..}\\ +\nduValue{danish rigsdaler}{.2.}\\ +\nduValue{danish rigsdaler}{..3}\\ +\end{dispExample*} +\end{docCommand} + +\clearpage +\subsubsection{Options} + +\begin{docKeys}[ + doc name = show, + ]{ + { + doc parameter = {=values}, + }, + { + doc parameter = {=values and symbols}, + doc description = initially \texttt{values and symbols}, + }, + { + doc parameter = {=symbols}, + }, + } + +Changes which information is included in the expansion. + +Because only those segments with a value will be included, \docAuxKey*{show}=\docValue*{symbols} can be used to list the segment units (though if only one or two is needed, it may be preferable to use \refCom{nduSymbol}). + +\begin{dispExample} +\nduValue{danish hartkorn} + [show=symbols] + {0.0.0.0.0} + +\nduValue{danish hartkorn} + [show=symbols] + {0.0...} +\end{dispExample} +\end{docKeys} + +See also \cref{units:new} for further discussion on possible options. + +\clearpage +\begin{docKeys} + [] + { + { + doc name = replace nil with, + doc parameter = {=\meta{...}}, + doc description = {no default, initially empty}, + }, + { + doc name = treat zero as nil, + doc description = {initially not set}, + }, + } + +The key \docAuxKey*{replace nil with} replaces nil (empty) segments with a custom string. + +The key \docAuxKey*{treat zero as nil} replaces 0 with nothing, which in turn means that setting both will replace both zero and nil with the custom string. + +These keys also apply in non-tabular contexts, but are probably most useful here. + +\begin{dispExample*}{ + title=Example usage: \docAuxKey*{replace nil with} key +} +\begingroup +\nduset{ + treat zero as nil, + replace nil with=---, +} +\begin{tabular}{r r} + \toprule + & \nduHeader{danish rigsdaler} \\ + \midrule + a & \nduValue{danish rigsdaler}{1.2.3} \\ + b & \nduValue{danish rigsdaler}{100.0.0} \\ + c & \nduValue{danish rigsdaler}{.1.} \\ + \bottomrule +\end{tabular} +\endgroup +\end{dispExample*} +\end{docKeys} + + +\clearpage +\subsection{Tabular Data} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +In order to align values in a tabular context, the \docAuxKey*{aligned} key causes \docAuxCommand{nduValue} to wrap each segment in a cell of equal width, using \docAuxCommand*{makebox}. + +Additionally, the \docAuxCommand*{nduHeader} macro provides a convenient header showing the unit symbols. + +All segments will be included in the headers and cells, whether they contain a value or not. If no value is provided for the segment, and no nil replacement is specified with the \refKey{replace nil with} key, the cell will be empty. + +\begin{docCommand} + {nduHeader} + {\marg{unit name}\oarg{options}} + Formats the unit symbols in boxes suitable for a header. See \cpageref{units:new} for configuration of symbols. +\end{docCommand} + +\clearpage +\subsubsection{Options} + +\begin{docKeys} + [] + { + { + doc name = aligned, + doc description = {initially not set}, + }, + { + doc name = set aligned for environment, + doc description = {initially not set}, + }, + } + + Setting \docAuxKey*{aligned} will format the presently displayed header in aligned boxes, desirable in tabular contexts. + + In this document, the \docAuxKey*{set aligned for environment} key has been set for \texttt{tabular}, which means that all values in the tables are automatically aligned. It can be set multiple times, once for each required environment. + +\begin{dispExample*}{ + title=Example usage: \docAuxCommand*{nduHeader} and \docAuxCommand*{nduValue} macros with \docAuxKey*{aligned} key. +} +\begingroup +\begin{tabular}{r r} + \toprule + & \nduHeader{danish rigsdaler} \\ + \midrule + a & \nduValue{danish rigsdaler}{1.2.3} \\ + b & \nduValue{danish rigsdaler}{100..} \\ + c & \nduValue{danish rigsdaler}{.1.} \\ + \bottomrule +\end{tabular} +\endgroup +\end{dispExample*} + +\end{docKeys} + +\begin{docKey} + {cell width} + {=\meta{length}} + {initially \texttt{5em}} + +Changes the width of each segment. + +\begin{dispExample*}{ + title=Example usage: \docAuxKey*{cell width} key +} +\begingroup +\nduset{ + cell width=3em, +} +\begin{tabular}{r r} + \toprule + & \nduHeader{danish rigsdaler} \\ + \midrule + a & \nduValue{danish rigsdaler}{1.2.3} \\ + b & \nduValue{danish rigsdaler}{100..} \\ + c & \nduValue{danish rigsdaler}{.1.} \\ + \bottomrule +\end{tabular} +\endgroup +\end{dispExample*} +\end{docKey} + +\clearpage +\subsection{Arithmetical Operations} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +Basic arithmetic functions can be used to build a result for display. Internally, this is done by converting the value to a representation, which is the total number of the smallest usable unit, eg. \nduValue{danish rigsdaler}{1.2.3} is 131 \nduName{danish rigsdaler}{2}. + +Results can be gathered in two ways, either manually via the \docAuxCommand*{nduMath} macro, or automatically via the \docAuxKey*{add to variable} and \docAuxKey*{subtract from variable} keys, the latter being especially suitable in tabular contexts. + +\begin{docCommands}[]{ + { + doc name = nduMath, + doc parameter = \marg{unit name}\oarg{options}\marg{variable}\marg{operator}\marg{value} + }, + { + doc name = nduResult, + doc parameter = \marg{unit name}\oarg{options}\marg{variable} + } +} + +The first arguments of \docAuxCommand*{nduMath} are identical to those of the \refCom{nduValue} macro. In addition, it has \meta{operator} (one of \texttt{+ - * /}) and \meta{variable} arguments. The first time a variable is used, it is assumed that the value is 0. The given value is then converted to its internal representation and stored in the variable. The command does not expand to any output. + +Note that mixing units in the same variable is not currently supported, and will likely give incorrect results. + +The \docAuxCommand*{nduResult} macro takes a stored \meta{variable} and formats it for display in the same way as \refCom{nduValue}. + +Both may be further configured via the \meta{options} in the same way as the other macros. + +\begin{dispExample*}{ + title=Example usage: \docAuxCommand*{nduMath} and \docAuxCommand*{nduResult} macros +} +\nduMath{danish rigsdaler}{example 1}{+}{0.0.10} +\nduMath{danish rigsdaler}{example 1}{+}{..8} +\nduMath{danish rigsdaler}{example 1}{+}{0.2} +\nduMath{danish rigsdaler}{example 1}{+}{0.5.1} +\nduResult{danish rigsdaler}{example 1} % = 1.2.3 +\end{dispExample*} + +\begin{dispExample*}{ + title=Example usage: \docAuxCommand*{nduResult} macro +} +\nduHeader{danish rigsdaler}\\ +\nduResult{danish rigsdaler}[aligned]{example 1} +\end{dispExample*} +\end{docCommands} + +\clearpage +\subsubsection{Options} + +\begin{docKeys} + [ + doc parameter = {=\meta{...}}, + ] + { + { + doc name = add to variable, + }, + { + doc name = subtract from variable, + }, + } + +Setting either of these keys will cause all uses of \docAuxCommand*{nduValue} in the current group to be added to or subtracted from the variable with the given name. + +\begin{dispExample*}{ + title=Example usage: \docAuxKey*{add to variable} key +} +\begingroup +\nduset{ + cell width=3em, + replace nil with=---, + add to variable=example 2 +} +\begin{tabular}{r r} + \toprule + & \nduHeader{danish rigsdaler} \\ + \midrule + a & \nduValue{danish rigsdaler}{1.2.3} \\ + b & \nduValue{danish rigsdaler}{100.1.} \\ + \bottomrule + total & \nduResult{danish rigsdaler}{example 2} \\ % = 101.3.3 +\end{tabular} +\endgroup +\end{dispExample*} + +Results are global and remain accessible outside the group: +\begin{dispExample} +\nduResult{danish rigsdaler}{example 2} +\end{dispExample} + +Adding an additional 15 \nduName{danish rigsdaler}{2} to the existing result gives: +\begin{dispExample} +\nduMath{danish rigsdaler}{example 2}{+}{0.0.15} +\nduResult{danish rigsdaler}{example 2} % = 101.4.2 +\end{dispExample} +\end{docKeys} + +\subsection{Accessing Information About Units} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\begin{docCommand} + {nduName} + {\marg{unit name}\marg{segment}} + Expands to the name of the the given segment of the unit. + + Set by \refKey{segment:name}. +\end{docCommand} + +\begin{docCommand} + {nduSymbol} + {\marg{unit name}\marg{segment}} + Expands to the symbol of the the given segment of the unit. + + Set by \refKey{segment:symbol}. +\end{docCommand} + +\begin{docCommand} + {nduFactor} + {\marg{unit name}\marg{segment}} + Expands to the conversion factor of the the given segment of the unit, ie. how many of the underlying segment the given segment consists of. + +\begin{dispExample} +That is, 1 \nduName{danish rigsdaler}{0} consists of +\nduFactor{danish rigsdaler}{1} \nduName{danish rigsdaler}{1}. +\end{dispExample} +\end{docCommand} + +\clearpage +\section{Creating New Units} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\label{units:new} +If the included units are not suitable, more can be created. Pull requests are also welcome at \url{https://github.com/mikkelee/latex-units}. + +\begin{docCommand} + {nduNewUnit} + {\marg{unit name}\marg{key/value pairs}} + +Units can have up to 7 segments, numbered \meta{0-6}. The left-most segment, that is, the \emph{top} or \emph{root} segment, is numbered \texttt{0}. + +The numeral part of the below key paths \docAuxKey*{segment 0/} can be any integer up to \texttt{6}, ie. \docAuxKey*{segment 6/}. The internal number of segments is determined by how many name keys are created. + +See below for available settings. + +\end{docCommand} + +\begin{docCommand} + {nduNewMacro} + {\marg{unit name}\oarg{key/value pairs}\marg{control sequence}} + + It is possible to create shortcut macros for commonly used \meta{unit name}s with optional overriding options. + + These macros take the same arguments as the full \refCom{nduValue} macro, except without the first argument (ie. the name of the unit). + +\begin{dispExample} +\nduNewMacro{rigsdaler.mark.skilling} + [unit groups/rigsdaler.mark.skilling/segment 0/symbol={R\textsuperscript{dl}}] + {myRdl} +\myRdl{1.2.3} +\end{dispExample} + +\end{docCommand} + +%\begin{docCommand} +% {nduCommonSymbols} +% {\marg{key/value pairs}} +% +% It is possible to configure commonly used symbols using the form \texttt{\meta{name}=\meta{symbol}}. These will be used as fallbacks if no specific symbol is configured for a segment via \refKey{segment:symbol}. +% +%\end{docCommand} +% +%\begin{docCommand} +% {nduCommonFactors} +% {\marg{key/value pairs}} +% +% Not currently implemented. +% +%\end{docCommand} + +\clearpage +\subsubsection{Options} + +\begin{docKey} + {segment separator} + {=\meta{...}} + {initially \texttt{\~{}}} + + When displaying a value, this string will be inserted between each segment. + +\begin{dispExample} +\nduValue{danish hartkorn}[ + show=values, + segment separator=. + ] + {1.2.3.4} + +\nduValue{danish rigsdaler} + [segment separator={---}] + {1.2.3} +\end{dispExample} + +\end{docKey} + +\begin{docKey} + {restrict segment depth} + {=\meta{integer}} + {initially no restriction} + + When calculating or displaying a value, only the segments up to and including \meta{integer} will be considered. + + In this document, the depth has been globally set to \texttt{2} for \docAuxKey*{danish rigsdaler}, but the older historical sub-unit \nduName{danish rigsdaler}{3} can be included by locally setting the depth to \texttt{3} (or indeed not restricting it globally). + +\begin{dispExample} +\nduValue{danish rigsdaler} + [restrict segment depth=3] + {1.2.3.4} +\end{dispExample} +\end{docKey} + +\begin{docKey} + [] + [doc label=segment:name] + {segment \meta{n}/name} + {=\meta{name}} + {no default, initially undefined} + + Gives the proper name of the segment's unit. Used internally to determine how many segments the unit contains. + + Can be accessed with by \refCom{nduName}. +\end{docKey} + +\begin{docKey} + [] + [doc label=segment:symbol] + {segment \meta{n}/symbol} + {=\meta{symbol}} + {no default, initially undefined} + + Configures a symbol displaying the unit. This is used in \docAuxCommand{nduHeader} and is also available via \docAuxCommand{nduSym} when defining the \refKey{segment:display} (see below). + + If none is configured, an attempt to look up a common symbol by its name is made. These can be configured with \refCom{nduCommonSymbols}. +\end{docKey} + +\begin{docKeys} + [ + doc parameter = {=\meta{...}}, + ] + { + { + doc name = {segment \meta{n}/prefix}, + doc label = segment:prefix, + doc description = {initially set to \texttt{\{\}}}, + }, + { + doc name = {segment \meta{n}/suffix}, + doc label = segment:suffix, + doc description = {initially set to \texttt{\{~\docAuxCommand*{nduSym}\}}}, + }, + } + + When displaying a value, segments will be wrapped between the \meta{prefix} and \meta{suffix}. + + The macro \docAuxCommand{nduSym} is available here to show the symbol configured for the segment. +\end{docKeys} + +\begin{docKey} + [] + [doc label=segment:display] + {segment \meta{n}/display} + {=\marg{prefix}\marg{suffix}} + {} + + Sets both \refKey{segment:prefix} and \refKey{segment:suffix} at the same time. +\end{docKey} + +\begin{docKey} + [] + [doc label=segment:factor] + {segment \meta{n}/factor} + {=\meta{integer}} + {no default, initially undefined} + + The conversion factor of a segment is how many of the underlying segment the given segment consists of. + + This is used in the math macros, in order to calculate the correct segment values. + + Can be accessed via \refCom{nduFactor}. +\end{docKey} + +These keys can of course also be set temporarily in \refCom{nduValue} + +\begin{dispExample} +\nduValue{danish rigsdaler} + [segment 1/symbol=Mk.] + {.9.} + +\nduValue{danish rigsdaler} + [segment 0/display={}{~Rigsdaler og}] + {1.2.3} + +\nduValue{danish rigsdaler}[ + segment separator={---}, + segment 0/display={(}{)}, + segment 1/display={[}{]}, + segment 2/display={\{}{\}}, + ] + {1.2.3} +\end{dispExample} + +\begin{docKey} + {create macro named} + {=\meta{control sequence}} + {no default, initially empty} + + Units may provide a default shortcut macro, for example the \docValue*{danish rigsdaler} unit configures \docAuxCommand*{rdl}. + + This is done via \refCom{nduNewMacro} which describes the arguments of the resulting macros. + +\begin{dispExample*}{ + sidebyside, + righthand width=1.75cm, +} +\rdl{2.3.} +\end{dispExample*} +\end{docKey} + +\clearpage +\section{Included Units} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\label{units:included} +On the following pages are the units included with the package. + +\unitlisting{british} + +\clearpage +\unitlisting{danish} + +\unitlisting{german} + +\printindex %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/non-decimal-units/docs/test.pdf b/macros/latex/contrib/non-decimal-units/docs/test.pdf Binary files differnew file mode 100644 index 0000000000..6cb11b3f93 --- /dev/null +++ b/macros/latex/contrib/non-decimal-units/docs/test.pdf diff --git a/macros/latex/contrib/non-decimal-units/docs/test.tex b/macros/latex/contrib/non-decimal-units/docs/test.tex new file mode 100644 index 0000000000..69b5d73a9b --- /dev/null +++ b/macros/latex/contrib/non-decimal-units/docs/test.tex @@ -0,0 +1,232 @@ +% !TEX TS-program = LuaLaTeX-shell-escape +\documentclass{article} +\usepackage{trace} + +\usepackage{non-decimal-units.preamble} + +%\nduset{logging} + +\makeatletter + +\begin{document} + + +\nduNewMacro{rigsdaler.mark.skilling} + [unit groups/rigsdaler.mark.skilling,segment 0/symbol={R\textsuperscript{dl}}] + {myRdl} +\myRdl{1.2.3} + +\end{document} + +\nduValue{sletdaler.mark}{1.2}% + + +%\traceon +\nduValue{sletdaler.mark}[restrict segment depth=2]{1.2}% +%\traceoff + +%\end{document} + + +\nduValue{danish rigsbankdaler}{.120} + + +normalize 120 skilling = \nduValue{danish rigsdaler}[ + normalize, + treat zero as nil, +]{..120} = 1.1.8 + + +\nduValue{danish rigsbankdaler}{.100} + +\nduValue{sletdaler.mark}{1.2}% + +\rbd{1.2} = 1.2 + +\rbd{.100} = 1.4 + +\rdl{..120} = 1.1.8 + + + +%\end{document} + +\nduAliasOrGroup{danish rigsbankdaler} == \nduAliasOrGroup{rigsbankdaler.skilling} + +\nduValue{danish rigsbankdaler}{50.10} == \nduValue{rigsbankdaler.skilling}{50.10} + +\begingroup +\nduset{ + aliases/danish sletdaler, + restrict segment depth=2, +} + +\nduset{ + unit groups/sletdaler.mark.skilling.penning/restrict segment depth=2, +} +\endgroup + +\nduValue{danish rigsdaler}[ + restrict segment depth=2, + segment separator=!, +]{1..3} = 1!3 + +\nduValue{sletdaler.mark.skilling}[ + restrict segment depth=2, + segment separator=!, +]{1..2} = 1!2 + + +factor: \pgfkeysvalueof{/ndu/base units/rigsdaler/factors/ort} + +factor: \pgfkeysvalueof{/ndu/base units/rigsdaler/factors/mark} + +factor: \pgfkeysvalueof{/ndu/base units/tønde/factors/skæppe} + + +%\nduFactor{danish rigsdaler}{0} + +\nduFactor{danish rigsdaler}{1} \nduSymbol{danish rigsdaler}{1} per \nduSymbol{danish rigsdaler}{0} + +\nduFactor{danish rigsdaler}{2} \nduSymbol{danish rigsdaler}{2} per \nduSymbol{danish rigsdaler}{1} + +\nduFactor{danish rigsdaler}{3} \nduSymbol{danish rigsdaler}{3} per \nduSymbol{danish rigsdaler}{2} + +%\nduFactor{danish rigsdaler}{4} \nduSymbol{danish rigsdaler}{4} per \nduSymbol{danish rigsdaler}{3} + +%\end{document} + + +\section{Aligned math test} + + testing with 1.2.3.4 = 1*6*16*12 + 2*16*12 + 3*12 + 4 = 1576 + + \csdef{ndu@repr@TEST}{0} + init as 0: \csuse{ndu@repr@TEST} + + \nduConvertToRepr@helper{danish rigsdaler}{TEST}{0}{1} + no conv, add rdl: 0 + 1 = 1 --- is \csuse{ndu@repr@TEST} + + \nduConvertToRepr@helper{danish rigsdaler}{TEST}{1}{2} + conv to mk, add mk: 1*6 + 2 = 8 --- is \csuse{ndu@repr@TEST} + + \nduConvertToRepr@helper{danish rigsdaler}{TEST}{2}{3} + conv to sk, add sk: 8*16 + 3 = 131 --- is \csuse{ndu@repr@TEST} + + \nduConvertToRepr@helper{danish rigsdaler}{TEST}{3}{4} + conv to pg, add pg: 131*12 + 4 = 1576 --- is \csuse{ndu@repr@TEST} + + \nduConvertToRepr@helper{danish rigsdaler}{TEST}{4}{0} + no conv, no add: --- is \csuse{ndu@repr@TEST} + +\nduResult{danish rigsdaler}{TEST} + + +\nduValue{danish rigsdaler}[replace nil with=---]{1..3} = 1.---.3.--- + +\nduValue{danish rigsdaler}{1..3} = 1..3 + +\nduValue{danish rigsdaler}{1.2.3} = 1.2.3 + +\nduConvertToRepr{danish rigsdaler}{baz}{1.2.3.4} 1.2.3.4 = +baz: \nduResult{danish rigsdaler}{baz} + +\nduConvertToRepr{danish rigsdaler}{foo}{1.2.3} 1.2.3 = +foo: \nduResult{danish rigsdaler}{foo} + +foo with local zero as nil: \nduResult{danish rigsdaler}[treat zero as nil]{foo} + +Setting depth to 2 + +\traceon +\nduset{ +% unit groups/rigsdaler.mark.skilling.penning/restrict segment depth=2, + aliases/danish rigsdaler, + restrict segment depth=2, +} +\traceoff + +\nduConvertToRepr{danish rigsdaler}{zap}{1.2.3.4} 1.2.3.4 = +zap: \nduResult{danish rigsdaler}{zap} + +\nduConvertToRepr{danish rigsdaler}{bar}{1.2.3} 1.2.3 = +bar: \nduResult{danish rigsdaler}{bar} + + +\section{Zero test} + +should be 1.0.1: \nduValue{danish rigsdaler}{1.0.1} + +should be 1..1: \nduValue{danish rigsdaler}[treat zero as nil]{1.0.1} + + +\section{Math test} + +\nduMath{danish rigsdaler}{math}{+}{..8} +\nduResult{danish rigsdaler}{math} + +\nduMath{danish rigsdaler}{math}{+}{..8} +\nduResult{danish rigsdaler}{math} + +\nduMath{danish rigsdaler}{math}{+}{..9} +\nduResult{danish rigsdaler}{math} + +\nduMath{danish rigsdaler}{math}{-}{..8} +\nduResult{danish rigsdaler}{math} = 0.1.1 + +\nduMath{danish rigsdaler}{math}{+}{..8} +\nduResult{danish rigsdaler}{math} = 0.1.9 + +\nduMath{danish rigsdaler}{math}{*}{2} +\nduResult{danish rigsdaler}{math} = 0.3.2 + +\section{Aligned math test} + +\begingroup +\nduset{ + aligned, + cell width=3em, + replace nil with=---, + treat zero as nil, + add to variable=example 2 +} +\begin{tabular}{r r} + \toprule + & \nduHeader{danish rigsdaler} \\ + \midrule + a & \nduValue{danish rigsdaler}{1.2.3} \\ + b & \nduValue{danish rigsdaler}{100.1.} \\ + c & \nduValue{danish rigsdaler}{0..15} \\ + \bottomrule + total & \nduResult{danish rigsdaler}{example 2} \\ +\end{tabular} = 101.4.2 +\endgroup + +\end{document} + +Does not work because 1 ort = 1.5 mark + +\section{All coins test} + +\nduMath{danish rigsdaler all coins}{all coins}{+}{..10} +\nduResult{danish rigsdaler all coins}{all coins} + +\nduMath{danish rigsdaler all coins}{all coins}{+}{...100} +\nduResult{danish rigsdaler all coins}{all coins} + +\nduMath{danish rigsdaler all coins}{all coins}{+}{.5} +\nduResult{danish rigsdaler all coins}{all coins} + +\nduMath{danish rigsdaler all coins}{all coins}{+}{....10} +\nduResult{danish rigsdaler all coins}{all coins} = XXXX + +\end{document} + +segment depth: \pgfkeysvalueof{/ndu/aliases/danish rigsdaler/segment depth} + +restrict segment depth: \pgfkeysvalueof{/ndu/aliases/danish rigsdaler/restrict segment depth} + +segment depth: \pgfkeysvalueof{/ndu/unit groups/sletdaler.mark.skilling/segment depth} + +restrict segment depth: \pgfkeysvalueof{/ndu/unit groups/sletdaler.mark.skilling/restrict segment depth} + diff --git a/macros/latex/contrib/non-decimal-units/latex/non-decimal-units.british.tex b/macros/latex/contrib/non-decimal-units/latex/non-decimal-units.british.tex new file mode 100644 index 0000000000..28c849f641 --- /dev/null +++ b/macros/latex/contrib/non-decimal-units/latex/non-decimal-units.british.tex @@ -0,0 +1,27 @@ +%%% CURRENCY %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% https://en.wikipedia.org/wiki/£sd + +\nduBaseUnits{% + pound sterling={% + symbol=£, + display={\nduSym}{}, + }, + shilling={% + symbol=s, + factor=20 per pound sterling, + display={}{\nduSym}, + }, + penny={% + symbol=d, + factor=12 per shilling, + display={}{\nduSym}, + }, +} + +\nduAliases{% + british pound sterling lsd={% + units=pound sterling.shilling.penny, + segment separator={. }, + }, +} diff --git a/macros/latex/contrib/non-decimal-units/latex/non-decimal-units.danish.tex b/macros/latex/contrib/non-decimal-units/latex/non-decimal-units.danish.tex new file mode 100644 index 0000000000..0ac75c3587 --- /dev/null +++ b/macros/latex/contrib/non-decimal-units/latex/non-decimal-units.danish.tex @@ -0,0 +1,122 @@ +%%% CURRENCY %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\nduBaseUnits{% + rigsbankdaler={% + symbol=Rbd., + }, + rigsdaler={% + symbol=Rdl., + }, + sletdaler={% + symbol=Sldl., + }, + speciedaler={% + symbol=Spdl., + }, + ort={symbol=Ort,factor=4 per rigsdaler}, + mark={% + symbol=Mk., + factor=6 per rigsdaler, + factor=4 per sletdaler, + }, + skilling={% + symbol=Sk., + factor=16 per mark, + factor=24 per ort, + factor=84 per speciedaler, + factor=96 per rigsbankdaler, + }, + hvid={% + symbol=Hvid, + factor=3 per skilling, + }, + penning={% + symbol=Pg., + factor=4 per hvid, + factor=12 per skilling, + }, +} + +\nduAliases{% + danish rigsbankdaler={% + units=rigsbankdaler.skilling, + macro={rbd}{% + normalize, + treat zero as nil + }, + }, + danish rigsdaler={% + units=rigsdaler.mark.skilling.penning, + macro={rdl}{% + normalize, + treat zero as nil + }, + }, + danish sletdaler={% + units=sletdaler.mark.skilling.penning, + macro={sldl}{% + normalize, + treat zero as nil + }, + }, +} + + +%%%% AREA %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\nduBaseUnits{% + tønde={% + symbol=Td., + }, + skæppe={% + symbol=Skp., + factor=8 per tønde, + }, + fjerdingkar={% + symbol=Fjk., + factor=4 per skæppe, + }, + album={% + symbol=Alb., + factor=3 per fjerdingkar, + }, + penning/factor=4 per album, % penning symbols defined under currency +} + +\nduAliases{% + danish hartkorn={% + units=tønde.skæppe.fjerdingkar.album.penning, + macro={hartkorn}{% + normalize, + treat zero as nil + }, + }, +} + + +%%%% WEIGHT %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\nduBaseUnits{% + skippund={% + symbol=Spd., + }, + lispund={% + symbol=Lpd., + factor=20 per skippund, + }, + skaalpund={% + symbol=Pd., + factor=16 per lispund, + }, +} + +\nduAliases{% + danish pund={% + units=skippund.lispund.skaalpund, + macro={pund}{% + normalize, + treat zero as nil + }, + }, +} + diff --git a/macros/latex/contrib/non-decimal-units/latex/non-decimal-units.german.tex b/macros/latex/contrib/non-decimal-units/latex/non-decimal-units.german.tex new file mode 100644 index 0000000000..912ee0d428 --- /dev/null +++ b/macros/latex/contrib/non-decimal-units/latex/non-decimal-units.german.tex @@ -0,0 +1,21 @@ +%%% CURRENCY %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\nduBaseUnits{% + reichsthaler={% + symbol=Rthl., % \mufi{reichtalold} + }, + groschen={% + symbol=Gr., % \mufi{grosch} + factor=30 per reichsthaler, + }, + pfennig={% + symbol=Pf., % \mufi{20B0} + factor=12 per groschen, + }, +} + +\nduAliases{% + german reichsthaler={% + units=reichsthaler.groschen.pfennig, + }, +} diff --git a/macros/latex/contrib/non-decimal-units/latex/non-decimal-units.sty b/macros/latex/contrib/non-decimal-units/latex/non-decimal-units.sty new file mode 100644 index 0000000000..92459759cc --- /dev/null +++ b/macros/latex/contrib/non-decimal-units/latex/non-decimal-units.sty @@ -0,0 +1,598 @@ +\ProvidesPackage{non-decimal-units}[2023/09/26 Macros for displaying and manipulating historical non-decimal units] + +% License: CC-BY-SA 4.0 +% Author: Mikkel Eide Eriksen <mikkel.eriksen@gmail.com> + +\RequirePackage{pgfkeys} +\RequirePackage{pgfopts} +\RequirePackage{bigintcalc} + +\RequirePackage{etoolbox} +\RequirePackage{ifthen} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\pgfkeys{/handlers/.store in cs/.code=\pgfkeysalso{% + \pgfkeyscurrentpath/.code=\csdef{#1}{##1}}% +} + +\def\nduset{\pgfqkeys{/ndu}} + +\newif\ifndushowvalues +\newif\ifndushowaffixes +\newif\ifndutreatzeroasnil +\newif\ifndualigned +\ndushowvaluestrue +\ndushowaffixestrue +\newif\ifndunormalize + +\newcounter{autorepr} + +\gdef\ndu@nextdelim{}% +\gdef\ndu@delim{}% + +\nduset{% + base units/.is family, + base units/.unknown/.code={% + \expandafter\nduBuildBaseUnitKeys\expandafter{\pgfkeyscurrentname}{#1}% + }, + unit groups/.is family, + unit groups/.unknown/.code={% + \expandafter\nduBuildUnitGroupKeys\expandafter{\pgfkeyscurrentname}% + }, + aliases/.is family, + aliases/.unknown/.code={% + \expandafter\nduBuildAliasKeys\expandafter{\pgfkeyscurrentname}{#1}% + }, + show/.is choice, + show/values/.code={\ndushowvaluestrue\ndushowaffixesfalse}, + show/values and symbols/.code={\ndushowvaluestrue\ndushowaffixestrue}, + show/symbols/.code={\ndushowvaluesfalse\ndushowaffixestrue}, + show=values and symbols, + cell width/.initial=5em, + add to variable/.code={% + \csdef{ndu@current@variable}{#1}% + \csdef{ndu@current@operator}{+}% + }, + subtract from variable/.code={% + \csdef{ndu@current@variable}{#1}% + \csdef{ndu@current@operator}{-}% + }, + replace nil with/.store in cs=ndu@nil@replacement, + treat zero as nil/.is if=ndutreatzeroasnil, + treat zero as nil=false, + normalize/.is if=ndunormalize, + normalize=false, + segment separator/.initial={~}, + aligned/.is if=ndualigned, + aligned=false, + set aligned for environment/.code={% + \AtBeginEnvironment{#1}{\nduset{aligned}}% + }, +} + +\newcommand\nduBuildBaseUnitKeys[2]{% + \nduset{% + base units/#1/.is family,base units/#1, + symbol/.initial={#1}, + factor/.style args={##1 per ##2}{% + /ndu/base units/##2/factors/#1/.initial=##1, + }, + prefix/.initial={}, + suffix/.initial={~\nduSym}, + display/.style 2 args={% + prefix={##1}, + suffix={##2}, + }, + #2, + }% +} + +\newcommand\nduBaseUnits[1]{% + \nduset{% + base units,#1, + }% +} + +\newcommand\nduBuildUnitGroupKeys[1]{% called by .unknown handler + \nduset{% + unit groups/#1/.search also={/ndu}, + unit groups/#1/.is family,unit groups/#1, + segment separator/.link=/ndu/segment separator, + segment depth/.initial=-1, + update segment depth/.code={% + \ifnum##1>\pgfkeysvalueof{/ndu/unit groups/#1/segment depth}% + \nduset{% + unit groups/#1/segment depth=##1, + }% + \fi% + }, + restrict segment depth/.link=/ndu/unit groups/#1/segment depth, + }% + \nduBuildSegments{#1}{#1}% +} + +\newcommand\nduUnitGroups[1]{% + \nduset{% + unit groups,#1, + }% +} + +\newcommand\nduBuildAliasKeys[2]{% called by .unknown handler + \nduset{% + aliases/#1/.is family,aliases/#1, + units/.code={% + % create unit group and set search path + \pgfkeys{% + /ndu/unit groups/##1, + /ndu/aliases/#1/.search also={/ndu/unit groups/##1}, + /ndu/aliases/#1/unit group/.initial=##1, + }% + }, + macro/.code 2 args={% + \nduNewMacro{#1}[##2]{##1}% + }, + #2, + }% +} + +\newcommand\nduAliases[1]{% + \nduset{% + aliases,#1, + }% +} + +\NewDocumentCommand\nduBuildSegments{ m > { \SplitArgument { 6 } { . } } m }{% + \nduBuildSegments@internal{#1}#2% +} + +\newcommand\nduBuildSegments@internal[8]{% + \nduNewUnit@segment{#1}{0}{#2}{#1}% + \nduNewUnit@segment{#1}{1}{#3}{#2}% + \nduNewUnit@segment{#1}{2}{#4}{#3}% + \nduNewUnit@segment{#1}{3}{#5}{#4}% + \nduNewUnit@segment{#1}{4}{#6}{#5}% + \nduNewUnit@segment{#1}{5}{#7}{#6}% + \nduNewUnit@segment{#1}{6}{#8}{#7}% +} + +\newcommand\nduNewUnit@segment[4]{% + \IfValueT{#3}{% + \nduset{ + unit groups/#1/segment #2/.is family,unit groups/#1/segment #2, + name/.initial=#3, + symbol/.link=/ndu/base units/#3/symbol, + prefix/.link=/ndu/base units/#3/prefix, + suffix/.link=/ndu/base units/#3/suffix, + display/.style 2 args={% + segment #2/prefix={##1}, % why is the segment needed here ??? + segment #2/suffix={##2}, + }, + factor/.link=/ndu/base units/#4/factors/#3, + }% + \nduset{% + unit groups/#1/update segment depth=#2, + }% + }% +} + +\NewDocumentCommand\nduNewMacro{ m O{} m }{% + \expandafter\NewDocumentCommand\csname#3\endcsname { O{} m } {% + \begingroup% + \nduset{unit groups/#1,#2}% + \nduValue{#1}[##1]{##2}% + \endgroup% + }% +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\newcommand\nduName[2]{% + \pgfkeysifdefined{/ndu/unit groups/\nduAliasOrGroup{#1}/segment #2/name}{% + \pgfkeysvalueof{/ndu/unit groups/\nduAliasOrGroup{#1}/segment #2/name}% + }{% + \PackageError{non-decimal-units}{No name defined for "\nduAliasOrGroup{#1}" segment #2}{}% + \nduNameMissing% + }% +} + +\newcommand\nduSymbol[2]{% + \pgfkeysifdefined{/ndu/unit groups/\nduAliasOrGroup{#1}/segment #2/symbol}{% + \pgfkeysvalueof{/ndu/unit groups/\nduAliasOrGroup{#1}/segment #2/symbol}% + }{% + \PackageError{non-decimal-units}{No symbol defined for "\nduAliasOrGroup{#1}" segment #2 (\nduName{#1}{#2})}{}% + \nduSymbolMissing% + }% +} + +\newcommand\nduPrefix[2]{% + \pgfkeysifdefined{/ndu/unit groups/\nduAliasOrGroup{#1}/segment #2/prefix}{% + \gdef\nduSym{\nduSymbol{\nduAliasOrGroup{#1}}{#2}}% + \pgfkeysvalueof{/ndu/unit groups/\nduAliasOrGroup{#1}/segment #2/prefix}% + }{% + \PackageError{non-decimal-units}{No prefix defined for "\nduAliasOrGroup{#1}" segment #2 (\nduName{#1}{#2})}{}% + \nduPrefixMissing% + }% +} + +\newcommand\nduSuffix[2]{% + \pgfkeysifdefined{/ndu/unit groups/\nduAliasOrGroup{#1}/segment #2/suffix}{% + \gdef\nduSym{\nduSymbol{\nduAliasOrGroup{#1}}{#2}}% + \pgfkeysvalueof{/ndu/unit groups/\nduAliasOrGroup{#1}/segment #2/suffix}% + }{% + \PackageError{non-decimal-units}{No suffix defined for "\nduAliasOrGroup{#1}" segment #2 (\nduName{#1}{#2})}{}% + \nduSuffixMissing% + }% +} + +\newcommand\nduFactor[2]{% + \pgfkeysifdefined{/ndu/unit groups/\nduAliasOrGroup{#1}/segment #2/factor}{% + \pgfkeysvalueof{/ndu/unit groups/\nduAliasOrGroup{#1}/segment #2/factor}% + }{% + % Having a PackageError here breaks bigintcalc. + \nduFactorMissing@#1@#2% + }% +} + +\newcommand\ifnduFactorDefined[4]{% + \pgfkeysifdefined{/ndu/base units/\nduName{#1}{\the\numexpr#2-1\relax}/factors/\nduName{#1}{#2}}{% + #3% + }{% + #4% + }% +} + +\newcommand\nduNamedFactor[2]{% + \pgfkeysifdefined{/ndu/base units/\nduAliasOrGroup{#1}/factors/#2}{% + \pgfkeysvalueof{/ndu/base units/\nduAliasOrGroup{#1}/factors/#2}% + }{% + % Having a PackageError here breaks bigintcalc. + \nduFactorMissing@#1@#2% + }% +} + +\newcommand\nduSegmentDepth[1]{% + \pgfkeysifdefined{/ndu/unit groups/\nduAliasOrGroup{#1}/restrict segment depth}{% + \pgfkeysvalueof{/ndu/unit groups/\nduAliasOrGroup{#1}/restrict segment depth}% + }{% + \pgfkeysvalueof{/ndu/unit groups/\nduAliasOrGroup{#1}/segment depth}% + }% +} + +\newcommand\nduAliasOrGroup[1]{% + \pgfkeysifdefined{/ndu/aliases/#1/unit group}{% + \pgfkeysvalueof{/ndu/aliases/#1/unit group}% + }{% + #1% + }% +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\newcommand\ndu@if@depth@at@least[3]{% + \ifnum#2>\nduSegmentDepth{#1}% + \relax% + \else% + #3% + \fi% +} + +\newcommand\ndu@nil@helper[4]{% + \IfValueTF{#1}{% + \ifblank{#1}{% + \ifcsvoid{ndu@nil@replacement}{}{#2\ndu@nil@replacement{}#4}% + }{% + \ifndutreatzeroasnil% + \expandafter\ifnum#1=0 + \ifcsvoid{ndu@nil@replacement}{}{#2\csuse{ndu@nil@replacement}#4}% + \else% + #2#3#4% + \fi% + \else% + #2#3#4% + \fi% + }% + }{% + \ifcsvoid{ndu@nil@replacement}{}{#2\csuse{ndu@nil@replacement}#4}% + }% +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\NewDocumentCommand\nduValue{ m O{} m }{% + \nduValue@unitgroup{\nduAliasOrGroup{#1}}[#2]{#3}% +} + +\NewDocumentCommand\nduValue@unitgroup{ m O{} m }{% + % #1 = unit group + % #2 = options + % #3 = values joined by . + \nduset{unit groups/#1}% + \begingroup% + \nduset{unit groups/#1,#2}% + \ifndualigned% + \nduAlignedValue@entry{#1}{#3}% + \else% + \nduFormatValue@entry{#1}{#3}% + \fi% + \endgroup% + \ifcsvoid{ndu@current@variable}{}{% + \nduMath{#1}{\ndu@current@variable}{\ndu@current@operator}{#3}% + }% +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\newcommand\nduFormatSegment[3]{% + % #1 = unit group + % #2 = segment + % #3 = value + %\csshow{nduSym}% + \ndu@nil@helper{#3}{% + \ndu@delim% + \ifndushowaffixes\nduPrefix{#1}{#2}\fi% + \edef\ndu@delim{\ndu@nextdelim}% + }{% + \ifndushowvalues#3\fi% + }{% + \ifndushowaffixes\nduSuffix{#1}{#2}\fi% + }% +} + +\newcommand\nduFormatValue@helper[3]{% + \ndu@if@depth@at@least{#1}{#2}{% + \nduFormatSegment{#1}{#2}{#3}% + }% +} + +\newcommand\nduFormatValue@internal[8]{% + % #1 = unit group + % #2-8 = values + \edef\ndu@nextdelim{\pgfkeysvalueof{/ndu/unit groups/#1/segment separator}}% + \edef\ndu@delim{}% + \nduFormatValue@helper{#1}{0}{#2}% + \nduFormatValue@helper{#1}{1}{#3}% + \nduFormatValue@helper{#1}{2}{#4}% + \nduFormatValue@helper{#1}{3}{#5}% + \nduFormatValue@helper{#1}{4}{#6}% + \nduFormatValue@helper{#1}{5}{#7}% + \nduFormatValue@helper{#1}{6}{#8}% +} + +\NewDocumentCommand\nduFormatValue@entry{ m > { \SplitArgument { 6 } { . } } m }{% + % #1 = unit group + % #2 = values joined by . + \ifndunormalize% + \stepcounter{autorepr}% + \nduConvertToRepr@internal{#1}{autorepr\arabic{autorepr}}#2% + \nduResult{#1}{autorepr\arabic{autorepr}}% + \else% + \nduFormatValue@internal{#1}#2% + \fi% +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\newcommand*{\ndu@minwidthbox}[2]{% + \makebox[{\ifdim#1<\width\width\else#1\fi}][r]{% + #2% + }% +} + +\newcommand\nduAlignedHeader@helper[2]{% + \ndu@if@depth@at@least{#1}{#2}{\ndu@minwidthbox{\pgfkeysvalueof{/ndu/cell width}}{% + \nduSymbol{#1}{#2}% + }}% +} + +\newcommand\nduAlignedValue@helper[3]{% + \ndu@if@depth@at@least{#1}{#2}{\ndu@minwidthbox{\pgfkeysvalueof{/ndu/cell width}}{\nduFormatSegment{#1}{#2}{#3}}}% +} + +\newcommand\nduAlignedValue@internal[8]{% + % #1 = unit group + % #2-8 = values + \nduAlignedValue@helper{#1}{0}{#2}% + \nduAlignedValue@helper{#1}{1}{#3}% + \nduAlignedValue@helper{#1}{2}{#4}% + \nduAlignedValue@helper{#1}{3}{#5}% + \nduAlignedValue@helper{#1}{4}{#6}% + \nduAlignedValue@helper{#1}{5}{#7}% + \nduAlignedValue@helper{#1}{6}{#8}% +} + +\NewDocumentCommand\nduHeader{ m O{} }{% + \nduHeader@unitgroup{\nduAliasOrGroup{#1}}[#2]% +} + +\NewDocumentCommand\nduHeader@unitgroup{ m O{} }{% + \nduset{unit groups/#1}% + \begingroup% + \nduset{unit groups/#1,#2}% + \nduAlignedHeader@helper{#1}{0}% + \nduAlignedHeader@helper{#1}{1}% + \nduAlignedHeader@helper{#1}{2}% + \nduAlignedHeader@helper{#1}{3}% + \nduAlignedHeader@helper{#1}{4}% + \nduAlignedHeader@helper{#1}{5}% + \nduAlignedHeader@helper{#1}{6}% + \endgroup% +} + +\NewDocumentCommand\nduAlignedValue@entry{ m > { \SplitArgument { 6 } { . } } m }{% + % #1 = unit group + % #2 = values joined by . + \begingroup% + \nduset{show=values}% + \ifndunormalize% + \stepcounter{autorepr}% + \nduConvertToRepr@internal{#1}{autorepr\arabic{autorepr}}#2% + \nduResult{#1}[aligned]{autorepr\arabic{autorepr}}% + \else% + \nduAlignedValue@internal{#1}#2% + \fi% + \endgroup% +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\newcommand\ndu@val@or@zero[1]{% + \IfValueTF{#1}{% + \ifblank{#1}{% + 0% + }{% + #1% + }% + }{% + 0% + }% +} + +\newcommand\nduConvertToRepr@helper[4]{% + % convert from overlying unit and add value + % #1 = unit group + % #2 = repr name + % #3 = segment + % #4 = value + \ndu@if@depth@at@least{#1}{#3}{% + \ifnum#3=0% + % no conversion at top level + \else% + \ifnduFactorDefined{#1}{#3}{% + %\show#3% + \csxdef{ndu@repr@#2}{\bigintcalcMul{\csuse{ndu@repr@#2}}{\nduFactor{#1}{#3}}}% + }{% + % there is no factor to the overlying unit + % instead attempt to skip ahead to the underlying unit? + \PackageError{non-decimal-units}{Cannot convert to representation because there is no conversion factor from \nduName{#1}{\the\numexpr#3-1\relax} to \nduName{#1}{#3}}{}% + }% + \fi% + \csxdef{ndu@repr@#2}{\bigintcalcAdd{\csuse{ndu@repr@#2}}{\ndu@val@or@zero{#4}}}% + \csxdef{ndu@repr@#2@unit}{\nduName{#1}{#3}}% + }% +} + +\newcommand\nduConvertToRepr@internal[9]{% + % #1 = unit group + % #2 = repr name + % #3-9 = values + \csdef{ndu@repr@#2}{0}% + \nduConvertToRepr@helper{#1}{#2}{0}{#3}% + \nduConvertToRepr@helper{#1}{#2}{1}{#4}% + \nduConvertToRepr@helper{#1}{#2}{2}{#5}% + \nduConvertToRepr@helper{#1}{#2}{3}{#6}% + \nduConvertToRepr@helper{#1}{#2}{4}{#7}% + \nduConvertToRepr@helper{#1}{#2}{5}{#8}% + \nduConvertToRepr@helper{#1}{#2}{6}{#9}% +} + +\NewDocumentCommand\nduConvertToRepr{ m O{} m > { \SplitArgument { 6 } { . } } m }{% + \nduset{unit groups/#1,#2}% + \nduConvertToRepr@internal{#1}{#3}#4% +} + +\newcommand\nduFormatRepr@helper[3]{% + % V = mod(R, F) + % R = div(R - V, F) + % #1 = unit group + % #2 = repr name + % #3 = segment (F) + \ndu@if@depth@at@least{#1}{#3}{% + \ifnum#3=0% + \csxdef{ndu@repr@#2@result@#3}{\csuse{ndu@repr@#2}}% + \else% + \ifnduFactorDefined{#1}{#3}{% + \csxdef{ndu@repr@#2@result@#3}{\bigintcalcMod{\csuse{ndu@repr@#2}}{\nduFactor{#1}{#3}}}% + \csxdef{ndu@repr@#2}{\bigintcalcDiv{\bigintcalcSub{\csuse{ndu@repr@#2}}{\csuse{ndu@repr@#2@result@#3}}}{\nduFactor{#1}{#3}}}% + }{% + % there is no factor to the underlying unit + % instead attempt to skip ahead to the overlying unit? + \PackageError{non-decimal-units}{Cannot convert from representation because there is no conversion factor from \nduName{#1}{\the\numexpr#3-1\relax} to \nduName{#1}{#3}}{}% + }% + \fi% + }% +} + +\NewDocumentCommand\nduResult{ m O{} m }{% + \nduResult@unitgroup{\nduAliasOrGroup{#1}}[#2]{#3}% +} + +\NewDocumentCommand\nduResult@unitgroup{ m O{} m }{% + % #1 = unit group + % #2 = options + % #3 = repr name + \nduset{unit groups/#1}% + \csdef{ndu@repr@tmp #3}{\csuse{ndu@repr@#3}}% + \nduFormatRepr@helper{#1}{tmp #3}{6}% + \nduFormatRepr@helper{#1}{tmp #3}{5}% + \nduFormatRepr@helper{#1}{tmp #3}{4}% + \nduFormatRepr@helper{#1}{tmp #3}{3}% + \nduFormatRepr@helper{#1}{tmp #3}{2}% + \nduFormatRepr@helper{#1}{tmp #3}{1}% + \nduFormatRepr@helper{#1}{tmp #3}{0}% + \edef\ndu@nextdelim{\pgfkeysvalueof{/ndu/unit groups/#1/segment separator}}% + \edef\ndu@delim{}% + \begingroup% + \nduset{unit groups/#1,#2}% + \ifndualigned% + \nduset{show=values}% + \nduAlignedValue@helper{#1}{0}{\csuse{ndu@repr@tmp #3@result@0}}% + \nduAlignedValue@helper{#1}{1}{\csuse{ndu@repr@tmp #3@result@1}}% + \nduAlignedValue@helper{#1}{2}{\csuse{ndu@repr@tmp #3@result@2}}% + \nduAlignedValue@helper{#1}{3}{\csuse{ndu@repr@tmp #3@result@3}}% + \nduAlignedValue@helper{#1}{4}{\csuse{ndu@repr@tmp #3@result@4}}% + \nduAlignedValue@helper{#1}{5}{\csuse{ndu@repr@tmp #3@result@4}}% + \nduAlignedValue@helper{#1}{6}{\csuse{ndu@repr@tmp #3@result@4}}% + \else% + \nduFormatValue@helper{#1}{0}{\csuse{ndu@repr@tmp #3@result@0}}% + \nduFormatValue@helper{#1}{1}{\csuse{ndu@repr@tmp #3@result@1}}% + \nduFormatValue@helper{#1}{2}{\csuse{ndu@repr@tmp #3@result@2}}% + \nduFormatValue@helper{#1}{3}{\csuse{ndu@repr@tmp #3@result@3}}% + \nduFormatValue@helper{#1}{4}{\csuse{ndu@repr@tmp #3@result@4}}% + \nduFormatValue@helper{#1}{5}{\csuse{ndu@repr@tmp #3@result@4}}% + \nduFormatValue@helper{#1}{6}{\csuse{ndu@repr@tmp #3@result@4}}% + \fi% + \endgroup% +} + +\newcommand\nduMath[4]{% + \nduMath@unitgroup{\nduAliasOrGroup{#1}}{#2}{#3}{#4}% +} + +\newcommand\nduMath@unitgroup[4]{% + % #1 = unit group + % #2 = repr name + % #3 = operator + % #4 = value + \nduset{unit groups/#1}% + \ifcsvoid{ndu@repr@#2}{\csxdef{ndu@repr@#2}{0}}{}% + \ifthenelse{\equal{#3}{+}}{% + \nduConvertToRepr{#1}{tmp #2}{#4}% + \csxdef{ndu@repr@#2}{\bigintcalcAdd{\csuse{ndu@repr@#2}}{\csuse{ndu@repr@tmp #2}}}% + }{% + \ifthenelse{\equal{#3}{-}}{% + \nduConvertToRepr{#1}{tmp #2}{#4}% + \csxdef{ndu@repr@#2}{\bigintcalcSub{\csuse{ndu@repr@#2}}{\csuse{ndu@repr@tmp #2}}}% + }{% + \ifthenelse{\equal{#3}{*}}{% + \csxdef{ndu@repr@#2}{\bigintcalcMul{\csuse{ndu@repr@#2}}{#4}}% + }{% + \ifthenelse{\equal{#3}{/}}{% + \csxdef{ndu@repr@#2}{\bigintcalcDiv{\csuse{ndu@repr@#2}}{#4}}% + }{% + \PackageError{non-decimal-units}{Unrecognized math operator: #3}{Only + - * / are allowed.}% + }% + }% + }% + }% +} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\nduset{ + options/.cd, + british/.code={\input{non-decimal-units.british}}, + danish/.code={\input{non-decimal-units.danish}}, +} + +\ProcessPgfPackageOptions{/ndu/options} diff --git a/macros/latex/contrib/tcolorbox/CHANGES.md b/macros/latex/contrib/tcolorbox/CHANGES.md index 0f745b9cf1..dc5f00c259 100644 --- a/macros/latex/contrib/tcolorbox/CHANGES.md +++ b/macros/latex/contrib/tcolorbox/CHANGES.md @@ -22,6 +22,25 @@ and this project adheres to +## [6.1.0] - 2023-09-26 + +### Added +- New option `redirectlowerto` (issue #240) + +### Changed +- Added braces to protect square brackets, mostly for key values (issue #234, issue #229 continued) +- Internal `\__tcobox_include_graphics:nn` refactored (issue #236) +- `blend into` now also adapts `list type` accordingly, + e.g. `blend into=figures` now sets `list type=figure` (issue #238) +- `every box`, `every box on layer <n>`, and `every box on higher layers` may contain + `capture` mode settings now (issue #246) + +### Fixed +- With parbox=false, `\par` was ignored in a `tcolorbox` that starts a list (issue #245) +- `varwidth upper` ignored horizontal alignment of upper part (issze #247) + + + ## [6.0.4] - 2023-06-19 ### Changed @@ -33,7 +52,7 @@ and this project adheres to The implementation is adapted to avoid such a need at several places (issue #229) ### Fixed -- The last version war inconsistently numbered 6.0.2 and/or 6.0.3 (issue #224) +- The last version was inconsistently numbered 6.0.2 and/or 6.0.3 (issue #224) - New LaTeX versions (from 2023-06-01) remove `\parskip` at top of `minipage`. Therefore, `parbox=false` has to be adapted (issue #232) diff --git a/macros/latex/contrib/tcolorbox/README.md b/macros/latex/contrib/tcolorbox/README.md index f10bab1518..8700b6c322 100644 --- a/macros/latex/contrib/tcolorbox/README.md +++ b/macros/latex/contrib/tcolorbox/README.md @@ -1,4 +1,4 @@ -# The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +# The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) > Copyright (c) 2006-2023 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> diff --git a/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex b/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex index ff40e8aeb2..cd9e6961b2 100644 --- a/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbbreakable.code.tex: Code for breakable colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \RequirePackage{pdfcol} \pdfcolInitStack{tcb@breakable} @@ -81,6 +81,7 @@ \def\noexpand\@currenvline{\on@line}}% \reserved@a% \@endpefalse% + \global\@newlistfalse% \let\tcbbreak\tcb@@break% \iftcb@usecolorstack% \pdfcolSwitchStack{tcb@breakable}% diff --git a/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex b/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex index 8bcbd53738..f0463342ce 100644 --- a/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbdocumentation.code.tex: Code for LaTeX documentations %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \tcbuselibrary{listings,skins,xparse,external,raster} @@ -150,7 +150,7 @@ index colorize/.is if=tcb@doc@colorize,% index annotate/.is if=tcb@doc@annotate,% index command/.code={\def\kvtcb@index@command##1{#1{##1}}},% - index command name/.code={\def\kvtcb@index@command##1{\index[#1]{##1}}},% + index command name/.code={\def\kvtcb@index@command##1{\index[{#1}]{##1}}},% doc left/.dimstore in=\kvtcb@doc@left, doc right/.dimstore in=\kvtcb@doc@right, doc left indent/.dimstore in=\kvtcb@doc@indentleft, @@ -868,7 +868,7 @@ \setrefcountdefault{-1} \NewDocumentCommand\tcb@ref@doc{msm}{% - \hyperref[#1:#3]{\texttt{\ref*{#1:#3}}% + \hyperref[{#1:#3}]{\texttt{\ref*{#1:#3}}% \IfBooleanTF{#2}{}{% \ifnum\getpagerefnumber{#1:#3}=\thepage\relax% \else% @@ -899,12 +899,12 @@ \newcommand{\tcbdocmarginnote}[2][]{% \marginnote{% - \begin{tcolorbox}[enhanced jigsaw,size=fbox,boxrule=1pt,leftrule=0pt,rightrule=0pt, + \begin{tcolorbox}[{enhanced jigsaw,size=fbox,boxrule=1pt,leftrule=0pt,rightrule=0pt, arc=0pt,outer arc=1pt,boxsep=1pt,top=1pt,bottom=1pt, nobeforeafter,width=\marginparwidth, colframe=red!50!white,colback=red!25!yellow!5!white,fontupper=\scriptsize, if odd page or oneside={flushright upper}{flushleft upper}, - doc@marginnote,#1]#2\end{tcolorbox}}} + doc@marginnote,#1}]#2\end{tcolorbox}}} \newcommand*{\tcbdocnew}[1]{\kvtcb@text@new: #1} \newcommand*{\tcbdocupdated}[1]{\kvtcb@text@updated: #1} diff --git a/macros/latex/contrib/tcolorbox/tcbexternal.code.tex b/macros/latex/contrib/tcolorbox/tcbexternal.code.tex index 4385fde3f3..c0159db83f 100644 --- a/macros/latex/contrib/tcolorbox/tcbexternal.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbexternal.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbexternal.code.tex: Code for externalization %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \tcbuselibrary{pro@cessing} @@ -160,7 +160,7 @@ \tcb@newenvironment{#1}[2][]{% #4% \begingroup% - \tcbexternal[#3,##1,environment=#2]{##2}% + \tcbexternal[{#3,##1,environment=#2}]{##2}% }{% \endtcbexternal% \endgroup% diff --git a/macros/latex/contrib/tcolorbox/tcbfitting.code.tex b/macros/latex/contrib/tcolorbox/tcbfitting.code.tex index 50c2365616..118c77fb13 100644 --- a/macros/latex/contrib/tcolorbox/tcbfitting.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbfitting.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbfitting.code.tex: Code for fit boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \newdimen\tcbfitdim \newdimen\tcb@lowerfitdim @@ -368,7 +368,7 @@ } \newcommand{\tcboxfit}[2][]{% - \tcb@ox{capture=fitbox,#1}{#2}% + \tcb@ox{capture=fitbox}{#1}{#2}% } @@ -380,15 +380,15 @@ \__tcobox_process_newtcolorbox:nn { #2 }{ #3 } \tl_if_novalue:nTF { #4 } { - \exp_args:Nc #1 { #3 }{ \tcboxfit[#6,options@for=#3] } + \exp_args:Nc #1 { #3 }{ \tcboxfit[{#6,options@for=#3}] } } { \tl_if_novalue:nTF { #5 } { - \exp_args:Nc #1 { #3 }[ #4 ]{ \tcboxfit[#6,options@for=#3] } + \exp_args:Nc #1 { #3 }[ #4 ]{ \tcboxfit[{#6,options@for=#3}] } } { - \exp_args:Nc #1 { #3 }[ #4 ][ #5 ]{ \tcboxfit[#6,options@for=#3] } + \exp_args:Nc #1 { #3 }[ #4 ][ #5 ]{ \tcboxfit[{#6,options@for=#3}] } } } } diff --git a/macros/latex/contrib/tcolorbox/tcbhooks.code.tex b/macros/latex/contrib/tcolorbox/tcbhooks.code.tex index 2719bcdee5..bdf0a6c9f1 100644 --- a/macros/latex/contrib/tcolorbox/tcbhooks.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbhooks.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbhooks.code.tex: Code for adding hooks %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \tcbset{% before upper app/.code={\appto\kvtcb@before@upper{#1}},% diff --git a/macros/latex/contrib/tcolorbox/tcblistings.code.tex b/macros/latex/contrib/tcolorbox/tcblistings.code.tex index 029ae9dd7c..c1bc358d1b 100644 --- a/macros/latex/contrib/tcolorbox/tcblistings.code.tex +++ b/macros/latex/contrib/tcolorbox/tcblistings.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcblistings.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \RequirePackage{listings}[2007/02/22] diff --git a/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex b/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex index 8e368cf5ef..e95a98a8ed 100644 --- a/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex +++ b/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \tcbuselibrary{pro@cessing} diff --git a/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex b/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex index 92ac89148c..fa6f16bd1f 100644 --- a/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex +++ b/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8 %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \tcbuselibrary{listings} diff --git a/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex b/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex index 3f87d181a7..0e6efd9f71 100644 --- a/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbmagazine.code.tex: Code for box sets and magazine styles %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \tcbuselibrary{breakable} diff --git a/macros/latex/contrib/tcolorbox/tcbminted.code.tex b/macros/latex/contrib/tcolorbox/tcbminted.code.tex index 7982a67579..2115bf2f4b 100644 --- a/macros/latex/contrib/tcolorbox/tcbminted.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbminted.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbminted.code.tex: Code for colorboxes with listings %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \RequirePackage{minted}[2021/12/24] diff --git a/macros/latex/contrib/tcolorbox/tcbposter.code.tex b/macros/latex/contrib/tcolorbox/tcbposter.code.tex index 7cbfcc8e00..b6a139fde7 100644 --- a/macros/latex/contrib/tcolorbox/tcbposter.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbposter.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbposter.code.tex: Code for posters %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \tcbuselibrary{breakable,magazine,skins,fitting} @@ -131,9 +131,9 @@ \tcbdimto\tcb@poster@boxwidth{\tcb@poster@span\dimexpr\tcbpostercolwidth+\tcbpostercolspacing\relax-\tcbpostercolspacing}% \iftcb@posterbox@sequence% \begin{pgfinterruptpicture}% - \begin{tcolorbox}[tcb@poster@style,width=\tcb@poster@boxwidth,tcb@poster@boxheight, + \begin{tcolorbox}[{tcb@poster@style,width=\tcb@poster@boxwidth,tcb@poster@boxheight, height fixed for=all,#1, - enforce breakable,reset box array=tcb@poster,store to box array=tcb@poster]#3\end{tcolorbox}% + enforce breakable,reset box array=tcb@poster,store to box array=tcb@poster}]#3\end{tcolorbox}% \end{pgfinterruptpicture}% \def\tcb@poster@boxcount{0}% \renewcommand*{\do}[1]{\edef\tcb@poster@boxcount{\the\numexpr\tcb@poster@boxcount+1\relax}% @@ -153,8 +153,8 @@ \fi% \else% \begin{pgfinterruptpicture}% - \begin{tcolorbox}[tcb@poster@style,width=\tcb@poster@boxwidth,tcb@poster@boxheight,#1, - reset box array=tcb@poster,store to box array=tcb@poster]#3\end{tcolorbox}% + \begin{tcolorbox}[{tcb@poster@style,width=\tcb@poster@boxwidth,tcb@poster@boxheight,#1, + reset box array=tcb@poster,store to box array=tcb@poster}]#3\end{tcolorbox}% \end{pgfinterruptpicture}% \node[inner sep=0pt,outer sep=0,tcb@poster@node,name=\tcb@poster@prefix\tcb@poster@boxname] at (\tcb@poster@xpos|-\tcb@poster@ypos) {\consumeboxarray[tcb@poster]{1}};% @@ -166,7 +166,7 @@ } \newenvironment{tcb@poster@boxenv}[2][]{% - \newcommand{\tcb@poster@box@saved}{\posterbox[#1]{#2}{\tcbusetemp}}% + \newcommand{\tcb@poster@box@saved}{\posterbox[{#1}]{#2}{\tcbusetemp}}% \tcbwritetemp}% {\endtcbwritetemp\tcb@poster@box@saved} diff --git a/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex b/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex index e57b443469..83f0ec2cb5 100644 --- a/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbprocessing.code.tex: Code for conditional processing %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \RequirePackage{pdftexcmds} \RequirePackage{shellesc} diff --git a/macros/latex/contrib/tcolorbox/tcbraster.code.tex b/macros/latex/contrib/tcolorbox/tcbraster.code.tex index a105b6c014..07f58e0c0b 100644 --- a/macros/latex/contrib/tcolorbox/tcbraster.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbraster.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \newcounter{tcbrastercolumn} \newcounter{tcbrasterrow} @@ -229,24 +229,24 @@ } \newcommand{\tcbitem@following}[1][]{% - \end{tcolorbox}\begin{tcolorbox}[#1]% + \end{tcolorbox}\begin{tcolorbox}[{#1}]% } \newcommand{\tcbitem@first}[1][]{% \let\tcbitem=\tcbitem@following% - \begin{tcolorbox}[#1]% + \begin{tcolorbox}[{#1}]% } \newenvironment{tcbitemize}[1][]{% - \begin{tcbraster}[#1]% + \begin{tcbraster}[{#1}]% \let\tcb@raster@change@fitbox=\tcb@raster@change@hbox% \let\tcbitem=\tcbitem@first% }{\end{tcolorbox}\end{tcbraster}} \newenvironment{tcboxedraster}[2][]{% - \tcolorbox[{#2}]\begin{tcbraster}[#1]}% + \tcolorbox[{#2}]\begin{tcbraster}[{#1}]}% {\end{tcbraster}\endtcolorbox} \newenvironment{tcboxeditemize}[2][]{% - \tcolorbox[{#2}]\tcbitemize[#1]}% + \tcolorbox[{#2}]\tcbitemize[{#1}]}% {\endtcbitemize\endtcolorbox} diff --git a/macros/latex/contrib/tcolorbox/tcbskins.code.tex b/macros/latex/contrib/tcolorbox/tcbskins.code.tex index 371605cb6a..51a7722f77 100644 --- a/macros/latex/contrib/tcolorbox/tcbskins.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbskins.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbskins.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \RequirePackage{tikz}[2010/10/13] \RequirePackage{tikzfill.image} @@ -1720,11 +1720,9 @@ \cs_new:Npn \__tcobox_include_graphics:nn #1#2 { - \tl_set:Nn \l_tmpa_tl { \includegraphics } - \tl_put_right:Nx \l_tmpa_tl { [#1] } - \l_tmpa_tl {#2} + \includegraphics [#1] {#2} } - +\cs_generate_variant:Nn \__tcobox_include_graphics:nn {en} \cs_new:Npn \__tcobox_include_graphics: { @@ -1734,7 +1732,7 @@ { \hbox_set:Nn \l_tmpa_box { - \__tcobox_include_graphics:nn { \l__tcobox_graphics_options_tl }{ \imagepath } + \__tcobox_include_graphics:en { \l__tcobox_graphics_options_tl }{ \imagepath } } \if_case:w \kvtcb@graphics@orientation \dim_compare:nNnT {\box_wd:N\l_tmpa_box} < {\box_ht_plus_dp:N \l_tmpa_box} @@ -1763,21 +1761,21 @@ { \tcbox { - \__tcobox_include_graphics:nn { \l__tcobox_graphics_options_tl }{ \imagepath } + \__tcobox_include_graphics:en { \l__tcobox_graphics_options_tl }{ \imagepath } } } { \legacy_if:nTF {tcb@fixedheight} { \begin{tcolorbox} - \__tcobox_include_graphics:nn { \l__tcobox_graphics_options_tl,width=\linewidth,height=\tcbtextheight,keepaspectratio }{ \imagepath } + \__tcobox_include_graphics:en { \l__tcobox_graphics_options_tl,width=\linewidth,height=\tcbtextheight,keepaspectratio }{ \imagepath } \end{tcolorbox} } { \tl_if_empty:NTF \tcb@height@adjust { \begin{tcolorbox} - \__tcobox_include_graphics:nn { \l__tcobox_graphics_options_tl,width=\linewidth }{ \imagepath } + \__tcobox_include_graphics:en { \l__tcobox_graphics_options_tl,width=\linewidth }{ \imagepath } \end{tcolorbox}% }{% height fill \begin{tcolorbox}[ @@ -1899,7 +1897,7 @@ }\fi} \tcbset{% - hyperref node/.style 2 args={finish={\tcbhypernode{\hyperref[#1]}{#2}}}, + hyperref node/.style 2 args={finish={\tcbhypernode{\hyperref[{#1}]}{#2}}}, hyperref/.style={hyperref node={#1}{frame}}, hyperref interior/.style={hyperref node={#1}{interior}}, hyperref title/.style={hyperref node={#1}{title}}, @@ -1911,7 +1909,7 @@ hyperurl/.style={hyperurl node={#1}{frame}}, hyperurl interior/.style={hyperurl node={#1}{interior}}, hyperurl title/.style={hyperurl node={#1}{title}}, - hyperurl* node/.style n args={3}{finish={\tcbhypernode{\href[#1]{#2}}{#3}}}, + hyperurl* node/.style n args={3}{finish={\tcbhypernode{\href[{#1}]{#2}}{#3}}}, hyperurl*/.style 2 args={hyperurl* node={#1}{#2}{frame}}, hyperurl* interior/.style 2 args={hyperurl* node={#1}{#2}{interior}}, hyperurl* title/.style 2 args={hyperurl* node={#1}{#2}{title}}, diff --git a/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex b/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex index 75e971229d..2a0e642acb 100644 --- a/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \tcbuselibrary{skins} diff --git a/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex b/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex index 7f7f04e5f0..7e93b7ddcd 100644 --- a/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbtheorems.code.tex: Code for theorems in colorboxes %% %% ------------------------------------------------------------------------------------------- @@ -18,7 +18,7 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \RequirePackage{amsmath} @@ -149,7 +149,7 @@ \NewDocumentCommand \__tcobox_new_tcbtheorem_x:w { m O{} m m +m m } { - #1 [auto~counter,#2] {#3} { +O{} +o +m m } + #1 [{auto~counter,#2}] {#3} { +O{} +o +m m } { #5, title = {\__tcobox_theo_title:nnn{#4}{\thetcbcounter}{##3}}, @@ -165,7 +165,7 @@ theo@label = {#6}{##4}, ##1 } - #1 [#2,no~counter,list~inside=] {#3*} { +O{} +m } + #1 [{#2,no~counter,list~inside=}] {#3*} { +O{} +m } { #5, title = {\__tcobox_theo_title:nnn{#4}{}{##2}}, diff --git a/macros/latex/contrib/tcolorbox/tcbvignette.code.tex b/macros/latex/contrib/tcolorbox/tcbvignette.code.tex index d9346b8fb9..c67a25d5c1 100644 --- a/macros/latex/contrib/tcolorbox/tcbvignette.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbvignette.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbvignette.code.tex: Code for ornamental frames %% %% ------------------------------------------------------------------------------------------- @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \tcbuselibrary{skins} diff --git a/macros/latex/contrib/tcolorbox/tcbxparse.code.tex b/macros/latex/contrib/tcolorbox/tcbxparse.code.tex index 0d5b4e9c99..22587ac90f 100644 --- a/macros/latex/contrib/tcolorbox/tcbxparse.code.tex +++ b/macros/latex/contrib/tcolorbox/tcbxparse.code.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcbxparse.code.tex: Code for xparse features %% %% ------------------------------------------------------------------------------------------- @@ -18,6 +18,6 @@ %% This work consists of all files listed in README %% %\makeatletter -\tcb@set@library@version{6.0.4} +\tcb@set@library@version{6.1.0} \RequirePackage{xparse}[2013/12/31] diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf Binary files differindex 835856cf6c..cd31a6eb52 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf +++ b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex index 173c6cec7d..9c80fc806d 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcolorbox-example-poster.tex: a poster example for tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf Binary files differindex 6f6bee5440..a2ebd3ede7 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf +++ b/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example.tex b/macros/latex/contrib/tcolorbox/tcolorbox-example.tex index e797fcb0a3..35a2e1de65 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox-example.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox-example.tex @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcolorbox-example.tex: an example for tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf Binary files differindex c2b0d9a915..b9398ca269 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf +++ b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex index 913509b21d..cb97de9e58 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex @@ -1,5 +1,5 @@ % \LaTeX-Main\ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcolorbox-tutorial-poster.tex: a tutorial for poster creation with tcolorbox %% %% ------------------------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex index 4be5dc76c8..9144696d2c 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex @@ -346,6 +346,31 @@ Now, we load the saved text:\\ \end{exdispExample} \end{docTcbKey} + +\clearpage +\begin{docTcbKey}[][doc new=2023-07-17]{redirectlowerto}{=\meta{file name}}{no default, initially empty} + This is a combination of \refKey{/tcb/savelowerto} and \refKey{/tcb/lowerbox}|=|\docValue{ignored} + \emph{and additionally} avoids typesetting the content of the lower part. + This can be useful, if the lower part contains counters or similar. +\begin{exdispExample}{redirectlowerto} + +\setcounter{enumi}{1} +Test counter: \theenumi + +\begin{tcolorbox}[redirectlowerto=\jobname_bspsave.tex,colback=white] +This is a \textbf{tcolorbox}. +\tcblower +This is the lower part.\stepcounter{enumi} +New value of test counter: \theenumi. +\end{tcolorbox} + +Now, we load the saved text:\\ +\input{\jobname_bspsave.tex} +\end{exdispExample} +\end{docTcbKey} + + + \clearpage \begin{docTcbKey}{lower separated}{\colOpt{=true\textbar false}}{default |true|, initially |true|} If set to |true|, the lower part is visually separated from the upper part. diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex index 1491edd0d6..b068d58eaf 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex @@ -210,13 +210,14 @@ With \texttt{varioref}:\\ \clearpage -\begin{newTcbKey}[][doc new=2014-09-19]{blend into}{=\meta{name}}{style, no default, initially unset} +\begin{newTcbKey}[][doc new and updated={2014-09-19}{2023-07-03}]{blend into}{=\meta{name}}{style, no default, initially unset} Used to comfortably blend into an existing schema of naming and numbering for some selected cases. For example, a |tcolorbox| can be used to display and entitle an image pretending to be a standard |figure| environment. Here, \refKey{/tcb/title} is used instead of the standard |\caption| and \refKey{/tcb/list text} can be used instead of the optional parameter of the standard |\caption|. +Also, \refKey{/tcb/new/list type} is automatically adapted (changed with version 6.0.5). Feasible values for \meta{name} are: \begin{itemize} diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.pdf b/macros/latex/contrib/tcolorbox/tcolorbox.pdf Binary files differindex 78d303ac4a..f9e23664ce 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.pdf +++ b/macros/latex/contrib/tcolorbox/tcolorbox.pdf diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.sty b/macros/latex/contrib/tcolorbox/tcolorbox.sty index 82823ed2e8..812b9dcc90 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.sty +++ b/macros/latex/contrib/tcolorbox/tcolorbox.sty @@ -1,4 +1,4 @@ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcolorbox.sty: Text color boxes %% %% ------------------------------------------------------------------------------------------- @@ -18,8 +18,8 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e}[2020/10/01] -\ProvidesPackage{tcolorbox}[2023/06/19 version 6.0.4 text color boxes] -\def\tcb@version{6.0.4} +\ProvidesPackage{tcolorbox}[2023/09/26 version 6.1.0 text color boxes] +\def\tcb@version{6.1.0} \RequirePackage{pgf}[2008/01/15] \RequirePackage{verbatim}[2003/08/22] @@ -29,6 +29,7 @@ % register \newif\iftcb@lowerignored \newif\iftcb@lowervisible +\newif\iftcb@redirectlowerto \newif\iftcb@uppervisible \newif\iftcb@titlevisible \newif\iftcb@hasTitle @@ -285,7 +286,8 @@ fontupper/.store in=\kvtcb@fontupper, fontlower/.store in=\kvtcb@fontlower, tempfile/.store in=\kvtcb@tempfile, - savelowerto/.store in=\kvtcb@savelowerto, + savelowerto/.code={\tcb@redirectlowertofalse\def\kvtcb@savelowerto{#1}}, + redirectlowerto/.code={\tcb@lowerignoredtrue\tcb@lowervisiblefalse\tcb@redirectlowertotrue\def\kvtcb@savelowerto{#1}}, saveto/.store in=\kvtcb@saveupperto, savedelimiter/.estore in=\kvtcb@savedelimiter, floatplacement/.store in=\kvtcb@floatplacement, @@ -681,8 +683,14 @@ tikznode upper/.style={before upper={\centering\tcb@shield@externalize\begin{tikzpicture}\node[{align=center,inner sep=\z@,outer sep=\z@,#1}]\bgroup},after upper={\egroup;\end{tikzpicture}}},% tikznode lower/.style={before lower={\centering\tcb@shield@externalize\begin{tikzpicture}\node[{align=center,inner sep=\z@,outer sep=\z@,#1}]\bgroup},after lower={\egroup;\end{tikzpicture}}},% tikznode/.style={tikznode upper={#1},tikznode lower={#1}},% - varwidth upper/.style={before upper={\tcbdimto\tcb@w@upper{#1-(\kvtcb@left@rule+\kvtcb@right@rule+(\kvtcb@boxsep)*2+\kvtcb@leftupper+\kvtcb@rightupper)}% - \begin{varwidth}{\tcb@w@upper}},after upper={\end{varwidth}}},% + varwidth upper/.style={% + before upper={% + \tcbdimto\tcb@w@upper{#1-(\kvtcb@left@rule+\kvtcb@right@rule+(\kvtcb@boxsep)*2+\kvtcb@leftupper+\kvtcb@rightupper)}% + \begin{varwidth}{\tcb@w@upper}% + \kvtcb@halignupper% + },% + after upper={\end{varwidth}}% + },% varwidth upper/.default=\kvtcb@width, text fill/.style={before upper={% \ifdim\dimexpr\tcbtextheight>\z@\relax% @@ -808,11 +816,11 @@ hypertarget/.style={phantom={\ifdefined\hypertarget\Hy@raisedlink{\hypertarget{#1}{}}\fi}}, bookmark*/.style 2 args={phantom={\ifdefined\bookmark% \Hy@raisedlink{\hypertarget{tcb@\thetcolorboxnumber}{}}% - \bookmark[dest=tcb@\thetcolorboxnumber,rellevel=1,keeplevel,#1]{#2}% + \bookmark[{dest=tcb@\thetcolorboxnumber,rellevel=1,keeplevel,#1}]{#2}% \fi}}, bookmark/.style={bookmark*={}{#1}}, index/.style={phantom={\index{#1}}},% - index*/.style 2 args={phantom={\index[#1]{#2}}},% + index*/.style 2 args={phantom={\index[{#1}]{#2}}},% add to list/.style 2 args={phantom={\tcb@addcontentsline{#1}{#2}}}, nophantom/.code={\def\kvtcb@phantom{}},% shield externalize/.is choice, @@ -987,6 +995,7 @@ \let\tcb@parboxrestore=\@parboxrestore \def\tcb@parbox@false@settings{% + \let\par\@@par% \linewidth\hsize% \@totalleftmargin\z@% \leftskip\z@skip% @@ -1022,7 +1031,8 @@ \def\noexpand\@currenvline{\on@line}}% \reserved@a \@endpefalse% - \let\tcbbreak\par% + \global\@newlistfalse% + \let\tcbbreak\@@par% \csname tcb@parbox@use@\kvtcb@parbox\endcsname% \tcb@minipage{#2}% \color{#3}% @@ -1388,8 +1398,9 @@ } \long\def\tcb@@icolorbox[#1]{% + \tcbset{capture=minipage}% \tcb@layer@inc% - \tcb@apply@box@options{capture=minipage,#1}\tcb@height@adjust% + \tcb@apply@box@options{#1}\tcb@height@adjust% \tcb@hasLowerfalse% \csname tcb@@capture@\kvtcb@capture\endcsname% } @@ -2059,17 +2070,18 @@ \long\def\tcbox@inner@v@@d#1{}% -\long\def\tcb@ox#1#2{% +\long\def\tcb@ox#1#2#3{% \begingroup% + \tcbset{#1}% \tcb@layer@inc% - \tcb@apply@box@options{#1,breakable@false,sidebyside@false}\tcb@height@adjust% - \csname tcbox@inner@\kvtcb@capture\endcsname{#2}% + \tcb@apply@box@options{#2,breakable@false,sidebyside@false}\tcb@height@adjust% + \csname tcbox@inner@\kvtcb@capture\endcsname{#3}% \tcb@layer@dec% \endgroup% } \newcommand{\tcbox}[2][]{% - \tcb@ox{capture=hbox,#1}{#2}% + \tcb@ox{capture=hbox}{#1}{#2}% } \newcommand{\tcbsubtitle}[2][]{% @@ -2089,14 +2101,14 @@ \let\tcb@trans@bottom\kvtcb@bottomtitle% \let\tcb@trans@rule\kvtcb@title@rule% \let\tcb@trans@style\kvtcb@subtitle@style% - \begin{tcolorbox}[sharp corners, + \begin{tcolorbox}[{sharp corners, before skip={0.5\baselineskip},after skip={0.5\baselineskip}, colframe=tcbtranscol@frame,colback=tcbtranscol@back, colupper=tcbtranscol@upper,fontupper=\tcb@trans@fontupper, boxsep=\tcb@trans@boxsep,left=\tcb@trans@left,right=\tcb@trans@right, top=\tcb@trans@top,bottom=\tcb@trans@bottom, boxrule=\tcb@trans@rule,leftrule=\z@,rightrule=\z@,oversize, - code={\pgfkeysalsofrom\tcb@trans@style},#1]% + code={\pgfkeysalsofrom\tcb@trans@style},#1}]% #2% \end{tcolorbox}% \endgroup% @@ -2140,9 +2152,24 @@ Crefname/.code n args={2}{\begingroup\edef\x{\endgroup\noexpand\Crefname{\tcb@new@boxname}}\x{#1}{#2}\tcb@new@label@type}, % blend into/.is choice,% - blend into/figures/.style={use counter*=figure,list inside=lof,/tcb/code={\appto\tcb@new@colopt{,before title={\tcb@blend@beforetitle{\fnum@figure}}}}},% - blend into/tables/.style={use counter*=table,list inside=lot,/tcb/code={\appto\tcb@new@colopt{,before title={\tcb@blend@beforetitle{\fnum@table}}}}},% - blend into/listings/.style={use counter*=lstlisting,list inside=lol,/tcb/code={\appto\tcb@new@colopt{,before title={\tcb@blend@beforetitle{\lstlistingname~\thetcbcounter}}}}},% + blend into/figures/.style={% + use counter* = figure, + list inside = lof, + list type = figure, + /tcb/code={\appto\tcb@new@colopt{,before title={\tcb@blend@beforetitle{\fnum@figure}}}}% + },% + blend into/tables/.style={% + use counter* = table, + list inside = lot, + list type = table, + /tcb/code={\appto\tcb@new@colopt{,before title={\tcb@blend@beforetitle{\fnum@table}}}}% + },% + blend into/listings/.style={% + use counter* = lstlisting, + list inside = lol, + list type = lstlisting, + /tcb/code={\appto\tcb@new@colopt{,before title={\tcb@blend@beforetitle{\lstlistingname~\thetcbcounter}}}}% + },% % reset@new/.style={no counter,number within=,number format=\arabic,number freestyle=, list inside=,list type=tcolorbox,init@hook@clear,reset counter on overlays=false}, @@ -2497,7 +2524,7 @@ #1{#4} } { - #1[#3]{#4} + #1[{#3}]{#4} } } \@starttoc{#2} @@ -2583,8 +2610,10 @@ \def\tcb@endlowerverbatimanddraw{% \endtcbverbatimwrite% \endgroup% - \IfFileExists{\kvtcb@savelowerto}{% - \tcb@savelowerbox\input{\kvtcb@savelowerto}\end{tcb@savebox}}{}% + \iftcb@redirectlowerto\else% + \IfFileExists{\kvtcb@savelowerto}{% + \tcb@savelowerbox\input{\kvtcb@savelowerto}\end{tcb@savebox}}{}% + \fi% \tcb@draw@color@box% \tcb@finalize@environment% } diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.tex b/macros/latex/contrib/tcolorbox/tcolorbox.tex index 6adbe6e8cf..be4bd0afc7 100644 --- a/macros/latex/contrib/tcolorbox/tcolorbox.tex +++ b/macros/latex/contrib/tcolorbox/tcolorbox.tex @@ -1,5 +1,5 @@ % \LaTeX-Main\ -%% The LaTeX package tcolorbox - version 6.0.4 (2023/06/19) +%% The LaTeX package tcolorbox - version 6.1.0 (2023/09/26) %% tcolorbox.tex: Manual %% %% ------------------------------------------------------------------------------------------- @@ -51,8 +51,8 @@ \setlength{\bibitemsep}{\smallskipamount} \addbibresource{tcolorbox.doc.bib} -\def\version{6.0.4}% -\def\datum{2023/06/19}% +\def\version{6.1.0}% +\def\datum{2023/09/26}% \makeindex \hypersetup{ |