0 files changed, 0 insertions, 0 deletions
diff --git a/.project b/.project
index 1a176fb..cc5f605 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>tk8.6</name>
+	<name>tk8.7</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/README b/README
index aa5d0f6..cb3bdd5 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 README:  Tk
-    This is the Tk 8.6.5 source distribution.
+    This is the Tk 8.7a0 source distribution.
 	http://sourceforge.net/projects/tcl/files/Tcl/
     You can get any source release of Tk from the URL above.
 
@@ -10,9 +10,9 @@ This directory contains the sources and documentation for Tk, an X11
 toolkit implemented with the Tcl scripting language.
 
 For details on features, incompatibilities, and potential problems with
-this release, see the Tcl/Tk 8.6 Web page at
+this release, see the Tcl/Tk 8.7 Web page at
 
-	http://www.tcl.tk/software/tcltk/8.6.html
+	http://www.tcl.tk/software/tcltk/8.7.html
 
 or refer to the "changes" file in this directory, which contains a
 historical record of all changes to Tk.
diff --git a/doc/3DBorder.3 b/doc/3DBorder.3
index f2f0eb8..f589e66 100644
--- a/doc/3DBorder.3
+++ b/doc/3DBorder.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_Alloc3DBorderFromObj 3 8.1 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/BindTable.3 b/doc/BindTable.3
index 5130bfc..772f39f 100644
--- a/doc/BindTable.3
+++ b/doc/BindTable.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CreateBindingTable 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/CanvPsY.3 b/doc/CanvPsY.3
index 5e104ce..f789d3c 100644
--- a/doc/CanvPsY.3
+++ b/doc/CanvPsY.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CanvasPs 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/CanvTkwin.3 b/doc/CanvTkwin.3
index d53c5b1..6ae3d97 100644
--- a/doc/CanvTkwin.3
+++ b/doc/CanvTkwin.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CanvasTkwin 3 4.1 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/CanvTxtInfo.3 b/doc/CanvTxtInfo.3
index 92a2bc3..1dd2354 100644
--- a/doc/CanvTxtInfo.3
+++ b/doc/CanvTxtInfo.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CanvasTextInfo 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/Clipboard.3 b/doc/Clipboard.3
index 3087777..cc09018 100644
--- a/doc/Clipboard.3
+++ b/doc/Clipboard.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_ClipboardClear 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/ClrSelect.3 b/doc/ClrSelect.3
index c56f63c..1b942b5 100644
--- a/doc/ClrSelect.3
+++ b/doc/ClrSelect.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_ClearSelection 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/ConfigWind.3 b/doc/ConfigWind.3
index 7c7adab..3e83387 100644
--- a/doc/ConfigWind.3
+++ b/doc/ConfigWind.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_ConfigureWindow 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/CoordToWin.3 b/doc/CoordToWin.3
index 5fe96a6..1ebd681 100644
--- a/doc/CoordToWin.3
+++ b/doc/CoordToWin.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CoordsToWindow 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/CrtCmHdlr.3 b/doc/CrtCmHdlr.3
index 98b93f7..01c3852 100644
--- a/doc/CrtCmHdlr.3
+++ b/doc/CrtCmHdlr.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CreateClientMessageHandler 3 "8.4" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/CrtConsoleChan.3 b/doc/CrtConsoleChan.3
index 7fd8a6a..d8e0740 100644
--- a/doc/CrtConsoleChan.3
+++ b/doc/CrtConsoleChan.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_InitConsoleChannels 3 8.5 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/CrtErrHdlr.3 b/doc/CrtErrHdlr.3
index e506220..e6ebafe 100644
--- a/doc/CrtErrHdlr.3
+++ b/doc/CrtErrHdlr.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CreateErrorHandler 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/CrtGenHdlr.3 b/doc/CrtGenHdlr.3
index c2161d1..c2aac03 100644
--- a/doc/CrtGenHdlr.3
+++ b/doc/CrtGenHdlr.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CreateGenericHandler 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/CrtImgType.3 b/doc/CrtImgType.3
index cbbc11e..4949c50 100644
--- a/doc/CrtImgType.3
+++ b/doc/CrtImgType.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CreateImageType 3 8.5 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/CrtItemType.3 b/doc/CrtItemType.3
index 005d2e2..f9198f3 100644
--- a/doc/CrtItemType.3
+++ b/doc/CrtItemType.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CreateItemType 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/CrtPhImgFmt.3 b/doc/CrtPhImgFmt.3
index c7e792a..92f2441 100644
--- a/doc/CrtPhImgFmt.3
+++ b/doc/CrtPhImgFmt.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 '\" Author: Paul Mackerras (paulus@cs.anu.edu.au),
 '\"	    Department of Computer Science,
 '\"	    Australian National University.
diff --git a/doc/DeleteImg.3 b/doc/DeleteImg.3
index 507be72..eb6db1e 100644
--- a/doc/DeleteImg.3
+++ b/doc/DeleteImg.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_DeleteImage 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/DrawFocHlt.3 b/doc/DrawFocHlt.3
index e2d1578..59cd069 100644
--- a/doc/DrawFocHlt.3
+++ b/doc/DrawFocHlt.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_DrawFocusHighlight 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/EventHndlr.3 b/doc/EventHndlr.3
index 97857fb..8c47e78 100644
--- a/doc/EventHndlr.3
+++ b/doc/EventHndlr.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CreateEventHandler 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/FindPhoto.3 b/doc/FindPhoto.3
index e4d83f0..61a47de 100644
--- a/doc/FindPhoto.3
+++ b/doc/FindPhoto.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 '\" Author: Paul Mackerras (paulus@cs.anu.edu.au),
 '\"	    Department of Computer Science,
 '\"	    Australian National University.
@@ -99,8 +99,8 @@ being written to the photo image.
 particular photo image to the other procedures.  The parameter is the
 name of the image, that is, the name specified to the \fBimage create
 photo\fR command, or assigned by that command if no name was specified.
-If \fIimageName\fR does not exist or is not a photo image, 
-\fBTk_FindPhoto\fR returns NULL. 
+If \fIimageName\fR does not exist or is not a photo image,
+\fBTk_FindPhoto\fR returns NULL.
 .PP
 \fBTk_PhotoPutBlock\fR is used to supply blocks of image data to be
 displayed.  The call affects an area of the image of size
@@ -184,16 +184,16 @@ that describe the address and layout of the image data that the
 photo image has stored internally.  The values are valid
 until the image is destroyed or its size is changed.
 .PP
-It is possible to modify an image by writing directly to the data 
+It is possible to modify an image by writing directly to the data
 the \fIpixelPtr\fR field points to. The size of the image cannot be
 changed this way, though.
-Also, changes made by writing directly to \fIpixelPtr\fR will not be 
-immediately visible, but only after a call to 
-\fBTk_ImageChanged\fR or after an event that causes the interested 
+Also, changes made by writing directly to \fIpixelPtr\fR will not be
+immediately visible, but only after a call to
+\fBTk_ImageChanged\fR or after an event that causes the interested
 widgets to redraw themselves.
-For these reasons usually it is preferable to make changes to 
-a copy of the image data and write it back with 
-\fBTk_PhotoPutBlock\fR or \fBTk_PhotoPutZoomedBlock\fR. 
+For these reasons usually it is preferable to make changes to
+a copy of the image data and write it back with
+\fBTk_PhotoPutBlock\fR or \fBTk_PhotoPutZoomedBlock\fR.
 .PP
 \fBTk_PhotoGetImage\fR returns 1 for compatibility with the
 corresponding procedure in the old photo widget.
diff --git a/doc/FreeXId.3 b/doc/FreeXId.3
index dd1d141..84fef26 100644
--- a/doc/FreeXId.3
+++ b/doc/FreeXId.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_FreeXId 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
@@ -25,24 +25,6 @@ context, or colormap) that is no longer in use.
 .BE
 .SH DESCRIPTION
 .PP
-The default allocator for resource identifiers provided by Xlib is very
-simple-minded and does not allow resource identifiers to be re-used.
-If a long-running application reaches the end of the resource id
-space, it will generate an X protocol error and crash.
-Tk replaces the default id allocator with its own allocator, which
-allows identifiers to be reused.
-In order for this to work, \fBTk_FreeXId\fR must be called to
-tell the allocator about resources that have been freed.
-Tk automatically calls \fBTk_FreeXId\fR whenever it frees a
-resource, so if you use procedures like \fBTk_GetFont\fR,
-\fBTk_GetGC\fR, and \fBTk_GetPixmap\fR then you need not call
-\fBTk_FreeXId\fR.
-However, if you allocate resources directly from Xlib, for example
-by calling \fBXCreatePixmap\fR, then you should call \fBTk_FreeXId\fR
-when you call the corresponding Xlib free procedure, such as
-\fBXFreePixmap\fR.
-If you do not call \fBTk_FreeXId\fR then the resource identifier will
-be lost, which could cause problems if the application runs long enough
-to lose all of the available identifiers.
+This function is deprecated, it doesn't do anything since 2008-08-19.
 .SH KEYWORDS
 resource identifier
diff --git a/doc/GeomReq.3 b/doc/GeomReq.3
index 895f683..7670521 100644
--- a/doc/GeomReq.3
+++ b/doc/GeomReq.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GeometryRequest 3 "8.4" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetAnchor.3 b/doc/GetAnchor.3
index 6526772..5d41ad6 100644
--- a/doc/GetAnchor.3
+++ b/doc/GetAnchor.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetAnchorFromObj 3 8.1 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetBitmap.3 b/doc/GetBitmap.3
index c4ac44e..88418c7 100644
--- a/doc/GetBitmap.3
+++ b/doc/GetBitmap.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_AllocBitmapFromObj 3 8.1 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetCapStyl.3 b/doc/GetCapStyl.3
index 28f1a1c..4e5d1d5 100644
--- a/doc/GetCapStyl.3
+++ b/doc/GetCapStyl.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetCapStyle 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetClrmap.3 b/doc/GetClrmap.3
index 9e6da12..4b72b6c 100644
--- a/doc/GetClrmap.3
+++ b/doc/GetClrmap.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetColormap 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetDash.3 b/doc/GetDash.3
index d1eeb70..2087424 100644
--- a/doc/GetDash.3
+++ b/doc/GetDash.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetDash 3 8.3 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetGC.3 b/doc/GetGC.3
index 44e06fb..6ee63a9 100644
--- a/doc/GetGC.3
+++ b/doc/GetGC.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetGC 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetHINSTANCE.3 b/doc/GetHINSTANCE.3
index de38051..980b374 100644
--- a/doc/GetHINSTANCE.3
+++ b/doc/GetHINSTANCE.3
@@ -1,7 +1,7 @@
 '\"
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
-'\" 
+'\"
 .TH Tk_GetHISTANCE 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetHWND.3 b/doc/GetHWND.3
index 1a5ec2d..15d2ff0 100644
--- a/doc/GetHWND.3
+++ b/doc/GetHWND.3
@@ -1,7 +1,7 @@
 '\"
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
-'\" 
+'\"
 .TH HWND 3 8.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetImage.3 b/doc/GetImage.3
index f2407bc..744f9ac 100644
--- a/doc/GetImage.3
+++ b/doc/GetImage.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetImage 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetJoinStl.3 b/doc/GetJoinStl.3
index a717b72..616719c 100644
--- a/doc/GetJoinStl.3
+++ b/doc/GetJoinStl.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetJoinStyle 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetJustify.3 b/doc/GetJustify.3
index b51cb8d..2e871cb 100644
--- a/doc/GetJustify.3
+++ b/doc/GetJustify.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetJustifyFromObj 3 8.1 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetOption.3 b/doc/GetOption.3
index 81846ad..799786d 100644
--- a/doc/GetOption.3
+++ b/doc/GetOption.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetOption 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetPixels.3 b/doc/GetPixels.3
index e7a9043..6c31af9 100644
--- a/doc/GetPixels.3
+++ b/doc/GetPixels.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetPixelsFromObj 3 8.1 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetPixmap.3 b/doc/GetPixmap.3
index 927c75c..65fae2d 100644
--- a/doc/GetPixmap.3
+++ b/doc/GetPixmap.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetPixmap 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetRelief.3 b/doc/GetRelief.3
index 6e8681a..5979662 100644
--- a/doc/GetRelief.3
+++ b/doc/GetRelief.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetReliefFromObj 3 8.1 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetRootCrd.3 b/doc/GetRootCrd.3
index a9d2cd9..20520ea 100644
--- a/doc/GetRootCrd.3
+++ b/doc/GetRootCrd.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetRootCoords 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetScroll.3 b/doc/GetScroll.3
index abd0880..70145aa 100644
--- a/doc/GetScroll.3
+++ b/doc/GetScroll.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetScrollInfo 3 8.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetSelect.3 b/doc/GetSelect.3
index 8c30a2b..11e837e 100644
--- a/doc/GetSelect.3
+++ b/doc/GetSelect.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetSelection 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetUid.3 b/doc/GetUid.3
index 06b466a..2cd95ad 100644
--- a/doc/GetUid.3
+++ b/doc/GetUid.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetUid 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetVRoot.3 b/doc/GetVRoot.3
index a65ef78..7e6003a 100644
--- a/doc/GetVRoot.3
+++ b/doc/GetVRoot.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetVRootGeometry 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/GetVisual.3 b/doc/GetVisual.3
index fe3d50c..fc6b6f8 100644
--- a/doc/GetVisual.3
+++ b/doc/GetVisual.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetVisual 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/Grab.3 b/doc/Grab.3
index 1dba2df..2741220 100644
--- a/doc/Grab.3
+++ b/doc/Grab.3
@@ -1,7 +1,7 @@
 '\"
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
-'\" 
+'\"
 .TH Tk_Grab 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/HWNDToWindow.3 b/doc/HWNDToWindow.3
index 9795099..a2e5a6c 100644
--- a/doc/HWNDToWindow.3
+++ b/doc/HWNDToWindow.3
@@ -1,7 +1,7 @@
 '\"
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
-'\" 
+'\"
 .TH Tk_HWNDToWindow 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/HandleEvent.3 b/doc/HandleEvent.3
index bc293b6..f3072de 100644
--- a/doc/HandleEvent.3
+++ b/doc/HandleEvent.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_HandleEvent 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/IdToWindow.3 b/doc/IdToWindow.3
index f6e397d..f8ce1f9 100644
--- a/doc/IdToWindow.3
+++ b/doc/IdToWindow.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_IdToWindow 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/ImgChanged.3 b/doc/ImgChanged.3
index f4d2c04..ccf0c11 100644
--- a/doc/ImgChanged.3
+++ b/doc/ImgChanged.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_ImageChanged 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/Inactive.3 b/doc/Inactive.3
index 5528fa5..d0fccf1 100644
--- a/doc/Inactive.3
+++ b/doc/Inactive.3
@@ -1,7 +1,7 @@
 '\"
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
-'\" 
+'\"
 .TH Tk_GetUserInactiveTime 3 8.5 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/InternAtom.3 b/doc/InternAtom.3
