Add @documentinfo, @publication, @maketitle in texi2any, preliminary

* tta/data/command_data.txt: add maketitle, documentinfo and
publication.

* tta/C/parsetexi/handle_commands.c (handle_line_command),
tta/perl/Texinfo/ParserNonXS.pm (_handle_line_command): allow author
to be in documentinfo.

* tta/perl/Texinfo/Convert/DocBook.pm (%ignored_block_commands)
(conversion_output_begin), tta/C/convert/format_html.c
(html_default_format_titlepage, html_convert_maketitle_command)
(html_convert_unit_type), tta/C/convert/html_prepare_converter.c
(commands_internal_conversion_table), tta/perl/Texinfo/Convert/HTML.pm
(%ignored_block_commands, _convert_maketitle_command)
(_convert_unit_type, _default_format_titlepage),
tta/perl/Texinfo/Convert/Plaintext.pm (%formatted_line_commands,
%advance_paragraph_count_commands) (%ignored_commands),
tta/perl/Texinfo/Convert/Text.pm (%ignored_block_commands),
tta/perl/ext/epub3.pm (epub_finish): basic handling of documentinfo
and publication, mainly by ignoring, but also by searching for author
and subtitle in documentinfo.  Handle maketitle in HTML.  The
titlepage formatting for maketitle is not yet implemented.

* tta/perl/Texinfo/Convert/LaTeX.pm (%ignored_block_commands)
(_make_title, _convert, _tableofcontents_after_title)
(_begin_document): add _tableofcontents_after_title with code from
_begin_document related to table of contents.  Do titlepage in
_begin_document only if maketitle is not found.  Handle maketitle.
Add mainmatter and table of contents where maketitle is output.  The
titlepage formatting for maketitle, expected to be in the _make_title
function is not yet implemented.
diff --git a/ChangeLog b/ChangeLog
index a78ab2a..858a92d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,40 @@
 2025-08-24 Patrice Dumas  <pertusus@free.fr>
 
+	Add @documentinfo, @publication, @maketitle in texi2any, preliminary 
+
+	* tta/data/command_data.txt: add maketitle, documentinfo and
+	publication.
+
+	* tta/C/parsetexi/handle_commands.c (handle_line_command),
+	tta/perl/Texinfo/ParserNonXS.pm (_handle_line_command): allow author
+	to be in documentinfo.
+
+	* tta/perl/Texinfo/Convert/DocBook.pm (%ignored_block_commands)
+	(conversion_output_begin), tta/C/convert/format_html.c
+	(html_default_format_titlepage, html_convert_maketitle_command)
+	(html_convert_unit_type), tta/C/convert/html_prepare_converter.c
+	(commands_internal_conversion_table), tta/perl/Texinfo/Convert/HTML.pm
+	(%ignored_block_commands, _convert_maketitle_command)
+	(_convert_unit_type, _default_format_titlepage),
+	tta/perl/Texinfo/Convert/Plaintext.pm (%formatted_line_commands,
+	%advance_paragraph_count_commands) (%ignored_commands),
+	tta/perl/Texinfo/Convert/Text.pm (%ignored_block_commands),
+	tta/perl/ext/epub3.pm (epub_finish): basic handling of documentinfo
+	and publication, mainly by ignoring, but also by searching for author
+	and subtitle in documentinfo.  Handle maketitle in HTML.  The
+	titlepage formatting for maketitle is not yet implemented.
+
+	* tta/perl/Texinfo/Convert/LaTeX.pm (%ignored_block_commands)
+	(_make_title, _convert, _tableofcontents_after_title)
+	(_begin_document): add _tableofcontents_after_title with code from
+	_begin_document related to table of contents.  Do titlepage in
+	_begin_document only if maketitle is not found.  Handle maketitle.
+	Add mainmatter and table of contents where maketitle is output.  The
+	titlepage formatting for maketitle, expected to be in the _make_title
+	function is not yet implemented.
+
+2025-08-24 Patrice Dumas  <pertusus@free.fr>
+
 	* tta/C/main/get_perl_info.c (get_sv_option), tta/C/main/txi_config.c
 	(set_option_value): if an integer option is not an integer, set it to
 	0 if it is the string value is empty, or to 1 if not empty.  This
diff --git a/tta/C/convert/cmd_converter.c b/tta/C/convert/cmd_converter.c
index 1e3c268..eb315fa 100644
--- a/tta/C/convert/cmd_converter.c
+++ b/tta/C/convert/cmd_converter.c
@@ -145,6 +145,7 @@
 0,
 0,
 0,
+0,
 "&hellip;",  /* dots */
 0,
 0,
@@ -254,6 +255,7 @@
 0,
 0,
 0,
+0,
 "&minus;",  /* minus */
 0,
 0,
@@ -284,6 +286,7 @@
 0,
 0,
 0,
+0,
 "&iquest;",  /* questiondown */
 0,
 "&bdquo;",  /* quotedblbase */
diff --git a/tta/C/convert/format_html.c b/tta/C/convert/format_html.c
index 271014b..33fc130 100644
--- a/tta/C/convert/format_html.c
+++ b/tta/C/convert/format_html.c
@@ -5745,6 +5745,10 @@
       titlepage_text = 1;
       self->shared_conversion_state.elements_authors.top--;
     }
+  else if (self->document->global_commands.maketitle)
+    {
+      /* TODO here format using the @documentinfo information */
+    }
   else if (self->simpletitle_tree)
     {
       format_simpletitle (self, &result);
@@ -9719,6 +9723,15 @@
     }
 }
 
+void
+html_convert_maketitle_command (CONVERTER *self, const enum command_id cmd,
+                                    const ELEMENT *element,
+                                    const HTML_ARGS_FORMATTED *args_formatted,
+                                    const char *content, TEXT *result)
+{
+  text_append (result, self->title_titlepage);
+}
+
 static char *caption_in_listoffloats_array[] = {"caption-in-listoffloats"};
 static const STRING_LIST caption_in_listoffloats_classes
   = {caption_in_listoffloats_array, 1, 1};
