[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html texi2html.init texi2html.pl Tests/for...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html texi2html.init texi2html.pl Tests/for... |
|
Date: |
Fri, 04 Aug 2006 21:18:52 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 06/08/04 21:18:52
Modified files:
. : texi2html.init texi2html.pl
Tests/formatting_res: chapter_test_refs.html comments.html
comments_redefined.html
complex_command_in_simple_command.html
index.html test_refs.html
doc : texi2html.html
Log message:
* texi2html.pl: Fix detection of allready present heading.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.107&r2=1.108
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.170&r2=1.171
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/chapter_test_refs.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/comments.html?cvsroot=texi2html&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/comments_redefined.html?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/complex_command_in_simple_command.html?cvsroot=texi2html&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/index.html?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/formatting_res/test_refs.html?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texi2html.html?cvsroot=texi2html&r1=1.40&r2=1.41
Patches:
Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- texi2html.init 4 Aug 2006 12:51:01 -0000 1.107
+++ texi2html.init 4 Aug 2006 21:18:51 -0000 1.108
@@ -12,7 +12,7 @@
# Afterwards, load the file with command-line
# option -init-file <your_init_file>
#
-# $Id: texi2html.init,v 1.107 2006/08/04 12:51:01 pertusus Exp $
+# $Id: texi2html.init,v 1.108 2006/08/04 21:18:51 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -863,7 +863,7 @@
&$print_page_foot($fh);
}
}
-sub T2H_DEFAULT_print_Top
+sub T2H_DEFAULT_print_Top($$)
{
my $fh = shift;
my $has_top_heading = shift;
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -b -r1.170 -r1.171
--- texi2html.pl 4 Aug 2006 12:51:01 -0000 1.170
+++ texi2html.pl 4 Aug 2006 21:18:51 -0000 1.171
@@ -59,7 +59,7 @@
#--##########################################################################
# CVS version:
-# $Id: texi2html.pl,v 1.170 2006/08/04 12:51:01 pertusus Exp $
+# $Id: texi2html.pl,v 1.171 2006/08/04 21:18:51 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -2874,7 +2874,6 @@
$Texi2HTML::THISDOC{'filename'}->{'foot'} = $docu_foot;
$Texi2HTML::THISDOC{'filename'}->{'stoc'} = $docu_stoc;
$Texi2HTML::THISDOC{'filename'}->{'about'} = $docu_about;
-$Texi2HTML::THISDOC{'filename'}->{'top'} = $docu_top;
$Texi2HTML::THISDOC{'filename'}->{'toc'} = $docu_toc;
$Texi2HTML::THISDOC{'extension'} = $docu_ext;
# FIXME document that
@@ -4465,7 +4464,6 @@
if ($T2H_DEBUG & $DEBUG_ELEMENTS);
my $current_section = $sections_list[0];
$current_section = $node_top if ($node_top and
$node_top->{'top_as_section'} and !$section_before_top);
- my $current;
foreach my $element (@all_elements)
{
if ($element->{'node'} and !$element->{'top_as_section'})
@@ -4477,11 +4475,10 @@
}
elsif (defined($current_section))
{
- $element->{'in_top'} = 1 if ($current_section->{'top'});
$element->{'section_ref'} = $current_section;
$element->{'toc_level'} = $current_section->{'toc_level'};
- push @{$element->{'section_ref'}->{'nodes'}}, $element;
- push @{$element->{'section_ref'}->{'node_childs'}}, $element;
+ push @{$current_section->{'nodes'}}, $element;
+ push @{$current_section->{'node_childs'}}, $element;
}
else
{
@@ -4490,7 +4487,6 @@
}
else
{
- $current = undef;
$current_section = $element;
if ($element->{'node'})
{ # Top node
@@ -5584,7 +5580,8 @@
foreach my $element (@elements_list)
{
if (!$element->{'top'} and !$element->{'index_page'})
- {
+ { # for link back to table of contents
+ # FIXME do it for top too?
$element->{'tocid'} = 'TOC' . $tocnr;
$tocnr++;
}
@@ -5893,7 +5890,6 @@
# We set titlefont only if the titlefont appeared in the top element
if (defined($element_top->{'titlefont'}))
{
- $element_top->{'has_heading'} = 1;
$value{'_titlefont'} = $element_top->{'titlefont'};
}
@@ -6150,14 +6146,9 @@
if (! $element)
{
$new_element = shift @elements_list;
- $element->{'has_heading'} = 1 if
($new_element->{'top'});
}
else
{
- if ($element->{'top'})
- {
- $element->{'has_heading'} = 1;
- }
push (@section_lines,
&$Texi2HTML::Config::anchor($current_element->{'id'}) . "\n");
push @section_lines,
&$Texi2HTML::Config::heading($current_element);
next;
@@ -6400,7 +6391,7 @@
$element->{'node'} = 0; # otherwise Texi2HTML::Config::heading may
uses the node level
$element->{'text'} = $Texi2HTML::NAME{'Top'};
print STDERR "[Top]" if ($T2H_VERBOSE);
- unless ($element->{'has_heading'})
+ unless ($element->{'titlefont'})
{
unshift @section_lines, &$Texi2HTML::Config::heading($element);
}
@@ -6553,7 +6544,7 @@
#print STDERR "TOP $element->{'texi'}, @section_lines\n";
print STDERR "[Top]" if ($T2H_VERBOSE);
$Texi2HTML::HREF{'Top'} = href($element_top, $element->{'file'});
- &$Texi2HTML::Config::print_Top($FH, $element->{'has_heading'});
+ &$Texi2HTML::Config::print_Top($FH, $element->{'titlefont'});
my $end_page = 0;
if ($Texi2HTML::Config::SPLIT)
{
Index: Tests/formatting_res/chapter_test_refs.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/Tests/formatting_res/chapter_test_refs.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- Tests/formatting_res/chapter_test_refs.html 8 Apr 2006 22:40:16 -0000
1.8
+++ Tests/formatting_res/chapter_test_refs.html 4 Aug 2006 21:18:52 -0000
1.9
@@ -49,6 +49,7 @@
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a
href="chapter_test_refs_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
+<h1 class="settitle">Test refs</h1>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="chapter_test_refs_1.html#SEC4">1.
Chapter with nodes</a></td><td> </td><td align="left" valign="top">
Index: Tests/formatting_res/comments.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/formatting_res/comments.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- Tests/formatting_res/comments.html 8 Apr 2006 22:40:16 -0000 1.22
+++ Tests/formatting_res/comments.html 4 Aug 2006 21:18:52 -0000 1.23
@@ -49,6 +49,7 @@
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
</tr></table>
+<h1 class="settitle">Top</h1>
<a name="SEC1"></a>
<h3 class="subheading"> Comment like: </h3>
Index: Tests/formatting_res/comments_redefined.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/Tests/formatting_res/comments_redefined.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Tests/formatting_res/comments_redefined.html 8 Apr 2006 22:40:16
-0000 1.3
+++ Tests/formatting_res/comments_redefined.html 4 Aug 2006 21:18:52
-0000 1.4
@@ -49,6 +49,7 @@
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
</tr></table>
+<h1 class="settitle">Top</h1>
<a name="SEC1"></a>
<h3 class="subheading"> Comment like: </h3>
Index: Tests/formatting_res/complex_command_in_simple_command.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/Tests/formatting_res/complex_command_in_simple_command.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- Tests/formatting_res/complex_command_in_simple_command.html 17 May 2006
01:51:46 -0000 1.11
+++ Tests/formatting_res/complex_command_in_simple_command.html 4 Aug 2006
21:18:52 -0000 1.12
@@ -43,6 +43,7 @@
<a name="Top"></a>
<a name="SEC_Top"></a>
+<h1 class="unnumbered"> Complex commands in simple commands </h1>
<p>The complex commands.
</p>
Index: Tests/formatting_res/index.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/formatting_res/index.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Tests/formatting_res/index.html 10 Apr 2006 14:43:33 -0000 1.7
+++ Tests/formatting_res/index.html 4 Aug 2006 21:18:52 -0000 1.8
@@ -50,6 +50,7 @@
<td valign="middle" align="left">[<a href="node_test_refs_abt.html#SEC_About"
title="About (help)"> ? </a>]</td>
</tr></table>
<hr size="1">
+<h1 class="settitle">Test refs</h1>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a
href="other-nodes.html#other-nodes">• other
nodes</a></td><td> </td><td align="left" valign="top">
Index: Tests/formatting_res/test_refs.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/formatting_res/test_refs.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Tests/formatting_res/test_refs.html 8 Apr 2006 22:40:16 -0000 1.9
+++ Tests/formatting_res/test_refs.html 4 Aug 2006 21:18:52 -0000 1.10
@@ -49,6 +49,7 @@
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
</tr></table>
+<h1 class="settitle">Test refs</h1>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="#SEC4">1. Chapter with
nodes</a></td><td> </td><td align="left" valign="top">
Index: doc/texi2html.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texi2html.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- doc/texi2html.html 29 May 2006 23:36:10 -0000 1.40
+++ doc/texi2html.html 4 Aug 2006 21:18:52 -0000 1.41
@@ -31,7 +31,7 @@
permission notice may be stated in a translation approved
by the Free Software Foundation.
-->
-<!-- Created on May, 30 2006 by texi2html 1.77 -->
+<!-- Created on August, 4 2006 by texi2html 1.77 -->
<!--
Written by: Lionel Cons <address@hidden> (original author)
Karl Berry <address@hidden>
@@ -6916,7 +6916,7 @@
</tr></table>
<h1>About This Document</h1>
<p>
- This document was generated by <em>Patrice Dumas</em> on <em>May, 30
2006</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html
1.77</em></a>.
+ This document was generated by <em>Patrice Dumas</em> on <em>August, 4
2006</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html
1.77</em></a>.
</p>
<p>
The buttons in the navigation panels have the following meaning:
@@ -7018,7 +7018,7 @@
<hr size="1">
<p>
<font size="-1">
- This document was generated by <em>Patrice Dumas</em> on <em>May, 30
2006</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html
1.77</em></a>.
+ This document was generated by <em>Patrice Dumas</em> on <em>August, 4
2006</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html
1.77</em></a>.
</font>
<br>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html texi2html.init texi2html.pl Tests/for...,
Patrice Dumas <=