Merge pull request #4 from Xerdi/test-research

Fix test suite
Xerdi · Aug 31, 2024 · b275ea9 · b275ea9
2 parents a6e478e + 0d3ec85
commit b275ea9
Show file tree

Hide file tree

Showing 37 changed files with 767 additions and 1,375 deletions.
diff --git a/dist/Makefile b/dist/Makefile
@@ -8,14 +8,14 @@ all	: fmtcount.pdf
 .PHONY: ctan dist
 ctan dist : fmtcount.zip
 
-install	:  fmtcount.pdf $(STYFILES) $(TEXMF_INSTALL_DIR)/doc/latex/fmtcount $(TEXMF_INSTALL_DIR)/tex/latex/fmtcount
-	command cp fmtcount.pdf $(TEXMF_INSTALL_DIR)/doc/latex/fmtcount/
-	command cp $(STYFILES) $(TEXMF_INSTALL_DIR)/tex/latex/fmtcount/
+install	:  fmtcount.pdf $(STYFILES) "$(TEXMF_INSTALL_DIR)/doc/latex/fmtcount" "$(TEXMF_INSTALL_DIR)/tex/latex/fmtcount"
+	command cp fmtcount.pdf "$(TEXMF_INSTALL_DIR)/doc/latex/fmtcount/"
+	command cp $(STYFILES) "$(TEXMF_INSTALL_DIR)/tex/latex/fmtcount/"
 
-$(TEXMF_INSTALL_DIR)/doc/latex/fmtcount:
+"$(TEXMF_INSTALL_DIR)/doc/latex/fmtcount":
 	mkdir -p $@
 
-$(TEXMF_INSTALL_DIR)/tex/latex/fmtcount:
+"$(TEXMF_INSTALL_DIR)/tex/latex/fmtcount":
 	mkdir -p $@
 
 fmtcount.tds.zip	: fmtcount.pdf \

diff --git a/trunk/fc-german.def b/trunk/fc-german.def
@@ -40,7 +40,7 @@
     \or zwei%
     \or drei%
     \or vier%
-    \or f\"unf%
+    \or fünf%
     \or sechs%
     \or sieben%
     \or acht%
@@ -55,9 +55,9 @@
   \ifcase#1%
     \or zehn%
     \or zwanzig%
-    \or drei{\ss}ig%
+    \or dreißig%
     \or vierzig%
-    \or f\"unfzig%
+    \or fünfzig%
     \or sechzig%
     \or siebzig%
     \or achtzig%
@@ -67,9 +67,9 @@
 }%
 \global\let\@@tenstringgerman\@@tenstringgerman
 %    \end{macrocode}
-% |\einhundert| is set to |einhundert| by default, user can
+% \cs{einhundert} is set to |einhundert| by default, user can
 % redefine this command to just |hundert| if required, similarly
-% for |\eintausend|.
+% for \cs{eintausend}.
 %    \begin{macrocode}
 \providecommand*{\einhundert}{einhundert}%
 \providecommand*{\eintausend}{eintausend}%
@@ -82,10 +82,10 @@
   \ifcase#1%
     zehn%
     \or elf%
-    \or zw\"olf%
+    \or zwölf%
     \or dreizehn%
     \or vierzehn%
-    \or f\"unfzehn%
+    \or fünfzehn%
     \or sechzehn%
     \or siebzehn%
     \or achtzehn%
