branch master updated: CONVERT_TO_LATEX_IN_MATH

[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 ba26ac279c CONVERT_TO_LATEX_IN_MATH
ba26ac279c is described below

commit ba26ac279c1f5496d956ac97ee5535918ec4bd2a
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Apr 12 10:08:35 2022 +0100

    CONVERT_TO_LATEX_IN_MATH
    
    * tp/Texinfo/Common.pm (@variable_string_settables):
    Rename CONVERT_TEXINFO_MATH_TO_LATEX to CONVERT_TO_LATEX_IN_MATH.
    * NEWS, doc/texinfo.texi: Update.
---
 ChangeLog                  |  8 ++++++++
 NEWS                       |  2 +-
 doc/texinfo.texi           |  2 +-
 tp/Texinfo/Common.pm       |  2 +-
 tp/Texinfo/Convert/HTML.pm | 10 +++++-----
 tp/t/html_tests.t          |  2 +-
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a2b3e86676..6aafa95ad4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-04-12  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       CONVERT_TO_LATEX_IN_MATH
+
+       * tp/Texinfo/Common.pm (@variable_string_settables):
+       Rename CONVERT_TEXINFO_MATH_TO_LATEX to CONVERT_TO_LATEX_IN_MATH.
+       * NEWS, doc/texinfo.texi: Update.
+
 2022-04-11  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * install-info/tests/defs.in, util/texi2dvi:
diff --git a/NEWS b/NEWS
index bb997cf91a..80eb657fb0 100644
--- a/NEWS
+++ b/NEWS
@@ -48,7 +48,7 @@ See the manual for detailed information.
        BEFORE_OVERVIEW to BEFORE_SHORT_TOC_LINE and AFTER_OVERVIEW to
        AFTER_SHORT_TOC_LINES.
      . remove PRE_ABOUT, AFTER_ABOUT, and add PROGRAM_NAME_IN_ABOUT
-     . new variable CONVERT_TEXINFO_MATH_TO_LATEX
+     . new variable CONVERT_TO_LATEX_IN_MATH
      . link to table of contents from short table of contents only if a
        table of contents is actually output
  . DocBook output:
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index e6ad935015..942aff47cf 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -16350,7 +16350,7 @@ end of the document if not split, or in a separate 
file.  If set to
 @samp{after_title} the tables of contents are output after the title; default
 @samp{after_top}.
 
-@item CONVERT_TEXINFO_MATH_TO_LATEX
+@item CONVERT_TO_LATEX_IN_MATH
 If set, try to convert any Texinfo @@-commands inside @code{@@math} and
 @code{@@displaymath} to @LaTeX{}.  Default @code{undef}.  If undefined, set
 if @code{HTML_MATH} is set.
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index bb2b70924f..4ac6bd848b 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -288,7 +288,7 @@ my @variable_string_settables = (
 'CLOSE_QUOTE_SYMBOL',
 'COMPLEX_FORMAT_IN_TABLE',
 'CONTENTS_OUTPUT_LOCATION',
-'CONVERT_TEXINFO_MATH_TO_LATEX',
+'CONVERT_TO_LATEX_IN_MATH',
 'DATE_IN_HEADER',
 'DEFAULT_RULE',
 'DEF_TABLE',
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 18fa36990f..4895957cfc 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1711,7 +1711,7 @@ my (%BUTTONS_TEXT, %BUTTONS_GOTO, %BUTTONS_NAME, 
%SPECIAL_ELEMENTS_HEADING);
 my %defaults = (
   'AVOID_MENU_REDUNDANCY' => 0,
   'CONTENTS_OUTPUT_LOCATION' => 'after_top',
-  'CONVERT_TEXINFO_MATH_TO_LATEX' => undef,
+  'CONVERT_TO_LATEX_IN_MATH' => undef,
   'ENABLE_ENCODING'      => 0,
   'EXTERNAL_CROSSREF_EXTENSION' => undef, # based on EXTENSION
   'FORMAT_MENU'           => 'sectiontoc',
@@ -9316,11 +9316,11 @@ sub output($$)
   }
 
   if ($self->get_conf('HTML_MATH')
-      and not defined($self->get_conf('CONVERT_TEXINFO_MATH_TO_LATEX'))) {
-    $self->set_conf('CONVERT_TEXINFO_MATH_TO_LATEX', 1);
+      and not defined($self->get_conf('CONVERT_TO_LATEX_IN_MATH'))) {
+    $self->set_conf('CONVERT_TO_LATEX_IN_MATH', 1);
   }
 
-  if ($self->get_conf('CONVERT_TEXINFO_MATH_TO_LATEX')) {
+  if ($self->get_conf('CONVERT_TO_LATEX_IN_MATH')) {
     $self->{'options_latex_math'}
      = { 
Texinfo::Convert::LaTeX::copy_options_for_convert_to_latex_math($self) };
   }
@@ -9995,7 +9995,7 @@ sub _convert($$;$)
         
$self->{'document_context'}->[-1]->{'formatting_context'}->[-1]->{'upper_case'}++;
       } elsif ($math_commands{$command_name}) {
         $self->{'document_context'}->[-1]->{'math'}++;
-        $convert_to_latex = 1 if 
($self->get_conf('CONVERT_TEXINFO_MATH_TO_LATEX'));
+        $convert_to_latex = 1 if ($self->get_conf('CONVERT_TO_LATEX_IN_MATH'));
       } elsif ($command_name eq 'w') {
         
$self->{'document_context'}->[-1]->{'formatting_context'}->[-1]->{'space_protected'}++;
       }
diff --git a/tp/t/html_tests.t b/tp/t/html_tests.t
index 6038b19b8a..64eae8f9ed 100644
--- a/tp/t/html_tests.t
+++ b/tp/t/html_tests.t
@@ -471,7 +471,7 @@ $mathjax_with_texinfo, {'test_formats' => ['latex', 
'file_latex'],
 {'HTML_MATH' => 'mathjax', 'ENABLE_ENCODING' => 1,},],
 ['mathjax_with_texinfo_no_convert_to_latex',
 $mathjax_with_texinfo, {}, {'HTML_MATH' => 'mathjax',
-                            'CONVERT_TEXINFO_MATH_TO_LATEX' => 0}],
+                            'CONVERT_TO_LATEX_IN_MATH' => 0}],
 ['empty_lines_at_beginning_no_setfilename',
 undef, {'test_file' => 'empty_lines_at_beginning_no_setfilename.texi'}
 ],