[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog TODO texi2html.pl test/sect...
From: |
Patrice Dumas |
Subject: |
[Texi2html-cvs] texi2html ChangeLog TODO texi2html.pl test/sect... |
Date: |
Thu, 25 Sep 2008 11:02:22 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 08/09/25 11:02:22
Modified files:
. : ChangeLog TODO texi2html.pl
test/sectionning/res/equivalent_nodes_no_node:
equivalent_nodes.2
Log message:
* texi2html.pl: associate nodes that are not already associated
with the top node in case only sections are used.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.326&r2=1.327
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.235&r2=1.236
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.2?cvsroot=texi2html&r1=1.1&r2=1.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -b -r1.326 -r1.327
--- ChangeLog 24 Sep 2008 23:39:17 -0000 1.326
+++ ChangeLog 25 Sep 2008 11:02:20 -0000 1.327
@@ -1,3 +1,8 @@
+2008-09-25 Patrice Dumas <address@hidden>
+
+ * texi2html.pl: associate nodes that are not already associated
+ with the top node in case only sections are used.
+
2008-09-24 Patrice Dumas <address@hidden>
* texi2html.pl, texi2html.init: remove THIS_HEADER. Instead
Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- TODO 23 Sep 2008 18:21:09 -0000 1.61
+++ TODO 25 Sep 2008 11:02:20 -0000 1.62
@@ -363,9 +363,7 @@
* failure in indices test nodes_before_top_no_nodes
-* ignore spaces after @ command, before {, like texi2dvi does.
+* ignore spaces after @ command, before {, like texi2dvi does?
* failures with split index between node and section in indices/ and
many_iput_files.
-
-* change prototype and document $printindex
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -b -r1.235 -r1.236
--- texi2html.pl 24 Sep 2008 23:39:18 -0000 1.235
+++ texi2html.pl 25 Sep 2008 11:02:20 -0000 1.236
@@ -60,7 +60,7 @@
#--##########################################################################
# CVS version:
-# $Id: texi2html.pl,v 1.235 2008/09/24 23:39:18 pertusus Exp $
+# $Id: texi2html.pl,v 1.236 2008/09/25 11:02:20 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";
@@ -5517,6 +5517,19 @@
$element->{'toc_level'} =
$element->{'section_ref'}->{'toc_level'};
}
}
+ else # $only_section and !$section_ref. This should only
+ # happen when there are no sections
+ # in that case it is possible that the node_top is an
+ # element, so it is associated with this one. Maybe it
+ # may happen that the node_top is not an element, not sure
+ # what would be the consequence ni that case.
+ {
+ if ($node_top)
+ {
+ add_t2h_dependent_element ($element, $node_top);
+ }
+ #print STDERR "node $element->{'texi'} not associated with an
element\n";
+ }
# FIXME use Texi2HTML::Config::NODE_TOC_LEVEL?
$element->{'toc_level'} = $MIN_LEVEL if
(!defined($element->{'toc_level'}));
}
@@ -5617,6 +5630,7 @@
}
}
+ # do human readable id
print STDERR "# find float id\n"
if ($T2H_DEBUG & $DEBUG_ELEMENTS);
foreach my $float (@floats)
@@ -5723,6 +5737,7 @@
}
}
+ # Set file names
# Find node file names and file names for nodes considered as elements
my $node_as_top;
if ($node_top)
@@ -5808,43 +5823,27 @@
do_element_targets($element, $use_node_file);
print STDERR "# add_file $element->{'file'} for
$element->{'texi'}\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
add_file($element->{'file'});
- if ($element->{'nodes'})
- {
- foreach my $node (@{$element->{'nodes'}})
- {
- $node->{'doc_nr'} = $element->{'doc_nr'};
- $node->{'file'} = $element->{'file'};
- }
- }
}
}
else
{ # not split
add_file($docu_doc);
- # FIXME sections or elements?
foreach my $element(@elements_list)
{
$element->{'file'} = $docu_doc;
$element->{'doc_nr'} = 0;
do_element_targets($element);
}
- foreach my $node(@nodes_list)
- {
- $node->{'file'} = $docu_doc;
- $node->{'doc_nr'} = 0;
- #FIXME do_element_targets?
- #do_element_targets($node);
- }
}
# 'pathological' cases. No texinfo sectionning element at all or no
# texi2html sectionning elements
- #FIXME already done for nodes?
if (address@hidden)
{
if (@all_elements)
{
foreach my $element (@all_elements)
{
+ #print STDERR "Processing $element->{'texi'}\n";
$element->{'file'} = $docu_doc;
$element->{'doc_nr'} = 0;
push @{$element->{'place'}}, @{$element->{'current_place'}};
@@ -6043,18 +6042,6 @@
print STDERR " $menu_up
($element->{'menu_up_hash'}->{$menu_up})\n";
}
}
- if (defined($element->{'nodes'}))
- {
- print STDERR " nodes: $element->{'nodes'}
(@{$element->{'nodes'}})\n";
- foreach my $node (@{$element->{'nodes'}})
- {
- my $beginning = " ";
- $beginning = " *" if ($node->{'with_section'});
- my $file = $node->{'file'};
- $file = "file undef" if (! defined($node->{'file'}));
- print STDERR "${beginning}$node->{'texi'} $file\n";
- }
- }
print STDERR " places: $element->{'place'}\n";
foreach my $place(@{$element->{'place'}})
{
Index: test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.2 8 Sep
2008 16:29:48 -0000 1.1
+++ test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.2 25 Sep
2008 11:02:22 -0000 1.2
@@ -4,6 +4,3 @@
** ---> but equivalent node address@hidden' found
*** Unknown node in menu entry address@hidden' (l. 12)
** ---> but equivalent node address@hidden' found
-*** Bug: @samp{node}, file undef (l. 12)
-*** Bug: @samp{node}, file undef (l. 21)
-*** Bug: @samp{node}, file undef (l. 25)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.pl test/sect...,
Patrice Dumas <=