From f887f53e17d1220ea3ec352fe7c347802340c4f6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 23 Nov 2021 22:38:59 +0000 Subject: fcolumn (23nov21) git-svn-id: svn://tug.org/texlive/trunk@61130 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/fcolumn/fcolumn.sty | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/latex/fcolumn') diff --git a/Master/texmf-dist/tex/latex/fcolumn/fcolumn.sty b/Master/texmf-dist/tex/latex/fcolumn/fcolumn.sty index 336bdd7e5d9..eb314709b09 100644 --- a/Master/texmf-dist/tex/latex/fcolumn/fcolumn.sty +++ b/Master/texmf-dist/tex/latex/fcolumn/fcolumn.sty @@ -20,7 +20,7 @@ %% and version 1.3 or later is part of all distributions of %% LaTeX version 1999/12/01 or later. \ProvidesPackage{fcolumn} - [2021/01/14 v1.3 Automatic Currency Package (EHTO)] + [2021/11/22 v1.4 Automatic Currency Package (EHTO)] \NeedsTeXFormat{LaTeX2e} \RequirePackage{array}[v2.4k] @@ -116,12 +116,13 @@ \fi\unhbox0} \newcount\FC@l \newcount\FC@r \def\setucc@de#1#2\relax{\uccode`\~=`#1 } -\def\assignform@t#1,#2,#3\end{\def\FCform@t{#1}\def\FCform@tt{#1#2}} +\def\assignform@t#1,#2,#3\assignform@t{\def\FCform@t{#1}% + \def\FCform@tt{#2}\ifx\FCform@tt\@empty \def\FCform@tt{#1}\fi} \def\b@fi#1#2#3#4{% \def\sep@xt##1##2\end{\def\sep@rator{{##1}}}% \sep@xt#1\end\def\decim@lmark{{#2}}% -\def\sp@l{#3}\assignform@t#4,,\end \global\advance\FCsc@l by \@ne -\global\FC@l=0 \global\FC@r=1 +\def\sp@l{#3}\assignform@t#4,,\assignform@t\global\advance\FCsc@l by + \@ne \global\FC@l=0 \global\FC@r=1 \let\FCs@gn=\@ne\relax \setbox0\hbox\bgroup$% \uccode`\~=`0\relax \uppercase{\def~}{\restorem@thcodes \global\FC@l=0} \uccode`\~=`1\relax \uppercase{\def~}{\restorem@thcodes \global\FC@l=1} @@ -160,7 +161,7 @@ \mathcode`\8=\mathcode`- \mathcode`\9=\mathcode`- } \def\e@fi{\ifnum\mathcode`\0=\mathcode`- \global\FC@r=\m@ne\fi$\egroup \ifnum\FC@r>0 - \ifnum\FC@r<10 \FC@r=10 \fi + \ifnum\FC@r=1 \FC@r=10 \fi \def\i@ts##1##2{\count0=##2} \afterassignment\i@ts\count@\sp@l \loop\ifnum\count0>0 \multiply\FC@l by 10 @@ -170,13 +171,13 @@ \def\tw@l##1##2\relax{##2} \PackageWarning{fcolumn}{Excess digit\ifnum\FC@r>100 s\fi\space ``\expandafter\tw@l\number\FC@r\relax'' in decimal part - \MessageBreak ignored} + \MessageBreak ignored near or} \fi \ifx\FCs@gn\m@ne\relax \FC@l=-\FC@l \fi \zetg@ld{\sp@l}{\FC@l}% \fi} \def\secd@xt#1#2#3\end{\advance\FC@l by #2 -\FC@r=#1#3 \ifnum\FC@r<10 \multiply\FC@r by 10 \fi} +\FC@r=#1#3 \ifnum\FC@r=1 \FC@r=10 \fi} \def\restorem@thcodes{\mathcode`\0=0 \mathcode`\1=0 \mathcode`\2=0 \mathcode`\3=0 \mathcode`\4=0 \mathcode`\5=0 \mathcode`\6=0 \mathcode`\7=0 \mathcode`\8=0 \mathcode`\9=0 } @@ -287,14 +288,14 @@ FCtot@\romannumeral\FCsc@l\endcsname}$}% \expandafter\fre@t\FC@chklist\end \ifnum\csname FCtot@\romannumeral\count0\endcsname= \csname FCtot@\romannumeral\count1\endcsname\else - \PackageWarningNoLine{fcolumn}{F-columns \number\count0 \space - and \number\count1 \space do not balance}% + \PackageWarning{fcolumn}{F-columns \number\count0 \space + and \number\count1 \space do not balance near or}% \fi \repeat} \def\fre@t#1,#2;#3\end{\count0=#1 \count1=#2 \xdef\FC@chklist{#3}} \def\checkfcolumns#1#2{\noalign{\xdef\FC@chklist{\FC@chklist #1,#2;}}} \ifx\longtable\@undefined - \PackageWarning{fcolumn}{fcolumn is loaded without longtable. That's + \PackageWarningNoLine{fcolumn}{fcolumn is loaded without longtable. That's OK, but\MessageBreak if you want to load longtable as well, make sure \MessageBreak it is done before loading fcolumn} \fi -- cgit v1.2.3