texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo ChangeLog doc/texinfo.txi tp/Texinfo/Co...


From: Patrice Dumas
Subject: texinfo ChangeLog doc/texinfo.txi tp/Texinfo/Co...
Date: Sat, 21 Apr 2012 17:44:52 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/04/21 17:44:51

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 
        tp/Texinfo     : Common.pm Parser.pm 
        tp/Texinfo/Convert: Converter.pm HTML.pm 
        tp/t/results/converters_tests: at_commands_in_refs.pl 
                                       at_commands_in_refs_latin1.pl 
                                       at_commands_in_refs_utf8.pl 
        tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html: 
                                                                           
-_0040-_007b_007d-_002e-.html 
                                                                           
cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html 
                                                                           
f_002d_002dile1-f_002d_002dile.html 
                                                                           
http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html 
        tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info: 
                                                                           
at_commands_in_refs_latin1.info 
        tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html: 
                                                                         
-_0040-_007b_007d-_002e-.html 
                                                                         
cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html 
                                                                         
f_002d_002dile1-f_002d_002dile.html 
                                                                         
http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html 
        tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info: 
                                                                         
at_commands_in_refs_utf8.info 
        tp/t/results/coverage_braces: test_image.pl verb_in_xref.pl 
        tp/t/results/info_tests: space_in_setfilename.pl 
        tp/t/results/invalid_nestings: 
                                       
unclosed_verb_end_of_line_on_misc_line.pl 
                                       unclosed_verb_on_misc_line.pl 
                                       unclosed_verb_on_section_line.pl 
        tp/t/results/misc_commands: setfilename.pl 

