fontspec

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

4 files changed, 58 insertions, 23 deletions

diff --git a/Master/texmf-dist/doc/latex/fontspec/README b/Master/texmf-dist/doc/latex/fontspec/README
index 0610e92c6c3..8d5edc40e3a 100644
--- a/Master/texmf-dist/doc/latex/fontspec/README
+++ b/Master/texmf-dist/doc/latex/fontspec/README
@@ -3,7 +3,7 @@ THE FONTSPEC PACKAGE
 ====================
 
 The fontspec package provides an automatic and unified interface for loading
-fonts in LaTeX. XeTeX and LuaTeX (the latter through the luaotfload package)
+fonts in LaTeX. XeTeX and LuaTeX (the latter through the `luaotfload` package)
 allows a direct interface to fonts which may be loaded by their name rather
 than filename, so no manual font installation is required.
 
@@ -15,7 +15,7 @@ others.
 See the documentation `fontspec.pdf` for full information.
 
 Release versions of fontspec are available from CTAN:
-  <http://tug.ctan.org/pkg/fontspec>
+  <http://www.ctan.org/pkg/fontspec>
 
 Development and historical versions are available from Github:
   <http://github.com/wspr/fontspec>
@@ -27,7 +27,7 @@ Please offer suggestions and file bug reports in the issue tracker:
 Requirements
 ------------
 
-The `fontspec` package requires an up-to-date TeX Live 2011 or MiKTeX 2.9,
+The `fontspec` package requires an up-to-date TeX Live or MiKTeX installation,
 including the most recent version of the `l3kernel` package which provides
 the LaTeX3 programming interface known as `expl3`.
 
@@ -37,25 +37,18 @@ Summary of user commands
 
 Font families may be selected individually with the command
 
-    \fontspec[<font options>]{<font name>}
+    \fontspec{<font name>}[<font options>]
 
 Commands for selecting fonts efficiently through a document are created with
 
-    \newfontfamily\myfamily[<font options>]{<font name>}
-    \newfontface\myfont[<font options>]{<font name>}
+    \newfontfamily\myfamily{<font name>}[<font options>]
+    \newfontface\myfont{<font name>}[<font options>]
 
 Default document fonts are selected with
 
-    \setmainfont[<font options>]{<font name>}
-    \setsansfont[<font options>]{<font name>}
-    \setmonofont[<font options>]{<font name>}
-
-Fonts to be used in text strings in maths are defined with
-
-    \setmathrm[<font options>]{<font name>}
-    \setmathsf[<font options>]{<font name>}
-    \setmathtt[<font options>]{<font name>}
-    \setboldmathrm[<font options>]{<font name>}
+    \setmainfont{<font name>}[<font options>]
+    \setsansfont{<font name>}[<font options>]
+    \setmonofont{<font name>}[<font options>]
 
 Features to be used for every subsequently defined font are specified with
 
@@ -72,6 +65,48 @@ Features may be added to the font currently in use with
 Change history
 --------------
 
+- v2.4 (25/05/2014)
+
+    * Significant change to the user interface: instead of `\setmainfont[features]{font}`, you now write `\setmainfont{font}[features]`.
+      Backwards compatibility is of course preserved.
+
+      The reason for this change is to improve the visual comprehension of the font loading syntax with large numbers of font features.
+
+    * Defaults for symbolic font families like this can now be specified with
+
+            \defaultfontfeatures[\rmfamily]{...}
+
+      or
+
+            \defaultfontfeatures[\headingsfont]{...}
+            \setfontfamily\headingsfont{...}
+
+    * New `PunctuationSpace=WordSpace` and `PunctuationSpace=TwiceWordSpace` settings, intended for monospaced fonts; these force the space after a period to be exactly one or two spaces wide, respectively, which preserves character alignment across lines.
+
+    * The features above now allow changes to the default settings:
+
+      * `Ligatures=TeX` is enabled by default with `\setmainfont` and `\setsansfont`.
+      * `WordSpace={1,0,0}` and `PunctuationSpace=WordSpace` are now enabled by default for `\setmonofont` to produce better monospaced results.
+      * (These can be adjusted by created your own `fontspec.cfg` file.)
+
+    * `SizeFeatures` can now be nested inside `ItalicFeatures` (etc.) and behaves correctly. This has been a very long overdue bug!
+
+    * New feature `NFSSFamily=ABC` to set the NFSS family of a font to “`ABC`”. Useful
+      when other packages use the `\fontfamily{ABC}\selectfont` interface.
+
+    * New feature `FontFace = {series}{shape}{font}` allows a font face to be loaded with a specific NFSS font series and font shape.
+      A more verbose syntax allows arbitrary font features as well (and this also plays nicely with `SizeFeatures`):
+
+            \fontspec{myfont.otf}[
+              FontFace = {b}{ui}{Font = myfont-bui.otf, <features>} ,
+            ]
+
+      The code above, for example, will allow a bold upright italic font to be selected using the standard NFSS interface: `\fontseries{b}\fontshape{ui}\selectfont`.
+
+    * `\defaultfontfeatures+` (note the `+`) can now be used to append to the default font feature set.
+
+    * Setting the `SmallCapsFont` using the `*`-replacement notation has been improved/fixed.
+
 - v2.3c (2013/05/20)
 
     * Compatbility with luaotfload 2013/05/20 2.2c, support for older version
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec-example.tex b/Master/texmf-dist/doc/latex/fontspec/fontspec-example.tex
index a348d1f21b1..9138c3a6f74 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec-example.tex
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec-example.tex
@@ -4,9 +4,9 @@
 
 \usepackage{fontspec}
 
-\setmainfont[Ligatures=TeX]{TeX Gyre Pagella}
-\setsansfont[Ligatures=TeX,Scale=MatchLowercase]{TeX Gyre Heros}
-\setmonofont[Scale=MatchLowercase]{Inconsolata}
+\setmainfont{TeX Gyre Pagella}
+\setsansfont{TeX Gyre Heros}[Scale=MatchLowercase]
+\setmonofont{Inconsolata}[Scale=MatchLowercase]
 
 \begin{document}
 \pagestyle{empty}
@@ -17,7 +17,7 @@ The \textsf{fontspec} package enables automatic font selection
 for \LaTeX{} documents typeset with Xe\TeX{} or Lua\TeX.
 The basic command is
 
-{\centering \verb|\fontspec[font features]{font display name}|.\par}
+{\centering \verb|\fontspec{font display name}[font features]|.\par}
 
 The default, sans serif, and typewriter fonts may be set with the
 commands \verb|\setmainfont|, \verb|\setsansfont| and \verb|\setmonofont|,
@@ -37,9 +37,9 @@ 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
+\verb|Ligatures=TeX| is automatically enabled for the roman and sans font,
+allowing regular \TeX{} ligatures like \verb|``---''| for ``---''.
+\verb|Scale=MatchLowercase| automatically scales the fonts to
 the same x-height.
 
 Please see the complete \textsf{fontspec} documentation for further
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf
deleted file mode 100644
index d57ce9e952c..00000000000
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
index a4ded4d26e9..eec90c21a6a 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf