test22-ltjs-mag: adapt to latest ltjsclasses (and LaTeX)

diff --git a/test/test22-ltjs-mag.sh b/test/test22-ltjs-mag.sh
index 47686bd..98d1825 100755 (executable)
--- a/test/test22-ltjs-mag.sh
+++ b/test/test22-ltjs-mag.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-for x in `grep '{\\\\def\\\\js@magscale' ../src*/ltjsarticle.cls | grep 'DeclareOption' | sed 's/\\\\DeclareOption{\\([0-9][0-9.]*[A-Za-z]*\\)}.*/\\1/'`
+for x in `grep '{\\\\def\\\\jsc@magscale' ../src*/ltjsarticle.cls | grep 'DeclareOption' | sed 's/\\\\DeclareOption{\\([0-9][0-9.]*[A-Za-z]*\\)}.*/\\1/'`
   do echo TEST: $x; luajitlatex "\\def\\fsize{$x}\\input test22-ltjs-mag" \
   | grep @ | sed 's/@//'
 done

diff --git a/test/test22-ltjs-mag.tex b/test/test22-ltjs-mag.tex
index c5f356b..a29b711 100644 (file)
--- a/test/test22-ltjs-mag.tex
+++ b/test/test22-ltjs-mag.tex
@@ -1,10 +1,13 @@
-\batchmode\directlua{
+\batchmode
+%\loggingall
+\directlua{
   luatexbase.module_warning=function()end
 }
 \ifdefined\fsize\else\def\fsize{10pt}\fi
-\edef\head{\noexpand\documentclass[\fsize,xreal]{ltjsarticle}}
-\head\usepackage[OT1]{fontenc}\def\rmdefault{cmr}
-\usepackage{type1cm}\normalfont\noralsize
+\edef\head{\noexpand\documentclass[\fsize,nomag*]{ltjsarticle}}
+\head%\listfiles
+\usepackage{type1cm}\usepackage[OT1]{fontenc}
+\def\rmdefault{cmr}
 \makeatletter
 \let\ltj@selectfont@patch\relax
 \newcount\cI\newcount\cF\newdimen\szd
@@ -23,8 +26,8 @@
     \expandafter\S@\@tempa\@nil
   }%
 }
-\def\js@setfontsize#1#2#3{%
-  \edef\Fsize{\the\dimexpr\directlua{tex.sprint(#2*\js@magscale)}pt}%
+\def\ltjs@setfontsize#1#2#3{%
+  \edef\Fsize{\the\dimexpr\directlua{tex.sprint(#2*\jsc@magscale)}pt}%
   \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}}
 \def\R#1{{%
   #1\message{^^J\string#1: \fontname\font\space (ideal: \Fsize)}%
@@ -36,7 +39,7 @@
     \expandafter\T@\romannumeral-`0\fontname\font
   }%
   \ifnum\count@=#2\else
-    \typeout{@FAIL: #1\string\jsc@mpt\space selects cmr\the\count@
+    \typeout{@FAIL: #1\string\ljsc@mpt\space selects cmr\the\count@
     \space(should be cmr#2)}\szd=1pt%
   \fi
 }