summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/numspell/numspell-english.sty6
-rw-r--r--Master/texmf-dist/tex/latex/numspell/numspell-french.sty2
-rw-r--r--Master/texmf-dist/tex/latex/numspell/numspell-german.sty2
-rw-r--r--Master/texmf-dist/tex/latex/numspell/numspell-italian.sty2
-rw-r--r--Master/texmf-dist/tex/latex/numspell/numspell-magyar.sty2
-rw-r--r--Master/texmf-dist/tex/latex/numspell/numspell.sty59
6 files changed, 38 insertions, 35 deletions
diff --git a/Master/texmf-dist/tex/latex/numspell/numspell-english.sty b/Master/texmf-dist/tex/latex/numspell/numspell-english.sty
index 2bf2f69bbf3..a3120e3ca85 100644
--- a/Master/texmf-dist/tex/latex/numspell/numspell-english.sty
+++ b/Master/texmf-dist/tex/latex/numspell/numspell-english.sty
@@ -1,7 +1,7 @@
%%
%% `numspell-english.sty' English language package for 'numspell.sty'
%%
-%% Copyright 2017- by Tibor Tomacs
+%% Copyright 2017-2020 by Tibor Tomacs
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -16,7 +16,7 @@
%% The Current Maintainer of this work is Tibor Tomacs.
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{numspell-english}[2017/02/09 v1.0 English language package for numspell]
+\ProvidesPackage{numspell-english}[2020/11/07 v1.1 English language package for numspell]
%% -----------
%% \numspellGB (Default)
@@ -25,7 +25,7 @@
%%
\def\numspellGB{%
\def\numspell@and@en{\numspell@{ and }}%
- \def\numspell@and@@en{\numspell@{ and }}%
+ \def\numspell@and@@en{\numspell@{, }}% It was 'and' in v1.0
}
\numspellGB
diff --git a/Master/texmf-dist/tex/latex/numspell/numspell-french.sty b/Master/texmf-dist/tex/latex/numspell/numspell-french.sty
index 00426043bf5..8f9f1350b9b 100644
--- a/Master/texmf-dist/tex/latex/numspell/numspell-french.sty
+++ b/Master/texmf-dist/tex/latex/numspell/numspell-french.sty
@@ -1,7 +1,7 @@
%%
%% `numspell-french.sty' French language package for 'numspell.sty'
%%
-%% Copyright 2017- by Tibor Tomacs
+%% Copyright 2017-2020 by Tibor Tomacs
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/numspell/numspell-german.sty b/Master/texmf-dist/tex/latex/numspell/numspell-german.sty
index bd100313f88..068b7deee94 100644
--- a/Master/texmf-dist/tex/latex/numspell/numspell-german.sty
+++ b/Master/texmf-dist/tex/latex/numspell/numspell-german.sty
@@ -1,7 +1,7 @@
%%
%% `numspell-german.sty' German language package for 'numspell.sty'
%%
-%% Copyright 2017- by Tibor Tomacs
+%% Copyright 2017-2020 by Tibor Tomacs
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/numspell/numspell-italian.sty b/Master/texmf-dist/tex/latex/numspell/numspell-italian.sty
index da1f9dc1780..db519e4974b 100644
--- a/Master/texmf-dist/tex/latex/numspell/numspell-italian.sty
+++ b/Master/texmf-dist/tex/latex/numspell/numspell-italian.sty
@@ -1,7 +1,7 @@
%%
%% `numspell-italian.sty' Italian language package for 'numspell.sty'
%%
-%% Copyright 2017- by Tibor Tomacs
+%% Copyright 2017-2020 by Tibor Tomacs
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/numspell/numspell-magyar.sty b/Master/texmf-dist/tex/latex/numspell/numspell-magyar.sty
index ce4c1d2442e..7634b64f909 100644
--- a/Master/texmf-dist/tex/latex/numspell/numspell-magyar.sty
+++ b/Master/texmf-dist/tex/latex/numspell/numspell-magyar.sty
@@ -1,7 +1,7 @@
%%
%% `numspell-magyar.sty' Hungarian language package for 'numspell.sty'
%%
-%% Copyright 2017- by Tibor Tomacs
+%% Copyright 2017-2020 by Tibor Tomacs
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/numspell/numspell.sty b/Master/texmf-dist/tex/latex/numspell/numspell.sty
index 3fd2fcc1788..c74912b8d15 100644
--- a/Master/texmf-dist/tex/latex/numspell/numspell.sty
+++ b/Master/texmf-dist/tex/latex/numspell/numspell.sty
@@ -3,7 +3,7 @@
%%
%% Package for spelling the non-negative cardinal and ordinal numbers (maximum 66 digits).
%%
-%% Copyright 2017- by Tibor Tomacs
+%% Copyright 2017-2020 by Tibor Tomacs
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -18,10 +18,10 @@
%% The Current Maintainer of this work is Tibor Tomacs.
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{numspell}[2017/09/30 v1.2 Package for spelling cardinal and ordinal numbers]
+\ProvidesPackage{numspell}[2020/11/07 v1.3 Package for spelling cardinal and ordinal numbers]
\RequirePackage{xstring}
-\RequirePackage{pdftexcmds}
+\RequirePackage{iflang}
\RequirePackage{etoolbox}
\newcounter{numspell@counter@tempa}
@@ -226,43 +226,46 @@
%% --------------------
%% \numspell@lang@check
%% --------------------
-%% If english is active, then \numspell@langname will be 'en'.
-%% If magyar is active, then \numspell@langname will be 'hu'.
-%% If german or ngerman is active, then \numspell@langname will be 'de'.
-%% If french is active, then \numspell@langname will be 'fr'.
-%% If italian is active, then \numspell@langname will be 'it'.
-%% Otherwise error.
%%
\newif\if@numspell@lang@notsupported@
\def\numspell@lang@check{%
\@numspell@lang@notsupported@true%
- \ifnum\pdf@strcmp{\languagename}{english}=\z@\@numspell@lang@notsupported@false\def\numspell@langname{en}\fi%
- \ifnum\pdf@strcmp{\languagename}{magyar}=\z@\@numspell@lang@notsupported@false\def\numspell@langname{hu}\fi%
- \ifnum\pdf@strcmp{\languagename}{german}=\z@\@numspell@lang@notsupported@false\def\numspell@langname{de}\fi%
- \ifnum\pdf@strcmp{\languagename}{ngerman}=\z@\@numspell@lang@notsupported@false\def\numspell@langname{de}\fi%
- \ifnum\pdf@strcmp{\languagename}{french}=\z@\@numspell@lang@notsupported@false\def\numspell@langname{fr}\fi%
- \ifnum\pdf@strcmp{\languagename}{italian}=\z@\@numspell@lang@notsupported@false\def\numspell@langname{it}\fi%
- \if@numspell@lang@notsupported@\@latexerr{'numspell.sty' error! Not supported language: \languagename}{}\fi%
+ \def\numspell@langname{en}%
+ \IfLanguageName{english}{\@numspell@lang@notsupported@false}{}%
+ \IfLanguageName{british}{\@numspell@lang@notsupported@false}{}%
+ \IfLanguageName{ukenglish}{\@numspell@lang@notsupported@false}{}%
+ \IfLanguageName{UKenglish}{\@numspell@lang@notsupported@false}{}%
+ \IfLanguageName{american}{\@numspell@lang@notsupported@false\numspellUS}{}%
+ \IfLanguageName{usenglish}{\@numspell@lang@notsupported@false\numspellUS}{}%
+ \IfLanguageName{USenglish}{\@numspell@lang@notsupported@false\numspellUS}{}%
+ \IfLanguageName{magyar}{\@numspell@lang@notsupported@false\def\numspell@langname{hu}}{}%
+ \IfLanguageName{hungarian}{\@numspell@lang@notsupported@false\def\numspell@langname{hu}}{}%
+ \IfLanguageName{german}{\@numspell@lang@notsupported@false\def\numspell@langname{de}}{}%
+ \IfLanguageName{ngerman}{\@numspell@lang@notsupported@false\def\numspell@langname{de}}{}%
+ \IfLanguageName{french}{\@numspell@lang@notsupported@false\def\numspell@langname{fr}}{}%
+ \IfLanguageName{italian}{\@numspell@lang@notsupported@false\def\numspell@langname{it}}{}%
+ \if@numspell@lang@notsupported@\PackageWarning{numspell}{Not supported language: \languagename}\fi%
}
%% -------------------------
%% Loading language packages
%% -------------------------
-%% If babel or polyglossia loads english, then numspell loads numspell-english.sty.
-%% If babel or polyglossia loads magyar, then numspell loads numspell-magyar.sty.
-%% If babel or polyglossia loads german or ngerman, then numspell loads numspell-german.sty.
-%% If babel or polyglossia loads french, then numspell loads numspell-french.sty.
-%% If babel or polyglossia loads italian, then numspell loads numspell-italian.sty.
-%% Otherwise numspell loads numspell-english.sty.
%%
\AtEndPreamble{%
\newif\if@numspell@lang@loaded@
-\bbl@iflanguage\languagename{\expandafter\ifx\csname dateenglish\endcsname\relax\else\RequirePackage{numspell-english}\@numspell@lang@loaded@true\fi}%
-\bbl@iflanguage\languagename{\expandafter\ifx\csname datemagyar\endcsname\relax\else\RequirePackage{numspell-magyar}\@numspell@lang@loaded@true\fi}%
-\bbl@iflanguage\languagename{\expandafter\ifx\csname dategerman\endcsname\relax\else\RequirePackage{numspell-german}\@numspell@lang@loaded@true\fi}%
-\bbl@iflanguage\languagename{\expandafter\ifx\csname datengerman\endcsname\relax\else\RequirePackage{numspell-german}\@numspell@lang@loaded@true\fi}%
-\bbl@iflanguage\languagename{\expandafter\ifx\csname datefrench\endcsname\relax\else\RequirePackage{numspell-french}\@numspell@lang@loaded@true\fi}%
-\bbl@iflanguage\languagename{\expandafter\ifx\csname dateitalian\endcsname\relax\else\RequirePackage{numspell-italian}\@numspell@lang@loaded@true\fi}%
+\ifdefined\dateenglish\RequirePackage{numspell-english}\@numspell@lang@loaded@true\fi%
+\ifdefined\datebritish\RequirePackage{numspell-english}\@numspell@lang@loaded@true\fi%
+\ifdefined\dateukenglish\RequirePackage{numspell-english}\@numspell@lang@loaded@true\fi%
+\ifdefined\dateUKenglish\RequirePackage{numspell-english}\@numspell@lang@loaded@true\fi%
+\ifdefined\dateamerican\RequirePackage{numspell-english}\@numspell@lang@loaded@true\fi%
+\ifdefined\dateusenglish\RequirePackage{numspell-english}\@numspell@lang@loaded@true\fi%
+\ifdefined\dateUSenglish\RequirePackage{numspell-english}\@numspell@lang@loaded@true\fi%
+\ifdefined\datemagyar\RequirePackage{numspell-magyar}\@numspell@lang@loaded@true\fi%
+\ifdefined\datehungarian\RequirePackage{numspell-magyar}\@numspell@lang@loaded@true\fi%
+\ifdefined\dategerman\RequirePackage{numspell-german}\@numspell@lang@loaded@true\fi%
+\ifdefined\datengerman\RequirePackage{numspell-german}\@numspell@lang@loaded@true\fi%
+\ifdefined\datefrench\RequirePackage{numspell-french}\@numspell@lang@loaded@true\fi%
+\ifdefined\dateitalian\RequirePackage{numspell-italian}\@numspell@lang@loaded@true\fi%
\if@numspell@lang@loaded@\else\RequirePackage{numspell-english}\fi%
}