7 files changed, 29 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/latex/fontspec/README b/Master/texmf-dist/doc/latex/fontspec/README
index b5eef754d88..63c18e41c85 100644
--- a/Master/texmf-dist/doc/latex/fontspec/README
+++ b/Master/texmf-dist/doc/latex/fontspec/README
@@ -88,7 +88,12 @@ Features can be renamed and feature options can be renamed with
 Change history
 --------------
 
+- v2.1e (2010/11/17)
+
+    * Internal changes for luatexbase v0.3.
+
 - v2.1d (2010/11/07)
+
     * Bug fix when \itdefault is "sl" rather than "it".
       E.g., when using the "slides" class.
     * Minor internal changes, including merging some code from unicode-math.
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf
index 333e2e5f452..fe5e91b24e2 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec-testsuite.pdf
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
index b0963a2faad..aa30a7cf428 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
index ef3b45c4cc3..8f57befd73b 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
@@ -62,7 +62,7 @@ This work consists of this file fontspec.dtx
 %<fontspec>\ProvidesPackage{fontspec}
 %<patches>\ProvidesPackage{fontspec-patches}
 %<*fontspec|patches>
-  [2010/11/07 v2.1d Advanced font selection for XeLaTeX/LuaLaTeX]
+  [2010/11/17 v2.1e Advanced font selection for XeLaTeX/LuaLaTeX]
 %</fontspec|patches>
 %
 %<*driver>
@@ -2465,6 +2465,9 @@ This work consists of this file fontspec.dtx
 \ExplSyntaxOn
 %    \end{macrocode}
 %
+%    Check engine and load specific modules. For Lua\TeX, load only
+%    \pkg{luaotfload} which loads \pkg{luatexbase} and \pkg{lualibs} too.
+%
 %    \begin{macrocode}
 \msg_new:nnn {fontspec} {not-pdftex}
 {
@@ -2472,8 +2475,8 @@ This work consists of this file fontspec.dtx
 }
 \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}
   }
@@ -5999,13 +6002,16 @@ fontspec.module   = {
     copyright     = "Khaled Hosny",
     license       = "LPPL"
 }
-luatexbase.provides_module(fontspec.module)
+
+local err, warn, info, log = luatexbase.provides_module(fontspec.module)
+
 %    \end{macrocode}
 % Some utility functions
 %    \begin{macrocode}
-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
+fontspec.log     = log
+fontspec.warning = warn
+fontspec.error   = err
+
 function fontspec.sprint (...) tex.sprint(luatexbase.catcodetables['latex-package'], ...) end
 %    \end{macrocode}
 % The following functions check for exsitence of certain script, language or
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}
   }