summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-05-07 23:51:40 +0000
committerKarl Berry <karl@freefriends.org>2008-05-07 23:51:40 +0000
commitd726ca5998afaac28572056788e01b78fbe0aeeb (patch)
tree0242bb7fbd28fc23ff198c25c20b117be59cbfb5 /Master/texmf-dist/tex
parent836d5f65811c78378821754b1b0f07ab1bbf5f9b (diff)
fontspec update (7may08)
git-svn-id: svn://tug.org/texlive/trunk@7927 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/xelatex/fontspec/fontspec.cfg12
-rw-r--r--Master/texmf-dist/tex/xelatex/fontspec/fontspec.sty55
2 files changed, 48 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/xelatex/fontspec/fontspec.cfg b/Master/texmf-dist/tex/xelatex/fontspec/fontspec.cfg
index 4978c4e2d37..666cc00c9ac 100644
--- a/Master/texmf-dist/tex/xelatex/fontspec/fontspec.cfg
+++ b/Master/texmf-dist/tex/xelatex/fontspec/fontspec.cfg
@@ -8,7 +8,7 @@
%%
%% ________________________________
%% The fontspec package for XeLaTeX
-%% (C) 2004--2006 Will Robertson
+%% (C) 2004--2007 Will Robertson
%%
%% License information appended.
%%
@@ -39,7 +39,7 @@
\newfontscript{CJK}{hani}
%%
-%% Copyright 2005-2006 by Will Robertson <wspr81@gmail.com>
+%% Copyright 2004--2007 by Will Robertson <wspr81@gmail.com>
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
@@ -48,8 +48,12 @@
%% 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.
+%% This work consists of this file fontspec.dtx
+%% and the derived files fontspec.sty,
+%% fontspec.cfg,
+%% fontspec.ins,
+%% fontspec-example.ltx,
+%% and fontspec.pdf.
%%
%%
%% End of file `fontspec.cfg'.
diff --git a/Master/texmf-dist/tex/xelatex/fontspec/fontspec.sty b/Master/texmf-dist/tex/xelatex/fontspec/fontspec.sty
index 312a873355a..ee4753528e7 100644
--- a/Master/texmf-dist/tex/xelatex/fontspec/fontspec.sty
+++ b/Master/texmf-dist/tex/xelatex/fontspec/fontspec.sty
@@ -8,12 +8,12 @@
%%
%% ________________________________
%% The fontspec package for XeLaTeX
-%% (C) 2004--2006 Will Robertson
+%% (C) 2004--2007 Will Robertson
%%
%% License information appended.
%%
\ProvidesPackage{fontspec}
- [2007/06/20 v1.14 Advanced font selection for XeLaTeX]
+ [2008/02/03 v1.17 Advanced font selection for XeLaTeX]
\RequirePackage{ifxetex}
\RequireXeTeX
\newif\ifzf@firsttime
@@ -27,7 +27,6 @@
\newif\ifzf@math@euler
\newif\ifzf@math@lucida
\newif\ifzf@package@euler@loaded
-\newif\ifzf@package@babel@loaded
\newif\if@zf@configfile
\newif\if@zf@euenc
\newif\if@zf@math
@@ -51,7 +50,12 @@
\DeclareOption{config}{\@zf@configfiletrue}
\DeclareOption{no-config}{\@zf@configfilefalse}
\DeclareOption{noconfig}{\@zf@configfilefalse}
-\DeclareOption{quiet}{\let\zf@PackageWarning\zf@PackageInfo}
+\DeclareOption{quiet}{%
+ \let\zf@PackageWarning\zf@PackageInfo
+ \let\zf@PackageInfo\@gobble}
+\DeclareOption{silent}{%
+ \let\zf@PackageWarning\@gobble
+ \let\zf@PackageInfo\@gobble}
\ExecuteOptions{config,lm-default,math}
\ProcessOptions*
\RequirePackage{ifxetex}
@@ -139,12 +143,12 @@
\@tempa
\endgroup
\fontfamily\zf@family\selectfont
- \expandafter\ignorespaces
\else
\zf@PackageWarning{%
\protect\addfontfeature (s) ignored;\zf@nl
it cannot be used with a font that wasn't selected by fontspec.}%
- \fi}
+ \fi
+ \ignorespaces}
\let\addfontfeature\addfontfeatures
\newcommand*\newfontfeature[2]{%
\stepcounter{zf@newff}%
@@ -177,7 +181,7 @@
\xdef\zf@family@long{\zf@family@long+script=#1}%
\xdef\zf@pre@ff{script=#2,\zf@pre@ff}%
\else
- \zf@PackageWarning{Font \fontname\zf@basefont does not contain script '#1'}%
+ \zf@PackageWarning{Font \fontname\zf@basefont\space does not contain script '#1'}%
\fi}}
\newcommand*\newfontlanguage[2]{%
\define@key[zf@feat]{Lang}{#1}[]{%
@@ -189,7 +193,7 @@
\xdef\zf@pre@ff{\zf@pre@ff language=#2,}%
\else
\zf@PackageWarning{%
- Font \fontname\zf@basefont does not contain
+ Font \fontname\zf@basefont\space does not contain
language '#1' for script '\zf@script@name'}%
\fi}}
\newcommand*\zf@fontspec[2]{%
@@ -198,7 +202,9 @@
\edef\zf@fontname{#2}%
\let\zf@family@long\zf@fontname
\setkeys*[zf]{prepreparse}{#1}%
+ \let\zf@up\zf@fontname
\edef\@tempa{\noexpand\setkeys*[zf]{preparse}{\XKV@rm}}\@tempa
+ \let\zf@fontname\zf@up
\let\zf@font@feat\XKV@rm
\font\zf@basefont="\zf@font@wrap\zf@fontname\zf@suffix" at \f@size pt
\unless\ifzf@icu
@@ -222,7 +228,7 @@
\expandafter\stepcounter\else
\expandafter\newcounter\fi
{zf@famc@#2}%
- \def@cx{zf@UID@\zf@family@long}{%
+ \gdef@cx{zf@UID@\zf@family@long}{%
\zap@space#2 \@empty
(\expandafter\the\csname c@zf@famc@#2\endcsname)}%
\fi
@@ -349,8 +355,8 @@
\edef\@tempb{\itdefault}%
\ifx\@tempa\@tempb
\edef\@tempa{\noexpand
- \DeclareFontShape{\zf@enc}{\zf@family}{#1}{\sldefault}
- {<->sub*\zf@family/#2/\itdefault}{\zf@adjust}}%
+ \DeclareFontShape{\zf@enc}{\zf@family}{#2}{\sldefault}
+ {<->ssub*\zf@family/#2/\itdefault}{\zf@adjust}}%
\@tempa
\fi}
\newcommand*{\zf@update@family}[1]{%
@@ -552,6 +558,10 @@
\font\zf@basefont="\zf@font@wrap\zf@fontname\zf@suffix" at \f@size pt
\edef\zf@family@long{\zf@family@long +language:#1}%
{\setkeys[zf@feat]{Lang}{#1}}}
+\define@key[zf]{preparse}{UprightFont}{%
+ \edef\@tempa{#1}%
+ \zf@partial@fontname#1\@nil=\zf@up
+ \edef\zf@family@long{\zf@family@long up:#1}}
\define@key[zf]{preparse}{BoldFont}{%
\edef\@tempa{#1}%
\ifx\@tempa\@empty
@@ -721,6 +731,15 @@
\fi
\fi
\fi}
+\define@key[zf]{options}{FakeSlant}{%
+ \zf@update@family{+slant:#1}%
+ \zf@update@ff{slant=#1}}
+\define@key[zf]{options}{FakeStretch}{%
+ \zf@update@family{+extend:#1}%
+ \zf@update@ff{extend=#1}}
+\define@key[zf]{options}{FakeBold}{%
+ \zf@update@family{+embolden:#1}%
+ \zf@update@ff{embolden=#1}}
\zf@define@font@feature{Ligatures}
\zf@define@feature@option{Ligatures}{Required} {1}{0}{+rlig}
\zf@define@feature@option{Ligatures}{NoRequired} {1}{1}{-rlig}
@@ -858,6 +877,8 @@
\define@key[zf@feat]{Vertical}{RotatedGlyphs}[]{%
\ifzf@icu
\zf@make@feature{}{}{+vrt2}%
+ \zf@update@family{+vert}%
+ \zf@update@ff{vertical}%
\else
\zf@update@family{+vert}%
\zf@update@ff{vertical}%
@@ -1189,7 +1210,7 @@
\@ifpackageloaded{MinionPro}{\@zf@mathfalse}{}
\@ifpackageloaded{unicode-math}{\@zf@mathfalse}{}
\if@zf@math
- \zf@PackageWarning{Adjusting the maths setup (use [no-math] to avoid this).}
+ \zf@PackageInfo{Adjusting the maths setup (use [no-math] to avoid this).}
\zf@math
\fi}
\AtBeginDocument{\zf@math@maybe}
@@ -1199,7 +1220,7 @@
{\typeout{No fontspec.cfg file found; no configuration loaded.}}
\fi
%%
-%% Copyright 2005-2006 by Will Robertson <wspr81@gmail.com>
+%% Copyright 2004--2007 by Will Robertson <wspr81@gmail.com>
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
@@ -1208,8 +1229,12 @@
%% 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.
+%% This work consists of this file fontspec.dtx
+%% and the derived files fontspec.sty,
+%% fontspec.cfg,
+%% fontspec.ins,
+%% fontspec-example.ltx,
+%% and fontspec.pdf.
%%
%%
%% End of file `fontspec.sty'.