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

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

1 files changed, 17 insertions, 14 deletions

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}