5 files changed, 14 insertions, 60 deletions
diff --git a/Master/texmf-dist/doc/latex/fontspec/README b/Master/texmf-dist/doc/latex/fontspec/README
index edd0536d1b6..be6318a5718 100644
--- a/Master/texmf-dist/doc/latex/fontspec/README
+++ b/Master/texmf-dist/doc/latex/fontspec/README
@@ -1,6 +1,6 @@
 
-THE FONTSPEC PACKAGE v2.0c
-==========================
+THE FONTSPEC PACKAGE v2.1
+=========================
 
 This is the initial release of the fontspec package with support for LuaTeX.
 (Previously, fontspec was XeTeX-only.)
@@ -143,6 +143,18 @@ gladly accepted!
 Change history
 --------------
 
+- v2.1 (2010/09/19)
+  
+    * Now load xunicode internally for consistent behaviour in
+      XeLaTeX and LuaLaTeX.
+    * Font commands now include \fontencoding internally, easing their
+      use together with legacy TeX fonts.
+    * Colour & Opacity now behave a little better.
+    * Nested emphasis with \emph now also occurs inside a "slanted" shape.
+    * Some compatibility commands/options added that were removed.
+      in the transition to v2.
+    * Bug fix for a problem triggered after counters got too high.
+
 - v2.0c (2010/08/01)  
   Bug fix and documentation tune-up.
 
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec-luatex.tex b/Master/texmf-dist/doc/latex/fontspec/fontspec-example.tex
index 552233392de..8f1eb4da52e 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec-luatex.tex
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec-example.tex
@@ -1,8 +1,5 @@
 
 
-
-% !TEX TS-program = LuaLaTeX
-
 \documentclass{article}
 
 \usepackage{fontspec}
@@ -11,8 +8,6 @@
 \setsansfont[Ligatures=TeX,Scale=MatchLowercase]{TeX Gyre Heros}
 \setmonofont[Scale=MatchLowercase]{Inconsolata}
 
-\frenchspacing % TeX's default is a little old-fashioned...
-
 \begin{document}
 \pagestyle{empty}
 
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf
index 8701ecafe0d..67d0d9dd081 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-xetex.tex b/Master/texmf-dist/doc/latex/fontspec/fontspec-xetex.tex
deleted file mode 100644
index e5220bd11f7..00000000000
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec-xetex.tex
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-% !TEX TS-program = XeLaTeX
-
-\documentclass{article}
-
-\usepackage{xltxtra}
-
-\setmainfont[Ligatures=TeX]{TeX Gyre Pagella}
-\setsansfont[Ligatures=TeX,Scale=MatchLowercase]{TeX Gyre Heros}
-\setmonofont[Scale=MatchLowercase]{Inconsolata}
-
-\frenchspacing % TeX's default is a little old-fashioned...
-
-\begin{document}
-\pagestyle{empty}
-
-\section*{The basics of the \textsf{fontspec} package}
-
-The \textsf{fontspec} package enables automatic font selection
-for \LaTeX{} documents typeset with Xe\TeX{} or \LuaTeX.
-The basic command is
-
-{\centering \verb|\fontspec[font features]{font display name}|.\par}
-
-The default, sans serif, and typewriter fonts may be set with the
-\verb|\setmainfont|, \verb|\setsansfont| and \verb|\setmonofont|
-commands, respectively, as shown in the preamble. They take the
-same syntax as the \verb|\fontspec| package. All expected font
-shapes are available:
-
-\begin{center}
-  {\itshape Italics and \scshape small caps\dots}\\
-  {\sffamily\bfseries Bold sans serif and \itshape bold italic sans serif\dots}
-\end{center}
-
-Text fonts in maths mode are also changed (e.g., notice the cosine function in
-`$\cos(n\pi)=\pm 1$') but only if the roman and sans serif fonts are set in
-the preamble; \verb|\setmainfont| will not affect these maths mode fonts when
-called mid-document.
-Maths symbols themselves are not affected.
-
-Notice the font features used to load the default fonts in the preamble.
-The first, \verb|Ligatures=TeX|, enables regular \TeX{} ligatures like
-\verb|``---''| for ``---''.
-The second, \verb|Scale=MatchLowercase|, automatically scales the fonts to
-the same x-height.
-
-Please see the complete \textsf{fontspec} documentation for further
-information.
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
index 75141442804..8b7cca7cf91 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf