error if not luatex

11 files changed, 110 insertions, 64 deletions

diff --git a/Changes b/Changes
index 8f4faf9..e2d2f3d 100644
--- a/Changes
+++ b/Changes
@@ -5,6 +5,7 @@ After  v0.3, the only possible source of such changes will be the upcoming
 merge with luatex.sty. Afterwards, no such changes are expected.
 
 (current changes) v0.3
+    all   not using LuaTeX results in an error (formerly a warning)
     attr
         - [BI] Name changes: \*luatexattribute -> \*attribute.
     modutils
diff --git a/TODO b/TODO
index aacc67b..d137f8f 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,5 @@
-all
----
-
-- regression checks on the results of the tests (sed+diff the log)
-- add debug messages (to be used in the test suite)?
+Version 0.3
+===========
 
 modutils
 --------
@@ -14,3 +11,25 @@ declaration and no declaration?
 - Update user documentation including template(s) for Lua modules once the
   preceding question is decided.
 
+general
+-------
+
+- `make check` for luaotfload & fontspec (lltxb branch)
+- synchronize release
+
+
+Later
+=====
+
+all
+---
+
+- discuss merge with Heiko...
+
+- regression checks on the results of the tests (sed+diff the log)
+- add debug messages to be used in the test suite?
+
+modutils
+--------
+
+- make `\listfiles` show Lua modules?
diff --git a/lltxb-dtxstyle.tex b/lltxb-dtxstyle.tex
index 01232b6..52771b4 100644
--- a/lltxb-dtxstyle.tex
+++ b/lltxb-dtxstyle.tex
@@ -1,41 +1,43 @@
 % preamble for dtx documentations of the luatexbase package/bundle.
 
+% packages
 \usepackage[T1]{fontenc}
+\usepackage{textcomp}
 \usepackage{lmodern}
-\usepackage{geometry}
 \usepackage{xspace}
+\usepackage[a4paper]{geometry}
 \usepackage[english]{babel}
 \usepackage[colorlinks]{hyperref}
 \usepackage{bookmark}
 
 % logos
 \makeatletter
-\newcommand\eTeX{$\m@th\varepsilon$-\TeX}
-\newcommand\LuaTeX{Lua\TeX}
-\renewcommand\PlainTeX{Plain\thinspace\TeX}
-\newcommand\TeXe{\TeX\thinspace82}
-\newcommand\TeXLive{\TeX\thinspace Live}
+\newcommand \eTeX       {$\m@th\varepsilon$-\TeX}
+\newcommand \LuaTeX     {Lua\TeX}
+\renewcommand \PlainTeX {Plain\thinspace\TeX}
+\newcommand \TeXe       {\TeX\thinspace82}
+\newcommand \TeXLive    {\TeX\thinspace Live}
 \makeatother
 
 % logos for the lazy me (mpg)
-\newcommand\tex{\TeX\xspace}
-\newcommand\latex{\LaTeX\xspace}
-\newcommand\etex{\eTeX\xspace}
-\newcommand\luatex{\LuaTeX\xspace}
-\newcommand\texe{\TeXe\xspace}
-\newcommand\texlive{\TeXLive\xspace}
-\newcommand\plaintex{\PlainTeX\xspace}
+\newcommand \tex      {\TeX\xspace}
+\newcommand \latex    {\LaTeX\xspace}
+\newcommand \etex     {\eTeX\xspace}
+\newcommand \luatex   {\LuaTeX\xspace}
+\newcommand \texe     {\TeXe\xspace}
+\newcommand \texlive  {\TeXLive\xspace}
+\newcommand \plaintex {\PlainTeX\xspace}
 
 % special elements of text
