texi2html-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Patrice Dumas
Subject: [Texi2html-cvs] texi2html ChangeLog texi2html.pl examples/info....
Date: Thu, 08 Jan 2009 12:42:35 +0000 
CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        09/01/08 12:42:34

Modified files:
        .              : ChangeLog texi2html.pl 
        examples       : info.init 
        test/sectionning/res/no_node_directions: no_node.html 

Log message:
                Fix get_node to only return node elements.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.359&r2=1.360
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.256&r2=1.257
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/info.init?cvsroot=texi2html&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/no_node_directions/no_node.html?cvsroot=texi2html&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -b -r1.359 -r1.360
--- ChangeLog   8 Jan 2009 00:21:32 -0000       1.359
+++ ChangeLog   8 Jan 2009 12:42:33 -0000       1.360
@@ -2,6 +2,7 @@
 
        * texi2html.pl, texi2html.init: centerchap is unnumbered.
        Pass the index entry reference to index entry formatting functions.
+       Fix get_node to only return node elements.
        * examples/docbook.init: add the node as id only for the sectionning
        element associated with that node.
 

Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -b -r1.256 -r1.257
--- texi2html.pl        8 Jan 2009 00:21:33 -0000       1.256
+++ texi2html.pl        8 Jan 2009 12:42:33 -0000       1.257
@@ -74,7 +74,7 @@
 }
 
 # CVS version:
-# $Id: texi2html.pl,v 1.256 2009/01/08 00:21:33 pertusus Exp $
+# $Id: texi2html.pl,v 1.257 2009/01/08 12:42:33 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -6682,7 +6682,6 @@
     return undef if (!defined($element));
     return $element if ($element->{'node'});
     return $element->{'with_node'} if ($element->{'with_node'});
-    return $element;
 }
 
 sub do_section_names($$)

Index: examples/info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/info.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- examples/info.init  8 Jan 2009 00:21:35 -0000       1.13
+++ examples/info.init  8 Jan 2009 12:42:34 -0000       1.14
@@ -233,6 +233,21 @@
     return $copying_text;
 }
 
+sub info_default_count_lines($)
+{
+      my $text = shift;
+      my @lines = split /^/, $text;
+      my $line_passed = scalar(@lines);
+      $line_passed-- if ($line_passed);
+      my $end_of_line = 0;
+      if (chomp($text))
+      {
+         $line_passed++;
+         $end_of_line = 1;
+      }
+      return ($line_passed, $end_of_line,$lines[-1]);
+}
+
 # FIXME initialize
 my %info_default_state_map = ();
 my $info_default_state;
@@ -468,7 +483,6 @@
       last if (!defined($current));
       my $content = $current->{'content'}->[$index];
       my $text_added = '';
-      my $line_passed = 0;
 
 my $line_char_counter_text = 'undef';
 $line_char_counter_text = "$line_char_counter" if 
(defined($line_char_counter));
@@ -476,7 +490,9 @@
 $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 $in_node_count = 0;
+$in_node_count = $info_state->{'line_count'} if 
defined($info_state->{'line_count'});
+      print STDERR 
"($text_command|$text_length|$close|${all_line_passed}+$in_node_count) 
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";
@@ -546,11 +562,11 @@
               }
               elsif ($content->{'command'} eq 'index_label')
               {
-                  my $index_line_nr = $all_line_passed +$line_passed + 
$info_state->{'line_count'};
+                  my $index_line_nr = $all_line_passed + 
$info_state->{'line_count'};
                   my $index_name = $content->{'index_name'};
                   $info_default_index_line_string_length{$index_name} = 
length($index_line_nr) 
                       if 
(!defined($info_default_index_line_string_length{$index_name}) or 
$info_default_index_line_string_length{$index_name} < length($index_line_nr));
-#print STDERR "RRRRRRRRRRRRR $content->{'index_entry_reference'}->{'texi'}    
$index_name $index_line_nr 
$info_default_index_line_string_length{$index_name}\n";
+print STDERR "RRRRRRRRRRRRR $content->{'index_entry_reference'}->{'texi'}   
name: $index_name line: $index_line_nr max: 
$info_default_index_line_string_length{$index_name}\n";
                   
$info_default_index_entries{$content->{'index_entry_reference'}} = { 
'index_entry_reference' => $content->{'index_entry_reference'}, 'line_nr' => 
$index_line_nr, 'index_name' => $index_name };
               }
               elsif ($content->{'command'} eq '*' and !$preformatted)
@@ -653,7 +669,10 @@
       }
       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 '');
