texlive[72583] Master/texmf-dist: fmtcount (18oct24)

commits+karl at tug.org commits+karl at tug.org
Fri Oct 18 23:19:15 CEST 2024


Revision: 72583
          https://tug.org/svn/texlive?view=revision&revision=72583
Author:   karl
Date:     2024-10-18 23:19:15 +0200 (Fri, 18 Oct 2024)
Log Message:
-----------
fmtcount (18oct24)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/fmtcount/CHANGES
    trunk/Master/texmf-dist/doc/latex/fmtcount/README
    trunk/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf
    trunk/Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx
    trunk/Master/texmf-dist/source/latex/fmtcount/fmtcount.ins
    trunk/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def
    trunk/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty

Modified: trunk/Master/texmf-dist/doc/latex/fmtcount/CHANGES
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fmtcount/CHANGES	2024-10-18 21:19:06 UTC (rev 72582)
+++ trunk/Master/texmf-dist/doc/latex/fmtcount/CHANGES	2024-10-18 21:19:15 UTC (rev 72583)
@@ -1,5 +1,11 @@
 fmtcount package versions:
 
+Version 3.09
+
+* Remove redundant \"u occurences in Portuguese
+
+* Fix \andname conjunction for Portuguese
+
 Version 3.08
 
 * Add Dutch language support

Modified: trunk/Master/texmf-dist/doc/latex/fmtcount/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fmtcount/README	2024-10-18 21:19:06 UTC (rev 72582)
+++ trunk/Master/texmf-dist/doc/latex/fmtcount/README	2024-10-18 21:19:15 UTC (rev 72583)
@@ -1,6 +1,6 @@
-LaTeX Package : fmtcount v3.08
+LaTeX Package : fmtcount v3.09
 
-Last Modified : 2024-08-31
+Last Modified : 2024-10-18
 
 Author        : Nicola Talbot and Vincent Belaïche
 

Modified: trunk/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx	2024-10-18 21:19:06 UTC (rev 72582)
+++ trunk/Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx	2024-10-18 21:19:15 UTC (rev 72583)
@@ -1,11 +1,11 @@
 %\iffalse
 % fmtcount.dtx generated using makedtx version 1.2 (c) Nicola Talbot
 % Command line args:
+%   -doc "fmtcount-manual.tex"
 %   -src "(.+)\.(sty|def)$=>\1.\2"
-%   -doc "fmtcount-manual.tex"
 %   -author "Nicola Talbot and Vincent Belaïche"
 %   fmtcount
-% Created on 2024/8/31 14:57
+% Created on 2024/10/18 15:41
 %\fi
 %\iffalse
 %<*package>
@@ -77,7 +77,7 @@
             pdftitle={fmtcount.sty: Displaying the Values of LaTeX Counters},
             pdfkeywords={LaTeX,counter}]{hyperref}
 
-\CheckSum{10834}
+\CheckSum{10802}
 
 \doxitem{Option}{option}{options}
 
@@ -104,7 +104,7 @@
 % \url{www.dickimaw-books.com}
 % \and
 % Vincent Bela\"iche}
