fonttable update (2009/10/15 v1.6)

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

4 files changed, 64 insertions, 43 deletions

diff --git a/Master/texmf-dist/doc/latex/fonttable/README b/Master/texmf-dist/doc/latex/fonttable/README
index 52913106b47..c106070c4ea 100644
--- a/Master/texmf-dist/doc/latex/fonttable/README
+++ b/Master/texmf-dist/doc/latex/fonttable/README
@@ -1,4 +1,4 @@
-_____________________
+------------------------------------------------------------------
 The FONTTABLE package
 
 The fonttable package enables you to print a table of the characters
@@ -8,9 +8,12 @@ glyphs in a variety of settings.
 This, in a package form, is a poor man's version of nfssfont.tex and
 testfont.tex.
 
-______________
+------------------------------------------------------------------
 Change History
 
+1.6 (2009/10/15)
+- New spacing behaviour of the decimal numbers, courtesy Peter Wilson
+
 1.5d (2009/09/22) - Fix the bug for real, this time
 1.5c (2009/09/20) - Bug fix with \nodecimals
 1.5b (2009/09/02) - New maintainer (Will Robertson)
@@ -31,6 +34,7 @@ Change History
 1.0  (2005/11/27) - First public release
 
 ------------------------------------------------------------------
+
   Author: Peter Wilson (Herries Press)
   Maintainer: Will Robertson (will dot robertson at latex-project dot org)
   Copyright 2005--2009 Peter R. Wilson
@@ -53,6 +57,7 @@ Change History
    - fonttable.sty
 
 ------------------------------------------------------------------
+
 The distribution consists of the following files:
 
 - README (this file)
@@ -60,7 +65,6 @@ The distribution consists of the following files:
 - fonttable.ins
 - fonttable.pdf
 
-
 To install the package:
 
 - To generate fonttable.sty run: 
@@ -73,3 +77,5 @@ To manually generate the manual, run:
     pdflatex fonttable.dtx
     makeindex -s gind.ist fonttable.idx # optional
     pdflatex fonttable.dtx
+
+------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/fonttable/fonttable.pdf b/Master/texmf-dist/doc/latex/fonttable/fonttable.pdf
index 13b8552f479..659ddcec77c 100644
--- a/Master/texmf-dist/doc/latex/fonttable/fonttable.pdf
+++ b/Master/texmf-dist/doc/latex/fonttable/fonttable.pdf
diff --git a/Master/texmf-dist/source/latex/fonttable/fonttable.dtx b/Master/texmf-dist/source/latex/fonttable/fonttable.dtx
index 097a415bfa3..8c4b6018cde 100644
--- a/Master/texmf-dist/source/latex/fonttable/fonttable.dtx
+++ b/Master/texmf-dist/source/latex/fonttable/fonttable.dtx
@@ -54,7 +54,7 @@
 %
 % \fi
 %
