texi2html-cvs
[Top][All Lists]
Advanced

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

[Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht...


From: Patrice Dumas
Subject: [Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht...
Date: Mon, 27 Apr 2009 01:56:49 +0000

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        09/04/27 01:56:49

Modified files:
        .              : ChangeLog TODO texi2html.init texi2html.pl 
        doc            : texi2html.texi 
        examples       : docbook.init info.init 
        test/coverage/res/comments: comments.2 
        test/coverage/res/formatting: formatting.2 
        test/coverage/res/texi_comments: comments.2 
        test/encodings/res/at_commands_in_refs_utf8_use_nodes_no_unicode: 
                                                                          
at_commands_in_refs_utf8.2 
        test/encodings/res/formatting_converted_to_utf8: formatting.2 
        test/encodings/res/formatting_fr: formatting.2 
        test/encodings/res/formatting_fr_icons: formatting.2 
        test/encodings/res/nodetest: nodetest.2 
        test/encodings/res/nodetest_chapter: nodetest.2 
        test/encodings/res/nodetest_latin1: nodetest_latin1.2 
        test/encodings/res/nodetest_latin1_no_unicode: nodetest_latin1.2 
        test/encodings/res/nodetest_latin1_use_nodes: nodetest_latin1.2 
        test/encodings/res/nodetest_latin1_use_nodes_no_unicode: 
                                                                 
nodetest_latin1.2 
        test/encodings/res/nodetest_no_unicode: nodetest.2 
        test/encodings/res/nodetest_to_utf8_latin1: nodetest_latin1.2 
        test/encodings/res/nodetest_use_nodes: nodetest.2 
        test/encodings/res/nodetest_use_nodes_no_unicode: nodetest.2 
        test/encodings/res/nodetest_use_nodes_no_unidecode: nodetest.2 
        test/encodings/res/nodetest_utf8: nodetest_utf8.2 
        test/encodings/res/nodetest_utf8_no_unicode: nodetest_utf8.2 
        test/encodings/res/nodetest_utf8_use_nodes: nodetest_utf8.2 
        test/encodings/res/nodetest_utf8_use_nodes_no_unidecode: 
                                                                 
nodetest_utf8.2 
        test/formatting/res/def_cmds: def_cmds.2 
        test/formatting/res/formatting_docbook: formatting.2 
        test/formatting/res/formatting_weird_quotes: formatting.2 
        test/formatting/res/texi_images: images.passfirst 
        test/indices/res/index_no_node: index_no_node.2 
        test/invalid/res/caption_not_closed: caption_not_closed.2 
        test/invalid/res/copying_not_closed: copying_not_closed.2 
        test/invalid/res/footnote_not_closed: footnote_not_closed.2 
        test/invalid/res/recursive_copying: recursive_copying.2 
        test/invalid/res/tab_in_index: tab_in_index.2 
        test/invalid/res/texi_copying_not_closed: copying_not_closed.2 
        test/invalid/res/texi_titlepage_not_closed: 
                                                    titlepage_not_closed.2 
        test/invalid/res/titlepage_not_closed: titlepage_not_closed.2 
        test/layout/res/formatting_chm: formatting.2 
        test/layout/res/formatting_exotic: formatting.2 
        test/layout/res/formatting_makeinfo: formatting.2 
        test/layout/res/formatting_regions: formatting_regions.2 
        test/many_input_files/tex_l2h_res: tex_l2h.2 
        test/many_input_files/tex_t4ht_res: tex_t4ht.2 
        test/misc/res/formatting_html32: formatting.2 
        test/misc/res/mini_ker_httex: mini_ker.2 
        test/misc/res/mini_ker_l2h: mini_ker.2 
        test/misc/res/templates: templates.2 
        test/sectionning/res/equivalent_nodes: equivalent_nodes.2 
        test/sectionning/res/equivalent_nodes_no_node: 
                                                       equivalent_nodes.2 
        test/sectionning/res/lower_subsub: lower_subsub.2 
        test/sectionning/res/menutextorder: menutextorder.2 
        test/sectionning/res/nodes_id_docbook: nodes_id.2 
        test/sectionning/res/nodes_test: nodes_test.2 
        test/sectionning/res/semi_auto: semi_auto.2 
        test/xemacs_manual/res/xemacs: xemacs.2 
        test/xemacs_manual/res/xemacs_frame: xemacs.2 

Log message:
                Output an error message only if there is an associated line. 
                Use plain warn for messages that are not associated with a 
specific
                location.
                Pass line numbers to substitute_text for special regions and 
                special commands like refs and footnotes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.376&r2=1.377
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.189&r2=1.190
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.278&r2=1.279
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texi2html.texi?cvsroot=texi2html&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/docbook.init?cvsroot=texi2html&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/info.init?cvsroot=texi2html&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/comments/comments.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/formatting/formatting.2?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/texi_comments/comments.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/formatting_converted_to_utf8/formatting.2?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/formatting_fr/formatting.2?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/formatting_fr_icons/formatting.2?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest/nodetest.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_chapter/nodetest.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1/nodetest_latin1.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_no_unicode/nodetest_latin1.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes/nodetest_latin1.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_no_unicode/nodetest.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_to_utf8_latin1/nodetest_latin1.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes/nodetest.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/nodetest.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/nodetest.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8/nodetest_utf8.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_no_unicode/nodetest_utf8.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes/nodetest_utf8.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/def_cmds/def_cmds.2?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_docbook/formatting.2?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_weird_quotes/formatting.2?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_images/images.passfirst?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res/index_no_node/index_no_node.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/caption_not_closed/caption_not_closed.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/copying_not_closed/copying_not_closed.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/footnote_not_closed/footnote_not_closed.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/recursive_copying/recursive_copying.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/tab_in_index/tab_in_index.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_copying_not_closed/copying_not_closed.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_titlepage_not_closed/titlepage_not_closed.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/titlepage_not_closed/titlepage_not_closed.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting.2?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting.2?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/formatting.2?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_regions/formatting_regions.2?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/many_input_files/tex_l2h_res/tex_l2h.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/many_input_files/tex_t4ht_res/tex_t4ht.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/formatting_html32/formatting.2?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/mini_ker_httex/mini_ker.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/mini_ker_l2h/mini_ker.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/templates/templates.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/equivalent_nodes/equivalent_nodes.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/lower_subsub/lower_subsub.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/menutextorder/menutextorder.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/nodes_id_docbook/nodes_id.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/nodes_test/nodes_test.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/semi_auto/semi_auto.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/xemacs_manual/res/xemacs/xemacs.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/xemacs_manual/res/xemacs_frame/xemacs.2?cvsroot=texi2html&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -b -r1.376 -r1.377
--- ChangeLog   26 Apr 2009 17:35:47 -0000      1.376
+++ ChangeLog   27 Apr 2009 01:56:39 -0000      1.377
@@ -14,6 +14,11 @@
        output to STDOUT, or not split.
        Use stdin as input if there is no file in argument and stdin
        is not a tty and fix stdin and stdout names used.
+       Output an error message only if there is an associated line. 
+       Use plain warn for messages that are not associated with a specific
+       location.
+       Pass line numbers to substitute_text for special regions and 
+       special commands like refs and footnotes.
 
 2009-04-23   Patrice Dumas  <address@hidden>
 

Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- TODO        26 Apr 2009 18:27:25 -0000      1.92
+++ TODO        27 Apr 2009 01:56:39 -0000      1.93
@@ -81,11 +81,6 @@
 @printindex cp
 }
 
-* maybe some @-commands appearing on lines should stop paragraphs, namely
address@hidden or @indent. That's not sure. More likely this should be up to 
the 
-writer to add a line. There is a Config hash now for @style_map commands.
-formats automatically stop paragraphs.
-
 * @macro definition in @ifset is parsed but ignored. So in the following, the
 @end ifset appearing in the macro is ignored if 'a' is not set, and the 
 macro isn't defined.
@@ -113,12 +108,6 @@
 * in index_split the section associated with indices is the numbered section
   not the associated node where the @cindex are. Good or bad?
 
-* maybe be quiet during special region expansion outside of document. It
-  is not very clear that it is wrong, though. multiple_pass could be passed
-  down to echo_warn/echo_error and no warning would be produced with
-  multiple_pass > 1. Alternatively, line numbers could be passed down 
-  like what is done with inline_insertcopying
-
 * antispam @email
 <script type="text/javascript">
 <!--
@@ -312,8 +301,6 @@
 
 * error message when xref is followed by something else than . is missing.
 
-* no line numbers when in footnotes.
-
 * Certainly partly done: ignore spaces at end of @item line for @(|v|f)table. 
   Also maybe after @item, but to be careful with things prepended or 
   commands used in for the whole line.

Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -b -r1.189 -r1.190
--- texi2html.init      26 Apr 2009 17:35:47 -0000      1.189
+++ texi2html.init      27 Apr 2009 01:56:39 -0000      1.190
@@ -12,7 +12,7 @@
 # Afterwards, load the file with command-line 
 # option -init-file <your_init_file>
 #
-# $Id: texi2html.init,v 1.189 2009/04/26 17:35:47 pertusus Exp $
+# $Id: texi2html.init,v 1.190 2009/04/27 01:56:39 pertusus Exp $
 
 ######################################################################
 # The following variables can also be set by command-line options
@@ -4775,13 +4775,13 @@
     my $float = shift;
     if (defined($float->{'shortcaption_texi'}))
     {
-         return [ @{$float->{'shortcaption_texi'}} ];
+         return ([ @{$float->{'shortcaption_texi'}} ], 'shortcaption');
     }
     elsif (defined($float->{'caption_texi'}))
     {
-         return [ @{$float->{'caption_texi'}} ];
+         return ([ @{$float->{'caption_texi'}} ], 'caption');
     }
-    return [ ];
+    return ([ ], undef);
 }
 
 sub t2h_default_listoffloats_entry($$$$)
@@ -6069,10 +6069,11 @@
 
 # formatting of raw regions
 # if L2H is true another mechanism is used for tex