index a16eee1..e6756a5 100644
--- a/doc/InternAtom.3
+++ b/doc/InternAtom.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_InternAtom 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/MainLoop.3 b/doc/MainLoop.3
index ed4d0ea..770f254 100644
--- a/doc/MainLoop.3
+++ b/doc/MainLoop.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_MainLoop 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/MainWin.3 b/doc/MainWin.3
index c3af3e7..94bd7e2 100644
--- a/doc/MainWin.3
+++ b/doc/MainWin.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_MainWindow 3 7.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/MaintGeom.3 b/doc/MaintGeom.3
index d1c2d1c..b34e797 100644
--- a/doc/MaintGeom.3
+++ b/doc/MaintGeom.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_MaintainGeometry 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/ManageGeom.3 b/doc/ManageGeom.3
index 520546f..ba12aca 100644
--- a/doc/ManageGeom.3
+++ b/doc/ManageGeom.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_ManageGeometry 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/MoveToplev.3 b/doc/MoveToplev.3
index effed29..20ff120 100644
--- a/doc/MoveToplev.3
+++ b/doc/MoveToplev.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_MoveToplevelWindow 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/Name.3 b/doc/Name.3
index 4b9c5bc..1653cf5 100644
--- a/doc/Name.3
+++ b/doc/Name.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_Name 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/NameOfImg.3 b/doc/NameOfImg.3
index 78332db..38c7ca9 100644
--- a/doc/NameOfImg.3
+++ b/doc/NameOfImg.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_NameOfImage 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/OwnSelect.3 b/doc/OwnSelect.3
index ed9bcab..0e16eac 100644
--- a/doc/OwnSelect.3
+++ b/doc/OwnSelect.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_OwnSelection 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/ParseArgv.3 b/doc/ParseArgv.3
index 3a9bd49..b6362bd 100644
--- a/doc/ParseArgv.3
+++ b/doc/ParseArgv.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_ParseArgv 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/QWinEvent.3 b/doc/QWinEvent.3
index caa5026..9c43ce5 100644
--- a/doc/QWinEvent.3
+++ b/doc/QWinEvent.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_QueueWindowEvent 3 7.5 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/Restack.3 b/doc/Restack.3
index 2b9097f..5cd02eb 100644
--- a/doc/Restack.3
+++ b/doc/Restack.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_RestackWindow 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/RestrictEv.3 b/doc/RestrictEv.3
index eb1f040..103a80b 100644
--- a/doc/RestrictEv.3
+++ b/doc/RestrictEv.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_RestrictEvents 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/SetAppName.3 b/doc/SetAppName.3
index 3978850..91516a0 100644
--- a/doc/SetAppName.3
+++ b/doc/SetAppName.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_SetAppName 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/SetCaret.3 b/doc/SetCaret.3
index fd63f18..24cc18c 100644
--- a/doc/SetCaret.3
+++ b/doc/SetCaret.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_SetCaretPos 3 8.4 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/SetClass.3 b/doc/SetClass.3
index 707975d..0ea81bb 100644
--- a/doc/SetClass.3
+++ b/doc/SetClass.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_SetClass 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/SetClassProcs.3 b/doc/SetClassProcs.3
index 58618da..a2af479 100644
--- a/doc/SetClassProcs.3
+++ b/doc/SetClassProcs.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_SetClassProcs 3 8.4 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/SetGrid.3 b/doc/SetGrid.3
index 28e428b..ea32afb 100644
--- a/doc/SetGrid.3
+++ b/doc/SetGrid.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_SetGrid 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/SetOptions.3 b/doc/SetOptions.3
index b5f0782..581b1e6 100644
--- a/doc/SetOptions.3
+++ b/doc/SetOptions.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_SetOptions 3 8.1 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/SetVisual.3 b/doc/SetVisual.3
index 6d3fd83..a5b9efd 100644
--- a/doc/SetVisual.3
+++ b/doc/SetVisual.3
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_SetWindowVisual 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/StrictMotif.3 b/doc/StrictMotif.3
index 4319d53..ec9319f 100644
--- a/doc/StrictMotif.3
+++ b/doc/StrictMotif.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_StrictMotif 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/TkInitStubs.3 b/doc/TkInitStubs.3
index 04f5611..57ec9e6 100644
--- a/doc/TkInitStubs.3
+++ b/doc/TkInitStubs.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_InitStubs 3 8.4 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/Tk_Init.3 b/doc/Tk_Init.3
index 7bc46dd..fc29318 100644
--- a/doc/Tk_Init.3
+++ b/doc/Tk_Init.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_Init 3 8.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
diff --git a/doc/bell.n b/doc/bell.n
index 21c4f1b..3e8d112 100644
--- a/doc/bell.n
+++ b/doc/bell.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.
-'\" 
+'\"
 .TH bell n 8.4 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/bind.n b/doc/bind.n
index d189376..becc08b 100644
--- a/doc/bind.n
+++ b/doc/bind.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.
-'\" 
+'\"
 .TH bind n 8.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
@@ -351,7 +351,7 @@ position in the stacking order.
 .PP
 The last part of a long event specification is \fIdetail\fR.  In the
 case of a \fBButtonPress\fR or \fBButtonRelease\fR event, it is the
-number of a button (1\-5).  If a button number is given, then only an
+number of a button (1\-9).  If a button number is given, then only an
 event on that particular button will match;  if no button number is
 given, then an event on any button will match.  Note:  giving a
 specific button number is different than specifying a button modifier;
diff --git a/doc/bindtags.n b/doc/bindtags.n
index dc3973b..51c2ca9 100644
--- a/doc/bindtags.n
+++ b/doc/bindtags.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH bindtags n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/bitmap.n b/doc/bitmap.n
index ead3311..1751913 100644
--- a/doc/bitmap.n
+++ b/doc/bitmap.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH bitmap n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/chooseColor.n b/doc/chooseColor.n
index 015b17d..3fa6de3 100644
--- a/doc/chooseColor.n
+++ b/doc/chooseColor.n
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk_chooseColor n 4.2 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/console.n b/doc/console.n
index 1313d3a..d4d8a74 100644
--- a/doc/console.n
+++ b/doc/console.n
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH console n 8.4 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/cursors.n b/doc/cursors.n
index 1662de4..a728755 100644
--- a/doc/cursors.n
+++ b/doc/cursors.n
@@ -1,9 +1,9 @@
 '\"
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
-'\" 
+'\"
 '\" Copyright (c) 2006-2007 Daniel A. Steffen <das@users.sourceforge.net>
-'\" 
+'\"
 .TH cursors n 8.3 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/destroy.n b/doc/destroy.n
index 3d4743a..b10c679 100644
--- a/doc/destroy.n
+++ b/doc/destroy.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH destroy n "" Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/dialog.n b/doc/dialog.n
index d2031d3..e4938d2 100644
--- a/doc/dialog.n
+++ b/doc/dialog.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk_dialog n 4.1 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/entry.n b/doc/entry.n
index ccfcd24..40b45c7 100644
--- a/doc/entry.n
+++ b/doc/entry.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.
-'\" 
+'\"
 .TH entry n 8.3 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/focus.n b/doc/focus.n
index 4b8bb2a..e3efcd3 100644
--- a/doc/focus.n
+++ b/doc/focus.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH focus n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/focusNext.n b/doc/focusNext.n
index ffcf971..3283d4b 100644
--- a/doc/focusNext.n
+++ b/doc/focusNext.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk_focusNext n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/fontchooser.n b/doc/fontchooser.n
index bdd51c7..65aa8e7 100644
--- a/doc/fontchooser.n
+++ b/doc/fontchooser.n
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH fontchooser n "" Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/frame.n b/doc/frame.n
index 72a22db..6aa412e 100644
--- a/doc/frame.n
+++ b/doc/frame.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH frame n 8.4 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/grab.n b/doc/grab.n
index a6d0d19..9288e90 100644
--- a/doc/grab.n
+++ b/doc/grab.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH grab n "" Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/grid.n b/doc/grid.n
index 9ac84d9..07d07aa 100644
--- a/doc/grid.n
+++ b/doc/grid.n
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH grid n 8.5 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/image.n b/doc/image.n
index fd51cc0..70f5acf 100644
--- a/doc/image.n
+++ b/doc/image.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH image n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/label.n b/doc/label.n
index f2ba88c..107175e 100644
--- a/doc/label.n
+++ b/doc/label.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH label n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/lower.n b/doc/lower.n
index 8159a8b..d0b0551 100644
--- a/doc/lower.n
+++ b/doc/lower.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH lower n 3.3 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/menu.n b/doc/menu.n
index ed1bb33..9dd7ef4 100644
--- a/doc/menu.n
+++ b/doc/menu.n
@@ -98,8 +98,10 @@ a bitmap, or an image, controlled by the \fB\-label\fR,
 \fB\-bitmap\fR, and \fB\-image\fR options for the entry.
 If the  \fB\-accelerator\fR option is specified for an entry then a second
 textual field is displayed to the right of the label.  The accelerator
-typically describes a keystroke sequence that may be typed in the
+typically describes a keystroke sequence that may be used in the
 application to cause the same result as invoking the menu entry.
+This is a display option, it does not actually set the corresponding
+binding (which can be achieved using the \fBbind\fR command). 
 The third field is an \fIindicator\fR.  The indicator is present only for
 checkbutton or radiobutton entries.  It indicates whether the entry
 is selected or not, and is displayed to the left of the entry's
@@ -537,8 +539,10 @@ This option is not available for separator or tear-off entries.
 .
 Specifies a string to display at the right side of the menu entry.
 Normally describes an accelerator keystroke sequence that may be
-typed to invoke the same function as the menu entry.  This option
-is not available for separator or tear-off entries.
+used to invoke the same function as the menu entry. This is a display
+option, it does not actually set the corresponding binding (which can
+be achieved using the \fBbind\fR command). This option is not available
+for separator or tear-off entries.
 .TP
 \fB\-background \fIvalue\fR
 .
diff --git a/doc/menubar.n b/doc/menubar.n
index 023bf37..c3be85d 100644
--- a/doc/menubar.n
+++ b/doc/menubar.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk_menuBar n "" Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/menubutton.n b/doc/menubutton.n
index 08b52a0..1f596ce 100644
--- a/doc/menubutton.n
+++ b/doc/menubutton.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH menubutton n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/message.n b/doc/message.n
index bd635ac..280c072 100644
--- a/doc/message.n
+++ b/doc/message.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH message n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/option.n b/doc/option.n
index 2763d64..6042010 100644
--- a/doc/option.n
+++ b/doc/option.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH option n "" Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/optionMenu.n b/doc/optionMenu.n
index 42275ce..eff6e86 100644
--- a/doc/optionMenu.n
+++ b/doc/optionMenu.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk_optionMenu n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/pack-old.n b/doc/pack-old.n
index 217dba9..5ef5da1 100644
--- a/doc/pack-old.n
+++ b/doc/pack-old.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH pack-old n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/pack.n b/doc/pack.n
index 538af62..6b39e1d 100644
--- a/doc/pack.n
+++ b/doc/pack.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH pack n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/palette.n b/doc/palette.n
index 085c4c6..6a04450 100644
--- a/doc/palette.n
+++ b/doc/palette.n
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk_setPalette n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/photo.n b/doc/photo.n
index 0fe0c61..84cf618 100644
--- a/doc/photo.n
+++ b/doc/photo.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 '\" Author: Paul Mackerras (paulus@cs.anu.edu.au),
 '\"	    Department of Computer Science,
 '\"	    Australian National University.
diff --git a/doc/place.n b/doc/place.n
index 3a092c2..3ebaf20 100644
--- a/doc/place.n
+++ b/doc/place.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH place n "" Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/popup.n b/doc/popup.n
index 0d32362..6e6fd95 100644
--- a/doc/popup.n
+++ b/doc/popup.n
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk_popup n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/raise.n b/doc/raise.n
index be20c74..0983ed2 100644
--- a/doc/raise.n
+++ b/doc/raise.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH raise n 3.3 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/scrollbar.n b/doc/scrollbar.n
index 4d148af..4b1d4ba 100644
--- a/doc/scrollbar.n
+++ b/doc/scrollbar.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH scrollbar n 4.1 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/send.n b/doc/send.n
index 2a683d5..e33a504 100644
--- a/doc/send.n
+++ b/doc/send.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH send n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/spinbox.n b/doc/spinbox.n
index 330bb17..2f7e6bd 100644
--- a/doc/spinbox.n
+++ b/doc/spinbox.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH spinbox n 8.4 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
@@ -54,7 +54,8 @@ as it will format a floating-point number.
 A floating-point value corresponding to the lowest value for a spinbox, to
 be used in conjunction with \fB\-to\fR and \fB\-increment\fR.  When all
 are specified correctly, the spinbox will use these values to control its
-contents.  This value must be less than the \fB\-to\fR option.
+contents. If this value is greater than the \fB\-to\fR option, then
+\fB\-from\fR and \fB\-to\fR values are automatically swapped.
 If \fB\-values\fR is specified, it supersedes this option.
 .OP "\-invalidcommand or \-invcmd" invalidCommand InvalidCommand
 Specifies a script to eval when \fB\-validatecommand\fR returns 0.  Setting
@@ -83,7 +84,8 @@ be displayed in a different color, depending on the values of the
 A floating-point value corresponding to the highest value for the spinbox,
 to be used in conjunction with \fB\-from\fR and \fB\-increment\fR.  When
 all are specified correctly, the spinbox will use these values to control
-its contents.  This value must be greater than the \fB\-from\fR option.
+its contents. If this value is less than the \fB\-from\fR option, then
+\fB\-from\fR and \fB\-to\fR values are automatically swapped.
 If \fB\-values\fR is specified, it supersedes this option.
 .OP \-validate validate Validate
 Specifies the mode in which validation should operate: \fBnone\fR,
diff --git a/doc/text.n b/doc/text.n
index 9633e37..860fa30 100644
--- a/doc/text.n
+++ b/doc/text.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH text n 8.5 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
@@ -491,9 +491,10 @@ second and later display lines for a text line.
 \fIColor\fR specifies the background color to use in regions that do not
 contain characters because they are indented by \fB\-lmargin1\fR or
 \fB\-lmargin2\fR. It may have any of the forms accepted by
-\fBTk_GetColor\fR.If \fIcolor\fR has not been specified, or if it is
-specified as an empty string, then the color specified by the
-\fB-background\fR widget option is used.
+\fBTk_GetColor\fR. If \fIcolor\fR has not been specified, or if it is
+specified as an empty string, then the color used is specified by the
+\fB-background\fR tag option (or, if this is also unspecified, by the
+\fB-background\fR widget option).
 .TP
 \fB\-offset \fIpixels\fR
 .
