From f853d14edaf7b35865289ce85961df9790cf91e9 Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Wed, 3 Aug 2011 13:06:34 +0000 Subject: ionumbers 2011/06/15 v0.3.1-alpha git-svn-id: svn://tug.org/texlive/trunk@23380 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/ionumbers/Makefile | 82 ++++++++ Master/texmf-dist/doc/latex/ionumbers/README | 27 ++- .../texmf-dist/doc/latex/ionumbers/ionumbers.pdf | Bin 221782 -> 380424 bytes .../doc/latex/ionumbers/ionumbers_test.pdf | Bin 62211 -> 120411 bytes .../doc/latex/ionumbers/ionumbers_test.tex | 209 ++++++++++++++++++++- 5 files changed, 311 insertions(+), 7 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/ionumbers/Makefile (limited to 'Master/texmf-dist/doc/latex') diff --git a/Master/texmf-dist/doc/latex/ionumbers/Makefile b/Master/texmf-dist/doc/latex/ionumbers/Makefile new file mode 100644 index 00000000000..caef2d61f8d --- /dev/null +++ b/Master/texmf-dist/doc/latex/ionumbers/Makefile @@ -0,0 +1,82 @@ +# +# Makefile for ionumbers package +# +# Copyright 2008,2011 Christian Schneider +# +# This file is part of ionumbers. +# +# ionumbers is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3 as +# published by the Free Software Foundation, not any later version. +# +# ionumbers is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ionumbers. If not, see . +# +# WARNING: THIS IS ALPHA SOFTWARE AND MAY CONTAIN SERIOUS BUGS! +# + +PACKAGE := ionumbers +TESTFILE := ionumbers_test + +PDFLATEX := pdflatex +MAKEINDEX := makeindex + +# installation directories +DESTDIR := $(HOME)/.texmf +DOCDIR := $(DESTDIR)/doc/latex/$(PACKAGE) +SRCDIR := $(DESTDIR)/source/latex/$(PACKAGE) +TEXDIR := $(DESTDIR)/tex/latex/$(PACKAGE) + +.PHONY: all pkg doc test install clean distclean force + +all: pkg doc test + +%.sty: %.ins %.dtx + $(RM) $@ + $(PDFLATEX) -interaction=nonstopmode $< + +%.idx %.glo: %.dtx %.sty + $(PDFLATEX) -interaction=nonstopmode $< + +%.ind: %.idx + $(MAKEINDEX) -s gind.ist -o $@ $< + +%.gls: %.glo + $(MAKEINDEX) -s gglo.ist -o $@ $< + +$(PACKAGE).pdf: %.pdf: %.dtx %.sty %.ind %.gls + $(PDFLATEX) -interaction=nonstopmode $< + $(PDFLATEX) -interaction=nonstopmode $< + $(PDFLATEX) -interaction=nonstopmode $< + +$(TESTFILE).pdf: %.pdf: %.tex $(PACKAGE).sty + $(PDFLATEX) -interaction=nonstopmode $< + $(PDFLATEX) -interaction=nonstopmode $< + $(PDFLATEX) -interaction=nonstopmode $< + +pkg: $(PACKAGE).sty + +test: $(TESTFILE).pdf + +doc: $(PACKAGE).pdf + +install: force + mkdir -p $(DOCDIR) $(SRCDIR) $(TEXDIR) + install -m 644 README COPYING $(PACKAGE).pdf $(TESTFILE).pdf $(DOCDIR) + install -m 644 $(PACKAGE).ins $(PACKAGE).dtx $(TESTFILE).tex Makefile \ + $(SRCDIR) + install -m 644 $(PACKAGE).sty $(TEXDIR) + mktexlsr $(DESTDIR) + +clean: force + $(RM) *.aux *.glo *.gls *.idx *.ilg *.ind *.log *.toc *~ + +distclean: clean force + $(RM) $(PACKAGE).sty $(PACKAGE).pdf $(TESTFILE).pdf + +force: ; diff --git a/Master/texmf-dist/doc/latex/ionumbers/README b/Master/texmf-dist/doc/latex/ionumbers/README index 9cff6047b65..e393af7fc79 100644 --- a/Master/texmf-dist/doc/latex/ionumbers/README +++ b/Master/texmf-dist/doc/latex/ionumbers/README @@ -14,9 +14,11 @@ conventions without the need of changing the table. Furthermore this package can automatically group digits left to the decimal separator (\emph{thousands}) and right to the decimal separator -(\emph{thousandths}) in triplets without the need of specifing commas -(English) or points (German) as separators. E.g., the input |$1234.567890$| -can be output as `$1\,234.\,567\,890$'. +(\emph{thousandths}) without the need of specifing commas (English) or +points (German) as separators. E.g., the input |$1234.567890$| can be +output as `$1\,234.\,567\,890$'. By default, thousands/thousandths are +grouped in triplets, but the grouping length is configurable, which is +useful for numerical data. Finally, an |e| starts the exponent of the number. For example, |$21e6$| may be output as `$26\times10\,^{6}$'. @@ -67,12 +69,27 @@ Optionally you can compile the test file: INSTALLATION ============ -Copy the file `ionumbers.sty' to a directory, where LaTeX will find it. +1) Installing with make +----------------------- + +To install the package into a TDS (= TeX directory structure; typically its base +directory is named `texmf' or something similar), run the following command: + $ make DESTDIR= install + +Note: `$(DESTDIR)' defaults to `$(HOME)/.texmf'. + +2) Installing manually +---------------------- + +In principle, you will only habe to copy the file `ionumbers.sty' into a +directory, where LaTeX can find it. If you copy it into a TDS (TeX directory +structure), you will most probably have to run the following command afterwards: + $ mktexlsr LICENSE ======= -Copyright 2007-2009 Christian Schneider +Copyright 2007--2009,2011 Christian Schneider idea and parts of this package based on: ziffer.sty v2.1 Copyright Martin Vaeth diff --git a/Master/texmf-dist/doc/latex/ionumbers/ionumbers.pdf b/Master/texmf-dist/doc/latex/ionumbers/ionumbers.pdf index c8cd38adccd..6f25e5a1684 100644 Binary files a/Master/texmf-dist/doc/latex/ionumbers/ionumbers.pdf and b/Master/texmf-dist/doc/latex/ionumbers/ionumbers.pdf differ diff --git a/Master/texmf-dist/doc/latex/ionumbers/ionumbers_test.pdf b/Master/texmf-dist/doc/latex/ionumbers/ionumbers_test.pdf index 3aab6e8cb9f..42518288bb3 100644 Binary files a/Master/texmf-dist/doc/latex/ionumbers/ionumbers_test.pdf and b/Master/texmf-dist/doc/latex/ionumbers/ionumbers_test.pdf differ diff --git a/Master/texmf-dist/doc/latex/ionumbers/ionumbers_test.tex b/Master/texmf-dist/doc/latex/ionumbers/ionumbers_test.tex index 304a7992023..277e4e7e3d9 100644 --- a/Master/texmf-dist/doc/latex/ionumbers/ionumbers_test.tex +++ b/Master/texmf-dist/doc/latex/ionumbers/ionumbers_test.tex @@ -2,7 +2,7 @@ % % test file for ionumbers package % -% Copyright 2008 Christian Schneider +% Copyright 2008,2011 Christian Schneider % % This file is part of ionumbers. % @@ -53,10 +53,10 @@ This is test output of the \textsf{ionumbers} \LaTeX{} package. The default \LaTeX{} output, the output with \textsf{ionumbers} package and the expected output with \textsf{ionumbers} package is given for different inputs. - If the package \textsf{ionumbers} works correctly, the contents in the `\textsf{ionumbers}' columns and the respective contents in the `expected' columns must be identical. + Note that a lot of input is nonsense and serves for testing purposes only. \vspace{2ex}\noindent } @@ -260,6 +260,108 @@ \end{tabular} \end{center} + \clearpage + \section*{Options \texttt{autothousands=true,autothousandths=true,}\\ + \texttt{grplenthousands=2,grplenthousandths=4}} + \enlargethispage{3ex} + \fileinfo + \ionumbersresetstyle + \ionumbersstyle{autothousands,autothousandths,grplenthousands=2,% + grplenthousandths=4} + + \begin{center} + \begin{tabular}% + {r@{\hspace{1em}}r@{\hspace{1em}}r@{\hspace{1em}}r@{\hspace{1em}}r} + \hline\hline + input & \LaTeX{} & \textsf{ionumbers} & expected\\ + \hline\hline\\[-1ex] + \header{simple digits} + \abc{1}{1} + \abc{12}{12} + \abc{123}{1,23} + \abc{1234}{12,34} + \abc{12345}{1,23,45} + \abc{123456}{12,34,56} + \abc{1234567}{1,23,45,67} + \header{point} + \abc{.1}{.1} + \abc{1.}{1.} + \abc{1.1}{1.1} + \abc{1. 2}{1. 2} + \abc{1 .2}{1 .2} + \abc{1.23456}{1.2345\,6} + \abc{12345.6}{1,23,45.6} + \abc{1.23.456}{1.23.45\,6} + \abc{a.b}{a.b} + \abc{a.1}{a.1} + \abc{1.a}{1.a} + \header{comma} + \abc{,1}{,1} + \abc{1,}{1,} + \abc{1,1}{1,1} + \abc{1, 2}{1, 2} + \abc{1 ,2}{1 ,2} + \abc{1,23456}{1,23456} + \abc{12345,6}{12345,6} + \abc{1,23,456}{1,23,456} + \abc{a,b}{a,b} + \abc{a,1}{a,1} + \abc{1,a}{1,a} + \hline\hline + \end{tabular} + \end{center} + + \begin{center} + \begin{tabular}% + {r@{\hspace{1em}}r@{\hspace{1em}}r@{\hspace{1em}}r@{\hspace{1em}}r} + \hline\hline + input & \LaTeX{} & \textsf{ionumbers} & expected\\ + \hline\hline\\[-1ex] + \header{plus and minus} + \abc{+1}{+1} + \abc{-1}{-1} + \abc{++1}{++1} + \abc{+ +1}{+ +1} + \abc{+ + 1}{+ + 1} + \abc{1+2}{1+2} + \abc{1+ 2}{1+ 2} + \abc{1 +2}{1 +2} + \abc{1 + 2}{1 + 2} + \abc{1++2}{1++2} + \abc{x+1}{x+1} + \abc{1+x}{1+x} + \abc{x+y}{x+y} + \header{letter `e'} + \abc{1e1234}{1e12,34} + \abc{1e+1234}{1e+12,34} + \abc{1e.}{1e.} + \abc{1e,}{1e,} + \abc{1e.1234}{1e.1234} + \abc{1e,1234}{1e,1234} + \abc{1e++1234}{1e++12,34} + \abc{1e 1,234}{1e 1,234} + \abc{1e +1234}{1e +12,34} + \abc{1 e1,234}{1 e1,234} + \header{mixed numbers} + \abc{1.234,890}{1.234,8\,90} + \abc{1,234.890}{1,234.890} + \abc{1234e5678}{12,34e56,78} + \abc{+1234e5678}{+12,34e56,78} + \abc{1234e+5678}{12,34e+56,78} + \abc{1.234e5.678}{1.234e5.678} + \abc{1,234e5,678}{1,234e5,678} + \header{single characters} + \abc{\sqrt 1}{\sqrt 1} + \abc{\sqrt 1234}{\sqrt 12,34} + \abc{\sqrt +}{\sqrt +} + \abc{\sqrt ++}{\sqrt ++} + \abc{\sqrt +1234}{\sqrt +12,34} + \abc{1e\sqrt +1234}{1e\sqrt +12,34} + \abc{1\sqrt +1234e0}{1\sqrt +12,34e0} + \hline\hline + \end{tabular} + \end{center} + \clearpage \section*{Options \texttt{exponent=rmE}} \fileinfo @@ -557,4 +659,107 @@ \end{tabular} \end{center} + \clearpage + \section*{Options \texttt{comma=decimal,point=thousands,}\\ + \texttt{autothousands,autothousandths,thousands=apostrophe}\\ + \texttt{thousandths=phantom}} + \enlargethispage{6ex} + \fileinfo + \ionumbersresetstyle + \ionumbersstyle{comma=decimal,point=thousands,autothousands,autothousandths,% + thousands=apostrophe,thousandths=phantom} + + \begin{center} + \begin{tabular}% + {r@{\hspace{1em}}r@{\hspace{1em}}r@{\hspace{1em}}r@{\hspace{1em}}r} + \hline\hline + input & \LaTeX{} & \textsf{ionumbers} & expected\\ + \hline\hline\\[-1ex] + \header{simple digits} + \abc{1}{1} + \abc{12}{12} + \abc{123}{123} + \abc{1234}{1'234} + \abc{12345}{12'345} + \abc{123456}{123'456} + \abc{1234567}{1'234'567} + \header{point} + \abc{.1}{'1} + \abc{1.}{1.} + \abc{1.1}{1'1} + \abc{1. 2}{1. 2} + \abc{1 .2}{1 '2} + \abc{1.23456}{1'23456} + \abc{12345.6}{12345'6} + \abc{1.23.456}{1'23'456} + \abc{a.b}{a.b} + \abc{a.1}{a'1} + \abc{1.a}{1.a} + \header{comma} + \abc{,1}{.1} + \abc{1,}{1,} + \abc{1,1}{1.1} + \abc{1, 2}{1, 2} + \abc{1 ,2}{1 .2} + \abc{1,23456}{1.234\phantom{.}56} + \abc{12345,6}{12'345.6} + \abc{1,23,456}{1.23.4\phantom{.}56} + \abc{a,b}{a,b} + \abc{a,1}{a.1} + \abc{1,a}{1,a} + \hline\hline + \end{tabular} + \end{center} + + \begin{center} + \begin{tabular}% + {r@{\hspace{1em}}r@{\hspace{1em}}r@{\hspace{1em}}r@{\hspace{1em}}r} + \hline\hline + input & \LaTeX{} & \textsf{ionumbers} & expected\\ + \hline\hline\\[-1ex] + \header{plus and minus} + \abc{+1}{+1} + \abc{-1}{-1} + \abc{++1}{++1} + \abc{+ +1}{+ +1} + \abc{+ + 1}{+ + 1} + \abc{1+2}{1+2} + \abc{1+ 2}{1+ 2} + \abc{1 +2}{1 +2} + \abc{1 + 2}{1 + 2} + \abc{1++2}{1++2} + \abc{x+1}{x+1} + \abc{1+x}{1+x} + \abc{x+y}{x+y} + \header{letter `e'} + \abc{1e1234}{1e1'234} + \abc{1e+1234}{1e+1'234} + \abc{1e.}{1e.} + \abc{1e,}{1e,} + \abc{1e.1234}{1e'1234} + \abc{1e,1234}{1e.123\phantom{.}4} + \abc{1e++1234}{1e++1'234} + \abc{1e 1234}{1e 1'234} + \abc{1e +1234}{1e +1'234} + \abc{1 e1234}{1 e1'234} + \header{mixed numbers} + \abc{1.234,890}{1'234.890} + \abc{1,234.890}{1.234'\phantom{.}890} + \abc{1234e5678}{1'234e5'678} + \abc{+1234e5678}{+1'234e5'678} + \abc{1234e+5678}{1'234e+5'678} + \abc{1.234e5.678}{1'234e5'678} + \abc{1,234e5,678}{1.234e5.678} + \header{single characters} + \abc{\sqrt 1}{\sqrt 1} + \abc{\sqrt 1234}{\sqrt 1'234} + \abc{\sqrt +}{\sqrt +} + \abc{\sqrt ++}{\sqrt ++} + \abc{\sqrt +1234}{\sqrt +1'234} + \abc{1e\sqrt +1234}{1e\sqrt +1'234} + \abc{1\sqrt +1234e0}{1\sqrt +1'234e0} + \hline\hline + \end{tabular} + \end{center} + \end{document} -- cgit v1.2.3