branch master updated: @itemx at beginning of table is an error

[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 12a63cead7 @itemx at beginning of table is an error
12a63cead7 is described below

commit 12a63cead72f917bc872672a3720c2754849fbf1
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Nov 27 11:06:27 2022 +0000

    @itemx at beginning of table is an error
    
    * tp/Texinfo/ParserNonXS.pm (gather_previous_item),
    * tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item),
    NEWS: @itemx at beginning of table is an error, not a warning,
    as with recent changes this gives invalid HTML and DocBook output.
    Suggestion from Patrice.
---
 ChangeLog                                            | 10 ++++++++++
 NEWS                                                 |  1 +
 tp/Texinfo/ParserNonXS.pm                            |  2 +-
 tp/Texinfo/XS/parsetexi/multitable.c                 |  2 +-
 tp/t/results/xtable/comment_and_itemx_before_item.pl |  4 ++--
 tp/t/results/xtable/itemx_before_item.pl             |  4 ++--
 tp/t/results/xtable/title_and_itemx_before_item.pl   |  4 ++--
 7 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 07443b7b02..7dc4eedc7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-11-27  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       @itemx at beginning of table is an error
+
+       * tp/Texinfo/ParserNonXS.pm (gather_previous_item),
+       * tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item),
+       NEWS: @itemx at beginning of table is an error, not a warning,
+       as with recent changes this gives invalid HTML and DocBook output.
+       Suggestion from Patrice.
+
 2022-11-26  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Common.pm (%default_converter_customization): update
diff --git a/NEWS b/NEWS
index 6b9f01024d..11605792f2 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ See the manual for detailed information.
 ------------------------------------------------------------------------------
 
 * texi2any
+ . @itemx at the beginning of a @table is now an error, not a warning
  . HTML output:
     . format @subentry and index entry with @seealso or @seeentry more in line
       with printed output.
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index eb2060cd2c..2cff37fea4 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1550,7 +1550,7 @@ sub _gather_previous_item($$;$$)
   if ($current->{'contents'}->[-1]->{'type'}
       and $current->{'contents'}->[-1]->{'type'} eq 'before_item') {
     if ($next_command and $next_command eq 'itemx') {
-      $self->_line_warn(sprintf(__("\@itemx should not begin \@%s"),
+      $self->_line_error(sprintf(__("\@itemx should not begin \@%s"),
                                 $current->{'cmdname'}), $source_info);
     }
     return;
diff --git a/tp/Texinfo/XS/parsetexi/multitable.c 
b/tp/Texinfo/XS/parsetexi/multitable.c
index b3ea5675d8..ca1dd19b06 100644
--- a/tp/Texinfo/XS/parsetexi/multitable.c
+++ b/tp/Texinfo/XS/parsetexi/multitable.c
@@ -71,7 +71,7 @@ gather_previous_item (ELEMENT *current, enum command_id 
next_command)
       && last_contents_child(current)->type == ET_before_item)
     {
       if (next_command == CM_itemx)
-        line_warn ("@itemx should not begin @%s", command_name(current->cmd));
+        line_error ("@itemx should not begin @%s", command_name(current->cmd));
       return;
     }
 
diff --git a/tp/t/results/xtable/comment_and_itemx_before_item.pl 
b/tp/t/results/xtable/comment_and_itemx_before_item.pl
index ef0e3868bf..eb8e274d46 100644
--- a/tp/t/results/xtable/comment_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/comment_and_itemx_before_item.pl
@@ -149,13 +149,13 @@ $result_texts{'comment_and_itemx_before_item'} = 'in itemx
 
 $result_errors{'comment_and_itemx_before_item'} = [
   {
-    'error_line' => 'warning: @itemx should not begin @table
+    'error_line' => '@itemx should not begin @table
 ',
     'file_name' => '',
     'line_nr' => 3,
     'macro' => '',
     'text' => '@itemx should not begin @table',
-    'type' => 'warning'
+    'type' => 'error'
   }
 ];
 
diff --git a/tp/t/results/xtable/itemx_before_item.pl 
b/tp/t/results/xtable/itemx_before_item.pl
index 017b1d5a0f..2341fa611b 100644
--- a/tp/t/results/xtable/itemx_before_item.pl
+++ b/tp/t/results/xtable/itemx_before_item.pl
@@ -127,13 +127,13 @@ $result_texts{'itemx_before_item'} = 'in itemx
 
 $result_errors{'itemx_before_item'} = [
   {
-    'error_line' => 'warning: @itemx should not begin @table
+    'error_line' => '@itemx should not begin @table
 ',
     'file_name' => '',
     'line_nr' => 2,
     'macro' => '',
     'text' => '@itemx should not begin @table',
-    'type' => 'warning'
+    'type' => 'error'
   }
 ];
 
diff --git a/tp/t/results/xtable/title_and_itemx_before_item.pl 
b/tp/t/results/xtable/title_and_itemx_before_item.pl
index c071f7887c..021954456a 100644
--- a/tp/t/results/xtable/title_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/title_and_itemx_before_item.pl
@@ -143,13 +143,13 @@ in itemx
 
 $result_errors{'title_and_itemx_before_item'} = [
   {
-    'error_line' => 'warning: @itemx should not begin @table
+    'error_line' => '@itemx should not begin @table
 ',
     'file_name' => '',
     'line_nr' => 3,
     'macro' => '',
     'text' => '@itemx should not begin @table',
-    'type' => 'warning'
+    'type' => 'error'
   }
 ];