6 files changed, 42 insertions, 31 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 6034fe9..5e9f88e 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -32,9 +32,9 @@ ITCL_DOCS	= \
 
 #	$(ITCL_SOURCE)/iwidgets3.0.0/doc/*.[13n]
 
-COREDOCS	= $(TCL_DOCS) $(TK_DOCS) 
+COREDOCS	= $(TCL_DOCS) $(TK_DOCS)
 #PRODOCS	= $(COREDOCS) $(PRO_DOCS) $(ITCL_DOCS)
-PRODOCS		= $(COREDOCS) $(PRO_DOCS) 
+PRODOCS		= $(COREDOCS) $(PRO_DOCS)
 TCLSH		= $(TCL_BIN_DIR)/tclsh
 CC		= @CC@
 
diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl
index 93e0a9a..7a75dc6 100644
--- a/tools/genStubs.tcl
+++ b/tools/genStubs.tcl
@@ -283,7 +283,7 @@ proc genStubs::addPlatformGuard {plat iftxt {eltxt {}} {withCygwin 0}} {
     set text ""
     switch $plat {
 	win {
-	    append text "#if defined(__WIN32__)"
+	    append text "#if defined(_WIN32)"
 	    if {$withCygwin} {
 		append text " || defined(__CYGWIN__)"
 	    }
@@ -294,7 +294,7 @@ proc genStubs::addPlatformGuard {plat iftxt {eltxt {}} {withCygwin 0}} {
 	    append text "#endif /* WIN */\n"
 	}
 	unix {
-	    append text "#if !defined(__WIN32__)"
+	    append text "#if !defined(_WIN32)"
 	    if {$withCygwin} {
 		append text " && !defined(__CYGWIN__)"
 	    }
@@ -320,7 +320,7 @@ proc genStubs::addPlatformGuard {plat iftxt {eltxt {}} {withCygwin 0}} {
 	    append text "#endif /* AQUA */\n"
 	}
 	x11 {
-	    append text "#if !(defined(__WIN32__)"
+	    append text "#if !(defined(_WIN32)"
 	    if {$withCygwin} {
 		append text " || defined(__CYGWIN__)"
 	    }
@@ -983,6 +983,8 @@ proc genStubs::emitHeader {name} {
 	append text "#define ${CAPName}_STUBS_REVISION $revision\n"
     }
 
+    append text "\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n"
+
     emitDeclarations $name text
 
     if {[info exists hooks($name)]} {
@@ -1010,8 +1012,7 @@ proc genStubs::emitHeader {name} {
 
     append text "} ${capName}Stubs;\n\n"
 
-    append text "#ifdef __cplusplus\nextern \"C\" {\n#endif\n"
-    append text "extern const ${capName}Stubs *${name}StubsPtr;\n"
+    append text "extern const ${capName}Stubs *${name}StubsPtr;\n\n"
     append text "#ifdef __cplusplus\n}\n#endif\n"
 
     emitMacros $name text
diff --git a/tools/man2help2.tcl b/tools/man2help2.tcl
index fe4e7ad..9c8f503 100644
--- a/tools/man2help2.tcl
+++ b/tools/man2help2.tcl
@@ -717,7 +717,7 @@ proc char {name} {
 	    textSetup
 	    puts -nonewline $file "\\'d7 "
 	}
-	{\(em} {
+	{\(em} - {\(en} {
 	    textSetup
 	    puts -nonewline $file "-"
 	}
diff --git a/tools/tcl.hpj.in b/tools/tcl.hpj.in
index 3bdccbe..a94cea6 100644
--- a/tools/tcl.hpj.in
+++ b/tools/tcl.hpj.in
@@ -1,19 +1,19 @@
-; This file is maintained by HCW. Do not modify this file directly.
-
-[OPTIONS]
-HCW=0
-LCID=0x409 0x0 0x0 ;English (United States)
-REPORT=Yes
-TITLE=Tcl/Tk Reference Manual
-CNT=tcl86.cnt
-COPYRIGHT=Copyright © 2000 Ajuba Solutions
-HLP=tcl86.hlp
-
-[FILES]
-tcl.rtf
-
-[WINDOWS]
-main="Tcl/Tk Reference Manual",,0
-
-[CONFIG]
-BrowseButtons()
+; This file is maintained by HCW. Do not modify this file directly.

+

+[OPTIONS]

+HCW=0

+LCID=0x409 0x0 0x0 ;English (United States)

+REPORT=Yes

+TITLE=Tcl/Tk Reference Manual

+CNT=tcl86.cnt

+COPYRIGHT=Copyright © 2000 Ajuba Solutions

+HLP=tcl86.hlp

+

+[FILES]

+tcl.rtf

+

+[WINDOWS]

+main="Tcl/Tk Reference Manual",,0

+

+[CONFIG]

+BrowseButtons()

diff --git a/tools/tcltk-man2html-utils.tcl b/tools/tcltk-man2html-utils.tcl
index d02bcb6..8fd1245 100644
--- a/tools/tcltk-man2html-utils.tcl
+++ b/tools/tcltk-man2html-utils.tcl
@@ -142,6 +142,7 @@ proc process-text {text} {
 	    {\(+-}	"±" \
 	    {\(co}	"©" \
 	    {\(em}	"—" \
+	    {\(en}	"–" \
 	    {\(fm}	"′" \
 	    {\(mu}	"×" \
 	    {\(mi}	"−" \
@@ -900,7 +901,7 @@ proc insert-cross-references {text} {
 		append result [string range $text 0 [expr {$off-1}]]
 		regexp -indices -start $off {http://[\w/.]+} $text range
 		set url [string range $text {*}$range]
-		append result "<A HREF=\"$url\">" $url "</A>"
+		append result "<A HREF=\"[string trimright $url .]\">$url</A>"
 		set text [string range $text[set text ""] \
 			      [expr {[lindex $range 1]+1}] end]
 		continue
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index f392bce..1ceceb9 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -470,6 +470,7 @@ proc plus-pkgs {type args} {
 		continue
 	    }
 	}
+	set dir [string trimright $dir "0123456789-."]
 	switch $type {
 	    n {
 		set title "$name Package Commands"
@@ -647,10 +648,12 @@ try {
 	append appdir "$tkdir"
     }
 
+    apply {{} {
+    global packageBuildList tcltkdir tcldir build_tcl
 
     # When building docs for Tcl, try to build docs for bundled packages too
     set packageBuildList {}
-    if  {$build_tcl} {
+    if {$build_tcl} {
 	set pkgsDir [file join $tcltkdir $tcldir pkgs]
 	set subdirs [glob -nocomplain -types d -tails -directory $pkgsDir *]
 
@@ -664,7 +667,11 @@ try {
 
 	    # ... but try to extract (name, version) from subdir contents
 	    try {
-		set f [open [file join $pkgsDir $dir configure.in]]
+		try {
+		    set f [open [file join $pkgsDir $dir configure.in]]
+		} trap {POSIX ENOENT} {} {
+		    set f [open [file join $pkgsDir $dir configure.ac]]
+		}
 		foreach line [split [read $f] \n] {
 		    if {2 == [scan $line \
 			    { AC_INIT ( [%[^]]] , [%[^]]] ) } n v]} {
@@ -693,7 +700,8 @@ try {
 		foreach line [split [read $f] \n] {
 		    if {[string trim $line] eq ""} continue
 		    if {[string match #* $line]} continue
-		    lappend packageDirNameMap {*}$line
+		    lassign $line dir name
+		    lappend packageDirNameMap $dir $name
 		}
 	    } finally {
 		close $f
@@ -714,6 +722,7 @@ try {
 	    lset packageBuildList $idx+1 [dict get $packageDirNameMap $n]
 	}
     }
+    }}
 
     #
     # Invoke the scraper/converter engine.