diff options
author | Karl Berry <karl@freefriends.org> | 2020-02-25 22:03:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-02-25 22:03:17 +0000 |
commit | 026306ee26a95c4c9b07e9e7b2591ba9fdc6df22 (patch) | |
tree | 5ffcb243e8baa9d772d99762f2dbd0bc0ff84a35 /Master/texmf-dist/tex | |
parent | ec44a8cec262bd339e0632be731402e9ebaa3992 (diff) |
fmtcount (25feb20)
git-svn-id: svn://tug.org/texlive/trunk@53912 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/fmtcount/fc-french.def | 12 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty | 2 |
2 files changed, 10 insertions, 4 deletions
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} |