CTAN sync 202405140301

1 files changed, 61 insertions, 35 deletions

diff --git a/info/latex2e-help-texinfo/Makefile b/info/latex2e-help-texinfo/Makefile
index 55f36948f0..a5490434a6 100644
--- a/info/latex2e-help-texinfo/Makefile
+++ b/info/latex2e-help-texinfo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 1142 2023-01-11 16:09:29Z karl $
+# $Id: Makefile 1173 2024-05-13 15:17:28Z karl $
 # Public domain.  Originally written 2006, Karl Berry.
 # Makefile for latexrefman.
 
@@ -29,17 +29,28 @@ texi2info = $(makeinfo) --no-split
 texi2txt = $(makeinfo) --plaintext --no-split
 texi2xml = $(makeinfo) --xml
 #
-htmlopts = --html $(html_css) $(t2html_top) $(t2html_home) $(html_pagewords)
+htmlopts = --html $(html_css) $(t2html_config)
 #
 html_css = --css-include=latex2e.css
 #
-# Nodes must be larger than this to get navigation panel at bottom of
-# page; default is 300.
-html_pagewords = -c WORDS_IN_PAGE=10000
+t2html_config = $(t2html_top) $(t2html_pagewords) $(t2html_menu) $(t2html_home)
 #
 # Go somewhere useful from Top:
 t2html_top = -c TOP_NODE_UP_URL=https://tug.org/texinfohtml/
 #
+# Nodes must be larger than this to get navigation panel at bottom of
+# page; default is 300.
+t2html_pagewords = -c WORDS_IN_PAGE=10000
+#
+# For makeinfo 7.0, needed this to get warnings about tree structure:
+#t2html_menu = -c CHECK_NORMAL_MENU_STRUCTURE=1
+# https://lists.gnu.org/archive/html/bug-texinfo/2024-01/msg00021.html
+# But as of 7.1, it is the default again (whew).
+t2html_menu =
+#
+# Incidentally, a tree transformation can generate missing menu entries:
+#   -c TREE_TRANSFORMATIONS=complete_tree_nodes_menus file.texi
+#
 # Put a link in the footer:
 t2html_home = -c PRE_BODY_CLOSE="<hr/><div class='referenceinfo'>\
 <a href='https://latexref.xyz/'>\
@@ -85,7 +96,7 @@ all: en es fr
 
 # Sort of following the GNU sequence of clean targets.
 distclean clean mostlyclean:
-	rm -rf latex2e*.t2* latex2e-help-texinfo-tree*
+	rm -rf latex2e*.t2* $(distname)-tree*
 
 realclean maintainer-clean: distclean
 	rm -f $(addprefix latex2e*., pdf dvi $(mi_suffixes) $(xref_suffixes))
@@ -100,12 +111,14 @@ txt_files = ChangeLog Makefile NEWS README \
 figure_files = list.eps list.pdf list.png list.txt
 figure_source_files = asy/list.asy
 distname = latex2e-help-texinfo
+disttree = $(distname)-tree
 distzip = $(distname).zip
 #
-htmlsplit = $(distname)-tree
+htmlsplit = $(disttree)
 htmlsplitzip = $(htmlsplit).zip
 #
 dist: en es
