test22-ltjs-mag: \ltjs@mpt -> \js@mpt

diff --git a/test/test22-ltjs-mag.sh b/test/test22-ltjs-mag.sh
index f8bc8b3..47686bd 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\\\\ltjs@magscale' ../src*/ltjsarticle.cls | grep 'DeclareOption' | sed 's/\\\\DeclareOption{\\([0-9][0-9.]*[A-Za-z]*\\)}.*/\\1/'`
+for x in `grep '{\\\\def\\\\js@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 e059e0b..e0aecc0 100644 (file)
--- a/test/test22-ltjs-mag.tex
+++ b/test/test22-ltjs-mag.tex
@@ -16,26 +16,26 @@
    \fi
 }
 \def\S#1{%
-  \setbox0\hbox{\fontsize{#1\ltjs@mpt}{10}\selectfont
-    \@tempdimb=#1\ltjs@mpt
+  \setbox0\hbox{\fontsize{#1\js@mpt}{10}\selectfont
+    \@tempdimb=#1\js@mpt
     \edef\@tempa{\scantextokens\expandafter{\fontname\font}\space at\space at}%
     \expandafter\S@\@tempa\@nil
   }%
 }
-\def\ltjs@setfontsize#1#2#3{%
-  \edef\Fsize{\the\dimexpr\directlua{tex.sprint(#2*\ltjs@magscale)}pt}%
-  \@setfontsize#1{#2\ltjs@mpt}{#3\ltjs@mpt}}
+\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\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\ltjs@mpt}{10}\selectfont
+  \setbox0\hbox{\fontsize{#1\js@mpt}{10}\selectfont
     \expandafter\T@\romannumeral-`0\fontname\font
   }%
   \ifnum\count@=#2\else
-    \typeout{@FAIL: #1\string\ltjs@mpt\space selects cmr\the\count@
+    \typeout{@FAIL: #1\string\js@mpt\space selects cmr\the\count@
     \space(should be cmr#2)}\szd=1pt%
   \fi
 }