@@ -537,9 +538,10 @@ character of that display line.
 .
 \fIColor\fR specifies the background color to use in regions that do not
 contain characters because they are indented by \fB\-rmargin1\fR. It may
-have any of the forms accepted by \fBTk_GetColor\fR.If \fIcolor\fR has not
+have any of the forms accepted by \fBTk_GetColor\fR. If \fIcolor\fR has not
 been specified, or if it is specified as an empty string, then the color
-specified by the \fB-background\fR widget option is used.
+used is specified by the \fB-background\fR tag option (or, if this is also
+unspecified, by the \fB-background\fR widget option).
 .TP
 \fB\-selectbackground \fIcolor\fR
 \fIColor\fR specifies the background color to use when displaying selected
diff --git a/doc/tk.n b/doc/tk.n
index 1165b67..43ce64d 100644
--- a/doc/tk.n
+++ b/doc/tk.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk n 8.4 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/tk4.0.ps b/doc/tk4.0.ps
index d79642d..5b71d92 100644
--- a/doc/tk4.0.ps
+++ b/doc/tk4.0.ps
@@ -16,7 +16,7 @@
 %
 % Known Problems:
 %	Due to bugs in Transcript, the 'PS-Adobe-' is omitted from line 1
-/FMversion (3.0) def 
+/FMversion (3.0) def
 % Set up Color vs. Black-and-White
 
 /FMPrintInColor { % once-thru loop gimmick
@@ -38,34 +38,34 @@ exit } loop def
 
 % Uncomment the following line to force b&w on color printer
 %   /FMPrintInColor false def
-/FrameDict 195 dict def 
+/FrameDict 195 dict def
 systemdict /errordict known not {/errordict 10 dict def
 		errordict /rangecheck {stop} put} if
 % The readline in 23.0 doesn't recognize cr's as nl's on AppleTalk
-FrameDict /tmprangecheck errordict /rangecheck get put 
-errordict /rangecheck {FrameDict /bug true put} put 
-FrameDict /bug false put 
-mark 
+FrameDict /tmprangecheck errordict /rangecheck get put
+errordict /rangecheck {FrameDict /bug true put} put
+FrameDict /bug false put
+mark
 % Some PS machines read past the CR, so keep the following 3 lines together!
 currentfile 5 string readline
 00
 0000000000
-cleartomark 
-errordict /rangecheck FrameDict /tmprangecheck get put 
-FrameDict /bug get { 
+cleartomark
+errordict /rangecheck FrameDict /tmprangecheck get put
+FrameDict /bug get {
 	/readline {
 		/gstring exch def
 		/gfile exch def
 		/gindex 0 def
 		{
-			gfile read pop 
-			dup 10 eq {exit} if 
-			dup 13 eq {exit} if 
-			gstring exch gindex exch put 
-			/gindex gindex 1 add def 
+			gfile read pop
+			dup 10 eq {exit} if
+			dup 13 eq {exit} if
+			gstring exch gindex exch put
+			/gindex gindex 1 add def
 		} loop
-		pop 
-		gstring 0 gindex getinterval true 
+		pop
+		gstring 0 gindex getinterval true
 		} def
 	} if
 /FMVERSION {
@@ -76,12 +76,12 @@ FrameDict /bug get {
 		dup =
 		show showpage
 		} if
-	} def 
+	} def
 /FMLOCAL {
 	FrameDict begin
-	0 def 
-	end 
-	} def 
+	0 def
+	end
+	} def
 	/gstring FMLOCAL
 	/gfile FMLOCAL
 	/gindex FMLOCAL
