branch master updated: Rename COMPLEX_FORMAT_IN_TABLE as INDENTED_BLOCK_COMMANDS_IN_TABLE

[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 f6a0fcabe0 Rename COMPLEX_FORMAT_IN_TABLE as 
INDENTED_BLOCK_COMMANDS_IN_TABLE
f6a0fcabe0 is described below

commit f6a0fcabe039f0932c9dbd25787e31ecadfbbf8c
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Apr 3 14:43:25 2024 +0200

    Rename COMPLEX_FORMAT_IN_TABLE as INDENTED_BLOCK_COMMANDS_IN_TABLE
    
    * NEWS, doc/texinfo.texi (Specific Customization of HTML Formatting)
    (HTML Customization Variables List), tp/Texinfo/Convert/HTML.pm
    (%defaults, _convert_indented_command, _convert_preformatted_command),
    tp/Texinfo/XS/convert/convert_html.c (convert_preformatted_command)
    (convert_indented_command), tp/Texinfo/options_data.txt,
    tp/init/html32.pm: rename COMPLEX_FORMAT_IN_TABLE customization
    variable as INDENTED_BLOCK_COMMANDS_IN_TABLE.
---
 ChangeLog                            | 12 ++++++++++++
 NEWS                                 |  2 ++
 doc/texinfo.texi                     | 16 ++++++++--------
 tp/Texinfo/Convert/HTML.pm           |  6 +++---
 tp/Texinfo/XS/convert/convert_html.c |  4 ++--
 tp/Texinfo/options_data.txt          |  2 +-
 tp/init/html32.pm                    |  2 +-
 7 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f139e45744..fc9081edac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-04-03  Patrice Dumas  <pertusus@free.fr>
+
+       Rename COMPLEX_FORMAT_IN_TABLE as INDENTED_BLOCK_COMMANDS_IN_TABLE
+
+       * NEWS, doc/texinfo.texi (Specific Customization of HTML Formatting)
+       (HTML Customization Variables List), tp/Texinfo/Convert/HTML.pm
+       (%defaults, _convert_indented_command, _convert_preformatted_command),
+       tp/Texinfo/XS/convert/convert_html.c (convert_preformatted_command)
+       (convert_indented_command), tp/Texinfo/options_data.txt,
+       tp/init/html32.pm: rename COMPLEX_FORMAT_IN_TABLE customization
+       variable as INDENTED_BLOCK_COMMANDS_IN_TABLE.
+
 2024-04-03  Gavin Smith <gavinsmith0123@gmail.com>
 
        * doc/texinfo.texi (Customization of HTML Code Inserted) <BODYTEXT>:
diff --git a/NEWS b/NEWS
index fc398f6174..ddc45dfe1f 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,8 @@ See the manual for detailed information.
  . remove FRAMES and FRAMESET_DOCTYPE customization options.
  . remove AVOID_MENU_REDUNDANCY customization option.
  . set CHECK_NORMAL_MENU_STRUCTURE in the default case.
+ . rename COMPLEX_FORMAT_IN_TABLE customization option as
+   INDENTED_BLOCK_COMMANDS_IN_TABLE.
  . some unused translation files have been removed for the
    "texinfo_document" domain
  . the us-ascii encoding is not tried anymore when looking for a document
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index dfb7db846e..4dbfc1c6d5 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -18482,15 +18482,15 @@ default @samp{4}.
 
 You may modify the appearance of various constructs by setting:
 @vtable @code
-@item COMPLEX_FORMAT_IN_TABLE
-If set, use tables for indentation of complex formats; default
-false.
-
 @item DEF_TABLE
 If set, a @code{<table>} construction for @code{@@deffn}
 and similar @@-commands is used (looking more like the @TeX{} output),
 instead of definition lists; default false.
 
+@item INDENTED_BLOCK_COMMANDS_IN_TABLE
+If set, use tables for indentation of indented block commands; default
+false.
+
 @item INDEX_ENTRY_COLON
 Symbol used between the index entry and the associated node or section;
 default is an empty string.
@@ -18757,10 +18757,6 @@ Check that manuals which are the target of external
 cross-references (@pxref{Four and Five Arguments}) are present in
 @file{htmlxref.cnf} (@pxref{HTML Xref Configuration}); default false.
 
-@item COMPLEX_FORMAT_IN_TABLE
-If set, use tables for indentation of complex formats; default
-false.
-
 @item CONTENTS_OUTPUT_LOCATION
 If set to @samp{after_top}, output the contents at the end of the @code{@@top}
 section.  If set to @samp{inline}, output the contents where the
@@ -18898,6 +18894,10 @@ Use icons for the navigation panel; default false.
 If set, the associated value is prepended to the image file
 links; default unset.
 
+@item INDENTED_BLOCK_COMMANDS_IN_TABLE
+If set, use tables for indentation of indented block commands; default
+false.
+
 @item INDEX_ENTRY_COLON
 Symbol used between the index entry and the associated node or section;
 default is an empty string.
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index d3eaaee992..a6bd875326 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -2426,7 +2426,7 @@ my %defaults = (
   'CLOSE_QUOTE_SYMBOL'    => undef,
   'CONTENTS_OUTPUT_LOCATION' => 'after_top',
   'CONVERT_TO_LATEX_IN_MATH' => undef,
-  'COMPLEX_FORMAT_IN_TABLE' => 0,
+  'INDENTED_BLOCK_COMMANDS_IN_TABLE' => 0,
   'COPIABLE_LINKS'        => 1,
   'DATE_IN_HEADER'        => 0,
   'DEFAULT_RULE'          => '<hr>',
@@ -5186,7 +5186,7 @@ sub _convert_preformatted_command($$$$$)
     $main_cmdname = 'example';
   }
 
-  if ($self->get_conf('COMPLEX_FORMAT_IN_TABLE')
+  if ($self->get_conf('INDENTED_BLOCK_COMMANDS_IN_TABLE')
       and $indented_preformatted_commands{$cmdname}) {
     return _indent_with_table($self, $cmdname, $content, \@classes);
   } else {
@@ -5227,7 +5227,7 @@ sub _convert_indented_command($$$$$)
     $main_cmdname = $cmdname;
   }
 
-  if ($self->get_conf('COMPLEX_FORMAT_IN_TABLE')) {
+  if ($self->get_conf('INDENTED_BLOCK_COMMANDS_IN_TABLE')) {
     return _indent_with_table($self, $main_cmdname, $content, \@classes);
   } else {
     unshift @classes, $main_cmdname;
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index 781a397a55..86aa6e689b 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -10458,7 +10458,7 @@ convert_preformatted_command (CONVERTER *self, const 
enum command_id cmd,
       main_cmd = CM_example;
     }
 
-  if (self->conf->COMPLEX_FORMAT_IN_TABLE.integer > 0
+  if (self->conf->INDENTED_BLOCK_COMMANDS_IN_TABLE.integer > 0
       && html_commands_data[cmd].flags & HF_indented_preformatted)
     {
       indent_with_table (self, cmd, content,
@@ -10520,7 +10520,7 @@ convert_indented_command (CONVERTER *self, const enum 
command_id cmd,
   else
     main_cmd = cmd;
 
-  if (self->conf->COMPLEX_FORMAT_IN_TABLE.integer > 0)
+  if (self->conf->INDENTED_BLOCK_COMMANDS_IN_TABLE.integer > 0)
     {
       indent_with_table (self, main_cmd, content,
                          additional_classes, result);
diff --git a/tp/Texinfo/options_data.txt b/tp/Texinfo/options_data.txt
index 6f86914da5..b2792f731a 100644
--- a/tp/Texinfo/options_data.txt
+++ b/tp/Texinfo/options_data.txt
@@ -214,7 +214,7 @@ CLOSE_DOUBLE_QUOTE_SYMBOL          converter_customization 
undef   char
 CLOSE_QUOTE_SYMBOL                 converter_customization undef   char
 COLLATION_LANGUAGE                 converter_customization undef   char
 COMMAND_LINE_ENCODING              converter_customization undef   char
-COMPLEX_FORMAT_IN_TABLE            converter_customization undef   integer
+INDENTED_BLOCK_COMMANDS_IN_TABLE   converter_customization undef   integer
 CONTENTS_OUTPUT_LOCATION           converter_customization undef   char
 CONVERT_TO_LATEX_IN_MATH           converter_customization undef   integer
 DATE_IN_HEADER                     converter_customization undef   integer
diff --git a/tp/init/html32.pm b/tp/init/html32.pm
index 9afc67d76a..952ec1afdb 100644
--- a/tp/init/html32.pm
+++ b/tp/init/html32.pm
@@ -40,7 +40,7 @@ use Texinfo::Commands;
 use Texinfo::Common;
 
 
-texinfo_set_from_init_file('COMPLEX_FORMAT_IN_TABLE', 1);
+texinfo_set_from_init_file('INDENTED_BLOCK_COMMANDS_IN_TABLE', 1);
 
 texinfo_set_from_init_file('DOCTYPE', '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 
3.2//EN" "http://www.w3.org/TR/html32/loose.dtd";>');