From e66829952866153d1f8ac0f20adf5fb28870bfc4 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Wed, 4 Jun 2003 23:41:13 +0000 Subject: Fix for [Bug 748700] FossilOrigin-Name: 020cbf17af1819ea7989142fc91591c2dc7f3c23 --- ChangeLog | 6 ++++++ tools/index.tcl | 4 ++-- tools/man2help.tcl | 10 ++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b83852..b7ebd8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-06-04 Joe Mistachkin + + * 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-05-23 Don Porter * generic/tclObj.c (tclCmdNameType): Converted internal rep diff --git a/tools/index.tcl b/tools/index.tcl index f2c162f..629ceb4 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.3.40.1 2003/06/04 23:41:15 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..b0da42a 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.13.2.1 2003/06/04 23:41:15 mistachkin Exp $ # # @@ -28,7 +28,13 @@ proc generateContents {basename version files} { puts $fd ":Base $basename$version.hlp" foreach package [getPackages] { foreach section [getSections $package] { - puts $fd "1 $section" + 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