make test-luatex5 pass

- fix \lltxb@synonym
- rename \setcatcoderange as \SetCatcodeRange

3 files changed, 31 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index ff51d4b..8b7aa1b 100644
--- a/Makefile
+++ b/Makefile
@@ -147,7 +147,7 @@ check-luatex: install-runfiles
 	#$(TESTENV) lualatex --interaction=batchmode test-luatex2.tex >/dev/null
 	#$(TESTENV) lualatex --interaction=batchmode test-luatex3.tex >/dev/null
 	#$(TESTENV) lualatex --interaction=batchmode test-luatex4.tex >/dev/null
-	#$(TESTENV) luatex --interaction=batchmode test-luatex5.tex >/dev/null
+	$(TESTENV) luatex --interaction=batchmode test-luatex5.tex >/dev/null
 
 $(CTAN_ZIP): $(SOURCE) $(COMPILED) $(TDS_ZIP)
 	@echo "Making $@ for CTAN upload."
diff --git a/luatex.dtx b/luatex.dtx
index 3719a63..baeebf4 100644
--- a/luatex.dtx
+++ b/luatex.dtx
@@ -272,8 +272,8 @@ See source file '\inFileName' for licence and contact information.
     \else
       \def\x####1####2{%
         \begingroup \endlinechar10
-        \message{Package ####1 warning: ####2}}%
-        \endgroup
+        \message{Package ####1 warning: ####2}%
+        \endgroup}%
     \fi
     \expandafter\endgroup
     \x{luatex}{\string#1 is deprecated^^J%
diff --git a/luatexbase-cctb.dtx b/luatexbase-cctb.dtx
index e2c701d..6f7525a 100644
--- a/luatexbase-cctb.dtx
+++ b/luatexbase-cctb.dtx
@@ -136,7 +136,7 @@ See source file '\inFileName' for details.
 % (once they are allocated), two helper macros are available.
 %
 % \begin{quote}
-% \cs{setcatcoderange}\marg{from}\marg{to}\marg{value}
+% \cs{SetCatcodeRange}\marg{from}\marg{to}\marg{value}
 % \end{quote}
 % Set all characters code in the range \meta{from}--\meta{to} to the given
 % catcode \meta{value}.
@@ -456,7 +456,7 @@ See source file '\inFileName' for details.
 %    Set the catcodes for a range of characters.
 %
 %    \begin{macrocode}
-\def\setcatcoderange#1#2#3{%
+\def\SetCatcodeRange#1#2#3{%
   \edef\luaSCR@temp{%
     \noexpand\@tempcnta=\the\@tempcnta
     \noexpand\@tempcntb=\the\@tempcntb
@@ -472,6 +472,29 @@ See source file '\inFileName' for details.
   \luaSCR@temp}
 %    \end{macrocode}
 %
+%    Make \cs{SetCatcodeRange} available with its old name.
+%
+%    \begin{macrocode}
+\def\lltxb@synonym#1#2{%
+  \def#1{%
+    \begingroup
+    \ifdefined\PackageWarning
+      \let\x\PackageWarning
+    \else
+      \def\x####1####2{%
+        \begingroup \endlinechar10
+        \message{Package ####1 warning: ####2}%
+        \endgroup}
+    \fi
+    \expandafter\endgroup
+    \x{luatex}{\string#1 is deprecated^^J%
+      and will be removed in the next version of the package.^^J%
+      Please use \string#2 instead.}
+    \let#1#2%
+    #1}}
+\lltxb@synonym \setcatcoderange \SetCatcodeRange
+%    \end{macrocode}
+%
 %    Set a catcode table.
 %
 %    \begin{macrocode}
@@ -499,8 +522,8 @@ See source file '\inFileName' for details.
   \catcode0   12 % nul
   \catcode13  12 % carriage return
   \catcode37  12 % percent
-  \setcatcoderange{65}{90}{12}% A-Z
-  \setcatcoderange{97}{122}{12}% a-z
+  \SetCatcodeRange{65}{90}{12}% A-Z
+  \SetCatcodeRange{97}{122}{12}% a-z
   \catcode92  12 % backslash
   \catcode127 12 }
 %    \end{macrocode}
@@ -518,7 +541,7 @@ See source file '\inFileName' for details.
 \newluatexcatcodetable\CatcodeTableLaTeX
 \setluatexcatcodetable\CatcodeTableLaTeX{%
   \luatexcatcodetable\CatcodeTableIniTeX
-  \setcatcoderange{0}{31}{15}%
+  \SetCatcodeRange{0}{31}{15}%
   \catcode9   10 % tab
   \catcode12  13 % form feed
   \catcode13  5  % carriage return