diff options
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/luatex/luatextra/News | 3 | ||||
-rw-r--r-- | Master/texmf-dist/doc/luatex/luatextra/luatextra.pdf | bin | 178790 -> 178866 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/luatex/luatextra/luatextra.dtx | 23 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatextra/luatextra.lua | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatextra/luatextra.sty | 15 |
5 files changed, 27 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatextra/News b/Master/texmf-dist/doc/luatex/luatextra/News index ebcb2979d48..aec037bcede 100644 --- a/Master/texmf-dist/doc/luatex/luatextra/News +++ b/Master/texmf-dist/doc/luatex/luatextra/News @@ -1,5 +1,8 @@ History of the luatextra bundle +2010/08/02 v0.971 + * fix latex detection that used to break latex detection in other packages + (inc. TikZ). 2010/05/10 * adaptation to the new luatexbase package diff --git a/Master/texmf-dist/doc/luatex/luatextra/luatextra.pdf b/Master/texmf-dist/doc/luatex/luatextra/luatextra.pdf Binary files differindex 46bfd190696..e914f67113d 100644 --- a/Master/texmf-dist/doc/luatex/luatextra/luatextra.pdf +++ b/Master/texmf-dist/doc/luatex/luatextra/luatextra.pdf diff --git a/Master/texmf-dist/source/luatex/luatextra/luatextra.dtx b/Master/texmf-dist/source/luatex/luatextra/luatextra.dtx index 51aba955401..406386d0abe 100644 --- a/Master/texmf-dist/source/luatex/luatextra/luatextra.dtx +++ b/Master/texmf-dist/source/luatex/luatextra/luatextra.dtx @@ -97,7 +97,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{luatextra.drv}% - [2010/05/10 v0.97 LuaTeX extra low-level macros.]% + [2010/08/02 v0.971 LuaTeX extra low-level macros.]% \documentclass{ltxdoc} \EnableCrossrefs \CodelineIndex @@ -128,7 +128,7 @@ and the derived files % \GetFileInfo{luatextra.drv} % % \title{The \textsf{luatextra} package} -% \date{2010/05/10 v0.97} +% \date{2010/08/02 v0.971} % \author{Elie Roux \\ \texttt{elie.roux@telecom-bretagne.eu}} % % \maketitle @@ -170,9 +170,9 @@ module("luatextra", package.seeall) % % \begin{macrocode} 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", @@ -419,6 +419,7 @@ end % % \begin{macrocode} +\bgroup\expandafter\expandafter\expandafter\egroup \expandafter\ifx\csname ProvidesPackage\endcsname\relax \expandafter\ifx\csname ifluatex\endcsname\relax \input ifluatex.sty @@ -427,7 +428,7 @@ end \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 % \end{macrocode} @@ -449,8 +450,8 @@ end % Make sure Lua\TeX\ is being used. % % \begin{macrocode} -\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} @@ -473,8 +474,8 @@ end % Load other usefull packages. % % \begin{macrocode} -\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 @@ -494,7 +495,8 @@ end % also define the environment \texttt{luacode}. % % \begin{macrocode} -\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 @@ -596,6 +598,7 @@ end % Finally, we load \textsf{luaotfload}. % % \begin{macrocode} +\bgroup\expandafter\expandafter\expandafter\egroup \expandafter\ifx\csname ProvidesPackage\endcsname\relax \input luaotfload.sty \else 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 |