@@ -12801,7 +12814,8 @@
 
   if (!output_unit->tree_unit_directions[D_prev])
     {
-      text_append (result, self->title_titlepage);
+      if (!self->document->global_commands.maketitle)
+        text_append (result, self->title_titlepage);
       if (!output_unit->tree_unit_directions[D_next])
         {
           /* only one unit, use simplified formatting */
diff --git a/tta/C/convert/format_html.h b/tta/C/convert/format_html.h
index 42b8bb6..0f57f41 100644
--- a/tta/C/convert/format_html.h
+++ b/tta/C/convert/format_html.h
@@ -184,6 +184,7 @@
 COMMAND_CONVERSION_FUNCTION(item_command)
 COMMAND_CONVERSION_FUNCTION(tab_command)
 COMMAND_CONVERSION_FUNCTION(insertcopying_command)
+COMMAND_CONVERSION_FUNCTION(maketitle_command)
 COMMAND_CONVERSION_FUNCTION(listoffloats_command)
 COMMAND_CONVERSION_FUNCTION(printindex_command)
 COMMAND_CONVERSION_FUNCTION(informative_command)
diff --git a/tta/C/convert/html_prepare_converter.c b/tta/C/convert/html_prepare_converter.c
index e74ac8c..16eb9bb 100644
--- a/tta/C/convert/html_prepare_converter.c
+++ b/tta/C/convert/html_prepare_converter.c
@@ -1863,6 +1863,7 @@
   {CM_itemx, &html_convert_item_command},
   {CM_tab, &html_convert_tab_command},
   {CM_insertcopying, &html_convert_insertcopying_command},
+  {CM_maketitle, &html_convert_maketitle_command},
   {CM_listoffloats, &html_convert_listoffloats_command},
   {CM_printindex, &html_convert_printindex_command},
   /* @informative_global_commands in perl */
diff --git a/tta/C/main/cmd_structuring.c b/tta/C/main/cmd_structuring.c
index 1499061..b96c4bf 100644
--- a/tta/C/main/cmd_structuring.c
+++ b/tta/C/main/cmd_structuring.c
@@ -194,6 +194,7 @@
 -1,
 -1,
 -1,
+-1,
 2,  /* heading */
 -1,
 -1,
@@ -278,6 +279,7 @@
 -1,
 -1,
 -1,
+-1,
 0,  /* part */
 -1,
 -1,
@@ -307,6 +309,7 @@
 -1,
 -1,
 -1,
+-1,
 2,  /* section */
 -1,
 -1,
diff --git a/tta/C/main/cmd_text.c b/tta/C/main/cmd_text.c
index 59ce271..0e41a82 100644
--- a/tta/C/main/cmd_text.c
+++ b/tta/C/main/cmd_text.c
@@ -393,6 +393,9 @@
 0,
 0,
 0,
+0,
+0,
+0,
 "{",   /* { */
 "",   /* | */
 "}",   /* } */
@@ -543,6 +546,7 @@
 0,
 0,
 0,
+0,
 "...",   /* dots */
 0,
 0,
@@ -652,6 +656,7 @@
 0,
 0,
 0,
+0,
 "-",   /* minus */
 0,
 0,
@@ -682,6 +687,7 @@
 "-|",   /* print */
 0,
 0,
+0,
 "?",   /* questiondown */
 0,
 ",,",   /* quotedblbase */
@@ -1032,6 +1038,7 @@
 0,
 0,
 0,
+0,
 "l",   /* l */
 0,
 0,
@@ -1055,6 +1062,7 @@
 0,
 0,
 0,
+0,
 "o",   /* o */
 0,
 0,
@@ -1090,6 +1098,7 @@
 0,
 0,
 0,
+0,
 "R",   /* registeredsymbol */
 0,
 0,
diff --git a/tta/C/main/cmd_unicode.c b/tta/C/main/cmd_unicode.c
index 9cb5f74..0c06d6b 100644
--- a/tta/C/main/cmd_unicode.c
+++ b/tta/C/main/cmd_unicode.c
@@ -145,6 +145,7 @@
 {0, 0, 0},
 {0, 0, 0},
 {0, 0, 0},
+{0, 0, 0},
 {"\xcc\x87", "775", "0307"},  /* dotaccent */
 {0, 0, 0},
 {0, 0, 0},
@@ -271,6 +272,7 @@
 {0, 0, 0},
 {0, 0, 0},
 {0, 0, 0},
+{0, 0, 0},
 {"\xcc\xa8", "808", "0328"},  /* ogonek */
 {0, 0, 0},
 {0, 0, 0},
@@ -302,6 +304,7 @@
 {0, 0, 0},
 {0, 0, 0},
 {0, 0, 0},
+{0, 0, 0},
 {"\xcc\x8a", "778", "030A"},  /* ringaccent */
 {0, 0, 0},
 {0, 0, 0},
@@ -551,6 +554,7 @@
 {0, 0, 0},
 {0, 0, 0},
 {0, 0, 0},
+{0, 0, 0},
 {"20AC", "\xe2\x82\xac", "\\20AC "},   /* euro */
 {0, 0, 0},
 {0, 0, 0},
@@ -659,6 +663,7 @@
 {0, 0, 0},
 {0, 0, 0},
 {0, 0, 0},
+{0, 0, 0},
 {"00F8", "\xc3\xb8", "\\00F8 "},   /* o */
 {0, 0, 0},
 {0, 0, 0},
@@ -680,6 +685,7 @@
 {0, 0, 0},
 {0, 0, 0},
 {0, 0, 0},
+{0, 0, 0},
 {"00BF", "\xc2\xbf", "\\00BF "},   /* questiondown */
 {0, 0, 0},
 {"201E", "\xe2\x80\x9e", "\\201E "},   /* quotedblbase */
@@ -935,6 +941,7 @@
 {0, 0, 0},
 {0, 0, 0},
 {0, 0, 0},
+{0, 0, 0},
 {"2026", "\xe2\x80\xa6", "\\2026 "},   /* dots */
 {0, 0, 0},
 {0, 0, 0},
@@ -1044,6 +1051,7 @@
 {0, 0, 0},
 {0, 0, 0},
 {0, 0, 0},
+{0, 0, 0},
 {"2212", "\xe2\x88\x92", "\\2212 "},   /* minus */
 {0, 0, 0},
 {0, 0, 0},
@@ -1077,6 +1085,7 @@
 {0, 0, 0},
 {0, 0, 0},
 {0, 0, 0},
+{0, 0, 0},
 {"201C", "\xe2\x80\x9c", "\\201C "},   /* quotedblleft */
 {"201D", "\xe2\x80\x9d", "\\201D "},   /* quotedblright */
 {"2018", "\xe2\x80\x98", "\\2018 "},   /* quoteleft */
diff --git a/tta/C/main/command_data.c b/tta/C/main/command_data.c
index d75cbdd..f3484e1 100644
--- a/tta/C/main/command_data.c
+++ b/tta/C/main/command_data.c
@@ -143,6 +143,7 @@
 {"docbook", CF_block | CF_no_paragraph | CF_preamble, 0, BLOCK_format_raw, 0},
 {"documentdescription", CF_block | CF_no_paragraph | CF_close_paragraph | CF_global_unique | CF_preamble, 0, BLOCK_region, 0},
 {"documentencoding", CF_line | CF_no_paragraph | CF_global | CF_preamble | CF_contain_plain_text, 0, LINE_text, 1},
+{"documentinfo", CF_block | CF_no_paragraph | CF_close_paragraph | CF_global_unique | CF_preamble, 0, BLOCK_region, 0},
 {"documentlanguage", CF_line | CF_no_paragraph | CF_global | CF_preamble | CF_contain_plain_text, 0, LINE_text, 1},
 {"dotaccent", CF_brace | CF_accent | CF_contain_plain_text, 0, BRACE_accent, 1},
 {"dotless", CF_brace | CF_accent | CF_contain_plain_text, 0, BRACE_accent, 1},
@@ -252,6 +253,7 @@
 {"lowersections", CF_line | CF_no_paragraph | CF_preamble, 0, LINE_lineraw, 0},
 {"macro", CF_block | CF_no_paragraph | CF_preamble, CF_non_formatted_block, BLOCK_raw, 0},
 {"majorheading", CF_line | CF_no_paragraph | CF_contain_basic_inline | CF_sectioning_heading | CF_close_paragraph | CF_global, CF_formatted_line, LINE_line, 1},
+{"maketitle", CF_line | CF_no_paragraph | CF_close_paragraph | CF_global_unique, CF_formattable_line, LINE_lineraw, 0},
 {"math", CF_brace | CF_math | CF_contain_basic_inline, 0, BRACE_context, 1},
 {"menu", CF_block | CF_no_paragraph | CF_close_paragraph, 0, BLOCK_menu, 0},
 {"microtype", CF_line | CF_no_paragraph | CF_global | CF_preamble | CF_contain_plain_text, 0, LINE_specific, 1},
@@ -284,6 +286,7 @@
 {"pounds", CF_brace, 0, BRACE_noarg, 0},
 {"print", CF_brace, 0, BRACE_noarg, 0},
 {"printindex", CF_line | CF_no_paragraph | CF_close_paragraph | CF_global | CF_contain_plain_text, CF_formattable_line, LINE_specific, 1},
+{"publication", CF_block | CF_no_paragraph | CF_close_paragraph | CF_global_unique | CF_preamble, 0, BLOCK_region, 0},
 {"pxref", CF_brace | CF_ref | CF_contain_basic_inline, 0, BRACE_arguments, 5},
 {"questiondown", CF_brace, 0, BRACE_noarg, 0},
 {"quotation", CF_block | CF_no_paragraph | CF_close_paragraph | CF_contain_basic_inline, 0, BLOCK_quotation, 1},
diff --git a/tta/C/main/command_ids.h b/tta/C/main/command_ids.h
index f8ed920..cab7da8 100644
--- a/tta/C/main/command_ids.h
+++ b/tta/C/main/command_ids.h
@@ -172,6 +172,7 @@
 CM_docbook,
 CM_documentdescription,
 CM_documentencoding,
+CM_documentinfo,
 CM_documentlanguage,
 CM_dotaccent,
 CM_dotless,
@@ -281,6 +282,7 @@
 CM_lowersections,
 CM_macro,
 CM_majorheading,
+CM_maketitle,
 CM_math,
 CM_menu,
 CM_microtype,
@@ -313,6 +315,7 @@
 CM_pounds,
 CM_print,
 CM_printindex,
+CM_publication,
 CM_pxref,
 CM_questiondown,
 CM_quotation,
@@ -425,7 +428,7 @@
 CM_hex_7e,
 };
 
-#define BUILTIN_CMD_NUMBER 391
+#define BUILTIN_CMD_NUMBER 394
 
 #define TXI_CMD_CATEGORY_BLOCK \
   tcc_cmd_category(conditional, block, BLOCK) \
diff --git a/tta/C/main/global_commands_types.h b/tta/C/main/global_commands_types.h
index 0068a90..e11d8e9 100644
--- a/tta/C/main/global_commands_types.h
+++ b/tta/C/main/global_commands_types.h
@@ -13,6 +13,7 @@
    ELEMENT *bsixpaper;
    ELEMENT *copying;
    ELEMENT *documentdescription;
+   ELEMENT *documentinfo;
    ELEMENT *evenfooting;
    ELEMENT *evenfootingmarks;
    ELEMENT *evenheading;
@@ -23,12 +24,14 @@
    ELEMENT *everyheadingmarks;
    ELEMENT *fonttextsize;
    ELEMENT *footnotestyle;
+   ELEMENT *maketitle;
    ELEMENT *novalidate;
    ELEMENT *oddfooting;
    ELEMENT *oddfootingmarks;
    ELEMENT *oddheading;
    ELEMENT *oddheadingmarks;
    ELEMENT *pagesizes;
+   ELEMENT *publication;
    ELEMENT *setchapternewpage;
    ELEMENT *setfilename;
    ELEMENT *settitle;
diff --git a/tta/C/main/global_unique_commands_case.c b/tta/C/main/global_unique_commands_case.c
index ee85a70..f99052d 100644
--- a/tta/C/main/global_unique_commands_case.c
+++ b/tta/C/main/global_unique_commands_case.c
@@ -8,6 +8,7 @@
 GLOBAL_UNIQUE_CASE(bsixpaper);
 GLOBAL_UNIQUE_CASE(copying);
 GLOBAL_UNIQUE_CASE(documentdescription);
+GLOBAL_UNIQUE_CASE(documentinfo);
 GLOBAL_UNIQUE_CASE(evenfooting);
 GLOBAL_UNIQUE_CASE(evenfootingmarks);
 GLOBAL_UNIQUE_CASE(evenheading);
@@ -18,12 +19,14 @@
 GLOBAL_UNIQUE_CASE(everyheadingmarks);
 GLOBAL_UNIQUE_CASE(fonttextsize);
 GLOBAL_UNIQUE_CASE(footnotestyle);
+GLOBAL_UNIQUE_CASE(maketitle);
 GLOBAL_UNIQUE_CASE(novalidate);
 GLOBAL_UNIQUE_CASE(oddfooting);
 GLOBAL_UNIQUE_CASE(oddfootingmarks);
 GLOBAL_UNIQUE_CASE(oddheading);
 GLOBAL_UNIQUE_CASE(oddheadingmarks);
 GLOBAL_UNIQUE_CASE(pagesizes);
+GLOBAL_UNIQUE_CASE(publication);
 GLOBAL_UNIQUE_CASE(setchapternewpage);
 GLOBAL_UNIQUE_CASE(settitle);
 GLOBAL_UNIQUE_CASE(shorttitlepage);
diff --git a/tta/C/main/html_conversion_data.c b/tta/C/main/html_conversion_data.c
index ff07d2c..2db8649 100644
--- a/tta/C/main/html_conversion_data.c
+++ b/tta/C/main/html_conversion_data.c
@@ -356,6 +356,7 @@
 0,
 0,
 0,
+0,
 "em",  /* emph */
 0,
 0,
@@ -479,6 +480,7 @@
 0,
 0,
 0,
+0,
 "samp",  /* option */
 0,
 0,
@@ -501,6 +503,7 @@
 0,
 0,
 0,
+0,
 "span",  /* r */
 0,
 0,
diff --git a/tta/C/parsetexi/handle_commands.c b/tta/C/parsetexi/handle_commands.c
index 007707b..a899f75 100644
--- a/tta/C/parsetexi/handle_commands.c
+++ b/tta/C/parsetexi/handle_commands.c
@@ -1185,14 +1185,15 @@
                 break;
               if (parent_cmd == CM_titlepage
                   || parent_cmd == CM_quotation
-                  || parent_cmd == CM_smallquotation)
+                  || parent_cmd == CM_smallquotation
+                  || parent_cmd == CM_documentinfo)
                 {
                   found = 1; break;
                 }
             }
           if (!found)
             line_warn ("@author not meaningful outside "
-                       "`@titlepage' and `@quotation' environments");
+          "`@titlepage', `@documentinfo' and `@quotation' environments");
         }
       else if (cmd == CM_dircategory && current_node)
         line_warn ("@dircategory after first node");
