summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fontspec
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-07-14 22:58:10 +0000
committerKarl Berry <karl@freefriends.org>2010-07-14 22:58:10 +0000
commit827000f2ceadd8c4bd3fa95705d6f8eb1e5d4a7c (patch)
tree6a9345893893874235fbe876bca72e630f426923 /Master/texmf-dist/tex/latex/fontspec
parentda2b0e2dcdfe8fa263cacd12145f31828f745a3a (diff)
fontspec update (14jul10)
git-svn-id: svn://tug.org/texlive/trunk@19458 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/fontspec')
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty2
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec.sty25
2 files changed, 20 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty
index 73bda2464b5..4a52efff3e4 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty
@@ -14,7 +14,7 @@
%%
%%
\ProvidesPackage{fontspec-patches}
- [2010/07/11 v2.0a Advanced font selection for XeLaTeX/LuaLaTeX]
+ [2010/07/14 v2.0b Advanced font selection for XeLaTeX/LuaLaTeX]
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
index bed70f621fb..d842d849224 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
@@ -14,7 +14,7 @@
%%
%%
\ProvidesPackage{fontspec}
- [2010/07/11 v2.0a Advanced font selection for XeLaTeX/LuaLaTeX]
+ [2010/07/14 v2.0b Advanced font selection for XeLaTeX/LuaLaTeX]
@@ -1443,8 +1443,8 @@
\zf@define@feature@option{Ligatures}{NoDiscretionary}{1}{5}{-dlig}
\zf@define@feature@option{Ligatures}{Contextual} {}{} {+clig}
\zf@define@feature@option{Ligatures}{NoContextual} {}{} {-clig}
-\zf@define@feature@option{Ligatures}{Historical} {}{} {+hlig}
-\zf@define@feature@option{Ligatures}{NoHistorical} {}{} {-hlig}
+\zf@define@feature@option{Ligatures}{Historic} {}{} {+hlig}
+\zf@define@feature@option{Ligatures}{NoHistoric} {}{} {-hlig}
\zf@define@feature@option{Ligatures}{Logos} {1}{6} {}
\zf@define@feature@option{Ligatures}{NoLogos} {1}{7} {}
\zf@define@feature@option{Ligatures}{Rebus} {1}{8} {}
@@ -1537,20 +1537,31 @@
\setkeys*[zf@feat]{Alternate}{#1}
\unless\ifx\XKV@rm\@empty
\def\XKV@tfam{Alternate}
- \fontspec_make_feature:nnn{17}{#1}{+salt=#1}
+ \fontspec_make_feature:nnx {17}{#1} { \fontspec_salt:n {#1} }
\fi
\clist_set_eq:NN \XKV@rm \l_fontspec_tmpa_clist
}
+\xetex_or_luatex:nnn { \cs_set:Npn \fontspec_salt:n #1 }
+ {+salt=#1} { +salt= \intexpr_eval:n {#1+1} }
\define@key[zf]{options}{Variant}{
\clist_set_eq:NN \l_fontspec_tmpa_clist \XKV@rm
\setkeys*[zf@feat]{Variant}{#1}
\unless\ifx\XKV@rm\@empty
\def\XKV@tfam{Variant}
- \fontspec_make_feature:nnx{18}{#1}{+ss\two@digits{#1}}
+ \fontspec_make_feature:nnx {18}{#1} { +ss \two@digits {#1} }
\fi
\clist_set_eq:NN \XKV@rm \l_fontspec_tmpa_clist
}
\aliasfontfeature{Variant}{StylisticSet}
+\define@key[zf]{options}{CharacterVariant}{
+ \clist_set_eq:NN \l_fontspec_tmpa_clist \XKV@rm
+ \setkeys*[zf@feat]{CharacterVariant}{#1}
+ \unless\ifx\XKV@rm\@empty
+ \def\XKV@tfam{CharacterVariant}
+ \fontspec_make_feature:nnx {}{} { +cv \two@digits {#1} }
+ \fi
+ \clist_set_eq:NN \XKV@rm \l_fontspec_tmpa_clist
+}
\zf@define@font@feature{Style}
\zf@define@feature@option{Style}{Alternate} {} {} {+salt}
\zf@define@feature@option{Style}{Italic} {32}{2}{+ital}
@@ -1597,10 +1608,12 @@
\setkeys*[zf@feat]{Annotation}{#1}
\unless\ifx\XKV@rm\@empty
\def\XKV@tfam{Alternate}
- \fontspec_make_feature:nnn{}{}{+nalt=#1}
+ \fontspec_make_feature:nnx {}{} { \fontspec_nalt:n {#1} }
\fi
\clist_set_eq:NN \XKV@rm \l_fontspec_tmpa_clist
}
+\xetex_or_luatex:nnn { \cs_set:Npn \fontspec_nalt:n #1 }
+ {+nalt=#1} { +nalt= \intexpr_eval:n {#1+1} }
\zf@define@font@feature{Vertical}
\define@key[zf@feat]{Vertical}{RotatedGlyphs}[]{
\ifzf@icu