summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fontspec
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-11-18 00:34:22 +0000
committerKarl Berry <karl@freefriends.org>2010-11-18 00:34:22 +0000
commit32b992616e0edeae8f7cb513fb6416d1ebbc1ea7 (patch)
treeceaa7dc5367b1cf75979defe291a01dc8f2fd79d /Master/texmf-dist/tex/latex/fontspec
parent27724eb3da73a3049863e8003a12706a67fb0191 (diff)
fontspec (17nov10)
git-svn-id: svn://tug.org/texlive/trunk@20472 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.lua11
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec.sty6
3 files changed, 11 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty
index 25f905efd09..6f92f41bdb0 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/11/07 v2.1d Advanced font selection for XeLaTeX/LuaLaTeX]
+ [2010/11/17 v2.1e Advanced font selection for XeLaTeX/LuaLaTeX]
\ExplSyntaxOn
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
index 040e5dcb8a4..801f9e4de2d 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
@@ -25,10 +25,13 @@ fontspec.module = {
copyright = "Khaled Hosny",
license = "LPPL"
}
-luatexbase.provides_module(fontspec.module)
-function fontspec.log (...) luatexbase.module_log (fontspec.module.name, string.format(...)) end
-function fontspec.warning(...) luatexbase.module_warning(fontspec.module.name, string.format(...)) end
-function fontspec.error (...) luatexbase.module_error (fontspec.module.name, string.format(...)) end
+
+local err, warn, info, log = luatexbase.provides_module(fontspec.module)
+
+fontspec.log = log
+fontspec.warning = warn
+fontspec.error = err
+
function fontspec.sprint (...) tex.sprint(luatexbase.catcodetables['latex-package'], ...) end
local function check_script(id, script)
local s = string.lower(script)
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
index a1407c8e32e..ebac6a7c599 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/11/07 v2.1d Advanced font selection for XeLaTeX/LuaLaTeX]
+ [2010/11/17 v2.1e Advanced font selection for XeLaTeX/LuaLaTeX]
\RequirePackage{expl3,xparse}
@@ -26,8 +26,8 @@
}
\xetex_if_engine:F {
\luatex_if_engine:TF {
- \RequirePackage{luatextra}[2010/05/10]
- \luatexRequireModule{fontspec}
+ \RequirePackage{luaotfload}
+ \RequireLuaModule{fontspec}
}{
\msg_fatal:nn {fontspec} {not-pdftex}
}