2 files changed, 12 insertions, 5 deletions

diff --git a/tools/tcltk-man2html-utils.tcl b/tools/tcltk-man2html-utils.tcl
index ce962d8..a910777 100644
--- a/tools/tcltk-man2html-utils.tcl
+++ b/tools/tcltk-man2html-utils.tcl
@@ -6,7 +6,7 @@
 ## Copyright (c) 1995-1997 Roger E. Critchlow Jr
 ## Copyright (c) 2004-2010 Donal K. Fellows
 ##
-## CVS: $Id: tcltk-man2html-utils.tcl,v 1.6 2010/01/14 13:59:05 dkf Exp $
+## CVS: $Id: tcltk-man2html-utils.tcl,v 1.7 2010/09/03 09:38:53 dkf Exp $
 
 set ::manual(report-level) 1
 
@@ -592,7 +592,7 @@ proc output-IP-list {context code rest} {
 proc output-name {line} {
     global manual
     # split name line into pieces
-    regexp {^([^-]+) - (.*)$} $line all head tail
+    regexp {^([^-]+) - (.*)$} [regsub -all {[ \n\r\t]+} $line " "] -> head tail
     # output line to manual page untouched
     man-puts "$head — $tail"
     # output line to long table of contents
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index aa1fabb..258ee20 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.48 2010/06/13 22:19:54 dkf Exp $
+# CVS: $Id: tcltk-man2html.tcl,v 1.49 2010/09/03 09:38:53 dkf Exp $
 
-regexp {\d+\.\d+} {$Revision: 1.48 $} ::Version
+regexp {\d+\.\d+} {$Revision: 1.49 $} ::Version
 set ::CSSFILE "docs.css"
 
 ##
@@ -769,7 +769,13 @@ proc plus-pkgs {type args} {
     set result {}
     foreach {dir name} $args {
 	set globpat $tcltkdir/$tcldir/pkgs/$dir/doc/*.$type
-	if {![llength [glob -nocomplain $globpat]]} continue
+	if {![llength [glob -nocomplain $globpat]]} {
+	    # Fallback for manpages generated using doctools
+	    set globpat $tcltkdir/$tcldir/pkgs/$dir/doc/man/*.$type
+	    if {![llength [glob -nocomplain $globpat]]} {
+		continue
+	    }
+	}
 	switch $type {
 	    n {
 		set title "$name Package Commands"
@@ -901,6 +907,7 @@ try {
 	set packageDirNameMap {
 	    itcl {[incr Tcl]}
 	    tdbc {TDBC}
+	    Thread Thread
 	}
     }