[Texi2html-cvs] texi2html ChangeLog texi2html.pl examples/info....

[Patrice Dumas]

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        09/01/05 11:44:49

Modified files:
        .              : ChangeLog texi2html.pl 
        examples       : info.init 

Log message:
                * texi2html.pl: don't duplicate the state for menu entry 
                formatting, use the main state.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.354&r2=1.355
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.254&r2=1.255
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/info.init?cvsroot=texi2html&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -b -r1.354 -r1.355
--- ChangeLog   5 Jan 2009 01:00:22 -0000       1.354
+++ ChangeLog   5 Jan 2009 11:44:48 -0000       1.355
@@ -1,4 +1,9 @@
-2009-01-01  Patrice Dumas  <address@hidden>
+2009-01-05  Patrice Dumas  <address@hidden>
+
+       * texi2html.pl: don't duplicate the state for menu entry 
+       formatting, use the main state.
+
+2009-01-04  Patrice Dumas  <address@hidden>
 
        * texi2html.pl: add a hook at for the end of special regions 
        processing.

Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -b -r1.254 -r1.255
--- texi2html.pl        5 Jan 2009 01:00:22 -0000       1.254
+++ texi2html.pl        5 Jan 2009 11:44:48 -0000       1.255
@@ -74,7 +74,7 @@
 }
 
 # CVS version:
-# $Id: texi2html.pl,v 1.254 2009/01/05 01:00:22 pertusus Exp $
+# $Id: texi2html.pl,v 1.255 2009/01/05 11:44:48 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -9462,7 +9462,6 @@
     # normalise_node is used in fact to determine if name is empty. 
     # It is not passed down to the function reference.
     my $name = normalise_node($menu_entry->{'name'});
-    my $substitution_state = duplicate_formatting_state($state);
 
     my $node_substitution_state = duplicate_formatting_state($state);
     my $name_substitution_state = duplicate_formatting_state($state);
@@ -9538,7 +9537,7 @@
     # save the element used for the href for the description
     $menu_entry->{'menu_reference_element'} = $element;
 
-    return &$Texi2HTML::Config::menu_link($entry, $substitution_state, $href, 
$node_formatted, $name_formatted, $menu_entry->{'ending'}, $has_name, 
$state->{'command_stack'}, $state->{'preformatted'});
+    return &$Texi2HTML::Config::menu_link($entry, $state, $href, 
$node_formatted, $name_formatted, $menu_entry->{'ending'}, $has_name, 
$state->{'command_stack'}, $state->{'preformatted'});
 }
 
 sub do_menu_description($$)
@@ -11744,6 +11743,7 @@
                 if ($Texi2HTML::Config::SIMPLE_MENU)
                 {
                     add_prev ($text, $stack, do_menu_link($state, $line_nr, 
$menu_entry));
+                    #dump_stack($text, $stack, $state);
                 }
                 else
                 {
@@ -13685,7 +13685,8 @@
             $pre_style = $preformatted_style->{'pre_style'} if (exists 
$preformatted_style->{'pre_style'});
             my $class = '';
             $class = $preformatted_style->{'class'} if (exists 
$preformatted_style->{'class'});
-            my $style = $preformatted_style->{'style'} if (exists 
$preformatted_style->{'style'});
+            my $style = '';
+            $style = $preformatted_style->{'style'} if (exists 
$preformatted_style->{'style'});
             print STDERR "($pre_style, $class,$style)";
         }
         print STDERR "\n";

Index: examples/info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/info.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- examples/info.init  5 Jan 2009 01:00:24 -0000       1.10
+++ examples/info.init  5 Jan 2009 11:44:49 -0000       1.11
@@ -468,11 +468,13 @@
                   $indent_level--;
                   #Â don't do that for quotations, quotations already have
                   #Â end of paragraph end of lines.
+                  $text_added = $content->{'end'} if 
defined($content->{'end'});
                   if ($indent_level > 0 and 
$complex_format_map->{$content->{'command'}})
                   {
                      $text_added .= "\n";
                   }
                   #$line_beginning = 1;
+                  $info_state->{'waiting_for_line'} = 1 if ($indent_level == 
0);
                   goto new_text;
               }
               if ($content->{'command'} eq 'paragraph')
@@ -500,6 +502,7 @@
               {
                   my $pending;
                   ($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));
+                  #Â here spaces out of any environment are ignored.
                   if (defined($line_char_counter) or ($preformatted) or 
$pending !~ /^\s*$/)
                   {
                       $length += length($pending);