Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/cfd

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/cfd:
  texinice.tex: Cope with new names for page-dimension registers.

diff --git a/texinice.tex b/texinice.tex
index 27b84cf2e82bc10fb598181370db8134a7a0f0f0..35ba1270c00b360b04f4aeba9f4770abde43ea0f 100644 (file)
--- a/texinice.tex
+++ b/texinice.tex
@@ -43,8 +43,12 @@
   \global\outervsize=\vsize
   \global\advance\outervsize by 0.6in
 
-  \global\pagewidth=\hsize
-  \global\pageheight=\vsize
+  \ifx\txipagewidth\@@undefined
+    \global\let\txipagewidth=\pagewidth
+    \global\let\txipageheight=\pageheight
+  \fi
+  \global\txipagewidth=\hsize
+  \global\txipageheight=\vsize
 }
 
 \global\contentsrightmargin = 0pt