fonttable update (20sep09)

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

4 files changed, 58 insertions, 63 deletions

diff --git a/Master/texmf-dist/doc/latex/fonttable/README b/Master/texmf-dist/doc/latex/fonttable/README
index b8ea1dcd06c..e5c8d0f647c 100644
--- a/Master/texmf-dist/doc/latex/fonttable/README
+++ b/Master/texmf-dist/doc/latex/fonttable/README
@@ -11,42 +11,29 @@ testfont.tex.
 ______________
 Change History
 
-Version 1.5b (2009/09/02)
-- New maintainer (Will Robertson)
-
-Changes in version 1.51 (2009/05/14)
+1.5c (2009/09/20) - Bug fix with \nodecimals
+1.5b (2009/09/02) - New maintainer (Will Robertson)
+1.51 (2009/05/14)
 - Eliminated a clash with the babel package.
 - Described how to avoid a clash with the mftinc package.
 
-Changes in version 1.5 (2009/05/12)
-- Added code providing a packaged version of Donald Knuth's testfont.tex,
-  principally as an aid for font designers in testing their font.
-
-Changes in version 1.4 (2009/05/06)
-- Added a second method for specifying a font.
-
-Changes in version 1.3c (2009/04/30)
-- Fixed a major bug relating to redefining \:
-
-Changes in version 1.2 (2008/05/08)
-- Minor extensions providing more text examples
-
-Changes in version 1.1 (2006/10/02)
-- Minor extensions providing more text examples
+1.5  (2009/05/12) 
+- Added code providing a packaged version of Donald Knuth's
+  testfont.tex, principally as an aid for font designers in
+  testing their font.
 
-Changes in version 1.1 (2006/10/02)
-- Minor extensions providing more text examples
-
-Changes in version 1.0a (2005/12/06)
-- Fixed bug preventing multiple unnumbered tables
-
-Changes in version 1.0 (2005/11/27)
-- First public release
+1.4  (2009/05/06) - Added a second method for specifying a font.
+1.3c (2009/04/30) - Fixed a major bug relating to redefining \:
+1.2  (2008/05/08) - Minor extensions providing more text examples
+1.1  (2006/10/02) - Minor extensions providing more text examples
+1.0a (2005/12/06) - Fixed bug preventing multiple unnumbered tables
+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
+  Copyright 2009 Will Robertson
 
   This work may be distributed and/or modified under the
   conditions of the Latex Project Public License, either
@@ -61,30 +48,26 @@ Changes in version 1.0 (2005/11/27)
     fonttable.dtx
     fonttable.ins
     fonttable.pdf
-  and the derived files
+  and the derived file
     fonttable.sty
 
 ------------------------------------------------------------------
-     The distribution consists of the following files:
-README (this file)
-fonttable.dtx
-fonttable.ins
-fonttable.pdf
+The distribution consists of the following files:
 
+- README (this file)
+- fonttable.dtx
+- fonttable.ins
+- fonttable.pdf
 
-    To install the package:
-- run: latex fonttable.ins (which will generate fonttable.sty)
-- Move fonttable.sty to a location where LaTeX will find it,
-  for example /usr/TeX/texmf-local/tex/latex/fonttable/fonttable.sty
-  (for more information on installation see the FAQ).
 
-    To generate a second copy of the manual (which is already supplied as a PDF file):
-- run: latex fonttable.dtx
-- (for an index run: makeindex -s gind.ist fonttable.idx)
-- run: latex fonttable.dtx
-- Print *.dvi for a hardcopy of the package manual
+To install the package:
+
+- run: latex fonttable.ins (which will generate fonttable.sty)
+- Move fonttable.sty to a location where LaTeX will find it, for example:
+    /usr/local/texlive/texmf-local/tex/latex/fonttable/fonttable.sty
 
-2009/05/14
-Peter Wilson
+To manually generate the manual, run:
 
- 
+    pdflatex fonttable.dtx
+    makeindex -s gind.ist fonttable.idx
+    pdflatex fonttable.dtx
diff --git a/Master/texmf-dist/doc/latex/fonttable/fonttable.pdf b/Master/texmf-dist/doc/latex/fonttable/fonttable.pdf
index 02a77d2bbe2..087f05eebcf 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 50aaacff195..0fbc13f72b5 100644
--- a/Master/texmf-dist/source/latex/fonttable/fonttable.dtx
+++ b/Master/texmf-dist/source/latex/fonttable/fonttable.dtx
@@ -24,7 +24,8 @@
             plainpages=false,
             pdfpagelabels,
             bookmarksnumbered,
-            hyperindex=false
+            hyperindex=false,
+            colorlinks,linktocpage
            ]{hyperref}
 \providecommand{\phantomsection}{}
 %%\OnlyDescription %% comment this out for the full glory
@@ -115,6 +116,7 @@
 % \def\fileversion{v1.5} \def\filedate{2009/05/12}
 % \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}
 % \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
@@ -432,7 +434,7 @@
 %    \begin{macrocode}
 %<*pack>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fonttable}[2009/09/02 v1.5b displays a font]
+\ProvidesPackage{fonttable}[2009/09/20 v1.5c displays a font]
 
 %    \end{macrocode}
 %
@@ -794,21 +796,28 @@
 % 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)}
 %    \begin{macrocode}
 \newcommand*{\nodecimals}{%
-%%% the original
-  \newcommand*{\f@tpsg}{\setbox0=\hbox{\char\f@tn}%
+  \newcommand*{\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 }}
+    \box0\global\advance\f@tn 1 %
+  }%
+}
+%    \end{macrocode}
+% 
+%    \begin{macrocode}
 \newcommand{\decimals}{%
-%%% mine
-  \newcommand*{\f@tpsg}{\setbox0=\hbox{\char\f@tn\,\rlap{\tiny \the\f@tn}}%
+  \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 }}
+    \box0\global\advance\f@tn 1 %
+  }%
+}
 \decimals
-
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/Master/texmf-dist/tex/latex/fonttable/fonttable.sty b/Master/texmf-dist/tex/latex/fonttable/fonttable.sty
index dfddf9677de..6dbaf0f3b98 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/02 v1.5b displays a font]
+\ProvidesPackage{fonttable}[2009/09/20 v1.5c displays a font]
 
 \providecommand*{\sevenrm}{\fontsize{7}{9pt}\rmfamily}
 \newcount\f@tm \newcount\f@tn \newcount\f@tp \newdimen\f@tdim
@@ -166,19 +166,22 @@
   \egroup$$\par}
 
 \newcommand*{\nodecimals}{%
-%%% the original
-  \newcommand*{\f@tpsg}{\setbox0=\hbox{\char\f@tn}%
+  \newcommand*{\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 }}
+    \box0\global\advance\f@tn 1 %
+  }%
+}
 \newcommand{\decimals}{%
-%%% mine
-  \newcommand*{\f@tpsg}{\setbox0=\hbox{\char\f@tn\,\rlap{\tiny \the\f@tn}}%
+  \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 }}
+    \box0\global\advance\f@tn 1 %
+  }%
+}
 \decimals
-
 \newcommand*{\f@treposition}{\setbox0=\vbox{\kern2pt\box0}\f@tdim=\dp0
   \advance\f@tdim 2pt \dp0=\f@tdim}