-% \date{2024-08-31 (version 3.08)\relax
+% \date{2024-10-18 (version 3.09)\relax
 %}
 % \maketitle
 % \tableofcontents
@@ -4918,7 +4918,7 @@
     \or vinte%
     \or trinta%
     \or quarenta%
-    \or cinq\"uenta%
+    \or cinquenta%
     \or sessenta%
     \or setenta%
     \or oitenta%
@@ -5026,7 +5026,7 @@
     \or Vinte%
     \or Trinta%
     \or Quarenta%
-    \or Cinq\"uenta%
+    \or Cinquenta%
     \or Sessenta%
     \or Setenta%
     \or Oitenta%
@@ -5250,7 +5250,7 @@
     \or vig\'esimo%
     \or trig\'esimo%
     \or quadrag\'esimo%
-    \or q\"uinquag\'esimo%
+    \or quinquag\'esimo%
     \or sexag\'esimo%
     \or setuag\'esimo%
     \or octog\'esimo%
@@ -5277,7 +5277,7 @@
     \or ducent\'esimo%
     \or trecent\'esimo%
     \or quadringent\'esimo%
-    \or q\"uingent\'esimo%
+    \or quingent\'esimo%
     \or seiscent\'esimo%
     \or setingent\'esimo%
     \or octingent\'esimo%
@@ -5312,7 +5312,7 @@
     \or vig\'esima%
     \or trig\'esima%
     \or quadrag\'esima%
-    \or q\"uinquag\'esima%
+    \or quinquag\'esima%
     \or sexag\'esima%
     \or setuag\'esima%
     \or octog\'esima%
@@ -5329,7 +5329,7 @@
     \or ducent\'esima%
     \or trecent\'esima%
     \or quadringent\'esima%
-    \or q\"uingent\'esima%
+    \or quingent\'esima%
     \or seiscent\'esima%
     \or setingent\'esima%
     \or octingent\'esima%
@@ -5364,7 +5364,7 @@
     \or Vig\'esimo%
     \or Trig\'esimo%
     \or Quadrag\'esimo%
-    \or Q\"uinquag\'esimo%
+    \or Quinquag\'esimo%
     \or Sexag\'esimo%
     \or Setuag\'esimo%
     \or Octog\'esimo%
@@ -5381,7 +5381,7 @@
     \or Ducent\'esimo%
     \or Trecent\'esimo%
     \or Quadringent\'esimo%
-    \or Q\"uingent\'esimo%
+    \or Quingent\'esimo%
     \or Seiscent\'esimo%
     \or Setingent\'esimo%
     \or Octingent\'esimo%
@@ -5416,7 +5416,7 @@
     \or Vig\'esima%
     \or Trig\'esima%
     \or Quadrag\'esima%
-    \or Q\"uinquag\'esima%
+    \or Quinquag\'esima%
     \or Sexag\'esima%
     \or Setuag\'esima%
     \or Octog\'esima%
@@ -5433,7 +5433,7 @@
     \or Ducent\'esima%
     \or Trecent\'esima%
     \or Quadringent\'esima%
-    \or Q\"uingent\'esima%
+    \or Quingent\'esima%
     \or Seiscent\'esima%
     \or Setingent\'esima%
     \or Octingent\'esima%
@@ -5473,12 +5473,8 @@
     \@strctr=#1 \divide\@strctr by 1000\relax
     \@FCmodulo{\@strctr}{10}%
     \ifnum\@strctr>0
-      \ifnum\@strctr=1\relax
-        \let\@@fc at numstr#2\relax
-        \protected at edef#2{\@@fc at numstr\ \@andname}%
-      \fi
       \let\@@fc at numstr#2\relax
-      \protected at edef#2{\@@fc at numstr\ \@unitstring{\@strctr}}%
+      \protected at edef#2{\@@fc at numstr\ \@andname\ \@unitstring{\@strctr}}%
     \fi
   \else
     \@strctr=#1\relax
@@ -5504,7 +5500,7 @@
 \ifnum\@strctr>0\relax
   \ifnum#1>1000 \relax
     \let\@@fc at numstr#2\relax
-    \protected at edef#2{\@@fc at numstr\ }%
+    \protected at edef#2{\@@fc at numstr\ \@andname\ }%
   \fi
   \@tmpstrctr=#1\relax
   \@FCmodulo{\@tmpstrctr}{1000}%
@@ -5528,16 +5524,9 @@
   \protected at edef#2{\@@fc at numstr\@tenstring{\@strctr}}%
   \@strctr=#1\relax \@FCmodulo{\@strctr}{10}%
   \ifnum\@strctr>0
-    \ifnum\@strctr=1\relax
-      \let\@@fc at numstr#2\relax
-      \protected at edef#2{\@@fc at numstr\ \@andname}%
-    \else
-      \ifnum#1>100\relax
-        \let\@@fc at numstr#2\relax
-        \protected at edef#2{\@@fc at numstr\ \@andname}%
-      \fi
-    \fi
     \let\@@fc at numstr#2\relax
+    \protected at edef#2{\@@fc at numstr\ \@andname}%
+    \let\@@fc at numstr#2\relax
     \protected at edef#2{\@@fc at numstr\ \@unitstring{\@strctr}}%
   \fi
 \else
@@ -7931,7 +7920,7 @@
 % This section deals with the code for |fmtcount.sty|
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fmtcount}[2024/08/31 v3.08]
+\ProvidesPackage{fmtcount}[2024/10/18 v3.09]
 \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

Modified: trunk/Master/texmf-dist/source/latex/fmtcount/fmtcount.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/fmtcount/fmtcount.ins	2024-10-18 21:19:06 UTC (rev 72582)
+++ trunk/Master/texmf-dist/source/latex/fmtcount/fmtcount.ins	2024-10-18 21:19:15 UTC (rev 72583)
@@ -1,4 +1,4 @@
-% fmtcount.ins generated using makedtx version 1.2 2024/8/31 14:57
+% fmtcount.ins generated using makedtx version 1.2 2024/10/18 15:41
 \input docstrip
 
 \preamble

Modified: trunk/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def	2024-10-18 21:19:06 UTC (rev 72582)
+++ trunk/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def	2024-10-18 21:19:15 UTC (rev 72583)
@@ -106,7 +106,7 @@
     \or vinte%
     \or trinta%
     \or quarenta%
-    \or cinq\"uenta%
+    \or cinquenta%
     \or sessenta%
     \or setenta%
     \or oitenta%
@@ -194,7 +194,7 @@
     \or Vinte%
     \or Trinta%
     \or Quarenta%
-    \or Cinq\"uenta%
+    \or Cinquenta%
     \or Sessenta%
     \or Setenta%
     \or Oitenta%
@@ -351,7 +351,7 @@
     \or vig\'esimo%
     \or trig\'esimo%
     \or quadrag\'esimo%
