summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-01-28 03:00:53 +0000
committerNorbert Preining <norbert@preining.info>2024-01-28 03:00:53 +0000
commit7084e3008c8fc947579f46c6b8a08dfd180e72ef (patch)
tree9c99041cba4afefac3859d6a2fe4cea289458468 /macros/latex
parentb93d257f657e619e22b8b7a27446118ce041727e (diff)
CTAN sync 202401280300
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/babel-contrib/scottish/README.md15
-rw-r--r--macros/latex/contrib/babel-contrib/scottish/scottish.dtx70
-rw-r--r--macros/latex/contrib/babel-contrib/scottish/scottish.ins37
-rw-r--r--macros/latex/contrib/babel-contrib/scottish/scottish.pdfbin113507 -> 124268 bytes
-rw-r--r--macros/latex/contrib/regulatory/doc/example1-en.pdfbin25767 -> 25756 bytes
-rw-r--r--macros/latex/contrib/regulatory/doc/example1-nl.pdfbin25612 -> 25600 bytes
-rw-r--r--macros/latex/contrib/regulatory/doc/example2-en.pdfbin52584 -> 52555 bytes
-rw-r--r--macros/latex/contrib/regulatory/doc/example2-nl.pdfbin52617 -> 52599 bytes
-rw-r--r--macros/latex/contrib/regulatory/doc/regulatory-en.pdfbin224493 -> 227678 bytes
-rw-r--r--macros/latex/contrib/regulatory/doc/regulatory-en.tex2
-rw-r--r--macros/latex/contrib/regulatory/doc/regulatory-nl.pdfbin226188 -> 228133 bytes
-rw-r--r--macros/latex/contrib/regulatory/doc/regulatory-nl.tex2
-rw-r--r--macros/latex/contrib/regulatory/doc/regulatory.tex10
-rw-r--r--macros/latex/contrib/regulatory/tex/fc-dutch.def487
-rw-r--r--macros/latex/contrib/regulatory/tex/regulatory.sty2
15 files changed, 263 insertions, 362 deletions
diff --git a/macros/latex/contrib/babel-contrib/scottish/README.md b/macros/latex/contrib/babel-contrib/scottish/README.md
new file mode 100644
index 0000000000..24daf397bd
--- /dev/null
+++ b/macros/latex/contrib/babel-contrib/scottish/README.md
@@ -0,0 +1,15 @@
+Scottish Gaelic 1.0h
+--------------------
+
+This is the babel style for Scottish Gaelic.
+
+**This package is NOT being actively maintained, but bugs might
+got fixed if you report them. If you want to take over maintenance
+of this language style, please contact me at
+https://latex3.github.io/babel/contact.html .**
+
+Changes 1.0h
+------------
+
+Allow scottishgaelic as the language name, preferred to scottish.
+
diff --git a/macros/latex/contrib/babel-contrib/scottish/scottish.dtx b/macros/latex/contrib/babel-contrib/scottish/scottish.dtx
index 82613e5cd0..2f9321c7e4 100644
--- a/macros/latex/contrib/babel-contrib/scottish/scottish.dtx
+++ b/macros/latex/contrib/babel-contrib/scottish/scottish.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2024 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -16,17 +16,12 @@
%
% This work has the LPPL maintenance status "maintained".
%
-% The Current Maintainer of this work is Johannes Braams.
-%
-% The list of all files belonging to the Babel system is
-% given in the file `manifest.bbl. See also `legal.bbl' for additional
-% information.
+% The Current Maintainer of this work is Javier Bezos.
%
% The list of derived (unpacked) files belonging to the distribution
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{95}
%
% \iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
@@ -34,18 +29,17 @@
%<*dtx>
\ProvidesFile{scottish.dtx}
%</dtx>
-%<code>\ProvidesLanguage{scottish}
+%<code>\ProvidesLanguage{scottishgaelic}
+%<scottish>\ProvidesLanguage{scottish}
%\fi
%\ProvidesFile{scottish.dtx}
- [2005/03/31 v1.0g Scottish support from the babel system]
+ [2024/01/27 v1.0h Scottish support from the babel system]
%\iffalse
%% File `scottish.dtx'
%% Babel package for LaTeX version 2e
%% Copyright (C) 1989 -- 2005
%% by Johannes Braams, TeXniek
-%
-%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% by Javier Bezos
%
% This file is part of the babel system, it provides the source
% code for the Scottish language definition file.
@@ -67,6 +61,7 @@
%\fi
% \GetFileInfo{scottish.dtx}
%
+% \changes{scottish-1.0h}{2024/01/27}{Dual load scottishgaelic/scottish}
% \changes{scottish-1.0b}{1995/06/14}{Corrected typos (PR1652)}
% \changes{scottish-1.0d}{1996/10/10}{Replaced \cs{undefined} with
% \cs{@undefined} and \cs{empty} with \cs{@empty} for consistency
@@ -93,7 +88,7 @@
% initial checks}
% \begin{macrocode}
%<*code>
-\LdfInit{scottish}\captionsscottish
+\LdfInit\CurrentOption{date\CurrentOption}
% \end{macrocode}
%
% When this file is read as an option, i.e. by the |\usepackage|
@@ -103,9 +98,19 @@
% here.
%
% \begin{macrocode}
-\ifx\l@scottish\@undefined
- \@nopatterns{scottish}
- \adddialect\l@scottish0\fi
+\ifx\l@scottishgaelic\@undefined
+ \ifx\l@scottish\@undefined
+ \@nopatterns{Scottish Gaelic}
+ \adddialect\l@scottishgaelic\z@
+ \let\l@scottish\l@scottishgaelic
+ \else
+ \let\l@scottishgaelic\l@scottish
+ \fi
+\else
+ \ifx\l@scottish\@undefined
+ \let\l@scottish\l@scottishgaelic
+ \fi
+\fi
% \end{macrocode}
% The next step consists of defining commands to switch to (and
% from) the Scottish language.
@@ -117,7 +122,7 @@
% AMS-\LaTeX}
% \changes{scottish-1.0g}{2000/09/20}{Added \cs{glossaryname}}
% \begin{macrocode}
-\addto\captionsscottish{%
+\@namedef{captions\CurrentOption}{%
\def\prefacename{Preface}% <-- needs translation
\def\refname{Iomraidh}%
\def\abstractname{Br\`{\i}gh}%
@@ -151,7 +156,7 @@
% \changes{scottish-1.0e}{1998/03/28}{use \cs{def} instead of
% \cs{edef}}
% \begin{macrocode}
-\def\datescottish{%
+\@namedef{date\CurrentOption}{%
\def\today{%
\number\day\space \ifcase\month\or
am Faoilteach\or an Gearran\or am M\`art\or an Giblean\or
@@ -172,8 +177,8 @@
% definition files.
%
% \begin{macrocode}
-\addto\extrasscottish{}
-\addto\noextrasscottish{}
+\expandafter\addto\csname extras\CurrentOption\endcsname{}
+\expandafter\addto\csname noextras\CurrentOption\endcsname{}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -185,25 +190,16 @@
% \changes{scottish-1.0d}{1996/11/03}{Now use \cs{ldf@finish} to wrap
% up}
% \begin{macrocode}
-\ldf@finish{scottish}
+\ldf@finish{\CurrentOption}
%</code>
+% Finally, We create a proxy file.
+%
+% \begin{macrocode}
+%<*scottish>
+\input scottishgaelic.ldf\relax
+%</scottish>
% \end{macrocode}
%
% \Finale
%\endinput
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
+
diff --git a/macros/latex/contrib/babel-contrib/scottish/scottish.ins b/macros/latex/contrib/babel-contrib/scottish/scottish.ins
index 5937bb1c44..232b3ca018 100644
--- a/macros/latex/contrib/babel-contrib/scottish/scottish.ins
+++ b/macros/latex/contrib/babel-contrib/scottish/scottish.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2024 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -19,11 +19,7 @@
%%
%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainer of this work is Johannes Braams.
-%%
-%% The list of all files belonging to the LaTeX base distribution is
-%% given in the file `manifest.bbl. See also `legal.bbl' for additional
-%% information.
+%% The Current Maintainer of this work is Javier Bezos.
%%
%% The list of derived (unpacked) files belonging to the distribution
%% and covered by LPPL is defined by the unpacking scripts (with
@@ -31,7 +27,7 @@
%%
%% --------------- start of docstrip commands ------------------
%%
-\def\filedate{1999/04/11}
+\def\filedate{2014/01/27}
\def\batchfile{scottish.ins}
\input docstrip.tex
@@ -53,7 +49,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2024 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -69,15 +65,7 @@ version 2003/12/01 or later.
This work has the LPPL maintenance status "maintained".
-The Current Maintainer of this work is Johannes Braams.
-
-This file may only be distributed together with a copy of the Babel
-system. You may however distribute the Babel system without
-such generated files.
-
-The list of all files belonging to the Babel distribution is
-given in the file `manifest.bbl'. See also `legal.bbl for additional
-information.
+The Current Maintainer of this work is Javier Bezos.
The list of derived (unpacked) files belonging to the distribution
and covered by LPPL is defined by the unpacking scripts (with
@@ -87,7 +75,7 @@ extension .ins) which are part of the distribution.
\declarepreamble\fdpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2024 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -103,15 +91,7 @@ version 2003/12/01 or later.
This work has the LPPL maintenance status "maintained".
-The Current Maintainer of this work is Johannes Braams.
-
-This file may only be distributed together with a copy of the Babel
-system. You may however distribute the Babel system without
-such generated files.
-
-The list of all files belonging to the Babel distribution is
-given in the file `manifest.bbl'. See also `legal.bbl for additional
-information.
+The Current Maintainer of this work is Javier Bezos.
In particular, permission is granted to customize the declarations in
this file to serve the needs of your installation.
@@ -126,7 +106,8 @@ of this file under its original name.
\usedir{tex/generic/babel}
\usepreamble\mainpreamble
-\generate{\file{scottish.ldf}{\from{scottish.dtx}{code}}
+\generate{\file{scottishgaelic.ldf}{\from{scottish.dtx}{code}}
+ \file{scottish.ldf}{\from{scottish.dtx}{scottish}}
}
\usepreamble\fdpreamble
diff --git a/macros/latex/contrib/babel-contrib/scottish/scottish.pdf b/macros/latex/contrib/babel-contrib/scottish/scottish.pdf
index c478ec3454..03443b04d7 100644
--- a/macros/latex/contrib/babel-contrib/scottish/scottish.pdf
+++ b/macros/latex/contrib/babel-contrib/scottish/scottish.pdf
Binary files differ
diff --git a/macros/latex/contrib/regulatory/doc/example1-en.pdf b/macros/latex/contrib/regulatory/doc/example1-en.pdf
index 0e08431dbf..7bac5e0c9b 100644
--- a/macros/latex/contrib/regulatory/doc/example1-en.pdf
+++ b/macros/latex/contrib/regulatory/doc/example1-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/regulatory/doc/example1-nl.pdf b/macros/latex/contrib/regulatory/doc/example1-nl.pdf
index 63522191b7..bc3f8b1d53 100644
--- a/macros/latex/contrib/regulatory/doc/example1-nl.pdf
+++ b/macros/latex/contrib/regulatory/doc/example1-nl.pdf
Binary files differ
diff --git a/macros/latex/contrib/regulatory/doc/example2-en.pdf b/macros/latex/contrib/regulatory/doc/example2-en.pdf
index bc253e499b..e7fdc77178 100644
--- a/macros/latex/contrib/regulatory/doc/example2-en.pdf
+++ b/macros/latex/contrib/regulatory/doc/example2-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/regulatory/doc/example2-nl.pdf b/macros/latex/contrib/regulatory/doc/example2-nl.pdf
index be0484a77c..6342318259 100644
--- a/macros/latex/contrib/regulatory/doc/example2-nl.pdf
+++ b/macros/latex/contrib/regulatory/doc/example2-nl.pdf
Binary files differ
diff --git a/macros/latex/contrib/regulatory/doc/regulatory-en.pdf b/macros/latex/contrib/regulatory/doc/regulatory-en.pdf
index 11f032e016..ac592a4989 100644
--- a/macros/latex/contrib/regulatory/doc/regulatory-en.pdf
+++ b/macros/latex/contrib/regulatory/doc/regulatory-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/regulatory/doc/regulatory-en.tex b/macros/latex/contrib/regulatory/doc/regulatory-en.tex
index 0ec1ac52b9..55d4290753 100644
--- a/macros/latex/contrib/regulatory/doc/regulatory-en.tex
+++ b/macros/latex/contrib/regulatory/doc/regulatory-en.tex
@@ -23,7 +23,7 @@
\documentclass[10pt,english]{ltxdoc}
%! suppress = InclusionLoop
-\usepackage[md]{regulatory}
+\usepackage{regulatory}
\usepackage{tabularx}
\usepackage[english,dutch]{babel}
diff --git a/macros/latex/contrib/regulatory/doc/regulatory-nl.pdf b/macros/latex/contrib/regulatory/doc/regulatory-nl.pdf
index 334e4f3c55..9d4832ce44 100644
--- a/macros/latex/contrib/regulatory/doc/regulatory-nl.pdf
+++ b/macros/latex/contrib/regulatory/doc/regulatory-nl.pdf
Binary files differ
diff --git a/macros/latex/contrib/regulatory/doc/regulatory-nl.tex b/macros/latex/contrib/regulatory/doc/regulatory-nl.tex
index af6a3e7941..f5c9f47259 100644
--- a/macros/latex/contrib/regulatory/doc/regulatory-nl.tex
+++ b/macros/latex/contrib/regulatory/doc/regulatory-nl.tex
@@ -23,7 +23,7 @@
\documentclass[10pt,dutch]{ltxdoc}
%! suppress = InclusionLoop
-\usepackage[md]{regulatory}
+\usepackage{regulatory}
\usepackage{tabularx}
\usepackage[dutch,english]{babel}
diff --git a/macros/latex/contrib/regulatory/doc/regulatory.tex b/macros/latex/contrib/regulatory/doc/regulatory.tex
index ffb0ce5ecb..fbd5d35c3d 100644
--- a/macros/latex/contrib/regulatory/doc/regulatory.tex
+++ b/macros/latex/contrib/regulatory/doc/regulatory.tex
@@ -175,11 +175,17 @@ lualatex main
for subparagraphs.%
}{, voor onderdelen.}
\translation{%
- For ``subparagraphs'', \cmd{\abalpnum} from the \package{fmtcount} package is used to enumerate multiple subparagraphs.
+ For ``subparagraphs'', \cmd{\abalpnum} from the \package{fmtcount}\footnote{%
+ The Dutch language definition is currently in progress within the \href{https://github.com/vincentb1/fmtcount/pull/51}{\package{fmtcount}} package.
+ In the meantime, this package includes the correct configuration for it.%
+ } package is used to enumerate multiple subparagraphs.
Suppose \cmd{\alph} were used; in that case, \option{paras} (second level) would be limited to 26 subparagraphs.
With \cmd{\abalphnum}, for example, with a value of 125, the result is `\texttt{du}'.
}{%
- Voor onderdelen wordt er gebruik gemaakt van \cmd{\abalpnum} uit pakket \package{fmtcount}\footnote{Het pakket \package{fmtcount} heeft geen ondersteuning voor Nederlands. Dit pakket levert daarvoor de juist configuratie mee.} om meerdere onderdelen te kunnen opsommen.
+ Voor onderdelen wordt er gebruik gemaakt van \cmd{\abalpnum} uit pakket \package{fmtcount}\footnote{%
+ De Nederlandse taal definitie is momenteel nog in behandeling bij pakket \href{https://github.com/vincentb1/fmtcount/pull/51}{\package{fmtcount}}.
+ In de tussentijd levert dit pakket daarvoor de juist configuratie mee.%
+ } om meerdere onderdelen te kunnen opsommen.
Stel er zou gebruik gemaakt worden van \cmd{\alph}, dan is \option{paras} beperkt tot 26 onderdelen.
Bij \cmd{\abalphnum} met b\ij{}voorbeeld een waarde van 125 is `\texttt{du}' de uitkomst.
}
diff --git a/macros/latex/contrib/regulatory/tex/fc-dutch.def b/macros/latex/contrib/regulatory/tex/fc-dutch.def
index e1e1432121..ee86d49a48 100644
--- a/macros/latex/contrib/regulatory/tex/fc-dutch.def
+++ b/macros/latex/contrib/regulatory/tex/fc-dutch.def
@@ -20,19 +20,15 @@
% example1-en.tex, example2-en.tex,
% md-example.tex, example.md,
% fc-dutch.def and regulatory.sty
-\ProvidesFCLanguage{dutch}[2022/06/19]
-
-\newcommand{\@ordinalMdutch}[2]{\edef#2{\number#1\relax.}}
+\ProvidesFCLanguage{dutch}[2024/01/27]%
+\newcommand{\@ordinalMdutch}[2]{\edef#2{\number#1\relax.}}%
\global\let\@ordinalMdutch\@ordinalMdutch
-\newcommand{\@ordinalFdutch}[2]{\edef#2{\number#1\relax.}}
-\global\let\@ordinalFdutch\@ordinalFdutch
-\newcommand{\@ordinalNdutch}[2]{\edef#2{\number#1\relax.}}
-\global\let\@ordinalNdutch\@ordinalNdutch
-
+\global\let\@ordinalFdutch\@ordinalMdutch
+\global\let\@ordinalNdutch\@ordinalMdutch
\newcommand*\@@unitstringdutch[1]{%
\ifcase#1%
nul%
- \or één%
+ \or een%
\or twee%
\or drie%
\or vier%
@@ -44,10 +40,9 @@
\fi
}%
\global\let\@@unitstringdutch\@@unitstringdutch
-
\global\let\@@unitstringdutch\@@unitstringdutch
\newcommand*\@@tenstringdutch[1]{%
- \ifcase#1%
+ \ifcase#1%
\or tien%
\or twintig%
\or dertig%
@@ -58,17 +53,11 @@
\or tachtig%
\or negentig%
\or honderd%
- \fi
+ \fi
}%
\global\let\@@tenstringdutch\@@tenstringdutch
-
-\providecommand*{\honderd}{honderd}%
-\providecommand*{\duizend}{duizend}%
-\global\let\honderd\honderd
-\global\let\duizend\duizend
-
\newcommand*\@@teenstringdutch[1]{%
- \ifcase#1%
+ \ifcase#1%
tien%
\or elf%
\or twaalf%
@@ -79,84 +68,81 @@
\or zeventien%
\or achttien%
\or negentien%
- \fi
+ \fi
}%
\global\let\@@teenstringdutch\@@teenstringdutch
-
+\providecommand*{\honderd}{honderd}%
+\providecommand*{\duizend}{duizend}%
+\global\let\honderd\honderd
+\global\let\duizend\duizend
+\newcommand*\@@numberstringdutch[2]{%
+ \ifnum#1>99999\relax
+ \PackageError{fmtcount}{Out of range}%
+ {This macro only works for values less than 100000}%
+ \else
+ \ifnum#1<0\relax
+ \PackageError{fmtcount}{Negative numbers not permitted}%
+ {This macro does not work for negative numbers, however
+ you can try typing "minus" first, and then pass the modulus of
+ this number}%
+ \fi
+ \fi
+ \def#2{}%
+ \@strctr=#1\relax \divide\@strctr by 1000\relax
+ \ifnum\@strctr>1\relax
+ \@@numberunderhundreddutch{\@strctr}{#2}%
+ \appto#2{duizend}%
+ \else
+ \ifnum\@strctr=1\relax
+ \eappto#2{\duizend}%
+ \fi
+ \fi
+ \@strctr=#1\relax
+ \@FCmodulo{\@strctr}{1000}%
+ \divide\@strctr by 100\relax
+ \ifnum\@strctr>1\relax
+ \eappto#2{\@unitstring{\@strctr}honderd}%
+ \else
+ \ifnum\@strctr=1\relax
+ \ifnum#1>1000\relax
+ \appto#2{honderd}%
+ \else
+ \eappto#2{\honderd}%
+ \fi
+ \fi
+ \fi
+ \@strctr=#1\relax
+ \@FCmodulo{\@strctr}{100}%
+ \ifnum#1=0\relax
+ \def#2{null}%
+ \else
+ \ifnum\@strctr=1\relax
+ \appto#2{een}%
+ \else
+ \@@numberunderhundreddutch{\@strctr}{#2}%
+ \fi
+ \fi
+}%
+\global\let\@@numberstringdutch\@@numberstringdutch
\newcommand*{\@numberstringMdutch}[2]{%
- \let\@unitstring=\@@unitstringdutch
- \let\@teenstring=\@@teenstringdutch
- \let\@tenstring=\@@tenstringdutch
+ \let\@unitstring=\@@unitstringdutch%
+ \let\@teenstring=\@@teenstringdutch%
+ \let\@tenstring=\@@tenstringdutch%
+ \def\@hundred{honderd}\def\@thousand{duizend}%
+ \def\@andname{en}%
\@@numberstringdutch{#1}{#2}%
-}
+}%
\global\let\@numberstringMdutch\@numberstringMdutch
\global\let\@numberstringFdutch=\@numberstringMdutch
\global\let\@numberstringNdutch=\@numberstringMdutch
-
\newcommand*{\@NumberstringMdutch}[2]{%
-\@numberstringMdutch{#1}{\@@num@str}%
-\edef#2{\noexpand\MakeUppercase\expandonce\@@num@str}}
+ \@numberstringMdutch{#1}{\@@num@str}%
+ \edef#2{\noexpand\MakeUppercase\expandonce\@@num@str}%
+}%
\global\let\@NumberstringMdutch\@NumberstringMdutch
\global\let\@NumberstringFdutch=\@NumberstringMdutch
\global\let\@NumberstringNdutch=\@NumberstringMdutch
-
-\newcommand*{\@ordinalstringMdutch}[2]{%
- \let\@unitthstring=\@@unitthstringMdutch
- \let\@teenthstring=\@@teenthstringMdutch
- \let\@tenthstring=\@@tenthstringMdutch
- \let\@unitstring=\@@unitstringdutch
- \let\@teenstring=\@@teenstringdutch
- \let\@tenstring=\@@tenstringdutch
- \def\@thousandth{duizendste}%
- \def\@hundredth{honderdste}%
- \@@ordinalstringdutch{#1}{#2}%
-}%
-\global\let\@ordinalstringMdutch\@ordinalstringMdutch
-
-\global\let\@ordinalstringMdutch\@ordinalstringMdutch
-\newcommand*{\@ordinalstringFdutch}[2]{%
- \let\@unitthstring=\@@unitthstringFdutch
- \let\@teenthstring=\@@teenthstringFdutch
- \let\@tenthstring=\@@tenthstringFdutch
- \let\@unitstring=\@@unitstringdutch
- \let\@teenstring=\@@teenstringdutch
- \let\@tenstring=\@@tenstringdutch
- \def\@thousandth{duizendste}%
- \def\@hundredth{honderdste}%
- \@@ordinalstringdutch{#1}{#2}%
-}%
-\global\let\@ordinalstringFdutch\@ordinalstringFdutch
-
-\newcommand*{\@ordinalstringNdutch}[2]{%
- \let\@unitthstring=\@@unitthstringNdutch
- \let\@teenthstring=\@@teenthstringNdutch
- \let\@tenthstring=\@@tenthstringNdutch
- \let\@unitstring=\@@unitstringdutch
- \let\@teenstring=\@@teenstringdutch
- \let\@tenstring=\@@tenstringdutch
- \def\@thousandth{duizendste}%
- \def\@hundredth{honderdste}%
- \@@ordinalstringdutch{#1}{#2}%
-}%
-\global\let\@ordinalstringNdutch\@ordinalstringNdutch
-
-\newcommand*{\@OrdinalstringMdutch}[2]{%
- \@ordinalstringMdutch{#1}{\@@num@str}%
- \edef#2{\noexpand\MakeUppercase\expandonce\@@num@str}%
-}%
-\global\let\@OrdinalstringMdutch\@OrdinalstringMdutch
-\newcommand*{\@OrdinalstringFdutch}[2]{%
- \@ordinalstringFdutch{#1}{\@@num@str}%
- \edef#2{\noexpand\MakeUppercase\expandonce\@@num@str}%
-}%
-\global\let\@OrdinalstringFdutch\@OrdinalstringFdutch
-\newcommand*{\@OrdinalstringNdutch}[2]{%
- \@ordinalstringNdutch{#1}{\@@num@str}%
- \edef#2{\noexpand\MakeUppercase\expandonce\@@num@str}%
-}%
-\global\let\@OrdinalstringNdutch\@OrdinalstringNdutch
-
-\newcommand*\@@unitthstringMdutch[1]{%
+\newcommand*\@@unitthstringdutch[1]{%
\ifcase#1%
nulde%
\or eerste%
@@ -170,9 +156,9 @@
\or negende%
\fi
}%
-\global\let\@@unitthstringMdutch\@@unitthstringMdutch
-\newcommand*\@@tenthstringMdutch[1]{%
- \ifcase#1%
+\global\let\@@unitthstringdutch\@@unitthstringdutch
+\newcommand*\@@tenthstringdutch[1]{%
+ \ifcase#1%
\or tiende%
\or twintigste%
\or dertigste%
@@ -182,11 +168,11 @@
\or zeventigste%
\or tachtigste%
\or negentigste%
- \fi
+ \fi
}%
-\global\let\@@tenthstringMdutch\@@tenthstringMdutch
-\newcommand*\@@teenthstringMdutch[1]{%
- \ifcase#1%
+\global\let\@@tenthstringdutch\@@tenthstringdutch
+\newcommand*\@@teenthstringdutch[1]{%
+ \ifcase#1%
tiende%
\or elfde%
\or twaalfde%
@@ -197,228 +183,145 @@
\or zeventiende%
\or achttiende%
\or negentiende%
- \fi
-}%
-\global\let\@@teenthstringMdutch\@@teenthstringMdutch
-\newcommand*\@@unitthstringFdutch[1]{%
- \ifcase#1%
- nullte%
- \or eerste%
- \or tweede%
- \or derde%
- \or vierde%
- \or vijfde%
- \or zesde%
- \or zevende%
- \or achtste%
- \or negende%
- \fi
+ \fi
}%
-\global\let\@@unitthstringFdutch\@@unitthstringFdutch
-\newcommand*\@@tenthstringFdutch[1]{%
- \ifcase#1%
- \or tiende%
- \or twintigste%
- \or dertigste%
- \or veertigste%
- \or vijftigste%
- \or zestigste%
- \or zeventigste%
- \or tachtigste%
- \or negentigste%
- \fi
+\global\let\@@teenthstringdutch\@@teenthstringdutch
+\newcommand*\@@ordinalstringdutch[2]{%
+ \@orgargctr=#1\relax
+ \ifnum\@orgargctr>99999\relax
+ \PackageError{fmtcount}{Out of range}%
+ {This macro only works for values less than 100000}%
+ \else
+ \ifnum\@orgargctr<0\relax
+ \PackageError{fmtcount}{Negative numbers not permitted}%
+ {This macro does not work for negative numbers, however
+ you can try typing "minus" first, and then pass the modulus of
+ this number}%
+ \fi
+ \fi
+ \def#2{}%
+ \@strctr=\@orgargctr\divide\@strctr by 1000\relax
+ \ifnum\@strctr>1\relax
+ \@@numberunderhundreddutch{\@strctr}{#2}%
+ \@tmpstrctr=\@orgargctr\@FCmodulo{\@tmpstrctr}{1000}%
+ \ifnum\@tmpstrctr=0\relax
+ \eappto#2{\@thousandth}%
+ \else
+ \appto#2{duizend}%
+ \fi
+ \else
+ \ifnum\@strctr=1\relax
+ \ifnum\@orgargctr=1000\relax
+ \eappto#2{\@thousandth}%
+ \else
+ \eappto#2{\duizend}%
+ \fi
+ \fi
+ \fi
+ \@strctr=\@orgargctr%
+ \@FCmodulo{\@strctr}{1000}%
+ \divide\@strctr by 100\relax
+ \ifnum\@strctr>1\relax
+ \@tmpstrctr=\@orgargctr \@FCmodulo{\@tmpstrctr}{100}%
+ \ifnum\@tmpstrctr=0\relax
+ \ifnum\@strctr=1\relax
+ \eappto#2{\@hundredth}%
+ \else
+ \eappto#2{\@unitstring{\@strctr}\@hundredth}%
+ \fi
+ \else
+ \eappto#2{\@unitstring{\@strctr}honderd}%
+ \fi
+ \else
+ \ifnum\@strctr=1\relax
+ \@tmpstrctr=\@orgargctr \@FCmodulo{\@tmpstrctr}{100}%
+ \ifnum\@tmpstrctr=0\relax
+ \eappto#2{\@hundredth}%
+ \else
+ \ifnum\@orgargctr>1000\relax
+ \appto#2{honderd}%
+ \else
+ \eappto#2{\honderd}%
+ \fi
+ \fi
+ \fi
+ \fi
+ \@strctr=\@orgargctr%
+ \@FCmodulo{\@strctr}{100}%
+ \ifthenelse{\@strctr=0 \and \@orgargctr>0 }{}{%
+ \@@numberunderhundredthdutch{\@strctr}{#2}%
+ }%
}%
-\global\let\@@tenthstringFdutch\@@tenthstringFdutch
-\newcommand*\@@teenthstringFdutch[1]{%
- \ifcase#1%
- tiende%
- \or elfde%
- \or twaalfde%
- \or dertiende%
- \or veertiende%
- \or vijftiende%
- \or zestiende%
- \or zeventiende%
- \or achttiende%
- \or zegentiende%
- \fi
+\global\let\@@ordinalstringdutch\@@ordinalstringdutch
+\newcommand*{\@ordinalstringMdutch}[2]{%
+ \let\@unitthstring=\@@unitthstringdutch%
+ \let\@teenthstring=\@@teenthstringdutch%
+ \let\@tenthstring=\@@tenthstringdutch%
+ \let\@unitstring=\@@unitstringdutch%
+ \let\@teenstring=\@@teenstringdutch%
+ \let\@tenstring=\@@tenstringdutch%
+ \def\@thousandth{duizendste}%
+ \def\@hundredth{honderdste}%
+ \@@ordinalstringdutch{#1}{#2}%
}%
-\global\let\@@teenthstringFdutch\@@teenthstringFdutch
-\newcommand*\@@unitthstringNdutch[1]{%
- \ifcase#1%
- nulde%
- \or eerste%
- \or tweede%
- \or derde%
- \or vierde%
- \or vijfde%
- \or zesde%
- \or zevende%
- \or achtste%
- \or negende%
- \fi
+\global\let\@ordinalstringMdutch\@ordinalstringMdutch
+\global\let\@ordinalstringFdutch=\@ordinalstringMdutch
+\global\let\@ordinalstringNdutch=\@ordinalstringMdutch
+\newcommand*{\@OrdinalstringMdutch}[2]{%
+ \@ordinalstringMdutch{#1}{\@@num@str}%
+ \def\@andname{en}%
+ \def\@hundred{Honderd}\def\@thousand{Duizend}%
+ \def\@hundredth{Honderdste}\def\@thousandth{Duizendste}%
+ \edef#2{\noexpand\MakeUppercase\expandonce\@@num@str}%
}%
-\global\let\@@teenthstringNdutch\@@teenthstringNdutch
-\newcommand*\@@numberunderhundreddutch[2]{%
-\ifnum#1<10\relax
- \ifnum#1>0\relax
+\global\let\@OrdinalstringMdutch\@OrdinalstringMdutch
+\global\let\@OrdinalstringFdutch=\@OrdinalstringMdutch
+\global\let\@OrdinalstringNdutch=\@OrdinalstringMdutch
+\newcommand*{\@@numberunderhundreddutch}[2]{%
+ \ifnum#1<10\relax
+ \ifnum#1>0\relax
\eappto#2{\@unitstring{#1}}%
- \fi
-\else
- \@tmpstrctr=#1\relax
- \@FCmodulo{\@tmpstrctr}{10}%
- \ifnum#1<20\relax
+ \fi
+ \else
+ \@tmpstrctr=#1\relax
+ \@FCmodulo{\@tmpstrctr}{10}%
+ \ifnum#1<20\relax
\eappto#2{\@teenstring{\@tmpstrctr}}%
- \else
+ \else
\ifnum\@tmpstrctr=0\relax
\else
- \eappto#2{\@unitstring{\@tmpstrctr}en}%
+ \eappto#2{\@unitstring{\@tmpstrctr}en}%
\fi
\@tmpstrctr=#1\relax
\divide\@tmpstrctr by 10\relax
\eappto#2{\@tenstring{\@tmpstrctr}}%
- \fi
-\fi
+ \fi
+ \fi
}%
\global\let\@@numberunderhundreddutch\@@numberunderhundreddutch
-\newcommand*\@@numberstringdutch[2]{%
-\ifnum#1>99999\relax
- \PackageError{fmtcount}{Out of range}%
- {This macro only works for values less than 100000}%
-\else
- \ifnum#1<0\relax
- \PackageError{fmtcount}{Negative numbers not permitted}%
- {This macro does not work for negative numbers, however
- you can try typing "minus" first, and then pass the modulus of
- this number}%
- \fi
-\fi
-\def#2{}%
-\@strctr=#1\relax \divide\@strctr by 1000\relax
-\ifnum\@strctr>1\relax
- \@@numberunderhundreddutch{\@strctr}{#2}%
- \appto#2{duizend}%
-\else
- \ifnum\@strctr=1\relax
- \eappto#2{\eintausend}%
- \fi
-\fi
-\@strctr=#1\relax
-\@FCmodulo{\@strctr}{1000}%
-\divide\@strctr by 100\relax
-\ifnum\@strctr>1\relax
- \eappto#2{\@unitstring{\@strctr}honderd}%
-\else
- \ifnum\@strctr=1\relax
- \ifnum#1>1000\relax
- \appto#2{honderd}%
- \else
- \eappto#2{\honderd}%
- \fi
- \fi
-\fi
-\@strctr=#1\relax
-\@FCmodulo{\@strctr}{100}%
-\ifnum#1=0\relax
- \def#2{null}%
-\else
- \ifnum\@strctr=1\relax
- \appto#2{één}%
- \else
- \@@numberunderhundreddutch{\@strctr}{#2}%
- \fi
-\fi
-}%
-\global\let\@@numberstringdutch\@@numberstringdutch
-\newcommand*\@@numberunderhundredthdutch[2]{%
-\ifnum#1<10\relax
- \eappto#2{\@unitthstring{#1}}%
-\else
- \@tmpstrctr=#1\relax
- \@FCmodulo{\@tmpstrctr}{10}%
- \ifnum#1<20\relax
+\newcommand*{\@@numberunderhundredthdutch}[2]{%
+ \ifnum#1<10\relax
+ \eappto#2{\@unitthstring{#1}}%
+ \else
+ \@tmpstrctr=#1\relax
+ \@FCmodulo{\@tmpstrctr}{10}%
+ \ifnum#1<20\relax
\eappto#2{\@teenthstring{\@tmpstrctr}}%
- \else
+ \else
\ifnum\@tmpstrctr=0\relax
\else
- \eappto#2{\@unitstring{\@tmpstrctr}-en-}%
+ \eappto#2{\@unitstring{\@tmpstrctr}-en-}%
\fi
\@tmpstrctr=#1\relax
\divide\@tmpstrctr by 10\relax
\eappto#2{\@tenthstring{\@tmpstrctr}}%
- \fi
-\fi
+ \fi
+ \fi
}%
\global\let\@@numberunderhundredthdutch\@@numberunderhundredthdutch
-\newcommand*\@@ordinalstringdutch[2]{%
-\@orgargctr=#1\relax
-\ifnum\@orgargctr>99999\relax
- \PackageError{fmtcount}{Out of range}%
- {This macro only works for values less than 100000}%
-\else
- \ifnum\@orgargctr<0\relax
- \PackageError{fmtcount}{Negative numbers not permitted}%
- {This macro does not work for negative numbers, however
- you can try typing "minus" first, and then pass the modulus of
- this number}%
- \fi
-\fi
-\def#2{}%
-\@strctr=\@orgargctr\divide\@strctr by 1000\relax
-\ifnum\@strctr>1\relax
-\@@numberunderhundreddutch{\@strctr}{#2}%
- \@tmpstrctr=\@orgargctr\@FCmodulo{\@tmpstrctr}{1000}%
- \ifnum\@tmpstrctr=0\relax
- \eappto#2{\@thousandth}%
- \else
- \appto#2{duizend}%
- \fi
-\else
- \ifnum\@strctr=1\relax
- \ifnum\@orgargctr=1000\relax
- \eappto#2{\@thousandth}%
- \else
- \eappto#2{\duizend}%
- \fi
- \fi
-\fi
-\@strctr=\@orgargctr
-\@FCmodulo{\@strctr}{1000}%
-\divide\@strctr by 100\relax
-\ifnum\@strctr>1\relax
- \@tmpstrctr=\@orgargctr \@FCmodulo{\@tmpstrctr}{100}%
- \ifnum\@tmpstrctr=0\relax
- \ifnum\@strctr=1\relax
- \eappto#2{\@hundredth}%
- \else
- \eappto#2{\@unitstring{\@strctr}\@hundredth}%
- \fi
- \else
- \eappto#2{\@unitstring{\@strctr}honderd}%
- \fi
-\else
- \ifnum\@strctr=1\relax
- \@tmpstrctr=\@orgargctr \@FCmodulo{\@tmpstrctr}{100}%
- \ifnum\@tmpstrctr=0\relax
- \eappto#2{\@hundredth}%
- \else
- \ifnum\@orgargctr>1000\relax
- \appto#2{honderd}%
- \else
- \eappto#2{\honderd}%
- \fi
- \fi
- \fi
-\fi
-\@strctr=\@orgargctr
-\@FCmodulo{\@strctr}{100}%
-\ifthenelse{\@strctr=0 \and \@orgargctr>0 }{}{%
-\@@numberunderhundredthdutch{\@strctr}{#2}%
-}%
-}%
-\global\let\@@ordinalstringdutch\@@ordinalstringdutch
-%\FCloadlang{dutchb}%
\iffalse Local variables: \fi
\iffalse mode: docTeX \fi
\iffalse End: \fi
-\endinput \ No newline at end of file
+\endinput
+%%
+%% End of file `fc-dutch.def'.
diff --git a/macros/latex/contrib/regulatory/tex/regulatory.sty b/macros/latex/contrib/regulatory/tex/regulatory.sty
index f6b3be5e88..2e89a19a37 100644
--- a/macros/latex/contrib/regulatory/tex/regulatory.sty
+++ b/macros/latex/contrib/regulatory/tex/regulatory.sty
@@ -21,7 +21,7 @@
% md-example.tex, example.md,
% fc-dutch.def and regulatory.sty
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{regulatory}[2024/01/16 Xerdi's Regulatory Package]
+\ProvidesPackage{regulatory}[2024/01/27 0.0.3 Xerdi's Regulatory Package]
\RequirePackage{pgfopts}
\RequirePackage{xifthen}