*** empty log message ***

4 files changed, 50 insertions, 14 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index ceb539d..1376b0d 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -6,14 +6,18 @@
 #
 #    HTML:		 1. Build the html target on Unix
 
-# SCCS: %Z% $Id: Makefile.in,v 1.1 1998/04/28 18:53:49 stanton Exp $ 
+# SCCS: %Z% $Id: Makefile.in,v 1.2 1998/08/07 18:25:56 stanton Exp $ 
 
-TCL = tcl@TCL_VERSION@@TCL_PATCH_LEVEL@
-TK = tk@TCL_VERSION@@TCL_PATCH_LEVEL@
+#TCL = tcl@TCL_VERSION@@TCL_PATCH_LEVEL@
+#TK = tk@TCL_VERSION@@TCL_PATCH_LEVEL@
+TCL = tcl@TCL_VERSION@
+TK = tk@TCL_VERSION@
 VER=@TCL_WIN_VERSION@
 
 TCL_SOURCE = @srcdir@/..
 TK_SOURCE = @srcdir@/../../$(TK)
+PRO_SOURCE = @srcdir@/../../pro
+ITCL_SOURCE = @srcdir@/../../itcl3.0.1
 
 TCL_DOCS = \
 	$(TCL_SOURCE)/doc/*.[13n]
@@ -21,8 +25,18 @@ TCL_DOCS = \
 TK_DOCS = \
 	$(TK_SOURCE)/doc/*.[13n]
 
-TCLSH = $(TCL_SOURCE)/unix/tclsh
+PRO_DOCS = \
+	$(PRO_SOURCE)/doc/man/*.[13n]
+
+ITCL_DOCS = \
+	$(ITCL_SOURCE)/itcl/doc/*.[13n] \
+	$(ITCL_SOURCE)/itk/doc/*.[13n]
 
+#	$(ITCL_SOURCE)/iwidgets3.0.0/doc/*.[13n]
+
+DOCS = $(TCL_DOCS) $(TK_DOCS) $(PRO_DOCS) $(ITCL_DOCS)
+TCLSH = $(TCL_SOURCE)/unix/tclsh
+CC=@CC@
 
 all: winhelp
 
@@ -32,9 +46,9 @@ html: tcl$(VER).html
 man2tcl: man2tcl.c
 	$(CC) $(CFLAGS) -o man2tcl man2tcl.c
 
-tcl.rtf: man2help.tcl man2tcl $(TCL_DOCS) $(TK_DOCS)
-	$(TCLSH) man2help.tcl tcl $(VER) \
-		$(TCL_SOURCE)/doc $(TK_SOURCE)/doc
+tcl.rtf: man2help.tcl man2tcl $(DOCS)
+	LD_LIBRARY_PATH=$(TCL_SOURCE)/unix \
+	$(TCLSH) man2help.tcl tcl $(VER) $(DOCS)
 
 tcl$(VER).html: man2html.tcl man2tcl $(TCL_DOCS) $(TK_DOCS)
 	$(TCLSH) man2html.tcl tcl$(VER).html \
@@ -44,6 +58,6 @@ clean:
 	-rm -f man2tcl *.o tcl$(VER).cnt tcl$(VER).rtf
 
 helpfile:
-	hc31 tcl.hpj
+	hcw /c tcl.hpj
 	mv tcl.hlp tcl$(VER).hlp
 
diff --git a/tools/index.tcl b/tools/index.tcl
index 35f3638..30123b7 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.
 # 
-# SCCS: %Z% $Id: index.tcl,v 1.1 1998/04/28 18:53:50 stanton Exp $ 
+# SCCS: %Z% $Id: index.tcl,v 1.2 1998/08/07 18:26:01 stanton Exp $ 
 # 
 
 # Global variables used by these scripts:
@@ -55,6 +55,7 @@ proc getPackages {} {
 
 proc getSections {pkg} {
     global topics
+    regsub -all {[][*?\\]} $pkg {\\&} pkg
     foreach i [array names topics "${pkg},*"] {
 	regsub {^.*,(.*),.*$} $i {\1} i
 	set temp($i) {}
@@ -73,6 +74,8 @@ proc getSections {pkg} {
 
 proc getTopics {pkg sect} {
     global topics
+    regsub -all {[][*?\\]} $pkg {\\&} pkg
+    regsub -all {[][*?\\]} $sect {\\&} sect
     foreach i [array names topics "${pkg},${sect},*"] {
 	regsub {^.*,.*,(.*)$} $i {\1} i
 	set temp($i) {}
@@ -157,6 +160,7 @@ proc macro {name args} {
 	    set topic	[lindex $args 0]	;# Tcl_UpVar
 	    set curPkg	[lindex $args 3]	;# Tcl
 	    set curSect	[lindex $args 4]	;# {Tcl Library Procedures}
+	    regsub -all {\\ } $curSect { } curSect
 	    set index "$curPkg,$curSect,$topic"
 	    set topics($index) $curID
 	    lappend keywords($topic) $curID
diff --git a/tools/man2help2.tcl b/tools/man2help2.tcl
index f1df4fb..32d6b1f 100644
--- a/tools/man2help2.tcl
+++ b/tools/man2help2.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.
 # 
-# SCCS: %Z% $Id: man2help2.tcl,v 1.1 1998/04/28 18:53:51 stanton Exp $ 
+# SCCS: %Z% $Id: man2help2.tcl,v 1.2 1998/08/07 18:26:04 stanton Exp $ 
 # 
 
 # Global variables used by these scripts:
@@ -173,7 +173,7 @@ proc text {string} {
 	SEE { 
 	    global topics curPkg curSect
 	    foreach i [split $string] {
-		if ![regexp -nocase {^[a-z_]+} [string trim $i] i ] {
+		if ![regexp -nocase {^[a-z_0-9]+} [string trim $i] i ] {
 		    continue
 		}
 		if ![catch {set ref $topics($curPkg,$curSect,$i)} ] {
@@ -439,6 +439,7 @@ proc font {type} {
 		set state(textState) INSERT
 	    }
 	}
+	C -
 	B {
 	    beginFont Code
 	    if {$state(textState) == "INSERT"} {
@@ -627,6 +628,10 @@ proc char {name} {
         \\o {
 	    set state(intl) 1
 	}
+	\\\  {
+	    textSetup
+	    puts -nonewline $file " "
+	}
 	\\0 {
 	    textSetup
 	    puts -nonewline $file " \\emspace "
@@ -642,6 +647,10 @@ proc char {name} {
 	\\% -
 	\\| {
 	}
+	\\(bu {
+	    textSetup
+	    puts -nonewline $file "·"
+	}
 	default {
 	    puts stderr "Unknown character: $name"
 	}
@@ -751,6 +760,7 @@ proc IPmacro {argList} {
 	set count [lindex $argList 1]
 	set tab [expr $count * 0.1]i
 	newPara $tab -$tab
+	textSetup
 	setTabs $tab
 	formattedText [lindex $argList 0]
 	tab
@@ -816,6 +826,8 @@ proc THmacro {argList} {
     set vers	[lindex $argList 2]		;# 7.4
     set curPkg	[lindex $argList 3]		;# Tcl
     set curSect	[lindex $argList 4]		;# {Tcl Library Procedures}
+    
+    regsub -all {\\ } $curSect { } curSect	;# Clean up for [incr\ Tcl]
 
     puts $file "#{\\footnote $curID}"		;# Context string
     puts $file "\${\\footnote $name}"		;# Topic title
diff --git a/tools/tcl.hpj b/tools/tcl.hpj
index 9e58351..cb9e31c 100644
--- a/tools/tcl.hpj
+++ b/tools/tcl.hpj
@@ -1,14 +1,20 @@
+; 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

 CONTENTS=contents

-COPYRIGHT=Copyright © 1996-1997 Sun Microsystems, Inc.

+TITLE=Tcl/Tk Reference Manual

+CNT=.\tcl.cnt

+COPYRIGHT=Copyright © 1998 Scriptics Corporation

+HLP=.\tcl.hlp

 

 [FILES]

 .\tcl.rtf

 

 [WINDOWS]

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

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

 

 [CONFIG]

 BrowseButtons()