diff options
author | Karl Berry <karl@freefriends.org> | 2024-01-27 20:58:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-01-27 20:58:13 +0000 |
commit | 636785ebd5414eec316814c186d11c29f5ba45e5 (patch) | |
tree | 82f0165f8eb08d57ae40565699c650a43b7c79c3 /Master/texmf-dist | |
parent | cdeb4834b3436b45fecf1439582b82cc99c6a135 (diff) |
regulatory (27jan24)
git-svn-id: svn://tug.org/texlive/trunk@69611 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/regulatory/example1-en.pdf | bin | 25767 -> 25756 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/regulatory/example1-nl.pdf | bin | 25612 -> 25600 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/regulatory/example2-en.pdf | bin | 52584 -> 52555 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/regulatory/example2-nl.pdf | bin | 52617 -> 52599 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/regulatory/regulatory-en.pdf | bin | 224493 -> 227678 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/regulatory/regulatory-en.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/regulatory/regulatory-nl.pdf | bin | 226188 -> 228133 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/regulatory/regulatory-nl.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/regulatory/regulatory.tex | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/regulatory/fc-dutch.def | 487 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/regulatory/regulatory.sty | 2 |
11 files changed, 206 insertions, 297 deletions
diff --git a/Master/texmf-dist/doc/latex/regulatory/example1-en.pdf b/Master/texmf-dist/doc/latex/regulatory/example1-en.pdf Binary files differindex 0e08431dbf0..7bac5e0c9b3 100644 --- a/Master/texmf-dist/doc/latex/regulatory/example1-en.pdf +++ b/Master/texmf-dist/doc/latex/regulatory/example1-en.pdf diff --git a/Master/texmf-dist/doc/latex/regulatory/example1-nl.pdf b/Master/texmf-dist/doc/latex/regulatory/example1-nl.pdf Binary files differindex 63522191b7e..bc3f8b1d537 100644 --- a/Master/texmf-dist/doc/latex/regulatory/example1-nl.pdf +++ b/Master/texmf-dist/doc/latex/regulatory/example1-nl.pdf diff --git a/Master/texmf-dist/doc/latex/regulatory/example2-en.pdf b/Master/texmf-dist/doc/latex/regulatory/example2-en.pdf Binary files differindex bc253e499be..e7fdc771783 100644 --- a/Master/texmf-dist/doc/latex/regulatory/example2-en.pdf +++ b/Master/texmf-dist/doc/latex/regulatory/example2-en.pdf diff --git a/Master/texmf-dist/doc/latex/regulatory/example2-nl.pdf b/Master/texmf-dist/doc/latex/regulatory/example2-nl.pdf Binary files differindex be0484a77c0..6342318259e 100644 --- a/Master/texmf-dist/doc/latex/regulatory/example2-nl.pdf +++ b/Master/texmf-dist/doc/latex/regulatory/example2-nl.pdf diff --git a/Master/texmf-dist/doc/latex/regulatory/regulatory-en.pdf b/Master/texmf-dist/doc/latex/regulatory/regulatory-en.pdf Binary files differindex 11f032e0168..ac592a49898 100644 --- a/Master/texmf-dist/doc/latex/regulatory/regulatory-en.pdf +++ b/Master/texmf-dist/doc/latex/regulatory/regulatory-en.pdf diff --git a/Master/texmf-dist/doc/latex/regulatory/regulatory-en.tex b/Master/texmf-dist/doc/latex/regulatory/regulatory-en.tex index 0ec1ac52b98..55d42907535 100644 --- a/Master/texmf-dist/doc/latex/regulatory/regulatory-en.tex +++ b/Master/texmf-dist/doc/latex/regulatory/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/Master/texmf-dist/doc/latex/regulatory/regulatory-nl.pdf b/Master/texmf-dist/doc/latex/regulatory/regulatory-nl.pdf Binary files differindex 334e4f3c551..9d4832ce44d 100644 --- a/Master/texmf-dist/doc/latex/regulatory/regulatory-nl.pdf +++ b/Master/texmf-dist/doc/latex/regulatory/regulatory-nl.pdf diff --git a/Master/texmf-dist/doc/latex/regulatory/regulatory-nl.tex b/Master/texmf-dist/doc/latex/regulatory/regulatory-nl.tex index af6a3e79418..f5c9f47259d 100644 --- a/Master/texmf-dist/doc/latex/regulatory/regulatory-nl.tex +++ b/Master/texmf-dist/doc/latex/regulatory/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/Master/texmf-dist/doc/latex/regulatory/regulatory.tex b/Master/texmf-dist/doc/latex/regulatory/regulatory.tex index ffb0ce5ecb9..fbd5d35c3df 100644 --- a/Master/texmf-dist/doc/latex/regulatory/regulatory.tex +++ b/Master/texmf-dist/doc/latex/regulatory/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/Master/texmf-dist/tex/latex/regulatory/fc-dutch.def b/Master/texmf-dist/tex/latex/regulatory/fc-dutch.def index e1e14321219..ee86d49a48c 100644 --- a/Master/texmf-dist/tex/latex/regulatory/fc-dutch.def +++ b/Master/texmf-dist/tex/latex/regulatory/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/Master/texmf-dist/tex/latex/regulatory/regulatory.sty b/Master/texmf-dist/tex/latex/regulatory/regulatory.sty index f6b3be5e881..2e89a19a376 100644 --- a/Master/texmf-dist/tex/latex/regulatory/regulatory.sty +++ b/Master/texmf-dist/tex/latex/regulatory/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} |