Be carful with primitives in attr and cctb.

2 files changed, 43 insertions, 0 deletions

diff --git a/luatexbase-attr.dtx b/luatexbase-attr.dtx
index 3d88b3a..0d8bfb6 100644
--- a/luatexbase-attr.dtx
+++ b/luatexbase-attr.dtx
@@ -250,6 +250,27 @@ See source file '\inFileName' for details.
 \fi
 %    \end{macrocode}
 %
+%    \subsubsection{Primitives needed}
+%
+%    Load \pk{luatexbase-compat}.
+%
+%    \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+  \input luatexbase-compat.sty
+\else
+  \RequirePackage{luatexbase-compat}
+\fi
+%    \end{macrocode}
+%
+%    Make sure the primitives we need are available.
+%
+%    \begin{macrocode}
+\luatexbase@ensure@primitive{luaescapestring}
+\luatexbase@ensure@primitive{attributedef}
+\luatexbase@ensure@primitive{attribute}
+%    \end{macrocode}
+%
 %    \subsubsection{Load supporting Lua module}
 %
 %    First load \pk{luatexbase-loader} (hence \pk{luatexbase-compat}), then
diff --git a/luatexbase-cctb.dtx b/luatexbase-cctb.dtx
index 8e722b0..a3f2852 100644
--- a/luatexbase-cctb.dtx
+++ b/luatexbase-cctb.dtx
@@ -288,6 +288,28 @@ See source file '\inFileName' for details.
 \luatexbase@directlua{require('luatexbase.cctb')}
 %    \end{macrocode}
 %
+%    \subsubsection{Primitives needed}
+%
+%    Load \pk{luatexbase-compat}.
+%
+%    \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+  \input luatexbase-compat.sty
+\else
+  \RequirePackage{luatexbase-compat}
+\fi
+%    \end{macrocode}
+%
+%    Make sure the primitives we need are available.
+%
+%    \begin{macrocode}
+\luatexbase@ensure@primitive{luaescapestring}
+\luatexbase@ensure@primitive{catcodetable}
+\luatexbase@ensure@primitive{initcatcodetable}
+\luatexbase@ensure@primitive{savecatcodetable}
+%    \end{macrocode}
+%
 %    \subsubsection{User macros}
 %
 %    The allocation macro. Allocate tables starting with 1, since table 0 is