[Texi2html-cvs] texi2html ChangeLog texi2html.init texi2html.pl...

texi2html-cvs
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog texi2html.init texi2html.pl...

From:	Patrice Dumas
Subject:	[Texi2html-cvs] texi2html ChangeLog texi2html.init texi2html.pl...
Date:	Thu, 01 Jan 2009 22:35:28 +0000
CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        09/01/01 22:35:27

Modified files:
        .              : ChangeLog texi2html.init texi2html.pl 
        examples       : info.init 
        test           : Makefile.am Makefile.in coverage_macro.texi 
        test/coverage/res/formatting: formatting.html 
        test/encodings/res/formatting_converted_to_utf8: formatting.html 
        test/encodings/res/formatting_fr: formatting.html 
        test/encodings/res/formatting_fr_icons: formatting.html 
        test/formatting: Makefile.am Makefile.in tests.txt 
        test/formatting/res/formatting_docbook: formatting.2 
                                                formatting.xml 
        test/formatting/res/formatting_weird_quotes: formatting.html 
        test/formatting/res/formatting_xml: formatting.xml 
        test/formatting/res/menus_xml: menus.xml 
        test/formatting/res/menus_xml_makeinfo: menus.xml 
        test/formatting/res/quotation: quotation.html 
        test/formatting/res/texi_formatting: formatting.2 
                                             formatting.passfirst 
                                             formatting.passtexi 
                                             formatting.texi 
        test/layout/res/formatting_chm: formatting.html 
        test/layout/res/formatting_exotic: formatting.html 
        test/layout/res/formatting_makeinfo: index.html 
        test/layout/res/formatting_regions: formatting_regions.html 
        test/misc/res/formatting_html32: formatting.html 
        test/nested_formats/res/nested_multitable: nested_formats.html 

Log message:
                * texi2html.init: remove space in front of @quotation argument.
                * texi2html.pl: add a key in duplicated state.
                Return the remaining line after a kept misc command.
                Go through normal_text for empty lines in preformatted.
                Open paragraph after unkown command.
                Call begin_format_texi after closing stuff.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.348&r2=1.349
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.172&r2=1.173
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.252&r2=1.253
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/info.init?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/Makefile.am?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/Makefile.in?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage_macro.texi?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/formatting/formatting.html?cvsroot=texi2html&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/formatting_converted_to_utf8/formatting.html?cvsroot=texi2html&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/formatting_fr/formatting.html?cvsroot=texi2html&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/formatting_fr_icons/formatting.html?cvsroot=texi2html&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/Makefile.am?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/Makefile.in?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/tests.txt?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_docbook/formatting.2?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_docbook/formatting.xml?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_weird_quotes/formatting.html?cvsroot=texi2html&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_xml/formatting.xml?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/menus_xml/menus.xml?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/menus_xml_makeinfo/menus.xml?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/quotation/quotation.html?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_formatting/formatting.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_formatting/formatting.passfirst?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_formatting/formatting.passtexi?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_formatting/formatting.texi?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting.html?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting.html?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/index.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_regions/formatting_regions.html?cvsroot=texi2html&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/formatting_html32/formatting.html?cvsroot=texi2html&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_multitable/nested_formats.html?cvsroot=texi2html&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -b -r1.348 -r1.349
--- ChangeLog   27 Dec 2008 20:53:24 -0000      1.348
+++ ChangeLog   1 Jan 2009 22:35:07 -0000       1.349
@@ -1,3 +1,12 @@
+2009-01-01  Patrice Dumas  <address@hidden>
+
+       * texi2html.init: remove space in front of @quotation argument.
+       * texi2html.pl: add a key in duplicated state.
+       Return the remaining line after a kept misc command.
+       Go through normal_text for empty lines in preformatted.
+       Open paragraph after unkown command.
+       Call begin_format_texi after closing stuff.
+
 2008-12-24  Patrice Dumas  <address@hidden>
 
        * texi2html.pl: add new hooks for user functions, for simple 

Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -b -r1.172 -r1.173
--- texi2html.init      27 Dec 2008 20:53:24 -0000      1.172
+++ texi2html.init      1 Jan 2009 22:35:10 -0000       1.173
@@ -12,7 +12,7 @@
 # Afterwards, load the file with command-line 
 # option -init-file <your_init_file>
 #
-# $Id: texi2html.init,v 1.172 2008/12/27 20:53:24 pertusus Exp $
+# $Id: texi2html.init,v 1.173 2009/01/01 22:35:10 pertusus Exp $
 
 ######################################################################
 # The following variables can also be set by command-line options
@@ -4431,6 +4431,7 @@
     my $skip_spec = '';
     my $arg_spec = '';
 
+#print STDERR "HHHHHHHHH $line $macro\n";
     $skip_spec = $misc_command{$macro}->{'skip'}
         if (defined($misc_command{$macro}->{'skip'}));
     $arg_spec = $misc_command{$macro}->{'arg'}
@@ -6399,6 +6400,7 @@
     my $command = shift;
     my $text = shift;
     return undef if (!defined($text) or $text =~ /^$/);
+    $text =~ s/^\s*//;
 # FIXME if there is a @ protecting the end of line the result is
 # @b{some text @:}
 # It is likely not to be what was intended

Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -b -r1.252 -r1.253
--- texi2html.pl        27 Dec 2008 20:53:24 -0000      1.252
+++ texi2html.pl        1 Jan 2009 22:35:11 -0000       1.253
@@ -74,7 +74,7 @@
 }
 
 # CVS version:
-# $Id: texi2html.pl,v 1.252 2008/12/27 20:53:24 pertusus Exp $
+# $Id: texi2html.pl,v 1.253 2009/01/01 22:35:11 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -4990,7 +4990,8 @@
     }
 
     ($remaining, $skipped, $args) = 
&$Texi2HTML::Config::preserve_misc_command($line, $macro);
-    return ($skipped) if ($keep);
+#print STDERR "ZZZZZZZZZZZ r $remaining ZZ a @$args ZZZZ s `$skipped'\n" if 
($keep);
+    return ($skipped.$remaining) if ($keep);
     return $remaining if ($remaining ne '');
     return undef;
 }
@@ -9103,9 +9104,6 @@
     my $line_nr = shift;
     #print STDERR "BEGIN FORMAT $macro".format_line_number($line_nr)."\n";
 
-    $line = &$Texi2HTML::Config::begin_format_texi($macro, $line, $state)
-        unless($fake_format{$macro});
-
 
     if ($format_type{$macro} eq 'menu')
     {
@@ -9130,6 +9128,10 @@
     {
         close_paragraph($text, $stack, $state, $line_nr);
     }
+
+    $line = &$Texi2HTML::Config::begin_format_texi($macro, $line, $state)
+        unless($fake_format{$macro});
+
     push (@{$state->{'command_stack'}}, $macro) unless ($fake_format{$macro});
     if ($region_lines{$macro})
     {
@@ -9859,6 +9861,7 @@
          #print STDERR "float: (no label) $state->{'float'}\n";
     }
     $state->{'float'}->{'style'} = 
substitute_line($state->{'float'}->{'style_texi'}, undef, $line_nr);
+#    $state->{'cmd_line'} = 0;
     return '';
 }
 
@@ -9882,6 +9885,7 @@
     my $quotation_args = { 'text' => $text, 'text_texi' => $text_texi };
     push @{$state->{'quotation_stack'}}, $quotation_args;
     $state->{'prepend_text'} = 
&$Texi2HTML::Config::quotation_prepend_text($command, $text_texi);
+#    $state->{'cmd_line'} = 0;
     return '';
 }
 
@@ -10040,7 +10044,8 @@
          'region' => $state->{'region'},
          'sec_num' => $state->{'sec_num'},
          'outside_document' => $state->{'outside_document'},
-         'inside_document' => $state->{'inside_document'}
+         'inside_document' => $state->{'inside_document'},
+         'duplicated' => 1
     };
     return $new_state;
 }
@@ -11788,7 +11793,7 @@
           # it is also possible to be in preformatted within a menu_description
             if ($cline =~ /^\s*$/)
             {
-                add_prev($text, $stack, $cline);
+                add_prev($text, $stack, do_text($cline,$state));
                 return;
             }
         }
@@ -12756,7 +12761,7 @@
 
 # add a special style on the top of the stack. This is used for commands
 # that extend until the end of the line. Also add an entry in the @-command
-# hashes for this fakes stlye.
+# hashes for this fakes style.
 sub open_cmd_line($$$$)
 {
     my $stack = shift;
@@ -12770,6 +12775,7 @@
          $hash->{'cmd_line'}->{'function'} = $function;
     }
     $state->{'no_paragraph'}++;
+#    $state->{'cmd_line'} = 1;
     open_arg ('cmd_line', 0, $state);
 }
 
@@ -13161,6 +13167,11 @@
     {
          add_prev ($text, $stack, $result_text) if (defined($result_text));
          echo_warn($message, $line_nr) if (defined($message));
+         # if $state->{'preformatted'}, assume that the preformatted is 
+         #Â already opened. Otherwise we may end up opening one each time
+         # there is an unknown command.
+         begin_paragraph_after_command($state, $stack, $macro, $result_line)
+              if (!$state->{'preformatted'});
          return $result_line;
     }
     elsif ($pass == 2)

Index: examples/info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/info.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- examples/info.init  29 Dec 2008 13:28:47 -0000      1.7
+++ examples/info.init  1 Jan 2009 22:35:13 -0000       1.8
@@ -39,6 +39,8 @@
 $SPLIT_INDEX = 0;
 $SEPARATED_FOOTNOTES = 0;
 $INLINE_CONTENTS = 1;
+$SIMPLE_MENU = 1;
+$MENU_SYMBOL = '*';
 
 $no_paragraph_commands{'anchor'} = 1;
 
@@ -49,6 +51,10 @@
 %things_map = %ascii_things_map;
 %pre_map = %things_map;
 
+$misc_command{'exdent'}->{'keep'} = 1;
+$misc_command{'noindent'}->{'keep'} = 1;
+$misc_command{'indent'}->{'keep'} = 1;
+
 # sc and var upcase.
 my @simple_quoted_commands = ('cite', 'code', 'command', 'env', 'file', 'kbd',
   'option', 'samp');
@@ -59,7 +65,7 @@
 
 foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents), 
keys(%accent_map))
 {
-     $style_map{$accent_command} = { 'function' => \&t2h_ascii_accent };
+     $style_map{$accent_command} = { 'function' => \&t2h_default_ascii_accent 
};
 }
 
 foreach my $command (keys(%style_map))
@@ -146,15 +152,20 @@
 
 $style = \&info_default_style;
 $print_page_head   = \&info_default_print_page_head;
+$toc_body = \&info_default_noop;
+$about_body = \&info_default_noop;
 $copying_comment   = \&info_default_copying_comment;
 $element_heading   = \&info_default_element_heading;
 $heading           = \&info_default_heading;
 $normal_text       = \&info_default_normal_text;
 $paragraph         = \&info_default_paragraph;
+$preformatted      = \&info_default_preformatted;
 $empty_line               = \&info_default_empty_line;
 # maybe should not be called from the main program?
 $print_page_foot       = \&info_default_print_page_foot;
+$print_Top_footer      = \&info_default_print_Top_footer;
 $print_section         = \&info_default_print_section;
+$end_section           = \&info_default_end_section;
 $one_section           = \&info_default_one_section;
 $begin_format_texi     = \&info_default_begin_format_texi;
 $begin_style_texi      = \&info_default_begin_style_texi;
@@ -163,7 +174,15 @@
 $thing_command         = \&info_default_thing_command;
 $begin_special_region  = \&info_default_begin_special_region;
 $anchor_label          = \&info_default_anchor_label;
+$menu_link             = \&info_default_menu_link;
+$complex_format        = \&info_default_complex_format;
+$quotation             = \&info_default_quotation;
+$unknown               = \&info_default_misc_commands;
 
