[Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht...

[Patrice Dumas]

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        08/11/04 00:37:09

Modified files:
        .              : ChangeLog TODO texi2html.init texi2html.pl 
        doc            : texi2html.html 
        examples       : makeinfo.init 
        test/layout/res/formatting_makeinfo: chapter2.html 

Log message:
                * texi2html.pl, texi2html.init, examples/makeinfo.init: with
                OVERVIEW_LINK_TO_TOC set, overview links to toc as in makeinfo.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.334&r2=1.335
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.166&r2=1.167
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.241&r2=1.242
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texi2html.html?cvsroot=texi2html&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/makeinfo.init?cvsroot=texi2html&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/chapter2.html?cvsroot=texi2html&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -b -r1.334 -r1.335
--- ChangeLog   3 Nov 2008 23:24:13 -0000       1.334
+++ ChangeLog   4 Nov 2008 00:37:07 -0000       1.335
@@ -4,6 +4,8 @@
        multitable cells.
        * texi2html.pl: do human-readable id for toc, and different id
        for stoc.
+       * texi2html.pl, texi2html.init, examples/makeinfo.init: with 
+       OVERVIEW_LINK_TO_TOC set, overview links to toc as in makeinfo.
 
 2008-11-01  Patrice Dumas  <address@hidden>
 

Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- TODO        3 Nov 2008 12:33:15 -0000       1.67
+++ TODO        4 Nov 2008 00:37:07 -0000       1.68
@@ -38,6 +38,7 @@
 * Document 
   Texi2HTML::THIS_ELEMENT
   $NEW_CROSSREF_STYLE, $EXTERNAL_CROSSREF_SPLIT, $INLINE_INSERTCOPYING
+  $OVERVIEW_LINK_TO_TOC
   $Texi2HTML::THISDOC{'htmlxref'}
   $Texi2HTML::THISDOC{'current_lang'}
   $Texi2HTML::THISDOC{macro name}
@@ -350,8 +351,7 @@
      @author and Other people
 
 * makeinfo.init not uptodate with makeinfo --html. Index entries link back
-  now. Also Short table of contents link to table of contents entries.
-  And also look at floats?
+  now. And also look at floats?
   menu name is used instead of node in menu links url text.
 
 * change LINK_BUTTONS for makeinfo.init to have next, up... nodes
@@ -371,4 +371,6 @@
   after @item, but to be careful with things prepended or commands used
   in for the whole line.
 
+* second paragraph in cell should be taken into account.
+
 * add --command command line that gives inserted lines.

Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- texi2html.init      3 Nov 2008 12:33:15 -0000       1.166
+++ texi2html.init      4 Nov 2008 00:37:07 -0000       1.167
@@ -12,7 +12,7 @@
 # Afterwards, load the file with command-line 
 # option -init-file <your_init_file>
 #
-# $Id: texi2html.init,v 1.166 2008/11/03 12:33:15 pertusus Exp $
+# $Id: texi2html.init,v 1.167 2008/11/04 00:37:07 pertusus Exp $
 
 ######################################################################
 # The following variables can also be set by command-line options
@@ -318,6 +318,9 @@
 # if true, begin outputting at @setfilename, if this command is present.
 $IGNORE_BEFORE_SETFILENAME = 1;
 
+# if true the link in Overview link to the corresponding Toc entry.
+$OVERVIEW_LINK_TO_TOC = 0;
+
 # if set always separate description and menu link, even in 
 # preformatted environment
 $SEPARATE_DESCRIPTION = 0;

Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -b -r1.241 -r1.242
--- texi2html.pl        3 Nov 2008 23:24:13 -0000       1.241
+++ texi2html.pl        4 Nov 2008 00:37:07 -0000       1.242
@@ -60,7 +60,7 @@
 #--##########################################################################
 
 # CVS version:
-# $Id: texi2html.pl,v 1.241 2008/11/03 23:24:13 pertusus Exp $
+# $Id: texi2html.pl,v 1.242 2008/11/04 00:37:07 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -307,6 +307,7 @@
 $USE_SETFILENAME
 $SEPARATE_DESCRIPTION
 $IGNORE_BEFORE_SETFILENAME
+$OVERVIEW_LINK_TO_TOC
 $COMPLETE_IMAGE_PATHS
 $DATE
 %ACTIVE_ICONS
@@ -599,12 +600,18 @@
         # since it is in $Texi2HTML::THISDOC{'toc_file'}.
         my $dest_for_toc = $element->{'file'};
         my $dest_for_stoc = $element->{'file'};
+        my $dest_target_for_stoc = $element->{'target'};
+        if ($Texi2HTML::Config::OVERVIEW_LINK_TO_TOC)
+        {
+            $dest_for_stoc = $Texi2HTML::THISDOC{'toc_file'};
+            $dest_target_for_stoc = $element->{'tocid'};
+        }
         $dest_for_toc = '' if ($dest_for_toc eq 
$Texi2HTML::THISDOC{'toc_file'});
         $dest_for_stoc = '' if ($dest_for_stoc eq 
$Texi2HTML::THISDOC{'stoc_file'});
         my $text = $element->{'text'};
         #$text = $element->{'name'} unless ($NUMBER_SECTIONS);
         my $toc_entry = "<li>" . &$anchor ($element->{'tocid'}, 
"$dest_for_toc#$element->{'target'}",$text);
-        my $stoc_entry = "<li>" . &$anchor ($element->{'stocid'}, 
"$dest_for_stoc#$element->{'target'}",$text);
+        my $stoc_entry = "<li>" . &$anchor ($element->{'stocid'}, 
"$dest_for_stoc#$dest_target_for_stoc",$text);
         push (@{$Texi2HTML::TOC_LINES}, $ind . $toc_entry);
         push(@{$Texi2HTML::OVERVIEW}, $stoc_entry. "</li>\n") if ($level == 1);
     }

