fontspec 2.2a (18sep11)

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

9 files changed, 70 insertions, 38 deletions

diff --git a/Master/texmf-dist/doc/latex/fontspec/README b/Master/texmf-dist/doc/latex/fontspec/README
index 64e9c40beb1..845fa587837 100644
--- a/Master/texmf-dist/doc/latex/fontspec/README
+++ b/Master/texmf-dist/doc/latex/fontspec/README
@@ -71,7 +71,12 @@ Features may be added to the font currently in use with
 Change history
 --------------
 
-- v2.2 (2011/09/13)
+- v2.2a (2011/09/14)
+
+    * Bug fix: improve backwards compatibility for packages that use old
+      fontspec internals such as mathspec.
+
+- v2.2  (2011/09/13)
 
     * Support alternate selections in CharacterVariant (cvxx in OpenType)
       using new syntax `[CharacterVariant=5:2]`.
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf
index 4f84fa2aab6..1c538b0b038 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
index 2e2bf44b92e..d2e13c841a6 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
index 759f5f291f9..7500e8988d6 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
@@ -66,7 +66,7 @@ This work consists of this file fontspec.dtx
 %<fontspec&luatex>\ProvidesPackage{fontspec-luatex}
 %<patches>\ProvidesPackage{fontspec-patches}
 %<*fontspec|patches>
-  [2011/09/13 v2.2 Advanced font selection for XeLaTeX/LuaLaTeX]
+  [2011/09/18 v2.2a Advanced font selection for XeLaTeX/LuaLaTeX]
 %</fontspec|patches>
 %
 %<*driver>
@@ -1237,13 +1237,15 @@ This work consists of this file fontspec.dtx
 %
 % The \opt{Arabic} option (with tag \verb|anum|) maps regular numerals to their Arabic script or Persian equivalents
 % based on the current \opt{Language} setting (see \vref{sec:ot}), shown in