@@ -203,7 +203,7 @@
 % it is easier to split it into units, tens and teens.
 % Units:
 %\changes{2.0}{2012-09-25}{fixed spelling mistake (correction
-%provided by Dominik Wa\ss enhoven)}
+%provided by Dominik Waß enhoven)}
 %    \begin{macrocode}
 \newcommand*\@@unitthstringMgerman[1]{%
   \ifcase#1%
@@ -212,7 +212,7 @@
     \or zweiter%
     \or dritter%
     \or vierter%
-    \or f\"unfter%
+    \or fünfter%
     \or sechster%
     \or siebter%
     \or achter%
@@ -227,9 +227,9 @@
   \ifcase#1%
     \or zehnter%
     \or zwanzigster%
-    \or drei{\ss}igster%
+    \or dreißigster%
     \or vierzigster%
-    \or f\"unfzigster%
+    \or fünfzigster%
     \or sechzigster%
     \or siebzigster%
     \or achtzigster%
@@ -244,10 +244,10 @@
   \ifcase#1%
     zehnter%
     \or elfter%
-    \or zw\"olfter%
+    \or zwölfter%
     \or dreizehnter%
     \or vierzehnter%
-    \or f\"unfzehnter%
+    \or fünfzehnter%
     \or sechzehnter%
     \or siebzehnter%
     \or achtzehnter%
@@ -265,7 +265,7 @@
     \or zweite%
     \or dritte%
     \or vierte%
-    \or f\"unfte%
+    \or fünfte%
     \or sechste%
     \or siebte%
     \or achte%
@@ -280,9 +280,9 @@
   \ifcase#1%
     \or zehnte%
     \or zwanzigste%
-    \or drei{\ss}igste%
+    \or dreißigste%
     \or vierzigste%
-    \or f\"unfzigste%
+    \or fünfzigste%
     \or sechzigste%
     \or siebzigste%
     \or achtzigste%
@@ -297,10 +297,10 @@
   \ifcase#1%
     zehnte%
     \or elfte%
-    \or zw\"olfte%
+    \or zwölfte%
     \or dreizehnte%
     \or vierzehnte%
-    \or f\"unfzehnte%
+    \or fünfzehnte%
     \or sechzehnte%
     \or siebzehnte%
     \or achtzehnte%
@@ -320,7 +320,7 @@
     \or zweites%
     \or drittes%
     \or viertes%
-    \or f\"unftes%
+    \or fünftes%
     \or sechstes%
     \or siebtes%
     \or achtes%
@@ -335,9 +335,9 @@
   \ifcase#1%
     \or zehntes%
     \or zwanzigstes%
-    \or drei{\ss}igstes%
+    \or dreißigstes%
     \or vierzigstes%
-    \or f\"unfzigstes%
+    \or fünfzigstes%
     \or sechzigstes%
     \or siebzigstes%
     \or achtzigstes%
@@ -352,10 +352,10 @@
   \ifcase#1%
     zehntes%
     \or elftes%
-    \or zw\"olftes%
+    \or zwölftes%
     \or dreizehntes%
     \or vierzehntes%
-    \or f\"unfzehntes%
+    \or fünfzehntes%
     \or sechzehntes%
     \or siebzehntes%
     \or achtzehntes%

diff --git a/trunk/fc-italian.def b/trunk/fc-italian.def
@@ -7,42 +7,79 @@
 \RequirePackage{itnumpar}
 
 \newcommand{\@numberstringMitalian}[2]{%
-  \edef#2{\noexpand\printnumeroinparole{#1}}%
+  \begingroup
+    \def\np@oa{o}%
+    \count@=#1
+    \edef\@tempa{\def\noexpand#2{\@numeroinparole{\count@}}}%
+    \expandafter
+  \endgroup\@tempa
 }
 \global\let\@numberstringMitalian\@numberstringMitalian
 
 \newcommand{\@numberstringFitalian}[2]{%
-  \edef#2{\noexpand\printnumeroinparole{#1}}}
+  \begingroup
+    \def\np@oa{a}%
+    \count@=#1
+    \edef\@tempa{\def\noexpand#2{\@numeroinparole{\count@}}}%
+    \expandafter
+  \endgroup\@tempa
+}
 
 \global\let\@numberstringFitalian\@numberstringFitalian
 
 \newcommand{\@NumberstringMitalian}[2]{%
-  \edef#2{\noexpand\printNumeroinparole{#1}}%
+  \begingroup
+    \def\np@oa{o}%
+    \count@=#1
+    \edef\@tempa{\def\noexpand#2{\@Numeroinparole{\count@}}}%
+    \expandafter
+  \endgroup\@tempa
 }
 \global\let\@NumberstringMitalian\@NumberstringMitalian
 
 \newcommand{\@NumberstringFitalian}[2]{%
-  \edef#2{\noexpand\printNumeroinparole{#1}}%
+  \begingroup
+    \def\np@oa{a}%
+    \count@=#1
+    \edef\@tempa{\def\noexpand#2{\@Numeroinparole{\count@}}}%
+    \expandafter
+  \endgroup\@tempa
 }
 \global\let\@NumberstringFitalian\@NumberstringFitalian
 
 \newcommand{\@ordinalstringMitalian}[2]{%
-  \edef#2{\noexpand\printordinalem{#1}}%
+  \begingroup
+    \count@=#1
+    \edef\@tempa{\def\noexpand#2{\@ordinalem{\count@}}}%
+    \expandafter
+  \endgroup\@tempa
 }
 \global\let\@ordinalstringMitalian\@ordinalstringMitalian
 
 \newcommand{\@ordinalstringFitalian}[2]{%
-  \edef#2{\noexpand\printordinalef{#1}}%
+  \begingroup
+    \count@=#1
+    \edef\@tempa{\def\noexpand#2{\@ordinalef{\count@}}}%
+    \expandafter
+  \endgroup\@tempa
 }
 \global\let\@ordinalstringFitalian\@ordinalstringFitalian
 
 \newcommand{\@OrdinalstringMitalian}[2]{%
-  \edef#2{\noexpand\printOrdinalem{#1}}%
+  \begingroup
+    \count@=#1
+    \edef\@tempa{\def\noexpand#2{\@Ordinalem{\count@}}}%
+    \expandafter
+  \endgroup\@tempa
 }
 \global\let\@OrdinalstringMitalian\@OrdinalstringMitalian
 
 \newcommand{\@OrdinalstringFitalian}[2]{%
-  \edef#2{\noexpand\printOrdinalef{#1}}%
+  \begingroup
+    \count@=#1
+    \edef\@tempa{\def\noexpand#2{\@Ordinalef{\count@}}}%
+    \expandafter
+  \endgroup\@tempa
 }
 \global\let\@OrdinalstringFitalian\@OrdinalstringFitalian