summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-12-31 22:38:32 +0000
committerKarl Berry <karl@freefriends.org>2006-12-31 22:38:32 +0000
commitf9f0a3f94098db14e4130a6f2cd7c4bb837be140 (patch)
treea659cbf839d159d7050d5bd93b39a672de96b6a8
parent4bce4544a9d409cae7156a9e8ec7c5cd83d03aee (diff)
fontspec update (31dec06)
git-svn-id: svn://tug.org/texlive/trunk@3068 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/cdbuild/ctan2tds.pl7
-rw-r--r--Master/texmf-dist/doc/xelatex/fontspec/fontspec-example.ltx4
-rw-r--r--Master/texmf-dist/source/xelatex/fontspec/fontspec.dtx20
-rw-r--r--Master/texmf-dist/source/xelatex/fontspec/fontspec.ins35
-rw-r--r--Master/texmf-dist/tex/xelatex/fontspec/fontspec-doc-style.sty222
-rw-r--r--Master/texmf-dist/tex/xelatex/fontspec/fontspec.sty13
-rw-r--r--Master/texmf-dist/tpm/fontspec.tpm10
-rw-r--r--Master/texmf/lists/fontspec2
8 files changed, 286 insertions, 27 deletions
diff --git a/Build/cdbuild/ctan2tds.pl b/Build/cdbuild/ctan2tds.pl
index 95defbc489b..e0b745598fc 100755
--- a/Build/cdbuild/ctan2tds.pl
+++ b/Build/cdbuild/ctan2tds.pl
@@ -418,7 +418,7 @@ $standardfoundry='public';
'epsf', 'generic',
'eurosym', 'fonts',
'fc', 'fonts',
- 'fontspec', 'xetex',
+ 'fontspec', 'xelatex',
'fourier', 'fonts',
'fpl', 'fonts',
'frcursive', 'fonts',
@@ -464,7 +464,7 @@ $standardsourcefmt='latex';
'esint-type1', 'plain',
'fltpoint', 'generic',
'fontch', 'plain',
- 'fontspec', 'xetex',
+ 'fontspec', 'xelatex',
'genmisc', 'generic',
'hyplain', 'plain',
'ifxetex', 'generic',
@@ -528,7 +528,7 @@ $standardfmt='latex';
'fc', 'fonts',
'featpost', 'metapost',
'fontch', 'plain',
- 'fontspec', 'xetex',
+ 'fontspec', 'xelatex',
'fourier', 'fonts',
'frcursive', 'fonts',
'genmisc', 'generic',
@@ -590,7 +590,6 @@ $standarddocfmt='latex';
'dotseqn', 'dotseqn.dtx',
'feynmf', 'feynmf.ins',
'floatrow', 'floatrow.ins',
- 'fontspec', 'xetex',
'iso', 'alliso.ins',
'lettre', 'NULL',
'localloc', 'localloc.dtx',
diff --git a/Master/texmf-dist/doc/xelatex/fontspec/fontspec-example.ltx b/Master/texmf-dist/doc/xelatex/fontspec/fontspec-example.ltx
index 9a7d94d0922..6289e83ce97 100644
--- a/Master/texmf-dist/doc/xelatex/fontspec/fontspec-example.ltx
+++ b/Master/texmf-dist/doc/xelatex/fontspec/fontspec-example.ltx
@@ -5,7 +5,7 @@
\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}
@@ -31,7 +31,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}\\
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
diff --git a/Master/texmf-dist/tex/xelatex/fontspec/fontspec-doc-style.sty b/Master/texmf-dist/tex/xelatex/fontspec/fontspec-doc-style.sty
new file mode 100644
index 00000000000..15826bb1c8b
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/fontspec/fontspec-doc-style.sty
@@ -0,0 +1,222 @@
+%%
+%% This is file `fontspec-doc-style.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fontspec.dtx (with options: `doc-style')
+%%
+%% ________________________________
+%% The fontspec package for XeLaTeX
+%% (C) 2004--2006 Will Robertson
+%%
+%% License information appended.
+%%
+\ProvidesPackage{fontspec-doc-style}
+
+\RequirePackage{booktabs,calc,color,enumitem,euler,fancyvrb,fontspec,
+ graphicx,ifthen,ifxetex,url,varioref,xltxtra,xunicode}
+
+%% Titlepage
+\renewcommand\maketitle{%
+ \begin{titlepage}%
+ \null\vfil
+ \vskip 60\p@
+ \begin{center}%
+ {\LARGE \@title \par}%
+ \vskip 3em%
+ {\large
+ \lineskip .75em%
+ \begin{tabular}[t]{c}%
+ \@author
+ \end{tabular}\par}%
+ \vskip 1.5em%
+ {\large \@date \par}%
+ \end{center}\par
+ \vfil\null
+ \end{titlepage}%
+ \setcounter{footnote}{0}%
+ \global\let\thanks\relax
+ \global\let\maketitle\relax
+ \global\let\@thanks\@empty
+ \global\let\@author\@empty
+ \global\let\@date\@empty
+ \global\let\@title\@empty
+ \global\let\title\relax
+ \global\let\author\relax
+ \global\let\date\relax
+ \global\let\and\relax}
+
+%% ToC
+\def\@dotsep{1000}
+\setcounter{tocdepth}{2}
+\setlength\columnseprule{0.4pt}
+\renewcommand\tableofcontents{%
+ \begin{multicols}{2}[\section*{\contentsname}]%
+ \small
+ \@starttoc{toc}%
+ \end{multicols}}
+
+%% Index
+\renewenvironment{theglossary}
+ {\small\list{}{}
+ \item\relax
+ \glossary@prologue\GlossaryParms
+ \let\item\@idxitem \ignorespaces
+ \def\pfill{\hspace*{\fill}}}
+ {\endlist}
+
+%% varioref definitions:
+\labelformat{table}{Table~#1}
+\labelformat{section}{Section~#1}
+\labelformat{subsection}{Section~#1}
+
+%% verbatim examples:
+\newlength\examplewidth\newlength\verbatimwidth
+\newlength\exoutdent \newlength\exverbgap
+\setlength\exverbgap{1em}
+\setlength\exoutdent{-0.15\textwidth}
+\newsavebox\verbatimbox
+\edef\examplefilename{\jobname.example}
+
+\newenvironment{example}
+ {\VerbatimEnvironment
+ \begingroup
+ \begin{VerbatimOut}[gobble=4]{\examplefilename}}
+ {\end{VerbatimOut}
+ \defaultfontfeatures{Mapping=tex-text,Colour=228833}%
+ \typesetexample
+ \endgroup}
+\newenvironment{aatexample}
+ {\VerbatimEnvironment
+ \begingroup
+ \begin{VerbatimOut}[gobble=4]{\examplefilename}}
+ {\end{VerbatimOut}
+ \defaultfontfeatures{Mapping=tex-text,Colour=005599}%
+ \typesetexample
+ \endgroup}
+\newenvironment{opentypeexample}
+ {\VerbatimEnvironment
+ \begingroup
+ \begin{VerbatimOut}[gobble=4]{\examplefilename}}
+ {\end{VerbatimOut}
+ \defaultfontfeatures{Mapping=tex-text,Colour=AA0000}%
+ \typesetexample
+ \endgroup}
+
+\newcommand\typesetexample{%
+ \begin{lrbox}{\verbatimbox}%
+ \BVerbatimInput[fontsize=\small,firstline=\firstline,lastline=\lastline]{\examplefilename}\relax
+ \end{lrbox}
+ \begin{list}{}{\setlength\itemindent{0pt}
+ \setlength\leftmargin\exoutdent
+ \setlength\rightmargin{0pt}}\item
+ \ifx\auxwidth\relax
+ \setlength\verbatimwidth{\wd\verbatimbox}%
+ \else
+ \setlength\verbatimwidth{\auxwidth}%
+ \let\auxwidth\relax
+ \fi
+ \begin{minipage}[c]{\textwidth-\exoutdent-\verbatimwidth-\exverbgap}
+ \catcode`\%=14\centering\examplesize\input\examplefilename\relax
+ \end{minipage}\hfill
+ \begin{minipage}[c]{\verbatimwidth}
+ \usebox\verbatimbox
+ \end{minipage}
+ \end{list}
+ \global\let\examplesize\normalsize
+ \gdef\firstline{1}\gdef\lastline{}\par\noindent}
+
+\let\examplesize\normalsize
+\let\auxwidth\relax
+\def\firstline{1}
+\def\lastline{}
+
+\newcommand*\setexsize[1]{\let\examplesize#1}
+\newcommand*\setverbwidth[1]{\def\auxwidth{#1}}
+
+%% Sidenotes:
+\newcommand\warn[2]{%
+ \edef\thisversion{#1}%
+ \ifhmode\unskip~\fi{\ifx\thisversion\fileversion\color{red}\fi
+ $\leftarrow$}%
+ \marginpar{\raggedleft
+ \small%
+ {\ifx\thisversion\fileversion\color{red}\fi$\rightarrow$}%
+ \,{\notefont #1:~#2}}}
+
+\newcommand\new[1]{%
+ \edef\thisversion{#1}%
+ \ifhmode\unskip~\fi{\ifx\thisversion\fileversion\color{blue}\else\color[gray]{0.5}\fi
+ $\leftarrow$}%
+ \marginpar{\raggedleft
+ \small\ifx\thisversion\fileversion\color{blue}\else\color[gray]{0.5}\fi
+ $\rightarrow$\,{\notefont #1:~New!}}}
+
+%% Sidenote font
+\newfontfamily\notefont[Scale=MatchLowercase]{Optima}
+
+%% Various labelling commands:
+\newcommand*\name[1]{{#1}}
+\newcommand*\pkg[1]{\textsf{#1}}
+\newcommand*\opt[1]{\texttt{#1}}
+\newcommand*\feat[1]{\texttt{#1}}
+
+\let\latin\textit
+\def\eg{\latin{e.g.}}
+\def\ie{\latin{i.e.}}
+\def\Eg{\latin{E.g.}}
+\def\Ie{\latin{I.e.}}
+\def\etc{\@ifnextchar.{\latin{etc}}{\latin{etc.}\@}}
+
+\newcommand\note[1]{\unskip\footnote{#1}}
+
+%% LOGOS, tuned for Palatino:
+\TeX@logo@spacing{-0.12em}{-0.12em}%
+ {0.5ex}{-0.3em}{-0.12em}{-0.1em}
+
+\def\MacOSX{Mac~OS~X}
+
+%% fontspec declarations:
+\setmainfont[Mapping=tex-text,Numbers=OldStyle]{FPL Neu}
+\defaultfontfeatures{Scale=MatchLowercase}
+\setsansfont[Weight=1.2, Width=1.1,
+ Mapping=tex-text,
+ BoldFont={Skia},
+ BoldFeatures={Weight=1.7}]{Skia}
+\setmonofont{Osaka-Mono}
+\setmathrm{Optima Regular}
+\setboldmathrm[BoldFont=Optima ExtraBlack]{Optima Bold}
+\defaultfontfeatures{Mapping=tex-text}
+
+%% (La)TeX font-related declarations:
+\linespread{1.05} % Palatino needs more space between lines
+\lineskiplimit=-5pt % Osaka is really tall so this prevents ugly lines
+\frenchspacing % Remove ugly extra space after punctuation
+
+\makeatletter
+\newcounter{argument}
+\g@addto@macro\endmacro{\setcounter{argument}{0}}
+\newcommand*\darg[1]{%
+ \stepcounter{argument}%
+ \noindent{\ttfamily\char`\#\theargument~:~}#1\par}
+\newcommand*\doarg[1]{%
+ \stepcounter{argument}%
+ \noindent{\ttfamily\makebox[0pt][r]{[}\char`\#\theargument]:~}#1\par}
+\makeatother
+
+%%
+%% 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.
+%%
+%%
+%% End of file `fontspec-doc-style.sty'.
diff --git a/Master/texmf-dist/tex/xelatex/fontspec/fontspec.sty b/Master/texmf-dist/tex/xelatex/fontspec/fontspec.sty
index c539a8b67aa..824c0ff3da0 100644
--- a/Master/texmf-dist/tex/xelatex/fontspec/fontspec.sty
+++ b/Master/texmf-dist/tex/xelatex/fontspec/fontspec.sty
@@ -12,9 +12,8 @@
%%
%% License information appended.
%%
-%%
\ProvidesPackage{fontspec}
- [2006/12/21 v1.13 Advanced font selection for XeLaTeX]
+ [2006/12/24 v1.13 Advanced font selection for XeLaTeX]
\RequirePackage{ifxetex}
\RequireXeTeX
\newif\ifzf@firsttime
@@ -396,14 +395,14 @@
\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
@@ -414,8 +413,8 @@
\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
diff --git a/Master/texmf-dist/tpm/fontspec.tpm b/Master/texmf-dist/tpm/fontspec.tpm
index 1121edd899b..b138a41903e 100644
--- a/Master/texmf-dist/tpm/fontspec.tpm
+++ b/Master/texmf-dist/tpm/fontspec.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/fontspec.zip">
<TPM:Name>fontspec</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/12/24 16:19:15</TPM:Date>
+ <TPM:Date>2006/12/31 22:38:22</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>karl</TPM:Creator>
<TPM:Title>
@@ -22,18 +22,20 @@ and can access system fonts directly.
<TPM:Size>1884541</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="54379">
+ <TPM:RunFiles size="60631">
+texmf-dist/tex/xelatex/fontspec/fontspec-doc-style.sty
texmf-dist/tex/xelatex/fontspec/fontspec.cfg
texmf-dist/tex/xelatex/fontspec/fontspec.sty
texmf-dist/tpm/fontspec.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="1644972">
+ <TPM:DocFiles size="1644964">
texmf-dist/doc/xelatex/fontspec/README
texmf-dist/doc/xelatex/fontspec/fontspec-example.ltx
texmf-dist/doc/xelatex/fontspec/fontspec.pdf
</TPM:DocFiles>
- <TPM:SourceFiles size="185190">
+ <TPM:SourceFiles size="186218">
texmf-dist/source/xelatex/fontspec/fontspec.dtx
+texmf-dist/source/xelatex/fontspec/fontspec.ins
</TPM:SourceFiles>
<TPM:Provides>Package/fontspec</TPM:Provides>
</rdf:Description>
diff --git a/Master/texmf/lists/fontspec b/Master/texmf/lists/fontspec
index 936c69c1b1b..53017a4b189 100644
--- a/Master/texmf/lists/fontspec
+++ b/Master/texmf/lists/fontspec
@@ -2,6 +2,8 @@ texmf-dist/doc/xelatex/fontspec/README
texmf-dist/doc/xelatex/fontspec/fontspec-example.ltx
texmf-dist/doc/xelatex/fontspec/fontspec.pdf
texmf-dist/source/xelatex/fontspec/fontspec.dtx
+texmf-dist/source/xelatex/fontspec/fontspec.ins
+texmf-dist/tex/xelatex/fontspec/fontspec-doc-style.sty
texmf-dist/tex/xelatex/fontspec/fontspec.cfg
texmf-dist/tex/xelatex/fontspec/fontspec.sty
texmf-dist/tpm/fontspec.tpm