+sub info_default_noop
+{
+    return '';
+}
 
 sub info_default_copying_comment($$$$)
 {
@@ -216,14 +235,21 @@
 
 my $info_default_max_column = 72;
 
-sub info_default_process_text($$$$)
+#Â Beware that there is a pending word if the text doesn't end with
+# a space
+sub info_default_process_text($$$$;$)
 {
    my $text = shift;
    my $line_char_counter = shift;
    my $pending_spaces = shift;
    my $pending_word = shift;
+   my $indent_text = shift;
+   $indent_text = '' if (!defined($indent_text));
    my $line_passed = 0;
    my $result = '';
+my $line_char_counter_text = 'undef';
+$line_char_counter_text = "$line_char_counter" if 
(defined($line_char_counter));
+print STDERR "process_text(indent `$indent_text') line_char_counter 
$line_char_counter_text `$text'\n";
    
    while ($text ne '')
    {
@@ -232,6 +258,10 @@
           my $new_spaces = $1;
           if (defined($pending_word))
           {
+             if ($line_char_counter == 0)
+             {
+                 $pending_spaces = $indent_text . $pending_spaces;
+             }
              $result .= $pending_spaces . $pending_word;
              $line_char_counter += 
length($pending_spaces)+length($pending_word);
              $pending_spaces = $new_spaces;
@@ -296,12 +326,18 @@
     }
 }
 
-sub info_default_store_pending($$$)
+sub info_default_store_pending($$$;$)
 {
    my $line_char_counter = shift;
    my $pending_spaces = shift;
    my $pending_word = shift;
+   my $indent_text = shift;
+   $indent_text = '' if (!defined($indent_text));
    
+   if (defined($line_char_counter) and $line_char_counter == 0)
+   {
+      $pending_spaces = $indent_text . $pending_spaces;
+   }
    my $result = $pending_spaces;
    $pending_spaces = '';
    if (defined($pending_word))
@@ -314,30 +350,52 @@
 }
 
 my $info_default_end_sentence_character = quotemeta('.');
+my $info_default_indent_length = 5;
+my $info_default_para_indent_length = 3;
+
+my %info_default_indented_commands = ( 'quotation' => 1 );
+foreach my $complex_command (keys (%{$complex_format_map}))
+{
+    $info_default_indented_commands{$complex_command} = 1;
+}
 
 sub info_default_process_content($$)
 {
-#Â FIXME currently always in a paragraph
    my $current_command = shift;
    my $base_offset = shift;
    my $length = 0;
    my $result = '';
 
    my $line_char_counter;
-   my $new_text;
    my $pending_spaces = '';
    my $pending_word;
-   my $line_passed;
+   my $preformatted = 0;
+   my $indent_level = 0;
+   my $exdent_line = 0;
+   my $line_beginning = 0;
+   my $indent_para;
+   my $noindent_para;
 
    my ($current, $index, $close) = ($current_command, 0, 0);
 
-   print STDERR "info_default_process_content: $current_command\n";
+   #print STDERR "info_default_process_content: $current_command\n";
    while(1)
    {
       last if (!defined($current));
       my $content = $current->{'content'}->[$index];
       my $text_added = '';
-      my $new_text = '';
+      my $line_passed = 0;
+
+my $line_char_counter_text = 'undef';
+$line_char_counter_text = "$line_char_counter" if 
(defined($line_char_counter));
+my $text_length = '';
+$text_length = $content->{'length'} if defined($content->{'length'});
+my $text_command = '';
+$text_command = $content->{'command'} if defined($content->{'command'});
+      print STDERR "($text_command|$text_length|$close) preformatted 
$preformatted, line_beginning $line_beginning, indent_level $indent_level 
exdent_line $exdent_line line_char_counter $line_char_counter_text\n";
+my $pending_word_text = 'undef';
+$pending_word_text = "`$pending_word'" if (defined($pending_word));
+print STDERR "         spaces: `$pending_spaces' word: $pending_word_text\n";
 
       if ($close)
       {
@@ -346,13 +404,37 @@
               $text_added = $content->{'end'};
           }
           #Â if ending a paragraph, go straight to the text addition 
-          #Â without processing of the end of lines
-          if (defined($content->{'command'}) and $content->{'command'} eq 
'paragraph')
+          #Â without processing of the end of lines. Same if ending a 
+          #Â quotation or an @example
+          if (defined($content->{'command'}))
+          {
+              if ($info_default_indented_commands{$content->{'command'}})
+              {
+                  $indent_level--;
+                  #Â don't do that for quotations, quotations already have
+                  #Â end of paragraph end of lines.
+                  if ($indent_level == 0 and 
$complex_format_map->{$content->{'command'}})
+                  {
+                     $text_added .= "\n";
+                  }
+                  #$line_beginning = 1;
+                  goto new_text;
+              }
+              if ($content->{'command'} eq 'paragraph')
           {
+                  $pending_spaces = '';
               $line_char_counter = undef;
-              $new_text = $content->{'end'};
+                  $indent_para = undef;
+                  $noindent_para = undef;
+                  $text_added = $content->{'end'};
               goto new_text;
           }
+              elsif ($content->{'command'} eq 'preformatted')
+              {
+                  $preformatted--;
+                  $line_beginning = 0;
+              }
+          }
       }
       else
       {
@@ -361,8 +443,8 @@
               if ($content->{'command'} eq 'anchor')
               {
                   my $pending;
-                  ($line_char_counter, $pending_spaces, $pending_word, 
$pending) = info_default_store_pending($line_char_counter, $pending_spaces, 
$pending_word);
-                  if (defined($line_char_counter) or $pending !~ /^\s*$/)
+                  ($line_char_counter, $pending_spaces, $pending_word, 
$pending) = info_default_store_pending($line_char_counter, $pending_spaces, 
$pending_word, ' ' x ($indent_level * $info_default_indent_length));
+                  if (defined($line_char_counter) or ($preformatted) or 
$pending !~ /^\s*$/)
                   {
                       $length += length($pending);
                       $result .= $pending;
@@ -370,16 +452,16 @@
                   $content->{'anchor_reference'}->{'info_offset'} = $length + 
$base_offset;
                   push @info_default_pending_tags, 
$content->{'anchor_reference'};
               }
-              elsif ($content->{'command'} eq '*')
+              elsif ($content->{'command'} eq '*' and !$preformatted)
               {
                  if (defined($pending_word))
                  {
-                    $new_text .= $pending_spaces . $pending_word;
+                    $text_added .= $pending_spaces . $pending_word;
                     $pending_word = undef;
                  }
                  $pending_spaces = '';
                  $line_char_counter = 0;
-                 $new_text .=  $content->{'text'};
+                 $text_added .=  $content->{'text'};
                  ($current, $index, $close) = 
info_default_skip_spaces($current, $index, $close);
                  # FIXME new line
                  goto new_text;
@@ -388,6 +470,30 @@
               {
                   ($current, $index, $close) = 
info_default_skip_spaces($current, $index, $close);
                   $line_char_counter = 0;
+                  $content->{'begin'} = ' ' x $info_default_para_indent_length 
if 
+                    (!($content->{'top_stack'} eq 'quotation') and 
($indent_para or (!$noindent_para and  $content->{'paragraph_in_element_nr'})));
+              }
+              elsif ($content->{'command'} eq 'preformatted')
+              {
+                  $preformatted++;
+                  $line_beginning = 1;
+                  $exdent_line = 0;
+              }
+              elsif ($content->{'command'} eq 'exdent' and $preformatted)
+              {
+                  $exdent_line = 1;
+              }
+              elsif ($content->{'command'} eq 'indent')
+              {
+                  $indent_para = 1;
+              }
+              elsif ($content->{'command'} eq 'noindent')
+              {
+                  $noindent_para = 1;
+              }
+              if ($info_default_indented_commands{$content->{'command'}})
+              {
+                  $indent_level++;
               }
           }
 
@@ -408,14 +514,37 @@
                           $content->{'text'} .= ' ';
                       }
                   }
+              } # ignore spaces outside of paragraphs and preformatted
+              $text_added .= $content->{'text'} unless 
(!defined($line_char_counter) and !$preformatted and $content->{'text'} =~ 
/^\s*$/);
+          }
               }
-              $text_added .= $content->{'text'} unless 
(!defined($line_char_counter) and $content->{'text'} =~ /^\s*$/);
+      if (!$preformatted)
+      {
+          ($line_char_counter, $pending_spaces, $pending_word, $line_passed, 
$text_added) = info_default_process_text($text_added, $line_char_counter, 
$pending_spaces, $pending_word, ' ' x ($indent_level * 
$info_default_indent_length)) if ($text_added ne '');
+      }
+      else
+      {
+print STDERR "text_added `$text_added' line_beginning $line_beginning\n";
+          if ($text_added ne '' and $line_beginning)
+          {
+              my $used_indent_level = $indent_level;
+              $used_indent_level-- if ($indent_level and $exdent_line);
+              $exdent_line = 0;
+print STDERR "                     indent_level $indent_level\n";
+              $text_added =  ' ' x ($used_indent_level * 
$info_default_indent_length) 
+                             .$text_added;
+              $line_beginning = 0;
           }
       }
-      ($line_char_counter, $pending_spaces, $pending_word, $line_passed, 
$new_text) = info_default_process_text($text_added, $line_char_counter, 
$pending_spaces, $pending_word);
     new_text:
-      $result .= $new_text;
-      $length += length($new_text);
+print STDERR "ADDING `$text_added'\n" if ($text_added ne '');
+      $result .= $text_added;
+      $length += length($text_added);
+      if ($preformatted)
+      {
+          my $chomped_text = $text_added;
+          $line_beginning = 1 if (chomp($chomped_text));
+      }
 
     iterate:
       ($current, $index, $close) = info_default_iterator_next($current, 
$index, $close);
@@ -443,7 +572,7 @@
 #     Data::Dumper->Dump([$info_default_top_stack]);
 }
 
-sub info_default_close_command($$$$$$$$)
+sub info_default_close_command($$$$$$$$;$)
 {
    my $command_stack = shift;
    my $command = shift;
@@ -453,6 +582,7 @@
    my $begin = shift;
    my $text = shift;
    my $end = shift;
+   my $additional_entries = shift;
 
    $no_open = 0 if (!defined($no_open));
    $no_close = 0 if (!defined($no_close));
@@ -469,6 +599,13 @@
    $info_default_current_command->{'begin'} = $begin;
    $info_default_current_command->{'text'} = $text;
    $info_default_current_command->{'end'} = $end;
+   if (defined($additional_entries))
+   {
+       foreach my $key (keys(%$additional_entries))
+       {
+           $info_default_current_command->{$key} = $additional_entries->{$key};
+       }
+   }
 
    $info_default_current_command = $info_default_current_command->{'parent'};
 
@@ -512,8 +649,8 @@
    my $command = shift;
 #   $state = $Texi2HTML::THISDOC{'state'} if (!defined($state));
    my $len = length($text);
-   return 0 if ((!$state->{'inside_document'} and 
!$state->{'outside_document'}));
-   return 1 if ($len == 0);
+   return 0 if ((!$state->{'inside_document'} and 
!$state->{'outside_document'}) or ($state->{'duplicated'} and 
$state->{'inside_document'}));
+   return 1 if ($len == 0 and !defined($command));
    print STDERR "Storing text($len) $text\n";
    my $text_stored = {'text' => $text, 'length' => $len};
    $text_stored->{'command'} = $command if (defined($command));
@@ -527,6 +664,7 @@
    my $line = shift;
    my $state = shift;
    info_default_open_command($state,$command, undef, undef, undef);
+   return $line;
 }
 
 sub info_default_begin_style_texi($$$$)
@@ -544,7 +682,7 @@
    my $command = shift;
    my $paragraph_macros = shift;
    my $paragraph_command = shift;
-   print STDERR "paragraph_command $paragraph_command\n";
+   print STDERR "begin_paragraph $command\n";
    my $state = shift;
    my $stack = shift;
    info_default_open_command($state,$command, undef, undef, undef);
@@ -579,7 +717,7 @@
 
     my $result = $things_map{$command};
     return info_default_close_command(undef, $command, undef, undef, $line_nr, 
$result, $text, '');
-    return $result . $text;
+#    return $result . $text;
 }
 
 
@@ -610,7 +748,7 @@
    {
       $end = $style->{'end'};
    }
-   unless($state->{'remove_texi'} or $special_style{$command})
+   unless($state->{'remove_texi'} or $special_style{$command} or ($command eq 
'cmd_line'))
    {
       return info_default_close_command($command_stack, $command, $no_close, 
$no_open, $line_nr, $begin, $text, $end);
    }
@@ -621,9 +759,16 @@
 {
     my $fh = shift;
     my $setfilename = $Texi2HTML::THISDOC{'setfilename'} if 
(defined($Texi2HTML::THISDOC{'setfilename'}));
-    $setfilename = $Texi2HTML::THISDOC{file_base_name}.$EXTENSION if 
(!defined($setfilename));
+    $setfilename = $Texi2HTML::THISDOC{'file_base_name'}.$EXTENSION if 
(!defined($setfilename));
     #my $result = "This is $setfilename, produced by 
$Texi2HTML::THISDOC{program} from $Texi2HTML::THISDOC{'input_file_name'}.\n\n";
-    my $result = "This is $setfilename, produced by makeinfo version 4.13 from 
$Texi2HTML::THISDOC{'input_file_name'}.\n\n";
+    #Â this is wrong, $Texi2HTML::THISDOC{'input_file_name'} should be used 
+    #Â directly, but then tests are not reproducible in out of source builds
+    my $basename = $Texi2HTML::THISDOC{'input_file_name'};
+    $basename =~ s/^.*\///;
+    my $result = "This is $setfilename, produced by makeinfo version 4.13 from 
$basename. ";
+    my $dummy;
+    ($dummy, $dummy, $dummy, $dummy, $result) = 
info_default_process_text($result, 0, '', undef);
+    $result .= "\n\n";
     $result .= "$Texi2HTML::THISDOC{'copying_comment'}";
     $info_default_offset_in_file = length($result);
     @info_default_pending_tags = ();
@@ -632,7 +777,6 @@
 }
 
 my $info_default_paragraph_in_element_nr;
-my $info_default_para_indent_length = 3;
 
 sub info_default_paragraph($$$$$$$$$$$$)
 {
@@ -649,17 +793,39 @@
     my $command_stack_at_end = shift;
     my $command_stack_at_begin = shift;
 
-    my $begin_para = '';
-    if ($info_default_paragraph_in_element_nr)
-    {
-        # add length(para) before
-        $begin_para = ' ' x $info_default_para_indent_length;
-    }
+    my $top_stack = '';
+    $top_stack = $command_stack_at_begin->[-1] if (scalar 
(@$command_stack_at_begin));
+
     $info_default_paragraph_in_element_nr++;
+    return info_default_close_command(undef, 'paragraph', undef, undef, undef, 
'', undef, "\n\n", {'paragraph_in_element_nr' => 
($info_default_paragraph_in_element_nr -1), 'top_stack' => $top_stack});
+}
 