+          # the line_passed returned here are not used, since they are 
computed
+          # below.
+          my $dummy_line_passed;
+          ($line_char_counter, $pending_spaces, $pending_word, 
$dummy_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
       {
@@ -673,21 +692,17 @@
 print STDERR "ADDING `$text_added'\n" if ($text_added ne '');
       $result .= $text_added;
       $length += length($text_added);
+      my ($line_passed, $end_of_line, $last_line) = 
info_default_count_lines($text_added);
 
-      my @lines = split /^/, $text_added;
-      $line_passed += scalar(@lines);
-      $line_passed-- if ($line_passed);
-      my $chomped_text = $text_added;
-      if (chomp($chomped_text))
+      if ($end_of_line)
       {
-         $line_passed++;
          $line_char_counter = 0 if (defined($line_char_counter));
          $line_beginning = 1 if ($preformatted);
       }
       elsif (defined($line_char_counter) and $line_passed)
       {# in that case we added more than one line, the $line_char_counter
        # is reset to the last line length.
-         $line_char_counter = length($lines[-1]);
+         $line_char_counter = length($last_line);
       }
       $all_line_passed += $line_passed;
     iterate:
@@ -1062,7 +1077,7 @@
        $result .= ','.&$I('  Up: %{node_up}', {'node_up' => 
$Texi2HTML::THIS_ELEMENT->{'NodeUp'}->{'text'}});
     }
     $result .= "\n\n";
-    $info_default_line_count = 2;
+    $info_default_line_count = 3;
     $info_default_offset_in_file += length($result);
     
     return $before.$result;
@@ -1095,9 +1110,10 @@
        $info_state->{'waiting_for_line'} = 0;
        $info_default_line_count++;
     }
-    # FIXME use state
+    # FIXME use state for headings appearing somewhere strange. + maybe
+    # waiting_for_line should also be used for headings
     $info_default_offset_in_file += length($heading);
-    $info_default_line_count += 2;
+    $info_default_line_count += 3;
     return $heading;
 }
 
@@ -1534,7 +1550,9 @@
     return $before if (!defined($text));
     my $result = "\x{00}\x{08}[index\x{00}\x{08}]\n* Menu:\n\n" .$text."\n";
     $info_default_offset_in_file += length($result);
-    # FIXME count lines
+    # FIXME set waiting_for_line?
+    my ($line_passed, $end_of_line, $last_line) = 
info_default_count_lines($result);
+    $info_default_line_count += $line_passed;
     return $before.$result;
 }
 
@@ -1566,7 +1584,7 @@
     return info_default_output($info_state);
 }
 