-\newcommand\file{\nolinkurl}
-\newcommand\email[1]{\href{mailto:#1}{#1}}
-\newcommand\pk{\textsf}
-\newcommand\cmdname{\texttt}
+\newcommand*\email [1] {<\href{mailto:#1}{#1}>}
+\newcommand \file       {\nolinkurl}
+\newcommand \pk         {\textsf}
+\newcommand \cmdname    {\texttt}
 
 % for hyperref
 \pdfstringdefDisableCommands{%
   \def\cs#1{\@backslashchar #1}%
-  }
+}
 
 % easy verbatim
 \MakeShortVerb\|
diff --git a/luatexbase-attr.dtx b/luatexbase-attr.dtx
index 6546aba..5f15aa1 100644
--- a/luatexbase-attr.dtx
+++ b/luatexbase-attr.dtx
@@ -250,14 +250,17 @@ See source file '\inFileName' for details.
 \fi
 \ifluatex\else
   \begingroup
-    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
-      \def\x#1#2{\begingroup\newlinechar10
-        \immediate\write16{Package #1 warning: #2}\endgroup}
+    \expandafter\ifx\csname PackageError\endcsname\relax
+      \def\x#1#2#3{\begingroup \newlinechar10
+        \errhelp{#3}\errmessage{Package #1 error: #2}\endgroup}
     \else
-      \let\x\PackageWarningNoLine
+      \let\x\PackageError
     \fi
   \expandafter\endgroup
-  \x{luatexbase-attr}{LuaTeX is required for this package. Aborting.}
+  \x{luatexbase-attr}{LuaTeX is required for this package. Aborting.}{%
+    This package can only be used with the LuaTeX engine^^J%
+    (command `lualatex' or `luatex').^^J%
+    Package loading has been stopped to prevent additional errors.}
   \lltxb@attr@AtEnd
   \expandafter\endinput
 \fi
diff --git a/luatexbase-cctb.dtx b/luatexbase-cctb.dtx
index 4b7b8c6..2e5f417 100644
--- a/luatexbase-cctb.dtx
+++ b/luatexbase-cctb.dtx
@@ -260,14 +260,17 @@ See source file '\inFileName' for details.
 \fi
 \ifluatex\else
   \begingroup
-    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
-      \def\x#1#2{\begingroup\newlinechar10
-        \immediate\write16{Package #1 warning: #2}\endgroup}
+    \expandafter\ifx\csname PackageError\endcsname\relax
+      \def\x#1#2#3{\begingroup \newlinechar10
+        \errhelp{#3}\errmessage{Package #1 error: #2}\endgroup}
     \else
-      \let\x\PackageWarningNoLine
+      \let\x\PackageError
     \fi
   \expandafter\endgroup
-  \x{luatexbase-cctb}{LuaTeX is required for this package. Aborting.}
+  \x{luatexbase-attr}{LuaTeX is required for this package. Aborting.}{%
+    This package can only be used with the LuaTeX engine^^J%
+    (command `lualatex' or `luatex').^^J%
+    Package loading has been stopped to prevent additional errors.}
   \lltxb@cctb@AtEnd
   \expandafter\endinput
 \fi
diff --git a/luatexbase-compat.dtx b/luatexbase-compat.dtx
index f4a903b..da3b59f 100644
--- a/luatexbase-compat.dtx
+++ b/luatexbase-compat.dtx
@@ -272,14 +272,17 @@ See source file '\inFileName' for details.
 \fi
 \ifluatex\else
   \begingroup
-    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
-      \def\x#1#2{\begingroup\newlinechar10
-        \immediate\write16{Package #1 warning: #2}\endgroup}
+    \expandafter\ifx\csname PackageError\endcsname\relax
+      \def\x#1#2#3{\begingroup \newlinechar10
+        \errhelp{#3}\errmessage{Package #1 error: #2}\endgroup}
     \else
-      \let\x\PackageWarningNoLine
+      \let\x\PackageError
     \fi
   \expandafter\endgroup
-  \x{luatexbase-compat}{LuaTeX is required for this package. Aborting.}
+  \x{luatexbase-attr}{LuaTeX is required for this package. Aborting.}{%
+    This package can only be used with the LuaTeX engine^^J%
+    (command `lualatex' or `luatex').^^J%
+    Package loading has been stopped to prevent additional errors.}
   \lltxb@compat@AtEnd
   \expandafter\endinput
 \fi
diff --git a/luatexbase-loader.dtx b/luatexbase-loader.dtx
index bd900c2..b78007d 100644
--- a/luatexbase-loader.dtx
+++ b/luatexbase-loader.dtx
@@ -244,14 +244,17 @@ See source file '\inFileName' for details.
 \fi
 \ifluatex\else
   \begingroup
-    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
-      \def\x#1#2{\begingroup\newlinechar10
-        \immediate\write16{Package #1 warning: #2}\endgroup}
+    \expandafter\ifx\csname PackageError\endcsname\relax
+      \def\x#1#2#3{\begingroup \newlinechar10
+        \errhelp{#3}\errmessage{Package #1 error: #2}\endgroup}
     \else
-      \let\x\PackageWarningNoLine
+      \let\x\PackageError
     \fi
   \expandafter\endgroup
-  \x{luatexbase-loader}{LuaTeX is required for this package. Aborting.}
+  \x{luatexbase-attr}{LuaTeX is required for this package. Aborting.}{%
+    This package can only be used with the LuaTeX engine^^J%
+    (command `lualatex' or `luatex').^^J%
+    Package loading has been stopped to prevent additional errors.}
   \lltxb@loader@AtEnd
   \expandafter\endinput
 \fi
diff --git a/luatexbase-mcb.dtx b/luatexbase-mcb.dtx
index 6ac45f2..c491742 100644
--- a/luatexbase-mcb.dtx
+++ b/luatexbase-mcb.dtx
@@ -358,14 +358,17 @@ See source file '\inFileName' for details.
 \fi
 \ifluatex\else
   \begingroup
-    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
-      \def\x#1#2{\begingroup\newlinechar10
-        \immediate\write16{Package #1 warning: #2}\endgroup}
+    \expandafter\ifx\csname PackageError\endcsname\relax
+      \def\x#1#2#3{\begingroup \newlinechar10
+        \errhelp{#3}\errmessage{Package #1 error: #2}\endgroup}
     \else
-      \let\x\PackageWarningNoLine
+      \let\x\PackageError
     \fi
   \expandafter\endgroup
-  \x{luatexbase-mcb}{LuaTeX is required for this package. Aborting.}
+  \x{luatexbase-attr}{LuaTeX is required for this package. Aborting.}{%
+    This package can only be used with the LuaTeX engine^^J%
+    (command `lualatex' or `luatex').^^J%
+    Package loading has been stopped to prevent additional errors.}
   \lltxb@mcb@AtEnd
   \expandafter\endinput
 \fi
diff --git a/luatexbase-modutils.dtx b/luatexbase-modutils.dtx
index 483ee96..91d97ab 100644
--- a/luatexbase-modutils.dtx
+++ b/luatexbase-modutils.dtx
@@ -275,14 +275,17 @@ See source file '\inFileName' for details.
 \fi
 \ifluatex\else
   \begingroup
-    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
-      \def\x#1#2{\begingroup\newlinechar10
-        \immediate\write16{Package #1 warning: #2}\endgroup}
+    \expandafter\ifx\csname PackageError\endcsname\relax
+      \def\x#1#2#3{\begingroup \newlinechar10
+        \errhelp{#3}\errmessage{Package #1 error: #2}\endgroup}
     \else
-      \let\x\PackageWarningNoLine
+      \let\x\PackageError
     \fi
   \expandafter\endgroup
-  \x{luatexbase-modutils}{LuaTeX is required for this package. Aborting.}
+  \x{luatexbase-attr}{LuaTeX is required for this package. Aborting.}{%
+    This package can only be used with the LuaTeX engine^^J%
+    (command `lualatex' or `luatex').^^J%
+    Package loading has been stopped to prevent additional errors.}
   \lltxb@modutils@AtEnd
   \expandafter\endinput
 \fi
diff --git a/luatexbase-regs.dtx b/luatexbase-regs.dtx
index 08d1060..7146cd5 100644
--- a/luatexbase-regs.dtx
+++ b/luatexbase-regs.dtx
@@ -225,14 +225,17 @@ See source file '\inFileName' for details.
 \fi
 \ifluatex\else
   \begingroup
-    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
-      \def\x#1#2{\begingroup\newlinechar10
-        \immediate\write16{Package #1 warning: #2}\endgroup}
+    \expandafter\ifx\csname PackageError\endcsname\relax
+      \def\x#1#2#3{\begingroup \newlinechar10
+        \errhelp{#3}\errmessage{Package #1 error: #2}\endgroup}
     \else
-      \let\x\PackageWarningNoLine
+      \let\x\PackageError
     \fi
   \expandafter\endgroup
-  \x{luatexbase-regs}{LuaTeX is required for this package. Aborting.}
+  \x{luatexbase-attr}{LuaTeX is required for this package. Aborting.}{%
+    This package can only be used with the LuaTeX engine^^J%
+    (command `lualatex' or `luatex').^^J%
+    Package loading has been stopped to prevent additional errors.}
   \lltxb@regs@AtEnd
   \expandafter\endinput
 \fi
@@ -267,7 +270,7 @@ See source file '\inFileName' for details.
       \let\x\PackageWarningNoLine
     \fi
   \expandafter\endgroup
-  \x{luatexbase-regs}{etex macros not loaded!^^J
+  \x{luatexbase-regs}{etex macros not loaded!^^J%
     Registers allocation scheme will not be extended.}
 \else
 %    \end{macrocode}
diff --git a/luatexbase.dtx b/luatexbase.dtx
index a94637b..65f813d 100644
--- a/luatexbase.dtx
+++ b/luatexbase.dtx
@@ -215,14 +215,17 @@ See source file '\inFileName' for details.
 \fi
 \ifluatex\else
   \begingroup
-    \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
-      \def\x#1#2{\begingroup\newlinechar10
-        \immediate\write16{Package #1 warning: #2}\endgroup}
+    \expandafter\ifx\csname PackageError\endcsname\relax
+      \def\x#1#2#3{\begingroup \newlinechar10
+        \errhelp{#3}\errmessage{Package #1 error: #2}\endgroup}
     \else
-      \let\x\PackageWarningNoLine
+      \let\x\PackageError
     \fi
   \expandafter\endgroup
-  \x{luatexbase}{LuaTeX is required for this package. Aborting.}
+  \x{luatexbase-attr}{LuaTeX is required for this package. Aborting.}{%
+    This package can only be used with the LuaTeX engine^^J%
+    (command `lualatex' or `luatex').^^J%
+    Package loading has been stopped to prevent additional errors.}
   \lltxb@core@AtEnd
   \expandafter\endinput
 \fi