From 3d7821588796cdc101c34d7138d9d874876bbed4 Mon Sep 17 00:00:00 2001 From: Erik Nijenhuis Date: Wed, 23 Oct 2024 20:13:31 +0200 Subject: [PATCH 1/9] Uncomment subsection Prefixes in the docs Signed-off-by: Erik Nijenhuis --- trunk/fmtcount-manual.tex | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/trunk/fmtcount-manual.tex b/trunk/fmtcount-manual.tex index b8e66e3..b1f0739 100644 --- a/trunk/fmtcount-manual.tex +++ b/trunk/fmtcount-manual.tex @@ -797,16 +797,16 @@ \subsection{Options for French} \selectlanguage{english} -%\subsection{Prefixes} -%\label{sec:latin-prefixes} -% -%\begin{definition}[\DescribeMacro{\latinnumeralstring}] -%\cs{latinnumeralstring}\marg{counter}\oarg{prefix options} -%\end{definition} -% -%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}] -%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options} -%\end{definition} +\subsection{Prefixes} +\label{sec:latin-prefixes} + +\begin{definition}[\DescribeMacro{\latinnumeralstring}] +\cs{latinnumeralstring}\marg{counter}\oarg{prefix options} +\end{definition} + +\begin{definition}[\DescribeMacro{\latinnumeralstringnum}] +\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options} +\end{definition} \section{Configuration File \texttt{fmtcount.cfg}} From fb7e512ee7b259d38ef50904a86a8363c79f41cd Mon Sep 17 00:00:00 2001 From: Erik Nijenhuis Date: Wed, 23 Oct 2024 20:29:17 +0200 Subject: [PATCH 2/9] Fix hyperlinks and trailing comment Signed-off-by: Erik Nijenhuis --- trunk/fmtcount-manual.tex | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/trunk/fmtcount-manual.tex b/trunk/fmtcount-manual.tex index b1f0739..e59a361 100644 --- a/trunk/fmtcount-manual.tex +++ b/trunk/fmtcount-manual.tex @@ -63,7 +63,7 @@ \title{fmtcount.sty: Displaying the Values of \LaTeX\ Counters} \author{Nicola L.C. Talbot\\ - \url{www.dickimaw-books.com} + \href{https://www.dickimaw-books.com}{www.dickimaw-books.com} \and Vincent Bela\"iche} \date{%%DATE%% (version %%VERSION%%)\relax @@ -904,14 +904,12 @@ \section{Acknowledgements} \section{Troubleshooting} -There is a FAQ available at: -\url{http://theoval.cmp.uea.ac.uk/~nlct/latex/packages/faq/}. +There is a FAQ available at: -Bug reporting should be done via the Github issue manager at: -\url{https://github.com/nlct/fmtcount/issues/}. +\href{https://dickimaw-books.com/faq.php}{dickimaw-books.com/faq.php}. + +\noindent Bug reporting should be done via the GitHub issue manager at: + +\href{https://github.com/Xerdi/fmtcount/issues/}{github.com/Xerdi/fmtcount/issues/}. \end{document} -% Local Variables: -% coding: utf-8 -% compile-command: "make -C ../dist fmtcount.pdf" -% End: From 1b409a856621ef0b8a312dadc2ae378391d8ac8d Mon Sep 17 00:00:00 2001 From: Erik Nijenhuis Date: Wed, 23 Oct 2024 20:52:06 +0200 Subject: [PATCH 3/9] Merge \AtBeginDocument bodies in fmcount.sty Signed-off-by: Erik Nijenhuis --- trunk/fmtcount.sty | 2 -- 1 file changed, 2 deletions(-) diff --git a/trunk/fmtcount.sty b/trunk/fmtcount.sty index 79ebdc1..61e8fdc 100644 --- a/trunk/fmtcount.sty +++ b/trunk/fmtcount.sty @@ -2063,13 +2063,11 @@ dutch} \else \@setdef@ultfmtcount \fi\fi -} % \end{macrocode} % \changes{3.01}{2014/12/03}{Substitute \cs{textsuperscript} for \cs{fc@textsuperscript}, and define % \cs{fc@textsuperscript} as \cs{fup} when defined at beginning of document, or as \cs{textsuperscript} % otherwise} % \begin{macrocode} -\AtBeginDocument{% \ifcsundef{FBsupR}{\let\fc@textsuperscript\textsuperscript}{\let\fc@textsuperscript\fup}% } % \end{macrocode} From ca1be057df6be871a46b355e7dd7e38f14f81352 Mon Sep 17 00:00:00 2001 From: Erik Nijenhuis Date: Wed, 23 Oct 2024 20:57:29 +0200 Subject: [PATCH 4/9] Fix verbatim words in docs Signed-off-by: Erik Nijenhuis --- trunk/fc-brazilian.def | 4 ++-- trunk/fc-francais.def | 2 +- trunk/fc-frenchb.def | 2 +- trunk/fc-german.def | 8 ++++---- trunk/fc-germanb.def | 2 +- trunk/fc-ngerman.def | 2 +- trunk/fc-ngermanb.def | 2 +- trunk/fc-portuguese.def | 2 +- trunk/fmtcount-manual.tex | 2 +- trunk/fmtcount.sty | 6 +++--- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/trunk/fc-brazilian.def b/trunk/fc-brazilian.def index 42ac996..bc55b95 100644 --- a/trunk/fc-brazilian.def +++ b/trunk/fc-brazilian.def @@ -7,7 +7,7 @@ % \begin{macrocode} \FCloadlang{portuges}% % \end{macrocode} -% Set |brazilian| to be equivalent to |portuges| for all the numeral ordinals, and string ordinals. +% Set \verb|brazilian| to be equivalent to \verb|portuges| for all the numeral ordinals, and string ordinals. % \begin{macrocode} \global\let\@ordinalMbrazilian=\@ordinalMportuges \global\let\@ordinalFbrazilian=\@ordinalFportuges @@ -20,7 +20,7 @@ \global\let\@OrdinalstringNbrazilian\@OrdinalstringMportuges % \end{macrocode} % Convert a number to a textual representation. To make it easier, split it up into units, tens, teens and -% hundreds. Units, tens, and hundreds are the same as for |portuges| and are not redefined, only the teens are +% hundreds. Units, tens, and hundreds are the same as for \verb|portuges| and are not redefined, only the teens are % Brazilian specific.\\ % Teens (argument must be a number from 0 to 9): % \begin{macrocode} diff --git a/trunk/fc-francais.def b/trunk/fc-francais.def index 6c3bf3a..7088eee 100644 --- a/trunk/fc-francais.def +++ b/trunk/fc-francais.def @@ -3,7 +3,7 @@ \ProvidesFCLanguage{francais}[2013/08/17]% \FCloadlang{french}% % \end{macrocode} -% Set |francais| to be equivalent to |french|. +% Set \verb|francais| to be equivalent to \verb|french|. % \begin{macrocode} \global\let\@ordinalMfrancais=\@ordinalMfrench \global\let\@ordinalFfrancais=\@ordinalFfrench diff --git a/trunk/fc-frenchb.def b/trunk/fc-frenchb.def index f1112c7..1021782 100644 --- a/trunk/fc-frenchb.def +++ b/trunk/fc-frenchb.def @@ -3,7 +3,7 @@ \ProvidesFCLanguage{frenchb}[2013/08/17]% \FCloadlang{french}% % \end{macrocode} -% Set |frenchb| to be equivalent to |french|. +% Set \verb|frenchb| to be equivalent to \verb|french|. % \begin{macrocode} \global\let\@ordinalMfrenchb=\@ordinalMfrench \global\let\@ordinalFfrenchb=\@ordinalFfrench diff --git a/trunk/fc-german.def b/trunk/fc-german.def index b297e27..ef65bf4 100644 --- a/trunk/fc-german.def +++ b/trunk/fc-german.def @@ -67,8 +67,8 @@ }% \global\let\@@tenstringgerman\@@tenstringgerman % \end{macrocode} -% \cs{einhundert} is set to |einhundert| by default, user can -% redefine this command to just |hundert| if required, similarly +% \cs{einhundert} is set to \verb|einhundert| by default, user can +% redefine this command to just \verb|hundert| if required, similarly % for \cs{eintausend}. % \begin{macrocode} \providecommand*{\einhundert}{einhundert}% @@ -364,10 +364,10 @@ }% \global\let\@@teenthstringNgerman\@@teenthstringNgerman % \end{macrocode} -% This appends the results to |\#2| for number |\#2| (in range 0 to +% This appends the results to \verb|\#2| for number \verb|\#2| (in range 0 to % 100.) % null and eins are dealt with separately in -% |\@@numberstringgerman|. +% \verb|\@@numberstringgerman|. % \begin{macrocode} \newcommand*\@@numberunderhundredgerman[2]{% \ifnum#1<10\relax diff --git a/trunk/fc-germanb.def b/trunk/fc-germanb.def index 66bafaa..39ef05b 100644 --- a/trunk/fc-germanb.def +++ b/trunk/fc-germanb.def @@ -6,7 +6,7 @@ % \begin{macrocode} \FCloadlang{german}% % \end{macrocode} -% Set |germanb| to be equivalent to |german|. +% Set \verb|germanb| to be equivalent to \verb|german|. % \begin{macrocode} \global\let\@ordinalMgermanb=\@ordinalMgerman \global\let\@ordinalFgermanb=\@ordinalFgerman diff --git a/trunk/fc-ngerman.def b/trunk/fc-ngerman.def index a509342..2cf2f98 100644 --- a/trunk/fc-ngerman.def +++ b/trunk/fc-ngerman.def @@ -4,7 +4,7 @@ \FCloadlang{german}% \FCloadlang{ngermanb}% % \end{macrocode} -% Set |ngerman| to be equivalent to |german|. Is it okay to do +% Set \verb|ngerman| to be equivalent to \verb|german|. Is it okay to do % this? (I don't know the difference between the two.) % \begin{macrocode} \global\let\@ordinalMngerman=\@ordinalMgerman diff --git a/trunk/fc-ngermanb.def b/trunk/fc-ngermanb.def index 1807b96..97c1223 100644 --- a/trunk/fc-ngermanb.def +++ b/trunk/fc-ngermanb.def @@ -3,7 +3,7 @@ \ProvidesFCLanguage{ngermanb}[2013/08/17]% \FCloadlang{german}% % \end{macrocode} -% Set |ngermanb| to be equivalent to |german|. Is it okay to do +% Set \verb|ngermanb| to be equivalent to \verb|german|. Is it okay to do % this? (I don't know the difference between the two.) % \begin{macrocode} \global\let\@ordinalMngermanb=\@ordinalMgerman diff --git a/trunk/fc-portuguese.def b/trunk/fc-portuguese.def index 505a886..99c9ded 100644 --- a/trunk/fc-portuguese.def +++ b/trunk/fc-portuguese.def @@ -6,7 +6,7 @@ % \begin{macrocode} \FCloadlang{portuges}% % \end{macrocode} -% Set |portuguese| to be equivalent to |portuges|. +% Set \verb|portuguese| to be equivalent to \verb|portuges|. % \begin{macrocode} \global\let\@ordinalMportuguese=\@ordinalMportuges \global\let\@ordinalFportuguese=\@ordinalFportuges diff --git a/trunk/fmtcount-manual.tex b/trunk/fmtcount-manual.tex index e59a361..7384d7b 100644 --- a/trunk/fmtcount-manual.tex +++ b/trunk/fmtcount-manual.tex @@ -43,7 +43,7 @@ pdftitle={fmtcount.sty: Displaying the Values of LaTeX Counters}, pdfkeywords={LaTeX,counter}]{hyperref} -\CheckSum{10802} +\CheckSum{10801} \doxitem{Option}{option}{options} diff --git a/trunk/fmtcount.sty b/trunk/fmtcount.sty index 61e8fdc..4d411bf 100644 --- a/trunk/fmtcount.sty +++ b/trunk/fmtcount.sty @@ -1,6 +1,6 @@ %\subsection{fmtcount.sty} -% This section deals with the code for |fmtcount.sty| +% This section deals with the code for \verb|fmtcount.sty|. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{fmtcount}[2024/10/18 v3.09] @@ -28,7 +28,7 @@ % These commands need to be defined before the % configuration file is loaded. % -% Define the macro to format the |st|, |nd|, |rd| or |th| of an +% Define the macro to format the \verb|st|, \verb|nd|, \verb|rd| or \verb|th| of an % ordinal. % \changes{3.01}{2014/12/3}{Make \cs{fmtord} language dependent.} % \changes{3.01}{2014/12/3}{Substitute \cs{textsuperscript} for \cs{fc@textsuperscript}, and define @@ -477,7 +477,7 @@ dutch} } % \end{macrocode} %\end{macro} -% The following registers are needed by |\@ordinal| etc +% The following registers are needed by \verb|\@ordinal| etc % \begin{macrocode} \newcount\@ordinalctr \newcount\@orgargctr From 8f4779e7e2de4b5516a51bf6c716f1abf2930e6f Mon Sep 17 00:00:00 2001 From: Erik Nijenhuis Date: Wed, 23 Oct 2024 22:13:00 +0200 Subject: [PATCH 5/9] Fix code line numbers Signed-off-by: Erik Nijenhuis --- trunk/fc-UKenglish.def | 1 + trunk/fc-USenglish.def | 1 + trunk/fc-american.def | 4 +--- trunk/fc-brazilian.def | 4 +--- trunk/fc-british.def | 1 + trunk/fc-dutch.def | 4 +--- trunk/fc-english.def | 4 +--- trunk/fc-francais.def | 2 +- trunk/fc-french.def | 4 +--- trunk/fc-frenchb.def | 2 +- trunk/fc-german.def | 4 +--- trunk/fc-germanb.def | 2 +- trunk/fc-italian.def | 2 +- trunk/fc-ngerman.def | 2 +- trunk/fc-ngermanb.def | 2 +- trunk/fc-portuges.def | 4 +--- trunk/fc-portuguese.def | 2 +- trunk/fc-spanish.def | 4 +--- trunk/fcnumparser.sty | 4 +--- trunk/fcprefix.sty | 4 +--- trunk/fmtcount.sty | 4 +--- 21 files changed, 21 insertions(+), 40 deletions(-) diff --git a/trunk/fc-UKenglish.def b/trunk/fc-UKenglish.def index eaa4a1b..62e7c78 100644 --- a/trunk/fc-UKenglish.def +++ b/trunk/fc-UKenglish.def @@ -26,3 +26,4 @@ \global\let\@OrdinalstringFUKenglish\@OrdinalstringMenglish \global\let\@OrdinalstringNUKenglish\@OrdinalstringMenglish % \end{macrocode} +% \setcounter{CodelineNo}{0} diff --git a/trunk/fc-USenglish.def b/trunk/fc-USenglish.def index 493001e..2fb987d 100644 --- a/trunk/fc-USenglish.def +++ b/trunk/fc-USenglish.def @@ -27,3 +27,4 @@ \global\let\@OrdinalstringFUSenglish\@OrdinalstringMenglish \global\let\@OrdinalstringNUSenglish\@OrdinalstringMenglish % \end{macrocode} +% \setcounter{CodelineNo}{0} diff --git a/trunk/fc-american.def b/trunk/fc-american.def index e5189e0..e14b374 100644 --- a/trunk/fc-american.def +++ b/trunk/fc-american.def @@ -27,6 +27,4 @@ \global\let\@OrdinalstringFamerican\@OrdinalstringMUSenglish \global\let\@OrdinalstringNamerican\@OrdinalstringMUSenglish % \end{macrocode} -\iffalse Local variables: \fi -\iffalse mode: docTeX \fi -\iffalse End: \fi +% \setcounter{CodelineNo}{0} diff --git a/trunk/fc-brazilian.def b/trunk/fc-brazilian.def index bc55b95..53708d2 100644 --- a/trunk/fc-brazilian.def +++ b/trunk/fc-brazilian.def @@ -131,6 +131,4 @@ % \begin{macrocode} \global\let\@NumberstringNbrazilian\@NumberstringMbrazilian % \end{macrocode} -\iffalse Local variables: \fi -\iffalse mode: docTeX \fi -\iffalse End: \fi +% \setcounter{CodelineNo}{0} diff --git a/trunk/fc-british.def b/trunk/fc-british.def index a08c073..1bb8701 100644 --- a/trunk/fc-british.def +++ b/trunk/fc-british.def @@ -26,3 +26,4 @@ \global\let\@OrdinalstringFbritish\@OrdinalstringMenglish \global\let\@OrdinalstringNbritish\@OrdinalstringMenglish % \end{macrocode} +% \setcounter{CodelineNo}{0} diff --git a/trunk/fc-dutch.def b/trunk/fc-dutch.def index f27b666..aa24d24 100644 --- a/trunk/fc-dutch.def +++ b/trunk/fc-dutch.def @@ -393,6 +393,4 @@ }% \global\let\@@numberunderhundredthdutch\@@numberunderhundredthdutch % \end{macrocode} -\iffalse Local variables: \fi -\iffalse mode: docTeX \fi -\iffalse End: \fi +% \setcounter{CodelineNo}{0} diff --git a/trunk/fc-english.def b/trunk/fc-english.def index 90e8ab9..a916302 100644 --- a/trunk/fc-english.def +++ b/trunk/fc-english.def @@ -565,6 +565,4 @@ this number}% \global\let\@OrdinalstringFenglish=\@OrdinalstringMenglish \global\let\@OrdinalstringNenglish=\@OrdinalstringMenglish % \end{macrocode} -\iffalse Local variables: \fi -\iffalse mode: docTeX \fi -\iffalse End: \fi +% \setcounter{CodelineNo}{0} diff --git a/trunk/fc-francais.def b/trunk/fc-francais.def index 7088eee..9d9c63b 100644 --- a/trunk/fc-francais.def +++ b/trunk/fc-francais.def @@ -21,4 +21,4 @@ \global\let\@OrdinalstringFfrancais=\@OrdinalstringFfrench \global\let\@OrdinalstringNfrancais=\@OrdinalstringNfrench % \end{macrocode} - +% \setcounter{CodelineNo}{0} diff --git a/trunk/fc-french.def b/trunk/fc-french.def index fe3a6b3..18dda88 100644 --- a/trunk/fc-french.def +++ b/trunk/fc-french.def @@ -1767,6 +1767,4 @@ z\'ero% \gdef\@NumberstringMfrench{\csuse{@NumberstringMfrench\fmtcount@french}}% \gdef\@NumberstringFfrench{\csuse{@NumberstringFfrench\fmtcount@french}}% % \end{macrocode} -\iffalse Local variables: \fi -\iffalse mode: docTeX \fi -\iffalse End: \fi +% \setcounter{CodelineNo}{0} diff --git a/trunk/fc-frenchb.def b/trunk/fc-frenchb.def index 1021782..5fbc7ae 100644 --- a/trunk/fc-frenchb.def +++ b/trunk/fc-frenchb.def @@ -21,4 +21,4 @@ \global\let\@OrdinalstringFfrenchb=\@OrdinalstringFfrench \global\let\@OrdinalstringNfrenchb=\@OrdinalstringNfrench % \end{macrocode} - +% \setcounter{CodelineNo}{0} diff --git a/trunk/fc-german.def b/trunk/fc-german.def index ef65bf4..e04b7b3 100644 --- a/trunk/fc-german.def +++ b/trunk/fc-german.def @@ -579,6 +579,4 @@ % \begin{macrocode} \FCloadlang{germanb}% % \end{macrocode} -\iffalse Local variables: \fi -\iffalse mode: docTeX \fi -\iffalse End: \fi +% \setcounter{CodelineNo}{0} diff --git a/trunk/fc-germanb.def b/trunk/fc-germanb.def index 39ef05b..eaf7e5c 100644 --- a/trunk/fc-germanb.def +++ b/trunk/fc-germanb.def @@ -24,4 +24,4 @@ \global\let\@OrdinalstringFgermanb=\@OrdinalstringFgerman \global\let\@OrdinalstringNgermanb=\@OrdinalstringNgerman % \end{macrocode} - +% \setcounter{CodelineNo}{0} diff --git a/trunk/fc-italian.def b/trunk/fc-italian.def index 8c473e0..76494b7 100644 --- a/trunk/fc-italian.def +++ b/trunk/fc-italian.def @@ -92,4 +92,4 @@ \edef#2{#1\relax\noexpand\fmtord{a}}} \global\let\@ordinalFitalian\@ordinalFitalian % \end{macrocode} - +% \setcounter{CodelineNo}{0} diff --git a/trunk/fc-ngerman.def b/trunk/fc-ngerman.def index 2cf2f98..93d2803 100644 --- a/trunk/fc-ngerman.def +++ b/trunk/fc-ngerman.def @@ -23,4 +23,4 @@ \global\let\@OrdinalstringFngerman=\@OrdinalstringFgerman \global\let\@OrdinalstringNngerman=\@OrdinalstringNgerman % \end{macrocode} - +% \setcounter{CodelineNo}{0} diff --git a/trunk/fc-ngermanb.def b/trunk/fc-ngermanb.def index 97c1223..b659073 100644 --- a/trunk/fc-ngermanb.def +++ b/trunk/fc-ngermanb.def @@ -26,4 +26,4 @@ % \begin{macrocode} \FCloadlang{ngerman}% % \end{macrocode} - +% \setcounter{CodelineNo}{0} diff --git a/trunk/fc-portuges.def b/trunk/fc-portuges.def index 57df73a..e644ebb 100644 --- a/trunk/fc-portuges.def +++ b/trunk/fc-portuges.def @@ -800,6 +800,4 @@ this number}% }% \global\let\@@ordinalstringportuges\@@ordinalstringportuges % \end{macrocode} -\iffalse Local variables: \fi -\iffalse mode: docTeX \fi -\iffalse End: \fi +% \setcounter{CodelineNo}{0} diff --git a/trunk/fc-portuguese.def b/trunk/fc-portuguese.def index 99c9ded..ea1b8ea 100644 --- a/trunk/fc-portuguese.def +++ b/trunk/fc-portuguese.def @@ -24,4 +24,4 @@ \global\let\@OrdinalstringFportuguese=\@OrdinalstringFportuges \global\let\@OrdinalstringNportuguese=\@OrdinalstringNportuges % \end{macrocode} - +% \setcounter{CodelineNo}{0} diff --git a/trunk/fc-spanish.def b/trunk/fc-spanish.def index 74045bc..79e8702 100644 --- a/trunk/fc-spanish.def +++ b/trunk/fc-spanish.def @@ -947,6 +947,4 @@ this number}% }% \global\let\@@ordinalstringspanish\@@ordinalstringspanish % \end{macrocode} -\iffalse Local variables: \fi -\iffalse mode: docTeX \fi -\iffalse End: \fi \ No newline at end of file +% \setcounter{CodelineNo}{0} diff --git a/trunk/fcnumparser.sty b/trunk/fcnumparser.sty index 7b910ea..56230f0 100644 --- a/trunk/fcnumparser.sty +++ b/trunk/fcnumparser.sty @@ -597,6 +597,4 @@ }\@tempa }% % \end{macrocode} -\iffalse Local variables: \fi -\iffalse mode: docTeX \fi -\iffalse End: \fi +% \setcounter{CodelineNo}{0} diff --git a/trunk/fcprefix.sty b/trunk/fcprefix.sty index b7fa0cb..893c2c4 100644 --- a/trunk/fcprefix.sty +++ b/trunk/fcprefix.sty @@ -562,6 +562,4 @@ \fc@call\@latinnumeralstringnum } % \end{macrocode} -\iffalse Local variables: \fi -\iffalse mode: docTeX \fi -\iffalse End: \fi +% \setcounter{CodelineNo}{0} diff --git a/trunk/fmtcount.sty b/trunk/fmtcount.sty index 4d411bf..c9b7214 100644 --- a/trunk/fmtcount.sty +++ b/trunk/fmtcount.sty @@ -2079,6 +2079,4 @@ dutch} \let\@numberstring=\@numberstringM \let\@Numberstring=\@NumberstringM % \end{macrocode} -\iffalse Local variables: \fi -\iffalse mode: docTeX \fi -\iffalse End: \fi +% \setcounter{CodelineNo}{0} From b65bbf6682fab85b1703fcd2e69f3cba978a979a Mon Sep 17 00:00:00 2001 From: Erik Nijenhuis Date: Wed, 23 Oct 2024 22:45:46 +0200 Subject: [PATCH 6/9] Update fmtord test Signed-off-by: Erik Nijenhuis --- trunk/test/reference/test-fmtord-l.html | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/trunk/test/reference/test-fmtord-l.html b/trunk/test/reference/test-fmtord-l.html index b113a8a..6eb01cc 100644 --- a/trunk/test/reference/test-fmtord-l.html +++ b/trunk/test/reference/test-fmtord-l.html @@ -5,19 +5,18 @@ - - - - + + + -

french/raise: 1er, 2e, 3french/raise: 1er, 2e, 3e -

frenchb=french: -

1 frenchb=french: 1er, 2e, 3e From fd67fc00c5188e05acd56fee9901a4db533d1e69 Mon Sep 17 00:00:00 2001 From: Erik Nijenhuis Date: Wed, 23 Oct 2024 23:04:48 +0200 Subject: [PATCH 7/9] Fix authors Signed-off-by: Erik Nijenhuis --- README | 2 +- trunk/Makefile | 2 +- trunk/README | 2 +- trunk/fmtcount-manual.tex | 9 ++++++--- trunk/fmtcount.sty | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README b/README index 6bf4570..40be48e 100644 --- a/README +++ b/README @@ -10,7 +10,7 @@ In the trunk/ directory you can run "make dist" to generate the .dtx and .ins files (which will be put in the dist/ directory). Alternatively, you can run makedtx explicitly: - makedtx -author "Nicola Talbot and Vincent Belaïche" \ + makedtx -author "Nicola Talbot, Vincent Belaïche and Erik Nijenhuis" \ -src "(.+)\.(sty)=>\1.\2" \ -src "(.+)\.(def)=>\1.\2" \ -doc fmtcount-manual.tex fmtcount diff --git a/trunk/Makefile b/trunk/Makefile index 3515c26..fbd5a7e 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -14,7 +14,7 @@ dist ctan : README CHANGES fmtcount-manual.tex \ $(MAKE) -C $(DIST) ctan $(addprefix $(DIST)/,$(DOCSTRIP)) : $(DTX_DEPENDANCIES) - makedtx -author "Nicola Talbot and Vincent Belaïche" \ + makedtx -author "Nicola Talbot, Vincent Belaïche and Erik Nijenhuis" \ -src "(.+)\.(sty|def)$$=>\1.\2" \ -doc fmtcount-manual.tex fmtcount ./cp2dist -m $(addprefix -f$(SPACE),$(STYFILES)) fmtcount.{dtx,ins} $(DIST) diff --git a/trunk/README b/trunk/README index 31ea280..818c14e 100644 --- a/trunk/README +++ b/trunk/README @@ -2,7 +2,7 @@ LaTeX Package : fmtcount v%%VERSION%% Last Modified : %%DATE%% -Author : Nicola Talbot and Vincent Belaïche +Author : Nicola Talbot, Vincent Belaïche and Erik Nijenhuis Files : fmtcount.dtx - documented source file fmtcount.ins - installation script diff --git a/trunk/fmtcount-manual.tex b/trunk/fmtcount-manual.tex index 7384d7b..79d6e56 100644 --- a/trunk/fmtcount-manual.tex +++ b/trunk/fmtcount-manual.tex @@ -39,7 +39,7 @@ \usepackage[colorlinks, bookmarks, bookmarksopen, - pdfauthor={Nicola L.C. Talbot}, + pdfauthor={Nicola L.C. Talbot, Vincent Belaïche and Erik Nijenhuis}, pdftitle={fmtcount.sty: Displaying the Values of LaTeX Counters}, pdfkeywords={LaTeX,counter}]{hyperref} @@ -63,9 +63,12 @@ \title{fmtcount.sty: Displaying the Values of \LaTeX\ Counters} \author{Nicola L.C. Talbot\\ - \href{https://www.dickimaw-books.com}{www.dickimaw-books.com} + \href{https://www.dickimaw-books.com}{dickimaw-books.com} \and - Vincent Bela\"iche} + Vincent Bela\"iche + \and + Erik Nijenhuis\\ + \href{https://github.com/Xerdi/fmtcount}{github.com/Xerdi/fmtcount}} \date{%%DATE%% (version %%VERSION%%)\relax } \maketitle diff --git a/trunk/fmtcount.sty b/trunk/fmtcount.sty index c9b7214..2224257 100644 --- a/trunk/fmtcount.sty +++ b/trunk/fmtcount.sty @@ -3,7 +3,7 @@ % This section deals with the code for \verb|fmtcount.sty|. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fmtcount}[2024/10/18 v3.09] +\ProvidesPackage{fmtcount}[2024/10/18 v3.09 Displaying the values of LaTeX counters (NT,VB,NE)] \RequirePackage{ifthen} % \end{macrocode} % \changes{3.01}{2014/12/03}{Use \styfmt{xkeyval} instead of \styfmt{keyval}, so that we do not get in trouble From 02573fa9ca59c6910d0f8631e88202b4ae52fb0e Mon Sep 17 00:00:00 2001 From: Erik Nijenhuis Date: Sat, 8 Feb 2025 18:07:05 +0100 Subject: [PATCH 8/9] Correct documentation issues and deprecated preambles (e.g. \CharacterTable) Signed-off-by: Erik Nijenhuis --- README => README.md | 27 +++++++++++++++------------ dist/Makefile | 24 ++++++++++++------------ trunk/Makefile | 5 +++-- trunk/README | 22 +++++++++++++--------- trunk/fcnumparser.sty | 2 +- trunk/fmtcount-manual.tex | 9 +-------- trunk/fmtcount.perl | 2 +- 7 files changed, 46 insertions(+), 45 deletions(-) rename README => README.md (57%) diff --git a/README b/README.md similarity index 57% rename from README rename to README.md index 40be48e..bc36eb8 100644 --- a/README +++ b/README.md @@ -1,3 +1,6 @@ +# FMT Count +![CTAN Version](https://img.shields.io/ctan/v/fmtcount) + This is the source for the LaTeX fmtcount package. The source for the .sty and .def files are in the trunk/ directory. @@ -10,10 +13,10 @@ In the trunk/ directory you can run "make dist" to generate the .dtx and .ins files (which will be put in the dist/ directory). Alternatively, you can run makedtx explicitly: - makedtx -author "Nicola Talbot, Vincent Belaïche and Erik Nijenhuis" \ - -src "(.+)\.(sty)=>\1.\2" \ - -src "(.+)\.(def)=>\1.\2" \ - -doc fmtcount-manual.tex fmtcount + makedtx -author "Nicola Talbot (inactive), Vincent Belaïche and Erik Nijenhuis" \ + -src "(.+)\.(sty)=>\1.\2" \ + -src "(.+)\.(def)=>\1.\2" \ + -doc fmtcount-manual.tex fmtcount The Perl script mv2dist moves the .dtx and .ins files from trunk/ to dist/ additionally substituting in the correct version number and @@ -23,15 +26,15 @@ Once the .dtx and .ins files have been created, the documentation can be compiled either using the Makefile file in the dist/ directory or explicitly using: - latex fmtcount.ins + latex fmtcount.ins - pdflatex fmtcount.dtx - makeindex -s gind.ist fmtcount.idx - makeindex -s gglo.ist -o fmtcount.gls fmtcount.glo - pdflatex fmtcount.dtx - pdflatex fmtcount.dtx + pdflatex fmtcount.dtx + makeindex -s gind.ist fmtcount.idx + makeindex -s gglo.ist -o fmtcount.gls fmtcount.glo + pdflatex fmtcount.dtx + pdflatex fmtcount.dtx Licensed under the LPPL. -Nicola Talbot -http://www.dickimaw-books.com/ +Package info: https://ctan.org/pkg/fmtcount +Issues: https://github.com/Xerdi/fmtcount/issues diff --git a/dist/Makefile b/dist/Makefile index 7ae681e..4b86279 100644 --- a/dist/Makefile +++ b/dist/Makefile @@ -41,24 +41,24 @@ fmtcount.zip : fmtcount.tds.zip zip -r fmtcount.zip fmtcount/ fmtcount.tds.zip $(STYFILES):%: $(DOCSTRIP) - latex $< + latex $< fmtcount.pdf : $(DOCSTRIP) - -latex $< - pdflatex fmtcount.dtx - makeindex -s gind.ist fmtcount.idx - makeindex -s gglo.ist -o fmtcount.gls fmtcount.glo - pdflatex fmtcount.dtx - pdflatex fmtcount.dtx + -latex $< + pdflatex fmtcount.dtx + makeindex -s gind.ist fmtcount.idx + makeindex -s gglo.ist -o fmtcount.gls fmtcount.glo + pdflatex fmtcount.dtx + pdflatex fmtcount.dtx $(DOCSTRIP):%: $(addprefix $(SRC)/,$(DTX_DEPENDANCIES)) $(MAKE) -C ../trunk dist fmtcount-manual.html : fmtcount-manual.tex - ht latex fmtcount-manual - tex '\def\filename{{fmtcount-manual}{idx}{4dx}{ind}} \input idxmake.4ht' - makeindex -s gind.ist -o fmtcount-manual.ind fmtcount-manual.4dx - ht latex fmtcount-manual + ht latex fmtcount-manual + tex '\def\filename{{fmtcount-manual}{idx}{4dx}{ind}} \input idxmake.4ht' + makeindex -s gind.ist -o fmtcount-manual.ind fmtcount-manual.4dx + ht latex fmtcount-manual html : fmtcount-manual.html @@ -73,6 +73,6 @@ realclean squeaky:%: clean command rm -f fmtcount-manual.{html,tex} command rm -f fmtcount-manual*.png command rm -f *.sty *.def - command rm -f README CHANGES + command rm -f README CHANGES command rm -rf doc/ tex/ source/ fmtcount/ scripts/ command rm -f fmtcount.zip fmtcount.tds.zip diff --git a/trunk/Makefile b/trunk/Makefile index fbd5a7e..c2b0e1f 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -14,13 +14,14 @@ dist ctan : README CHANGES fmtcount-manual.tex \ $(MAKE) -C $(DIST) ctan $(addprefix $(DIST)/,$(DOCSTRIP)) : $(DTX_DEPENDANCIES) - makedtx -author "Nicola Talbot, Vincent Belaïche and Erik Nijenhuis" \ + makedtx -author "Nicola Talbot (inactive), Vincent Belaïche and Erik Nijenhuis" \ -src "(.+)\.(sty|def)$$=>\1.\2" \ + -setambles '(.*)\.(sty|def)=>\nopreamble\usepreamble\defaultpreamble' \ -doc fmtcount-manual.tex fmtcount ./cp2dist -m $(addprefix -f$(SPACE),$(STYFILES)) fmtcount.{dtx,ins} $(DIST) $(DIST)/fmtcount.pdf : $(addprefix $(DIST)/,$(DOCSTRIP)) - $(MAKE) -C $(DIST) fmtcount.pdf + $(MAKE) -C $(DIST) fmtcount.pdf $(DIST)/fmtcount-manual.tex : fmtcount-manual.tex ./cp2dist $(addprefix -f$(SPACE),$(STYFILES)) fmtcount-manual.tex $(DIST) diff --git a/trunk/README b/trunk/README index 818c14e..fa7de76 100644 --- a/trunk/README +++ b/trunk/README @@ -2,14 +2,14 @@ LaTeX Package : fmtcount v%%VERSION%% Last Modified : %%DATE%% -Author : Nicola Talbot, Vincent Belaïche and Erik Nijenhuis +Author : Nicola Talbot (inactive), Vincent Belaïche and Erik Nijenhuis Files : fmtcount.dtx - documented source file fmtcount.ins - installation script - fmtcount.perl - latex2html style file - fc-samp.tex \ - fc-lang.tex - sample files - fc-frlargenum.tex / + fmtcount.perl - latex2html style file + fc-samp.tex \ + fc-lang.tex - sample files + fc-frlargenum.tex / The package fmtcount.sty provides commands that display the value of a LaTeX counter in a variety @@ -36,10 +36,10 @@ find it (e.g. latex2html/styles/). To extract the documentation do: -latex fmtcount.dtx +pdflatex fmtcount.dtx makeindex -s gglo.ist -t fmtcount.glg -o fmtcount.gls fmtcount.glo -latex fmtcount.dtx -latex fmtcount.dtx +pdflatex fmtcount.dtx +pdflatex fmtcount.dtx Place the resulting file (fmtcount.dvi) into the documentation directory (e.g. texmf/doc/latex/fmtcount/). @@ -49,4 +49,8 @@ Read the file CHANGES for version changes. This material is subject to the LaTeX Project Public License. See https://www.ctan.org/license/lppl for the details of that license. -http://www.dickimaw-books.com/ +Package info: + https://ctan.org/pkg/fmtcount + +Issues: + https://github.com/Xerdi/fmtcount/issues diff --git a/trunk/fcnumparser.sty b/trunk/fcnumparser.sty index 56230f0..6665308 100644 --- a/trunk/fcnumparser.sty +++ b/trunk/fcnumparser.sty @@ -341,7 +341,7 @@ }\@tempa } % \end{macrocode} -% \DescribeMacro{\fc@@check@nonzeros@inner} Macro \cs{fc@@check@nonzeros@inner} Check wehther some part of the +% \DescribeMacro{\fc@@check@nonzeros@inner} Macro \cs{fc@@check@nonzeros@inner} Check whether some part of the % parsed value contains some non-zero digit At the call of this macro we expect that:\newline\noindent % \begin{tabularx}{\linewidth}{@{}>{\raggedleft\arraybackslash}rX@{}} % \cs{@tempa}&input/output macro:\newline\noindent diff --git a/trunk/fmtcount-manual.tex b/trunk/fmtcount-manual.tex index 79d6e56..4ea83cd 100644 --- a/trunk/fmtcount-manual.tex +++ b/trunk/fmtcount-manual.tex @@ -43,8 +43,6 @@ pdftitle={fmtcount.sty: Displaying the Values of LaTeX Counters}, pdfkeywords={LaTeX,counter}]{hyperref} -\CheckSum{10801} - \doxitem{Option}{option}{options} \newlength{\tabcolwidth} @@ -59,7 +57,6 @@ \begin{document} \RecordChanges - \title{fmtcount.sty: Displaying the Values of \LaTeX\ Counters} \author{Nicola L.C. Talbot\\ @@ -907,11 +904,7 @@ \section{Acknowledgements} \section{Troubleshooting} -There is a FAQ available at: - -\href{https://dickimaw-books.com/faq.php}{dickimaw-books.com/faq.php}. - -\noindent Bug reporting should be done via the GitHub issue manager at: +Bug reporting should be done via the GitHub issue manager at: \href{https://github.com/Xerdi/fmtcount/issues/}{github.com/Xerdi/fmtcount/issues/}. diff --git a/trunk/fmtcount.perl b/trunk/fmtcount.perl index c7fdfe3..a07c839 100644 --- a/trunk/fmtcount.perl +++ b/trunk/fmtcount.perl @@ -1,5 +1,5 @@ # File : fmtcount.perl -# Author : Nicola Talbot +# Author : Nicola Talbot (inactive) # Date : 2012-09-25 # Version : 1.06 # Description : LaTeX2HTML implementation of fmtcount package From 398580fe402240659c3888f673f9c4c149e150c0 Mon Sep 17 00:00:00 2001 From: Erik Nijenhuis Date: Sat, 8 Feb 2025 19:43:44 +0100 Subject: [PATCH 9/9] Update upload-artifact Signed-off-by: Erik Nijenhuis --- .github/workflows/test-latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-latest.yml b/.github/workflows/test-latest.yml index a40f77a..5452d4a 100644 --- a/.github/workflows/test-latest.yml +++ b/.github/workflows/test-latest.yml @@ -17,7 +17,7 @@ jobs: run: | make -C trunk test - name: Archive Test results (Latest) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: name: build