-sub t2h_default_raw($$)
+sub t2h_default_raw($$;$)
 {
     my $style = shift;
     my $text = shift;
+    my $line_nr = shift;
     my $expanded = 1 if (grep {$style eq $_} @EXPAND);
     if ($style eq 'verbatim' or $style eq 'verbatiminclude' or ($style eq 
'tex' and $expanded))
     {
@@ -6086,7 +6087,7 @@
     }
     elsif ($expanded)
     {
-        main::echo_warn ("Raw $style not handled especially, but expanded");
+        main::echo_warn ("Raw $style not handled especially, but expanded", 
$line_nr);
         return &$protect_text($text);
     }
     else
@@ -6199,7 +6200,7 @@
 # extension
 # path to working dir
 # path to file relative from working dir
-sub t2h_default_image($$$$$$$$$$$$$$$$)
+sub t2h_default_image($$$$$$$$$$$$$$$$$)
 {
     my $file = shift;
     my $base = shift;
@@ -6217,6 +6218,7 @@
     my $base_simple_format = shift;
     my $extension_simple_format = shift;
     my $file_name_simple_format = shift;
+    my $line_nr = shift;
  
     if (!defined($file_path) or $file_path eq '')
     {
@@ -6228,7 +6230,7 @@
         {
             $file = "$base.jpg";
         }
-        main::echo_warn ("no image file for $base, (using $file)");
+        main::echo_warn ("no image file for $base, (using $file)", $line_nr);
     }
     elsif (! $COMPLETE_IMAGE_PATHS)
     {

Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -b -r1.278 -r1.279
--- texi2html.pl        26 Apr 2009 17:35:48 -0000      1.278
+++ texi2html.pl        27 Apr 2009 01:56:39 -0000      1.279
@@ -79,7 +79,7 @@
 }
 
 # CVS version:
-# $Id: texi2html.pl,v 1.278 2009/04/26 17:35:48 pertusus Exp $
+# $Id: texi2html.pl,v 1.279 2009/04/27 01:56:39 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -2026,15 +2026,16 @@
 
 # find the encoding alias.
 # with encoding support (USE_UNICODE), may return undef if no alias was found
-sub encoding_alias($)
+sub encoding_alias($;$)
 {
     my $encoding = shift;
+    my $line_nr = shift;
     return $encoding if (!defined($encoding) or $encoding eq '');
     if ($Texi2HTML::Config::USE_UNICODE)
     {
          if (! Encode::resolve_alias($encoding))
          {
-              echo_warn("Encoding name unknown: $encoding");
+              echo_warn("Encoding name unknown: $encoding", $line_nr);
               return undef;
          }
          print STDERR "# Using encoding " . Encode::resolve_alias($encoding) . 
"\n"
@@ -2047,7 +2048,7 @@
          if (exists($Texi2HTML::Config::t2h_encoding_aliases{$encoding}))
          {
              $encoding = $Texi2HTML::Config::t2h_encoding_aliases{$encoding};
-             echo_warn ("Document encoding is utf8, but there is no unicode 
support") if ($encoding eq 'utf-8');
+             warn "$WARN Document encoding is utf8, but there is no unicode 
support\n" if ($encoding eq 'utf-8');
              return $encoding;
          }
          echo_warn("Encoding certainly poorly supported");
@@ -4006,6 +4007,7 @@
 # initial state for the special regions.
 my %region_initial_state;
 my %region_lines;
+my %region_line_nrs;
 
 # This is a place for index entries, anchors and so on appearing in 
 # copying or documentdescription
@@ -4222,6 +4224,7 @@
                             $node_ref->{'automatic_directions'} = 
$auto_directions;
                             $node_ref->{'place'} = [];
                             $node_ref->{'current_place'} = [];
+                            $node_ref->{'line_nr'} = $line_nr;
                             merge_element_before_anything($node_ref);
                             $node_ref->{'index_names'} = [];
                             $state->{'place'} = $node_ref->{'current_place'};
@@ -4287,6 +4290,7 @@
                         $section_ref->{'current_place'} = [];
                         $section_ref->{'place'} = [];
                         $section_ref->{'section'} = 1;
+                        $section_ref->{'line_nr'} = $line_nr;
 
                         if ($tag eq 'top')
                         {
@@ -4355,13 +4359,13 @@
                 elsif ($cline =~ /address@hidden/)
                 {
                     @added_lines = @{$region_lines{'copying'}};
-                    @added_numbers = ();
-                    my $copying_line_nr = 0;
-                    foreach my $line_added (@added_lines)
-                    {
-                       $copying_line_nr++;
-                       push @added_numbers, { 'file_name' => '', 'macro' => 
'copying', 'line_nr' => $copying_line_nr };
-                    }
+                    @added_numbers = @{$region_line_nrs{'copying'}};
+                    #my $copying_line_nr = 0;
+                    #foreach my $line_added (@added_lines)
+                    #{
+                    #   $copying_line_nr++;
+                    #   push @added_numbers, { 'file_name' => '', 'macro' => 
'copying', 'line_nr' => $copying_line_nr };
+                    #}
                     unshift (@$texi_lines, @added_lines);
                     unshift (@$lines_numbers, @added_numbers);
                     next;
@@ -4370,7 +4374,8 @@
                 {
                     push 
@{$region_lines{$state->{'region_lines'}->{'format'}}}, @added_lines;
                     if 
($Texi2HTML::Config::region_formats_kept{$state->{'region_lines'}->{'format'}})
-                    {
+                    { # the region is kept in the document in addition with
+                      # being put in the appropriate region_lines entry.
                         push @doc_lines, @added_lines;
                         push @doc_numbers, @added_numbers;
                     }
@@ -4383,10 +4388,17 @@
                 next;
             }
         }
-        if (scan_structure ($cline, \$text, address@hidden, $state, $line_nr) 
and (!exists($state->{'region_lines'}) or 
$Texi2HTML::Config::region_formats_kept{$state->{'region_lines'}->{'format'}}))
+        if (scan_structure ($cline, \$text, address@hidden, $state, $line_nr))
+        {
+            if (!exists($state->{'region_lines'}) or 
$Texi2HTML::Config::region_formats_kept{$state->{'region_lines'}->{'format'}})
         {
             push (@doc_numbers, $line_nr);
         }
+            if (exists($state->{'region_lines'}))
+            {
+                 push 
@{$region_line_nrs{$state->{'region_lines'}->{'format'}}}, $line_nr unless 
($state->{'region_lines'}->{'first_line'});
+            }
+        }
         next if (scalar(@stack) or $state->{'in_deff_line'});
         $cline = $text;
         $text = '';
@@ -4421,7 +4433,8 @@
             }
         }
     }
-    echo_warn ("At end of document, $state->{'region_lines'}->{'number'} 
$state->{'region_lines'}->{'format'} not closed") if 
(exists($state->{'region_lines'}));
+    #echo_warn ("At end of document, $state->{'region_lines'}->{'number'} 
$state->{'region_lines'}->{'format'} not closed") if 
(exists($state->{'region_lines'}));
+    echo_warn ("$state->{'region_lines'}->{'number'} 
address@hidden>{'region_lines'}->{'format'} not closed", $line_nr) if 
(exists($state->{'region_lines'}));
     print STDERR "# end of pass structure\n" if $T2H_VERBOSE;
     # To remove once they are handled
     #print STDERR "No node nor section, texi2html won't be able to place 
things rightly\n" if ($element_before_anything->{'place'} and 
@{$element_before_anything->{'place'}});
@@ -4660,7 +4673,7 @@
             my $from_encoding;
             if (!defined($Texi2HTML::Config::IN_ENCODING))
             {
-               $from_encoding = encoding_alias($encoding);
+               $from_encoding = encoding_alias($encoding, $line_nr);
                $Texi2HTML::THISDOC{'IN_ENCODING'} = $from_encoding
                  if (defined($from_encoding));
             }
@@ -5038,7 +5051,7 @@
                     }
                     else
                     { 
-                        add_prev($text, $stack, 
&$Texi2HTML::Config::raw('verbatiminclude', $verb_text));
+                        add_prev($text, $stack, 
&$Texi2HTML::Config::raw('verbatiminclude', $verb_text, $line_nr));
                     }
                     close VERBINCLUDE;
                 }
@@ -5201,7 +5214,7 @@
                         $node_seen = $other_node;
                         last if ($nodes{$other_node}->{'seen'})
                     }
-                    echo_error("Node equivalent with `$node->{'texi'}' already 
used `$node_seen'");
+                    warn "$ERROR Node equivalent with `$node->{'texi'}' 
already used `$node_seen'\n";
                     push @{$other_node_array}, $node->{'texi'};
                 }
                 else 
@@ -5676,7 +5689,7 @@
         { 
             if (defined($node->{$direction}) and 
!$node->{$node_directions{$direction}})
             {
-                echo_warn ("$direction `$node->{$direction}' for 
`$node->{'texi'}' not found");
+                echo_warn ("$direction `$node->{$direction}' for 
`$node->{'texi'}' not found", $node->{'line_nr'});
                 my @equivalent_nodes = equivalent_nodes($node->{$direction});
                 my $node_seen;
                 foreach my $equivalent_node (@equivalent_nodes)
@@ -5689,7 +5702,7 @@
                 }
                 if (defined($node_seen))
                 {
-                    echo_warn (" ---> but equivalent node `$node_seen' found");
+                    warn "$WARN ---> but equivalent node `$node_seen' found\n";
                     $node->{$node_directions{$direction}} = $nodes{$node_seen};
                 }
             }
@@ -5818,8 +5831,8 @@
                 $next = get_node($section->{'sectionnext'});
                 if (defined($next) and $Texi2HTML::Config::SHOW_MENU)
                 {
-                    echo_warn ("No node following `$node->{'texi'}' in menu, 
but `$next->{'texi'}' follows in sectionning") if 
(!defined($node->{'menu_next'}));
-                    echo_warn ("Node following `$node->{'texi'}' in menu 
`$node->{'menu_next'}->{'texi'}' and in sectionning `$next->{'texi'}' differ") 
+                    warn "$WARN No node following `$node->{'texi'}' in menu, 
but `$next->{'texi'}' follows in sectionning\n" if 
(!defined($node->{'menu_next'}));
+                    warn "$WARN Node following `$node->{'texi'}' in menu 
`$node->{'menu_next'}->{'texi'}' and in sectionning `$next->{'texi'}' differ\n" 
                        if (defined($node->{'menu_next'}) and $next ne 
$node->{'menu_next'});
                 }
             }
@@ -6760,7 +6773,7 @@
     my $section = shift;
     #$section->{'name'} = substitute_line($section->{'texi'});
     my $texi = &$Texi2HTML::Config::heading_texi($section->{'tag'}, 
$section->{'texi'}, $section->{'number'});
-    $section->{'text'} = substitute_line($texi, "address@hidden>{'tag'}");
+    $section->{'text'} = substitute_line($texi, "address@hidden>{'tag'}", 
undef, $section->{'line_nr'});
     $section->{'text_nonumber'} = substitute_line($section->{'texi'}, 
"address@hidden>{'tag'}");
     # backward compatibility
     $section->{'name'} = $section->{'text_nonumber'};