-% \CheckSum{915}
+% \CheckSum{911}
 %
 % \DoNotIndex{\',\.,\@M,\@@input,\@addtoreset,\@arabic,\@badmath}
 % \DoNotIndex{\@centercr,\@cite}
@@ -106,6 +106,7 @@
 % \changes{v1.5}{2009/05/12}{Added code for Knuth's testfont.tex}
 % \changes{v1.51}{2009/05/14}{Eliminated a clash with babel package}
 % \changes{v1.5b}{2009/09/02}{New maintainer (Will Robertson)}
+% \changes{v1.6}{2009/10/15}{New spacing of the decimals from Peter Wilson}
 %
 % \def\fileversion{v1.0} \def\filedate{2005/11/27}
 % \def\fileversion{v1.0a} \def\filedate{2005/12/06}
@@ -118,6 +119,7 @@
 % \def\fileversion{v1.5b} \def\filedate{2009/09/02}
 % \def\fileversion{v1.5c} \def\filedate{2009/09/20}
 % \def\fileversion{v1.5d} \def\filedate{2009/09/22}
+% \def\fileversion{v1.6} \def\filedate{2009/10/15}
 % \newcommand*{\Lpack}[1]{\textsf {#1}}           ^^A typeset a package
 % \newcommand*{\Lopt}[1]{\textsf {#1}}            ^^A typeset an option
 % \newcommand*{\file}[1]{\texttt {#1}}            ^^A typeset a file
@@ -435,7 +437,7 @@
 %    \begin{macrocode}
 %<*pack>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fonttable}[2009/09/22 v1.5d displays a font]
+\ProvidesPackage{fonttable}[2009/10/15 v1.6 displays a font]
 
 %    \end{macrocode}
 %
@@ -785,46 +787,56 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\decimals}
-% \begin{macro}{\nodecimals}
 % \begin{macro}{\f@tpsg}
-% Following \cs{decimals}, which is the default, decimal numbers are 
-% printed in the table. Following \cs{nodecimals} they are not printed.
-%
-% \cs{f@tpsg} typesets a single glyph, possibly with its decimal slot number.
-%
-% NOTE (2009/04/30): Initially \cs{f@tpsg} was called \cs{:}, which LaTeX
-% defines to be a medium space. No doubt this was OK with the interactive
-% version but can cause havoc when used in a package!
 % \changes{v1.3}{2009/04/30}{Replaced redefinition of \cs{:} by \cs{f@tpsg}}
 % \changes{v1.5c}{2009/09/20}{\cs{renewcommand}\cs{f@tpsg} instead (props Michael Niedermair)}
 % \changes{v1.5d}{2009/09/22}{Fix the bug for real this time}
+% \begin{macro}{\f@placechar}
+% \begin{macro}{\f@placedecimal}
+% \cs{f@tpsg} typesets a single glyph, possibly with its decimal slot number.
+% \cs{f@placechar} is the function to typeset the glyph with its number that is
+% internally defined as \cs{f@placedecimal} if decimals are to be shown.
+%    \begin{macrocode}
+\newcommand*{\f@tpsg}{%
+  \setbox\z@=\hbox{\f@placechar{\char\f@tn}{\the\f@tn}}%
+  \ifdim\ht\z@>7.5pt\relax
+    \f@treposition
+  \else
+    \ifdim\dp\z@>2.5pt\relax
+      \f@treposition
+    \fi
+  \fi
+  \box\z@
+  \global\advance\f@tn\@ne
+}
+%    \end{macrocode}
+% Change this definition to adjust the typesetting of the decimal numbers:
+%    \begin{macrocode}
+\newcommand*\f@placedecimal[2]{#1\ {\tiny #2}}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\decimals}
+% \begin{macro}{\nodecimals}
+% Following \cs{decimals}, which is the default, decimal numbers are
+% printed in the table. Following \cs{nodecimals} they are not printed.
 %    \begin{macrocode}
-\newcommand*\f@tpsg{}
 \newcommand*{\nodecimals}{%
-  \renewcommand*\f@tpsg{%
-    \setbox0=\hbox{\char\f@tn}%
-    \ifdim\ht0>7.5pt\f@treposition
-    \else\ifdim\dp0>2.5pt\f@treposition\fi\fi
-    \box0\global\advance\f@tn 1 %
-  }%
+  \renewcommand*\f@placechar{\@firstoftwo}%
 }
 %    \end{macrocode}
 % 
 %    \begin{macrocode}
 \newcommand{\decimals}{%
-  \renewcommand*\f@tpsg{%
-    \setbox0=\hbox{\char\f@tn\,\rlap{\tiny \the\f@tn}}%
-    \ifdim\ht0>7.5pt\f@treposition
-    \else\ifdim\dp0>2.5pt\f@treposition\fi\fi
-    \box0\global\advance\f@tn 1 %
-  }%
+  \renewcommand*\f@placechar{\f@placedecimal}%
 }
+\newcommand*\f@placechar{}
 \decimals
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
-% \end{macro}
 %
 % \begin{macro}{\f@treposition}
 % \cs{f@treposition}
diff --git a/Master/texmf-dist/tex/latex/fonttable/fonttable.sty b/Master/texmf-dist/tex/latex/fonttable/fonttable.sty
index 70a613e0017..e1e5cd8a85b 100644
--- a/Master/texmf-dist/tex/latex/fonttable/fonttable.sty
+++ b/Master/texmf-dist/tex/latex/fonttable/fonttable.sty
@@ -21,7 +21,7 @@
 %%   This work consists of the files listed in the README file.
 %% ------------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fonttable}[2009/09/22 v1.5d displays a font]
+\ProvidesPackage{fonttable}[2009/10/15 v1.6 displays a font]
 
 \providecommand*{\sevenrm}{\fontsize{7}{9pt}\rmfamily}
 \newcount\f@tm \newcount\f@tn \newcount\f@tp \newdimen\f@tdim
@@ -165,23 +165,26 @@
   &\f@thex C&&\f@thex D&&\f@thex E&&\f@thex F&\cr
   \egroup$$\par}
 
-\newcommand*\f@tpsg{}
+\newcommand*{\f@tpsg}{%
+  \setbox\z@=\hbox{\f@placechar{\char\f@tn}{\the\f@tn}}%
+  \ifdim\ht\z@>7.5pt\relax
+    \f@treposition
+  \else
+    \ifdim\dp\z@>2.5pt\relax
+      \f@treposition
+    \fi
+  \fi
+  \box\z@
+  \global\advance\f@tn\@ne
+}
+\newcommand*\f@placedecimal[2]{#1\ {\tiny #2}}
 \newcommand*{\nodecimals}{%
-  \renewcommand*\f@tpsg{%
-    \setbox0=\hbox{\char\f@tn}%
-    \ifdim\ht0>7.5pt\f@treposition
-    \else\ifdim\dp0>2.5pt\f@treposition\fi\fi
-    \box0\global\advance\f@tn 1 %
-  }%
+  \renewcommand*\f@placechar{\@firstoftwo}%
 }
 \newcommand{\decimals}{%
-  \renewcommand*\f@tpsg{%
-    \setbox0=\hbox{\char\f@tn\,\rlap{\tiny \the\f@tn}}%
-    \ifdim\ht0>7.5pt\f@treposition
-    \else\ifdim\dp0>2.5pt\f@treposition\fi\fi
-    \box0\global\advance\f@tn 1 %
-  }%
+  \renewcommand*\f@placechar{\f@placedecimal}%
 }
+\newcommand*\f@placechar{}
 \decimals
 \newcommand*{\f@treposition}{\setbox0=\vbox{\kern2pt\box0}\f@tdim=\dp0
   \advance\f@tdim 2pt \dp0=\f@tdim}