numprint (22aug12)

git-svn-id: svn://tug.org/texlive/trunk@27498 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 103 insertions, 81 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/doc/latex/numprint/Makefile b/Master/texmf-dist/doc/latex/numprint/Makefile
new file mode 100644
index 00000000000..f822b654219
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/numprint/Makefile
@@ -0,0 +1,96 @@
+
+SRCDIR=numprint
+INSTALLDIR=`kpsewhich --expand-path='$$TEXMFLOCAL'`/tex/latex/numprint
+DOCDIR=`kpsewhich --expand-path='$$TEXMFLOCAL'`/doc/latex/numprint
+#VERSION=`latex getversion | grep '^VERSION' | sed 's/^VERSION \\(.*\\)\\.\\(.*\\)/\\1_\\2/g'`
+VERSION=`latex getversion | grep '^VERSION' | sed 's/^VERSION //' | sed 's/\\([0-9]*\\)\\.\\([0-9a-z]*\\)/\\1_\\2/g'`
+
+
+.SUFFIXES: .sty .ins .dtx .pdf
+
+.ins.sty:
+	pdflatex $<
+
+.dtx.pdf:
+	pdflatex $<
+	pdflatex $<
+	makeindex -s gind.ist $(*D)/$(*F)
+	makeindex -s gglo.ist -o $(*D)/$(*F).gls $(*D)/$(*F).glo
+	pdflatex $<
+
+
+all:	numprint.sty numprint.pdf numprinttest.pdf \
+	nbaseprt.pdf nbaseprttest.pdf
+
+numprinttest.pdf: numprinttest.tex numprint.sty
+	pdflatex numprinttest
+
+nbaseprttest.pdf: nbaseprttest.tex nbaseprt.sty
+	pdflatex nbaseprttest
+
+
+
+clean:
+	@-rm -f numprint.glo numprint.gls numprint.idx numprint.ilg
+	@-rm -f numprint.ind numprint.aux numprint.log numprint.toc
+	@-rm -f numprinttest.log numprinttest.aux
+	@-rm -f nbaseprt.glo nbaseprt.gls nbaseprt.idx nbaseprt.ilg
+	@-rm -f nbaseprt.ind nbaseprt.aux nbaseprt.log nbaseprt.toc
+	@-rm -f nbaseprttest.log nbaseprttest.aux
+	@-rm -f *~
+
+distclean: clean
+	@-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
+	-rm -f numprint-$(VERSION).tar.gz
+	tar czCf .. numprint-$(VERSION).tar.gz \
+	  $(SRCDIR)/README \
+	  $(SRCDIR)/ChangeLog.numprint \
+	  $(SRCDIR)/ChangeLog.nbaseprt \
+	  $(SRCDIR)/Makefile \
+	  $(SRCDIR)/numprint.dtx \
+	  $(SRCDIR)/nbaseprt.dtx \
+	  $(SRCDIR)/numprint.ins \
+	  $(SRCDIR)/numprint.pdf \
+	  $(SRCDIR)/nbaseprt.pdf \
+	  $(SRCDIR)/numprint032.dtx \
+	  $(SRCDIR)/numprinttest.tex \
+	  $(SRCDIR)/nbaseprttest.tex \
+	  $(SRCDIR)/getversion.tex
+	rm -f getversion.log
+
+texlive:	all clean
+	rm -rf texmf
+	mkdir -p texmf/tex/latex/numprint
+	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 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
+	cp nbaseprttest.tex nbaseprt.pdf texmf/doc/latex/numprint
+
+zip:	all clean texlive
+	-@rm -f numprint-$(VERSION).zip
+	zip -r numprint-$(VERSION).zip texmf
+	rm -r texmf/
+	rm -f getversion.log
+
+install: all
+	if [ ! -d $(INSTALLDIR) ]; then mkdir -p $(INSTALLDIR); fi
+	if [ ! -d $(DOCDIR) ]; then mkdir -p $(DOCDIR); fi
+	install -m644 numprint.sty numprint032.sty nbaseprt.sty $(INSTALLDIR)
+	install -m644 numprint.pdf numprinttest.tex $(DOCDIR)
+	install -m644 nbaseprt.pdf nbaseprttest.tex $(DOCDIR)
+	install -m644 README ChangeLog.numprint ChangeLog.nbaseprt $(DOCDIR)
+	texhash
+
+numprint.sty: numprint.ins numprint.dtx
+nbaseprt.sty: numprint.ins nbaseprt.dtx
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
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
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>