@@ -6783,7 +6796,7 @@
     {
         my $texi = &$Texi2HTML::Config::heading_texi($nodes{$node}->{'tag'}, 
            $nodes{$node}->{'texi'}, undef);
-        $nodes{$node}->{'text'} = substitute_line ($texi, "address@hidden", 
{'code_style' => 1});
+        $nodes{$node}->{'text'} = substitute_line ($texi, "address@hidden", 
{'code_style' => 1}, $nodes{$node}->{'line_nr'});
         $nodes{$node}->{'text_nonumber'} = $nodes{$node}->{'text'};
         # backward compatibility -> maybe used to have the name without 
code_style ?
         $nodes{$node}->{'name'} = substitute_line($texi, "address@hidden");
@@ -6872,7 +6885,8 @@
            'target'   => $target,
            'command'  => $command,
            'hidden'   => $index_entry_hidden,
-           'region'   => $region
+           'region'   => $region,
+           'line_nr'  => $line_nr
     };
             
     print STDERR "# enter address@hidden ${prefix}index($key) [$entry] with id 
$id ($index_entry)\n"
@@ -6940,7 +6954,7 @@
 
     unless (exists($index_names{$index_name}))
     {
-        echo_error ("Bad index name: $index_name", $line_nr) unless ($no_warn);
+        warn "$ERROR Bad index name: $index_name\n";
         return;
     }
     # add the index name itself to the index names searched for index
@@ -7495,7 +7509,12 @@
                 next unless (exists($Texi2HTML::Config::misc_command{$tag}) 
and $Texi2HTML::Config::misc_command{$tag}->{'keep'});
             }
         }
+        push @{$state{'keep_line_nr'}}, $line_nr if ($state{'keep_texi'});
+
         scan_line($cline, \$text, address@hidden, \%state, $line_nr);
+
+        # this means that a command that keep text was opened
+        push @{$state{'keep_line_nr'}}, $line_nr if ($state{'keep_texi'} and 
(!defined($state{'keep_line_nr'}) or !(@{$state{'keep_line_nr'}})));
        #print STDERR "after scan_line: $cline";
        #dump_stack(\$text, address@hidden, \%state);
         next if (@stack);
@@ -7936,6 +7955,8 @@
     my $text = shift;
     chomp ($text);
     my $line_number = shift;
+#    warn "$WARN $text " . format_line_number($line_number) . "\n";
+    return if (!defined($line_number));
     warn "$WARN $text " . format_line_number($line_number) . "\n";
 }
 
@@ -7945,7 +7966,10 @@
     my $text = shift;
     chomp ($text);
     my $line_number = shift;
+    if (defined($line_number))
+    {
     warn "$ERROR $text " . format_line_number($line_number) . "\n";
+    }
     $error_nrs ++;
     die "Max error number exceeded\n" if ($error_nrs >= 
$Texi2HTML::Config::ERROR_LIMIT);
 }
@@ -8558,10 +8582,11 @@
 # are duplicated and global stuff is changed.
 # -> identify what is global
 # -> use local state
-sub do_special_region_lines($;$)
+sub do_special_region_lines($;$$)
 {
     my $region = shift;
     my $state = shift;
+    my $line_nr = shift;
 
     # this case covers something like
     # @copying
@@ -8569,7 +8594,7 @@
     # @end copying
     if (defined($state) and exists($state->{'region'}) and ($region eq 
$state->{'region'}))
     {
-         echo_error("Recursively expanding region $region in 
$state->{'region'}");
+         echo_error("Recursively expanding region $region in 
$state->{'region'}", $line_nr);
          return ('','', '');
          
     }
@@ -8600,7 +8625,7 @@
     }
     
&$Texi2HTML::Config::begin_special_region($region,$new_state,$region_lines{$region})
       if (defined($Texi2HTML::Config::begin_special_region));
-    my $text = substitute_text($new_state, undef, @{$region_lines{$region}});
+    my $text = substitute_text($new_state, [ @{$region_line_nrs{$region}} ], 
@{$region_lines{$region}});
     $text = &$Texi2HTML::Config::end_special_region($region,$new_state,$text)
       if (defined($Texi2HTML::Config::end_special_region));
 
@@ -8639,10 +8664,11 @@
     return ($text, $removed_texi, $simple_format);
 }
 
-sub do_insertcopying($)
+sub do_insertcopying($$)
 {
     my $state = shift;
-    my ($text, $comment, $simple_formatted) = 
do_special_region_lines('copying', $state);
+    my $line_nr = shift;
+    my ($text, $comment, $simple_formatted) = 
do_special_region_lines('copying', $state, $line_nr);
     return &$Texi2HTML::Config::insertcopying($text, $comment, 
$simple_formatted);
 }
 
@@ -8986,9 +9012,10 @@
         my $caption_state = duplicate_formatting_state($state);
         push @{$caption_state->{'command_stack'}}, 'caption';
         $caption_text = substitute_text($caption_state, undef, 
@$caption_lines) if (defined($caption_lines));
+
         my $shortcaption_state = duplicate_formatting_state($state);
         push @{$shortcaption_state->{'command_stack'}}, 'shortcaption';
-        $shortcaption_text = substitute_text($shortcaption_state,undef, 
@$shortcaption_lines) if (defined($shortcaption_lines));
+        $shortcaption_text = substitute_text($shortcaption_state, undef, 
@$shortcaption_lines) if (defined($shortcaption_lines));
         add_prev($text, $stack, 
&$Texi2HTML::Config::float($format_ref->{'text'}, $state->{'float'}, 
$caption_text, $shortcaption_text));
         delete $state->{'float'};
     }
@@ -9611,7 +9638,7 @@
             }
             if (defined($node_seen))
             {
-                echo_warn (" ---> but equivalent node `$node_seen' found");
+                warn " ---> but equivalent node `$node_seen' found\n";
                 $element = $nodes{$node_seen};
             }
         }
@@ -9907,7 +9934,7 @@
               $text .= $line
          }
          $text =~ s/ $//;
-         $explanation_simple_format = simple_format($state, undef, $text);
+         $explanation_simple_format = simple_format($state, [ $line_nr ], 
$text);
          $explanation_text = substitute_line($text, "address@hidden 
explanation", duplicate_formatting_state($state), $line_nr);
     }
     return &$Texi2HTML::Config::acronym_like($command, $acronym_texi, 
substitute_line($acronym_texi, "address@hidden", 
duplicate_formatting_state($state), $line_nr), 
@@ -9932,8 +9959,9 @@
     my $float = $state->{'float'};
     my @texi_lines = map {$_ = $_."\n"} split (/\n/, $text_texi);
     $float->{"${command}_texi"} = address@hidden;
+    $float->{"${command}_keep_line_nr"} = [ @{$state->{'keep_line_nr'}} ];
     return  &$Texi2HTML::Config::caption_shortcaption_command($command, 
-       substitute_text(prepare_state_multiple_pass($command, $state) , undef, 
@texi_lines), address@hidden, $float);
+       substitute_text(prepare_state_multiple_pass($command, $state), 
$state->{'keep_line_nr'}, @texi_lines), address@hidden, $float);
 }
 
 # function called when a @float is encountered. Don't do any output
@@ -9999,7 +10027,7 @@
     return '';
 }
 
-sub do_footnote($$$$)
+sub do_footnote($$$$$$)
 {
     my $command = shift;
     my $args = shift;
@@ -10060,7 +10088,7 @@
     $foot_state->{'footnote_document_state'} = $doc_state;
     
     # FIXME use split_lines ? It seems to work like it is now ?
-    my @lines = substitute_text($foot_state, undef, map {$_ = $_."\n"} split 
(/\n/, $text));
+    my @lines = substitute_text($foot_state, $doc_state->{'keep_line_nr'}, map 
{$_ = $_."\n"} split (/\n/, $text));
     my ($foot_lines, $foot_label) = 
&$Texi2HTML::Config::foot_line_and_ref($$foot_num,
          $$relative_foot_num, $footid, $docid, $from_file, 
$foot_state->{'element'}->{'file'}, address@hidden, $doc_state);
     if ($doc_state->{'outside_document'} or ($doc_state->{'region'} and 
$doc_state->{'multiple_pass'} > 0))
@@ -10142,7 +10170,7 @@
         $state->{'preformatted'}, $file_name, $alt, $args[1], $args[2], 
         $args[3], $extension, $path_to_working_dir, $image_name, 
         $state->{'paragraph_context'}, address@hidden, $base_simple,
-        $extension_simple, $simple_file_name);
+        $extension_simple, $simple_file_name, $line_nr);
 }
 
 # usefull if we want to duplicate only the global state, nothing related with
@@ -10375,7 +10403,7 @@
 sub simple_format($$@)
 {
     my $state = shift;
-    my $line_nr = shift;
+    my $line_nrs = shift;
     if (!defined($state))
     {
         $state = {};
@@ -10389,7 +10417,7 @@
     $::simple_map_texi_ref = 
\%Texi2HTML::Config::simple_format_simple_map_texi;
     $::style_map_texi_ref = \%Texi2HTML::Config::simple_format_style_map_texi;
     $::texi_map_ref = \%Texi2HTML::Config::simple_format_texi_map;
-    my $text = substitute_text($state, $line_nr, @_);
+    my $text = substitute_text($state, $line_nrs, @_);
     $::simple_map_texi_ref = \%Texi2HTML::Config::simple_map_texi;
     $::style_map_texi_ref = \%Texi2HTML::Config::style_map_texi;
     $::texi_map_ref = \%Texi2HTML::Config::texi_map;
@@ -12078,7 +12106,7 @@
                     }
                     else
                     { 
-                        add_prev($text, $stack, 
&$Texi2HTML::Config::raw($style->{'style'}, $style->{'text'}));
+                        add_prev($text, $stack, 
&$Texi2HTML::Config::raw($style->{'style'}, $style->{'text'}, $line_nr));
                     }
                 }
                 if (!$state->{'keep_texi'} and !$state->{'remove_texi'})
