From bed7f978b1f35e9c4e54dac8f7d57f537f112ffa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 23 Sep 2010 18:28:18 +0000 Subject: luatextra (4aug10) git-svn-id: svn://tug.org/texlive/trunk@19860 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/luatex/luatextra/luatextra.lua | 4 ++-- Master/texmf-dist/tex/luatex/luatextra/luatextra.sty | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/tex/luatex/luatextra') diff --git a/Master/texmf-dist/tex/luatex/luatextra/luatextra.lua b/Master/texmf-dist/tex/luatex/luatextra/luatextra.lua index 1e8a51ca278..4721e5871c2 100644 --- a/Master/texmf-dist/tex/luatex/luatextra/luatextra.lua +++ b/Master/texmf-dist/tex/luatex/luatextra/luatextra.lua @@ -17,9 +17,9 @@ -- module("luatextra", package.seeall) luatexbase.provides_module { - version = 0.97, + version = 0.971, name = "luatextra", - date = "2010/05/10", + date = "2010/08/02", description = "Additional low level functions for LuaTeX", author = "Elie Roux and Manuel Pegourie-Gonnard", copyright = "Elie Roux, 2009 and Manuel Pegourie-Gonnard, 2010", diff --git a/Master/texmf-dist/tex/luatex/luatextra/luatextra.sty b/Master/texmf-dist/tex/luatex/luatextra/luatextra.sty index ced176ec071..68743355202 100644 --- a/Master/texmf-dist/tex/luatex/luatextra/luatextra.sty +++ b/Master/texmf-dist/tex/luatex/luatextra/luatextra.sty @@ -19,6 +19,7 @@ \let\ifluatextraloaded\endinput +\bgroup\expandafter\expandafter\expandafter\egroup \expandafter\ifx\csname ProvidesPackage\endcsname\relax \expandafter\ifx\csname ifluatex\endcsname\relax \input ifluatex.sty @@ -27,15 +28,15 @@ \RequirePackage{ifluatex} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luatextra} - [2010/05/10 v0.97 LuaTeX extra low-level macros] + [2010/08/02 v0.971 LuaTeX extra low-level macros] \fi \def\LuaTeX{Lua\TeX } \def\LuaLaTeX{Lua\LaTeX } -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname RequirePackage\endcsname\relax +\bgroup\expandafter\expandafter\expandafter\egroup +\expandafter\ifx\csname ProvidesPackage\endcsname\relax \input ifluatex.sty \else \RequirePackage{ifluatex} @@ -53,8 +54,8 @@ Aborting package loading.} \expandafter\endinput \fi -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname RequirePackage\endcsname\relax +\bgroup\expandafter\expandafter\expandafter\egroup +\expandafter\ifx\csname ProvidesPackage\endcsname\relax \input luatexbase-modutils.sty \input luatexbase-attr.sty \input luatexbase-cctb.sty @@ -68,7 +69,8 @@ \RequirePackage{luatexbase-mcb} \fi \luatexUseModule{lualibs} -\expandafter\ifx\csname RequirePackage\endcsname\relax \else +\bgroup\expandafter\expandafter\expandafter\egroup +\expandafter\ifx\csname ProvidesPackage\endcsname\relax \else \RequirePackage{environ} \NewEnviron{luacode}{\directlua{\BODY}} \fi @@ -117,6 +119,7 @@ \let\luaModuleError\luatexModuleError \let\luaRequireModule\luatexRequireModule \let\luaUseModule\luatexUseModule +\bgroup\expandafter\expandafter\expandafter\egroup \expandafter\ifx\csname ProvidesPackage\endcsname\relax \input luaotfload.sty \else -- cgit v1.2.3