texinfo-commits
[Top][All Lists]
Advanced

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

[5413] tp/t/test_utils.pl: sort the error result structure for reproduci


From: Patrice Dumas
Subject: [5413] tp/t/test_utils.pl: sort the error result structure for reproducibility.
Date: Sat, 15 Feb 2014 11:38:26 +0000

Revision: 5413
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5413
Author:   pertusus
Date:     2014-02-15 11:38:25 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
tp/t/test_utils.pl: sort the error result structure for reproducibility.

Modified Paths:
--------------
    trunk/tp/t/results/converters_tests/at_commands_in_refs.pl
    trunk/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl
    trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl
    trunk/tp/t/results/converters_tests/image_extension.pl
    trunk/tp/t/results/converters_tests/image_formatting.pl
    trunk/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
    trunk/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
    trunk/tp/t/results/converters_tests/verbatiminclude_paths.pl
    trunk/tp/t/results/coverage_braces/space_in_image.pl
    trunk/tp/t/results/coverage_braces/test_image.pl
    trunk/tp/t/results/coverage_braces/uref_in_ref.pl
    trunk/tp/t/results/float/float_copying.pl
    trunk/tp/t/results/html_tests/check_htmlxref.pl
    trunk/tp/t/results/html_tests/image_link_prefix.pl
    trunk/tp/t/results/indices/empty_string_index_entry.pl
    trunk/tp/t/results/indices/image_text_lines_count.pl
    trunk/tp/t/results/indices/index_entry_before_first_node.pl
    trunk/tp/t/results/info_tests/before_node_and_section.pl
    trunk/tp/t/results/info_tests/center_flush.pl
    trunk/tp/t/results/info_tests/error_in_footnote.pl
    trunk/tp/t/results/info_tests/image_file_search.pl
    trunk/tp/t/results/info_tests/image_not_found.pl
    trunk/tp/t/results/info_tests/invalid_node_name_warning.pl
    trunk/tp/t/results/info_tests/note_in_strong.pl
    trunk/tp/t/results/info_tests/note_in_strong_end_of_line.pl
    trunk/tp/t/results/info_tests/xref_test.pl
    trunk/tp/t/results/menu/invalid_info_menu_entry.pl
    trunk/tp/t/results/paragraph/image_in_paragraph.pl
    trunk/tp/t/results/paragraph/no_paragraph_commands.pl
    trunk/tp/t/results/raw/verbatim_and_verbatiminclude.pl
    trunk/tp/t/results/regions/anchor_in_copying.pl
    trunk/tp/t/results/regions/anchor_in_copying_in_footnote.pl
    trunk/tp/t/results/sectioning/character_and_spaces_in_refs.pl
    trunk/tp/t/results/sectioning/no_element.pl
    trunk/tp/t/results/sectioning/placed_things_before_element.pl
    trunk/tp/t/results/sectioning/placed_things_before_node.pl
    trunk/tp/t/results/test_count/flushright.pl
    trunk/tp/t/results/test_count/flushright_in_example.pl
    trunk/tp/t/results/test_count/multitable.pl
    trunk/tp/t/test_utils.pl

Modified: trunk/tp/t/results/converters_tests/at_commands_in_refs.pl
===================================================================
--- trunk/tp/t/results/converters_tests/at_commands_in_refs.pl  2014-02-09 
23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/converters_tests/at_commands_in_refs.pl  2014-02-15 
11:38:25 UTC (rev 5413)
@@ -22225,31 +22225,31 @@
 
 $result_converted_errors{'plaintext'}->{'at_commands_in_refs'} = [
   {
-    'file_name' => '',
     'error_line' => ':91: warning: could not find @image file `f--ile1.txt\' 
nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 91,
+    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 91
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':89: warning: could not find @image file `f--ile1.txt\' 
nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 89,
+    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 89
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':149: warning: @ref node name should not contain `:\'
 ',
+    'file_name' => '',
+    'line_nr' => 149,
+    'macro' => '',
     'text' => '@ref node name should not contain `:\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 149
+    'type' => 'warning'
   }
 ];
 
@@ -22637,40 +22637,40 @@
 
 $result_converted_errors{'html'}->{'at_commands_in_refs'} = [
   {
-    'file_name' => '',
     'error_line' => ':23: warning: @image file `f--ile1\' (for HTML) not 
found, using `f--ile1.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 23,
+    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 23
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':89: warning: @image file `f--ile1\' (for HTML) not 
found, using `f--ile1.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 89,
+    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 89
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':91: warning: @image file `f--ile1\' (for HTML) not 
found, using `f--ile1.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 91,
+    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 91
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':141: warning: @image file `f--ile1\' (for HTML) not 
found, using `f--ile1.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 141,
+    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 141
+    'type' => 'warning'
   }
 ];
 
@@ -22992,22 +22992,22 @@
 
 $result_converted_errors{'docbook'}->{'at_commands_in_refs'} = [
   {
-    'file_name' => '',
     'error_line' => ':91: warning: @image file `f--ile1\' not found, using 
`f--ile1.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 91,
+    'macro' => '',
     'text' => '@image file `f--ile1\' not found, using `f--ile1.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 91
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':141: warning: @image file `f--ile1\' not found, using 
`f--ile1.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 141,
+    'macro' => '',
     'text' => '@image file `f--ile1\' not found, using `f--ile1.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 141
+    'type' => 'warning'
   }
 ];
 