@@ -12325,7 +12353,7 @@
                          foreach my $float (@{$floats{$style_id}->{'floats'}})
                          {
                               my $float_style = 
substitute_line(&$Texi2HTML::Config::listoffloats_float_style($arg, $float), 
"address@hidden address@hidden type");
-                              my $caption_lines = 
&$Texi2HTML::Config::listoffloats_caption($float);
+                              my ($caption_lines, $caption_or_shortcaption) = 
&$Texi2HTML::Config::listoffloats_caption($float);
                               # we set 'multiple_pass', 'region' and 
                               # 'region_pass'such that index entries
                               # and anchors are not handled one more time;
@@ -12587,7 +12615,7 @@
             if ($macro eq 'insertcopying')
             {
                 #close_paragraph($text, $stack, $state, $line_nr);
-                add_prev($text, $stack, do_insertcopying($state));
+                add_prev($text, $stack, do_insertcopying($state, $line_nr));
                 # reopen a preformatted format if it was interrupted by the 
macro
                 begin_paragraph ($stack, $state) if ($state->{'preformatted'});
                 return;
@@ -13338,6 +13366,7 @@
             if (defined($style))
             {                           # known style
                 $result = &$Texi2HTML::Config::style($style, $macro, $text, 
$args, $no_close, $no_open, $line_nr, $state, $state->{'command_stack'});
+                @{$state->{'keep_line_nr'}} = ();
             }
             if (!$no_close)
             { 
@@ -14010,17 +14039,18 @@
     print STDERR "BUG: substitute line with main state\n" if 
(($state->{'inside_document'} or $state->{'outside_document'}) and 
!$state->{'duplicated'});
     push @{$state->{'no_paragraph_stack'}}, $context_string;
     # this is usefull when called from &$I, and also for image files 
-    return simple_format($state, $line_nr, $line) if 
($state->{'simple_format'});
-    return substitute_text($state, $line_nr, $line);
+    return simple_format($state, [ $line_nr ], $line) if 
($state->{'simple_format'});
+    return substitute_text($state, [ $line_nr ], $line);
 }
 
 sub substitute_text($$@)
 {
     my $state = shift;
-    my $line_nr = shift;
+    my $line_nrs = shift;
     my @stack = ();
     my $text = '';
     my $result = '';
+    my $line_nr;
     if ($state->{'structure'})
     {
         initialise_state_structure($state);
@@ -14041,6 +14071,10 @@
     while (@_ or @{$state->{'spool'}} or $state->{'in_deff_line'})
     {
         my $line;
+        if ($line_nrs)
+        {
+             $line_nr = shift @{$line_nrs};
+        }
         if (@{$state->{'spool'}})
         {
              $line = shift @{$state->{'spool'}};
@@ -14049,6 +14083,7 @@
         {
             $line = shift @_;
         }
+        # print STDERR "SUBSTITUTE_TEXT ".format_line_number($line_nr) 
."$line" if ($line_nr);
         if ($state->{'in_deff_line'})
         {
             if (defined($line))
@@ -14232,7 +14267,7 @@
         if ($T2H_DEBUG & $DEBUG_INDEX);
     # =========== end debug
     #return (undef,'','') if ($state->{'region'});
-    my $formatted_entry = substitute_line($entry->{'entry'}, "address@hidden", 
prepare_state_multiple_pass("${command}_index", $state));
+    my $formatted_entry = substitute_line($entry->{'entry'}, "address@hidden", 
prepare_state_multiple_pass("${command}_index", $state),$entry->{'line_nr'});
     my $formatted_entry_reference = substitute_line($entry->{'texi'}, 
"address@hidden", prepare_state_multiple_pass("${command}_index", $state));
     return ($entry, $formatted_entry, &$Texi2HTML::Config::index_entry_label 
($entry->{'id'}, $state->{'preformatted'}, $formatted_entry, 
       $index_prefix_to_name{$entry->{'prefix'}},
@@ -14522,9 +14557,11 @@
       = collect_all_css_files();
 
    %region_lines = ();
+   %region_line_nrs = ();
    foreach my $region (@special_regions)
    {
       $region_lines{$region} = [];
+      $region_line_nrs{$region} = [];
    }
 
    texinfo_initialization(0);

Index: doc/texi2html.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texi2html.texi,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- doc/texi2html.texi  25 Apr 2009 14:54:42 -0000      1.83
+++ doc/texi2html.texi  27 Apr 2009 01:56:40 -0000      1.84
@@ -4086,10 +4086,13 @@
 main program.
 @end deftypefn
 
address@hidden {Function Reference} $caption_texi_returned listoffloats_caption 
\%float
address@hidden {Function Reference} (address@hidden, $caption_or_shortcaption) 
listoffloats_caption \%float
 @var{\%float} is the structure described 
 above. This function reference returns a caption to be formatted in the
-main program.
+main program, @address@hidden, and a string, 
address@hidden that is either @samp{caption} or 
address@hidden that can be used by the main program if this information
+is needed. 
 @end deftypefn
 
 Each entry is formatted by:

Index: examples/docbook.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/docbook.init,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- examples/docbook.init       25 Apr 2009 14:54:43 -0000      1.19
+++ examples/docbook.init       27 Apr 2009 01:56:40 -0000      1.20
@@ -938,7 +938,7 @@
 }
 
 
-sub docbook_image($$$$$$$$$$$$$$$$)
+sub docbook_image($$$$$$$$$$$$$$$$;$)
 {
     my $file = shift;
     my $base = shift;
@@ -956,6 +956,7 @@
     my $base_simple_format = shift;
     my $extension_simple_format = shift;
     my $file_name_simple_format = shift;
+    my $line_nr = shift;
 
 #    if (!defined($file_path) or $file_path eq '' or $file_path =~ /\.txt$/)
 #    {
@@ -1021,12 +1022,12 @@
        } 
        else
        {
-          main::echo_warn ("address@hidden file `$txt_path' unreadable: $!");
+          main::echo_warn ("address@hidden file `$txt_path' unreadable: $!", 
$line_nr);
        }
     }
     else
     {
-        main::echo_warn ("Cannot find address@hidden file `$base.txt'");
+        main::echo_warn ("Cannot find address@hidden file `$base.txt'", 
$line_nr);
     }
 
     return "$result$end";
@@ -1465,10 +1466,11 @@
     return $result;
 }
 
-sub docbook_raw($$)
+sub docbook_raw($$$)
 {
     my $style = shift;
     my $text = shift;
+    my $line_nr = shift;
 
     if ($style eq 'verbatim' or $style eq 'verbatiminclude')
     {
@@ -1482,7 +1484,7 @@
     }
     else
     {
-        main::echo_warn ("Raw style $style not handled");
+        main::echo_warn ("Raw style $style not handled", $line_nr);
         return &$protect_text($text);
     }
 }

Index: examples/info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/info.init,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- examples/info.init  26 Apr 2009 18:27:25 -0000      1.38
+++ examples/info.init  27 Apr 2009 01:56:40 -0000      1.39
@@ -649,7 +649,7 @@
    my $info_state = shift;
    my $result = '';
    print STDERR "Storing the stack\n";
-   print STDERR "" . Data::Dumper->Dump([$info_state->{'top'}]);
+#   print STDERR "" . Data::Dumper->Dump([$info_state->{'top'}]);
    my ($characters_count, $lines_count);
    ($characters_count, $result, $lines_count) = 
info_default_process_content($info_state->{'top'}, $info_state);
    $info_state->{'offset_in_file'} += $characters_count;
@@ -2029,11 +2029,11 @@
        close ($Texi2HTML::THISDOC{'FH'});
        unless (rename 
("$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'filename'}->{'top'}",
 
"$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'filename'}->{'top'}-1"))
        {
-           main::echo_warn("Rename 
$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'filename'}->{'top'}
 failed: $!\n");
+           warn "Rename 
$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'filename'}->{'top'}
 failed: $!\n";
        }
        unless (open (INDIRECT, 
">$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'filename'}->{'top'}"))
        {
-           main::echo_warn("Open 
$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'filename'}->{'top'}
 failed: $!\n");
+           warn "Open 
$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'filename'}->{'top'}
 failed: $!\n";
        }
        print INDIRECT "".info_default_header();
        print INDIRECT "\x{1F}\nIndirect:";
@@ -2374,7 +2374,7 @@
     return @files;
 }
 
-sub info_default_image($$$$$$$$$$$$$$$$)
+sub info_default_image($$$$$$$$$$$$$$$$$)
 {
     my $file = shift;
     my $base = shift;
@@ -2392,6 +2392,7 @@
     my $base_simple_format = shift;
     my $extension_simple_format = shift;
     my $file_name_simple_format = shift;
+    my $line_nr = shift;
 
     my $txt_path;
     my $found_file;
@@ -2446,12 +2447,12 @@
        }
        else
        {
-          main::echo_warn ("address@hidden file `$txt_path' unreadable: $!");
+          main::echo_warn ("address@hidden file `$txt_path' unreadable: $!", 
$line_nr);
        }
     }
     else
     {
-        main::echo_warn ("Cannot find address@hidden file `$base.txt'");
+        main::echo_warn ("Cannot find address@hidden file `$base.txt'", 
$line_nr);
     }
     if (defined($found_file) and (!defined($extension) or $file_found_index <= 
1))
     {

Index: test/coverage/res/comments/comments.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/coverage/res/comments/comments.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/coverage/res/comments/comments.2       20 Aug 2008 16:02:33 -0000      
1.2
+++ test/coverage/res/comments/comments.2       27 Apr 2009 01:56:41 -0000      
1.3
@@ -1,2 +1,2 @@
-** Encoding name unknown: bad 
+** Encoding name unknown: bad (l. 120)
 *** @clickstyle should only accept a macro as argument (l. 212)

Index: test/coverage/res/formatting/formatting.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res/formatting/formatting.2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/coverage/res/formatting/formatting.2   2 Apr 2009 09:13:54 -0000       
1.5
+++ test/coverage/res/formatting/formatting.2   27 Apr 2009 01:56:41 -0000      
1.6
@@ -34,166 +34,124 @@
 ** Empty index entry for @deffn (l. 42 in @mymacro)
 ** Empty index entry for @deffn (l. 42 in @mymacro)
 ** Empty index entry for @deffn (l. 42 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 28 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 28 in 
@mymacro)
+** TeX requires {} (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  and after (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 38 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 38 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 38 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 38 in 
@mymacro)
 ** TeX requires {} (l. 38 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 38 in @mymacro)
 ** bullet requires {} (l. 38 in @mymacro)
 *** '}' without opening '{' before:  (l. 38 in @mymacro)
@@ -211,19 +169,17 @@
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
+** no image file for f-ile, (using f-ile.jpg) (l. 42 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 42 
in @mymacro)
 *** @center should not appear in another format (l. 42 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 42 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 42 in 
@mymacro)
 ** TeX requires {} (l. 42 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 42 in @mymacro)
 ** bullet requires {} (l. 42 in @mymacro)
 *** '}' without opening '{' before:  (l. 42 in @mymacro)

Index: test/coverage/res/texi_comments/comments.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res/texi_comments/comments.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/coverage/res/texi_comments/comments.2  20 Aug 2008 16:02:33 -0000      
1.2
+++ test/coverage/res/texi_comments/comments.2  27 Apr 2009 01:56:41 -0000      
1.3
@@ -1,4 +1,4 @@
-** Encoding name unknown: bad 
+** Encoding name unknown: bad (l. 120)
 *** @clickstyle should only accept a macro as argument (l. 212)
-** Encoding name unknown: bad 
+** Encoding name unknown: bad (l. 120)
 *** @clickstyle should only accept a macro as argument (l. 212)

Index: 
test/encodings/res/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2

Index: test/encodings/res/formatting_converted_to_utf8/formatting.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/formatting_converted_to_utf8/formatting.2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/encodings/res/formatting_converted_to_utf8/formatting.2        2 Apr 
2009 09:13:57 -0000       1.5
+++ test/encodings/res/formatting_converted_to_utf8/formatting.2        27 Apr 
2009 01:56:41 -0000      1.6
@@ -34,166 +34,124 @@
 ** Empty index entry for @deffn (l. 42 in @mymacro)
 ** Empty index entry for @deffn (l. 42 in @mymacro)
 ** Empty index entry for @deffn (l. 42 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 28 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 28 in 
@mymacro)
+** TeX requires {} (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  and after (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 38 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 38 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 38 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 38 in 
@mymacro)
 ** TeX requires {} (l. 38 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 38 in @mymacro)
 ** bullet requires {} (l. 38 in @mymacro)
 *** '}' without opening '{' before:  (l. 38 in @mymacro)
@@ -211,19 +169,17 @@
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
+** no image file for f-ile, (using f-ile.jpg) (l. 42 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 42 
in @mymacro)
 *** @center should not appear in another format (l. 42 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 42 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 42 in 
@mymacro)
 ** TeX requires {} (l. 42 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 42 in @mymacro)
 ** bullet requires {} (l. 42 in @mymacro)
 *** '}' without opening '{' before:  (l. 42 in @mymacro)

Index: test/encodings/res/formatting_fr/formatting.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/formatting_fr/formatting.2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/encodings/res/formatting_fr/formatting.2       2 Apr 2009 09:13:57 
-0000       1.5
+++ test/encodings/res/formatting_fr/formatting.2       27 Apr 2009 01:56:41 
-0000      1.6
@@ -34,166 +34,124 @@
 ** Empty index entry for @deffn (l. 42 in @mymacro)
 ** Empty index entry for @deffn (l. 42 in @mymacro)
 ** Empty index entry for @deffn (l. 42 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 28 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 28 in 
@mymacro)
+** TeX requires {} (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  and after (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 38 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 38 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 38 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 38 in 
@mymacro)
 ** TeX requires {} (l. 38 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 38 in @mymacro)
 ** bullet requires {} (l. 38 in @mymacro)
 *** '}' without opening '{' before:  (l. 38 in @mymacro)
@@ -211,19 +169,17 @@
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
+** no image file for f-ile, (using f-ile.jpg) (l. 42 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 42 
in @mymacro)
 *** @center should not appear in another format (l. 42 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 42 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 42 in 
@mymacro)
 ** TeX requires {} (l. 42 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 42 in @mymacro)
 ** bullet requires {} (l. 42 in @mymacro)
 *** '}' without opening '{' before:  (l. 42 in @mymacro)

Index: test/encodings/res/formatting_fr_icons/formatting.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/formatting_fr_icons/formatting.2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/encodings/res/formatting_fr_icons/formatting.2 2 Apr 2009 09:13:57 
-0000       1.5
+++ test/encodings/res/formatting_fr_icons/formatting.2 27 Apr 2009 01:56:42 
-0000      1.6
@@ -34,166 +34,124 @@
 ** Empty index entry for @deffn (l. 42 in @mymacro)
 ** Empty index entry for @deffn (l. 42 in @mymacro)
 ** Empty index entry for @deffn (l. 42 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 28 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 28 in 
@mymacro)
+** TeX requires {} (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  and after (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 38 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 38 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 38 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 38 in 
@mymacro)
 ** TeX requires {} (l. 38 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 38 in @mymacro)
 ** bullet requires {} (l. 38 in @mymacro)
 *** '}' without opening '{' before:  (l. 38 in @mymacro)
@@ -211,19 +169,17 @@
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
+** no image file for f-ile, (using f-ile.jpg) (l. 42 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 42 
in @mymacro)
 *** @center should not appear in another format (l. 42 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 42 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 42 in 
@mymacro)
 ** TeX requires {} (l. 42 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 42 in @mymacro)
 ** bullet requires {} (l. 42 in @mymacro)
 *** '}' without opening '{' before:  (l. 42 in @mymacro)

Index: test/encodings/res/nodetest/nodetest.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/encodings/res/nodetest/nodetest.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3

Index: test/encodings/res/nodetest_chapter/nodetest.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_chapter/nodetest.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3

Index: test/encodings/res/nodetest_latin1/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1/nodetest_latin1.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2

Index: test/encodings/res/nodetest_latin1_no_unicode/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_no_unicode/nodetest_latin1.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3

Index: test/encodings/res/nodetest_latin1_use_nodes/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes/nodetest_latin1.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2

Index: test/encodings/res/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2

Index: test/encodings/res/nodetest_no_unicode/nodetest.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_no_unicode/nodetest.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3

Index: test/encodings/res/nodetest_to_utf8_latin1/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_to_utf8_latin1/nodetest_latin1.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2

Index: test/encodings/res/nodetest_use_nodes/nodetest.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes/nodetest.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3

Index: test/encodings/res/nodetest_use_nodes_no_unicode/nodetest.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/nodetest.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3

Index: test/encodings/res/nodetest_use_nodes_no_unidecode/nodetest.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/nodetest.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3

Index: test/encodings/res/nodetest_utf8/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8/nodetest_utf8.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2

Index: test/encodings/res/nodetest_utf8_no_unicode/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_no_unicode/nodetest_utf8.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3

Index: test/encodings/res/nodetest_utf8_use_nodes/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes/nodetest_utf8.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2

Index: test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2

Index: test/formatting/res/def_cmds/def_cmds.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/res/def_cmds/def_cmds.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/formatting/res/def_cmds/def_cmds.2     16 Apr 2009 08:37:17 -0000      
1.4
+++ test/formatting/res/def_cmds/def_cmds.2     27 Apr 2009 01:56:44 -0000      
1.5
@@ -31,18 +31,12 @@
 ** Empty index entry for @deftypecv (l. 274)
 ** Empty index entry for @defop (l. 278)
 ** Empty index entry for @deftp (l. 282)
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** '{' without macro. Before:    more args 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-*** '}' without opening '{' before:  more args 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-*** '}' without opening '{' before:  more args 
+*** '}' without opening '{' before:  (l. 143 in @mymacro)
+*** '}' without opening '{' before:  (l. 143 in @mymacro)
+*** '{' without macro. Before:  (l. 143 in @mymacro)
+*** '{' without macro. Before:  and after (l. 143 in @mymacro)
+*** '{' without macro. Before:    more args (l. 143 in @mymacro)
+*** '}' without opening '{' before:  (l. 143 in @mymacro)
 *** '}' without opening '{' before:  (l. 146 in @mymacro)
 *** '}' without opening '{' before:  (l. 146 in @mymacro)
 *** '{' without macro. Before:  (l. 146 in @mymacro)

Index: test/formatting/res/formatting_docbook/formatting.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/formatting_docbook/formatting.2,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/formatting/res/formatting_docbook/formatting.2 2 Apr 2009 09:14:30 
-0000       1.7
+++ test/formatting/res/formatting_docbook/formatting.2 27 Apr 2009 01:56:44 
-0000      1.8
@@ -14,22 +14,22 @@
 ** Empty index entry for @deffn (l. 28 in @mymacro)
 ** Empty index entry for @deffn (l. 28 in @mymacro)
 ** Empty index entry for @deffn (l. 28 in @mymacro)
-** Empty index entry for @deffn (in  l. 352 in @copying)
-** Empty index entry for @deffn (in  l. 353 in @copying)
-** Empty index entry for @deffn (in  l. 354 in @copying)
-** Empty index entry for @deffn (in  l. 355 in @copying)
-** Empty index entry for @deffn (in  l. 356 in @copying)
-** Empty index entry for @deffn (in  l. 360 in @copying)
-** Empty index entry for @deffn (in  l. 363 in @copying)
-** Empty index entry for @deffn (in  l. 364 in @copying)
-** Empty index entry for @deffn (in  l. 352 in @copying)
-** Empty index entry for @deffn (in  l. 353 in @copying)
-** Empty index entry for @deffn (in  l. 354 in @copying)
-** Empty index entry for @deffn (in  l. 355 in @copying)
-** Empty index entry for @deffn (in  l. 356 in @copying)
-** Empty index entry for @deffn (in  l. 360 in @copying)
-** Empty index entry for @deffn (in  l. 363 in @copying)
-** Empty index entry for @deffn (in  l. 364 in @copying)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
 ** Empty index entry for @deffn (l. 38 in @mymacro)
 ** Empty index entry for @deffn (l. 38 in @mymacro)
 ** Empty index entry for @deffn (l. 38 in @mymacro)

Index: test/formatting/res/formatting_weird_quotes/formatting.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/formatting_weird_quotes/formatting.2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/formatting/res/formatting_weird_quotes/formatting.2    2 Apr 2009 
09:14:31 -0000       1.5
+++ test/formatting/res/formatting_weird_quotes/formatting.2    27 Apr 2009 
01:56:44 -0000      1.6
@@ -38,148 +38,148 @@
 ** no image file for address@hidden, (using address@hidden ext e--xt}) 
 ** no image file for f-ile, (using f-ile.jpg) 
 ** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) 
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} 
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
 *** '}' without opening '{' before:  
 *** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
 *** '}' without opening '{' before:  
 *** '}' without opening '{' before:  after 
 ** no image file for f-ile, (using f-ile.jpg) 
 ** no image file for address@hidden, (using address@hidden ext e--xt}) 
 ** no image file for f-ile, (using f-ile.jpg) 
 ** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
+** TeX requires {} (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) 
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+** bullet requires {} 
+** bullet requires {} (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  and after (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
 ** no image file for f-ile, (using f-ile.jpg) 
 ** no image file for address@hidden, (using address@hidden ext e--xt}) 
 ** no image file for f-ile, (using f-ile.jpg) 
 ** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) 
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} 
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** '}' without opening '{' before:  
+*** '}' without opening '{' before:  after 
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
 *** '}' without opening '{' before:  
 *** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
+** TeX requires {} (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
 *** '}' without opening '{' before:  
 *** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
+** TeX requires {} (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
 *** '}' without opening '{' before:  
 *** '}' without opening '{' before:  after 
 ** no image file for f-ile, (using f-ile.jpg) 
 ** no image file for address@hidden, (using address@hidden ext e--xt}) 
 ** no image file for f-ile, (using f-ile.jpg) 
 ** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) 
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} 
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
 *** '}' without opening '{' before:  
 *** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
 *** '}' without opening '{' before:  
 *** '}' without opening '{' before:  after 
 ** no image file for f-ile, (using f-ile.jpg) 

Index: test/formatting/res/texi_images/images.passfirst
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/texi_images/images.passfirst,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/formatting/res/texi_images/images.passfirst    29 Aug 2008 15:05:59 
-0000      1.2
+++ test/formatting/res/texi_images/images.passfirst    27 Apr 2009 01:56:44 
-0000      1.3
@@ -26,22 +26,22 @@
 images.texi(,30) 
 images.texi(,31) 
 images.texi(,32) Insertcopying
-(copying,1) In copying.
-(copying,2) @image{f--ile}.
-(copying,3) 
-(copying,4) Text in copying.
-(copying,5) File with @@-commands and special characters:
-(copying,6) 
-(copying,7) @c cannot test a file with newline, since perl says
-(copying,8) @c Unsuccessful stat on filename containing newline at 
././../../texi2html.pl line 7375.
-(copying,9) @c with a noon reproducible path
-(copying,10) @c @image{f@@i--le@/address@hidden  address@hidden<"%@@@verb{:  < 
& @ % " :} ,,,,ext@@i--le@/address@hidden  address@hidden<"%@@@verb{:  < & @ % 
" :}}.
-(copying,11) @image{f@@i--le@/address@hidden  a@@<"%@@@verb{:  < & @ % " :} 
,,,,ext@@i--le@/address@hidden  a@@<"%@@@verb{:  < & @ % " :}}.
-(copying,12) 
-(copying,13) And also in alt, and with dimensions:
-(copying,14) 
-(copying,15) @c @image{f@@i--le@/address@hidden  address@hidden<"%@@@verb{:  < 
& @ % " :} ,1in, 1cm, alt @address@hidden@^{i}}--le@/address@hidden  
address@hidden<"%@@@verb{:  < & @ % " :}  ,ext@@i--le@/address@hidden  
address@hidden<"%@@@verb{:  < & @ % " :}}.
-(copying,16) @image{f@@i--le@/address@hidden  a@@<"%@@@verb{:  < & @ % " :} 
,1in, 1cm, alt @address@hidden@^{i}}--le@/address@hidden  
address@hidden<"%@@@verb{:  < & @ % " :}  ,ext@@i--le@/address@hidden  
a@@<"%@@@verb{:  < & @ % " :}}.
+images.texi(,21) In copying.
+images.texi(,22) @image{f--ile}.
+images.texi(,23) 
+images.texi(,24) Text in copying.
+images.texi(files_char,25) File with @@-commands and special characters:
+images.texi(files_char,25) 
+images.texi(files_char,25) @c cannot test a file with newline, since perl says
+images.texi(files_char,25) @c Unsuccessful stat on filename containing newline 
at ././../../texi2html.pl line 7375.
+images.texi(files_char,25) @c with a noon reproducible path
+images.texi(files_char,25) @c @image{f@@i--le@/address@hidden  
address@hidden<"%@@@verb{:  < & @ % " :} ,,,,ext@@i--le@/address@hidden  
address@hidden<"%@@@verb{:  < & @ % " :}}.
+images.texi(files_char,25) @image{f@@i--le@/address@hidden  a@@<"%@@@verb{:  < 
& @ % " :} ,,,,ext@@i--le@/address@hidden  a@@<"%@@@verb{:  < & @ % " :}}.
+images.texi(files_char,25) 
+images.texi(files_char,25) And also in alt, and with dimensions:
+images.texi(files_char,25) 
+images.texi(files_char,25) @c @image{f@@i--le@/address@hidden  
address@hidden<"%@@@verb{:  < & @ % " :} ,1in, 1cm, alt 
@address@hidden@^{i}}--le@/address@hidden  address@hidden<"%@@@verb{:  < & @ % 
" :}  ,ext@@i--le@/address@hidden  address@hidden<"%@@@verb{:  < & @ % " :}}.
+images.texi(files_char,25) @image{f@@i--le@/address@hidden  a@@<"%@@@verb{:  < 
& @ % " :} ,1in, 1cm, alt @address@hidden@^{i}}--le@/address@hidden  
address@hidden<"%@@@verb{:  < & @ % " :}  ,ext@@i--le@/address@hidden  
a@@<"%@@@verb{:  < & @ % " :}}.
 images.texi(,34) 
 images.texi(,35) In normal context
 images.texi(,36) @image{f--ile}.

