diff options
author | stanton <stanton> | 1998-09-24 23:58:14 (GMT) |
---|---|---|
committer | stanton <stanton> | 1998-09-24 23:58:14 (GMT) |
commit | 9995355714bc90faf7c2e345b3d6a1d041447097 (patch) | |
tree | 2ad97c5b1994495118cef4df947cf16b55e326f2 /tools | |
parent | e13392595faf8e8d0d1c3c514ce160cfadc3d372 (diff) | |
download | tcl-9995355714bc90faf7c2e345b3d6a1d041447097.zip tcl-9995355714bc90faf7c2e345b3d6a1d041447097.tar.gz tcl-9995355714bc90faf7c2e345b3d6a1d041447097.tar.bz2 |
merging changes from 8.0.3 into 8.1a2
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile.in | 49 | ||||
-rw-r--r-- | tools/configure.in | 2 | ||||
-rw-r--r-- | tools/index.tcl | 6 | ||||
-rw-r--r-- | tools/man2help.tcl | 2 | ||||
-rw-r--r-- | tools/man2help2.tcl | 16 | ||||
-rw-r--r-- | tools/man2tcl.c | 2 | ||||
-rw-r--r-- | tools/tcl.hpj | 12 |
7 files changed, 65 insertions, 24 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index b0f2fc8..8de979f 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -6,14 +6,18 @@ # # HTML: 1. Build the html target on Unix -# SCCS: @(#) Makefile.in 1.2 97/01/28 18:58:31 +# RCS: @(#) $Id: Makefile.in,v 1.1.2.2 1998/09/24 23:59:40 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,29 +25,42 @@ TCL_DOCS = \ TK_DOCS = \ $(TK_SOURCE)/doc/*.[13n] +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] + +COREDOCS = $(TCL_DOCS) $(TK_DOCS) +PRODOCS = $(COREDOCS) $(PRO_DOCS) $(ITCL_DOCS) TCLSH = $(TCL_SOURCE)/unix/tclsh +CC=@CC@ + +all: core +pro: + $(MAKE) PRODOCS="$(PRODOCS)" VER="" rtf -all: winhelp +core: + $(MAKE) DOCS="$(COREDOCS)" rtf + +rtf: man2help.tcl man2tcl $(DOCS) + LD_LIBRARY_PATH=$(TCL_SOURCE)/unix \ + $(TCLSH) man2help.tcl tcl "$(VER)" $(DOCS) winhelp: tcl.rtf -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$(VER).html: man2html.tcl man2tcl $(TCL_DOCS) $(TK_DOCS) - $(TCLSH) man2html.tcl tcl$(VER).html \ - ../.. ${TCL} ${TK} - clean: - -rm -f man2tcl *.o tcl$(VER).cnt tcl$(VER).rtf + -rm -f man2tcl *.o *.cnt *.rtf helpfile: - hc31 tcl.hpj - mv tcl.hlp tcl$(VER).hlp + hcw /c tcl.hpj + +# mv tcl.hlp tcl$(VER).hlp diff --git a/tools/configure.in b/tools/configure.in index 824773a..70a4d86 100644 --- a/tools/configure.in +++ b/tools/configure.in @@ -2,7 +2,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run to configure the dnl Makefile in this directory. AC_INIT(man2tcl.c) -# SCCS: @(#) configure.in 1.2 97/01/28 18:58:48 +# RCS: @(#) $Id: configure.in,v 1.1.2.2 1998/09/24 23:59:40 stanton Exp $ # Recover information that Tcl computed with its configure script. diff --git a/tools/index.tcl b/tools/index.tcl index 1a9c437..e620316 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: @(#) index.tcl 1.2 96/10/17 14:44:16 +# RCS: @(#) $Id: index.tcl,v 1.1.2.2 1998/09/24 23:59:41 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/man2help.tcl b/tools/man2help.tcl index 4983026..f36965e 100644 --- a/tools/man2help.tcl +++ b/tools/man2help.tcl @@ -6,7 +6,7 @@ # # Copyright (c) 1996 by Sun Microsystems, Inc. # -# SCCS: @(#) man2help.tcl 1.2 97/01/28 18:58:20 +# RCS: @(#) $Id: man2help.tcl,v 1.1.2.2 1998/09/24 23:59:41 stanton Exp $ # # diff --git a/tools/man2help2.tcl b/tools/man2help2.tcl index 6f16dd5..727f817 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: @(#) man2help2.tcl 1.7 98/01/22 16:51:45 +# RCS: @(#) $Id: man2help2.tcl,v 1.1.2.2 1998/09/24 23:59:41 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/man2tcl.c b/tools/man2tcl.c index 7384065..850c1c2 100644 --- a/tools/man2tcl.c +++ b/tools/man2tcl.c @@ -15,6 +15,8 @@ * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. + * + * RCS: @(#) $Id: man2tcl.c,v 1.1.2.2 1998/09/24 23:59:41 stanton Exp $ */ static char sccsid[] = "@(#) man2tcl.c 1.3 95/08/12 17:34:08"; diff --git a/tools/tcl.hpj b/tools/tcl.hpj index 9e58351..9797d1b 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=.\tcl80.cnt
+COPYRIGHT=Copyright © 1998 Scriptics Corporation
+HLP=.\tcl80.hlp
[FILES]
.\tcl.rtf
[WINDOWS]
-main="Tcl/Tk Reference Manual",,0,,,0
+main="Tcl/Tk Reference Manual",,0
[CONFIG]
BrowseButtons()
|