+	@echo Making $@ ...
 	rm -rf $(distname)
 	mkdir $(distname) && cd $(distname) && ln -s ../* .
 	mkdir $(distname)/spanish && cd $(distname)/spanish && ln -s ../../* .
@@ -117,20 +130,22 @@ $(addprefix $(distname)/spanish/,  $(es_mi_output) latex2e-es.pdf) \
 $(addprefix $(distname)/latex2e-figures/,  $(figure_files)) \
 $(addprefix $(distname)/graphics/,  README $(figure_source_files))
 	rm -f $(htmlsplitzip)
-	cd $(htmlsplit) && zip -qr ../$(htmlsplitzip) latex2e 
+	cd $(htmlsplit) && zip -qr ../$(htmlsplitzip) latex2e
 	zip -q $(distzip) $(distname)
 	@ls -l $(distzip); unzip -l $(distzip)
 
 easyurls: htmlsplit dist
+	@echo Making $@ ...
 	cd src \
         && rm -rf testdist && mkdir -p testdist \
-        && cp ../latex2e-help-texinfo-tree.zip testdist \
-        && rm -rf latex2e && unzip -q testdist/latex2e-help-texinfo-tree \
+        && cp ../$(disttree).zip testdist \
+        && rm -rf latex2e && unzip -q testdist/$(distname)-tree \
         && $(easyurls_python) ./easyurls.py $(easyurls_opt) \
-        && zip -rq ../latex2e-help-texinfo-tree-easyurls.zip latex2e
+        && zip -rq ../$(disttree)-easyurls.zip latex2e
 
-easyurls_python = python3.6 # depends on bs4 (beautifulsoup4)
-easyurls_opt = --directory latex2e --action softlink --lower_case --rewrite_index --debug
+easyurls_python = python # depends on bs4 (beautifulsoup4)
+easyurls_debug = # --debug
+easyurls_opt = --directory latex2e --action softlink --lower_case --rewrite_index $(easyurls_debug)
 
 # To update web site, after basic build is ok (check-dw, spelling, etc.),
 # first undo temporary build results:
@@ -138,26 +153,32 @@ easyurls_opt = --directory latex2e --action softlink --lower_case --rewrite_inde
 #   make svrsplit  # revert generated split html
 # then update ChangeLog, etc.,
 # then svn commit the modified source files,
+# then make commitready, which runs:
+# 
+#	$(MAKE)
+#	$(MAKE) htmlsplit
+#	$(MAKE) dist
+#	$(MAKE) easyurls     # depends on htmlsplit and dist
+#	$(MAKE) commitready  # depends on easyurls;
+#			     # many files will have status !
+# and then:
+#   svn commit        # to commit regenerated files
 # then:
-#   make
-#   make htmlsplit
-#   make dist
-#   make easyurls     # depends htmlsplit and dist
-#   make commitready  # many files will have status ! 
-#   svn commit        # to commit regenerated files   
-# then:
-#   svn update     # restore easy url stubs
+#   svn -q update     # restore easy url stubs
 #   make svrsplit  # restore generated split html
 #
 # If uploading to CTAN:
-#   (update NEWS, write announcement)
+#   see file ./CTAN (update NEWS, write announcement, etc.)
 #   upload latex2e-help-texinfo.zip
 #
 # Clean up:
-#   rm -rf src/testdist src/latex2e
-#   rm -rf latex2e-help-texinfo   
-#   rm latex2e-help-texinfo-tree{,-easyurls}.zip   
-#   rm latex2e-help-texinfo.zip   
+postwebclean:
+	rm -rf src/testdist src/latex2e
+	rm -rf $(distname)
+	rm $(disttree).zip $(distname)-easyurls.zip
+	rm $(distname).zip
+	make svri
+	svn status
 
 # In Texinfo 7.0, the default output directory changed to foo_html.
 # Change it back.
@@ -165,14 +186,16 @@ html_split_opts = $(htmlopts) -o latex2e
 
 # Get many small .html files.
 htmlsplit: en
+	@echo Making $@ ...
 	rm -rf $(htmlsplit)
-	mkdir $(htmlsplit) && cd $(htmlsplit) && ln -s ../* .	
+	mkdir $(htmlsplit) && cd $(htmlsplit) && ln -s ../* .
 	cd $(htmlsplit) && $(makeinfo) $(html_split_opts) latex2e.texi
 	cd $(htmlsplit)/latex2e && ln -s ../../latex2e-figures .
 
 # Right before a commit, delete html files that are gone and add new ones.
 htmlsplitstatus = cd $(htmlsplit)/latex2e && svn status *.html
-commitready: htmlsplit
+commitready: easyurls
+	@echo Making $@ ...
 	$(htmlsplitstatus) | sed -n 's/^\!//p' | xargs -r svn rm
 	$(htmlsplitstatus) | sed -n 's/^\?//p' | xargs -r svn add
 # we linked everything above, remove the unused upper-level links.
@@ -184,25 +207,28 @@ commitready: htmlsplit
 # Remove \commandnames to reduce exception list, but not {args} or
 # [args], since they are often words.
 spell spell-en:
-	sed -e 's/\\[a-zA-Z]*//g' latex2e.texi \
+	sed -e 's/\\[a-zA-Z]*//g' -e 's/U+[0-9A-F]\{4\}//' latex2e.texi \
 	| aspell list --mode=texinfo --add-extra-dicts=`pwd`/aspell.en.pws \
         | sort -f -u
 
 # Check for doubled words.
-# http://www.math.utah.edu/~beebe/software/file-tools.html#dw
+# https://www.math.utah.edu/~beebe/software/file-tools.html#dw
 # The first sed expression elides a few @-command lines which cause
 # duplicates; the second expr some text in the middle of lines.
 check-dw:
-	sed -e 's/^@\(node\|item\|anchor\|.index\|.*section\) .*//' \
+	sed -e 's/^@\(c\|node\|item\|anchor\|.index\|.*section\) .*//' \
 	    -e 's/ da da\|xxx\|overwrite\|{test test}\|[iI][jJ]//g' \
 	  latex2e.texi | dw
 
-# Convenience targets to svn revert the generated files,
-# and svn diff the source files.
+# Convenience targets for svn operations.
+svat:
+	svn status
+svup:
+	svn -q update
 svr:
 	svn revert $(addprefix latex2e*., $(all_suffixes))
 	svn status
-svrsplit:
+svri svrsplit:
 	svn revert --depth infinity $(htmlsplit)
 svd:
-	svn diff $(txt_files) *.texi
+	svn diff -x -p $(txt_files) *.texi