Index: test/indices/res/index_no_node/index_no_node.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/indices/res/index_no_node/index_no_node.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2

Index: test/invalid/res/caption_not_closed/caption_not_closed.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/invalid/res/caption_not_closed/caption_not_closed.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/invalid/res/caption_not_closed/caption_not_closed.2    22 Aug 2008 
13:51:22 -0000      1.2
+++ test/invalid/res/caption_not_closed/caption_not_closed.2    27 Apr 2009 
01:56:45 -0000      1.3
@@ -1,6 +1,4 @@
 ** closing @-command caption (l. 21)
-*** @end float without corresponding opening 
-** Unknown float style Text 
+*** @end float without corresponding opening (l. 17)
+** Unknown float style Text (l. 19)
 *** closing `float' (l. 21)
-*** @end float without corresponding opening 
-** Unknown float style Text 

Index: test/invalid/res/copying_not_closed/copying_not_closed.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/invalid/res/copying_not_closed/copying_not_closed.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/invalid/res/copying_not_closed/copying_not_closed.2    18 Aug 2008 
18:03:50 -0000      1.1
+++ test/invalid/res/copying_not_closed/copying_not_closed.2    27 Apr 2009 
01:56:45 -0000      1.2
@@ -1 +1 @@
-** At end of document, 2 copying not closed 
+** 2 @copying not closed (l. 17)

Index: test/invalid/res/footnote_not_closed/footnote_not_closed.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/invalid/res/footnote_not_closed/footnote_not_closed.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/invalid/res/footnote_not_closed/footnote_not_closed.2  18 Aug 2008 
18:03:50 -0000      1.1
+++ test/invalid/res/footnote_not_closed/footnote_not_closed.2  27 Apr 2009 
01:56:45 -0000      1.2
@@ -1,3 +1,3 @@
 ** closing @-command footnote (l. 17)
 ** closing @-command footnote (l. 25)
-*** closing `quotation' 
+*** closing `quotation' (l. 23)

Index: test/invalid/res/recursive_copying/recursive_copying.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/invalid/res/recursive_copying/recursive_copying.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/invalid/res/recursive_copying/recursive_copying.2      18 Aug 2008 
18:03:54 -0000      1.1
+++ test/invalid/res/recursive_copying/recursive_copying.2      27 Apr 2009 
01:56:45 -0000      1.2
@@ -1,2 +1,2 @@
-*** Recursively expanding region copying in copying 
-*** Recursively expanding region copying in copying 
+*** Recursively expanding region copying in copying (l. 9)
+*** Recursively expanding region copying in copying (l. 9)

Index: test/invalid/res/tab_in_index/tab_in_index.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/invalid/res/tab_in_index/tab_in_index.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/invalid/res/tab_in_index/tab_in_index.2        2 Apr 2009 09:14:52 
-0000       1.1
+++ test/invalid/res/tab_in_index/tab_in_index.2        27 Apr 2009 01:56:45 
-0000      1.2
@@ -1,20 +1,6 @@
-** @tab should not appear in @vindex 
-** @tab outside of multitable 
-** @tab should not appear in @vindex 
-** @tab outside of multitable 
-*** '}' without opening '{' before:  
-** @tab should not appear in @vindex 
-** @tab outside of multitable 
-** @item should not appear in @vindex 
-** @item outside of table or list 
-** @item should not appear in @vindex 
-** @item outside of table or list 
-*** '}' without opening '{' before:  
-** @item should not appear in @vindex 
-** @item outside of table or list 
-** @item should not appear in @vindex index infos 
-** @item outside of table or list 
-*** '}' without opening '{' before:  
-** @tab should not appear in @vindex index infos 
-** @tab outside of multitable 
-*** '}' without opening '{' before:  
+** @tab should not appear in @vindex (l. 10)
+** @tab outside of multitable (l. 10)
+*** '}' without opening '{' before:  (l. 10)
+** @item should not appear in @vindex (l. 14)
+** @item outside of table or list (l. 14)
+*** '}' without opening '{' before:  (l. 14)

Index: test/invalid/res/texi_copying_not_closed/copying_not_closed.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/invalid/res/texi_copying_not_closed/copying_not_closed.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/invalid/res/texi_copying_not_closed/copying_not_closed.2       18 Aug 
2008 18:03:58 -0000      1.1
+++ test/invalid/res/texi_copying_not_closed/copying_not_closed.2       27 Apr 
2009 01:56:45 -0000      1.2
@@ -1,2 +1,2 @@
-** At end of document, 2 copying not closed 
-** At end of document, 2 copying not closed 
+** 2 @copying not closed (l. 17)
+** 2 @copying not closed (l. 17)

Index: test/invalid/res/texi_titlepage_not_closed/titlepage_not_closed.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/invalid/res/texi_titlepage_not_closed/titlepage_not_closed.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/invalid/res/texi_titlepage_not_closed/titlepage_not_closed.2   18 Aug 
2008 18:04:05 -0000      1.1
+++ test/invalid/res/texi_titlepage_not_closed/titlepage_not_closed.2   27 Apr 
2009 01:56:45 -0000      1.2
@@ -1,2 +1,2 @@
-** At end of document, 2 titlepage not closed 
-** At end of document, 2 titlepage not closed 
+** 2 @titlepage not closed (l. 16)
+** 2 @titlepage not closed (l. 16)

Index: test/invalid/res/titlepage_not_closed/titlepage_not_closed.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/invalid/res/titlepage_not_closed/titlepage_not_closed.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/invalid/res/titlepage_not_closed/titlepage_not_closed.2        18 Aug 
2008 18:04:06 -0000      1.1
+++ test/invalid/res/titlepage_not_closed/titlepage_not_closed.2        27 Apr 
2009 01:56:46 -0000      1.2
@@ -1 +1 @@
-** At end of document, 2 titlepage not closed 
+** 2 @titlepage not closed (l. 16)

Index: test/layout/res/formatting_chm/formatting.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/layout/res/formatting_chm/formatting.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/layout/res/formatting_chm/formatting.2 2 Apr 2009 09:14:58 -0000       
1.4
+++ test/layout/res/formatting_chm/formatting.2 27 Apr 2009 01:56:46 -0000      
1.5
@@ -34,166 +34,124 @@
 ** Empty index entry for @deffn (l. 42 in @mymacro)
 ** Empty index entry for @deffn (l. 42 in @mymacro)
 ** Empty index entry for @deffn (l. 42 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 28 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 28 in 
@mymacro)
+** TeX requires {} (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  and after (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 38 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 38 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 38 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 38 in 
@mymacro)
 ** TeX requires {} (l. 38 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 38 in @mymacro)
 ** bullet requires {} (l. 38 in @mymacro)
 *** '}' without opening '{' before:  (l. 38 in @mymacro)
@@ -211,19 +169,17 @@
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
+** no image file for f-ile, (using f-ile.jpg) (l. 42 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 42 
in @mymacro)
 *** @center should not appear in another format (l. 42 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 42 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 42 in 
@mymacro)
 ** TeX requires {} (l. 42 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 42 in @mymacro)
 ** bullet requires {} (l. 42 in @mymacro)
 *** '}' without opening '{' before:  (l. 42 in @mymacro)

Index: test/layout/res/formatting_exotic/formatting.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/layout/res/formatting_exotic/formatting.2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/layout/res/formatting_exotic/formatting.2      2 Apr 2009 09:14:59 
-0000       1.5
+++ test/layout/res/formatting_exotic/formatting.2      27 Apr 2009 01:56:46 
-0000      1.6
@@ -34,166 +34,124 @@
 ** Empty index entry for @deffn (l. 42 in @mymacro)
 ** Empty index entry for @deffn (l. 42 in @mymacro)
 ** Empty index entry for @deffn (l. 42 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 28 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 28 in 
@mymacro)
+** TeX requires {} (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  and after (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 38 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 38 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 38 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 38 in 
@mymacro)
 ** TeX requires {} (l. 38 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 38 in @mymacro)
 ** bullet requires {} (l. 38 in @mymacro)
 *** '}' without opening '{' before:  (l. 38 in @mymacro)
@@ -211,19 +169,17 @@
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
+** no image file for f-ile, (using f-ile.jpg) (l. 42 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 42 
in @mymacro)
 *** @center should not appear in another format (l. 42 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 42 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 42 in 
@mymacro)
 ** TeX requires {} (l. 42 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 42 in @mymacro)
 ** bullet requires {} (l. 42 in @mymacro)
 *** '}' without opening '{' before:  (l. 42 in @mymacro)

Index: test/layout/res/formatting_makeinfo/formatting.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/layout/res/formatting_makeinfo/formatting.2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/layout/res/formatting_makeinfo/formatting.2    2 Apr 2009 09:15:00 
-0000       1.5
+++ test/layout/res/formatting_makeinfo/formatting.2    27 Apr 2009 01:56:46 
-0000      1.6
@@ -34,214 +34,164 @@
 ** Empty index entry for @deffn (l. 42 in @mymacro)
 ** Empty index entry for @deffn (l. 42 in @mymacro)
 ** Empty index entry for @deffn (l. 42 in @mymacro)
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-*** Can't find simplest.texi, skipping 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-*** Can't find simplest.texi, skipping 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-*** Can't find simplest.texi, skipping 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-*** Can't find simplest.texi, skipping 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
+** no image file for f--ile, (using f--ile.jpg) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+*** Can't find simplest.texi, skipping (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 28 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 28 
in @mymacro)
+*** Can't find simplest.texi, skipping (l. 28 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 28 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 28 in 
@mymacro)
+** TeX requires {} (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  and after (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+*** Can't find simplest.texi, skipping (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+*** Can't find simplest.texi, skipping (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 38 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 38 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 38 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 38 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 38 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 38 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 38 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 38 
in @mymacro)
 *** Can't find simplest.texi, skipping (l. 38 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 38 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 38 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 38 in 
@mymacro)
 ** TeX requires {} (l. 38 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 38 in @mymacro)
 ** bullet requires {} (l. 38 in @mymacro)
 *** '}' without opening '{' before:  (l. 38 in @mymacro)
@@ -259,27 +209,25 @@
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
+** no image file for f--ile, (using f--ile.jpg) (l. 42 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 42 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 42 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 42 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 42 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 42 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 42 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 42 
in @mymacro)
 *** @center should not appear in another format (l. 42 in @mymacro)
 *** Can't find simplest.texi, skipping (l. 42 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 42 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 42 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 42 in 
@mymacro)
 ** TeX requires {} (l. 42 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 42 in @mymacro)
 ** bullet requires {} (l. 42 in @mymacro)
 *** '}' without opening '{' before:  (l. 42 in @mymacro)

Index: test/layout/res/formatting_regions/formatting_regions.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/layout/res/formatting_regions/formatting_regions.2,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/layout/res/formatting_regions/formatting_regions.2     2 Apr 2009 
09:15:00 -0000       1.6
+++ test/layout/res/formatting_regions/formatting_regions.2     27 Apr 2009 
01:56:46 -0000      1.7
@@ -42,261 +42,199 @@
 ** No node following `chapter' in menu, but `chapter2' follows in sectionning 
 ** `chapter2' doesn't appear in menus
 ** `Top' is up for `chapter2', but has no menu entry for this node
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-*** Can't find simplest.texi, skipping 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-*** Can't find simplest.texi, skipping 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-*** Can't find simplest.texi, skipping 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-*** Can't find simplest.texi, skipping 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-*** Can't find simplest.texi, skipping 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 28 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 28 
in @mymacro)
+*** Can't find simplest.texi, skipping (l. 28 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 28 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 28 in 
@mymacro)
+** TeX requires {} (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  and after (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 39 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 39 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 39 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 39 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 39 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 39 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 39 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 39 
in @mymacro)
+*** Can't find simplest.texi, skipping (l. 39 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 39 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 39 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 39 in 
@mymacro)
+** TeX requires {} (l. 39 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 39 in @mymacro)
+*** no file argument for @image (l. 39 in @mymacro)
+*** no file argument for @image (l. 39 in @mymacro)
+*** no file argument for @image (l. 39 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 39 in @mymacro)
+** bullet requires {} (l. 39 in @mymacro)
+** bullet requires {} (l. 39 in @mymacro)
+*** '}' without opening '{' before:  (l. 39 in @mymacro)
+*** '}' without opening '{' before:  (l. 39 in @mymacro)
+*** '{' without macro. Before:  (l. 39 in @mymacro)
+*** '{' without macro. Before:  and after (l. 39 in @mymacro)
+*** Undefined node `node' in @ref (l. 39 in @mymacro)
+*** Undefined node `' in @ref (l. 39 in @mymacro)
+*** Undefined node `' in @ref (l. 39 in @mymacro)
+*** Undefined node `node' in @ref (l. 39 in @mymacro)
+*** Undefined node `node' in @ref (l. 39 in @mymacro)
+*** Undefined node `node' in @ref (l. 39 in @mymacro)
+*** Undefined node `' in @ref (l. 39 in @mymacro)
+*** First argument to @inforef may not be empty (l. 39 in @mymacro)
+*** First argument to @inforef may not be empty (l. 39 in @mymacro)
+*** First argument to @inforef may not be empty (l. 39 in @mymacro)
+*** First argument to @inforef may not be empty (l. 39 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 28 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 28 
in @mymacro)
+*** Can't find simplest.texi, skipping (l. 28 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 28 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 28 in 
@mymacro)
+** TeX requires {} (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  and after (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 39 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 39 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 39 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 39 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 39 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 39 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 39 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 39 
in @mymacro)
+*** Can't find simplest.texi, skipping (l. 39 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 39 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 39 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 39 in 
@mymacro)
+** TeX requires {} (l. 39 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 39 in @mymacro)
+*** no file argument for @image (l. 39 in @mymacro)
+*** no file argument for @image (l. 39 in @mymacro)
+*** no file argument for @image (l. 39 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 39 in @mymacro)
+** bullet requires {} (l. 39 in @mymacro)
+** bullet requires {} (l. 39 in @mymacro)
+*** '}' without opening '{' before:  (l. 39 in @mymacro)
+*** '}' without opening '{' before:  (l. 39 in @mymacro)
+*** '{' without macro. Before:  (l. 39 in @mymacro)
+*** '{' without macro. Before:  and after (l. 39 in @mymacro)
+*** Undefined node `node' in @ref (l. 39 in @mymacro)
+*** Undefined node `' in @ref (l. 39 in @mymacro)
+*** Undefined node `' in @ref (l. 39 in @mymacro)
+*** Undefined node `node' in @ref (l. 39 in @mymacro)
+*** Undefined node `node' in @ref (l. 39 in @mymacro)
+*** Undefined node `node' in @ref (l. 39 in @mymacro)
+*** Undefined node `' in @ref (l. 39 in @mymacro)
+*** First argument to @inforef may not be empty (l. 39 in @mymacro)
+*** First argument to @inforef may not be empty (l. 39 in @mymacro)
+*** First argument to @inforef may not be empty (l. 39 in @mymacro)
+*** First argument to @inforef may not be empty (l. 39 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 28 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 28 
in @mymacro)
+*** Can't find simplest.texi, skipping (l. 28 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 28 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 28 in 
@mymacro)
+** TeX requires {} (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  and after (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 46 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 46 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 46 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 46 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 46 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 46 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 46 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 46 
in @mymacro)
 *** Can't find simplest.texi, skipping (l. 46 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 46 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 46 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 46 in 
@mymacro)
 ** TeX requires {} (l. 46 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 46 in @mymacro)
 *** no file argument for @image (l. 46 in @mymacro)
 *** no file argument for @image (l. 46 in @mymacro)
 *** no file argument for @image (l. 46 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 46 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 46 in @mymacro)
 ** bullet requires {} (l. 46 in @mymacro)
 *** '}' without opening '{' before:  (l. 46 in @mymacro)
