X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucwmac2.tex;h=cb713d962067386d8c7bbe5594187e56eb8426d9;hb=cb229f3c185750bb8f5f7831331696e457b7ee12;hp=bd4ffda22517a98fdfcabd2034df9591ab0ace0a;hpb=7f2c803cc3d90993ec6c5b94d83a0011b3602779;p=ucwmac.git

diff --git a/ucwmac2.tex b/ucwmac2.tex
index bd4ffda..cb713d9 100644
--- a/ucwmac2.tex
+++ b/ucwmac2.tex
@@ -24,7 +24,7 @@
 	\pdfpkresolution=600	% Provide a reasonable default
 \fi\fi
 
-\ifx\directlua\undefined\else
+\ifx\luatexversion\undefined\else
 	% In LuaTeX \pdfpkresolution is not enough
 	\directlua{kpse.init_prog("luatex", 600, "ljfour")}
 \fi
@@ -44,6 +44,15 @@
 \def\sdef#1{\expandafter\def\csname#1\endcsname}
 \def\slet#1#2{\expandafter\let\csname#1\expandafter\endcsname\csname#2\endcsname}
 
+% Assign a control sequence given as a string, complain if it is not defined.
+\def\sget#1#2{\ifcsname#2\endcsname
+		\expandafter\let\expandafter#1\csname#2\endcsname
+	\else
+		\errmessage{Undefined control sequence #2}%
+		\let#1\relax
+	\fi
+}
+
 % Add \protected to an existing macro
 \def\addprotected#1{\protected\edef#1{\expandafter\unexpanded\expandafter{#1}}}
 
@@ -57,8 +66,9 @@
 % If you modify these registers, call \setuppage afterwards
 \ifx\luatexversion\undefined
 	% In LuaTeX, \pagewidth and \pageheight are primitive
-	\newdimen\pagewidth
-	\newdimen\pageheight
+	% (also, we need \csname here, because \newdimen is \outer)
+	\csname newdimen\endcsname\pagewidth
+	\csname newdimen\endcsname\pageheight
 \fi
 \newdimen\leftmargin
 \newdimen\rightmargin
@@ -309,10 +319,10 @@
 \def\liststyle#1{%
 	\edef\markertmp{#1}
 	\ifcsname item:\markertmp\endcsname
-		\slet{listmarker}{item:\markertmp}%
+		\sget\listmarker{item:\markertmp}%
 	\else
-		\slet{listmarker}{metaitem:\markertometa#1^^X}%
-		\slet{markerinner}{item:\markertoinner#1^^X}%
+		\sget\listmarker{metaitem:\markertometa#1^^X}%
+		\sget\markerinner{item:\markertoinner#1^^X}%
 	\fi
 }