From 32b992616e0edeae8f7cb513fb6416d1ebbc1ea7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 18 Nov 2010 00:34:22 +0000 Subject: fontspec (17nov10) git-svn-id: svn://tug.org/texlive/trunk@20472 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/fontspec/fontspec.dtx | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/source/latex/fontspec') 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 %\ProvidesPackage{fontspec} %\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] % % %<*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 -- cgit v1.2.3