1 files changed, 69 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/numprint/numprint.sty b/Master/texmf-dist/tex/latex/numprint/numprint.sty
index 45aee534a95..e80c0a74b50 100644
--- a/Master/texmf-dist/tex/latex/numprint/numprint.sty
+++ b/Master/texmf-dist/tex/latex/numprint/numprint.sty
@@ -8,7 +8,7 @@
 %% 
 %%   numprint package
 %% 
-%%   Copyright  2000--2005 Harald Harders
+%%   Copyright  2000--2005, 2007 Harald Harders
 %% 
 %%   This program can be redistributed and/or modified under the terms
 %%   of the LaTeX Project Public License Distributed from CTAN
@@ -19,7 +19,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{numprint}
-  [2005/07/11  v1.35  Print numbers (HH)]
+  [2007/01/08  v1.37  Print numbers (HH)]
 \RequirePackage{array}
 \newif\ifnprt@numsepfour
 \newif\ifnprt@errormessage
@@ -66,6 +66,7 @@
 \newcommand*\npproductsign[1]{\def\nprt@prod{\ensuremath{{}#1{}}}}
 \newcommand*\npunitseparator[1]{\def\nprt@unitsep{{#1}}}
 \newcommand*\npdegreeseparator[1]{\def\nprt@degreesep{{#1}}}
+\newcommand*\npcelsiusseparator[1]{\def\nprt@celsiussep{{#1}}}
 \newcommand*\nppercentseparator[1]{\def\nprt@percentsep{{#1}}}
 \def\nprt@fillnull#1#2{%
   \@tempcnta=-1
@@ -1114,11 +1115,41 @@
           \ifx\nprt@oarg\nprt@tmpunit
             \ensuremath{\nprt@degreesep}%
           \else
-            \def\nprt@tmpunit{\%}%
+            \def\nprt@tmpunit{\tccelsius}%
             \ifx\nprt@oarg\nprt@tmpunit
-              \ensuremath{\nprt@percentsep}%
+              \ensuremath{\nprt@celsiussep}%
             \else
-              \ensuremath{\nprt@unitsep}%
+              \def\nprt@tmpunit{\celsius}%
+              \ifx\nprt@oarg\nprt@tmpunit
+                \ensuremath{\nprt@celsiussep}%
+              \else
+                \def\nprt@tmpunit{\textcelsius}%
+                \ifx\nprt@oarg\nprt@tmpunit
+                  \ensuremath{\nprt@celsiussep}%
+                \else
+                  \def\nprt@tmpunit{\%}%
+                  \ifx\nprt@oarg\nprt@tmpunit
+                    \ensuremath{\nprt@percentsep}%
+                  \else
+                    \def\nprt@tmpunit{\tcperthousand}%
+                    \ifx\nprt@oarg\nprt@tmpunit
+                      \ensuremath{\nprt@percentsep}%
+                    \else
+                      \def\nprt@tmpunit{\perthousand}%
+                      \ifx\nprt@oarg\nprt@tmpunit
+                        \ensuremath{\nprt@percentsep}%
+                      \else
+                        \def\nprt@tmpunit{\textperthousand}%
+                        \ifx\nprt@oarg\nprt@tmpunit
+                          \ensuremath{\nprt@percentsep}%
+                        \else
+                          \ensuremath{\nprt@unitsep}%
+                        \fi
+                      \fi
+                    \fi
+                  \fi
+                \fi
+              \fi
             \fi
           \fi
         \fi
@@ -1196,6 +1227,7 @@
   \npproductsign{\cdot}%
   \npunitseparator{\,}%
   \npdegreeseparator{}%
+  \npcelsiusseparator{\nprt@unitsep}%
   \nppercentseparator{\nprt@unitsep}%
 }
     \npstyledefault
@@ -1205,6 +1237,7 @@
   \npproductsign{\cdot}%
   \npunitseparator{\,}%
   \npdegreeseparator{}%
+  \npcelsiusseparator{\nprt@unitsep}%
   \nppercentseparator{\nprt@unitsep}%
 }
 \newcommand*\npstyleenglish{%
@@ -1213,14 +1246,34 @@
   \npproductsign{\times}%
   \npunitseparator{\,}%
   \npdegreeseparator{}%
+  \npcelsiusseparator{\nprt@unitsep}%
   \nppercentseparator{\nprt@unitsep}%
 }
 \newcommand*\npstyleportuguese{%
+  \npthousandsep{.}%
+  \npdecimalsign{,}%
+  \npproductsign{\cdot}%
+  \npunitseparator{\,}%
+  \npdegreeseparator{}%
+  \npcelsiusseparator{\nprt@unitsep}%
+  \nppercentseparator{\nprt@unitsep}%
+}
+\newcommand*\npstyledutch{%
   \npthousandsep{\,}%
   \npdecimalsign{,}%
   \npproductsign{\cdot}%
   \npunitseparator{\,}%
   \npdegreeseparator{}%
+  \npcelsiusseparator{\nprt@unitsep}%
+  \nppercentseparator{}%
+}
+\newcommand*\npstylefrench{%
+  \npthousandsep{~}%
+  \npdecimalsign{,}%
+  \npproductsign{\cdot}%
+  \npunitseparator{\,}%
+  \npdegreeseparator{}%
+  \npcelsiusseparator{\nprt@unitsep}%
   \nppercentseparator{\nprt@unitsep}%
 }
 \AtBeginDocument{%
@@ -1228,18 +1281,25 @@
     \@ifpackageloaded{babel}{%
       \npaddtolanguage{UKenglish}{english}%
       \npaddtolanguage{USenglish}{english}%
+      \npaddtolanguage{afrikaans}{dutch}%
       \npaddtolanguage{american}{english}%
       \npaddtolanguage{austrian}{german}%
       \npaddtolanguage{british}{english}%
       \npaddtolanguage{canadian}{english}%
+      \npaddtolanguage{dutch}{dutch}%
       \npaddtolanguage{english}{english}%
       \npaddtolanguage{german}{german}%
       \npaddtolanguage{naustrian}{german}%
       \npaddtolanguage{ngerman}{german}%
-      \npaddtolanguage{brazil}{portuguese}
-      \npaddtolanguage{brazilian}{portuguese}
-      \npaddtolanguage{portuges}{portuguese}
-      \npaddtolanguage{portuguese}{portuguese}
+      \npaddtolanguage{brazil}{portuguese}%
+      \npaddtolanguage{brazilian}{portuguese}%
+      \npaddtolanguage{portuges}{portuguese}%
+      \npaddtolanguage{portuguese}{portuguese}%
+      \npaddtolanguage{francais}{french}%
+      \npaddtolanguage{canadien}{french}%
+      \npaddtolanguage{acadian}{french}%
+      \npaddtolanguage{french}{french}%
+      \npaddtolanguage{frenchb}{french}%
       \expandafter\selectlanguage\expandafter{\languagename}%
     }{%
       \npstyleenglish