From 8120c7e0e54f7fc6ed22a78a8be84971d95b7071 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 18 Sep 2011 22:30:00 +0000 Subject: fontspec 2.2a (18sep11) git-svn-id: svn://tug.org/texlive/trunk@24004 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/fontspec/fontspec-luatex.sty | 24 ++++++++++++++-------- .../tex/latex/fontspec/fontspec-patches.sty | 2 +- .../tex/latex/fontspec/fontspec-xetex.sty | 24 ++++++++++++++-------- Master/texmf-dist/tex/latex/fontspec/fontspec.sty | 2 +- 4 files changed, 32 insertions(+), 20 deletions(-) (limited to 'Master/texmf-dist/tex') 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 diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty index 72b3dfc6bd4..8f9ba41e426 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} - [2011/09/13 v2.2 Advanced font selection for XeLaTeX/LuaLaTeX] + [2011/09/18 v2.2a Advanced font selection for XeLaTeX/LuaLaTeX] \ExplSyntaxOn diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty index 4fab045b766..b0fad28a8a8 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty @@ -14,7 +14,7 @@ %% %% \ProvidesPackage{fontspec-xetex} - [2011/09/13 v2.2 Advanced font selection for XeLaTeX/LuaLaTeX] + [2011/09/18 v2.2a Advanced font selection for XeLaTeX/LuaLaTeX] \ExplSyntaxOn @@ -50,6 +50,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} } @@ -66,10 +70,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 { @@ -82,10 +85,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: @@ -2018,9 +2021,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 diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty index 14c282e8727..6b4caf9d773 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} - [2011/09/13 v2.2 Advanced font selection for XeLaTeX/LuaLaTeX] + [2011/09/18 v2.2a Advanced font selection for XeLaTeX/LuaLaTeX] \RequirePackage{expl3}[2011/09/05] -- cgit v1.2.3