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

[luatex-ja/luatexja.git] / test / test22-ltjs-mag.tex

diff --git a/test/test22-ltjs-mag.tex b/test/test22-ltjs-mag.tex
index e0aecc0..a29b711 100644 (file)
--- a/test/test22-ltjs-mag.tex
+++ b/test/test22-ltjs-mag.tex
@@ -1,9 +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{type1cm}
+\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
@@ -16,26 +20,26 @@
    \fi
 }
 \def\S#1{%
-  \setbox0\hbox{\fontsize{#1\js@mpt}{10}\selectfont
-    \@tempdimb=#1\js@mpt
+  \setbox0\hbox{\fontsize{#1\jsc@mpt}{10}\selectfont
+    \@tempdimb=#1\jsc@mpt
     \edef\@tempa{\scantextokens\expandafter{\fontname\font}\space at\space at}%
     \expandafter\S@\@tempa\@nil
   }%
 }
-\def\js@setfontsize#1#2#3{%
-  \edef\Fsize{\the\dimexpr\directlua{tex.sprint(#2*\js@magscale)}pt}%
-  \@setfontsize#1{#2\js@mpt}{#3\js@mpt}}
+\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)}%
 }}
 
 \def\T@#1#2#3{\global\count@=}
 \def\T#1#2{%
-  \setbox0\hbox{\fontsize{#1\js@mpt}{10}\selectfont
+  \setbox0\hbox{\fontsize{#1\jsc@mpt}{10}\selectfont
     \expandafter\T@\romannumeral-`0\fontname\font
   }%
   \ifnum\count@=#2\else
-    \typeout{@FAIL: #1\string\js@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
 }