summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-25 22:03:17 +0000
committerKarl Berry <karl@freefriends.org>2020-02-25 22:03:17 +0000
commit026306ee26a95c4c9b07e9e7b2591ba9fdc6df22 (patch)
tree5ffcb243e8baa9d772d99762f2dbd0bc0ff84a35
parentec44a8cec262bd339e0632be731402e9ebaa3992 (diff)
fmtcount (25feb20)
git-svn-id: svn://tug.org/texlive/trunk@53912 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/CHANGES5
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/README14
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdfbin562977 -> 563008 bytes
-rw-r--r--Master/texmf-dist/source/latex/fmtcount/fmtcount.dtx22
-rw-r--r--Master/texmf-dist/source/latex/fmtcount/fmtcount.ins2
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fc-french.def12
-rw-r--r--Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty2
7 files changed, 39 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/fmtcount/CHANGES b/Master/texmf-dist/doc/latex/fmtcount/CHANGES
index b36551c14bc..ce54ab42c83 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/CHANGES
+++ b/Master/texmf-dist/doc/latex/fmtcount/CHANGES
@@ -1,5 +1,10 @@
fmtcount package versions:
+Version 3.07:
+
+* Make french definition robust against cleveref 0.21.4 dirty handling
+ of conditionals. See https://github.com/nlct/fmtcount/pull/36.
+
Version 3.06:
* Fix French documentation « mille » → « mil » where applicable.
diff --git a/Master/texmf-dist/doc/latex/fmtcount/README b/Master/texmf-dist/doc/latex/fmtcount/README
index c287533f4a8..8a4fa7e918b 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/README
+++ b/Master/texmf-dist/doc/latex/fmtcount/README
@@ -1,6 +1,11 @@
-LaTeX Package : fmtcount v3.06
+LaTeX Package : fmtcount v3.07
-Last Modified : 2020-01-30
+
+(c) Copyright 2000-2013 Nicola LC Talbot
+(c) Copyright 2013-2020 Nicola LC Talbot and Vincent Bela\"iche
+
+
+Last Modified : 2020-02-24
Author : Nicola Talbot and Vincent Belaïche
@@ -46,8 +51,7 @@ directory (e.g. texmf/doc/latex/fmtcount/).
Read the file CHANGES for version changes.
-This material is subject to the LaTeX Project Public License.
-See http://mirror.ctan.org/help/Cataloague/licenses.lppl.html for
-the details of that license.
+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/
diff --git a/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf b/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf
index e5eaf4d23e7..98673a2b817 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf
+++ b/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf
Binary files differ
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
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-french.def b/Master/texmf-dist/tex/latex/fmtcount/fc-french.def
index 0dafda2be2b..3247cd15851 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fc-french.def
+++ b/Master/texmf-dist/tex/latex/fmtcount/fc-french.def
@@ -52,7 +52,7 @@
%% coding: utf-8
%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
-\ProvidesFCLanguage{french}[2017/06/15]%
+\ProvidesFCLanguage{french}[2020/02/24]%
\ifcsundef{fc@gl@let}{\global\let\fc@gl@let\let}{\PackageError{fmtcount}{Command already defined}{Command
\protect\fc@gl@let\space already defined.}}
\ifcsundef{fc@gl@def}{\global\let\fc@gl@def\def}{\PackageError{fmtcount}{Command already defined}{Command
@@ -1160,8 +1160,14 @@ z\'ero%
\count0=0 %
\fi
\ifnum\count0=1 %
- \protected@edef\@tempa{\expandafter\fc@wcase\fc@first\@nil}%
+ \expandafter\@firstoftwo
\else
+ \expandafter\@secondoftwo
+ \fi
+ {%
+ \protected@edef\@tempa{\expandafter\fc@wcase\fc@first\@nil}%
+ }%
+ {%
\def\@tempa##1{%
\expandafter\edef\csname fc@frenchoptions@##1@plural\endcsname{%
\ifcase\csname fc@frenchoptions@##1@plural\endcsname\space
@@ -1210,7 +1216,7 @@ z\'ero%
\fi
\fi
\fi
- \fi
+ }%
\fc@apply@gcase
\def\@tempb##1{\def\@tempa{\def#2{##1}}}%
\expandafter\@tempb\expandafter{\@tempa}%
diff --git a/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty b/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty
index f42140e0eb4..c60688b1004 100644
--- a/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty
+++ b/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty
@@ -54,7 +54,7 @@
%% End:
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fmtcount}[2020/01/30 v3.06]
+\ProvidesPackage{fmtcount}[2020/01/30 v3.07]
\RequirePackage{ifthen}
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}