3 files changed, 18 insertions, 13 deletions
diff --git a/Master/texmf-dist/doc/xetex/xetexfontinfo/README b/Master/texmf-dist/doc/xetex/xetexfontinfo/README
index fadc827f4ec..7a46e0d2377 100644
--- a/Master/texmf-dist/doc/xetex/xetexfontinfo/README
+++ b/Master/texmf-dist/doc/xetex/xetexfontinfo/README
@@ -1,12 +1,12 @@
 __________________________
- OpenType-info & AAT-info 
+ opentype-info & aat-info 
      By Jonathan Kew
 
 These documents are used to reveal the various
 font features supported by fonts useable in XeTeX.
 
-Use OpenType-info.tex for OpenType fonts and
-AAT-info.tex for AAT fonts (Mac OS X only).
+Use 'opentype-info.tex' with OpenType fonts and
+'aat-info.tex' with AAT fonts (Mac OS X only).
 
 Input the font name and compile them with plain 
 `xetex`; the output will be a listing of the
diff --git a/Master/texmf-dist/tex/xetex/xetexfontinfo/AAT-info.tex b/Master/texmf-dist/tex/xetex/xetexfontinfo/aat-info.tex
index e0ae839348e..f6985509d3f 100644
--- a/Master/texmf-dist/tex/xetex/xetexfontinfo/AAT-info.tex
+++ b/Master/texmf-dist/tex/xetex/xetexfontinfo/aat-info.tex
@@ -1,12 +1,12 @@
-%%% AAT-info.tex %%%
+%%% aat-info.tex %%%
 % By Jonathan Kew
 %
 % Prints XeTeX font features for a font
 % using the "AAT" renderer of XeTeX;
 % requires Mac OS X.
 %
-% See OpenType-info.tex for the equivalent
-% functionality for OpenType fonts.
+% See 'opentype-info.tex' for the equivalent
+% functionality with OpenType fonts.
 %
 % Usage:
 %   Type the name of the font below and compile this 
@@ -24,7 +24,7 @@
 %%% AAT-info.tex %%%
 
 
-\font\testfont="\myfontname" at 10pt
+\font\testfont="\myfontname/AAT" at 10pt
 \nopagenumbers
 
 \baselineskip=14pt
diff --git a/Master/texmf-dist/tex/xetex/xetexfontinfo/OpenType-info.tex b/Master/texmf-dist/tex/xetex/xetexfontinfo/opentype-info.tex
index 8aea6e4d992..c91b54f7a48 100644
--- a/Master/texmf-dist/tex/xetex/xetexfontinfo/OpenType-info.tex
+++ b/Master/texmf-dist/tex/xetex/xetexfontinfo/opentype-info.tex
@@ -1,8 +1,11 @@
-%%% OpenType-info.tex %%%
+%%% opentype-info.tex %%%
 % By Jonathan Kew
 %
-% Prints XeTeX font features for an
-% OpenType font using the "ICU" renderer of XeTeX.
+% Prints XeTeX font features for an OpenType 
+% font using the "ICU" renderer of XeTeX.
+%
+% See 'aat-info.tex' for the equivalent
+% functionality with AAT fonts (Mac OS X only).
 %
 % Usage:
 %   Type the name of the font below and compile this 
@@ -10,7 +13,7 @@
 %   of the OpenType font features, languages & scripts
 %   supported by the chosen font.
 %
-% OpenType-info is distributed under the Apache License v2: 
+% opentype-info is distributed under the Apache License v2: 
 %   <http://www.apache.org/licenses/LICENSE-2.0.html>
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20,9 +23,11 @@
 %
 %%% OpenType-info.tex %%%
 
+\font\testfont="\myfontname/ICU" at 12pt
+
+\nopagenumbers 
+\rightskip=0pt plus 1fil
 
-\nopagenumbers \rightskip=0pt plus 1fil
-\font\testfont="\myfontname" at 12pt
 \font\title=ec-lmssbx10 at 14pt
 \font\tenrm=ec-lmss10 at 10pt \tenrm
 \font\tentt=ec-lmtt10 at 10pt