diff --git a/tta/data/command_data.txt b/tta/data/command_data.txt
index 702fc48..498138e 100644
--- a/tta/data/command_data.txt
+++ b/tta/data/command_data.txt
@@ -175,6 +175,7 @@
 shortcontents           line,close_paragraph,global,preamble    lineraw
 summarycontents         line,close_paragraph,global,preamble    lineraw
 insertcopying           line,formattable_line,close_paragraph,global      lineraw
+maketitle               line,formattable_line,close_paragraph,global_unique      lineraw
 
 # more relevant in preamble
 documentencoding        line,global,preamble,contain_plain_text   text
@@ -565,6 +566,8 @@
 titlepage               block,close_paragraph,global_unique,preamble     region
 copying                 block,close_paragraph,global_unique,preamble     region
 documentdescription     block,close_paragraph,global_unique,preamble     region
+documentinfo            block,close_paragraph,global_unique,preamble     region
+publication             block,close_paragraph,global_unique,preamble     region
 
 # preformatted commands
 example           block,close_paragraph,preformatted,preformatted_code,variadic,contain_basic_inline   preformatted
diff --git a/tta/perl/Texinfo/Commands.pm b/tta/perl/Texinfo/Commands.pm
index 53a4478..b4a1412 100644
--- a/tta/perl/Texinfo/Commands.pm
+++ b/tta/perl/Texinfo/Commands.pm
@@ -83,6 +83,8 @@
   "verbatim"                => 'raw',
   "copying"                 => 'region',
   "documentdescription"     => 'region',
