summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Mistachkin <joe@mistachkin.com>2003-06-04 23:40:16 (GMT)
committerJoe Mistachkin <joe@mistachkin.com>2003-06-04 23:40:16 (GMT)
commitd957ac0939a46479bf11a785dcf44c3bfa5d9eef (patch)
treeb447523a2146b1bb2a0d417f6e500f5a6d1c47ab
parent753ae00890d0e80ad9d637fea2871c566e67bb17 (diff)
downloadtcl-d957ac0939a46479bf11a785dcf44c3bfa5d9eef.zip
tcl-d957ac0939a46479bf11a785dcf44c3bfa5d9eef.tar.gz
tcl-d957ac0939a46479bf11a785dcf44c3bfa5d9eef.tar.bz2
Fix for [Bug 748700]
-rw-r--r--ChangeLog6
-rw-r--r--tools/index.tcl4
-rw-r--r--tools/man2help.tcl8
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]} {