[Texi2html-cvs] texi2html ChangeLog texi2html.pl Tests/formatti...

[Patrice Dumas]

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        07/10/04 10:12:01

Modified files:
        .              : ChangeLog texi2html.pl 
        Tests/formatting_res: heading.html 

Log message:
                Don't associate headings with the following index entries.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.277&r2=1.278
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.191&r2=1.192
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/heading.html?cvsroot=texi2html&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -b -r1.277 -r1.278
--- ChangeLog   3 Oct 2007 23:56:51 -0000       1.277
+++ ChangeLog   4 Oct 2007 10:12:01 -0000       1.278
@@ -2,6 +2,7 @@
 
        * texi2html.pl, texi2html.init: handle headings more like normal
        @-commands and not like sectionning commands.
+       Don't associate headings with the following index entries.
        * Tests/*: add tests for headings
 
 2007-10-03  Patrice Dumas  <address@hidden>

Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -b -r1.191 -r1.192
--- texi2html.pl        3 Oct 2007 23:56:51 -0000       1.191
+++ texi2html.pl        4 Oct 2007 10:12:01 -0000       1.192
@@ -60,7 +60,7 @@
 #--##########################################################################
 
 # CVS version:
-# $Id: texi2html.pl,v 1.191 2007/10/03 23:56:51 pertusus Exp $
+# $Id: texi2html.pl,v 1.192 2007/10/04 10:12:01 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -3454,7 +3454,6 @@
     my $state = shift;
     $name = normalise_space($name);
     $name = '' if (!defined($name));
-    $state->{'after_element'} = 1;
     # no increase if in @copying and the like. Also no increase if it is top
     # since top has number 0.
     my $docid;
@@ -3627,11 +3626,13 @@
                     }
                 }
                 elsif (defined($sec2level{$tag}))
-                { # section or heading
+                { # section
                     if (/address@hidden(.*)$/)
                     {
                         my $name = $1;
                         my $section_ref = new_section_heading($tag, $name, 
$state);
+                        $state->{'after_element'} = 1;
+
                         $section_ref->{'seen'} = 1;
                         $section_ref->{'index_names'} = [];
                         $section_ref->{'current_place'} = [];
@@ -6361,13 +6362,7 @@
                 }
                 my $new_element;
                 my $current_element;
-#                if ($tag =~ /heading/)
-#                {
-#                    my $heading_element = $sections{$sec_num};
-#                    push (@section_lines, 
&$Texi2HTML::Config::anchor($heading_element->{'id'}) . "\n");
-#                    push @section_lines, 
&$Texi2HTML::Config::heading($heading_element);
-#                }
-#                elsif (!$index_pages)
+
                 if (!$index_pages)
                 {# handle node and structuring elements
                     $current_element = shift (@all_elements);
@@ -6551,7 +6546,9 @@
                 if ($current_element->{'element'} and 
!$current_element->{'top'})
                 {
                     &$Texi2HTML::Config::print_element_header($FH, 
$first_section, $previous_is_top) if (!$one_section);
-                    push @section_lines, 
&$Texi2HTML::Config::heading($current_element) 
+                    my $line = $_;
+                    $line =~ s/address@hidden//;
+                    push @section_lines, 
&$Texi2HTML::Config::heading($current_element, $tag, $line, 
substitute_line($line));
                 }
                 next;
             }

Index: Tests/formatting_res/heading.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/formatting_res/heading.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Tests/formatting_res/heading.html   3 Oct 2007 23:56:51 -0000       1.1
+++ Tests/formatting_res/heading.html   4 Oct 2007 10:12:01 -0000       1.2
@@ -132,7 +132,7 @@
 <tr><td></td><td valign="top"><a href="#SEC_Top">cindex copying</a></td><td 
valign="top"><a href="#SEC_Top">Test headings</a></td></tr>
 <tr><td colspan="3"> <hr></td></tr>
 <tr><th><a name="SEC6_1">H</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="#SEC4">heading in footnote</a></td><td 
valign="top"><a href="#SEC4">heading in footnote @ 
<em>heading</em></a></td></tr>
+<tr><td></td><td valign="top"><a href="#IDX1">heading in footnote</a></td><td 
valign="top"><a href="#SEC4">heading in footnote @ 
<em>heading</em></a></td></tr>
 <tr><td colspan="3"> <hr></td></tr>
 </table>
 <table><tr><th valign="top">Jump to: &nbsp; </th><td><a href="#SEC6_0" 
class="summary-letter"><b>C</b></a>
@@ -160,6 +160,7 @@
 
 <a name="SEC5"></a>
 <h2 class="heading"> heading in footnote @ <em>heading</em> </h2>
+<a name="IDX1"></a>
 <a name="SEC5"></a>
 <h2 class="heading"> second heading in footnote @ <em>heading</em> </h2>
 <hr size="1">