[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog texi2html.pl test/sectionni...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog texi2html.pl test/sectionni... |
|
Date: |
Thu, 03 Sep 2009 19:22:10 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 09/09/03 19:22:10
Modified files:
. : ChangeLog texi2html.pl
test/sectionning/res/more_nodes_than_sections:
more_nodes_than_sections_0.html
more_nodes_than_sections_2.html
Log message:
* texi2html.pl: associate node directions with a section only
if there is an associated node.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.421&r2=1.422
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.322&r2=1.323
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/more_nodes_than_sections/more_nodes_than_sections_0.html?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/more_nodes_than_sections/more_nodes_than_sections_2.html?cvsroot=texi2html&r1=1.6&r2=1.7
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -b -r1.421 -r1.422
--- ChangeLog 3 Sep 2009 15:06:07 -0000 1.421
+++ ChangeLog 3 Sep 2009 19:22:09 -0000 1.422
@@ -2,6 +2,8 @@
* texi2html.init, formats/*: don't remove spaces again in
@quotation formatting.
+ * texi2html.pl: associate node directions with a section only
+ if there is an associated node.
2009-09-02 Patrice Dumas <address@hidden>
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -b -r1.322 -r1.323
--- texi2html.pl 3 Sep 2009 15:06:07 -0000 1.322
+++ texi2html.pl 3 Sep 2009 19:22:10 -0000 1.323
@@ -86,7 +86,7 @@
}
# CVS version:
-# $Id: texi2html.pl,v 1.322 2009/09/03 15:06:07 pertusus Exp $
+# $Id: texi2html.pl,v 1.323 2009/09/03 19:22:10 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -6594,8 +6594,7 @@
$node_nr++;
}
- # do node directions for sections
- # FIXME: really do that?
+ # do node directions for sections.
foreach my $section (@sections_list)
{
# If the element is not a node, then all the node directions are copied
@@ -6611,58 +6610,8 @@
$section->{'nodeup'} = $section->{'with_node'}->{'nodeup'};
$section->{'following'} = $section->{'with_node'}->{'following'};
}
- else
- { # the section has no node associated. Find the node directions using
- # sections
- if (defined($section->{'toplevelnext'}))
- {
- $section->{'nodenext'} = get_node($section->{'toplevelnext'});
- }
- elsif (defined($section->{'sectionnext'}))
- {
- $section->{'nodenext'} = get_node($section->{'sectionnext'});
- }
- if (defined($section->{'toplevelprev'}))
- {
- $section->{'nodeprev'} = get_node($section->{'toplevelprev'});
- }
- elsif (defined($section->{'sectionprev'}))
- {
- $section->{'nodeprev'} = get_node($section->{'sectionprev'});
- }
- if (defined($section->{'sectionup'}))
- {
- $section->{'nodeup'} = get_node($section->{'sectionup'});
}
- if ($section->{'child'})
- {
- $section->{'following'} = get_node($section->{'child'});
- }
- elsif ($section->{'toplevelnext'})
- {
- $section->{'following'} = get_node($section->{'toplevelnext'});
- }
- elsif ($section->{'sectionnext'})
- {
- $section->{'following'} = get_node($section->{'sectionnext'});
- }
- elsif ($section->{'sectionup'})
- {
- my $up = $section;
- while ($up->{'sectionup'} and !$section->{'following'})
- {
- print STDERR "# Going up, searching next section from
$up->{'texi'}\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
- die "BUG: $up->{'texi'} is up for itself\n" if ($up eq
$up->{'sectionup'});
- $up = $up->{'sectionup'};
- if ($up->{'sectionnext'})
- {
- $section->{'following'} = get_node
($up->{'sectionnext'});
- }
- }
- }
- }
- }
my $only_nodes = 0;
my $only_sections = 0;
Index:
test/sectionning/res/more_nodes_than_sections/more_nodes_than_sections_0.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/sectionning/res/more_nodes_than_sections/more_nodes_than_sections_0.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
---
test/sectionning/res/more_nodes_than_sections/more_nodes_than_sections_0.html
24 Aug 2009 10:27:48 -0000 1.5
+++
test/sectionning/res/more_nodes_than_sections/more_nodes_than_sections_0.html
3 Sep 2009 19:22:10 -0000 1.6
@@ -50,12 +50,12 @@
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">node: </td>
<td valign="middle" align="left"></td>
-<td valign="middle" align="left"><a href="index.html#Top" accesskey="n"
rel="next">Top</a></td>
+<td valign="middle" align="left"></td>
<td valign="middle" align="left">,</td>
<td valign="middle" align="left"></td>
<td valign="middle" align="left">,</td>
-<td valign="middle" align="left"><a href="index.html#Top" accesskey="u"
rel="up">Top</a></td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Node
following in node reading order"> > </a>]</td>
+<td valign="middle" align="left"></td>
+<td valign="middle" align="left">[ > ]</td>
</tr></table>
<hr>
<h1 class="unnumbered">Unnumbered</h1>
Index:
test/sectionning/res/more_nodes_than_sections/more_nodes_than_sections_2.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/sectionning/res/more_nodes_than_sections/more_nodes_than_sections_2.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
---
test/sectionning/res/more_nodes_than_sections/more_nodes_than_sections_2.html
24 Aug 2009 10:27:48 -0000 1.6
+++
test/sectionning/res/more_nodes_than_sections/more_nodes_than_sections_2.html
3 Sep 2009 19:22:10 -0000 1.7
@@ -53,10 +53,10 @@
<td valign="middle" align="left"></td>
<td valign="middle" align="left"></td>
<td valign="middle" align="left">,</td>
-<td valign="middle" align="left"><a href="index.html#Top" accesskey="p"
rel="previous">Top</a></td>
+<td valign="middle" align="left"></td>
<td valign="middle" align="left">,</td>
-<td valign="middle" align="left"><a href="index.html#Top" accesskey="u"
rel="up">Top</a></td>
-<td valign="middle" align="left">[<a href="section-node.html#section-node"
title="Node following in node reading order"> > </a>]</td>
+<td valign="middle" align="left"></td>
+<td valign="middle" align="left">[ > ]</td>
</tr></table>
<hr>
<h1 class="chapter">1 Chapter</h1>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog texi2html.pl test/sectionni...,
Patrice Dumas <=