branch master updated: Fix MathJax referencing in docs build.

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 3dfd90f7ce Fix MathJax referencing in docs build.
3dfd90f7ce is described below

commit 3dfd90f7ce31015bf532b212f5df1defa789ed26
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Fri Apr 8 16:11:39 2022 +0100

    Fix MathJax referencing in docs build.
    
    * doc/Makefile.am (wwwdoc-build): Set MATHJAX_SCRIPT and
    MATHJAX_SOURCE to absolute URLs rather than relative paths.
    This means that gendocs.sh produces working references in
    both split and non-split output.
    * README-hacking: Update.
---
 ChangeLog       | 10 ++++++++++
 README-hacking  |  3 +--
 doc/Makefile.am | 10 +++++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 912ec4a5f3..fb20920eee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-04-08  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       Fix MathJax referencing in docs build.
+
+       * doc/Makefile.am (wwwdoc-build): Set MATHJAX_SCRIPT and
+       MATHJAX_SOURCE to absolute URLs rather than relative paths.
+       This means that gendocs.sh produces working references in
+       both split and non-split output.
+       * README-hacking: Update.
+
 2022-04-08  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * README-hacking: Mention infog subdirectory.
diff --git a/README-hacking b/README-hacking
index a5c52cc8c5..5039a77b11 100644
--- a/README-hacking
+++ b/README-hacking
@@ -304,14 +304,13 @@ including:
 
 Build web documentation with
   make -C doc wwwdoc-build
+
 Copy documentation files to web checkout with, e.g.
   make -C doc \
   wwwdoc-install www_target=../../TEXINFO_WEB_PAGES/texinfo/manual/
 Check for removed files with, e.g. ls -ltu $(www_target)/*/html_node, 
 followed by cvs rm -f.  Likewise, check for added files with
 cvs -qn update, followed by cvs add.  When done, run cvs commit.
-(Note: MathJax referencing is currently broken for generating the
-non-split manual.)
 
 #  Official releases only: Contact root@tug.org to update texinfo at tug.org.
 # If root@tug.org doesn't reply, can try webmaster@tug.org,
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 03e663d50f..d5e9b7f454 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -99,8 +99,16 @@ gendocs_envvars = GENDOCS_TEMPLATE_DIR=$(gendocs_templates)
 #
 gendocs_email = bug-texinfo@gnu.org
 gendocs_dir_url = /manual/
+
+# We use absolute URLs here so the same values will work for
+# both split and non-split
+mathjax_root = https://www.gnu.org/software/texinfo/manual
+gendocs_mathjax = -c HTML_MATH=mathjax \
+                  -c MATHJAX_SCRIPT=$(mathjax_root)/tex-svg.js \
+                  -c MATHJAX_SOURCE=$(mathjax_root)/mathjax-instructions.html
+#
 gendocs_invoke = env $(gendocs_envvars) $(gendocs) --email $(gendocs_email) \
-  --html '-c HTML_MATH=mathjax -c MATHJAX_SCRIPT=../../tex-svg.js -c 
MATHJAX_SOURCE=../../mathjax-instructions.html -c 
TOP_NODE_UP_URL=$(gendocs_dir_url)'
+  --html '$(gendocs_mathjax) -c TOP_NODE_UP_URL=$(gendocs_dir_url)'
 # A nice side effect of using --html is to eliminate the fancy css default;
 # otherwise, we could use gendocs_template_min.
 #