From de18b221795280dbe1c980b96322182e2f1e4547 Mon Sep 17 00:00:00 2001
From: hornik <hornik@00db46b3-68df-0310-9c12-caf00c1e9a41>
Date: Fri, 21 Jul 2023 19:47:20 +0000
Subject: [PATCH] Handle HTML output changes in Texinfo 7.

git-svn-id: https://svn.r-project.org/R/trunk@84721 00db46b3-68df-0310-9c12-caf00c1e9a41
---
 doc/manual/Makefile.in |  2 +-
 m4/R.m4                | 42 +++++++++++++++++++++++++++++++-----------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/doc/manual/Makefile.in b/doc/manual/Makefile.in
index 5f517f98597..69e44653630 100644
--- a/doc/manual/Makefile.in
+++ b/doc/manual/Makefile.in
@@ -34,7 +34,7 @@ OBJECTS_MOBI = $(SOURCES_TEXI:.texi=.mobi)
 
 MAKEINDEX = @MAKEINDEX@
 TEXI2ANY = @TEXI2ANY@
-TEXI2ANY_HTML_OPTS = --html --no-split --css-include=$(srcdir)/Rman.css
+TEXI2ANY_HTML_OPTS = --html --no-split --css-include=$(srcdir)/Rman.css @HAVE_TEXI2ANY_V7_TRUE@ --set-customization-variable SHOW_TITLE=true
 TEXI2ANY_TEXT_OPTS = --number-sections --fill-column=76 --no-split --no-headers
 TEXI2HTML = $(TEXI2ANY) $(TEXI2ANY_HTML_OPTS)
 TEXI2TEXT = $(TEXI2ANY) $(TEXI2ANY_TEXT_OPTS)
diff --git a/m4/R.m4 b/m4/R.m4
index b8e25c0c01d..216c6d5ff31 100644
--- a/m4/R.m4
+++ b/m4/R.m4
@@ -202,6 +202,12 @@ if test "${r_cv_prog_texi2any_v5}" != yes; then
 else
   TEXI2ANY="${TEXI2ANY}"
 fi
+if test "${r_cv_prog_texi2any_v7}" != yes; then 
+  HAVE_TEXI2ANY_V7_TRUE='#'
+else
+  HAVE_TEXI2ANY_V7_TRUE=
+fi
+AC_SUBST(HAVE_TEXI2ANY_V7_TRUE)
 ])# R_PROG_TEXI2ANY
 
 ## _R_PROG_TEXI2ANY_VERSION
@@ -212,24 +218,38 @@ fi
 ## If you change the minimum version here, also change it in
 ## doc/manual/Makefile.in and doc/manual/R-admin.texi.
 AC_DEFUN([_R_PROG_TEXI2ANY_VERSION],
-[AC_CACHE_CHECK([whether texi2any version is at least 5.1],
+[AC_CACHE_VAL([r_cv_prog_texi2any_version],
+[r_cv_prog_texi2any_version=`${TEXI2ANY} --version | \
+  grep -E '^(makeinfo|texi2any)' | sed 's/[[^)]]*) \(.*\)/\1/'`])
+AC_CACHE_VAL([r_cv_prog_texi2any_version_maj],
+[r_cv_prog_texi2any_version_maj=`echo ${r_cv_prog_texi2any_version} | \
+  cut -f1 -d.`])
+AC_CACHE_VAL([r_cv_prog_texi2any_version_min],
+[r_cv_prog_texi2any_version_min=`echo ${r_cv_prog_texi2any_version} | \
+  cut -f2 -d. | tr -dc '0123456789.'`])
+AC_CACHE_CHECK([whether texi2any version is at least 5.1],
                 [r_cv_prog_texi2any_v5],
-[texi2any_version=`${TEXI2ANY} --version | \
-  grep -E '^(makeinfo|texi2any)' | sed 's/[[^)]]*) \(.*\)/\1/'`
-texi2any_version_maj=`echo ${texi2any_version} | cut -f1 -d.`
-texi2any_version_min=`echo ${texi2any_version} | \
-  cut -f2 -d. | tr -dc '0123456789.' `
-if test -z "${texi2any_version_maj}" \
-     || test -z "${texi2any_version_min}"; then
+[if test -z "${r_cv_prog_texi2any_version_maj}" \
+     || test -z "${r_cv_prog_texi2any_version_min}"; then
   r_cv_prog_texi2any_v5=no
-elif test ${texi2any_version_maj} -gt 5; then
+elif test ${r_cv_prog_texi2any_version_maj} -gt 5; then
   r_cv_prog_texi2any_v5=yes
-elif test ${texi2any_version_maj} -lt 5 \
-     || test ${texi2any_version_min} -lt 1; then
+elif test ${r_cv_prog_texi2any_version_maj} -lt 5 \
+     || test ${r_cv_prog_texi2any_version_min} -lt 1; then
   r_cv_prog_texi2any_v5=no
 else
   r_cv_prog_texi2any_v5=yes
 fi])
+## Also record whether texi2any is at least 7 to appropriately handle
+## HTML and EPUB output changes, see
+## <<https://lists.gnu.org/archive/html/bug-texinfo/2022-11/msg00036.html>.
+AC_CACHE_VAL([r_cv_prog_texi2any_v7],
+[if test ${r_cv_prog_texi2any_v5} = yes \
+     && test ${r_cv_prog_texi2any_version_maj} -ge 7; then
+  r_cv_prog_texi2any_v7=yes
+else
+  r_cv_prog_texi2any_v7=no
+fi])
 ])# _R_PROG_TEXI2ANY_VERSION
 
 ## R_PROG_BROWSER