branch master updated: * doc/texinfo.texi (HTML Customization Variables) (@command{latex2html} Customization Variables, @command{texi2html}) tp/Texinfo/Common.pm (@variable_string_settables) tp/texi2any.pl: remove L2H. HTML_MATH should be set to l2h only.

[Patrice Dumas]

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 2c5c751  * doc/texinfo.texi (HTML Customization Variables) 
(@command{latex2html} Customization Variables, @command{texi2html}) 
tp/Texinfo/Common.pm (@variable_string_settables) tp/texi2any.pl: remove L2H.  
HTML_MATH should be set to l2h only.
2c5c751 is described below

commit 2c5c7511df8fea3faf1d57fa5905e9fb7beae954
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Sep 1 16:47:14 2021 +0200

    * doc/texinfo.texi (HTML Customization Variables)
    (@command{latex2html} Customization Variables, @command{texi2html})
    tp/Texinfo/Common.pm (@variable_string_settables)
    tp/texi2any.pl: remove L2H.  HTML_MATH should be set to l2h
    only.
---
 ChangeLog                            |  8 ++++++++
 doc/texinfo.texi                     | 24 +++++++++++-------------
 tp/Texinfo/Common.pm                 |  1 -
 tp/tests/many_input_files/tex_l2h.sh |  4 ++--
 tp/tests/run_parser_all.sh           |  2 +-
 tp/tests/tex_html/list-of-tests      | 22 +++++++++++-----------
 tp/texi2any.pl                       |  6 ++----
 7 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 478406d..fca22d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2021-09-01  Patrice Dumas  <pertusus@free.fr>
 
+       * doc/texinfo.texi (HTML Customization Variables)
+       (@command{latex2html} Customization Variables, @command{texi2html})
+       tp/Texinfo/Common.pm (@variable_string_settables)
+       tp/texi2any.pl: remove L2H.  HTML_MATH should be set to l2h
+       only.
+
+2021-09-01  Patrice Dumas  <pertusus@free.fr>
+
        * tp/Texinfo/Common.pm (@variable_other_settables),
        tp/Texinfo/Convert/IXIN.pm (output_ixin),
        tp/Texinfo/Convert/IXINSXML.pm (%defaults):
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index 4cd50d9..a4199af 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -16251,7 +16251,7 @@ Use tables for header formatting rather than a simple
 @item HTML_MATH
 Method to use to render @code{@@math}.  This can be unset, set to
 @samp{mathjax} (@pxref{MathJax Customization Variables}),
-set to @samp{l2h}, which has the same effect as setting @code{L2H}
+set to @samp{l2h}, which uses @command{latex2html}
 (@pxref{@command{latex2html} Customization Variables}), or set to
 @samp{t2h}, which uses @command{tex4ht}.
 
@@ -16473,32 +16473,30 @@ others' distribution systems.
 @subsection @command{latex2html} Customization Variables
 
 This table lists the customization variables which can be used when 
-@command{latex2html} is being used.
+@command{latex2html} is being used to convert @code{@@math} and
+@code{@@tex} sections for HTML@.  To actually convert @code{@@tex} sections,
+@option{--iftex} should be used.
 
 @vtable @code
-@item L2H
-For HTML@.  If set, @command{latex2html} is used to convert @code{@@math}
-and @code{@@tex} sections; default false.  Best used with @option{--iftex}.
-
 @item L2H_CLEAN
-(Relevant only if @code{L2H} is set.)  If set, the intermediate files
+(Relevant only if @code{HTML_MATH} is set to @samp{l2h}.)  If set, the 
intermediate files
 generated in relation with @command{latex2html} are removed; default
 true.
 
 @item L2H_FILE
-(Relevant only if @code{L2H} is set.)  If set, the given file is used
+(Relevant only if @code{HTML_MATH} is set to @samp{l2h}.)  If set, the given 
file is used
 as @command{latex2html}'s init file; default unset.
 
 @item L2H_HTML_VERSION
-(Relevant only if @code{L2H} is set.)  The HTML version used in the
+(Relevant only if @code{HTML_MATH} is set to @samp{l2h}.)  The HTML version 
used in the
 @command{latex2html} call; default unset.
 
 @item L2H_L2H
-(Relevant only if @code{L2H} is set.)  The program invoked as
+(Relevant only if @code{HTML_MATH} is set to @samp{l2h}.)  The program invoked 
as
 @command{latex2html}; default is @code{latex2html}.
 
 @item L2H_SKIP