-    return info_default_close_command(undef, 'paragraph', undef, undef, undef, 
$begin_para, undef, "\n\n");
+sub info_default_preformatted($$$$$$$$$$$$)
+{
+    my $text = shift;
+    my $pre_style = shift;
+    my $class = shift;
+    my $leading_command = shift;
+    my $leading_command_formatted = shift;
+    my $preformatted_number = shift;
+    my $format = shift;
+    my $item_nr = shift;
+    my $enumerate_style = shift;
+    my $number = shift;
+    my $command_stack_at_end = shift;
+    my $command_stack_at_begin = shift;
+
+#    if (defined($preformatted_number) and defined($$preformatted_number))
+#    {
+#        $$preformatted_number++;
+#    }
+    #Â a paragraph after a preformatted is indented. So looks like 
+    #Â preformatted count as paragraphs.
+    $info_default_paragraph_in_element_nr++;
+    return info_default_close_command(undef, 'preformatted', undef, undef, 
undef, undef, undef, undef);
 }
 
+
 my %default_info_level_to_symbol = (
   0 => '*',
   1 => '*',
@@ -739,6 +905,7 @@
 
 #Data::Dumper->Dump([$state]);
 
+#print STDERR "info_default_normal_text $text $in_preformatted $in_code \n";
    $text = uc($text) if (in_cmd($style_stack, 'sc'));
 #   $text = &$protect_text($text) unless($in_raw_text);
    if (! $in_code and !$in_preformatted)
@@ -746,6 +913,8 @@
        $text =~ s/---/\x{1F}/g;
        $text =~ s/--/-/g;
        $text =~ s/\x{1F}/--/g;
+       $text =~ s/``/"/g;
+       $text =~ s/\'\'/"/g;
    }
    else
    {
@@ -756,7 +925,7 @@
 #       $text =~ s/'/\&rsquo\;/g unless ($special_code and 
exists($main::value{'txicodequoteundirected'}));
 #       $text =~ s/`/\&lsquo\;/g unless ($special_code and 
exists($main::value{'txicodequotebacktick'}));
    }
-   #Â We ignore the text outside paragraphs
+   #Â We never store in the stack text in raw text (remove_texi).
    unless ($in_raw_text)
    {
       return '' if (info_default_store_text($state,$text));
@@ -764,12 +933,14 @@
    return $text;
 }
 
+#Â this is not called in preformatted
 sub info_default_empty_line($$)
 {
     my $text = shift;
     my $state = shift;
     #ignore the line if it just follows a deff
     #return '' if ($state->{'deff_line'});
+    info_default_store_text($state,$text);
     return '';
 }
 
@@ -826,6 +997,17 @@
    print $fh "\x{1F}\nEnd Tag Table\n";
 }
 
+sub info_default_print_Top_footer($$$)
+{
+    my $fh = shift;
+    my $end_page = shift;
+    my $element = shift;
+    if ($end_page)
+    {
+        &$print_page_foot($fh);
+    }
+}
+
 sub info_default_print_section
 {
     my $fh = shift;
@@ -835,6 +1017,13 @@
     my $nw = main::print_lines($fh);
 }
 
+sub info_default_end_section($$$)
+{
+    my $fh = shift;
+    my $end_foot_navigation = shift;
+    my $element = shift;
+}
+
 sub info_default_one_section($$)
 {
     my $fh = shift;
@@ -856,4 +1045,54 @@
     
 }
 
+sub info_default_menu_link($$$$$$$$)
+{
+    my $entry = shift;
+    my $state = shift;
+    my $href = shift;
+    my $node = shift;
+    my $title = shift;
+    my $ending = shift;
+    my $has_title = shift;
+    my $command_stack = shift;
+    my $preformatted = shift;
+
+    $title .= ':' if ($title ne '');
+    $entry = "$MENU_SYMBOL$title$node";
+    return $entry.$ending;
+}
+
+sub info_default_complex_format($$)
+{
+    my $name = shift;
+    my $text = shift;
+    return info_default_close_command(undef, $name, undef, undef, undef, 
undef, undef, undef);
+}
+
+sub info_default_quotation($$$$)
+{
+    my $command = shift;
+    my $text = shift;
+    my $argument_text = shift;
+    my $argument_text_texi = shift;
+
+    return info_default_close_command(undef, $command, undef, undef, undef, 
undef, undef, undef);
+}
+
+sub info_default_misc_commands($$$$$)
+{
+    my $command = shift;
+    my $line = shift;
+    my $pass = shift;
+    my $stack = shift;
+    my $state = shift;
+
+    return ($line, 0, undef, undef) unless ($pass == 2);
+    return ($line, 0, undef, undef) unless ($command eq 'exdent' or $command 
eq 'noindent' or $command eq 'indent');
+    my ($result_line, $text, $args) = &$preserve_misc_command ($line, 
$command);
+    info_default_store_text($state,'',$command);
+#print STDERR "ZZZZZZZZZZZZZZz `$result_line' `$text'\n";
+    return ($result_line, 1, '', undef);
+}
+
 1;

Index: test/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/Makefile.am    1 Sep 2008 14:48:28 -0000       1.4
+++ test/Makefile.am    1 Jan 2009 22:35:14 -0000       1.5
@@ -16,6 +16,7 @@
 
 copy-base:
        $(srcdir)/tests.sh -copy $(base_tests)
+       cp $(srcdir)/formatting/res/texi_formatting/formatting.texi 
$(srcdir)/formatting/formatting_for_makeinfo.texi
 
 copy-long:
        $(srcdir)/tests.sh -copy $(long_tests)

Index: test/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/Makefile.in    1 Sep 2008 14:48:29 -0000       1.4
+++ test/Makefile.in    1 Jan 2009 22:35:14 -0000       1.5
@@ -539,6 +539,7 @@
 
 copy-base:
        $(srcdir)/tests.sh -copy $(base_tests)
+       cp $(srcdir)/formatting/res/texi_formatting/formatting.texi 
$(srcdir)/formatting/formatting_for_makeinfo.texi
 
 copy-long:
        $(srcdir)/tests.sh -copy $(long_tests)

Index: test/coverage_macro.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/coverage_macro.texi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/coverage_macro.texi    11 Nov 2008 00:52:25 -0000      1.7
+++ test/coverage_macro.texi    1 Jan 2009 22:35:14 -0000       1.8
@@ -175,8 +175,10 @@
 @code{@@address@hidden@}} @v{--a}
 @code{@@,@address@hidden @,{c}
 @code{@@,@address@hidden @,{--c}
address@hidden texi2html
 @code{@@address@hidden@}} @ogonek{a}
 @code{@@address@hidden@}} @ogonek{--a}
