fontspec update (31dec06)

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

2 files changed, 45 insertions, 10 deletions

diff --git a/Master/texmf-dist/source/xelatex/fontspec/fontspec.dtx b/Master/texmf-dist/source/xelatex/fontspec/fontspec.dtx
index e1824682b9c..c0c27dc42ba 100644
--- a/Master/texmf-dist/source/xelatex/fontspec/fontspec.dtx
+++ b/Master/texmf-dist/source/xelatex/fontspec/fontspec.dtx
@@ -203,7 +203,7 @@ This work consists of the file  fontspec.dtx
 % \begin{Verbatim}[gobble=4]
 %   \usepackage{fontspec}
 %   \defaultfontfeatures{Scale=MatchLowercase}
-%   \setromanfont[Mapping=tex-text]{Baskerville}
+%   \setmainfont[Mapping=tex-text]{Baskerville}
 %   \setsansfont[Mapping=tex-text]{Skia}
 %   \setmonofont{Courier}
 % \end{Verbatim}
@@ -2579,14 +2579,14 @@ This work consists of the file  fontspec.dtx
     \def\@tempa{#1}%
     \ifx\@tempa\@empty
       \zf@PackageWarning{%
-        ‘\XKV@tfam=\XKV@tkey’ feature not supported
-         for AAT font ‘\fontname\zf@basefont’}%
+        '\XKV@tfam=\XKV@tkey' feature not supported
+         for AAT font '\fontname\zf@basefont'}%
     \else
       \zf@make@aat@feature@string{#1}{#2}%
       \ifx\@tempa\@empty
         \zf@PackageWarning{%
           AAT feature '\XKV@tfam=\XKV@tkey'
-          (#1,#2) not available in font \fontname\zf@basefont}%
+          (#1,#2) not available in font '\fontname\zf@basefont'}%
       \else
         \zf@update@family{+#1,#2}%
         \zf@update@ff\@tempa
@@ -2600,8 +2600,8 @@ This work consists of the file  fontspec.dtx
     \edef\@tempa{#3}%
     \ifx\@tempa\@empty
       \zf@PackageWarning{%
-        ‘\XKV@tfam=\XKV@tkey’ feature not supported 
-        for ICU font ‘ \fontname\zf@basefont’}%
+        '\XKV@tfam=\XKV@tkey' feature not supported 
+        for ICU font '\fontname\zf@basefont'}%
     \else
       \expandafter\zf@check@ot@feat\expandafter{\@tempa}%
       \if@tempswa
@@ -3716,7 +3716,7 @@ This work consists of the file  fontspec.dtx
 % Here, the fonts used in math mode are redefined to correspond to the
 % default roman, sans serif and typewriter fonts. Unfortunately, you
 % can only define maths fonts in the preamble, otherwise I'd run this
-% code whenever \cs{setromanfont} and friends was run.
+% code whenever \cs{setmainfont} and friends was run.
 %
 % \begin{macro}{\AtBeginDocument}
 % \changes{v1.4}{2004/11/25}{Selects the default \cs{mathXX} fonts.}
@@ -3967,7 +3967,7 @@ This work consists of the file  fontspec.dtx
 \usepackage{xltxtra}
 
 \defaultfontfeatures{Scale=MatchLowercase,Mapping=tex-text}
-\setromanfont[Numbers=Lowercase]{FPL Neu}
+\setmainfont[Numbers=Lowercase]{FPL Neu}
 \setsansfont{Lucida Sans}
 \setmonofont{Lucida Sans Typewriter}
 
@@ -3993,7 +3993,7 @@ As an example:
   My 1st example of Apple Chancery
 \end{center}
 
-The default roman, sans serif, and typewriter fonts may be set with the \verb|\setromanfont|, \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:
+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}\\
@@ -4194,7 +4194,7 @@ Please see the documentation for font feature explanation and further package ni
 \def\MacOSX{Mac~OS~X}
 
 %% fontspec declarations:
-\setromanfont[Mapping=tex-text,Numbers=OldStyle]{FPL Neu}
+\setmainfont[Mapping=tex-text,Numbers=OldStyle]{FPL Neu}
 \defaultfontfeatures{Scale=MatchLowercase}
 \setsansfont[Weight=1.2, Width=1.1,
              Mapping=tex-text,
diff --git a/Master/texmf-dist/source/xelatex/fontspec/fontspec.ins b/Master/texmf-dist/source/xelatex/fontspec/fontspec.ins
new file mode 100644
index 00000000000..5c1b85d3b87
--- /dev/null
+++ b/Master/texmf-dist/source/xelatex/fontspec/fontspec.ins
@@ -0,0 +1,35 @@
+\input docstrip.tex
+\keepsilent
+\usedir{tex/xelatex/fontspec}
+\preamble
+
+  ________________________________
+  The fontspec package for XeLaTeX
+  (C) 2004--2006    Will Robertson
+
+  License information appended.
+
+\endpreamble
+\postamble
+
+Copyright 2005-2006 by Will Robertson <wspr81@gmail.com>
+
+Distributable under the LaTeX Project Public License,
+version 1.3c or higher (your choice). The latest version of
+this license is at: http://www.latex-project.org/lppl.txt
+
+This work is "maintained" (as per LPPL maintenance status)
+by Will Robertson.
+
+This work consists of the file  fontspec.dtx
+          and the derived files fontspec.sty and fontspec.pdf.
+
+\endpostamble
+\askforoverwritefalse
+\generate{\file{fontspec.sty}{\from{fontspec.dtx}{fontspec}}}
+\generate{\file{fontspec-doc-style.sty}{\from{fontspec.dtx}{doc-style}}}
+\nopreamble\nopostamble
+\generate{\file{fontspec.cfg}{\from{fontspec.dtx}{cfg}}}
+\generate{\file{fontspec.ins}{\from{fontspec.dtx}{batchfile}}}
+\generate{\file{fontspec-example.ltx}{\from{fontspec.dtx}{example}}}
+\endbatchfile