-my $info_default_index_length_to_node = 36;
+my $info_default_index_length_to_node = 41;
 sub info_default_index_entry($$$$$$$$)
 {
     my $text_href = shift;
@@ -1586,12 +1604,13 @@
     {
        $result .= ' ' x($info_default_index_length_to_node - length($result));
     }
-    $result .= $element_text;
+    $result .= $element_text . '.';
     my $info_index_entry_ref = $info_default_index_entries{$index_entry_ref};
     my $line_nr = $info_index_entry_ref->{'line_nr'};
     my $max_len = 
$info_default_index_line_string_length{$info_index_entry_ref->{'index_name'}};
-    my $line_nr_spaces = sprintf("% ${max_len}d", $line_nr);
+    my $line_nr_spaces = sprintf("%${max_len}d", $line_nr);
     my $line_part = "(line ${line_nr_spaces})";
+print STDERR "GGGGGGGGGG name: $info_index_entry_ref->{'index_name'} max: 
${max_len} line_nr: `$line_nr' line_nr_spaces `$line_nr_spaces' $line_part \n";
     if (length($result)+length($line_part) >  $info_default_max_column)
     {
         $result .= "\n" . ' ' x ($info_default_max_column - 
length($line_part)) ;

Index: test/sectionning/res/no_node_directions/no_node.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/sectionning/res/no_node_directions/no_node.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/sectionning/res/no_node_directions/no_node.html        1 Nov 2008 
18:28:27 -0000       1.5
+++ test/sectionning/res/no_node_directions/no_node.html        8 Jan 2009 
12:42:34 -0000       1.6
@@ -113,9 +113,9 @@
 <td valign="middle" align="left">node-NodeUp</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-NodeUp</td>
-<td valign="middle" align="left">#top-section</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-NodeUp</td>
-<td valign="middle" align="left">top section</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-NodePrev</td>
@@ -129,17 +129,17 @@
 <td valign="middle" align="left">node-NodeNext</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-NodeNext</td>
-<td valign="middle" align="left">#top-section</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-NodeNext</td>
-<td valign="middle" align="left">top section</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Following</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-Following</td>
-<td valign="middle" align="left">#second</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-Following</td>
-<td valign="middle" align="left">0.1 second</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 </tr></table>
 <h1 class="unnumbered">unnumbered</h1>
@@ -225,25 +225,25 @@
 <td valign="middle" align="left">node-NodePrev</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-NodePrev</td>
-<td valign="middle" align="left">#unnumbered</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-NodePrev</td>
-<td valign="middle" align="left">unnumbered</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-NodeNext</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-NodeNext</td>
-<td valign="middle" align="left">#Chapter</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-NodeNext</td>
-<td valign="middle" align="left">1. Chapter</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Following</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-Following</td>
-<td valign="middle" align="left">#Chapter</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-Following</td>
-<td valign="middle" align="left">1. Chapter</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 </tr></table>
 <h1 class="settitle">top section</h1>
@@ -321,9 +321,9 @@
 <td valign="middle" align="left">node-NodeUp</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-NodeUp</td>
-<td valign="middle" align="left">#unnumbered</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-NodeUp</td>
-<td valign="middle" align="left">unnumbered</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-NodePrev</td>
@@ -345,9 +345,9 @@
 <td valign="middle" align="left">node-Following</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-Following</td>
-<td valign="middle" align="left">#Chapter</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-Following</td>
-<td valign="middle" align="left">1. Chapter</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 </tr></table>
 <h2 class="section">0.1 second</h2>
@@ -425,33 +425,33 @@
 <td valign="middle" align="left">node-NodeUp</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-NodeUp</td>
-<td valign="middle" align="left">#top-section</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-NodeUp</td>
-<td valign="middle" align="left">top section</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-NodePrev</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-NodePrev</td>
-<td valign="middle" align="left">#top-section</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-NodePrev</td>
-<td valign="middle" align="left">top section</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-NodeNext</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-NodeNext</td>
-<td valign="middle" align="left">#Chapter-2</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-NodeNext</td>
-<td valign="middle" align="left">2. Chapter 2</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Following</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-Following</td>
-<td valign="middle" align="left">#Section-of-chapter</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-Following</td>
-<td valign="middle" align="left">1.1 Section of chapter</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 </tr></table>
 <h1 class="chapter">1. Chapter</h1>
@@ -529,9 +529,9 @@
 <td valign="middle" align="left">node-NodeUp</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-NodeUp</td>
-<td valign="middle" align="left">#Chapter</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-NodeUp</td>
-<td valign="middle" align="left">1. Chapter</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-NodePrev</td>
@@ -553,9 +553,9 @@
 <td valign="middle" align="left">node-Following</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-Following</td>
-<td valign="middle" align="left">#subsection-1</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-Following</td>
-<td valign="middle" align="left">1.1.1 subsection 1</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 </tr></table>
 <h2 class="section">1.1 Section of chapter</h2>
@@ -631,9 +631,9 @@
 <td valign="middle" align="left">node-NodeUp</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-NodeUp</td>
-<td valign="middle" align="left">#Section-of-chapter</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-NodeUp</td>
-<td valign="middle" align="left">1.1 Section of chapter</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-NodePrev</td>
@@ -647,17 +647,17 @@
 <td valign="middle" align="left">node-NodeNext</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-NodeNext</td>
-<td valign="middle" align="left">#subsection-2</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-NodeNext</td>
-<td valign="middle" align="left">1.1.2 subsection 2</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-Following</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-Following</td>
-<td valign="middle" align="left">#subsection-2</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-Following</td>
-<td valign="middle" align="left">1.1.2 subsection 2</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 </tr></table>
 <h3 class="subsection">1.1.1 subsection 1</h3>
@@ -733,17 +733,17 @@
 <td valign="middle" align="left">node-NodeUp</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-NodeUp</td>
-<td valign="middle" align="left">#Section-of-chapter</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-NodeUp</td>
-<td valign="middle" align="left">1.1 Section of chapter</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-NodePrev</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-NodePrev</td>
-<td valign="middle" align="left">#subsection-1</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-NodePrev</td>
-<td valign="middle" align="left">1.1.1 subsection 1</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-NodeNext</td>
@@ -757,9 +757,9 @@
 <td valign="middle" align="left">node-Following</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-Following</td>
-<td valign="middle" align="left">#Chapter-2</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-Following</td>
-<td valign="middle" align="left">2. Chapter 2</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 </tr></table>
 <h3 class="subsection">1.1.2 subsection 2</h3>
@@ -835,17 +835,17 @@
 <td valign="middle" align="left">node-NodeUp</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-NodeUp</td>
-<td valign="middle" align="left">#top-section</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-NodeUp</td>
-<td valign="middle" align="left">top section</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-NodePrev</td>
 <td valign="middle" align="left"></td>
 <td valign="middle" align="left">href-NodePrev</td>
-<td valign="middle" align="left">#Chapter</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">name-NodePrev</td>
-<td valign="middle" align="left">1. Chapter</td>
+<td valign="middle" align="left"></td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">|</td>
 <td valign="middle" align="left">node-NodeNext</td>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]