From 46c64ac9b3bb3dab8bf4a1dc6039983171c73186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Mon, 29 Mar 2010 06:03:16 +0200
Subject: First attempt at using compat.

---
 luatexbase-attr.dtx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'luatexbase-attr.dtx')

diff --git a/luatexbase-attr.dtx b/luatexbase-attr.dtx
index 41d7b88..1d66d5a 100644
--- a/luatexbase-attr.dtx
+++ b/luatexbase-attr.dtx
@@ -252,6 +252,9 @@ See source file '\inFileName' for details.
 %
 %    \subsubsection{Load supporting Lua module}
 %
+%    First load \pk{luatexbase-loader} (hence \pk{luatexbase-compat}), then
+%    the supporting Lua module.
+%
 %    \begin{macrocode}
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname RequirePackage\endcsname\relax
@@ -259,7 +262,7 @@ See source file '\inFileName' for details.
 \else
   \RequirePackage{luatexbase-loader}
 \fi
-\directlua{require('luatexbase.attr')}
+\luatexbase@directlua{require('luatexbase.attr')}
 %    \end{macrocode}
 %
 %    \subsection{User macros}
@@ -276,7 +279,7 @@ See source file '\inFileName' for details.
     \global\luatexattributedef#1=\allocationnumber
     \unsetluatexattribute#1%
     \begingroup\escapechar\m@ne \expandafter\endgroup
-    \directlua{luatexbase.attributedef_from_tex(
+    \luatexbase@directlua{luatexbase.attributedef_from_tex(
       '\luatexluaescapestring{\string#1}', '\number\allocationnumber')}%
     \wlog{\string#1=\string\luatexattribute\the\allocationnumber}%
   \else
@@ -343,13 +346,14 @@ end
 \newluatexattribute\testattr
 \setluatexattribute\testattr{1}
 \unsetluatexattribute\testattr
-\directlua{assert(luatexbase.attributes.testattr)}
+\catcode64 11
+\luatexbase@directlua{assert(luatexbase.attributes.testattr)}
 \begingroup
 \escapechar64
 \newluatexattribute\anotherattr
 \endgroup
 \setluatexattribute\anotherattr{1}
-\directlua{assert(luatexbase.attributes.anotherattr)}
+\luatexbase@directlua{assert(luatexbase.attributes.anotherattr)}
 %</testplain,testlatex>
 %<testplain>\bye
 %<testlatex>\stop
-- 
cgit v1.2.3

