summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/fmtcount
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-06-19 20:23:47 +0000
committerKarl Berry <karl@freefriends.org>2014-06-19 20:23:47 +0000
commit645977d2a193cba365984822764a2d97c2951249 (patch)
treef2f6d6c5c64e8beef2bca4f81ed57fe8b52f6223 /Master/texmf-dist/doc/latex/fmtcount
parenta6a9c8cb6c125f8674dc6c2480c60229f3d9e64d (diff)
fmtcount (19jun14)
git-svn-id: svn://tug.org/texlive/trunk@34318 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/fmtcount')
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/CHANGES12
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/README4
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/fc-frlargenum.tex2
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/fc-lang.tex271
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/fc-samp.tex1
-rw-r--r--Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdfbin543970 -> 547614 bytes
6 files changed, 190 insertions, 100 deletions
diff --git a/Master/texmf-dist/doc/latex/fmtcount/CHANGES b/Master/texmf-dist/doc/latex/fmtcount/CHANGES
index bb24cc417d5..4b2bab78530 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/CHANGES
+++ b/Master/texmf-dist/doc/latex/fmtcount/CHANGES
@@ -1,5 +1,17 @@
fmtcount package versions:
+Version 2.04:
+
+ * Renamed \@modulo to \@FCmodulo to avoid conflict with other
+ packages. (If you use datetime.sty, ensure you have at least
+ datetime version 2.59 installed.)
+
+ * Fixed "eins" bug in fc-german.def
+
+ * Fixed bug in \@@unitstringportuges
+
+ * Added fc-portuguese.def
+
Version 2.03:
* Renamed \@fc@loadifbabelldf to \@fc@loadifbabelorpolyglossialdf
diff --git a/Master/texmf-dist/doc/latex/fmtcount/README b/Master/texmf-dist/doc/latex/fmtcount/README
index ee5ac6370fa..717d61d148e 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/README
+++ b/Master/texmf-dist/doc/latex/fmtcount/README
@@ -1,6 +1,6 @@
-LaTeX Package : fmtcount v2.03
+LaTeX Package : fmtcount v2.04
-Last Modified : 2013-08-17
+Last Modified : 2014-06-18
Author : Nicola Talbot and Vincent Belaïche
diff --git a/Master/texmf-dist/doc/latex/fmtcount/fc-frlargenum.tex b/Master/texmf-dist/doc/latex/fmtcount/fc-frlargenum.tex
index cd5134b37c4..33c769328e2 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/fc-frlargenum.tex
+++ b/Master/texmf-dist/doc/latex/fmtcount/fc-frlargenum.tex
@@ -1,3 +1,5 @@
+ % This file is public domain
+
\documentclass{article}
\usepackage[french]{babel}
\usepackage{fmtcount}
diff --git a/Master/texmf-dist/doc/latex/fmtcount/fc-lang.tex b/Master/texmf-dist/doc/latex/fmtcount/fc-lang.tex
index b2e52ba4164..b2a8907ffb8 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/fc-lang.tex
+++ b/Master/texmf-dist/doc/latex/fmtcount/fc-lang.tex
@@ -1,12 +1,16 @@
+ % This file is public domain
+
% This is an interactive script. Run it through \LaTeX
% and enter appropriate responses. (This won't work with
- % LaTeX2HTML
+ % LaTeX2HTML)
\documentclass[a4paper]{article}
\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
+\usepackage{etoolbox}
+
\usepackage[french,english,spanish,portuges,ngerman,italian]{babel}
\usepackage{fmtcount}
@@ -17,6 +21,43 @@
\newcount\myctr
\newcount\langid
+\newcommand*{\deflangopt}[2][\relax]{%
+ \csdef{setlang#2}{\langid=#2#1}%
+}
+\newcommand*{\uselangopt}[1]{\csuse{setlang#1}}
+\deflangopt{1}
+\deflangopt{2}
+\deflangopt{3}
+\deflangopt[\fmtcountsetoptions{french}]{4}
+\deflangopt[\fmtcountsetoptions{french=swiss}]{5}
+\deflangopt[\fmtcountsetoptions{french=belgian}]{6}
+\deflangopt{7}
+\deflangopt{8}
+
+\newcommand*{\defformat}[1]{%
+ \csdef{setformat#1}{\numformat=#1\relax}%
+}
+\newcommand*{\useformat}[1]{\csuse{setformat#1}}
+
+\newcommand*{\setformat}{\numformat=1\relax}
+
+\defformat{1}
+\defformat{2}
+\defformat{3}
+\defformat{4}
+\defformat{5}
+\defformat{6}
+
+\newcommand*{\defgender}[2]{%
+ \csdef{setgender#1}{\myctr=#2\relax}%
+}
+\newcommand*{\usegender}[1]{\csuse{setgender#1}}
+
+\defgender{}{1}
+\defgender{m}{1}
+\defgender{f}{2}
+\defgender{n}{3}
+
\begin{document}
\section{Displaying the value of a counter}
@@ -26,28 +67,25 @@
\langid=-1
\loop
-\typeout{Which language?^^J}
-\typeout{[1] English}
-\typeout{[2] Portuguese}
-\typeout{[3] Spanish}
-\typeout{[4] French}
-\typeout{[5] French (Swiss)}
-\typeout{[6] French (Belgium)}
-\typeout{[7] German}
-\typeout{[8] Italian}
-
-\typein[\response]{}
-
-\ifthenelse{\equal{\response}{1}}{\langid=1}{
-\ifthenelse{\equal{\response}{2}}{\langid=2}{
-\ifthenelse{\equal{\response}{3}}{\langid=3}{
-\ifthenelse{\equal{\response}{4}}{\langid=4\fmtcountsetoptions{french}}{
-\ifthenelse{\equal{\response}{5}}{\langid=5\fmtcountsetoptions{french=swiss}}{
-\ifthenelse{\equal{\response}{6}}{\langid=6\fmtcountsetoptions{french=belgian}}
-{\ifthenelse{\equal{\response}{7}}{\langid=7}{%
-\ifthenelse{\equal{\response}{8}}{\langid=8}{%
-\langid=-1
-\typeout{Invalid response '\response', please select a number from 1 to 6}}}}}}}}}
+ \typeout{Which language?^^J}
+ \typeout{[1] English}
+ \typeout{[2] Portuguese}
+ \typeout{[3] Spanish}
+ \typeout{[4] French}
+ \typeout{[5] French (Swiss)}
+ \typeout{[6] French (Belgium)}
+ \typeout{[7] German}
+ \typeout{[8] Italian}
+
+ \typein[\response]{}
+
+ \ifcsundef{setlang\response}%
+ {%
+ \typeout{Invalid response '\response', please select a number from 1 to 8}%
+ \langid=-1\relax
+ }%
+ {\uselangopt{\response}}
+
\ifnum\langid=-1
\repeat
@@ -73,72 +111,71 @@ Current language: Italian.
\def\startval{-1}
\loop
-\typein[\startval]{Start value? (Integer from 0 to 99999)
-[Default 1]}
-\ifthenelse{\equal{\startval}{}}{\def\startval{1}}{}
-\ifnum\startval<0\def\startval{-1}\fi
-\ifnum\startval>99999\def\startval{-1}\fi
+ \typein[\startval]{Start value? (Integer from 0 to 99999) [Default 1]}
+ \ifdefempty{\startval}{\def\startval{1}}{}
+ \ifnum\startval<0\def\startval{-1}\fi
+ \ifnum\startval>99999\def\startval{-1}\fi
+
\ifnum\startval=-1
\repeat
\def\endval{-1}
\loop
-\typein[\endval]{End value? (Integer from 0 to 99999)
-[Default 1000]}
-\ifthenelse{\equal{\endval}{}}{\def\endval{1000}}{}
-\ifnum\endval<0\def\endval{-1}\fi
-\ifnum\endval>99999\def\endval{-1}\fi
+ \typein[\endval]{End value? (Integer from 0 to 99999) [Default 1000]}
+ \ifdefempty{\endval}{\def\endval{1000}}{}
+ \ifnum\endval<0\def\endval{-1}\fi
+ \ifnum\endval>99999\def\endval{-1}\fi
\ifnum\endval=-1
\repeat
\def\stepsize{0}
\loop
-\typein[\stepsize]{Step size? (Non zero integer)
-[Default 1]}
-\ifthenelse{\equal{\stepsize}{}}{\def\stepsize{1}}{}
+ \typein[\stepsize]{Step size? (Non zero integer) [Default 1]}
+ \ifdefempty{\stepsize}{\def\stepsize{1}}{}
\ifnum\stepsize=0
\repeat
\typeout{From {\startval} to {\endval} step {\stepsize}}
-\ifnum\startval<\endval
-\ifnum\stepsize<0
-\PackageError{fc-lang}{Infinite loop not permitted!}{}
-\def\endval{\startval}
-\fi
+\ifnum\startval<\endval\relax
+ \ifnum\stepsize<0\relax
+ \PackageError{fc-lang}{Infinite loop not permitted!}{}
+ \def\endval{\startval}
+ \fi
\fi
-\ifnum\startval>\endval
-\ifnum\stepsize>0
-\PackageError{fc-lang}{Infinite loop not permitted!}{}
-\def\endval{\startval}
-\fi
+\ifnum\startval>\endval\relax
+ \ifnum\stepsize>0\relax
+ \PackageError{fc-lang}{Infinite loop not permitted!}{}
+ \def\endval{\startval}
+ \fi
\fi
\newcount\numformat
\numformat=-1
\loop
-\typeout{Which format?^^J}
-\typeout{[1] ordinalstring}
-\typeout{[2] Ordinalstring}
-\typeout{[3] ORDINALstring}
-\typeout{[4] numberstring}
-\typeout{[5] Numberstring}
-\typeout{[6] NUMBERstring}
+ \typeout{Which format?^^J}
+ \typeout{[1] ordinalstring}
+ \typeout{[2] Ordinalstring}
+ \typeout{[3] ORDINALstring}
+ \typeout{[4] numberstring}
+ \typeout{[5] Numberstring}
+ \typeout{[6] NUMBERstring}
+
+ \typein[\response]{Default: 1}
+
+ \ifcsundef{setformat\response}%
+ {%
+ \numformat=-1\relax
+ \typeout{Invalid response '\response', please select a number from 1 to 6}%
+ }%
+ {%
+ \useformat\response
+ }
-\typein[\response]{Default: 1}
-
-\ifthenelse{\equal{\response}{}}{\def\response{1}}{}%default val
-\ifthenelse{\equal{\response}{1}}{\numformat=1}{
-\ifthenelse{\equal{\response}{2}}{\numformat=2}{
-\ifthenelse{\equal{\response}{3}}{\numformat=3}{
-\ifthenelse{\equal{\response}{4}}{\numformat=4}{
-\ifthenelse{\equal{\response}{5}}{\numformat=5}{
-\ifthenelse{\equal{\response}{6}}{\numformat=6}{\numformat=-1
-\typeout{Invalid response '\response', please select a number from 1 to 4}}}}}}}
\ifnum\numformat=-1
\repeat
@@ -159,23 +196,25 @@ Current language: Italian.
\typeout{[1] eme}
\typeout{[2] e}
\typein[\response]{Default: 1}
- \ifthenelse{\equal{\response}{}}%
+ \ifdefempty{\response}%
{%
\def\response{1}% default
\myctr=1\relax
}%
{%
- \ifthenelse{\equal{\response}{1}}%
+ \ifdefstring{\response}{1}%
{%
\fmtcountsetoptions{abbrv=false}\myctr=1\relax
}%
{%
- \ifthenelse{\equal{\response}{2}}%
+ \ifdefstring{\response}{2}%
{%
\fmtcountsetoptions{abbrv}\myctr=2\relax
}%
{%
\myctr=-1\relax
+ \typeout{Invalid response '\response', please select a
+number from 1 to 2}%
}%
}%
}%
@@ -186,42 +225,78 @@ Current language: Italian.
\myctr=-1
\loop
-\typeout{Ordinal format?^^J}
-\typeout{[1] raised}
-\typeout{[2] level}
-\typein[\response]{Default: 1}
-\ifthenelse{\equal{\response}{1}\or\equal{\response}{}}{%
-\fmtcountsetoptions{fmtord=raise}\myctr=1}{%
-\ifthenelse{\equal{\response}{2}}{%
-\fmtcountsetoptions{fmtord=level}\myctr=2}{%
-\myctr=-1}}
+ \typeout{Ordinal format?^^J}
+ \typeout{[1] raised}
+ \typeout{[2] level}
+ \typein[\response]{Default: 1}
+ \ifdefempty{\response}{\def\response{1}}{}%
+
+ \ifdefstring{\response}{1}
+ {%
+ \fmtcountsetoptions{fmtord=raise}\myctr=1\relax
+ }%
+ {%
+ \ifdefstring{\response}{2}
+ {%
+ \fmtcountsetoptions{fmtord=level}\myctr=2\relax
+ }%
+ {%
+ \myctr=-1\relax
+ \typeout{Invalid response '\response', please select a
+ number from 1 to 2}%
+ }%
+ }
+
\ifnum\myctr=-1
\repeat
-\ifnum\langid=1
-\myctr=1
-\else
-\ifthenelse{\langid=7 \and \numformat>3}{}{%
-\loop
-\ifnum\langid=7
- \typein[\response]{Gender? (m, f or n) [Default: m]}
- \ifthenelse{\equal{\response}{m}}{\myctr=1}{
- \ifthenelse{\equal{\response}{f}}{\myctr=2}{
- \ifthenelse{\equal{\response}{n}}{\myctr=3}{
- \ifthenelse{\equal{\response}{}}{\myctr=1}{%
- \myctr=-1
- \typeout{Invalid response '\response'}}}}}
+\ifnum\langid=1\relax
+ \myctr=1\relax
\else
- \typein[\response]{Gender? (m or f) [Default: m]}
- \ifthenelse{\equal{\response}{m}}{\myctr=1}{
- \ifthenelse{\equal{\response}{f}}{\myctr=2}{%
- \ifthenelse{\equal{\response}{}}{\myctr=1}{%
- \myctr=-1
- \typeout{Invalid response '\response'}}}}
-\fi
-\ifnum\myctr=-1
-\repeat
-}
+
+ \ifboolexpr
+ {
+ test {\ifnumequal{\langid}{7}}
+ and
+ test {\ifnumgreater{\numformat}{3}}
+ }%
+ {%
+ \loop
+ \ifnum\langid=7\relax
+ \typein[\response]{Gender? (m, f or n) [Default: m]}
+ \ifcsundef{setgender\response}%
+ {%
+ \typeout{Invalid response '\response', please select a
+ number from 1 to 3}%
+ \myctr=-1\relax
+ }%
+ {\usegender\response}
+ \else
+ \typein[\response]{Gender? (m or f) [Default: m]}
+ \ifcsundef{setgender\response}%
+ {%
+ \typeout{Invalid response '\response', please select a
+ number from 1 to 2}%
+ \myctr=-1\relax
+ }%
+ {%
+ \ifdefstring{\response}{3}
+ {%
+ \typeout{Invalid response '\response', please select a
+ number from 1 to 2}%
+ \myctr=-1\relax
+ }
+ {%
+ \usegender\response
+ }
+ }
+ \fi
+ \ifnum\myctr=-1
+ \repeat
+ }%
+ {%
+ }
+
\fi
\ifcase\myctr
diff --git a/Master/texmf-dist/doc/latex/fmtcount/fc-samp.tex b/Master/texmf-dist/doc/latex/fmtcount/fc-samp.tex
index bb19da7993b..443b60e2c94 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/fc-samp.tex
+++ b/Master/texmf-dist/doc/latex/fmtcount/fc-samp.tex
@@ -1,3 +1,4 @@
+ % This file is public domain
\documentclass[a4paper]{article}
\usepackage{fmtcount}
diff --git a/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf b/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf
index d27dab44138..860fabd43e4 100644
--- a/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf
+++ b/Master/texmf-dist/doc/latex/fmtcount/fmtcount.pdf
Binary files differ