-(Relevant only if @code{L2H} is set.)  If set to a true value, the
+(Relevant only if @code{HTML_MATH} is set to @samp{l2h}.)  If set to a true 
value, the
 actual call to @command{latex2html} is skipped; previously generated
 content is reused instead.  If set to 0, the cache is not used at all.
 If set to @samp{undef}, the cache is used for as many @TeX{} fragments as
@@ -16506,7 +16504,7 @@ possible and for any remaining the command is run.  The 
default is
 @samp{undef}.
 
 @item L2H_TMP
-(Relevant only if @code{L2H} is set.)  Set the directory used for
+(Relevant only if @code{HTML_MATH} is set to @samp{l2h}.)  Set the directory 
used for
 temporary files.  None of the file name components in this directory
 name may start with @samp{.}; otherwise, @command{latex2html} will
 fail (because of @command{dvips}).  The default is the empty string,
@@ -17013,7 +17011,7 @@ corresponding @command{texi2any} customization 
variables.
 @item @option{--def-table}            @tab @code{DEF_TABLE}
 @item @option{--ignore-preamble-text} @tab @code{IGNORE_PREAMBLE_TEXT}
 @item @option{--html-xref-prefix}     @tab @code{EXTERNAL_DIR}
-@item @option{--l2h}                  @tab @code{L2H}
+@item @option{--l2h}                  @tab @code{HTML_MATH} set to @samp{l2h}
 @item @option{--l2h-l2h}              @tab @code{L2H_L2H}
 @item @option{--l2h-skip}             @tab @code{L2H_SKIP}
 @item @option{--l2h-tmp}              @tab @code{L2H_TMP}
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 974d717..2585fb2 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -241,7 +241,6 @@ our @variable_string_settables = (
 'JS_WEBLABELS',
 'JS_WEBLABELS_FILE',
 'KEEP_TOP_EXTERNAL_REF',
-'L2H',
 'L2H_CLEAN',
 'L2H_FILE',
 'L2H_HTML_VERSION',
diff --git a/tp/tests/many_input_files/tex_l2h.sh 
b/tp/tests/many_input_files/tex_l2h.sh
index 2b8602f..e135b6e 100755
--- a/tp/tests/many_input_files/tex_l2h.sh
+++ b/tp/tests/many_input_files/tex_l2h.sh
@@ -53,8 +53,8 @@ raw_outdir=$raw_output_dir/$basename
 [ -d $raw_outdir ] && rm -rf $raw_outdir
 mkdir $basename
 : > $basename/$stdout_file
-echo "$PERL -I $srcdir/../.. -I 
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../../maintain/lib/libintl-perl/lib -I 
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init 
--set-customization-variable 'L2H 1' --set-customization-variable 
L2H_FILE=$srcdir/../../t/init/l2h.init --set-customizati [...]
-$PERL -I $srcdir/../.. -I 
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../../maintain/lib/libintl-perl/lib -I 
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init 
--set-customization-variable 'L2H 1' --set-customization-variable 
L2H_FILE=$srcdir/../../t/init/l2h.init  --set-customization-va [...]
+echo "$PERL -I $srcdir/../.. -I 
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../../maintain/lib/libintl-perl/lib -I 
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init 
--set-customization-variable 'HTML_MATH l2h' --set-customization-variable 
L2H_FILE=$srcdir/../../t/init/l2h.init --set-cus [...]
+$PERL -I $srcdir/../.. -I 
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../../maintain/lib/libintl-perl/lib -I 
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl 
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init 
--set-customization-variable 'HTML_MATH l2h' --set-customization-variable 
L2H_FILE=$srcdir/../../t/init/l2h.init  --set-customiz [...]
 
 return_code=0
 ret=$?
diff --git a/tp/tests/run_parser_all.sh b/tp/tests/run_parser_all.sh
index 9d8bfb7..3f92ebd 100755
--- a/tp/tests/run_parser_all.sh
+++ b/tp/tests/run_parser_all.sh
@@ -17,7 +17,7 @@ check_latex2html_and_tex4ht ()
     if echo "$remaining" | grep '[-]l2h' >/dev/null; then
       maybe_use_latex2html=yes
     fi
-    if echo "$remaining" | grep 'L2H 1' >/dev/null; then
+    if echo "$remaining" | grep 'HTML_MATH l2h' >/dev/null; then
       maybe_use_latex2html=yes
     fi
     if [ $maybe_use_latex2html = 'yes' ]; then
diff --git a/tp/tests/tex_html/list-of-tests b/tp/tests/tex_html/list-of-tests
index c3444bd..65be956 100644
--- a/tp/tests/tex_html/list-of-tests
+++ b/tp/tests/tex_html/list-of-tests
@@ -1,26 +1,26 @@
 # tex
-block_EOL_tex block_EOL.texi -c 'L2H 1' --iftex
+block_EOL_tex block_EOL.texi -c 'HTML_MATH l2h' --iftex
 simplest_httex ../formatting/simplest.texi --init tex4ht.pm --iftex
-tex tex.texi -c 'L2H 1' --iftex
+tex tex.texi -c 'HTML_MATH l2h' --iftex
 tex_notex tex.texi
 tex_httex tex.texi --init tex4ht.pm --iftex
 tex_accents_httex tex_accents.texi --init tex4ht.pm --iftex
-tex_accents_l2h tex_accents.texi -c 'L2H 1' --iftex
+tex_accents_l2h tex_accents.texi -c 'HTML_MATH l2h' --iftex
 tex_gdef_httex tex_gdef.texi --init tex4ht.pm --iftex -D tex4ht
-tex_gdef_l2h tex_gdef.texi -c 'L2H 1' --iftex
+tex_gdef_l2h tex_gdef.texi -c 'HTML_MATH l2h' --iftex
 tex_gdef_mathjax tex_gdef.texi -c HTML_MATH=mathjax --iftex
 # No mediawki tests for now
 #tex_mediawiki tex.texi --init mediawiki.pm --iftex
 #tex_httex_mediawiki tex.texi --html --init tex4ht.pm --init mediawiki.pm 
--iftex
-#tex_l2h_mediawiki tex.texi --html -c 'L2H 1' --iftex --init mediawiki.pm
+#tex_l2h_mediawiki tex.texi --html -c 'HTML_MATH l2h' --iftex --init 
mediawiki.pm
 tex_complex_httex tex_complex.texi --init tex4ht.pm --iftex
-tex_complex_l2h tex_complex.texi -c 'L2H 1' --iftex
+tex_complex_l2h tex_complex.texi -c 'HTML_MATH l2h' --iftex
 tex_eqalign_httex tex_eqalign.texi --init tex4ht.pm --iftex
-tex_eqalign_l2h tex_eqalign.texi -c 'L2H 1' --iftex
-math_not_closed math_not_closed.texi -c 'L2H 1' --iftex
-tex_not_closed tex_not_closed.texi -c 'L2H 1' --iftex
-tex_in_copying tex_in_copying.texi -c 'L2H 1' --iftex
-formatting_singular ../layout/formatting.texi --init-file t2h_singular.init -c 
'L2H 1' -c 'EXTENSION htm' -c 'PREFIX sing' -c 'TOP_FILE index.htm' --no-verbose
+tex_eqalign_l2h tex_eqalign.texi -c 'HTML_MATH l2h' --iftex
+math_not_closed math_not_closed.texi -c 'HTML_MATH l2h' --iftex
+tex_not_closed tex_not_closed.texi -c 'HTML_MATH l2h' --iftex
+tex_in_copying tex_in_copying.texi -c 'HTML_MATH l2h' --iftex
+formatting_singular ../layout/formatting.texi --init-file t2h_singular.init -c 
'HTML_MATH l2h' -c 'EXTENSION htm' -c 'PREFIX sing' -c 'TOP_FILE index.htm' 
--no-verbose
 # The following could be added, mainly to test the full 
 # ../layout/formatting.texi processing with tex4ht, but
 # also to check that singular style is compatible with tex4ht
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 18077fb..1e7cbaf 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -908,16 +908,14 @@ sub process_config {
     $format = set_format('html', $format, 1);
     $parser_options->{'values'}->{'texi2html'} = 1;
   }
-  if (defined($conf->{'HTML_MATH'}) and $conf->{'HTML_MATH'} eq 'l2h') {
-    $conf->{'L2H'} = 1;
-  }
 }
 
 process_config($cmdline_options);
 
 # FIXME do this here or inside format-specific code?
 my $latex2html_file = 'latex2html.pm';
-if (defined($cmdline_options->{'L2H'})) {
+if (defined($cmdline_options->{'HTML_MATH'})
+      and $cmdline_options->{'HTML_MATH'} eq 'l2h') {
   locate_and_load_init_file($latex2html_file, 
                         [ @conf_dirs, @program_init_dirs ]);
 }