From 026306ee26a95c4c9b07e9e7b2591ba9fdc6df22 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 25 Feb 2020 22:03:17 +0000 Subject: fmtcount (25feb20) git-svn-id: svn://tug.org/texlive/trunk@53912 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/fmtcount/fmtcount.dtx | 22 ++++++++++++++-------- .../texmf-dist/source/latex/fmtcount/fmtcount.ins | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/source/latex/fmtcount') diff --git a/Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx b/Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx index 910ff335718..0525133f838 100644 --- a/Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx +++ b/Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx @@ -1,11 +1,11 @@ %\iffalse % fmtcount.dtx generated using makedtx version 1.2 (c) Nicola Talbot % Command line args: +% -src "(.+)\.(sty|def)$=>\1.\2" % -doc "fmtcount-manual.tex" % -author "Nicola Talbot and Vincent Belaïche" -% -src "(.+)\.(sty|def)$=>\1.\2" % fmtcount -% Created on 2020/1/28 8:17 +% Created on 2020/2/24 20:03 %\fi %\iffalse %<*package> @@ -77,7 +77,7 @@ pdftitle={fmtcount.sty: Displaying the Values of LaTeX Counters}, pdfkeywords={LaTeX,counter}]{hyperref} -\CheckSum{10311} +\CheckSum{10315} \doxitem{Option}{option}{options} @@ -104,7 +104,7 @@ % \url{www.dickimaw-books.com} % \and % Vincent Bela\"iche} -% \date{2020-01-30 (version 3.06)\relax +% \date{2020-02-24 (version 3.07)\relax %} % \maketitle % \tableofcontents @@ -1804,7 +1804,7 @@ this number}% % \subsubsection{fc-french.def} % Definitions for French. % \begin{macrocode} -\ProvidesFCLanguage{french}[2017/06/15]% +\ProvidesFCLanguage{french}[2020/02/24]% % \end{macrocode} % Package \styfmt{fcprefix} is needed to format the prefix \meta{$n$} % in \meta{$n$}illion or \meta{$n$}illiard. Big numbers were @@ -3447,15 +3447,21 @@ z\'ero% \count0=0 % \fi \ifnum\count0=1 % + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi % \end{macrocode} % \changes{3.01}{2014-11-10}{Protect \cs{`}, for solving % \uref{http://github.com/nlct/fmtcount/issues/15}{Issue \#15}} % \begin{macrocode} + {% \protected@edef\@tempa{\expandafter\fc@wcase\fc@first\@nil}% - \else + }% % \end{macrocode} % Now we tamper a little bit with the plural handling options to ensure that there is no final plural mark. % \begin{macrocode} + {% \def\@tempa##1{% \expandafter\edef\csname fc@frenchoptions@##1@plural\endcsname{% \ifcase\csname fc@frenchoptions@##1@plural\endcsname\space @@ -3518,7 +3524,7 @@ z\'ero% \fi \fi \fi - \fi + }% % \end{macrocode} % Apply \cs{fc@gcase} to the result. % \begin{macrocode} @@ -7480,7 +7486,7 @@ this number}% % This section deals with the code for |fmtcount.sty| % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fmtcount}[2020/01/30 v3.06] +\ProvidesPackage{fmtcount}[2020/01/30 v3.07] \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 diff --git a/Master/texmf-dist/source/latex/fmtcount/fmtcount.ins b/Master/texmf-dist/source/latex/fmtcount/fmtcount.ins index 7c4395ef39c..1c31d8f0aa0 100644 --- a/Master/texmf-dist/source/latex/fmtcount/fmtcount.ins +++ b/Master/texmf-dist/source/latex/fmtcount/fmtcount.ins @@ -1,4 +1,4 @@ -% fmtcount.ins generated using makedtx version 1.2 2020/1/28 8:17 +% fmtcount.ins generated using makedtx version 1.2 2020/2/24 20:03 \input docstrip \preamble -- cgit v1.2.3