summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-03-17 21:52:23 +0000
committerKarl Berry <karl@freefriends.org>2013-03-17 21:52:23 +0000
commit80090176bd324ec248211fca691b6133abc263d2 (patch)
tree12808db627a2d2c7a59f4ee5d5ccbe42bbef7366
parente6826e3bb3139f2329f722784dfa24c5cbb824dc (diff)
fontspec
git-svn-id: svn://tug.org/texlive/trunk@29412 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/fontspec/README4
-rw-r--r--Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdfbin272893 -> 272820 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontspec/fontspec.pdfbin2801312 -> 2801314 bytes
-rw-r--r--Master/texmf-dist/source/latex/fontspec/fontspec.dtx12
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty12
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty8
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty12
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec.lua6
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec.sty8
9 files changed, 33 insertions, 29 deletions
diff --git a/Master/texmf-dist/doc/latex/fontspec/README b/Master/texmf-dist/doc/latex/fontspec/README
index 5ebebcddb17..cdd4c642542 100644
--- a/Master/texmf-dist/doc/latex/fontspec/README
+++ b/Master/texmf-dist/doc/latex/fontspec/README
@@ -72,6 +72,10 @@ Features may be added to the font currently in use with
Change history
--------------
+- v2.3a (2013/03/16)
+
+ * Bug fix update to retain compatibility with new expl3
+
- v2.3 (2013/02/25)
* Add support for per-font options in `\defaultfontfeatures`
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf
index e5fb90a6995..2556562e468 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
index b4f3e785cec..9c6880b6ad2 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
index 28b6d4a5c46..f31264b1d83 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
@@ -9,7 +9,7 @@
_________________________________________
The fontspec package for XeLaTeX/LuaLaTeX
- (C) 2004--2012 Will Robertson and Khaled Hosny
+ (C) 2004--2013 Will Robertson and Khaled Hosny
License information appended.
@@ -17,8 +17,8 @@
\endpreamble
\postamble
-Copyright 2004--2012 Will Robertson <wspr81@gmail.com>
-Copyright 2009--2012 Khaled Hosny <khaledhosny@eglug.org>
+Copyright 2004--2013 Will Robertson <wspr81@gmail.com>
+Copyright 2009--2013 Khaled Hosny <khaledhosny@eglug.org>
Distributable under the LaTeX Project Public License,
version 1.3c or higher (your choice). The latest version of
@@ -66,7 +66,7 @@ This work consists of this file fontspec.dtx
%<fontspec&luatex>\ProvidesPackage{fontspec-luatex}
%<patches>\ProvidesPackage{fontspec-patches}
%<*fontspec|patches>
- [2013/02/25 v2.3 Font selection for XeLaTeX and LuaLaTeX]
+ [2013/03/16 v2.3a Font selection for XeLaTeX and LuaLaTeX]
%</fontspec|patches>
%
%<*driver>
@@ -5433,10 +5433,10 @@ This work consists of this file fontspec.dtx
\convertcolorspec{named}{#1}{HTML}\l_fontspec_hexcol_tl
}
{
- \int_compare:nTF { \tl_length:n {#1} == 6 }
+ \int_compare:nTF { \tl_count:n {#1} == 6 }
{ \tl_set:Nn \l_fontspec_hexcol_tl {#1} }
{
- \int_compare:nTF { \tl_length:n {#1} == 8 }
+ \int_compare:nTF { \tl_count:n {#1} == 8 }
{ \fontspec_parse_colour:viii #1 }
{
\bool_if:NF \l_fontspec_firsttime_bool
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
index 4a82ad05de5..7ba03b2cf47 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
@@ -8,13 +8,13 @@
%%
%% _________________________________________
%% The fontspec package for XeLaTeX/LuaLaTeX
-%% (C) 2004--2012 Will Robertson and Khaled Hosny
+%% (C) 2004--2013 Will Robertson and Khaled Hosny
%%
%% License information appended.
%%
%%
\ProvidesPackage{fontspec-luatex}
- [2013/02/25 v2.3 Font selection for XeLaTeX and LuaLaTeX]
+ [2013/03/16 v2.3a Font selection for XeLaTeX and LuaLaTeX]
\ExplSyntaxOn
@@ -1352,10 +1352,10 @@
\convertcolorspec{named}{#1}{HTML}\l_fontspec_hexcol_tl
}
{
- \int_compare:nTF { \tl_length:n {#1} == 6 }
+ \int_compare:nTF { \tl_count:n {#1} == 6 }
{ \tl_set:Nn \l_fontspec_hexcol_tl {#1} }
{
- \int_compare:nTF { \tl_length:n {#1} == 8 }
+ \int_compare:nTF { \tl_count:n {#1} == 8 }
{ \fontspec_parse_colour:viii #1 }
{
\bool_if:NF \l_fontspec_firsttime_bool
@@ -2180,8 +2180,8 @@
}
\ExplSyntaxOff
%%
-%% Copyright 2004--2012 Will Robertson <wspr81@gmail.com>
-%% Copyright 2009--2012 Khaled Hosny <khaledhosny@eglug.org>
+%% Copyright 2004--2013 Will Robertson <wspr81@gmail.com>
+%% Copyright 2009--2013 Khaled Hosny <khaledhosny@eglug.org>
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty
index 7564e72ddc4..fc14aa67365 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty
@@ -8,13 +8,13 @@
%%
%% _________________________________________
%% The fontspec package for XeLaTeX/LuaLaTeX
-%% (C) 2004--2012 Will Robertson and Khaled Hosny
+%% (C) 2004--2013 Will Robertson and Khaled Hosny
%%
%% License information appended.
%%
%%
\ProvidesPackage{fontspec-patches}
- [2013/02/25 v2.3 Font selection for XeLaTeX and LuaLaTeX]
+ [2013/03/16 v2.3a Font selection for XeLaTeX and LuaLaTeX]
\ExplSyntaxOn
@@ -131,8 +131,8 @@
{ \addfontfeature{Numbers=Lining} #1 }
}
%%
-%% Copyright 2004--2012 Will Robertson <wspr81@gmail.com>
-%% Copyright 2009--2012 Khaled Hosny <khaledhosny@eglug.org>
+%% Copyright 2004--2013 Will Robertson <wspr81@gmail.com>
+%% Copyright 2009--2013 Khaled Hosny <khaledhosny@eglug.org>
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
index ef0d4a3b988..e1f17ad5caa 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
@@ -8,13 +8,13 @@
%%
%% _________________________________________
%% The fontspec package for XeLaTeX/LuaLaTeX
-%% (C) 2004--2012 Will Robertson and Khaled Hosny
+%% (C) 2004--2013 Will Robertson and Khaled Hosny
%%
%% License information appended.
%%
%%
\ProvidesPackage{fontspec-xetex}
- [2013/02/25 v2.3 Font selection for XeLaTeX and LuaLaTeX]
+ [2013/03/16 v2.3a Font selection for XeLaTeX and LuaLaTeX]
\ExplSyntaxOn
@@ -1416,10 +1416,10 @@
\convertcolorspec{named}{#1}{HTML}\l_fontspec_hexcol_tl
}
{
- \int_compare:nTF { \tl_length:n {#1} == 6 }
+ \int_compare:nTF { \tl_count:n {#1} == 6 }
{ \tl_set:Nn \l_fontspec_hexcol_tl {#1} }
{
- \int_compare:nTF { \tl_length:n {#1} == 8 }
+ \int_compare:nTF { \tl_count:n {#1} == 8 }
{ \fontspec_parse_colour:viii #1 }
{
\bool_if:NF \l_fontspec_firsttime_bool
@@ -2259,8 +2259,8 @@
}
\ExplSyntaxOff
%%
-%% Copyright 2004--2012 Will Robertson <wspr81@gmail.com>
-%% Copyright 2009--2012 Khaled Hosny <khaledhosny@eglug.org>
+%% Copyright 2004--2013 Will Robertson <wspr81@gmail.com>
+%% Copyright 2009--2013 Khaled Hosny <khaledhosny@eglug.org>
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
index 04f3de54d22..cb6a24926e5 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
@@ -8,7 +8,7 @@
--
-- _________________________________________
-- The fontspec package for XeLaTeX/LuaLaTeX
--- (C) 2004--2012 Will Robertson and Khaled Hosny
+-- (C) 2004--2013 Will Robertson and Khaled Hosny
--
-- License information appended.
--
@@ -152,8 +152,8 @@ local function set_capheight(fontdata)
end
luatexbase.add_to_callback("luaotfload.patch_font", set_capheight, "fontspec.set_capheight")
--
--- Copyright 2004--2012 Will Robertson <wspr81@gmail.com>
--- Copyright 2009--2012 Khaled Hosny <khaledhosny@eglug.org>
+-- Copyright 2004--2013 Will Robertson <wspr81@gmail.com>
+-- Copyright 2009--2013 Khaled Hosny <khaledhosny@eglug.org>
--
-- Distributable under the LaTeX Project Public License,
-- version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
index 97b0bf750a5..c145b8145e8 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
@@ -8,13 +8,13 @@
%%
%% _________________________________________
%% The fontspec package for XeLaTeX/LuaLaTeX
-%% (C) 2004--2012 Will Robertson and Khaled Hosny
+%% (C) 2004--2013 Will Robertson and Khaled Hosny
%%
%% License information appended.
%%
%%
\ProvidesPackage{fontspec}
- [2013/02/25 v2.3 Font selection for XeLaTeX and LuaLaTeX]
+ [2013/03/16 v2.3a Font selection for XeLaTeX and LuaLaTeX]
\RequirePackage{expl3}[2011/09/05]
@@ -273,8 +273,8 @@
\luatex_if_engine:T { \RequirePackage{fontspec-luatex} \endinput }
\xetex_if_engine:T { \RequirePackage{fontspec-xetex} \endinput }
%%
-%% Copyright 2004--2012 Will Robertson <wspr81@gmail.com>
-%% Copyright 2009--2012 Khaled Hosny <khaledhosny@eglug.org>
+%% Copyright 2004--2013 Will Robertson <wspr81@gmail.com>
+%% Copyright 2009--2013 Khaled Hosny <khaledhosny@eglug.org>
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of