fonttable update (22sep09)

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

4 files changed, 23 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/latex/fonttable/README b/Master/texmf-dist/doc/latex/fonttable/README
index e5c8d0f647c..52913106b47 100644
--- a/Master/texmf-dist/doc/latex/fonttable/README
+++ b/Master/texmf-dist/doc/latex/fonttable/README
@@ -1,16 +1,17 @@
 _____________________
 The FONTTABLE package
 
-    The fonttable package enables you to print a table of the characters
+The fonttable package enables you to print a table of the characters
 in a font (a font table), and/or some example text, and/or individual
 glyphs in a variety of settings.
 
-    This, in a package form, is a poor man's version of nfssfont.tex and
+This, in a package form, is a poor man's version of nfssfont.tex and
 testfont.tex.
 
 ______________
 Change History
 
+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)
 1.51 (2009/05/14)
@@ -44,12 +45,12 @@ Change History
   The Current Maintainer of this work is Will Robertson.
 
   This work consists of the files:
-    README (this file)
-    fonttable.dtx
-    fonttable.ins
-    fonttable.pdf
+   - README (this file)
+   - fonttable.dtx
+   - fonttable.ins
+   - fonttable.pdf
   and the derived file
-    fonttable.sty
+   - fonttable.sty
 
 ------------------------------------------------------------------
 The distribution consists of the following files:
@@ -62,12 +63,13 @@ The distribution consists of the following files:
 
 To install the package:
 
-- run: latex fonttable.ins (which will generate fonttable.sty)
+- To generate fonttable.sty run: 
+    tex fonttable.ins
 - Move fonttable.sty to a location where LaTeX will find it, for example:
-    /usr/local/texlive/texmf-local/tex/latex/fonttable/fonttable.sty
+    /usr/local/texlive/texmf-local/tex/latex/fonttable.sty
 
 To manually generate the manual, run:
 
     pdflatex fonttable.dtx
-    makeindex -s gind.ist fonttable.idx
+    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 087f05eebcf..13b8552f479 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 0fbc13f72b5..097a415bfa3 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{913}
+% \CheckSum{915}
 %
 % \DoNotIndex{\',\.,\@M,\@@input,\@addtoreset,\@arabic,\@badmath}
 % \DoNotIndex{\@centercr,\@cite}
@@ -117,6 +117,7 @@
 % \def\fileversion{v1.51} \def\filedate{2009/05/14}
 % \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}
 % \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
@@ -434,7 +435,7 @@
 %    \begin{macrocode}
 %<*pack>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fonttable}[2009/09/20 v1.5c displays a font]
+\ProvidesPackage{fonttable}[2009/09/22 v1.5d displays a font]
 
 %    \end{macrocode}
 %
@@ -797,9 +798,11 @@
 % 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{macrocode}
+\newcommand*\f@tpsg{}
 \newcommand*{\nodecimals}{%
-  \newcommand*{\f@tpsg}{%
+  \renewcommand*\f@tpsg{%
     \setbox0=\hbox{\char\f@tn}%
     \ifdim\ht0>7.5pt\f@treposition
     \else\ifdim\dp0>2.5pt\f@treposition\fi\fi
@@ -810,7 +813,7 @@
 % 
 %    \begin{macrocode}
 \newcommand{\decimals}{%
-  \renewcommand*{\f@tpsg}{%
+  \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
diff --git a/Master/texmf-dist/tex/latex/fonttable/fonttable.sty b/Master/texmf-dist/tex/latex/fonttable/fonttable.sty
index 6dbaf0f3b98..70a613e0017 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/20 v1.5c displays a font]
+\ProvidesPackage{fonttable}[2009/09/22 v1.5d displays a font]
 
 \providecommand*{\sevenrm}{\fontsize{7}{9pt}\rmfamily}
 \newcount\f@tm \newcount\f@tn \newcount\f@tp \newdimen\f@tdim
@@ -165,8 +165,9 @@
   &\f@thex C&&\f@thex D&&\f@thex E&&\f@thex F&\cr
   \egroup$$\par}
 
+\newcommand*\f@tpsg{}
 \newcommand*{\nodecimals}{%
-  \newcommand*{\f@tpsg}{%
+  \renewcommand*\f@tpsg{%
     \setbox0=\hbox{\char\f@tn}%
     \ifdim\ht0>7.5pt\f@treposition
     \else\ifdim\dp0>2.5pt\f@treposition\fi\fi
@@ -174,7 +175,7 @@
   }%
 }
 \newcommand{\decimals}{%
-  \renewcommand*{\f@tpsg}{%
+  \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