@@ -314,27 +252,25 @@
 *** First argument to @inforef may not be empty (l. 46 in @mymacro)
 *** First argument to @inforef may not be empty (l. 46 in @mymacro)
 *** First argument to @inforef may not be empty (l. 46 in @mymacro)
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
+** no image file for f--ile, (using f--ile.jpg) (l. 49 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 49 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 49 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 49 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 49 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 49 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 49 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 49 
in @mymacro)
 *** @center should not appear in another format (l. 49 in @mymacro)
 *** Can't find simplest.texi, skipping (l. 49 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 49 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 49 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 49 in 
@mymacro)
 ** TeX requires {} (l. 49 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 49 in @mymacro)
 *** no file argument for @image (l. 49 in @mymacro)
 *** no file argument for @image (l. 49 in @mymacro)
 *** no file argument for @image (l. 49 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 49 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 49 in @mymacro)
 ** bullet requires {} (l. 49 in @mymacro)
 *** '}' without opening '{' before:  (l. 49 in @mymacro)
@@ -352,50 +288,38 @@
 *** First argument to @inforef may not be empty (l. 49 in @mymacro)
 *** First argument to @inforef may not be empty (l. 49 in @mymacro)
 *** First argument to @inforef may not be empty (l. 49 in @mymacro)
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-*** Can't find simplest.texi, skipping 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for f--ile, (using f--ile.e--xt) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-*** Can't find simplest.texi, skipping 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 28 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 28 
in @mymacro)
+*** Can't find simplest.texi, skipping (l. 28 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for f--ile, (using f--ile.e--xt) (l. 28 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 28 in 
@mymacro)
+** TeX requires {} (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  and after (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)

Index: test/many_input_files/tex_l2h_res/tex_l2h.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/many_input_files/tex_l2h_res/tex_l2h.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/many_input_files/tex_l2h_res/tex_l2h.2 16 Dec 2008 11:18:45 -0000      
1.3
+++ test/many_input_files/tex_l2h_res/tex_l2h.2 27 Apr 2009 01:56:46 -0000      
1.4
@@ -1,4 +1,4 @@
 texexpand 
-** no image file for heavyside, (using heavyside.jpg) 
+** no image file for heavyside, (using heavyside.jpg) (l. 1903)
 texexpand 
 ** Unknown command address@hidden' (left as is) (l. 42)

Index: test/many_input_files/tex_t4ht_res/tex_t4ht.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/many_input_files/tex_t4ht_res/tex_t4ht.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/many_input_files/tex_t4ht_res/tex_t4ht.2       2 Nov 2008 00:49:21 
-0000       1.2
+++ test/many_input_files/tex_t4ht_res/tex_t4ht.2       27 Apr 2009 01:56:46 
-0000      1.3
@@ -1,2 +1,2 @@
-dvipng warning: DVI magnification of 1000 over-ridden by user (1400) dvipng 
warning: DVI magnification of 1000 over-ridden by user (1400) dvipng warning: 
DVI magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) ** no image file for 
heavyside, (using heavyside.jpg) 
+dvipng warning: DVI magnification of 1000 over-ridden by user (1400) dvipng 
warning: DVI magnification of 1000 over-ridden by user (1400) dvipng warning: 
DVI magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) ** no image file for 
heavyside, (using heavyside.jpg) (l. 1903)
 dvipng warning: DVI magnification of 1000 over-ridden by user (1400) ** 