-    \or q\"uinquag\'esimo%
+    \or quinquag\'esimo%
     \or sexag\'esimo%
     \or setuag\'esimo%
     \or octog\'esimo%
@@ -372,7 +372,7 @@
     \or ducent\'esimo%
     \or trecent\'esimo%
     \or quadringent\'esimo%
-    \or q\"uingent\'esimo%
+    \or quingent\'esimo%
     \or seiscent\'esimo%
     \or setingent\'esimo%
     \or octingent\'esimo%
@@ -401,7 +401,7 @@
     \or vig\'esima%
     \or trig\'esima%
     \or quadrag\'esima%
-    \or q\"uinquag\'esima%
+    \or quinquag\'esima%
     \or sexag\'esima%
     \or setuag\'esima%
     \or octog\'esima%
@@ -415,7 +415,7 @@
     \or ducent\'esima%
     \or trecent\'esima%
     \or quadringent\'esima%
-    \or q\"uingent\'esima%
+    \or quingent\'esima%
     \or seiscent\'esima%
     \or setingent\'esima%
     \or octingent\'esima%
@@ -444,7 +444,7 @@
     \or Vig\'esimo%
     \or Trig\'esimo%
     \or Quadrag\'esimo%
-    \or Q\"uinquag\'esimo%
+    \or Quinquag\'esimo%
     \or Sexag\'esimo%
     \or Setuag\'esimo%
     \or Octog\'esimo%
@@ -458,7 +458,7 @@
     \or Ducent\'esimo%
     \or Trecent\'esimo%
     \or Quadringent\'esimo%
-    \or Q\"uingent\'esimo%
+    \or Quingent\'esimo%
     \or Seiscent\'esimo%
     \or Setingent\'esimo%
     \or Octingent\'esimo%
@@ -487,7 +487,7 @@
     \or Vig\'esima%
     \or Trig\'esima%
     \or Quadrag\'esima%
-    \or Q\"uinquag\'esima%
+    \or Quinquag\'esima%
     \or Sexag\'esima%
     \or Setuag\'esima%
     \or Octog\'esima%
@@ -501,7 +501,7 @@
     \or Ducent\'esima%
     \or Trecent\'esima%
     \or Quadringent\'esima%
-    \or Q\"uingent\'esima%
+    \or Quingent\'esima%
     \or Seiscent\'esima%
     \or Setingent\'esima%
     \or Octingent\'esima%
@@ -531,12 +531,8 @@
     \@strctr=#1 \divide\@strctr by 1000\relax
     \@FCmodulo{\@strctr}{10}%
     \ifnum\@strctr>0
-      \ifnum\@strctr=1\relax
-        \let\@@fc at numstr#2\relax
-        \protected at edef#2{\@@fc at numstr\ \@andname}%
-      \fi
       \let\@@fc at numstr#2\relax
-      \protected at edef#2{\@@fc at numstr\ \@unitstring{\@strctr}}%
+      \protected at edef#2{\@@fc at numstr\ \@andname\ \@unitstring{\@strctr}}%
     \fi
   \else
     \@strctr=#1\relax
@@ -562,7 +558,7 @@
 \ifnum\@strctr>0\relax
   \ifnum#1>1000 \relax
     \let\@@fc at numstr#2\relax
-    \protected at edef#2{\@@fc at numstr\ }%
+    \protected at edef#2{\@@fc at numstr\ \@andname\ }%
   \fi
   \@tmpstrctr=#1\relax
   \@FCmodulo{\@tmpstrctr}{1000}%
@@ -586,16 +582,9 @@
   \protected at edef#2{\@@fc at numstr\@tenstring{\@strctr}}%
   \@strctr=#1\relax \@FCmodulo{\@strctr}{10}%
   \ifnum\@strctr>0
-    \ifnum\@strctr=1\relax
-      \let\@@fc at numstr#2\relax
-      \protected at edef#2{\@@fc at numstr\ \@andname}%
-    \else
-      \ifnum#1>100\relax
-        \let\@@fc at numstr#2\relax
-        \protected at edef#2{\@@fc at numstr\ \@andname}%
-      \fi
-    \fi
     \let\@@fc at numstr#2\relax
+    \protected at edef#2{\@@fc at numstr\ \@andname}%
+    \let\@@fc at numstr#2\relax
     \protected at edef#2{\@@fc at numstr\ \@unitstring{\@strctr}}%
   \fi
 \else

Modified: trunk/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty	2024-10-18 21:19:06 UTC (rev 72582)
+++ trunk/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty	2024-10-18 21:19:15 UTC (rev 72583)
@@ -54,7 +54,7 @@
 %% End:
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fmtcount}[2024/08/31 v3.08]
+\ProvidesPackage{fmtcount}[2024/10/18 v3.09]
 \RequirePackage{ifthen}
 \RequirePackage{xkeyval}
 \RequirePackage{etoolbox}



More information about the tex-live-commits mailing list.