summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes3
-rw-r--r--luatexbase.dtx19
2 files changed, 20 insertions, 2 deletions
diff --git a/Changes b/Changes
index e3a7959..0b6b3d4 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,9 @@
Changes in the luatexbase package/bundle
2013/04/13 v0.5
+ all
+ - input luatex.sty before doing anything, is luatex.sty
+ breaks if loaded after luatexbase
mcb and loader
- compatibility with Lua 5.2 (LuaTeX >= 0.74)
loader
diff --git a/luatexbase.dtx b/luatexbase.dtx
index 6bf3fa6..49b0c07 100644
--- a/luatexbase.dtx
+++ b/luatexbase.dtx
@@ -132,11 +132,11 @@ See the aforementioned source file(s) for copyright and licensing information.
% \subsection{History}
%
% The first package for managing \luatex's new resources was the \pk{luatex}
-% package by Heiko Oberdiek. Later, Élie Roux wrote \pk{luatextra} which
+% package by Heiko Oberdiek. Later, \'Elie Roux wrote \pk{luatextra} which
% reprised many features of \pk{luatex} with little extensions to some of them
% and added independant low-level features (currently found in the
% \pk{modutils} and \pk{mcb} subpackages), as well as user-level things.
-% Later, \pk{luatexbase} was created by Manuel Pégourié-Gonnard by isolating
+% Later, \pk{luatexbase} was created by Manuel P\'egouri\'e-Gonnard by isolating
% the general low-level features of \pk{luatextra}, and later expanding on
% them.
%
@@ -243,6 +243,21 @@ See the aforementioned source file(s) for copyright and licensing information.
\fi
% \end{macrocode}
%
+% %\subsection{luatex.sty compatibility}
+%
+% Currently, |luatex.sty| has to be loaded before luatexbase, otherwise it
+% raises an error, as the same names are used between luatexbase and luatex.
+%
+% This is a quite strange situation, but we hope to clarify it.
+%
+% \begin{macrocode}
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+ \input luatex.sty
+\else
+ \RequirePackage{luatex}
+\fi
+% \end{macrocode}
+%
% \subsection{Packages loading}
%
% \begin{macrocode}