address@hidden ifset
 @code{@@address@hidden address@hidden @footnote{in footnote}
 @code{@@address@hidden address@hidden @footnote{in footnote2}
 
@@ -253,6 +255,7 @@
 @quotation @*
 @end quotation
 
address@hidden texi2html
 @smallquotation 
 A small quot---ation
 @end smallquotation
@@ -264,6 +267,7 @@
 @smallquotation something, other thing
 something, other thing
 @end smallquotation
address@hidden ifset
 
 @itemize
 @item i--temize

Index: test/coverage/res/formatting/formatting.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res/formatting/formatting.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- test/coverage/res/formatting/formatting.html        11 Nov 2008 13:29:13 
-0000      1.15
+++ test/coverage/res/formatting/formatting.html        1 Jan 2009 22:35:15 
-0000       1.16
@@ -909,51 +909,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -1590,51 +1590,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -2284,41 +2284,41 @@
 </pre><blockquote><pre class="example">A quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note:</b> A Note
+</pre><blockquote><pre class="example"><b>Note:</b> A Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> note:</b> A note
+</pre><blockquote><pre class="example"><b>note:</b> A note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Caution:</b> Caution
+</pre><blockquote><pre class="example"><b>Caution:</b> Caution
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Important:</b> Important
+</pre><blockquote><pre class="example"><b>Important:</b> Important
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Tip:</b> a Tip
+</pre><blockquote><pre class="example"><b>Tip:</b> a Tip
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Warning:</b> a Warning.
+</pre><blockquote><pre class="example"><b>Warning:</b> a Warning.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something &eacute; TeX:</b> The 
something &eacute; TeX is here.
+</pre><blockquote><pre class="example"><b>something &eacute; TeX:</b> The 
something &eacute; TeX is here.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> @ at the end of line </b> A @ at 
the end of the @quotation line.
+</pre><blockquote><pre class="example"><b>@ at the end of line </b> A @ at the 
end of the @quotation line.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something, other thing:</b> 
something, other thing
+</pre><blockquote><pre class="example"><b>something, other thing:</b> 
something, other thing
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note, the note:</b> Note, the note
+</pre><blockquote><pre class="example"><b>Note, the note:</b> Note, the note
 </pre></blockquote>
 <pre class="example">
 </pre><blockquote></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Empty:</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>Empty:</b> </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> :</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>:</b> </pre></blockquote>
 <pre class="example">
 </pre><blockquote><pre class="example"><b> 
 :</b> </pre></blockquote>
@@ -2326,10 +2326,10 @@
 </pre><blockquote class="smallquotation"><pre class="example">A small 
quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> Note:</b> A 
small Note
+</pre><blockquote class="smallquotation"><pre class="example"><b>Note:</b> A 
small Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> something, 
other thing:</b> something, other thing
+</pre><blockquote class="smallquotation"><pre class="example"><b>something, 
other thing:</b> something, other thing
 </pre></blockquote>
 <pre class="example">
 </pre><ul>

Index: test/encodings/res/formatting_converted_to_utf8/formatting.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/formatting_converted_to_utf8/formatting.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- test/encodings/res/formatting_converted_to_utf8/formatting.html     11 Nov 
2008 13:29:13 -0000      1.15
+++ test/encodings/res/formatting_converted_to_utf8/formatting.html     1 Jan 
2009 22:35:15 -0000       1.16
@@ -909,51 +909,51 @@
 <blockquote><p>A quotâation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something Ã© TeX:</b> The something Ã© TeX is here.
+<blockquote><p><b>something Ã© TeX:</b> The something Ã© TeX is here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quotâation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -1590,51 +1590,51 @@
 <blockquote><p>A quotâation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something Ã© TeX:</b> The something Ã© TeX is here.
+<blockquote><p><b>something Ã© TeX:</b> The something Ã© TeX is here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quotâation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -2284,41 +2284,41 @@
 </pre><blockquote><pre class="example">A quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note:</b> A Note
+</pre><blockquote><pre class="example"><b>Note:</b> A Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> note:</b> A note
+</pre><blockquote><pre class="example"><b>note:</b> A note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Caution:</b> Caution
+</pre><blockquote><pre class="example"><b>Caution:</b> Caution
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Important:</b> Important
+</pre><blockquote><pre class="example"><b>Important:</b> Important
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Tip:</b> a Tip
+</pre><blockquote><pre class="example"><b>Tip:</b> a Tip
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Warning:</b> a Warning.
+</pre><blockquote><pre class="example"><b>Warning:</b> a Warning.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something Ã© TeX:</b> The something 
Ã© TeX is here.
+</pre><blockquote><pre class="example"><b>something Ã© TeX:</b> The something 
Ã© TeX is here.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> @ at the end of line </b> A @ at 
the end of the @quotation line.
+</pre><blockquote><pre class="example"><b>@ at the end of line </b> A @ at the 
end of the @quotation line.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something, other thing:</b> 
something, other thing
+</pre><blockquote><pre class="example"><b>something, other thing:</b> 
something, other thing
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note, the note:</b> Note, the note
+</pre><blockquote><pre class="example"><b>Note, the note:</b> Note, the note
 </pre></blockquote>
 <pre class="example">
 </pre><blockquote></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Empty:</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>Empty:</b> </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> :</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>:</b> </pre></blockquote>
 <pre class="example">
 </pre><blockquote><pre class="example"><b> 
 :</b> </pre></blockquote>
@@ -2326,10 +2326,10 @@
 </pre><blockquote class="smallquotation"><pre class="example">A small 
quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> Note:</b> A 
small Note
+</pre><blockquote class="smallquotation"><pre class="example"><b>Note:</b> A 
small Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> something, 
other thing:</b> something, other thing
+</pre><blockquote class="smallquotation"><pre class="example"><b>something, 
other thing:</b> something, other thing
 </pre></blockquote>
 <pre class="example">
 </pre><ul>

Index: test/encodings/res/formatting_fr/formatting.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/formatting_fr/formatting.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- test/encodings/res/formatting_fr/formatting.html    11 Nov 2008 13:29:13 
-0000      1.15
+++ test/encodings/res/formatting_fr/formatting.html    1 Jan 2009 22:35:16 
-0000       1.16
@@ -909,51 +909,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -1590,51 +1590,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -2284,41 +2284,41 @@
 </pre><blockquote><pre class="example">A quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note:</b> A Note
+</pre><blockquote><pre class="example"><b>Note:</b> A Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> note:</b> A note
+</pre><blockquote><pre class="example"><b>note:</b> A note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Caution:</b> Caution
+</pre><blockquote><pre class="example"><b>Caution:</b> Caution
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Important:</b> Important
+</pre><blockquote><pre class="example"><b>Important:</b> Important
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Tip:</b> a Tip
+</pre><blockquote><pre class="example"><b>Tip:</b> a Tip
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Warning:</b> a Warning.
+</pre><blockquote><pre class="example"><b>Warning:</b> a Warning.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something &eacute; TeX:</b> The 
something &eacute; TeX is here.
+</pre><blockquote><pre class="example"><b>something &eacute; TeX:</b> The 
something &eacute; TeX is here.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> @ at the end of line </b> A @ at 
the end of the @quotation line.
+</pre><blockquote><pre class="example"><b>@ at the end of line </b> A @ at the 
end of the @quotation line.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something, other thing:</b> 
something, other thing
+</pre><blockquote><pre class="example"><b>something, other thing:</b> 
something, other thing
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note, the note:</b> Note, the note
+</pre><blockquote><pre class="example"><b>Note, the note:</b> Note, the note
 </pre></blockquote>
 <pre class="example">
 </pre><blockquote></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Empty:</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>Empty:</b> </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> :</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>:</b> </pre></blockquote>
 <pre class="example">
 </pre><blockquote><pre class="example"><b> 
 :</b> </pre></blockquote>
@@ -2326,10 +2326,10 @@
 </pre><blockquote class="smallquotation"><pre class="example">A small 
quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> Note:</b> A 
small Note
+</pre><blockquote class="smallquotation"><pre class="example"><b>Note:</b> A 
small Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> something, 
other thing:</b> something, other thing
+</pre><blockquote class="smallquotation"><pre class="example"><b>something, 
other thing:</b> something, other thing
 </pre></blockquote>
 <pre class="example">
 </pre><ul>

Index: test/encodings/res/formatting_fr_icons/formatting.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/formatting_fr_icons/formatting.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- test/encodings/res/formatting_fr_icons/formatting.html      11 Nov 2008 
13:29:14 -0000      1.15
+++ test/encodings/res/formatting_fr_icons/formatting.html      1 Jan 2009 
22:35:16 -0000       1.16
@@ -909,51 +909,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -1590,51 +1590,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -2284,41 +2284,41 @@
 </pre><blockquote><pre class="example">A quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note:</b> A Note
+</pre><blockquote><pre class="example"><b>Note:</b> A Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> note:</b> A note
+</pre><blockquote><pre class="example"><b>note:</b> A note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Caution:</b> Caution
+</pre><blockquote><pre class="example"><b>Caution:</b> Caution
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Important:</b> Important
+</pre><blockquote><pre class="example"><b>Important:</b> Important
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Tip:</b> a Tip
+</pre><blockquote><pre class="example"><b>Tip:</b> a Tip
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Warning:</b> a Warning.
+</pre><blockquote><pre class="example"><b>Warning:</b> a Warning.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something &eacute; TeX:</b> The 
something &eacute; TeX is here.
+</pre><blockquote><pre class="example"><b>something &eacute; TeX:</b> The 
something &eacute; TeX is here.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> @ at the end of line </b> A @ at 
the end of the @quotation line.
+</pre><blockquote><pre class="example"><b>@ at the end of line </b> A @ at the 
end of the @quotation line.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something, other thing:</b> 
something, other thing
+</pre><blockquote><pre class="example"><b>something, other thing:</b> 
something, other thing
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note, the note:</b> Note, the note
+</pre><blockquote><pre class="example"><b>Note, the note:</b> Note, the note
 </pre></blockquote>
 <pre class="example">
 </pre><blockquote></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Empty:</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>Empty:</b> </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> :</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>:</b> </pre></blockquote>
 <pre class="example">
 </pre><blockquote><pre class="example"><b> 
 :</b> </pre></blockquote>
@@ -2326,10 +2326,10 @@
 </pre><blockquote class="smallquotation"><pre class="example">A small 
quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> Note:</b> A 
small Note
+</pre><blockquote class="smallquotation"><pre class="example"><b>Note:</b> A 
small Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> something, 
other thing:</b> something, other thing
+</pre><blockquote class="smallquotation"><pre class="example"><b>something, 
other thing:</b> something, other thing
 </pre></blockquote>
 <pre class="example">
 </pre><ul>

Index: test/formatting/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/formatting/Makefile.am 14 Nov 2008 22:34:35 -0000      1.9
+++ test/formatting/Makefile.am 1 Jan 2009 22:35:17 -0000       1.10
@@ -8,7 +8,7 @@
  images.texi index_in_item_line_table.texi index_in_item_line_vtable.texi \
  index_in_item_line_table_in_code.texi table_in_table_item.texi \
  nested_formats.texi inter_item_commands.texi multitables.texi \
- double_style_paragraph.texi \
+ double_style_paragraph.texi formatting_for_makeinfo.texi \
  f--ile.gif f--ile.jpeg f--ile.png f---ile.gr--a f--ile.jpg f--ile.txt \
  simple_menu.init weird_quotes.init redefine_need.init file.css tests.txt res
 

Index: test/formatting/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/formatting/Makefile.in 14 Nov 2008 22:34:35 -0000      1.6
+++ test/formatting/Makefile.in 1 Jan 2009 22:35:17 -0000       1.7
@@ -138,7 +138,7 @@
  images.texi index_in_item_line_table.texi index_in_item_line_vtable.texi \
  index_in_item_line_table_in_code.texi table_in_table_item.texi \
  nested_formats.texi inter_item_commands.texi multitables.texi \
- double_style_paragraph.texi \
+ double_style_paragraph.texi formatting_for_makeinfo.texi \
  f--ile.gif f--ile.jpeg f--ile.png f---ile.gr--a f--ile.jpg f--ile.txt \
  simple_menu.init weird_quotes.init redefine_need.init file.css tests.txt res
 

Index: test/formatting/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/tests.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/formatting/tests.txt   14 Nov 2008 22:34:36 -0000      1.9
+++ test/formatting/tests.txt   1 Jan 2009 22:35:18 -0000       1.10
@@ -84,3 +84,4 @@
 inter_item_commands_xml inter_item_commands.texi -init xml.init
 inter_item_commands_docbook inter_item_commands.texi -init docbook.init
 double_style_paragraph double_style_paragraph.texi
+#formatting_info ../coverage/formatting.texi -init info.init

Index: test/formatting/res/formatting_docbook/formatting.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/formatting_docbook/formatting.2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/formatting/res/formatting_docbook/formatting.2 28 Nov 2008 09:27:53 
-0000      1.5
+++ test/formatting/res/formatting_docbook/formatting.2 1 Jan 2009 22:35:18 
-0000       1.6
@@ -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. 365 in @copying)
-** Empty index entry for @deffn (in  l. 366 in @copying)
-** Empty index entry for @deffn (in  l. 367 in @copying)
-** Empty index entry for @deffn (in  l. 368 in @copying)
-** Empty index entry for @deffn (in  l. 369 in @copying)
-** Empty index entry for @deffn (in  l. 373 in @copying)
-** Empty index entry for @deffn (in  l. 376 in @copying)
-** Empty index entry for @deffn (in  l. 377 in @copying)
-** Empty index entry for @deffn (in  l. 365 in @copying)
-** Empty index entry for @deffn (in  l. 366 in @copying)
-** Empty index entry for @deffn (in  l. 367 in @copying)
-** Empty index entry for @deffn (in  l. 368 in @copying)
-** Empty index entry for @deffn (in  l. 369 in @copying)
-** Empty index entry for @deffn (in  l. 373 in @copying)
-** Empty index entry for @deffn (in  l. 376 in @copying)
-** Empty index entry for @deffn (in  l. 377 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 (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. 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_docbook/formatting.xml
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/formatting_docbook/formatting.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/formatting/res/formatting_docbook/formatting.xml       11 Nov 2008 
00:52:28 -0000      1.7
+++ test/formatting/res/formatting_docbook/formatting.xml       1 Jan 2009 
22:35:18 -0000       1.8
@@ -191,8 +191,6 @@
 <literal>@v{--a}</literal> &ndash;a&lt;
 <literal>@,{c}</literal> &ccedil;
 <literal>@,{--c}</literal> &ndash;c,
-<literal>@ogonek{a}</literal> &aogon;
-<literal>@ogonek{--a}</literal> &ndash;a;
 <literal>@footnote{in footnote}</literal> <footnote><para>in footnote
 </para></footnote>
 <literal>@footnote{in footnote2}</literal> <footnote><para>in footnote2
@@ -266,14 +264,6 @@
 <blockquote><para><emphasis role="bold"> 
 :</emphasis> </para></blockquote>
 
-<blockquote><para>A small quot&mdash;ation
-</para></blockquote>
-
-<note><para>A small Note
-</para></note>
-
-<blockquote><para><emphasis role="bold"> something, other thing:</emphasis> 
something, other thing
-</para></blockquote>
 
 <itemizedlist><listitem><para> i&ndash;temize
 </para></listitem>
@@ -723,8 +713,6 @@
 <literal>@v{--a}</literal> &ndash;a&lt;
 <literal>@,{c}</literal> &ccedil;
 <literal>@,{--c}</literal> &ndash;c,
-<literal>@ogonek{a}</literal> &aogon;
-<literal>@ogonek{--a}</literal> &ndash;a;
 <literal>@footnote{in footnote}</literal> <footnote><para>in footnote
 </para></footnote>
 <literal>@footnote{in footnote2}</literal> <footnote><para>in footnote2
@@ -798,14 +786,6 @@
 <blockquote><para><emphasis role="bold"> 
 :</emphasis> </para></blockquote>
 
-<blockquote><para>A small quot&mdash;ation
-</para></blockquote>
-
-<note><para>A small Note
-</para></note>
-
-<blockquote><para><emphasis role="bold"> something, other thing:</emphasis> 
something, other thing
-</para></blockquote>
 
 <itemizedlist><listitem><para> i&ndash;temize
 </para></listitem>
@@ -1251,8 +1231,6 @@
 <literal>@v{--a}</literal> &ndash;a&lt;
 <literal>@,{c}</literal> &ccedil;
 <literal>@,{--c}</literal> &ndash;c,
-<literal>@ogonek{a}</literal> &aogon;
-<literal>@ogonek{--a}</literal> &ndash;a;
 <literal>@footnote{in footnote}</literal> <footnote><para>in footnote
 </para></footnote>
 <literal>@footnote{in footnote2}</literal> <footnote><para>in footnote2
@@ -1326,14 +1304,6 @@
 <blockquote><para><emphasis role="bold"> 
 :</emphasis> </para></blockquote>
 
-<blockquote><para>A small quot&mdash;ation
-</para></blockquote>
-
-<note><para>A small Note
-</para></note>
-
-<blockquote><para><emphasis role="bold"> something, other thing:</emphasis> 
something, other thing
-</para></blockquote>
 
 <itemizedlist><listitem><para> i&ndash;temize
 </para></listitem>
@@ -1779,8 +1749,6 @@
 <literal>@v{--a}</literal> --a&lt;
 <literal>@,{c}</literal> &ccedil;
 <literal>@,{--c}</literal> --c,
-<literal>@ogonek{a}</literal> &aogon;
-<literal>@ogonek{--a}</literal> --a;
 <literal>@footnote{in footnote}</literal> <footnote><para>in footnote
 </para></footnote>
 <literal>@footnote{in footnote2}</literal> <footnote><para>in footnote2
@@ -1854,14 +1822,6 @@
 <blockquote><lineannotation> 
 :</lineannotation> </blockquote>
 
-<blockquote>A small quot---ation
-</blockquote>
-
-<note>A small Note
-</note>
-
-<blockquote><lineannotation> something, other thing:</lineannotation> 
something, other thing
-</blockquote>
 
 <itemizedlist><listitem> i--temize
 </listitem>

Index: test/formatting/res/formatting_weird_quotes/formatting.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/formatting_weird_quotes/formatting.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- test/formatting/res/formatting_weird_quotes/formatting.html 11 Nov 2008 
13:29:14 -0000      1.16
+++ test/formatting/res/formatting_weird_quotes/formatting.html 1 Jan 2009 
22:35:19 -0000       1.17
@@ -909,51 +909,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -1590,51 +1590,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -2284,41 +2284,41 @@
 </pre><blockquote><pre class="example">A quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note:</b> A Note
+</pre><blockquote><pre class="example"><b>Note:</b> A Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> note:</b> A note
+</pre><blockquote><pre class="example"><b>note:</b> A note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Caution:</b> Caution
+</pre><blockquote><pre class="example"><b>Caution:</b> Caution
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Important:</b> Important
+</pre><blockquote><pre class="example"><b>Important:</b> Important
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Tip:</b> a Tip
+</pre><blockquote><pre class="example"><b>Tip:</b> a Tip
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Warning:</b> a Warning.
+</pre><blockquote><pre class="example"><b>Warning:</b> a Warning.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something &eacute; TeX:</b> The 
something &eacute; TeX is here.
+</pre><blockquote><pre class="example"><b>something &eacute; TeX:</b> The 
something &eacute; TeX is here.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> @ at the end of line </b> A @ at 
the end of the @quotation line.
+</pre><blockquote><pre class="example"><b>@ at the end of line </b> A @ at the 
end of the @quotation line.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something, other thing:</b> 
something, other thing
+</pre><blockquote><pre class="example"><b>something, other thing:</b> 
something, other thing
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note, the note:</b> Note, the note
+</pre><blockquote><pre class="example"><b>Note, the note:</b> Note, the note
 </pre></blockquote>
 <pre class="example">
 </pre><blockquote></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Empty:</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>Empty:</b> </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> :</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>:</b> </pre></blockquote>
 <pre class="example">
 </pre><blockquote><pre class="example"><b> 
 :</b> </pre></blockquote>
@@ -2326,10 +2326,10 @@
 </pre><blockquote class="smallquotation"><pre class="example">A small 
quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> Note:</b> A 
small Note
+</pre><blockquote class="smallquotation"><pre class="example"><b>Note:</b> A 
small Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> something, 
other thing:</b> something, other thing
+</pre><blockquote class="smallquotation"><pre class="example"><b>something, 
other thing:</b> something, other thing
 </pre></blockquote>
 <pre class="example">
 </pre><ul>

Index: test/formatting/res/formatting_xml/formatting.xml
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/formatting_xml/formatting.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/formatting/res/formatting_xml/formatting.xml   11 Nov 2008 00:52:28 
-0000      1.6
+++ test/formatting/res/formatting_xml/formatting.xml   1 Jan 2009 22:35:19 
-0000       1.7
@@ -199,8 +199,6 @@
 <code>@v{--a}</code> &ndash;a&lt;
 <code>@,{c}</code> &ccedil;
 <code>@,{--c}</code> &ndash;c,
-<code>@ogonek{a}</code> &aogon;
-<code>@ogonek{--a}</code> &ndash;a;
 <code>@footnote{in footnote}</code> <footnote><para>in footnote
 </para></footnote>
 <code>@footnote{in footnote2}</code> <footnote><para>in footnote2
@@ -226,68 +224,57 @@
 </para></quotation>
 
 <quotation>
-<para><b> Note:</b> A Note
+<para><b>Note:</b> A Note
 </para></quotation>
 
 <quotation>
-<para><b> note:</b> A note
+<para><b>note:</b> A note
 </para></quotation>
 
 <quotation>
-<para><b> Caution:</b> Caution
+<para><b>Caution:</b> Caution
 </para></quotation>
 
 <quotation>
-<para><b> Important:</b> Important
+<para><b>Important:</b> Important
 </para></quotation>
 
 <quotation>
-<para><b> Tip:</b> a Tip
+<para><b>Tip:</b> a Tip
 </para></quotation>
 
 <quotation>
-<para><b> Warning:</b> a Warning.
+<para><b>Warning:</b> a Warning.
 </para></quotation>
 
 <quotation>
-<para><b> something &eacute; &tex;:</b> The something &eacute; &tex; is here.
+<para><b>something &eacute; &tex;:</b> The something &eacute; &tex; is here.
 </para></quotation>
 
 <quotation>
-<para><b> @ at the end of line </b> A @ at the end of the @quotation line.
+<para><b>@ at the end of line </b> A @ at the end of the @quotation line.
 </para></quotation>
 
 <quotation>
-<para><b> something, other thing:</b> something, other thing
+<para><b>something, other thing:</b> something, other thing
 </para></quotation>
 
 <quotation>
-<para><b> Note, the note:</b> Note, the note
+<para><b>Note, the note:</b> Note, the note
 </para></quotation>
 
 <quotation>
 </quotation>
 
 <quotation>
-<para><b> Empty:</b> </para></quotation>
+<para><b>Empty:</b> </para></quotation>
 
 <quotation>
-<para><b> :</b> </para></quotation>
+<para><b>:</b> </para></quotation>
 
 <quotation>
-<para><b> &linebreak;:</b> </para></quotation>
+<para><b>&linebreak;:</b> </para></quotation>
 
-<smallquotation>
-<para>A small quot&mdash;ation
-</para></smallquotation>
-
-<smallquotation>
-<para><b> Note:</b> A small Note
-</para></smallquotation>
-
-<smallquotation>
-<para><b> something, other thing:</b> something, other thing
-</para></smallquotation>
 
 <itemize><itemfunction>&bullet;</itemfunction><item><para> i&ndash;temize
 </para></item>
@@ -746,8 +733,6 @@
 <code>@v{--a}</code> &ndash;a&lt;
 <code>@,{c}</code> &ccedil;
 <code>@,{--c}</code> &ndash;c,
-<code>@ogonek{a}</code> &aogon;
-<code>@ogonek{--a}</code> &ndash;a;
 <code>@footnote{in footnote}</code> <footnote><para>in footnote
 </para></footnote>
 <code>@footnote{in footnote2}</code> <footnote><para>in footnote2
@@ -773,68 +758,57 @@
 </para></quotation>
 
 <quotation>
-<para><b> Note:</b> A Note
+<para><b>Note:</b> A Note
 </para></quotation>
 
 <quotation>
-<para><b> note:</b> A note
+<para><b>note:</b> A note
 </para></quotation>
 
 <quotation>
-<para><b> Caution:</b> Caution
+<para><b>Caution:</b> Caution
 </para></quotation>
 
 <quotation>
-<para><b> Important:</b> Important
+<para><b>Important:</b> Important
 </para></quotation>
 
 <quotation>
-<para><b> Tip:</b> a Tip
+<para><b>Tip:</b> a Tip
 </para></quotation>
 
 <quotation>
-<para><b> Warning:</b> a Warning.
+<para><b>Warning:</b> a Warning.
 </para></quotation>
 
 <quotation>
-<para><b> something &eacute; &tex;:</b> The something &eacute; &tex; is here.
+<para><b>something &eacute; &tex;:</b> The something &eacute; &tex; is here.
 </para></quotation>
 
 <quotation>
-<para><b> @ at the end of line </b> A @ at the end of the @quotation line.
+<para><b>@ at the end of line </b> A @ at the end of the @quotation line.
 </para></quotation>
 
 <quotation>
-<para><b> something, other thing:</b> something, other thing
+<para><b>something, other thing:</b> something, other thing
 </para></quotation>
 
 <quotation>
-<para><b> Note, the note:</b> Note, the note
+<para><b>Note, the note:</b> Note, the note
 </para></quotation>
 
 <quotation>
 </quotation>
 
 <quotation>
-<para><b> Empty:</b> </para></quotation>
+<para><b>Empty:</b> </para></quotation>
 
 <quotation>
-<para><b> :</b> </para></quotation>
+<para><b>:</b> </para></quotation>
 
 <quotation>
-<para><b> &linebreak;:</b> </para></quotation>
-
-<smallquotation>
-<para>A small quot&mdash;ation
-</para></smallquotation>
-
-<smallquotation>
-<para><b> Note:</b> A small Note
-</para></smallquotation>
+<para><b>&linebreak;:</b> </para></quotation>
 
-<smallquotation>
-<para><b> something, other thing:</b> something, other thing
-</para></smallquotation>
 
 <itemize><itemfunction>&bullet;</itemfunction><item><para> i&ndash;temize
 </para></item>
@@ -1288,8 +1262,6 @@
 <code>@v{--a}</code> &ndash;a&lt;
 <code>@,{c}</code> &ccedil;
 <code>@,{--c}</code> &ndash;c,
-<code>@ogonek{a}</code> &aogon;
-<code>@ogonek{--a}</code> &ndash;a;
 <code>@footnote{in footnote}</code> <footnote><para>in footnote
 </para></footnote>
 <code>@footnote{in footnote2}</code> <footnote><para>in footnote2
@@ -1315,68 +1287,57 @@
 </para></quotation>
 
 <quotation>
-<para><b> Note:</b> A Note
+<para><b>Note:</b> A Note
 </para></quotation>
 
 <quotation>
-<para><b> note:</b> A note
+<para><b>note:</b> A note
 </para></quotation>
 
 <quotation>
-<para><b> Caution:</b> Caution
+<para><b>Caution:</b> Caution
 </para></quotation>
 
 <quotation>
-<para><b> Important:</b> Important
+<para><b>Important:</b> Important
 </para></quotation>
 
 <quotation>
-<para><b> Tip:</b> a Tip
+<para><b>Tip:</b> a Tip
 </para></quotation>
 
 <quotation>
-<para><b> Warning:</b> a Warning.
+<para><b>Warning:</b> a Warning.
 </para></quotation>
 
 <quotation>
-<para><b> something &eacute; &tex;:</b> The something &eacute; &tex; is here.
+<para><b>something &eacute; &tex;:</b> The something &eacute; &tex; is here.
 </para></quotation>
 
 <quotation>
-<para><b> @ at the end of line </b> A @ at the end of the @quotation line.
+<para><b>@ at the end of line </b> A @ at the end of the @quotation line.
 </para></quotation>
 
 <quotation>
-<para><b> something, other thing:</b> something, other thing
+<para><b>something, other thing:</b> something, other thing
 </para></quotation>
 
 <quotation>
-<para><b> Note, the note:</b> Note, the note
+<para><b>Note, the note:</b> Note, the note
 </para></quotation>
 
 <quotation>
 </quotation>
 
 <quotation>
-<para><b> Empty:</b> </para></quotation>
+<para><b>Empty:</b> </para></quotation>
 
 <quotation>
-<para><b> :</b> </para></quotation>
+<para><b>:</b> </para></quotation>
 
 <quotation>
-<para><b> &linebreak;:</b> </para></quotation>
+<para><b>&linebreak;:</b> </para></quotation>
 
-<smallquotation>
-<para>A small quot&mdash;ation
-</para></smallquotation>
-
-<smallquotation>
-<para><b> Note:</b> A small Note
-</para></smallquotation>
-
-<smallquotation>
-<para><b> something, other thing:</b> something, other thing
-</para></smallquotation>
 
 <itemize><itemfunction>&bullet;</itemfunction><item><para> i&ndash;temize
 </para></item>
@@ -1831,8 +1792,6 @@
 <code>@v{--a}</code> &ndash;a&lt;
 <code>@,{c}</code> &ccedil;
 <code>@,{--c}</code> &ndash;c,
-<code>@ogonek{a}</code> &aogon;
-<code>@ogonek{--a}</code> &ndash;a;
 <code>@footnote{in footnote}</code> <footnote><para>in footnote
 </para></footnote>
 <code>@footnote{in footnote2}</code> <footnote><para>in footnote2
@@ -1858,68 +1817,57 @@
 </para></quotation>
 
 <quotation>
-<para><b> Note:</b> A Note
+<para><b>Note:</b> A Note
 </para></quotation>
 
 <quotation>
-<para><b> note:</b> A note
+<para><b>note:</b> A note
 </para></quotation>
 
 <quotation>
-<para><b> Caution:</b> Caution
+<para><b>Caution:</b> Caution
 </para></quotation>
 
 <quotation>
-<para><b> Important:</b> Important
+<para><b>Important:</b> Important
 </para></quotation>
 
 <quotation>
-<para><b> Tip:</b> a Tip
+<para><b>Tip:</b> a Tip
 </para></quotation>
 
 <quotation>
-<para><b> Warning:</b> a Warning.
+<para><b>Warning:</b> a Warning.
 </para></quotation>
 
 <quotation>
-<para><b> something &eacute; &tex;:</b> The something &eacute; &tex; is here.
+<para><b>something &eacute; &tex;:</b> The something &eacute; &tex; is here.
 </para></quotation>
 
 <quotation>
-<para><b> @ at the end of line </b> A @ at the end of the @quotation line.
+<para><b>@ at the end of line </b> A @ at the end of the @quotation line.
 </para></quotation>
 
 <quotation>
-<para><b> something, other thing:</b> something, other thing
+<para><b>something, other thing:</b> something, other thing
 </para></quotation>
 
 <quotation>
-<para><b> Note, the note:</b> Note, the note
+<para><b>Note, the note:</b> Note, the note
 </para></quotation>
 
 <quotation>
 </quotation>
 
 <quotation>
-<para><b> Empty:</b> </para></quotation>
+<para><b>Empty:</b> </para></quotation>
 
 <quotation>
-<para><b> :</b> </para></quotation>
+<para><b>:</b> </para></quotation>
 
 <quotation>
-<para><b> &linebreak;:</b> </para></quotation>
-
-<smallquotation>
-<para>A small quot&mdash;ation
-</para></smallquotation>
+<para><b>&linebreak;:</b> </para></quotation>
 
-<smallquotation>
-<para><b> Note:</b> A small Note
-</para></smallquotation>
-
-<smallquotation>
-<para><b> something, other thing:</b> something, other thing
-</para></smallquotation>
 
 <itemize><itemfunction>&bullet;</itemfunction><item><para> i&ndash;temize
 </para></item>
@@ -2372,8 +2320,6 @@
 <code>@v{--a}</code> &ndash;a&lt;
 <code>@,{c}</code> &ccedil;
 <code>@,{--c}</code> &ndash;c,
-<code>@ogonek{a}</code> &aogon;
-<code>@ogonek{--a}</code> &ndash;a;
 <code>@footnote{in footnote}</code> <footnote><para>in footnote
 </para></footnote>
 <code>@footnote{in footnote2}</code> <footnote><para>in footnote2
@@ -2399,68 +2345,57 @@
 </para></quotation>
 
 <quotation>
-<para><b> Note:</b> A Note
+<para><b>Note:</b> A Note
 </para></quotation>
 
 <quotation>
-<para><b> note:</b> A note
+<para><b>note:</b> A note
 </para></quotation>
 
 <quotation>
-<para><b> Caution:</b> Caution
+<para><b>Caution:</b> Caution
 </para></quotation>
 
 <quotation>
-<para><b> Important:</b> Important
+<para><b>Important:</b> Important
 </para></quotation>
 
 <quotation>
-<para><b> Tip:</b> a Tip
+<para><b>Tip:</b> a Tip
 </para></quotation>
 
 <quotation>
-<para><b> Warning:</b> a Warning.
+<para><b>Warning:</b> a Warning.
 </para></quotation>
 
 <quotation>
-<para><b> something &eacute; &tex;:</b> The something &eacute; &tex; is here.
+<para><b>something &eacute; &tex;:</b> The something &eacute; &tex; is here.
 </para></quotation>
 
 <quotation>
-<para><b> @ at the end of line </b> A @ at the end of the @quotation line.
+<para><b>@ at the end of line </b> A @ at the end of the @quotation line.
 </para></quotation>
 
 <quotation>
-<para><b> something, other thing:</b> something, other thing
+<para><b>something, other thing:</b> something, other thing
 </para></quotation>
 
 <quotation>
-<para><b> Note, the note:</b> Note, the note
+<para><b>Note, the note:</b> Note, the note
 </para></quotation>
 
 <quotation>
 </quotation>
 
 <quotation>
-<para><b> Empty:</b> </para></quotation>
+<para><b>Empty:</b> </para></quotation>
 
 <quotation>
-<para><b> :</b> </para></quotation>
+<para><b>:</b> </para></quotation>
 
 <quotation>
-<para><b> &linebreak;:</b> </para></quotation>
-
-<smallquotation>
-<para>A small quot&mdash;ation
-</para></smallquotation>
-
-<smallquotation>
-<para><b> Note:</b> A small Note
-</para></smallquotation>
+<para><b>&linebreak;:</b> </para></quotation>
 
-<smallquotation>
-<para><b> something, other thing:</b> something, other thing
-</para></smallquotation>
 
 <itemize><itemfunction>&bullet;</itemfunction><item><para> i&ndash;temize
 </para></item>
@@ -2913,8 +2848,6 @@
 <code>@v{--a}</code> --a&lt;
 <code>@,{c}</code> &ccedil;
 <code>@,{--c}</code> --c,
-<code>@ogonek{a}</code> &aogon;
-<code>@ogonek{--a}</code> --a;
 <code>@footnote{in footnote}</code> <footnote><para>in footnote
 </para></footnote>
 <code>@footnote{in footnote2}</code> <footnote><para>in footnote2
@@ -2940,68 +2873,57 @@
 </quotation>
 
 <quotation>
-<b> Note:</b> A Note
+<b>Note:</b> A Note
 </quotation>
 
 <quotation>
-<b> note:</b> A note
+<b>note:</b> A note
 </quotation>
 
 <quotation>
-<b> Caution:</b> Caution
+<b>Caution:</b> Caution
 </quotation>
 
 <quotation>
-<b> Important:</b> Important
+<b>Important:</b> Important
 </quotation>
 
 <quotation>
-<b> Tip:</b> a Tip
+<b>Tip:</b> a Tip
 </quotation>
 
 <quotation>
-<b> Warning:</b> a Warning.
+<b>Warning:</b> a Warning.
 </quotation>
 
 <quotation>
-<b> something &eacute; &tex;:</b> The something &eacute; &tex; is here.
+<b>something &eacute; &tex;:</b> The something &eacute; &tex; is here.
 </quotation>
 
 <quotation>
-<b> @ at the end of line </b> A @ at the end of the @quotation line.
+<b>@ at the end of line </b> A @ at the end of the @quotation line.
 </quotation>
 
 <quotation>
-<b> something, other thing:</b> something, other thing
+<b>something, other thing:</b> something, other thing
 </quotation>
 
 <quotation>
-<b> Note, the note:</b> Note, the note
+<b>Note, the note:</b> Note, the note
 </quotation>
 
 <quotation>
 </quotation>
 
 <quotation>
-<b> Empty:</b> </quotation>
+<b>Empty:</b> </quotation>
 
 <quotation>
-<b> :</b> </quotation>
+<b>:</b> </quotation>
 
 <quotation>
-<b> &linebreak;:</b> </quotation>
+<b>&linebreak;:</b> </quotation>
 
-<smallquotation>
-A small quot---ation
-</smallquotation>
-
-<smallquotation>
-<b> Note:</b> A small Note
-</smallquotation>
-
-<smallquotation>
-<b> something, other thing:</b> something, other thing
-</smallquotation>
 
 <itemize><itemfunction>&bullet;</itemfunction><item> i--temize
 </item>
@@ -3383,7 +3305,9 @@
 <printindex>cp</printindex>
 <printindex>fn</printindex>
 
-<contents></contents><shortcontents></shortcontents></unnumbered>
+<contents></contents>
+<shortcontents></shortcontents>
+</unnumbered>
 </node>
 </texinfo>
 <!-- Keep this comment at the end of the file

Index: test/formatting/res/menus_xml/menus.xml
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/res/menus_xml/menus.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/formatting/res/menus_xml/menus.xml     29 Aug 2008 15:05:58 -0000      
1.3
+++ test/formatting/res/menus_xml/menus.xml     1 Jan 2009 22:35:19 -0000       
1.4
@@ -191,7 +191,9 @@
 <section>
 <title>section in chapter 2</title>
 
-<contents></contents><shortcontents></shortcontents>
+<contents></contents>
+<shortcontents></shortcontents>
+
 </section>
 </node>
 </texinfo>

Index: test/formatting/res/menus_xml_makeinfo/menus.xml
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/menus_xml_makeinfo/menus.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/formatting/res/menus_xml_makeinfo/menus.xml    29 Aug 2008 15:05:58 
-0000      1.3
+++ test/formatting/res/menus_xml_makeinfo/menus.xml    1 Jan 2009 22:35:20 
-0000       1.4
@@ -145,7 +145,9 @@
 <section>
 <title>section in chapter 2</title>
 
-<contents></contents><shortcontents></shortcontents>
+<contents></contents>
+<shortcontents></shortcontents>
+
 </section>
 </node>
 </texinfo>

Index: test/formatting/res/quotation/quotation.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/quotation/quotation.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/formatting/res/quotation/quotation.html        1 Nov 2008 18:26:55 
-0000       1.3
+++ test/formatting/res/quotation/quotation.html        1 Jan 2009 22:35:21 
-0000       1.4
@@ -48,82 +48,82 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <table><tr><td>&nbsp;</td><td><blockquote><pre class="example">A quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note:</b> A Note
+</pre><blockquote><pre class="example"><b>Note:</b> A Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> note:</b> A note
+</pre><blockquote><pre class="example"><b>note:</b> A note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Caution:</b> Caution
+</pre><blockquote><pre class="example"><b>Caution:</b> Caution
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Important:</b> Important
+</pre><blockquote><pre class="example"><b>Important:</b> Important
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Tip:</b> a Tip
+</pre><blockquote><pre class="example"><b>Tip:</b> a Tip
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Warning:</b> a Warning.
+</pre><blockquote><pre class="example"><b>Warning:</b> a Warning.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something &eacute; TeX:</b> The 
something &eacute; TeX is here.
+</pre><blockquote><pre class="example"><b>something &eacute; TeX:</b> The 
something &eacute; TeX is here.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> @ at the end of line </b> A @ at 
the end of the @quotation line.
+</pre><blockquote><pre class="example"><b>@ at the end of line </b> A @ at the 
end of the @quotation line.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something, other thing:</b> 
something, other thing
+</pre><blockquote><pre class="example"><b>something, other thing:</b> 
something, other thing
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note, the note:</b> Note, the note
+</pre><blockquote><pre class="example"><b>Note, the note:</b> Note, the note
 </pre></blockquote>
 <pre class="example">
 </pre><blockquote></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Empty:</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>Empty:</b> </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> :</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>:</b> </pre></blockquote>
 <pre class="example">
 </pre><blockquote><pre class="example"><b> 
 :</b> </pre></blockquote>

Index: test/formatting/res/texi_formatting/formatting.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/texi_formatting/formatting.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/formatting/res/texi_formatting/formatting.2    28 Nov 2008 09:27:54 
-0000      1.2
+++ test/formatting/res/texi_formatting/formatting.2    1 Jan 2009 22:35:21 
-0000       1.3
@@ -1,4 +1,8 @@
 # Popped `code' in ifset/ifclear
+# Popped `ogonek' in ifset/ifclear
+# Popped `code' in ifset/ifclear
+# Popped `ogonek' in ifset/ifclear
+# Popped `code' in ifset/ifclear
 # Popped `comma' in ifset/ifclear
 # Popped `enddots' in ifset/ifclear
 # Popped `acronym' in ifset/ifclear
@@ -114,6 +118,10 @@
 # Popped `code' in ifset/ifclear
 # Popped `inforef' in ifset/ifclear
 # Popped `code' in ifset/ifclear
+# Popped `ogonek' in ifset/ifclear
+# Popped `code' in ifset/ifclear
+# Popped `ogonek' in ifset/ifclear
+# Popped `code' in ifset/ifclear
 # Popped `comma' in ifset/ifclear
 # Popped `enddots' in ifset/ifclear
 # Popped `acronym' in ifset/ifclear
@@ -229,6 +237,10 @@
 # Popped `code' in ifset/ifclear
 # Popped `inforef' in ifset/ifclear
 # Popped `code' in ifset/ifclear
+# Popped `ogonek' in ifset/ifclear
+# Popped `code' in ifset/ifclear
+# Popped `ogonek' in ifset/ifclear
+# Popped `code' in ifset/ifclear
 # Popped `comma' in ifset/ifclear
 # Popped `enddots' in ifset/ifclear
 # Popped `acronym' in ifset/ifclear
@@ -344,6 +356,10 @@
 # Popped `code' in ifset/ifclear
 # Popped `inforef' in ifset/ifclear
 # Popped `code' in ifset/ifclear
+# Popped `ogonek' in ifset/ifclear
+# Popped `code' in ifset/ifclear
+# Popped `ogonek' in ifset/ifclear
+# Popped `code' in ifset/ifclear
 # Popped `comma' in ifset/ifclear
 # Popped `enddots' in ifset/ifclear
 # Popped `acronym' in ifset/ifclear

Index: test/formatting/res/texi_formatting/formatting.passfirst
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/texi_formatting/formatting.passfirst,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/formatting/res/texi_formatting/formatting.passfirst    11 Nov 2008 
00:52:28 -0000      1.3
+++ test/formatting/res/texi_formatting/formatting.passfirst    1 Jan 2009 
22:35:21 -0000       1.4
@@ -193,8 +193,6 @@
 formatting.texi(mymacro,38) @code{@@address@hidden@}} @v{--a}
 formatting.texi(mymacro,38) @code{@@,@address@hidden @,{c}
 formatting.texi(mymacro,38) @code{@@,@address@hidden @,{--c}
-formatting.texi(mymacro,38) @code{@@address@hidden@}} @ogonek{a}
-formatting.texi(mymacro,38) @code{@@address@hidden@}} @ogonek{--a}
 formatting.texi(mymacro,38) @code{@@address@hidden address@hidden @footnote{in 
footnote}
 formatting.texi(mymacro,38) @code{@@address@hidden address@hidden @footnote{in 
footnote2}
 formatting.texi(mymacro,38) 
@@ -271,17 +269,6 @@
 formatting.texi(mymacro,38) @quotation @*
 formatting.texi(mymacro,38) @end quotation
 formatting.texi(mymacro,38) 
-formatting.texi(mymacro,38) @smallquotation 
-formatting.texi(mymacro,38) A small quot---ation
-formatting.texi(mymacro,38) @end smallquotation
-formatting.texi(mymacro,38) 
-formatting.texi(mymacro,38) @smallquotation Note
-formatting.texi(mymacro,38) A small Note
-formatting.texi(mymacro,38) @end smallquotation
-formatting.texi(mymacro,38) 
-formatting.texi(mymacro,38) @smallquotation something, other thing
-formatting.texi(mymacro,38) something, other thing
-formatting.texi(mymacro,38) @end smallquotation
 formatting.texi(mymacro,38) 
 formatting.texi(mymacro,38) @itemize
 formatting.texi(mymacro,38) @item i--temize
@@ -787,8 +774,6 @@
 formatting.texi(mymacro,42) @code{@@address@hidden@}} @v{--a}
 formatting.texi(mymacro,42) @code{@@,@address@hidden @,{c}
 formatting.texi(mymacro,42) @code{@@,@address@hidden @,{--c}
-formatting.texi(mymacro,42) @code{@@address@hidden@}} @ogonek{a}
-formatting.texi(mymacro,42) @code{@@address@hidden@}} @ogonek{--a}
 formatting.texi(mymacro,42) @code{@@address@hidden address@hidden @footnote{in 
footnote}
 formatting.texi(mymacro,42) @code{@@address@hidden address@hidden @footnote{in 
footnote2}
 formatting.texi(mymacro,42) 
@@ -865,17 +850,6 @@
 formatting.texi(mymacro,42) @quotation @*
 formatting.texi(mymacro,42) @end quotation
 formatting.texi(mymacro,42) 
-formatting.texi(mymacro,42) @smallquotation 
-formatting.texi(mymacro,42) A small quot---ation
-formatting.texi(mymacro,42) @end smallquotation
-formatting.texi(mymacro,42) 
-formatting.texi(mymacro,42) @smallquotation Note
-formatting.texi(mymacro,42) A small Note
-formatting.texi(mymacro,42) @end smallquotation
-formatting.texi(mymacro,42) 
-formatting.texi(mymacro,42) @smallquotation something, other thing
-formatting.texi(mymacro,42) something, other thing
-formatting.texi(mymacro,42) @end smallquotation
 formatting.texi(mymacro,42) 
 formatting.texi(mymacro,42) @itemize
 formatting.texi(mymacro,42) @item i--temize

Index: test/formatting/res/texi_formatting/formatting.passtexi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/texi_formatting/formatting.passtexi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/formatting/res/texi_formatting/formatting.passtexi     11 Nov 2008 
00:52:28 -0000      1.3
+++ test/formatting/res/texi_formatting/formatting.passtexi     1 Jan 2009 
22:35:22 -0000       1.4
@@ -189,8 +189,6 @@
 formatting.texi(mymacro,18) @code{@@address@hidden@}} @v{--a}
 formatting.texi(mymacro,18) @code{@@,@address@hidden @,{c}
 formatting.texi(mymacro,18) @code{@@,@address@hidden @,{--c}
-formatting.texi(mymacro,18) @code{@@address@hidden@}} @ogonek{a}
-formatting.texi(mymacro,18) @code{@@address@hidden@}} @ogonek{--a}
 formatting.texi(mymacro,18) @code{@@address@hidden address@hidden @footnote{in 
footnote}
 formatting.texi(mymacro,18) @code{@@address@hidden address@hidden @footnote{in 
footnote2}
 formatting.texi(mymacro,18) 
@@ -267,17 +265,6 @@
 formatting.texi(mymacro,18) @quotation @*
 formatting.texi(mymacro,18) @end quotation
 formatting.texi(mymacro,18) 
-formatting.texi(mymacro,18) @smallquotation 
-formatting.texi(mymacro,18) A small quot---ation
-formatting.texi(mymacro,18) @end smallquotation
-formatting.texi(mymacro,18) 
-formatting.texi(mymacro,18) @smallquotation Note
-formatting.texi(mymacro,18) A small Note
-formatting.texi(mymacro,18) @end smallquotation
-formatting.texi(mymacro,18) 
-formatting.texi(mymacro,18) @smallquotation something, other thing
-formatting.texi(mymacro,18) something, other thing
-formatting.texi(mymacro,18) @end smallquotation
 formatting.texi(mymacro,18) 
 formatting.texi(mymacro,18) @itemize
 formatting.texi(mymacro,18) @item i--temize
@@ -790,8 +777,6 @@
 formatting.texi(mymacro,28) @code{@@address@hidden@}} @v{--a}
 formatting.texi(mymacro,28) @code{@@,@address@hidden @,{c}
 formatting.texi(mymacro,28) @code{@@,@address@hidden @,{--c}
-formatting.texi(mymacro,28) @code{@@address@hidden@}} @ogonek{a}
-formatting.texi(mymacro,28) @code{@@address@hidden@}} @ogonek{--a}
 formatting.texi(mymacro,28) @code{@@address@hidden address@hidden @footnote{in 
footnote}
 formatting.texi(mymacro,28) @code{@@address@hidden address@hidden @footnote{in 
footnote2}
 formatting.texi(mymacro,28) 
@@ -868,17 +853,6 @@
 formatting.texi(mymacro,28) @quotation @*
 formatting.texi(mymacro,28) @end quotation
 formatting.texi(mymacro,28) 
-formatting.texi(mymacro,28) @smallquotation 
-formatting.texi(mymacro,28) A small quot---ation
-formatting.texi(mymacro,28) @end smallquotation
-formatting.texi(mymacro,28) 
-formatting.texi(mymacro,28) @smallquotation Note
-formatting.texi(mymacro,28) A small Note
-formatting.texi(mymacro,28) @end smallquotation
-formatting.texi(mymacro,28) 
-formatting.texi(mymacro,28) @smallquotation something, other thing
-formatting.texi(mymacro,28) something, other thing
-formatting.texi(mymacro,28) @end smallquotation
 formatting.texi(mymacro,28) 
 formatting.texi(mymacro,28) @itemize
 formatting.texi(mymacro,28) @item i--temize
@@ -1391,8 +1365,6 @@
 formatting.texi(mymacro,38) @code{@@address@hidden@}} @v{--a}
 formatting.texi(mymacro,38) @code{@@,@address@hidden @,{c}
 formatting.texi(mymacro,38) @code{@@,@address@hidden @,{--c}
-formatting.texi(mymacro,38) @code{@@address@hidden@}} @ogonek{a}
-formatting.texi(mymacro,38) @code{@@address@hidden@}} @ogonek{--a}
 formatting.texi(mymacro,38) @code{@@address@hidden address@hidden @footnote{in 
footnote}
 formatting.texi(mymacro,38) @code{@@address@hidden address@hidden @footnote{in 
footnote2}
 formatting.texi(mymacro,38) 
@@ -1469,17 +1441,6 @@
 formatting.texi(mymacro,38) @quotation @*
 formatting.texi(mymacro,38) @end quotation
 formatting.texi(mymacro,38) 
-formatting.texi(mymacro,38) @smallquotation 
-formatting.texi(mymacro,38) A small quot---ation
-formatting.texi(mymacro,38) @end smallquotation
-formatting.texi(mymacro,38) 
-formatting.texi(mymacro,38) @smallquotation Note
-formatting.texi(mymacro,38) A small Note
-formatting.texi(mymacro,38) @end smallquotation
-formatting.texi(mymacro,38) 
-formatting.texi(mymacro,38) @smallquotation something, other thing
-formatting.texi(mymacro,38) something, other thing
-formatting.texi(mymacro,38) @end smallquotation
 formatting.texi(mymacro,38) 
 formatting.texi(mymacro,38) @itemize
 formatting.texi(mymacro,38) @item i--temize
@@ -1986,8 +1947,6 @@
 formatting.texi(mymacro,42) @code{@@address@hidden@}} @v{--a}
 formatting.texi(mymacro,42) @code{@@,@address@hidden @,{c}
 formatting.texi(mymacro,42) @code{@@,@address@hidden @,{--c}
-formatting.texi(mymacro,42) @code{@@address@hidden@}} @ogonek{a}
-formatting.texi(mymacro,42) @code{@@address@hidden@}} @ogonek{--a}
 formatting.texi(mymacro,42) @code{@@address@hidden address@hidden @footnote{in 
footnote}
 formatting.texi(mymacro,42) @code{@@address@hidden address@hidden @footnote{in 
footnote2}
 formatting.texi(mymacro,42) 
@@ -2064,17 +2023,6 @@
 formatting.texi(mymacro,42) @quotation @*
 formatting.texi(mymacro,42) @end quotation
 formatting.texi(mymacro,42) 
-formatting.texi(mymacro,42) @smallquotation 
-formatting.texi(mymacro,42) A small quot---ation
-formatting.texi(mymacro,42) @end smallquotation
-formatting.texi(mymacro,42) 
-formatting.texi(mymacro,42) @smallquotation Note
-formatting.texi(mymacro,42) A small Note
-formatting.texi(mymacro,42) @end smallquotation
-formatting.texi(mymacro,42) 
-formatting.texi(mymacro,42) @smallquotation something, other thing
-formatting.texi(mymacro,42) something, other thing
-formatting.texi(mymacro,42) @end smallquotation
 formatting.texi(mymacro,42) 
 formatting.texi(mymacro,42) @itemize
 formatting.texi(mymacro,42) @item i--temize

Index: test/formatting/res/texi_formatting/formatting.texi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/texi_formatting/formatting.texi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/formatting/res/texi_formatting/formatting.texi 11 Nov 2008 00:52:29 
-0000      1.3
+++ test/formatting/res/texi_formatting/formatting.texi 1 Jan 2009 22:35:22 
-0000       1.4
@@ -190,8 +190,6 @@
 @code{@@address@hidden@}} @v{--a}
 @code{@@,@address@hidden @,{c}
 @code{@@,@address@hidden @,{--c}
address@hidden@@address@hidden@}} @ogonek{a}
address@hidden@@address@hidden@}} @ogonek{--a}
 @code{@@address@hidden address@hidden @footnote{in footnote}
 @code{@@address@hidden address@hidden @footnote{in footnote2}
 
@@ -268,17 +266,6 @@
 @quotation @*
 @end quotation
 
address@hidden 
-A small quot---ation
address@hidden smallquotation
-
address@hidden Note
-A small Note
address@hidden smallquotation
-
address@hidden something, other thing
-something, other thing
address@hidden smallquotation
 
 @itemize
 @item i--temize
@@ -791,8 +778,6 @@
 @code{@@address@hidden@}} @v{--a}
 @code{@@,@address@hidden @,{c}
 @code{@@,@address@hidden @,{--c}
address@hidden@@address@hidden@}} @ogonek{a}
address@hidden@@address@hidden@}} @ogonek{--a}
 @code{@@address@hidden address@hidden @footnote{in footnote}
 @code{@@address@hidden address@hidden @footnote{in footnote2}
 
@@ -869,17 +854,6 @@
 @quotation @*
 @end quotation
 
address@hidden 
-A small quot---ation
address@hidden smallquotation
-
address@hidden Note
-A small Note
address@hidden smallquotation
-
address@hidden something, other thing
-something, other thing
address@hidden smallquotation
 
 @itemize
 @item i--temize
@@ -1392,8 +1366,6 @@
 @code{@@address@hidden@}} @v{--a}
 @code{@@,@address@hidden @,{c}
 @code{@@,@address@hidden @,{--c}
address@hidden@@address@hidden@}} @ogonek{a}
address@hidden@@address@hidden@}} @ogonek{--a}
 @code{@@address@hidden address@hidden @footnote{in footnote}
 @code{@@address@hidden address@hidden @footnote{in footnote2}
 
@@ -1470,17 +1442,6 @@
 @quotation @*
 @end quotation
 
address@hidden 
-A small quot---ation
address@hidden smallquotation
-
address@hidden Note
-A small Note
address@hidden smallquotation
-
address@hidden something, other thing
-something, other thing
address@hidden smallquotation
 
 @itemize
 @item i--temize
@@ -1987,8 +1948,6 @@
 @code{@@address@hidden@}} @v{--a}
 @code{@@,@address@hidden @,{c}
 @code{@@,@address@hidden @,{--c}
address@hidden@@address@hidden@}} @ogonek{a}
address@hidden@@address@hidden@}} @ogonek{--a}
 @code{@@address@hidden address@hidden @footnote{in footnote}
 @code{@@address@hidden address@hidden @footnote{in footnote2}
 
@@ -2065,17 +2024,6 @@
 @quotation @*
 @end quotation
 
address@hidden 
-A small quot---ation
address@hidden smallquotation
-
address@hidden Note
-A small Note
address@hidden smallquotation
-
address@hidden something, other thing
-something, other thing
address@hidden smallquotation
 
 @itemize
 @item i--temize

Index: test/layout/res/formatting_chm/formatting.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/layout/res/formatting_chm/formatting.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/layout/res/formatting_chm/formatting.html      11 Nov 2008 13:29:14 
-0000      1.9
+++ test/layout/res/formatting_chm/formatting.html      1 Jan 2009 22:35:23 
-0000       1.10
@@ -895,51 +895,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -1576,51 +1576,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -2270,41 +2270,41 @@
 </pre><blockquote><pre class="example">A quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note:</b> A Note
+</pre><blockquote><pre class="example"><b>Note:</b> A Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> note:</b> A note
+</pre><blockquote><pre class="example"><b>note:</b> A note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Caution:</b> Caution
+</pre><blockquote><pre class="example"><b>Caution:</b> Caution
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Important:</b> Important
+</pre><blockquote><pre class="example"><b>Important:</b> Important
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Tip:</b> a Tip
+</pre><blockquote><pre class="example"><b>Tip:</b> a Tip
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Warning:</b> a Warning.
+</pre><blockquote><pre class="example"><b>Warning:</b> a Warning.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something &eacute; TeX:</b> The 
something &eacute; TeX is here.
+</pre><blockquote><pre class="example"><b>something &eacute; TeX:</b> The 
something &eacute; TeX is here.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> @ at the end of line </b> A @ at 
the end of the @quotation line.
+</pre><blockquote><pre class="example"><b>@ at the end of line </b> A @ at the 
end of the @quotation line.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something, other thing:</b> 
something, other thing
+</pre><blockquote><pre class="example"><b>something, other thing:</b> 
something, other thing
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note, the note:</b> Note, the note
+</pre><blockquote><pre class="example"><b>Note, the note:</b> Note, the note
 </pre></blockquote>
 <pre class="example">
 </pre><blockquote></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Empty:</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>Empty:</b> </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> :</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>:</b> </pre></blockquote>
 <pre class="example">
 </pre><blockquote><pre class="example"><b> 
 :</b> </pre></blockquote>
@@ -2312,10 +2312,10 @@
 </pre><blockquote class="smallquotation"><pre class="example">A small 
quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> Note:</b> A 
small Note
+</pre><blockquote class="smallquotation"><pre class="example"><b>Note:</b> A 
small Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> something, 
other thing:</b> something, other thing
+</pre><blockquote class="smallquotation"><pre class="example"><b>something, 
other thing:</b> something, other thing
 </pre></blockquote>
 <pre class="example">
 </pre><ul>

Index: test/layout/res/formatting_exotic/formatting.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/layout/res/formatting_exotic/formatting.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- test/layout/res/formatting_exotic/formatting.html   11 Nov 2008 13:29:15 
-0000      1.14
+++ test/layout/res/formatting_exotic/formatting.html   1 Jan 2009 22:35:23 
-0000       1.15
@@ -910,51 +910,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -1591,51 +1591,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -2285,41 +2285,41 @@
 </pre><blockquote><pre class="example">A quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note:</b> A Note
+</pre><blockquote><pre class="example"><b>Note:</b> A Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> note:</b> A note
+</pre><blockquote><pre class="example"><b>note:</b> A note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Caution:</b> Caution
+</pre><blockquote><pre class="example"><b>Caution:</b> Caution
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Important:</b> Important
+</pre><blockquote><pre class="example"><b>Important:</b> Important
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Tip:</b> a Tip
+</pre><blockquote><pre class="example"><b>Tip:</b> a Tip
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Warning:</b> a Warning.
+</pre><blockquote><pre class="example"><b>Warning:</b> a Warning.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something &eacute; TeX:</b> The 
something &eacute; TeX is here.
+</pre><blockquote><pre class="example"><b>something &eacute; TeX:</b> The 
something &eacute; TeX is here.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> @ at the end of line </b> A @ at 
the end of the @quotation line.
+</pre><blockquote><pre class="example"><b>@ at the end of line </b> A @ at the 
end of the @quotation line.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something, other thing:</b> 
something, other thing
+</pre><blockquote><pre class="example"><b>something, other thing:</b> 
something, other thing
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note, the note:</b> Note, the note
+</pre><blockquote><pre class="example"><b>Note, the note:</b> Note, the note
 </pre></blockquote>
 <pre class="example">
 </pre><blockquote></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Empty:</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>Empty:</b> </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> :</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>:</b> </pre></blockquote>
 <pre class="example">
 </pre><blockquote><pre class="example"><b> 
 :</b> </pre></blockquote>
@@ -2327,10 +2327,10 @@
 </pre><blockquote class="smallquotation"><pre class="example">A small 
quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> Note:</b> A 
small Note
+</pre><blockquote class="smallquotation"><pre class="example"><b>Note:</b> A 
small Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> something, 
other thing:</b> something, other thing
+</pre><blockquote class="smallquotation"><pre class="example"><b>something, 
other thing:</b> something, other thing
 </pre></blockquote>
 <pre class="example">
 </pre><ul>

Index: test/layout/res/formatting_makeinfo/index.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/layout/res/formatting_makeinfo/index.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/layout/res/formatting_makeinfo/index.html      11 Nov 2008 13:29:17 
-0000      1.10
+++ test/layout/res/formatting_makeinfo/index.html      1 Jan 2009 22:35:24 
-0000       1.11
@@ -911,51 +911,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -1583,51 +1583,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -2268,41 +2268,41 @@
 </pre><blockquote><pre class="example">A quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note:</b> A Note
+</pre><blockquote><pre class="example"><b>Note:</b> A Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> note:</b> A note
+</pre><blockquote><pre class="example"><b>note:</b> A note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Caution:</b> Caution
+</pre><blockquote><pre class="example"><b>Caution:</b> Caution
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Important:</b> Important
+</pre><blockquote><pre class="example"><b>Important:</b> Important
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Tip:</b> a Tip
+</pre><blockquote><pre class="example"><b>Tip:</b> a Tip
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Warning:</b> a Warning.
+</pre><blockquote><pre class="example"><b>Warning:</b> a Warning.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something &eacute; TeX:</b> The 
something &eacute; TeX is here.
+</pre><blockquote><pre class="example"><b>something &eacute; TeX:</b> The 
something &eacute; TeX is here.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> @ at the end of line </b> A @ at 
the end of the @quotation line.
+</pre><blockquote><pre class="example"><b>@ at the end of line </b> A @ at the 
end of the @quotation line.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something, other thing:</b> 
something, other thing
+</pre><blockquote><pre class="example"><b>something, other thing:</b> 
something, other thing
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note, the note:</b> Note, the note
+</pre><blockquote><pre class="example"><b>Note, the note:</b> Note, the note
 </pre></blockquote>
 <pre class="example">
 </pre><blockquote></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Empty:</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>Empty:</b> </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> :</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>:</b> </pre></blockquote>
 <pre class="example">
 </pre><blockquote><pre class="example"><b> 
 :</b> </pre></blockquote>
@@ -2310,10 +2310,10 @@
 </pre><blockquote class="smallquotation"><pre class="example">A small 
quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> Note:</b> A 
small Note
+</pre><blockquote class="smallquotation"><pre class="example"><b>Note:</b> A 
small Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> something, 
other thing:</b> something, other thing
+</pre><blockquote class="smallquotation"><pre class="example"><b>something, 
other thing:</b> something, other thing
 </pre></blockquote>
 <pre class="example">
 </pre><ul>

Index: test/layout/res/formatting_regions/formatting_regions.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/layout/res/formatting_regions/formatting_regions.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- test/layout/res/formatting_regions/formatting_regions.html  11 Nov 2008 
13:29:17 -0000      1.15
+++ test/layout/res/formatting_regions/formatting_regions.html  1 Jan 2009 
22:35:25 -0000       1.16
@@ -893,51 +893,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -1561,51 +1561,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -2266,51 +2266,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>
@@ -2950,41 +2950,41 @@
 </pre><blockquote><pre class="example">A quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note:</b> A Note
+</pre><blockquote><pre class="example"><b>Note:</b> A Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> note:</b> A note
+</pre><blockquote><pre class="example"><b>note:</b> A note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Caution:</b> Caution
+</pre><blockquote><pre class="example"><b>Caution:</b> Caution
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Important:</b> Important
+</pre><blockquote><pre class="example"><b>Important:</b> Important
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Tip:</b> a Tip
+</pre><blockquote><pre class="example"><b>Tip:</b> a Tip
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Warning:</b> a Warning.
+</pre><blockquote><pre class="example"><b>Warning:</b> a Warning.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something &eacute; TeX:</b> The 
something &eacute; TeX is here.
+</pre><blockquote><pre class="example"><b>something &eacute; TeX:</b> The 
something &eacute; TeX is here.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> @ at the end of line </b> A @ at 
the end of the @quotation line.
+</pre><blockquote><pre class="example"><b>@ at the end of line </b> A @ at the 
end of the @quotation line.
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> something, other thing:</b> 
something, other thing
+</pre><blockquote><pre class="example"><b>something, other thing:</b> 
something, other thing
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Note, the note:</b> Note, the note
+</pre><blockquote><pre class="example"><b>Note, the note:</b> Note, the note
 </pre></blockquote>
 <pre class="example">
 </pre><blockquote></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> Empty:</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>Empty:</b> </pre></blockquote>
 <pre class="example">
-</pre><blockquote><pre class="example"><b> :</b> </pre></blockquote>
+</pre><blockquote><pre class="example"><b>:</b> </pre></blockquote>
 <pre class="example">
 </pre><blockquote><pre class="example"><b> 
 :</b> </pre></blockquote>
@@ -2992,10 +2992,10 @@
 </pre><blockquote class="smallquotation"><pre class="example">A small 
quot---ation
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> Note:</b> A 
small Note
+</pre><blockquote class="smallquotation"><pre class="example"><b>Note:</b> A 
small Note
 </pre></blockquote>
 <pre class="example">
-</pre><blockquote class="smallquotation"><pre class="example"><b> something, 
other thing:</b> something, other thing
+</pre><blockquote class="smallquotation"><pre class="example"><b>something, 
other thing:</b> something, other thing
 </pre></blockquote>
 <pre class="example">
 </pre><ul>
@@ -3627,51 +3627,51 @@
 <blockquote><p>A quot&mdash;ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote class="smallquotation"><p>A small quot&mdash;ation
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> Note:</b> A small Note
+<blockquote class="smallquotation"><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote class="smallquotation"><p><b> something, other thing:</b> 
something, other thing
+<blockquote class="smallquotation"><p><b>something, other thing:</b> 
something, other thing
 </p></blockquote>
 
 <ul>

Index: test/misc/res/formatting_html32/formatting.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/misc/res/formatting_html32/formatting.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- test/misc/res/formatting_html32/formatting.html     11 Nov 2008 13:29:17 
-0000      1.15
+++ test/misc/res/formatting_html32/formatting.html     1 Jan 2009 22:35:26 
-0000       1.16
@@ -893,51 +893,51 @@
 <blockquote><p>A quot--ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote><p>A small quot--ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A small Note
+<blockquote><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
 <ul>
@@ -1575,51 +1575,51 @@
 <blockquote><p>A quot--ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A Note
+<blockquote><p><b>Note:</b> A Note
 </p></blockquote>
 
-<blockquote><p><b> note:</b> A note
+<blockquote><p><b>note:</b> A note
 </p></blockquote>
 
-<blockquote><p><b> Caution:</b> Caution
+<blockquote><p><b>Caution:</b> Caution
 </p></blockquote>
 
-<blockquote><p><b> Important:</b> Important
+<blockquote><p><b>Important:</b> Important
 </p></blockquote>
 
-<blockquote><p><b> Tip:</b> a Tip
+<blockquote><p><b>Tip:</b> a Tip
 </p></blockquote>
 
-<blockquote><p><b> Warning:</b> a Warning.
+<blockquote><p><b>Warning:</b> a Warning.
 </p></blockquote>
 
-<blockquote><p><b> something &eacute; TeX:</b> The something &eacute; TeX is 
here.
+<blockquote><p><b>something &eacute; TeX:</b> The something &eacute; TeX is 
here.
 </p></blockquote>
 
-<blockquote><p><b> @ at the end of line </b> A @ at the end of the @quotation 
line.
+<blockquote><p><b>@ at the end of line </b> A @ at the end of the @quotation 
line.
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
-<blockquote><p><b> Note, the note:</b> Note, the note
+<blockquote><p><b>Note, the note:</b> Note, the note
 </p></blockquote>
 
 <blockquote></blockquote>
 
-<blockquote><p><b> Empty:</b> </p></blockquote>
+<blockquote><p><b>Empty:</b> </p></blockquote>
 
-<blockquote><p><b> :</b> </p></blockquote>
+<blockquote><p><b>:</b> </p></blockquote>
 
-<blockquote><p><b> <br>:</b> </p></blockquote>
+<blockquote><p><b><br>:</b> </p></blockquote>
 
 <blockquote><p>A small quot--ation
 </p></blockquote>
 
-<blockquote><p><b> Note:</b> A small Note
+<blockquote><p><b>Note:</b> A small Note
 </p></blockquote>
 
-<blockquote><p><b> something, other thing:</b> something, other thing
+<blockquote><p><b>something, other thing:</b> something, other thing
 </p></blockquote>
 
 <ul>
@@ -2270,41 +2270,41 @@
 </pre><blockquote><pre>A quot---ation
 </pre></blockquote>
 <pre>
-</pre><blockquote><pre><b> Note:</b> A Note
+</pre><blockquote><pre><b>Note:</b> A Note
 </pre></blockquote>
 <pre>
-</pre><blockquote><pre><b> note:</b> A note
+</pre><blockquote><pre><b>note:</b> A note
 </pre></blockquote>
 <pre>
-</pre><blockquote><pre><b> Caution:</b> Caution
+</pre><blockquote><pre><b>Caution:</b> Caution
 </pre></blockquote>
 <pre>
-</pre><blockquote><pre><b> Important:</b> Important
+</pre><blockquote><pre><b>Important:</b> Important
 </pre></blockquote>
 <pre>
-</pre><blockquote><pre><b> Tip:</b> a Tip
+</pre><blockquote><pre><b>Tip:</b> a Tip
 </pre></blockquote>
 <pre>
-</pre><blockquote><pre><b> Warning:</b> a Warning.
+</pre><blockquote><pre><b>Warning:</b> a Warning.
 </pre></blockquote>
 <pre>
-</pre><blockquote><pre><b> something &eacute; TeX:</b> The something &eacute; 
TeX is here.
+</pre><blockquote><pre><b>something &eacute; TeX:</b> The something &eacute; 
TeX is here.
 </pre></blockquote>
 <pre>
-</pre><blockquote><pre><b> @ at the end of line </b> A @ at the end of the 
@quotation line.
+</pre><blockquote><pre><b>@ at the end of line </b> A @ at the end of the 
@quotation line.
 </pre></blockquote>
 <pre>
-</pre><blockquote><pre><b> something, other thing:</b> something, other thing
+</pre><blockquote><pre><b>something, other thing:</b> something, other thing
 </pre></blockquote>
 <pre>
-</pre><blockquote><pre><b> Note, the note:</b> Note, the note
+</pre><blockquote><pre><b>Note, the note:</b> Note, the note
 </pre></blockquote>
 <pre>
 </pre><blockquote></blockquote>
 <pre>
-</pre><blockquote><pre><b> Empty:</b> </pre></blockquote>
+</pre><blockquote><pre><b>Empty:</b> </pre></blockquote>
 <pre>
-</pre><blockquote><pre><b> :</b> </pre></blockquote>
+</pre><blockquote><pre><b>:</b> </pre></blockquote>
 <pre>
 </pre><blockquote><pre><b> 
 :</b> </pre></blockquote>
@@ -2312,10 +2312,10 @@
 </pre><blockquote><pre>A small quot---ation
 </pre></blockquote>
 <pre>
-</pre><blockquote><pre><b> Note:</b> A small Note
+</pre><blockquote><pre><b>Note:</b> A small Note
 </pre></blockquote>
 <pre>
-</pre><blockquote><pre><b> something, other thing:</b> something, other thing
+</pre><blockquote><pre><b>something, other thing:</b> something, other thing
 </pre></blockquote>
 <pre>
 </pre><ul>

Index: test/nested_formats/res/nested_multitable/nested_formats.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_multitable/nested_formats.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/nested_formats/res/nested_multitable/nested_formats.html       26 Nov 
2008 19:09:05 -0000      1.8
+++ test/nested_formats/res/nested_multitable/nested_formats.html       1 Jan 
2009 22:35:27 -0000       1.9
@@ -434,15 +434,15 @@
 
 
 
-Something
-
-Something
-
-Something2
-<p>After
+<p>Something
 </p>
-Something2
-<p>After
+<p>Something
+</p>
+<p>Something2
+</p><p>After
+</p>
+<p>Something2
+</p><p>After
 </p>
 
 <br>
@@ -507,15 +507,15 @@
 
 
 
-Something
-
-Something
-
-Something2
-<p>After
+<p>Something
 </p>
-Something2
-<p>After
+<p>Something
+</p>
+<p>Something2
+</p><p>After
+</p>
+<p>Something2
+</p><p>After
 </p>
 
 <br>
[Prev in Thread]
Current Thread
[Next in Thread]
[Texi2html-cvs] texi2html ChangeLog texi2html.init texi2html.pl..., Patrice Dumas <=
Next by Date: [Texi2html-cvs] texi2html ChangeLog Makefile.in NEWS aclocal.m4...
Next by thread: [Texi2html-cvs] texi2html ChangeLog Makefile.in NEWS aclocal.m4...
Index(es):
- Date
- Thread