summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/numprint/ChangeLog.numprint4
-rw-r--r--Master/texmf-dist/doc/latex/numprint/Makefile (renamed from Master/texmf-dist/source/latex/numprint/Makefile)35
-rw-r--r--Master/texmf-dist/doc/latex/numprint/README6
-rw-r--r--Master/texmf-dist/doc/latex/numprint/nbaseprt.pdfbin399252 -> 342477 bytes
-rw-r--r--Master/texmf-dist/doc/latex/numprint/nbaseprt.xml37
-rw-r--r--Master/texmf-dist/doc/latex/numprint/numprint.pdfbin778272 -> 834558 bytes
-rw-r--r--Master/texmf-dist/doc/latex/numprint/numprint.xml41
-rw-r--r--Master/texmf-dist/source/latex/numprint/nbaseprt.dtx2
-rw-r--r--Master/texmf-dist/source/latex/numprint/numprint.dtx68
-rw-r--r--Master/texmf-dist/source/latex/numprint/numprint.ins5
-rw-r--r--Master/texmf-dist/source/latex/numprint/numprint032.dtx2
-rw-r--r--Master/texmf-dist/tex/latex/numprint/nbaseprt.sty4
-rw-r--r--Master/texmf-dist/tex/latex/numprint/numprint.sty14
-rw-r--r--Master/texmf-dist/tex/latex/numprint/numprint032.sty4
14 files changed, 74 insertions, 148 deletions
diff --git a/Master/texmf-dist/doc/latex/numprint/ChangeLog.numprint b/Master/texmf-dist/doc/latex/numprint/ChangeLog.numprint
index 1d43b3027a5..1d3eb0e94db 100644
--- a/Master/texmf-dist/doc/latex/numprint/ChangeLog.numprint
+++ b/Master/texmf-dist/doc/latex/numprint/ChangeLog.numprint
@@ -1,3 +1,7 @@
+2012/08/20 v1.39 Harald Harders (harald.harders@gmx.de)
+ - Move group around sign into the specific sign macros in order
+ to allow colour again (bug fix)
+
2007/05/18 v1.38 Harald Harders (h.harders@tu-bs.de)
- Moved counters \nprt@curpos and \nprt@rndpos outside the macro
definitions to avoid an overflow of counters
diff --git a/Master/texmf-dist/source/latex/numprint/Makefile b/Master/texmf-dist/doc/latex/numprint/Makefile
index 1f5fbf23792..f822b654219 100644
--- a/Master/texmf-dist/source/latex/numprint/Makefile
+++ b/Master/texmf-dist/doc/latex/numprint/Makefile
@@ -6,10 +6,10 @@ DOCDIR=`kpsewhich --expand-path='$$TEXMFLOCAL'`/doc/latex/numprint
VERSION=`latex getversion | grep '^VERSION' | sed 's/^VERSION //' | sed 's/\\([0-9]*\\)\\.\\([0-9a-z]*\\)/\\1_\\2/g'`
-.SUFFIXES: .sty .ins .dtx .dvi .ps .pdf
+.SUFFIXES: .sty .ins .dtx .pdf
.ins.sty:
- latex $<
+ pdflatex $<
.dtx.pdf:
pdflatex $<
@@ -18,18 +18,15 @@ VERSION=`latex getversion | grep '^VERSION' | sed 's/^VERSION //' | sed 's/\\([0
makeindex -s gglo.ist -o $(*D)/$(*F).gls $(*D)/$(*F).glo
pdflatex $<
-.dvi.ps:
- dvips -o $(*D)/$(*F).ps $(*D)/$(*F)
-
-all: numprint.sty numprint.pdf numprinttest.dvi \
- nbaseprt.pdf nbaseprttest.dvi
+all: numprint.sty numprint.pdf numprinttest.pdf \
+ nbaseprt.pdf nbaseprttest.pdf
-numprinttest.dvi: numprinttest.tex numprint.sty
- latex numprinttest
+numprinttest.pdf: numprinttest.tex numprint.sty
+ pdflatex numprinttest
-nbaseprttest.dvi: nbaseprttest.tex nbaseprt.sty
- latex nbaseprttest
+nbaseprttest.pdf: nbaseprttest.tex nbaseprt.sty
+ pdflatex nbaseprttest
@@ -43,10 +40,10 @@ clean:
@-rm -f *~
distclean: clean
- @-rm -f numprint.sty numprint.pdf numprint.ps numprint032.sty
- @-rm -f numprinttest.dvi numprinttest.ps
- @-rm -f nbaseprt.sty nbaseprt.pdf nbaseprt.ps nbaseprt032.sty
- @-rm -f nbaseprttest.dvi nbaseprttest.ps
+ @-rm -f numprint.sty numprint.pdf numprint032.sty
+ @-rm -f numprinttest.pdf
+ @-rm -f nbaseprt.sty nbaseprt.pdf nbaseprt032.sty
+ @-rm -f nbaseprttest.pdf
tar: all clean
echo Lege numprint-$(VERSION).tar.gz an
@@ -64,9 +61,7 @@ tar: all clean
$(SRCDIR)/numprint032.dtx \
$(SRCDIR)/numprinttest.tex \
$(SRCDIR)/nbaseprttest.tex \
- $(SRCDIR)/getversion.tex \
- $(SRCDIR)/numprint.xml \
- $(SRCDIR)/nbaseprt.xml
+ $(SRCDIR)/getversion.tex
rm -f getversion.log
texlive: all clean
@@ -75,8 +70,8 @@ texlive: all clean
mkdir -p texmf/doc/latex/numprint
mkdir -p texmf/source/latex/numprint
cp numprint.sty nbaseprt.sty numprint032.sty texmf/tex/latex/numprint
- cp numprint.dtx numprint.ins numprint.xml texmf/source/latex/numprint
- cp nbaseprt.dtx nbaseprt.ins nbaseprt.xml texmf/source/latex/numprint
+ cp numprint.dtx numprint.ins texmf/source/latex/numprint
+ cp nbaseprt.dtx texmf/source/latex/numprint
cp numprint032.dtx Makefile texmf/source/latex/numprint
cp README ChangeLog.numprint ChangeLog.nbaseprt texmf/doc/latex/numprint
cp numprinttest.tex numprint.pdf texmf/doc/latex/numprint
diff --git a/Master/texmf-dist/doc/latex/numprint/README b/Master/texmf-dist/doc/latex/numprint/README
index 20669af7654..347a6013e5c 100644
--- a/Master/texmf-dist/doc/latex/numprint/README
+++ b/Master/texmf-dist/doc/latex/numprint/README
@@ -34,7 +34,7 @@ improved and if the abbreviations for the different number bases are correct.
-Copyright 2000--2005, 2007, 2008 Harald Harders
+Copyright 2000--2005, 2007, 2008, 2012 Harald Harders
This program can be redistributed and/or modified under the terms
of the LaTeX Project Public License Distributed from CTAN
@@ -72,6 +72,6 @@ by hand: - execute latex on numprint.ins
again
-2008/02/17
+2012/08/20
Harald Harders
-h.harders@tu-bs.de
+harald.harders@gmx.de
diff --git a/Master/texmf-dist/doc/latex/numprint/nbaseprt.pdf b/Master/texmf-dist/doc/latex/numprint/nbaseprt.pdf
index bfe48f45597..0929b0034ad 100644
--- a/Master/texmf-dist/doc/latex/numprint/nbaseprt.pdf
+++ b/Master/texmf-dist/doc/latex/numprint/nbaseprt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/numprint/nbaseprt.xml b/Master/texmf-dist/doc/latex/numprint/nbaseprt.xml
deleted file mode 100644
index afdb5430bf7..00000000000
--- a/Master/texmf-dist/doc/latex/numprint/nbaseprt.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE entry SYSTEM "../catalogue.dtd">
-<entry id="nbaseprt"
- datestamp="2004/08/08"
- modifier="h.harders@tu-bs.de">
- <about>
- <name>nbaseprt</name>
- <caption>Print numbers in different number bases with separators.</caption>
- <author>
- <name>Harald Harders</name>
- <email>h.harders@tu-bs.de</email>
- </author>
- <license type="lppl"/>
- <version>
- <number>0.10</number>
- </version>
- </about>
- <description>
- <abstract>
-This package prints integer numbers in different bases (octal,
-decimal, hexadecimal, binary) similarly to the numprint package.
-But here, the number of digits within one group depends on the
-base.
-
-This version of nbaseprt.sty is a BETA VERSION.
-The main command \nbaseprint will stay stable but
-all configuration commands and the output of
-\nbaseprint may change in future.
-Please give me feedback what can be improved and if the
-abbreviations for the different number bases are correct.
- </abstract>
- </description>
- <distribution>
- <texlive>latex3</texlive>
- <ctan>macros/latex/contrib/nbaseprt</ctan>
- </distribution>
-</entry>
diff --git a/Master/texmf-dist/doc/latex/numprint/numprint.pdf b/Master/texmf-dist/doc/latex/numprint/numprint.pdf
index b98a9266123..717e4858fd6 100644
--- a/Master/texmf-dist/doc/latex/numprint/numprint.pdf
+++ b/Master/texmf-dist/doc/latex/numprint/numprint.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/numprint/numprint.xml b/Master/texmf-dist/doc/latex/numprint/numprint.xml
deleted file mode 100644
index 6aa3eca9d79..00000000000
--- a/Master/texmf-dist/doc/latex/numprint/numprint.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE entry SYSTEM "../catalogue.dtd">
-<entry id="numprint"
- datestamp="2008/02/17"
- modifier="h.harders@tu-bs.de">
- <about>
- <name>numprint</name>
- <caption>Print numbers with separators and exponent if necessary.</caption>
- <author>
- <name>Harald Harders</name>
- <email>h.harders@tu-bs.de</email>
- </author>
- <license type="lppl"/>
- <version>
- <number>1.38</number>
- </version>
- </about>
- <description>
- <abstract>
-Print numbers with a separator every three digits and convert numbers
-given as 12345.6e789 to 12\,345,6\cdot 10^{789}. Numbers are printed
-in the current mode (text or math) in order to use the correct font.
- Many things, including the decimal sign, the thousand separator, as
-well as the product sign can be changed by the user, e.g., to reach
-12,345.6\times 10^{789}. If requested, numprint can round numbers to
-a given number of digits.
- If an optional argument is given it is printed upright as unit.
-Numbers can be rounded to a given number of digits.
- The package supports an automatic, language-dependent change of the
-number format.
- Tabular alignment using the tabular(*), array, tabularx, and longtable
-environments (similar to the dcolumn and rccol packages) is supported
-using all features of numprint. Additional text can be added before and
-after the formatted number.
- </abstract>
- </description>
- <distribution>
- <texlive>latex3</texlive>
- <ctan>macros/latex/contrib/numprint</ctan>
- </distribution>
-</entry>
diff --git a/Master/texmf-dist/source/latex/numprint/nbaseprt.dtx b/Master/texmf-dist/source/latex/numprint/nbaseprt.dtx
index 801a534c3a1..f8119ad2089 100644
--- a/Master/texmf-dist/source/latex/numprint/nbaseprt.dtx
+++ b/Master/texmf-dist/source/latex/numprint/nbaseprt.dtx
@@ -36,7 +36,7 @@
\def\bottomrule\hline}
\GetFileInfo{nbaseprt.sty}
\title{The nbaseprt package}
-\author{Harald Harders\\\texttt{h.harders@tu-bs.de}}
+\author{Harald Harders\\\texttt{harald.harders@gmx.de}}
\date{Version \fileversion, \filedate; printed \today}
\newlength{\tempdima}%
\makeatletter
diff --git a/Master/texmf-dist/source/latex/numprint/numprint.dtx b/Master/texmf-dist/source/latex/numprint/numprint.dtx
index 4d387ecf7d1..c9ee3ea2485 100644
--- a/Master/texmf-dist/source/latex/numprint/numprint.dtx
+++ b/Master/texmf-dist/source/latex/numprint/numprint.dtx
@@ -1,5 +1,5 @@
% \iffalse meta comment
-% File: numprint.dtx Copyright (C) 2000--2005, 2007, 2008 Harald Harders
+% File: numprint.dtx Copyright (C) 2000--2005, 2007, 2008, 2012 Harald Harders
% \fi
%
% \iffalse
@@ -42,7 +42,7 @@
}
\GetFileInfo{numprint.sty}
\title{The numprint package}
-\author{Harald Harders\\\texttt{h.harders@tu-bs.de}}
+\author{Harald Harders\\\texttt{harald.harders@gmx.de}}
\date{Version \fileversion, \filedate; printed \today}
\npdecimalsign{.}%
\newlength{\tempdima}%
@@ -140,7 +140,7 @@
% \tableofcontents
%
% \section*{Copyright}
-% Copyright 2000--2005, 2007, 2008 Harald Harders.
+% Copyright 2000--2005, 2007, 2008, 2012 Harald Harders.
%
% This program can be redistributed and/or modified under the terms
% of the LaTeX Project Public License Distributed from CTAN
@@ -1380,8 +1380,8 @@
% Since the sign might be arbitrary characters, you should define the
% command as follows:
% \begin{verbatim}
-%\expandafter\newcommand\csname nprt@sign@*\endcsname{\ensuremath{*}}\end{verbatim}
-% {\makeatletter\expandafter\def\csname nprt@sign@*\endcsname{\ensuremath{*}}%
+%\expandafter\newcommand\csname nprt@sign@*\endcsname{{\ensuremath{*}}}\end{verbatim}
+% {\makeatletter\expandafter\def\csname nprt@sign@*\endcsname{{\ensuremath{*}}}%
% \def\nprt@signlist{+-\pm *}\makeatother
% With this command, \cs{numprint\{*1234\}} occurs as
% ``\numprint{*1234}'' in text mode and as ``$\numprint{*1234}$'' in
@@ -1409,17 +1409,17 @@
% user signs, described in section~\ref{sec:custom-parsing}.
% They are defined as follows:
% \begin{verbatim}
-%\expandafter\newcommand\csname nprt@sign@+\endcsname{\ensuremath{+}}
-%\expandafter\newcommand\csname nprt@sign@-\endcsname{\ensuremath{-}}
-%\expandafter\newcommand\csname nprt@sign@+-\endcsname{\ensuremath{\pm}}\end{verbatim}
+%\expandafter\newcommand\csname nprt@sign@+\endcsname{{\ensuremath{+}}}
+%\expandafter\newcommand\csname nprt@sign@-\endcsname{{\ensuremath{-}}}
+%\expandafter\newcommand\csname nprt@sign@+-\endcsname{{\ensuremath{\pm}}}\end{verbatim}
% If you, for instance, don't want to use the math minus for numbers
% in text mode but another character, you may redefine
% \cs{nprt@sign@-}:
% \begin{verbatim}
%\expandafter\renewcommand\csname nprt@sign@-\endcsname{%
-% \ifmmode -\else ---\fi}\end{verbatim}
+% \ifmmode {-}\else {---}\fi}\end{verbatim}
%{\makeatletter\expandafter\def\csname nprt@sign@-\endcsname
-% {\ifmmode -\else---\fi}\makeatother
+% {\ifmmode {-}\else {---}\fi}\makeatother
% With this definition, \cs{numprint\{-1234\}} leads to
% ``\numprint{-1234}'' resp.\ ``$\numprint{-1234}$'' in text resp.\
% math mode.}
@@ -1435,16 +1435,16 @@
%\usepackage{color}
%\makeatletter
%\expandafter\renewcommand\csname nprt@sign@-\endcsname{%
-% \color{red}\ensuremath{-}}
+% \color{red}{\ensuremath{-}}}
%\makeatother\end{verbatim}
% With this definition,
% \begin{verbatim}
%\numprint{1234}, \numprint{-1234},
%\numprint{1234e-123}, \numprint{-1234e123}.\end{verbatim}
% {\makeatletter\expandafter\def\csname nprt@sign@-\endcsname
-% {\color{red}\ensuremath{-}}\makeatother
+% {\color{red}{\ensuremath{-}}}\makeatother
% leads to ``\numprint{1234}, \numprint{-1234}, \numprint{1234e-123},
-% \numprint{-1234e123}.''}\footnote{Wheather you can see the effect in
+% \numprint{-1234e123}.''}\footnote{Whether you can see the effect in
% the output depends on the viewer; in PostScript and PDF the red
% color works, in many dvi viewers, it doesn't.}
% To avoid a negative exponent beeing printed in red for a positive
@@ -1652,7 +1652,7 @@
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{numprint}
- [2008/02/17 v1.38 Print numbers (HH)]
+ [2012/08/20 v1.39 Print numbers (HH)]
% \end{macrocode}
%
% \subsection{Load packages}
@@ -2161,7 +2161,7 @@
% \end{macrocode}
% \begin{macro}{\nprt@testsign}
% Define \cs{nprt@testsign\marg{Number type}\marg{Number}} which tests
-% wheather a sign is given and then starts \cs{nprt@testnumber} (the
+% whether a sign is given and then starts \cs{nprt@testnumber} (the
% call actually is done by \cs{nprt@@testsign}).
% \begin{macrocode}
\newcommand*\nprt@testsign[2]{%
@@ -2211,7 +2211,7 @@
\setcounter{nprt@#1@digitsbefore}{0}%
\setcounter{nprt@#1@digitsafter}{0}%
% \end{macrocode}
-% Test wheather the first character of the number, |#2|, contains a
+% Test whether the first character of the number, |#2|, contains a
% sign symbol which is listed in \cs{nprt@signlist}.
% \begin{macrocode}
\nprt@IfCharInString{#2}{\nprt@signlist}{%
@@ -2309,7 +2309,7 @@
\edef\nprt@commandname{#1}%
\edef\nprt@argthree{#3}%
% \end{macrocode}
-% Test wheather the current character is a valid character for a real
+% Test whether the current character is a valid character for a real
% number (say a digit or a decimal sign).
% \begin{macrocode}
\nprt@IfCharInString{#2}{\nprt@numberlist\nprt@dotlist}{%
@@ -2384,14 +2384,14 @@
% \begin{macrocode}
\edef\nprt@argtwo{#2}%
% \end{macrocode}
-% Test wheather the current character is a valid one.
+% Test whether the current character is a valid one.
% \begin{macrocode}
\nprt@IfCharInString{#1}{%
\nprt@numberlist\nprt@dotlist\nprt@explist\nprt@signlist\nprt@ignorelist}{%
% \end{macrocode}
% Yes, it is valid.
%
-% Now, test wheather it is one of the ignored characters.
+% Now, test whether it is one of the ignored characters.
% \begin{macrocode}
\nprt@IfCharInString{#1}{\nprt@ignorelist}{%
\nprt@debug{Character `\noexpand#1' ignored}%
@@ -2399,7 +2399,7 @@
% \end{macrocode}
% Yes, it is valid.
%
-% Now, test wheather it is one of the characters that start the
+% Now, test whether it is one of the characters that start the
% exponent.
% If yes, set \cs{ifnprt@expfound} to ``true''.
% If in addition, this has been done before, you have used more than
@@ -2416,7 +2416,7 @@
% \end{macrocode}
% If the current character is not an exponent-starting character it
% is either a part of the mantissa or the exponent, depending on
-% wheather the exponent has been started before.
+% whether the exponent has been started before.
% Add the current character to the corresponding command that stores
% the mantissa resp.\ the exponent.
% \begin{macrocode}
@@ -2797,7 +2797,7 @@
% \begin{macrocode}
\ifx\nprt@end#1%
% \end{macrocode}
-% Test wheather it is the normal or the star version of the
+% Test whether it is the normal or the star version of the
% environment.
% Is this really necessary?
% \begin{macrocode}
@@ -3204,7 +3204,7 @@
\edef\nprt@argtwo{#2}%
% \end{macrocode}
% Do the recursion until the end of the number.
-% This routine does not have to decide wheather the number has to be
+% This routine does not have to decide whether the number has to be
% rounded since it knows that by \cs{ifnprt@roundup}, set by
% \cs{nprt@round@after}.
% \begin{macrocode}
@@ -3420,10 +3420,12 @@
% Define commands for printing the signs in math mode. This ensures
% that the printed signs really are signs and not hyphens. Compare
% ``-'' to ``\ensuremath{-}''.
+% \changes{1.39}{2012/08/20}{Move group around sign into the specific
+% sign macros in order to allow colour again}%
% \begin{macrocode}
-\expandafter\newcommand\csname nprt@sign@+\endcsname{\ensuremath{+}}
-\expandafter\newcommand\csname nprt@sign@-\endcsname{\ensuremath{-}}
-\expandafter\newcommand\csname nprt@sign@+-\endcsname{\ensuremath{\pm}}
+\expandafter\newcommand\csname nprt@sign@+\endcsname{{\ensuremath{+}}}
+\expandafter\newcommand\csname nprt@sign@-\endcsname{{\ensuremath{-}}}
+\expandafter\newcommand\csname nprt@sign@+-\endcsname{{\ensuremath{\pm}}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -3462,13 +3464,15 @@
% e.g., \cs{nprt@sign@+}, print it; if not, print the sign itself.
% \changes{1.22}{2004/08/08}{Print sign in a group to avoid additional space
% for an operator (for nbaseprt)}%
+% \changes{1.39}{2012/08/20}{Move group around sign into the specific
+% sign macros in order to allow colour again}%
% \begin{macrocode}
\@ifundefined{nprt@sign@\nprt@marg}{%
\PackageWarning{numprint}{%
Unknown sign `\nprt@marg'. Print as typed in}%
\nprt@marg
}{%
- {\csname nprt@sign@\nprt@marg\endcsname}%
+ \csname nprt@sign@\nprt@marg\endcsname%
}%
\fi
}
@@ -3487,7 +3491,7 @@
% Print the number before the decimal sign.
% The argument is the Number type (``mantissa'' or ``exponent'').
% When this macro is called, everything is parsed already.
-% Thus, it is known wheather a decimal sign has been found, which and
+% Thus, it is known whether a decimal sign has been found, which and
% how many digits are before resp.\ after the decimal sign etc.
% \begin{macrocode}
\newcommand*\nprt@printbefore[1]{%
@@ -3675,7 +3679,7 @@
\ifx\nprt@numbertoprint\@empty
\else
% \end{macrocode}
-% Find out wheather separators have to be inserted.
+% Find out whether separators have to be inserted.
% \begin{macrocode}
\ifnprt@numsepfour
\else
@@ -3803,7 +3807,7 @@
the argument of \string\numprint}%
\fi
% \end{macrocode}
-% Test wheather only valid characters have been used and devide the
+% Test whether only valid characters have been used and devide the
% argument in the mantissa and the exponent.
% \begin{macrocode}
\expandafter\nprt@testcharacter\nprt@marg\@empty\@empty
@@ -3860,7 +3864,7 @@
% \begin{macrocode}
\ifnprt@expfound
% \end{macrocode}
-% Test wheather an exponent character was given but no exponent.
+% Test whether an exponent character was given but no exponent.
% \begin{macrocode}
\ifx\nprt@exponent\@empty
\nprt@error{Empty exponent}{If you specify an exponent
@@ -4184,7 +4188,7 @@
\else
% \end{macrocode}
% All units expect the degree symbol are separated from the number.
-% Detect wheather the degree symbol is used.
+% Detect whether the degree symbol is used.
%
% \changes{1.22}{2004/08/08}{Produce a warning rather than an error
% when using \cs{textdegree} as unit}%
diff --git a/Master/texmf-dist/source/latex/numprint/numprint.ins b/Master/texmf-dist/source/latex/numprint/numprint.ins
index aa28afd8f1a..11306b1b487 100644
--- a/Master/texmf-dist/source/latex/numprint/numprint.ins
+++ b/Master/texmf-dist/source/latex/numprint/numprint.ins
@@ -1,16 +1,17 @@
+% Hello, Emacs: this is -*-LaTeX-*- !
\input docstrip.tex
\preamble
numprint package
- Copyright 2000--2005, 2007, 2008 Harald Harders
+ Copyright 2000--2005, 2007, 2008, 2012 Harald Harders
This program can be redistributed and/or modified under the terms
of the LaTeX Project Public License Distributed from CTAN
archives in directory macros/latex/base/lppl.txt; either
version 1 of the License, or any later version.
- h.harders@tu-bs.de
+ harald.harders@gmx.de
\endpreamble
diff --git a/Master/texmf-dist/source/latex/numprint/numprint032.dtx b/Master/texmf-dist/source/latex/numprint/numprint032.dtx
index 486a26866a9..7b8865986f0 100644
--- a/Master/texmf-dist/source/latex/numprint/numprint032.dtx
+++ b/Master/texmf-dist/source/latex/numprint/numprint032.dtx
@@ -21,7 +21,7 @@
\title{The \texttt{numprint} package\thanks{This file has version
\nprtfileversion\ last revised \nprtfiledate, documentation dated
\nprtdocdate.}}
-\author{Harald Harders\\\texttt{h.harders@tu-bs.de}}
+\author{Harald Harders\\\texttt{harald.harders@gmx.de}}
\date{File Date \nprtfiledate, Printed \today}
\npdecimalsign{.}%
\newlength{\tempdima}%
diff --git a/Master/texmf-dist/tex/latex/numprint/nbaseprt.sty b/Master/texmf-dist/tex/latex/numprint/nbaseprt.sty
index 62e9194cb38..72e9a4d0a0f 100644
--- a/Master/texmf-dist/tex/latex/numprint/nbaseprt.sty
+++ b/Master/texmf-dist/tex/latex/numprint/nbaseprt.sty
@@ -8,14 +8,14 @@
%%
%% numprint package
%%
-%% Copyright 2000--2005, 2007, 2008 Harald Harders
+%% Copyright 2000--2005, 2007, 2008, 2012 Harald Harders
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
%% archives in directory macros/latex/base/lppl.txt; either
%% version 1 of the License, or any later version.
%%
-%% h.harders@tu-bs.de
+%% harald.harders@gmx.de
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{nbaseprt}
diff --git a/Master/texmf-dist/tex/latex/numprint/numprint.sty b/Master/texmf-dist/tex/latex/numprint/numprint.sty
index 6cafa201ece..ee73c98a5d4 100644
--- a/Master/texmf-dist/tex/latex/numprint/numprint.sty
+++ b/Master/texmf-dist/tex/latex/numprint/numprint.sty
@@ -8,18 +8,18 @@
%%
%% numprint package
%%
-%% Copyright 2000--2005, 2007, 2008 Harald Harders
+%% Copyright 2000--2005, 2007, 2008, 2012 Harald Harders
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
%% archives in directory macros/latex/base/lppl.txt; either
%% version 1 of the License, or any later version.
%%
-%% h.harders@tu-bs.de
+%% harald.harders@gmx.de
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{numprint}
- [2008/02/17 v1.38 Print numbers (HH)]
+ [2012/08/20 v1.39 Print numbers (HH)]
\RequirePackage{array}
\newif\ifnprt@numsepfour
\newif\ifnprt@errormessage
@@ -622,9 +622,9 @@
\fi
\fi
}%
-\expandafter\newcommand\csname nprt@sign@+\endcsname{\ensuremath{+}}
-\expandafter\newcommand\csname nprt@sign@-\endcsname{\ensuremath{-}}
-\expandafter\newcommand\csname nprt@sign@+-\endcsname{\ensuremath{\pm}}
+\expandafter\newcommand\csname nprt@sign@+\endcsname{{\ensuremath{+}}}
+\expandafter\newcommand\csname nprt@sign@-\endcsname{{\ensuremath{-}}}
+\expandafter\newcommand\csname nprt@sign@+-\endcsname{{\ensuremath{\pm}}}
\newcommand*\nprt@printsign[2]{%
\nprt@debug{\string\nprt@printsign: `#2'}%
\edef\nprt@marg{#2}%
@@ -640,7 +640,7 @@
Unknown sign `\nprt@marg'. Print as typed in}%
\nprt@marg
}{%
- {\csname nprt@sign@\nprt@marg\endcsname}%
+ \csname nprt@sign@\nprt@marg\endcsname%
}%
\fi
}
diff --git a/Master/texmf-dist/tex/latex/numprint/numprint032.sty b/Master/texmf-dist/tex/latex/numprint/numprint032.sty
index f9653be0ff2..40792b477c2 100644
--- a/Master/texmf-dist/tex/latex/numprint/numprint032.sty
+++ b/Master/texmf-dist/tex/latex/numprint/numprint032.sty
@@ -8,14 +8,14 @@
%%
%% numprint package
%%
-%% Copyright 2000--2005, 2007, 2008 Harald Harders
+%% Copyright 2000--2005, 2007, 2008, 2012 Harald Harders
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
%% archives in directory macros/latex/base/lppl.txt; either
%% version 1 of the License, or any later version.
%%
-%% h.harders@tu-bs.de
+%% harald.harders@gmx.de
%%
\def\packagename{numprint}
\def\nprtfileversion{0.32}