summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2010-06-13 22:19:53 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2010-06-13 22:19:53 (GMT)
commitb76b06298684d10212e10d970bb2d5ee1ff29b45 (patch)
tree4b1164f24f0b53ab2e12ce03328380bc4dda3a0b
parent6c9b8bdd74ad3b776f15340267d4173afb1985af (diff)
downloadtcl-b76b06298684d10212e10d970bb2d5ee1ff29b45.zip
tcl-b76b06298684d10212e10d970bb2d5ee1ff29b45.tar.gz
tcl-b76b06298684d10212e10d970bb2d5ee1ff29b45.tar.bz2
* tools/tcltk-man2html.tcl (make-man-pages): [Bug 3015327]: Make the
title of a manual page be stored relative to its resulting directory name as well as its source filename. This was caused by both Tcl and a contributed package ([incr Tcl]) defining an Object.3. Also corrected the joining of strings in titles to avoid extra braces. Note: This removes the previous hack and fixes things correctly.
-rw-r--r--ChangeLog11
-rwxr-xr-xtools/tcltk-man2html.tcl15
2 files changed, 13 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index b3866dd..525d59c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,10 @@
2010-06-13 Donal K. Fellows <dkf@users.sf.net>
- * tools/tcltk-man2html.tcl: [Bug 3015327]: Add hack to stop Itcl C
- docs from interfering with Tcl docs during HTML generation. This is a
- band-aid since it just prevents the generation of the HTML version of
- the Itcl C docs (since they're not installed during 'make install')
- rather than improving the code to not have problems with the clash
- between two Object.3 files.
+ * tools/tcltk-man2html.tcl (make-man-pages): [Bug 3015327]: Make the
+ title of a manual page be stored relative to its resulting directory
+ name as well as its source filename. This was caused by both Tcl and a
+ contributed package ([incr Tcl]) defining an Object.3. Also corrected
+ the joining of strings in titles to avoid extra braces.
2010-06-09 Andreas Kupries <andreask@activestate.com>
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index b497afb..aa1fabb 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -18,9 +18,9 @@ package require Tcl 8.6
# Copyright (c) 1995-1997 Roger E. Critchlow Jr
# Copyright (c) 2004-2010 Donal K. Fellows
#
-# CVS: $Id: tcltk-man2html.tcl,v 1.47 2010/06/13 10:24:45 dkf Exp $
+# CVS: $Id: tcltk-man2html.tcl,v 1.48 2010/06/13 22:19:54 dkf Exp $
-regexp {\d+\.\d+} {$Revision: 1.47 $} ::Version
+regexp {\d+\.\d+} {$Revision: 1.48 $} ::Version
set ::CSSFILE "docs.css"
##
@@ -541,10 +541,11 @@ proc make-man-pages {html args} {
open-text
set haserror 0
if {[next-op-is .HS rest]} {
- set manual($manual(name)-title) \
- "[lrange $rest 1 end] [lindex $rest 0] manual page"
+ set manual($manual(wing-file)-$manual(name)-title) \
+ "[join [lrange $rest 1 end] { }] [lindex $rest 0] manual page"
} elseif {[next-op-is .TH rest]} {
- set manual($manual(name)-title) "[lindex $rest 0] manual page - [lrange $rest 4 end]"
+ set manual($manual(wing-file)-$manual(name)-title) \
+ "[lindex $rest 0] manual page - [join [lrange $rest 4 end] { }]"
} else {
set haserror 1
if {!$verbose} {
@@ -712,7 +713,7 @@ proc make-man-pages {html args} {
puts -nonewline stderr .
}
set outfd [open $html/$manual(wing-file)/$manual(name).htm w]
- puts $outfd [htmlhead "$manual($manual(name)-title)" \
+ puts $outfd [htmlhead "$manual($manual(wing-file)-$manual(name)-title)" \
$manual(name) $manual(wing-file) "[indexfile]" \
$overall_title "../[indexfile]"]
if {($ntext > 60) && ($ntoc > 32)} {
@@ -918,7 +919,7 @@ try {
"The C functions which a Tcl extended C program may use."] \
[plus-base $build_tk $tkdir/doc/*.3 {Tk Library} TkLib \
"The additional C functions which a Tk extended C program may use."] \
- {*}[plus-pkgs 3 {*}[dict remove $packageDirNameMap itcl]]
+ {*}[plus-pkgs 3 {*}$packageDirNameMap]
} on error {msg opts} {
# On failure make sure we show what went wrong. We're not supposed
# to get here though; it represents a bug in the script.