Index: doc/texi2html.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texi2html.html,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- doc/texi2html.html  3 Nov 2008 23:24:14 -0000       1.98
+++ doc/texi2html.html  4 Nov 2008 00:37:08 -0000       1.99
@@ -40,7 +40,7 @@
 permission notice may be stated in a translation approved
 by the Free Software Foundation.
  -->
-<!-- Created on November 3, 2008 by texi2html 1.79
+<!-- Created on November 4, 2008 by texi2html 1.79
 texi2html was written by: 
             Lionel Cons <address@hidden> (original author)
             Karl Berry  <address@hidden>
@@ -7718,7 +7718,7 @@
 </tr></table>
 <h1>About This Document</h1>
 <p>
-  This document was generated by <em>Patrice Dumas</em> on <em>November 3, 
2008</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html 
1.79</em></a>.
+  This document was generated by <em>Patrice Dumas</em> on <em>November 4, 
2008</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html 
1.79</em></a>.
 </p>
 <p>
   The buttons in the navigation panels have the following meaning:
@@ -7820,7 +7820,7 @@
 <hr size="1">
 <p>
  <font size="-1">
-  This document was generated by <em>Patrice Dumas</em> on <em>November 3, 
2008</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html 
1.79</em></a>.
+  This document was generated by <em>Patrice Dumas</em> on <em>November 4, 
2008</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html 
1.79</em></a>.
  </font>
  <br>
 

Index: examples/makeinfo.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/makeinfo.init,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- examples/makeinfo.init      3 Nov 2008 12:33:16 -0000       1.23
+++ examples/makeinfo.init      4 Nov 2008 00:37:08 -0000       1.24
@@ -44,6 +44,8 @@
 
 $INLINE_CONTENTS = 1;
 
+$OVERVIEW_LINK_TO_TOC = 1;
+
 @SECTION_BUTTONS =
     (
      \"node: ", \$Texi2HTML::NODE{This}, [ 'NodeNext', 
\$Texi2HTML::NODE{NodeNext} ] , \",", [ 'NodePrev', \$Texi2HTML::NODE{NodePrev} 
], \",", [ 'NodeUp', \$Texi2HTML::NODE{NodeUp} ], 'Following'

Index: test/layout/res/formatting_makeinfo/chapter2.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/layout/res/formatting_makeinfo/chapter2.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/layout/res/formatting_makeinfo/chapter2.html   3 Nov 2008 23:24:23 
-0000       1.8
+++ test/layout/res/formatting_makeinfo/chapter2.html   4 Nov 2008 00:37:09 
-0000       1.9
@@ -921,8 +921,8 @@
 <h1>Short Table of Contents</h1>
 <div class="shortcontents">
 <ul class="toc">
-<li><a name="stoc-chapter-1" href="chapter.html#chapter">1. chapter</a></li>
-<li><a name="stoc-chapter-2" href="#chapter2">2. chapter 2</a></li>
+<li><a name="stoc-chapter-1" href="#toc-chapter-1">1. chapter</a></li>
+<li><a name="stoc-chapter-2" href="#toc-chapter-2">2. chapter 2</a></li>
 </ul>
 </div>
 <hr size="1">