From 7deee3c46bc9f30d8481c23f04f3c5a574d79493 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 20 Sep 2017 22:37:47 +0000 Subject: numspell (20sep17) git-svn-id: svn://tug.org/texlive/trunk@45361 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/numspell/numspell.pdf | Bin 220505 -> 220502 bytes Master/texmf-dist/doc/latex/numspell/numspell.tex | 10 +++++----- Master/texmf-dist/tex/latex/numspell/numspell.sty | 10 ++++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Master/texmf-dist/doc/latex/numspell/numspell.pdf b/Master/texmf-dist/doc/latex/numspell/numspell.pdf index 2ccf9708c59..74ad6ce060e 100644 Binary files a/Master/texmf-dist/doc/latex/numspell/numspell.pdf and b/Master/texmf-dist/doc/latex/numspell/numspell.pdf differ diff --git a/Master/texmf-dist/doc/latex/numspell/numspell.tex b/Master/texmf-dist/doc/latex/numspell/numspell.tex index 28423466ccf..6c8467b8213 100644 --- a/Master/texmf-dist/doc/latex/numspell/numspell.tex +++ b/Master/texmf-dist/doc/latex/numspell/numspell.tex @@ -21,7 +21,7 @@ \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} \usepackage{numspell} -\usepackage[magyar,german,french,english]{babel} +\usepackage[magyar,ngerman,french,english]{babel} \usepackage{listings,xcolor,amsmath,upquote} \usepackage[group-separator={,}]{siunitx} \flushbottom @@ -52,7 +52,7 @@ keepspaces]} \begin{document} -\title{The {\bfseries\sffamily numspell} package\\{\large v1.0 (2017/02/09)}} +\title{The {\bfseries\sffamily numspell} package\\{\large v1.1 (2017/09/20)}} \author{Tibor Tómács\\{\normalsize\url{tomacs.tibor@uni-eszterhazy.hu}}} \date{} \maketitle @@ -394,7 +394,7 @@ For example \documentclass{article} \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} -\usepackage[magyar,german,french,english]{babel} +\usepackage[magyar,ngerman,french,english]{babel} \usepackage{numspell} \usepackage[group-separator={,}]{siunitx} \begin{document} @@ -411,7 +411,7 @@ In American English the spelling of \num{\mynum} is \smallskip\noindent In German the spelling of \num{\mynum} is -{\selectlanguage{german}\emph{``\numspell{\mynum}''}}. +{\selectlanguage{ngerman}\emph{``\numspell{\mynum}''}}. \smallskip\noindent In French the spelling of \num{\mynum} is @@ -435,7 +435,7 @@ In American English the spelling of \num{\mynum} is \smallskip\noindent In German the spelling of \num{\mynum} is -{\selectlanguage{german}\emph{``\numspell{\mynum}''}}. +{\selectlanguage{ngerman}\emph{``\numspell{\mynum}''}}. \smallskip\noindent In French the spelling of \num{\mynum} is diff --git a/Master/texmf-dist/tex/latex/numspell/numspell.sty b/Master/texmf-dist/tex/latex/numspell/numspell.sty index a4167f80854..1b860796e25 100644 --- a/Master/texmf-dist/tex/latex/numspell/numspell.sty +++ b/Master/texmf-dist/tex/latex/numspell/numspell.sty @@ -18,7 +18,7 @@ %% The Current Maintainer of this work is Tibor Tomacs. %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{numspell}[2017/02/09 v1.0 Package for spelling cardinal and ordinal numbers] +\ProvidesPackage{numspell}[2017/09/20 v1.1 Package for spelling cardinal and ordinal numbers] \RequirePackage{xstring} \RequirePackage{pdftexcmds} @@ -228,7 +228,7 @@ %% -------------------- %% If english is active, then \numspell@langname will be 'en'. %% If magyar is active, then \numspell@langname will be 'hu'. -%% If german is active, then \numspell@langname will be 'de'. +%% If german or ngerman is active, then \numspell@langname will be 'de'. %% If french is active, then \numspell@langname will be 'fr'. %% Otherwise error. %% @@ -238,6 +238,7 @@ \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% \if@numspell@lang@notsupported@\@latexerr{'numspell.sty' error! Not supported language: \languagename}{}\fi% } @@ -247,8 +248,8 @@ %% ------------------------- %% 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, then numspell loads numspell-german.sty. -%% If babel or polyglossia loads german, then numspell loads numspell-french.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. %% Otherwise numspell loads numspell-english.sty. %% \AtEndPreamble{% @@ -256,6 +257,7 @@ \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}% \if@numspell@lang@loaded@\else\RequirePackage{numspell-english}\fi% } -- cgit v1.2.3