Unknown command address@hidden' (left as is) (l. 42)

Index: test/misc/res/formatting_html32/formatting.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/misc/res/formatting_html32/formatting.2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/misc/res/formatting_html32/formatting.2        2 Apr 2009 09:16:44 
-0000       1.5
+++ test/misc/res/formatting_html32/formatting.2        27 Apr 2009 01:56:47 
-0000      1.6
@@ -34,166 +34,124 @@
 ** Empty index entry for @deffn (l. 42 in @mymacro)
 ** Empty index entry for @deffn (l. 42 in @mymacro)
 ** Empty index entry for @deffn (l. 42 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** no file argument for @image 
-*** no file argument for @image 
-*** no file argument for @image 
-** Unknown command address@hidden' (left as is) 
-** Unknown command address@hidden' (left as is) 
-** bullet requires {} 
-** bullet requires {} 
-** bullet requires {} 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  
-*** '{' without macro. Before:  
-*** '{' without macro. Before:  and after 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `node' in @ref 
-*** Undefined node `' in @ref 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-*** First argument to @inforef may not be empty 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** TeX requires {} 
-** Unknown command address@hidden' (left as is) 
-*** '}' without opening '{' before:  
-*** '}' without opening '{' before:  after 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 28 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 28 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 28 in 
@mymacro)
+** TeX requires {} (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+*** no file argument for @image (l. 28 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+** bullet requires {} (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '}' without opening '{' before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  (l. 28 in @mymacro)
+*** '{' without macro. Before:  and after (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `node' in @ref (l. 28 in @mymacro)
+*** Undefined node `' in @ref (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+*** First argument to @inforef may not be empty (l. 28 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 18 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 18 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 18 in 
@mymacro)
+** TeX requires {} (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+*** no file argument for @image (l. 18 in @mymacro)
+** Unknown command address@hidden' (left as is) (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+** bullet requires {} (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '}' without opening '{' before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  (l. 18 in @mymacro)
+*** '{' without macro. Before:  and after (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `node' in @ref (l. 18 in @mymacro)
+*** Undefined node `' in @ref (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+*** First argument to @inforef may not be empty (l. 18 in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 38 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 38 
in @mymacro)
+** no image file for f-ile, (using f-ile.jpg) (l. 38 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 38 in 
@mymacro)
 ** TeX requires {} (l. 38 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
 *** no file argument for @image (l. 38 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 38 in @mymacro)
 ** bullet requires {} (l. 38 in @mymacro)
 *** '}' without opening '{' before:  (l. 38 in @mymacro)
@@ -211,19 +169,17 @@
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
 *** First argument to @inforef may not be empty (l. 38 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for address@hidden, (using address@hidden ext e--xt}) 
+** no image file for f-ile, (using f-ile.jpg) (l. 42 in @mymacro)
+** no image file for address@hidden, (using address@hidden ext e--xt}) (l. 42 
in @mymacro)
 *** @center should not appear in another format (l. 42 in @mymacro)
-** no image file for f-ile, (using f-ile.jpg) 
-** no image file for filejk _" %@, (using filejk _" address@hidden) 
+** no image file for f-ile, (using f-ile.jpg) (l. 42 in @mymacro)
+** no image file for filejk _" %@, (using filejk _" address@hidden) (l. 42 in 
@mymacro)
 ** TeX requires {} (l. 42 in @mymacro)
 ** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
 *** no file argument for @image (l. 42 in @mymacro)
-** Unknown command address@hidden' (left as is) 
 ** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
-** bullet requires {} 
 ** bullet requires {} (l. 42 in @mymacro)
 ** bullet requires {} (l. 42 in @mymacro)
 *** '}' without opening '{' before:  (l. 42 in @mymacro)

Index: test/misc/res/mini_ker_httex/mini_ker.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/misc/res/mini_ker_httex/mini_ker.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/misc/res/mini_ker_httex/mini_ker.2     2 Nov 2008 00:49:21 -0000       
1.2
+++ test/misc/res/mini_ker_httex/mini_ker.2     27 Apr 2009 01:56:47 -0000      
1.3
@@ -1 +1 @@
-dvipng warning: DVI magnification of 1000 over-ridden by user (1400) dvipng 
warning: DVI magnification of 1000 over-ridden by user (1400) dvipng warning: 
DVI magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) ** no image file for 
heavyside, (using heavyside.jpg) 
+dvipng warning: DVI magnification of 1000 over-ridden by user (1400) dvipng 
warning: DVI magnification of 1000 over-ridden by user (1400) dvipng warning: 
DVI magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) dvipng warning: DVI 
magnification of 1000 over-ridden by user (1400) ** no image file for 
heavyside, (using heavyside.jpg) (l. 1903)

