From d957ac0939a46479bf11a785dcf44c3bfa5d9eef Mon Sep 17 00:00:00 2001
From: Joe Mistachkin <joe@mistachkin.com>
Date: Wed, 4 Jun 2003 23:40:16 +0000
Subject: Fix for [Bug 748700]

---
 ChangeLog          | 6 ++++++
 tools/index.tcl    | 4 ++--
 tools/man2help.tcl | 8 +++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 54bd747..877dd58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-04  Joe Mistachkin  <joe@mistachkin.com>
+
+        * tools/man2help.tcl: Added duplicate help section checking
+        * tools/index.tcl:    and corrected a comment typo for the 
+        getTopics proc in index.tcl [Bug #748700].
+
 2003-06-02  Vince Darley  <vincentdarley@users.sourceforge.net>
 
 	* win/tclWinFCmd.c:
diff --git a/tools/index.tcl b/tools/index.tcl
index f2c162f..26e4386 100644
--- a/tools/index.tcl
+++ b/tools/index.tcl
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# RCS: @(#) $Id: index.tcl,v 1.3 1998/09/14 18:40:15 stanton Exp $
+# RCS: @(#) $Id: index.tcl,v 1.4 2003/06/04 23:40:18 mistachkin Exp $
 # 
 
 # Global variables used by these scripts:
@@ -63,7 +63,7 @@ proc getSections {pkg} {
     lsort [array names temp]
 }
 
-# getSections --
+# getTopics --
 #
 # Generate a sorted list of topics in the specified section of the
 # specified package from the topics array.
diff --git a/tools/man2help.tcl b/tools/man2help.tcl
index d172d1e..91fcb89 100644
--- a/tools/man2help.tcl
+++ b/tools/man2help.tcl
@@ -6,7 +6,7 @@
 #
 # Copyright (c) 1996 by Sun Microsystems, Inc.
 #
-# RCS: @(#) $Id: man2help.tcl,v 1.13 2002/08/09 00:13:54 davygrvy Exp $
+# RCS: @(#) $Id: man2help.tcl,v 1.14 2003/06/04 23:40:18 mistachkin Exp $
 # 
 
 #
@@ -28,7 +28,13 @@ proc generateContents {basename version files} {
     puts $fd ":Base $basename$version.hlp"
     foreach package [getPackages] {
 	foreach section [getSections $package] {
+            if {![info exists lastSection]} {
+	        set lastSection {}
+            }
+            if {[string compare $lastSection $section]} {
 	    puts $fd "1 $section"
+            }
+            set lastSection $section
 	    set lastTopic {}
 	    foreach topic [getTopics $package $section] {
 		if {[string compare $lastTopic $topic]} {
-- 
cgit v0.12