mathspec update (29aug09)

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

5 files changed, 84 insertions, 90 deletions

diff --git a/Master/texmf-dist/doc/xelatex/mathspec/README b/Master/texmf-dist/doc/xelatex/mathspec/README
index 4df204507ae..e4c4fdfc7e3 100644
--- a/Master/texmf-dist/doc/xelatex/mathspec/README
+++ b/Master/texmf-dist/doc/xelatex/mathspec/README
@@ -1,11 +1,11 @@
 The mathspec package
 Andrew Gilbert Moschou
-v0.15 2008/10/01
+v0.16 2009/08/29
 
 This work is released under the LPPL v1.3c or later.
 
-The mathspec package provides an interface to typeset
-mathematics in arbitrary text fonts in XeLaTeX documents.
+The mathspec package provides an interface to select arbitrary
+text fonts for typesetting mathematics in XeLaTeX documents.
 
 Usage
 
@@ -38,4 +38,4 @@ Commands
   \+[<size>]
     Inserts a <size> mu (1/18 em) space in mathematics mode.
     Default <size> is 1.
-    
\ No newline at end of file
+    
diff --git a/Master/texmf-dist/doc/xelatex/mathspec/mathspec.pdf b/Master/texmf-dist/doc/xelatex/mathspec/mathspec.pdf
index b7b53c667c8..64028733dee 100644
--- a/Master/texmf-dist/doc/xelatex/mathspec/mathspec.pdf
+++ b/Master/texmf-dist/doc/xelatex/mathspec/mathspec.pdf
diff --git a/Master/texmf-dist/source/xelatex/mathspec/mathspec.dtx b/Master/texmf-dist/source/xelatex/mathspec/mathspec.dtx
index ada9b8d66e7..01fcc9e42d3 100644
--- a/Master/texmf-dist/source/xelatex/mathspec/mathspec.dtx
+++ b/Master/texmf-dist/source/xelatex/mathspec/mathspec.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % © Andrew Gilbert Moschou 2008
-%
+%fontspec
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
@@ -20,7 +20,7 @@
 %
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-%<package>\ProvidesPackage{mathspec}[2008/10/01 v0.15 LaTeX Package (Specify arbitrary fonts for mathematics)]
+%<package>\ProvidesPackage{mathspec}[2009/08/29 v0.16 LaTeX Package (Mathematics font selection for XeLaTeX)]
 %<*internal>
 \begingroup
 %</internal>