-% \exref{num-arab} using the Zar fonts\note{\url{http://wiki.irmug.org/index.php/X_Series_2}}.
+% \exref{num-arab} using the Persian Modern font, which is included in \TeX\ Live
+% and MiK\TeX.
 % This option is based on a \LuaTeX\ feature of the \pkg{luaotfload} package,
 % not an OpenType feature. (Thus, this feature is unavailable in \XeTeX.)
 %
 % \begin{Lexample}[firstline=2]{num-arab}{An example of number remapping to Arabic or Persian. (\LuaTeX\ only.)}
 %   \huge
-%   \fontspec[Script=Arabic,Numbers=Arabic]{XB Zar}
+%   \fontspec[Script=Arabic,Numbers=Arabic]
+%     {persian-modern-regular.ttf}
 %   {\addfontfeature{Language=Arabic}
 %    0123456789} \\
 %   {\addfontfeature{Language=Parsi}
@@ -2466,22 +2468,24 @@ This work consists of this file fontspec.dtx
 % \end{macro}
 %
 % \begin{macro}{\fontspec_set_family:Nnn}
-% \darg{family}
+% \darg{\LaTeX\ family}
 % \darg{fontspec features}
 % \darg{font name}
-% Defines a new font family from given \meta{features} and \meta{font},
-% and stores the name in the variable \meta{family}.
+% Defines a new NFSS family from given \meta{features} and \meta{font},
+% and stores the family name in the variable \meta{family}.
+% This font family can then be selected with standard \LaTeX\ commands
+% \cs{fontfamily}\marg{family}\cs{selectfont}.
 % See the standard \pkg{fontspec} user commands for applications of this
 % function.
 % \end{macro}
 %
 % \begin{macro}{\fontspec_set_fontface:NNnn}
 % \darg{primitive font}
-% \darg{family}
+% \darg{\LaTeX\ family}
 % \darg{fontspec features}
 % \darg{font name}
 % Variant of the above in which the primitive \TeX\ font command is stored in
-% meta{primitive font}.
+% the variable \meta{primitive font}.
 % If a family is loaded (with bold and italic shapes) the primitive font
 % command will only select the regular face.
 % This feature is designed for \LaTeX\ programmers who need to
@@ -2991,6 +2995,10 @@ This work consists of this file fontspec.dtx
 % document. \cmd\setboldmathrm\ is used for specifying which
 % fonts should be used in \cmd\boldmath.
 %    \begin{macrocode}
+\tl_new:N \g_fontspec_mathrm_tl
+\tl_new:N \g_fontspec_bfmathrm_tl
+\tl_new:N \g_fontspec_mathsf_tl
+\tl_new:N \g_fontspec_mathtt_tl
 \DeclareDocumentCommand \setmathrm { O{} m } {
   \fontspec_set_family:Nnn \g_fontspec_mathrm_tl {#1}{#2}
 }
@@ -3011,10 +3019,9 @@ This work consists of this file fontspec.dtx
 % If the commands above are not executed, then \cmd\rmdefault\ (\etc)
 % will be used.
 %    \begin{macrocode}
-\def\g_fontspec_mathrm_tl{\rmdefault}
-\def\g_fontspec_mathsf_tl{\sfdefault}
-\def\g_fontspec_mathtt_tl{\ttdefault}
-\tl_clear:N \g_fontspec_bfmathrm_tl
+\tl_set:Nn \g_fontspec_mathrm_tl {\rmdefault}
+\tl_set:Nn \g_fontspec_mathsf_tl {\sfdefault}
+\tl_set:Nn \g_fontspec_mathtt_tl {\ttdefault}
 %    \end{macrocode}
 % \end{macro} \end{macro} \end{macro}
 % \end{macro}
@@ -3063,10 +3070,10 @@ This work consists of this file fontspec.dtx
 %   concatenated with the individual macro choices in the
 %   [...] macro.
 %    \begin{macrocode}
+\tl_new:N \g_fontspec_default_fontopts_tl
 \DeclareDocumentCommand \defaultfontfeatures {m} {
   \tl_set:Nn \g_fontspec_default_fontopts_tl {#1,}
 }
-\tl_clear:N \g_fontspec_default_fontopts_tl
 %    \end{macrocode}
 % \end{macro}
 %
@@ -6265,12 +6272,16 @@ This work consists of this file fontspec.dtx
 % \begin{macro}{\zf@family}
 % \begin{macro}{\zf@basefont}
 % \begin{macro}{\zf@fontspec}
-% Just in case.
+% Old interfaces.
+% These are needed by, at least, the \pkg{mathspec} package.
 %    \begin{macrocode}
 \tl_set:Nn \zf@enc { \g_fontspec_encoding_tl }
-\tl_set:Nn \zf@family { \l_fontspec_family_tl }
-\tl_set:Nn \zf@basefont { \l_fontspec_font }
-\cs_set_eq:NN \zf@fontspec \fontspec_select:nn
+\cs_set:Npn \zf@fontspec #1 #2
+  {
+    \fontspec_select:nn {#1} {#2}
+    \tl_set:Nn \zf@family { \l_fontspec_family_tl }
+    \tl_set:Nn \zf@basefont { \l_fontspec_font }
+  }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/fontspec/testsuite/testsuite-listing.tex b/Master/texmf-dist/source/latex/fontspec/testsuite/testsuite-listing.tex
index 25644b041dc..7a888653eaa 100644
--- a/Master/texmf-dist/source/latex/fontspec/testsuite/testsuite-listing.tex
+++ b/Master/texmf-dist/source/latex/fontspec/testsuite/testsuite-listing.tex
@@ -1,3 +1,5 @@
+\TEST{F-alias-feature-option}
+\TEST{F-alias-feature}
 \TEST{F-autoscaling}
 \TEST{F-charactervariant}
 \TEST{F-colour-basic}
@@ -12,6 +14,7 @@
 \TEST{F-loading-nested-scfeat}
 \TEST{F-loading-scale}
 \TEST{F-loading-sizefeatures}
+\TEST{F-optical-sizes}
 \TEST{F-ot-cvxx-2}
 \TEST{F-ot-cvxx}
 \TEST{F-ot-ss06}
@@ -22,3 +25,4 @@
 \TEST{F-verb-plain}
 \TEST{F-verb-verbatim}
 \TEST{F-wordspace}
+\TEST{X-new-font-feature}
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
index 02a6ab12561..bac3bf4cd66 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
@@ -14,7 +14,7 @@
 %% 
 %% 
 \ProvidesPackage{fontspec-luatex}
-  [2011/09/13 v2.2 Advanced font selection for XeLaTeX/LuaLaTeX]
+  [2011/09/18 v2.2a Advanced font selection for XeLaTeX/LuaLaTeX]
 
 
 \ExplSyntaxOn
@@ -53,6 +53,10 @@
   \normalfont
 }
 \cs_set_eq:NN \setromanfont \setmainfont
+\tl_new:N \g_fontspec_mathrm_tl
+\tl_new:N \g_fontspec_bfmathrm_tl
+\tl_new:N \g_fontspec_mathsf_tl
+\tl_new:N \g_fontspec_mathtt_tl
 \DeclareDocumentCommand \setmathrm { O{} m } {
   \fontspec_set_family:Nnn \g_fontspec_mathrm_tl {#1}{#2}
 }
@@ -69,10 +73,9 @@
 \@onlypreamble\setboldmathrm
 \@onlypreamble\setmathsf
 \@onlypreamble\setmathtt
-\def\g_fontspec_mathrm_tl{\rmdefault}
-\def\g_fontspec_mathsf_tl{\sfdefault}
-\def\g_fontspec_mathtt_tl{\ttdefault}
-\tl_clear:N \g_fontspec_bfmathrm_tl
+\tl_set:Nn \g_fontspec_mathrm_tl {\rmdefault}
+\tl_set:Nn \g_fontspec_mathsf_tl {\sfdefault}
+\tl_set:Nn \g_fontspec_mathtt_tl {\ttdefault}
 \DeclareDocumentCommand \newfontfamily { m O{} m } {
   \fontspec_select:nn{#2}{#3}
   \use:x {
@@ -85,10 +88,10 @@
 \DeclareDocumentCommand \newfontface { m O{} m } {
   \newfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2 ] {#3}
 }
+\tl_new:N \g_fontspec_default_fontopts_tl
 \DeclareDocumentCommand \defaultfontfeatures {m} {
   \tl_set:Nn \g_fontspec_default_fontopts_tl {#1,}
 }
-\tl_clear:N \g_fontspec_default_fontopts_tl
 \DeclareDocumentCommand \addfontfeatures {m} {
   \ifcsname zf@family@fontdef\f@family\endcsname
     \group_begin:
@@ -1946,9 +1949,12 @@
     {\typeout{No~ fontspec.cfg~ file~ found;~ no~ configuration~ loaded.}}
 }
 \tl_set:Nn \zf@enc { \g_fontspec_encoding_tl }
-\tl_set:Nn \zf@family { \l_fontspec_family_tl }
-\tl_set:Nn \zf@basefont { \l_fontspec_font }
-\cs_set_eq:NN \zf@fontspec \fontspec_select:nn
+\cs_set:Npn \zf@fontspec #1 #2
+  {
+    \fontspec_select:nn {#1} {#2}
+    \tl_set:Nn \zf@family { \l_fontspec_family_tl }
+    \tl_set:Nn \zf@basefont { \l_fontspec_font }
+  }
 \ExplSyntaxOff
 %% 
 %% Copyright 2004--2011 Will Robertson <wspr81@gmail.com>
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty
index 72b3dfc6bd4..8f9ba41e426 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty
@@ -14,7 +14,7 @@
 %% 
 %% 
 \ProvidesPackage{fontspec-patches}
-  [2011/09/13 v2.2 Advanced font selection for XeLaTeX/LuaLaTeX]
+  [2011/09/18 v2.2a Advanced font selection for XeLaTeX/LuaLaTeX]
 
 
 \ExplSyntaxOn
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
index 4fab045b766..b0fad28a8a8 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
@@ -14,7 +14,7 @@
 %% 
 %% 
 \ProvidesPackage{fontspec-xetex}
-  [2011/09/13 v2.2 Advanced font selection for XeLaTeX/LuaLaTeX]
+  [2011/09/18 v2.2a Advanced font selection for XeLaTeX/LuaLaTeX]
 
 
 \ExplSyntaxOn
@@ -50,6 +50,10 @@
   \normalfont
 }
 \cs_set_eq:NN \setromanfont \setmainfont
+\tl_new:N \g_fontspec_mathrm_tl
+\tl_new:N \g_fontspec_bfmathrm_tl
+\tl_new:N \g_fontspec_mathsf_tl
+\tl_new:N \g_fontspec_mathtt_tl
 \DeclareDocumentCommand \setmathrm { O{} m } {
   \fontspec_set_family:Nnn \g_fontspec_mathrm_tl {#1}{#2}
 }
@@ -66,10 +70,9 @@
 \@onlypreamble\setboldmathrm
 \@onlypreamble\setmathsf
 \@onlypreamble\setmathtt
-\def\g_fontspec_mathrm_tl{\rmdefault}
-\def\g_fontspec_mathsf_tl{\sfdefault}
-\def\g_fontspec_mathtt_tl{\ttdefault}
-\tl_clear:N \g_fontspec_bfmathrm_tl
+\tl_set:Nn \g_fontspec_mathrm_tl {\rmdefault}
+\tl_set:Nn \g_fontspec_mathsf_tl {\sfdefault}
+\tl_set:Nn \g_fontspec_mathtt_tl {\ttdefault}
 \DeclareDocumentCommand \newfontfamily { m O{} m } {
   \fontspec_select:nn{#2}{#3}
   \use:x {
@@ -82,10 +85,10 @@
 \DeclareDocumentCommand \newfontface { m O{} m } {
   \newfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2 ] {#3}
 }
+\tl_new:N \g_fontspec_default_fontopts_tl
 \DeclareDocumentCommand \defaultfontfeatures {m} {
   \tl_set:Nn \g_fontspec_default_fontopts_tl {#1,}
 }
-\tl_clear:N \g_fontspec_default_fontopts_tl
 \DeclareDocumentCommand \addfontfeatures {m} {
   \ifcsname zf@family@fontdef\f@family\endcsname
     \group_begin:
@@ -2018,9 +2021,12 @@
     {\typeout{No~ fontspec.cfg~ file~ found;~ no~ configuration~ loaded.}}
 }
 \tl_set:Nn \zf@enc { \g_fontspec_encoding_tl }
-\tl_set:Nn \zf@family { \l_fontspec_family_tl }
-\tl_set:Nn \zf@basefont { \l_fontspec_font }
-\cs_set_eq:NN \zf@fontspec \fontspec_select:nn
+\cs_set:Npn \zf@fontspec #1 #2
+  {
+    \fontspec_select:nn {#1} {#2}
+    \tl_set:Nn \zf@family { \l_fontspec_family_tl }
+    \tl_set:Nn \zf@basefont { \l_fontspec_font }
+  }
 \ExplSyntaxOff
 %% 
 %% Copyright 2004--2011 Will Robertson <wspr81@gmail.com>
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
index 14c282e8727..6b4caf9d773 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
@@ -14,7 +14,7 @@
 %% 
 %% 
 \ProvidesPackage{fontspec}
-  [2011/09/13 v2.2 Advanced font selection for XeLaTeX/LuaLaTeX]
+  [2011/09/18 v2.2a Advanced font selection for XeLaTeX/LuaLaTeX]
 
 
 \RequirePackage{expl3}[2011/09/05]