@@ -94,8 +94,8 @@ FrameDict /bug get {
 	/manualfeed FMLOCAL
 	/paperheight FMLOCAL
 	/paperwidth FMLOCAL
-/FMDOCUMENT { 
-	array /FMfonts exch def 
+/FMDOCUMENT {
+	array /FMfonts exch def
 	/#copies exch def
 	FrameDict begin
 	0 ne dup {setmanualfeed} if
@@ -107,62 +107,62 @@ FrameDict /bug get {
 	currenttransfer cvlit /orgxfer exch def
 	currentscreen cvlit /orgproc exch def
 	/organgle exch def /orgfreq exch def
-	setpapername 
-	manualfeed {true} {papersize} ifelse 
-	{manualpapersize} {false} ifelse 
+	setpapername
+	manualfeed {true} {papersize} ifelse
+	{manualpapersize} {false} ifelse
 	{desperatepapersize} if
-	end 
-	} def 
+	end
+	} def
 	/pagesave FMLOCAL
 	/orgmatrix FMLOCAL
 	/landscape FMLOCAL
-/FMBEGINPAGE { 
-	FrameDict begin 
+/FMBEGINPAGE {
+	FrameDict begin
 	/pagesave save def
 	3.86 setmiterlimit
 	/landscape exch 0 ne def
-	landscape { 
-		90 rotate 0 exch neg translate pop 
+	landscape {
+		90 rotate 0 exch neg translate pop
 		}
 		{pop pop}
 		ifelse
 	xscale yscale scale
 	/orgmatrix matrix def
-	gsave 
-	} def 
+	gsave
+	} def
 /FMENDPAGE {
-	grestore 
+	grestore
 	pagesave restore
-	end 
+	end
 	showpage
-	} def 
-/FMFONTDEFINE { 
+	} def
+/FMFONTDEFINE {
 	FrameDict begin
-	findfont 
-	ReEncode 
-	1 index exch 
-	definefont 
-	FMfonts 3 1 roll 
+	findfont
+	ReEncode
+	1 index exch
+	definefont
+	FMfonts 3 1 roll
 	put
-	end 
-	} def 
+	end
+	} def
 /FMFILLS {
 	FrameDict begin
 	array /fillvals exch def
-	end 
-	} def 
+	end
+	} def
 /FMFILL {
 	FrameDict begin
 	 fillvals 3 1 roll put
-	end 
-	} def 
-/FMNORMALIZEGRAPHICS { 
+	end
+	} def
+/FMNORMALIZEGRAPHICS {
 	newpath
 	0.0 0.0 moveto
 	1 setlinewidth
 	0 setlinecap
 	0 0 0 sethsbcolor
-	0 setgray 
+	0 setgray
 	} bind def
 	/fx FMLOCAL
 	/fy FMLOCAL
@@ -172,22 +172,22 @@ FrameDict /bug get {
 	/lly FMLOCAL
 	/urx FMLOCAL
 	/ury FMLOCAL
-/FMBEGINEPSF { 
-	end 
-	/FMEPSF save def 
-	/showpage {} def 
-	FMNORMALIZEGRAPHICS 
-	[/fy /fx /fh /fw /ury /urx /lly /llx] {exch def} forall 
-	fx fy translate 
+/FMBEGINEPSF {
+	end
+	/FMEPSF save def
+	/showpage {} def
+	FMNORMALIZEGRAPHICS
+	[/fy /fx /fh /fw /ury /urx /lly /llx] {exch def} forall
+	fx fy translate
 	rotate
-	fw urx llx sub div fh ury lly sub div scale 
-	llx neg lly neg translate 
+	fw urx llx sub div fh ury lly sub div scale
+	llx neg lly neg translate
 	} bind def
 /FMENDEPSF {
 	FMEPSF restore
-	FrameDict begin 
+	FrameDict begin
 	} bind def
-FrameDict begin 
+FrameDict begin
 /setmanualfeed {
 %%BeginFeature *ManualFeed True
 	 statusdict /manualfeed true put
@@ -196,16 +196,16 @@ FrameDict begin
 /max {2 copy lt {exch} if pop} bind def
 /min {2 copy gt {exch} if pop} bind def
 /inch {72 mul} def
-/pagedimen { 
-	paperheight sub abs 16 lt exch 
+/pagedimen {
+	paperheight sub abs 16 lt exch
 	paperwidth sub abs 16 lt and
 	{/papername exch def} {pop} ifelse
 	} def
 	/papersizedict FMLOCAL
-/setpapername { 
-	/papersizedict 14 dict def 
+/setpapername {
+	/papersizedict 14 dict def
 	papersizedict begin
-	/papername /unknown def 
+	/papername /unknown def
 		/Letter 8.5 inch 11.0 inch pagedimen
 		/LetterSmall 7.68 inch 10.16 inch pagedimen
 		/Tabloid 11.0 inch 17.0 inch pagedimen
@@ -237,9 +237,9 @@ FrameDict begin
 		/unknown {unknown} def
 	papersizedict dup papername known {papername} {/unknown} ifelse get
 	end
-	/FMdicttop countdictstack 1 add def 
-	statusdict begin stopped end 
-	countdictstack -1 FMdicttop {pop end} for 
+	/FMdicttop countdictstack 1 add def
+	statusdict begin stopped end
+	countdictstack -1 FMdicttop {pop end} for
 	} def
 /manualpapersize {
 	papersizedict begin
@@ -258,14 +258,14 @@ FrameDict begin
 		/unknown {unknown} def
 	papersizedict dup papername known {papername} {/unknown} ifelse get
 	end
-	stopped 
+	stopped
 	} def
 /desperatepapersize {
 	statusdict /setpageparams known
 		{
-		paperwidth paperheight 0 1 
+		paperwidth paperheight 0 1
 		statusdict begin
-		{setpageparams} stopped pop 
+		{setpageparams} stopped pop
 		end
 		} if
 	} def
@@ -314,18 +314,18 @@ FrameDict begin
 /Uacute /Ucircumflex /Ugrave /dotlessi /circumflex /tilde /macron
 /breve /dotaccent /ring /cedilla /hungarumlaut /ogonek /caron
 ] def
-/ReEncode { 
-	dup 
-	length 
-	dict begin 
+/ReEncode {
+	dup
+	length
+	dict begin
 	{
-	1 index /FID ne 
-		{def} 
-		{pop pop} ifelse 
-	} forall 
-	0 eq {/Encoding DiacriticEncoding def} if 
-	currentdict 
-	end 
+	1 index /FID ne
+		{def}
+		{pop pop} ifelse
+	} forall
+	0 eq {/Encoding DiacriticEncoding def} if
+	currentdict
+	end
 	} bind def
 /graymode true def
 	/bwidth FMLOCAL
@@ -342,7 +342,7 @@ FrameDict begin
 	 /bpside  exch def
 	 /bstring exch def
 	 /onbits 0 def  /offbits 0 def
-	 freq sangle landscape {90 add} if 
+	 freq sangle landscape {90 add} if
 		{/y exch def
 		 /x exch def
 		 /xindex x 1 add 2 div bpside mul cvi def
@@ -370,14 +370,14 @@ FrameDict begin
 	/SAT FMLOCAL
 	/BRIGHT FMLOCAL
 	/Colors FMLOCAL
-FMPrintInColor 
-	
+FMPrintInColor
+
 	{
 	/HUE 0 def
 	/SAT 0 def
 	/BRIGHT 0 def
 	% array of arrays Hue and Sat values for the separations [HUE BRIGHT]
-	/Colors   
+	/Colors
 	[[0    0  ]    % black
 	 [0    0  ]    % white
 	 [0.00 1.0]    % red
@@ -387,44 +387,44 @@ FMPrintInColor
 	 [0.83 1.0]    % magenta
 	 [0.16 1.0]    % comment / yellow
 	 ] def
-      
-	/BEGINBITMAPCOLOR { 
+
+	/BEGINBITMAPCOLOR {
 		BITMAPCOLOR} def
-	/BEGINBITMAPCOLORc { 
+	/BEGINBITMAPCOLORc {
 		BITMAPCOLORc} def
-	/BEGINBITMAPTRUECOLOR { 
+	/BEGINBITMAPTRUECOLOR {
 		BITMAPTRUECOLOR } def
-	/BEGINBITMAPTRUECOLORc { 
+	/BEGINBITMAPTRUECOLORc {
 		BITMAPTRUECOLORc } def
-	/K { 
+	/K {
 		Colors exch get dup
-		0 get /HUE exch store 
+		0 get /HUE exch store
 		1 get /BRIGHT exch store
 		  HUE 0 eq BRIGHT 0 eq and
 			{1.0 SAT sub setgray}
-			{HUE SAT BRIGHT sethsbcolor} 
+			{HUE SAT BRIGHT sethsbcolor}
 		  ifelse
 		} def
-	/FMsetgray { 
-		/SAT exch 1.0 exch sub store 
+	/FMsetgray {
+		/SAT exch 1.0 exch sub store
 		  HUE 0 eq BRIGHT 0 eq and
 			{1.0 SAT sub setgray}
-			{HUE SAT BRIGHT sethsbcolor} 
+			{HUE SAT BRIGHT sethsbcolor}
 		  ifelse
 		} bind def
 	}
-	
+
 	{
-	/BEGINBITMAPCOLOR { 
+	/BEGINBITMAPCOLOR {
 		BITMAPGRAY} def
-	/BEGINBITMAPCOLORc { 
+	/BEGINBITMAPCOLORc {
 		BITMAPGRAYc} def
-	/BEGINBITMAPTRUECOLOR { 
+	/BEGINBITMAPTRUECOLOR {
 		BITMAPTRUEGRAY } def
-	/BEGINBITMAPTRUECOLORc { 
+	/BEGINBITMAPTRUECOLORc {
 		BITMAPTRUEGRAYc } def
 	/FMsetgray {setgray} bind def
-	/K { 
+	/K {
 		pop
 		} def
 	}
@@ -435,27 +435,27 @@ ifelse
 /dnormalize {
 	dtransform round exch round exch idtransform
 	} bind def
-/lnormalize { 
+/lnormalize {
 	0 dtransform exch cvi 2 idiv 2 mul 1 add exch idtransform pop
 	} bind def
-/H { 
+/H {
 	lnormalize setlinewidth
 	} bind def
 /Z {
 	setlinecap
 	} bind def
 	/fillvals FMLOCAL
-/X { 
+/X {
 	fillvals exch get
 	dup type /stringtype eq
-	{8 1 setpattern} 
+	{8 1 setpattern}
 	{grayness}
 	ifelse
 	} bind def
-/V { 
+/V {
 	gsave eofill grestore
 	} bind def
-/N { 
+/N {
 	stroke
 	} bind def
 /M {newpath moveto} bind def
@@ -463,15 +463,15 @@ ifelse
 /D {curveto} bind def
 /O {closepath} bind def
 	/n FMLOCAL
-/L { 
+/L {
  	/n exch def
 	newpath
 	normalize
-	moveto 
+	moveto
 	2 1 n {pop normalize lineto} for
 	} bind def
-/Y { 
-	L 
+/Y {
+	L
 	closepath
 	} bind def
 	/x1 FMLOCAL
@@ -479,7 +479,7 @@ ifelse
 	/y1 FMLOCAL
 	/y2 FMLOCAL
 	/rad FMLOCAL
-/R { 
+/R {
 	/y2 exch def
 	/x2 exch def
 	/y1 exch def
@@ -488,9 +488,9 @@ ifelse
 	x2 y1
 	x2 y2
 	x1 y2
-	4 Y 
+	4 Y
 	} bind def
-/RR { 
+/RR {
 	/rad exch def
 	normalize
 	/y2 exch def
@@ -507,87 +507,87 @@ ifelse
 	closepath
 	16 {pop} repeat
 	} bind def
-/C { 
+/C {
 	grestore
 	gsave
-	R 
+	R
 	clip
 	} bind def
 	/FMpointsize FMLOCAL
-/F { 
+/F {
 	FMfonts exch get
 	FMpointsize scalefont
 	setfont
 	} bind def
-/Q { 
+/Q {
 	/FMpointsize exch def
-	F 
+	F
 	} bind def
-/T { 
+/T {
 	moveto show
 	} bind def
-/RF { 
+/RF {
 	rotate
 	0 ne {-1 1 scale} if
 	} bind def
-/TF { 
+/TF {
 	gsave
-	moveto 
+	moveto
 	RF
 	show
 	grestore
 	} bind def
-/P { 
+/P {
 	moveto
 	0 32 3 2 roll widthshow
 	} bind def
-/PF { 
+/PF {
 	gsave
-	moveto 
+	moveto
 	RF
 	0 32 3 2 roll widthshow
 	grestore
 	} bind def
-/S { 
+/S {
 	moveto
 	0 exch ashow
 	} bind def
-/SF { 
+/SF {
 	gsave
 	moveto
 	RF
 	0 exch ashow
 	grestore
 	} bind def
-/B { 
+/B {
 	moveto
 	0 32 4 2 roll 0 exch awidthshow
 	} bind def
-/BF { 
+/BF {
 	gsave
 	moveto
 	RF
 	0 32 4 2 roll 0 exch awidthshow
 	grestore
 	} bind def
-/G { 
+/G {
 	gsave
 	newpath
-	normalize translate 0.0 0.0 moveto 
-	dnormalize scale 
-	0.0 0.0 1.0 5 3 roll arc 
+	normalize translate 0.0 0.0 moveto
+	dnormalize scale
+	0.0 0.0 1.0 5 3 roll arc
 	closepath fill
 	grestore
 	} bind def
-/A { 
+/A {
 	gsave
 	savematrix
 	newpath
-	2 index 2 div add exch 3 index 2 div sub exch 
-	normalize 2 index 2 div sub exch 3 index 2 div add exch 
-	translate 
-	scale 
-	0.0 0.0 1.0 5 3 roll arc 
+	2 index 2 div add exch 3 index 2 div sub exch
+	normalize 2 index 2 div sub exch 3 index 2 div add exch
+	translate
+	scale
+	0.0 0.0 1.0 5 3 roll arc
 	restorematrix
 	stroke
 	grestore
@@ -603,37 +603,37 @@ ifelse
 	/FMsaveobject FMLOCAL
 	/FMoptop FMLOCAL
 	/FMdicttop FMLOCAL
-/BEGINPRINTCODE { 
-	/FMdicttop countdictstack 1 add def 
-	/FMoptop count 4 sub def 
+/BEGINPRINTCODE {
+	/FMdicttop countdictstack 1 add def
+	/FMoptop count 4 sub def
 	/FMsaveobject save def
-	userdict begin 
-	/showpage {} def 
-	FMNORMALIZEGRAPHICS 
+	userdict begin
+	/showpage {} def
+	FMNORMALIZEGRAPHICS
 	3 index neg 3 index neg translate
 	} bind def
 /ENDPRINTCODE {
-	count -1 FMoptop {pop pop} for 
-	countdictstack -1 FMdicttop {pop end} for 
-	FMsaveobject restore 
+	count -1 FMoptop {pop pop} for
+	countdictstack -1 FMdicttop {pop end} for
+	FMsaveobject restore
 	} bind def
-/gn { 
-	0 
-	{	46 mul 
-		cf read pop 
-		32 sub 
-		dup 46 lt {exit} if 
-		46 sub add 
+/gn {
+	0
+	{	46 mul
+		cf read pop
+		32 sub
+		dup 46 lt {exit} if
+		46 sub add
 		} loop
-	add 
+	add
 	} bind def
 	/str FMLOCAL
-/cfs { 
-	/str sl string def 
-	0 1 sl 1 sub {str exch val put} for 
-	str def 
+/cfs {
+	/str sl string def
+	0 1 sl 1 sub {str exch val put} for
+	str def
 	} bind def
-/ic [ 
+/ic [
 	0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0223
 	0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0223
 	0
@@ -655,49 +655,49 @@ ifelse
 	/cs FMLOCAL
 	/len FMLOCAL
 	/pos FMLOCAL
-/ms { 
-	/sl exch def 
-	/val 255 def 
-	/ws cfs 
-	/im cfs 
-	/val 0 def 
-	/bs cfs 
-	/cs cfs 
+/ms {
+	/sl exch def
+	/val 255 def
+	/ws cfs
+	/im cfs
+	/val 0 def
+	/bs cfs
+	/cs cfs
 	} bind def
-400 ms 
-/ip { 
-	is 
-	0 
-	cf cs readline pop 
-	{	ic exch get exec 
-		add 
-		} forall 
-	pop 
-	
+400 ms
+/ip {
+	is
+	0
+	cf cs readline pop
+	{	ic exch get exec
+		add
+		} forall
+	pop
+
 	} bind def
-/wh { 
-	/len exch def 
-	/pos exch def 
+/wh {
+	/len exch def
+	/pos exch def
 	ws 0 len getinterval im pos len getinterval copy pop
-	pos len 
+	pos len
 	} bind def
-/bl { 
-	/len exch def 
-	/pos exch def 
+/bl {
+	/len exch def
+	/pos exch def
 	bs 0 len getinterval im pos len getinterval copy pop
-	pos len 
+	pos len
 	} bind def
 /s1 1 string def
-/fl { 
-	/len exch def 
-	/pos exch def 
+/fl {
+	/len exch def
+	/pos exch def
 	/val cf s1 readhexstring pop 0 get def
 	pos 1 pos len add 1 sub {im exch val put} for
-	pos len 
+	pos len
 	} bind def
-/hx { 
-	3 copy getinterval 
-	cf exch readhexstring pop pop 
+/hx {
+	3 copy getinterval
+	cf exch readhexstring pop pop
 	} bind def
 	/h FMLOCAL
 	/w FMLOCAL
@@ -706,57 +706,57 @@ ifelse
 	/bitmapsave FMLOCAL
 	/is FMLOCAL
 	/cf FMLOCAL
-/wbytes { 
-	dup 
+/wbytes {
+	dup
 	8 eq {pop} {1 eq {7 add 8 idiv} {3 add 4 idiv} ifelse} ifelse
 	} bind def
-/BEGINBITMAPBWc { 
+/BEGINBITMAPBWc {
 	1 {} COMMONBITMAPc
 	} bind def
-/BEGINBITMAPGRAYc { 
+/BEGINBITMAPGRAYc {
 	8 {} COMMONBITMAPc
 	} bind def
-/BEGINBITMAP2BITc { 
+/BEGINBITMAP2BITc {
 	2 {} COMMONBITMAPc
 	} bind def
-/COMMONBITMAPc { 
+/COMMONBITMAPc {
 	/r exch def
 	/d exch def
 	gsave
 	translate rotate scale /h exch def /w exch def
-	/lb w d wbytes def 
-	sl lb lt {lb ms} if 
-	/bitmapsave save def 
-	r                    
-	/is im 0 lb getinterval def 
-	ws 0 lb getinterval is copy pop 
-	/cf currentfile def 
-	w h d [w 0 0 h neg 0 h] 
-	{ip} image 
-	bitmapsave restore 
+	/lb w d wbytes def
+	sl lb lt {lb ms} if
+	/bitmapsave save def
+	r
+	/is im 0 lb getinterval def
+	ws 0 lb getinterval is copy pop
+	/cf currentfile def
+	w h d [w 0 0 h neg 0 h]
+	{ip} image
+	bitmapsave restore
 	grestore
 	} bind def
-/BEGINBITMAPBW { 
+/BEGINBITMAPBW {
 	1 {} COMMONBITMAP
 	} bind def
-/BEGINBITMAPGRAY { 
+/BEGINBITMAPGRAY {
 	8 {} COMMONBITMAP
 	} bind def
-/BEGINBITMAP2BIT { 
+/BEGINBITMAP2BIT {
 	2 {} COMMONBITMAP
 	} bind def
-/COMMONBITMAP { 
+/COMMONBITMAP {
 	/r exch def
 	/d exch def
 	gsave
 	translate rotate scale /h exch def /w exch def
-	/bitmapsave save def 
-	r                    
+	/bitmapsave save def
+	r
 	/is w d wbytes string def
-	/cf currentfile def 
-	w h d [w 0 0 h neg 0 h] 
+	/cf currentfile def
+	w h d [w 0 0 h neg 0 h]
 	{cf is readhexstring pop} image
-	bitmapsave restore 
+	bitmapsave restore
 	grestore
 	} bind def
 	/proc1 FMLOCAL
@@ -813,7 +813,7 @@ ifelse
 	/tran FMLOCAL
 /fakecolorsetup {
 	/tran 256 string def
-	0 1 255 {/indx exch def 
+	0 1 255 {/indx exch def
 		tran indx
 		red indx get 77 mul
 		green indx get 151 mul
@@ -823,77 +823,77 @@ ifelse
 	{255 mul cvi tran exch get 255.0 div}
 	exch Fmcc settransfer
 } bind def
-/BITMAPCOLOR { 
+/BITMAPCOLOR {
 	/d 8 def
 	gsave
 	translate rotate scale /h exch def /w exch def
-	/bitmapsave save def 
+	/bitmapsave save def
 	colorsetup
 	/is w d wbytes string def
-	/cf currentfile def 
-	w h d [w 0 0 h neg 0 h] 
-	{cf is readhexstring pop} {is} {is} true 3 colorimage 
-	bitmapsave restore 
+	/cf currentfile def
+	w h d [w 0 0 h neg 0 h]
+	{cf is readhexstring pop} {is} {is} true 3 colorimage
+	bitmapsave restore
 	grestore
 	} bind def
-/BITMAPCOLORc { 
+/BITMAPCOLORc {
 	/d 8 def
 	gsave
 	translate rotate scale /h exch def /w exch def
-	/lb w d wbytes def 
-	sl lb lt {lb ms} if 
-	/bitmapsave save def 
+	/lb w d wbytes def
+	sl lb lt {lb ms} if
+	/bitmapsave save def
 	colorsetup
-	/is im 0 lb getinterval def 
-	ws 0 lb getinterval is copy pop 
-	/cf currentfile def 
-	w h d [w 0 0 h neg 0 h] 
+	/is im 0 lb getinterval def
+	ws 0 lb getinterval is copy pop
+	/cf currentfile def
+	w h d [w 0 0 h neg 0 h]
 	{ip} {is} {is} true 3 colorimage
-	bitmapsave restore 
+	bitmapsave restore
 	grestore
 	} bind def
-/BITMAPTRUECOLORc { 
+/BITMAPTRUECOLORc {
         gsave
         translate rotate scale /h exch def /w exch def
-        /bitmapsave save def 
-        
+        /bitmapsave save def
+
         /is w string def
-        
-        ws 0 w getinterval is copy pop 
-        /cf currentfile def 
-        w h 8 [w 0 0 h neg 0 h] 
+
+        ws 0 w getinterval is copy pop
+        /cf currentfile def
+        w h 8 [w 0 0 h neg 0 h]
         {ip} {gip} {bip} true 3 colorimage
-        bitmapsave restore 
+        bitmapsave restore
         grestore
         } bind def
-/BITMAPTRUECOLOR { 
+/BITMAPTRUECOLOR {
         gsave
         translate rotate scale /h exch def /w exch def
-        /bitmapsave save def 
+        /bitmapsave save def
         /is w string def
         /gis w string def
         /bis w string def
-        /cf currentfile def 
-        w h 8 [w 0 0 h neg 0 h] 
-        { cf is readhexstring pop } 
-        { cf gis readhexstring pop } 
-        { cf bis readhexstring pop } 
-        true 3 colorimage 
-        bitmapsave restore 
+        /cf currentfile def
+        w h 8 [w 0 0 h neg 0 h]
+        { cf is readhexstring pop }
+        { cf gis readhexstring pop }
+        { cf bis readhexstring pop }
+        true 3 colorimage
+        bitmapsave restore
         grestore
         } bind def
-/BITMAPTRUEGRAYc { 
+/BITMAPTRUEGRAYc {
         gsave
         translate rotate scale /h exch def /w exch def
-        /bitmapsave save def 
-        
+        /bitmapsave save def
+
         /is w string def
-        
-        ws 0 w getinterval is copy pop 
-        /cf currentfile def 
-        w h 8 [w 0 0 h neg 0 h] 
+
+        ws 0 w getinterval is copy pop
+        /cf currentfile def
+        w h 8 [w 0 0 h neg 0 h]
         {ip gip bip w gray} image
-        bitmapsave restore 
+        bitmapsave restore
         grestore
         } bind def
 /ww FMLOCAL
@@ -901,7 +901,7 @@ ifelse
 /g FMLOCAL
 /b FMLOCAL
 /i FMLOCAL
-/gray { 
+/gray {
         /ww exch def
         /b exch def
         /g exch def
@@ -910,30 +910,30 @@ ifelse
 			b i get .114 mul add add r i 3 -1 roll floor cvi put } for
         r
         } bind def
-/BITMAPTRUEGRAY { 
+/BITMAPTRUEGRAY {
         gsave
         translate rotate scale /h exch def /w exch def
-        /bitmapsave save def 
+        /bitmapsave save def
         /is w string def
         /gis w string def
         /bis w string def
-        /cf currentfile def 
-        w h 8 [w 0 0 h neg 0 h] 
-        { cf is readhexstring pop 
-          cf gis readhexstring pop 
+        /cf currentfile def
+        w h 8 [w 0 0 h neg 0 h]
+        { cf is readhexstring pop
+          cf gis readhexstring pop
           cf bis readhexstring pop w gray}  image
-        bitmapsave restore 
+        bitmapsave restore
         grestore
         } bind def
-/BITMAPGRAY { 
+/BITMAPGRAY {
 	8 {fakecolorsetup} COMMONBITMAP
 	} bind def
-/BITMAPGRAYc { 
+/BITMAPGRAYc {
 	8 {fakecolorsetup} COMMONBITMAPc
 	} bind def
 /ENDBITMAP {
 	} bind def
-end 
+end
 	/ALDsave FMLOCAL
 	/ALDmatrix matrix def ALDmatrix currentmatrix pop
 /StartALD {
diff --git a/doc/tk_mac.n b/doc/tk_mac.n
index f29ef2f..a1ad758 100644
--- a/doc/tk_mac.n
+++ b/doc/tk_mac.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk::mac n 8.6 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/tkvars.n b/doc/tkvars.n
index a80fd54..f872d1f 100644
--- a/doc/tkvars.n
+++ b/doc/tkvars.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tkvars n 4.1 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/tkwait.n b/doc/tkwait.n
index a31aee7..82d51ba 100644
--- a/doc/tkwait.n
+++ b/doc/tkwait.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tkwait n "" Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/toplevel.n b/doc/toplevel.n
index 271d9f1..31f241c 100644
--- a/doc/toplevel.n
+++ b/doc/toplevel.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH toplevel n 8.4 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/ttk_Theme.3 b/doc/ttk_Theme.3
index 8031b8a..a42dd38 100644
--- a/doc/ttk_Theme.3
+++ b/doc/ttk_Theme.3
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Ttk_CreateTheme 3 8.5 Tk "Tk Themed Widget"
 .so man.macros
 .BS
diff --git a/doc/ttk_sizegrip.n b/doc/ttk_sizegrip.n
index 8b3429e..64d3ef6 100644
--- a/doc/ttk_sizegrip.n
+++ b/doc/ttk_sizegrip.n
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH ttk::sizegrip n 8.5 Tk "Tk Themed Widget"
 .so man.macros
 .BS
diff --git a/doc/winfo.n b/doc/winfo.n
index 5008448..bff4973 100644
--- a/doc/winfo.n
+++ b/doc/winfo.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH winfo n 4.3 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
diff --git a/doc/wish.1 b/doc/wish.1
index 93ade0d..f7d97d9 100644
--- a/doc/wish.1
+++ b/doc/wish.1
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH wish 1 8.0 Tk "Tk Applications"
 .so man.macros
 .BS
@@ -77,7 +77,7 @@ If there exists a file
 in the home directory of the user, \fBwish\fR evaluates the file as a
 Tcl script just before reading the first command from standard input.
 .PP
-If arguments to \fBwish\fR do specify a \fIfileName\fR, then 
+If arguments to \fBwish\fR do specify a \fIfileName\fR, then
 \fIfileName\fR is treated as the name of a script file.
 \fBWish\fR will evaluate the script in \fIfileName\fR (which
 presumably creates a user interface), then it will respond to events
diff --git a/generic/tk.h b/generic/tk.h
index 75d82ba..9403f31 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -17,8 +17,8 @@
 #define _TK
 
 #include <tcl.h>
-#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION < 6)
-#	error Tk 8.6 must be compiled with tcl.h from Tcl 8.6 or better
+#if (TCL_MAJOR_VERSION < 8) || (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6)
+#	error Tk 8.7 must be compiled with tcl.h from Tcl 8.6 or better
 #endif
 
 #ifndef CONST84
@@ -59,8 +59,8 @@ extern "C" {
  * and update the version numbers:
  *
  * library/tk.tcl	(1 LOC patch)
- * unix/configure.in	(2 LOC Major, 2 LOC minor, 1 LOC patch)
- * win/configure.in	(as above)
+ * unix/configure.ac	(2 LOC Major, 2 LOC minor, 1 LOC patch)
+ * win/configure.ac	(as above)
  * README		(sections 0 and 1)
  * macosx/Tk-Common.xcconfig (not patchlevel) 1 LOC
  * win/README		(not patchlevel)
@@ -73,12 +73,12 @@ extern "C" {
  */
 
 #define TK_MAJOR_VERSION	8
-#define TK_MINOR_VERSION	6
-#define TK_RELEASE_LEVEL	TCL_FINAL_RELEASE
-#define TK_RELEASE_SERIAL	5
+#define TK_MINOR_VERSION	7
+#define TK_RELEASE_LEVEL	TCL_ALPHA_RELEASE
+#define TK_RELEASE_SERIAL	0
 
-#define TK_VERSION		"8.6"
-#define TK_PATCH_LEVEL		"8.6.5"
+#define TK_VERSION		"8.7"
+#define TK_PATCH_LEVEL		"8.7a0"
 
 /*
  * A special definition used to allow this header file to be included from
diff --git a/generic/tkBind.c b/generic/tkBind.c
index 3b05066..bb95fa9 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -2868,7 +2868,7 @@ GetAllVirtualEvents(
  *	Any other fields in eventPtr which are not specified by the pattern
  *	string or the optional arguments, are set to 0.
  *
- *	The event may be handled sychronously or asynchronously, depending on
+ *	The event may be handled synchronously or asynchronously, depending on
  *	the value specified by the optional "-when" option. The default
  *	setting is synchronous.
  *
@@ -3460,7 +3460,7 @@ HandleEventGenerate(
 	    Tcl_DoWhenIdle(DoWarp, dispPtr);
 	    dispPtr->flags |= TK_DISPLAY_IN_WARP;
 	}
-	dispPtr->warpWindow = Tk_IdToWindow(Tk_Display(mainWin),
+	dispPtr->warpWindow = Tk_IdToWindow(dispPtr->display,
 		event.general.xmotion.window);
 	dispPtr->warpMainwin = mainWin;
 	dispPtr->warpX = event.general.xmotion.x;
@@ -3949,7 +3949,7 @@ ParseEventDescription(
 	p = GetField(p, field, FIELD_SIZE);
     }
     if (*field != '\0') {
-	if ((*field >= '1') && (*field <= '5') && (field[1] == '\0')) {
+	if ((*field >= '1') && (*field <= '9') && (field[1] == '\0')) {
 	    if (eventFlags == 0) {
 		patPtr->eventType = ButtonPress;
 		eventMask = ButtonPressMask;
diff --git a/generic/tkBusy.c b/generic/tkBusy.c
index 65248a2..b36d453 100644
--- a/generic/tkBusy.c
+++ b/generic/tkBusy.c
@@ -433,6 +433,10 @@ MakeTransparentWindowExist(
 
     TkpMakeTransparentWindowExist(tkwin, parent);
 
+    if (winPtr->window == None) {
+	return;			/* Platform didn't make Window. */
+    }
+
     dispPtr = winPtr->dispPtr;
     hPtr = Tcl_CreateHashEntry(&dispPtr->winTable, (char *) winPtr->window,
 	    &notUsed);
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 64c32cd..eaaaf6c 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -1721,6 +1721,9 @@ extern const TkStubs *tkStubsPtr;
 #undef Tk_SafeInit
 #undef Tk_CreateConsoleWindow
 
+#undef Tk_FreeXId
+#define Tk_FreeXId(display,xid)
+
 #if defined(_WIN32) && defined(UNICODE)
 #   define Tk_MainEx Tk_MainExW
     EXTERN void Tk_MainExW(int argc, wchar_t **argv,
diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index ea8d7f1..5681e47 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -1176,13 +1176,15 @@ ConfigureEntry(
 
 	if (entryPtr->type == TK_SPINBOX) {
 	    if (sbPtr->fromValue > sbPtr->toValue) {
-		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"-to value must be greater than -from value",
-			-1));
-		Tcl_SetErrorCode(interp, "TK", "SPINBOX", "RANGE_SANITY",
-			NULL);
-		continue;
-	    }
+                /*
+                 * Swap -from and -to values.
+                 */
+
+                double tmpFromTo = sbPtr->fromValue;
+
+                sbPtr->fromValue = sbPtr->toValue;
+                sbPtr->toValue = tmpFromTo;
+            }
 
 	    if (sbPtr->reqFormat && (oldFormat != sbPtr->reqFormat)) {
 		/*
diff --git a/generic/tkFont.c b/generic/tkFont.c
index 102fc6e..1ffac16 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -497,7 +497,7 @@ Tk_FontObjCmd(
 	const char *s;
 	Tk_Font tkfont;
 	Tcl_Obj *optPtr, *charPtr, *resultPtr;
-	Tcl_UniChar uniChar = 0;
+	int uniChar = 0;
 	const TkFontAttributes *faPtr;
 	TkFontAttributes fa;
 
@@ -1714,10 +1714,10 @@ Tk_PostscriptFontName(
 	    }
 	    src += Tcl_UtfToUniChar(src, &ch);
 	    if (upper) {
-		ch = Tcl_UniCharToUpper(ch);
+		ch = (Tcl_UniChar) Tcl_UniCharToUpper(ch);
 		upper = 0;
 	    } else {
-		ch = Tcl_UniCharToLower(ch);
+		ch = (Tcl_UniChar) Tcl_UniCharToLower(ch);
 	    }
 	    dest += Tcl_UniCharToUtf(ch, dest);
 	}
diff --git a/generic/tkFrame.c b/generic/tkFrame.c
index f6edfb0..0f1a1b3 100644
--- a/generic/tkFrame.c
+++ b/generic/tkFrame.c
@@ -458,7 +458,6 @@ TkListCreateFrame(
 				 * window associated with the interpreter.
 				 * Gives the base name to use for the new
 				 * application. */
-    
 {
     int objc;
     Tcl_Obj **objv;
diff --git a/generic/tkGC.c b/generic/tkGC.c
index 5663ede..c424e30 100644
--- a/generic/tkGC.c
+++ b/generic/tkGC.c
@@ -314,7 +314,6 @@ Tk_FreeGC(
     gcPtr = Tcl_GetHashValue(idHashPtr);
     gcPtr->refCount--;
     if (gcPtr->refCount == 0) {
-	Tk_FreeXId(gcPtr->display, (XID) XGContextFromGC(gcPtr->gc));
 	XFreeGC(gcPtr->display, gcPtr->gc);
 	Tcl_DeleteHashEntry(gcPtr->valueHashPtr);
 	Tcl_DeleteHashEntry(idHashPtr);
@@ -351,12 +350,6 @@ TkGCCleanup(
 	    entryPtr != NULL; entryPtr = Tcl_NextHashEntry(&search)) {
 	gcPtr = Tcl_GetHashValue(entryPtr);
 
-	/*
-	 * This call is not needed, as it is only used on Unix to restore the
-	 * Id to the stack pool, and we don't want to use them anymore.
-	 *   Tk_FreeXId(gcPtr->display, (XID) XGContextFromGC(gcPtr->gc));
-	 */
-
 	XFreeGC(gcPtr->display, gcPtr->gc);
 	Tcl_DeleteHashEntry(gcPtr->valueHashPtr);
 	Tcl_DeleteHashEntry(entryPtr);
diff --git a/generic/tkImgPhInstance.c b/generic/tkImgPhInstance.c
index 666a9b0..bd152f2 100644
--- a/generic/tkImgPhInstance.c
+++ b/generic/tkImgPhInstance.c
@@ -404,6 +404,9 @@ TkImgPhotoGet(
  *
  *	Note that Win32 pre-defines those operations that we really need.
  *
+ *	Note that on MacOS, if the background comes from a Retina display
+ *	then it will be twice as wide and twice as high as the photoimage.
+ *
  *----------------------------------------------------------------------
  */
 
@@ -433,7 +436,16 @@ BlendComplexAlpha(
     unsigned long pixel;
     unsigned char r, g, b, alpha, unalpha, *masterPtr;
     unsigned char *alphaAr = iPtr->masterPtr->pix32;
-
+#if defined(MAC_OSX_TK)
+    /* Background "pixels" are actually 2^pp x 2^pp blocks of subpixels.  Each
+     * block gets blended with the color of one image pixel.  Since we iterate
+     * over the background subpixels, we reset the width and height to the
+     * subpixel dimensions of the background image we are using.
+     */
+    int pp = bgImg->pixelpower;
+    width = width << pp;
+    height = height << pp;
+#endif
     /*
      * This blending is an integer version of the Source-Over compositing rule
      * (see Porter&Duff, "Compositing Digital Images", proceedings of SIGGRAPH
@@ -532,9 +544,16 @@ BlendComplexAlpha(
 #endif /* !_WIN32 && !MAC_OSX_TK */
 
     for (y = 0; y < height; y++) {
+# if !defined(MAC_OSX_TK)
 	line = (y + yOffset) * iPtr->masterPtr->width;
 	for (x = 0; x < width; x++) {
 	    masterPtr = alphaAr + ((line + x + xOffset) * 4);
+#else
+	/* Repeat each image row and column 2^pp times. */
+	line = ((y>>pp) + yOffset) * iPtr->masterPtr->width;
+	for (x = 0; x < width; x++) {
+	    masterPtr = alphaAr + ((line + (x>>pp) + xOffset) * 4);
+#endif
 	    alpha = masterPtr[3];
 
 	    /*
@@ -635,7 +654,9 @@ TkImgPhotoDisplay(
 		(unsigned int)width, (unsigned int)height, AllPlanes, ZPixmap);
 	if (bgImg == NULL) {
 	    Tk_DeleteErrorHandler(handler);
-	    /* We failed to get the image so draw without blending alpha. It's the best we can do */
+	    /* We failed to get the image, so draw without blending alpha.
+	     * It's the best we can do.
+	     */
 	    goto fallBack;
 	}
 
diff --git a/generic/tkInt.h b/generic/tkInt.h
index dd5dcad..0b502e4 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -1196,7 +1196,7 @@ MODULE_SCOPE void	TkUnderlineCharsInContext(Display *display,
 			    const char *string, int numBytes, int x, int y,
 			    int firstByte, int lastByte);
 MODULE_SCOPE void	TkpGetFontAttrsForChar(Tk_Window tkwin, Tk_Font tkfont,
-			    Tcl_UniChar c, struct TkFontAttributes *faPtr);
+			    int c, struct TkFontAttributes *faPtr);
 MODULE_SCOPE Tcl_Obj *	TkNewWindowObj(Tk_Window tkwin);
 MODULE_SCOPE void	TkpShowBusyWindow(TkBusy busy);
 MODULE_SCOPE void	TkpHideBusyWindow(TkBusy busy);
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index d24516f..7f5389c 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -38,7 +38,7 @@
  * implemented using menu clones. Menu clones are full menus in their own
  * right; they have a Tk window and pathname associated with them; they have a
  * TkMenu structure and array of entries. However, they are linked with the
- * original menu that they were cloned from. The reflect the attributes of the
+ * original menu that they were cloned from. They reflect the attributes of the
  * original, or "master", menu. So if an item is added to a menu, and that
  * menu has clones, then the item must be added to all of its clones also.
  * Menus are cloned when a menu is torn-off or when a menu is assigned as a
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index f08d7f4..21e6a68 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -38,6 +38,15 @@ MODULE_SCOPE const TkStubs tkStubs;
  */
 
 #undef Tk_MainEx
+#undef Tk_FreeXId
+
+static void
+doNothing(void)
+{
+    /* dummy implementation, no need to do anything */
+}
+
+#define Tk_FreeXId ((void (*)(Display *, XID)) doNothing)
 
 #ifdef _WIN32
 
diff --git a/generic/tkTest.c b/generic/tkTest.c
index fa9e073..faba89d 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -227,7 +227,7 @@ Tktest_Init(
 {
     static int initialized = 0;
 
-    if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.6", 0) == NULL) {
 	return TCL_ERROR;
     }
     if (Tk_InitStubs(interp, TK_VERSION, 0) == NULL) {
@@ -239,7 +239,7 @@ Tktest_Init(
      */
 
     if (Tcl_PkgProvideEx(interp, "Tktest", TK_PATCH_LEVEL, NULL) == TCL_ERROR) {
-        return TCL_ERROR;
+	return TCL_ERROR;
     }
 
     Tcl_CreateObjCommand(interp, "square", SquareObjCmd, NULL, NULL);
diff --git a/generic/tkText.c b/generic/tkText.c
index 6b90a23..ea11af1 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -3091,7 +3091,7 @@ CountIndices(
  *	If 'viewUpdate' is true, we may adjust the window contents'
  *	y-position, and scrollbar setting.
  *
- *	If 'viewUpdate' is false, true we can guarantee that textPtr->topIndex
+ *	If 'viewUpdate' is true we can guarantee that textPtr->topIndex
  *	points to a valid TkTextLine after this function returns. However, if
  *	'viewUpdate' is false, then there is no such guarantee (since
  *	topIndex.linePtr can be garbage). The caller is expected to take
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 81bce94..5faab36 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -610,7 +610,7 @@ static void		AsyncUpdateLineMetrics(ClientData clientData);
 static void		GenerateWidgetViewSyncEvent(TkText *textPtr, Bool InSync);
 static void		AsyncUpdateYScrollbar(ClientData clientData);
 static int              IsStartOfNotMergedLine(TkText *textPtr,
-                            CONST TkTextIndex *indexPtr);
+                            const TkTextIndex *indexPtr);
 
 /*
  * Result values returned by TextGetScrollInfoObj:
@@ -2464,7 +2464,13 @@ DisplayDLine(
 	    Tk_Width(textPtr->tkwin), dlPtr->height, 0, TK_RELIEF_FLAT);
 
     /*
-     * Second, draw the background color of the left and right margins.
+     * Second, draw background information for the whole line.
+     */
+
+    DisplayLineBackground(textPtr, dlPtr, prevPtr, pixmap);
+
+    /*
+     * Third, draw the background color of the left and right margins.
      */
     if (dlPtr->lMarginColor != NULL) {
         Tk_Fill3DRectangle(textPtr->tkwin, pixmap, dlPtr->lMarginColor, 0, y,
@@ -2478,12 +2484,6 @@ DisplayDLine(
     }
 
     /*
-     * Next, draw background information for the whole line.
-     */
-
-    DisplayLineBackground(textPtr, dlPtr, prevPtr, pixmap);
-
-    /*
      * Make another pass through all of the chunks to redraw the insertion
      * cursor, if it is visible on this line. Must do it here rather than in
      * the foreground pass below because otherwise a wide insertion cursor
@@ -6890,7 +6890,7 @@ FindDLine(
 static int
 IsStartOfNotMergedLine(
       TkText *textPtr,              /* Widget record for text widget. */
-      CONST TkTextIndex *indexPtr)  /* Index to check. */
+      const TkTextIndex *indexPtr)  /* Index to check. */
 {
     TkTextIndex indexPtr2;
 
diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c
index 8820191..92ca03b 100644
--- a/generic/tkTextIndex.c
+++ b/generic/tkTextIndex.c
@@ -40,9 +40,9 @@ static const char *	StartEnd(TkText *textPtr, const char *string,
 static int		GetIndex(Tcl_Interp *interp, TkSharedText *sharedPtr,
 			    TkText *textPtr, const char *string,
 			    TkTextIndex *indexPtr, int *canCachePtr);
-static int              IndexCountBytesOrdered(CONST TkText *textPtr,
-                            CONST TkTextIndex *indexPtr1,
-                            CONST TkTextIndex *indexPtr2);
+static int              IndexCountBytesOrdered(const TkText *textPtr,
+                            const TkTextIndex *indexPtr1,
+                            const TkTextIndex *indexPtr2);
 
 /*
  * The "textindex" Tcl_Obj definition:
@@ -1636,9 +1636,9 @@ TkTextIndexForwChars(
 
 int
 TkTextIndexCountBytes(
-    CONST TkText *textPtr,
-    CONST TkTextIndex *indexPtr1, /* Index describing one location. */
-    CONST TkTextIndex *indexPtr2) /* Index describing second location. */
+    const TkText *textPtr,
+    const TkTextIndex *indexPtr1, /* Index describing one location. */
+    const TkTextIndex *indexPtr2) /* Index describing second location. */
 {
     int compare = TkTextIndexCmp(indexPtr1, indexPtr2);
 
@@ -1653,11 +1653,11 @@ TkTextIndexCountBytes(
 
 static int
 IndexCountBytesOrdered(
-    CONST TkText *textPtr,
-    CONST TkTextIndex *indexPtr1,
+    const TkText *textPtr,
+    const TkTextIndex *indexPtr1,
 				/* Index describing location of character from
 				 * which to count. */
-    CONST TkTextIndex *indexPtr2)
+    const TkTextIndex *indexPtr2)
 				/* Index describing location of last character
 				 * at which to stop the count. */
 {
diff --git a/generic/tkUtil.c b/generic/tkUtil.c
index 6563165..d4c4d2d 100644
--- a/generic/tkUtil.c
+++ b/generic/tkUtil.c
@@ -1187,7 +1187,7 @@ TkSendVirtualEvent(
     event.general.xany.display = Tk_Display(target);
     event.virtual.name = Tk_GetUid(eventName);
     if (detail != NULL) {
-        event.virtual.user_data = detail;
+	event.virtual.user_data = detail;
     }
 
     Tk_QueueWindowEvent(&event.general, TCL_QUEUE_TAIL);
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 7afb031..5855b7c 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -2351,6 +2351,9 @@ Tk_IdToWindow(
 	    break;
 	}
     }
+    if (window == None) {
+	return NULL;
+    }
 
     hPtr = Tcl_FindHashEntry(&dispPtr->winTable, (char *) window);
     if (hPtr == NULL) {
@@ -3098,7 +3101,7 @@ Initialize(
 	Tcl_ListObjAppendElement(NULL, cmd,
 		Tcl_NewStringObj("::safe::TkInit", -1));
 	Tcl_ListObjAppendElement(NULL, cmd, Tcl_GetObjResult(master));
-	
+
 	/*
 	 * Step 2 : Eval in the master. The argument is the *reversed* interp
 	 * path of the slave.
diff --git a/generic/ttk/ttkClamTheme.c b/generic/ttk/ttkClamTheme.c
index 15ebcb7..b44eeb5 100644
--- a/generic/ttk/ttkClamTheme.c
+++ b/generic/ttk/ttkClamTheme.c
@@ -7,8 +7,8 @@
 #include <tk.h>
 #include "ttkTheme.h"
 
-/* 
- * Under windows, the Tk-provided XDrawLine and XDrawArc have an 
+/*
+ * Under windows, the Tk-provided XDrawLine and XDrawArc have an
  * off-by-one error in the end point. This is especially apparent with this
  * theme. Defining this macro as true handles this case.
  */
@@ -123,8 +123,8 @@ static Ttk_ElementOptionSpec BorderElementOptions[] = {
 /*
  * <<NOTE-BORDERWIDTH>>: -borderwidth is only partially supported:
  * in this theme, borders are always exactly 2 pixels thick.
- * With -borderwidth 0, border is not drawn at all; 
- * otherwise a 2-pixel border is used.  For -borderwidth > 2, 
+ * With -borderwidth 0, border is not drawn at all;
+ * otherwise a 2-pixel border is used.  For -borderwidth > 2,
  * the excess is used as padding.
  */
 
@@ -402,7 +402,7 @@ typedef struct {
 static Ttk_ElementOptionSpec MenuIndicatorElementOptions[] =
 {
     { "-arrowsize", TK_OPTION_PIXELS,
-	Tk_Offset(MenuIndicatorElement,sizeObj), 
+	Tk_Offset(MenuIndicatorElement,sizeObj),
 	STR(MENUBUTTON_ARROW_SIZE)},
     { "-arrowcolor",TK_OPTION_COLOR,
 	Tk_Offset(MenuIndicatorElement,colorObj),
@@ -630,7 +630,7 @@ static void ThumbElementDraw(
     Tcl_GetIntFromObj(NULL, sb->gripCountObj, &gripCount);
     lightGC = Ttk_GCForColor(tkwin,sb->lightColorObj,d);
     darkGC = Ttk_GCForColor(tkwin,sb->borderColorObj,d);
-    
+
     if (orient == TTK_ORIENT_HORIZONTAL) {
 	dx = 1; dy = 0;
 	x1 = x2 = b.x + b.width / 2 - gripCount;
@@ -710,12 +710,12 @@ static void PbarElementDraw(
     Drawable d, Ttk_Box b, unsigned state)
 {
     ScrollbarElement *sb = elementRecord;
-    
+
     b = Ttk_PadBox(b, Ttk_UniformPadding(2));
     if (b.width > 4 && b.height > 4) {
 	DrawSmoothBorder(tkwin, d, b,
 	    sb->borderColorObj, sb->lightColorObj, sb->darkColorObj);
-	XFillRectangle(Tk_Display(tkwin), d, 
+	XFillRectangle(Tk_Display(tkwin), d,
 	    BackgroundGC(tkwin, sb->backgroundObj),
 	    b.x+2, b.y+2, b.width-4, b.height-4);
     }
@@ -780,8 +780,8 @@ static Ttk_ElementSpec ArrowElementSpec = {
 
 /*------------------------------------------------------------------------
  * +++ Notebook elements.
- * 	
- * Note: Tabs, except for the rightmost, overlap the neighbor to 
+ *
+ * Note: Tabs, except for the rightmost, overlap the neighbor to
  * their right by one pixel.
  */
 
diff --git a/generic/ttk/ttkClassicTheme.c b/generic/ttk/ttkClassicTheme.c
index 2fbcd76..d16cb85 100644
--- a/generic/ttk/ttkClassicTheme.c
+++ b/generic/ttk/ttkClassicTheme.c
@@ -68,7 +68,7 @@ static Ttk_ElementSpec HighlightElementSpec =
 
 /*------------------------------------------------------------------------
  * +++ Button Border element:
- * 
+ *
  * The Motif-style button border on X11 consists of (from outside-in):
  *
  * + focus indicator (controlled by -highlightcolor and -highlightthickness),
@@ -85,13 +85,13 @@ typedef struct {
 
 static Ttk_ElementOptionSpec ButtonBorderElementOptions[] =
 {
-    { "-background", TK_OPTION_BORDER, 
+    { "-background", TK_OPTION_BORDER,
 	Tk_Offset(ButtonBorderElement,borderObj), DEFAULT_BACKGROUND },
-    { "-borderwidth", TK_OPTION_PIXELS, 
+    { "-borderwidth", TK_OPTION_PIXELS,
 	Tk_Offset(ButtonBorderElement,borderWidthObj), DEFAULT_BORDERWIDTH },
-    { "-relief", TK_OPTION_RELIEF, 
+    { "-relief", TK_OPTION_RELIEF,
 	Tk_Offset(ButtonBorderElement,reliefObj), "flat" },
-    { "-default", TK_OPTION_ANY, 
+    { "-default", TK_OPTION_ANY,
 	Tk_Offset(ButtonBorderElement,defaultStateObj), "disabled" },
     { NULL, 0, 0, NULL }
 };
@@ -115,7 +115,7 @@ static void ButtonBorderElementSize(
 
 /*
  * (@@@ Note: ButtonBorderElement still still still buggy:
- * padding for default ring is drawn in the wrong color 
+ * padding for default ring is drawn in the wrong color
  * when the button is active.)
  */
 static void ButtonBorderElementDraw(
@@ -281,19 +281,19 @@ static Ttk_ElementSpec ArrowElementSpec =
 /*------------------------------------------------------------------------
  * +++ Sash element (for ttk::panedwindow)
  *
- * NOTES: 
+ * NOTES:
  *
  * panedwindows with -orient horizontal use vertical sashes, and vice versa.
  *
  * Interpretation of -sashrelief 'groove' and 'ridge' are
  * swapped wrt. the core panedwindow, which (I think) has them backwards.
  *
- * Default -sashrelief is sunken; the core panedwindow has default 
+ * Default -sashrelief is sunken; the core panedwindow has default
  * -sashrelief raised, but that looks wrong to me.
  */
 
 static Ttk_Orient SashClientData[] = {
-    TTK_ORIENT_HORIZONTAL, TTK_ORIENT_VERTICAL 
+    TTK_ORIENT_HORIZONTAL, TTK_ORIENT_VERTICAL
 };
 
 typedef struct {
@@ -306,13 +306,13 @@ typedef struct {
 } SashElement;
 
 static Ttk_ElementOptionSpec SashOptions[] = {
-    { "-background", TK_OPTION_BORDER, 
+    { "-background", TK_OPTION_BORDER,
 	Tk_Offset(SashElement,borderObj), DEFAULT_BACKGROUND },
-    { "-sashrelief", TK_OPTION_RELIEF, 
+    { "-sashrelief", TK_OPTION_RELIEF,
 	Tk_Offset(SashElement,sashReliefObj), "sunken" },
     { "-sashthickness", TK_OPTION_PIXELS,
 	Tk_Offset(SashElement,sashThicknessObj), "6" },
-    { "-sashpad", TK_OPTION_PIXELS, 
+    { "-sashpad", TK_OPTION_PIXELS,
 	Tk_Offset(SashElement,sashPadObj), "2" },
     { "-handlesize", TK_OPTION_PIXELS,
 	Tk_Offset(SashElement,handleSizeObj), "8" },
@@ -367,10 +367,10 @@ static void SashElementDraw(
 	    gc1 = Tk_3DBorderGC(tkwin, border, TK_3D_DARK_GC);
 	    gc2 = Tk_3DBorderGC(tkwin, border, TK_3D_LIGHT_GC);
 	    break;
-	case TK_RELIEF_SOLID: 
+	case TK_RELIEF_SOLID:
 	    gc1 = gc2 = Tk_3DBorderGC(tkwin, border, TK_3D_DARK_GC);
 	    break;
-	case TK_RELIEF_FLAT: 
+	case TK_RELIEF_FLAT:
 	default:
 	    gc1 = gc2 = Tk_3DBorderGC(tkwin, border, TK_3D_FLAT_GC);
 	    break;
@@ -398,7 +398,7 @@ static void SashElementDraw(
 	    hb = Ttk_StickBox(b, handleSize, handleSize, TTK_STICK_N);
 	    hb.y += handlePad;
 	}
-	Tk_Fill3DRectangle(tkwin, d, border, 
+	Tk_Fill3DRectangle(tkwin, d, border,
 	    hb.x, hb.y, hb.width, hb.height, 1, TK_RELIEF_RAISED);
     }
 }
@@ -495,7 +495,7 @@ MODULE_SCOPE int TtkClassicTheme_Init(Tcl_Interp *interp)
     Ttk_RegisterElement(interp, theme, "arrow",
 	    &ArrowElementSpec, &ArrowElements[0]);
 
-    Ttk_RegisterElement(interp, theme, "hsash", 
+    Ttk_RegisterElement(interp, theme, "hsash",
 	    &SashElementSpec, &SashClientData[0]);
     Ttk_RegisterElement(interp, theme, "vsash",
 	    &SashElementSpec, &SashClientData[1]);
diff --git a/generic/ttk/ttkLabel.c b/generic/ttk/ttkLabel.c
index 1037840..b8b7f29 100644
--- a/generic/ttk/ttkLabel.c
+++ b/generic/ttk/ttkLabel.c
@@ -139,7 +139,7 @@ static void TextDraw(TextElement *text, Tk_Window tkwin, Drawable d, Ttk_Box b)
     gcValues.foreground = WhitePixelOfScreen(Tk_Screen(tkwin));
     gc2 = Tk_GetGC(tkwin, GCFont | GCForeground, &gcValues);
 
-    /* 
+    /*
      * Place text according to -anchor:
      */
     Tk_GetAnchorFromObj(NULL, text->anchorObj, &anchor);
@@ -342,15 +342,15 @@ static void ImageDraw(
 
     Tk_RedrawImage(image->tkimg, 0,0, width, height, d, b.x, b.y);
 
-    /* If we're disabled there's no state-specific 'disabled' image, 
+    /* If we're disabled there's no state-specific 'disabled' image,
      * stipple the image.
      * @@@ Possibly: Don't do disabled-stippling at all;
      * @@@ it's ugly and out of fashion.
-     * Do not stipple at all under Aqua, just draw the image: it shows up 
+     * Do not stipple at all under Aqua, just draw the image: it shows up
      * as a white rectangle otherwise.
      */
 
-    
+
     if (state & TTK_STATE_DISABLED) {
 	if (TtkSelectImage(image->imageSpec, 0ul) == image->tkimg) {
 #ifndef MAC_OSX_TK
@@ -577,7 +577,7 @@ static void LabelElementSize(
     if (label->compound != TTK_COMPOUND_IMAGE)
 	textReqWidth = TextReqWidth(&label->text);
 
-    switch (label->compound) 
+    switch (label->compound)
     {
 	case TTK_COMPOUND_TEXT:
 	    *widthPtr = textReqWidth;
@@ -588,11 +588,11 @@ static void LabelElementSize(
 	case TTK_COMPOUND_TOP:
 	case TTK_COMPOUND_BOTTOM:
 	case TTK_COMPOUND_CENTER:
-	    *widthPtr = MAX(label->image.width, textReqWidth); 
+	    *widthPtr = MAX(label->image.width, textReqWidth);
 	    break;
 	case TTK_COMPOUND_LEFT:
 	case TTK_COMPOUND_RIGHT:
-	    *widthPtr = label->image.width + textReqWidth + label->space; 
+	    *widthPtr = label->image.width + textReqWidth + label->space;
 	    break;
 	case TTK_COMPOUND_NONE:
 	    break; /* Can't happen */
diff --git a/generic/ttk/ttkManager.c b/generic/ttk/ttkManager.c
index 24a0fb1..031fdec 100644
--- a/generic/ttk/ttkManager.c
+++ b/generic/ttk/ttkManager.c
@@ -320,7 +320,7 @@ void Ttk_GeometryRequestProc(ClientData clientData, Tk_Window slaveWindow)
     int reqHeight= Tk_ReqHeight(slaveWindow);
 
     if (mgr->managerSpec->SlaveRequest(
-		mgr->managerData, slaveIndex, reqWidth, reqHeight)) 
+		mgr->managerData, slaveIndex, reqWidth, reqHeight))
     {
 	ScheduleUpdate(mgr, MGR_RESIZE_REQUIRED);
     }
diff --git a/generic/ttk/ttkManager.h b/generic/ttk/ttkManager.h
index d22ff98..07fcea1 100644
--- a/generic/ttk/ttkManager.h
+++ b/generic/ttk/ttkManager.h
@@ -22,7 +22,7 @@ typedef struct TtkManager_ Ttk_Manager;
  * SlaveRemoved() is called immediately before a slave is removed.
  * NB: the associated slave window may have been destroyed when this
  * routine is called.
- * 
+ *
  * SlaveRequest() is called when a slave requests a size change.
  * It should return 1 if the request should propagate, 0 otherwise.
  */
diff --git a/generic/ttk/ttkProgress.c b/generic/ttk/ttkProgress.c
index 4dc50a2..eed90ec 100644
--- a/generic/ttk/ttkProgress.c
+++ b/generic/ttk/ttkProgress.c
@@ -398,7 +398,7 @@ static int ProgressbarStepCommand(
 {
     Progressbar *pb = recordPtr;
     double value = 0.0, stepAmount = 1.0;
-    Tcl_Obj *newValueObj; 
+    Tcl_Obj *newValueObj;
 
     if (objc == 3) {
 	if (Tcl_GetDoubleFromObj(interp, objv[2], &stepAmount) != TCL_OK) {
@@ -424,7 +424,7 @@ static int ProgressbarStepCommand(
 
     TtkRedisplayWidget(&pb->core);
 
-    /* Update value by setting the linked -variable, if there is one: 
+    /* Update value by setting the linked -variable, if there is one:
      */
     if (pb->progress.variableTrace) {
 	return Tcl_ObjSetVar2(
@@ -444,7 +444,7 @@ static int ProgressbarStepCommand(
 }
 
 /* $sb start|stop ?args? --
- * Change [$sb $cmd ...] to [ttk::progressbar::$cmd ...] 
+ * Change [$sb $cmd ...] to [ttk::progressbar::$cmd ...]
  * and pass to interpreter.
  */
 static int ProgressbarStartStopCommand(
diff --git a/generic/ttk/ttkScale.c b/generic/ttk/ttkScale.c
index 69753d1..95824af 100644
--- a/generic/ttk/ttkScale.c
+++ b/generic/ttk/ttkScale.c
@@ -46,14 +46,14 @@ typedef struct
 static Tk_OptionSpec ScaleOptionSpecs[] =
 {
     {TK_OPTION_STRING, "-command", "command", "Command", "",
-	Tk_Offset(Scale,scale.commandObj), -1, 
+	Tk_Offset(Scale,scale.commandObj), -1,
 	TK_OPTION_NULL_OK,0,0},
     {TK_OPTION_STRING, "-variable", "variable", "Variable", "",
-	Tk_Offset(Scale,scale.variableObj), -1, 
+	Tk_Offset(Scale,scale.variableObj), -1,
 	0,0,0},
     {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "horizontal",
 	Tk_Offset(Scale,scale.orientObj),
-	Tk_Offset(Scale,scale.orient), 0, 
+	Tk_Offset(Scale,scale.orient), 0,
 	(ClientData)ttkOrientStrings, STYLE_CHANGED },
 
     {TK_OPTION_DOUBLE, "-from", "from", "From", "0",
@@ -63,7 +63,7 @@ static Tk_OptionSpec ScaleOptionSpecs[] =
     {TK_OPTION_DOUBLE, "-value", "value", "Value", "0",
 	Tk_Offset(Scale,scale.valueObj), -1, 0, 0, 0},
     {TK_OPTION_PIXELS, "-length", "length", "Length",
-	DEF_SCALE_LENGTH, Tk_Offset(Scale,scale.lengthObj), -1, 0, 0, 
+	DEF_SCALE_LENGTH, Tk_Offset(Scale,scale.lengthObj), -1, 0, 0,
     	GEOMETRY_CHANGED},
 
     WIDGET_TAKEFOCUS_TRUE,
@@ -76,7 +76,7 @@ static double PointToValue(Scale *scalePtr, int x, int y);
 /* ScaleVariableChanged --
  * 	Variable trace procedure for scale -variable;
  * 	Updates the scale's value.
- * 	If the linked variable is not a valid double, 
+ * 	If the linked variable is not a valid double,
  * 	sets the 'invalid' state.
  */
 static void ScaleVariableChanged(void *recordPtr, const char *value)
@@ -172,7 +172,7 @@ static int ScalePostConfigure(
 /* ScaleGetLayout --
  *	getLayout hook.
  */
-static Ttk_Layout 
+static Ttk_Layout
 ScaleGetLayout(Tcl_Interp *interp, Ttk_Theme theme, void *recordPtr)
 {
     Scale *scalePtr = recordPtr;
@@ -236,7 +236,7 @@ static double ScaleFraction(Scale *scalePtr, double value)
 }
 
 /* $scale get ?x y? --
- * 	Returns the current value of the scale widget, or if $x and 
+ * 	Returns the current value of the scale widget, or if $x and
  * 	$y are specified, the value represented by point @x,y.
  */
 static int
diff --git a/generic/ttk/ttkScrollbar.c b/generic/ttk/ttkScrollbar.c
index 5b0c212..9d99ea5 100644
--- a/generic/ttk/ttkScrollbar.c
+++ b/generic/ttk/ttkScrollbar.c
@@ -22,7 +22,7 @@ typedef struct
     double	first;			/* top fraction */
     double	last;			/* bottom fraction */
 
-    Ttk_Box	troughBox;		/* trough parcel */ 
+    Ttk_Box	troughBox;		/* trough parcel */
     int 	minSize;		/* minimum size of thumb */
 } ScrollbarPart;
 
@@ -50,7 +50,7 @@ static Tk_OptionSpec ScrollbarOptionSpecs[] =
  * +++ Widget hooks.
  */
 
-static void 
+static void
 ScrollbarInitialize(Tcl_Interp *interp, void *recordPtr)
 {
     Scrollbar *sb = recordPtr;
@@ -241,7 +241,7 @@ ScrollbarDeltaCommand(
 
 /* $sb fraction $x $y --
  * 	Returns a real number between 0 and 1 indicating  where  the
- * 	point given by x and y lies in the trough area of the scrollbar. 
+ * 	point given by x and y lies in the trough area of the scrollbar.
  */
 static int
 ScrollbarFractionCommand(
diff --git a/generic/ttk/ttkSquare.c b/generic/ttk/ttkSquare.c
index d002f2f..7837310 100644
--- a/generic/ttk/ttkSquare.c
+++ b/generic/ttk/ttkSquare.c
@@ -56,24 +56,24 @@ static Tk_OptionSpec SquareOptionSpecs[] =
     {TK_OPTION_BORDER, "-foreground", "foreground", "Foreground",
      DEFAULT_BACKGROUND, Tk_Offset(Square,square.foregroundObj),
      -1, 0, 0, 0},
-    
+
     {TK_OPTION_PIXELS, "-width", "width", "Width",
      "50", Tk_Offset(Square,square.widthObj), -1, 0, 0,
      GEOMETRY_CHANGED},
     {TK_OPTION_PIXELS, "-height", "height", "Height",
      "50", Tk_Offset(Square,square.heightObj), -1, 0, 0,
      GEOMETRY_CHANGED},
-    
+
     {TK_OPTION_STRING, "-padding", "padding", "Pad", NULL,
-     Tk_Offset(Square,square.paddingObj), -1, 
+     Tk_Offset(Square,square.paddingObj), -1,
      TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
-    
+
     {TK_OPTION_RELIEF, "-relief", "relief", "Relief",
      NULL, Tk_Offset(Square,square.reliefObj), -1, TK_OPTION_NULL_OK, 0, 0},
-    
+
     {TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor",
      NULL, Tk_Offset(Square,square.anchorObj), -1, TK_OPTION_NULL_OK, 0, 0},
-    
+
     WIDGET_TAKEFOCUS_TRUE,
     WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)
 };
@@ -138,7 +138,7 @@ static const Ttk_Ensemble SquareCommands[] = {
 };
 
 /*
- * The Widget specification structure holds all the implementation 
+ * The Widget specification structure holds all the implementation
  * information about this widget and this is what must be registered
  * with Tk in the package initialization code (see bottom).
  */
@@ -159,7 +159,7 @@ static WidgetSpec SquareWidgetSpec =
     TtkWidgetDisplay		/* displayProc */
 };
 
-/* ---------------------------------------------------------------------- 
+/* ----------------------------------------------------------------------
  * Square element
  *
  * In this section we demonstrate what is required to create a new themed
@@ -176,7 +176,7 @@ typedef struct
     Tcl_Obj *heightObj;
 } SquareElement;
 
-static Ttk_ElementOptionSpec SquareElementOptions[] = 
+static Ttk_ElementOptionSpec SquareElementOptions[] =
 {
     { "-background", TK_OPTION_BORDER, Tk_Offset(SquareElement,borderObj),
     	DEFAULT_BACKGROUND },
@@ -248,7 +248,7 @@ static Ttk_ElementSpec SquareElementSpec =
  * engine is similar to the Tk pack geometry manager. Read the documentation
  * for the details. In this example we just need to have the square element
  * that has been defined for this widget placed on a background. We will
- * also need some padding to keep it away from the edges. 
+ * also need some padding to keep it away from the edges.
  */
 
 TTK_BEGIN_LAYOUT(SquareLayout)
@@ -257,12 +257,12 @@ TTK_BEGIN_LAYOUT(SquareLayout)
 	 TTK_NODE("Square.square", 0))
 TTK_END_LAYOUT
 
-/* ---------------------------------------------------------------------- 
+/* ----------------------------------------------------------------------
  *
  * Widget initialization.
  *
  * This file defines a new element and a new widget. We need to register
- * the element with the themes that will need it. In this case we will 
+ * the element with the themes that will need it. In this case we will
  * register with the default theme that is the root of the theme inheritance
  * tree. This means all themes will find this element.
  * We then need to register the widget class style. This is the layout
@@ -287,10 +287,10 @@ TtkSquareWidget_Init(Tcl_Interp *interp)
 
     /* register the new elements for this theme engine */
     Ttk_RegisterElement(interp, theme, "square", &SquareElementSpec, NULL);
-    
+
     /* register the layout for this theme */
     Ttk_RegisterLayout(theme, "TSquare", SquareLayout);
-    
+
     /* register the widget */
     RegisterWidget(interp, "ttk::square", &SquareWidgetSpec);
 
diff --git a/generic/ttk/ttkStubLib.c b/generic/ttk/ttkStubLib.c
index 2c07b9d..c17f1e9 100644
--- a/generic/ttk/ttkStubLib.c
+++ b/generic/ttk/ttkStubLib.c
@@ -67,7 +67,7 @@ error:
 	"Error loading ", packageName, " package",
 	" (requested version '", version,
 	"', loaded version '", actualVersion, "'): ",
-	errMsg, 
+	errMsg,
 	NULL);
     return NULL;
 }
diff --git a/generic/ttk/ttkTagSet.c b/generic/ttk/ttkTagSet.c
index f2108b9..31798ea 100644
--- a/generic/ttk/ttkTagSet.c
+++ b/generic/ttk/ttkTagSet.c
@@ -188,7 +188,7 @@ int Ttk_TagSetAdd(Ttk_TagSet tagset, Ttk_Tag tag)
 	    return 0;
 	}
     }
-    tagset->tags = ckrealloc(tagset->tags, 
+    tagset->tags = ckrealloc(tagset->tags,
 	    (tagset->nTags+1)*sizeof(tagset->tags[0]));
     tagset->tags[tagset->nTags++] = tag;
     return 1;
diff --git a/generic/ttk/ttkTrace.c b/generic/ttk/ttkTrace.c
index ba66db4..c0f17cf 100644
--- a/generic/ttk/ttkTrace.c
+++ b/generic/ttk/ttkTrace.c
@@ -3,7 +3,7 @@
  *
  * Simplified interface to Tcl_TraceVariable.
  *
- * PROBLEM: Can't distinguish "variable does not exist" (which is OK) 
+ * PROBLEM: Can't distinguish "variable does not exist" (which is OK)
  * from other errors (which are not).
  */
 
diff --git a/generic/ttk/ttkWidget.h b/generic/ttk/ttkWidget.h
index e4dd712..798bcce 100644
--- a/generic/ttk/ttkWidget.h
+++ b/generic/ttk/ttkWidget.h
@@ -111,8 +111,8 @@ MODULE_SCOPE int TtkWidgetConstructorObjCmd(
 
 /* WIDGET_TAKEFOCUS_TRUE --
  * WIDGET_TAKEFOCUS_FALSE --
- *	Add one or the other of these to each OptionSpecs table 
- *	to indicate whether the widget should take focus 
+ *	Add one or the other of these to each OptionSpecs table
+ *	to indicate whether the widget should take focus
  *	during keyboard traversal.
  */
 #define WIDGET_TAKEFOCUS_TRUE \
diff --git a/library/images/logo.eps b/library/images/logo.eps
index 0d05d34..006e72a 100644
--- a/library/images/logo.eps
+++ b/library/images/logo.eps
@@ -28,7 +28,7 @@
 %%BeginProlog
 %%BeginResource: procset Adobe_level2_AI5 1.0 0
 %%Title: (Adobe Illustrator (R) Version 5.0 Level 2 Emulation)
-%%Version: 1.0 
+%%Version: 1.0
 %%CreationDate: (04/10/93) ()
 %%Copyright: ((C) 1987-1993 Adobe Systems Incorporated All Rights Reserved)
 userdict /Adobe_level2_AI5 21 dict dup begin
@@ -77,7 +77,7 @@ userdict /Adobe_level2_AI5 21 dict dup begin
 		}
 		def
 	} if
-	
+
 	/gt38? mark {version cvx exec} stopped {cleartomark true} {38 gt exch pop} ifelse def
 	userdict /deviceDPI 72 0 matrix defaultmatrix dtransform dup mul exch dup mul add sqrt put
 	userdict /level2?
@@ -178,7 +178,7 @@ userdict /Adobe_level2_AI5 21 dict dup begin
 %%EndResource
 %%BeginResource: procset Adobe_IllustratorA_AI5 1.1 0
 %%Title: (Adobe Illustrator (R) Version 5.0 Abbreviated Prolog)
-%%Version: 1.1 
+%%Version: 1.1
 %%CreationDate: (3/7/1994) ()
 %%Copyright: ((C) 1987-1994 Adobe Systems Incorporated All Rights Reserved)
 currentpacking true setpacking
@@ -1062,7 +1062,7 @@ end
 		}
 		{
 			/clipForward? true def
-			
+
 			/Tx /pop load def
 			/Tj /pop load def
 			currentdict end clipRenderOff begin begin
@@ -1089,7 +1089,7 @@ end
 		 end
 		 end
 		 begin
-			
+
 			/clipForward? false ddef
 		} if
 	} ifelse
diff --git a/library/images/pwrdLogo.eps b/library/images/pwrdLogo.eps
index e11d9e9..674250f 100644
--- a/library/images/pwrdLogo.eps
+++ b/library/images/pwrdLogo.eps
@@ -28,7 +28,7 @@
 %%BeginProlog
 %%BeginResource: procset Adobe_level2_AI5 1.0 0
 %%Title: (Adobe Illustrator (R) Version 5.0 Level 2 Emulation)
-%%Version: 1.0 
+%%Version: 1.0
 %%CreationDate: (04/10/93) ()
 %%Copyright: ((C) 1987-1993 Adobe Systems Incorporated All Rights Reserved)
 userdict /Adobe_level2_AI5 21 dict dup begin
@@ -77,7 +77,7 @@ userdict /Adobe_level2_AI5 21 dict dup begin
 		}
 		def
 	} if
-	
+
 	/gt38? mark {version cvx exec} stopped {cleartomark true} {38 gt exch pop} ifelse def
 	userdict /deviceDPI 72 0 matrix defaultmatrix dtransform dup mul exch dup mul add sqrt put
 	userdict /level2?
@@ -178,7 +178,7 @@ userdict /Adobe_level2_AI5 21 dict dup begin
 %%EndResource
 %%BeginResource: procset Adobe_IllustratorA_AI5 1.1 0
 %%Title: (Adobe Illustrator (R) Version 5.0 Abbreviated Prolog)
-%%Version: 1.1 
+%%Version: 1.1
 %%CreationDate: (3/7/1994) ()
 %%Copyright: ((C) 1987-1994 Adobe Systems Incorporated All Rights Reserved)
 currentpacking true setpacking
@@ -1062,7 +1062,7 @@ end
 		}
 		{
 			/clipForward? true def
-			
+
 			/Tx /pop load def
 			/Tj /pop load def
 			currentdict end clipRenderOff begin begin
@@ -1089,7 +1089,7 @@ end
 		 end
 		 end
 		 begin
-			
+
 			/clipForward? false ddef
 		} if
 	} ifelse
diff --git a/library/tk.tcl b/library/tk.tcl
index 54d8ffb..d66ac56 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -11,7 +11,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 # Verify that we have Tk binary and script components from the same release
-package require -exact Tk  8.6.5
+package require -exact Tk  8.7a0
 
 # Create a ::tk namespace
 namespace eval ::tk {
diff --git a/library/ttk/button.tcl b/library/ttk/button.tcl
index 9f2cec7..24065c2 100644
--- a/library/ttk/button.tcl
+++ b/library/ttk/button.tcl
@@ -8,7 +8,7 @@
 # (If the button is released off the widget, the grab deactivates and
 # we get a <Leave> event then, which turns off the "active" state)
 #
-# Normally, <ButtonRelease> and <ButtonN-Enter/Leave> events are 
+# Normally, <ButtonRelease> and <ButtonN-Enter/Leave> events are
 # delivered to the widget which received the initial <ButtonPress>
 # event.  However, Tk [grab]s (#1223103) and menu interactions
 # (#1222605) can interfere with this.  To guard against spurious
diff --git a/library/ttk/clamTheme.tcl b/library/ttk/clamTheme.tcl
index f184ea0..1789b8a 100644
--- a/library/ttk/clamTheme.tcl
+++ b/library/ttk/clamTheme.tcl
@@ -5,7 +5,7 @@
 #
 
 namespace eval ttk::theme::clam {
-    variable colors 
+    variable colors
     array set colors {
 	-disabledfg	"#999999"
 	-frame  	"#dcdad5"
diff --git a/library/ttk/defaults.tcl b/library/ttk/defaults.tcl
index 05a46bd..4551966 100644
--- a/library/ttk/defaults.tcl
+++ b/library/ttk/defaults.tcl
@@ -40,7 +40,7 @@ namespace eval ttk::theme::default {
 	ttk::style configure TButton \
 	    -anchor center -padding "3 3" -width -9 \
 	    -relief raised -shiftrelief 1
-	ttk::style map TButton -relief [list {!disabled pressed} sunken] 
+	ttk::style map TButton -relief [list {!disabled pressed} sunken]
 
 	ttk::style configure TCheckbutton \
 	    -indicatorcolor "#ffffff" -indicatorrelief sunken -padding 1
diff --git a/library/ttk/entry.tcl b/library/ttk/entry.tcl
index b3ebcbd..647d16e 100644
--- a/library/ttk/entry.tcl
+++ b/library/ttk/entry.tcl
@@ -418,7 +418,7 @@ proc ttk::entry::DragOut {w mode} {
 # 	Suspend autoscroll.
 #
 proc ttk::entry::DragIn {w} {
-    ttk::CancelRepeat 
+    ttk::CancelRepeat
 }
 
 ## <ButtonRelease-1> binding
@@ -432,7 +432,7 @@ proc ttk::entry::Release {w} {
 ## AutoScroll
 #	Called repeatedly when the mouse is outside an entry window
 #	with Button 1 down.  Scroll the window left or right,
-#	depending on where the mouse left the window, and extend 
+#	depending on where the mouse left the window, and extend
 #	the selection according to the current selection mode.
 #
 # TODO: AutoScroll should repeat faster (50ms) than normal autorepeat.
diff --git a/library/ttk/menubutton.tcl b/library/ttk/menubutton.tcl
index 2be064c..648cdee 100644
--- a/library/ttk/menubutton.tcl
+++ b/library/ttk/menubutton.tcl
@@ -10,7 +10,7 @@
 # (In addition, when menu system is active, "dropdown" -- menu posts
 # on mouse-over.  Ttk menubuttons don't implement this).
 #
-# For keyboard and popdown mode, we hand off to tk_popup and let 
+# For keyboard and popdown mode, we hand off to tk_popup and let
 # the built-in Tk bindings handle the rest of the interaction.
 #
 # ON X11:
@@ -22,13 +22,13 @@
 # rely on the passive grab that occurs on <ButtonPress> events,
 # and transition to popdown mode when the mouse is released
 # or dragged outside the menubutton.
-# 
+#
 # ON WINDOWS:
 #
-# I'm not sure what the hell is going on here.  [$menu post] apparently 
+# I'm not sure what the hell is going on here.  [$menu post] apparently
 # sets up some kind of internal grab for native menus.
 # On this platform, just use [tk_popup] for all menu actions.
-# 
+#
 # ON MACOS:
 #
 # Same probably applies here.
@@ -61,7 +61,7 @@ if {[tk windowingsystem] eq "x11"} {
 }
 
 # PostPosition --
-#	Returns the x and y coordinates where the menu 
+#	Returns the x and y coordinates where the menu
 #	should be posted, based on the menubutton and menu size
 #	and -direction option.
 #
@@ -85,7 +85,7 @@ proc ttk::menubutton::PostPosition {mb menu} {
 	below { if {$y <= $sh} { incr y  $bh } { incr y -$mh } }
 	left  { if {$x >= $mw} { incr x -$mw } { incr x  $bw } }
 	right { if {$x <= $sw} { incr x  $bw } { incr x -$mw } }
-	flush { 
+	flush {
 	    # post menu atop menubutton.
 	    # If there's a menu entry whose label matches the
 	    # menubutton -text, assume this is an optionmenu
@@ -113,7 +113,7 @@ proc ttk::menubutton::Popdown {mb} {
 
 # Pulldown (X11 only) --
 #	Called when Button1 is pressed on a menubutton.
-#	Posts the menu; a subsequent ButtonRelease 
+#	Posts the menu; a subsequent ButtonRelease
 #	or Leave event will set a grab on the menu.
 #
 proc ttk::menubutton::Pulldown {mb} {
diff --git a/library/ttk/notebook.tcl b/library/ttk/notebook.tcl
index 72b85e6..92efe40 100644
--- a/library/ttk/notebook.tcl
+++ b/library/ttk/notebook.tcl
@@ -70,7 +70,7 @@ proc ttk::notebook::CycleTab {w dir} {
 }
 
 # MnemonicTab $nb $key --
-#	Scan all tabs in the specified notebook for one with the 
+#	Scan all tabs in the specified notebook for one with the
 #	specified mnemonic. If found, returns path name of tab;
 #	otherwise returns ""
 #
@@ -94,8 +94,8 @@ proc ttk::notebook::MnemonicTab {nb key} {
 #	Enable keyboard traversal for a notebook widget
 #	by adding bindings to the containing toplevel window.
 #
-#	TLNotebooks($top) keeps track of the list of all traversal-enabled 
-#	notebooks contained in the toplevel 
+#	TLNotebooks($top) keeps track of the list of all traversal-enabled
+#	notebooks contained in the toplevel
 #
 proc ttk::notebook::enableTraversal {nb} {
     variable TLNotebooks
@@ -145,7 +145,7 @@ proc ttk::notebook::Cleanup {nb} {
     }
 }
 
-# EnclosingNotebook $w -- 
+# EnclosingNotebook $w --
 #	Return the nearest traversal-enabled notebook widget
 #	that contains $w.
 #
@@ -171,7 +171,7 @@ proc ttk::notebook::EnclosingNotebook {w} {
 
 # TLCycleTab --
 #	toplevel binding procedure for Control-Tab / Control-Shift-Tab
-#	Select the next/previous tab in the nearest ancestor notebook. 
+#	Select the next/previous tab in the nearest ancestor notebook.
 #
 proc ttk::notebook::TLCycleTab {w dir} {
     set nb [EnclosingNotebook $w]
diff --git a/library/ttk/scrollbar.tcl b/library/ttk/scrollbar.tcl
index 4bd5107..17d729d 100644
--- a/library/ttk/scrollbar.tcl
+++ b/library/ttk/scrollbar.tcl
@@ -86,7 +86,7 @@ proc ttk::scrollbar::Press {w x y} {
 proc ttk::scrollbar::Drag {w x y} {
     variable State
     if {![info exists State(first)]} {
-    	# Initial buttonpress was not on the thumb, 
+    	# Initial buttonpress was not on the thumb,
 	# or something screwy has happened.  In either case, ignore:
 	return;
     }
diff --git a/library/ttk/treeview.tcl b/library/ttk/treeview.tcl
index 8772587..c38b5b6 100644
--- a/library/ttk/treeview.tcl
+++ b/library/ttk/treeview.tcl
@@ -46,7 +46,7 @@ bind Treeview	<Shift-ButtonPress-1> \
 bind Treeview	<<ToggleSelection>> \
 		{ ttk::treeview::Select %W %x %y toggle }
 
-ttk::copyBindings TtkScrollable Treeview 
+ttk::copyBindings TtkScrollable Treeview
 
 ### Binding procedures.
 #
diff --git a/library/ttk/ttk.tcl b/library/ttk/ttk.tcl
index 7bae211..665222d 100644
--- a/library/ttk/ttk.tcl
+++ b/library/ttk/ttk.tcl
@@ -122,7 +122,7 @@ proc ttk::LoadThemes {} {
     variable library
 
     # "default" always present:
-    uplevel #0 [list source [file join $library defaults.tcl]] 
+    uplevel #0 [list source [file join $library defaults.tcl]]
 
     set builtinThemes [style theme names]
     foreach {theme scripts} {
diff --git a/library/ttk/vistaTheme.tcl b/library/ttk/vistaTheme.tcl