summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Mistachkin <joe@mistachkin.com>2008-10-02 19:01:30 (GMT)
committerJoe Mistachkin <joe@mistachkin.com>2008-10-02 19:01:30 (GMT)
commit430612c9b1d9221b032c2c2dabbfed4a10570b50 (patch)
tree7c5087b839c039d878ec1e8c5a0022ae0953534a
parentff1f43598ccc3d0a157e9bd32a7f48ecacf42331 (diff)
downloadtcl-430612c9b1d9221b032c2c2dabbfed4a10570b50.zip
tcl-430612c9b1d9221b032c2c2dabbfed4a10570b50.tar.gz
tcl-430612c9b1d9221b032c2c2dabbfed4a10570b50.tar.bz2
Fixes for [Bug 1934272, 2072891]
-rw-r--r--ChangeLog13
-rw-r--r--doc/info.n4
-rw-r--r--doc/tclvars.n4
-rw-r--r--doc/variable.n4
-rw-r--r--tools/man2help2.tcl8
-rw-r--r--tools/man2tcl.c4
-rwxr-xr-xwin/buildall.vc.bat4
-rw-r--r--win/makefile.vc5
8 files changed, 31 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index ee5e0bd..b341eb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-10-02 Joe Mistachkin <joe@mistachkin.com>
+
+ * doc/info.n: Fix unmatched font change.
+ * doc/tclvars.n: Fix unmatched font change.
+ * doc/variable.n: Fix unmatched font change.
+ * tools/man2help2.tcl: Integrated patch from Harald Oehlmann.
+ [Bug 1934272]
+ * tools/man2tcl.c: Increase MAX_LINE_SIZE to fix "Too long line" error.
+ * win/buildall.vc.bat: Prefer the HtmlHelp target over the WinHelp
+ target. [Bug 2072891]
+ * win/makefile.vc: Fix the HtmlHelp and WinHelp targets to not be
+ mutually exclusive.
+
2008-09-29 Don Porter <dgp@users.sourceforge.net>
TIP #323 IMPLEMENTATION (partial)
diff --git a/doc/info.n b/doc/info.n
index 6200357..e1b877b 100644
--- a/doc/info.n
+++ b/doc/info.n
@@ -8,7 +8,7 @@
'\" See the file "license.terms" for information on usage and redistribution
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
'\"
-'\" RCS: @(#) $Id: info.n,v 1.28 2008/09/23 05:05:47 dkf Exp $
+'\" RCS: @(#) $Id: info.n,v 1.29 2008/10/02 19:01:30 mistachkin Exp $
'\"
.so man.macros
.TH info n 8.4 Tcl "Tcl Built-In Commands"
@@ -458,7 +458,7 @@ inheritance precedence order.
\fBinfo class variables\fI class\fR
.VS 8.6
This subcommand returns a list of all variables that have been declared for
-the class named \Iclass\fR (i.e. that are automatically present in the
+the class named \fIclass\fR (i.e. that are automatically present in the
class's methods, constructor and destructor).
.SS "OBJECT INTROSPECTION"
.PP
diff --git a/doc/tclvars.n b/doc/tclvars.n
index 6235011..3e3f7ac 100644
--- a/doc/tclvars.n
+++ b/doc/tclvars.n
@@ -5,7 +5,7 @@
'\" See the file "license.terms" for information on usage and redistribution
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
'\"
-'\" RCS: @(#) $Id: tclvars.n,v 1.38 2008/09/25 14:30:23 dkf Exp $
+'\" RCS: @(#) $Id: tclvars.n,v 1.39 2008/10/02 19:01:30 mistachkin Exp $
'\"
.so man.macros
.TH tclvars n 8.0 Tcl "Tcl Built-In Commands"
@@ -305,7 +305,7 @@ On UNIX machines, this is the value returned by \fBuname -r\fR. On
Windows 95, the version will be 4.0; on Windows 98, the version will
be 4.10.
.TP
-\fBpathSeparator
+\fBpathSeparator\fR
.VS 8.6
'\" Defined by TIP #315
The character that should be used to \fBsplit\fR PATH-like environment
diff --git a/doc/variable.n b/doc/variable.n
index 6e5b5c4..f94178d 100644
--- a/doc/variable.n
+++ b/doc/variable.n
@@ -5,7 +5,7 @@
'\" See the file "license.terms" for information on usage and redistribution
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
'\"
-'\" RCS: @(#) $Id: variable.n,v 1.9 2008/09/25 19:51:28 dgp Exp $
+'\" RCS: @(#) $Id: variable.n,v 1.10 2008/10/02 19:01:30 mistachkin Exp $
'\"
.so man.macros
.TH variable n 8.0 Tcl "Tcl Built-In Commands"
@@ -14,7 +14,7 @@
.SH NAME
variable \- create and initialize a namespace variable
.SH SYNOPSIS
-\fBvariable \fIname
+\fBvariable \fIname\fR
.sp
\fBvariable \fR?\fIname value...\fR?
.BE
diff --git a/tools/man2help2.tcl b/tools/man2help2.tcl
index 7791add..20e86af 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.
#
-# RCS: @(#) $Id: man2help2.tcl,v 1.18 2008/06/13 05:45:15 mistachkin Exp $
+# RCS: @(#) $Id: man2help2.tcl,v 1.19 2008/10/02 19:01:30 mistachkin Exp $
#
# Global variables used by these scripts:
@@ -600,7 +600,7 @@ proc setTabs {tabList} {
set relativeTo [expr {$state(leftMargin) \
+ ($state(offset) * $state(nestingLevel))}]
}
- if {[regexp {^\w'(.*)'u$} $arg -> submatch]} {
+ if {[regexp {^\\w'([^']*)'u$} $arg -> submatch]} {
# Magic factor!
set distance [expr {[string length $submatch] * 86.4}]
} else {
@@ -976,6 +976,10 @@ proc getTwips {arg} {
puts stderr "bad distance \"$arg\""
return 0
}
+ if {[string length $units] > 1} {
+ puts stderr "additional characters after unit \"$arg\""
+ set units [string index $units 0]
+ }
switch -- $units {
c {
set distance [expr {$distance * 567}]
diff --git a/tools/man2tcl.c b/tools/man2tcl.c
index 6622a5b..7940325 100644
--- a/tools/man2tcl.c
+++ b/tools/man2tcl.c
@@ -15,7 +15,7 @@
* 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.14 2008/06/13 05:45:15 mistachkin Exp $
+ * RCS: @(#) $Id: man2tcl.c,v 1.15 2008/10/02 19:01:30 mistachkin Exp $
*/
static char sccsid[] = "@(#) man2tcl.c 1.3 95/08/12 17:34:08";
@@ -96,7 +96,7 @@ main(
char **argv) /* Values of command-line arguments. */
{
FILE *f;
-#define MAX_LINE_SIZE 1000
+#define MAX_LINE_SIZE 4000
char line[MAX_LINE_SIZE];
char *p;
diff --git a/win/buildall.vc.bat b/win/buildall.vc.bat
index 1201bb2..aff1bc6 100755
--- a/win/buildall.vc.bat
+++ b/win/buildall.vc.bat
@@ -3,7 +3,7 @@
:: edit this (or make your own) for your needs and wants using
:: the instructions for calling makefile.vc found in makefile.vc
::
-:: RCS: @(#) $Id: buildall.vc.bat,v 1.9 2005/10/14 12:31:39 patthoyts Exp $
+:: RCS: @(#) $Id: buildall.vc.bat,v 1.10 2008/10/02 19:01:30 mistachkin Exp $
set SYMBOLS=
@@ -54,7 +54,7 @@ if "%INSTALLDIR%" == "" set INSTALLDIR=C:\Program Files\Tcl
::
set OPTS=none
if not %SYMBOLS%.==. set OPTS=symbols
-nmake -nologo -f makefile.vc release winhelp OPTS=%OPTS% %1
+nmake -nologo -f makefile.vc release htmlhelp OPTS=%OPTS% %1
if errorlevel 1 goto error
:: Build the static core, dlls and shell.
diff --git a/win/makefile.vc b/win/makefile.vc
index fc9014e..2811c90 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -13,7 +13,7 @@
# Copyright (c) 2003-2008 Pat Thoyts.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.189 2008/08/29 12:37:18 dkf Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.190 2008/10/02 19:01:30 mistachkin Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -761,13 +761,12 @@ install-docs:
!if exist($(CHMFILE))
@echo Installing compiled html help
@$(CPY) "$(CHMFILE)" "$(DOC_INSTALL_DIR)\"
-!else
+!endif
!if exist($(HELPFILE))
@echo Installing Windows help
@$(CPY) "$(HELPFILE)" "$(DOC_INSTALL_DIR)\"
@$(CPY) "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"
!endif
-!endif
#"
#---------------------------------------------------------------------