Index: test/misc/res/mini_ker_l2h/mini_ker.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/misc/res/mini_ker_l2h/mini_ker.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/misc/res/mini_ker_l2h/mini_ker.2       16 Dec 2008 11:18:46 -0000      
1.3
+++ test/misc/res/mini_ker_l2h/mini_ker.2       27 Apr 2009 01:56:47 -0000      
1.4
@@ -1,2 +1,2 @@
 texexpand 
-** no image file for heavyside, (using heavyside.jpg) 
+** no image file for heavyside, (using heavyside.jpg) (l. 1903)

Index: test/misc/res/templates/templates.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/misc/res/templates/templates.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/misc/res/templates/templates.2 1 Nov 2008 18:28:18 -0000       1.1
+++ test/misc/res/templates/templates.2 27 Apr 2009 01:56:47 -0000      1.2
@@ -1,4 +1,4 @@
 ** `Related' doesn't appear in menus
 ** `Overview' is up for `Related', but has no menu entry for this node
 *** Undefined node `EExpansion' in @xref (l. 263)
-*** Undefined node `EExpansion' in @xref 
+*** Undefined node `EExpansion' in @xref (l. 266)

Index: test/sectionning/res/equivalent_nodes/equivalent_nodes.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/sectionning/res/equivalent_nodes/equivalent_nodes.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/sectionning/res/equivalent_nodes/equivalent_nodes.2    18 Aug 2008 
18:06:12 -0000      1.1
+++ test/sectionning/res/equivalent_nodes/equivalent_nodes.2    27 Apr 2009 
01:56:47 -0000      1.2
@@ -1,6 +1,6 @@
 *** Node equivalent with address@hidden' already used address@hidden' 
 *** Node equivalent with `node' already used address@hidden' 
-** node_next address@hidden' for `before top' not found 
+** node_next address@hidden' for `before top' not found (l. 5)
 **  ---> but equivalent node address@hidden' found 
 *** Unknown node in menu entry address@hidden' (l. 12)
-**  ---> but equivalent node address@hidden' found 
+ ---> but equivalent node address@hidden' found

Index: test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.2    25 Sep 
2008 11:02:22 -0000      1.2
+++ test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.2    27 Apr 
2009 01:56:47 -0000      1.3
@@ -1,6 +1,6 @@
 *** Node equivalent with address@hidden' already used address@hidden' 
 *** Node equivalent with `node' already used address@hidden' 
-** node_next address@hidden' for `before top' not found 
+** node_next address@hidden' for `before top' not found (l. 5)
 **  ---> but equivalent node address@hidden' found 
 *** Unknown node in menu entry address@hidden' (l. 12)
-**  ---> but equivalent node address@hidden' found 
+ ---> but equivalent node address@hidden' found

Index: test/sectionning/res/lower_subsub/lower_subsub.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/sectionning/res/lower_subsub/lower_subsub.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3

Index: test/sectionning/res/menutextorder/menutextorder.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/sectionning/res/menutextorder/menutextorder.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3

Index: test/sectionning/res/nodes_id_docbook/nodes_id.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/sectionning/res/nodes_id_docbook/nodes_id.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/sectionning/res/nodes_id_docbook/nodes_id.2    19 Aug 2008 14:52:19 
-0000      1.2
+++ test/sectionning/res/nodes_id_docbook/nodes_id.2    27 Apr 2009 01:56:48 
-0000      1.3
@@ -1,3 +1,3 @@
 i18n: missing string See section address@hidden'@asis{}' in @cite{%{book}}
 i18n: missing string See %{ref}
-** Cannot find @image file `image.txt' 
+** Cannot find @image file `image.txt' (l. 99)

Index: test/sectionning/res/nodes_test/nodes_test.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/sectionning/res/nodes_test/nodes_test.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/sectionning/res/nodes_test/nodes_test.2        18 Aug 2008 18:06:20 
-0000      1.1
+++ test/sectionning/res/nodes_test/nodes_test.2        27 Apr 2009 01:56:48 
-0000      1.2
@@ -1,5 +1,5 @@
 ** unnumbered without name (l. 32)
-** node_prev `nonexistant node in prev for @@top' for `lop' not found 
+** node_prev `nonexistant node in prev for @@top' for `lop' not found (l. 13)
 ** `node below node1' doesn't appear in menus
 ** `node1' is up for `node below node1', but has no menu entry for this node
 *** Unknown node in menu entry `node inexistant in menu' (l. 19)

Index: test/sectionning/res/semi_auto/semi_auto.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/sectionning/res/semi_auto/semi_auto.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2

Index: test/xemacs_manual/res/xemacs/xemacs.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/xemacs_manual/res/xemacs/xemacs.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3

Index: test/xemacs_manual/res/xemacs_frame/xemacs.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/xemacs_manual/res/xemacs_frame/xemacs.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3




reply via email to

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