From e9549ffe43d42fda4e5d3778e1d26fbd95e4ae9f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 29 Jan 2020 22:37:04 +0000 Subject: fmtcount (29jan20) git-svn-id: svn://tug.org/texlive/trunk@53591 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/fmtcount/fc-UKenglish.def | 3 +- .../texmf-dist/tex/latex/fmtcount/fc-USenglish.def | 3 +- .../texmf-dist/tex/latex/fmtcount/fc-american.def | 3 +- .../texmf-dist/tex/latex/fmtcount/fc-brazilian.def | 3 +- .../texmf-dist/tex/latex/fmtcount/fc-british.def | 3 +- .../texmf-dist/tex/latex/fmtcount/fc-english.def | 3 +- .../texmf-dist/tex/latex/fmtcount/fc-francais.def | 3 +- Master/texmf-dist/tex/latex/fmtcount/fc-french.def | 3 +- .../texmf-dist/tex/latex/fmtcount/fc-frenchb.def | 3 +- Master/texmf-dist/tex/latex/fmtcount/fc-german.def | 28 +++++----- .../texmf-dist/tex/latex/fmtcount/fc-germanb.def | 3 +- .../texmf-dist/tex/latex/fmtcount/fc-italian.def | 3 +- .../texmf-dist/tex/latex/fmtcount/fc-ngerman.def | 3 +- .../texmf-dist/tex/latex/fmtcount/fc-ngermanb.def | 3 +- .../texmf-dist/tex/latex/fmtcount/fc-portuges.def | 3 +- .../tex/latex/fmtcount/fc-portuguese.def | 3 +- .../texmf-dist/tex/latex/fmtcount/fc-spanish.def | 3 +- .../texmf-dist/tex/latex/fmtcount/fcnumparser.sty | 3 +- Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty | 3 +- Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty | 64 +++++++++------------- 20 files changed, 78 insertions(+), 68 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def index 97ce0c80253..f5b00b73e6c 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-UKenglish.def,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \ProvidesFCLanguage{UKenglish}[2013/08/17]% \FCloadlang{english}% diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def index d7f5cdcccf2..70c269f6d33 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-USenglish.def,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \ProvidesFCLanguage{USenglish}[2013/08/17]% \FCloadlang{english}% diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-american.def b/Master/texmf-dist/tex/latex/fmtcount/fc-american.def index 306aa6b357f..7b42aac4fe4 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-american.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-american.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-american.def,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \ProvidesFCLanguage{american}[2016/01/12]% \FCloadlang{USenglish}% diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-brazilian.def b/Master/texmf-dist/tex/latex/fmtcount/fc-brazilian.def index 516ef996246..5f0706a0885 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-brazilian.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-brazilian.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-brazilian.def,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \ProvidesFCLanguage{brazilian}[2017/12/26]% \FCloadlang{portuges}% diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-british.def b/Master/texmf-dist/tex/latex/fmtcount/fc-british.def index ce37703ee65..7aaaa6afa0a 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-british.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-british.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-british.def,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \ProvidesFCLanguage{british}[2013/08/17]% \FCloadlang{english}% diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-english.def b/Master/texmf-dist/tex/latex/fmtcount/fc-english.def index 0ad40d156e8..d6bd6a80a4f 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-english.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-english.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-english.def,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \ProvidesFCLanguage{english}[2016/01/12]% \newcommand*\@ordinalMenglish[2]{% diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def b/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def index 448aaadd731..2e0cbb2eb8b 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-francais.def,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \ProvidesFCLanguage{francais}[2013/08/17]% \FCloadlang{french}% diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-french.def b/Master/texmf-dist/tex/latex/fmtcount/fc-french.def index 621c290e667..0dafda2be2b 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-french.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-french.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-french.def,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \ProvidesFCLanguage{french}[2017/06/15]% \ifcsundef{fc@gl@let}{\global\let\fc@gl@let\let}{\PackageError{fmtcount}{Command already defined}{Command diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def b/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def index 6164c49e4d8..3eb9c340033 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-frenchb.def,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \ProvidesFCLanguage{frenchb}[2013/08/17]% \FCloadlang{french}% diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-german.def b/Master/texmf-dist/tex/latex/fmtcount/fc-german.def index 0f025d2ab04..3a44772de68 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-german.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-german.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-german.def,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,8 +50,9 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: -\ProvidesFCLanguage{german}[2016/01/12]% +\ProvidesFCLanguage{german}[2018/06/17]% \newcommand{\@ordinalMgerman}[2]{% \edef#2{\number#1\relax.}% }% @@ -404,11 +405,12 @@ }% \global\let\@@numberunderhundredthgerman\@@numberunderhundredthgerman \newcommand*\@@ordinalstringgerman[2]{% -\ifnum#1>99999\relax +\@orgargctr=#1\relax +\ifnum\@orgargctr>99999\relax \PackageError{fmtcount}{Out of range}% {This macro only works for values less than 100000}% \else - \ifnum#1<0\relax + \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 @@ -416,10 +418,10 @@ \fi \fi \def#2{}% -\@strctr=#1\relax \divide\@strctr by 1000\relax +\@strctr=\@orgargctr\divide\@strctr by 1000\relax \ifnum\@strctr>1\relax \@@numberunderhundredgerman{\@strctr}{#2}% - \@tmpstrctr=#1\relax \@FCmodulo{\@tmpstrctr}{1000}% + \@tmpstrctr=\@orgargctr\@FCmodulo{\@tmpstrctr}{1000}% \ifnum\@tmpstrctr=0\relax \eappto#2{\@thousandth}% \else @@ -427,18 +429,18 @@ \fi \else \ifnum\@strctr=1\relax - \ifnum#1=1000\relax + \ifnum\@orgargctr=1000\relax \eappto#2{\@thousandth}% \else \eappto#2{\eintausend}% \fi \fi \fi -\@strctr=#1\relax +\@strctr=\@orgargctr \@FCmodulo{\@strctr}{1000}% \divide\@strctr by 100\relax \ifnum\@strctr>1\relax - \@tmpstrctr=#1\relax \@FCmodulo{\@tmpstrctr}{100}% + \@tmpstrctr=\@orgargctr \@FCmodulo{\@tmpstrctr}{100}% \ifnum\@tmpstrctr=0\relax \ifnum\@strctr=1\relax \eappto#2{\@hundredth}% @@ -450,11 +452,11 @@ \fi \else \ifnum\@strctr=1\relax - \@tmpstrctr=#1\relax \@FCmodulo{\@tmpstrctr}{100}% + \@tmpstrctr=\@orgargctr \@FCmodulo{\@tmpstrctr}{100}% \ifnum\@tmpstrctr=0\relax \eappto#2{\@hundredth}% \else - \ifnum#1>1000\relax + \ifnum\@orgargctr>1000\relax \appto#2{einhundert}% \else \eappto#2{\einhundert}% @@ -462,9 +464,9 @@ \fi \fi \fi -\@strctr=#1\relax +\@strctr=\@orgargctr \@FCmodulo{\@strctr}{100}% -\ifthenelse{\@strctr=0 \and #1>0}{}{% +\ifthenelse{\@strctr=0 \and \@orgargctr>0 }{}{% \@@numberunderhundredthgerman{\@strctr}{#2}% }% }% diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def b/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def index f282008f801..45a5602b3a1 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-germanb.def,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \ProvidesFCLanguage{germanb}[2013/08/17]% \FCloadlang{german}% diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def b/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def index df8318a60e1..16fe43e5eac 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-italian.def,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \ProvidesFCLanguage{italian}[2013/08/17] diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def b/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def index 458a8046509..27a65543963 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-ngerman.def,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \ProvidesFCLanguage{ngerman}[2012/06/18]% \FCloadlang{german}% diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def b/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def index a7f448a5b51..c6797d56884 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-ngermanb.def,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \ProvidesFCLanguage{ngermanb}[2013/08/17]% \FCloadlang{german}% diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def b/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def index 4e902433e0d..0a5e7fa968b 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-portuges.def,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \ProvidesFCLanguage{portuges}[2017/12/26]% \newcommand*\@ordinalMportuges[2]{% diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def b/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def index e8ae37ee2fc..480bf186075 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-portuguese.def,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \ProvidesFCLanguage{portuguese}[2014/06/09]% \FCloadlang{portuges}% diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def index 6d559e51040..4ac3cf1f359 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-spanish.def,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \ProvidesFCLanguage{spanish}[2016/01/12]% \newcommand*\@ordinalMspanish[2]{% diff --git a/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty b/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty index a0218203f02..f18155fb4c5 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty +++ b/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fcnumparser.sty,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{fcnumparser}[2017/06/15] diff --git a/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty b/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty index 257a46bf3d9..880e570cb76 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty +++ b/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fcprefix.sty,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,6 +50,7 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{fcprefix}[2012/09/28] diff --git a/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty b/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty index a918fb7a7d4..f42140e0eb4 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty +++ b/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fmtcount.sty,package') %% %% fmtcount.dtx -%% Copyright 2017 Nicola Talbot and Vincent Belaïche +%% Copyright 2020 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -50,10 +50,11 @@ %%\end{definition} %% Local Variables: %% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" %% End: \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fmtcount}[2017/12/24 v3.05] +\ProvidesPackage{fmtcount}[2020/01/30 v3.06] \RequirePackage{ifthen} \RequirePackage{xkeyval} \RequirePackage{etoolbox} @@ -341,48 +342,26 @@ italian} \ifcase#10\or1\or2\or3\or4\or5\or 6\or7\or8\or9\or a\or b\or c\or d\or e\or f\fi } -\newrobustcmd*{\@hexadecimal}[1]{% - \@DT@padzeroestrue - \@DT@loopN=\@vpt - \@strctr=\@DT@loopN - \whiledo{\@strctr<\c@padzeroesN}{0\advance\@strctr by \@ne}% - \@strctr=65536\relax - \@DT@X=#1\relax - \loop - \@DT@modctr=\@DT@X - \divide\@DT@modctr by \@strctr - \ifthenelse{\boolean{@DT@padzeroes} - \and \(\@DT@modctr=0\) - \and \(\@DT@loopN>\c@padzeroesN\)} - {}{\@@hexadecimal\@DT@modctr}% - \ifnum\@DT@modctr=0\else\@DT@padzeroesfalse\fi - \multiply\@DT@modctr by \@strctr - \advance\@DT@X by -\@DT@modctr - \divide\@strctr by 16\relax - \advance\@DT@loopN by \m@ne - \ifnum\@strctr>\@ne - \repeat - \@@hexadecimal\@DT@X -} -\let\hexadecimalnum=\@hexadecimal +\newrobustcmd*{\hexadecimalnum}{\@hexadecimalengine\@@hexadecimal} \newcommand*{\@@Hexadecimal}[1]{% \ifcase#10\or1\or2\or3\or4\or5\or6\or 7\or8\or9\or A\or B\or C\or D\or E\or F\fi } -\newrobustcmd*{\@Hexadecimal}[1]{% +\newrobustcmd*{\HEXADecimalnum}{\@hexadecimalengine\@@Hexadecimal} +\newcommand*{\@hexadecimalengine}[2]{% \@DT@padzeroestrue - \@DT@loopN=5\relax + \@DT@loopN=\@vpt \@strctr=\@DT@loopN \whiledo{\@strctr<\c@padzeroesN}{0\advance\@strctr by \@ne}% \@strctr=65536\relax - \@DT@X=#1\relax + \@DT@X=#2\relax \loop \@DT@modctr=\@DT@X \divide\@DT@modctr by \@strctr \ifthenelse{\boolean{@DT@padzeroes} \and \(\@DT@modctr=0\) - \and \(\@DT@loopN>\c@padzeroesN\)}% - {}{\@@Hexadecimal\@DT@modctr}% + \and \(\@DT@loopN>\c@padzeroesN\)} + {}{#1\@DT@modctr}% \ifnum\@DT@modctr=0\else\@DT@padzeroesfalse\fi \multiply\@DT@modctr by \@strctr \advance\@DT@X by -\@DT@modctr @@ -390,10 +369,13 @@ italian} \advance\@DT@loopN by \m@ne \ifnum\@strctr>\@ne \repeat - \@@Hexadecimal\@DT@X + #1\@DT@X } - -\let\Hexadecimalnum=\@Hexadecimal +\def\Hexadecimalnum{% + \PackageWarning{fmtcount}{\string\Hexadecimalnum\space is deprecated, use \string\HEXADecimalnum\space + instead. The \string\Hexadecimalnum\space control sequence name is confusing as it can mislead in thinking + that only the 1st letter is upper-cased.}% + \HEXADecimalnum} \newrobustcmd*{\@aaalph}{\fc@aaalph\@alph} \newcommand*\fc@aaalph[2]{% \@DT@loopN=#2\relax @@ -979,13 +961,21 @@ italian} \the\value{#1}}% } \providecommand*{\hexadecimal}[1]{% - \@hexadecimal{\expandafter\expandafter\expandafter + \hexadecimalnum{\expandafter\expandafter\expandafter \the\value{#1}}% } -\providecommand*{\Hexadecimal}[1]{% - \@Hexadecimal{\expandafter\expandafter\expandafter +\providecommand*{\HEXADecimal}[1]{% + \HEXADecimalnum{\expandafter\expandafter\expandafter \the\value{#1}}% } +\newrobustcmd*\FC@Hexadecimal@warning{% + \PackageWarning{fmtcount}{\string\Hexadecimal\space is deprecated, use \string\HEXADecimal\space + instead. The \string\Hexadecimal\space control sequence name is confusing as it can mislead in thinking + that only the 1st letter is upper-cased.}% +} +\def\Hexadecimal{% + \FC@Hexadecimal@warning + \HEXADecimal} \providecommand*{\octal}[1]{% \@octal{\expandafter\expandafter\expandafter \the\value{#1}}% -- cgit v1.2.3