4 files changed, 16 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/latex/fonttable/README b/Master/texmf-dist/doc/latex/fonttable/README
index 8adbe85f393..0d79019aa50 100644
--- a/Master/texmf-dist/doc/latex/fonttable/README
+++ b/Master/texmf-dist/doc/latex/fonttable/README
@@ -11,6 +11,7 @@ testfont.tex.
 ------------------------------------------------------------------
 Change History
 
+1.6c (2017/06/06) - Fix bug with fonts with `at' in their name
 1.6b (2011/02/13) - Fix bug with Spanish babel
 1.6  (2009/10/15)
 - New spacing behaviour of the decimal numbers, courtesy Peter Wilson
@@ -39,7 +40,7 @@ Change History
   Author: Peter Wilson (Herries Press)
   Maintainer: Will Robertson (will dot robertson at latex-project dot org)
   Copyright 2005--2009 Peter R. Wilson
-  Copyright 2009--2011 Will Robertson
+  Copyright 2009--2011, 2017 Will Robertson
 
   This work may be distributed and/or modified under the
   conditions of the Latex Project Public License, either
diff --git a/Master/texmf-dist/doc/latex/fonttable/fonttable.pdf b/Master/texmf-dist/doc/latex/fonttable/fonttable.pdf
index c6a07cdfd2e..2ff3f16b401 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 735668fe291..6759aa87810 100644
--- a/Master/texmf-dist/source/latex/fonttable/fonttable.dtx
+++ b/Master/texmf-dist/source/latex/fonttable/fonttable.dtx
@@ -23,7 +23,7 @@
 \ProvidesFile{fonttable.dtx}
 %</driver>
 %<*driver|pack>
-  [2011/02/13 v1.6b displays a font]
+  [2017/06/06 v1.6c displays a font]
 %</driver|pack>
 %
 %<*driver>
@@ -117,6 +117,7 @@
 % \changes{v1.5b}{2009/09/02}{New maintainer (Will Robertson)}
 % \changes{v1.6}{2009/10/15}{New spacing of the decimals from Peter Wilson}
 % \changes{v1.6b}{2011/02/13}{Fix bug with Spanish babel}
+% \changes{v1.6c}{2017/06/06}{Fix bug with fonts with `at' in their name}
 %
 % \newcommand*{\Lpack}[1]{\textsf {#1}}           ^^A typeset a package
 % \newcommand*{\Lopt}[1]{\textsf {#1}}            ^^A typeset an option
@@ -290,7 +291,7 @@
 % \DescribeMacro{\fonttexts}
 % \DescribeMacro{\regulartexts}
 % The macro \cs{fonttexts}\marg{testfont}\marg{text} typesets \meta{text} using
-% the \meta{testfont} (e.g \texttt{cmr10}). Similarly the macro
+% the \meta{testfont} (e.g., \texttt{cmr10}). Similarly the macro
 % \cs{regulartexts}\marg{fontspec}\marg{text} typesets \meta{text}
 % using \meta{fontspec} (e.g., \verb?\rmfamily\itshape? or 
 % \verb?\pikfont{T1}{ppl}{m}{it}?).
@@ -380,7 +381,7 @@
 % \DescribeMacro{\glyphlowers}
 % \DescribeMacro{\glyphdigits}
 % \cs{glyphlowers} takes each character of the lowercase alphabet in turn as
-% a test glyph and sets it interpersed among the other lowercase characters.
+% a test glyph and sets it interspersed among the other lowercase characters.
 % \cs{glyphuppers} and \cs{glyphdigits} are similar except that they use
 % the uppercase alphabet and the ten digits instead. For example, 
 % \cs{glyphdigits} produces output like \\
@@ -505,7 +506,7 @@
 % This wasn't necessary before because we didn't explicitly choose the font
 % size; it was inferred automatically.
 %    \begin{macrocode}
-    \edef\@tempa{\string a\string t}%
+    \edef\@tempa{ \string a\string t}%
     \edef\@tempb{\noexpand\in@{\@tempa}{\f@tfontname}}%
     \@tempb
     \ifin@
@@ -528,7 +529,7 @@
 %    \begin{macrocode}
 \edef\@tempa{%
   \def\noexpand\f@tstripsize
-    ##1\string a\string t##2\string p\string t{##1}%
+    ##1 \string a\string t##2\string p\string t{##1}%
 }
 \@tempa
 %    \end{macrocode}
@@ -956,7 +957,7 @@ official r\^ole in fluffy souffl\'es? }
 %
 % \begin{macro}{\@capknutext}
 % \begin{macro}{\capknutext}
-% Text using only capital letters and some punctutation.
+% Text using only capital letters and some punctuation.
 %    \begin{macrocode}
 \newcommand{\@capknutext}{%
 (!`THE DAZED BROWN FOX QUICKLY GAVE 12345--67890 JUMPS!)}
@@ -982,7 +983,7 @@ official r\^ole in fluffy souffl\'es? }
 % \begin{macro}{\guillemotright}
 % \begin{macro}{\flqq}
 % \begin{macro}{\frqq}
-% Just in case the french quotes are not defined, as they are called for in
+% Just in case the French quotes are not defined, as they are called for in
 % the subsequent \cs{germantext}.
 % \changes{v1.2}{2008/05/08}{Replaced \cs{providecommand} for guillemots
 %                           by \cs{DeclareTextSymbol}}
@@ -1035,7 +1036,7 @@ falsche Anmutung vermitteln.\par}
 % because of a clash with the babel package}
 %    \begin{macrocode}
 \providecommand*{\latintext}{%
-  \PackageWarning{fonttable}{\protect\latintext\space may be overriden by the 
+  \PackageWarning{fonttable}{\protect\latintext\space may be overridden by the 
    babel package \MessageBreak use
                  \protect\latinparatext\space instead}}
 \newcommand*{\latinparatext}{%
@@ -1247,7 +1248,7 @@ turpis accumsan semper.\par}
 % \begin{macro}{\f@tdgs}
 % \begin{macro}{\f@tdocomprehensive}
 % These macros generate an extended mix of characters of a particular kind.
-% The work is done by \cs{f@tdocomprensive} wih \cs{f@tclc}, \cs{f@tcuc}, and
+% The work is done by \cs{f@tdocomprensive} with \cs{f@tclc}, \cs{f@tcuc}, and
 % \cs{f@tdgs} setting up the glyph sets.
 %    \begin{macrocode}
 \newcommand*{\glyphlowers}{\f@tdocomprehensive\f@tclc{`a}{`z}{31}{34}}
diff --git a/Master/texmf-dist/tex/latex/fonttable/fonttable.sty b/Master/texmf-dist/tex/latex/fonttable/fonttable.sty
index 6c2ede06a20..9d858d9d097 100644
--- a/Master/texmf-dist/tex/latex/fonttable/fonttable.sty
+++ b/Master/texmf-dist/tex/latex/fonttable/fonttable.sty
@@ -22,7 +22,7 @@
 %% ------------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fonttable}
-  [2011/02/13 v1.6b displays a font]
+  [2017/06/06 v1.6c displays a font]
 \providecommand*{\sevenrm}{\fontsize{7}{9pt}\rmfamily}
 \newcount\f@tm \newcount\f@tn \newcount\f@tp \newdimen\f@tdim
 
@@ -40,7 +40,7 @@
   \begingroup
     \pikfont{#1}{#2}{#3}{#4}%
     \edef\f@tfontname{\fontname\font}%
-    \edef\@tempa{\string a\string t}%
+    \edef\@tempa{ \string a\string t}%
     \edef\@tempb{\noexpand\in@{\@tempa}{\f@tfontname}}%
     \@tempb
     \ifin@
@@ -53,7 +53,7 @@
 }
 \edef\@tempa{%
   \def\noexpand\f@tstripsize
-    ##1\string a\string t##2\string p\string t{##1}%
+    ##1 \string a\string t##2\string p\string t{##1}%
 }
 \@tempa
 \newcommand*{\f@tstartfont}{%
@@ -282,7 +282,7 @@ nicht dem eigentlichen Zweck, da sie eine
 falsche Anmutung vermitteln.\par}
 
 \providecommand*{\latintext}{%
-  \PackageWarning{fonttable}{\protect\latintext\space may be overriden by the
+  \PackageWarning{fonttable}{\protect\latintext\space may be overridden by the
    babel package \MessageBreak use
                  \protect\latinparatext\space instead}}
 \newcommand*{\latinparatext}{%