@@ -23267,94 +23267,94 @@
 
 $result_converted_errors{'info'}->{'at_commands_in_refs'} = [
   {
-    'file_name' => '',
     'error_line' => ':23: warning: could not find @image file `f--ile1.txt\' 
nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 23,
+    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 23
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':30: warning: menu entry node name should not contain `:\'
 ',
+    'file_name' => '',
+    'line_nr' => 30,
+    'macro' => '',
     'text' => 'menu entry node name should not contain `:\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 30
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':42: warning: @node name should not contain `,\': LaTeX 
TeX * , (C) ... ...
 ',
+    'file_name' => '',
+    'line_nr' => 42,
+    'macro' => '',
     'text' => '@node name should not contain `,\': LaTeX TeX * , (C) ... ...',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 42
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':60: warning: @node name should not contain `,\': a" e~ 
i^ a^ a` e\' c, e= e* e\'\' e;
 ',
+    'file_name' => '',
+    'line_nr' => 60,
+    'macro' => '',
     'text' => '@node name should not contain `,\': a" e~ i^ a^ a` e\' c, e= e* 
e\'\' e;',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 60
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':66: warning: @node name should not contain `,\': i E=` 
C\',
 ',
+    'file_name' => '',
+    'line_nr' => 66,
+    'macro' => '',
     'text' => '@node name should not contain `,\': i E=` C\',',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 66
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':69: warning: @node name should not contain `,\': `` \'\' 
` \' ,, ,
 ',
+    'file_name' => '',
+    'line_nr' => 69,
+    'macro' => '',
     'text' => '@node name should not contain `,\': `` \'\' ` \' ,, ,',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 69
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':89: warning: could not find @image file `f--ile1.txt\' 
nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 89,
+    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 89
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':91: warning: could not find @image file `f--ile1.txt\' 
nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 91,
+    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 91
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':89: warning: could not find @image file `f--ile1.txt\' 
nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 89,
+    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 89
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':149: warning: @ref node name should not contain `:\'
 ',
+    'file_name' => '',
+    'line_nr' => 149,
+    'macro' => '',
     'text' => '@ref node name should not contain `:\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 149
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl
===================================================================
--- trunk/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl   
2014-02-09 23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl   
2014-02-15 11:38:25 UTC (rev 5413)
@@ -22227,125 +22227,125 @@
 
 $result_converted_errors{'file_html'}->{'at_commands_in_refs_latin1'} = [
   {
-    'file_name' => '',
     'error_line' => ':26: warning: @image file `f--ile1\' (for HTML) not 
found, using `f--ile1.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 26,
+    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 26
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':92: warning: @image file `f--ile1\' (for HTML) not 
found, using `f--ile1.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 92,
+    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 92
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':94: warning: @image file `f--ile1\' (for HTML) not 
found, using `f--ile1.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 94,
+    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 94
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':144: warning: @image file `f--ile1\' (for HTML) not 
found, using `f--ile1.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 144,
+    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 144
+    'type' => 'warning'
   }
 ];
 
 
 $result_converted_errors{'file_info'}->{'at_commands_in_refs_latin1'} = [
   {
-    'file_name' => '',
     'error_line' => ':26: warning: could not find @image file `f--ile1.txt\' 
nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 26,
+    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 26
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':33: warning: menu entry node name should not contain `:\'
 ',
+    'file_name' => '',
+    'line_nr' => 33,
+    'macro' => '',
     'text' => 'menu entry node name should not contain `:\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 33
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ":45: warning: address@hidden name should not contain `,': 
LaTeX TeX * , \x{a9} ... ...
 ",
+    'file_name' => '',
+    'line_nr' => 45,
+    'macro' => '',
     'text' => "address@hidden name should not contain `,': LaTeX TeX * , 
\x{a9} ... ...",
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 45
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':69: warning: @node name should not contain `,\': i E=` 
C\',
 ',
+    'file_name' => '',
+    'line_nr' => 69,
+    'macro' => '',
     'text' => '@node name should not contain `,\': i E=` C\',',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 69
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':72: warning: @node name should not contain `,\': `` \'\' 
` \' ,, ,
 ',
+    'file_name' => '',
+    'line_nr' => 72,
+    'macro' => '',
     'text' => '@node name should not contain `,\': `` \'\' ` \' ,, ,',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 72
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':92: warning: could not find @image file `f--ile1.txt\' 
nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 92,
+    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 92
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':94: warning: could not find @image file `f--ile1.txt\' 
nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 94,
+    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 94
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':92: warning: could not find @image file `f--ile1.txt\' 
nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 92,
+    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 92
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':152: warning: @ref node name should not contain `:\'
 ',
+    'file_name' => '',
+    'line_nr' => 152,
+    'macro' => '',
     'text' => '@ref node name should not contain `:\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 152
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl
===================================================================
--- trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl     
2014-02-09 23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl     
2014-02-15 11:38:25 UTC (rev 5413)
@@ -22227,107 +22227,107 @@
 
 $result_converted_errors{'file_html'}->{'at_commands_in_refs_utf8'} = [
   {
-    'file_name' => '',
     'error_line' => ':26: warning: @image file `f--ile1\' (for HTML) not 
found, using `f--ile1.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 26,
+    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 26
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':92: warning: @image file `f--ile1\' (for HTML) not 
found, using `f--ile1.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 92,
+    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 92
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':94: warning: @image file `f--ile1\' (for HTML) not 
found, using `f--ile1.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 94,
+    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 94
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':144: warning: @image file `f--ile1\' (for HTML) not 
found, using `f--ile1.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 144,
+    'macro' => '',
     'text' => '@image file `f--ile1\' (for HTML) not found, using 
`f--ile1.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 144
+    'type' => 'warning'
   }
 ];
 
 
 $result_converted_errors{'file_info'}->{'at_commands_in_refs_utf8'} = [
   {
-    'file_name' => '',
     'error_line' => ':26: warning: could not find @image file `f--ile1.txt\' 
nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 26,
+    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 26
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':33: warning: menu entry node name should not contain `:\'
 ',
+    'file_name' => '',
+    'line_nr' => 33,
+    'macro' => '',
     'text' => 'menu entry node name should not contain `:\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 33
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ":45: warning: address@hidden name should not contain `,': 
LaTeX TeX \x{2022} , \x{a9} \x{2026} ...
 ",
+    'file_name' => '',
+    'line_nr' => 45,
+    'macro' => '',
     'text' => "address@hidden name should not contain `,': LaTeX TeX \x{2022} 
, \x{a9} \x{2026} ...",
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 45
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':92: warning: could not find @image file `f--ile1.txt\' 
nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 92,
+    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 92
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':94: warning: could not find @image file `f--ile1.txt\' 
nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 94,
+    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 94
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':92: warning: could not find @image file `f--ile1.txt\' 
nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 92,
+    'macro' => '',
     'text' => 'could not find @image file `f--ile1.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 92
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':152: warning: @ref node name should not contain `:\'
 ',
+    'file_name' => '',
+    'line_nr' => 152,
+    'macro' => '',
     'text' => '@ref node name should not contain `:\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 152
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/converters_tests/image_extension.pl
===================================================================
--- trunk/tp/t/results/converters_tests/image_extension.pl      2014-02-09 
23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/converters_tests/image_extension.pl      2014-02-15 
11:38:25 UTC (rev 5413)
@@ -106,13 +106,13 @@
 
 $result_converted_errors{'plaintext'}->{'image_extension'} = [
   {
-    'file_name' => '',
     'error_line' => ':1: warning: could not find @image file `f---ile.txt\' 
nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
     'text' => 'could not find @image file `f---ile.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 1
+    'type' => 'warning'
   }
 ];
 
@@ -123,13 +123,13 @@
 
 $result_converted_errors{'html_text'}->{'image_extension'} = [
   {
-    'file_name' => '',
     'error_line' => ':1: warning: @image file `f---ile\' (for HTML) not found, 
using `f---ile.gr--a\'
 ',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
     'text' => '@image file `f---ile\' (for HTML) not found, using 
`f---ile.gr--a\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 1
+    'type' => 'warning'
   }
 ];
 
@@ -144,13 +144,13 @@
 
 $result_converted_errors{'docbook'}->{'image_extension'} = [
   {
-    'file_name' => '',
     'error_line' => ':1: warning: @image file `f---ile\' not found, using 
`f---ile.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
     'text' => '@image file `f---ile\' not found, using `f---ile.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 1
+    'type' => 'warning'
   }
 ];
 
@@ -173,13 +173,13 @@
     'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':1: warning: could not find @image file `f---ile.txt\' 
nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
     'text' => 'could not find @image file `f---ile.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 1
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/converters_tests/image_formatting.pl
===================================================================
--- trunk/tp/t/results/converters_tests/image_formatting.pl     2014-02-09 
23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/converters_tests/image_formatting.pl     2014-02-15 
11:38:25 UTC (rev 5413)
@@ -2931,76 +2931,76 @@
 
 $result_converted_errors{'html_text'}->{'image_formatting'} = [
   {
-    'file_name' => '',
     'error_line' => ':9: warning: @image file `f-ile\' (for HTML) not found, 
using `f-ile.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => '',
     'text' => '@image file `f-ile\' (for HTML) not found, using `f-ile.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 9
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':10: warning: @image file address@hidden' (for HTML) not 
found, using address@hidden ext e--xt}\'
 ',
+    'file_name' => '',
+    'line_nr' => 10,
+    'macro' => '',
     'text' => '@image file address@hidden' (for HTML) not found, using 
address@hidden ext e--xt}\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 10
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':11: warning: @image file `image\' (for HTML) not found, 
using `image.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 11,
+    'macro' => '',
     'text' => '@image file `image\' (for HTML) not found, using `image.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 11
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':11: warning: @image file `image\' (for HTML) not found, 
using `image.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 11,
+    'macro' => '',
     'text' => '@image file `image\' (for HTML) not found, using `image.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 11
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':20: warning: @image file `f-ile\' (for HTML) not found, 
using `f-ile.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 20,
+    'macro' => '',
     'text' => '@image file `f-ile\' (for HTML) not found, using `f-ile.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 20
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':21: warning: @image file address@hidden' (for HTML) not 
found, using address@hidden ext e--xt}\'
 ',
+    'file_name' => '',
+    'line_nr' => 21,
+    'macro' => '',
     'text' => '@image file address@hidden' (for HTML) not found, using 
address@hidden ext e--xt}\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 21
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':22: warning: @image file `image\' (for HTML) not found, 
using `image.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 22,
+    'macro' => '',
     'text' => '@image file `image\' (for HTML) not found, using `image.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 22
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':22: warning: @image file `image\' (for HTML) not found, 
using `image.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 22,
+    'macro' => '',
     'text' => '@image file `image\' (for HTML) not found, using `image.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 22
+    'type' => 'warning'
   }
 ];
 
@@ -3075,40 +3075,40 @@
 
 $result_converted_errors{'docbook'}->{'image_formatting'} = [
   {
-    'file_name' => '',
     'error_line' => ':9: warning: @image file `f-ile\' not found, using 
`f-ile.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => '',
     'text' => '@image file `f-ile\' not found, using `f-ile.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 9
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':10: warning: @image file address@hidden' not found, 
using address@hidden'
 ',
+    'file_name' => '',
+    'line_nr' => 10,
+    'macro' => '',
     'text' => '@image file address@hidden' not found, using address@hidden'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 10
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':20: warning: @image file `f-ile\' not found, using 
`f-ile.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 20,
+    'macro' => '',
     'text' => '@image file `f-ile\' not found, using `f-ile.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 20
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':21: warning: @image file address@hidden' not found, 
using address@hidden'
 ',
+    'file_name' => '',
+    'line_nr' => 21,
+    'macro' => '',
     'text' => '@image file address@hidden' not found, using address@hidden'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 21
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
===================================================================
--- trunk/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl        
2014-02-09 23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl        
2014-02-15 11:38:25 UTC (rev 5413)
@@ -502,13 +502,13 @@
 
 $result_converted_errors{'html_text'}->{'raw_block_commands_expand_tex'} = [
   {
-    'file_name' => '',
     'error_line' => ':14: warning: raw format tex is not converted
 ',
+    'file_name' => '',
+    'line_nr' => 14,
+    'macro' => '',
     'text' => 'raw format tex is not converted',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 14
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
===================================================================
--- trunk/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl        
2014-02-09 23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl        
2014-02-15 11:38:25 UTC (rev 5413)
@@ -1832,13 +1832,13 @@
 
 $result_converted_errors{'info'}->{'some_at_commands_in_ref_nodes'} = [
   {
-    'file_name' => '',
     'error_line' => ':9: warning: @node name should not contain `,\': A SC N~ 
AA TeX node i" i" E=` /l C\', !
 ',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => '',
     'text' => '@node name should not contain `,\': A SC N~ AA TeX node i" i" 
E=` /l C\', !',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 9
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/converters_tests/verbatiminclude_paths.pl
===================================================================
--- trunk/tp/t/results/converters_tests/verbatiminclude_paths.pl        
2014-02-09 23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/converters_tests/verbatiminclude_paths.pl        
2014-02-15 11:38:25 UTC (rev 5413)
@@ -390,22 +390,22 @@
 
 $result_converted_errors{'plaintext'}->{'verbatiminclude_paths'} = [
   {
-    'file_name' => '',
     'error_line' => ':8: @verbatiminclude: could not find 
../include_dir/inc_file.texi
 ',
+    'file_name' => '',
+    'line_nr' => 8,
+    'macro' => '',
     'text' => '@verbatiminclude: could not find ../include_dir/inc_file.texi',
-    'type' => 'error',
-    'macro' => '',
-    'line_nr' => 8
+    'type' => 'error'
   },
   {
-    'file_name' => '',
     'error_line' => ':11: @verbatiminclude: could not find 
./tp/t/include_dir/inc_file.texi
 ',
+    'file_name' => '',
+    'line_nr' => 11,
+    'macro' => '',
     'text' => '@verbatiminclude: could not find 
./tp/t/include_dir/inc_file.texi',
-    'type' => 'error',
-    'macro' => '',
-    'line_nr' => 11
+    'type' => 'error'
   }
 ];
 
@@ -425,22 +425,22 @@
 
 $result_converted_errors{'html_text'}->{'verbatiminclude_paths'} = [
   {
-    'file_name' => '',
     'error_line' => ':8: @verbatiminclude: could not find 
../include_dir/inc_file.texi
 ',
+    'file_name' => '',
+    'line_nr' => 8,
+    'macro' => '',
     'text' => '@verbatiminclude: could not find ../include_dir/inc_file.texi',
-    'type' => 'error',
-    'macro' => '',
-    'line_nr' => 8
+    'type' => 'error'
   },
   {
-    'file_name' => '',
     'error_line' => ':11: @verbatiminclude: could not find 
./tp/t/include_dir/inc_file.texi
 ',
+    'file_name' => '',
+    'line_nr' => 11,
+    'macro' => '',
     'text' => '@verbatiminclude: could not find 
./tp/t/include_dir/inc_file.texi',
-    'type' => 'error',
-    'macro' => '',
-    'line_nr' => 11
+    'type' => 'error'
   }
 ];
 
@@ -481,22 +481,22 @@
 
 $result_converted_errors{'docbook'}->{'verbatiminclude_paths'} = [
   {
-    'file_name' => '',
     'error_line' => ':8: @verbatiminclude: could not find 
../include_dir/inc_file.texi
 ',
+    'file_name' => '',
+    'line_nr' => 8,
+    'macro' => '',
     'text' => '@verbatiminclude: could not find ../include_dir/inc_file.texi',
-    'type' => 'error',
-    'macro' => '',
-    'line_nr' => 8
+    'type' => 'error'
   },
   {
-    'file_name' => '',
     'error_line' => ':11: @verbatiminclude: could not find 
./tp/t/include_dir/inc_file.texi
 ',
+    'file_name' => '',
+    'line_nr' => 11,
+    'macro' => '',
     'text' => '@verbatiminclude: could not find 
./tp/t/include_dir/inc_file.texi',
-    'type' => 'error',
-    'macro' => '',
-    'line_nr' => 11
+    'type' => 'error'
   }
 ];
 

Modified: trunk/tp/t/results/coverage_braces/space_in_image.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/space_in_image.pl        2014-02-09 
23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/coverage_braces/space_in_image.pl        2014-02-15 
11:38:25 UTC (rev 5413)
@@ -212,22 +212,22 @@
 
 $result_converted_errors{'html_text'}->{'space_in_image'} = [
   {
-    'file_name' => '',
     'error_line' => ':1: warning: @image file `a\' (for HTML) not found, using 
`a.e\'
 ',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
     'text' => '@image file `a\' (for HTML) not found, using `a.e\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 1
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':1: warning: @image file `f\' (for HTML) not found, using 
`f.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
     'text' => '@image file `f\' (for HTML) not found, using `f.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 1
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/coverage_braces/test_image.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/test_image.pl    2014-02-09 23:55:10 UTC 
(rev 5412)
+++ trunk/tp/t/results/coverage_braces/test_image.pl    2014-02-15 11:38:25 UTC 
(rev 5413)
@@ -4781,94 +4781,94 @@
     'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':14: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 14,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 14
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':14: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 14,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 14
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':9: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 9
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':9: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 9
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':20: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 20,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 20
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':20: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 20,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 20
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':24: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 24,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 24
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':24: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 24,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 24
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':26: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 26,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 26
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':26: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 26,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 26
+    'type' => 'warning'
   }
 ];
 
@@ -4905,58 +4905,58 @@
 
 $result_converted_errors{'plaintext'}->{'test_image'} = [
   {
-    'file_name' => '',
     'error_line' => ':14: warning: could not find @image file address@hidden  
a@<"%@  < & @ % " .txt\' nor alternate text (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 14,
+    'macro' => 'files-char',
     'text' => 'could not find @image file address@hidden  a@<"%@  < & @ % " 
.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 14
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':9: warning: could not find @image file address@hidden  
a@<"%@  < & @ % " .txt\' nor alternate text (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => 'files-char',
     'text' => 'could not find @image file address@hidden  a@<"%@  < & @ % " 
.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 9
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':20: warning: could not find @image file address@hidden  
a@<"%@  < & @ % " .txt\' nor alternate text (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 20,
+    'macro' => 'files-char',
     'text' => 'could not find @image file address@hidden  a@<"%@  < & @ % " 
.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 20
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':24: warning: could not find @image file address@hidden  
a@<"%@  < & @ % " .txt\' nor alternate text (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 24,
+    'macro' => 'files-char',
     'text' => 'could not find @image file address@hidden  a@<"%@  < & @ % " 
.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 24
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':26: warning: could not find @image file address@hidden  
a@<"%@  < & @ % " .txt\' nor alternate text (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 26,
+    'macro' => 'files-char',
     'text' => 'could not find @image file address@hidden  a@<"%@  < & @ % " 
.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 26
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':26: warning: could not find @image file address@hidden  
a@<"%@  < & @ % " .txt\' nor alternate text (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 26,
+    'macro' => 'files-char',
     'text' => 'could not find @image file address@hidden  a@<"%@  < & @ % " 
.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 26
+    'type' => 'warning'
   }
 ];
 
@@ -5010,94 +5010,94 @@
 
 $result_converted_errors{'html_text'}->{'test_image'} = [
   {
-    'file_name' => '',
     'error_line' => ':14: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 14,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 14
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':14: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 14,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 14
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':9: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 9
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':9: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 9
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':20: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 20,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 20
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':20: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 20,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 20
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':24: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 24,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 24
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':24: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 24,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 24
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':26: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 26,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 26
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':26: warning: @image file address@hidden  a@<"%@  < & @ % 
" \' (for HTML) not found, using address@hidden  a@<"%@  < & @ % " 
address@hidden  a@<"%@  < & @ % " \' (possibly involving @files-char)
 ',
+    'file_name' => '',
+    'line_nr' => 26,
+    'macro' => 'files-char',
     'text' => '@image file address@hidden  a@<"%@  < & @ % " \' (for HTML) not 
found, using address@hidden  a@<"%@  < & @ % " address@hidden  a@<"%@  < & @ % 
" \'',
-    'type' => 'warning',
-    'macro' => 'files-char',
-    'line_nr' => 26
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/coverage_braces/uref_in_ref.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/uref_in_ref.pl   2014-02-09 23:55:10 UTC 
(rev 5412)
+++ trunk/tp/t/results/coverage_braces/uref_in_ref.pl   2014-02-15 11:38:25 UTC 
(rev 5413)
@@ -384,13 +384,13 @@
 
 $result_converted_errors{'plaintext'}->{'uref_in_ref'} = [
   {
-    'file_name' => '',
     'error_line' => ':1: warning: @ref cross-reference name should not contain 
`:\'
 ',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
     'text' => '@ref cross-reference name should not contain `:\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 1
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/float/float_copying.pl
===================================================================
--- trunk/tp/t/results/float/float_copying.pl   2014-02-09 23:55:10 UTC (rev 
5412)
+++ trunk/tp/t/results/float/float_copying.pl   2014-02-15 11:38:25 UTC (rev 
5413)
@@ -1815,58 +1815,58 @@
 
 $result_converted_errors{'info'}->{'float_copying'} = [
   {
-    'file_name' => '',
     'error_line' => ':3: @float output more than once: public domain
 ',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
     'text' => '@float output more than once: public domain',
-    'type' => 'error',
-    'macro' => '',
-    'line_nr' => 3
+    'type' => 'error'
   },
   {
-    'file_name' => '',
     'error_line' => ':19: @anchor output more than once: public domain anchor
 ',
+    'file_name' => '',
+    'line_nr' => 19,
+    'macro' => '',
     'text' => '@anchor output more than once: public domain anchor',
-    'type' => 'error',
-    'macro' => '',
-    'line_nr' => 19
+    'type' => 'error'
   },
   {
-    'file_name' => '',
     'error_line' => ':3: @float output more than once: public domain
 ',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
     'text' => '@float output more than once: public domain',
-    'type' => 'error',
-    'macro' => '',
-    'line_nr' => 3
+    'type' => 'error'
   },
   {
-    'file_name' => '',
     'error_line' => ':19: @anchor output more than once: public domain anchor
 ',
+    'file_name' => '',
+    'line_nr' => 19,
+    'macro' => '',
     'text' => '@anchor output more than once: public domain anchor',
-    'type' => 'error',
-    'macro' => '',
-    'line_nr' => 19
+    'type' => 'error'
   },
   {
-    'file_name' => '',
     'error_line' => ':10: @anchor output more than once: caption copying 
footnote anchor
 ',
+    'file_name' => '',
+    'line_nr' => 10,
+    'macro' => '',
     'text' => '@anchor output more than once: caption copying footnote anchor',
-    'type' => 'error',
-    'macro' => '',
-    'line_nr' => 10
+    'type' => 'error'
   },
   {
-    'file_name' => '',
     'error_line' => ':10: @anchor output more than once: caption copying 
footnote anchor
 ',
+    'file_name' => '',
+    'line_nr' => 10,
+    'macro' => '',
     'text' => '@anchor output more than once: caption copying footnote anchor',
-    'type' => 'error',
-    'macro' => '',
-    'line_nr' => 10
+    'type' => 'error'
   }
 ];
 

Modified: trunk/tp/t/results/html_tests/check_htmlxref.pl
===================================================================
--- trunk/tp/t/results/html_tests/check_htmlxref.pl     2014-02-09 23:55:10 UTC 
(rev 5412)
+++ trunk/tp/t/results/html_tests/check_htmlxref.pl     2014-02-15 11:38:25 UTC 
(rev 5413)
@@ -986,31 +986,31 @@
     'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':5: warning: no htmlxref.cnf entry found for 
`no_existing_no_manual.info\'
 ',
+    'file_name' => '',
+    'line_nr' => 5,
+    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 5
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':6: warning: no htmlxref.cnf entry found for 
`no_existing_no_manual.info\'
 ',
+    'file_name' => '',
+    'line_nr' => 6,
+    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `no_existing_no_manual.info\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 6
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':10: warning: no htmlxref.cnf entry found for 
`other_no_existing_no_manual\'
 ',
+    'file_name' => '',
+    'line_nr' => 10,
+    'macro' => '',
     'text' => 'no htmlxref.cnf entry found for `other_no_existing_no_manual\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 10
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/html_tests/image_link_prefix.pl
===================================================================
--- trunk/tp/t/results/html_tests/image_link_prefix.pl  2014-02-09 23:55:10 UTC 
(rev 5412)
+++ trunk/tp/t/results/html_tests/image_link_prefix.pl  2014-02-15 11:38:25 UTC 
(rev 5413)
@@ -116,13 +116,13 @@
     'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':1: warning: @image file `image\' (for HTML) not found, 
using `image.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
     'text' => '@image file `image\' (for HTML) not found, using `image.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 1
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/indices/empty_string_index_entry.pl
===================================================================
--- trunk/tp/t/results/indices/empty_string_index_entry.pl      2014-02-09 
23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/indices/empty_string_index_entry.pl      2014-02-15 
11:38:25 UTC (rev 5413)
@@ -961,40 +961,40 @@
 
 $result_converted_errors{'info'}->{'empty_string_index_entry'} = [
   {
-    'file_name' => '',
     'error_line' => ':3: warning: empty index key in @findex
 ',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
     'text' => 'empty index key in @findex',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 3
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':6: warning: empty index key in @item
 ',
+    'file_name' => '',
+    'line_nr' => 6,
+    'macro' => '',
     'text' => 'empty index key in @item',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 6
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':9: warning: empty index key in @defun
 ',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => '',
     'text' => 'empty index key in @defun',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 9
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':10: warning: empty index key in @defunx
 ',
+    'file_name' => '',
+    'line_nr' => 10,
+    'macro' => '',
     'text' => 'empty index key in @defunx',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 10
+    'type' => 'warning'
   }
 ];
 
@@ -1009,40 +1009,40 @@
 
 $result_converted_errors{'plaintext'}->{'empty_string_index_entry'} = [
   {
-    'file_name' => '',
     'error_line' => ':3: warning: empty index key in @findex
 ',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
     'text' => 'empty index key in @findex',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 3
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':6: warning: empty index key in @item
 ',
+    'file_name' => '',
+    'line_nr' => 6,
+    'macro' => '',
     'text' => 'empty index key in @item',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 6
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':9: warning: empty index key in @defun
 ',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => '',
     'text' => 'empty index key in @defun',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 9
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':10: warning: empty index key in @defunx
 ',
+    'file_name' => '',
+    'line_nr' => 10,
+    'macro' => '',
     'text' => 'empty index key in @defunx',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 10
+    'type' => 'warning'
   }
 ];
 
@@ -1069,40 +1069,40 @@
 
 $result_converted_errors{'html_text'}->{'empty_string_index_entry'} = [
   {
-    'file_name' => '',
     'error_line' => ':3: warning: empty index key in @findex
 ',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
     'text' => 'empty index key in @findex',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 3
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':6: warning: empty index key in @item
 ',
+    'file_name' => '',
+    'line_nr' => 6,
+    'macro' => '',
     'text' => 'empty index key in @item',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 6
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':9: warning: empty index key in @defun
 ',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => '',
     'text' => 'empty index key in @defun',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 9
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':10: warning: empty index key in @defunx
 ',
+    'file_name' => '',
+    'line_nr' => 10,
+    'macro' => '',
     'text' => 'empty index key in @defunx',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 10
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/indices/image_text_lines_count.pl
===================================================================
--- trunk/tp/t/results/indices/image_text_lines_count.pl        2014-02-09 
23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/indices/image_text_lines_count.pl        2014-02-15 
11:38:25 UTC (rev 5413)
@@ -368,13 +368,13 @@
 
 $result_converted_errors{'html_text'}->{'image_text_lines_count'} = [
   {
-    'file_name' => '',
     'error_line' => ':3: warning: @image file `count_image_text\' (for HTML) 
not found, using `count_image_text.jpg\'
 ',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
     'text' => '@image file `count_image_text\' (for HTML) not found, using 
`count_image_text.jpg\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 3
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/indices/index_entry_before_first_node.pl
===================================================================
--- trunk/tp/t/results/indices/index_entry_before_first_node.pl 2014-02-09 
23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/indices/index_entry_before_first_node.pl 2014-02-15 
11:38:25 UTC (rev 5413)
@@ -287,13 +287,13 @@
 
 $result_converted_errors{'info'}->{'index_entry_before_first_node'} = [
   {
-    'file_name' => '',
     'error_line' => ':2: warning: entry for index `cp\' outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 2,
+    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 2
+    'type' => 'warning'
   }
 ];
 
@@ -307,13 +307,13 @@
 
 $result_converted_errors{'plaintext'}->{'index_entry_before_first_node'} = [
   {
-    'file_name' => '',
     'error_line' => ':2: warning: entry for index `cp\' outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 2,
+    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 2
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/info_tests/before_node_and_section.pl
===================================================================
--- trunk/tp/t/results/info_tests/before_node_and_section.pl    2014-02-09 
23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/info_tests/before_node_and_section.pl    2014-02-15 
11:38:25 UTC (rev 5413)
@@ -1249,31 +1249,31 @@
 
 $result_converted_errors{'info'}->{'before_node_and_section'} = [
   {
-    'file_name' => '',
     'error_line' => ':4: warning: @footnote outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 4,
+    'macro' => '',
     'text' => '@footnote outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 4
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':5: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 5,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 5
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':3: warning: entry for index `cp\' outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
     'text' => 'entry for index `cp\' outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 3
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/info_tests/center_flush.pl
===================================================================
--- trunk/tp/t/results/info_tests/center_flush.pl       2014-02-09 23:55:10 UTC 
(rev 5412)
+++ trunk/tp/t/results/info_tests/center_flush.pl       2014-02-15 11:38:25 UTC 
(rev 5413)
@@ -688,31 +688,31 @@
     'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':14: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 14,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 14
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':29: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 29,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 29
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':31: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 31,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 31
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/info_tests/error_in_footnote.pl
===================================================================
--- trunk/tp/t/results/info_tests/error_in_footnote.pl  2014-02-09 23:55:10 UTC 
(rev 5412)
+++ trunk/tp/t/results/info_tests/error_in_footnote.pl  2014-02-15 11:38:25 UTC 
(rev 5413)
@@ -713,40 +713,40 @@
 
 $result_converted_errors{'info'}->{'error_in_footnote'} = [
   {
-    'file_name' => '',
     'error_line' => ':9: warning: @strong{Note...} produces a spurious 
cross-reference in Info; reword to avoid that
 ',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => '',
     'text' => '@strong{Note...} produces a spurious cross-reference in Info; 
reword to avoid that',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 9
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':9: warning: @strong{Note...} produces a spurious 
cross-reference in Info; reword to avoid that
 ',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => '',
     'text' => '@strong{Note...} produces a spurious cross-reference in Info; 
reword to avoid that',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 9
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':9: warning: @strong{Note...} produces a spurious 
cross-reference in Info; reword to avoid that
 ',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => '',
     'text' => '@strong{Note...} produces a spurious cross-reference in Info; 
reword to avoid that',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 9
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':11: warning: @strong{Note...} produces a spurious 
cross-reference in Info; reword to avoid that
 ',
+    'file_name' => '',
+    'line_nr' => 11,
+    'macro' => '',
     'text' => '@strong{Note...} produces a spurious cross-reference in Info; 
reword to avoid that',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 11
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/info_tests/image_file_search.pl
===================================================================
--- trunk/tp/t/results/info_tests/image_file_search.pl  2014-02-09 23:55:10 UTC 
(rev 5412)
+++ trunk/tp/t/results/info_tests/image_file_search.pl  2014-02-15 11:38:25 UTC 
(rev 5413)
@@ -331,22 +331,22 @@
 
 $result_converted_errors{'info'}->{'image_file_search'} = [
   {
-    'file_name' => '',
     'error_line' => ':7: warning: could not find @image file 
`./tp/t/include_dir/f--ile.txt\' nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 7,
+    'macro' => '',
     'text' => 'could not find @image file `./tp/t/include_dir/f--ile.txt\' nor 
alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 7
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':10: warning: could not find @image file 
`../include_dir/f--ile.txt\' nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 10,
+    'macro' => '',
     'text' => 'could not find @image file `../include_dir/f--ile.txt\' nor 
alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 10
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/info_tests/image_not_found.pl
===================================================================
--- trunk/tp/t/results/info_tests/image_not_found.pl    2014-02-09 23:55:10 UTC 
(rev 5412)
+++ trunk/tp/t/results/info_tests/image_not_found.pl    2014-02-15 11:38:25 UTC 
(rev 5413)
@@ -174,13 +174,13 @@
 
 $result_converted_errors{'info'}->{'image_not_found'} = [
   {
-    'file_name' => '',
     'error_line' => ':2: warning: could not find @image file `n_f_image.txt\' 
nor alternate text
 ',
+    'file_name' => '',
+    'line_nr' => 2,
+    'macro' => '',
     'text' => 'could not find @image file `n_f_image.txt\' nor alternate text',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 2
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/info_tests/invalid_node_name_warning.pl
===================================================================
--- trunk/tp/t/results/info_tests/invalid_node_name_warning.pl  2014-02-09 
23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/info_tests/invalid_node_name_warning.pl  2014-02-15 
11:38:25 UTC (rev 5413)
@@ -1203,85 +1203,85 @@
 
 $result_converted_errors{'info'}->{'invalid_node_name_warning'} = [
   {
-    'file_name' => '',
     'error_line' => ':5: warning: menu entry name should not contain `:\'
 ',
+    'file_name' => '',
+    'line_nr' => 5,
+    'macro' => '',
     'text' => 'menu entry name should not contain `:\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 5
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':5: warning: menu entry node name should not contain `. \'
 ',
+    'file_name' => '',
+    'line_nr' => 5,
+    'macro' => '',
     'text' => 'menu entry node name should not contain `. \'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 5
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':6: warning: menu entry node name should not contain `,\'
 ',
+    'file_name' => '',
+    'line_nr' => 6,
+    'macro' => '',
     'text' => 'menu entry node name should not contain `,\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 6
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':7: warning: menu entry node name should not contain `:\'
 ',
+    'file_name' => '',
+    'line_nr' => 7,
+    'macro' => '',
     'text' => 'menu entry node name should not contain `:\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 7
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':12: warning: @node name should not contain `,\': 
node,comma
 ',
+    'file_name' => '',
+    'line_nr' => 12,
+    'macro' => '',
     'text' => '@node name should not contain `,\': node,comma',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 12
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':16: warning: @ref cross-reference name should not 
contain `:\'
 ',
+    'file_name' => '',
+    'line_nr' => 16,
+    'macro' => '',
     'text' => '@ref cross-reference name should not contain `:\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 16
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':16: warning: @ref node name should not contain `. \'
 ',
+    'file_name' => '',
+    'line_nr' => 16,
+    'macro' => '',
     'text' => '@ref node name should not contain `. \'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 16
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':16: warning: @ref node name should not contain `,\'
 ',
+    'file_name' => '',
+    'line_nr' => 16,
+    'macro' => '',
     'text' => '@ref node name should not contain `,\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 16
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':17: warning: @ref node name should not contain `:\'
 ',
+    'file_name' => '',
+    'line_nr' => 17,
+    'macro' => '',
     'text' => '@ref node name should not contain `:\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 17
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/info_tests/note_in_strong.pl
===================================================================
--- trunk/tp/t/results/info_tests/note_in_strong.pl     2014-02-09 23:55:10 UTC 
(rev 5412)
+++ trunk/tp/t/results/info_tests/note_in_strong.pl     2014-02-15 11:38:25 UTC 
(rev 5413)
@@ -482,22 +482,22 @@
 
 $result_converted_errors{'info'}->{'note_in_strong'} = [
   {
-    'file_name' => '',
     'error_line' => ':5: warning: @strong{Note...} produces a spurious 
cross-reference in Info; reword to avoid that
 ',
+    'file_name' => '',
+    'line_nr' => 5,
+    'macro' => '',
     'text' => '@strong{Note...} produces a spurious cross-reference in Info; 
reword to avoid that',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 5
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':11: warning: @strong{Note...} produces a spurious 
cross-reference in Info; reword to avoid that
 ',
+    'file_name' => '',
+    'line_nr' => 11,
+    'macro' => '',
     'text' => '@strong{Note...} produces a spurious cross-reference in Info; 
reword to avoid that',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 11
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/info_tests/note_in_strong_end_of_line.pl
===================================================================
--- trunk/tp/t/results/info_tests/note_in_strong_end_of_line.pl 2014-02-09 
23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/info_tests/note_in_strong_end_of_line.pl 2014-02-15 
11:38:25 UTC (rev 5413)
@@ -250,22 +250,22 @@
 
 $result_converted_errors{'info'}->{'note_in_strong_end_of_line'} = [
   {
-    'file_name' => '',
     'error_line' => ':3: warning: @strong{Note...} produces a spurious 
cross-reference in Info; reword to avoid that
 ',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
     'text' => '@strong{Note...} produces a spurious cross-reference in Info; 
reword to avoid that',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 3
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':5: warning: @strong{Note...} produces a spurious 
cross-reference in Info; reword to avoid that
 ',
+    'file_name' => '',
+    'line_nr' => 5,
+    'macro' => '',
     'text' => '@strong{Note...} produces a spurious cross-reference in Info; 
reword to avoid that',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 5
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/info_tests/xref_test.pl
===================================================================
--- trunk/tp/t/results/info_tests/xref_test.pl  2014-02-09 23:55:10 UTC (rev 
5412)
+++ trunk/tp/t/results/info_tests/xref_test.pl  2014-02-15 11:38:25 UTC (rev 
5413)
@@ -499,40 +499,40 @@
 
 $result_converted_errors{'info'}->{'xref_test'} = [
   {
-    'file_name' => '',
     'error_line' => ':4: warning: `.\' or `,\' must follow @xref, not a
 ',
+    'file_name' => '',
+    'line_nr' => 4,
+    'macro' => '',
     'text' => '`.\' or `,\' must follow @xref, not a',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 4
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':5: warning: `.\' or `,\' must follow @xref
 ',
+    'file_name' => '',
+    'line_nr' => 5,
+    'macro' => '',
     'text' => '`.\' or `,\' must follow @xref',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 5
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':6: warning: `.\' or `,\' must follow @xref, not !
 ',
+    'file_name' => '',
+    'line_nr' => 6,
+    'macro' => '',
     'text' => '`.\' or `,\' must follow @xref, not !',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 6
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':7: warning: `.\' or `,\' must follow @xref, not #
 ',
+    'file_name' => '',
+    'line_nr' => 7,
+    'macro' => '',
     'text' => '`.\' or `,\' must follow @xref, not #',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 7
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/menu/invalid_info_menu_entry.pl
===================================================================
--- trunk/tp/t/results/menu/invalid_info_menu_entry.pl  2014-02-09 23:55:10 UTC 
(rev 5412)
+++ trunk/tp/t/results/menu/invalid_info_menu_entry.pl  2014-02-15 11:38:25 UTC 
(rev 5413)
@@ -820,49 +820,49 @@
 
 $result_converted_errors{'plaintext'}->{'invalid_info_menu_entry'} = [
   {
-    'file_name' => '',
     'error_line' => ':4: warning: menu entry node name should not contain `:\'
 ',
+    'file_name' => '',
+    'line_nr' => 4,
+    'macro' => '',
     'text' => 'menu entry node name should not contain `:\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 4
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':5: warning: menu entry name should not contain `:\'
 ',
+    'file_name' => '',
+    'line_nr' => 5,
+    'macro' => '',
     'text' => 'menu entry name should not contain `:\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 5
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':6: warning: menu entry node name should not contain `. \'
 ',
+    'file_name' => '',
+    'line_nr' => 6,
+    'macro' => '',
     'text' => 'menu entry node name should not contain `. \'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 6
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':7: warning: menu entry node name should not contain `,\'
 ',
+    'file_name' => '',
+    'line_nr' => 7,
+    'macro' => '',
     'text' => 'menu entry node name should not contain `,\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 7
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':8: warning: menu entry node name should not contain `    
\'
 ',
+    'file_name' => '',
+    'line_nr' => 8,
+    'macro' => '',
     'text' => 'menu entry node name should not contain `       \'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 8
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/paragraph/image_in_paragraph.pl
===================================================================
--- trunk/tp/t/results/paragraph/image_in_paragraph.pl  2014-02-09 23:55:10 UTC 
(rev 5412)
+++ trunk/tp/t/results/paragraph/image_in_paragraph.pl  2014-02-15 11:38:25 UTC 
(rev 5413)
@@ -150,13 +150,13 @@
 
 $result_converted_errors{'html_text'}->{'image_in_paragraph'} = [
   {
-    'file_name' => '',
     'error_line' => ':1: warning: @image file `aa\' (for HTML) not found, 
using `aa.ee\'
 ',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
     'text' => '@image file `aa\' (for HTML) not found, using `aa.ee\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 1
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/paragraph/no_paragraph_commands.pl
===================================================================
--- trunk/tp/t/results/paragraph/no_paragraph_commands.pl       2014-02-09 
23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/paragraph/no_paragraph_commands.pl       2014-02-15 
11:38:25 UTC (rev 5413)
@@ -201,13 +201,13 @@
 
 $result_converted_errors{'html_text'}->{'no_paragraph_commands'} = [
   {
-    'file_name' => '',
     'error_line' => ':3: warning: @image file `aa\' (for HTML) not found, 
using `aa.ee\'
 ',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
     'text' => '@image file `aa\' (for HTML) not found, using `aa.ee\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 3
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/raw/verbatim_and_verbatiminclude.pl
===================================================================
--- trunk/tp/t/results/raw/verbatim_and_verbatiminclude.pl      2014-02-09 
23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/raw/verbatim_and_verbatiminclude.pl      2014-02-15 
11:38:25 UTC (rev 5413)
@@ -1282,31 +1282,31 @@
 
 $result_converted_errors{'plaintext'}->{'verbatim_and_verbatiminclude'} = [
   {
-    'file_name' => '',
     'error_line' => ':25: @verbatiminclude: could not find verb.txt
 ',
+    'file_name' => '',
+    'line_nr' => 25,
+    'macro' => '',
     'text' => '@verbatiminclude: could not find verb.txt',
-    'type' => 'error',
-    'macro' => '',
-    'line_nr' => 25
+    'type' => 'error'
   },
   {
-    'file_name' => '',
     'error_line' => ':29: @verbatiminclude: could not find verb.txt
 ',
+    'file_name' => '',
+    'line_nr' => 29,
+    'macro' => '',
     'text' => '@verbatiminclude: could not find verb.txt',
-    'type' => 'error',
-    'macro' => '',
-    'line_nr' => 29
+    'type' => 'error'
   },
   {
-    'file_name' => '',
     'error_line' => ':33: @verbatiminclude: could not find verb.txt
 ',
+    'file_name' => '',
+    'line_nr' => 33,
+    'macro' => '',
     'text' => '@verbatiminclude: could not find verb.txt',
-    'type' => 'error',
-    'macro' => '',
-    'line_nr' => 33
+    'type' => 'error'
   }
 ];
 

Modified: trunk/tp/t/results/regions/anchor_in_copying.pl
===================================================================
--- trunk/tp/t/results/regions/anchor_in_copying.pl     2014-02-09 23:55:10 UTC 
(rev 5412)
+++ trunk/tp/t/results/regions/anchor_in_copying.pl     2014-02-15 11:38:25 UTC 
(rev 5413)
@@ -452,13 +452,13 @@
 
 $result_converted_errors{'info'}->{'anchor_in_copying'} = [
   {
-    'file_name' => '',
     'error_line' => ':5: @anchor output more than once: Copying information
 ',
+    'file_name' => '',
+    'line_nr' => 5,
+    'macro' => '',
     'text' => '@anchor output more than once: Copying information',
-    'type' => 'error',
-    'macro' => '',
-    'line_nr' => 5
+    'type' => 'error'
   }
 ];
 

Modified: trunk/tp/t/results/regions/anchor_in_copying_in_footnote.pl
===================================================================
--- trunk/tp/t/results/regions/anchor_in_copying_in_footnote.pl 2014-02-09 
23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/regions/anchor_in_copying_in_footnote.pl 2014-02-15 
11:38:25 UTC (rev 5413)
@@ -506,13 +506,13 @@
 
 $result_converted_errors{'info'}->{'anchor_in_copying_in_footnote'} = [
   {
-    'file_name' => '',
     'error_line' => ':5: @anchor output more than once: Copying footnote
 ',
+    'file_name' => '',
+    'line_nr' => 5,
+    'macro' => '',
     'text' => '@anchor output more than once: Copying footnote',
-    'type' => 'error',
-    'macro' => '',
-    'line_nr' => 5
+    'type' => 'error'
   }
 ];
 

Modified: trunk/tp/t/results/sectioning/character_and_spaces_in_refs.pl
===================================================================
--- trunk/tp/t/results/sectioning/character_and_spaces_in_refs.pl       
2014-02-09 23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/sectioning/character_and_spaces_in_refs.pl       
2014-02-15 11:38:25 UTC (rev 5413)
@@ -2248,13 +2248,13 @@
 
 $result_converted_errors{'info'}->{'character_and_spaces_in_refs'} = [
   {
-    'file_name' => '',
     'error_line' => ':11: warning: @ref node name should not contain `:\'
 ',
+    'file_name' => '',
+    'line_nr' => 11,
+    'macro' => '',
     'text' => '@ref node name should not contain `:\'',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 11
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/sectioning/no_element.pl
===================================================================
--- trunk/tp/t/results/sectioning/no_element.pl 2014-02-09 23:55:10 UTC (rev 
5412)
+++ trunk/tp/t/results/sectioning/no_element.pl 2014-02-15 11:38:25 UTC (rev 
5413)
@@ -1101,40 +1101,40 @@
     'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':5: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 5,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 5
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':13: warning: @footnote outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 13,
+    'macro' => '',
     'text' => '@footnote outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 13
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':21: warning: @float outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 21,
+    'macro' => '',
     'text' => '@float outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 21
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':15: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 15,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 15
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/sectioning/placed_things_before_element.pl
===================================================================
--- trunk/tp/t/results/sectioning/placed_things_before_element.pl       
2014-02-09 23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/sectioning/placed_things_before_element.pl       
2014-02-15 11:38:25 UTC (rev 5413)
@@ -1228,40 +1228,40 @@
     'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':1: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 1
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':9: warning: @footnote outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => '',
     'text' => '@footnote outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 9
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':17: warning: @float outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 17,
+    'macro' => '',
     'text' => '@float outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 17
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':11: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 11,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 11
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/sectioning/placed_things_before_node.pl
===================================================================
--- trunk/tp/t/results/sectioning/placed_things_before_node.pl  2014-02-09 
23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/sectioning/placed_things_before_node.pl  2014-02-15 
11:38:25 UTC (rev 5413)
@@ -1322,31 +1322,31 @@
 
 $result_converted_errors{'info'}->{'placed_things_before_node'} = [
   {
-    'file_name' => '',
     'error_line' => ':1: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 1
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':9: warning: @footnote outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => '',
     'text' => '@footnote outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 9
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':17: warning: @float outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 17,
+    'macro' => '',
     'text' => '@float outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 17
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/test_count/flushright.pl
===================================================================
--- trunk/tp/t/results/test_count/flushright.pl 2014-02-09 23:55:10 UTC (rev 
5412)
+++ trunk/tp/t/results/test_count/flushright.pl 2014-02-15 11:38:25 UTC (rev 
5413)
@@ -485,40 +485,40 @@
 
 $result_converted_errors{'debugcount'}->{'flushright'} = [
   {
-    'file_name' => '',
     'error_line' => ':3: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 3
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':4: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 4,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 4
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':4: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 4,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 4
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':9: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 9
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/test_count/flushright_in_example.pl
===================================================================
--- trunk/tp/t/results/test_count/flushright_in_example.pl      2014-02-09 
23:55:10 UTC (rev 5412)
+++ trunk/tp/t/results/test_count/flushright_in_example.pl      2014-02-15 
11:38:25 UTC (rev 5413)
@@ -669,58 +669,58 @@
 
 $result_converted_errors{'debugcount'}->{'flushright_in_example'} = [
   {
-    'file_name' => '',
     'error_line' => ':4: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 4,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 4
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':5: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 5,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 5
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':5: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 5,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 5
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':6: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 6,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 6
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':6: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 6,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 6
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':11: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 11,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 11
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/results/test_count/multitable.pl
===================================================================
--- trunk/tp/t/results/test_count/multitable.pl 2014-02-09 23:55:10 UTC (rev 
5412)
+++ trunk/tp/t/results/test_count/multitable.pl 2014-02-15 11:38:25 UTC (rev 
5413)
@@ -579,22 +579,22 @@
 
 $result_converted_errors{'debugcount'}->{'multitable'} = [
   {
-    'file_name' => '',
     'error_line' => ':3: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 3
+    'type' => 'warning'
   },
   {
-    'file_name' => '',
     'error_line' => ':5: warning: @anchor outside of any node
 ',
+    'file_name' => '',
+    'line_nr' => 5,
+    'macro' => '',
     'text' => '@anchor outside of any node',
-    'type' => 'warning',
-    'macro' => '',
-    'line_nr' => 5
+    'type' => 'warning'
   }
 ];
 

Modified: trunk/tp/t/test_utils.pl
===================================================================
--- trunk/tp/t/test_utils.pl    2014-02-09 23:55:10 UTC (rev 5412)
+++ trunk/tp/t/test_utils.pl    2014-02-15 11:38:25 UTC (rev 5413)
@@ -937,6 +937,7 @@
       #print STDERR "$format: \n$converted{$format}";
       }
       if (defined($converted_errors{$format})) {
+        local $Data::Dumper::Sortkeys = 1;
         $out_result .= Data::Dumper->Dump([$converted_errors{$format}], 
                  
['$result_converted_errors{\''.$format.'\'}->{\''.$test_name.'\'}']) ."\n\n";
         #print STDERR "".Data::Dumper->Dump([$converted_errors{$format}]);




reply via email to

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