Xerdi · MacLotsen · Feb 8, 2025 · Oct 23, 2024 · Oct 23, 2024 · Oct 23, 2024
diff --git 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

diff --git a/README → README.md b/README → 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 and Vincent Belaïche" \
-                -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
@@ -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
@@ -14,13 +14,14 @@ 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 (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
@@ -2,14 +2,14 @@ LaTeX Package : fmtcount v%%VERSION%%
 
 Last Modified : %%DATE%%
 
-Author        : Nicola Talbot and Vincent Belaïche
+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/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
@@ -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
@@ -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
@@ -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}
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -947,6 +947,4 @@ this number}%
 }%
 \global\let\@@ordinalstringspanish\@@ordinalstringspanish
 %    \end{macrocode}
-\iffalse Local variables: \fi
-\iffalse mode: docTeX     \fi
-\iffalse End:             \fi
+% \setcounter{CodelineNo}{0}
diff --git 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
@@ -597,6 +597,4 @@
   }\@tempa
 }%
 %    \end{macrocode}
-\iffalse Local variables: \fi
-\iffalse mode: docTeX     \fi
-\iffalse End:             \fi
+% \setcounter{CodelineNo}{0}