From bc2bdee4506fc39997c8f0451a26277c8b57076d Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 7 Apr 2020 20:14:44 +0100
Subject: [PATCH] texinice.tex: Cope with new names for page-dimension
 registers.

Texinfo 6.2 apparently renamed `\pagewidth' to `\txipagewidth', and
similarly for `\pageheight', to avoid some conflict with LuaTeX.  Fix
`@afourpaper' to with these new names.

(cherry picked from commits 892a9f865ad8baed5c67ddf9d68301c916bfb0f1 and
0b5f869b689a085655df9e1a261eacf8c7facade)
---
 texinice.tex | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/texinice.tex b/texinice.tex
index 27b84cf..b4d84de 100644
--- 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\xxundefined
+    \global\let\txipagewidth=\pagewidth
+    \global\let\txipageheight=\pageheight
+  \fi
+  \global\txipagewidth=\hsize
+  \global\txipageheight=\vsize
 }
 
 \global\contentsrightmargin = 0pt
-- 
2.11.0