Log message:
                * doc/texinfo.txi (Other Configuration Variables): add
                BASEFILENAME_LENGTH.
                (HTML Xref Link Basics): explain that file names 
                are truncated.
                * tp/Texinfo/Common.pm, tp/Texinfo/Convert/Converter.pm,
                tp/Texinfo/Convert/HTML.pm (_id_to_filename): add
                IBASEFILENAME_LENGTH and use it to truncate base
                filenames.
                * tp/Texinfo/Parser.pm tp/t/*: @verb is not accepted in 
                simple text commands and sectioning commands.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1355&r2=1.1356
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.435&r2=1.436
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.139&r2=1.140
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.375&r2=1.376
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.232&r2=1.233
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/test_image.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/verb_in_xref.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/space_in_setfilename.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/setfilename.pl?cvsroot=texinfo&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1355
retrieving revision 1.1356
diff -u -b -r1.1355 -r1.1356
--- ChangeLog   21 Apr 2012 00:38:02 -0000      1.1355
+++ ChangeLog   21 Apr 2012 17:44:45 -0000      1.1356
@@ -1,3 +1,16 @@
+2012-04-21  Patrice Dumas  <address@hidden>
+
+       * doc/texinfo.txi (Other Configuration Variables): add
+       BASEFILENAME_LENGTH.
+       (HTML Xref Link Basics): explain that file names 
+       are truncated.
+       * tp/Texinfo/Common.pm, tp/Texinfo/Convert/Converter.pm,
+       tp/Texinfo/Convert/HTML.pm (_id_to_filename): add
+       IBASEFILENAME_LENGTH and use it to truncate base
+       filenames.
+       * tp/Texinfo/Parser.pm tp/t/*: @verb is not accepted in 
+       simple text commands and sectioning commands.
+
 2012-04-20  Julian Gilbey  <address@hidden>  (tiny change)
 
        * info/footnotes.c,

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -b -r1.435 -r1.436
--- doc/texinfo.txi     20 Apr 2012 18:52:47 -0000      1.435
+++ doc/texinfo.txi     21 Apr 2012 17:44:46 -0000      1.436
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.435 2012/04/20 18:52:47 karl Exp $
address@hidden $Id: texinfo.txi,v 1.436 2012/04/21 17:44:46 pertusus Exp $
 @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
 @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
 
@@ -17342,6 +17342,8 @@
 the table of contents for @code{AFTER_TOC_LINES}, otherwise a
 default string is used.
 
address@hidden BASEFILENAME_LENGTH
+For address@hidden  The maximum length of the base filenames.
 
 @item BEFORE_OVERVIEW
 @itemx BEFORE_TOC_LINES
@@ -19091,6 +19093,11 @@
 kludge (due to XHTML rules) is not necessary for filenames, and is
 therefore omitted.
 
+Another rule, that only holds for filenames, is that base filenames 
+are truncated to 245 characters, to allow for an extension to be 
+prepended and still comply with a 255 characters limit which is 
+common to most filesystems.
+
 Any directory part in the filename argument of the source cross
 reference command is ignored.  Thus, 
@code{@@address@hidden,,,../address@hidden and
 @code{@@address@hidden,,,address@hidden both use @samp{foo} as the manual 
name.  This
@@ -21938,7 +21945,7 @@
 Revision Control System}) or other version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.435 2012/04/20 18:52:47 karl Exp $
+$Id: texinfo.txi,v 1.436 2012/04/21 17:44:46 pertusus Exp $
 @end example
 (This is useful in all sources that use version control, not just manuals.)
 You may wish to include the @samp{$Id:} comment in the @code{@@copying}

Index: tp/Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- tp/Texinfo/Common.pm        4 Mar 2012 23:22:24 -0000       1.139
+++ tp/Texinfo/Common.pm        21 Apr 2012 17:44:48 -0000      1.140
@@ -185,7 +185,7 @@
   'SORT_ELEMENT_COUNT', 'SORT_ELEMENT_COUNT_WORDS',
   'KEEP_TOP_EXTERNAL_REF',
   'TEXI2HTML', 'IMAGE_LINK_PREFIX', 'FIX_TEXINFO',
-  'TREE_TRANSFORMATIONS',
+  'TREE_TRANSFORMATIONS', 'BASEFILENAME_LENGTH',
 # FIXME document
   'TEXTCONTENT_COMMENT',
 # FIXME Not strings. To be documented.

Index: tp/Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -b -r1.375 -r1.376
--- tp/Texinfo/Parser.pm        15 Apr 2012 22:34:31 -0000      1.375
+++ tp/Texinfo/Parser.pm        21 Apr 2012 17:44:48 -0000      1.376
@@ -404,7 +404,7 @@
 # commands that may happen on sectioning commands 
 my %in_sectioning_command_line_commands = %in_full_line_commands;
 foreach my $not_in_sectioning_command_line_commands ('titlefont', 
-                                                 'anchor', 'footnote') {
+                                   'anchor', 'footnote', 'verb') {
   delete 
$in_sectioning_command_line_commands{$not_in_sectioning_command_line_commands};
 }
 

Index: tp/Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- tp/Texinfo/Convert/Converter.pm     7 Feb 2012 00:40:47 -0000       1.80
+++ tp/Texinfo/Convert/Converter.pm     21 Apr 2012 17:44:48 -0000      1.81
@@ -83,6 +83,7 @@
   'allowcodebreaks'      => 'true',
   'footnotestyle'        => 'end',
   'deftypefnnewline'     => 'off',
+  'BASEFILENAME_LENGTH'  => 255 - 10,
 # This is not used much as converters do their best to give a sane output
   'FIX_TEXINFO'          => 1,
 # This is the default, mainly for tests; the caller should set them.  These

Index: tp/Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -b -r1.232 -r1.233
--- tp/Texinfo/Convert/HTML.pm  3 Mar 2012 11:33:58 -0000       1.232
+++ tp/Texinfo/Convert/HTML.pm  21 Apr 2012 17:44:48 -0000      1.233
@@ -4834,6 +4834,13 @@
   $self->{'css_rule_lines'} = address@hidden;
 }
 
+sub _id_to_filename($$)
+{
+  my $self = shift;
+  my $id = shift;
+  return substr($id, 0, $self->get_conf('BASEFILENAME_LENGTH'));
+}
+
 sub _node_id_file($$)
 {
   my $self = shift;
@@ -4870,7 +4877,7 @@
   } else {
     $filename = '';
   }
-  return ($filename, $target, $id);
+  return ($self->_id_to_filename($filename), $target, $id);
 }
 
 sub _new_sectioning_command_target($$)
@@ -4887,6 +4894,7 @@
                 $no_unidecode);
 
   my $target_base = _normalized_to_id($filename);
+  $filename = $self->_id_to_filename($filename);
   $filename .= '.'.$self->get_conf('EXTENSION') 
     if (defined($self->get_conf('EXTENSION')) 
       and $self->get_conf('EXTENSION') ne '');

Index: tp/t/results/converters_tests/at_commands_in_refs.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tp/t/results/converters_tests/at_commands_in_refs.pl        25 Feb 2012 
13:15:36 -0000      1.4
+++ tp/t/results/converters_tests/at_commands_in_refs.pl        21 Apr 2012 
17:44:49 -0000      1.5
@@ -10145,6 +10145,9 @@
               ],
               'cmdname' => 'verb',
               'contents' => [],
+              'extra' => {
+                'invalid_nesting' => 1
+              },
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 94,
@@ -10209,6 +10212,9 @@
               ],
               'cmdname' => 'verb',
               'contents' => [],
+              'extra' => {
+                'invalid_nesting' => 1
+              },
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 96,
@@ -15068,6 +15074,9 @@
                       ],
                       'cmdname' => 'verb',
                       'contents' => [],
+                      'extra' => {
+                        'invalid_nesting' => 1
+                      },
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 142,
@@ -21613,7 +21622,35 @@
 $result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_up'} = 
$result_menus{'at_commands_in_refs'};
 $result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_up'} = 
$result_menus{'at_commands_in_refs'};
 
-$result_errors{'at_commands_in_refs'} = [];
+$result_errors{'at_commands_in_refs'} = [
+  {
+    'error_line' => ':94: warning: @verb should not appear in @node
+',
+    'file_name' => '',
+    'line_nr' => 94,
+    'macro' => '',
+    'text' => '@verb should not appear in @node',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':96: warning: @verb should not appear in @chapter
+',
+    'file_name' => '',
+    'line_nr' => 96,
+    'macro' => '',
+    'text' => '@verb should not appear in @chapter',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':142: warning: @verb should not appear in @ref
+',
+    'file_name' => '',
+    'line_nr' => 142,
+    'macro' => '',
+    'text' => '@verb should not appear in @ref',
+    'type' => 'warning'
+  }
+];
 
 
 
@@ -21709,8 +21746,8 @@
 19 [f--ile1] [Image description""\\.]
 ************************************
 
-20  @ {} . 
-***********
+20 
+***
 
 21 \'cite asis\' in @w b in r SC *str* t VAR "dfn" i
 **************************************************
@@ -21743,10 +21780,10 @@
 e\'\' e;:: *note e. e( e_ .e e< j ee[:: *note i E=` C\',:: *note `` \'\' ` \'
 ,, ,:: *note << >> << >> < >:: *note `` \'\' --- -- ` \':: *note AAA (fff)
 AAA BBB:: *note CCC (rrr) CCC DDD:: *note the someone <address@hidden>
-<address@hidden>:: *note [f--ile1] [Image description""\\.]:: *note  @ {} . :: 
*note \'cite asis\' in @w b
-in r SC *str* t VAR "dfn" i:: *note \'env\' \'code\' \'option\' \'samp\'
-\'command\' \'file\' \'C-x <ESC>\':: *note 8.27in:: *note sansserif slanted::
-*note <indicateurl>:: *note \'http://somewhere_aaa\' text (url) ls::
+<address@hidden>:: *note [f--ile1] [Image description""\\.]:: *note :: *note 
\'cite asis\' in @w b in r
+SC *str* t VAR "dfn" i:: *note \'env\' \'code\' \'option\' \'samp\' \'command\'
+\'file\' \'C-x <ESC>\':: *note 8.27in:: *note sansserif slanted:: *note
+<indicateurl>:: *note \'http://somewhere_aaa\' text (url) ls::
 
 ';
 
@@ -21762,6 +21799,15 @@
   },
   {
     'file_name' => '',
+    'error_line' => ':24: warning: Node expansion ` @ {} .\' in menu differs 
from normal node expansion `\'
+',
+    'text' => 'Node expansion ` @ {} .\' in menu differs from normal node 
expansion `\'',
+    'type' => 'warning',
+    'macro' => '',
+    'line_nr' => 24
+  },
+  {
+    'file_name' => '',
     'error_line' => ':91: warning: Cannot find @image file `f--ile1.txt\' nor 
alternate text
 ',
     'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
@@ -22054,7 +22100,7 @@
 <a name="f_002d_002dile1-f_002d_002dile"></a>
 <div class="header">
 <p>
-Next: <a href="#-_0040-_007b_007d-_002e-" accesskey="n" rel="next"><tt> @ {} . 
</tt></a>, Previous: <a href="#the-someone-no_005fexplain_0040there" 
accesskey="p" rel="previous"><a href="mailto:address@hidden";>the someone</a> <a 
href="mailto:address@hidden";>address@hidden</a></a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Previous: <a href="#the-someone-no_005fexplain_0040there" accesskey="p" 
rel="previous"><a href="mailto:address@hidden";>the someone</a> <a 
href="mailto:address@hidden";>address@hidden</a></a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <a name="f_002d_002dile1-f_002d_002dile-1"></a>
 <h2 class="chapter">19 <img src="f--ile1.jpg" alt="f--ile1">  <img 
src="f--ile.png" alt="alt"></h2>
@@ -22066,13 +22112,13 @@
 Next: <a href="#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i" accesskey="n" 
rel="next"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span 
class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> 
<var>var</var> <em>dfn</em> <i>i</i></a>, Previous: <a 
href="#f_002d_002dile1-f_002d_002dile" accesskey="p" rel="previous"><img 
src="f--ile1.jpg" alt="f--ile1">  <img src="f--ile.png" alt="alt"></a>, Up: <a 
href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <a name="-_0040-_007b_007d-_002e--1"></a>
-<h2 class="chapter">20 <tt> @ {} . </tt></h2>
+<h2 class="chapter">20 </h2>
 
 <hr>
 <a name="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"></a>
 <div class="header">
 <p>
-Next: <a href="#env-code-option-samp-command-file-C_002dx-ESC" accesskey="n" 
rel="next"><code>env</code> <code>code</code> &lsquo;<samp>option</samp>&rsquo; 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> 
&lsquo;<tt>file</tt>&rsquo; <kbd>C-x &lt;ESC&gt;</kbd></a>, Previous: <a 
href="#-_0040-_007b_007d-_002e-" accesskey="p" rel="previous"><tt> @ {} . 
</tt></a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="#env-code-option-samp-command-file-C_002dx-ESC" accesskey="n" 
rel="next"><code>env</code> <code>code</code> &lsquo;<samp>option</samp>&rsquo; 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> 
&lsquo;<tt>file</tt>&rsquo; <kbd>C-x &lt;ESC&gt;</kbd></a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <a name="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1"></a>
 <h2 class="chapter">21 <cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w 
--> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> 
<tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></h2>
@@ -22144,7 +22190,7 @@
 <a href="#CCC-CCC-DDD"><abbr title="rrr">CCC</abbr> (rrr) <abbr 
title="rrr">CCC</abbr> <abbr>DDD</abbr></a>
 <a href="#the-someone-no_005fexplain_0040there"><a 
href="mailto:address@hidden";>the someone</a> <a 
href="mailto:address@hidden";>address@hidden</a></a>
 <a href="#f_002d_002dile1-f_002d_002dile"><img src="f--ile1.jpg" 
alt="f--ile1">  <img src="f--ile.png" alt="alt"></a>
-<a href="#-_0040-_007b_007d-_002e-"><tt> @ {} . </tt></a>
+<a href="#-_0040-_007b_007d-_002e-"></a>
 <a href="#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite>cite 
asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in 
r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> 
<em>dfn</em> <i>i</i></a>
 <a href="#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code> 
<code>code</code> &lsquo;<samp>option</samp>&rsquo; 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> 
&lsquo;<tt>file</tt>&rsquo; <kbd>C-x &lt;ESC&gt;</kbd></a>
 <a href="#g_t8_002e27in">8.27in</a>
@@ -22689,20 +22735,20 @@
 ****************************************************
 
 
-File: ,  Node: [f--ile1] [image src="f--ile.png" alt="alt" text="[Image 
description\\"\\"\\\\.]"],  Next:  @ {} . ,  Prev: the someone 
<address@hidden> <address@hidden>,  Up: Top
+File: ,  Node: [f--ile1] [image src="f--ile.png" alt="alt" text="[Image 
description\\"\\"\\\\.]"],  Next: ,  Prev: the someone <address@hidden> 
<address@hidden>,  Up: Top
 
 
 19 [f--ile1] [image src="f--ile.png" alt="alt" text="[Image 
description\\"\\"\\\\.]"]
 
*********************************************************************************
 
 
-File: ,  Node:  @ {} . ,  Next: \'cite asis\' in @w b in r SC *str* t VAR 
"dfn" i,  Prev: [f--ile1] [image src="f--ile.png" alt="alt" text="[Image 
description\\"\\"\\\\.]"],  Up: Top
+File: ,  Node: ,  Next: \'cite asis\' in @w b in r SC *str* t VAR "dfn" i,  
Prev: [f--ile1] [image src="f--ile.png" alt="alt" text="[Image 
description\\"\\"\\\\.]"],  Up: Top
 
-20  @ {} . 
-***********
+20 
+***
 
 
-File: ,  Node: \'cite asis\' in @w b in r SC *str* t VAR "dfn" i,  Next: 
\'env\' \'code\' \'option\' \'samp\' \'command\' \'file\' \'C-x <ESC>\',  Prev: 
 @ {} . ,  Up: Top
+File: ,  Node: \'cite asis\' in @w b in r SC *str* t VAR "dfn" i,  Next: 
\'env\' \'code\' \'option\' \'samp\' \'command\' \'file\' \'C-x <ESC>\',  Prev: 
,  Up: Top
 
 21 \'cite asis\' in @w b in r SC *str* t VAR "dfn" i
 **************************************************
@@ -22750,10 +22796,10 @@
 e\'\' e;:: *note e. e( e_ .e e< j ee[:: *note i E=` C\',:: *note `` \'\' ` \'
 ,, ,:: *note << >> << >> < >:: *note `` \'\' --- -- ` \':: *note AAA (fff)
 AAA BBB:: *note CCC (rrr) CCC DDD:: *note the someone <address@hidden>
-<address@hidden>:: *note [f--ile1] [image src="f--ile.png" alt="alt" 
text="[Image description\\"\\"\\\\.]"]:: *note  @ {} . :: *note \'cite asis\' 
in @w b
-in r SC *str* t VAR "dfn" i:: *note \'env\' \'code\' \'option\' \'samp\'
-\'command\' \'file\' \'C-x <ESC>\':: *note 8.27in:: *note sansserif slanted::
-*note <indicateurl>:: *note \'http://somewhere_aaa\' text (url) ls::
+<address@hidden>:: *note [f--ile1] [image src="f--ile.png" alt="alt" 
text="[Image description\\"\\"\\\\.]"]:: *note :: *note \'cite asis\' in @w b 
in r
+SC *str* t VAR "dfn" i:: *note \'env\' \'code\' \'option\' \'samp\' \'command\'
+\'file\' \'C-x <ESC>\':: *note 8.27in:: *note sansserif slanted:: *note
+<indicateurl>:: *note \'http://somewhere_aaa\' text (url) ls::
 
 
 
@@ -22779,13 +22825,13 @@
 Node: CCC (rrr) CCC DDD3154
 Node: the someone <address@hidden> <address@hidden>3327
 Node: [f--ile1] [image src="f--ile.png" alt="alt" text="[Image 
description\\"\\"\\\\.]"]3629
-Node:  @ {} . 3985
-Node: \'cite asis\' in @w b in r SC *str* t VAR "dfn" i4194
-Node: \'env\' \'code\' \'option\' \'samp\' \'command\' \'file\' \'C-x 
<ESC>\'4456
-Node: 8.27in4736
-Node: sansserif slanted4884
-Node: <indicateurl>5010
-Node: \'http://somewhere_aaa\' text (url) ls5158
+Node: 3977
+Node: \'cite asis\' in @w b in r SC *str* t VAR "dfn" i4162
+Node: \'env\' \'code\' \'option\' \'samp\' \'command\' \'file\' \'C-x 
<ESC>\'4416
+Node: 8.27in4696
+Node: sansserif slanted4844
+Node: <indicateurl>4970
+Node: \'http://somewhere_aaa\' text (url) ls5118
 
 End Tag Table
 ';
@@ -22802,6 +22848,15 @@
   },
   {
     'file_name' => '',
+    'error_line' => ':24: warning: Node expansion ` @ {} .\' in menu differs 
from normal node expansion `\'
+',
+    'text' => 'Node expansion ` @ {} .\' in menu differs from normal node 
expansion `\'',
+    'type' => 'warning',
+    'macro' => '',
+    'line_nr' => 24
+  },
+  {
+    'file_name' => '',
     'error_line' => ':89: warning: Cannot find @image file `f--ile1.txt\' nor 
alternate text
 ',
     'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',

Index: tp/t/results/converters_tests/at_commands_in_refs_latin1.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tp/t/results/converters_tests/at_commands_in_refs_latin1.pl 14 Feb 2012 
22:27:43 -0000      1.2
+++ tp/t/results/converters_tests/at_commands_in_refs_latin1.pl 21 Apr 2012 
17:44:49 -0000      1.3
@@ -10230,6 +10230,9 @@
               ],
               'cmdname' => 'verb',
               'contents' => [],
+              'extra' => {
+                'invalid_nesting' => 1
+              },
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 97,
@@ -10294,6 +10297,9 @@
               ],
               'cmdname' => 'verb',
               'contents' => [],
+              'extra' => {
+                'invalid_nesting' => 1
+              },
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 99,
@@ -15153,6 +15159,9 @@
                       ],
                       'cmdname' => 'verb',
                       'contents' => [],
+                      'extra' => {
+                        'invalid_nesting' => 1
+                      },
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 145,
@@ -21715,7 +21724,35 @@
 
$result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_menus{'at_commands_in_refs_latin1'};
 $result_menus{'at_commands_in_refs_latin1'}{'menu_child'}{'menu_up'} = 
$result_menus{'at_commands_in_refs_latin1'};
 
-$result_errors{'at_commands_in_refs_latin1'} = [];
+$result_errors{'at_commands_in_refs_latin1'} = [
+  {
+    'error_line' => ':97: warning: @verb should not appear in @node
+',
+    'file_name' => '',
+    'line_nr' => 97,
+    'macro' => '',
+    'text' => '@verb should not appear in @node',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':99: warning: @verb should not appear in @chapter
+',
+    'file_name' => '',
+    'line_nr' => 99,
+    'macro' => '',
+    'text' => '@verb should not appear in @chapter',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':145: warning: @verb should not appear in @ref
+',
+    'file_name' => '',
+    'line_nr' => 145,
+    'macro' => '',
+    'text' => '@verb should not appear in @ref',
+    'type' => 'warning'
+  }
+];
 
 
 $result_converted_errors{'file_html'}->{'at_commands_in_refs_latin1'} = [
@@ -21770,6 +21807,15 @@
   },
   {
     'file_name' => '',
+    'error_line' => ':27: warning: Node expansion ` @ {} .\' in menu differs 
from normal node expansion `\'
+',
+    'text' => 'Node expansion ` @ {} .\' in menu differs from normal node 
expansion `\'',
+    'type' => 'warning',
+    'macro' => '',
+    'line_nr' => 27
+  },
+  {
+    'file_name' => '',
     'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\' nor 
alternate text
 ',
     'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',

Index: tp/t/results/converters_tests/at_commands_in_refs_utf8.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tp/t/results/converters_tests/at_commands_in_refs_utf8.pl   14 Feb 2012 
22:27:43 -0000      1.2
+++ tp/t/results/converters_tests/at_commands_in_refs_utf8.pl   21 Apr 2012 
17:44:49 -0000      1.3
@@ -10230,6 +10230,9 @@
               ],
               'cmdname' => 'verb',
               'contents' => [],
+              'extra' => {
+                'invalid_nesting' => 1
+              },
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 97,
@@ -10294,6 +10297,9 @@
               ],
               'cmdname' => 'verb',
               'contents' => [],
+              'extra' => {
+                'invalid_nesting' => 1
+              },
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 99,
@@ -15153,6 +15159,9 @@
                       ],
                       'cmdname' => 'verb',
                       'contents' => [],
+                      'extra' => {
+                        'invalid_nesting' => 1
+                      },
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 145,
@@ -21715,7 +21724,35 @@
 
$result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_next'}{'menu_up'} 
= $result_menus{'at_commands_in_refs_utf8'};
 $result_menus{'at_commands_in_refs_utf8'}{'menu_child'}{'menu_up'} = 
$result_menus{'at_commands_in_refs_utf8'};
 
-$result_errors{'at_commands_in_refs_utf8'} = [];
+$result_errors{'at_commands_in_refs_utf8'} = [
+  {
+    'error_line' => ':97: warning: @verb should not appear in @node
+',
+    'file_name' => '',
+    'line_nr' => 97,
+    'macro' => '',
+    'text' => '@verb should not appear in @node',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':99: warning: @verb should not appear in @chapter
+',
+    'file_name' => '',
+    'line_nr' => 99,
+    'macro' => '',
+    'text' => '@verb should not appear in @chapter',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':145: warning: @verb should not appear in @ref
+',
+    'file_name' => '',
+    'line_nr' => 145,
+    'macro' => '',
+    'text' => '@verb should not appear in @ref',
+    'type' => 'warning'
+  }
+];
 
 
 $result_converted_errors{'file_html'}->{'at_commands_in_refs_utf8'} = [
@@ -21770,6 +21807,15 @@
   },
   {
     'file_name' => '',
+    'error_line' => ':27: warning: Node expansion ` @ {} .\' in menu differs 
from normal node expansion `\'
+',
+    'text' => 'Node expansion ` @ {} .\' in menu differs from normal node 
expansion `\'',
+    'type' => 'warning',
+    'macro' => '',
+    'line_nr' => 27
+  },
+  {
+    'file_name' => '',
     'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\' nor 
alternate text
 ',
     'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',

Index: 
tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- 
tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
     25 Feb 2012 13:15:36 -0000      1.2
+++ 
tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
     21 Apr 2012 17:44:49 -0000      1.3
@@ -2,10 +2,10 @@
 <html>
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
-<title>Top:  @ {} . </title>
+<title>Top: </title>
 
-<meta name="description" content="Top:  @ {} . ">
-<meta name="keywords" content="Top:  @ {} . ">
+<meta name="description" content="Top: ">
+<meta name="keywords" content="Top: ">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="Generator" content="tp">
@@ -51,7 +51,7 @@
 </div>
 <hr>
 <a name="-_0040-_007b_007d-_002e--1"></a>
-<h2 class="chapter">20 <tt> @ {} . </tt></h2>
+<h2 class="chapter">20 </h2>
 
 
 

Index: 
tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- 
tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
        25 Feb 2012 13:15:37 -0000      1.2
+++ 
tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
        21 Apr 2012 17:44:49 -0000      1.3
@@ -13,7 +13,7 @@
 <link href="index.html#Top" rel="start" title="Top">
 <link href="index.html#Top" rel="up" title="Top">
 <link 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 rel="next" title="env code option samp command file C-x &lt;ESC&gt;">
-<link href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" 
rel="previous" title=" @ {} . ">
+<link href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" 
rel="previous" title="">
 <style type="text/css">
 <!--
 a.summary-letter {text-decoration: none}
@@ -47,7 +47,7 @@
 <a name="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"></a>
 <div class="header">
 <p>
-Next: <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 accesskey="n" rel="next"><code>env</code> <code>code</code> 
&lsquo;<samp>option</samp>&rsquo; &lsquo;<samp>samp</samp>&rsquo; 
<code>command</code> &lsquo;<tt>file</tt>&rsquo; <kbd>C-x 
&lt;ESC&gt;</kbd></a>, Previous: <a 
href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" accesskey="p" 
rel="previous"><tt> @ {} . </tt></a>, Up: <a href="index.html#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 accesskey="n" rel="next"><code>env</code> <code>code</code> 
&lsquo;<samp>option</samp>&rsquo; &lsquo;<samp>samp</samp>&rsquo; 
<code>command</code> &lsquo;<tt>file</tt>&rsquo; <kbd>C-x 
&lt;ESC&gt;</kbd></a>, Up: <a href="index.html#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <a name="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1"></a>

Index: 
tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- 
tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
       25 Feb 2012 13:15:37 -0000      1.2
+++ 
tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
       21 Apr 2012 17:44:49 -0000      1.3
@@ -12,7 +12,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
 <link href="index.html#Top" rel="start" title="Top">
 <link href="index.html#Top" rel="up" title="Top">
-<link href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" rel="next" 
title=" @ {} . ">
+<link href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" rel="next" 
title="">
 <link 
href="the-someone-no_005fexplain_0040there.html#the-someone-no_005fexplain_0040there"
 rel="previous" title="address@hidden (the someone) address@hidden 
(address@hidden)">
 <style type="text/css">
 <!--
@@ -47,7 +47,7 @@
 <a name="f_002d_002dile1-f_002d_002dile"></a>
 <div class="header">
 <p>
-Next: <a href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" 
accesskey="n" rel="next"><tt> @ {} . </tt></a>, Previous: <a 
href="the-someone-no_005fexplain_0040there.html#the-someone-no_005fexplain_0040there"
 accesskey="p" rel="previous"><a href="mailto:address@hidden";>the someone</a> 
<a href="mailto:address@hidden";>address@hidden</a></a>, Up: <a 
href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Previous: <a 
href="the-someone-no_005fexplain_0040there.html#the-someone-no_005fexplain_0040there"
 accesskey="p" rel="previous"><a href="mailto:address@hidden";>the someone</a> 
<a href="mailto:address@hidden";>address@hidden</a></a>, Up: <a 
href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <a name="f_002d_002dile1-f_002d_002dile-1"></a>

Index: 
tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- 
tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
       25 Feb 2012 13:15:37 -0000      1.2
+++ 
tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
       21 Apr 2012 17:44:49 -0000      1.3
@@ -74,7 +74,7 @@
 <a href="CCC-CCC-DDD.html#CCC-CCC-DDD"><abbr title="rrr">CCC</abbr> (rrr) 
<abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a>
 <a 
href="the-someone-no_005fexplain_0040there.html#the-someone-no_005fexplain_0040there"><a
 href="mailto:address@hidden";>the someone</a> <a 
href="mailto:address@hidden";>address@hidden</a></a>
 <a 
href="f_002d_002dile1-f_002d_002dile.html#f_002d_002dile1-f_002d_002dile"><img 
src="f--ile1.jpg" alt="f--ile1">  <img src="f--ile.png" alt="alt"></a>
-<a href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-"><tt> @ {} . 
</tt></a>
+<a href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-"></a>
 <a 
href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite>cite
 asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in 
r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> 
<em>dfn</em> <i>i</i></a>
 <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code>
 <code>code</code> &lsquo;<samp>option</samp>&rsquo; 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> 
&lsquo;<tt>file</tt>&rsquo; <kbd>C-x &lt;ESC&gt;</kbd></a>
 <a href="8_002e27in.html#g_t8_002e27in">8.27in</a>

Index: 
tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvsHN7JNG and /tmp/cvsaVocn3 differ

Index: 
tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- 
tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
       25 Feb 2012 13:15:37 -0000      1.2
+++ 
tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
       21 Apr 2012 17:44:50 -0000      1.3
@@ -2,10 +2,10 @@
 <html>
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
-<title>Top:  @ {} . </title>
+<title>Top: </title>
 
-<meta name="description" content="Top:  @ {} . ">
-<meta name="keywords" content="Top:  @ {} . ">
+<meta name="description" content="Top: ">
+<meta name="keywords" content="Top: ">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="Generator" content="tp">
@@ -51,7 +51,7 @@
 </div>
 <hr>
 <a name="-_0040-_007b_007d-_002e--1"></a>
-<h2 class="chapter">20 <tt> @ {} . </tt></h2>
+<h2 class="chapter">20 </h2>
 
 
 

Index: 
tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- 
tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
  25 Feb 2012 13:15:38 -0000      1.2
+++ 
tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
  21 Apr 2012 17:44:50 -0000      1.3
@@ -13,7 +13,7 @@
 <link href="index.html#Top" rel="start" title="Top">
 <link href="index.html#Top" rel="up" title="Top">
 <link 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 rel="next" title="env code option samp command file C-x &lt;ESC&gt;">
-<link href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" 
rel="previous" title=" @ {} . ">
+<link href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" 
rel="previous" title="">
 <style type="text/css">
 <!--
 a.summary-letter {text-decoration: none}
@@ -47,7 +47,7 @@
 <a name="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"></a>
 <div class="header">
 <p>
-Next: <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 accesskey="n" rel="next"><code>env</code> <code>code</code> 
&lsquo;<samp>option</samp>&rsquo; &lsquo;<samp>samp</samp>&rsquo; 
<code>command</code> &lsquo;<tt>file</tt>&rsquo; <kbd>C-x 
&lt;ESC&gt;</kbd></a>, Previous: <a 
href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" accesskey="p" 
rel="previous"><tt> @ {} . </tt></a>, Up: <a href="index.html#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 accesskey="n" rel="next"><code>env</code> <code>code</code> 
&lsquo;<samp>option</samp>&rsquo; &lsquo;<samp>samp</samp>&rsquo; 
<code>command</code> &lsquo;<tt>file</tt>&rsquo; <kbd>C-x 
&lt;ESC&gt;</kbd></a>, Up: <a href="index.html#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <a name="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1"></a>

Index: 
tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- 
tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
 25 Feb 2012 13:15:39 -0000      1.2
+++ 
tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
 21 Apr 2012 17:44:50 -0000      1.3
@@ -12,7 +12,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link href="index.html#Top" rel="start" title="Top">
 <link href="index.html#Top" rel="up" title="Top">
-<link href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" rel="next" 
title=" @ {} . ">
+<link href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" rel="next" 
title="">
 <link 
href="the-someone-no_005fexplain_0040there.html#the-someone-no_005fexplain_0040there"
 rel="previous" title="address@hidden (the someone) address@hidden 
(address@hidden)">
 <style type="text/css">
 <!--
@@ -47,7 +47,7 @@
 <a name="f_002d_002dile1-f_002d_002dile"></a>
 <div class="header">
 <p>
-Next: <a href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" 
accesskey="n" rel="next"><tt> @ {} . </tt></a>, Previous: <a 
href="the-someone-no_005fexplain_0040there.html#the-someone-no_005fexplain_0040there"
 accesskey="p" rel="previous"><a href="mailto:address@hidden";>the someone</a> 
<a href="mailto:address@hidden";>address@hidden</a></a>, Up: <a 
href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Previous: <a 
href="the-someone-no_005fexplain_0040there.html#the-someone-no_005fexplain_0040there"
 accesskey="p" rel="previous"><a href="mailto:address@hidden";>the someone</a> 
<a href="mailto:address@hidden";>address@hidden</a></a>, Up: <a 
href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <a name="f_002d_002dile1-f_002d_002dile-1"></a>

Index: 
tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- 
tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
 25 Feb 2012 13:15:39 -0000      1.2
+++ 
tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
 21 Apr 2012 17:44:50 -0000      1.3
@@ -74,7 +74,7 @@
 <a href="CCC-CCC-DDD.html#CCC-CCC-DDD"><abbr title="rrr">CCC</abbr> (rrr) 
<abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a>
 <a 
href="the-someone-no_005fexplain_0040there.html#the-someone-no_005fexplain_0040there"><a
 href="mailto:address@hidden";>the someone</a> <a 
href="mailto:address@hidden";>address@hidden</a></a>
 <a 
href="f_002d_002dile1-f_002d_002dile.html#f_002d_002dile1-f_002d_002dile"><img 
src="f--ile1.jpg" alt="f--ile1">  <img src="f--ile.png" alt="alt"></a>
-<a href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-"><tt> @ {} . 
</tt></a>
+<a href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-"></a>
 <a 
href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite>cite
 asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in 
r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> 
<em>dfn</em> <i>i</i></a>
 <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code>
 <code>code</code> &lsquo;<samp>option</samp>&rsquo; 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> 
&lsquo;<tt>file</tt>&rsquo; <kbd>C-x &lt;ESC&gt;</kbd></a>
 <a href="8_002e27in.html#g_t8_002e27in">8.27in</a>

Index: 
tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvsMGNtWy and /tmp/cvsFAL4zV differ

Index: tp/t/results/coverage_braces/test_image.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/test_image.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- tp/t/results/coverage_braces/test_image.pl  25 Feb 2012 13:15:40 -0000      
1.17
+++ tp/t/results/coverage_braces/test_image.pl  21 Apr 2012 17:44:50 -0000      
1.18
@@ -152,6 +152,9 @@
                           ],
                           'cmdname' => 'verb',
                           'contents' => [],
+                          'extra' => {
+                            'invalid_nesting' => 1
+                          },
                           'line_nr' => {
                             'file_name' => '',
                             'line_nr' => 9,
@@ -242,6 +245,9 @@
                           ],
                           'cmdname' => 'verb',
                           'contents' => [],
+                          'extra' => {
+                            'invalid_nesting' => 1
+                          },
                           'line_nr' => {},
                           'parent' => {},
                           'type' => ':'
@@ -370,6 +376,9 @@
                           ],
                           'cmdname' => 'verb',
                           'contents' => [],
+                          'extra' => {
+                            'invalid_nesting' => 1
+                          },
                           'line_nr' => {
                             'file_name' => '',
                             'line_nr' => 9,
@@ -515,6 +524,9 @@
                           ],
                           'cmdname' => 'verb',
                           'contents' => [],
+                          'extra' => {
+                            'invalid_nesting' => 1
+                          },
                           'line_nr' => {},
                           'parent' => {},
                           'type' => ':'
@@ -586,6 +598,9 @@
                           ],
                           'cmdname' => 'verb',
                           'contents' => [],
+                          'extra' => {
+                            'invalid_nesting' => 1
+                          },
                           'line_nr' => {},
                           'parent' => {},
                           'type' => ':'
@@ -810,6 +825,9 @@
                   ],
                   'cmdname' => 'verb',
                   'contents' => [],
+                  'extra' => {
+                    'invalid_nesting' => 1
+                  },
                   'line_nr' => {
                     'file_name' => '',
                     'line_nr' => 14,
@@ -900,6 +918,9 @@
                   ],
                   'cmdname' => 'verb',
                   'contents' => [],
+                  'extra' => {
+                    'invalid_nesting' => 1
+                  },
                   'line_nr' => {},
                   'parent' => {},
                   'type' => ':'
@@ -1024,6 +1045,9 @@
                       ],
                       'cmdname' => 'verb',
                       'contents' => [],
+                      'extra' => {
+                        'invalid_nesting' => 1
+                      },
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 14,
@@ -1169,6 +1193,9 @@
                       ],
                       'cmdname' => 'verb',
                       'contents' => [],
+                      'extra' => {
+                        'invalid_nesting' => 1
+                      },
                       'line_nr' => {},
                       'parent' => {},
                       'type' => ':'
@@ -1240,6 +1267,9 @@
                       ],
                       'cmdname' => 'verb',
                       'contents' => [],
+                      'extra' => {
+                        'invalid_nesting' => 1
+                      },
                       'line_nr' => {},
                       'parent' => {},
                       'type' => ':'
@@ -1419,6 +1449,9 @@
                           ],
                           'cmdname' => 'verb',
                           'contents' => [],
+                          'extra' => {
+                            'invalid_nesting' => 1
+                          },
                           'line_nr' => {
                             'file_name' => '',
                             'line_nr' => 20,
@@ -1509,6 +1542,9 @@
                           ],
                           'cmdname' => 'verb',
                           'contents' => [],
+                          'extra' => {
+                            'invalid_nesting' => 1
+                          },
                           'line_nr' => {},
                           'parent' => {},
                           'type' => ':'
@@ -1631,6 +1667,9 @@
                           ],
                           'cmdname' => 'verb',
                           'contents' => [],
+                          'extra' => {
+                            'invalid_nesting' => 1
+                          },
                           'line_nr' => {
                             'file_name' => '',
                             'line_nr' => 20,
@@ -1776,6 +1815,9 @@
                           ],
                           'cmdname' => 'verb',
                           'contents' => [],
+                          'extra' => {
+                            'invalid_nesting' => 1
+                          },
                           'line_nr' => {},
                           'parent' => {},
                           'type' => ':'
@@ -1847,6 +1889,9 @@
                           ],
                           'cmdname' => 'verb',
                           'contents' => [],
+                          'extra' => {
+                            'invalid_nesting' => 1
+                          },
                           'line_nr' => {},
                           'parent' => {},
                           'type' => ':'
@@ -2075,6 +2120,9 @@
                       ],
                       'cmdname' => 'verb',
                       'contents' => [],
+                      'extra' => {
+                        'invalid_nesting' => 1
+                      },
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 24,
@@ -2165,6 +2213,9 @@
                       ],
                       'cmdname' => 'verb',
                       'contents' => [],
+                      'extra' => {
+                        'invalid_nesting' => 1
+                      },
                       'line_nr' => {},
                       'parent' => {},
                       'type' => ':'
@@ -2289,6 +2340,9 @@
                           ],
                           'cmdname' => 'verb',
                           'contents' => [],
+                          'extra' => {
+                            'invalid_nesting' => 1
+                          },
                           'line_nr' => {
                             'file_name' => '',
                             'line_nr' => 24,
@@ -2434,6 +2488,9 @@
                           ],
                           'cmdname' => 'verb',
                           'contents' => [],
+                          'extra' => {
+                            'invalid_nesting' => 1
+                          },
                           'line_nr' => {},
                           'parent' => {},
                           'type' => ':'
@@ -2505,6 +2562,9 @@
                           ],
                           'cmdname' => 'verb',
                           'contents' => [],
+                          'extra' => {
+                            'invalid_nesting' => 1
+                          },
                           'line_nr' => {},
                           'parent' => {},
                           'type' => ':'
@@ -2643,6 +2703,9 @@
                               ],
                               'cmdname' => 'verb',
                               'contents' => [],
+                              'extra' => {
+                                'invalid_nesting' => 1
+                              },
                               'line_nr' => {
                                 'file_name' => '',
                                 'line_nr' => 26,
@@ -2733,6 +2796,9 @@
                               ],
                               'cmdname' => 'verb',
                               'contents' => [],
+                              'extra' => {
+                                'invalid_nesting' => 1
+                              },
                               'line_nr' => {},
                               'parent' => {},
                               'type' => ':'
@@ -2857,6 +2923,9 @@
                                   ],
                                   'cmdname' => 'verb',
                                   'contents' => [],
+                                  'extra' => {
+                                    'invalid_nesting' => 1
+                                  },
                                   'line_nr' => {
                                     'file_name' => '',
                                     'line_nr' => 26,
@@ -3002,6 +3071,9 @@
                                   ],
                                   'cmdname' => 'verb',
                                   'contents' => [],
+                                  'extra' => {
+                                    'invalid_nesting' => 1
+                                  },
                                   'line_nr' => {},
                                   'parent' => {},
                                   'type' => ':'
@@ -3073,6 +3145,9 @@
                                   ],
                                   'cmdname' => 'verb',
                                   'contents' => [],
+                                  'extra' => {
+                                    'invalid_nesting' => 1
+                                  },
                                   'line_nr' => {},
                                   'parent' => {},
                                   'type' => ':'
@@ -4263,7 +4338,233 @@
   }
 };
 
-$result_errors{'test_image'} = [];
+$result_errors{'test_image'} = [
+  {
+    'error_line' => ':9: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':9: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':9: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':9: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':9: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':14: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 14,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':14: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 14,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':14: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 14,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':14: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 14,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':14: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 14,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':20: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 20,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':20: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 20,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':20: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 20,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':20: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 20,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':20: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 20,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':24: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 24,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':24: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 24,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':24: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 24,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':24: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 24,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':24: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 24,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':26: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 26,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':26: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 26,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':26: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 26,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':26: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 26,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':26: warning: @verb should not appear in @image (possibly 
involving @files-char)
+',
+    'file_name' => '',
+    'line_nr' => 26,
+    'macro' => 'files-char',
+    'text' => '@verb should not appear in @image',
+    'type' => 'warning'
+  }
+];
 
 
 $result_floats{'test_image'} = {
@@ -4359,39 +4660,39 @@
 <img src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; address@hidden 
 a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="address@hidden  a@&lt;&quot;%@  
&lt; &amp; @ % &quot; ">
 
 <p>In text <img src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; 
address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="alt 
&icirc;&ndash;le..  a
-&lt;&quot;%@  &lt; &amp; @ % &quot; ">.
+&lt;&quot;%@">.
 </p>
 <p>Insertcopying
 </p><p>Text in copying.
 <img src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; address@hidden 
 a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="address@hidden  a@&lt;&quot;%@  
&lt; &amp; @ % &quot; ">
 </p>
 <p>In text <img src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; 
address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="alt 
&icirc;&ndash;le..  a
-&lt;&quot;%@  &lt; &amp; @ % &quot; ">.
+&lt;&quot;%@">.
 </p>
 
 <div class="example">
 <pre class="example">[ address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot;  ]
 
 In text [ alt <b>&icirc;--le..</b>  a
-&lt;&quot;%@<tt>  &lt; &amp; @ % &quot; </tt> ].
+&lt;&quot;%@ ].
 </pre></div>
 
 <div class="float"><a name="Image-with-commands"></a>
 <img src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; address@hidden 
 a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="address@hidden  a@&lt;&quot;%@  
&lt; &amp; @ % &quot; ">
 
 <p>In text <img src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; 
address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="alt 
&icirc;&ndash;le..  a
-&lt;&quot;%@  &lt; &amp; @ % &quot; ">.
+&lt;&quot;%@">.
 </p>
 
 </div><img src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; 
address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="address@hidden  
a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 
 <p><strong>Image 1: </strong>In text <img src="address@hidden  a@&lt;&quot;%@  
&lt; &amp; @ % &quot; address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " 
alt="alt &icirc;&ndash;le..  a
-&lt;&quot;%@  &lt; &amp; @ % &quot; ">.</p>
+&lt;&quot;%@">.</p>
 <dl class="listoffloats">
 <dt><a href="#Image-with-commands">Image 1</a></dt><dd><img 
src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; address@hidden  
a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="address@hidden  a@&lt;&quot;%@  
&lt; &amp; @ % &quot; ">
 
 <p>In text <img src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; 
address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="alt 
&icirc;&ndash;le..  a
-&lt;&quot;%@  &lt; &amp; @ % &quot; ">.</p></dd>
+&lt;&quot;%@">.</p></dd>
 </dl>
 
 <hr>
@@ -4599,39 +4900,39 @@
 <img src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; address@hidden 
 a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="address@hidden  a@&lt;&quot;%@  
&lt; &amp; @ % &quot; ">
 
 <p>In text <img src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; 
address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="alt 
&icirc;&ndash;le..  a
-&lt;&quot;%@  &lt; &amp; @ % &quot; ">.
+&lt;&quot;%@">.
 </p>
 <p>Insertcopying
 </p><p>Text in copying.
 <img src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; address@hidden 
 a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="address@hidden  a@&lt;&quot;%@  
&lt; &amp; @ % &quot; ">
 </p>
 <p>In text <img src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; 
address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="alt 
&icirc;&ndash;le..  a
-&lt;&quot;%@  &lt; &amp; @ % &quot; ">.
+&lt;&quot;%@">.
 </p>
 
 <div class="example">
 <pre class="example">[ address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot;  ]
 
 In text [ alt <b>&icirc;--le..</b>  a
-&lt;&quot;%@<tt>  &lt; &amp; @ % &quot; </tt> ].
+&lt;&quot;%@ ].
 </pre></div>
 
 <div class="float"><a name="Image-with-commands"></a>
 <img src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; address@hidden 
 a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="address@hidden  a@&lt;&quot;%@  
&lt; &amp; @ % &quot; ">
 
 <p>In text <img src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; 
address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="alt 
&icirc;&ndash;le..  a
-&lt;&quot;%@  &lt; &amp; @ % &quot; ">.
+&lt;&quot;%@">.
 </p>
 
 </div><img src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; 
address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="address@hidden  
a@&lt;&quot;%@  &lt; &amp; @ % &quot; ">
 
 <p><strong>Image 1: </strong>In text <img src="address@hidden  a@&lt;&quot;%@  
&lt; &amp; @ % &quot; address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " 
alt="alt &icirc;&ndash;le..  a
-&lt;&quot;%@  &lt; &amp; @ % &quot; ">.</p>
+&lt;&quot;%@">.</p>
 <dl class="listoffloats">
 <dt><a href="#Image-with-commands">Image 1</a></dt><dd><img 
src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; address@hidden  
a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="address@hidden  a@&lt;&quot;%@  
&lt; &amp; @ % &quot; ">
 
 <p>In text <img src="address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; 
address@hidden  a@&lt;&quot;%@  &lt; &amp; @ % &quot; " alt="alt 
&icirc;&ndash;le..  a
-&lt;&quot;%@  &lt; &amp; @ % &quot; ">.</p></dd>
+&lt;&quot;%@">.</p></dd>
 </dl>
 
 <hr>

Index: tp/t/results/coverage_braces/verb_in_xref.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage_braces/verb_in_xref.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tp/t/results/coverage_braces/verb_in_xref.pl        11 Jan 2012 23:27:40 
-0000      1.1
+++ tp/t/results/coverage_braces/verb_in_xref.pl        21 Apr 2012 17:44:50 
-0000      1.2
@@ -101,6 +101,9 @@
                       ],
                       'cmdname' => 'verb',
                       'contents' => [],
+                      'extra' => {
+                        'invalid_nesting' => 1
+                      },
                       'line_nr' => {
                         'file_name' => '',
                         'line_nr' => 3,
@@ -237,24 +240,28 @@
   }
 };
 
-$result_errors{'verb_in_xref'} = [];
-
+$result_errors{'verb_in_xref'} = [
+  {
+    'error_line' => ':3: warning: @verb should not appear in @xref
+',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
+    'text' => '@verb should not appear in @xref',
+    'type' => 'warning'
+  }
+];
 
 
-$result_converted{'plaintext'}->{'verb_in_xref'} = '*Notewith
-verb
 
-ggg : Top.
+$result_converted{'plaintext'}->{'verb_in_xref'} = '*Note : Top.
 ';
 
 
 $result_converted{'html_text'}->{'verb_in_xref'} = '<a name="Top"></a>
 <h1 class="node-heading">Top</h1>
 
-<p>See <a href="#Top"><tt>with
-verb
-
-ggg </tt></a>.
+<p>See <a href="#Top">Top</a>.
 </p><hr>
 ';
 

Index: tp/t/results/info_tests/space_in_setfilename.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/info_tests/space_in_setfilename.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tp/t/results/info_tests/space_in_setfilename.pl     1 Nov 2011 12:26:07 
-0000       1.7
+++ tp/t/results/info_tests/space_in_setfilename.pl     21 Apr 2012 17:44:51 
-0000      1.8
@@ -41,6 +41,9 @@
                   ],
                   'cmdname' => 'verb',
                   'contents' => [],
+                  'extra' => {
+                    'invalid_nesting' => 1
+                  },
                   'line_nr' => {
                     'file_name' => '',
                     'line_nr' => 1,
@@ -191,7 +194,17 @@
   }
 };
 
-$result_errors{'space_in_setfilename'} = [];
+$result_errors{'space_in_setfilename'} = [
+  {
+    'error_line' => ':1: warning: @verb should not appear in @setfilename
+',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
+    'text' => '@verb should not appear in @setfilename',
+    'type' => 'warning'
+  }
+];
 
 
 

Index: tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl     
3 Jul 2011 14:50:58 -0000       1.14
+++ tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl     
21 Apr 2012 17:44:51 -0000      1.15
@@ -40,6 +40,9 @@
               ],
               'cmdname' => 'verb',
               'contents' => [],
+              'extra' => {
+                'invalid_nesting' => 1
+              },
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -78,6 +81,15 @@
 
 $result_errors{'unclosed_verb_end_of_line_on_misc_line'} = [
   {
+    'error_line' => ':1: warning: @verb should not appear in @setfilename
+',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
+    'text' => '@verb should not appear in @setfilename',
+    'type' => 'warning'
+  },
+  {
     'error_line' => ':1: @verb without associated character
 ',
     'file_name' => '',

Index: tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl 3 Jul 2011 
14:50:58 -0000       1.14
+++ tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl 21 Apr 2012 
17:44:51 -0000      1.15
@@ -39,6 +39,9 @@
               ],
               'cmdname' => 'verb',
               'contents' => [],
+              'extra' => {
+                'invalid_nesting' => 1
+              },
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -76,6 +79,15 @@
 
 $result_errors{'unclosed_verb_on_misc_line'} = [
   {
+    'error_line' => ':1: warning: @verb should not appear in @setfilename
+',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
+    'text' => '@verb should not appear in @setfilename',
+    'type' => 'warning'
+  },
+  {
     'error_line' => ':1: @verb missing closing delimiter sequence: f}
 ',
     'file_name' => '',

Index: tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl      3 Jul 
2011 14:50:58 -0000       1.20
+++ tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl      21 Apr 
2012 17:44:51 -0000      1.21
@@ -57,6 +57,9 @@
               ],
               'cmdname' => 'verb',
               'contents' => [],
+              'extra' => {
+                'invalid_nesting' => 1
+              },
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 1,
@@ -119,6 +122,15 @@
 
 $result_errors{'unclosed_verb_on_section_line'} = [
   {
+    'error_line' => ':1: warning: @verb should not appear in @section
+',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
+    'text' => '@verb should not appear in @section',
+    'type' => 'warning'
+  },
+  {
     'error_line' => ':1: @verb missing closing delimiter sequence: T}
 ',
     'file_name' => '',

Index: tp/t/results/misc_commands/setfilename.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/setfilename.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- tp/t/results/misc_commands/setfilename.pl   7 Jan 2012 12:12:04 -0000       
1.20
+++ tp/t/results/misc_commands/setfilename.pl   21 Apr 2012 17:44:51 -0000      
1.21
@@ -170,6 +170,9 @@
               ],
               'cmdname' => 'verb',
               'contents' => [],
+              'extra' => {
+                'invalid_nesting' => 1
+              },
               'line_nr' => {
                 'file_name' => '',
                 'line_nr' => 4,
@@ -281,6 +284,15 @@
     'macro' => '',
     'text' => 'Multiple @setfilename',
     'type' => 'warning'
+  },
+  {
+    'error_line' => ':4: warning: @verb should not appear in @setfilename
+',
+    'file_name' => '',
+    'line_nr' => 4,
+    'macro' => '',
+    'text' => '@verb should not appear in @setfilename',
+    'type' => 'warning'
   }
 ];
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]