@@ -76,6 +76,9 @@ LaTeX.
 \makeatletter
 \DeclareMathSymbol{\eu@digamma}{\mathord}{AMSb}{"7A}
 \usepackage[MnSymbol,normalskips]{mathspec}
+\setprimaryfont[Numbers={OldStyle,Proportional}]{Sabon LT Std}
+\setmonofonts[Numbers=OldStyle,Scale=MatchLowercase]{Consolas}
+\setsansfonts[Numbers={OldStyle,Proportional},Scale=MatchLowercase]{Candara}
 \usepackage{eukdate}
 \def\@seccntformat#1{%
   \protect\makebox[0pt][r]{\csname the#1\endcsname\hspace{1\@ptsize pt}}}
@@ -101,21 +104,31 @@ LaTeX.
                                      {1.5ex \@plus .2ex}%
                                      {\normalfont\normalsize\itshape}}
 \newcommand\STIX{\MakeSC{STIX}}
-\RequirePackage{graphicx}
-\RequirePackage{booktabs}
+\usepackage{graphicx}
+\usepackage{booktabs}
 \usepackage[xetex,usenames]{color}
 \def\abovetopsep{1ex}
-\def\TeX{%
-  \ifdim\fontdimen1\font=0pt\@tempdima=0pt%
-  \else\@tempdima=-0.106275ex\fi
-  T\kern-.1667em\kern\@tempdima\lower.5ex\hbox{E}\kern-.125em X}
-\def\Xe{X\kern-.125em \lower.5ex\hbox{\reflectbox{E}}}
-\def\XeTeX{\Xe\kern-.1667em\TeX}
-\DeclareRobustCommand{\LaTeX}{%
-  L\kern-.36em%
-  {\sbox\z@ T\vbox to\ht\z@{\hbox{\scshape a}\vss}}%
-  \kern-.10em\TeX}
-\def\XeLaTeX{\Xe\kern-.0833em\LaTeX}
+\usepackage{metalogo}
+\setlogokern{Te}{-0.084em}
+\setlogokern{eX}{-0.063em}
+\setlogokern{eT}{-0.074em}
+\setlogokern{Xe}{-0.063em}
+\setlogokern{eL}{-0.068em}
+\setlogokern{La}{-0.305em}
+\setlogokern{aT}{-0.07313em}
+\setlogokern{X2}{0.101em}
+\setlogodrop{0.131em}
+\setLaTeXa{%
+  \ifdim\fontdimen\@ne\font=\z@\else
+    \addfontfeature{FakeSlant=\the\fontdimen\@ne\font}%
+  \fi
+  \if b\expandafter\@car\f@series\@nil
+    \check@mathfonts\fontsize\sf@size\z@
+    \math@fontsfalse\selectfont A%
+  \else
+    \scshape a%
+  \fi}
+\setLaTeXee{\mbox{\STIXGeneral\itshape ε}}
 \newcommand\closebracket{\char"5D}
 \renewcommand\backslash{\char"5C}
 \newcommand\permitbreak{\linebreak[0]}
@@ -146,7 +159,7 @@ LaTeX.
   \begin{center}\ttfamily%
   \fbox{\string#1#2}%
   \end{center}}
-\fontspec{Bembo MT}
+\fontspec[Scale=MatchLowercase]{Bembo MT}
 \let\eu@Bembo\zf@family
 \DeclareSymbolFont{BemboMTmn}{EU1}{\eu@Bembo}{m}{n}
 \DeclareSymbolFont{BemboMTmit}{EU1}{\eu@Bembo}{m}{it}
@@ -206,28 +219,14 @@ LaTeX.
      \let\item\@idxitem \ignorespaces
      \def\pfill{\hspace*{\fill}}}
   {\endlist}
-\newfontfamily\CambriaMath[Scale=0.9468786611]{Cambria Math}
-\newfontfamily\STIXGeneral[Scale=1.03271028]{STIXGeneral}
-\newcommand\CambriaOrSTIX{
-  \CambriaMath
-  \@gobble{\STIXGeneral\itshape}}
-\newfontfamily\GFSElpis[Scale=0.9821428571]{GFS ElpisX}
-\newfontfamily\GaramondNoVIII[Scale=1.036902635]{GaramondNo8}
+\newfontfamily\STIXGeneral[Scale=MatchLowercase]{STIXGeneral}
 \usepackage{multirow}
 \newcommand\tablerow[3]{
-  \CambriaMath #1 &
-  \ttfamily\string#3 &
-  \CambriaMath\char"#2 &
-  \ttfamily\MakeLowercase{\string#3}}
-\renewcommand\tablerow[3]{
-  \GFSElpis #1 & \ttfamily\string#3 & $#2$ &
+  \STIXGeneral #1 & \ttfamily\string#3 & \STIXGeneral\itshape #2 &
   \ttfamily\MakeLowercase{\string#3}}
-\hyphenation{se-par-ate math-ema-tics math-ema-tic cor-res-pond-ing}
+\hyphenation{se-par-ate math-ema-tics math-ema-tic cor-res-pond-ing de-spite bene-fits ela-borate des-cribed rom-an}
 \makeatother
-\setprimaryfont[Numbers={OldStyle,Proportional},Ligatures=Rare,Scale=0.884]{Serif12 Beta}
-\setmonofonts[Numbers=OldStyle,Scale=0.8975298805]{Consolas}
-\setsansfonts[Numbers={OldStyle,Proportional},Scale=MatchLowercase]{Candara}
-\setmathsfont[Set=Greek,Scale=0.9821428571,FakeSlant=0.21255]{GFS ElpisX}
+\setmathsfont[Set=Greek,Scale=MatchLowercase]{STIXGeneral}
 \normalvarforms
 \EnableCrossrefs
 \CodelineIndex
@@ -238,6 +237,8 @@ LaTeX.
 %</driver>
 % \fi
 %
+% \CheckSum{1829}
+%
 % \GetFileInfo{mathspec.sty}
 %
 % \DoNotIndex{
@@ -248,21 +249,21 @@ LaTeX.
 %  \@star@or@long,\@tempa,\@tempb,\@tempc,\@tempd,\@undefined,\@xargdef}
 % \DoNotIndex{
 %   \AtBeginDocument,\csname,\CurrentOption,\DeclareMathAlphabet,\DeclareMathSymbol,
-%   \DeclareOption,\DeclareSymbolFont,\def,\defin@boolkey,\define@choicekey,\edef,
+%   \DeclareOption,\DeclareSymbolFont,\def,\define@boolkey,\define@choicekey,\edef,
 %   \else,\endcsname,\ensuremath,\expandafter}
 % \DoNotIndex{
-%   \fi,\fontfamily,\futurelet,\ifcase,\ifnum,\ifthnelse,\ifx,\isempty,\let,\long,
+%   \fi,\fontfamily,\futurelet,\ifcase,\ifnum,\ifthenelse,\ifx,\isempty,\let,\long,
 %   \mathalpha,\makeatother,\mathbin,\mathchar@type,\mathclose,\mathgroup,\mathord,
 %   \mathpunct,\meaning,\mskip,\newcommand,\newif,\noexpand,\or,\PackageError,
 %   \PackageWarning,\PassOptionsToPackage,\presetkeys,\ProcessOptions,\protect,
-%   \providecommand,\relax,\renewcommand,\RequirePackage,\resered@a,\reserved@b}
+%   \providecommand,\relax,\renewcommand,\RequirePackage,\reserved@a,\reserved@b}
 % \DoNotIndex{
 %   \selectfont,\setkeys,\SetMathAlphabet,\string,\strip@prefix,\unexpanded,\x@protect,
 %   \XKV@rm}
 %
 % \makeatletter
-% \title{\itshape \XeTeXglyph241\XeTeXglyph247e \textsf{mathspec} \XeTeXglyph261ac\XeTeXglyph259ag\XeTeXglyph245\\[1ex]\normalsize version \expandafter\@gobble\fileversion}
-% \author{\textit{\XeTeXglyph246no\kern-0.236em\XeTeXglyph234rew Gi\XeTeXglyph222bert Mosc\XeTeXglyph248ou}\\\texttt{andmos@gmail.com}}
+% \title{The \textsf{mathspec} package\\[1ex]\normalsize version \expandafter\@gobble\fileversion}
+% \author{Andrew Gilbert Moschou\\\texttt{andmos@gmail.com}}
 % \makeatletter\let\@today\today\def\today{\MakeSC{\@today}}\makeatother
 %
 % \maketitle
@@ -277,7 +278,7 @@ LaTeX.
 %
 %\section{Introduction}
 %
-%Since Jonathan Kew released \XeTeX, an extension to \TeX\ that permits the inclusion of system wide Unicode fonts and modern font technologies in \TeX\ documents, users have been able to easily typeset documents using readily available fonts such as Hoefler Text and Times New Roman (This document is typeset using a prototype version of an unnamed typeface, currently known as ‘Serif Beta’, from Betatype). Will Robertson’s \XeLaTeX\ package |fontspec| provides an automatic font selection process for such arbitrary fonts. Still, mathematics typesetting has not benefited from this development to the same extent as text typesetting, which is not surprising given the font requirements that are demanded.
+%Since Jonathan Kew released \XeTeX, an extension to \TeX\ that permits the inclusion of system wide Unicode fonts and modern font technologies in \TeX\ documents, users have been able to easily typeset documents using readily available fonts such as Hoefler Text and Times New Roman (This document is typeset using Sabon \MakeSC{LT} Std). Will Robertson’s \XeLaTeX\ package |fontspec| provides an automatic font selection process for such arbitrary fonts. Still, mathematics typesetting has not benefited from this development to the same extent as text typesetting, which is not surprising given the font requirements that are demanded.
 %
 %Will Robertson has in development a package |unicode-math| that is used to typeset mathematics using some font that has an OpenType mathematics table. Currently, the only two that are available are Cambria Math, a new design, by Microsoft and Asana Math, based on Hermann Zapf’s Palatino, by Apostolos Syropoulos. It is expected that the \STIX\ fonts, based on Times, may also be used.
 %
@@ -289,7 +290,7 @@ LaTeX.
 %
 %\displaycommand\usepackage{\oarg{|mathspec| and |fontspec| options}\char"7B mathspec\char"7D}
 %
-%\noindent To use the package, put |\usepackage{mathspec}| in the preamble of the document. It is not necessary to put |\usepackage{fontspec}| because |mathspec| will ensure that |fontspec| is loaded anyway. To load |fontspec| with some options, parse them through |mathspec|, for example, |\usepackage|\permitbreak|[quiet]|\permitbreak|{mathspec}| is equivalent to |\usepackage|\permitbreak|[quiet]|\permitbreak|{fontspec}|\permitbreak|\usepackage|\permitbreak|{mathspec}|.
+%\noindent To use the package, put |\usepackage{mathspec}| in the preamble of the document. It is not necessary to put |\usepackage{requirepackagefontspec}| because |mathspec| will ensure that |fontspec| is loaded anyway. To load |fontspec| with some options, parse them through |mathspec|, for example, |\usepackage|\permitbreak|[quiet]|\permitbreak|{mathspec}| is equivalent to |\usepackage|\permitbreak|[quiet]|\permitbreak|{fontspec}|\permitbreak|\usepackage|\permitbreak|{mathspec}|.
 %
 %Actually, |mathspec| ordinarily loads |fontspec| with the |no-math| option. To cancel this, explicitly use the |math| option: \eg|\usepackage[math]{mathspec}|.
 %
@@ -318,7 +319,7 @@ LaTeX.
 %Regular & Italic    & Italic              & Regular    & Italic       \\\bottomrule
 %\end{tabular}\end{table}
 %
-%\DescribeMacro{\plaindigits}It is clear that the digits can be typeset by only one font at any one time. By default, if only one set is specified (Latin or Greek), then the digits are typeset using the font that is used for the set or if both sets are specified, then teh digits are typset using the Latin font, unless this choice is overridden. The choice can be overridden by explicitely writing |Digits=Regular| or |Digits=Plain| in the optional argument to |\setmathsfont|, or with the command |\plaindigits|, which might be an easier way to cancel the assignment of a new font for the digits.
+%\DescribeMacro{\plaindigits}It is clear that the digits can be typeset by only one font at any one time. By default, if only one set is specified (Latin or Greek), then the digits are typeset using the font that is used for the set or if both sets are specified, then the digits are typset using the Latin font, unless this choice is overridden. The choice can be overridden by explicitely writing |Digits=Regular| or |Digits=Plain| in the optional argument to |\setmathsfont|, or with the command |\plaindigits|, which might be an easier way to cancel the assignment of a new font for the digits.
 %
 %\item[\meta{font features}\textrm{, }\meta{font name}]\meta{font features} optional comma separated list, \meta{font name} compulsory argument.
 %
@@ -329,7 +330,7 @@ LaTeX.
 %
 %Support for setting the symbols font was removed in this version. I am focussing on the other areas of the package and feel that an incomplete feature should not be present at all.
 %
-%You can try MnSymbol, which has greater (and more uniform) coverage, with the package option |MnSymbol|, \eg|\usepackage[MnSymbol]{mathspec}|.
+%You can try MnSymbol, which has greater (and more uniform) coverage, with the package option |MnSymbol|, \eg|\usepackage[MnSymbol]{mathspec}|. Note that MnSymbol is a third party package by Achim Blumensath, which can only be used if additionally installed.
 %
 %\section{Alphabets}
 %
@@ -380,7 +381,7 @@ LaTeX.
 %
 %\section{Greek characters}
 %
-%For reference, the Greek alphabet and variant letter forms is given in table~\ref{tab:greek}. Despite the name, |\varsigma|~$\varsigma$ is not a variant form of |\sigma|~$\sigma\+$, it is the final form. Digamma~{\GaramondNoVIII\char"EFD5} is an obsolete letter of the alphabet, originally placed between epsilon~$\epsilon$ and zeta~$\zeta\+$.
+%For reference, the Greek alphabet and variant letter forms is given in table~\ref{tab:greek}. Despite the name, |\varsigma|~$\varsigma$ is not a variant form of |\sigma|~$\sigma\+$, it is the final form. Digamma~{\STIXGeneral Ϝ} is an obsolete letter of the alphabet, originally placed between epsilon~$\epsilon$ and zeta~$\zeta\+$.
 %
 %\begin{table}[htbp]\centering
 %\caption{The Greek alphabet and variant letter forms with control sequences\label{tab:greek}}
@@ -388,31 +389,31 @@ LaTeX.
 %\begin{tabular}{@{}clcl@{\hspace{2em}}clcl@{}}
 %\multicolumn{2}{@{}c@{}}{Uppercase} & \multicolumn{2}{@{}c@{\hspace{2em}}}{Lowercase} &
 %\multicolumn{2}{@{}c@{}}{Uppercase} & \multicolumn{2}{@{}c@{}}{Lowercase} \\\midrule
-%\tablerow{Α}{α}{\Alpha}   &\tablerow{Χ}{ξ}{\Xi}\\
+%\tablerow{Α}{α}{\Alpha}   &\tablerow{Ξ}{ξ}{\Xi}\\
 %\tablerow{Β}{β}{\Beta}    &\tablerow{Ο}{ο}{\Omicron}\\
 %\tablerow{Γ}{γ}{\Gamma}   &\tablerow{Π}{π}{\Pi}\\
 %\tablerow{Δ}{δ}{\Delta}   &\tablerow{Ρ}{ρ}{\Rho}\\
-%\tablerow{Ε}{ε}{\Epsilon} &\multirow{2}*{\GFSElpis Σ}&\multirow{2}*{\ttfamily\string\Sigma}& $ς$ & \ttfamily\string\varsigma\\
-%\tablerow{Ζ}{ζ}{\Zeta}    &&& $σ$ & \ttfamily\string\sigma\\
+%\tablerow{Ε}{ε}{\Epsilon} &\multirow{2}*{\STIXGeneral Σ}&\multirow{2}*{\ttfamily\string\Sigma}& \STIXGeneral\itshape ς & \ttfamily\string\varsigma\\
+%\tablerow{Ζ}{ζ}{\Zeta}    &&& \STIXGeneral\itshape σ & \ttfamily\string\sigma\\
 %\tablerow{Η}{η}{\Eta}     &\tablerow{Τ}{τ}{\Tau}\\
 %\tablerow{Θ}{θ}{\Theta}   &\tablerow{Υ}{υ}{\Upsilon}\\
-%\tablerow{Ι}{ι}{\Iota}    &\tablerow{Φ}{φ}{\Phi}\\
+%\tablerow{Ι}{ι}{\Iota}    &\tablerow{Φ}{ϕ}{\Phi}\\
 %\tablerow{Κ}{κ}{\Kappa}   &\tablerow{Χ}{χ}{\Chi}\\
 %\tablerow{Λ}{λ}{\Lambda}  &\tablerow{Ψ}{ψ}{\Psi}\\
 %\tablerow{Μ}{μ}{\Mu}      &\tablerow{Ω}{ω}{\Omega}\\
-%\tablerow{Ν}{ν}{\Nu}      &\GFSElpis\char"3DC &\ttfamily\string\Digamma &\GaramondNoVIII\char"EFD5 &\ttfamily\string\digamma
+%\tablerow{Ν}{ν}{\Nu}      &\STIXGeneral\char"3DC &\ttfamily\string\Digamma &\STIXGeneral\itshape\char"3DD &\ttfamily\string\digamma
 %\end{tabular}\\\toprule
 %\begin{tabular}{@{}ccl@{\hspace{2em}}ccl@{}}
 %Normal form & \multicolumn{2}{@{}c@{\hspace{2em}}}{Variant form} &
 %Normal form & \multicolumn{2}{@{}c@{}}{Variant form} \\\midrule
-%$β$ &$\varbeta$ &\ttfamily\string\varbeta&
-%$π$ &$\varpi$ &\ttfamily\string\varpi\\
-%$ε$ &\GaramondNoVIII\char"EFEC &\ttfamily\string\varepsilon&
-%$ρ$ &\CambriaOrSTIX\itshape\char"1D71A &\ttfamily\string\varrho\\
-%$θ$ &$\vartheta$ &\ttfamily\string\vartheta&
-%$φ$ &$\varphi$ &\ttfamily\string\varphi\\
-%$κ$ &\CambriaOrSTIX\itshape\char"1D718 &\ttfamily\string\varkappa&
-%\GFSElpis Θ &\GFSElpis\char"3F4 &\ttfamily\string\varTheta\\
+%\STIXGeneral\itshape β &\STIXGeneral\itshape ϐ &\ttfamily\string\varbeta&
+%\STIXGeneral\itshape π &\STIXGeneral\itshape ϖ &\ttfamily\string\varpi\\
+%\STIXGeneral\itshape ε &\STIXGeneral\itshape ϵ &\ttfamily\string\varepsilon&
+%\STIXGeneral\itshape ρ &\STIXGeneral\itshape ϱ &\ttfamily\string\varrho\\
+%\STIXGeneral\itshape θ &\STIXGeneral\itshape ϑ &\ttfamily\string\vartheta&
+%\STIXGeneral\itshape ϕ &\STIXGeneral\itshape φ &\ttfamily\string\varphi\\
+%\STIXGeneral\itshape κ &\STIXGeneral\itshape ϰ &\ttfamily\string\varkappa&
+%\STIXGeneral Θ &\STIXGeneral ϴ &\ttfamily\string\varTheta\\
 %\end{tabular}\\\bottomrule
 %\end{tabular}\end{table}
 %
@@ -422,7 +423,7 @@ LaTeX.
 %
 %\DescribeMacro{\varforms}If an author does not agree with the font designer’s choice of normal and variant forms, for example, I prefer |\phi| to print ‘$\varphi\+$’ and |\varphi| to print ‘$\phi\+$’, which is not the default behaviour for many fonts, the forms can be exchanged by putting the list of letters to the command |\varforms|, \eg|\varforms{theta,kappa,phi}| might be used if the Greek mathematics font is Garamond Premier Pro Italic.
 %
-%It should be noted that |\epsilon| prints the lunate epsilon~‘$\cmepsilon$’ and |\varepsilon| prints the usual (double loop) epsilon~‘$\cmvarepsilon$’ in Plain \TeX\ and \LaTeX. This is in contrast to other fonts, which contain the lunate style epsilon separately from the Greek alphabet among variant letter forms and symbols (where Unicode assigns ‘Greek Lunate Epsilon Symbol’). The definition of |\LaTeXe|, which prints ‘\LaTeXe’ uses |\varepsilon| and care should be taken to ensure that |\LaTeXe| uses the usual epsilon either by using one of the methods that were presented in this section or by redefining |\LaTeXe|, because \makeatletter \let\@tempa\varepsilon \def\varepsilon{\mbox{\GaramondNoVIII\char"EFEC}} ‘\LaTeXe’ \let\varepsilon\@tempa \makeatother is not as good as ‘\LaTeXe’.
+%It should be noted that |\epsilon| prints the lunate epsilon~‘$\cmepsilon$’ and |\varepsilon| prints the usual (double loop) epsilon~‘$\cmvarepsilon$’ in Plain \TeX\ and \LaTeX. This is in contrast to other fonts, which contain the lunate style epsilon separately from the Greek alphabet among variant letter forms and symbols (where Unicode assigns ‘Greek Lunate Epsilon Symbol’). The definition of |\LaTeXe|, which prints ‘\LaTeXe’ uses |\varepsilon| and care should be taken to ensure that |\LaTeXe| uses the usual epsilon either by using one of the methods that were presented in this section or by redefining |\LaTeXe| (possibly using my \texttt{metalogo} package), because \setLaTeXee{\mbox{\STIXGeneral\itshape ϵ}}‘\LaTeXe’ is not as good as \setLaTeXee{\mbox{\STIXGeneral\itshape ε}}‘\LaTeXe’.
 %
 %\section{Additional information}
 %
@@ -432,8 +433,8 @@ LaTeX.
 %
 %In using this package to provide arbitrary fonts for mathematics, there are issues with glyph bounds (similar to italic correction), as illustrated in the equations:
 %\begin{align}
-%f(x) &= \sum_{n=-\infty}^{\infty}{c_ne^{jnx}}\label{eq:2}\\
-%c_n &= \frac{1}{2\pi}\int_{-\pi}^{\pi}{f(x)e^{-jnx}\,\mathrm{d}x}\label{eq:3}
+%\BemboMathematics f(x) &= \BemboMathematics \sum_{n=-\infty}^{\infty}{c_ne^{jnx}}\label{eq:2}\\
+%\BemboMathematics  c_n &= \BemboMathematics \frac{1}{2\pi}\int_{-\pi}^{\pi}{f(x)e^{-jnx}\,\mathrm{d}x}\label{eq:3}
 %\end{align}
 %where the function $f$ is too close the parenthesis $($ and the exponent $jnx$ is so close to its base $e$ that there is actually a collision! The reason is that the font has metrics that are suitable for use in text, but not for mathematics.
 %
@@ -484,8 +485,8 @@ LaTeX.
 %
 %\noindent \DescribeMacro{\+}The command |\+| is used to produce fine control over the spacing in mathematics. Without its optional argument, it inserts a 1\,mu ($\frac{1}{18}$\,em) skip. |\+|\oarg{size} inserts a \meta{size}\,mu skip. The spacing of equations~(\ref{eq:2}, \ref{eq:3}) are improved by the replacements that are described in table~\ref{tab:3}:
 %\begin{align}
-%f\grp(){x} &= \sum_{n=-\infty}^{\infty}{c_ne^{\+[5]jn\+x}}\label{eq:4}\\
-%c_n &= \frac{1}{2\pi}\int_{-\pi}^{\pi}{\+f\grp(){x}e^{\+-jn\+x}\,\mathrm{d}x}\label{eq:5}
+% \BemboMathematics f(x) &= \BemboMathematics \sum_{n=-\infty}^{\infty}{c_ne^{jnx}} & \BemboMathematics f\grp(){x} &= \BemboMathematics \sum_{n=-\infty}^{\infty}{c_ne^{\+[5]jn\+x}}\label{eq:4}\\
+%       \BemboMathematics  c_n &= \BemboMathematics \frac{1}{2\pi}\int_{-\pi}^{\pi}{f(x)e^{-jnx}\,\mathrm{d}x} & \BemboMathematics        c_n &= \BemboMathematics \frac{1}{2\pi}\int_{-\pi}^{\pi}{\+f\grp(){x}e^{\+-jn\+x}\,\mathrm{d}x}\label{eq:5}
 %\end{align}
 %\begin{table}[htbp]\centering
 %\caption{Example replacements that improve spacing\label{tab:3}}
@@ -527,7 +528,7 @@ LaTeX.
 \DeclareOption{math}{\def\eu@zf@math{math}}
 \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{fontspec}}
 \ProcessOptions\relax
-\RequirePackage[\eu@zf@math]{fontspec}
+\RequirePackage[\eu@zf@math]{fontspec}[2008/08/09]
 \eu@if@MnSymbol{\RequirePackage{MnSymbol}}
 \RequirePackage{xkeyval}
 \RequirePackage{xifthen}
@@ -667,7 +668,8 @@ LaTeX.
 %\begin{macro}{\ernewcommand}
 % Useful macros and internal commands.
 %    \begin{macrocode}
-\providecommand\expandonce[1]{\unexpanded\expandafter{#1}}
+\RequirePackage{etoolbox}
+\@gobble{\providecommand\expandonce[1]{\unexpanded\expandafter{#1}}}
 \providecommand\expanded[1]{\edef\@tempa{#1}\@tempa}
 \providecommand\ernewcommand[1]{
   \@ifundefined{\expandafter\@gobble\string#1}%
@@ -750,7 +752,7 @@ LaTeX.
   \fi}}
 %    \end{macrocode}
 %\end{macro}
-%\begin{macro}{plaindigits}
+%\begin{macro}{\plaindigits}
 % This command is used to easily disable digits redefinitions.
 %    \begin{macrocode}
 \let\eu@ifnot@plaindigits\@firstofone
@@ -1262,7 +1264,7 @@ LaTeX.
     \eu@DeclareMathSymbol{;}{\mathpunct}{\eu@Symbols@symfont}{`;}[\semicolon]
     \eu@DeclareMathSymbol{<}{\mathrel}{\eu@Symbols@symfont}{`<}[\less]
     \DeclareMathSymbol{=}{\mathrel}{\eu@Symbols@symfont}{`=}
-      \let\equal==
+      \let\eq==
     \eu@DeclareMathSymbol{>}{\mathrel}{\eu@Symbols@symfont}{`>}[\greater]
     \eu@DeclareMathSymbol{?}{\mathclose}{\eu@Symbols@symfont}{`?}
     \eu@DeclareMathSymbol{¬}{\mathord}{\eu@Symbols@symfont}{`¬}[\neg]
diff --git a/Master/texmf-dist/source/xelatex/mathspec/mathspec.ins b/Master/texmf-dist/source/xelatex/mathspec/mathspec.ins
index 1083e8db6f7..bd93d7f0ea8 100644
--- a/Master/texmf-dist/source/xelatex/mathspec/mathspec.ins
+++ b/Master/texmf-dist/source/xelatex/mathspec/mathspec.ins
@@ -1,25 +1,16 @@
 %%
-%% This is file `mathspec.ins',
-%% generated with the docstrip utility.
+%% © Andrew Gilbert Moschou 2008
 %%
-%% The original source files were:
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
 %%
-%% mathspec.dtx  (with options: `batchfile')
-%% 
-%% This is a generated file.
-%% 
-%% © Andrew Gilbert Moschou
-%% 
-%% This file may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either
-%% version 1.3c of this license or (at your option) any later
-%% version. The latest version of this license is in:
-%% 
 %%   http://www.latex-project.org/lppl.txt
-%% 
+%%
 %% and version 1.3c or later is part of all recent distributions of
 %% LaTeX.
-%% 
+%%
 
 \input docstrip.tex
 \keepsilent
diff --git a/Master/texmf-dist/tex/xelatex/mathspec/mathspec.sty b/Master/texmf-dist/tex/xelatex/mathspec/mathspec.sty
index d43957199ad..543f0142aa8 100644
--- a/Master/texmf-dist/tex/xelatex/mathspec/mathspec.sty
+++ b/Master/texmf-dist/tex/xelatex/mathspec/mathspec.sty
@@ -21,7 +21,7 @@
 %% LaTeX.
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{mathspec}[2008/10/01 v0.15 LaTeX Package (Specify arbitrary fonts for mathematics)]
+\ProvidesPackage{mathspec}[2009/08/29 v0.16 LaTeX Package (Mathematics font selection for XeLaTeX)]
 \let\eu@ifnot@normalskips\@firstofone
 \let\eu@if@MnSymbol\@gobble
 \def\eu@zf@math{no-math}
@@ -31,7 +31,7 @@
 \DeclareOption{math}{\def\eu@zf@math{math}}
 \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{fontspec}}
 \ProcessOptions\relax
-\RequirePackage[\eu@zf@math]{fontspec}
+\RequirePackage[\eu@zf@math]{fontspec}[2008/08/09]
 \eu@if@MnSymbol{\RequirePackage{MnSymbol}}
 \RequirePackage{xkeyval}
 \RequirePackage{xifthen}
@@ -144,7 +144,8 @@
 \let\cmvarrho\varrho
 \let\cmvarphi\varphi
 \let\cmvarTheta\varTheta
-\providecommand\expandonce[1]{\unexpanded\expandafter{#1}}
+\RequirePackage{etoolbox}
+\@gobble{\providecommand\expandonce[1]{\unexpanded\expandafter{#1}}}
 \providecommand\expanded[1]{\edef\@tempa{#1}\@tempa}
 \providecommand\ernewcommand[1]{
   \@ifundefined{\expandafter\@gobble\string#1}%
@@ -613,7 +614,7 @@
     \eu@DeclareMathSymbol{;}{\mathpunct}{\eu@Symbols@symfont}{`;}[\semicolon]
     \eu@DeclareMathSymbol{<}{\mathrel}{\eu@Symbols@symfont}{`<}[\less]
     \DeclareMathSymbol{=}{\mathrel}{\eu@Symbols@symfont}{`=}
-      \let\equal==
+      \let\eq==
     \eu@DeclareMathSymbol{>}{\mathrel}{\eu@Symbols@symfont}{`>}[\greater]
     \eu@DeclareMathSymbol{?}{\mathclose}{\eu@Symbols@symfont}{`?}
     \eu@DeclareMathSymbol{¬}{\mathord}{\eu@Symbols@symfont}{`¬}[\neg]