+  "documentinfo"            => 'region',
+  "publication"             => 'region',
   "titlepage"               => 'region',
 );
 
@@ -321,6 +323,7 @@
   "finalout"                => 'lineraw',
   "insertcopying"           => 'lineraw',
   "lowersections"           => 'lineraw',
+  "maketitle"               => 'lineraw',
   "novalidate"              => 'lineraw',
   "page"                    => 'lineraw',
   "raisesections"           => 'lineraw',
@@ -513,6 +516,7 @@
   "display"                 => 1,
   "displaymath"             => 1,
   "documentdescription"     => 1,
+  "documentinfo"            => 1,
   "enumerate"               => 1,
   "example"                 => 1,
   "exdent"                  => 1,
@@ -533,6 +537,7 @@
   "lisp"                    => 1,
   "listoffloats"            => 1,
   "majorheading"            => 1,
+  "maketitle"               => 1,
   "menu"                    => 1,
   "multitable"              => 1,
   "need"                    => 1,
@@ -540,6 +545,7 @@
   "nodedescriptionblock"    => 1,
   "page"                    => 1,
   "printindex"              => 1,
+  "publication"             => 1,
   "quotation"               => 1,
   "raggedright"             => 1,
   "setfilename"             => 1,
@@ -838,6 +844,7 @@
 our %formattable_line_commands = (
   "insertcopying"           => 1,
   "listoffloats"            => 1,
+  "maketitle"               => 1,
   "need"                    => 1,
   "printindex"              => 1,
   "sp"                      => 1,
@@ -946,6 +953,7 @@
   "bsixpaper"               => 1,
   "copying"                 => 1,
   "documentdescription"     => 1,
+  "documentinfo"            => 1,
   "evenfooting"             => 1,
   "evenfootingmarks"        => 1,
   "evenheading"             => 1,
@@ -956,12 +964,14 @@
   "everyheadingmarks"       => 1,
   "fonttextsize"            => 1,
   "footnotestyle"           => 1,
+  "maketitle"               => 1,
   "novalidate"              => 1,
   "oddfooting"              => 1,
   "oddfootingmarks"         => 1,
   "oddheading"              => 1,
   "oddheadingmarks"         => 1,
   "pagesizes"               => 1,
+  "publication"             => 1,
   "setchapternewpage"       => 1,
   "setfilename"             => 1,
   "settitle"                => 1,
@@ -1146,6 +1156,7 @@
   "docbook"                 => 1,
   "documentdescription"     => 1,
   "documentencoding"        => 1,
+  "documentinfo"            => 1,
   "documentlanguage"        => 1,
   "end"                     => 1,
   "enumerate"               => 1,
@@ -1218,6 +1229,7 @@
   "lowersections"           => 1,
   "macro"                   => 1,
   "majorheading"            => 1,
+  "maketitle"               => 1,
   "menu"                    => 1,
   "microtype"               => 1,
   "multitable"              => 1,
@@ -1239,6 +1251,7 @@
   "pgindex"                 => 1,
   "pindex"                  => 1,
   "printindex"              => 1,
+  "publication"             => 1,
   "quotation"               => 1,
   "raggedright"             => 1,
   "raisesections"           => 1,
@@ -1341,6 +1354,7 @@
   "docbook"                 => 1,
   "documentdescription"     => 1,
   "documentencoding"        => 1,
+  "documentinfo"            => 1,
   "documentlanguage"        => 1,
   "end"                     => 1,
   "errormsg"                => 1,
@@ -1383,6 +1397,7 @@
   "oddheadingmarks"         => 1,
   "pagesizes"               => 1,
   "paragraphindent"         => 1,
+  "publication"             => 1,
   "raisesections"           => 1,
   "refill"                  => 1,
   "rmacro"                  => 1,
diff --git a/tta/perl/Texinfo/Convert/DocBook.pm b/tta/perl/Texinfo/Convert/DocBook.pm
index 74a6c2e..9dc0072 100644
--- a/tta/perl/Texinfo/Convert/DocBook.pm
+++ b/tta/perl/Texinfo/Convert/DocBook.pm
@@ -226,7 +226,7 @@
 
 my %ignored_block_commands;
 foreach my $block_command ('copying', 'titlepage', 'documentdescription',
-    'nodedescriptionblock') {
+    'nodedescriptionblock', 'publication', 'documentinfo') {
   $ignored_block_commands{$block_command} = 1;
 }
 
@@ -440,37 +440,41 @@
   # independently, only author and subtitle are gathered here.
   my $subtitle_info = '';
   my $authors_info = '';
-  if (defined($global_commands) and exists($global_commands->{'titlepage'})) {
-    my $collected_commands = Texinfo::Common::collect_commands_list_in_tree(
-            $global_commands->{'titlepage'}, ['author', 'subtitle']);
+  if (defined($global_commands)) {
+    foreach my $information_block ('documentinfo', 'titlepage') {
+      if (exists($global_commands->{$information_block})) {
+        my $collected_commands
+          = Texinfo::Common::collect_commands_list_in_tree(
+            $global_commands->{$information_block}, ['author', 'subtitle']);
 
-    my @authors_elements;
-    my $subtitle_text = '';
-    if (scalar(@{$collected_commands})) {
-      foreach my $element (@{$collected_commands}) {
-        my $cmdname = $element->{'cmdname'};
-        if ($cmdname eq 'author') {
-          push @authors_elements, $element;
-        } elsif ($cmdname eq 'subtitle') {
-          # concatenate the text of @subtitle as DocBook only allows one.
-          my ($arg, $end_line)
-            = _convert_argument_and_end_line($self, $element);
-          $subtitle_text .= $arg . $end_line
+        my @authors_elements;
+        my $subtitle_text = '';
+        if (scalar(@{$collected_commands})) {
+          foreach my $element (@{$collected_commands}) {
+            my $cmdname = $element->{'cmdname'};
+            if ($cmdname eq 'author') {
+              push @authors_elements, $element;
+            } elsif ($cmdname eq 'subtitle') {
+              # concatenate the text of @subtitle as DocBook only allows one.
+              my ($arg, $end_line)
+                = _convert_argument_and_end_line($self, $element);
+              $subtitle_text .= $arg . $end_line
+            }
+          }
         }
-      }
-    }
-    if ($subtitle_text ne '') {
-      chomp ($subtitle_text);
-      $subtitle_info = "<subtitle>$subtitle_text</subtitle>\n";
-    }
+        if ($subtitle_text ne '') {
+          chomp ($subtitle_text);
+          $subtitle_info = "<subtitle>$subtitle_text</subtitle>\n";
+        }
 
-    if (scalar(@authors_elements)) {
+        if (scalar(@authors_elements)) {
       # using authorgroup and collab is the best, because it doesn't require
       # knowing people name decomposition.  Also it should work for group names.
       # FIXME dblatex ignores collab/collabname.
-      $authors_info .= "<authorgroup>\n";
-      foreach my $element (@authors_elements) {
-        my ($arg, $end_line) = _convert_argument_and_end_line($self, $element);
+          $authors_info .= "<authorgroup>\n";
+          foreach my $element (@authors_elements) {
+            my ($arg, $end_line)
+              = _convert_argument_and_end_line($self, $element);
         # FIXME DocBook 5 no more collabname, merged with other elements in
         # orgname, which is much more specific than collabname, it is for an
         # organisation and therefore not suitable here.
@@ -480,12 +484,16 @@
         # have the information in Texinfo needed for <person>, which requires
         # a split of the name in honorific, firstname, surname...
         # https://tdg.docbook.org/tdg/5.0/personname
-        my $result = "<collab><collabname>$arg</collabname></collab>$end_line";
-        chomp ($result);
-        $result .= "\n";
-        $authors_info .= $result;
+            my $result
+             = "<collab><collabname>$arg</collabname></collab>$end_line";
+            chomp ($result);
+            $result .= "\n";
+            $authors_info .= $result;
+          }
+          $authors_info .= "</authorgroup>\n";
+        }
+        last;
       }
-      $authors_info .= "</authorgroup>\n";
     }
   }
 
diff --git a/tta/perl/Texinfo/Convert/HTML.pm b/tta/perl/Texinfo/Convert/HTML.pm
index 03b3339..4605c14 100644
--- a/tta/perl/Texinfo/Convert/HTML.pm
+++ b/tta/perl/Texinfo/Convert/HTML.pm
@@ -2993,8 +2993,8 @@
 }
 
 foreach my $ignored_block_commands ('ignore', 'macro', 'rmacro', 'linemacro',
-   'copying', 'documentdescription', 'titlepage', 'direntry',
-   'nodedescriptionblock') {
+   'copying', 'documentdescription', 'documentinfo', 'titlepage',
+   'publication', 'direntry', 'nodedescriptionblock') {
   $default_commands_conversion{$ignored_block_commands} = undef;
 };
 
@@ -5139,6 +5139,15 @@
 $default_commands_conversion{'insertcopying'}
    = \&_convert_insertcopying_command;
 
+sub _convert_maketitle_command($$$) {
+  my ($self, $cmdname, $command) = @_;
+
+  return $self->get_info('title_titlepage');
+}
+
+$default_commands_conversion{'maketitle'}
+   = \&_convert_maketitle_command;
+
 sub _convert_listoffloats_command($$$$) {
   my ($self, $cmdname, $command, $args) = @_;
 
@@ -7846,7 +7855,17 @@
   my $result = '';
   if (not exists($output_unit->{'tree_unit_directions'})
       or not exists($output_unit->{'tree_unit_directions'}->{'prev'})) {
-    $result .= $self->get_info('title_titlepage');
+    my $global_commands;
+
+    my $document = $self->get_info('document');
+    if (defined($document)) {
+      $global_commands = $document->global_commands_information();
+    }
+
+    if (!(defined($global_commands)
+          and exists($global_commands->{'maketitle'}))) {
+      $result .= $self->get_info('title_titlepage');
+    }
     if (not exists($output_unit->{'tree_unit_directions'})
         or not exists($output_unit->{'tree_unit_directions'}->{'next'})) {
       # only one unit, use simplified formatting
@@ -7937,6 +7956,9 @@
     $self->set_shared_conversion_state('quotation',
                                        'quotation_titlepage_stack',
                                        $quotation_titlepage_nr);
+  } elsif (defined($global_commands)
+           and exists($global_commands->{'maketitle'})) {
+    # TODO here format using the @documentinfo information
   } else {
     my $simpletitle_tree = $self->get_info('simpletitle_tree');
     if (defined($simpletitle_tree)) {
diff --git a/tta/perl/Texinfo/Convert/LaTeX.pm b/tta/perl/Texinfo/Convert/LaTeX.pm
index 2fd4b4b..2822108 100644
--- a/tta/perl/Texinfo/Convert/LaTeX.pm
+++ b/tta/perl/Texinfo/Convert/LaTeX.pm
@@ -486,9 +486,11 @@
   $ignored_commands{$ignored_brace_commands} = 1;
 }
 
-# titlepage content is directly formatted at document begin
+# titlepage content is directly formatted at document begin.
+# publication and documentinfo information are used for maketitle.
 foreach my $ignored_block_commands ('ignore', 'macro', 'rmacro', 'linemacro',
-  'copying', 'documentdescription', 'titlepage', 'nodedescriptionblock') {
+  'copying', 'documentdescription', 'titlepage', 'nodedescriptionblock',
+  'publication', 'documentinfo') {
   $ignored_commands{$ignored_block_commands} = 1;
 }
 
@@ -1875,6 +1877,27 @@
   return $result_text;
 }
 
+sub _tableofcontents_after_title($$;$) {
+  my ($self, $global_commands, $restore_pagenums) = @_;
+
+  my $result = '';
+
+  if (exists($global_commands->{'contents'})
+      and not (defined($self->get_conf('CONTENTS_OUTPUT_LOCATION'))
+               and $self->get_conf('CONTENTS_OUTPUT_LOCATION') eq 'inline')) {
+    my $sections_list = $self->{'document'}->sections_list();
+
+    if (defined($sections_list) and scalar(@$sections_list)) {
+      if ($restore_pagenums) {
+        $result .= _set_headings($self, 'pagenum');
+      }
+      $result .= "\\tableofcontents\\newpage\n";
+    }
+  }
+
+  return $result;
+}
+
 sub _begin_document($) {
   my $self = shift;
 
@@ -1886,14 +1909,21 @@
     $global_commands = $self->{'document'}->global_commands_information();
   }
 
-  if (defined($global_commands)
-      and (exists($global_commands->{'titlepage'})
-           or exists($global_commands->{'shorttitlepage'}))) {
+  return if (!defined($global_commands));
+
+  my $with_maketitle = (exists($global_commands->{'maketitle'}));
+
+  my $with_title_page = (exists($global_commands->{'titlepage'})
+                   or exists($global_commands->{'shorttitlepage'}));
+
+  if ($with_maketitle or $with_title_page) {
     $result .= "\n";
     $result .= $front_main_matter_definitions{$documentclass}->{'front'}."\n";
     $result .= _set_headings($self, 'off');
 
-    if (exists($global_commands->{'titlepage'})) {
+    if ($with_maketitle) {
+      # do nothing here, output the titlepage where @maketitle appears
+    } elsif (exists($global_commands->{'titlepage'})) {
       my $element = $global_commands->{'titlepage'};
       # Start a group such that the changes are forgotten when front cover
       # is done.
@@ -1925,27 +1955,16 @@
     }
   }
 
-  if (defined($global_commands) and exists($global_commands->{'contents'})
-      and not (defined($self->get_conf('CONTENTS_OUTPUT_LOCATION'))
-               and $self->get_conf('CONTENTS_OUTPUT_LOCATION') eq 'inline')) {
-    my $sections_list = $self->{'document'}->sections_list();
+  if (!$with_maketitle) {
+    $result .= _tableofcontents_after_title($self, $global_commands,
+                                            $with_title_page);
 
-    if (defined($sections_list) and scalar(@$sections_list)) {
-      if (exists($global_commands->{'titlepage'})
-          or exists($global_commands->{'shorttitlepage'})) {
-        $result .= _set_headings($self, 'pagenum');
-      }
-      $result .= "\\tableofcontents\\newpage\n";
+    if ($with_title_page) {
+      $result .= $front_main_matter_definitions{$documentclass}->{'main'}."\n";
+      $result .= _set_headings($self, $self->get_conf('headings'));
     }
   }
 
-  if (defined($global_commands)
-      and (exists($global_commands->{'titlepage'})
-           or exists($global_commands->{'shorttitlepage'}))) {
-    $result .= $front_main_matter_definitions{$documentclass}->{'main'}."\n";
-    $result .= _set_headings($self, $self->get_conf('headings'));
-  }
-
   return $result;
 }
 
@@ -2797,6 +2816,13 @@
   $result .= _index_entry($self, $element);
 }
 
+sub _make_title($$) {
+  my ($self, $global_commands) = @_;
+
+  # TODO use @documentinfo and @publication to format
+  return '';
+}
+
 sub _convert($$);
 
 # Convert the Texinfo tree under $ELEMENT
@@ -4223,6 +4249,18 @@
            {'contents' => $global_commands->{'copying'}->{'contents'}};
       }
       return $result;
+    } elsif ($cmdname eq 'maketitle') {
+      my $global_commands;
+      if (exists($self->{'document'})) {
+        $global_commands = $self->{'document'}->global_commands_information();
+      }
+      if (defined($global_commands)) {
+        $result .= _make_title($self, $global_commands);
+        $result .= _tableofcontents_after_title($self, $global_commands, 1);
+      }
+      $result .= $front_main_matter_definitions{$documentclass}->{'main'}."\n";
+      $result .= _set_headings($self, $self->get_conf('headings'));
+      return $result;
     } elsif ($cmdname eq 'printindex') {
       my $index_name;
       if (exists($element->{'extra'})
diff --git a/tta/perl/Texinfo/Convert/Plaintext.pm b/tta/perl/Texinfo/Convert/Plaintext.pm
index ea36b82..c39cf54 100644
--- a/tta/perl/Texinfo/Convert/Plaintext.pm
+++ b/tta/perl/Texinfo/Convert/Plaintext.pm
@@ -132,7 +132,7 @@
 
 # formatted/formattable @-commands not formatted in Plaintext/Info
 foreach my $non_formatted_line_command ('page', 'need', 'vskip',
-   'subtitle', 'title') {
+   'subtitle', 'title', 'maketitle') {
   delete $formatted_line_commands{$non_formatted_line_command};
 }
 
@@ -267,7 +267,8 @@
 # group and raggedright do more than not advancing para, they should also
 # be transparent with respect to paragraph number counting.
 foreach my $not_advancing_para ('group', 'raggedright',
-  'titlepage', 'copying', 'documentdescription', 'float') {
+  'titlepage', 'copying', 'documentdescription', 'documentinfo',
+   'publication', 'float') {
   delete $advance_paragraph_count_commands{$not_advancing_para};
 }
 
@@ -276,8 +277,8 @@
 }
 
 foreach my $ignored_block_commands ('ignore', 'macro', 'rmacro', 'linemacro',
-   'copying', 'documentdescription', 'titlepage', 'direntry',
-   'nodedescriptionblock') {
+   'copying', 'documentdescription', 'documentinfo', 'publication',
+   'titlepage', 'direntry', 'nodedescriptionblock') {
   $ignored_commands{$ignored_block_commands} = 1;
 }
 
diff --git a/tta/perl/Texinfo/Convert/Text.pm b/tta/perl/Texinfo/Convert/Text.pm
index 0409166..0cfa78f 100644
--- a/tta/perl/Texinfo/Convert/Text.pm
+++ b/tta/perl/Texinfo/Convert/Text.pm
@@ -114,6 +114,7 @@
 
 my %ignored_block_commands;
 foreach my $ignored_command ('titlepage', 'copying', 'documentdescription',
+  'documentinfo', 'publication',
   'ignore', 'macro', 'rmacro', 'linemacro', 'nodedescriptionblock') {
   $ignored_block_commands{$ignored_command} = 1;
 }
diff --git a/tta/perl/Texinfo/ParserNonXS.pm b/tta/perl/Texinfo/ParserNonXS.pm
index 7fcc094..20284a8 100644
--- a/tta/perl/Texinfo/ParserNonXS.pm
+++ b/tta/perl/Texinfo/ParserNonXS.pm
@@ -6283,14 +6283,15 @@
         if (defined($parent_cmdname)
             and ($parent_cmdname eq 'titlepage'
                  or $parent_cmdname eq 'quotation'
-                 or $parent_cmdname eq 'smallquotation')) {
+                 or $parent_cmdname eq 'smallquotation'
+                 or $parent_cmdname eq 'documentinfo')) {
           $found = 1;
           last;
         }
       }
       if (!$found) {
         _line_warn($self, __(
-     "\@author not meaningful outside `\@titlepage' and `\@quotation' environments"),
+     "\@author not meaningful outside `\@titlepage', `\@documentinfo' and `\@quotation' environments"),
                            $current->{'source_info'});
       }
     } elsif ($command eq 'dircategory' and exists($self->{'current_node'})) {
diff --git a/tta/perl/ext/epub3.pm b/tta/perl/ext/epub3.pm
index 147145c..3c81d77 100644
--- a/tta/perl/ext/epub3.pm
+++ b/tta/perl/ext/epub3.pm
@@ -850,22 +850,26 @@
   my @authors = ();
   my @languages = ();
 
-  if ($global_commands_information) {
-    if ($global_commands_information->{'titlepage'}) {
-      my $titlepage = $global_commands_information->{'titlepage'};
-      my @authors_commands = ();
+  if (defined($global_commands_information)) {
+    foreach my $information_block ('documentinfo', 'titlepage') {
+      if (exists($global_commands_information->{$information_block})) {
 
-      Texinfo::Convert::Utils::find_element_authors($titlepage,
+        my @authors_commands = ();
+
+        Texinfo::Convert::Utils::find_element_authors(
+               $global_commands_information->{$information_block},
                                                   \@authors_commands);
 
-      foreach my $element (@authors_commands) {
-        if ($element->{'contents'}->[0]->{'contents'}) {
-          my $author_str = _epub_convert_tree_to_text($self,
+        foreach my $element (@authors_commands) {
+          if ($element->{'contents'}->[0]->{'contents'}) {
+            my $author_str = _epub_convert_tree_to_text($self,
                                       $element->{'contents'}->[0]);
-          if ($author_str =~ /\S/) {
-            push @authors, $author_str;
+            if ($author_str =~ /\S/) {
+              push @authors, $author_str;
+            }
           }
         }
+        last;
       }
     }
     if ($global_commands_information->{'documentlanguage'}) {
diff --git a/tta/perl/t/results/misc_commands/author_outside_titlepage_quotation.pl b/tta/perl/t/results/misc_commands/author_outside_titlepage_quotation.pl
index 599b959..c611067 100644
--- a/tta/perl/t/results/misc_commands/author_outside_titlepage_quotation.pl
+++ b/tta/perl/t/results/misc_commands/author_outside_titlepage_quotation.pl
@@ -30,10 +30,10 @@
 
 $result_errors{'author_outside_titlepage_quotation'} = [
   {
-    'error_line' => 'warning: @author not meaningful outside `@titlepage\' and `@quotation\' environments
+    'error_line' => 'warning: @author not meaningful outside `@titlepage\', `@documentinfo\' and `@quotation\' environments
 ',
     'line_nr' => 1,
-    'text' => '@author not meaningful outside `@titlepage\' and `@quotation\' environments',
+    'text' => '@author not meaningful outside `@titlepage\', `@documentinfo\' and `@quotation\' environments',
     'type' => 'warning'
   }
 ];
diff --git a/tta/perl/t/results/paragraph/indent_before_macro_definition_and_other.pl b/tta/perl/t/results/paragraph/indent_before_macro_definition_and_other.pl
index d5ab76c..c59d250 100644
--- a/tta/perl/t/results/paragraph/indent_before_macro_definition_and_other.pl
+++ b/tta/perl/t/results/paragraph/indent_before_macro_definition_and_other.pl
@@ -156,10 +156,10 @@
 
 $result_errors{'indent_before_macro_definition_and_other'} = [
   {
-    'error_line' => 'warning: @author not meaningful outside `@titlepage\' and `@quotation\' environments
+    'error_line' => 'warning: @author not meaningful outside `@titlepage\', `@documentinfo\' and `@quotation\' environments
 ',
     'line_nr' => 3,
-    'text' => '@author not meaningful outside `@titlepage\' and `@quotation\' environments',
+    'text' => '@author not meaningful outside `@titlepage\', `@documentinfo\' and `@quotation\' environments',
     'type' => 'warning'
   },
   {
diff --git a/tta/tests/coverage/res_parser/formatting_chm/formatting.2 b/tta/tests/coverage/res_parser/formatting_chm/formatting.2
index 2eedfd5..b18c715 100644
--- a/tta/tests/coverage/res_parser/formatting_chm/formatting.2
+++ b/tta/tests/coverage/res_parser/formatting_chm/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/coverage/res_parser/formatting_docbook/formatting.2 b/tta/tests/coverage/res_parser/formatting_docbook/formatting.2
index 66b0c71..7195bf9 100644
--- a/tta/tests/coverage/res_parser/formatting_docbook/formatting.2
+++ b/tta/tests/coverage/res_parser/formatting_docbook/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/coverage/res_parser/formatting_epub/formatting.2 b/tta/tests/coverage/res_parser/formatting_epub/formatting.2
index 3e9db5b..f7da99f 100644
--- a/tta/tests/coverage/res_parser/formatting_epub/formatting.2
+++ b/tta/tests/coverage/res_parser/formatting_epub/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/coverage/res_parser/formatting_html32/formatting.2 b/tta/tests/coverage/res_parser/formatting_html32/formatting.2
index 04a4782..76db82a 100644
--- a/tta/tests/coverage/res_parser/formatting_html32/formatting.2
+++ b/tta/tests/coverage/res_parser/formatting_html32/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/coverage/res_parser/formatting_html_no_split/formatting.2 b/tta/tests/coverage/res_parser/formatting_html_no_split/formatting.2
index 2c54bf5..c62654d 100644
--- a/tta/tests/coverage/res_parser/formatting_html_no_split/formatting.2
+++ b/tta/tests/coverage/res_parser/formatting_html_no_split/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/coverage/res_parser/formatting_info/formatting.2 b/tta/tests/coverage/res_parser/formatting_info/formatting.2
index c4e55ff..38286aa 100644
--- a/tta/tests/coverage/res_parser/formatting_info/formatting.2
+++ b/tta/tests/coverage/res_parser/formatting_info/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/coverage/res_parser/formatting_latex/formatting.2 b/tta/tests/coverage/res_parser/formatting_latex/formatting.2
index be7b831..91b7e53 100644
--- a/tta/tests/coverage/res_parser/formatting_latex/formatting.2
+++ b/tta/tests/coverage/res_parser/formatting_latex/formatting.2
@@ -48,7 +48,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -199,7 +199,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -275,7 +275,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/coverage/res_parser/formatting_macro_expand/formatting.2 b/tta/tests/coverage/res_parser/formatting_macro_expand/formatting.2
index c7d5f51..fae97b9 100644
--- a/tta/tests/coverage/res_parser/formatting_macro_expand/formatting.2
+++ b/tta/tests/coverage/res_parser/formatting_macro_expand/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/coverage/res_parser/formatting_plaintext/formatting.2 b/tta/tests/coverage/res_parser/formatting_plaintext/formatting.2
index 2f184de..0d4259f 100644
--- a/tta/tests/coverage/res_parser/formatting_plaintext/formatting.2
+++ b/tta/tests/coverage/res_parser/formatting_plaintext/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/coverage/res_parser/formatting_rawtext/formatting.2 b/tta/tests/coverage/res_parser/formatting_rawtext/formatting.2
index d90bb05..08d7559 100644
--- a/tta/tests/coverage/res_parser/formatting_rawtext/formatting.2
+++ b/tta/tests/coverage/res_parser/formatting_rawtext/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/coverage/res_parser/formatting_regions/formatting_regions.2 b/tta/tests/coverage/res_parser/formatting_regions/formatting_regions.2
index 1065c74..c6f4c5a 100644
--- a/tta/tests/coverage/res_parser/formatting_regions/formatting_regions.2
+++ b/tta/tests/coverage/res_parser/formatting_regions/formatting_regions.2
@@ -49,7 +49,7 @@
 formatting_regions.texi:27: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting_regions.texi:27: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting_regions.texi:27: @sp missing argument (possibly involving @mymacro)
-formatting_regions.texi:27: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting_regions.texi:27: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting_regions.texi:27: warning: @emph expected braces (possibly involving @mymacro)
 formatting_regions.texi:27: warning: @w expected braces (possibly involving @mymacro)
 formatting_regions.texi:27: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting_regions.texi:45: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting_regions.texi:45: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting_regions.texi:45: @sp missing argument (possibly involving @mymacro)
-formatting_regions.texi:45: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting_regions.texi:45: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting_regions.texi:45: warning: @emph expected braces (possibly involving @mymacro)
 formatting_regions.texi:45: warning: @w expected braces (possibly involving @mymacro)
 formatting_regions.texi:45: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting_regions.texi:48: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting_regions.texi:48: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting_regions.texi:48: @sp missing argument (possibly involving @mymacro)
-formatting_regions.texi:48: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting_regions.texi:48: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting_regions.texi:48: warning: @emph expected braces (possibly involving @mymacro)
 formatting_regions.texi:48: warning: @w expected braces (possibly involving @mymacro)
 formatting_regions.texi:48: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/coverage/res_parser/formatting_textcontent/formatting.2 b/tta/tests/coverage/res_parser/formatting_textcontent/formatting.2
index d90bb05..08d7559 100644
--- a/tta/tests/coverage/res_parser/formatting_textcontent/formatting.2
+++ b/tta/tests/coverage/res_parser/formatting_textcontent/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/coverage/res_parser/formatting_xhtml/formatting.2 b/tta/tests/coverage/res_parser/formatting_xhtml/formatting.2
index 2eedfd5..b18c715 100644
--- a/tta/tests/coverage/res_parser/formatting_xhtml/formatting.2
+++ b/tta/tests/coverage/res_parser/formatting_xhtml/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/coverage/res_parser/formatting_xml/formatting.2 b/tta/tests/coverage/res_parser/formatting_xml/formatting.2
index c7d5f51..fae97b9 100644
--- a/tta/tests/coverage/res_parser/formatting_xml/formatting.2
+++ b/tta/tests/coverage/res_parser/formatting_xml/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/layout/res_parser/formatting_enable_encoding/formatting.2 b/tta/tests/layout/res_parser/formatting_enable_encoding/formatting.2
index 04a4782..76db82a 100644
--- a/tta/tests/layout/res_parser/formatting_enable_encoding/formatting.2
+++ b/tta/tests/layout/res_parser/formatting_enable_encoding/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/layout/res_parser/formatting_epub_nodes/formatting.2 b/tta/tests/layout/res_parser/formatting_epub_nodes/formatting.2
index 3e9db5b..f7da99f 100644
--- a/tta/tests/layout/res_parser/formatting_epub_nodes/formatting.2
+++ b/tta/tests/layout/res_parser/formatting_epub_nodes/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/layout/res_parser/formatting_exotic/formatting.2 b/tta/tests/layout/res_parser/formatting_exotic/formatting.2
index 2c54bf5..c62654d 100644
--- a/tta/tests/layout/res_parser/formatting_exotic/formatting.2
+++ b/tta/tests/layout/res_parser/formatting_exotic/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/layout/res_parser/formatting_fr/formatting.2 b/tta/tests/layout/res_parser/formatting_fr/formatting.2
index 04a4782..76db82a 100644
--- a/tta/tests/layout/res_parser/formatting_fr/formatting.2
+++ b/tta/tests/layout/res_parser/formatting_fr/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/layout/res_parser/formatting_fr_icons/formatting.2 b/tta/tests/layout/res_parser/formatting_fr_icons/formatting.2
index 04a4782..76db82a 100644
--- a/tta/tests/layout/res_parser/formatting_fr_icons/formatting.2
+++ b/tta/tests/layout/res_parser/formatting_fr_icons/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/layout/res_parser/formatting_fr_info/formatting.2 b/tta/tests/layout/res_parser/formatting_fr_info/formatting.2
index c4e55ff..38286aa 100644
--- a/tta/tests/layout/res_parser/formatting_fr_info/formatting.2
+++ b/tta/tests/layout/res_parser/formatting_fr_info/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/layout/res_parser/formatting_info_ascii_punctuation/formatting.2 b/tta/tests/layout/res_parser/formatting_info_ascii_punctuation/formatting.2
index c4e55ff..38286aa 100644
--- a/tta/tests/layout/res_parser/formatting_info_ascii_punctuation/formatting.2
+++ b/tta/tests/layout/res_parser/formatting_info_ascii_punctuation/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/layout/res_parser/formatting_info_disable_encoding/formatting.2 b/tta/tests/layout/res_parser/formatting_info_disable_encoding/formatting.2
index c4e55ff..38286aa 100644
--- a/tta/tests/layout/res_parser/formatting_info_disable_encoding/formatting.2
+++ b/tta/tests/layout/res_parser/formatting_info_disable_encoding/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/layout/res_parser/formatting_inline_css/formatting.2 b/tta/tests/layout/res_parser/formatting_inline_css/formatting.2
index 04a4782..76db82a 100644
--- a/tta/tests/layout/res_parser/formatting_inline_css/formatting.2
+++ b/tta/tests/layout/res_parser/formatting_inline_css/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/layout/res_parser/formatting_mathjax/formatting.2 b/tta/tests/layout/res_parser/formatting_mathjax/formatting.2
index 2eedfd5..b18c715 100644
--- a/tta/tests/layout/res_parser/formatting_mathjax/formatting.2
+++ b/tta/tests/layout/res_parser/formatting_mathjax/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/layout/res_parser/formatting_numerical_entities/formatting.2 b/tta/tests/layout/res_parser/formatting_numerical_entities/formatting.2
index 04a4782..76db82a 100644
--- a/tta/tests/layout/res_parser/formatting_numerical_entities/formatting.2
+++ b/tta/tests/layout/res_parser/formatting_numerical_entities/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/layout/res_parser/formatting_plaintext_ascii_punctuation/formatting.2 b/tta/tests/layout/res_parser/formatting_plaintext_ascii_punctuation/formatting.2
index 2f184de..0d4259f 100644
--- a/tta/tests/layout/res_parser/formatting_plaintext_ascii_punctuation/formatting.2
+++ b/tta/tests/layout/res_parser/formatting_plaintext_ascii_punctuation/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/layout/res_parser/formatting_sort_element_counts/formatting.2 b/tta/tests/layout/res_parser/formatting_sort_element_counts/formatting.2
index 2c54bf5..c62654d 100644
--- a/tta/tests/layout/res_parser/formatting_sort_element_counts/formatting.2
+++ b/tta/tests/layout/res_parser/formatting_sort_element_counts/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/layout/res_parser/formatting_texi2html/formatting.2 b/tta/tests/layout/res_parser/formatting_texi2html/formatting.2
index 04a4782..76db82a 100644
--- a/tta/tests/layout/res_parser/formatting_texi2html/formatting.2
+++ b/tta/tests/layout/res_parser/formatting_texi2html/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/layout/res_parser/formatting_texi2html_nodes/formatting.2 b/tta/tests/layout/res_parser/formatting_texi2html_nodes/formatting.2
index 04a4782..76db82a 100644
--- a/tta/tests/layout/res_parser/formatting_texi2html_nodes/formatting.2
+++ b/tta/tests/layout/res_parser/formatting_texi2html_nodes/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/layout/res_parser/formatting_weird_quotes/formatting.2 b/tta/tests/layout/res_parser/formatting_weird_quotes/formatting.2
index 04a4782..76db82a 100644
--- a/tta/tests/layout/res_parser/formatting_weird_quotes/formatting.2
+++ b/tta/tests/layout/res_parser/formatting_weird_quotes/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
diff --git a/tta/tests/tex_html/res_parser/formatting_singular/formatting.2 b/tta/tests/tex_html/res_parser/formatting_singular/formatting.2
index c57e360..7386acb 100644
--- a/tta/tests/tex_html/res_parser/formatting_singular/formatting.2
+++ b/tta/tests/tex_html/res_parser/formatting_singular/formatting.2
@@ -49,7 +49,7 @@
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:22: @sp missing argument (possibly involving @mymacro)
-formatting.texi:22: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:22: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:22: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:22: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:22: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -202,7 +202,7 @@
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:82: @sp missing argument (possibly involving @mymacro)
-formatting.texi:82: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:82: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:82: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:82: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:82: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
@@ -279,7 +279,7 @@
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: warning: @verb should not appear anywhere inside @image (possibly involving @mymacro)
 formatting.texi:89: @sp missing argument (possibly involving @mymacro)
-formatting.texi:89: warning: @author not meaningful outside `@titlepage' and `@quotation' environments (possibly involving @mymacro)
+formatting.texi:89: warning: @author not meaningful outside `@titlepage', `@documentinfo' and `@quotation' environments (possibly involving @mymacro)
 formatting.texi:89: warning: @emph expected braces (possibly involving @mymacro)
 formatting.texi:89: warning: @w expected braces (possibly involving @mymacro)
 formatting.texi:89: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)