diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty index 02a6ab12561..bac3bf4cd66 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty @@ -14,7 +14,7 @@ %% %% \ProvidesPackage{fontspec-luatex} - [2011/09/13 v2.2 Advanced font selection for XeLaTeX/LuaLaTeX] + [2011/09/18 v2.2a Advanced font selection for XeLaTeX/LuaLaTeX] \ExplSyntaxOn @@ -53,6 +53,10 @@ \normalfont } \cs_set_eq:NN \setromanfont \setmainfont +\tl_new:N \g_fontspec_mathrm_tl +\tl_new:N \g_fontspec_bfmathrm_tl +\tl_new:N \g_fontspec_mathsf_tl +\tl_new:N \g_fontspec_mathtt_tl \DeclareDocumentCommand \setmathrm { O{} m } { \fontspec_set_family:Nnn \g_fontspec_mathrm_tl {#1}{#2} } @@ -69,10 +73,9 @@ \@onlypreamble\setboldmathrm \@onlypreamble\setmathsf \@onlypreamble\setmathtt -\def\g_fontspec_mathrm_tl{\rmdefault} -\def\g_fontspec_mathsf_tl{\sfdefault} -\def\g_fontspec_mathtt_tl{\ttdefault} -\tl_clear:N \g_fontspec_bfmathrm_tl +\tl_set:Nn \g_fontspec_mathrm_tl {\rmdefault} +\tl_set:Nn \g_fontspec_mathsf_tl {\sfdefault} +\tl_set:Nn \g_fontspec_mathtt_tl {\ttdefault} \DeclareDocumentCommand \newfontfamily { m O{} m } { \fontspec_select:nn{#2}{#3} \use:x { @@ -85,10 +88,10 @@ \DeclareDocumentCommand \newfontface { m O{} m } { \newfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2 ] {#3} } +\tl_new:N \g_fontspec_default_fontopts_tl \DeclareDocumentCommand \defaultfontfeatures {m} { \tl_set:Nn \g_fontspec_default_fontopts_tl {#1,} } -\tl_clear:N \g_fontspec_default_fontopts_tl \DeclareDocumentCommand \addfontfeatures {m} { \ifcsname zf@family@fontdef\f@family\endcsname \group_begin: @@ -1946,9 +1949,12 @@ {\typeout{No~ fontspec.cfg~ file~ found;~ no~ configuration~ loaded.}} } \tl_set:Nn \zf@enc { \g_fontspec_encoding_tl } -\tl_set:Nn \zf@family { \l_fontspec_family_tl } -\tl_set:Nn \zf@basefont { \l_fontspec_font } -\cs_set_eq:NN \zf@fontspec \fontspec_select:nn +\cs_set:Npn \zf@fontspec #1 #2 + { + \fontspec_select:nn {#1} {#2} + \tl_set:Nn \zf@family { \l_fontspec_family_tl } + \tl_set:Nn \zf@basefont { \l_fontspec_font } + } \ExplSyntaxOff %% %% Copyright 2004--2011 Will Robertson <wspr81@gmail.com> |