rm tcl/tk 8.6.7

168 files changed, 0 insertions, 37708 deletions

diff --git a/tk8.6/library/bgerror.tcl b/tk8.6/library/bgerror.tcl
deleted file mode 100644
index b15387e..0000000
--- a/tk8.6/library/bgerror.tcl
+++ /dev/null
@@ -1,265 +0,0 @@
-# bgerror.tcl --
-#
-#	Implementation of the bgerror procedure.  It posts a dialog box with
-#	the error message and gives the user a chance to see a more detailed
-#	stack trace, and possible do something more interesting with that
-#	trace (like save it to a log).  This is adapted from work done by
-#	Donal K. Fellows.
-#
-# Copyright (c) 1998-2000 by Ajuba Solutions.
-# Copyright (c) 2007 by ActiveState Software Inc.
-# Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net>
-# Copyright (c) 2009 Pat Thoyts <patthoyts@users.sourceforge.net>
-
-namespace eval ::tk::dialog::error {
-    namespace import -force ::tk::msgcat::*
-    namespace export bgerror
-    option add *ErrorDialog.function.text [mc "Save To Log"] \
-	widgetDefault
-    option add *ErrorDialog.function.command [namespace code SaveToLog]
-    option add *ErrorDialog*Label.font TkCaptionFont widgetDefault
-    if {[tk windowingsystem] eq "aqua"} {
-	option add *ErrorDialog*background systemAlertBackgroundActive \
-		widgetDefault
-	option add *ErrorDialog*info.text.background white widgetDefault
-	option add *ErrorDialog*Button.highlightBackground \
-		systemAlertBackgroundActive widgetDefault
-    }
-}
-
-proc ::tk::dialog::error::Return {which code} {
-    variable button
-
-    .bgerrorDialog.$which state {active selected focus}
-    update idletasks
-    after 100
-    set button $code
-}
-
-proc ::tk::dialog::error::Details {} {
-    set w .bgerrorDialog
-    set caption [option get $w.function text {}]
-    set command [option get $w.function command {}]
-    if { ($caption eq "") || ($command eq "") } {
-	grid forget $w.function
-    }
-    lappend command [$w.top.info.text get 1.0 end-1c]
-    $w.function configure -text $caption -command $command
-    grid $w.top.info - -sticky nsew -padx 3m -pady 3m
-}
-
-proc ::tk::dialog::error::SaveToLog {text} {
-    if { $::tcl_platform(platform) eq "windows" } {
-	set allFiles *.*
-    } else {
-	set allFiles *
-    }
-    set types [list \
-	    [list [mc "Log Files"] .log]      \
-	    [list [mc "Text Files"] .txt]     \
-	    [list [mc "All Files"] $allFiles] \
-	    ]
-    set filename [tk_getSaveFile -title [mc "Select Log File"] \
-	    -filetypes $types -defaultextension .log -parent .bgerrorDialog]
-    if {$filename ne {}} {
-        set f [open $filename w]
-        puts -nonewline $f $text
-        close $f
-    }
-    return
-}
-
-proc ::tk::dialog::error::Destroy {w} {
-    if {$w eq ".bgerrorDialog"} {
-	variable button
-	set button -1
-    }
-}
-
-proc ::tk::dialog::error::DeleteByProtocol {} {
-    variable button
-    set button 1
-}
-
-proc ::tk::dialog::error::ReturnInDetails w {
-    bind $w <Return> {}; # Remove this binding
-    $w invoke
-    return -code break
-}
-
-# ::tk::dialog::error::bgerror --
-#
-#	This is the default version of bgerror.
-#	It tries to execute tkerror, if that fails it posts a dialog box
-#	containing the error message and gives the user a chance to ask
-#	to see a stack trace.
-#
-# Arguments:
-#	err - The error message.
-#
-proc ::tk::dialog::error::bgerror err {
-    global errorInfo
-    variable button
-
-    set info $errorInfo
-
-    set ret [catch {::tkerror $err} msg];
-    if {$ret != 1} {return -code $ret $msg}
-
-    # Ok the application's tkerror either failed or was not found
-    # we use the default dialog then :
-    set windowingsystem [tk windowingsystem]
-    if {$windowingsystem eq "aqua"} {
-	set ok [mc Ok]
-    } else {
-	set ok [mc OK]
-    }
-
-    # Truncate the message if it is too wide (>maxLine characters) or
-    # too tall (>4 lines).  Truncation occurs at the first point at
-    # which one of those conditions is met.
-    set displayedErr ""
-    set lines 0
-    set maxLine 45
-    foreach line [split $err \n] {
-	if { [string length $line] > $maxLine } {
-	    append displayedErr "[string range $line 0 [expr {$maxLine-3}]]..."
-	    break
-	}
-	if { $lines > 4 } {
-	    append displayedErr "..."
-	    break
-	} else {
-	    append displayedErr "${line}\n"
-	}
-	incr lines
-    }
-
-    set title [mc "Application Error"]
-    set text [mc "Error: %1\$s" $displayedErr]
-    set buttons [list ok $ok dismiss [mc "Skip Messages"] \
-		     function [mc "Details >>"]]
-
-    # 1. Create the top-level window and divide it into top
-    # and bottom parts.
-
-    set dlg .bgerrorDialog
-    set bg [ttk::style lookup . -background]
-    destroy $dlg
-    toplevel $dlg -class ErrorDialog -background $bg
-    wm withdraw $dlg
-    wm title $dlg $title
-    wm iconname $dlg ErrorDialog
-    wm protocol $dlg WM_DELETE_WINDOW [namespace code DeleteByProtocol]
-
-    if {$windowingsystem eq "aqua"} {
-	::tk::unsupported::MacWindowStyle style $dlg moveableAlert {}
-    } elseif {$windowingsystem eq "x11"} {
-	wm attributes $dlg -type dialog
-    }
-
-    ttk::frame $dlg.bot
-    ttk::frame $dlg.top
-    pack $dlg.bot -side bottom -fill both
-    pack $dlg.top -side top -fill both -expand 1
-
-    set W [ttk::frame $dlg.top.info]
-    text $W.text -setgrid true -height 10 -wrap char \
-	-yscrollcommand [list $W.scroll set]
-    if {$windowingsystem ne "aqua"} {
-	$W.text configure -width 40
-    }
-
-    ttk::scrollbar $W.scroll -command [list $W.text yview]
-    pack $W.scroll -side right -fill y
-    pack $W.text -side left -expand yes -fill both
-    $W.text insert 0.0 "$err\n$info"
-    $W.text mark set insert 0.0
-    bind $W.text <ButtonPress-1> { focus %W }
-    $W.text configure -state disabled
-
-    # 2. Fill the top part with bitmap and message
-
-    # Max-width of message is the width of the screen...
-    set wrapwidth [winfo screenwidth $dlg]
-    # ...minus the width of the icon, padding and a fudge factor for
-    # the window manager decorations and aesthetics.
-    set wrapwidth [expr {$wrapwidth-60-[winfo pixels $dlg 9m]}]
-    ttk::label $dlg.msg -justify left -text $text -wraplength $wrapwidth
-    ttk::label $dlg.bitmap -image ::tk::icons::error
-
-    grid $dlg.bitmap $dlg.msg -in $dlg.top -row 0 -padx 3m -pady 3m
-    grid configure       $dlg.bitmap -sticky ne
-    grid configure	 $dlg.msg -sticky nsw -padx {0 3m}
-    grid rowconfigure	 $dlg.top 1 -weight 1
-    grid columnconfigure $dlg.top 1 -weight 1
-
-    # 3. Create a row of buttons at the bottom of the dialog.
-
-    set i 0
-    foreach {name caption} $buttons {
-	ttk::button $dlg.$name -text $caption -default normal \
-	    -command [namespace code [list set button $i]]
-	grid $dlg.$name -in $dlg.bot -column $i -row 0 -sticky ew -padx 10
-	grid columnconfigure $dlg.bot $i -weight 1
-	# We boost the size of some Mac buttons for l&f
-	if {$windowingsystem eq "aqua"} {
-	    if {($name eq "ok") || ($name eq "dismiss")} {
-		grid columnconfigure $dlg.bot $i -minsize 90
-	    }
-	    grid configure $dlg.$name -pady 7
-	}
-	incr i
-    }
-    # The "OK" button is the default for this dialog.
-    $dlg.ok configure -default active
-
-    bind $dlg <Return>	[namespace code {Return ok 0}]
-    bind $dlg <Escape>	[namespace code {Return dismiss 1}]
-    bind $dlg <Destroy>	[namespace code {Destroy %W}]
-    bind $dlg.function <Return>	[namespace code {ReturnInDetails %W}]
-    $dlg.function configure -command [namespace code Details]
-
-    # 6. Withdraw the window, then update all the geometry information
-    # so we know how big it wants to be, then center the window in the
-    # display (Motif style) and de-iconify it.
-
-    ::tk::PlaceWindow $dlg
-
-    # 7. Set a grab and claim the focus too.
-
-    ::tk::SetFocusGrab $dlg $dlg.ok
-
-    # 8. Ensure that we are topmost.
-
-    raise $dlg
-    if {[tk windowingsystem] eq "win32"} {
-	# Place it topmost if we aren't at the top of the stacking
-	# order to ensure that it's seen
-	if {[lindex [wm stackorder .] end] ne "$dlg"} {
-	    wm attributes $dlg -topmost 1
-        }
-    }
-
-    # 9. Wait for the user to respond, then restore the focus and
-    # return the index of the selected button.  Restore the focus
-    # before deleting the window, since otherwise the window manager
-    # may take the focus away so we can't redirect it.  Finally,
-    # restore any grab that was in effect.
-
-    vwait [namespace which -variable button]
-    set copy $button; # Save a copy...
-
-    ::tk::RestoreFocusGrab $dlg $dlg.ok destroy
-
-    if {$copy == 1} {
-	return -code break
-    }
-}
-
-namespace eval :: {
-    # Fool the indexer
-    proc bgerror err {}
-    rename bgerror {}
-    namespace import ::tk::dialog::error::bgerror
-}
diff --git a/tk8.6/library/button.tcl b/tk8.6/library/button.tcl
deleted file mode 100644
index 80d8bf9..0000000
--- a/tk8.6/library/button.tcl
+++ /dev/null
@@ -1,778 +0,0 @@
-# button.tcl --
-#
-# This file defines the default bindings for Tk label, button,
-# checkbutton, and radiobutton widgets and provides procedures
-# that help in implementing those bindings.
-#
-# Copyright (c) 1992-1994 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 2002 ActiveState Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-#-------------------------------------------------------------------------
-# The code below creates the default class bindings for buttons.
-#-------------------------------------------------------------------------
-
-if {[tk windowingsystem] eq "aqua"} {
-
-    bind Radiobutton <Enter> {
-	tk::ButtonEnter %W
-    }
-    bind Radiobutton <1> {
-	tk::ButtonDown %W
-    }
-    bind Radiobutton <ButtonRelease-1> {
-	tk::ButtonUp %W
-    }
-    bind Checkbutton <Enter> {
-	tk::ButtonEnter %W
-    }
-    bind Checkbutton <1> {
-	tk::ButtonDown %W
-    }
-    bind Checkbutton <ButtonRelease-1> {
-	tk::ButtonUp %W
-    }
-    bind Checkbutton <Leave> {
-	tk::ButtonLeave %W
-    }
-}
-if {"win32" eq [tk windowingsystem]} {
-    bind Checkbutton <equal> {
-	tk::CheckRadioInvoke %W select
-    }
-    bind Checkbutton <plus> {
-	tk::CheckRadioInvoke %W select
-    }
-    bind Checkbutton <minus> {
-	tk::CheckRadioInvoke %W deselect
-    }
-    bind Checkbutton <1> {
-	tk::CheckRadioDown %W
-    }
-    bind Checkbutton <ButtonRelease-1> {
-	tk::ButtonUp %W
-    }
-    bind Checkbutton <Enter> {
-	tk::CheckRadioEnter %W
-    }
-    bind Checkbutton <Leave> {
-	tk::ButtonLeave %W
-    }
-
-    bind Radiobutton <1> {
-	tk::CheckRadioDown %W
-    }
-    bind Radiobutton <ButtonRelease-1> {
-	tk::ButtonUp %W
-    }
-    bind Radiobutton <Enter> {
-	tk::CheckRadioEnter %W
-    }
-}
-if {"x11" eq [tk windowingsystem]} {
-    bind Checkbutton <Return> {
-	if {!$tk_strictMotif} {
-	    tk::CheckInvoke %W
-	}
-    }
-    bind Radiobutton <Return> {
-	if {!$tk_strictMotif} {
-	    tk::CheckRadioInvoke %W
-	}
-    }
-    bind Checkbutton <1> {
-	tk::CheckInvoke %W
-    }
-    bind Radiobutton <1> {
-	tk::CheckRadioInvoke %W
-    }
-    bind Checkbutton <Enter> {
-	tk::CheckEnter %W
-    }
-    bind Radiobutton <Enter> {
-	tk::ButtonEnter %W
-    }
-    bind Checkbutton <Leave> {
-	tk::CheckLeave %W
-    }
-}
-
-bind Button <space> {
-    tk::ButtonInvoke %W
-}
-bind Checkbutton <space> {
-    tk::CheckRadioInvoke %W
-}
-bind Radiobutton <space> {
-    tk::CheckRadioInvoke %W
-}
-bind Button <<Invoke>> {
-    tk::ButtonInvoke %W
-}
-bind Checkbutton <<Invoke>> {
-    tk::CheckRadioInvoke %W
-}
-bind Radiobutton <<Invoke>> {
-    tk::CheckRadioInvoke %W
-}
-
-bind Button <FocusIn> {}
-bind Button <Enter> {
-    tk::ButtonEnter %W
-}
-bind Button <Leave> {
-    tk::ButtonLeave %W
-}
-bind Button <1> {
-    tk::ButtonDown %W
-}
-bind Button <ButtonRelease-1> {
-    tk::ButtonUp %W
-}
-
-bind Checkbutton <FocusIn> {}
-
-bind Radiobutton <FocusIn> {}
-bind Radiobutton <Leave> {
-    tk::ButtonLeave %W
-}
-
-if {"win32" eq [tk windowingsystem]} {
-
-#########################
-# Windows implementation
-#########################
-
-# ::tk::ButtonEnter --
-# The procedure below is invoked when the mouse pointer enters a
-# button widget.  It records the button we're in and changes the
-# state of the button to active unless the button is disabled.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::ButtonEnter w {
-    variable ::tk::Priv
-    if {[$w cget -state] ne "disabled"} {
-
-	# If the mouse button is down, set the relief to sunken on entry.
-	# Overwise, if there's an -overrelief value, set the relief to that.
-
-	set Priv($w,relief) [$w cget -relief]
-	if {$Priv(buttonWindow) eq $w} {
-	    $w configure -relief sunken -state active
-	    set Priv($w,prelief) sunken
-	} elseif {[set over [$w cget -overrelief]] ne ""} {
-	    $w configure -relief $over
-	    set Priv($w,prelief) $over
-	}
-    }
-    set Priv(window) $w
-}
-
-# ::tk::ButtonLeave --
-# The procedure below is invoked when the mouse pointer leaves a
-# button widget.  It changes the state of the button back to inactive.
-# Restore any modified relief too.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::ButtonLeave w {
-    variable ::tk::Priv
-    if {[$w cget -state] ne "disabled"} {
-	$w configure -state normal
-    }
-
-    # Restore the original button relief if it was changed by Tk.
-    # That is signaled by the existence of Priv($w,prelief).
-
-    if {[info exists Priv($w,relief)]} {
-	if {[info exists Priv($w,prelief)] && \
-		$Priv($w,prelief) eq [$w cget -relief]} {
-	    $w configure -relief $Priv($w,relief)
-	}
-	unset -nocomplain Priv($w,relief) Priv($w,prelief)
-    }
-
-    set Priv(window) ""
-}
-
-# ::tk::ButtonDown --
-# The procedure below is invoked when the mouse button is pressed in
-# a button widget.  It records the fact that the mouse is in the button,
-# saves the button's relief so it can be restored later, and changes
-# the relief to sunken.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::ButtonDown w {
-    variable ::tk::Priv
-
-    # Only save the button's relief if it does not yet exist.  If there
-    # is an overrelief setting, Priv($w,relief) will already have been set,
-    # and the current value of the -relief option will be incorrect.
-
-    if {![info exists Priv($w,relief)]} {
-	set Priv($w,relief) [$w cget -relief]
-    }
-
-    if {[$w cget -state] ne "disabled"} {
-	set Priv(buttonWindow) $w
-	$w configure -relief sunken -state active
-	set Priv($w,prelief) sunken
-
-	# If this button has a repeatdelay set up, get it going with an after
-	after cancel $Priv(afterId)
-	set delay [$w cget -repeatdelay]
-	set Priv(repeated) 0
-	if {$delay > 0} {
-	    set Priv(afterId) [after $delay [list tk::ButtonAutoInvoke $w]]
-	}
-    }
-}
-
-# ::tk::ButtonUp --
-# The procedure below is invoked when the mouse button is released
-# in a button widget.  It restores the button's relief and invokes
-# the command as long as the mouse hasn't left the button.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::ButtonUp w {
-    variable ::tk::Priv
-    if {$Priv(buttonWindow) eq $w} {
-	set Priv(buttonWindow) ""
-
-	# Restore the button's relief if it was cached.
-
-	if {[info exists Priv($w,relief)]} {
-	    if {[info exists Priv($w,prelief)] && \
-		    $Priv($w,prelief) eq [$w cget -relief]} {
-		$w configure -relief $Priv($w,relief)
-	    }
-	    unset -nocomplain Priv($w,relief) Priv($w,prelief)
-	}
-
-	# Clean up the after event from the auto-repeater
-	after cancel $Priv(afterId)
-
-	if {$Priv(window) eq $w && [$w cget -state] ne "disabled"} {
-	    $w configure -state normal
-
-	    # Only invoke the command if it wasn't already invoked by the
-	    # auto-repeater functionality
-	    if { $Priv(repeated) == 0 } {
-		uplevel #0 [list $w invoke]
-	    }
-	}
-    }
-}
-
-# ::tk::CheckRadioEnter --
-# The procedure below is invoked when the mouse pointer enters a
-# checkbutton or radiobutton widget.  It records the button we're in
-# and changes the state of the button to active unless the button is
-# disabled.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::CheckRadioEnter w {
-    variable ::tk::Priv
-    if {[$w cget -state] ne "disabled"} {
-	if {$Priv(buttonWindow) eq $w} {
-	    $w configure -state active
-	}
-	if {[set over [$w cget -overrelief]] ne ""} {
-	    set Priv($w,relief)  [$w cget -relief]
-	    set Priv($w,prelief) $over
-	    $w configure -relief $over
-	}
-    }
-    set Priv(window) $w
-}
-
-# ::tk::CheckRadioDown --
-# The procedure below is invoked when the mouse button is pressed in
-# a button widget.  It records the fact that the mouse is in the button,
-# saves the button's relief so it can be restored later, and changes
-# the relief to sunken.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::CheckRadioDown w {
-    variable ::tk::Priv
-    if {![info exists Priv($w,relief)]} {
-	set Priv($w,relief) [$w cget -relief]
-    }
-    if {[$w cget -state] ne "disabled"} {
-	set Priv(buttonWindow) $w
-	set Priv(repeated) 0
-	$w configure -state active
-    }
-}
-
-}
-
-if {"x11" eq [tk windowingsystem]} {
-
-#####################
-# Unix implementation
-#####################
-
-# ::tk::ButtonEnter --
-# The procedure below is invoked when the mouse pointer enters a
-# button widget.  It records the button we're in and changes the
-# state of the button to active unless the button is disabled.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::ButtonEnter {w} {
-    variable ::tk::Priv
-    if {[$w cget -state] ne "disabled"} {
-	# On unix the state is active just with mouse-over
-	$w configure -state active
-
-	# If the mouse button is down, set the relief to sunken on entry.
-	# Overwise, if there's an -overrelief value, set the relief to that.
-
-	set Priv($w,relief) [$w cget -relief]
-	if {$Priv(buttonWindow) eq $w} {
-	    $w configure -relief sunken
-	    set Priv($w,prelief) sunken
-	} elseif {[set over [$w cget -overrelief]] ne ""} {
-	    $w configure -relief $over
-	    set Priv($w,prelief) $over
-	}
-    }
-    set Priv(window) $w
-}
-
-# ::tk::ButtonLeave --
-# The procedure below is invoked when the mouse pointer leaves a
-# button widget.  It changes the state of the button back to inactive.
-# Restore any modified relief too.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::ButtonLeave w {
-    variable ::tk::Priv
-    if {[$w cget -state] ne "disabled"} {
-	$w configure -state normal
-    }
-
-    # Restore the original button relief if it was changed by Tk.
-    # That is signaled by the existence of Priv($w,prelief).
-
-    if {[info exists Priv($w,relief)]} {
-	if {[info exists Priv($w,prelief)] && \
-		$Priv($w,prelief) eq [$w cget -relief]} {
-	    $w configure -relief $Priv($w,relief)
-	}
-	unset -nocomplain Priv($w,relief) Priv($w,prelief)
-    }
-
-    set Priv(window) ""
-}
-
-# ::tk::ButtonDown --
-# The procedure below is invoked when the mouse button is pressed in
-# a button widget.  It records the fact that the mouse is in the button,
-# saves the button's relief so it can be restored later, and changes
-# the relief to sunken.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::ButtonDown w {
-    variable ::tk::Priv
-
-    # Only save the button's relief if it does not yet exist.  If there
-    # is an overrelief setting, Priv($w,relief) will already have been set,
-    # and the current value of the -relief option will be incorrect.
-
-    if {![info exists Priv($w,relief)]} {
-	set Priv($w,relief) [$w cget -relief]
-    }
-
-    if {[$w cget -state] ne "disabled"} {
-	set Priv(buttonWindow) $w
-	$w configure -relief sunken
-	set Priv($w,prelief) sunken
-
-	# If this button has a repeatdelay set up, get it going with an after
-	after cancel $Priv(afterId)
-	set delay [$w cget -repeatdelay]
-	set Priv(repeated) 0
-	if {$delay > 0} {
-	    set Priv(afterId) [after $delay [list tk::ButtonAutoInvoke $w]]
-	}
-    }
-}
-
-# ::tk::ButtonUp --
-# The procedure below is invoked when the mouse button is released
-# in a button widget.  It restores the button's relief and invokes
-# the command as long as the mouse hasn't left the button.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::ButtonUp w {
-    variable ::tk::Priv
-    if {$w eq $Priv(buttonWindow)} {
-	set Priv(buttonWindow) ""
-
-	# Restore the button's relief if it was cached.
-
-	if {[info exists Priv($w,relief)]} {
-	    if {[info exists Priv($w,prelief)] && \
-		    $Priv($w,prelief) eq [$w cget -relief]} {
-		$w configure -relief $Priv($w,relief)
-	    }
-	    unset -nocomplain Priv($w,relief) Priv($w,prelief)
-	}
-
-	# Clean up the after event from the auto-repeater
-	after cancel $Priv(afterId)
-
-	if {$Priv(window) eq $w && [$w cget -state] ne "disabled"} {
-	    # Only invoke the command if it wasn't already invoked by the
-	    # auto-repeater functionality
-	    if { $Priv(repeated) == 0 } {
-		uplevel #0 [list $w invoke]
-	    }
-	}
-    }
-}
-
-}
-
-if {[tk windowingsystem] eq "aqua"} {
-
-####################
-# Mac implementation
-####################
-
-# ::tk::ButtonEnter --
-# The procedure below is invoked when the mouse pointer enters a
-# button widget.  It records the button we're in and changes the
-# state of the button to active unless the button is disabled.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::ButtonEnter {w} {
-    variable ::tk::Priv
-    if {[$w cget -state] ne "disabled"} {
-
-	# If there's an -overrelief value, set the relief to that.
-
-	if {$Priv(buttonWindow) eq $w} {
-	    $w configure -state active
-	} elseif {[set over [$w cget -overrelief]] ne ""} {
-	    set Priv($w,relief)  [$w cget -relief]
-	    set Priv($w,prelief) $over
-	    $w configure -relief $over
-	}
-    }
-    set Priv(window) $w
-}
-
-# ::tk::ButtonLeave --
-# The procedure below is invoked when the mouse pointer leaves a
-# button widget.  It changes the state of the button back to
-# inactive.  If we're leaving the button window with a mouse button
-# pressed (Priv(buttonWindow) == $w), restore the relief of the
-# button too.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::ButtonLeave w {
-    variable ::tk::Priv
-    if {$w eq $Priv(buttonWindow)} {
-	$w configure -state normal
-    }
-
-    # Restore the original button relief if it was changed by Tk.
-    # That is signaled by the existence of Priv($w,prelief).
-
-    if {[info exists Priv($w,relief)]} {
-	if {[info exists Priv($w,prelief)] && \
-		$Priv($w,prelief) eq [$w cget -relief]} {
-	    $w configure -relief $Priv($w,relief)
-	}
-	unset -nocomplain Priv($w,relief) Priv($w,prelief)
-    }
-
-    set Priv(window) ""
-}
-
-# ::tk::ButtonDown --
-# The procedure below is invoked when the mouse button is pressed in
-# a button widget.  It records the fact that the mouse is in the button,
-# saves the button's relief so it can be restored later, and changes
-# the relief to sunken.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::ButtonDown w {
-    variable ::tk::Priv
-
-    if {[$w cget -state] ne "disabled"} {
-	set Priv(buttonWindow) $w
-	$w configure -state active
-
-	# If this button has a repeatdelay set up, get it going with an after
-	after cancel $Priv(afterId)
-	set Priv(repeated) 0
-	if { ![catch {$w cget -repeatdelay} delay] } {
-	    if {$delay > 0} {
-		set Priv(afterId) [after $delay [list tk::ButtonAutoInvoke $w]]
-	    }
-	}
-    }
-}
-
-# ::tk::ButtonUp --
-# The procedure below is invoked when the mouse button is released
-# in a button widget.  It restores the button's relief and invokes
-# the command as long as the mouse hasn't left the button.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::ButtonUp w {
-    variable ::tk::Priv
-    if {$Priv(buttonWindow) eq $w} {
-	set Priv(buttonWindow) ""
-	$w configure -state normal
-
-	# Restore the button's relief if it was cached.
-
-	if {[info exists Priv($w,relief)]} {
-	    if {[info exists Priv($w,prelief)] && \
-		    $Priv($w,prelief) eq [$w cget -relief]} {
-		$w configure -relief $Priv($w,relief)
-	    }
-	    unset -nocomplain Priv($w,relief) Priv($w,prelief)
-	}
-
-	# Clean up the after event from the auto-repeater
-	after cancel $Priv(afterId)
-
-	if {$Priv(window) eq $w && [$w cget -state] ne "disabled"} {
-	    # Only invoke the command if it wasn't already invoked by the
-	    # auto-repeater functionality
-	    if { $Priv(repeated) == 0 } {
-		uplevel #0 [list $w invoke]
-	    }
-	}
-    }
-}
-
-}
-
-##################
-# Shared routines
-##################
-
-# ::tk::ButtonInvoke --
-# The procedure below is called when a button is invoked through
-# the keyboard.  It simulate a press of the button via the mouse.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::ButtonInvoke w {
-    if {[winfo exists $w] && [$w cget -state] ne "disabled"} {
-	set oldRelief [$w cget -relief]
-	set oldState [$w cget -state]
-	$w configure -state active -relief sunken
-	after 100 [list ::tk::ButtonInvokeEnd $w $oldState $oldRelief]
-    }
-}
-
-# ::tk::ButtonInvokeEnd --
-# The procedure below is called after a button is invoked through
-# the keyboard.  It simulate a release of the button via the mouse.
-#
-# Arguments:
-# w -         The name of the widget.
-# oldState -  Old state to be set back.
-# oldRelief - Old relief to be set back.
-
-proc ::tk::ButtonInvokeEnd {w oldState oldRelief} {
-    if {[winfo exists $w]} {
-	$w configure -state $oldState -relief $oldRelief
-	uplevel #0 [list $w invoke]
-    }
-}
-
-# ::tk::ButtonAutoInvoke --
-#
-#	Invoke an auto-repeating button, and set it up to continue to repeat.
-#
-# Arguments:
-#	w	button to invoke.
-#
-# Results:
-#	None.
-#
-# Side effects:
-#	May create an after event to call ::tk::ButtonAutoInvoke.
-
-proc ::tk::ButtonAutoInvoke {w} {
-    variable ::tk::Priv
-    after cancel $Priv(afterId)
-    set delay [$w cget -repeatinterval]
-    if {$Priv(window) eq $w} {
-	incr Priv(repeated)
-	uplevel #0 [list $w invoke]
-    }
-    if {$delay > 0} {
-	set Priv(afterId) [after $delay [list tk::ButtonAutoInvoke $w]]
-    }
-}
-
-# ::tk::CheckRadioInvoke --
-# The procedure below is invoked when the mouse button is pressed in
-# a checkbutton or radiobutton widget, or when the widget is invoked
-# through the keyboard.  It invokes the widget if it
-# isn't disabled.
-#
-# Arguments:
-# w -		The name of the widget.
-# cmd -		The subcommand to invoke (one of invoke, select, or deselect).
-
-proc ::tk::CheckRadioInvoke {w {cmd invoke}} {
-    if {[$w cget -state] ne "disabled"} {
-	uplevel #0 [list $w $cmd]
-    }
-}
-
-# Special versions of the handlers for checkbuttons on Unix that do the magic
-# to make things work right when the checkbutton indicator is hidden;
-# radiobuttons don't need this complexity.
-
-# ::tk::CheckInvoke --
-# The procedure below invokes the checkbutton, like ButtonInvoke, but handles
-# what to do when the checkbutton indicator is missing. Only used on Unix.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::CheckInvoke {w} {
-    variable ::tk::Priv
-    if {[$w cget -state] ne "disabled"} {
-	# Additional logic to switch the "selected" colors around if necessary
-	# (when we're indicator-less).
-
-	if {![$w cget -indicatoron] && [info exist Priv($w,selectcolor)]} {
-	    if {[$w cget -selectcolor] eq $Priv($w,aselectcolor)} {
-		$w configure -selectcolor $Priv($w,selectcolor)
-	    } else {
-		$w configure -selectcolor $Priv($w,aselectcolor)
-	    }
-	}
-	uplevel #0 [list $w invoke]
-    }
-}
-
-# ::tk::CheckEnter --
-# The procedure below enters the checkbutton, like ButtonEnter, but handles
-# what to do when the checkbutton indicator is missing. Only used on Unix.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::CheckEnter {w} {
-    variable ::tk::Priv
-    if {[$w cget -state] ne "disabled"} {
-	# On unix the state is active just with mouse-over
-	$w configure -state active
-
-	# If the mouse button is down, set the relief to sunken on entry.
-	# Overwise, if there's an -overrelief value, set the relief to that.
-
-	set Priv($w,relief) [$w cget -relief]
-	if {$Priv(buttonWindow) eq $w} {
-	    $w configure -relief sunken
-	    set Priv($w,prelief) sunken
-	} elseif {[set over [$w cget -overrelief]] ne ""} {
-	    $w configure -relief $over
-	    set Priv($w,prelief) $over
-	}
-
-	# Compute what the "selected and active" color should be.
-
-	if {![$w cget -indicatoron] && [$w cget -selectcolor] ne ""} {
-	    set Priv($w,selectcolor) [$w cget -selectcolor]
-	    lassign [winfo rgb $w [$w cget -selectcolor]]      r1 g1 b1
-	    lassign [winfo rgb $w [$w cget -activebackground]] r2 g2 b2
-	    set Priv($w,aselectcolor) \
-		[format "#%04x%04x%04x" [expr {($r1+$r2)/2}] \
-		     [expr {($g1+$g2)/2}] [expr {($b1+$b2)/2}]]
-	    # use uplevel to work with other var resolvers
-	    if {[uplevel #0 [list set [$w cget -variable]]]
-		 eq [$w cget -onvalue]} {
-		$w configure -selectcolor $Priv($w,aselectcolor)
-	    }
-	}
-    }
-    set Priv(window) $w
-}
-
-# ::tk::CheckLeave --
-# The procedure below leaves the checkbutton, like ButtonLeave, but handles
-# what to do when the checkbutton indicator is missing. Only used on Unix.
-#
-# Arguments:
-# w -		The name of the widget.
-
-proc ::tk::CheckLeave {w} {
-    variable ::tk::Priv
-    if {[$w cget -state] ne "disabled"} {
-	$w configure -state normal
-    }
-
-    # Restore the original button "selected" color; assume that the user
-    # wasn't monkeying around with things too much.
-
-    if {![$w cget -indicatoron] && [info exist Priv($w,selectcolor)]} {
-	$w configure -selectcolor $Priv($w,selectcolor)
-    }
-    unset -nocomplain Priv($w,selectcolor) Priv($w,aselectcolor)
-
-    # Restore the original button relief if it was changed by Tk. That is
-    # signaled by the existence of Priv($w,prelief).
-
-    if {[info exists Priv($w,relief)]} {
-	if {[info exists Priv($w,prelief)] && \
-		$Priv($w,prelief) eq [$w cget -relief]} {
-	    $w configure -relief $Priv($w,relief)
-	}
-	unset -nocomplain Priv($w,relief) Priv($w,prelief)
-    }
-
-    set Priv(window) ""
-}
-
-return
-
-# Local Variables:
-# mode: tcl
-# fill-column: 78
-# End:
diff --git a/tk8.6/library/choosedir.tcl b/tk8.6/library/choosedir.tcl
deleted file mode 100644
index 68dd9b0..0000000
--- a/tk8.6/library/choosedir.tcl
+++ /dev/null
@@ -1,308 +0,0 @@
-# choosedir.tcl --
-#
-#	Choose directory dialog implementation for Unix/Mac.
-#
-# Copyright (c) 1998-2000 by Scriptics Corporation.
-# All rights reserved.
-
-# Make sure the tk::dialog namespace, in which all dialogs should live, exists
-namespace eval ::tk::dialog {}
-namespace eval ::tk::dialog::file {}
-
-# Make the chooseDir namespace inside the dialog namespace
-namespace eval ::tk::dialog::file::chooseDir {
-    namespace import -force ::tk::msgcat::*
-}
-
-# ::tk::dialog::file::chooseDir:: --
-#
-#	Implements the TK directory selection dialog.
-#
-# Arguments:
-#	args		Options parsed by the procedure.
-#
-proc ::tk::dialog::file::chooseDir:: {args} {
-    variable ::tk::Priv
-    set dataName __tk_choosedir
-    upvar ::tk::dialog::file::$dataName data
-    Config $dataName $args
-
-    if {$data(-parent) eq "."} {
-        set w .$dataName
-    } else {
-        set w $data(-parent).$dataName
-    }
-
-    # (re)create the dialog box if necessary
-    #
-    if {![winfo exists $w]} {
-	::tk::dialog::file::Create $w TkChooseDir
-    } elseif {[winfo class $w] ne "TkChooseDir"} {
-	destroy $w
-	::tk::dialog::file::Create $w TkChooseDir
-    } else {
-	set data(dirMenuBtn) $w.contents.f1.menu
-	set data(dirMenu) $w.contents.f1.menu.menu
-	set data(upBtn) $w.contents.f1.up
-	set data(icons) $w.contents.icons
-	set data(ent) $w.contents.f2.ent
-	set data(okBtn) $w.contents.f2.ok
-	set data(cancelBtn) $w.contents.f2.cancel
-	set data(hiddenBtn) $w.contents.f2.hidden
-    }
-    if {$::tk::dialog::file::showHiddenBtn} {
-	$data(hiddenBtn) configure -state normal
-	grid $data(hiddenBtn)
-    } else {
-	$data(hiddenBtn) configure -state disabled
-	grid remove $data(hiddenBtn)
-    }
-
-    # When using -mustexist, manage the OK button state for validity
-    $data(okBtn) configure -state normal
-    if {$data(-mustexist)} {
-	$data(ent) configure -validate key \
-	    -validatecommand [list ::tk::dialog::file::chooseDir::IsOK? $w %P]
-    } else {
-	$data(ent) configure -validate none
-    }
-
-    # Dialog boxes should be transient with respect to their parent,
-    # so that they will always stay on top of their parent window.  However,
-    # some window managers will create the window as withdrawn if the parent
-    # window is withdrawn or iconified.  Combined with the grab we put on the
-    # window, this can hang the entire application.  Therefore we only make
-    # the dialog transient if the parent is viewable.
-
-    if {[winfo viewable [winfo toplevel $data(-parent)]] } {
-	wm transient $w $data(-parent)
-    }
-
-    trace add variable data(selectPath) write \
-	    [list ::tk::dialog::file::SetPath $w]
-    $data(dirMenuBtn) configure \
-	    -textvariable ::tk::dialog::file::${dataName}(selectPath)
-
-    set data(filter) "*"
-    set data(previousEntryText) ""
-    ::tk::dialog::file::UpdateWhenIdle $w
-
-    # Withdraw the window, then update all the geometry information
-    # so we know how big it wants to be, then center the window in the
-    # display (Motif style) and de-iconify it.
-
-    ::tk::PlaceWindow $w widget $data(-parent)
-    wm title $w $data(-title)
-
-    # Set a grab and claim the focus too.
-
-    ::tk::SetFocusGrab $w $data(ent)
-    $data(ent) delete 0 end
-    $data(ent) insert 0 $data(selectPath)
-    $data(ent) selection range 0 end
-    $data(ent) icursor end
-
-    # Wait for the user to respond, then restore the focus and
-    # return the index of the selected button.  Restore the focus
-    # before deleting the window, since otherwise the window manager
-    # may take the focus away so we can't redirect it.  Finally,
-    # restore any grab that was in effect.
-
-    vwait ::tk::Priv(selectFilePath)
-
-    ::tk::RestoreFocusGrab $w $data(ent) withdraw
-
-    # Cleanup traces on selectPath variable
-    #
-
-    foreach trace [trace info variable data(selectPath)] {
-	trace remove variable data(selectPath) [lindex $trace 0] [lindex $trace 1]
-    }
-    $data(dirMenuBtn) configure -textvariable {}
-
-    # Return value to user
-    #
-
-    return $Priv(selectFilePath)
-}
-
-# ::tk::dialog::file::chooseDir::Config --
-#
-#	Configures the Tk choosedir dialog according to the argument list
-#
-proc ::tk::dialog::file::chooseDir::Config {dataName argList} {
-    upvar ::tk::dialog::file::$dataName data
-
-    # 0: Delete all variable that were set on data(selectPath) the
-    # last time the file dialog is used. The traces may cause troubles
-    # if the dialog is now used with a different -parent option.
-    #
-    foreach trace [trace info variable data(selectPath)] {
-	trace remove variable data(selectPath) [lindex $trace 0] [lindex $trace 1]
-    }
-
-    # 1: the configuration specs
-    #
-    set specs {
-	{-mustexist "" "" 0}
-	{-initialdir "" "" ""}
-	{-parent "" "" "."}
-	{-title "" "" ""}
-    }
-
-    # 2: default values depending on the type of the dialog
-    #
-    if {![info exists data(selectPath)]} {
-	# first time the dialog has been popped up
-	set data(selectPath) [pwd]
-    }
-
-    # 3: parse the arguments
-    #
-    tclParseConfigSpec ::tk::dialog::file::$dataName $specs "" $argList
-
-    if {$data(-title) eq ""} {
-	set data(-title) "[mc "Choose Directory"]"
-    }
-
-    # Stub out the -multiple value for the dialog; it doesn't make sense for
-    # choose directory dialogs, but we have to have something there because we
-    # share so much code with the file dialogs.
-    set data(-multiple) 0
-
-    # 4: set the default directory and selection according to the -initial
-    #    settings
-    #
-    if {$data(-initialdir) ne ""} {
-	# Ensure that initialdir is an absolute path name.
-	if {[file isdirectory $data(-initialdir)]} {
-	    set old [pwd]
-	    cd $data(-initialdir)
-	    set data(selectPath) [pwd]
-	    cd $old
-	} else {
-	    set data(selectPath) [pwd]
-	}
-    }
-
-    if {![winfo exists $data(-parent)]} {
-	return -code error -errorcode [list TK LOOKUP WINDOW $data(-parent)] \
-	    "bad window path name \"$data(-parent)\""
-    }
-}
-
-# Gets called when user presses Return in the "Selection" entry or presses OK.
-#
-proc ::tk::dialog::file::chooseDir::OkCmd {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    # This is the brains behind selecting non-existant directories.  Here's
-    # the flowchart:
-    # 1.  If the icon list has a selection, join it with the current dir,
-    #     and return that value.
-    # 1a.  If the icon list does not have a selection ...
-    # 2.  If the entry is empty, do nothing.
-    # 3.  If the entry contains an invalid directory, then...
-    # 3a.   If the value is the same as last time through here, end dialog.
-    # 3b.   If the value is different than last time, save it and return.
-    # 4.  If entry contains a valid directory, then...
-    # 4a.   If the value is the same as the current directory, end dialog.
-    # 4b.   If the value is different from the current directory, change to
-    #       that directory.
-
-    set selection [$data(icons) selection get]
-    if {[llength $selection] != 0} {
-	set iconText [$data(icons) get [lindex $selection 0]]
-	set iconText [file join $data(selectPath) $iconText]
-	Done $w $iconText
-    } else {
-	set text [$data(ent) get]
-	if {$text eq ""} {
-	    return
-	}
-	set text [file join {*}[file split [string trim $text]]]
-	if {![file exists $text] || ![file isdirectory $text]} {
-	    # Entry contains an invalid directory.  If it's the same as the
-	    # last time they came through here, reset the saved value and end
-	    # the dialog.  Otherwise, save the value (so we can do this test
-	    # next time).
-	    if {$text eq $data(previousEntryText)} {
-		set data(previousEntryText) ""
-		Done $w $text
-	    } else {
-		set data(previousEntryText) $text
-	    }
-	} else {
-	    # Entry contains a valid directory.  If it is the same as the
-	    # current directory, end the dialog.  Otherwise, change to that
-	    # directory.
-	    if {$text eq $data(selectPath)} {
-		Done $w $text
-	    } else {
-		set data(selectPath) $text
-	    }
-	}
-    }
-    return
-}
-
-# Change state of OK button to match -mustexist correctness of entry
-#
-proc ::tk::dialog::file::chooseDir::IsOK? {w text} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    set ok [file isdirectory $text]
-    $data(okBtn) configure -state [expr {$ok ? "normal" : "disabled"}]
-
-    # always return 1
-    return 1
-}
-
-proc ::tk::dialog::file::chooseDir::DblClick {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-    set selection [$data(icons) selection get]
-    if {[llength $selection] != 0} {
-	set filenameFragment [$data(icons) get [lindex $selection 0]]
-	set file $data(selectPath)
-	if {[file isdirectory $file]} {
-	    ::tk::dialog::file::ListInvoke $w [list $filenameFragment]
-	    return
-	}
-    }
-}
-
-# Gets called when user browses the IconList widget (dragging mouse, arrow
-# keys, etc)
-#
-proc ::tk::dialog::file::chooseDir::ListBrowse {w text} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    if {$text eq ""} {
-	return
-    }
-
-    set file [::tk::dialog::file::JoinFile $data(selectPath) $text]
-    $data(ent) delete 0 end
-    $data(ent) insert 0 $file
-}
-
-# ::tk::dialog::file::chooseDir::Done --
-#
-#	Gets called when user has input a valid filename.  Pops up a
-#	dialog box to confirm selection when necessary. Sets the
-#	Priv(selectFilePath) variable, which will break the "vwait"
-#	loop in tk_chooseDirectory and return the selected filename to the
-#	script that calls tk_getOpenFile or tk_getSaveFile
-#
-proc ::tk::dialog::file::chooseDir::Done {w {selectFilePath ""}} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-    variable ::tk::Priv
-
-    if {$selectFilePath eq ""} {
-	set selectFilePath $data(selectPath)
-    }
-    if {$data(-mustexist) && ![file isdirectory $selectFilePath]} {
-	return
-    }
-    set Priv(selectFilePath) $selectFilePath
-}
diff --git a/tk8.6/library/clrpick.tcl b/tk8.6/library/clrpick.tcl
deleted file mode 100644
index 600be16..0000000
--- a/tk8.6/library/clrpick.tcl
+++ /dev/null
@@ -1,695 +0,0 @@
-# clrpick.tcl --
-#
-#	Color selection dialog for platforms that do not support a
-#	standard color selection dialog.
-#
-# Copyright (c) 1996 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# ToDo:
-#
-#	(1): Find out how many free colors are left in the colormap and
-#	     don't allocate too many colors.
-#	(2): Implement HSV color selection.
-#
-
-# Make sure namespaces exist
-namespace eval ::tk {}
-namespace eval ::tk::dialog {}
-namespace eval ::tk::dialog::color {
-    namespace import ::tk::msgcat::*
-}
-
-# ::tk::dialog::color:: --
-#
-#	Create a color dialog and let the user choose a color. This function
-#	should not be called directly. It is called by the tk_chooseColor
-#	function when a native color selector widget does not exist
-#
-proc ::tk::dialog::color:: {args} {
-    variable ::tk::Priv
-    set dataName __tk__color
-    upvar ::tk::dialog::color::$dataName data
-    set w .$dataName
-
-    # The lines variables track the start and end indices of the line
-    # elements in the colorbar canvases.
-    set data(lines,red,start)   0
-    set data(lines,red,last)   -1
-    set data(lines,green,start) 0
-    set data(lines,green,last) -1
-    set data(lines,blue,start)  0
-    set data(lines,blue,last)  -1
-
-    # This is the actual number of lines that are drawn in each color strip.
-    # Note that the bars may be of any width.
-    # However, NUM_COLORBARS must be a number that evenly divides 256.
-    # Such as 256, 128, 64, etc.
-    set data(NUM_COLORBARS) 16
-
-    # BARS_WIDTH is the number of pixels wide the color bar portion of the
-    # canvas is. This number must be a multiple of NUM_COLORBARS
-    set data(BARS_WIDTH) 160
-
-    # PLGN_WIDTH is the number of pixels wide of the triangular selection
-    # polygon. This also results in the definition of the padding on the
-    # left and right sides which is half of PLGN_WIDTH. Make this number even.
-    set data(PLGN_HEIGHT) 10
-
-    # PLGN_HEIGHT is the height of the selection polygon and the height of the
-    # selection rectangle at the bottom of the color bar. No restrictions.
-    set data(PLGN_WIDTH) 10
-
-    Config $dataName $args
-    InitValues $dataName
-
-    set sc [winfo screen $data(-parent)]
-    set winExists [winfo exists $w]
-    if {!$winExists || $sc ne [winfo screen $w]} {
-	if {$winExists} {
-	    destroy $w
-	}
-	toplevel $w -class TkColorDialog -screen $sc
-	if {[tk windowingsystem] eq "x11"} {wm attributes $w -type dialog}
-	BuildDialog $w
-    }
-
-    # Dialog boxes should be transient with respect to their parent,
-    # so that they will always stay on top of their parent window.  However,
-    # some window managers will create the window as withdrawn if the parent
-    # window is withdrawn or iconified.  Combined with the grab we put on the
-    # window, this can hang the entire application.  Therefore we only make
-    # the dialog transient if the parent is viewable.
-
-    if {[winfo viewable [winfo toplevel $data(-parent)]] } {
-	wm transient $w $data(-parent)
-    }
-
-    # 5. Withdraw the window, then update all the geometry information
-    # so we know how big it wants to be, then center the window in the
-    # display (Motif style) and de-iconify it.
-
-    ::tk::PlaceWindow $w widget $data(-parent)
-    wm title $w $data(-title)
-
-    # 6. Set a grab and claim the focus too.
-
-    ::tk::SetFocusGrab $w $data(okBtn)
-
-    # 7. Wait for the user to respond, then restore the focus and
-    # return the index of the selected button.  Restore the focus
-    # before deleting the window, since otherwise the window manager
-    # may take the focus away so we can't redirect it.  Finally,
-    # restore any grab that was in effect.
-
-    vwait ::tk::Priv(selectColor)
-    set result $Priv(selectColor)
-    ::tk::RestoreFocusGrab $w $data(okBtn)
-    unset data
-
-    return $result
-}
-
-# ::tk::dialog::color::InitValues --
-#
-#	Get called during initialization or when user resets NUM_COLORBARS
-#
-proc ::tk::dialog::color::InitValues {dataName} {
-    upvar ::tk::dialog::color::$dataName data
-
-    # IntensityIncr is the difference in color intensity between a colorbar
-    # and its neighbors.
-    set data(intensityIncr) [expr {256 / $data(NUM_COLORBARS)}]
-
-    # ColorbarWidth is the width of each colorbar
-    set data(colorbarWidth) [expr {$data(BARS_WIDTH) / $data(NUM_COLORBARS)}]
-
-    # Indent is the width of the space at the left and right side of the
-    # colorbar. It is always half the selector polygon width, because the
-    # polygon extends into the space.
-    set data(indent) [expr {$data(PLGN_WIDTH) / 2}]
-
-    set data(colorPad) 2
-    set data(selPad)   [expr {$data(PLGN_WIDTH) / 2}]
-
-    #
-    # minX is the x coordinate of the first colorbar
-    #
-    set data(minX) $data(indent)
-
-    #
-    # maxX is the x coordinate of the last colorbar
-    #
-    set data(maxX) [expr {$data(BARS_WIDTH) + $data(indent)-1}]
-
-    #
-    # canvasWidth is the width of the entire canvas, including the indents
-    #
-    set data(canvasWidth) [expr {$data(BARS_WIDTH) + $data(PLGN_WIDTH)}]
-
-    # Set the initial color, specified by -initialcolor, or the
-    # color chosen by the user the last time.
-    set data(selection) $data(-initialcolor)
-    set data(finalColor)  $data(-initialcolor)
-    set rgb [winfo rgb . $data(selection)]
-
-    set data(red,intensity)   [expr {[lindex $rgb 0]/0x100}]
-    set data(green,intensity) [expr {[lindex $rgb 1]/0x100}]
-    set data(blue,intensity)  [expr {[lindex $rgb 2]/0x100}]
-}
-
-# ::tk::dialog::color::Config  --
-#
-#	Parses the command line arguments to tk_chooseColor
-#
-proc ::tk::dialog::color::Config {dataName argList} {
-    variable ::tk::Priv
-    upvar ::tk::dialog::color::$dataName data
-
-    # 1: the configuration specs
-    #
-    if {[info exists Priv(selectColor)] && $Priv(selectColor) ne ""} {
-	set defaultColor $Priv(selectColor)
-    } else {
-	set defaultColor [. cget -background]
-    }
-
-    set specs [list \
-	    [list -initialcolor "" "" $defaultColor] \
-	    [list -parent "" "" "."] \
-	    [list -title "" "" [mc "Color"]] \
-	    ]
-
-    # 2: parse the arguments
-    #
-    tclParseConfigSpec ::tk::dialog::color::$dataName $specs "" $argList
-
-    if {$data(-title) eq ""} {
-	set data(-title) " "
-    }
-    if {[catch {winfo rgb . $data(-initialcolor)} err]} {
-	return -code error -errorcode [list TK LOOKUP COLOR $data(-initialcolor)] \
-	    $err
-    }
-
-    if {![winfo exists $data(-parent)]} {
-	return -code error -errorcode [list TK LOOKUP WINDOW $data(-parent)] \
-	    "bad window path name \"$data(-parent)\""
-    }
-}
-
-# ::tk::dialog::color::BuildDialog --
-#
-#	Build the dialog.
-#
-proc ::tk::dialog::color::BuildDialog {w} {
-    upvar ::tk::dialog::color::[winfo name $w] data
-
-    # TopFrame contains the color strips and the color selection
-    #
-    set topFrame [frame $w.top -relief raised -bd 1]
-
-    # StripsFrame contains the colorstrips and the individual RGB entries
-    set stripsFrame [frame $topFrame.colorStrip]
-
-    set maxWidth [::tk::mcmaxamp &Red &Green &Blue]
-    set maxWidth [expr {$maxWidth<6 ? 6 : $maxWidth}]
-    set colorList {
-	red   "&Red"
-	green "&Green"
-	blue  "&Blue"
-    }
-    foreach {color l} $colorList {
-	# each f frame contains an [R|G|B] entry and the equiv. color strip.
-	set f [frame $stripsFrame.$color]
-
-	# The box frame contains the label and entry widget for an [R|G|B]
-	set box [frame $f.box]
-
-	::tk::AmpWidget label $box.label -text "[mc $l]:" \
-		-width $maxWidth -anchor ne
-	bind $box.label <<AltUnderlined>> [list focus $box.entry]
-
-	entry $box.entry -textvariable \
-		::tk::dialog::color::[winfo name $w]($color,intensity) \
-		-width 4
-	pack $box.label -side left -fill y -padx 2 -pady 3
-	pack $box.entry -side left -anchor n -pady 0
-	pack $box -side left -fill both
-
-	set height [expr {
-	    [winfo reqheight $box.entry] -
-	    2*([$box.entry cget -highlightthickness] + [$box.entry cget -bd])
-	}]
-
-	canvas $f.color -height $height \
-		-width $data(BARS_WIDTH) -relief sunken -bd 2
-	canvas $f.sel -height $data(PLGN_HEIGHT) \
-		-width $data(canvasWidth) -highlightthickness 0
-	pack $f.color -expand yes -fill both
-	pack $f.sel -expand yes -fill both
-
-	pack $f -side top -fill x -padx 0 -pady 2
-
-	set data($color,entry) $box.entry
-	set data($color,col) $f.color
-	set data($color,sel) $f.sel
-
-	bind $data($color,col) <Configure> \
-		[list tk::dialog::color::DrawColorScale $w $color 1]
-	bind $data($color,col) <Enter> \
-		[list tk::dialog::color::EnterColorBar $w $color]
-	bind $data($color,col) <Leave> \
-		[list tk::dialog::color::LeaveColorBar $w $color]
-
-	bind $data($color,sel) <Enter> \
-		[list tk::dialog::color::EnterColorBar $w $color]
-	bind $data($color,sel) <Leave> \
-		[list tk::dialog::color::LeaveColorBar $w $color]
-
-	bind $box.entry <Return> [list tk::dialog::color::HandleRGBEntry $w]
-    }
-
-    pack $stripsFrame -side left -fill both -padx 4 -pady 10
-
-    # The selFrame contains a frame that demonstrates the currently
-    # selected color
-    #
-    set selFrame [frame $topFrame.sel]
-    set lab [::tk::AmpWidget label $selFrame.lab \
-	    -text [mc "&Selection:"] -anchor sw]
-    set ent [entry $selFrame.ent \
-	    -textvariable ::tk::dialog::color::[winfo name $w](selection) \
-	    -width 16]
-    set f1  [frame $selFrame.f1 -relief sunken -bd 2]
-    set data(finalCanvas) [frame $f1.demo -bd 0 -width 100 -height 70]
-
-    pack $lab $ent -side top -fill x -padx 4 -pady 2
-    pack $f1 -expand yes -anchor nw -fill both -padx 6 -pady 10
-    pack $data(finalCanvas) -expand yes -fill both
-
-    bind $ent <Return> [list tk::dialog::color::HandleSelEntry $w]
-
-    pack $selFrame -side left -fill none -anchor nw
-    pack $topFrame -side top -expand yes -fill both -anchor nw
-
-    # the botFrame frame contains the buttons
-    #
-    set botFrame [frame $w.bot -relief raised -bd 1]
-
-    ::tk::AmpWidget button $botFrame.ok     -text [mc "&OK"]		\
-	    -command [list tk::dialog::color::OkCmd $w]
-    ::tk::AmpWidget button $botFrame.cancel -text [mc "&Cancel"]	\
-	    -command [list tk::dialog::color::CancelCmd $w]
-
-    set data(okBtn)      $botFrame.ok
-    set data(cancelBtn)  $botFrame.cancel
-
-    grid x $botFrame.ok x $botFrame.cancel x -sticky ew
-    grid configure $botFrame.ok $botFrame.cancel -padx 10 -pady 10
-    grid columnconfigure $botFrame {0 4} -weight 1 -uniform space
-    grid columnconfigure $botFrame {1 3} -weight 1 -uniform button
-    grid columnconfigure $botFrame 2 -weight 2 -uniform space
-    pack $botFrame -side bottom -fill x
-
-    # Accelerator bindings
-    bind $lab <<AltUnderlined>> [list focus $ent]
-    bind $w <KeyPress-Escape> [list tk::ButtonInvoke $data(cancelBtn)]
-    bind $w <Alt-Key> [list tk::AltKeyInDialog $w %A]
-
-    wm protocol $w WM_DELETE_WINDOW [list tk::dialog::color::CancelCmd $w]
-    bind $lab <Destroy> [list tk::dialog::color::CancelCmd $w]
-}
-
-# ::tk::dialog::color::SetRGBValue --
-#
-#	Sets the current selection of the dialog box
-#
-proc ::tk::dialog::color::SetRGBValue {w color} {
-    upvar ::tk::dialog::color::[winfo name $w] data
-
-    set data(red,intensity)   [lindex $color 0]
-    set data(green,intensity) [lindex $color 1]
-    set data(blue,intensity)  [lindex $color 2]
-
-    RedrawColorBars $w all
-
-    # Now compute the new x value of each colorbars pointer polygon
-    foreach color {red green blue} {
-	set x [RgbToX $w $data($color,intensity)]
-	MoveSelector $w $data($color,sel) $color $x 0
-    }
-}
-
-# ::tk::dialog::color::XToRgb --
-#
-#	Converts a screen coordinate to intensity
-#
-proc ::tk::dialog::color::XToRgb {w x} {
-    upvar ::tk::dialog::color::[winfo name $w] data
-
-    set x [expr {($x * $data(intensityIncr))/ $data(colorbarWidth)}]
-    if {$x > 255} {
-	set x 255
-    }
-    return $x
-}
-
-# ::tk::dialog::color::RgbToX
-#
-#	Converts an intensity to screen coordinate.
-#
-proc ::tk::dialog::color::RgbToX {w color} {
-    upvar ::tk::dialog::color::[winfo name $w] data
-
-    return [expr {($color * $data(colorbarWidth)/ $data(intensityIncr))}]
-}
-
-# ::tk::dialog::color::DrawColorScale --
-#
-#	Draw color scale is called whenever the size of one of the color
-#	scale canvases is changed.
-#
-proc ::tk::dialog::color::DrawColorScale {w c {create 0}} {
-    upvar ::tk::dialog::color::[winfo name $w] data
-
-    # col: color bar canvas
-    # sel: selector canvas
-    set col $data($c,col)
-    set sel $data($c,sel)
-
-    # First handle the case that we are creating everything for the first time.
-    if {$create} {
-	# First remove all the lines that already exist.
-	if { $data(lines,$c,last) > $data(lines,$c,start)} {
-	    for {set i $data(lines,$c,start)} \
-		    {$i <= $data(lines,$c,last)} {incr i} {
-		$sel delete $i
-	    }
-	}
-	# Delete the selector if it exists
-	if {[info exists data($c,index)]} {
-	    $sel delete $data($c,index)
-	}
-
-	# Draw the selection polygons
-	CreateSelector $w $sel $c
-	$sel bind $data($c,index) <ButtonPress-1> \
-		[list tk::dialog::color::StartMove $w $sel $c %x $data(selPad) 1]
-	$sel bind $data($c,index) <B1-Motion> \
-		[list tk::dialog::color::MoveSelector $w $sel $c %x $data(selPad)]
-	$sel bind $data($c,index) <ButtonRelease-1> \
-		[list tk::dialog::color::ReleaseMouse $w $sel $c %x $data(selPad)]
-
-	set height [winfo height $col]
-	# Create an invisible region under the colorstrip to catch mouse clicks
-	# that aren't on the selector.
-	set data($c,clickRegion) [$sel create rectangle 0 0 \
-		$data(canvasWidth) $height -fill {} -outline {}]
-
-	bind $col <ButtonPress-1> \
-		[list tk::dialog::color::StartMove $w $sel $c %x $data(colorPad)]
-	bind $col <B1-Motion> \
-		[list tk::dialog::color::MoveSelector $w $sel $c %x $data(colorPad)]
-	bind $col <ButtonRelease-1> \
-		[list tk::dialog::color::ReleaseMouse $w $sel $c %x $data(colorPad)]
-
-	$sel bind $data($c,clickRegion) <ButtonPress-1> \
-		[list tk::dialog::color::StartMove $w $sel $c %x $data(selPad)]
-	$sel bind $data($c,clickRegion) <B1-Motion> \
-		[list tk::dialog::color::MoveSelector $w $sel $c %x $data(selPad)]
-	$sel bind $data($c,clickRegion) <ButtonRelease-1> \
-		[list tk::dialog::color::ReleaseMouse $w $sel $c %x $data(selPad)]
-    } else {
-	# l is the canvas index of the first colorbar.
-	set l $data(lines,$c,start)
-    }
-
-    # Draw the color bars.
-    set highlightW [expr {[$col cget -highlightthickness] + [$col cget -bd]}]
-    for {set i 0} { $i < $data(NUM_COLORBARS)} { incr i} {
-	set intensity [expr {$i * $data(intensityIncr)}]
-	set startx [expr {$i * $data(colorbarWidth) + $highlightW}]
-	if {$c eq "red"} {
-	    set color [format "#%02x%02x%02x" \
-		    $intensity $data(green,intensity) $data(blue,intensity)]
-	} elseif {$c eq "green"} {
-	    set color [format "#%02x%02x%02x" \
-		    $data(red,intensity) $intensity $data(blue,intensity)]
-	} else {
-	    set color [format "#%02x%02x%02x" \
-		    $data(red,intensity) $data(green,intensity) $intensity]
-	}
-
-	if {$create} {
-	    set index [$col create rect $startx $highlightW \
-		    [expr {$startx +$data(colorbarWidth)}] \
-		    [expr {[winfo height $col] + $highlightW}] \
-		    -fill $color -outline $color]
-	} else {
-	    $col itemconfigure $l -fill $color -outline $color
-	    incr l
-	}
-    }
-    $sel raise $data($c,index)
-
-    if {$create} {
-	set data(lines,$c,last) $index
-	set data(lines,$c,start) [expr {$index - $data(NUM_COLORBARS) + 1}]
-    }
-
-    RedrawFinalColor $w
-}
-
-# ::tk::dialog::color::CreateSelector --
-#
-#	Creates and draws the selector polygon at the position
-#	$data($c,intensity).
-#
-proc ::tk::dialog::color::CreateSelector {w sel c } {
-    upvar ::tk::dialog::color::[winfo name $w] data
-    set data($c,index) [$sel create polygon \
-	    0 $data(PLGN_HEIGHT) \
-	    $data(PLGN_WIDTH) $data(PLGN_HEIGHT) \
-	    $data(indent) 0]
-    set data($c,x) [RgbToX $w $data($c,intensity)]
-    $sel move $data($c,index) $data($c,x) 0
-}
-
-# ::tk::dialog::color::RedrawFinalColor
-#
-#	Combines the intensities of the three colors into the final color
-#
-proc ::tk::dialog::color::RedrawFinalColor {w} {
-    upvar ::tk::dialog::color::[winfo name $w] data
-
-    set color [format "#%02x%02x%02x" $data(red,intensity) \
-	    $data(green,intensity) $data(blue,intensity)]
-
-    $data(finalCanvas) configure -bg $color
-    set data(finalColor) $color
-    set data(selection) $color
-    set data(finalRGB) [list \
-	    $data(red,intensity) \
-	    $data(green,intensity) \
-	    $data(blue,intensity)]
-}
-
-# ::tk::dialog::color::RedrawColorBars --
-#
-# Only redraws the colors on the color strips that were not manipulated.
-# Params: color of colorstrip that changed. If color is not [red|green|blue]
-#         Then all colorstrips will be updated
-#
-proc ::tk::dialog::color::RedrawColorBars {w colorChanged} {
-    upvar ::tk::dialog::color::[winfo name $w] data
-
-    switch $colorChanged {
-	red {
-	    DrawColorScale $w green
-	    DrawColorScale $w blue
-	}
-	green {
-	    DrawColorScale $w red
-	    DrawColorScale $w blue
-	}
-	blue {
-	    DrawColorScale $w red
-	    DrawColorScale $w green
-	}
-	default {
-	    DrawColorScale $w red
-	    DrawColorScale $w green
-	    DrawColorScale $w blue
-	}
-    }
-    RedrawFinalColor $w
-}
-
-#----------------------------------------------------------------------
-#			Event handlers
-#----------------------------------------------------------------------
-
-# ::tk::dialog::color::StartMove --
-#
-#	Handles a mousedown button event over the selector polygon.
-#	Adds the bindings for moving the mouse while the button is
-#	pressed.  Sets the binding for the button-release event.
-#
-# Params: sel is the selector canvas window, color is the color of the strip.
-#
-proc ::tk::dialog::color::StartMove {w sel color x delta {dontMove 0}} {
-    upvar ::tk::dialog::color::[winfo name $w] data
-
-    if {!$dontMove} {
-	MoveSelector $w $sel $color $x $delta
-    }
-}
-
-# ::tk::dialog::color::MoveSelector --
-#
-# Moves the polygon selector so that its middle point has the same
-# x value as the specified x. If x is outside the bounds [0,255],
-# the selector is set to the closest endpoint.
-#
-# Params: sel is the selector canvas, c is [red|green|blue]
-#         x is a x-coordinate.
-#
-proc ::tk::dialog::color::MoveSelector {w sel color x delta} {
-    upvar ::tk::dialog::color::[winfo name $w] data
-
-    incr x -$delta
-
-    if { $x < 0 } {
-	set x 0
-    } elseif { $x > $data(BARS_WIDTH)} {
-	set x $data(BARS_WIDTH)
-    }
-    set diff [expr {$x - $data($color,x)}]
-    $sel move $data($color,index) $diff 0
-    set data($color,x) [expr {$data($color,x) + $diff}]
-
-    # Return the x value that it was actually set at
-    return $x
-}
-
-# ::tk::dialog::color::ReleaseMouse
-#
-# Removes mouse tracking bindings, updates the colorbars.
-#
-# Params: sel is the selector canvas, color is the color of the strip,
-#         x is the x-coord of the mouse.
-#
-proc ::tk::dialog::color::ReleaseMouse {w sel color x delta} {
-    upvar ::tk::dialog::color::[winfo name $w] data
-
-    set x [MoveSelector $w $sel $color $x $delta]
-
-    # Determine exactly what color we are looking at.
-    set data($color,intensity) [XToRgb $w $x]
-
-    RedrawColorBars $w $color
-}
-
-# ::tk::dialog::color::ResizeColorbars --
-#
-#	Completely redraws the colorbars, including resizing the
-#	colorstrips
-#
-proc ::tk::dialog::color::ResizeColorBars {w} {
-    upvar ::tk::dialog::color::[winfo name $w] data
-
-    if {
-	($data(BARS_WIDTH) < $data(NUM_COLORBARS)) ||
-	(($data(BARS_WIDTH) % $data(NUM_COLORBARS)) != 0)
-    } then {
-	set data(BARS_WIDTH) $data(NUM_COLORBARS)
-    }
-    InitValues [winfo name $w]
-    foreach color {red green blue} {
-	$data($color,col) configure -width $data(canvasWidth)
-	DrawColorScale $w $color 1
-    }
-}
-
-# ::tk::dialog::color::HandleSelEntry --
-#
-#	Handles the return keypress event in the "Selection:" entry
-#
-proc ::tk::dialog::color::HandleSelEntry {w} {
-    upvar ::tk::dialog::color::[winfo name $w] data
-
-    set text [string trim $data(selection)]
-    # Check to make sure that the color is valid
-    if {[catch {set color [winfo rgb . $text]} ]} {
-	set data(selection) $data(finalColor)
-	return
-    }
-
-    set R [expr {[lindex $color 0]/0x100}]
-    set G [expr {[lindex $color 1]/0x100}]
-    set B [expr {[lindex $color 2]/0x100}]
-
-    SetRGBValue $w "$R $G $B"
-    set data(selection) $text
-}
-
-# ::tk::dialog::color::HandleRGBEntry --
-#
-#	Handles the return keypress event in the R, G or B entry
-#
-proc ::tk::dialog::color::HandleRGBEntry {w} {
-    upvar ::tk::dialog::color::[winfo name $w] data
-
-    foreach c {red green blue} {
-	if {[catch {
-	    set data($c,intensity) [expr {int($data($c,intensity))}]
-	}]} {
-	    set data($c,intensity) 0
-	}
-
-	if {$data($c,intensity) < 0} {
-	    set data($c,intensity) 0
-	}
-	if {$data($c,intensity) > 255} {
-	    set data($c,intensity) 255
-	}
-    }
-
-    SetRGBValue $w "$data(red,intensity) \
-	$data(green,intensity) $data(blue,intensity)"
-}
-
-# mouse cursor enters a color bar
-#
-proc ::tk::dialog::color::EnterColorBar {w color} {
-    upvar ::tk::dialog::color::[winfo name $w] data
-
-    $data($color,sel) itemconfigure $data($color,index) -fill red
-}
-
-# mouse leaves enters a color bar
-#
-proc ::tk::dialog::color::LeaveColorBar {w color} {
-    upvar ::tk::dialog::color::[winfo name $w] data
-
-    $data($color,sel) itemconfigure $data($color,index) -fill black
-}
-
-# user hits OK button
-#
-proc ::tk::dialog::color::OkCmd {w} {
-    variable ::tk::Priv
-    upvar ::tk::dialog::color::[winfo name $w] data
-
-    set Priv(selectColor) $data(finalColor)
-}
-
-# user hits Cancel button or destroys window
-#
-proc ::tk::dialog::color::CancelCmd {w} {
-    variable ::tk::Priv
-    set Priv(selectColor) ""
-}
diff --git a/tk8.6/library/comdlg.tcl b/tk8.6/library/comdlg.tcl
deleted file mode 100644
index 18df8a6..0000000
--- a/tk8.6/library/comdlg.tcl
+++ /dev/null
@@ -1,319 +0,0 @@
-# comdlg.tcl --
-#
-#	Some functions needed for the common dialog boxes. Probably need to go
-#	in a different file.
-#
-# Copyright (c) 1996 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-# tclParseConfigSpec --
-#
-#	Parses a list of "-option value" pairs. If all options and
-#	values are legal, the values are stored in
-#	$data($option). Otherwise an error message is returned. When
-#	an error happens, the data() array may have been partially
-#	modified, but all the modified members of the data(0 array are
-#	guaranteed to have valid values. This is different than
-#	Tk_ConfigureWidget() which does not modify the value of a
-#	widget record if any error occurs.
-#
-# Arguments:
-#
-# w = widget record to modify. Must be the pathname of a widget.
-#
-# specs = {
-#    {-commandlineswitch resourceName ResourceClass defaultValue verifier}
-#    {....}
-# }
-#
-# flags = currently unused.
-#
-# argList = The list of  "-option value" pairs.
-#
-proc tclParseConfigSpec {w specs flags argList} {
-    upvar #0 $w data
-
-    # 1: Put the specs in associative arrays for faster access
-    #
-    foreach spec $specs {
-	if {[llength $spec] < 4} {
-	    return -code error -errorcode {TK VALUE CONFIG_SPEC} \
-		"\"spec\" should contain 5 or 4 elements"
-	}
-	set cmdsw [lindex $spec 0]
-	set cmd($cmdsw) ""
-	set rname($cmdsw)   [lindex $spec 1]
-	set rclass($cmdsw)  [lindex $spec 2]
-	set def($cmdsw)     [lindex $spec 3]
-	set verproc($cmdsw) [lindex $spec 4]
-    }
-
-    if {[llength $argList] & 1} {
-	set cmdsw [lindex $argList end]
-	if {![info exists cmd($cmdsw)]} {
-	    return -code error -errorcode [list TK LOOKUP OPTION $cmdsw] \
-		"bad option \"$cmdsw\": must be [tclListValidFlags cmd]"
-	}
-	return -code error -errorcode {TK VALUE_MISSING} \
-	    "value for \"$cmdsw\" missing"
-    }
-
-    # 2: set the default values
-    #
-    foreach cmdsw [array names cmd] {
-	set data($cmdsw) $def($cmdsw)
-    }
-
-    # 3: parse the argument list
-    #
-    foreach {cmdsw value} $argList {
-	if {![info exists cmd($cmdsw)]} {
-	    return -code error -errorcode [list TK LOOKUP OPTION $cmdsw] \
-		"bad option \"$cmdsw\": must be [tclListValidFlags cmd]"
-	}
-	set data($cmdsw) $value
-    }
-
-    # Done!
-}
-
-proc tclListValidFlags {v} {
-    upvar $v cmd
-
-    set len [llength [array names cmd]]
-    set i 1
-    set separator ""
-    set errormsg ""
-    foreach cmdsw [lsort [array names cmd]] {
-	append errormsg "$separator$cmdsw"
-	incr i
-	if {$i == $len} {
-	    set separator ", or "
-	} else {
-	    set separator ", "
-	}
-    }
-    return $errormsg
-}
-
-#----------------------------------------------------------------------
-#
-#			Focus Group
-#
-# Focus groups are used to handle the user's focusing actions inside a
-# toplevel.
-#
-# One example of using focus groups is: when the user focuses on an
-# entry, the text in the entry is highlighted and the cursor is put to
-# the end of the text. When the user changes focus to another widget,
-# the text in the previously focused entry is validated.
-#
-#----------------------------------------------------------------------
-
-
-# ::tk::FocusGroup_Create --
-#
-#	Create a focus group. All the widgets in a focus group must be
-#	within the same focus toplevel. Each toplevel can have only
-#	one focus group, which is identified by the name of the
-#	toplevel widget.
-#
-proc ::tk::FocusGroup_Create {t} {
-    variable ::tk::Priv
-    if {[winfo toplevel $t] ne $t} {
-	return -code error -errorcode [list TK LOOKUP TOPLEVEL $t] \
-	    "$t is not a toplevel window"
-    }
-    if {![info exists Priv(fg,$t)]} {
-	set Priv(fg,$t) 1
-	set Priv(focus,$t) ""
-	bind $t <FocusIn>  [list tk::FocusGroup_In  $t %W %d]
-	bind $t <FocusOut> [list tk::FocusGroup_Out $t %W %d]
-	bind $t <Destroy>  [list tk::FocusGroup_Destroy $t %W]
-    }
-}
-
-# ::tk::FocusGroup_BindIn --
-#
-# Add a widget into the "FocusIn" list of the focus group. The $cmd will be
-# called when the widget is focused on by the user.
-#
-proc ::tk::FocusGroup_BindIn {t w cmd} {
-    variable FocusIn
-    variable ::tk::Priv
-    if {![info exists Priv(fg,$t)]} {
-	return -code error -errorcode [list TK LOOKUP FOCUS_GROUP $t] \
-	    "focus group \"$t\" doesn't exist"
-    }
-    set FocusIn($t,$w) $cmd
-}
-
-
-# ::tk::FocusGroup_BindOut --
-#
-#	Add a widget into the "FocusOut" list of the focus group. The
-#	$cmd will be called when the widget loses the focus (User
-#	types Tab or click on another widget).
-#
-proc ::tk::FocusGroup_BindOut {t w cmd} {
-    variable FocusOut
-    variable ::tk::Priv
-    if {![info exists Priv(fg,$t)]} {
-	return -code error -errorcode [list TK LOOKUP FOCUS_GROUP $t] \
-	    "focus group \"$t\" doesn't exist"
-    }
-    set FocusOut($t,$w) $cmd
-}
-
-# ::tk::FocusGroup_Destroy --
-#
-#	Cleans up when members of the focus group is deleted, or when the
-#	toplevel itself gets deleted.
-#
-proc ::tk::FocusGroup_Destroy {t w} {
-    variable FocusIn
-    variable FocusOut
-    variable ::tk::Priv
-
-    if {$t eq $w} {
-	unset Priv(fg,$t)
-	unset Priv(focus,$t)
-
-	foreach name [array names FocusIn $t,*] {
-	    unset FocusIn($name)
-	}
-	foreach name [array names FocusOut $t,*] {
-	    unset FocusOut($name)
-	}
-    } else {
-	if {[info exists Priv(focus,$t)] && ($Priv(focus,$t) eq $w)} {
-	    set Priv(focus,$t) ""
-	}
-	unset -nocomplain FocusIn($t,$w) FocusOut($t,$w)
-    }
-}
-
-# ::tk::FocusGroup_In --
-#
-#	Handles the <FocusIn> event. Calls the FocusIn command for the newly
-#	focused widget in the focus group.
-#
-proc ::tk::FocusGroup_In {t w detail} {
-    variable FocusIn
-    variable ::tk::Priv
-
-    if {$detail ne "NotifyNonlinear" && $detail ne "NotifyNonlinearVirtual"} {
-	# This is caused by mouse moving out&in of the window *or*
-	# ordinary keypresses some window managers (ie: CDE [Bug: 2960]).
-	return
-    }
-    if {![info exists FocusIn($t,$w)]} {
-	set FocusIn($t,$w) ""
-	return
-    }
-    if {![info exists Priv(focus,$t)]} {
-	return
-    }
-    if {$Priv(focus,$t) eq $w} {
-	# This is already in focus
-	#
-	return
-    } else {
-	set Priv(focus,$t) $w
-	eval $FocusIn($t,$w)
-    }
-}
-
-# ::tk::FocusGroup_Out --
-#
-#	Handles the <FocusOut> event. Checks if this is really a lose
-#	focus event, not one generated by the mouse moving out of the
-#	toplevel window.  Calls the FocusOut command for the widget
-#	who loses its focus.
-#
-proc ::tk::FocusGroup_Out {t w detail} {
-    variable FocusOut
-    variable ::tk::Priv
-
-    if {$detail ne "NotifyNonlinear" && $detail ne "NotifyNonlinearVirtual"} {
-	# This is caused by mouse moving out of the window
-	return
-    }
-    if {![info exists Priv(focus,$t)]} {
-	return
-    }
-    if {![info exists FocusOut($t,$w)]} {
-	return
-    } else {
-	eval $FocusOut($t,$w)
-	set Priv(focus,$t) ""
-    }
-}
-
-# ::tk::FDGetFileTypes --
-#
-#	Process the string given by the -filetypes option of the file
-#	dialogs. Similar to the C function TkGetFileFilters() on the Mac
-#	and Windows platform.
-#
-proc ::tk::FDGetFileTypes {string} {
-    foreach t $string {
-	if {[llength $t] < 2 || [llength $t] > 3} {
-	    return -code error -errorcode {TK VALUE FILE_TYPE} \
-		"bad file type \"$t\", should be \"typeName {extension ?extensions ...?} ?{macType ?macTypes ...?}?\""
-	}
-	lappend fileTypes([lindex $t 0]) {*}[lindex $t 1]
-    }
-
-    set types {}
-    foreach t $string {
-	set label [lindex $t 0]
-	set exts {}
-
-	if {[info exists hasDoneType($label)]} {
-	    continue
-	}
-
-	# Validate each macType.  This is to agree with the
-	# behaviour of TkGetFileFilters().  This list may be
-	# empty.
-	foreach macType [lindex $t 2] {
-	    if {[string length $macType] != 4} {
-		return -code error -errorcode {TK VALUE MAC_TYPE} \
-		    "bad Macintosh file type \"$macType\""
-	    }
-	}
-
-	set name "$label \("
-	set sep ""
-	set doAppend 1
-	foreach ext $fileTypes($label) {
-	    if {$ext eq ""} {
-		continue
-	    }
-	    regsub {^[.]} $ext "*." ext
-	    if {![info exists hasGotExt($label,$ext)]} {
-		if {$doAppend} {
-		    if {[string length $sep] && [string length $name]>40} {
-			set doAppend 0
-			append name $sep...
-		    } else {
-			append name $sep$ext
-		    }
-		}
-		lappend exts $ext
-		set hasGotExt($label,$ext) 1
-	    }
-	    set sep ","
-	}
-	append name "\)"
-	lappend types [list $name $exts]
-
-	set hasDoneType($label) 1
-    }
-
-    return $types
-}
diff --git a/tk8.6/library/console.tcl b/tk8.6/library/console.tcl
deleted file mode 100644
index ba68ccc..0000000
--- a/tk8.6/library/console.tcl
+++ /dev/null
@@ -1,1148 +0,0 @@
-# console.tcl --
-#
-# This code constructs the console window for an application.  It
-# can be used by non-unix systems that do not have built-in support
-# for shells.
-#
-# Copyright (c) 1995-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-2000 Ajuba Solutions.
-# Copyright (c) 2007-2008 Daniel A. Steffen <das@users.sourceforge.net>
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-# TODO: history - remember partially written command
-
-namespace eval ::tk::console {
-    variable blinkTime   500 ; # msecs to blink braced range for
-    variable blinkRange  1   ; # enable blinking of the entire braced range
-    variable magicKeys   1   ; # enable brace matching and proc/var recognition
-    variable maxLines    600 ; # maximum # of lines buffered in console
-    variable showMatches 1   ; # show multiple expand matches
-    variable useFontchooser [llength [info command ::tk::fontchooser]]
-    variable inPlugin [info exists embed_args]
-    variable defaultPrompt   ; # default prompt if tcl_prompt1 isn't used
-
-    if {$inPlugin} {
-	set defaultPrompt {subst {[history nextid] % }}
-    } else {
-	set defaultPrompt {subst {([file tail [pwd]]) [history nextid] % }}
-    }
-}
-
-# simple compat function for tkcon code added for this console
-interp alias {} EvalAttached {} consoleinterp eval
-
-# ::tk::ConsoleInit --
-# This procedure constructs and configures the console windows.
-#
-# Arguments:
-# 	None.
-
-proc ::tk::ConsoleInit {} {
-    if {![consoleinterp eval {set tcl_interactive}]} {
-	wm withdraw .
-    }
-
-    if {[tk windowingsystem] eq "aqua"} {
-	set mod "Cmd"
-    } else {
-	set mod "Ctrl"
-    }
-
-    if {[catch {menu .menubar} err]} {
-	bgerror "INIT: $err"
-    }
-    AmpMenuArgs .menubar add cascade -label [mc &File] -menu .menubar.file
-    AmpMenuArgs .menubar add cascade -label [mc &Edit] -menu .menubar.edit
-
-    menu .menubar.file -tearoff 0
-    AmpMenuArgs .menubar.file add command -label [mc "&Source..."] \
-	    -command {tk::ConsoleSource}
-    AmpMenuArgs .menubar.file add command -label [mc "&Hide Console"] \
-	    -command {wm withdraw .}
-    AmpMenuArgs .menubar.file add command -label [mc "&Clear Console"] \
-	    -command {.console delete 1.0 "promptEnd linestart"}
-    if {[tk windowingsystem] ne "aqua"} {
-	AmpMenuArgs .menubar.file add command -label [mc E&xit] -command {exit}
-    }
-
-    menu .menubar.edit -tearoff 0
-    AmpMenuArgs	.menubar.edit add command -label [mc Cu&t]   -accel "$mod+X"\
-	    -command {event generate .console <<Cut>>}
-    AmpMenuArgs	.menubar.edit add command -label [mc &Copy]  -accel "$mod+C"\
-	    -command {event generate .console <<Copy>>}
-    AmpMenuArgs	.menubar.edit add command -label [mc P&aste] -accel "$mod+V"\
-	    -command {event generate .console <<Paste>>}
-
-    if {[tk windowingsystem] ne "win32"} {
-	AmpMenuArgs .menubar.edit add command -label [mc Cl&ear] \
-		-command {event generate .console <<Clear>>}
-    } else {
-	AmpMenuArgs .menubar.edit add command -label [mc &Delete] \
-		-command {event generate .console <<Clear>>} -accel "Del"
-
-	AmpMenuArgs .menubar add cascade -label [mc &Help] -menu .menubar.help
-	menu .menubar.help -tearoff 0
-	AmpMenuArgs .menubar.help add command -label [mc &About...] \
-		-command tk::ConsoleAbout
-    }
-
-    AmpMenuArgs .menubar.edit add separator
-    if {$::tk::console::useFontchooser} {
-        if {[tk windowingsystem] eq "aqua"} {
-            .menubar.edit add command -label tk_choose_font_marker
-            set index [.menubar.edit index tk_choose_font_marker]
-            .menubar.edit entryconfigure $index \
-                -label [mc "Show Fonts"]\
-                -accelerator "$mod-T"\
-                -command [list ::tk::console::FontchooserToggle]
-            bind Console <<TkFontchooserVisibility>> \
-                [list ::tk::console::FontchooserVisibility $index]
-	    ::tk::console::FontchooserVisibility $index
-        } else {
-            AmpMenuArgs .menubar.edit add command -label [mc "&Font..."] \
-                -command [list ::tk::console::FontchooserToggle]
-        }
-	bind Console <FocusIn>  [list ::tk::console::FontchooserFocus %W 1]
-	bind Console <FocusOut> [list ::tk::console::FontchooserFocus %W 0]
-    }
-    AmpMenuArgs .menubar.edit add command -label [mc "&Increase Font Size"] \
-        -accel "$mod++" -command {event generate .console <<Console_FontSizeIncr>>}
-    AmpMenuArgs .menubar.edit add command -label [mc "&Decrease Font Size"] \
-        -accel "$mod+-" -command {event generate .console <<Console_FontSizeDecr>>}
-    AmpMenuArgs .menubar.edit add command -label [mc "Fit To Screen Width"] \
-        -command {event generate .console <<Console_FitScreenWidth>>}
-
-    if {[tk windowingsystem] eq "aqua"} {
-	.menubar add cascade -label [mc Window] -menu [menu .menubar.window]
-	.menubar add cascade -label [mc Help] -menu [menu .menubar.help]
-    }
-
-    . configure -menu .menubar
-
-    # See if we can find a better font than the TkFixedFont
-    catch {font create TkConsoleFont {*}[font configure TkFixedFont]}
-    set families [font families]
-    switch -exact -- [tk windowingsystem] {
-        aqua { set preferred {Monaco 10} }
-        win32 { set preferred {ProFontWindows 8 Consolas 8} }
-        default { set preferred {} }
-    }
-    foreach {family size} $preferred {
-        if {[lsearch -exact $families $family] != -1} {
-            font configure TkConsoleFont -family $family -size $size
-            break
-        }
-    }
-
-    # Provide the right border for the text widget (platform dependent).
-    ::ttk::style layout ConsoleFrame {
-        Entry.field -sticky news -border 1 -children {
-            ConsoleFrame.padding -sticky news
-        }
-    }
-    ::ttk::frame .consoleframe -style ConsoleFrame
-
-    set con [text .console -yscrollcommand [list .sb set] -setgrid true \
-                 -borderwidth 0 -highlightthickness 0 -font TkConsoleFont]
-    if {[tk windowingsystem] eq "aqua"} {
-        scrollbar .sb -command [list $con yview]
-    } else {
-        ::ttk::scrollbar .sb -command [list $con yview]
-    }
-    pack .sb  -in .consoleframe -fill both -side right -padx 1 -pady 1
-    pack $con -in .consoleframe -fill both -expand 1 -side left -padx 1 -pady 1
-    pack .consoleframe -fill both -expand 1 -side left
-
-    ConsoleBind $con
-
-    $con tag configure stderr	-foreground red
-    $con tag configure stdin	-foreground blue
-    $con tag configure prompt	-foreground \#8F4433
-    $con tag configure proc	-foreground \#008800
-    $con tag configure var	-background \#FFC0D0
-    $con tag raise sel
-    $con tag configure blink	-background \#FFFF00
-    $con tag configure find	-background \#FFFF00
-
-    focus $con
-
-    # Avoid listing this console in [winfo interps]
-    if {[info command ::send] eq "::send"} {rename ::send {}}
-
-    wm protocol . WM_DELETE_WINDOW { wm withdraw . }
-    wm title . [mc "Console"]
-    flush stdout
-    $con mark set output [$con index "end - 1 char"]
-    tk::TextSetCursor $con end
-    $con mark set promptEnd insert
-    $con mark gravity promptEnd left
-
-    # A variant of ConsolePrompt to avoid a 'puts' call
-    set w $con
-    set temp [$w index "end - 1 char"]
-    $w mark set output end
-    if {![consoleinterp eval "info exists tcl_prompt1"]} {
-	set string [EvalAttached $::tk::console::defaultPrompt]
-	$w insert output $string stdout
-    }
-    $w mark set output $temp
-    ::tk::TextSetCursor $w end
-    $w mark set promptEnd insert
-    $w mark gravity promptEnd left
-
-    if {[tk windowingsystem] ne "aqua"} {
-	# Subtle work-around to erase the '% ' that tclMain.c prints out
-	after idle [subst -nocommand {
-	    if {[$con get 1.0 output] eq "% "} { $con delete 1.0 output }
-	}]
-    }
-}
-
-# ::tk::ConsoleSource --
-#
-# Prompts the user for a file to source in the main interpreter.
-#
-# Arguments:
-# None.
-
-proc ::tk::ConsoleSource {} {
-    set filename [tk_getOpenFile -defaultextension .tcl -parent . \
-	    -title [mc "Select a file to source"] \
-	    -filetypes [list \
-	    [list [mc "Tcl Scripts"] .tcl] \
-	    [list [mc "All Files"] *]]]
-    if {$filename ne ""} {
-    	set cmd [list source $filename]
-	if {[catch {consoleinterp eval $cmd} result]} {
-	    ConsoleOutput stderr "$result\n"
-	}
-    }
-}
-
-# ::tk::ConsoleInvoke --
-# Processes the command line input.  If the command is complete it
-# is evaled in the main interpreter.  Otherwise, the continuation
-# prompt is added and more input may be added.
-#
-# Arguments:
-# None.
-
-proc ::tk::ConsoleInvoke {args} {
-    set ranges [.console tag ranges input]
-    set cmd ""
-    if {[llength $ranges]} {
-	set pos 0
-	while {[lindex $ranges $pos] ne ""} {
-	    set start [lindex $ranges $pos]
-	    set end [lindex $ranges [incr pos]]
-	    append cmd [.console get $start $end]
-	    incr pos
-	}
-    }
-    if {$cmd eq ""} {
-	ConsolePrompt
-    } elseif {[info complete $cmd]} {
-	.console mark set output end
-	.console tag delete input
-	set result [consoleinterp record $cmd]
-	if {$result ne ""} {
-	    puts $result
-	}
-	ConsoleHistory reset
-	ConsolePrompt
-    } else {
-	ConsolePrompt partial
-    }
-    .console yview -pickplace insert
-}
-
-# ::tk::ConsoleHistory --
-# This procedure implements command line history for the
-# console.  In general is evals the history command in the
-# main interpreter to obtain the history.  The variable
-# ::tk::HistNum is used to store the current location in the history.
-#
-# Arguments:
-# cmd -	Which action to take: prev, next, reset.
-
-set ::tk::HistNum 1
-proc ::tk::ConsoleHistory {cmd} {
-    variable HistNum
-
-    switch $cmd {
-    	prev {
-	    incr HistNum -1
-	    if {$HistNum == 0} {
-		set cmd {history event [expr {[history nextid] -1}]}
-	    } else {
-		set cmd "history event $HistNum"
-	    }
-    	    if {[catch {consoleinterp eval $cmd} cmd]} {
-    	    	incr HistNum
-    	    	return
-    	    }
-	    .console delete promptEnd end
-    	    .console insert promptEnd $cmd {input stdin}
-    	}
-    	next {
-	    incr HistNum
-	    if {$HistNum == 0} {
-		set cmd {history event [expr {[history nextid] -1}]}
-	    } elseif {$HistNum > 0} {
-		set cmd ""
-		set HistNum 1
-	    } else {
-		set cmd "history event $HistNum"
-	    }
-	    if {$cmd ne ""} {
-		catch {consoleinterp eval $cmd} cmd
-	    }
-	    .console delete promptEnd end
-	    .console insert promptEnd $cmd {input stdin}
-    	}
-    	reset {
-    	    set HistNum 1
-    	}
-    }
-}
-
-# ::tk::ConsolePrompt --
-# This procedure draws the prompt.  If tcl_prompt1 or tcl_prompt2
-# exists in the main interpreter it will be called to generate the
-# prompt.  Otherwise, a hard coded default prompt is printed.
-#
-# Arguments:
-# partial -	Flag to specify which prompt to print.
-
-proc ::tk::ConsolePrompt {{partial normal}} {
-    set w .console
-    if {$partial eq "normal"} {
-	set temp [$w index "end - 1 char"]
-	$w mark set output end
-    	if {[consoleinterp eval "info exists tcl_prompt1"]} {
-    	    consoleinterp eval "eval \[set tcl_prompt1\]"
-    	} else {
-    	    puts -nonewline [EvalAttached $::tk::console::defaultPrompt]
-    	}
-    } else {
-	set temp [$w index output]
-	$w mark set output end
-    	if {[consoleinterp eval "info exists tcl_prompt2"]} {
-    	    consoleinterp eval "eval \[set tcl_prompt2\]"
-    	} else {
-	    puts -nonewline "> "
-    	}
-    }
-    flush stdout
-    $w mark set output $temp
-    ::tk::TextSetCursor $w end
-    $w mark set promptEnd insert
-    $w mark gravity promptEnd left
-    ::tk::console::ConstrainBuffer $w $::tk::console::maxLines
-    $w see end
-}
-
-# Copy selected text from the console
-proc ::tk::console::Copy {w} {
-    if {![catch {set data [$w get sel.first sel.last]}]} {
-        clipboard clear -displayof $w
-        clipboard append -displayof $w $data
-    }
-}
-# Copies selected text. If the selection is within the current active edit
-# region then it will be cut, if not it is only copied.
-proc ::tk::console::Cut {w} {
-    if {![catch {set data [$w get sel.first sel.last]}]} {
-        clipboard clear -displayof $w
-        clipboard append -displayof $w $data
-        if {[$w compare sel.first >= output]} {
-            $w delete sel.first sel.last
-	}
-    }
-}
-# Paste text from the clipboard
-proc ::tk::console::Paste {w} {
-    catch {
-        set clip [::tk::GetSelection $w CLIPBOARD]
-        set list [split $clip \n\r]
-        tk::ConsoleInsert $w [lindex $list 0]
-        foreach x [lrange $list 1 end] {
-            $w mark set insert {end - 1c}
-            tk::ConsoleInsert $w "\n"
-            tk::ConsoleInvoke
-            tk::ConsoleInsert $w $x
-        }
-    }
-}
-
-# Fit TkConsoleFont to window width
-proc ::tk::console::FitScreenWidth {w} {
-    set width [winfo screenwidth $w]
-    set cwidth [$w cget -width]
-    set s -50
-    set fit 0
-    array set fi [font configure TkConsoleFont]
-    while {$s < 0} {
-        set fi(-size) $s
-        set f [font create {*}[array get fi]]
-        set c [font measure $f "eM"]
-        font delete $f
-        if {$c * $cwidth < 1.667 * $width} {
-            font configure TkConsoleFont -size $s
-            break
-        }
-	incr s 2
-    }
-}
-
-# ::tk::ConsoleBind --
-# This procedure first ensures that the default bindings for the Text
-# class have been defined.  Then certain bindings are overridden for
-# the class.
-#
-# Arguments:
-# None.
-
-proc ::tk::ConsoleBind {w} {
-    bindtags $w [list $w Console PostConsole [winfo toplevel $w] all]
-
-    ## Get all Text bindings into Console
-    foreach ev [bind Text] {
-	bind Console $ev [bind Text $ev]
-    }
-    ## We really didn't want the newline insertion...
-    bind Console <Control-Key-o> {}
-    ## ...or any Control-v binding (would block <<Paste>>)
-    bind Console <Control-Key-v> {}
-
-    # For the moment, transpose isn't enabled until the console
-    # gets and overhaul of how it handles input -- hobbs
-    bind Console <Control-Key-t> {}
-
-    # Ignore all Alt, Meta, and Control keypresses unless explicitly bound.
-    # Otherwise, if a widget binding for one of these is defined, the
-    # <Keypress> class binding will also fire and insert the character
-    # which is wrong.
-
-    bind Console <Alt-KeyPress> {# nothing }
-    bind Console <Meta-KeyPress> {# nothing}
-    bind Console <Control-KeyPress> {# nothing}
-
-    foreach {ev key} {
-	<<Console_NextImmediate>>	<Control-Key-n>
-	<<Console_PrevImmediate>>	<Control-Key-p>
-	<<Console_PrevSearch>>		<Control-Key-r>
-	<<Console_NextSearch>>		<Control-Key-s>
-
-	<<Console_Expand>>		<Key-Tab>
-	<<Console_Expand>>		<Key-Escape>
-	<<Console_ExpandFile>>		<Control-Shift-Key-F>
-	<<Console_ExpandProc>>		<Control-Shift-Key-P>
-	<<Console_ExpandVar>>		<Control-Shift-Key-V>
-	<<Console_Tab>>			<Control-Key-i>
-	<<Console_Tab>>			<Meta-Key-i>
-	<<Console_Eval>>		<Key-Return>
-	<<Console_Eval>>		<Key-KP_Enter>
-
-	<<Console_Clear>>		<Control-Key-l>
-	<<Console_KillLine>>		<Control-Key-k>
-	<<Console_Transpose>>		<Control-Key-t>
-	<<Console_ClearLine>>		<Control-Key-u>
-	<<Console_SaveCommand>>		<Control-Key-z>
-        <<Console_FontSizeIncr>>	<Control-Key-plus>
-        <<Console_FontSizeDecr>>	<Control-Key-minus>
-    } {
-	event add $ev $key
-	bind Console $key {}
-    }
-    if {[tk windowingsystem] eq "aqua"} {
-	foreach {ev key} {
-	    <<Console_FontSizeIncr>>	<Command-Key-plus>
-	    <<Console_FontSizeDecr>>	<Command-Key-minus>
-	} {
-	    event add $ev $key
-	    bind Console $key {}
-	}
-	if {$::tk::console::useFontchooser} {
-	    bind Console <Command-Key-t> [list ::tk::console::FontchooserToggle]
-	}
-    }
-    bind Console <<Console_Expand>> {
-	if {[%W compare insert > promptEnd]} {
-	    ::tk::console::Expand %W
-	}
-    }
-    bind Console <<Console_ExpandFile>> {
-	if {[%W compare insert > promptEnd]} {
-	    ::tk::console::Expand %W path
-	}
-    }
-    bind Console <<Console_ExpandProc>> {
-	if {[%W compare insert > promptEnd]} {
-	    ::tk::console::Expand %W proc
-	}
-    }
-    bind Console <<Console_ExpandVar>> {
-	if {[%W compare insert > promptEnd]} {
-	    ::tk::console::Expand %W var
-	}
-    }
-    bind Console <<Console_Eval>> {
-	%W mark set insert {end - 1c}
-	tk::ConsoleInsert %W "\n"
-	tk::ConsoleInvoke
-	break
-    }
-    bind Console <Delete> {
-	if {{} ne [%W tag nextrange sel 1.0 end] \
-		&& [%W compare sel.first >= promptEnd]} {
-	    %W delete sel.first sel.last
-	} elseif {[%W compare insert >= promptEnd]} {
-	    %W delete insert
-	    %W see insert
-	}
-    }
-    bind Console <BackSpace> {
-	if {{} ne [%W tag nextrange sel 1.0 end] \
-		&& [%W compare sel.first >= promptEnd]} {
-	    %W delete sel.first sel.last
-	} elseif {[%W compare insert != 1.0] && \
-		[%W compare insert > promptEnd]} {
-	    %W delete insert-1c
-	    %W see insert
-	}
-    }
-    bind Console <Control-h> [bind Console <BackSpace>]
-
-    bind Console <<LineStart>> {
-	if {[%W compare insert < promptEnd]} {
-	    tk::TextSetCursor %W {insert linestart}
-	} else {
-	    tk::TextSetCursor %W promptEnd
-	}
-    }
-    bind Console <<LineEnd>> {
-	tk::TextSetCursor %W {insert lineend}
-    }
-    bind Console <Control-d> {
-	if {[%W compare insert < promptEnd]} {
-	    break
-	}
-	%W delete insert
-    }
-    bind Console <<Console_KillLine>> {
-	if {[%W compare insert < promptEnd]} {
-	    break
-	}
-	if {[%W compare insert == {insert lineend}]} {
-	    %W delete insert
-	} else {
-	    %W delete insert {insert lineend}
-	}
-    }
-    bind Console <<Console_Clear>> {
-	## Clear console display
-	%W delete 1.0 "promptEnd linestart"
-    }
-    bind Console <<Console_ClearLine>> {
-	## Clear command line (Unix shell staple)
-	%W delete promptEnd end
-    }
-    bind Console <Meta-d> {
-	if {[%W compare insert >= promptEnd]} {
-	    %W delete insert {insert wordend}
-	}
-    }
-    bind Console <Meta-BackSpace> {
-	if {[%W compare {insert -1c wordstart} >= promptEnd]} {
-	    %W delete {insert -1c wordstart} insert
-	}
-    }
-    bind Console <Meta-d> {
-	if {[%W compare insert >= promptEnd]} {
-	    %W delete insert {insert wordend}
-	}
-    }
-    bind Console <Meta-BackSpace> {
-	if {[%W compare {insert -1c wordstart} >= promptEnd]} {
-	    %W delete {insert -1c wordstart} insert
-	}
-    }
-    bind Console <Meta-Delete> {
-	if {[%W compare insert >= promptEnd]} {
-	    %W delete insert {insert wordend}
-	}
-    }
-    bind Console <<PrevLine>> {
-	tk::ConsoleHistory prev
-    }
-    bind Console <<NextLine>> {
-	tk::ConsoleHistory next
-    }
-    bind Console <Insert> {
-	catch {tk::ConsoleInsert %W [::tk::GetSelection %W PRIMARY]}
-    }
-    bind Console <KeyPress> {
-	tk::ConsoleInsert %W %A
-    }
-    bind Console <F9> {
-	eval destroy [winfo child .]
-	source [file join $tk_library console.tcl]
-    }
-    if {[tk windowingsystem] eq "aqua"} {
-	bind Console <Command-q> {
-	    exit
-	}
-    }
-    bind Console <<Cut>> { ::tk::console::Cut %W }
-    bind Console <<Copy>> { ::tk::console::Copy %W }
-    bind Console <<Paste>> { ::tk::console::Paste %W }
-
-    bind Console <<Console_FontSizeIncr>> {
-        set size [font configure TkConsoleFont -size]
-        if {$size < 0} {set sign -1} else {set sign 1}
-        set size [expr {(abs($size) + 1) * $sign}]
-        font configure TkConsoleFont -size $size
-	if {$::tk::console::useFontchooser} {
-	    tk fontchooser configure -font TkConsoleFont
-	}
-    }
-    bind Console <<Console_FontSizeDecr>> {
-        set size [font configure TkConsoleFont -size]
-        if {abs($size) < 2} { return }
-        if {$size < 0} {set sign -1} else {set sign 1}
-        set size [expr {(abs($size) - 1) * $sign}]
-        font configure TkConsoleFont -size $size
-	if {$::tk::console::useFontchooser} {
-	    tk fontchooser configure -font TkConsoleFont
-	}
-    }
-    bind Console <<Console_FitScreenWidth>> {
-	::tk::console::FitScreenWidth %W
-    }
-
-    ##
-    ## Bindings for doing special things based on certain keys
-    ##
-    bind PostConsole <Key-parenright> {
-	if {"\\" ne [%W get insert-2c]} {
-	    ::tk::console::MatchPair %W \( \) promptEnd
-	}
-    }
-    bind PostConsole <Key-bracketright> {
-	if {"\\" ne [%W get insert-2c]} {
-	    ::tk::console::MatchPair %W \[ \] promptEnd
-	}
-    }
-    bind PostConsole <Key-braceright> {
-	if {"\\" ne [%W get insert-2c]} {
-	    ::tk::console::MatchPair %W \{ \} promptEnd
-	}
-    }
-    bind PostConsole <Key-quotedbl> {
-	if {"\\" ne [%W get insert-2c]} {
-	    ::tk::console::MatchQuote %W promptEnd
-	}
-    }
-
-    bind PostConsole <KeyPress> {
-	if {"%A" ne ""} {
-	    ::tk::console::TagProc %W
-	}
-    }
-}
-
-# ::tk::ConsoleInsert --
-# Insert a string into a text at the point of the insertion cursor.
-# If there is a selection in the text, and it covers the point of the
-# insertion cursor, then delete the selection before inserting.  Insertion
-# is restricted to the prompt area.
-#
-# Arguments:
-# w -		The text window in which to insert the string
-# s -		The string to insert (usually just a single character)
-
-proc ::tk::ConsoleInsert {w s} {
-    if {$s eq ""} {
-	return
-    }
-    catch {
-	if {[$w compare sel.first <= insert] \
-		&& [$w compare sel.last >= insert]} {
-	    $w tag remove sel sel.first promptEnd
-	    $w delete sel.first sel.last
-	}
-    }
-    if {[$w compare insert < promptEnd]} {
-	$w mark set insert end
-    }
-    $w insert insert $s {input stdin}
-    $w see insert
-}
-
-# ::tk::ConsoleOutput --
-#
-# This routine is called directly by ConsolePutsCmd to cause a string
-# to be displayed in the console.
-#
-# Arguments:
-# dest -	The output tag to be used: either "stderr" or "stdout".
-# string -	The string to be displayed.
-
-proc ::tk::ConsoleOutput {dest string} {
-    set w .console
-    $w insert output $string $dest
-    ::tk::console::ConstrainBuffer $w $::tk::console::maxLines
-    $w see insert
-}
-
-# ::tk::ConsoleExit --
-#
-# This routine is called by ConsoleEventProc when the main window of
-# the application is destroyed.  Don't call exit - that probably already
-# happened.  Just delete our window.
-#
-# Arguments:
-# None.
-
-proc ::tk::ConsoleExit {} {
-    destroy .
-}
-
-# ::tk::ConsoleAbout --
-#
-# This routine displays an About box to show Tcl/Tk version info.
-#
-# Arguments:
-# None.
-
-proc ::tk::ConsoleAbout {} {
-    tk_messageBox -type ok -message "[mc {Tcl for Windows}]
-
-Tcl $::tcl_patchLevel
-Tk $::tk_patchLevel"
-}
-
-# ::tk::console::Fontchooser* --
-# 	Let the user select the console font (TIP 324).
-
-proc ::tk::console::FontchooserToggle {} {
-    if {[tk fontchooser configure -visible]} {
-	tk fontchooser hide
-    } else {
-	tk fontchooser show
-    }
-}
-proc ::tk::console::FontchooserVisibility {index} {
-    if {[tk fontchooser configure -visible]} {
-	.menubar.edit entryconfigure $index -label [msgcat::mc "Hide Fonts"]
-    } else {
-	.menubar.edit entryconfigure $index -label [msgcat::mc "Show Fonts"]
-    }
-}
-proc ::tk::console::FontchooserFocus {w isFocusIn} {
-    if {$isFocusIn} {
-	tk fontchooser configure -parent $w -font TkConsoleFont \
-		-command [namespace code [list FontchooserApply]]
-    } else {
-	tk fontchooser configure -parent $w -font {} -command {}
-    }
-}
-proc ::tk::console::FontchooserApply {font args} {
-    catch {font configure TkConsoleFont {*}[font actual $font]}
-}
-
-# ::tk::console::TagProc --
-#
-# Tags a procedure in the console if it's recognized
-# This procedure is not perfect.  However, making it perfect wastes
-# too much CPU time...
-#
-# Arguments:
-#	w	- console text widget
-
-proc ::tk::console::TagProc w {
-    if {!$::tk::console::magicKeys} {
-	return
-    }
-    set exp "\[^\\\\\]\[\[ \t\n\r\;{}\"\$\]"
-    set i [$w search -backwards -regexp $exp insert-1c promptEnd-1c]
-    if {$i eq ""} {
-	set i promptEnd
-    } else {
-	append i +2c
-    }
-    regsub -all "\[\[\\\\\\?\\*\]" [$w get $i "insert-1c wordend"] {\\\0} c
-    if {[llength [EvalAttached [list info commands $c]]]} {
-	$w tag add proc $i "insert-1c wordend"
-    } else {
-	$w tag remove proc $i "insert-1c wordend"
-    }
-    if {[llength [EvalAttached [list info vars $c]]]} {
-	$w tag add var $i "insert-1c wordend"
-    } else {
-	$w tag remove var $i "insert-1c wordend"
-    }
-}
-
-# ::tk::console::MatchPair --
-#
-# Blinks a matching pair of characters
-# c2 is assumed to be at the text index 'insert'.
-# This proc is really loopy and took me an hour to figure out given
-# all possible combinations with escaping except for escaped \'s.
-# It doesn't take into account possible commenting... Oh well.  If
-# anyone has something better, I'd like to see/use it.  This is really
-# only efficient for small contexts.
-#
-# Arguments:
-#	w	- console text widget
-# 	c1	- first char of pair
-# 	c2	- second char of pair
-#
-# Calls:	::tk::console::Blink
-
-proc ::tk::console::MatchPair {w c1 c2 {lim 1.0}} {
-    if {!$::tk::console::magicKeys} {
-	return
-    }
-    if {{} ne [set ix [$w search -back $c1 insert $lim]]} {
-	while {
-	    [string match {\\} [$w get $ix-1c]] &&
-	    [set ix [$w search -back $c1 $ix-1c $lim]] ne {}
-	} {}
-	set i1 insert-1c
-	while {$ix ne {}} {
-	    set i0 $ix
-	    set j 0
-	    while {[set i0 [$w search $c2 $i0 $i1]] ne {}} {
-		append i0 +1c
-		if {[string match {\\} [$w get $i0-2c]]} {
-		    continue
-		}
-		incr j
-	    }
-	    if {!$j} {
-		break
-	    }
-	    set i1 $ix
-	    while {$j && [set ix [$w search -back $c1 $ix $lim]] ne {}} {
-		if {[string match {\\} [$w get $ix-1c]]} {
-		    continue
-		}
-		incr j -1
-	    }
-	}
-	if {[string match {} $ix]} {
-	    set ix [$w index $lim]
-	}
-    } else {
-	set ix [$w index $lim]
-    }
-    if {$::tk::console::blinkRange} {
-	Blink $w $ix [$w index insert]
-    } else {
-	Blink $w $ix $ix+1c [$w index insert-1c] [$w index insert]
-    }
-}
-
-# ::tk::console::MatchQuote --
-#
-# Blinks between matching quotes.
-# Blinks just the quote if it's unmatched, otherwise blinks quoted string
-# The quote to match is assumed to be at the text index 'insert'.
-#
-# Arguments:
-#	w	- console text widget
-#
-# Calls:	::tk::console::Blink
-
-proc ::tk::console::MatchQuote {w {lim 1.0}} {
-    if {!$::tk::console::magicKeys} {
-	return
-    }
-    set i insert-1c
-    set j 0
-    while {[set i [$w search -back \" $i $lim]] ne {}} {
-	if {[string match {\\} [$w get $i-1c]]} {
-	    continue
-	}
-	if {!$j} {
-	    set i0 $i
-	}
-	incr j
-    }
-    if {$j&1} {
-	if {$::tk::console::blinkRange} {
-	    Blink $w $i0 [$w index insert]
-	} else {
-	    Blink $w $i0 $i0+1c [$w index insert-1c] [$w index insert]
-	}
-    } else {
-	Blink $w [$w index insert-1c] [$w index insert]
-    }
-}
-
-# ::tk::console::Blink --
-#
-# Blinks between n index pairs for a specified duration.
-#
-# Arguments:
-#	w	- console text widget
-# 	i1	- start index to blink region
-# 	i2	- end index of blink region
-# 	dur	- duration in usecs to blink for
-#
-# Outputs:
-#	blinks selected characters in $w
-
-proc ::tk::console::Blink {w args} {
-    eval [list $w tag add blink] $args
-    after $::tk::console::blinkTime [list $w] tag remove blink $args
-}
-
-# ::tk::console::ConstrainBuffer --
-#
-# This limits the amount of data in the text widget
-# Called by Prompt and ConsoleOutput
-#
-# Arguments:
-#	w	- console text widget
-#	size	- # of lines to constrain to
-#
-# Outputs:
-#	may delete data in console widget
-
-proc ::tk::console::ConstrainBuffer {w size} {
-    if {[$w index end] > $size} {
-	$w delete 1.0 [expr {int([$w index end])-$size}].0
-    }
-}
-
-# ::tk::console::Expand --
-#
-# Arguments:
-# ARGS:	w	- text widget in which to expand str
-# 	type	- type of expansion (path / proc / variable)
-#
-# Calls:	::tk::console::Expand(Pathname|Procname|Variable)
-#
-# Outputs:	The string to match is expanded to the longest possible match.
-#		If ::tk::console::showMatches is non-zero and the longest match
-#		equaled the string to expand, then all possible matches are
-#		output to stdout.  Triggers bell if no matches are found.
-#
-# Returns:	number of matches found
-
-proc ::tk::console::Expand {w {type ""}} {
-    set exp "\[^\\\\\]\[\[ \t\n\r\\\{\"\\\\\$\]"
-    set tmp [$w search -backwards -regexp $exp insert-1c promptEnd-1c]
-    if {$tmp eq ""} {
-	set tmp promptEnd
-    } else {
-	append tmp +2c
-    }
-    if {[$w compare $tmp >= insert]} {
-	return
-    }
-    set str [$w get $tmp insert]
-    switch -glob $type {
-	path* {
-	    set res [ExpandPathname $str]
-	}
-	proc* {
-	    set res [ExpandProcname $str]
-	}
-	var* {
-	    set res [ExpandVariable $str]
-	}
-	default {
-	    set res {}
-	    foreach t {Pathname Procname Variable} {
-		if {![catch {Expand$t $str} res] && ($res ne "")} {
-		    break
-		}
-	    }
-	}
-    }
-    set len [llength $res]
-    if {$len} {
-	set repl [lindex $res 0]
-	$w delete $tmp insert
-	$w insert $tmp $repl {input stdin}
-	if {($len > 1) && ($::tk::console::showMatches) && ($repl eq $str)} {
-	    puts stdout [lsort [lreplace $res 0 0]]
-	}
-    } else {
-	bell
-    }
-    return [incr len -1]
-}
-
-# ::tk::console::ExpandPathname --
-#
-# Expand a file pathname based on $str
-# This is based on UNIX file name conventions
-#
-# Arguments:
-#	str	- partial file pathname to expand
-#
-# Calls:	::tk::console::ExpandBestMatch
-#
-# Returns:	list containing longest unique match followed by all the
-#		possible further matches
-
-proc ::tk::console::ExpandPathname str {
-    set pwd [EvalAttached pwd]
-    if {[catch {EvalAttached [list cd [file dirname $str]]} err opt]} {
-	return -options $opt $err
-    }
-    set dir [file tail $str]
-    ## Check to see if it was known to be a directory and keep the trailing
-    ## slash if so (file tail cuts it off)
-    if {[string match */ $str]} {
-	append dir /
-    }
-    if {[catch {lsort [EvalAttached [list glob $dir*]]} m]} {
-	set match {}
-    } else {
-	if {[llength $m] > 1} {
-	    if { $::tcl_platform(platform) eq "windows" } {
-		## Windows is screwy because it's case insensitive
-		set tmp [ExpandBestMatch [string tolower $m] \
-			[string tolower $dir]]
-		## Don't change case if we haven't changed the word
-		if {[string length $dir]==[string length $tmp]} {
-		    set tmp $dir
-		}
-	    } else {
-		set tmp [ExpandBestMatch $m $dir]
-	    }
-	    if {[string match ?*/* $str]} {
-		set tmp [file dirname $str]/$tmp
-	    } elseif {[string match /* $str]} {
-		set tmp /$tmp
-	    }
-	    regsub -all { } $tmp {\\ } tmp
-	    set match [linsert $m 0 $tmp]
-	} else {
-	    ## This may look goofy, but it handles spaces in path names
-	    eval append match $m
-	    if {[file isdir $match]} {
-		append match /
-	    }
-	    if {[string match ?*/* $str]} {
-		set match [file dirname $str]/$match
-	    } elseif {[string match /* $str]} {
-		set match /$match
-	    }
-	    regsub -all { } $match {\\ } match
-	    ## Why is this one needed and the ones below aren't!!
-	    set match [list $match]
-	}
-    }
-    EvalAttached [list cd $pwd]
-    return $match
-}
-
-# ::tk::console::ExpandProcname --
-#
-# Expand a tcl proc name based on $str
-#
-# Arguments:
-#	str	- partial proc name to expand
-#
-# Calls:	::tk::console::ExpandBestMatch
-#
-# Returns:	list containing longest unique match followed by all the
-#		possible further matches
-
-proc ::tk::console::ExpandProcname str {
-    set match [EvalAttached [list info commands $str*]]
-    if {[llength $match] == 0} {
-	set ns [EvalAttached \
-		"namespace children \[namespace current\] [list $str*]"]
-	if {[llength $ns]==1} {
-	    set match [EvalAttached [list info commands ${ns}::*]]
-	} else {
-	    set match $ns
-	}
-    }
-    if {[llength $match] > 1} {
-	regsub -all { } [ExpandBestMatch $match $str] {\\ } str
-	set match [linsert $match 0 $str]
-    } else {
-	regsub -all { } $match {\\ } match
-    }
-    return $match
-}
-
-# ::tk::console::ExpandVariable --
-#
-# Expand a tcl variable name based on $str
-#
-# Arguments:
-#	str	- partial tcl var name to expand
-#
-# Calls:	::tk::console::ExpandBestMatch
-#
-# Returns:	list containing longest unique match followed by all the
-#		possible further matches
-
-proc ::tk::console::ExpandVariable str {
-    if {[regexp {([^\(]*)\((.*)} $str -> ary str]} {
-	## Looks like they're trying to expand an array.
-	set match [EvalAttached [list array names $ary $str*]]
-	if {[llength $match] > 1} {
-	    set vars $ary\([ExpandBestMatch $match $str]
-	    foreach var $match {
-		lappend vars $ary\($var\)
-	    }
-	    return $vars
-	} elseif {[llength $match] == 1} {
-	    set match $ary\($match\)
-	}
-	## Space transformation avoided for array names.
-    } else {
-	set match [EvalAttached [list info vars $str*]]
-	if {[llength $match] > 1} {
-	    regsub -all { } [ExpandBestMatch $match $str] {\\ } str
-	    set match [linsert $match 0 $str]
-	} else {
-	    regsub -all { } $match {\\ } match
-	}
-    }
-    return $match
-}
-
-# ::tk::console::ExpandBestMatch --
-#
-# Finds the best unique match in a list of names.
-# The extra $e in this argument allows us to limit the innermost loop a little
-# further.  This improves speed as $l becomes large or $e becomes long.
-#
-# Arguments:
-#	l	- list to find best unique match in
-# 	e	- currently best known unique match
-#
-# Returns:	longest unique match in the list
-
-proc ::tk::console::ExpandBestMatch {l {e {}}} {
-    set ec [lindex $l 0]
-    if {[llength $l]>1} {
-	set e [expr {[string length $e] - 1}]
-	set ei [expr {[string length $ec] - 1}]
-	foreach l $l {
-	    while {$ei>=$e && [string first $ec $l]} {
-		set ec [string range $ec 0 [incr ei -1]]
-	    }
-	}
-    }
-    return $ec
-}
-
-# now initialize the console
-::tk::ConsoleInit
diff --git a/tk8.6/library/demos/README b/tk8.6/library/demos/README
deleted file mode 100644
index 7285a93..0000000
--- a/tk8.6/library/demos/README
+++ /dev/null
@@ -1,44 +0,0 @@
-This directory contains a collection of programs to demonstrate
-the features of the Tk toolkit.  The programs are all scripts for
-"wish", a windowing shell.  If wish has been installed on your path
-then you can invoke any of the programs in this directory just
-by typing its file name to your command shell under Unix.  Otherwise
-invoke wish with the file as its first argument, e.g., "wish hello".
-The rest of this file contains a brief description of each program.
-Files with names ending in ".tcl" are procedure packages used by one
-or more of the demo programs;  they can't be used as programs by
-themselves so they aren't described below.
-
-hello -		Creates a single button;  if you click on it, a message
-		is typed and the application terminates.
-
-widget -	Contains a collection of demonstrations of the widgets
-		currently available in the Tk library.  Most of the .tcl
-		files are scripts for individual demos available through
-		the "widget" program.
-
-ixset -		A simple Tk-based wrapper for the "xset" program, which
-		allows you to interactively query and set various X options
-		such as mouse acceleration and bell volume.  Thanks to
-		Pierre David for contributing this example.
-
-rolodex -	A mock-up of a simple rolodex application.  It has much of
-		the user interface for such an application but no back-end
-		database.  This program was written in response to Tom
-		LaStrange's toolkit benchmark challenge.
-
-tcolor -	A color editor.  Allows you to edit colors in several
-		different ways, and will also perform automatic updates
-		using "send".
-
-rmt -		Allows you to "hook-up" remotely to any Tk application
-		on the display.  Select an application with the menu,
-		then just type commands:  they'll go to that application.
-
-timer -		Displays a seconds timer with start and stop buttons.
-		Control-c and control-q cause it to exit.
-
-browse -	A simple directory browser.  Invoke it with and argument
-		giving the name of the directory you'd like to browse.
-		Double-click on files or subdirectories to browse them.
-		Control-c and control-q cause the program to exit.
diff --git a/tk8.6/library/demos/anilabel.tcl b/tk8.6/library/demos/anilabel.tcl
deleted file mode 100644
index 61e6315..0000000
--- a/tk8.6/library/demos/anilabel.tcl
+++ /dev/null
@@ -1,160 +0,0 @@
-# anilabel.tcl --
-#
-# This demonstration script creates a toplevel window containing
-# several animated label widgets.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .anilabel
-catch {destroy $w}
-toplevel $w
-wm title $w "Animated Label Demonstration"
-wm iconname $w "anilabel"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "Four animated labels are displayed below; each of the labels on the left is animated by making the text message inside it appear to scroll, and the label on the right is animated by animating the image that it displays."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-# Ensure that this this is an array
-array set animationCallbacks {}
-
-## This callback is the core of how to do animation in Tcl/Tk; all
-## animations work in basically the same way, with a procedure that
-## uses the [after] command to reschedule itself at some point in the
-## future. Of course, the details of how to update the state will vary
-## according to what is being animated.
-proc RotateLabelText {w interval} {
-    global animationCallbacks
-
-    # Schedule the calling of this procedure again in the future
-    set animationCallbacks($w) [after $interval RotateLabelText $w $interval]
-
-    # We do marquee-like scrolling text by chopping characters off the
-    # front of the text and sticking them on the end.
-    set text [$w cget -text]
-    set newText [string range $text 1 end][string index $text 0]
-    $w configure -text $newText
-}
-
-## A helper procedure to start the animation happening.
-proc animateLabelText {w text interval} {
-    global animationCallbacks
-
-    # Install the text into the widget
-    $w configure -text $text
-
-    # Schedule the start of the animation loop
-    set animationCallbacks($w) [after $interval RotateLabelText $w $interval]
-
-    # Make sure that the animation stops and is cleaned up after itself
-    # when the animated label is destroyed.  Note that at this point we
-    # cannot manipulate the widget itself, as that has already died.
-    bind $w <Destroy> {
-	after cancel $animationCallbacks(%W)
-	unset animationCallbacks(%W)
-    }
-}
-
-## Next, a similar pair of procedures to animate a GIF loaded into a
-## photo image.
-proc SelectNextImageFrame {w interval} {
-    global animationCallbacks
-    set animationCallbacks($w) \
-	    [after $interval SelectNextImageFrame $w $interval]
-    set image [$w cget -image]
-
-    # The easy way to animate a GIF!
-    set idx -1
-    scan [$image cget -format] "GIF -index %d" idx
-    if {[catch {
-	# Note that we get an error if the index is out of range
-	$image configure -format "GIF -index [incr idx]"
-    }]} then {
-	$image configure -format "GIF -index 0"
-    }
-}
-proc animateLabelImage {w imageData interval} {
-    global animationCallbacks
-
-    # Create a multi-frame GIF from base-64-encoded data
-    set image [image create photo -format GIF -data $imageData]
-
-    # Install the image into the widget
-    $w configure -image $image
-
-    # Schedule the start of the animation loop
-    set animationCallbacks($w) \
-	    [after $interval SelectNextImageFrame $w $interval]
-
-    # Make sure that the animation stops and is cleaned up after itself
-    # when the animated label is destroyed.  Note that at this point we
-    # cannot manipulate the widget itself, as that has already died.
-    # Also note that this script is in double-quotes; this is always OK
-    # because image names are chosen automatically to be simple words.
-    bind $w <Destroy> "
-	after cancel \$animationCallbacks(%W)
-	unset animationCallbacks(%W)
-	rename $image {}
-    "
-}
-
-# Make some widgets to contain the animations
-labelframe $w.left -text "Scrolling Texts"
-labelframe $w.right -text "GIF Image"
-pack $w.left $w.right -side left -padx 10 -pady 10 -expand yes
-
-# This method of scrolling text looks far better with a fixed-width font
-label $w.left.l1 -bd 4 -relief ridge -font fixedFont
-label $w.left.l2 -bd 4 -relief groove -font fixedFont
-label $w.left.l3 -bd 4 -relief flat -font fixedFont -width 18
-pack $w.left.l1 $w.left.l2 $w.left.l3 -side top -expand yes -padx 10 -pady 10 -anchor w
-# Don't need to do very much with this label except turn off the border
-label $w.right.l -bd 0
-pack $w.right.l -side top -expand yes -padx 10 -pady 10
-
-# This is a base-64-encoded animated GIF file.
-set tclPoweredData {
-    R0lGODlhKgBAAPQAAP//////zP//AP/MzP/Mmf/MAP+Zmf+ZZv+ZAMz//8zM
-    zMyZmcyZZsxmZsxmAMwzAJnMzJmZzJmZmZlmmZlmZplmM5kzM2aZzGZmzGZm
-    mWZmZmYzZmYzMzNmzDMzZgAzmSH+IE1hZGUgd2l0aCBHSU1QIGJ5IExARGVt
-    YWlsbHkuY29tACH5BAVkAAEALAAAAAAqAEAAAAX+YCCOZEkyTKM2jOm66yPP
-    dF03bx7YcuHIDkGBR7SZeIyhTID4FZ+4Es8nQyCe2EeUNJ0peY2s9mi7PhAM
-    ngEAMGRbUpvzSxskLh1J+Hkg134OdDIDEB+GHxtYMEQMTjMGEYeGFoomezaC
-    DZGSHFmLXTQKkh8eNQVpZ2afmDQGHaOYSoEyhhcklzVmMpuHnaZmDqiGJbg0
-    qFqvh6UNAwB7VA+OwydEjgujkgrPNhbTI8dFvNgEYcHcHx0lB1kX2IYeA2G6
-    NN0YfkXJ2BsAMuAzHB9cZMk3qoEbRzUACsRCUBK5JxsC3iMiKd8GN088SIyT
-    0RAFSROyeEg38caDiB/+JEgqxsODrZJ1BkT0oHKSmI0ceQxo94HDpg0qsuDk
-    UmRAMgu8OgwQ+uIJgUMVeGXA+IQkzEeHGvD8cIGlDXsLiRjQ+EHroQhea7xY
-    8IQBSgYYDi1IS+OFBCgaDMGVS3fGi5BPJpBaENdQ0EomKGD56IHwO39EXiSC
-    Ysgxor5+Xfgq0qByYUpiXmwuoredB2aYH4gWWda0B7SeNENpEJHC1ghi+pS4
-    AJpIAwWvKPBi+8YEht5EriEqpFfMlhEdkBNpx0HUhwypx5T4IB1MBg/Ws2sn
-    wV3MSQOkzI8fUd48Aw3dOZto71x85hHtHijYv18Gf/3GqCdDCXHNoICBobSo
-    IqBqJLyCoH8JPrLgdh88CKCFD0CGmAiGYPgffwceZh6FC2ohIIklnkhehTNY
-    4CIHHGzgwYw01ujBBhvAqKOLLq5AAk9kuSPkkKO40NB+h1gnypJIIvkBf09a
-    N5QIRz5p5ZJXJpmlIVhOGQA2TmIJZZhKKmmll2BqyWSXWUrZpQtpatlmk1c2
-    KaWRHeTZEJF8SqLDn/hhsOeQgBbqAh6DGqronxeARUIIACH5BAUeAAAALAUA
-    LgAFAAUAAAUM4CeKz/OV5YmqaRkCACH5BAUeAAEALAUALgAKAAUAAAUUICCK
-    z/OdJVCaa7p+7aOWcDvTZwgAIfkEBR4AAQAsCwAuAAkABQAABRPgA4zP95zA
-    eZqoWqqpyqLkZ38hACH5BAUKAAEALAcALgANAA4AAAU7ICA+jwiUJEqeKau+
-    r+vGaTmac63v/GP9HM7GQyx+jsgkkoRUHJ3Qx0cK/VQVTKtWwbVKn9suNunc
-    WkMAIfkEBQoAAAAsBwA3AAcABQAABRGgIHzk842j+Yjlt5KuO8JmCAAh+QQF
-    CgAAACwLADcABwAFAAAFEeAnfN9TjqP5oOWziq05lmUIACH5BAUKAAAALA8A
-    NwAHAAUAAAUPoPCJTymS3yiQj4qOcPmEACH5BAUKAAAALBMANwAHAAUAAAUR
-    oCB+z/MJX2o+I2miKimiawgAIfkEBQoAAAAsFwA3AAcABQAABRGgIHzfY47j
-    Q4qk+aHl+pZmCAAh+QQFCgAAACwbADcABwAFAAAFEaAgfs/zCV9qPiNJouo7
-    ll8IACH5BAUKAAAALB8ANwADAAUAAAUIoCB8o0iWZggAOw==
-}
-
-# Finally, set up the text scrolling animation
-animateLabelText $w.left.l1 "* Slow Animation *" 300
-animateLabelText $w.left.l2 "* Fast Animation *" 80
-animateLabelText $w.left.l3 "This is a longer scrolling text in a widget that will not show the whole message at once. " 150
-animateLabelImage $w.right.l $tclPoweredData 100
diff --git a/tk8.6/library/demos/aniwave.tcl b/tk8.6/library/demos/aniwave.tcl
deleted file mode 100644
index a7539fb..0000000
--- a/tk8.6/library/demos/aniwave.tcl
+++ /dev/null
@@ -1,104 +0,0 @@
-# aniwave.tcl --
-#
-# This demonstration script illustrates how to adjust canvas item
-# coordinates in a way that does something fairly similar to waveform
-# display.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .aniwave
-catch {destroy $w}
-toplevel $w
-wm title $w "Animated Wave Demonstration"
-wm iconname $w "aniwave"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "This demonstration contains a canvas widget with a line item inside it. The animation routines work by adjusting the coordinates list of the line; a trace on a variable is used so updates to the variable result in a change of position of the line."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-# Create a canvas large enough to hold the wave. In fact, the wave
-# sticks off both sides of the canvas to prevent visual glitches.
-pack [canvas $w.c -width 300 -height 200 -background black] -padx 10 -pady 10 -expand yes
-
-# Ensure that this this is an array
-array set animationCallbacks {}
-
-# Creates a coordinates list of a wave. This code does a very sketchy
-# job and relies on Tk's line smoothing to make things look better.
-set waveCoords {}
-for {set x -10} {$x<=300} {incr x 5} {
-    lappend waveCoords $x 100
-}
-lappend waveCoords $x 0 [incr x 5] 200
-
-# Create a smoothed line and arrange for its coordinates to be the
-# contents of the variable waveCoords.
-$w.c create line $waveCoords -tags wave -width 1 -fill green -smooth 1
-proc waveCoordsTracer {w args} {
-    global waveCoords
-    # Actual visual update will wait until we have finished
-    # processing; Tk does that for us automatically.
-    $w.c coords wave $waveCoords
-}
-trace add variable waveCoords write [list waveCoordsTracer $w]
-
-# Basic motion handler. Given what direction the wave is travelling
-# in, it advances the y coordinates in the coordinate-list one step in
-# that direction.
-proc basicMotion {} {
-    global waveCoords direction
-    set oc $waveCoords
-    for {set i 1} {$i<[llength $oc]} {incr i 2} {
-	if {$direction eq "left"} {
-	    lset waveCoords $i [lindex $oc \
-		    [expr {$i+2>[llength $oc] ? 1 : $i+2}]]
-	} else {
-	    lset waveCoords $i \
-		    [lindex $oc [expr {$i-2<0 ? "end" : $i-2}]]
-	}
-    }
-}
-
-# Oscillation handler. This detects whether to reverse the direction
-# of the wave by checking to see if the peak of the wave has moved off
-# the screen (whose size we know already.)
-proc reverser {} {
-    global waveCoords direction
-    if {[lindex $waveCoords 1] < 10} {
-	set direction "right"
-    } elseif {[lindex $waveCoords end] < 10} {
-	set direction "left"
-    }
-}
-
-# Main animation "loop". This calls the two procedures that handle the
-# movement repeatedly by scheduling asynchronous calls back to itself
-# using the [after] command. This procedure is the fundamental basis
-# for all animated effect handling in Tk.
-proc move {} {
-    basicMotion
-    reverser
-
-    # Theoretically 100 frames-per-second (==10ms between frames)
-    global animationCallbacks
-    set animationCallbacks(simpleWave) [after 10 move]
-}
-
-# Initialise our remaining animation variables
-set direction "left"
-set animateAfterCallback {}
-# Arrange for the animation loop to stop when the canvas is deleted
-bind $w.c <Destroy> {
-    after cancel $animationCallbacks(simpleWave)
-    unset animationCallbacks(simpleWave)
-}
-# Start the animation processing
-move
diff --git a/tk8.6/library/demos/arrow.tcl b/tk8.6/library/demos/arrow.tcl
deleted file mode 100644
index 5011f6f..0000000
--- a/tk8.6/library/demos/arrow.tcl
+++ /dev/null
@@ -1,237 +0,0 @@
-# arrow.tcl --
-#
-# This demonstration script creates a canvas widget that displays a
-# large line with an arrowhead whose shape can be edited interactively.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-# arrowSetup --
-# This procedure regenerates all the text and graphics in the canvas
-# window.  It's called when the canvas is initially created, and also
-# whenever any of the parameters of the arrow head are changed
-# interactively.
-#
-# Arguments:
-# c -		Name of the canvas widget.
-
-proc arrowSetup c {
-    upvar #0 demo_arrowInfo v
-
-    # Remember the current box, if there is one.
-
-    set tags [$c gettags current]
-    if {$tags != ""} {
-	set cur [lindex $tags [lsearch -glob $tags box?]]
-    } else {
-	set cur ""
-    }
-
-    # Create the arrow and outline.
-
-    $c delete all
-    eval {$c create line $v(x1) $v(y) $v(x2) $v(y)  -arrow last \
-	    -width [expr {10*$v(width)}] -arrowshape [list \
-	    [expr {10*$v(a)}] [expr {10*$v(b)}] [expr {10*$v(c)}]]} \
-	    $v(bigLineStyle)
-    set xtip [expr {$v(x2)-10*$v(b)}]
-    set deltaY [expr {10*$v(c)+5*$v(width)}]
-    $c create line $v(x2) $v(y) $xtip [expr {$v(y)+$deltaY}] \
-	    [expr {$v(x2)-10*$v(a)}] $v(y) $xtip [expr {$v(y)-$deltaY}] \
-	    $v(x2) $v(y) -width 2 -capstyle round -joinstyle round
-
-    # Create the boxes for reshaping the line and arrowhead.
-
-    eval {$c create rect [expr {$v(x2)-10*$v(a)-5}] [expr {$v(y)-5}] \
-	    [expr {$v(x2)-10*$v(a)+5}] [expr {$v(y)+5}] \
-	    -tags {box1 box}} $v(boxStyle)
-    eval {$c create rect [expr {$xtip-5}] [expr {$v(y)-$deltaY-5}] \
-	    [expr {$xtip+5}] [expr {$v(y)-$deltaY+5}] \
-	    -tags {box2 box}} $v(boxStyle)
-    eval {$c create rect [expr {$v(x1)-5}] [expr {$v(y)-5*$v(width)-5}] \
-	    [expr {$v(x1)+5}] [expr {$v(y)-5*$v(width)+5}] \
-	    -tags {box3 box}} $v(boxStyle)
-    if {$cur != ""} {
-	eval $c itemconfigure $cur $v(activeStyle)
-    }
-
-    # Create three arrows in actual size with the same parameters
-
-    $c create line [expr {$v(x2)+50}] 0 [expr {$v(x2)+50}] 1000 \
-	    -width 2
-    set tmp [expr {$v(x2)+100}]
-    $c create line $tmp [expr {$v(y)-125}] $tmp [expr {$v(y)-75}] \
-	    -width $v(width) \
-	    -arrow both -arrowshape "$v(a) $v(b) $v(c)"
-    $c create line [expr {$tmp-25}] $v(y) [expr {$tmp+25}] $v(y) \
-	    -width $v(width) \
-	    -arrow both -arrowshape "$v(a) $v(b) $v(c)"
-    $c create line [expr {$tmp-25}] [expr {$v(y)+75}] [expr {$tmp+25}] \
-	    [expr {$v(y)+125}] -width $v(width) \
-	    -arrow both -arrowshape "$v(a) $v(b) $v(c)"
-
-    # Create a bunch of other arrows and text items showing the
-    # current dimensions.
-
-    set tmp [expr {$v(x2)+10}]
-    $c create line $tmp [expr {$v(y)-5*$v(width)}] \
-	    $tmp [expr {$v(y)-$deltaY}] \
-	    -arrow both -arrowshape $v(smallTips)
-    $c create text [expr {$v(x2)+15}] [expr {$v(y)-$deltaY+5*$v(c)}] \
-	    -text $v(c) -anchor w
-    set tmp [expr {$v(x1)-10}]
-    $c create line $tmp [expr {$v(y)-5*$v(width)}] \
-	    $tmp [expr {$v(y)+5*$v(width)}] \
-	    -arrow both -arrowshape $v(smallTips)
-    $c create text [expr {$v(x1)-15}] $v(y) -text $v(width) -anchor e
-    set tmp [expr {$v(y)+5*$v(width)+10*$v(c)+10}]
-    $c create line [expr {$v(x2)-10*$v(a)}] $tmp $v(x2) $tmp \
-	    -arrow both -arrowshape $v(smallTips)
-    $c create text [expr {$v(x2)-5*$v(a)}] [expr {$tmp+5}] \
-	    -text $v(a) -anchor n
-    set tmp [expr {$tmp+25}]
-    $c create line [expr {$v(x2)-10*$v(b)}] $tmp $v(x2) $tmp \
-	    -arrow both -arrowshape $v(smallTips)
-    $c create text [expr {$v(x2)-5*$v(b)}] [expr {$tmp+5}] \
-	    -text $v(b) -anchor n
-
-    $c create text $v(x1) 310 -text "-width  $v(width)" \
-	    -anchor w -font {Helvetica 18}
-    $c create text $v(x1) 330 -text "-arrowshape  {$v(a)  $v(b)  $v(c)}" \
-	    -anchor w -font {Helvetica 18}
-
-    incr v(count)
-}
-
-set w .arrow
-catch {destroy $w}
-toplevel $w
-wm title $w "Arrowhead Editor Demonstration"
-wm iconname $w "arrow"
-positionWindow $w
-set c $w.c
-
-label $w.msg -font $font -wraplength 5i -justify left -text "This widget allows you to experiment with different widths and arrowhead shapes for lines in canvases.  To change the line width or the shape of the arrowhead, drag any of the three boxes attached to the oversized arrow.  The arrows on the right give examples at normal scale.  The text at the bottom shows the configuration options as you'd enter them for a canvas line item."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-canvas $c -width 500 -height 350 -relief sunken -borderwidth 2
-pack $c -expand yes -fill both
-
-set demo_arrowInfo(a) 8
-set demo_arrowInfo(b) 10
-set demo_arrowInfo(c) 3
-set demo_arrowInfo(width) 2
-set demo_arrowInfo(motionProc) arrowMoveNull
-set demo_arrowInfo(x1) 40
-set demo_arrowInfo(x2) 350
-set demo_arrowInfo(y) 150
-set demo_arrowInfo(smallTips) {5 5 2}
-set demo_arrowInfo(count) 0
-if {[winfo depth $c] > 1} {
-    set demo_arrowInfo(bigLineStyle) "-fill SkyBlue1"
-    set demo_arrowInfo(boxStyle) "-fill {} -outline black -width 1"
-    set demo_arrowInfo(activeStyle) "-fill red -outline black -width 1"
-} else {
-    # Main widget program sets variable tk_demoDirectory
-    set demo_arrowInfo(bigLineStyle) "-fill black \
-	-stipple @[file join $tk_demoDirectory images grey.25]"
-    set demo_arrowInfo(boxStyle) "-fill {} -outline black -width 1"
-    set demo_arrowInfo(activeStyle) "-fill black -outline black -width 1"
-}
-arrowSetup $c
-$c bind box <Enter> "$c itemconfigure current $demo_arrowInfo(activeStyle)"
-$c bind box <Leave> "$c itemconfigure current $demo_arrowInfo(boxStyle)"
-$c bind box <B1-Enter> " "
-$c bind box <B1-Leave> " "
-$c bind box1 <1> {set demo_arrowInfo(motionProc) arrowMove1}
-$c bind box2 <1> {set demo_arrowInfo(motionProc) arrowMove2}
-$c bind box3 <1> {set demo_arrowInfo(motionProc) arrowMove3}
-$c bind box <B1-Motion> "\$demo_arrowInfo(motionProc) $c %x %y"
-bind $c <Any-ButtonRelease-1> "arrowSetup $c"
-
-# arrowMove1 --
-# This procedure is called for each mouse motion event on box1 (the
-# one at the vertex of the arrow).  It updates the controlling parameters
-# for the line and arrowhead.
-#
-# Arguments:
-# c -		The name of the canvas window.
-# x, y -	The coordinates of the mouse.
-
-proc arrowMove1 {c x y} {
-    upvar #0 demo_arrowInfo v
-    set newA [expr {($v(x2)+5-round([$c canvasx $x]))/10}]
-    if {$newA < 0} {
-	set newA 0
-    }
-    if {$newA > 25} {
-	set newA 25
-    }
-    if {$newA != $v(a)} {
-	$c move box1 [expr {10*($v(a)-$newA)}] 0
-	set v(a) $newA
-    }
-}
-
-# arrowMove2 --
-# This procedure is called for each mouse motion event on box2 (the
-# one at the trailing tip of the arrowhead).  It updates the controlling
-# parameters for the line and arrowhead.
-#
-# Arguments:
-# c -		The name of the canvas window.
-# x, y -	The coordinates of the mouse.
-
-proc arrowMove2 {c x y} {
-    upvar #0 demo_arrowInfo v
-    set newB [expr {($v(x2)+5-round([$c canvasx $x]))/10}]
-    if {$newB < 0} {
-	set newB 0
-    }
-    if {$newB > 25} {
-	set newB 25
-    }
-    set newC [expr {($v(y)+5-round([$c canvasy $y])-5*$v(width))/10}]
-    if {$newC < 0} {
-	set newC 0
-    }
-    if {$newC > 20} {
-	set newC 20
-    }
-    if {($newB != $v(b)) || ($newC != $v(c))} {
-	$c move box2 [expr {10*($v(b)-$newB)}] [expr {10*($v(c)-$newC)}]
-	set v(b) $newB
-	set v(c) $newC
-    }
-}
-
-# arrowMove3 --
-# This procedure is called for each mouse motion event on box3 (the
-# one that controls the thickness of the line).  It updates the
-# controlling parameters for the line and arrowhead.
-#
-# Arguments:
-# c -		The name of the canvas window.
-# x, y -	The coordinates of the mouse.
-
-proc arrowMove3 {c x y} {
-    upvar #0 demo_arrowInfo v
-    set newWidth [expr {($v(y)+2-round([$c canvasy $y]))/5}]
-    if {$newWidth < 0} {
-	set newWidth 0
-    }
-    if {$newWidth > 20} {
-	set newWidth 20
-    }
-    if {$newWidth != $v(width)} {
-	$c move box3 0 [expr {5*($v(width)-$newWidth)}]
-	set v(width) $newWidth
-    }
-}
diff --git a/tk8.6/library/demos/bind.tcl b/tk8.6/library/demos/bind.tcl
deleted file mode 100644
index 03f6d3b..0000000
--- a/tk8.6/library/demos/bind.tcl
+++ /dev/null
@@ -1,78 +0,0 @@
-# bind.tcl --
-#
-# This demonstration script creates a text widget with bindings set
-# up for hypertext-like effects.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .bind
-catch {destroy $w}
-toplevel $w
-wm title $w "Text Demonstration - Tag Bindings"
-wm iconname $w "bind"
-positionWindow $w
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-text $w.text -yscrollcommand "$w.scroll set" -setgrid true \
-	-width 60 -height 24 -font $font -wrap word
-ttk::scrollbar $w.scroll -command "$w.text yview"
-pack $w.scroll -side right -fill y
-pack $w.text -expand yes -fill both
-
-# Set up display styles.
-
-if {[winfo depth $w] > 1} {
-    set bold "-background #43ce80 -relief raised -borderwidth 1"
-    set normal "-background {} -relief flat"
-} else {
-    set bold "-foreground white -background black"
-    set normal "-foreground {} -background {}"
-}
-
-# Add text to widget.
-
-$w.text insert 0.0 {\
-The same tag mechanism that controls display styles in text widgets can also be used to associate Tcl commands with regions of text, so that mouse or keyboard actions on the text cause particular Tcl commands to be invoked.  For example, in the text below the descriptions of the canvas demonstrations have been tagged.  When you move the mouse over a demo description the description lights up, and when you press button 1 over a description then that particular demonstration is invoked.
-
-}
-$w.text insert end \
-{1. Samples of all the different types of items that can be created in canvas widgets.} d1
-$w.text insert end \n\n
-$w.text insert end \
-{2. A simple two-dimensional plot that allows you to adjust the positions of the data points.} d2
-$w.text insert end \n\n
-$w.text insert end \
-{3. Anchoring and justification modes for text items.} d3
-$w.text insert end \n\n
-$w.text insert end \
-{4. An editor for arrow-head shapes for line items.} d4
-$w.text insert end \n\n
-$w.text insert end \
-{5. A ruler with facilities for editing tab stops.} d5
-$w.text insert end \n\n
-$w.text insert end \
-{6. A grid that demonstrates how canvases can be scrolled.} d6
-
-# Create bindings for tags.
-
-foreach tag {d1 d2 d3 d4 d5 d6} {
-    $w.text tag bind $tag <Any-Enter> "$w.text tag configure $tag $bold"
-    $w.text tag bind $tag <Any-Leave> "$w.text tag configure $tag $normal"
-}
-# Main widget program sets variable tk_demoDirectory
-$w.text tag bind d1 <1> {source [file join $tk_demoDirectory items.tcl]}
-$w.text tag bind d2 <1> {source [file join $tk_demoDirectory plot.tcl]}
-$w.text tag bind d3 <1> {source [file join $tk_demoDirectory ctext.tcl]}
-$w.text tag bind d4 <1> {source [file join $tk_demoDirectory arrow.tcl]}
-$w.text tag bind d5 <1> {source [file join $tk_demoDirectory ruler.tcl]}
-$w.text tag bind d6 <1> {source [file join $tk_demoDirectory cscroll.tcl]}
-
-$w.text mark set insert 0.0
-$w.text configure -state disabled
diff --git a/tk8.6/library/demos/bitmap.tcl b/tk8.6/library/demos/bitmap.tcl
deleted file mode 100644
index 453987d..0000000
--- a/tk8.6/library/demos/bitmap.tcl
+++ /dev/null
@@ -1,52 +0,0 @@
-# bitmap.tcl --
-#
-# This demonstration script creates a toplevel window that displays
-# all of Tk's built-in bitmaps.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-# bitmapRow --
-# Create a row of bitmap items in a window.
-#
-# Arguments:
-# w -		The window that is to contain the row.
-# args -	The names of one or more bitmaps, which will be displayed
-#		in a new row across the bottom of w along with their
-#		names.
-
-proc bitmapRow {w args} {
-    frame $w
-    pack $w -side top -fill both
-    set i 0
-    foreach bitmap $args {
-	frame $w.$i
-	pack $w.$i -side left -fill both -pady .25c -padx .25c
-	label $w.$i.bitmap -bitmap $bitmap
-	label $w.$i.label -text $bitmap -width 9
-	pack $w.$i.label $w.$i.bitmap -side bottom
-	incr i
-    }
-}
-
-set w .bitmap
-catch {destroy $w}
-toplevel $w
-wm title $w "Bitmap Demonstration"
-wm iconname $w "bitmap"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "This window displays all of Tk's built-in bitmaps, along with the names you can use for them in Tcl scripts."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-frame $w.frame
-bitmapRow $w.frame.0 error gray12 gray25 gray50 gray75
-bitmapRow $w.frame.1 hourglass info question questhead warning
-pack $w.frame -side top -expand yes -fill both
diff --git a/tk8.6/library/demos/browse b/tk8.6/library/demos/browse
deleted file mode 100644
index d107f28..0000000
--- a/tk8.6/library/demos/browse
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-# the next line restarts using wish \
-exec wish "$0" ${1+"$@"}
-
-# browse --
-# This script generates a directory browser, which lists the working
-# directory and allows you to open files or subdirectories by
-# double-clicking.
-
-package require Tk
-
-# Create a scrollbar on the right side of the main window and a listbox
-# on the left side.
-
-scrollbar .scroll -command ".list yview"
-pack .scroll -side right -fill y
-listbox .list -yscroll ".scroll set" -relief sunken -width 20 -height 20 \
-	-setgrid yes
-pack .list -side left -fill both -expand yes
-wm minsize . 1 1
-
-# The procedure below is invoked to open a browser on a given file;  if the
-# file is a directory then another instance of this program is invoked; if
-# the file is a regular file then the Mx editor is invoked to display
-# the file.
-
-set browseScript [file join [pwd] $argv0]
-proc browse {dir file} {
-    global env browseScript
-    if {[string compare $dir "."] != 0} {set file $dir/$file}
-    switch [file type $file] {
-	directory {
-	    exec [info nameofexecutable] $browseScript $file &
-	}
-	file {
-	    if {[info exists env(EDITOR)]} {
-		eval exec $env(EDITOR) $file &
-	    } else {
-		exec xedit $file &
-	    }
-	}
-	default {
-	    puts stdout "\"$file\" isn't a directory or regular file"
-	}
-    }
-}
-
-# Fill the listbox with a list of all the files in the directory.
-
-if {$argc>0} {set dir [lindex $argv 0]} else {set dir "."}
-foreach i [lsort [glob * .* *.*]] {
-    if {[file type $i] eq "directory"} {
-	# Safe to do since it is still a directory.
-	append i /
-    }
-    .list insert end $i
-}
-
-# Set up bindings for the browser.
-
-bind all <Control-c> {destroy .}
-bind .list <Double-Button-1> {foreach i [selection get] {browse $dir $i}}
-
-# Local Variables:
-# mode: tcl
-# End:
diff --git a/tk8.6/library/demos/button.tcl b/tk8.6/library/demos/button.tcl
deleted file mode 100644
index bb943e6..0000000
--- a/tk8.6/library/demos/button.tcl
+++ /dev/null
@@ -1,47 +0,0 @@
-# button.tcl --
-#
-# This demonstration script creates a toplevel window containing
-# several button widgets.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .button
-catch {destroy $w}
-toplevel $w
-wm title $w "Button Demonstration"
-wm iconname $w "button"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "If you click on any of the four buttons below, the background of the button area will change to the color indicated in the button.  You can press Tab to move among the buttons, then press Space to invoke the current button."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-pack [addSeeDismiss $w.buttons $w] -side bottom -fill x
-
-proc colorrefresh {w col} {
-    $w configure -bg $col
-    if {[tk windowingsystem] eq "aqua"} {
-	# set highlightbackground of all buttons in $w
-	set l [list $w]
-	while {[llength $l]} {
-	    set l [concat [lassign $l b] [winfo children $b]]
-	    if {[winfo class $b] eq "Button"} {
-		$b configure -highlightbackground $col
-	    }
-	}
-    }
-}
-
-button $w.b1 -text "Peach Puff" -width 10 \
-    -command [list colorrefresh $w PeachPuff1]
-button $w.b2 -text "Light Blue" -width 10 \
-    -command [list colorrefresh $w LightBlue1]
-button $w.b3 -text "Sea Green" -width 10 \
-    -command [list colorrefresh $w SeaGreen2]
-button $w.b4 -text "Yellow" -width 10 \
-    -command [list colorrefresh $w Yellow1]
-pack $w.b1 $w.b2 $w.b3 $w.b4 -side top -expand yes -pady 2
diff --git a/tk8.6/library/demos/check.tcl b/tk8.6/library/demos/check.tcl
deleted file mode 100644
index c072096..0000000
--- a/tk8.6/library/demos/check.tcl
+++ /dev/null
@@ -1,71 +0,0 @@
-# check.tcl --
-#
-# This demonstration script creates a toplevel window containing
-# several checkbuttons.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .check
-catch {destroy $w}
-toplevel $w
-wm title $w "Checkbutton Demonstration"
-wm iconname $w "check"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "Four checkbuttons are displayed below.  If you click on a button, it will toggle the button's selection state and set a Tcl variable to a value indicating the state of the checkbutton.  The first button also follows the state of the other three.  If only some of the three are checked, the first button will display the tri-state mode. Click the \"See Variables\" button to see the current values of the variables."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w [list safety wipers brakes sober]]
-pack $btns -side bottom -fill x
-
-checkbutton $w.b0 -text "Safety Check" -variable safety -relief flat \
-    -onvalue "all" \
-    -offvalue "none" \
-    -tristatevalue "partial"
-checkbutton $w.b1 -text "Wipers OK" -variable wipers -relief flat
-checkbutton $w.b2 -text "Brakes OK" -variable brakes -relief flat
-checkbutton $w.b3 -text "Driver Sober" -variable sober -relief flat
-pack $w.b0 -side top -pady 2 -anchor w
-pack $w.b1 $w.b2 $w.b3 -side top -pady 2 -anchor w -padx 15
-
-## This code makes $w.b0 function as a tri-state button; it's not
-## needed at all for just straight yes/no buttons.
-
-set in_check 0
-proc tristate_check {n1 n2 op} {
-    global safety wipers brakes sober in_check
-    if {$in_check} {
-	return
-    }
-    set in_check 1
-    if {$n1 eq "safety"} {
-	if {$safety eq "none"} {
-	    set wipers 0
-	    set brakes 0
-	    set sober 0
-	} elseif {$safety eq "all"} {
-	    set wipers 1
-	    set brakes 1
-	    set sober 1
-	}
-    } else {
-	if {$wipers == 1 && $brakes == 1 && $sober == 1} {
-	    set safety all
-	} elseif {$wipers == 1 || $brakes == 1 || $sober == 1} {
-	    set safety partial
-	} else {
-	    set safety none
-	}
-    }
-    set in_check 0
-}
-
-trace variable wipers w tristate_check
-trace variable brakes w tristate_check
-trace variable sober  w tristate_check
-trace variable safety w tristate_check
diff --git a/tk8.6/library/demos/clrpick.tcl b/tk8.6/library/demos/clrpick.tcl
deleted file mode 100644
index ba50b75..0000000
--- a/tk8.6/library/demos/clrpick.tcl
+++ /dev/null
@@ -1,54 +0,0 @@
-# clrpick.tcl --
-#
-# This demonstration script prompts the user to select a color.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .clrpick
-catch {destroy $w}
-toplevel $w
-wm title $w "Color Selection Dialog"
-wm iconname $w "colors"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "Press the buttons below to choose the foreground and background colors for the widgets in this window."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-button $w.back -text "Set background color ..." \
-    -command \
-    "setColor $w $w.back background {-background -highlightbackground}"
-button $w.fore -text "Set foreground color ..." \
-    -command \
-    "setColor $w $w.back foreground -foreground"
-
-pack $w.back $w.fore -side top -anchor c -pady 2m
-
-proc setColor {w button name options} {
-    grab $w
-    set initialColor [$button cget -$name]
-    set color [tk_chooseColor -title "Choose a $name color" -parent $w \
-	-initialcolor $initialColor]
-    if {[string compare $color ""]} {
-	setColor_helper $w $options $color
-    }
-    grab release $w
-}
-
-proc setColor_helper {w options color} {
-    foreach option $options {
-	catch {
-	    $w config $option $color
-	}
-    }
-    foreach child [winfo children $w] {
-	setColor_helper $child $options $color
-    }
-}
diff --git a/tk8.6/library/demos/colors.tcl b/tk8.6/library/demos/colors.tcl
deleted file mode 100644
index 99dec92..0000000
--- a/tk8.6/library/demos/colors.tcl
+++ /dev/null
@@ -1,99 +0,0 @@
-# colors.tcl --
-#
-# This demonstration script creates a listbox widget that displays
-# many of the colors from the X color database.  You can click on
-# a color to change the application's palette.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .colors
-catch {destroy $w}
-toplevel $w
-wm title $w "Listbox Demonstration (colors)"
-wm iconname $w "Listbox"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "A listbox containing several color names is displayed below, along with a scrollbar.  You can scan the list either using the scrollbar or by dragging in the listbox window with button 2 pressed.  If you double-click button 1 on a color, then the application's color palette will be set to match that color"
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-frame $w.frame -borderwidth 10
-pack $w.frame -side top -expand yes -fill y
-
-scrollbar $w.frame.scroll -command "$w.frame.list yview"
-listbox $w.frame.list -yscroll "$w.frame.scroll set" \
-	-width 20 -height 16 -setgrid 1
-pack $w.frame.list $w.frame.scroll -side left -fill y -expand 1
-
-bind $w.frame.list <Double-1> {
-    tk_setPalette [selection get]
-}
-$w.frame.list insert 0 gray60 gray70 gray80 gray85 gray90 gray95 \
-    snow1 snow2 snow3 snow4 seashell1 seashell2 \
-    seashell3 seashell4 AntiqueWhite1 AntiqueWhite2 AntiqueWhite3 \
-    AntiqueWhite4 bisque1 bisque2 bisque3 bisque4 PeachPuff1 \
-    PeachPuff2 PeachPuff3 PeachPuff4 NavajoWhite1 NavajoWhite2 \
-    NavajoWhite3 NavajoWhite4 LemonChiffon1 LemonChiffon2 \
-    LemonChiffon3 LemonChiffon4 cornsilk1 cornsilk2 cornsilk3 \
-    cornsilk4 ivory1 ivory2 ivory3 ivory4 honeydew1 honeydew2 \
-    honeydew3 honeydew4 LavenderBlush1 LavenderBlush2 \
-    LavenderBlush3 LavenderBlush4 MistyRose1 MistyRose2 \
-    MistyRose3 MistyRose4 azure1 azure2 azure3 azure4 \
-    SlateBlue1 SlateBlue2 SlateBlue3 SlateBlue4 RoyalBlue1 \
-    RoyalBlue2 RoyalBlue3 RoyalBlue4 blue1 blue2 blue3 blue4 \
-    DodgerBlue1 DodgerBlue2 DodgerBlue3 DodgerBlue4 SteelBlue1 \
-    SteelBlue2 SteelBlue3 SteelBlue4 DeepSkyBlue1 DeepSkyBlue2 \
-    DeepSkyBlue3 DeepSkyBlue4 SkyBlue1 SkyBlue2 SkyBlue3 \
-    SkyBlue4 LightSkyBlue1 LightSkyBlue2 LightSkyBlue3 \
-    LightSkyBlue4 SlateGray1 SlateGray2 SlateGray3 SlateGray4 \
-    LightSteelBlue1 LightSteelBlue2 LightSteelBlue3 \
-    LightSteelBlue4 LightBlue1 LightBlue2 LightBlue3 \
-    LightBlue4 LightCyan1 LightCyan2 LightCyan3 LightCyan4 \
-    PaleTurquoise1 PaleTurquoise2 PaleTurquoise3 PaleTurquoise4 \
-    CadetBlue1 CadetBlue2 CadetBlue3 CadetBlue4 turquoise1 \
-    turquoise2 turquoise3 turquoise4 cyan1 cyan2 cyan3 cyan4 \
-    DarkSlateGray1 DarkSlateGray2 DarkSlateGray3 \
-    DarkSlateGray4 aquamarine1 aquamarine2 aquamarine3 \
-    aquamarine4 DarkSeaGreen1 DarkSeaGreen2 DarkSeaGreen3 \
-    DarkSeaGreen4 SeaGreen1 SeaGreen2 SeaGreen3 SeaGreen4 \
-    PaleGreen1 PaleGreen2 PaleGreen3 PaleGreen4 SpringGreen1 \
-    SpringGreen2 SpringGreen3 SpringGreen4 green1 green2 \
-    green3 green4 chartreuse1 chartreuse2 chartreuse3 \
-    chartreuse4 OliveDrab1 OliveDrab2 OliveDrab3 OliveDrab4 \
-    DarkOliveGreen1 DarkOliveGreen2 DarkOliveGreen3 \
-    DarkOliveGreen4 khaki1 khaki2 khaki3 khaki4 \
-    LightGoldenrod1 LightGoldenrod2 LightGoldenrod3 \
-    LightGoldenrod4 LightYellow1 LightYellow2 LightYellow3 \
-    LightYellow4 yellow1 yellow2 yellow3 yellow4 gold1 gold2 \
-    gold3 gold4 goldenrod1 goldenrod2 goldenrod3 goldenrod4 \
-    DarkGoldenrod1 DarkGoldenrod2 DarkGoldenrod3 DarkGoldenrod4 \
-    RosyBrown1 RosyBrown2 RosyBrown3 RosyBrown4 IndianRed1 \
-    IndianRed2 IndianRed3 IndianRed4 sienna1 sienna2 sienna3 \
-    sienna4 burlywood1 burlywood2 burlywood3 burlywood4 wheat1 \
-    wheat2 wheat3 wheat4 tan1 tan2 tan3 tan4 chocolate1 \
-    chocolate2 chocolate3 chocolate4 firebrick1 firebrick2 \
-    firebrick3 firebrick4 brown1 brown2 brown3 brown4 salmon1 \
-    salmon2 salmon3 salmon4 LightSalmon1 LightSalmon2 \
-    LightSalmon3 LightSalmon4 orange1 orange2 orange3 orange4 \
-    DarkOrange1 DarkOrange2 DarkOrange3 DarkOrange4 coral1 \
-    coral2 coral3 coral4 tomato1 tomato2 tomato3 tomato4 \
-    OrangeRed1 OrangeRed2 OrangeRed3 OrangeRed4 red1 red2 red3 \
-    red4 DeepPink1 DeepPink2 DeepPink3 DeepPink4 HotPink1 \
-    HotPink2 HotPink3 HotPink4 pink1 pink2 pink3 pink4 \
-    LightPink1 LightPink2 LightPink3 LightPink4 PaleVioletRed1 \
-    PaleVioletRed2 PaleVioletRed3 PaleVioletRed4 maroon1 \
-    maroon2 maroon3 maroon4 VioletRed1 VioletRed2 VioletRed3 \
-    VioletRed4 magenta1 magenta2 magenta3 magenta4 orchid1 \
-    orchid2 orchid3 orchid4 plum1 plum2 plum3 plum4 \
-    MediumOrchid1 MediumOrchid2 MediumOrchid3 MediumOrchid4 \
-    DarkOrchid1 DarkOrchid2 DarkOrchid3 DarkOrchid4 purple1 \
-    purple2 purple3 purple4 MediumPurple1 MediumPurple2 \
-    MediumPurple3 MediumPurple4 thistle1 thistle2 thistle3 \
-    thistle4
diff --git a/tk8.6/library/demos/combo.tcl b/tk8.6/library/demos/combo.tcl
deleted file mode 100644
index 8631904..0000000
--- a/tk8.6/library/demos/combo.tcl
+++ /dev/null
@@ -1,61 +0,0 @@
-# combo.tcl --
-#
-# This demonstration script creates several combobox widgets.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .combo
-catch {destroy $w}
-toplevel $w
-wm title $w "Combobox Demonstration"
-wm iconname $w "combo"
-positionWindow $w
-
-ttk::label $w.msg -font $font -wraplength 5i -justify left -text "Three different\
-	combo-boxes are displayed below. You can add characters to the first\
-	one by pointing, clicking and typing, just as with an entry; pressing\
-	Return will cause the current value to be added to the list that is\
-	selectable from the drop-down list, and you can choose other values\
-	by pressing the Down key, using the arrow keys to pick another one,\
-	and pressing Return again. The second combo-box is fixed to a\
-	particular value, and cannot be modified at all. The third one only\
-	allows you to select values from its drop-down list of Australian\
-	cities."
-pack $w.msg -side top -fill x
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w {firstValue secondValue ozCity}]
-pack $btns -side bottom -fill x
-
-ttk::frame $w.f
-pack $w.f -fill both -expand 1
-set w $w.f
-
-set australianCities {
-    Canberra Sydney Melbourne Perth Adelaide Brisbane
-    Hobart Darwin "Alice Springs"
-}
-set secondValue unchangable
-set ozCity Sydney
-
-ttk::labelframe $w.c1 -text "Fully Editable"
-ttk::combobox $w.c1.c -textvariable firstValue
-ttk::labelframe $w.c2 -text Disabled
-ttk::combobox $w.c2.c -textvariable secondValue -state disabled
-ttk::labelframe $w.c3 -text "Defined List Only"
-ttk::combobox $w.c3.c -textvariable ozCity -state readonly \
-	-values $australianCities
-bind $w.c1.c <Return> {
-    if {[%W get] ni [%W cget -values]} {
-	%W configure -values [concat [%W cget -values] [list [%W get]]]
-    }
-}
-
-pack $w.c1 $w.c2 $w.c3 -side top -pady 5 -padx 10
-pack $w.c1.c -pady 5 -padx 10
-pack $w.c2.c -pady 5 -padx 10
-pack $w.c3.c -pady 5 -padx 10
diff --git a/tk8.6/library/demos/cscroll.tcl b/tk8.6/library/demos/cscroll.tcl
deleted file mode 100644
index f6e88f4..0000000
--- a/tk8.6/library/demos/cscroll.tcl
+++ /dev/null
@@ -1,108 +0,0 @@
-# cscroll.tcl --
-#
-# This demonstration script creates a simple canvas that can be
-# scrolled in two dimensions.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .cscroll
-catch {destroy $w}
-toplevel $w
-wm title $w "Scrollable Canvas Demonstration"
-wm iconname $w "cscroll"
-positionWindow $w
-set c $w.c
-
-label $w.msg -font $font -wraplength 4i -justify left -text "This window displays a canvas widget that can be scrolled either using the scrollbars or by dragging with button 2 in the canvas.  If you click button 1 on one of the rectangles, its indices will be printed on stdout."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-frame $w.grid
-scrollbar $w.hscroll -orient horiz -command "$c xview"
-scrollbar $w.vscroll -command "$c yview"
-canvas $c -relief sunken -borderwidth 2 -scrollregion {-11c -11c 50c 20c} \
-	-xscrollcommand "$w.hscroll set" \
-	-yscrollcommand "$w.vscroll set"
-pack $w.grid -expand yes -fill both -padx 1 -pady 1
-grid rowconfig    $w.grid 0 -weight 1 -minsize 0
-grid columnconfig $w.grid 0 -weight 1 -minsize 0
-
-grid $c -padx 1 -in $w.grid -pady 1 \
-    -row 0 -column 0 -rowspan 1 -columnspan 1 -sticky news
-grid $w.vscroll -in $w.grid -padx 1 -pady 1 \
-    -row 0 -column 1 -rowspan 1 -columnspan 1 -sticky news
-grid $w.hscroll -in $w.grid -padx 1 -pady 1 \
-    -row 1 -column 0 -rowspan 1 -columnspan 1 -sticky news
-
-
-set bg [lindex [$c config -bg] 4]
-for {set i 0} {$i < 20} {incr i} {
-    set x [expr {-10 + 3*$i}]
-    for {set j 0; set y -10} {$j < 10} {incr j; incr y 3} {
-	$c create rect ${x}c ${y}c [expr {$x+2}]c [expr {$y+2}]c \
-		-outline black -fill $bg -tags rect
-	$c create text [expr {$x+1}]c [expr {$y+1}]c -text "$i,$j" \
-	    -anchor center -tags text
-    }
-}
-
-$c bind all <Any-Enter> "scrollEnter $c"
-$c bind all <Any-Leave> "scrollLeave $c"
-$c bind all <1> "scrollButton $c"
-bind $c <2> "$c scan mark %x %y"
-bind $c <B2-Motion> "$c scan dragto %x %y"
-if {[tk windowingsystem] eq "aqua"} {
-    bind $c <MouseWheel> {
-        %W yview scroll [expr {- (%D)}] units
-    }
-    bind $c <Option-MouseWheel> {
-        %W yview scroll [expr {-10 * (%D)}] units
-    }
-    bind $c <Shift-MouseWheel> {
-        %W xview scroll [expr {- (%D)}] units
-    }
-    bind $c <Shift-Option-MouseWheel> {
-        %W xview scroll [expr {-10 * (%D)}] units
-    }
-}
-
-proc scrollEnter canvas {
-    global oldFill
-    set id [$canvas find withtag current]
-    if {[lsearch [$canvas gettags current] text] >= 0} {
-	set id [expr {$id-1}]
-    }
-    set oldFill [lindex [$canvas itemconfig $id -fill] 4]
-    if {[winfo depth $canvas] > 1} {
-	$canvas itemconfigure $id -fill SeaGreen1
-    } else {
-	$canvas itemconfigure $id -fill black
-	$canvas itemconfigure [expr {$id+1}] -fill white
-    }
-}
-
-proc scrollLeave canvas {
-    global oldFill
-    set id [$canvas find withtag current]
-    if {[lsearch [$canvas gettags current] text] >= 0} {
-	set id [expr {$id-1}]
-    }
-    $canvas itemconfigure $id -fill $oldFill
-    $canvas itemconfigure [expr {$id+1}] -fill black
-}
-
-proc scrollButton canvas {
-    global oldFill
-    set id [$canvas find withtag current]
-    if {[lsearch [$canvas gettags current] text] < 0} {
-	set id [expr {$id+1}]
-    }
-    puts stdout "You buttoned at [lindex [$canvas itemconf $id -text] 4]"
-}
diff --git a/tk8.6/library/demos/ctext.tcl b/tk8.6/library/demos/ctext.tcl
deleted file mode 100644
index 4b8c644..0000000
--- a/tk8.6/library/demos/ctext.tcl
+++ /dev/null
@@ -1,172 +0,0 @@
-# ctext.tcl --
-#
-# This demonstration script creates a canvas widget with a text
-# item that can be edited and reconfigured in various ways.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .ctext
-catch {destroy $w}
-toplevel $w
-wm title $w "Canvas Text Demonstration"
-wm iconname $w "Text"
-positionWindow $w
-set c $w.c
-
-label $w.msg -font $font -wraplength 5i -justify left -text "This window displays a string of text to demonstrate the text facilities of canvas widgets.  You can click in the boxes to adjust the position of the text relative to its positioning point or change its justification, and on a pie slice to change its angle.  The text also supports the following simple bindings for editing:
-  1. You can point, click, and type.
-  2. You can also select with button 1.
-  3. You can copy the selection to the mouse position with button 2.
-  4. Backspace and Control+h delete the selection if there is one;
-     otherwise they delete the character just before the insertion cursor.
-  5. Delete deletes the selection if there is one; otherwise it deletes
-     the character just after the insertion cursor."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-canvas $c -relief flat -borderwidth 0 -width 500 -height 350
-pack $w.c -side top -expand yes -fill both
-
-set textFont {Helvetica 24}
-
-$c create rectangle 245 195 255 205 -outline black -fill red
-
-# First, create the text item and give it bindings so it can be edited.
-
-$c addtag text withtag [$c create text 250 200 -text "This is just a string of text to demonstrate the text facilities of canvas widgets. Bindings have been been defined to support editing (see above)." -width 440 -anchor n -font $textFont -justify left]
-$c bind text <1> "textB1Press $c %x %y"
-$c bind text <B1-Motion> "textB1Move $c %x %y"
-$c bind text <Shift-1> "$c select adjust current @%x,%y"
-$c bind text <Shift-B1-Motion> "textB1Move $c %x %y"
-$c bind text <KeyPress> "textInsert $c %A"
-$c bind text <Return> "textInsert $c \\n"
-$c bind text <Control-h> "textBs $c"
-$c bind text <BackSpace> "textBs $c"
-$c bind text <Delete> "textDel $c"
-$c bind text <2> "textPaste $c @%x,%y"
-
-# Next, create some items that allow the text's anchor position
-# to be edited.
-
-proc mkTextConfigBox {w x y option value color} {
-    set item [$w create rect $x $y [expr {$x+30}] [expr {$y+30}] \
-	    -outline black -fill $color -width 1]
-    $w bind $item <1> "$w itemconf text $option $value"
-    $w addtag config withtag $item
-}
-proc mkTextConfigPie {w x y a option value color} {
-    set item [$w create arc $x $y [expr {$x+90}] [expr {$y+90}] \
-	    -start [expr {$a-15}] -extent 30 -outline black -fill $color \
-	    -width 1]
-    $w bind $item <1> "$w itemconf text $option $value"
-    $w addtag config withtag $item
-}
-
-set x 50
-set y 50
-set color LightSkyBlue1
-mkTextConfigBox $c $x $y -anchor se $color
-mkTextConfigBox $c [expr {$x+30}] [expr {$y   }] -anchor s      $color
-mkTextConfigBox $c [expr {$x+60}] [expr {$y   }] -anchor sw     $color
-mkTextConfigBox $c [expr {$x   }] [expr {$y+30}] -anchor e      $color
-mkTextConfigBox $c [expr {$x+30}] [expr {$y+30}] -anchor center $color
-mkTextConfigBox $c [expr {$x+60}] [expr {$y+30}] -anchor w      $color
-mkTextConfigBox $c [expr {$x   }] [expr {$y+60}] -anchor ne     $color
-mkTextConfigBox $c [expr {$x+30}] [expr {$y+60}] -anchor n      $color
-mkTextConfigBox $c [expr {$x+60}] [expr {$y+60}] -anchor nw     $color
-set item [$c create rect \
-	[expr {$x+40}] [expr {$y+40}] [expr {$x+50}] [expr {$y+50}] \
-	-outline black -fill red]
-$c bind $item <1> "$c itemconf text -anchor center"
-$c create text [expr {$x+45}] [expr {$y-5}] \
-	-text {Text Position}  -anchor s  -font {Times 20}  -fill brown
-
-# Now create some items that allow the text's angle to be changed.
-
-set x 205
-set y 50
-set color Yellow
-mkTextConfigPie $c $x $y   0 -angle  90 $color
-mkTextConfigPie $c $x $y  30 -angle 120 $color
-mkTextConfigPie $c $x $y  60 -angle 150 $color
-mkTextConfigPie $c $x $y  90 -angle 180 $color
-mkTextConfigPie $c $x $y 120 -angle 210 $color
-mkTextConfigPie $c $x $y 150 -angle 240 $color
-mkTextConfigPie $c $x $y 180 -angle 270 $color
-mkTextConfigPie $c $x $y 210 -angle 300 $color
-mkTextConfigPie $c $x $y 240 -angle 330 $color
-mkTextConfigPie $c $x $y 270 -angle   0 $color
-mkTextConfigPie $c $x $y 300 -angle  30 $color
-mkTextConfigPie $c $x $y 330 -angle  60 $color
-$c create text [expr {$x+45}] [expr {$y-5}] \
-	-text {Text Angle}  -anchor s  -font {Times 20}  -fill brown
-
-# Lastly, create some items that allow the text's justification to be
-# changed.
-
-set x 350
-set y 50
-set color SeaGreen2
-mkTextConfigBox $c $x $y -justify left $color
-mkTextConfigBox $c [expr {$x+30}] $y -justify center $color
-mkTextConfigBox $c [expr {$x+60}] $y -justify right $color
-$c create text [expr {$x+45}] [expr {$y-5}] \
-	-text {Justification}  -anchor s  -font {Times 20}  -fill brown
-
-$c bind config <Enter> "textEnter $c"
-$c bind config <Leave> "$c itemconf current -fill \$textConfigFill"
-
-set textConfigFill {}
-
-proc textEnter {w} {
-    global textConfigFill
-    set textConfigFill [lindex [$w itemconfig current -fill] 4]
-    $w itemconfig current -fill black
-}
-
-proc textInsert {w string} {
-    if {$string == ""} {
-	return
-    }
-    catch {$w dchars text sel.first sel.last}
-    $w insert text insert $string
-}
-
-proc textPaste {w pos} {
-    catch {
-	$w insert text $pos [selection get]
-    }
-}
-
-proc textB1Press {w x y} {
-    $w icursor current @$x,$y
-    $w focus current
-    focus $w
-    $w select from current @$x,$y
-}
-
-proc textB1Move {w x y} {
-    $w select to current @$x,$y
-}
-
-proc textBs {w} {
-    if {![catch {$w dchars text sel.first sel.last}]} {
-	return
-    }
-    set char [expr {[$w index text insert] - 1}]
-    if {$char >= 0} {$w dchar text $char}
-}
-
-proc textDel {w} {
-    if {![catch {$w dchars text sel.first sel.last}]} {
-	return
-    }
-    $w dchars text insert
-}
diff --git a/tk8.6/library/demos/dialog1.tcl b/tk8.6/library/demos/dialog1.tcl
deleted file mode 100644
index 5c572be..0000000
--- a/tk8.6/library/demos/dialog1.tcl
+++ /dev/null
@@ -1,13 +0,0 @@
-# dialog1.tcl --
-#
-# This demonstration script creates a dialog box with a local grab.
-
-after idle {.dialog1.msg configure -wraplength 4i}
-set i [tk_dialog .dialog1 "Dialog with local grab" {This is a modal dialog box.  It uses Tk's "grab" command to create a "local grab" on the dialog box.  The grab prevents any pointer-related events from getting to any other windows in the application until you have answered the dialog by invoking one of the buttons below.  However, you can still interact with other applications.} \
-info 0 OK Cancel {Show Code}]
-
-switch $i {
-    0 {puts "You pressed OK"}
-    1 {puts "You pressed Cancel"}
-    2 {showCode .dialog1}
-}
diff --git a/tk8.6/library/demos/dialog2.tcl b/tk8.6/library/demos/dialog2.tcl
deleted file mode 100644
index 2f45da8..0000000
--- a/tk8.6/library/demos/dialog2.tcl
+++ /dev/null
@@ -1,17 +0,0 @@
-# dialog2.tcl --
-#
-# This demonstration script creates a dialog box with a global grab.
-
-after idle {
-    .dialog2.msg configure -wraplength 4i
-}
-after 100 {
-    grab -global .dialog2
-}
-set i [tk_dialog .dialog2 "Dialog with global grab" {This dialog box uses a global grab, so it prevents you from interacting with anything on your display until you invoke one of the buttons below.  Global grabs are almost always a bad idea; don't use them unless you're truly desperate.} warning 0 OK Cancel {Show Code}]
-
-switch $i {
-    0 {puts "You pressed OK"}
-    1 {puts "You pressed Cancel"}
-    2 {showCode .dialog2}
-}
diff --git a/tk8.6/library/demos/en.msg b/tk8.6/library/demos/en.msg
deleted file mode 100644
index 05d4a64..0000000
--- a/tk8.6/library/demos/en.msg
+++ /dev/null
@@ -1,97 +0,0 @@
-::msgcat::mcset en "Widget Demonstration"
-::msgcat::mcset en "tkWidgetDemo"
-::msgcat::mcset en "&File"
-::msgcat::mcset en "About..."
-::msgcat::mcset en "&About..."
-::msgcat::mcset en "<F1>"
-::msgcat::mcset en "&Quit"
-::msgcat::mcset en "Meta+Q"		;# Displayed hotkey
-::msgcat::mcset en "Meta-q"		;# Actual binding sequence
-::msgcat::mcset en "Ctrl+Q"		;# Displayed hotkey
-::msgcat::mcset en "Control-q"		;# Actual binding sequence
-::msgcat::mcset en "Variable values"
-::msgcat::mcset en "Variable values:"
-::msgcat::mcset en "OK"
-::msgcat::mcset en "Run the \"%s\" sample program"
-::msgcat::mcset en "Dismiss"
-::msgcat::mcset en "Rerun Demo"
-::msgcat::mcset en "Demo code: %s"
-::msgcat::mcset en "About Widget Demo"
-::msgcat::mcset en "Tk widget demonstration application"
-::msgcat::mcset en "Copyright © %s"
-::msgcat::mcset en "
-    @@title
-    Tk Widget Demonstrations
-    @@newline
-    @@normal
-    @@newline
-
-    This application provides a front end for several short scripts
-    that demonstrate what you can do with Tk widgets.  Each of the
-    numbered lines below describes a demonstration;  you can click on
-    it to invoke the demonstration.  Once the demonstration window
-    appears, you can click the
-    @@bold
-    See Code
-    @@normal
-    button to see the Tcl/Tk code that created the demonstration.  If
-    you wish, you can edit the code and click the
-    @@bold
-    Rerun Demo
-    @@normal
-    button in the code window to reinvoke the demonstration with the
-    modified code.
-    @@newline
-"
-::msgcat::mcset en "Labels, buttons, checkbuttons, and radiobuttons"
-::msgcat::mcset en "Labels (text and bitmaps)"
-::msgcat::mcset en "Labels and UNICODE text"
-::msgcat::mcset en "Buttons"
-::msgcat::mcset en "Check-buttons (select any of a group)"
-::msgcat::mcset en "Radio-buttons (select one of a group)"
-::msgcat::mcset en "A 15-puzzle game made out of buttons"
-::msgcat::mcset en "Iconic buttons that use bitmaps"
-::msgcat::mcset en "Two labels displaying images"
-::msgcat::mcset en "A simple user interface for viewing images"
-::msgcat::mcset en "Labelled frames"
-::msgcat::mcset en "Listboxes"
-::msgcat::mcset en "The 50 states"
-::msgcat::mcset en "Colors: change the color scheme for the application"
-::msgcat::mcset en "A collection of famous and infamous sayings"
-::msgcat::mcset en "Entries and Spin-boxes"
-::msgcat::mcset en "Entries without scrollbars"
-::msgcat::mcset en "Entries with scrollbars"
-::msgcat::mcset en "Validated entries and password fields"
-::msgcat::mcset en "Spin-boxes"
-::msgcat::mcset en "Simple Rolodex-like form"
-::msgcat::mcset en "Text"
-::msgcat::mcset en "Basic editable text"
-::msgcat::mcset en "Text display styles"
-::msgcat::mcset en "Hypertext (tag bindings)"
-::msgcat::mcset en "A text widget with embedded windows"
-::msgcat::mcset en "A search tool built with a text widget"
-::msgcat::mcset en "Canvases"
-::msgcat::mcset en "The canvas item types"
-::msgcat::mcset en "A simple 2-D plot"
-::msgcat::mcset en "Text items in canvases"
-::msgcat::mcset en "An editor for arrowheads on canvas lines"
-::msgcat::mcset en "A ruler with adjustable tab stops"
-::msgcat::mcset en "A building floor plan"
-::msgcat::mcset en "A simple scrollable canvas"
-::msgcat::mcset en "Scales"
-::msgcat::mcset en "Horizontal scale"
-::msgcat::mcset en "Vertical scale"
-::msgcat::mcset en "Paned Windows"
-::msgcat::mcset en "Horizontal paned window"
-::msgcat::mcset en "Vertical paned window"
-::msgcat::mcset en "Menus"
-::msgcat::mcset en "Menus and cascades (sub-menus)"
-::msgcat::mcset en "Menu-buttons"
-::msgcat::mcset en "Common Dialogs"
-::msgcat::mcset en "Message boxes"
-::msgcat::mcset en "File selection dialog"
-::msgcat::mcset en "Color picker"
-::msgcat::mcset en "Miscellaneous"
-::msgcat::mcset en "The built-in bitmaps"
-::msgcat::mcset en "A dialog box with a local grab"
-::msgcat::mcset en "A dialog box with a global grab"
diff --git a/tk8.6/library/demos/entry1.tcl b/tk8.6/library/demos/entry1.tcl
deleted file mode 100644
index eef8964..0000000
--- a/tk8.6/library/demos/entry1.tcl
+++ /dev/null
@@ -1,34 +0,0 @@
-# entry1.tcl --
-#
-# This demonstration script creates several entry widgets without
-# scrollbars.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .entry1
-catch {destroy $w}
-toplevel $w
-wm title $w "Entry Demonstration (no scrollbars)"
-wm iconname $w "entry1"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 5i -justify left -text "Three different entries are displayed below.  You can add characters by pointing, clicking and typing.  The normal Motif editing characters are supported, along with many Emacs bindings.  For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor.  For entries that are too large to fit in the window all at once, you can scan through the entries by dragging with mouse button2 pressed."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-entry $w.e1
-entry $w.e2
-entry $w.e3
-pack $w.e1 $w.e2 $w.e3 -side top -pady 5 -padx 10 -fill x
-
-$w.e1 insert 0 "Initial value"
-$w.e2 insert end "This entry contains a long value, much too long "
-$w.e2 insert end "to fit in the window at one time, so long in fact "
-$w.e2 insert end "that you'll have to scan or scroll to see the end."
diff --git a/tk8.6/library/demos/entry2.tcl b/tk8.6/library/demos/entry2.tcl
deleted file mode 100644
index 9e3f4ef..0000000
--- a/tk8.6/library/demos/entry2.tcl
+++ /dev/null
@@ -1,46 +0,0 @@
-# entry2.tcl --
-#
-# This demonstration script is the same as the entry1.tcl script
-# except that it creates scrollbars for the entries.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .entry2
-catch {destroy $w}
-toplevel $w
-wm title $w "Entry Demonstration (with scrollbars)"
-wm iconname $w "entry2"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 5i -justify left -text "Three different entries are displayed below, with a scrollbar for each entry.  You can add characters by pointing, clicking and typing.  The normal Motif editing characters are supported, along with many Emacs bindings.  For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor.  For entries that are too large to fit in the window all at once, you can scan through the entries with the scrollbars, or by dragging with mouse button2 pressed."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-frame $w.frame -borderwidth 10
-pack $w.frame -side top -fill x -expand 1
-
-entry $w.frame.e1 -xscrollcommand "$w.frame.s1 set"
-ttk::scrollbar $w.frame.s1 -orient horiz -command \
-	"$w.frame.e1 xview"
-frame $w.frame.spacer1 -width 20 -height 10
-entry $w.frame.e2 -xscrollcommand "$w.frame.s2 set"
-ttk::scrollbar $w.frame.s2 -orient horiz -command \
-	"$w.frame.e2 xview"
-frame $w.frame.spacer2 -width 20 -height 10
-entry $w.frame.e3 -xscrollcommand "$w.frame.s3 set"
-ttk::scrollbar $w.frame.s3 -orient horiz -command \
-	"$w.frame.e3 xview"
-pack $w.frame.e1 $w.frame.s1 $w.frame.spacer1 $w.frame.e2 $w.frame.s2 \
-	$w.frame.spacer2 $w.frame.e3 $w.frame.s3 -side top -fill x
-
-$w.frame.e1 insert 0 "Initial value"
-$w.frame.e2 insert end "This entry contains a long value, much too long "
-$w.frame.e2 insert end "to fit in the window at one time, so long in fact "
-$w.frame.e2 insert end "that you'll have to scan or scroll to see the end."
diff --git a/tk8.6/library/demos/entry3.tcl b/tk8.6/library/demos/entry3.tcl
deleted file mode 100644
index d4435c6..0000000
--- a/tk8.6/library/demos/entry3.tcl
+++ /dev/null
@@ -1,185 +0,0 @@
-# entry3.tcl --
-#
-# This demonstration script creates several entry widgets whose
-# permitted input is constrained in some way.  It also shows off a
-# password entry.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .entry3
-catch {destroy $w}
-toplevel $w
-wm title $w "Constrained Entry Demonstration"
-wm iconname $w "entry3"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 5i -justify left -text "Four different\
-	entries are displayed below.  You can add characters by pointing,\
-	clicking and typing, though each is constrained in what it will\
-	accept.  The first only accepts 32-bit integers or the empty string\
-	(checking when focus leaves it) and will flash to indicate any\
-	problem.  The second only accepts strings with fewer than ten\
-	characters and sounds the bell when an attempt to go over the limit\
-	is made.  The third accepts US phone numbers, mapping letters to\
-	their digit equivalent and sounding the bell on encountering an\
-	illegal character or if trying to type over a character that is not\
-	a digit.  The fourth is a password field that accepts up to eight\
-	characters (silently ignoring further ones), and displaying them as\
-	asterisk characters."
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-# focusAndFlash --
-# Error handler for entry widgets that forces the focus onto the
-# widget and makes the widget flash by exchanging the foreground and
-# background colours at intervals of 200ms (i.e. at approximately
-# 2.5Hz).
-#
-# Arguments:
-# W -		Name of entry widget to flash
-# fg -		Initial foreground colour
-# bg -		Initial background colour
-# count -	Counter to control the number of times flashed
-
-proc focusAndFlash {W fg bg {count 9}} {
-    focus -force $W
-    if {$count<1} {
-	$W configure -foreground $fg -background $bg
-    } else {
-	if {$count%2} {
-	    $W configure -foreground $bg -background $fg
-	} else {
-	    $W configure -foreground $fg -background $bg
-	}
-	after 200 [list focusAndFlash $W $fg $bg [expr {$count-1}]]
-    }
-}
-
-labelframe $w.l1 -text "Integer Entry"
-# Alternatively try using {string is digit} for arbitrary length numbers,
-# and not just 32-bit ones.
-entry $w.l1.e -validate focus -vcmd {string is integer %P}
-$w.l1.e configure -invalidcommand \
-	"focusAndFlash %W [$w.l1.e cget -fg] [$w.l1.e cget -bg]"
-pack $w.l1.e -fill x -expand 1 -padx 1m -pady 1m
-
-labelframe $w.l2 -text "Length-Constrained Entry"
-entry $w.l2.e -validate key -invcmd bell -vcmd {expr {[string length %P]<10}}
-pack $w.l2.e -fill x -expand 1 -padx 1m -pady 1m
-
-### PHONE NUMBER ENTRY ###
-# Note that the source to this is quite a bit longer as the behaviour
-# demonstrated is a lot more ambitious than with the others.
-
-# Initial content for the third entry widget
-set entry3content "1-(000)-000-0000"
-# Mapping from alphabetic characters to numbers.  This is probably
-# wrong, but it is the only mapping I have; the UK doesn't really go
-# for associating letters with digits for some reason.
-set phoneNumberMap {}
-foreach {chars digit} {abc 2 def 3 ghi 4 jkl 5 mno 6 pqrs 7 tuv 8 wxyz 9} {
-    foreach char [split $chars ""] {
-	lappend phoneNumberMap $char $digit [string toupper $char] $digit
-    }
-}
-
-# validatePhoneChange --
-# Checks that the replacement (mapped to a digit) of the given
-# character in an entry widget at the given position will leave a
-# valid phone number in the widget.
-#
-# W -	  The entry widget to validate
-# vmode - The widget's validation mode
-# idx -	  The index where replacement is to occur
-# char -  The character (or string, though that will always be
-#	  refused) to be overwritten at that point.
-
-proc validatePhoneChange {W vmode idx char} {
-    global phoneNumberMap entry3content
-    if {$idx == -1} {return 1}
-    after idle [list $W configure -validate $vmode -invcmd bell]
-    if {
-	!($idx<3 || $idx==6 || $idx==7 || $idx==11 || $idx>15) &&
-	[string match {[0-9A-Za-z]} $char]
-    } then {
-	$W delete $idx
-	$W insert $idx [string map $phoneNumberMap $char]
-	after idle [list phoneSkipRight $W -1]
-	return 1
-    }
-    return 0
-}
-
-# phoneSkipLeft --
-# Skip over fixed characters in a phone-number string when moving left.
-#
-# Arguments:
-# W -	The entry widget containing the phone-number.
-
-proc phoneSkipLeft {W} {
-    set idx [$W index insert]
-    if {$idx == 8} {
-	# Skip back two extra characters
-	$W icursor [incr idx -2]
-    } elseif {$idx == 7 || $idx == 12} {
-	# Skip back one extra character
-	$W icursor [incr idx -1]
-    } elseif {$idx <= 3} {
-	# Can't move any further
-	bell
-	return -code break
-    }
-}
-
-# phoneSkipRight --
-# Skip over fixed characters in a phone-number string when moving right.
-#
-# Arguments:
-# W -	The entry widget containing the phone-number.
-# add - Offset to add to index before calculation (used by validation.)
-
-proc phoneSkipRight {W {add 0}} {
-    set idx [$W index insert]
-    if {$idx+$add == 5} {
-	# Skip forward two extra characters
-	$W icursor [incr idx 2]
-    } elseif {$idx+$add == 6 || $idx+$add == 10} {
-	# Skip forward one extra character
-	$W icursor [incr idx]
-    } elseif {$idx+$add == 15 && !$add} {
-	# Can't move any further
-	bell
-	return -code break
-    }
-}
-
-labelframe $w.l3 -text "US Phone-Number Entry"
-entry $w.l3.e -validate key  -invcmd bell  -textvariable entry3content \
-	-vcmd {validatePhoneChange %W %v %i %S}
-# Click to focus goes to the first editable character...
-bind $w.l3.e <FocusIn> {
-    if {"%d" ne "NotifyAncestor"} {
-	%W icursor 3
-	after idle {%W selection clear}
-    }
-}
-bind $w.l3.e <<PrevChar>> {phoneSkipLeft  %W}
-bind $w.l3.e <<NextChar>> {phoneSkipRight %W}
-pack $w.l3.e -fill x -expand 1 -padx 1m -pady 1m
-
-labelframe $w.l4 -text "Password Entry"
-entry $w.l4.e -validate key -show "*" -vcmd {expr {[string length %P]<=8}}
-pack $w.l4.e -fill x -expand 1 -padx 1m -pady 1m
-
-lower [frame $w.mid]
-grid $w.l1 $w.l2 -in $w.mid -padx 3m -pady 1m -sticky ew
-grid $w.l3 $w.l4 -in $w.mid -padx 3m -pady 1m -sticky ew
-grid columnconfigure $w.mid {0 1} -uniform 1
-pack $w.msg -side top
-pack $w.mid -fill both -expand 1
diff --git a/tk8.6/library/demos/filebox.tcl b/tk8.6/library/demos/filebox.tcl
deleted file mode 100644
index e06ebba..0000000
--- a/tk8.6/library/demos/filebox.tcl
+++ /dev/null
@@ -1,81 +0,0 @@
-# filebox.tcl --
-#
-# This demonstration script prompts the user to select a file.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .filebox
-catch {destroy $w}
-toplevel $w
-wm title $w "File Selection Dialogs"
-wm iconname $w "filebox"
-positionWindow $w
-
-ttk::frame $w._bg
-place $w._bg -x 0 -y 0 -relwidth 1 -relheight 1
-
-ttk::label $w.msg -font $font -wraplength 4i -justify left -text "Enter a file name in the entry box or click on the \"Browse\" buttons to select a file name using the file selection dialog."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-foreach i {open save} {
-    set f [ttk::frame $w.$i]
-    ttk::label $f.lab -text "Select a file to $i: " -anchor e
-    ttk::entry $f.ent -width 20
-    ttk::button $f.but -text "Browse ..." -command "fileDialog $w $f.ent $i"
-    pack $f.lab -side left
-    pack $f.ent -side left -expand yes -fill x
-    pack $f.but -side left
-    pack $f -fill x -padx 1c -pady 3
-}
-
-if {[tk windowingsystem] eq "x11"} {
-    ttk::checkbutton $w.strict -text "Use Motif Style Dialog" \
-	-variable tk_strictMotif -onvalue 1 -offvalue 0
-    pack $w.strict -anchor c
-
-    # This binding ensures that we don't run the rest of the demos
-    # with motif style interactions
-    bind $w.strict <Destroy> {set tk_strictMotif 0}
-}
-
-proc fileDialog {w ent operation} {
-    #   Type names		Extension(s)	Mac File Type(s)
-    #
-    #---------------------------------------------------------
-    set types {
-	{"Text files"		{.txt .doc}	}
-	{"Text files"		{}		TEXT}
-	{"Tcl Scripts"		{.tcl}		TEXT}
-	{"C Source Files"	{.c .h}		}
-	{"All Source Files"	{.tcl .c .h}	}
-	{"Image Files"		{.gif}		}
-	{"Image Files"		{.jpeg .jpg}	}
-	{"Image Files"		""		{GIFF JPEG}}
-	{"All files"		*}
-    }
-    if {$operation == "open"} {
-	global selected_type
-	if {![info exists selected_type]} {
-	    set selected_type "Tcl Scripts"
-	}
-	set file [tk_getOpenFile -filetypes $types -parent $w \
-		-typevariable selected_type]
-	puts "You selected filetype \"$selected_type\""
-    } else {
-	set file [tk_getSaveFile -filetypes $types -parent $w \
-		-initialfile Untitled -defaultextension .txt]
-    }
-    if {[string compare $file ""]} {
-	$ent delete 0 end
-	$ent insert 0 $file
-	$ent xview end
-    }
-}
diff --git a/tk8.6/library/demos/floor.tcl b/tk8.6/library/demos/floor.tcl
deleted file mode 100644
index c36979b..0000000
--- a/tk8.6/library/demos/floor.tcl
+++ /dev/null
@@ -1,1366 +0,0 @@
-# floor.tcl --
-#
-# This demonstration script creates a canvas widet that displays the
-# floorplan for DEC's Western Research Laboratory.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-# floorDisplay --
-# Recreate the floorplan display in the canvas given by "w".  The
-# floor given by "active" is displayed on top with its office structure
-# visible.
-#
-# Arguments:
-# w -		Name of the canvas window.
-# active -	Number of active floor (1, 2, or 3).
-
-proc floorDisplay {w active} {
-    global floorLabels floorItems colors activeFloor
-
-    if {$activeFloor == $active} {
-	return
-    }
-
-    $w delete all
-    set activeFloor $active
-
-    # First go through the three floors, displaying the backgrounds for
-    # each floor.
-
-    bg1 $w $colors(bg1) $colors(outline1)
-    bg2 $w $colors(bg2) $colors(outline2)
-    bg3 $w $colors(bg3) $colors(outline3)
-
-    # Raise the background for the active floor so that it's on top.
-
-    $w raise floor$active
-
-    # Create a dummy item just to mark this point in the display list,
-    # so we can insert highlights here.
-
-    $w create rect 0 100 1 101 -fill {} -outline {} -tags marker
-
-    # Add the walls and labels for the active floor, along with
-    # transparent polygons that define the rooms on the floor.
-    # Make sure that the room polygons are on top.
-
-    catch {unset floorLabels}
-    catch {unset floorItems}
-    fg$active $w $colors(offices)
-    $w raise room
-
-    # Offset the floors diagonally from each other.
-
-    $w move floor1 2c 2c
-    $w move floor2 1c 1c
-
-    # Create items for the room entry and its label.
-
-    $w create window 600 100 -anchor w -window $w.entry
-    $w create text 600 100 -anchor e -text "Room: "
-    $w config -scrollregion [$w bbox all]
-}
-
-# newRoom --
-# This procedure is invoked whenever the mouse enters a room
-# in the floorplan.  It changes tags so that the current room is
-# highlighted.
-#
-# Arguments:
-# w  -		The name of the canvas window.
-
-proc newRoom w {
-    global currentRoom floorLabels
-
-    set id [$w find withtag current]
-    if {$id != ""} {
-	set currentRoom $floorLabels($id)
-    }
-    update idletasks
-}
-
-# roomChanged --
-# This procedure is invoked whenever the currentRoom variable changes.
-# It highlights the current room and unhighlights any previous room.
-#
-# Arguments:
-# w -		The canvas window displaying the floorplan.
-# args -	Not used.
-
-proc roomChanged {w args} {
-    global currentRoom floorItems colors
-    $w delete highlight
-    if {[catch {set item $floorItems($currentRoom)}]} {
-	return
-    }
-    set new [eval \
-	"$w create polygon [$w coords $item] -fill $colors(active) \
-	-tags highlight"]
-    $w raise $new marker
-}
-
-# bg1 --
-# This procedure represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -		The canvas window.
-# fill -	Fill color to use for the floor's background.
-# outline -	Color to use for the floor's outline.
-
-proc bg1 {w fill outline} {
-    $w create poly 347 80 349 82 351 84 353 85 363 92 375 99 386 104 \
-	386 129 398 129 398 162 484 162 484 129 559 129 559 133 725 \
-	133 725 129 802 129 802 389 644 389 644 391 559 391 559 327 \
-	508 327 508 311 484 311 484 278 395 278 395 288 400 288 404 \
-	288 409 290 413 292 418 297 421 302 422 309 421 318 417 325 \
-	411 330 405 332 397 333 344 333 340 334 336 336 335 338 332 \
-	342 331 347 332 351 334 354 336 357 341 359 340 360 335 363 \
-	331 365 326 366 304 366 304 355 258 355 258 387 60 387 60 391 \
-	0 391 0 337 3 337 3 114 8 114 8 25 30 25 30 5 93 5 98 5 104 7 \
-	110 10 116 16 119 20 122 28 123 32 123 68 220 68 220 34 221 \
-	22 223 17 227 13 231 8 236 4 242 2 246 0 260 0 283 1 300 5 \
-	321 14 335 22 348 25 365 29 363 39 358 48 352 56 337 70 \
-	344 76 347 80 \
-	-tags {floor1 bg} -fill $fill
-    $w create line 386 129 398 129 -fill $outline -tags {floor1 bg}
-    $w create line 258 355 258 387 -fill $outline -tags {floor1 bg}
-    $w create line 60 387 60 391 -fill $outline -tags {floor1 bg}
-    $w create line 0 337 0 391 -fill $outline -tags {floor1 bg}
-    $w create line 60 391 0 391 -fill $outline -tags {floor1 bg}
-    $w create line 3 114 3 337 -fill $outline -tags {floor1 bg}
-    $w create line 258 387 60 387 -fill $outline -tags {floor1 bg}
-    $w create line 484 162 398 162 -fill $outline -tags {floor1 bg}
-    $w create line 398 162 398 129 -fill $outline -tags {floor1 bg}
-    $w create line 484 278 484 311 -fill $outline -tags {floor1 bg}
-    $w create line 484 311 508 311 -fill $outline -tags {floor1 bg}
-    $w create line 508 327 508 311 -fill $outline -tags {floor1 bg}
-    $w create line 559 327 508 327 -fill $outline -tags {floor1 bg}
-    $w create line 644 391 559 391 -fill $outline -tags {floor1 bg}
-    $w create line 644 389 644 391 -fill $outline -tags {floor1 bg}
-    $w create line 559 129 484 129 -fill $outline -tags {floor1 bg}
-    $w create line 484 162 484 129 -fill $outline -tags {floor1 bg}
-    $w create line 725 133 559 133 -fill $outline -tags {floor1 bg}
-    $w create line 559 129 559 133 -fill $outline -tags {floor1 bg}
-    $w create line 725 129 802 129 -fill $outline -tags {floor1 bg}
-    $w create line 802 389 802 129 -fill $outline -tags {floor1 bg}
-    $w create line 3 337 0 337 -fill $outline -tags {floor1 bg}
-    $w create line 559 391 559 327 -fill $outline -tags {floor1 bg}
-    $w create line 802 389 644 389 -fill $outline -tags {floor1 bg}
-    $w create line 725 133 725 129 -fill $outline -tags {floor1 bg}
-    $w create line 8 25 8 114 -fill $outline -tags {floor1 bg}
-    $w create line 8 114 3 114 -fill $outline -tags {floor1 bg}
-    $w create line 30 25 8 25 -fill $outline -tags {floor1 bg}
-    $w create line 484 278 395 278 -fill $outline -tags {floor1 bg}
-    $w create line 30 25 30 5 -fill $outline -tags {floor1 bg}
-    $w create line 93 5 30 5 -fill $outline -tags {floor1 bg}
-    $w create line 98 5 93 5 -fill $outline -tags {floor1 bg}
-    $w create line 104 7 98 5 -fill $outline -tags {floor1 bg}
-    $w create line 110 10 104 7 -fill $outline -tags {floor1 bg}
-    $w create line 116 16 110 10 -fill $outline -tags {floor1 bg}
-    $w create line 119 20 116 16 -fill $outline -tags {floor1 bg}
-    $w create line 122 28 119 20 -fill $outline -tags {floor1 bg}
-    $w create line 123 32 122 28 -fill $outline -tags {floor1 bg}
-    $w create line 123 68 123 32 -fill $outline -tags {floor1 bg}
-    $w create line 220 68 123 68 -fill $outline -tags {floor1 bg}
-    $w create line 386 129 386 104 -fill $outline -tags {floor1 bg}
-    $w create line 386 104 375 99 -fill $outline -tags {floor1 bg}
-    $w create line 375 99 363 92 -fill $outline -tags {floor1 bg}
-    $w create line 353 85 363 92 -fill $outline -tags {floor1 bg}
-    $w create line 220 68 220 34 -fill $outline -tags {floor1 bg}
-    $w create line 337 70 352 56 -fill $outline -tags {floor1 bg}
-    $w create line 352 56 358 48 -fill $outline -tags {floor1 bg}
-    $w create line 358 48 363 39 -fill $outline -tags {floor1 bg}
-    $w create line 363 39 365 29 -fill $outline -tags {floor1 bg}
-    $w create line 365 29 348 25 -fill $outline -tags {floor1 bg}
-    $w create line 348 25 335 22 -fill $outline -tags {floor1 bg}
-    $w create line 335 22 321 14 -fill $outline -tags {floor1 bg}
-    $w create line 321 14 300 5 -fill $outline -tags {floor1 bg}
-    $w create line 300 5 283 1 -fill $outline -tags {floor1 bg}
-    $w create line 283 1 260 0 -fill $outline -tags {floor1 bg}
-    $w create line 260 0 246 0 -fill $outline -tags {floor1 bg}
-    $w create line 246 0 242 2 -fill $outline -tags {floor1 bg}
-    $w create line 242 2 236 4 -fill $outline -tags {floor1 bg}
-    $w create line 236 4 231 8 -fill $outline -tags {floor1 bg}
-    $w create line 231 8 227 13 -fill $outline -tags {floor1 bg}
-    $w create line 223 17 227 13 -fill $outline -tags {floor1 bg}
-    $w create line 221 22 223 17 -fill $outline -tags {floor1 bg}
-    $w create line 220 34 221 22 -fill $outline -tags {floor1 bg}
-    $w create line 340 360 335 363 -fill $outline -tags {floor1 bg}
-    $w create line 335 363 331 365 -fill $outline -tags {floor1 bg}
-    $w create line 331 365 326 366 -fill $outline -tags {floor1 bg}
-    $w create line 326 366 304 366 -fill $outline -tags {floor1 bg}
-    $w create line 304 355 304 366 -fill $outline -tags {floor1 bg}
-    $w create line 395 288 400 288 -fill $outline -tags {floor1 bg}
-    $w create line 404 288 400 288 -fill $outline -tags {floor1 bg}
-    $w create line 409 290 404 288 -fill $outline -tags {floor1 bg}
-    $w create line 413 292 409 290 -fill $outline -tags {floor1 bg}
-    $w create line 418 297 413 292 -fill $outline -tags {floor1 bg}
-    $w create line 421 302 418 297 -fill $outline -tags {floor1 bg}
-    $w create line 422 309 421 302 -fill $outline -tags {floor1 bg}
-    $w create line 421 318 422 309 -fill $outline -tags {floor1 bg}
-    $w create line 421 318 417 325 -fill $outline -tags {floor1 bg}
-    $w create line 417 325 411 330 -fill $outline -tags {floor1 bg}
-    $w create line 411 330 405 332 -fill $outline -tags {floor1 bg}
-    $w create line 405 332 397 333 -fill $outline -tags {floor1 bg}
-    $w create line 397 333 344 333 -fill $outline -tags {floor1 bg}
-    $w create line 344 333 340 334 -fill $outline -tags {floor1 bg}
-    $w create line 340 334 336 336 -fill $outline -tags {floor1 bg}
-    $w create line 336 336 335 338 -fill $outline -tags {floor1 bg}
-    $w create line 335 338 332 342 -fill $outline -tags {floor1 bg}
-    $w create line 331 347 332 342 -fill $outline -tags {floor1 bg}
-    $w create line 332 351 331 347 -fill $outline -tags {floor1 bg}
-    $w create line 334 354 332 351 -fill $outline -tags {floor1 bg}
-    $w create line 336 357 334 354 -fill $outline -tags {floor1 bg}
-    $w create line 341 359 336 357 -fill $outline -tags {floor1 bg}
-    $w create line 341 359 340 360 -fill $outline -tags {floor1 bg}
-    $w create line 395 288 395 278 -fill $outline -tags {floor1 bg}
-    $w create line 304 355 258 355 -fill $outline -tags {floor1 bg}
-    $w create line 347 80 344 76 -fill $outline -tags {floor1 bg}
-    $w create line 344 76 337 70 -fill $outline -tags {floor1 bg}
-    $w create line 349 82 347 80 -fill $outline -tags {floor1 bg}
-    $w create line 351 84 349 82 -fill $outline -tags {floor1 bg}
-    $w create line 353 85 351 84 -fill $outline -tags {floor1 bg}
-}
-
-# bg2 --
-# This procedure represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the second
-# floor.
-#
-# Arguments:
-# w -		The canvas window.
-# fill -	Fill color to use for the floor's background.
-# outline -	Color to use for the floor's outline.
-
-proc bg2 {w fill outline} {
-    $w create poly 559 129 484 129 484 162 398 162 398 129 315 129 \
-	315 133 176 133 176 129 96 129 96 133 3 133 3 339 0 339 0 391 \
-	60 391 60 387 258 387 258 329 350 329 350 311 395 311 395 280 \
-	484 280 484 311 508 311 508 327 558 327 558 391 644 391 644 \
-	367 802 367 802 129 725 129 725 133 559 133 559 129 \
-	-tags {floor2 bg} -fill $fill
-    $w create line 350 311 350 329 -fill $outline -tags {floor2 bg}
-    $w create line 398 129 398 162 -fill $outline -tags {floor2 bg}
-    $w create line 802 367 802 129 -fill $outline -tags {floor2 bg}
-    $w create line 802 129 725 129 -fill $outline -tags {floor2 bg}
-    $w create line 725 133 725 129 -fill $outline -tags {floor2 bg}
-    $w create line 559 129 559 133 -fill $outline -tags {floor2 bg}
-    $w create line 559 133 725 133 -fill $outline -tags {floor2 bg}
-    $w create line 484 162 484 129 -fill $outline -tags {floor2 bg}
-    $w create line 559 129 484 129 -fill $outline -tags {floor2 bg}
-    $w create line 802 367 644 367 -fill $outline -tags {floor2 bg}
-    $w create line 644 367 644 391 -fill $outline -tags {floor2 bg}
-    $w create line 644 391 558 391 -fill $outline -tags {floor2 bg}
-    $w create line 558 327 558 391 -fill $outline -tags {floor2 bg}
-    $w create line 558 327 508 327 -fill $outline -tags {floor2 bg}
-    $w create line 508 327 508 311 -fill $outline -tags {floor2 bg}
-    $w create line 484 311 508 311 -fill $outline -tags {floor2 bg}
-    $w create line 484 280 484 311 -fill $outline -tags {floor2 bg}
-    $w create line 398 162 484 162 -fill $outline -tags {floor2 bg}
-    $w create line 484 280 395 280 -fill $outline -tags {floor2 bg}
-    $w create line 395 280 395 311 -fill $outline -tags {floor2 bg}
-    $w create line 258 387 60 387 -fill $outline -tags {floor2 bg}
-    $w create line 3 133 3 339 -fill $outline -tags {floor2 bg}
-    $w create line 3 339 0 339 -fill $outline -tags {floor2 bg}
-    $w create line 60 391 0 391 -fill $outline -tags {floor2 bg}
-    $w create line 0 339 0 391 -fill $outline -tags {floor2 bg}
-    $w create line 60 387 60 391 -fill $outline -tags {floor2 bg}
-    $w create line 258 329 258 387 -fill $outline -tags {floor2 bg}
-    $w create line 350 329 258 329 -fill $outline -tags {floor2 bg}
-    $w create line 395 311 350 311 -fill $outline -tags {floor2 bg}
-    $w create line 398 129 315 129 -fill $outline -tags {floor2 bg}
-    $w create line 176 133 315 133 -fill $outline -tags {floor2 bg}
-    $w create line 176 129 96 129 -fill $outline -tags {floor2 bg}
-    $w create line 3 133 96 133 -fill $outline -tags {floor2 bg}
-    $w create line 315 133 315 129 -fill $outline -tags {floor2 bg}
-    $w create line 176 133 176 129 -fill $outline -tags {floor2 bg}
-    $w create line 96 133 96 129 -fill $outline -tags {floor2 bg}
-}
-
-# bg3 --
-# This procedure represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the third
-# floor.
-#
-# Arguments:
-# w -		The canvas window.
-# fill -	Fill color to use for the floor's background.
-# outline -	Color to use for the floor's outline.
-
-proc bg3 {w fill outline} {
-    $w create poly 159 300 107 300 107 248 159 248 159 129 96 129 96 \
-	133 21 133 21 331 0 331 0 391 60 391 60 370 159 370 159 300 \
-	-tags {floor3 bg} -fill $fill
-    $w create poly 258 370 258 329 350 329 350 311 399 311 399 129 \
-	315 129 315 133 176 133 176 129 159 129 159 370 258 370 \
-	-tags {floor3 bg} -fill $fill
-    $w create line 96 133 96 129 -fill $outline -tags {floor3 bg}
-    $w create line 176 129 96 129 -fill $outline -tags {floor3 bg}
-    $w create line 176 129 176 133 -fill $outline -tags {floor3 bg}
-    $w create line 315 133 176 133 -fill $outline -tags {floor3 bg}
-    $w create line 315 133 315 129 -fill $outline -tags {floor3 bg}
-    $w create line 399 129 315 129 -fill $outline -tags {floor3 bg}
-    $w create line 399 311 399 129 -fill $outline -tags {floor3 bg}
-    $w create line 399 311 350 311 -fill $outline -tags {floor3 bg}
-    $w create line 350 329 350 311 -fill $outline -tags {floor3 bg}
-    $w create line 350 329 258 329 -fill $outline -tags {floor3 bg}
-    $w create line 258 370 258 329 -fill $outline -tags {floor3 bg}
-    $w create line 60 370 258 370 -fill $outline -tags {floor3 bg}
-    $w create line 60 370 60 391 -fill $outline -tags {floor3 bg}
-    $w create line 60 391 0 391 -fill $outline -tags {floor3 bg}
-    $w create line 0 391 0 331 -fill $outline -tags {floor3 bg}
-    $w create line 21 331 0 331 -fill $outline -tags {floor3 bg}
-    $w create line 21 331 21 133 -fill $outline -tags {floor3 bg}
-    $w create line 96 133 21 133 -fill $outline -tags {floor3 bg}
-    $w create line 107 300 159 300 159 248 107 248 107 300 \
-	    -fill $outline -tags {floor3 bg}
-}
-
-# fg1 --
-# This procedure represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the first
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -		The canvas window.
-# color -	Color to use for drawing foreground information.
-
-proc fg1 {w color} {
-    global floorLabels floorItems
-    set i [$w create polygon 375 246 375 172 341 172 341 246 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 101
-    set {floorItems(101)} $i
-    $w create text 358 209 -text 101 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 307 240 339 240 339 206 307 206 -fill {} -tags {floor1 room}]
-    set floorLabels($i) {Pub Lift1}
-    set {floorItems(Pub Lift1)} $i
-    $w create text 323 223 -text {Pub Lift1} -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 339 205 307 205 307 171 339 171 -fill {} -tags {floor1 room}]
-    set floorLabels($i) {Priv Lift1}
-    set {floorItems(Priv Lift1)} $i
-    $w create text 323 188 -text {Priv Lift1} -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 42 389 42 337 1 337 1 389 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 110
-    set {floorItems(110)} $i
-    $w create text 21.5 363 -text 110 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 59 389 59 385 90 385 90 337 44 337 44 389 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 109
-    set {floorItems(109)} $i
-    $w create text 67 363 -text 109 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 51 300 51 253 6 253 6 300 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 111
-    set {floorItems(111)} $i
-    $w create text 28.5 276.5 -text 111 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 98 248 98 309 79 309 79 248 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 117B
-    set {floorItems(117B)} $i
-    $w create text 88.5 278.5 -text 117B -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 51 251 51 204 6 204 6 251 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 112
-    set {floorItems(112)} $i
-    $w create text 28.5 227.5 -text 112 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 6 156 51 156 51 203 6 203 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 113
-    set {floorItems(113)} $i
-    $w create text 28.5 179.5 -text 113 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 85 169 79 169 79 192 85 192 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 117A
-    set {floorItems(117A)} $i
-    $w create text 82 180.5 -text 117A -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 77 302 77 168 53 168 53 302 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 117
-    set {floorItems(117)} $i
-    $w create text 65 235 -text 117 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 51 155 51 115 6 115 6 155 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 114
-    set {floorItems(114)} $i
-    $w create text 28.5 135 -text 114 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 95 115 53 115 53 168 95 168 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 115
-    set {floorItems(115)} $i
-    $w create text 74 141.5 -text 115 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 87 113 87 27 10 27 10 113 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 116
-    set {floorItems(116)} $i
-    $w create text 48.5 70 -text 116 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 89 91 128 91 128 113 89 113 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 118
-    set {floorItems(118)} $i
-    $w create text 108.5 102 -text 118 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 178 128 178 132 216 132 216 91 163 91 163 112 149 112 149 128 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 120
-    set {floorItems(120)} $i
-    $w create text 189.5 111.5 -text 120 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 79 193 87 193 87 169 136 169 136 192 156 192 156 169 175 169 175 246 79 246 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 122
-    set {floorItems(122)} $i
-    $w create text 131 207.5 -text 122 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 138 169 154 169 154 191 138 191 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 121
-    set {floorItems(121)} $i
-    $w create text 146 180 -text 121 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 99 300 126 300 126 309 99 309 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 106A
-    set {floorItems(106A)} $i
-    $w create text 112.5 304.5 -text 106A -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 128 299 128 309 150 309 150 248 99 248 99 299 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 105
-    set {floorItems(105)} $i
-    $w create text 124.5 278.5 -text 105 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 174 309 174 300 152 300 152 309 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 106B
-    set {floorItems(106B)} $i
-    $w create text 163 304.5 -text 106B -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 176 299 176 309 216 309 216 248 152 248 152 299 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 104
-    set {floorItems(104)} $i
-    $w create text 184 278.5 -text 104 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 138 385 138 337 91 337 91 385 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 108
-    set {floorItems(108)} $i
-    $w create text 114.5 361 -text 108 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 256 337 140 337 140 385 256 385 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 107
-    set {floorItems(107)} $i
-    $w create text 198 361 -text 107 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 300 353 300 329 260 329 260 353 -fill {} -tags {floor1 room}]
-    set floorLabels($i) Smoking
-    set {floorItems(Smoking)} $i
-    $w create text 280 341 -text Smoking -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 314 135 314 170 306 170 306 246 177 246 177 135 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 123
-    set {floorItems(123)} $i
-    $w create text 245.5 190.5 -text 123 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 217 248 301 248 301 326 257 326 257 310 217 310 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 103
-    set {floorItems(103)} $i
-    $w create text 259 287 -text 103 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 396 188 377 188 377 169 316 169 316 131 396 131 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 124
-    set {floorItems(124)} $i
-    $w create text 356 150 -text 124 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 397 226 407 226 407 189 377 189 377 246 397 246 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 125
-    set {floorItems(125)} $i
-    $w create text 392 217.5 -text 125 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 399 187 409 187 409 207 474 207 474 164 399 164 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 126
-    set {floorItems(126)} $i
-    $w create text 436.5 185.5 -text 126 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 409 209 409 229 399 229 399 253 486 253 486 239 474 239 474 209 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 127
-    set {floorItems(127)} $i
-    $w create text 436.5 231 -text 127 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 501 164 501 174 495 174 495 188 490 188 490 204 476 204 476 164 -fill {} -tags {floor1 room}]
-    set floorLabels($i) MShower
-    set {floorItems(MShower)} $i
-    $w create text 488.5 184 -text MShower -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 497 176 513 176 513 204 492 204 492 190 497 190 -fill {} -tags {floor1 room}]
-    set floorLabels($i) Closet
-    set {floorItems(Closet)} $i
-    $w create text 502.5 190 -text Closet -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 476 237 476 206 513 206 513 254 488 254 488 237 -fill {} -tags {floor1 room}]
-    set floorLabels($i) WShower
-    set {floorItems(WShower)} $i
-    $w create text 494.5 230 -text WShower -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 486 131 558 131 558 135 724 135 724 166 697 166 697 275 553 275 531 254 515 254 515 174 503 174 503 161 486 161 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 130
-    set {floorItems(130)} $i
-    $w create text 638.5 205 -text 130 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 308 242 339 242 339 248 342 248 342 246 397 246 397 276 393 276 393 309 300 309 300 248 308 248 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 102
-    set {floorItems(102)} $i
-    $w create text 367.5 278.5 -text 102 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 397 255 486 255 486 276 397 276 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 128
-    set {floorItems(128)} $i
-    $w create text 441.5 265.5 -text 128 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 510 309 486 309 486 255 530 255 552 277 561 277 561 325 510 325 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 129
-    set {floorItems(129)} $i
-    $w create text 535.5 293 -text 129 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 696 281 740 281 740 387 642 387 642 389 561 389 561 277 696 277 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 133
-    set {floorItems(133)} $i
-    $w create text 628.5 335 -text 133 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 742 387 742 281 800 281 800 387 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 132
-    set {floorItems(132)} $i
-    $w create text 771 334 -text 132 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 800 168 800 280 699 280 699 168 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 134
-    set {floorItems(134)} $i
-    $w create text 749.5 224 -text 134 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 726 131 726 166 800 166 800 131 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 135
-    set {floorItems(135)} $i
-    $w create text 763 148.5 -text 135 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 340 360 335 363 331 365 326 366 304 366 304 312 396 312 396 288 400 288 404 288 409 290 413 292 418 297 421 302 422 309 421 318 417 325 411 330 405 332 397 333 344 333 340 334 336 336 335 338 332 342 331 347 332 351 334 354 336 357 341 359 -fill {} -tags {floor1 room}]
-    set floorLabels($i) {Ramona Stair}
-    set {floorItems(Ramona Stair)} $i
-    $w create text 368 323 -text {Ramona Stair} -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 30 23 30 5 93 5 98 5 104 7 110 10 116 16 119 20 122 28 123 32 123 68 220 68 220 87 90 87 90 23 -fill {} -tags {floor1 room}]
-    set floorLabels($i) {University Stair}
-    set {floorItems(University Stair)} $i
-    $w create text 155 77.5 -text {University Stair} -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 282 37 295 40 312 49 323 56 337 70 352 56 358 48 363 39 365 29 348 25 335 22 321 14 300 5 283 1 260 0 246 0 242 2 236 4 231 8 227 13 223 17 221 22 220 34 260 34 -fill {} -tags {floor1 room}]
-    set floorLabels($i) {Plaza Stair}
-    set {floorItems(Plaza Stair)} $i
-    $w create text 317.5 28.5 -text {Plaza Stair} -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 220 34 260 34 282 37 295 40 312 49 323 56 337 70 350 83 365 94 377 100 386 104 386 128 220 128 -fill {} -tags {floor1 room}]
-    set floorLabels($i) {Plaza Deck}
-    set {floorItems(Plaza Deck)} $i
-    $w create text 303 81 -text {Plaza Deck} -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 257 336 77 336 6 336 6 301 77 301 77 310 257 310 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 106
-    set {floorItems(106)} $i
-    $w create text 131.5 318.5 -text 106 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 146 110 162 110 162 91 130 91 130 115 95 115 95 128 114 128 114 151 157 151 157 153 112 153 112 130 97 130 97 168 175 168 175 131 146 131 -fill {} -tags {floor1 room}]
-    set floorLabels($i) 119
-    set {floorItems(119)} $i
-    $w create text 143.5 133 -text 119 -fill $color -anchor c -tags {floor1 label}
-    $w create line 155 191 155 189 -fill $color -tags {floor1 wall}
-    $w create line 155 177 155 169 -fill $color -tags {floor1 wall}
-    $w create line 96 129 96 169 -fill $color -tags {floor1 wall}
-    $w create line 78 169 176 169 -fill $color -tags {floor1 wall}
-    $w create line 176 247 176 129 -fill $color -tags {floor1 wall}
-    $w create line 340 206 307 206 -fill $color -tags {floor1 wall}
-    $w create line 340 187 340 170 -fill $color -tags {floor1 wall}
-    $w create line 340 210 340 201 -fill $color -tags {floor1 wall}
-    $w create line 340 247 340 224 -fill $color -tags {floor1 wall}
-    $w create line 340 241 307 241 -fill $color -tags {floor1 wall}
-    $w create line 376 246 376 170 -fill $color -tags {floor1 wall}
-    $w create line 307 247 307 170 -fill $color -tags {floor1 wall}
-    $w create line 376 170 307 170 -fill $color -tags {floor1 wall}
-    $w create line 315 129 315 170 -fill $color -tags {floor1 wall}
-    $w create line 147 129 176 129 -fill $color -tags {floor1 wall}
-    $w create line 202 133 176 133 -fill $color -tags {floor1 wall}
-    $w create line 398 129 315 129 -fill $color -tags {floor1 wall}
-    $w create line 258 352 258 387 -fill $color -tags {floor1 wall}
-    $w create line 60 387 60 391 -fill $color -tags {floor1 wall}
-    $w create line 0 337 0 391 -fill $color -tags {floor1 wall}
-    $w create line 60 391 0 391 -fill $color -tags {floor1 wall}
-    $w create line 3 114 3 337 -fill $color -tags {floor1 wall}
-    $w create line 258 387 60 387 -fill $color -tags {floor1 wall}
-    $w create line 52 237 52 273 -fill $color -tags {floor1 wall}
-    $w create line 52 189 52 225 -fill $color -tags {floor1 wall}
-    $w create line 52 140 52 177 -fill $color -tags {floor1 wall}
-    $w create line 395 306 395 311 -fill $color -tags {floor1 wall}
-    $w create line 531 254 398 254 -fill $color -tags {floor1 wall}
-    $w create line 475 178 475 238 -fill $color -tags {floor1 wall}
-    $w create line 502 162 398 162 -fill $color -tags {floor1 wall}
-    $w create line 398 129 398 188 -fill $color -tags {floor1 wall}
-    $w create line 383 188 376 188 -fill $color -tags {floor1 wall}
-    $w create line 408 188 408 194 -fill $color -tags {floor1 wall}
-    $w create line 398 227 398 254 -fill $color -tags {floor1 wall}
-    $w create line 408 227 398 227 -fill $color -tags {floor1 wall}
-    $w create line 408 222 408 227 -fill $color -tags {floor1 wall}
-    $w create line 408 206 408 210 -fill $color -tags {floor1 wall}
-    $w create line 408 208 475 208 -fill $color -tags {floor1 wall}
-    $w create line 484 278 484 311 -fill $color -tags {floor1 wall}
-    $w create line 484 311 508 311 -fill $color -tags {floor1 wall}
-    $w create line 508 327 508 311 -fill $color -tags {floor1 wall}
-    $w create line 559 327 508 327 -fill $color -tags {floor1 wall}
-    $w create line 644 391 559 391 -fill $color -tags {floor1 wall}
-    $w create line 644 389 644 391 -fill $color -tags {floor1 wall}
-    $w create line 514 205 475 205 -fill $color -tags {floor1 wall}
-    $w create line 496 189 496 187 -fill $color -tags {floor1 wall}
-    $w create line 559 129 484 129 -fill $color -tags {floor1 wall}
-    $w create line 484 162 484 129 -fill $color -tags {floor1 wall}
-    $w create line 725 133 559 133 -fill $color -tags {floor1 wall}
-    $w create line 559 129 559 133 -fill $color -tags {floor1 wall}
-    $w create line 725 149 725 167 -fill $color -tags {floor1 wall}
-    $w create line 725 129 802 129 -fill $color -tags {floor1 wall}
-    $w create line 802 389 802 129 -fill $color -tags {floor1 wall}
-    $w create line 739 167 802 167 -fill $color -tags {floor1 wall}
-    $w create line 396 188 408 188 -fill $color -tags {floor1 wall}
-    $w create line 0 337 9 337 -fill $color -tags {floor1 wall}
-    $w create line 58 337 21 337 -fill $color -tags {floor1 wall}
-    $w create line 43 391 43 337 -fill $color -tags {floor1 wall}
-    $w create line 105 337 75 337 -fill $color -tags {floor1 wall}
-    $w create line 91 387 91 337 -fill $color -tags {floor1 wall}
-    $w create line 154 337 117 337 -fill $color -tags {floor1 wall}
-    $w create line 139 387 139 337 -fill $color -tags {floor1 wall}
-    $w create line 227 337 166 337 -fill $color -tags {floor1 wall}
-    $w create line 258 337 251 337 -fill $color -tags {floor1 wall}
-    $w create line 258 328 302 328 -fill $color -tags {floor1 wall}
-    $w create line 302 355 302 311 -fill $color -tags {floor1 wall}
-    $w create line 395 311 302 311 -fill $color -tags {floor1 wall}
-    $w create line 484 278 395 278 -fill $color -tags {floor1 wall}
-    $w create line 395 294 395 278 -fill $color -tags {floor1 wall}
-    $w create line 473 278 473 275 -fill $color -tags {floor1 wall}
-    $w create line 473 256 473 254 -fill $color -tags {floor1 wall}
-    $w create line 533 257 531 254 -fill $color -tags {floor1 wall}
-    $w create line 553 276 551 274 -fill $color -tags {floor1 wall}
-    $w create line 698 276 553 276 -fill $color -tags {floor1 wall}
-    $w create line 559 391 559 327 -fill $color -tags {floor1 wall}
-    $w create line 802 389 644 389 -fill $color -tags {floor1 wall}
-    $w create line 741 314 741 389 -fill $color -tags {floor1 wall}
-    $w create line 698 280 698 167 -fill $color -tags {floor1 wall}
-    $w create line 707 280 698 280 -fill $color -tags {floor1 wall}
-    $w create line 802 280 731 280 -fill $color -tags {floor1 wall}
-    $w create line 741 280 741 302 -fill $color -tags {floor1 wall}
-    $w create line 698 167 727 167 -fill $color -tags {floor1 wall}
-    $w create line 725 137 725 129 -fill $color -tags {floor1 wall}
-    $w create line 514 254 514 175 -fill $color -tags {floor1 wall}
-    $w create line 496 175 514 175 -fill $color -tags {floor1 wall}
-    $w create line 502 175 502 162 -fill $color -tags {floor1 wall}
-    $w create line 475 166 475 162 -fill $color -tags {floor1 wall}
-    $w create line 496 176 496 175 -fill $color -tags {floor1 wall}
-    $w create line 491 189 496 189 -fill $color -tags {floor1 wall}
-    $w create line 491 205 491 189 -fill $color -tags {floor1 wall}
-    $w create line 487 238 475 238 -fill $color -tags {floor1 wall}
-    $w create line 487 240 487 238 -fill $color -tags {floor1 wall}
-    $w create line 487 252 487 254 -fill $color -tags {floor1 wall}
-    $w create line 315 133 304 133 -fill $color -tags {floor1 wall}
-    $w create line 256 133 280 133 -fill $color -tags {floor1 wall}
-    $w create line 78 247 270 247 -fill $color -tags {floor1 wall}
-    $w create line 307 247 294 247 -fill $color -tags {floor1 wall}
-    $w create line 214 133 232 133 -fill $color -tags {floor1 wall}
-    $w create line 217 247 217 266 -fill $color -tags {floor1 wall}
-    $w create line 217 309 217 291 -fill $color -tags {floor1 wall}
-    $w create line 217 309 172 309 -fill $color -tags {floor1 wall}
-    $w create line 154 309 148 309 -fill $color -tags {floor1 wall}
-    $w create line 175 300 175 309 -fill $color -tags {floor1 wall}
-    $w create line 151 300 175 300 -fill $color -tags {floor1 wall}
-    $w create line 151 247 151 309 -fill $color -tags {floor1 wall}
-    $w create line 78 237 78 265 -fill $color -tags {floor1 wall}
-    $w create line 78 286 78 309 -fill $color -tags {floor1 wall}
-    $w create line 106 309 78 309 -fill $color -tags {floor1 wall}
-    $w create line 130 309 125 309 -fill $color -tags {floor1 wall}
-    $w create line 99 309 99 247 -fill $color -tags {floor1 wall}
-    $w create line 127 299 99 299 -fill $color -tags {floor1 wall}
-    $w create line 127 309 127 299 -fill $color -tags {floor1 wall}
-    $w create line 155 191 137 191 -fill $color -tags {floor1 wall}
-    $w create line 137 169 137 191 -fill $color -tags {floor1 wall}
-    $w create line 78 171 78 169 -fill $color -tags {floor1 wall}
-    $w create line 78 190 78 218 -fill $color -tags {floor1 wall}
-    $w create line 86 192 86 169 -fill $color -tags {floor1 wall}
-    $w create line 86 192 78 192 -fill $color -tags {floor1 wall}
-    $w create line 52 301 3 301 -fill $color -tags {floor1 wall}
-    $w create line 52 286 52 301 -fill $color -tags {floor1 wall}
-    $w create line 52 252 3 252 -fill $color -tags {floor1 wall}
-    $w create line 52 203 3 203 -fill $color -tags {floor1 wall}
-    $w create line 3 156 52 156 -fill $color -tags {floor1 wall}
-    $w create line 8 25 8 114 -fill $color -tags {floor1 wall}
-    $w create line 63 114 3 114 -fill $color -tags {floor1 wall}
-    $w create line 75 114 97 114 -fill $color -tags {floor1 wall}
-    $w create line 108 114 129 114 -fill $color -tags {floor1 wall}
-    $w create line 129 114 129 89 -fill $color -tags {floor1 wall}
-    $w create line 52 114 52 128 -fill $color -tags {floor1 wall}
-    $w create line 132 89 88 89 -fill $color -tags {floor1 wall}
-    $w create line 88 25 88 89 -fill $color -tags {floor1 wall}
-    $w create line 88 114 88 89 -fill $color -tags {floor1 wall}
-    $w create line 218 89 144 89 -fill $color -tags {floor1 wall}
-    $w create line 147 111 147 129 -fill $color -tags {floor1 wall}
-    $w create line 162 111 147 111 -fill $color -tags {floor1 wall}
-    $w create line 162 109 162 111 -fill $color -tags {floor1 wall}
-    $w create line 162 96 162 89 -fill $color -tags {floor1 wall}
-    $w create line 218 89 218 94 -fill $color -tags {floor1 wall}
-    $w create line 218 89 218 119 -fill $color -tags {floor1 wall}
-    $w create line 8 25 88 25 -fill $color -tags {floor1 wall}
-    $w create line 258 337 258 328 -fill $color -tags {floor1 wall}
-    $w create line 113 129 96 129 -fill $color -tags {floor1 wall}
-    $w create line 302 355 258 355 -fill $color -tags {floor1 wall}
-    $w create line 386 104 386 129 -fill $color -tags {floor1 wall}
-    $w create line 377 100 386 104 -fill $color -tags {floor1 wall}
-    $w create line 365 94 377 100 -fill $color -tags {floor1 wall}
-    $w create line 350 83 365 94 -fill $color -tags {floor1 wall}
-    $w create line 337 70 350 83 -fill $color -tags {floor1 wall}
-    $w create line 337 70 323 56 -fill $color -tags {floor1 wall}
-    $w create line 312 49 323 56 -fill $color -tags {floor1 wall}
-    $w create line 295 40 312 49 -fill $color -tags {floor1 wall}
-    $w create line 282 37 295 40 -fill $color -tags {floor1 wall}
-    $w create line 260 34 282 37 -fill $color -tags {floor1 wall}
-    $w create line 253 34 260 34 -fill $color -tags {floor1 wall}
-    $w create line 386 128 386 104 -fill $color -tags {floor1 wall}
-    $w create line 113 152 156 152 -fill $color -tags {floor1 wall}
-    $w create line 113 152 156 152 -fill $color -tags {floor1 wall}
-    $w create line 113 152 113 129 -fill $color -tags {floor1 wall}
-}
-
-# fg2 --
-# This procedure represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the second
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -		The canvas window.
-# color -	Color to use for drawing foreground information.
-
-proc fg2 {w color} {
-    global floorLabels floorItems
-    set i [$w create polygon 748 188 755 188 755 205 758 205 758 222 800 222 800 168 748 168 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 238
-    set {floorItems(238)} $i
-    $w create text 774 195 -text 238 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 726 188 746 188 746 166 800 166 800 131 726 131 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 237
-    set {floorItems(237)} $i
-    $w create text 763 148.5 -text 237 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 497 187 497 204 559 204 559 324 641 324 643 324 643 291 641 291 641 205 696 205 696 291 694 291 694 314 715 314 715 291 715 205 755 205 755 190 724 190 724 187 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 246
-    set {floorItems(246)} $i
-    $w create text 600 264 -text 246 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 694 279 643 279 643 314 694 314 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 247
-    set {floorItems(247)} $i
-    $w create text 668.5 296.5 -text 247 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 232 250 308 250 308 242 339 242 339 246 397 246 397 255 476 255 476 250 482 250 559 250 559 274 482 274 482 278 396 278 396 274 232 274 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 202
-    set {floorItems(202)} $i
-    $w create text 285.5 260 -text 202 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 53 228 53 338 176 338 233 338 233 196 306 196 306 180 175 180 175 169 156 169 156 196 176 196 176 228 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 206
-    set {floorItems(206)} $i
-    $w create text 143 267 -text 206 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 51 277 6 277 6 338 51 338 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 212
-    set {floorItems(212)} $i
-    $w create text 28.5 307.5 -text 212 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 557 276 486 276 486 309 510 309 510 325 557 325 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 245
-    set {floorItems(245)} $i
-    $w create text 521.5 300.5 -text 245 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 560 389 599 389 599 326 560 326 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 244
-    set {floorItems(244)} $i
-    $w create text 579.5 357.5 -text 244 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 601 389 601 326 643 326 643 389 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 243
-    set {floorItems(243)} $i
-    $w create text 622 357.5 -text 243 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 688 316 645 316 645 365 688 365 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 242
-    set {floorItems(242)} $i
-    $w create text 666.5 340.5 -text 242 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 802 367 759 367 759 226 802 226 -fill {} -tags {floor2 room}]
-    set floorLabels($i) {Barbecue Deck}
-    set {floorItems(Barbecue Deck)} $i
-    $w create text 780.5 296.5 -text {Barbecue Deck} -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 755 262 755 314 717 314 717 262 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 240
-    set {floorItems(240)} $i
-    $w create text 736 288 -text 240 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 755 316 689 316 689 365 755 365 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 241
-    set {floorItems(241)} $i
-    $w create text 722 340.5 -text 241 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 755 206 717 206 717 261 755 261 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 239
-    set {floorItems(239)} $i
-    $w create text 736 233.5 -text 239 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 695 277 643 277 643 206 695 206 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 248
-    set {floorItems(248)} $i
-    $w create text 669 241.5 -text 248 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 676 135 676 185 724 185 724 135 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 236
-    set {floorItems(236)} $i
-    $w create text 700 160 -text 236 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 675 135 635 135 635 145 628 145 628 185 675 185 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 235
-    set {floorItems(235)} $i
-    $w create text 651.5 160 -text 235 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 626 143 633 143 633 135 572 135 572 143 579 143 579 185 626 185 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 234
-    set {floorItems(234)} $i
-    $w create text 606 160 -text 234 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 557 135 571 135 571 145 578 145 578 185 527 185 527 131 557 131 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 233
-    set {floorItems(233)} $i
-    $w create text 552.5 158 -text 233 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 476 249 557 249 557 205 476 205 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 230
-    set {floorItems(230)} $i
-    $w create text 516.5 227 -text 230 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 476 164 486 164 486 131 525 131 525 185 476 185 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 232
-    set {floorItems(232)} $i
-    $w create text 500.5 158 -text 232 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 476 186 495 186 495 204 476 204 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 229
-    set {floorItems(229)} $i
-    $w create text 485.5 195 -text 229 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 474 207 409 207 409 187 399 187 399 164 474 164 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 227
-    set {floorItems(227)} $i
-    $w create text 436.5 185.5 -text 227 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 399 228 399 253 474 253 474 209 409 209 409 228 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 228
-    set {floorItems(228)} $i
-    $w create text 436.5 231 -text 228 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 397 246 397 226 407 226 407 189 377 189 377 246 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 226
-    set {floorItems(226)} $i
-    $w create text 392 217.5 -text 226 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 377 169 316 169 316 131 397 131 397 188 377 188 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 225
-    set {floorItems(225)} $i
-    $w create text 356.5 150 -text 225 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 234 198 306 198 306 249 234 249 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 224
-    set {floorItems(224)} $i
-    $w create text 270 223.5 -text 224 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 270 179 306 179 306 170 314 170 314 135 270 135 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 223
-    set {floorItems(223)} $i
-    $w create text 292 157 -text 223 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 268 179 221 179 221 135 268 135 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 222
-    set {floorItems(222)} $i
-    $w create text 244.5 157 -text 222 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 177 179 219 179 219 135 177 135 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 221
-    set {floorItems(221)} $i
-    $w create text 198 157 -text 221 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 299 327 349 327 349 284 341 284 341 276 299 276 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 204
-    set {floorItems(204)} $i
-    $w create text 324 301.5 -text 204 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 234 276 297 276 297 327 257 327 257 338 234 338 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 205
-    set {floorItems(205)} $i
-    $w create text 265.5 307 -text 205 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 256 385 256 340 212 340 212 385 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 207
-    set {floorItems(207)} $i
-    $w create text 234 362.5 -text 207 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 210 340 164 340 164 385 210 385 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 208
-    set {floorItems(208)} $i
-    $w create text 187 362.5 -text 208 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 115 340 162 340 162 385 115 385 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 209
-    set {floorItems(209)} $i
-    $w create text 138.5 362.5 -text 209 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 89 228 89 156 53 156 53 228 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 217
-    set {floorItems(217)} $i
-    $w create text 71 192 -text 217 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 89 169 97 169 97 190 89 190 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 217A
-    set {floorItems(217A)} $i
-    $w create text 93 179.5 -text 217A -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 89 156 89 168 95 168 95 135 53 135 53 156 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 216
-    set {floorItems(216)} $i
-    $w create text 71 145.5 -text 216 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 51 179 51 135 6 135 6 179 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 215
-    set {floorItems(215)} $i
-    $w create text 28.5 157 -text 215 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 51 227 6 227 6 180 51 180 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 214
-    set {floorItems(214)} $i
-    $w create text 28.5 203.5 -text 214 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 51 275 6 275 6 229 51 229 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 213
-    set {floorItems(213)} $i
-    $w create text 28.5 252 -text 213 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 114 340 67 340 67 385 114 385 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 210
-    set {floorItems(210)} $i
-    $w create text 90.5 362.5 -text 210 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 59 389 59 385 65 385 65 340 1 340 1 389 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 211
-    set {floorItems(211)} $i
-    $w create text 33 364.5 -text 211 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 393 309 350 309 350 282 342 282 342 276 393 276 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 203
-    set {floorItems(203)} $i
-    $w create text 367.5 292.5 -text 203 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 99 191 91 191 91 226 174 226 174 198 154 198 154 192 109 192 109 169 99 169 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 220
-    set {floorItems(220)} $i
-    $w create text 132.5 208.5 -text 220 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 339 205 307 205 307 171 339 171 -fill {} -tags {floor2 room}]
-    set floorLabels($i) {Priv Lift2}
-    set {floorItems(Priv Lift2)} $i
-    $w create text 323 188 -text {Priv Lift2} -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 307 240 339 240 339 206 307 206 -fill {} -tags {floor2 room}]
-    set floorLabels($i) {Pub Lift 2}
-    set {floorItems(Pub Lift 2)} $i
-    $w create text 323 223 -text {Pub Lift 2} -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 175 168 97 168 97 131 175 131 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 218
-    set {floorItems(218)} $i
-    $w create text 136 149.5 -text 218 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 154 191 111 191 111 169 154 169 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 219
-    set {floorItems(219)} $i
-    $w create text 132.5 180 -text 219 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 375 246 375 172 341 172 341 246 -fill {} -tags {floor2 room}]
-    set floorLabels($i) 201
-    set {floorItems(201)} $i
-    $w create text 358 209 -text 201 -fill $color -anchor c -tags {floor2 label}
-    $w create line 641 186 678 186 -fill $color -tags {floor2 wall}
-    $w create line 757 350 757 367 -fill $color -tags {floor2 wall}
-    $w create line 634 133 634 144 -fill $color -tags {floor2 wall}
-    $w create line 634 144 627 144 -fill $color -tags {floor2 wall}
-    $w create line 572 133 572 144 -fill $color -tags {floor2 wall}
-    $w create line 572 144 579 144 -fill $color -tags {floor2 wall}
-    $w create line 398 129 398 162 -fill $color -tags {floor2 wall}
-    $w create line 174 197 175 197 -fill $color -tags {floor2 wall}
-    $w create line 175 197 175 227 -fill $color -tags {floor2 wall}
-    $w create line 757 206 757 221 -fill $color -tags {floor2 wall}
-    $w create line 396 188 408 188 -fill $color -tags {floor2 wall}
-    $w create line 727 189 725 189 -fill $color -tags {floor2 wall}
-    $w create line 747 167 802 167 -fill $color -tags {floor2 wall}
-    $w create line 747 167 747 189 -fill $color -tags {floor2 wall}
-    $w create line 755 189 739 189 -fill $color -tags {floor2 wall}
-    $w create line 769 224 757 224 -fill $color -tags {floor2 wall}
-    $w create line 802 224 802 129 -fill $color -tags {floor2 wall}
-    $w create line 802 129 725 129 -fill $color -tags {floor2 wall}
-    $w create line 725 189 725 129 -fill $color -tags {floor2 wall}
-    $w create line 725 186 690 186 -fill $color -tags {floor2 wall}
-    $w create line 676 133 676 186 -fill $color -tags {floor2 wall}
-    $w create line 627 144 627 186 -fill $color -tags {floor2 wall}
-    $w create line 629 186 593 186 -fill $color -tags {floor2 wall}
-    $w create line 579 144 579 186 -fill $color -tags {floor2 wall}
-    $w create line 559 129 559 133 -fill $color -tags {floor2 wall}
-    $w create line 725 133 559 133 -fill $color -tags {floor2 wall}
-    $w create line 484 162 484 129 -fill $color -tags {floor2 wall}
-    $w create line 559 129 484 129 -fill $color -tags {floor2 wall}
-    $w create line 526 129 526 186 -fill $color -tags {floor2 wall}
-    $w create line 540 186 581 186 -fill $color -tags {floor2 wall}
-    $w create line 528 186 523 186 -fill $color -tags {floor2 wall}
-    $w create line 511 186 475 186 -fill $color -tags {floor2 wall}
-    $w create line 496 190 496 186 -fill $color -tags {floor2 wall}
-    $w create line 496 205 496 202 -fill $color -tags {floor2 wall}
-    $w create line 475 205 527 205 -fill $color -tags {floor2 wall}
-    $w create line 558 205 539 205 -fill $color -tags {floor2 wall}
-    $w create line 558 205 558 249 -fill $color -tags {floor2 wall}
-    $w create line 558 249 475 249 -fill $color -tags {floor2 wall}
-    $w create line 662 206 642 206 -fill $color -tags {floor2 wall}
-    $w create line 695 206 675 206 -fill $color -tags {floor2 wall}
-    $w create line 695 278 642 278 -fill $color -tags {floor2 wall}
-    $w create line 642 291 642 206 -fill $color -tags {floor2 wall}
-    $w create line 695 291 695 206 -fill $color -tags {floor2 wall}
-    $w create line 716 208 716 206 -fill $color -tags {floor2 wall}
-    $w create line 757 206 716 206 -fill $color -tags {floor2 wall}
-    $w create line 757 221 757 224 -fill $color -tags {floor2 wall}
-    $w create line 793 224 802 224 -fill $color -tags {floor2 wall}
-    $w create line 757 262 716 262 -fill $color -tags {floor2 wall}
-    $w create line 716 220 716 264 -fill $color -tags {floor2 wall}
-    $w create line 716 315 716 276 -fill $color -tags {floor2 wall}
-    $w create line 757 315 703 315 -fill $color -tags {floor2 wall}
-    $w create line 757 325 757 224 -fill $color -tags {floor2 wall}
-    $w create line 757 367 644 367 -fill $color -tags {floor2 wall}
-    $w create line 689 367 689 315 -fill $color -tags {floor2 wall}
-    $w create line 647 315 644 315 -fill $color -tags {floor2 wall}
-    $w create line 659 315 691 315 -fill $color -tags {floor2 wall}
-    $w create line 600 325 600 391 -fill $color -tags {floor2 wall}
-    $w create line 627 325 644 325 -fill $color -tags {floor2 wall}
-    $w create line 644 391 644 315 -fill $color -tags {floor2 wall}
-    $w create line 615 325 575 325 -fill $color -tags {floor2 wall}
-    $w create line 644 391 558 391 -fill $color -tags {floor2 wall}
-    $w create line 563 325 558 325 -fill $color -tags {floor2 wall}
-    $w create line 558 391 558 314 -fill $color -tags {floor2 wall}
-    $w create line 558 327 508 327 -fill $color -tags {floor2 wall}
-    $w create line 558 275 484 275 -fill $color -tags {floor2 wall}
-    $w create line 558 302 558 275 -fill $color -tags {floor2 wall}
-    $w create line 508 327 508 311 -fill $color -tags {floor2 wall}
-    $w create line 484 311 508 311 -fill $color -tags {floor2 wall}
-    $w create line 484 275 484 311 -fill $color -tags {floor2 wall}
-    $w create line 475 208 408 208 -fill $color -tags {floor2 wall}
-    $w create line 408 206 408 210 -fill $color -tags {floor2 wall}
-    $w create line 408 222 408 227 -fill $color -tags {floor2 wall}
-    $w create line 408 227 398 227 -fill $color -tags {floor2 wall}
-    $w create line 398 227 398 254 -fill $color -tags {floor2 wall}
-    $w create line 408 188 408 194 -fill $color -tags {floor2 wall}
-    $w create line 383 188 376 188 -fill $color -tags {floor2 wall}
-    $w create line 398 188 398 162 -fill $color -tags {floor2 wall}
-    $w create line 398 162 484 162 -fill $color -tags {floor2 wall}
-    $w create line 475 162 475 254 -fill $color -tags {floor2 wall}
-    $w create line 398 254 475 254 -fill $color -tags {floor2 wall}
-    $w create line 484 280 395 280 -fill $color -tags {floor2 wall}
-    $w create line 395 311 395 275 -fill $color -tags {floor2 wall}
-    $w create line 307 197 293 197 -fill $color -tags {floor2 wall}
-    $w create line 278 197 233 197 -fill $color -tags {floor2 wall}
-    $w create line 233 197 233 249 -fill $color -tags {floor2 wall}
-    $w create line 307 179 284 179 -fill $color -tags {floor2 wall}
-    $w create line 233 249 278 249 -fill $color -tags {floor2 wall}
-    $w create line 269 179 269 133 -fill $color -tags {floor2 wall}
-    $w create line 220 179 220 133 -fill $color -tags {floor2 wall}
-    $w create line 155 191 110 191 -fill $color -tags {floor2 wall}
-    $w create line 90 190 98 190 -fill $color -tags {floor2 wall}
-    $w create line 98 169 98 190 -fill $color -tags {floor2 wall}
-    $w create line 52 133 52 165 -fill $color -tags {floor2 wall}
-    $w create line 52 214 52 177 -fill $color -tags {floor2 wall}
-    $w create line 52 226 52 262 -fill $color -tags {floor2 wall}
-    $w create line 52 274 52 276 -fill $color -tags {floor2 wall}
-    $w create line 234 275 234 339 -fill $color -tags {floor2 wall}
-    $w create line 226 339 258 339 -fill $color -tags {floor2 wall}
-    $w create line 211 387 211 339 -fill $color -tags {floor2 wall}
-    $w create line 214 339 177 339 -fill $color -tags {floor2 wall}
-    $w create line 258 387 60 387 -fill $color -tags {floor2 wall}
-    $w create line 3 133 3 339 -fill $color -tags {floor2 wall}
-    $w create line 165 339 129 339 -fill $color -tags {floor2 wall}
-    $w create line 117 339 80 339 -fill $color -tags {floor2 wall}
-    $w create line 68 339 59 339 -fill $color -tags {floor2 wall}
-    $w create line 0 339 46 339 -fill $color -tags {floor2 wall}
-    $w create line 60 391 0 391 -fill $color -tags {floor2 wall}
-    $w create line 0 339 0 391 -fill $color -tags {floor2 wall}
-    $w create line 60 387 60 391 -fill $color -tags {floor2 wall}
-    $w create line 258 329 258 387 -fill $color -tags {floor2 wall}
-    $w create line 350 329 258 329 -fill $color -tags {floor2 wall}
-    $w create line 395 311 350 311 -fill $color -tags {floor2 wall}
-    $w create line 398 129 315 129 -fill $color -tags {floor2 wall}
-    $w create line 176 133 315 133 -fill $color -tags {floor2 wall}
-    $w create line 176 129 96 129 -fill $color -tags {floor2 wall}
-    $w create line 3 133 96 133 -fill $color -tags {floor2 wall}
-    $w create line 66 387 66 339 -fill $color -tags {floor2 wall}
-    $w create line 115 387 115 339 -fill $color -tags {floor2 wall}
-    $w create line 163 387 163 339 -fill $color -tags {floor2 wall}
-    $w create line 234 275 276 275 -fill $color -tags {floor2 wall}
-    $w create line 288 275 309 275 -fill $color -tags {floor2 wall}
-    $w create line 298 275 298 329 -fill $color -tags {floor2 wall}
-    $w create line 341 283 350 283 -fill $color -tags {floor2 wall}
-    $w create line 321 275 341 275 -fill $color -tags {floor2 wall}
-    $w create line 375 275 395 275 -fill $color -tags {floor2 wall}
-    $w create line 315 129 315 170 -fill $color -tags {floor2 wall}
-    $w create line 376 170 307 170 -fill $color -tags {floor2 wall}
-    $w create line 307 250 307 170 -fill $color -tags {floor2 wall}
-    $w create line 376 245 376 170 -fill $color -tags {floor2 wall}
-    $w create line 340 241 307 241 -fill $color -tags {floor2 wall}
-    $w create line 340 245 340 224 -fill $color -tags {floor2 wall}
-    $w create line 340 210 340 201 -fill $color -tags {floor2 wall}
-    $w create line 340 187 340 170 -fill $color -tags {floor2 wall}
-    $w create line 340 206 307 206 -fill $color -tags {floor2 wall}
-    $w create line 293 250 307 250 -fill $color -tags {floor2 wall}
-    $w create line 271 179 238 179 -fill $color -tags {floor2 wall}
-    $w create line 226 179 195 179 -fill $color -tags {floor2 wall}
-    $w create line 176 129 176 179 -fill $color -tags {floor2 wall}
-    $w create line 182 179 176 179 -fill $color -tags {floor2 wall}
-    $w create line 174 169 176 169 -fill $color -tags {floor2 wall}
-    $w create line 162 169 90 169 -fill $color -tags {floor2 wall}
-    $w create line 96 169 96 129 -fill $color -tags {floor2 wall}
-    $w create line 175 227 90 227 -fill $color -tags {floor2 wall}
-    $w create line 90 190 90 227 -fill $color -tags {floor2 wall}
-    $w create line 52 179 3 179 -fill $color -tags {floor2 wall}
-    $w create line 52 228 3 228 -fill $color -tags {floor2 wall}
-    $w create line 52 276 3 276 -fill $color -tags {floor2 wall}
-    $w create line 155 177 155 169 -fill $color -tags {floor2 wall}
-    $w create line 110 191 110 169 -fill $color -tags {floor2 wall}
-    $w create line 155 189 155 197 -fill $color -tags {floor2 wall}
-    $w create line 350 283 350 329 -fill $color -tags {floor2 wall}
-    $w create line 162 197 155 197 -fill $color -tags {floor2 wall}
-    $w create line 341 275 341 283 -fill $color -tags {floor2 wall}
-}
-
-# fg3 --
-# This procedure represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the third
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -		The canvas window.
-# color -	Color to use for drawing foreground information.
-
-proc fg3 {w color} {
-    global floorLabels floorItems
-    set i [$w create polygon 89 228 89 180 70 180 70 228 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 316
-    set {floorItems(316)} $i
-    $w create text 79.5 204 -text 316 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 115 368 162 368 162 323 115 323 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 309
-    set {floorItems(309)} $i
-    $w create text 138.5 345.5 -text 309 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 164 323 164 368 211 368 211 323 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 308
-    set {floorItems(308)} $i
-    $w create text 187.5 345.5 -text 308 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 256 368 212 368 212 323 256 323 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 307
-    set {floorItems(307)} $i
-    $w create text 234 345.5 -text 307 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 244 276 297 276 297 327 260 327 260 321 244 321 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 305
-    set {floorItems(305)} $i
-    $w create text 270.5 301.5 -text 305 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 251 219 251 203 244 203 244 219 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 324B
-    set {floorItems(324B)} $i
-    $w create text 247.5 211 -text 324B -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 251 249 244 249 244 232 251 232 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 324A
-    set {floorItems(324A)} $i
-    $w create text 247.5 240.5 -text 324A -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 223 135 223 179 177 179 177 135 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 320
-    set {floorItems(320)} $i
-    $w create text 200 157 -text 320 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 114 368 114 323 67 323 67 368 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 310
-    set {floorItems(310)} $i
-    $w create text 90.5 345.5 -text 310 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 23 277 23 321 68 321 68 277 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 312
-    set {floorItems(312)} $i
-    $w create text 45.5 299 -text 312 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 23 229 68 229 68 275 23 275 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 313
-    set {floorItems(313)} $i
-    $w create text 45.5 252 -text 313 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 68 227 23 227 23 180 68 180 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 314
-    set {floorItems(314)} $i
-    $w create text 45.5 203.5 -text 314 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 95 179 95 135 23 135 23 179 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 315
-    set {floorItems(315)} $i
-    $w create text 59 157 -text 315 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 99 226 99 204 91 204 91 226 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 316B
-    set {floorItems(316B)} $i
-    $w create text 95 215 -text 316B -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 91 202 99 202 99 180 91 180 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 316A
-    set {floorItems(316A)} $i
-    $w create text 95 191 -text 316A -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 97 169 109 169 109 192 154 192 154 198 174 198 174 226 101 226 101 179 97 179 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 319
-    set {floorItems(319)} $i
-    $w create text 141.5 209 -text 319 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 65 368 58 368 58 389 1 389 1 333 23 333 23 323 65 323 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 311
-    set {floorItems(311)} $i
-    $w create text 29.5 361 -text 311 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 154 191 111 191 111 169 154 169 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 318
-    set {floorItems(318)} $i
-    $w create text 132.5 180 -text 318 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 175 168 97 168 97 131 175 131 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 317
-    set {floorItems(317)} $i
-    $w create text 136 149.5 -text 317 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 274 194 274 221 306 221 306 194 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 323
-    set {floorItems(323)} $i
-    $w create text 290 207.5 -text 323 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 306 222 274 222 274 249 306 249 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 325
-    set {floorItems(325)} $i
-    $w create text 290 235.5 -text 325 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 263 179 224 179 224 135 263 135 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 321
-    set {floorItems(321)} $i
-    $w create text 243.5 157 -text 321 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 314 169 306 169 306 192 273 192 264 181 264 135 314 135 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 322
-    set {floorItems(322)} $i
-    $w create text 293.5 163.5 -text 322 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 307 240 339 240 339 206 307 206 -fill {} -tags {floor3 room}]
-    set floorLabels($i) {Pub Lift3}
-    set {floorItems(Pub Lift3)} $i
-    $w create text 323 223 -text {Pub Lift3} -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 339 205 307 205 307 171 339 171 -fill {} -tags {floor3 room}]
-    set floorLabels($i) {Priv Lift3}
-    set {floorItems(Priv Lift3)} $i
-    $w create text 323 188 -text {Priv Lift3} -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 350 284 376 284 376 276 397 276 397 309 350 309 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 303
-    set {floorItems(303)} $i
-    $w create text 373.5 292.5 -text 303 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 272 203 272 249 252 249 252 230 244 230 244 221 252 221 252 203 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 324
-    set {floorItems(324)} $i
-    $w create text 262 226 -text 324 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 299 276 299 327 349 327 349 284 341 284 341 276 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 304
-    set {floorItems(304)} $i
-    $w create text 324 301.5 -text 304 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 375 246 375 172 341 172 341 246 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 301
-    set {floorItems(301)} $i
-    $w create text 358 209 -text 301 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 397 246 377 246 377 185 397 185 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 327
-    set {floorItems(327)} $i
-    $w create text 387 215.5 -text 327 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 316 131 316 169 377 169 377 185 397 185 397 131 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 326
-    set {floorItems(326)} $i
-    $w create text 356.5 150 -text 326 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 308 251 242 251 242 274 342 274 342 282 375 282 375 274 397 274 397 248 339 248 339 242 308 242 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 302
-    set {floorItems(302)} $i
-    $w create text 319.5 261 -text 302 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 70 321 242 321 242 200 259 200 259 203 272 203 272 193 263 180 242 180 175 180 175 169 156 169 156 196 177 196 177 228 107 228 70 228 70 275 107 275 107 248 160 248 160 301 107 301 107 275 70 275 -fill {} -tags {floor3 room}]
-    set floorLabels($i) 306
-    set {floorItems(306)} $i
-    $w create text 200.5 284.5 -text 306 -fill $color -anchor c -tags {floor3 label}
-    $w create line 341 275 341 283 -fill $color -tags {floor3 wall}
-    $w create line 162 197 155 197 -fill $color -tags {floor3 wall}
-    $w create line 396 247 399 247 -fill $color -tags {floor3 wall}
-    $w create line 399 129 399 311 -fill $color -tags {floor3 wall}
-    $w create line 258 202 243 202 -fill $color -tags {floor3 wall}
-    $w create line 350 283 350 329 -fill $color -tags {floor3 wall}
-    $w create line 251 231 243 231 -fill $color -tags {floor3 wall}
-    $w create line 243 220 251 220 -fill $color -tags {floor3 wall}
-    $w create line 243 250 243 202 -fill $color -tags {floor3 wall}
-    $w create line 155 197 155 190 -fill $color -tags {floor3 wall}
-    $w create line 110 192 110 169 -fill $color -tags {floor3 wall}
-    $w create line 155 192 110 192 -fill $color -tags {floor3 wall}
-    $w create line 155 177 155 169 -fill $color -tags {floor3 wall}
-    $w create line 176 197 176 227 -fill $color -tags {floor3 wall}
-    $w create line 69 280 69 274 -fill $color -tags {floor3 wall}
-    $w create line 21 276 69 276 -fill $color -tags {floor3 wall}
-    $w create line 69 262 69 226 -fill $color -tags {floor3 wall}
-    $w create line 21 228 69 228 -fill $color -tags {floor3 wall}
-    $w create line 21 179 75 179 -fill $color -tags {floor3 wall}
-    $w create line 69 179 69 214 -fill $color -tags {floor3 wall}
-    $w create line 90 220 90 227 -fill $color -tags {floor3 wall}
-    $w create line 90 204 90 202 -fill $color -tags {floor3 wall}
-    $w create line 90 203 100 203 -fill $color -tags {floor3 wall}
-    $w create line 90 187 90 179 -fill $color -tags {floor3 wall}
-    $w create line 90 227 176 227 -fill $color -tags {floor3 wall}
-    $w create line 100 179 100 227 -fill $color -tags {floor3 wall}
-    $w create line 100 179 87 179 -fill $color -tags {floor3 wall}
-    $w create line 96 179 96 129 -fill $color -tags {floor3 wall}
-    $w create line 162 169 96 169 -fill $color -tags {floor3 wall}
-    $w create line 173 169 176 169 -fill $color -tags {floor3 wall}
-    $w create line 182 179 176 179 -fill $color -tags {floor3 wall}
-    $w create line 176 129 176 179 -fill $color -tags {floor3 wall}
-    $w create line 195 179 226 179 -fill $color -tags {floor3 wall}
-    $w create line 224 133 224 179 -fill $color -tags {floor3 wall}
-    $w create line 264 179 264 133 -fill $color -tags {floor3 wall}
-    $w create line 238 179 264 179 -fill $color -tags {floor3 wall}
-    $w create line 273 207 273 193 -fill $color -tags {floor3 wall}
-    $w create line 273 235 273 250 -fill $color -tags {floor3 wall}
-    $w create line 273 224 273 219 -fill $color -tags {floor3 wall}
-    $w create line 273 193 307 193 -fill $color -tags {floor3 wall}
-    $w create line 273 222 307 222 -fill $color -tags {floor3 wall}
-    $w create line 273 250 307 250 -fill $color -tags {floor3 wall}
-    $w create line 384 247 376 247 -fill $color -tags {floor3 wall}
-    $w create line 340 206 307 206 -fill $color -tags {floor3 wall}
-    $w create line 340 187 340 170 -fill $color -tags {floor3 wall}
-    $w create line 340 210 340 201 -fill $color -tags {floor3 wall}
-    $w create line 340 247 340 224 -fill $color -tags {floor3 wall}
-    $w create line 340 241 307 241 -fill $color -tags {floor3 wall}
-    $w create line 376 247 376 170 -fill $color -tags {floor3 wall}
-    $w create line 307 250 307 170 -fill $color -tags {floor3 wall}
-    $w create line 376 170 307 170 -fill $color -tags {floor3 wall}
-    $w create line 315 129 315 170 -fill $color -tags {floor3 wall}
-    $w create line 376 283 366 283 -fill $color -tags {floor3 wall}
-    $w create line 376 283 376 275 -fill $color -tags {floor3 wall}
-    $w create line 399 275 376 275 -fill $color -tags {floor3 wall}
-    $w create line 341 275 320 275 -fill $color -tags {floor3 wall}
-    $w create line 341 283 350 283 -fill $color -tags {floor3 wall}
-    $w create line 298 275 298 329 -fill $color -tags {floor3 wall}
-    $w create line 308 275 298 275 -fill $color -tags {floor3 wall}
-    $w create line 243 322 243 275 -fill $color -tags {floor3 wall}
-    $w create line 243 275 284 275 -fill $color -tags {floor3 wall}
-    $w create line 258 322 226 322 -fill $color -tags {floor3 wall}
-    $w create line 212 370 212 322 -fill $color -tags {floor3 wall}
-    $w create line 214 322 177 322 -fill $color -tags {floor3 wall}
-    $w create line 163 370 163 322 -fill $color -tags {floor3 wall}
-    $w create line 165 322 129 322 -fill $color -tags {floor3 wall}
-    $w create line 84 322 117 322 -fill $color -tags {floor3 wall}
-    $w create line 71 322 64 322 -fill $color -tags {floor3 wall}
-    $w create line 115 322 115 370 -fill $color -tags {floor3 wall}
-    $w create line 66 322 66 370 -fill $color -tags {floor3 wall}
-    $w create line 52 322 21 322 -fill $color -tags {floor3 wall}
-    $w create line 21 331 0 331 -fill $color -tags {floor3 wall}
-    $w create line 21 331 21 133 -fill $color -tags {floor3 wall}
-    $w create line 96 133 21 133 -fill $color -tags {floor3 wall}
-    $w create line 176 129 96 129 -fill $color -tags {floor3 wall}
-    $w create line 315 133 176 133 -fill $color -tags {floor3 wall}
-    $w create line 315 129 399 129 -fill $color -tags {floor3 wall}
-    $w create line 399 311 350 311 -fill $color -tags {floor3 wall}
-    $w create line 350 329 258 329 -fill $color -tags {floor3 wall}
-    $w create line 258 322 258 370 -fill $color -tags {floor3 wall}
-    $w create line 60 370 258 370 -fill $color -tags {floor3 wall}
-    $w create line 60 370 60 391 -fill $color -tags {floor3 wall}
-    $w create line 0 391 0 331 -fill $color -tags {floor3 wall}
-    $w create line 60 391 0 391 -fill $color -tags {floor3 wall}
-    $w create line 307 250 307 242 -fill $color -tags {floor3 wall}
-    $w create line 273 250 307 250 -fill $color -tags {floor3 wall}
-    $w create line 258 250 243 250 -fill $color -tags {floor3 wall}
-}
-
-# Below is the "main program" that creates the floorplan demonstration.
-
-set w .floor
-global c currentRoom colors activeFloor
-catch {destroy $w}
-toplevel $w
-wm title $w "Floorplan Canvas Demonstration"
-wm iconname $w "Floorplan"
-wm geometry $w +20+20
-wm minsize $w 100 100
-
-label $w.msg -font $font -wraplength 8i -justify left  -text "This window contains a canvas widget showing the floorplan of Digital Equipment Corporation's Western Research Laboratory.  It has three levels.  At any given time one of the levels is active, meaning that you can see its room structure.  To activate a level, click the left mouse button anywhere on it.  As the mouse moves over the active level, the room under the mouse lights up and its room number appears in the \"Room:\" entry.  You can also type a room number in the entry and the room will light up."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-set f [frame $w.frame]
-pack $f -side top -fill both -expand yes
-set h [ttk::scrollbar $f.hscroll -orient horizontal]
-set v [ttk::scrollbar $f.vscroll -orient vertical]
-set f1 [frame $f.f1 -borderwidth 2 -relief sunken]
-set c [canvas $f1.c -width 900 -height 500 -highlightthickness 0 \
-	   -xscrollcommand [list $h set] \
-	   -yscrollcommand [list $v set]]
-pack $c -expand yes -fill both
-grid $f1 -padx 1 -pady 1 -row 0 -column 0 -rowspan 1 -columnspan 1 -sticky news
-grid $v -padx 1 -pady 1 -row 0 -column 1 -rowspan 1 -columnspan 1 -sticky news
-grid $h -padx 1 -pady 1 -row 1 -column 0 -rowspan 1 -columnspan 1 -sticky news
-grid rowconfig    $f 0 -weight 1 -minsize 0
-grid columnconfig $f 0 -weight 1 -minsize 0
-pack $f -expand yes -fill both -padx 1 -pady 1
-
-$v configure -command [list $c yview]
-$h configure -command [list $c xview]
-
-# Create an entry for displaying and typing in current room.
-
-entry $c.entry -width 10 -textvariable currentRoom
-
-# Choose colors, then fill in the floorplan.
-
-if {[winfo depth $c] > 1} {
-    set colors(bg1) #a9c1da
-    set colors(outline1) #77889a
-    set colors(bg2) #9ab0c6
-    set colors(outline2) #687786
-    set colors(bg3) #8ba0b3
-    set colors(outline3) #596673
-    set colors(offices) Black
-    set colors(active) #c4d1df
-} else {
-    set colors(bg1) white
-    set colors(outline1) black
-    set colors(bg2) white
-    set colors(outline2) black
-    set colors(bg3) white
-    set colors(outline3) black
-    set colors(offices) Black
-    set colors(active) black
-}
-set activeFloor ""
-floorDisplay $c 3
-
-# Set up event bindings for canvas:
-
-$c bind floor1 <1> "floorDisplay $c 1"
-$c bind floor2 <1> "floorDisplay $c 2"
-$c bind floor3 <1> "floorDisplay $c 3"
-$c bind room <Enter> "newRoom $c"
-$c bind room <Leave> {set currentRoom ""}
-bind $c <2> "$c scan mark %x %y"
-bind $c <B2-Motion> "$c scan dragto %x %y"
-bind $c <Destroy> "unset currentRoom"
-set currentRoom ""
-trace variable currentRoom w "roomChanged $c"
diff --git a/tk8.6/library/demos/fontchoose.tcl b/tk8.6/library/demos/fontchoose.tcl
deleted file mode 100644
index 8b34377..0000000
--- a/tk8.6/library/demos/fontchoose.tcl
+++ /dev/null
@@ -1,69 +0,0 @@
-# fontchoose.tcl --
-#
-# Show off the stock font selector dialog
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .fontchoose
-catch {destroy $w}
-toplevel $w
-wm title $w "Font Selection Dialog"
-wm iconname $w "fontchooser"
-positionWindow $w
-
-catch {font create FontchooseDemoFont {*}[font actual TkDefaultFont]}
-
-# The font chooser needs to be configured and then shown.
-proc SelectFont {parent} {
-    tk fontchooser configure -font FontchooseDemoFont \
-        -command ApplyFont -parent $parent
-    tk fontchooser show
-}
-
-proc ApplyFont {font} {
-    font configure FontchooseDemoFont {*}[font actual $font]
-}
-
-# When the visibility of the fontchooser changes, the following event is fired
-# to the parent widget.
-#
-bind $w <<TkFontchooserVisibility>> {
-    if {[tk fontchooser configure -visible]} {
-        %W.f.font state disabled
-    } else {
-        %W.f.font state !disabled
-    }
-}
-
-
-set f [ttk::frame $w.f -relief sunken -padding 2]
-
-text $f.msg -font FontchooseDemoFont -width 40 -height 6 -borderwidth 0 \
-    -yscrollcommand [list $f.vs set]
-ttk::scrollbar $f.vs -command [list $f.msg yview]
-
-$f.msg insert end "Press the buttons below to choose a new font for the\
-  text shown in this window.\n" {}
-
-ttk::button $f.font -text "Set font ..." -command [list SelectFont $w]
-
-grid $f.msg $f.vs -sticky news
-grid $f.font -    -sticky e
-grid columnconfigure $f 0 -weight 1
-grid rowconfigure $f 0 -weight 1
-bind $w <Visibility> {
-    bind %W <Visibility> {}
-    grid propagate %W.f 0
-}
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-
-grid $f -sticky news
-grid $btns -sticky ew
-grid columnconfigure $w 0 -weight 1
-grid rowconfigure $w 0 -weight 1
diff --git a/tk8.6/library/demos/form.tcl b/tk8.6/library/demos/form.tcl
deleted file mode 100644
index 4d80437..0000000
--- a/tk8.6/library/demos/form.tcl
+++ /dev/null
@@ -1,38 +0,0 @@
-# form.tcl --
-#
-# This demonstration script creates a simple form with a bunch
-# of entry widgets.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .form
-catch {destroy $w}
-toplevel $w
-wm title $w "Form Demonstration"
-wm iconname $w "form"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "This window contains a simple form where you can type in the various entries and use tabs to move circularly between the entries."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-foreach i {f1 f2 f3 f4 f5} {
-    frame $w.$i -bd 2
-    entry $w.$i.entry -relief sunken -width 40
-    label $w.$i.label
-    pack $w.$i.entry -side right
-    pack $w.$i.label -side left
-}
-$w.f1.label config -text Name:
-$w.f2.label config -text Address:
-$w.f5.label config -text Phone:
-pack $w.msg $w.f1 $w.f2 $w.f3 $w.f4 $w.f5 -side top -fill x
-bind $w <Return> "destroy $w"
-focus $w.f1.entry
diff --git a/tk8.6/library/demos/goldberg.tcl b/tk8.6/library/demos/goldberg.tcl
deleted file mode 100644
index 284b5c2..0000000
--- a/tk8.6/library/demos/goldberg.tcl
+++ /dev/null
@@ -1,1833 +0,0 @@
-##+#################################################################
-#
-# TkGoldberg.tcl
-# by Keith Vetter, March 13, 2003
-#
-# "Man will always find a difficult means to perform a simple task"
-# Rube Goldberg
-#
-# Reproduced here with permission.
-#
-##+#################################################################
-#
-# Keith Vetter 2003-03-21: this started out as a simple little program
-# but was so much fun that it grew and grew. So I apologize about the
-# size but I just couldn't resist sharing it.
-#
-# This is a whizzlet that does a Rube Goldberg type animation, the
-# design of which comes from an New Years e-card from IncrediMail.
-# That version had nice sound effects which I eschewed. On the other
-# hand, that version was in black and white (actually dark blue and
-# light blue) and this one is fully colorized.
-#
-# One thing I learned from this project is that drawing filled complex
-# objects on a canvas is really hard. More often than not I had to
-# draw each item twice--once with the desired fill color but no
-# outline, and once with no fill but with the outline. Another trick
-# is erasing by drawing with the background color. Having a flood fill
-# command would have been extremely helpful.
-#
-# Two wiki pages were extremely helpful: Drawing rounded rectangles
-# which I generalized into Drawing rounded polygons, and regular
-# polygons which allowed me to convert ovals and arcs into polygons
-# which could then be rotated (see Canvas Rotation). I also wrote
-# Named Colors to aid in the color selection.
-#
-# I could comment on the code, but it's just 26 state machines with
-# lots of canvas create and move calls.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .goldberg
-catch {destroy $w}
-toplevel $w
-wm title $w "Tk Goldberg (demonstration)"
-wm iconname $w "goldberg"
-wm resizable $w 0 0
-#positionWindow $w
-
-label $w.msg -font {Arial 10} -wraplength 4i -justify left -text "This is a\
-	demonstration of just how complex you can make your animations\
-	become. Click the ball to start things moving!\n\n\"Man will always\
-	find a difficult means to perform a simple task\"\n - Rube Goldberg"
-pack $w.msg -side top
-
-###--- End of Boilerplate ---###
-
-# Ensure that this this is an array
-array set animationCallbacks {}
-bind $w <Destroy> {
-    if {"%W" eq [winfo toplevel %W]} {
-	unset S C speed
-    }
-}
-
-set S(title) "Tk Goldberg"
-set S(speed) 5
-set S(cnt) 0
-set S(message) "\\nWelcome\\nto\\nTcl/Tk"
-array set speed {1 10 2 20 3 50 4 80 5 100 6 150 7 200 8 300 9 400 10 500}
-
-set MSTART 0; set MGO 1; set MPAUSE 2; set MSSTEP 3; set MBSTEP 4; set MDONE 5
-set S(mode) $::MSTART
-
-# Colors for everything
-set C(fg) black
-set C(bg) gray75
-set C(bg) cornflowerblue
-
-set C(0) white;		set C(1a) darkgreen;	set C(1b) yellow
-set C(2) red;		set C(3a) green;	set C(3b) darkblue
-set C(4) $C(fg);	set C(5a) brown;	set C(5b) white
-set C(6) magenta;	set C(7) green;		set C(8) $C(fg)
-set C(9) blue4;		set C(10a) white;	set C(10b) cyan
-set C(11a) yellow;	set C(11b) mediumblue;	set C(12) tan2
-set C(13a) yellow;	set C(13b) red;		set C(14) white
-set C(15a) green;	set C(15b) yellow;	set C(16) gray65
-set C(17) \#A65353;	set C(18) $C(fg);	set C(19) gray50
-set C(20) cyan;		set C(21) gray65;	set C(22) $C(20)
-set C(23a) blue;	set C(23b) red;		set C(23c) yellow
-set C(24a) red;		set C(24b) white;
-
-proc DoDisplay {w} {
-    global S C
-
-    ttk::frame $w.ctrl -relief ridge -borderwidth 2 -padding 5
-    pack [frame $w.screen -bd 2 -relief raised] \
-	    -side left -fill both -expand 1
-
-    canvas $w.c -width 860 -height 730 -bg $C(bg) -highlightthickness 0
-    $w.c config -scrollregion {0 0 1000 1000}	;# Kludge: move everything up
-    $w.c yview moveto .05
-    pack $w.c -in $w.screen -side top -fill both -expand 1
-
-    bind $w.c <3> [list $w.pause invoke]
-    bind $w.c <Destroy> {
-	after cancel $animationCallbacks(goldberg)
-	unset animationCallbacks(goldberg)
-    }
-    DoCtrlFrame $w
-    DoDetailFrame $w
-    if {[tk windowingsystem] ne "aqua"} {
-	ttk::button $w.show -text "\u00bb" -command [list ShowCtrl $w] -width 2
-    } else {
-	button $w.show -text "\u00bb" -command [list ShowCtrl $w] -width 2 -highlightbackground $C(bg)
-    }
-    place $w.show -in $w.c -relx 1 -rely 0 -anchor ne
-    update
-}
-
-proc DoCtrlFrame {w} {
-    global S
-    ttk::button $w.start -text "Start" -command [list DoButton $w 0]
-    ttk::checkbutton $w.pause -text "Pause" -command [list DoButton $w 1] \
-	    -variable S(pause)
-    ttk::button $w.step -text "Single Step" -command [list DoButton $w 2]
-    ttk::button $w.bstep -text "Big Step" -command [list DoButton $w 4]
-    ttk::button $w.reset -text "Reset" -command [list DoButton $w 3]
-    ttk::labelframe $w.details
-    raise $w.details
-    set S(details) 0
-    ttk::checkbutton $w.details.cb -text "Details" -variable S(details)
-    ttk::labelframe $w.message -text "Message"
-    ttk::entry $w.message.e -textvariable S(message) -justify center
-    ttk::labelframe $w.speed -text "Speed: 0"
-    ttk::scale $w.speed.scale -orient h -from 1 -to 10 -variable S(speed)
-    ttk::button $w.about -text About -command [list About $w]
-
-    grid $w.start -in $w.ctrl -row 0 -sticky ew
-    grid rowconfigure $w.ctrl 1 -minsize 10
-    grid $w.pause -in $w.ctrl -row 2 -sticky ew
-    grid $w.step  -in $w.ctrl -sticky ew -pady 2
-    grid $w.bstep -in $w.ctrl -sticky ew
-    grid $w.reset -in $w.ctrl -sticky ew -pady 2
-    grid rowconfigure $w.ctrl 10 -minsize 18
-    grid $w.details -in $w.ctrl -row 11 -sticky ew
-    grid rowconfigure $w.ctrl 11 -minsize 20
-    $w.details configure -labelwidget $w.details.cb
-    grid [ttk::frame $w.details.b -height 1]	;# Work around minor bug
-    raise $w.details
-    raise $w.details.cb
-    grid rowconfigure $w.ctrl 50 -weight 1
-    trace variable ::S(mode) w	  [list ActiveGUI $w]
-    trace variable ::S(details) w [list ActiveGUI $w]
-    trace variable ::S(speed) w	  [list ActiveGUI $w]
-
-    grid $w.message -in $w.ctrl -row 98 -sticky ew -pady 5
-    grid $w.message.e -sticky nsew
-    grid $w.speed -in $w.ctrl -row 99 -sticky ew -pady {0 5}
-    pack $w.speed.scale -fill both -expand 1
-    grid $w.about -in $w.ctrl -row 100 -sticky ew
-    bind $w.reset <3> {set S(mode) -1}		;# Debugging
-
-    ## See Code / Dismiss buttons hack!
-    set btns [addSeeDismiss $w.ctrl.buttons $w]
-    grid [ttk::separator $w.ctrl.sep] -sticky ew -pady 4
-    set i 0
-    foreach b [winfo children $btns] {
-	if {[winfo class $b] eq "TButton"} {
-	    grid [set b2 [ttk::button $w.ctrl.b[incr i]]] -sticky ew
-	    foreach b3 [$b configure] {
-		set b3 [lindex $b3 0]
-		# Some options are read-only; ignore those errors
-		catch {$b2 configure $b3 [$b cget $b3]}
-	    }
-	}
-    }
-    destroy $btns
-}
-
-proc DoDetailFrame {w} {
-    set w2 $w.details.f
-    ttk::frame $w2
-
-    set bd 2
-    ttk::label $w2.l -textvariable S(cnt) -background white
-    grid $w2.l - - - -sticky ew -row 0
-    for {set i 1} {1} {incr i} {
-	if {[info procs "Move$i"] eq ""} break
-	ttk::label $w2.l$i -text $i -anchor e -width 2 -background white
-	ttk::label $w2.ll$i -textvariable STEP($i) -width 5 -background white
-	set row [expr {($i + 1) / 2}]
-	set col [expr {(($i + 1) & 1) * 2}]
-	grid $w2.l$i -sticky ew -row $row -column $col
-	grid $w2.ll$i -sticky ew -row $row -column [incr col]
-    }
-    grid columnconfigure $w2 1 -weight 1
-}
-
-# Map or unmap the ctrl window
-proc ShowCtrl {w} {
-    if {[winfo ismapped $w.ctrl]} {
-	pack forget $w.ctrl
-	$w.show config -text "\u00bb"
-    } else {
-	pack $w.ctrl -side right -fill both -ipady 5
-	$w.show config -text "\u00ab"
-    }
-}
-
-proc DrawAll {w} {
-    ResetStep
-    $w.c delete all
-    for {set i 0} {1} {incr i} {
-	set p "Draw$i"
-	if {[info procs $p] eq ""} break
-	$p $w
-    }
-}
-
-proc ActiveGUI {w var1 var2 op} {
-    global S MGO MSTART MDONE
-    array set z {0 disabled 1 normal}
-
-    set m $S(mode)
-    set S(pause) [expr {$m == 2}]
-    $w.start  config -state $z([expr {$m != $MGO}])
-    $w.pause  config -state $z([expr {$m != $MSTART && $m != $MDONE}])
-    $w.step   config -state $z([expr {$m != $MGO && $m != $MDONE}])
-    $w.bstep  config -state $z([expr {$m != $MGO && $m != $MDONE}])
-    $w.reset  config -state $z([expr {$m != $MSTART}])
-
-    if {$S(details)} {
-	grid $w.details.f -sticky ew
-    } else {
-	grid forget $w.details.f
-    }
-    set S(speed) [expr {round($S(speed))}]
-    $w.speed config -text "Speed: $S(speed)"
-}
-
-proc Start {} {
-    global S MGO
-    set S(mode) $MGO
-}
-
-proc DoButton {w what} {
-    global S MDONE MGO MSSTEP MBSTEP MPAUSE
-
-    if {$what == 0} {				;# Start
-	if {$S(mode) == $MDONE} {
-	    Reset $w
-	}
-	set S(mode) $MGO
-    } elseif {$what == 1} {			;# Pause
-	set S(mode) [expr {$S(pause) ? $MPAUSE : $MGO}]
-    } elseif {$what == 2} {			;# Step
-	set S(mode) $MSSTEP
-    } elseif {$what == 3} {			;# Reset
-	Reset $w
-    } elseif {$what == 4} {			;# Big step
-	set S(mode) $MBSTEP
-    }
-}
-
-proc Go {w {who {}}} {
-    global S speed animationCallbacks MGO MPAUSE MSSTEP MBSTEP
-
-    set now [clock clicks -milliseconds]
-    catch {after cancel $animationCallbacks(goldberg)}
-    if {$who ne ""} {				;# Start here for debugging
-	set S(active) $who;
-	set S(mode) $MGO
-    }
-    if {$S(mode) == -1} return			;# Debugging
-    set n 0
-    if {$S(mode) != $MPAUSE} {			;# Not paused
-	set n [NextStep $w]			;# Do the next move
-    }
-    if {$S(mode) == $MSSTEP} {			;# Single step
-	set S(mode) $MPAUSE
-    }
-    if {$S(mode) == $MBSTEP && $n} {		;# Big step
-	set S(mode) $MSSTEP
-    }
-
-    set elapsed [expr {[clock click -milliseconds] - $now}]
-    set delay [expr {$speed($S(speed)) - $elapsed}]
-    if {$delay <= 0} {
-	set delay 1
-    }
-    set animationCallbacks(goldberg) [after $delay [list Go $w]]
-}
-
-# NextStep: drives the next step of the animation
-proc NextStep {w} {
-    global S MSTART MDONE
-    set rval 0					;# Return value
-
-    if {$S(mode) != $MSTART && $S(mode) != $MDONE} {
-	incr S(cnt)
-    }
-    set alive {}
-    foreach {who} $S(active) {
-	set n ["Move$who" $w]
-	if {$n & 1} {				;# This guy still alive
-	    lappend alive $who
-	}
-	if {$n & 2} {				;# Next guy is active
-	    lappend alive [expr {$who + 1}]
-	    set rval 1
-	}
-	if {$n & 4} {				;# End of puzzle flag
-	    set S(mode) $MDONE			;# Done mode
-	    set S(active) {}			;# No more animation
-	    return 1
-	}
-    }
-    set S(active) $alive
-    return $rval
-}
-proc About {w} {
-    set msg "$::S(title)\nby Keith Vetter, March 2003\n(Reproduced by kind\
-	    permission of the author)\n\n\"Man will always find a difficult\
-	    means to perform a simple task.\"\nRube Goldberg"
-    tk_messageBox -parent $w -message $msg -title About
-}
-################################################################
-#
-# All the drawing and moving routines
-#
-
-# START HERE! banner
-proc Draw0 {w} {
-    set color $::C(0)
-    set xy {579 119}
-    $w.c create text $xy -text "START HERE!" -fill $color -anchor w \
-	    -tag I0 -font {{Times Roman} 12 italic bold}
-    set xy {719 119 763 119}
-    $w.c create line $xy -tag I0 -fill $color -width 5 -arrow last \
-	    -arrowshape {18 18 5}
-    $w.c bind I0 <1> Start
-}
-proc Move0 {w {step {}}} {
-    set step [GetStep 0 $step]
-
-    if {$::S(mode) > $::MSTART} {		;# Start the ball rolling
-	MoveAbs $w I0 {-100 -100}		;# Hide the banner
-	return 2
-    }
-
-    set pos {
-	{673 119} {678 119} {683 119} {688 119}
-	{693 119} {688 119} {683 119} {678 119}
-    }
-    set step [expr {$step % [llength $pos]}]
-    MoveAbs $w I0 [lindex $pos $step]
-    return 1
-}
-
-# Dropping ball
-proc Draw1 {w} {
-    set color $::C(1a)
-    set color2 $::C(1b)
-    set xy {844 133 800 133 800 346 820 346 820 168 844 168 844 133}
-    $w.c create poly $xy -width 3 -fill $color -outline {}
-    set xy {771 133 685 133 685 168 751 168 751 346 771 346 771 133}
-    $w.c create poly $xy -width 3 -fill $color -outline {}
-
-    set xy [box 812 122 9]
-    $w.c create oval $xy -tag I1 -fill $color2 -outline {}
-    $w.c bind I1 <1> Start
-}
-proc Move1 {w {step {}}} {
-    set step [GetStep 1 $step]
-    set pos {
-	{807 122} {802 122} {797 123} {793 124} {789 129} {785 153}
-	{785 203} {785 278 x} {785 367} {810 392} {816 438} {821 503}
-	{824 585 y} {838 587} {848 593} {857 601} {-100 -100}
-    }
-    if {$step >= [llength $pos]} {
-	return 0
-    }
-    set where [lindex $pos $step]
-    MoveAbs $w I1 $where
-
-    if {[lindex $where 2] eq "y"} {
-	Move15a $w
-    }
-    if {[lindex $where 2] eq "x"} {
-	return 3
-    }
-    return 1
-}
-
-# Lighting the match
-proc Draw2 {w} {
-    set color red
-    set color $::C(2)
-    set xy  {750 369 740 392 760 392}		;# Fulcrum
-    $w.c create poly $xy -fill $::C(fg) -outline $::C(fg)
-    set xy {628 335 660 383}			;# Strike box
-    $w.c create rect $xy -fill {} -outline $::C(fg)
-    for {set y 0} {$y < 3} {incr y} {
-	set yy [expr {335+$y*16}]
-	$w.c create bitmap 628 $yy -bitmap gray25 -anchor nw \
-		-foreground $::C(fg)
-	$w.c create bitmap 644 $yy -bitmap gray25 -anchor nw \
-		-foreground $::C(fg)
-    }
-
-    set xy {702 366 798 366}			;# Lever
-    $w.c create line $xy -fill $::C(fg) -width 6 -tag I2_0
-    set xy {712 363 712 355}			;# R strap
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag I2_1
-    set xy {705 363 705 355}			;# L strap
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag I2_2
-    set xy {679 356 679 360 717 360 717 356 679 356}	;# Match stick
-    $w.c create line $xy -fill $::C(fg) -tag I2_3
-
-    #set xy {662 352 680 365}			;# Match head
-    set xy {
-	671 352 677.4 353.9 680 358.5 677.4 363.1 671 365 664.6 363.1
-	662 358.5 664.6 353.9
-    }
-    $w.c create poly $xy -fill $color -outline $color -tag I2_4
-}
-proc Move2 {w {step {}}} {
-    set step [GetStep 2 $step]
-
-    set stages {0 0 1 2 0 2 1 0 1 2 0 2 1}
-    set xy(0) {
-	686 333 692 323 682 316 674 309 671 295 668 307 662 318 662 328
-	671 336
-    }
-    set xy(1) {687 331 698 322 703 295 680 320 668 297 663 311 661 327 671 335}
-    set xy(2) {
-	686 331 704 322 688 300 678 283 678 283 674 298 666 309 660 324
-	672 336
-    }
-
-    if {$step >= [llength $stages]} {
-	$w.c delete I2
-	return 0
-    }
-
-    if {$step == 0} {				;# Rotate the match
-	set beta 20
-	lassign [Anchor $w I2_0 s] Ox Oy	;# Where to pivot
-	for {set i 0} {[$w.c find withtag I2_$i] ne ""} {incr i} {
-	    RotateItem $w I2_$i $Ox $Oy $beta
-	}
-	$w.c create poly -tag I2 -smooth 1 -fill $::C(2) ;# For the flame
-	return 1
-    }
-    $w.c coords I2 $xy([lindex $stages $step])
-    return [expr {$step == 7 ? 3 : 1}]
-}
-
-# Weight and pulleys
-proc Draw3 {w} {
-    set color $::C(3a)
-    set color2 $::C(3b)
-
-    set xy {602 296 577 174 518 174}
-    foreach {x y} $xy {				;# 3 Pulleys
-	$w.c create oval [box $x $y 13] -fill $color -outline $::C(fg) \
-		-width 3
-	$w.c create oval [box $x $y 2] -fill $::C(fg) -outline $::C(fg)
-    }
-
-    set xy {750 309 670 309}			;# Wall to flame
-    $w.c create line $xy -tag I3_s -width 3 -fill $::C(fg) -smooth 1
-    set xy {670 309 650 309}			;# Flame to pulley 1
-    $w.c create line $xy -tag I3_0 -width 3 -fill $::C(fg)
-    set xy {650 309 600 309}			;# Flame to pulley 1
-    $w.c create line $xy -tag I3_1 -width 3 -fill $::C(fg)
-    set xy {589 296 589 235}			;# Pulley 1 half way to 2
-    $w.c create line $xy -tag I3_2 -width 3 -fill $::C(fg)
-    set xy {589 235 589 174}			;# Pulley 1 other half to 2
-    $w.c create line $xy -width 3 -fill $::C(fg)
-    set xy {577 161 518 161}			;# Across the top
-    $w.c create line $xy -width 3 -fill $::C(fg)
-    set xy {505 174 505 205}			;# Down to weight
-    $w.c create line $xy -tag I3_w -width 3 -fill $::C(fg)
-
-    # Draw the weight as 2 circles, two rectangles and 1 rounded rectangle
-    set xy {515 207 495 207}
-    foreach {x1 y1 x2 y2} $xy {
-	$w.c create oval [box $x1 $y1 6] -tag I3_ -fill $color2 \
-		-outline $color2
-	$w.c create oval [box $x2 $y2 6] -tag I3_ -fill $color2 \
-		-outline $color2
-	incr y1 -6; incr y2 6
-	$w.c create rect $x1 $y1 $x2 $y2 -tag I3_ -fill $color2 \
-		-outline $color2
-    }
-    set xy {492 220 518 263}
-    set xy [RoundRect $w $xy 15]
-    $w.c create poly $xy -smooth 1 -tag I3_ -fill $color2 -outline $color2
-    set xy {500 217 511 217}
-    $w.c create line $xy -tag I3_ -fill $color2 -width 10
-
-    set xy {502 393 522 393 522 465}		;# Bottom weight target
-    $w.c create line $xy -tag I3__ -fill $::C(fg) -join miter -width 10
-}
-proc Move3 {w {step {}}} {
-    set step [GetStep 3 $step]
-
-    set pos {{505 247} {505 297} {505 386.5} {505 386.5}}
-    set rope(0) {750 309 729 301 711 324 690 300}
-    set rope(1) {750 309 737 292 736 335 717 315 712 320}
-    set rope(2) {750 309 737 309 740 343 736 351 725 340}
-    set rope(3) {750 309 738 321 746 345 742 356}
-
-    if {$step >= [llength $pos]} {
-	return 0
-    }
-
-    $w.c delete "I3_$step"			;# Delete part of the rope
-    MoveAbs $w I3_ [lindex $pos $step]		;# Move weight down
-    $w.c coords I3_s $rope($step)		;# Flapping rope end
-    $w.c coords I3_w [concat 505 174 [lindex $pos $step]]
-    if {$step == 2} {
-	$w.c move I3__ 0 30
-	return 2
-    }
-    return 1
-}
-
-# Cage and door
-proc Draw4 {w} {
-    set color $::C(4)
-    lassign {527 356 611 464} x0 y0 x1 y1
-
-    for {set y $y0} {$y <= $y1} {incr y 12} {	;# Horizontal bars
-	$w.c create line $x0 $y $x1 $y -fill $color -width 1
-    }
-    for {set x $x0} {$x <= $x1} {incr x 12} {	;# Vertical bars
-	$w.c create line $x $y0 $x $y1 -fill $color -width 1
-    }
-
-    set xy {518 464 518 428}			;# Swing gate
-    $w.c create line $xy -tag I4 -fill $color -width 3
-}
-proc Move4 {w {step {}}} {
-    set step [GetStep 4 $step]
-
-    set angles {-10 -20 -30 -30}
-    if {$step >= [llength $angles]} {
-	return 0
-    }
-    RotateItem $w I4 518 464 [lindex $angles $step]
-    $w.c raise I4
-    return [expr {$step == 3 ? 3 : 1}]
-}
-
-# Mouse
-proc Draw5 {w} {
-    set color $::C(5a)
-    set color2 $::C(5b)
-    set xy {377 248 410 248 410 465 518 465}	;# Mouse course
-    lappend xy 518 428 451 428 451 212 377 212
-    $w.c create poly $xy -fill $color2 -outline $::C(fg) -width 3
-
-    set xy {
-	534.5 445.5 541 440 552 436 560 436 569 440 574 446 575 452 574 454
-	566 456 554 456 545 456 537 454 530 452
-    }
-    $w.c create poly $xy -tag {I5 I5_0} -fill $color
-    set xy {573 452 592 458 601 460 613 456}	;# Tail
-    $w.c create line $xy -tag {I5 I5_1} -fill $color -smooth 1 -width 3
-    set xy [box 540 446 2]			;# Eye
-    set xy {540 444 541 445 541 447 540 448 538 447 538 445}
-    #.c create oval $xy -tag {I5 I5_2} -fill $::C(bg) -outline {}
-    $w.c create poly $xy -tag {I5 I5_2} -fill $::C(bg) -outline {} -smooth 1
-    set xy {538 454 535 461}			;# Front leg
-    $w.c create line $xy -tag {I5 I5_3} -fill $color -width 2
-    set xy {566 455 569 462}			;# Back leg
-    $w.c create line $xy -tag {I5 I5_4} -fill $color -width 2
-    set xy {544 455 545 460}			;# 2nd front leg
-    $w.c create line $xy -tag {I5 I5_5} -fill $color -width 2
-    set xy {560 455 558 460}			;# 2nd back leg
-    $w.c create line $xy -tag {I5 I5_6}	 -fill $color -width 2
-}
-proc Move5 {w {step {}}} {
-    set step [GetStep 5 $step]
-
-    set pos {
-	{553 452} {533 452} {513 452} {493 452} {473 452}
-	{463 442 30} {445.5 441.5 30} {425.5 434.5 30} {422 414} {422 394}
-	{422 374} {422 354} {422 334} {422 314} {422 294}
-	{422 274 -30} {422 260.5 -30 x} {422.5 248.5 -28} {425 237}
-    }
-    if {$step >= [llength $pos]} {
-	return 0
-    }
-
-    lassign [lindex $pos $step] x y beta next
-    MoveAbs $w I5 [list $x $y]
-    if {$beta ne ""} {
-	lassign [Centroid $w I5_0] Ox Oy
-	foreach id {0 1 2 3 4 5 6} {
-	    RotateItem $w I5_$id $Ox $Oy $beta
-	}
-    }
-    if {$next eq "x"} {
-	return 3
-    }
-    return 1
-}
-
-# Dropping gumballs
-array set XY6 {
-    -1 {366 207} -2 {349 204} -3 {359 193} -4 {375 192} -5 {340 190}
-    -6 {349 177} -7 {366 177} -8 {380 176} -9 {332 172} -10 {342 161}
-    -11 {357 164} -12 {372 163} -13 {381 149} -14 {364 151} -15 {349 146}
-    -16 {333 148} 0 {357 219}
-    1 {359 261} 2 {359 291} 3 {359 318}	 4 {361 324}  5 {365 329}  6 {367 334}
-    7 {367 340} 8 {366 346} 9 {364 350} 10 {361 355} 11 {359 370} 12 {359 391}
-    13,0 {360 456}  13,1 {376 456}  13,2 {346 456}  13,3 {330 456}
-    13,4 {353 444}  13,5 {368 443}  13,6 {339 442}  13,7 {359 431}
-    13,8 {380 437}  13,9 {345 428}  13,10 {328 434} 13,11 {373 424}
-    13,12 {331 420} 13,13 {360 417} 13,14 {345 412} 13,15 {376 410}
-    13,16 {360 403}
-}
-proc Draw6 {w} {
-    set color $::C(6)
-    set xy {324 130 391 204}			;# Ball holder
-    set xy [RoundRect $w $xy 10]
-    $w.c create poly $xy -smooth 1 -outline $::C(fg) -width 3 -fill $color
-    set xy {339 204 376 253}			;# Below the ball holder
-    $w.c create rect $xy -fill {} -outline $::C(fg) -width 3 -fill $color \
-	    -tag I6c
-    set xy [box 346 339 28]
-    $w.c create oval $xy -fill $color -outline {}	;# Rotor
-    $w.c create arc $xy -outline $::C(fg) -width 2 -style arc \
-	    -start 80 -extent 205
-    $w.c create arc $xy -outline $::C(fg) -width 2 -style arc \
-	    -start -41 -extent 85
-
-    set xy [box 346 339 15]			;# Center of rotor
-    $w.c create oval $xy -outline $::C(fg) -fill $::C(fg) -tag I6m
-    set xy {352 312 352 254 368 254 368 322}	;# Top drop to rotor
-    $w.c create poly $xy -fill $color -outline {}
-    $w.c create line $xy -fill $::C(fg) -width 2
-
-    set xy {353 240 367 300}			;# Poke bottom hole
-    $w.c create rect $xy -fill $color -outline {}
-    set xy {341 190 375 210}			;# Poke another hole
-    $w.c create rect $xy -fill $color -outline {}
-
-    set xy {368 356 368 403 389 403 389 464 320 464 320 403 352 403 352 366}
-    $w.c create poly $xy -fill $color -outline {} -width 2	;# Below rotor
-    $w.c create line $xy -fill $::C(fg) -width 2
-    set xy [box 275 342 7]			;# On/off rotor
-    $w.c create oval $xy -outline $::C(fg) -fill $::C(fg)
-    set xy {276 334 342 325}			;# Fan belt top
-    $w.c create line $xy -fill $::C(fg) -width 3
-    set xy {276 349 342 353}			;# Fan belt bottom
-    $w.c create line $xy -fill $::C(fg) -width 3
-
-    set xy {337 212 337 247}			;# What the mouse pushes
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag I6_
-    set xy {392 212 392 247}
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag I6_
-    set xy {337 230 392 230}
-    $w.c create line $xy -fill $::C(fg) -width 7 -tag I6_
-
-    set who -1					;# All the balls
-    set colors {red cyan orange green blue darkblue}
-    lappend colors {*}$colors {*}$colors
-
-    for {set i 0} {$i < 17} {incr i} {
-	set loc [expr {-1 * $i}]
-	set color [lindex $colors $i]
-	$w.c create oval [box {*}$::XY6($loc) 5] -fill $color \
-		-outline $color -tag I6_b$i
-    }
-    Draw6a $w 12				;# The wheel
-}
-proc Draw6a {w beta} {
-    $w.c delete I6_0
-    lassign {346 339} Ox Oy
-    for {set i 0} {$i < 4} {incr i} {
-	set b [expr {$beta + $i * 45}]
-	lassign [RotateC 28 0 0 0 $b] x y
-	set xy [list [expr {$Ox+$x}] [expr {$Oy+$y}] \
-		[expr {$Ox-$x}] [expr {$Oy-$y}]]
-	$w.c create line $xy -tag I6_0 -fill $::C(fg) -width 2
-    }
-}
-proc Move6 {w {step {}}} {
-    set step [GetStep 6 $step]
-    if {$step > 62} {
-	return 0
-    }
-
-    if {$step < 2} {				;# Open gate for balls to drop
-	$w.c move I6_ -7 0
-	if {$step == 1} {			;# Poke a hole
-	    set xy {348 226 365 240}
-	    $w.c create rect $xy -fill [$w.c itemcget I6c -fill] -outline {}
-	}
-	return 1
-    }
-
-    set s [expr {$step - 1}]			;# Do the gumball drop dance
-    for {set i 0} {$i <= int(($s-1) / 3)} {incr i} {
-	set tag "I6_b$i"
-	if {[$w.c find withtag $tag] eq ""} break
-	set loc [expr {$s - 3 * $i}]
-
-	if {[info exists ::XY6($loc,$i)]} {
-	    MoveAbs $w $tag $::XY6($loc,$i)
-	} elseif {[info exists ::XY6($loc)]} {
-	    MoveAbs $w $tag $::XY6($loc)
-	}
-    }
-    if {($s % 3) == 1} {
-	set first [expr {($s + 2) / 3}]
-	for {set i $first} {1} {incr i} {
-	    set tag "I6_b$i"
-	    if {[$w.c find withtag $tag] eq ""} break
-	    set loc [expr {$first - $i}]
-	    MoveAbs $w $tag $::XY6($loc)
-	}
-    }
-    if {$s >= 3} {				;# Rotate the motor
-	set idx [expr {$s % 3}]
-	#Draw6a $w [lindex {12 35 64} $idx]
-	Draw6a $w [expr {12 + $s * 15}]
-    }
-    return [expr {$s == 3 ? 3 : 1}]
-}
-
-# On/off switch
-proc Draw7 {w} {
-    set color $::C(7)
-    set xy {198 306 277 374}			;# Box
-    $w.c create rect $xy -outline $::C(fg) -width 2 -fill $color -tag I7z
-    $w.c lower I7z
-    set xy {275 343 230 349}
-    $w.c create line $xy -tag I7 -fill $::C(fg) -arrow last \
-	    -arrowshape {23 23 8} -width 6
-    set xy {225 324}				;# On button
-    $w.c create oval [box {*}$xy 3] -fill $::C(fg) -outline $::C(fg)
-    set xy {218 323}				;# On text
-    set font {{Times Roman} 8}
-    $w.c create text $xy -text "on" -anchor e -fill $::C(fg) -font $font
-    set xy {225 350}				;# Off button
-    $w.c create oval [box {*}$xy 3] -fill $::C(fg) -outline $::C(fg)
-    set xy {218 349}				;# Off button
-    $w.c create text $xy -text "off" -anchor e -fill $::C(fg) -font $font
-}
-proc Move7 {w {step {}}} {
-    set step [GetStep 7 $step]
-    set numsteps 30
-    if {$step > $numsteps} {
-	return 0
-    }
-    set beta [expr {30.0 / $numsteps}]
-    RotateItem $w I7 275 343 $beta
-
-    return [expr {$step == $numsteps ? 3 : 1}]
-}
-
-# Electricity to the fan
-proc Draw8 {w} {
-    Sine $w 271 248 271 306 5 8 -tag I8_s -fill $::C(8) -width 3
-}
-proc Move8 {w {step {}}} {
-    set step [GetStep 8 $step]
-
-    if {$step > 3} {
-	return 0
-    }
-    if {$step == 0} {
-	Sparkle $w [Anchor $w I8_s s] I8
-	return 1
-
-    } elseif {$step == 1} {
-	MoveAbs $w I8 [Anchor $w I8_s c]
-    } elseif {$step == 2} {
-	MoveAbs $w I8 [Anchor $w I8_s n]
-    } else {
-	$w.c delete I8
-    }
-    return [expr {$step == 2 ? 3 : 1}]
-}
-
-# Fan
-proc Draw9 {w} {
-    set color $::C(9)
-    set xy {266 194 310 220}
-    $w.c create oval $xy -outline $color -fill $color
-    set xy {280 209 296 248}
-    $w.c create oval $xy -outline $color -fill $color
-    set xy {288 249 252 249 260 240 280 234 296 234 316 240 324 249 288 249}
-    $w.c create poly $xy -fill $color -smooth 1
-
-    set xy {248 205 265 214 264 205 265 196}	;# Spinner
-    $w.c create poly $xy -fill $color
-
-    set xy {255 206 265 234}			;# Fan blades
-    $w.c create oval $xy -fill {} -outline $::C(fg) -width 3 -tag I9_0
-    set xy {255 176 265 204}
-    $w.c create oval $xy -fill {} -outline $::C(fg) -width 3 -tag I9_0
-    set xy {255 206 265 220}
-    $w.c create oval $xy -fill {} -outline $::C(fg) -width 1 -tag I9_1
-    set xy {255 190 265 204}
-    $w.c create oval $xy -fill {} -outline $::C(fg) -width 1 -tag I9_1
-}
-proc Move9 {w {step {}}} {
-    set step [GetStep 9 $step]
-
-    if {$step & 1} {
-	$w.c itemconfig I9_0 -width 4
-	$w.c itemconfig I9_1 -width 1
-	$w.c lower I9_1 I9_0
-    } else {
-	$w.c itemconfig I9_0 -width 1
-	$w.c itemconfig I9_1 -width 4
-	$w.c lower I9_0 I9_1
-    }
-    if {$step == 0} {
-	return 3
-    }
-    return 1
-}
-
-# Boat
-proc Draw10 {w} {
-    set color $::C(10a)
-    set color2 $::C(10b)
-    set xy {191 230 233 230 233 178 191 178}	;# Sail
-    $w.c create poly $xy -fill $color -width 3 -outline $::C(fg) -tag I10
-    set xy [box 209 204 31]			;# Front
-    $w.c create arc $xy -outline {} -fill $color -style pie \
-	    -start 120 -extent 120 -tag I10
-    $w.c create arc $xy -outline $::C(fg) -width 3 -style arc \
-	    -start 120 -extent 120 -tag I10
-    set xy [box 249 204 31]			;# Back
-    $w.c create arc $xy -outline {} -fill $::C(bg) -width 3 -style pie \
-	    -start 120 -extent 120 -tag I10
-    $w.c create arc $xy -outline $::C(fg) -width 3 -style arc \
-	    -start 120 -extent 120 -tag I10
-
-    set xy {200 171 200 249}			;# Mast
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag I10
-    set xy {159 234 182 234}			;# Bow sprit
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag I10
-    set xy {180 234 180 251 220 251}		;# Hull
-    $w.c create line $xy -fill $::C(fg) -width 6 -tag I10
-
-    set xy {92 255 221 255}			;# Waves
-    Sine $w {*}$xy 2 25 -fill $color2 -width 1 -tag I10w
-
-    set xy [lrange [$w.c coords I10w] 4 end-4]	;# Water
-    set xy [concat $xy 222 266 222 277 99 277]
-    $w.c create poly $xy -fill $color2 -outline $color2
-    set xy {222 266 222 277 97 277 97 266}	;# Water bottom
-    $w.c create line $xy -fill $::C(fg) -width 3
-
-    set xy [box 239 262 17]
-    $w.c create arc $xy -outline $::C(fg) -width 3 -style arc \
-	    -start 95 -extent 103
-    set xy [box 76 266 21]
-    $w.c create arc $xy -outline $::C(fg) -width 3 -style arc -extent 190
-}
-proc Move10 {w {step {}}} {
-    set step [GetStep 10 $step]
-    set pos {
-	{195 212} {193 212} {190 212} {186 212} {181 212} {176 212}
-	{171 212} {166 212} {161 212} {156 212} {151 212} {147 212} {142 212}
-	{137 212} {132 212 x} {127 212} {121 212} {116 212} {111 212}
-    }
-
-    if {$step >= [llength $pos]} {
-	return 0
-    }
-    set where [lindex $pos $step]
-    MoveAbs $w I10 $where
-
-    if {[lindex $where 2] eq "x"} {
-	return 3
-    }
-    return 1
-}
-
-# 2nd ball drop
-proc Draw11 {w} {
-    set color $::C(11a)
-    set color2 $::C(11b)
-    set xy {23 264 55 591}			;# Color the down tube
-    $w.c create rect $xy -fill $color -outline {}
-    set xy [box 71 460 48]			;# Color the outer loop
-    $w.c create oval $xy -fill $color -outline {}
-
-    set xy {55 264 55 458}			;# Top right side
-    $w.c create line $xy -fill $::C(fg) -width 3
-    set xy {55 504 55 591}			;# Bottom right side
-    $w.c create line $xy -fill $::C(fg) -width 3
-    set xy [box 71 460 48]			;# Outer loop
-    $w.c create arc $xy -outline $::C(fg) -width 3 -style arc \
-	    -start 110 -extent -290 -tag I11i
-    set xy [box 71 460 16]			;# Inner loop
-    $w.c create oval $xy -outline $::C(fg) -fill {} -width 3 -tag I11i
-    $w.c create oval $xy -outline $::C(fg) -fill $::C(bg) -width 3
-
-    set xy {23 264 23 591}			;# Left side
-    $w.c create line $xy -fill $::C(fg) -width 3
-    set xy [box 1 266 23]			;# Top left curve
-    $w.c create arc $xy -outline $::C(fg) -width 3 -style arc -extent 90
-
-    set xy [box 75 235 9]			;# The ball
-    $w.c create oval $xy -fill $color2 -outline {} -width 3 -tag I11
-}
-proc Move11 {w {step {}}} {
-    set step [GetStep 11 $step]
-    set pos {
-	{75 235} {70 235} {65 237} {56 240} {46 247} {38 266} {38 296}
-	{38 333} {38 399} {38 475} {74 496} {105 472} {100 437} {65 423}
-	{-100 -100} {38 505} {38 527 x} {38 591}
-    }
-
-    if {$step >= [llength $pos]} {
-	return 0
-    }
-    set where [lindex $pos $step]
-    MoveAbs $w I11 $where
-    if {[lindex $where 2] eq "x"} {
-	return 3
-    }
-    return 1
-}
-
-# Hand
-proc Draw12 {w} {
-    set xy {20 637 20 617 20 610 20 590 40 590 40 590 60 590 60 610 60 610}
-    lappend xy 60 610 65 620 60 631		;# Thumb
-    lappend xy 60 631 60 637 60 662 60 669 52 669 56 669 50 669 50 662 50 637
-
-    set y0 637					;# Bumps for fingers
-    set y1 645
-    for {set x 50} {$x > 20} {incr x -10} {
-	set x1 [expr {$x - 5}]
-	set x2 [expr {$x - 10}]
-	lappend xy $x $y0 $x1 $y1 $x2 $y0
-    }
-    $w.c create poly $xy -fill $::C(12) -outline $::C(fg) -smooth 1 -tag I12 \
-	    -width 3
-}
-proc Move12 {w {step {}}} {
-    set step [GetStep 12 $step]
-    set pos {{42.5 641 x}}
-    if {$step >= [llength $pos]} {
-	return 0
-    }
-
-    set where [lindex $pos $step]
-    MoveAbs $w I12 $where
-    if {[lindex $where 2] eq "x"} {
-	return 3
-    }
-    return 1
-}
-
-# Fax
-proc Draw13 {w} {
-    set color $::C(13a)
-    set xy {86 663 149 663 149 704 50 704 50 681 64 681 86 671}
-    set xy2 {784 663 721 663 721 704 820 704 820 681 806 681 784 671}
-    set radii {2 9 9 8 5 5 2}
-
-    RoundPoly $w.c $xy $radii -width 3 -outline $::C(fg) -fill $color
-    RoundPoly $w.c $xy2 $radii -width 3 -outline $::C(fg) -fill $color
-
-    set xy {56 677}
-    $w.c create rect [box {*}$xy 4] -fill {} -outline $::C(fg) -width 3 \
-	    -tag I13
-    set xy {809 677}
-    $w.c create rect [box {*}$xy 4] -fill {} -outline $::C(fg) -width 3 \
-	    -tag I13R
-
-    set xy {112 687}				;# Label
-    $w.c create text $xy -text "FAX" -fill $::C(fg) \
-	    -font {{Times Roman} 12 bold}
-    set xy {762 687}
-    $w.c create text $xy -text "FAX" -fill $::C(fg) \
-	    -font {{Times Roman} 12 bold}
-
-    set xy {138 663 148 636 178 636}		;# Paper guide
-    $w.c create line $xy -smooth 1 -fill $::C(fg) -width 3
-    set xy {732 663 722 636 692 636}
-    $w.c create line $xy -smooth 1 -fill $::C(fg) -width 3
-
-    Sine $w 149 688 720 688 5 15 -tag I13_s -fill $::C(fg) -width 3
-}
-proc Move13 {w {step {}}} {
-    set step [GetStep 13 $step]
-    set numsteps 7
-
-    if {$step == $numsteps+2} {
-	MoveAbs $w I13_star {-100 -100}
-	$w.c itemconfig I13R -fill $::C(13b) -width 2
-	return 2
-    }
-    if {$step == 0} {				;# Button down
-	$w.c delete I13
-	Sparkle $w {-100 -100} I13_star		;# Create off screen
-	return 1
-    }
-    lassign [Anchor $w I13_s w] x0 y0
-    lassign [Anchor $w I13_s e] x1 y1
-    set x [expr {$x0 + ($x1-$x0) * ($step - 1) / double($numsteps)}]
-    MoveAbs $w I13_star [list $x $y0]
-    return 1
-}
-
-# Paper in fax
-proc Draw14 {w} {
-    set color $::C(14)
-    set xy {102 661 113 632 130 618}		;# Left paper edge
-    $w.c create line $xy -smooth 1 -fill $color -width 3 -tag I14L_0
-    set xy {148 629 125 640 124 662}		;# Right paper edge
-    $w.c create line $xy -smooth 1 -fill $color -width 3 -tag I14L_1
-    Draw14a $w L
-
-    set xy {
-	768.0 662.5 767.991316225 662.433786215 767.926187912 662.396880171
-    }
-    $w.c create line $xy -smooth 1 -fill $color -width 3 -tag I14R_0
-    $w.c lower I14R_0
-    # NB. these numbers are VERY sensitive, you must start with final size
-    # and shrink down to get the values
-    set xy {
-	745.947897349 662.428358855 745.997829056 662.452239237 746.0 662.5
-    }
-    $w.c create line $xy -smooth 1 -fill $color -width 3 -tag I14R_1
-    $w.c lower I14R_1
-}
-proc Draw14a {w side} {
-    set color $::C(14)
-    set xy [$w.c coords I14${side}_0]
-    set xy2 [$w.c coords I14${side}_1]
-    lassign $xy x0 y0 x1 y1 x2 y2
-    lassign $xy2 x3 y3 x4 y4 x5 y5
-    set zz [concat \
-	    $x0 $y0 $x0 $y0 $xy $x2 $y2 $x2 $y2 \
-	    $x3 $y3 $x3 $y3 $xy2 $x5 $y5 $x5 $y5]
-    $w.c delete I14$side
-    $w.c create poly $zz -tag I14$side -smooth 1 -fill $color -outline $color \
-	    -width 3
-    $w.c lower I14$side
-}
-proc Move14 {w {step {}}} {
-    set step [GetStep 14 $step]
-
-    # Paper going down
-    set sc [expr {.9 - .05*$step}]
-    if {$sc < .3} {
-	$w.c delete I14L
-	return 0
-    }
-
-    lassign [$w.c coords I14L_0] Ox Oy
-    $w.c scale I14L_0 $Ox $Oy $sc $sc
-    lassign [lrange [$w.c coords I14L_1] end-1 end] Ox Oy
-    $w.c scale I14L_1 $Ox $Oy $sc $sc
-    Draw14a $w L
-
-    # Paper going up
-    set sc [expr {.35 + .05*$step}]
-    set sc [expr {1 / $sc}]
-
-    lassign [$w.c coords I14R_0] Ox Oy
-    $w.c scale I14R_0 $Ox $Oy $sc $sc
-    lassign [lrange [$w.c coords I14R_1] end-1 end] Ox Oy
-    $w.c scale I14R_1 $Ox $Oy $sc $sc
-    Draw14a $w R
-
-    return [expr {$step == 10 ? 3 : 1}]
-}
-
-# Light beam
-proc Draw15 {w} {
-    set color $::C(15a)
-    set xy {824 599 824 585 820 585 829 585}
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag I15a
-    set xy {789 599 836 643}
-    $w.c create rect $xy -fill $color -outline $::C(fg) -width 3
-    set xy {778 610 788 632}
-    $w.c create rect $xy -fill $color -outline $::C(fg) -width 3
-    set xy {766 617 776 625}
-    $w.c create rect $xy -fill $color -outline $::C(fg) -width 3
-
-    set xy {633 600 681 640}
-    $w.c create rect $xy -fill $color -outline $::C(fg) -width 3
-    set xy {635 567 657 599}
-    $w.c create rect $xy -fill $color -outline $::C(fg) -width 2
-    set xy {765 557 784 583}
-    $w.c create rect $xy -fill $color -outline $::C(fg) -width 2
-
-    Sine $w 658 580 765 580 3 15 -tag I15_s -fill $::C(fg) -width 3
-}
-proc Move15a {w} {
-    set color $::C(15b)
-    $w.c scale I15a 824 599 1 .3		;# Button down
-    set xy {765 621 681 621}
-    $w.c create line $xy -dash "-" -width 3 -fill $color -tag I15
-}
-proc Move15 {w {step {}}} {
-    set step [GetStep 15 $step]
-    set numsteps 6
-
-    if {$step == $numsteps+2} {
-	MoveAbs $w I15_star {-100 -100}
-	return 2
-    }
-    if {$step == 0} {				;# Break the light beam
-	Sparkle $w {-100 -100} I15_star
-	set xy {765 621 745 621}
-	$w.c coords I15 $xy
-	return 1
-    }
-    lassign [Anchor $w I15_s w] x0 y0
-    lassign [Anchor $w I15_s e] x1 y1
-    set x [expr {$x0 + ($x1-$x0) * ($step - 1) / double($numsteps)}]
-    MoveAbs $w I15_star [list $x $y0]
-    return 1
-}
-
-# Bell
-proc Draw16 {w} {
-    set color $::C(16)
-    set xy {722 485 791 556}
-    $w.c create rect $xy -fill {} -outline $::C(fg) -width 3
-    set xy [box 752 515 25]			;# Bell
-    $w.c create oval $xy -fill $color -outline black -tag I16b -width 2
-    set xy [box 752 515 5]			;# Bell button
-    $w.c create oval $xy -fill black -outline black -tag I16b
-
-    set xy {784 523 764 549}			;# Clapper
-    $w.c create line $xy -width 3 -tag I16c -fill $::C(fg)
-    set xy [box 784 523 4]
-    $w.c create oval $xy -fill $::C(fg) -outline $::C(fg) -tag I16d
-}
-proc Move16 {w {step {}}} {
-    set step [GetStep 16 $step]
-
-    # Note: we never stop
-    lassign {760 553} Ox Oy
-    if {$step & 1} {
-	set beta 12
-	$w.c move I16b 3 0
-    } else {
-	set beta -12
-	$w.c move I16b -3 0
-    }
-    RotateItem $w I16c $Ox $Oy $beta
-    RotateItem $w I16d $Ox $Oy $beta
-
-    return [expr {$step == 1 ? 3 : 1}]
-}
-
-# Cat
-proc Draw17 {w} {
-    set color $::C(17)
-
-    set xy {584 556 722 556}
-    $w.c create line $xy -fill $::C(fg) -width 3
-    set xy {584 485 722 485}
-    $w.c create line $xy -fill $::C(fg) -width 3
-
-    set xy {664 523 717 549}			;# Body
-    $w.c create arc $xy -outline $::C(fg) -fill $color -width 3 \
-	    -style chord -start 128 -extent -260 -tag I17
-
-    set xy {709 554 690 543}			;# Paw
-    $w.c create oval $xy -outline $::C(fg) -fill $color -width 3 -tag I17
-    set xy {657 544 676 555}
-    $w.c create oval $xy -outline $::C(fg) -fill $color -width 3 -tag I17
-
-    set xy [box 660 535 15]			;# Lower face
-    $w.c create arc $xy -outline $::C(fg) -width 3 -style arc \
-	    -start 150 -extent 240 -tag I17_
-    $w.c create arc $xy -outline {} -fill $color -width 1 -style chord \
-	    -start 150 -extent 240 -tag I17_
-    set xy {674 529 670 513 662 521 658 521 650 513 647 529}	;# Ears
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag I17_
-    $w.c create poly $xy -fill $color -outline {} -width 1 -tag {I17_ I17_c}
-    set xy {652 542 628 539}			;# Whiskers
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag I17_
-    set xy {652 543 632 545}
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag I17_
-    set xy {652 546 632 552}
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag I17_
-
-    set xy {668 543 687 538}
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag {I17_ I17w}
-    set xy {668 544 688 546}
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag {I17_ I17w}
-    set xy {668 547 688 553}
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag {I17_ I17w}
-
-    set xy {649 530 654 538 659 530}		;# Left eye
-    $w.c create line $xy -fill $::C(fg) -width 2 -smooth 1 -tag I17
-    set xy {671 530 666 538 661 530}		;# Right eye
-    $w.c create line $xy -fill $::C(fg) -width 2 -smooth 1 -tag I17
-    set xy {655 543 660 551 665 543}		;# Mouth
-    $w.c create line $xy -fill $::C(fg) -width 2 -smooth 1 -tag I17
-}
-proc Move17 {w {step {}}} {
-    set step [GetStep 17 $step]
-
-    if {$step == 0} {
-	$w.c delete I17				;# Delete most of the cat
-	set xy {655 543 660 535 665 543}	;# Mouth
-	$w.c create line $xy -fill $::C(fg) -width 3 -smooth 1 -tag I17_
-	set xy [box 654 530 4]			;# Left eye
-	$w.c create oval $xy -outline $::C(fg) -width 3 -fill {} -tag I17_
-	set xy [box 666 530 4]			;# Right eye
-	$w.c create oval $xy -outline $::C(fg) -width 3 -fill {} -tag I17_
-
-	$w.c move I17_ 0 -20			;# Move face up
-	set xy {652 528 652 554}		;# Front leg
-	$w.c create line $xy -fill $::C(fg) -width 3 -tag I17_
-	set xy {670 528 670 554}		;# 2nd front leg
-	$w.c create line $xy -fill $::C(fg) -width 3 -tag I17_
-
-	set xy {
-	    675 506 694 489 715 513 715 513 715 513 716 525 716 525 716 525
-	    706 530 695 530 679 535 668 527 668 527 668 527 675 522 676 517
-	    677 512
-	}					;# Body
-	$w.c create poly $xy -fill [$w.c itemcget I17_c -fill] \
-		-outline $::C(fg) -width 3 -smooth 1 -tag I17_
-	set xy {716 514 716 554}		;# Back leg
-	$w.c create line $xy -fill $::C(fg) -width 3 -tag I17_
-	set xy {694 532 694 554}		;# 2nd back leg
-	$w.c create line $xy -fill $::C(fg) -width 3 -tag I17_
-	set xy {715 514 718 506 719 495 716 488};# Tail
-	$w.c create line $xy -fill $::C(fg) -width 3 -smooth 1 -tag I17_
-
-	$w.c raise I17w				;# Make whiskers visible
-	$w.c move I17_ -5 0			;# Move away from wall a bit
-	return 2
-    }
-    return 0
-}
-
-# Sling shot
-proc Draw18 {w} {
-    set color $::C(18)
-    set xy {721 506 627 506}			;# Sling hold
-    $w.c create line $xy -width 4 -fill $::C(fg) -tag I18
-
-    set xy {607 500 628 513}			;# Sling rock
-    $w.c create oval $xy -fill $color -outline {} -tag I18a
-
-    set xy {526 513 606 507 494 502}		;# Sling band
-    $w.c create line $xy -fill $::C(fg) -width 4 -tag I18b
-    set xy { 485 490 510 540 510 575 510 540 535 491 }	;# Sling
-    $w.c create line $xy -fill $::C(fg) -width 6
-}
-proc Move18 {w {step {}}} {
-    set step [GetStep 18 $step]
-
-    set pos {
-	{587 506} {537 506} {466 506} {376 506} {266 506 x} {136 506}
-	{16 506} {-100 -100}
-    }
-
-    set b(0) {490 502 719 507 524 512}		;# Band collapsing
-    set b(1) {
-	491 503 524 557 563 505 559 496 546 506 551 525 553 536 538 534
-	532 519 529 499
-    }
-    set b(2) {491 503 508 563 542 533 551 526 561 539 549 550 530 500}
-    set b(3) {491 503 508 563 530 554 541 562 525 568 519 544 530 501}
-
-    if {$step >= [llength $pos]} {
-	return 0
-    }
-
-    if {$step == 0} {
-	$w.c delete I18
-	$w.c itemconfig I18b -smooth 1
-    }
-    if {[info exists b($step)]} {
-	$w.c coords I18b $b($step)
-    }
-
-    set where [lindex $pos $step]
-    MoveAbs $w I18a $where
-    if {[lindex $where 2] eq "x"} {
-	return 3
-    }
-    return 1
-}
-
-# Water pipe
-proc Draw19 {w} {
-    set color $::C(19)
-    set xx {249 181 155 118  86 55 22 0}
-    foreach {x1 x2} $xx {
-	$w.c create rect $x1 453 $x2 467 -fill $color -outline {} -tag I19
-	$w.c create line $x1 453 $x2 453 -fill $::C(fg) -width 1;# Pipe top
-	$w.c create line $x1 467 $x2 467 -fill $::C(fg) -width 1;# Pipe bottom
-    }
-    $w.c raise I11i
-
-    set xy [box 168 460 16]			;# Bulge by the joint
-    $w.c create oval $xy -fill $color -outline {}
-    $w.c create arc $xy -outline $::C(fg) -width 1 -style arc \
-	    -start 21 -extent 136
-    $w.c create arc $xy -outline $::C(fg) -width 1 -style arc \
-	    -start -21 -extent -130
-
-    set xy {249 447 255 473}			;# First joint 26x6
-    $w.c create rect $xy -fill $color -outline $::C(fg) -width 1
-
-    set xy [box 257 433 34]			;# Bend up
-    $w.c create arc $xy -outline {} -fill $color -width 1 \
-	    -style pie -start 0 -extent -91
-    $w.c create arc $xy -outline $::C(fg) -width 1 \
-	    -style arc -start 0 -extent -90
-    set xy [box 257 433 20]
-    $w.c create arc $xy -outline {} -fill $::C(bg) -width 1 \
-	    -style pie -start 0 -extent -92
-    $w.c create arc $xy -outline $::C(fg) -width 1 \
-	    -style arc -start 0 -extent -90
-    set xy [box 257 421 34]			;# Bend left
-    $w.c create arc $xy -outline {} -fill $color -width 1 \
-	    -style pie -start 1 -extent 91
-    $w.c create arc $xy -outline $::C(fg) -width 1 \
-	    -style arc -start 0 -extent 90
-    set xy [box 257 421 20]
-    $w.c create arc $xy -outline {} -fill $::C(bg) -width 1 \
-	    -style pie -start 0 -extent 90
-    $w.c create arc $xy -outline $::C(fg) -width 1 \
-	    -style arc -start 0 -extent 90
-    set xy [box 243 421 34]			;# Bend down
-    $w.c create arc $xy -outline {} -fill $color -width 1 \
-	    -style pie -start 90 -extent 90
-    $w.c create arc $xy -outline $::C(fg) -width 1 \
-	    -style arc -start 90 -extent 90
-    set xy [box 243 421 20]
-    $w.c create arc $xy -outline {} -fill $::C(bg) -width 1 \
-	    -style pie -start 90 -extent 90
-    $w.c create arc $xy -outline $::C(fg) -width 1 \
-	    -style arc -start 90 -extent 90
-
-    set xy {270 427 296 433}			;# 2nd joint bottom
-    $w.c create rect $xy -fill $color -outline $::C(fg) -width 1
-    set xy {270 421 296 427}			;# 2nd joint top
-    $w.c create rect $xy -fill $color -outline $::C(fg) -width 1
-    set xy {249 382 255 408}			;# Third joint right
-    $w.c create rect $xy -fill $color -outline $::C(fg) -width 1
-    set xy {243 382 249 408}			;# Third joint left
-    $w.c create rect $xy -fill $color -outline $::C(fg) -width 1
-    set xy {203 420 229 426}			;# Last joint
-    $w.c create rect $xy -fill $color -outline $::C(fg) -width 1
-
-    set xy [box 168 460 6]			;# Handle joint
-    $w.c create oval $xy -fill $::C(fg) -outline {} -tag I19a
-    set xy {168 460 168 512}			;# Handle bar
-    $w.c create line $xy -fill $::C(fg) -width 5 -tag I19b
-}
-proc Move19 {w {step {}}} {
-    set step [GetStep 19 $step]
-
-    set angles {30 30 30}
-    if {$step == [llength $angles]} {
-	return 2
-    }
-
-    RotateItem $w I19b {*}[Centroid $w I19a] [lindex $angles $step]
-    return 1
-}
-
-# Water pouring
-proc Draw20 {w} {
-}
-proc Move20 {w {step {}}} {
-    set step [GetStep 20 $step]
-
-    set pos {451 462 473 484 496 504 513 523 532}
-    set freq {20 40   40  40  40  40  40  40  40}
-    set pos {
-	{451 20} {462 40} {473 40} {484 40} {496 40} {504 40} {513 40}
-	{523 40} {532 40 x}
-    }
-    if {$step >= [llength $pos]} {
-	return 0
-    }
-
-    $w.c delete I20
-    set where [lindex $pos $step]
-    lassign $where y f
-    H2O $w $y $f
-    if {[lindex $where 2] eq "x"} {
-	return 3
-    }
-    return 1
-}
-proc H2O {w y f} {
-    set color $::C(20)
-    $w.c delete I20
-
-    Sine $w 208 428 208 $y 4 $f -tag {I20 I20s} -width 3 -fill $color \
-	    -smooth 1
-    $w.c create line [$w.c coords I20s] -width 3 -fill $color -smooth 1 \
-	    -tag {I20 I20a}
-    $w.c create line [$w.c coords I20s] -width 3 -fill $color -smooth 1 \
-	    -tag {I20 I20b}
-    $w.c move I20a 8 0
-    $w.c move I20b 16 0
-}
-
-# Bucket
-proc Draw21 {w} {
-    set color $::C(21)
-    set xy {217 451 244 490}			;# Right handle
-    $w.c create line $xy -fill $::C(fg) -width 2 -tag I21_a
-    set xy {201 467 182 490}			;# Left handle
-    $w.c create line $xy -fill $::C(fg) -width 2 -tag I21_a
-
-    set xy {245 490 237 535}			;# Right side
-    set xy2 {189 535 181 490}			;# Left side
-    $w.c create poly [concat $xy $xy2] -fill $color -outline {} \
-	    -tag {I21 I21f}
-    $w.c create line $xy -fill $::C(fg) -width 2 -tag I21
-    $w.c create line $xy2 -fill $::C(fg) -width 2 -tag I21
-
-    set xy {182 486 244 498}			;# Top
-    $w.c create oval $xy -fill $color -outline {} -width 2 -tag {I21 I21f}
-    $w.c create oval $xy -fill {} -outline $::C(fg) -width 2 -tag {I21 I21t}
-    set xy {189 532 237 540}			;# Bottom
-    $w.c create oval $xy -fill $color -outline $::C(fg) -width 2 \
-	    -tag {I21 I21b}
-}
-proc Move21 {w {step {}}} {
-    set step [GetStep 21 $step]
-
-    set numsteps 30
-    if {$step  >= $numsteps} {
-	return 0
-    }
-
-    lassign [$w.c coords I21b] x1 y1 x2 y2
-    #lassign [$w.c coords I21t] X1 Y1 X2 Y2
-    lassign {183 492 243 504} X1 Y1 X2 Y2
-
-    set f [expr {$step / double($numsteps)}]
-    set y2 [expr {$y2 - 3}]
-    set xx1 [expr {$x1 + ($X1 - $x1) * $f}]
-    set yy1 [expr {$y1 + ($Y1 - $y1) * $f}]
-    set xx2 [expr {$x2 + ($X2 - $x2) * $f}]
-    set yy2 [expr {$y2 + ($Y2 - $y2) * $f}]
-    #H2O $w $yy1 40
-
-    $w.c itemconfig I21b -fill $::C(20)
-    $w.c delete I21w
-    $w.c create poly $x2 $y2 $x1 $y1 $xx1 $yy1 $xx2 $yy1 -tag {I21 I21w} \
-	    -outline {} -fill $::C(20)
-    $w.c lower I21w I21
-    $w.c raise I21b
-    $w.c lower I21f
-
-    return [expr {$step == $numsteps-1 ? 3 : 1}]
-}
-
-# Bucket drop
-proc Draw22 {w} {
-}
-proc Move22 {w {step {}}} {
-    set step [GetStep 22 $step]
-    set pos {{213 513} {213 523} {213 543 x} {213 583} {213 593}}
-
-    if {$step == 0} {$w.c itemconfig I21f -fill $::C(22)}
-    if {$step >= [llength $pos]} {
-	return 0
-    }
-    set where [lindex $pos $step]
-    MoveAbs $w I21 $where
-    H2O $w [lindex $where 1] 40
-    $w.c delete I21_a				;# Delete handles
-
-    if {[lindex $where 2] eq "x"} {
-	return 3
-    }
-    return 1
-}
-
-# Blow dart
-proc Draw23 {w} {
-    set color  $::C(23a)
-    set color2 $::C(23b)
-    set color3 $::C(23c)
-
-    set xy {185 623 253 650}			;# Block
-    $w.c create rect $xy -fill black -outline $::C(fg) -width 2 -tag I23a
-    set xy {187 592 241 623}			;# Balloon
-    $w.c create oval $xy -outline {} -fill $color -tag I23b
-    $w.c create arc $xy -outline $::C(fg) -width 3 -tag I23b \
-	    -style arc -start 12 -extent 336
-    set xy {239 604  258 589 258 625 239 610}	;# Balloon nozzle
-    $w.c create poly $xy -outline {} -fill $color -tag I23b
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag I23b
-
-    set xy {285 611 250 603}			;# Dart body
-    $w.c create oval $xy -fill $color2 -outline $::C(fg) -width 3 -tag I23d
-    set xy {249 596 249 618 264 607 249 596}	;# Dart tail
-    $w.c create poly $xy -fill $color3 -outline $::C(fg) -width 3 -tag I23d
-    set xy {249 607 268 607}			;# Dart detail
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag I23d
-    set xy {285 607 305 607}			;# Dart needle
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag I23d
-}
-proc Move23 {w {step {}}} {
-    set step [GetStep 23 $step]
-
-    set pos {
-	{277 607} {287 607} {307 607 x} {347 607} {407 607} {487 607}
-	{587 607} {687 607} {787 607} {-100 -100}
-    }
-
-    if {$step >= [llength $pos]} {
-	return 0
-    }
-    if {$step <= 1} {
-	$w.c scale I23b {*}[Anchor $w I23a n] .9 .5
-    }
-    set where [lindex $pos $step]
-    MoveAbs $w I23d $where
-
-    if {[lindex $where 2] eq "x"} {
-	return 3
-    }
-    return 1
-}
-
-# Balloon
-proc Draw24 {w} {
-    set color $::C(24a)
-    set xy {366 518 462 665}			;# Balloon
-    $w.c create oval $xy -fill $color -outline $::C(fg) -width 3 -tag I24
-    set xy {414 666 414 729}			;# String
-    $w.c create line $xy -fill $::C(fg) -width 3 -tag I24
-    set xy {410 666 404 673 422 673 418 666}	;# Nozzle
-    $w.c create poly $xy -fill $color -outline $::C(fg) -width 3 -tag I24
-
-    set xy {387 567 390 549 404 542}		;# Reflections
-    $w.c create line $xy -fill $::C(fg) -smooth 1 -width 2 -tag I24
-    set xy {395 568 399 554 413 547}
-    $w.c create line $xy -fill $::C(fg) -smooth 1 -width 2 -tag I24
-    set xy {403 570 396 555 381 553}
-    $w.c create line $xy -fill $::C(fg) -smooth 1 -width 2 -tag I24
-    set xy {408 564 402 547 386 545}
-    $w.c create line $xy -fill $::C(fg) -smooth 1 -width 2 -tag I24
-}
-proc Move24 {w {step {}}} {
-    global S
-    set step [GetStep 24 $step]
-
-    if {$step > 4} {
-	return 0
-    } elseif {$step == 4} {
-	return 2
-    }
-
-    if {$step == 0} {
-	$w.c delete I24				;# Exploding balloon
-	set xy {
-	    347 465 361 557 271 503 272 503 342 574 259 594 259 593 362 626
-	    320 737 320 740 398 691 436 738 436 739 476 679 528 701 527 702
-	    494 627 548 613 548 613 480 574 577 473 577 473 474 538 445 508
-	    431 441 431 440 400 502 347 465 347 465
-	}
-	$w.c create poly $xy -tag I24 -fill $::C(24b) -outline $::C(24a) \
-		-width 10 -smooth 1
-	set msg [subst $S(message)]
-	$w.c create text [Centroid $w I24] -text $msg -tag {I24 I24t} \
-		-justify center -font {{Times Roman} 18 bold}
-	return 1
-    }
-
-    $w.c itemconfig I24t -font [list {Times Roman} [expr {18 + 6*$step}] bold]
-    $w.c move I24 0 -60
-    $w.c scale I24 {*}[Centroid $w I24] 1.25 1.25
-    return 1
-}
-
-# Displaying the message
-proc Move25 {w {step {}}} {
-    global S
-    set step [GetStep 25 $step]
-    if {$step == 0} {
-	set ::XY(25) [clock clicks -milliseconds]
-	return 1
-    }
-    set elapsed [expr {[clock clicks -milliseconds] - $::XY(25)}]
-    if {$elapsed < 5000} {
-	return 1
-    }
-    return 2
-}
-
-# Collapsing balloon
-proc Move26 {w {step {}}} {
-    global S
-    set step [GetStep 26 $step]
-
-    if {$step >= 3} {
-	$w.c delete I24 I26
-	$w.c create text 430 755 -anchor s -tag I26 \
-		-text "click to continue" -font {{Times Roman} 24 bold}
-	bind $w.c <1> [list Reset $w]
-	return 4
-    }
-
-    $w.c scale I24 {*}[Centroid $w I24] .8 .8
-    $w.c move I24 0 60
-    $w.c itemconfig I24t -font [list {Times Roman} [expr {30 - 6*$step}] bold]
-    return 1
-}
-
-################################################################
-#
-# Helper functions
-#
-
-proc box {x y r} {
-    return [list [expr {$x-$r}] [expr {$y-$r}] [expr {$x+$r}] [expr {$y+$r}]]
-}
-
-proc MoveAbs {w item xy} {
-    lassign $xy x y
-    lassign [Centroid $w $item] Ox Oy
-    set dx [expr {$x - $Ox}]
-    set dy [expr {$y - $Oy}]
-    $w.c move $item $dx $dy
-}
-
-proc RotateItem {w item Ox Oy beta} {
-    set xy [$w.c coords $item]
-    set xy2 {}
-    foreach {x y} $xy {
-	lappend xy2 {*}[RotateC $x $y $Ox $Oy $beta]
-    }
-    $w.c coords $item $xy2
-}
-
-proc RotateC {x y Ox Oy beta} {
-    # rotates vector (Ox,Oy)->(x,y) by beta degrees clockwise
-
-    set x [expr {$x - $Ox}]			;# Shift to origin
-    set y [expr {$y - $Oy}]
-
-    set beta [expr {$beta * atan(1) * 4 / 180.0}]	;# Radians
-    set xx [expr {$x * cos($beta) - $y * sin($beta)}]	;# Rotate
-    set yy [expr {$x * sin($beta) + $y * cos($beta)}]
-
-    set xx [expr {$xx + $Ox}]			;# Shift back
-    set yy [expr {$yy + $Oy}]
-
-    return [list $xx $yy]
-}
-
-proc Reset {w} {
-    global S
-    DrawAll $w
-    bind $w.c <1> {}
-    set S(mode) $::MSTART
-    set S(active) 0
-}
-
-# Each Move## keeps its state info in STEP, this retrieves and increments it
-proc GetStep {who step} {
-    global STEP
-    if {$step ne ""} {
-	set STEP($who) $step
-    } elseif {![info exists STEP($who)] || $STEP($who) eq ""} {
-	set STEP($who) 0
-    } else {
-	incr STEP($who)
-    }
-    return $STEP($who)
-}
-
-proc ResetStep {} {
-    global STEP
-    set ::S(cnt) 0
-    foreach a [array names STEP] {
-	set STEP($a) ""
-    }
-}
-
-proc Sine {w x0 y0 x1 y1 amp freq args} {
-    set PI [expr {4 * atan(1)}]
-    set step 2
-    set xy {}
-    if {$y0 == $y1} {				;# Horizontal
-	for {set x $x0} {$x <= $x1} {incr x $step} {
-	    set beta [expr {($x - $x0) * 2 * $PI / $freq}]
-	    set y [expr {$y0 + $amp * sin($beta)}]
-	    lappend xy $x $y
-	}
-    } else {
-	for {set y $y0} {$y <= $y1} {incr y $step} {
-	    set beta [expr {($y - $y0) * 2 * $PI / $freq}]
-	    set x [expr {$x0 + $amp * sin($beta)}]
-	    lappend xy $x $y
-	}
-    }
-    return [$w.c create line $xy {*}$args]
-}
-
-proc RoundRect {w xy radius args} {
-    lassign $xy x0 y0 x3 y3
-    set r [winfo pixels $w.c $radius]
-    set d [expr {2 * $r}]
-
-    # Make sure that the radius of the curve is less than 3/8 size of the box!
-    set maxr 0.75
-    if {$d > $maxr * ($x3 - $x0)} {
-	set d [expr {$maxr * ($x3 - $x0)}]
-    }
-    if {$d > $maxr * ($y3 - $y0)} {
-	set d [expr {$maxr * ($y3 - $y0)}]
-    }
-
-    set x1 [expr { $x0 + $d }]
-    set x2 [expr { $x3 - $d }]
-    set y1 [expr { $y0 + $d }]
-    set y2 [expr { $y3 - $d }]
-
-    set xy [list $x0 $y0 $x1 $y0 $x2 $y0 $x3 $y0 $x3 $y1 $x3 $y2]
-    lappend xy $x3 $y3 $x2 $y3 $x1 $y3 $x0 $y3 $x0 $y2 $x0 $y1
-    return $xy
-}
-
-proc RoundPoly {canv xy radii args} {
-    set lenXY [llength $xy]
-    set lenR [llength $radii]
-    if {$lenXY != 2*$lenR} {
-	error "wrong number of vertices and radii"
-    }
-
-    set knots {}
-    lassign [lrange $xy end-1 end] x0 y0
-    lassign $xy x1 y1
-    lappend xy {*}[lrange $xy 0 1]
-
-    for {set i 0} {$i < $lenXY} {incr i 2} {
-	set radius [lindex $radii [expr {$i/2}]]
-	set r [winfo pixels $canv $radius]
-
-	lassign [lrange $xy [expr {$i + 2}] [expr {$i + 3}]] x2 y2
-	set z [_RoundPoly2 $x0 $y0 $x1 $y1 $x2 $y2 $r]
-	lappend knots {*}$z
-
-	lassign [list $x1 $y1] x0 y0
-	lassign [list $x2 $y2] x1 y1
-    }
-    set n [$canv create polygon $knots -smooth 1 {*}$args]
-    return $n
-}
-
-proc _RoundPoly2 {x0 y0 x1 y1 x2 y2 radius} {
-    set d [expr {2 * $radius}]
-    set maxr 0.75
-
-    set v1x [expr {$x0 - $x1}]
-    set v1y [expr {$y0 - $y1}]
-    set v2x [expr {$x2 - $x1}]
-    set v2y [expr {$y2 - $y1}]
-
-    set vlen1 [expr {sqrt($v1x*$v1x + $v1y*$v1y)}]
-    set vlen2 [expr {sqrt($v2x*$v2x + $v2y*$v2y)}]
-    if {$d > $maxr * $vlen1} {
-	set d [expr {$maxr * $vlen1}]
-    }
-    if {$d > $maxr * $vlen2} {
-	set d [expr {$maxr * $vlen2}]
-    }
-
-    lappend xy [expr {$x1 + $d * $v1x/$vlen1}] [expr {$y1 + $d * $v1y/$vlen1}]
-    lappend xy $x1 $y1
-    lappend xy [expr {$x1 + $d * $v2x/$vlen2}] [expr {$y1 + $d * $v2y/$vlen2}]
-
-    return $xy
-}
-
-proc Sparkle {w Oxy tag} {
-    set xy {299 283 298 302 295 314 271 331 239 310 242 292 256 274 281 273}
-    foreach {x y} $xy {
-	$w.c create line 271 304 $x $y -fill white -width 3 -tag $tag
-    }
-    MoveAbs $w $tag $Oxy
-}
-
-proc Centroid {w item} {
-    return [Anchor $w $item c]
-}
-
-proc Anchor {w item where} {
-    lassign [$w.c bbox $item] x1 y1 x2 y2
-    if {[string match *n* $where]} {
-	set y $y1
-    } elseif {[string match *s* $where]} {
-	set y $y2
-    } else {
-	set y [expr {($y1 + $y2) / 2.0}]
-    }
-    if {[string match *w* $where]} {
-	set x $x1
-    } elseif {[string match *e* $where]} {
-	set x $x2
-    } else {
-	set x [expr {($x1 + $x2) / 2.0}]
-    }
-    return [list $x $y]
-}
-
-DoDisplay $w
-Reset $w
-Go $w						;# Start everything going
diff --git a/tk8.6/library/demos/hello b/tk8.6/library/demos/hello
deleted file mode 100644
index d10b8d5..0000000
--- a/tk8.6/library/demos/hello
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# the next line restarts using wish \
-exec wish "$0" ${1+"$@"}
-
-# hello --
-# Simple Tk script to create a button that prints "Hello, world".
-# Click on the button to terminate the program.
-
-package require Tk
-
-# The first line below creates the button, and the second line
-# asks the packer to shrink-wrap the application's main window
-# around the button.
-
-button .hello -text "Hello, world" -command {
-    puts stdout "Hello, world"; destroy .
-}
-pack .hello
-
-# Local Variables:
-# mode: tcl
-# End:
diff --git a/tk8.6/library/demos/hscale.tcl b/tk8.6/library/demos/hscale.tcl
deleted file mode 100644
index 1df144d..0000000
--- a/tk8.6/library/demos/hscale.tcl
+++ /dev/null
@@ -1,45 +0,0 @@
-# hscale.tcl --
-#
-# This demonstration script shows an example with a horizontal scale.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .hscale
-catch {destroy $w}
-toplevel $w
-wm title $w "Horizontal Scale Demonstration"
-wm iconname $w "hscale"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 3.5i -justify left -text "An arrow and a horizontal scale are displayed below.  If you click or drag mouse button 1 in the scale, you can change the length of the arrow."
-pack $w.msg -side top -padx .5c
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-frame $w.frame -borderwidth 10
-pack $w.frame -side top -fill x
-
-canvas $w.frame.canvas -width 50 -height 50 -bd 0 -highlightthickness 0
-$w.frame.canvas create polygon 0 0 1 1 2 2 -fill DeepSkyBlue3 -tags poly
-$w.frame.canvas create line 0 0 1 1 2 2 0 0 -fill black -tags line
-scale $w.frame.scale -orient horizontal -length 284 -from 0 -to 250 \
-	-command "setWidth $w.frame.canvas" -tickinterval 50
-pack $w.frame.canvas -side top -expand yes -anchor s -fill x  -padx 15
-pack $w.frame.scale -side bottom -expand yes -anchor n
-$w.frame.scale set 75
-
-proc setWidth {w width} {
-    incr width 21
-    set x2 [expr {$width - 30}]
-    if {$x2 < 21} {
-	set x2 21
-    }
-    $w coords poly 20 15 20 35 $x2 35 $x2 45 $width 25 $x2 5 $x2 15 20 15
-    $w coords line 20 15 20 35 $x2 35 $x2 45 $width 25 $x2 5 $x2 15 20 15
-}
diff --git a/tk8.6/library/demos/icon.tcl b/tk8.6/library/demos/icon.tcl
deleted file mode 100644
index 224d8f9..0000000
--- a/tk8.6/library/demos/icon.tcl
+++ /dev/null
@@ -1,51 +0,0 @@
-# icon.tcl --
-#
-# This demonstration script creates a toplevel window containing
-# buttons that display bitmaps instead of text.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .icon
-catch {destroy $w}
-toplevel $w
-wm title $w "Iconic Button Demonstration"
-wm iconname $w "icon"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 5i -justify left -text "This window shows three ways of using bitmaps or images in radiobuttons and checkbuttons.  On the left are two radiobuttons, each of which displays a bitmap and an indicator.  In the middle is a checkbutton that displays a different image depending on whether it is selected or not.  On the right is a checkbutton that displays a single bitmap but changes its background color to indicate whether or not it is selected."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-# Main widget program sets variable tk_demoDirectory
-image create bitmap flagup \
-	-file [file join $tk_demoDirectory images flagup.xbm] \
-	-maskfile [file join $tk_demoDirectory images flagup.xbm]
-image create bitmap flagdown \
-	-file [file join $tk_demoDirectory images flagdown.xbm] \
-	-maskfile [file join $tk_demoDirectory images flagdown.xbm]
-frame $w.frame -borderwidth 10
-pack $w.frame -side top
-
-checkbutton $w.frame.b1 -image flagdown -selectimage flagup \
-	-indicatoron 0
-$w.frame.b1 configure -selectcolor [$w.frame.b1 cget -background]
-checkbutton $w.frame.b2 \
-	-bitmap @[file join $tk_demoDirectory images letters.xbm] \
-	-indicatoron 0 -selectcolor SeaGreen1
-frame $w.frame.left
-pack $w.frame.left $w.frame.b1 $w.frame.b2 -side left -expand yes -padx 5m
-
-radiobutton $w.frame.left.b3 \
-	-bitmap @[file join $tk_demoDirectory images letters.xbm] \
-	-variable letters -value full
-radiobutton $w.frame.left.b4 \
-	-bitmap @[file join $tk_demoDirectory images noletter.xbm] \
-	-variable letters -value empty
-pack $w.frame.left.b3 $w.frame.left.b4 -side top -expand yes
diff --git a/tk8.6/library/demos/image1.tcl b/tk8.6/library/demos/image1.tcl
deleted file mode 100644
index 0bd2f49..0000000
--- a/tk8.6/library/demos/image1.tcl
+++ /dev/null
@@ -1,35 +0,0 @@
-# image1.tcl --
-#
-# This demonstration script displays two image widgets.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .image1
-catch {destroy $w}
-toplevel $w
-wm title $w "Image Demonstration #1"
-wm iconname $w "Image1"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "This demonstration displays two images, each in a separate label widget."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-# Main widget program sets variable tk_demoDirectory
-catch {image delete image1a}
-image create photo image1a -file [file join $tk_demoDirectory images earth.gif]
-label $w.l1 -image image1a -bd 1 -relief sunken
-
-catch {image delete image1b}
-image create photo image1b \
-	-file [file join $tk_demoDirectory images earthris.gif]
-label $w.l2 -image image1b -bd 1 -relief sunken
-
-pack $w.l1 $w.l2 -side top -padx .5m -pady .5m
diff --git a/tk8.6/library/demos/image2.tcl b/tk8.6/library/demos/image2.tcl
deleted file mode 100644
index 2d7ba03..0000000
--- a/tk8.6/library/demos/image2.tcl
+++ /dev/null
@@ -1,108 +0,0 @@
-# image2.tcl --
-#
-# This demonstration script creates a simple collection of widgets
-# that allow you to select and view images in a Tk label.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-# loadDir --
-# This procedure reloads the directory listbox from the directory
-# named in the demo's entry.
-#
-# Arguments:
-# w -			Name of the toplevel window of the demo.
-
-proc loadDir w {
-    global dirName
-
-    $w.f.list delete 0 end
-    foreach i [lsort [glob -type f -directory $dirName *]] {
-	$w.f.list insert end [file tail $i]
-    }
-}
-
-# selectAndLoadDir --
-# This procedure pops up a dialog to ask for a directory to load into
-# the listobx and (if the user presses OK) reloads the directory
-# listbox from the directory named in the demo's entry.
-#
-# Arguments:
-# w -			Name of the toplevel window of the demo.
-
-proc selectAndLoadDir w {
-    global dirName
-    set dir [tk_chooseDirectory -initialdir $dirName -parent $w -mustexist 1]
-    if {$dir ne ""} {
-	set dirName $dir
-	loadDir $w
-    }
-}
-
-# loadImage --
-# Given the name of the toplevel window of the demo and the mouse
-# position, extracts the directory entry under the mouse and loads
-# that file into a photo image for display.
-#
-# Arguments:
-# w -			Name of the toplevel window of the demo.
-# x, y-			Mouse position within the listbox.
-
-proc loadImage {w x y} {
-    global dirName
-
-    set file [file join $dirName [$w.f.list get @$x,$y]]
-    if {[catch {
-	image2a configure -file $file
-    }]} then {
-	# Mark the file as not loadable
-	$w.f.list itemconfigure @$x,$y -bg \#c00000 -selectbackground \#ff0000
-    }
-}
-
-set w .image2
-catch {destroy $w}
-toplevel $w
-wm title $w "Image Demonstration #2"
-wm iconname $w "Image2"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "This demonstration allows you to view images using a Tk \"photo\" image.  First type a directory name in the listbox, then type Return to load the directory into the listbox.  Then double-click on a file name in the listbox to see that image."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-frame $w.mid
-pack $w.mid -fill both -expand 1
-
-labelframe $w.dir -text "Directory:"
-# Main widget program sets variable tk_demoDirectory
-set dirName [file join $tk_demoDirectory images]
-entry $w.dir.e -width 30 -textvariable dirName
-button $w.dir.b -pady 0 -padx 2m -text "Select Dir." \
-	-command "selectAndLoadDir $w"
-bind $w.dir.e <Return> "loadDir $w"
-pack $w.dir.e -side left -fill both -padx 2m     -pady 2m -expand true
-pack $w.dir.b -side left -fill y    -padx {0 2m} -pady 2m
-labelframe $w.f -text "File:" -padx 2m -pady 2m
-
-listbox $w.f.list -width 20 -height 10 -yscrollcommand "$w.f.scroll set"
-ttk::scrollbar $w.f.scroll -command "$w.f.list yview"
-pack $w.f.list $w.f.scroll -side left -fill y -expand 1
-$w.f.list insert 0 earth.gif earthris.gif teapot.ppm
-bind $w.f.list <Double-1> "loadImage $w %x %y"
-
-catch {image delete image2a}
-image create photo image2a
-labelframe $w.image -text "Image:"
-label $w.image.image -image image2a
-pack $w.image.image -padx 2m -pady 2m
-
-grid $w.dir -        -sticky ew -padx 1m -pady 1m -in $w.mid
-grid $w.f   $w.image -sticky nw -padx 1m -pady 1m -in $w.mid
-grid columnconfigure $w.mid 1 -weight 1
diff --git a/tk8.6/library/demos/images/earth.gif b/tk8.6/library/demos/images/earth.gif
deleted file mode 100644
index 2c229eb..0000000
--- a/tk8.6/library/demos/images/earth.gif
+++ /dev/null
diff --git a/tk8.6/library/demos/images/earthris.gif b/tk8.6/library/demos/images/earthris.gif
deleted file mode 100644
index c4ee473..0000000
--- a/tk8.6/library/demos/images/earthris.gif
+++ /dev/null
diff --git a/tk8.6/library/demos/images/flagdown.xbm b/tk8.6/library/demos/images/flagdown.xbm
deleted file mode 100644
index 55abc51..0000000
--- a/tk8.6/library/demos/images/flagdown.xbm
+++ /dev/null
@@ -1,27 +0,0 @@
-#define flagdown_width 48
-#define flagdown_height 48
-static char flagdown_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00,
-   0x00, 0x00, 0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe1, 0x00, 0x00,
-   0x00, 0x00, 0x70, 0x80, 0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x03, 0x00,
-   0x00, 0x00, 0x0c, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x06, 0x04,
-   0x00, 0x00, 0x03, 0x00, 0x06, 0x06, 0x00, 0x80, 0x01, 0x00, 0x06, 0x07,
-   0x00, 0xc0, 0x1f, 0x00, 0x87, 0x07, 0x00, 0xe0, 0x7f, 0x80, 0xc7, 0x07,
-   0x00, 0x70, 0xe0, 0xc0, 0xe5, 0x07, 0x00, 0x38, 0x80, 0xe1, 0x74, 0x07,
-   0x00, 0x18, 0x80, 0x71, 0x3c, 0x07, 0x00, 0x0c, 0x00, 0x3b, 0x1e, 0x03,
-   0x00, 0x0c, 0x00, 0x1f, 0x0f, 0x00, 0x00, 0x86, 0x1f, 0x8e, 0x07, 0x00,
-   0x00, 0x06, 0x06, 0xc6, 0x05, 0x00, 0x00, 0x06, 0x00, 0xc6, 0x05, 0x00,
-   0x00, 0x06, 0x00, 0xc6, 0x04, 0x00, 0x00, 0x06, 0x00, 0x06, 0x04, 0x00,
-   0x7f, 0x06, 0x00, 0x06, 0xe4, 0xff, 0x00, 0x06, 0x00, 0x06, 0x04, 0x00,
-   0x00, 0x06, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x00, 0x06, 0x06, 0x00,
-   0x00, 0x06, 0x00, 0x06, 0x03, 0x00, 0x00, 0x06, 0x00, 0x86, 0x01, 0x00,
-   0x00, 0x06, 0x00, 0xc6, 0x00, 0x00, 0x00, 0x06, 0x00, 0x66, 0x00, 0x00,
-   0x00, 0x06, 0x00, 0x36, 0x00, 0x00, 0x00, 0x06, 0x00, 0x3e, 0x00, 0x00,
-   0x00, 0xfe, 0xff, 0x2f, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x27, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0xf7, 0xbf, 0x8e, 0xfc, 0xdf, 0xf8, 0x9d, 0xeb, 0x9b, 0x76, 0xd2, 0x7a,
-   0x46, 0x30, 0xe2, 0x0f, 0xe1, 0x47, 0x55, 0x84, 0x48, 0x11, 0x84, 0x19};
diff --git a/tk8.6/library/demos/images/flagup.xbm b/tk8.6/library/demos/images/flagup.xbm
deleted file mode 100644
index 6eb0d84..0000000
--- a/tk8.6/library/demos/images/flagup.xbm
+++ /dev/null
@@ -1,27 +0,0 @@
-#define flagup_width 48
-#define flagup_height 48
-static char flagup_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00,
-   0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xef, 0x6a, 0x00,
-   0x00, 0x00, 0xc0, 0x7b, 0x75, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0x6a, 0x00,
-   0x00, 0x00, 0x30, 0x60, 0x75, 0x00, 0x00, 0x00, 0x18, 0xe0, 0x7f, 0x00,
-   0x00, 0x00, 0x0c, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x06, 0xe0, 0x04, 0x00,
-   0x00, 0x00, 0x03, 0xe0, 0x04, 0x00, 0x00, 0x80, 0x01, 0xe0, 0x06, 0x00,
-   0x00, 0xc0, 0x1f, 0xe0, 0x07, 0x00, 0x00, 0xe0, 0x7f, 0xe0, 0x07, 0x00,
-   0x00, 0x70, 0xe0, 0xe0, 0x05, 0x00, 0x00, 0x38, 0x80, 0xe1, 0x04, 0x00,
-   0x00, 0x18, 0x80, 0xf1, 0x04, 0x00, 0x00, 0x0c, 0x00, 0xfb, 0x04, 0x00,
-   0x00, 0x0c, 0x00, 0xff, 0x04, 0x00, 0x00, 0x86, 0x1f, 0xee, 0x04, 0x00,
-   0x00, 0x06, 0x06, 0xe6, 0x04, 0x00, 0x00, 0x06, 0x00, 0xe6, 0x04, 0x00,
-   0x00, 0x06, 0x00, 0xe6, 0x04, 0x00, 0x00, 0x06, 0x00, 0x66, 0x04, 0x00,
-   0x7f, 0x56, 0x52, 0x06, 0xe4, 0xff, 0x00, 0x76, 0x55, 0x06, 0x04, 0x00,
-   0x00, 0x56, 0x57, 0x06, 0x04, 0x00, 0x00, 0x56, 0x55, 0x06, 0x06, 0x00,
-   0x00, 0x56, 0xd5, 0x06, 0x03, 0x00, 0x00, 0x06, 0x00, 0x86, 0x01, 0x00,
-   0x54, 0x06, 0x00, 0xc6, 0x54, 0x55, 0xaa, 0x06, 0x00, 0x66, 0xaa, 0x2a,
-   0x54, 0x06, 0x00, 0x36, 0x55, 0x55, 0xaa, 0x06, 0x00, 0xbe, 0xaa, 0x2a,
-   0x54, 0xfe, 0xff, 0x6f, 0x55, 0x55, 0xaa, 0xfc, 0xff, 0xa7, 0xaa, 0x2a,
-   0x54, 0x01, 0x88, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x50, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa8, 0xaa, 0x2a,
-   0x54, 0x55, 0x95, 0x54, 0x55, 0x55, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x2a,
-   0x54, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/tk8.6/library/demos/images/gray25.xbm b/tk8.6/library/demos/images/gray25.xbm
deleted file mode 100644
index b234b3c..0000000
--- a/tk8.6/library/demos/images/gray25.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define grey_width 16
-#define grey_height 16
-static char grey_bits[] = {
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44};
diff --git a/tk8.6/library/demos/images/letters.xbm b/tk8.6/library/demos/images/letters.xbm
deleted file mode 100644
index 0f12568..0000000
--- a/tk8.6/library/demos/images/letters.xbm
+++ /dev/null
@@ -1,27 +0,0 @@
-#define letters_width 48
-#define letters_height 48
-static char letters_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x02, 0x00, 0x00, 0x00, 0x20,
-   0x00, 0xfa, 0x00, 0x00, 0x00, 0x2e, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2a,
-   0x00, 0x3a, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2e,
-   0xe0, 0xff, 0xff, 0xff, 0xff, 0x21, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21,
-   0xa0, 0x03, 0x00, 0x00, 0x70, 0x21, 0x20, 0x00, 0x00, 0x00, 0x50, 0x21,
-   0xa0, 0x1f, 0x00, 0x00, 0x50, 0x21, 0x20, 0x00, 0x00, 0x00, 0x70, 0x21,
-   0xfe, 0xff, 0xff, 0xff, 0x0f, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x21,
-   0xfa, 0x01, 0x00, 0x80, 0x0b, 0x21, 0x02, 0x00, 0x00, 0x80, 0x0a, 0x21,
-   0xba, 0x01, 0x00, 0x80, 0x0a, 0x21, 0x02, 0x00, 0x00, 0x80, 0x0b, 0x21,
-   0x3a, 0x00, 0x00, 0x00, 0x08, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x21,
-   0x02, 0xc0, 0xfb, 0x03, 0x08, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x3f,
-   0x02, 0xc0, 0xbd, 0x0f, 0x08, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x01,
-   0x02, 0xc0, 0x7f, 0x7b, 0x08, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x01,
-   0x02, 0x00, 0x00, 0x00, 0xf8, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
-   0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
-   0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
-   0xfe, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/tk8.6/library/demos/images/noletter.xbm b/tk8.6/library/demos/images/noletter.xbm
deleted file mode 100644
index 5774124..0000000
--- a/tk8.6/library/demos/images/noletter.xbm
+++ /dev/null
@@ -1,27 +0,0 @@
-#define noletters_width 48
-#define noletters_height 48
-static char noletters_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00,
-   0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x07, 0x00,
-   0x00, 0xf0, 0x0f, 0xe0, 0x1f, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x7f, 0x00,
-   0x00, 0x3e, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x1f, 0x00, 0x00, 0xf0, 0x01,
-   0x80, 0x07, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0xe0, 0x07,
-   0xe0, 0x01, 0x00, 0x00, 0xf0, 0x0f, 0xe0, 0x00, 0x00, 0x00, 0x78, 0x0e,
-   0xf0, 0x00, 0x00, 0x00, 0x3c, 0x1e, 0x70, 0x00, 0x00, 0x00, 0x1e, 0x1c,
-   0x38, 0x00, 0x00, 0x00, 0x0f, 0x38, 0x38, 0x00, 0x00, 0x80, 0x07, 0x38,
-   0x3c, 0xfc, 0xff, 0xff, 0x7f, 0x78, 0x1c, 0x04, 0x00, 0xe0, 0x41, 0x70,
-   0x1c, 0x04, 0x00, 0xf0, 0x40, 0x70, 0x1c, 0x74, 0x00, 0x78, 0x4e, 0x70,
-   0x0e, 0x04, 0x00, 0x3c, 0x4a, 0xe0, 0x0e, 0x74, 0x03, 0x1e, 0x4a, 0xe0,
-   0x0e, 0x04, 0x00, 0x0f, 0x4e, 0xe0, 0x0e, 0x04, 0x80, 0x07, 0x40, 0xe0,
-   0x0e, 0x04, 0xf8, 0x0f, 0x40, 0xe0, 0x0e, 0x04, 0xe0, 0x01, 0x40, 0xe0,
-   0x0e, 0x04, 0xf8, 0x00, 0x40, 0xe0, 0x0e, 0x04, 0x78, 0x00, 0x40, 0xe0,
-   0x0e, 0x04, 0xfc, 0xf3, 0x40, 0xe0, 0x1c, 0x04, 0x1e, 0x00, 0x40, 0x70,
-   0x1c, 0x04, 0x0f, 0x00, 0x40, 0x70, 0x1c, 0x84, 0x07, 0x00, 0x40, 0x70,
-   0x3c, 0xfc, 0xff, 0xff, 0x7f, 0x78, 0x38, 0xe0, 0x01, 0x00, 0x00, 0x38,
-   0x38, 0xf0, 0x00, 0x00, 0x00, 0x38, 0x70, 0x78, 0x00, 0x00, 0x00, 0x1c,
-   0xf0, 0x3c, 0x00, 0x00, 0x00, 0x1e, 0xe0, 0x1e, 0x00, 0x00, 0x00, 0x0e,
-   0xe0, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x07, 0x00, 0x00, 0x80, 0x07,
-   0x80, 0x07, 0x00, 0x00, 0xc0, 0x03, 0x00, 0x1f, 0x00, 0x00, 0xf0, 0x01,
-   0x00, 0x3e, 0x00, 0x00, 0xf8, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x7f, 0x00,
-   0x00, 0xf0, 0x0f, 0xe0, 0x1f, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x07, 0x00,
-   0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00};
diff --git a/tk8.6/library/demos/images/ouster.png b/tk8.6/library/demos/images/ouster.png
deleted file mode 100644
index 259b8f9..0000000
--- a/tk8.6/library/demos/images/ouster.png
+++ /dev/null
diff --git a/tk8.6/library/demos/images/pattern.xbm b/tk8.6/library/demos/images/pattern.xbm
deleted file mode 100644
index df31baf..0000000
--- a/tk8.6/library/demos/images/pattern.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define foo_width 16
-#define foo_height 16
-static char foo_bits[] = {
-   0x60, 0x06, 0x90, 0x09, 0x90, 0x09, 0xb0, 0x0d, 0x4e, 0x72, 0x49, 0x92,
-   0x71, 0x8e, 0x8e, 0x71, 0x8e, 0x71, 0x71, 0x8e, 0x49, 0x92, 0x4e, 0x72,
-   0xb0, 0x0d, 0x90, 0x09, 0x90, 0x09, 0x60, 0x06};
diff --git a/tk8.6/library/demos/images/tcllogo.gif b/tk8.6/library/demos/images/tcllogo.gif
deleted file mode 100644
index 4603d4f..0000000
--- a/tk8.6/library/demos/images/tcllogo.gif
+++ /dev/null
diff --git a/tk8.6/library/demos/images/teapot.ppm b/tk8.6/library/demos/images/teapot.ppm
deleted file mode 100644
index b8ab85f..0000000
--- a/tk8.6/library/demos/images/teapot.ppm
+++ /dev/null
@@ -1,31 +0,0 @@
-P6
-256 256
-255
-\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À[7 eOLjQLmSMoTMnSMlRMhPL_9 \À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀnSMtVMzYN~[N~[N\N\O€\O€]O€]O€]O€]O€\O€\O}[NyYNtVM\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀG-wXN}[N€]O„^O†_O†`O‡`Oˆ`Oˆ`OˆaO‰aO‰aO‰aO‰aO‰aO‰aOˆaOˆ`O†_Oƒ^O\N\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀaMLyYN…_O‰aP‹bP�cPŽcPŽdPŽdP�dP�dP�dP�dP�dP�dP�dP�eP‘eP’eP’eP‘eP�dP�cP…_OpUM\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀwXN…_O�dP“fP•gQ–hQ˜hQ˜iQ™iQ™iQšiQšiQšjQ›jQ›jQœjQœjQœjQœjQœjQ›jQœjQ™iQ“fP‡`O\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀNCJiQL‹bP—hQ�kQ¡mR¤nR¥oR¥oR¥oR¥oR¥oR¥oR¦oR¦oR¦pR¨pS©qSªqS«rS¬rS«rS©qS¤oRœjQ€]O\KK\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀfOLrUM�cPŸlR©qS¯tS²uTµwT·xT¸xT¹yTºyT»zT»zU¼zU¼zU¼zU»zUºyT¸xT¶wT¯tS¡mR‰aOhPL\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\Àa0	cNLqUM€\O”fQ¦pS²wVºzV¿|VÂ}VÄVÆVÇ€VÉ‚WÌ…[Õ�eæ w÷³‹êª…Ĉg§qT“fQ{ZNYIK9\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀO1{G#‘JkRMqUMtVN–iS¨v\·€d¹�bµzZ±vU°uT®sSªqS¤nRœjQ’eP„^OrUM�Hh>!T4\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀG-V5wE"~I#†M%�U+¥e7²l:°g2®b*­a(­`(©^(¥])¡^-›]1ŠS,qC$`9 R3G-\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À@)J/i>!pA"tD"wF$yH&xH&tE$wE#yG%}M+ƒT4S5mE*Z7!K/B*;'\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À‰aO¦oR½{UÇ€VÏ…X<(F-a: e<!h>!j@#k@$h>"d<!c=$hD-fF2[<)K0@);'5$Ë‚VÇ€V¿|U_LKYIK\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À…_O·xTÉ‚Wó«€ûµ‹Ö’k¼|X×>µf-¨^(¡Z'šW&–T&œN>)F-J/b; g>#nD(jB&c<!b=%jH2_A/I0!<(8&5$”J¥Y’S%8&;'?)E,<:HA=HE?IJAISFJYIKXIK\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À£nRÁ}UܘqÊŠe±vU²e,™V&¥V†C
€@|>y<u:r9o7l6
-j5
-h4
-g3
-5$D,K/b; h>"wM1tK.e="a<#cA,U8&E-<(9&.!a0	b1	c1	



	
	
	

-
-+3#@)46G<:HMCIXHK\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀU*´vT¿~X¸{YÃk+›W&‰N$|>u:p8k5
-f3
-a0	_/	].	[-	�I¡\*ª_(‘LkRMmSMmSMnSMnSMD,R3W5mA"|O0|P1j?"c<!a=%Y7"N1F,;'NCJNCJNDJODJODJODJh>!a: X/K%
-g3
-a0	Z-	\/T*Q(ŠHµm8kRMmSMnTMoTMpTMpUM15G15G05G04G04GpUMpTM5^9 d<!yF#�O+€N,rC#qB"pB#k?"a: Z7 6ODJPDJPEJQEJQEJREJREJREJRFJSFJSFJSFJSFJe<!X/
-^/	V+Q(L&I$r9 TlRMnSM46G47G47G46G46G46G46G46G36G36G25G25G15G04G/4F.3F
-
-�X&pUMuWMwXNxXN<:H<:H<:H<:H<;H<;H<;H<;H=;H=;H=;H=;H>;H>;H?<H@<HA=HC>HG@ILBIREJ[JKcNLjQL§pR±uTºzUÃ~VÈ�WË‚XÖŽcä�sÒŽe¼{V²vT¨pSžkR•gQŒbP†_O‚^O�]O€\O€\O€\O€\O€]O�]O�]O�]O�]O�]O�]O�]O�]O�]O�]O€\O€\O~\N}[N|ZNxXN•T%H$
-›W&rVMvWNyYNzYN|ZN}[N}[N><H?<H?<H?<H?<H?<H@<H@<H@<HA=HA=HB=HC>HE?IG@IIAIKBIODJSFJWHK—hQŸlR§pR°b(¾i*Én+Ù|7Û|6Ïr,Íq+Êp-Ãl+»g)±b(®sS§pS lRšiQ•gQ�eP�cPŠaPˆaO‡`O‡`O†_O†_O…_O…_O…_O…_O…_O…_O…_O„_O„^O„^Oƒ^Oƒ^O‚]O�]O€\O~[N{ZN•T%
-
-	
-@%<-$G?@…pfdNLuWM\NdNL\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀTFJvWN‰aP./01„E}[N�]O…_Oˆ`O‰aP‹bPŒbP�cP�cPŽcP�dP�dP�dP�eP‘eP’eP’eP“fP“fQ”fQ•gQ•gQ–gQ–hQ—hQ˜hQ™iQšiQ›jQœjQ�kQ�kRžlRŸlRžY&¤\'¨^'µ^½bÀcÃeÇi ÄgÀc½b¼a¹`µ^´]¯X¢[' Z'žY&¢mR¡mR¡mR lRŸlRŸlRžkR�kQœkQœjQ›jQšjQšiQ™iQ™iQ˜iQ˜hQ—hQ—hQ—hQ–gQ–gQ•gQ•gQ•gQ”fQ”fQ“fQ“fP’eP‘eP�dP�cP‰aP—O
- B\À\À\À\À\À\À\À\À\À\À%7!!C*F#P){dYœze»�p€\OgPL\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀSFJ`LKvWNŠaPm6
-

-$5 ¬`(¶e)£nRœjQƒ^OJAI\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀXIK^KKdNLhPLuWM‚]OŒbP”fQ�eP

m6
-†`OŽcP“fQ—hQ˜hQ™iQšiQšjQ›jQ›jQ›jQœjQœjQœjQœkQ�kQ�kQ�kRžkRžkRžkRžlRŸlRŸlRŸlR lR lR lR¡mR¡mR¡mR¡mRºg)³c(²c(±b(­V¿cÂeÅi!Åi!Àd¼bº`¹`·_·_¶^¢Q§]'ª_(­`(¹f)£nR£nR£nR£nR£nR£nR£nR¢nR¢nR¢nR¢nR¢nR¢nR¢mR¢mR¢mR¢mR¢mR¢mR¢mR¢mR¢mR¢nR¢mR¢mR£nR¢mR¢mR¡mR mR�kR—hQˆGa0	ŠbP mRœjQ“fQ‰aP}[NrUMmSM…L$\À\À\À\À\À\À\À\À B B
#C, 8&H.Z7 §pR›jQ{ZN\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀQEJ[JK`LKdNLhQLqUM{ZN…_OŽcP–gQ—hQ
-‹bP‘eP–hQšiQ›jQœjQ�kQ�kQ�kRžkRžkRžlRžlRŸlRŸlRŸlRŸlRŸlR lR lR lR mR¡mR¡mR¡mR¡mR¡mR¢mR¢mR¢mR¢nR£nRÀj*ºg)·e)¶d)Âd°XÅgÅhÂe¿c½b½b¾bªU­`(®a(¯a(³c(¾i*¤oR¤oR¤nR¤nR¤nR¤nR¤nR¤nR¤nR¤nR¤nR¤nR¤nR¤nR¤nR¤nR¤nR¤oR¤oR¥oR¥oR¥oR¥oR¥oR¥oR¦oR¦oR¥oR¥oR¤nR¡mR›jQŽQ%Z-	œjQ£nRŸlR—hQŽdP…_OuWMpTMnSMkRLa: \À\À\À\À\À\À\À B B&D2
@*S6#G@IPDJ˜hQmSM\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀVGJ]KKbMLeOLiQLlRMvWN\OˆaO‘eP—hQœjQ•gQ
-!C+E'0F.4F7%8%U/lG.SFJZIK]KKZIKB=H\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀREJZJK`LKdNLgPLjQLlRMnSMpTMqUMtWMxXN{ZN~[N�]O„^O†`O‰aO‹bP�dP•gQ™iQœkQ lR¤nR§pSªrS­sS¯tT²uT´vT¶wT·xT¹yT¹yTºyTºyT¹yT¶xT´vT¬rS¢nR—hQ¿|U¿|UÀ|UÀ|UÀ|UÀ|UÀ|UÀ|UÀ|UÀ|UÀ|UÀ|UÀ|UÀ|UÀ}UÀ}UÁ}UÁ}UÁ}UÁ}UÂ}UÂ~UÃ~UÃ~VÃ~VÄVÅ€WÆ�X®a(ŸlRªrS´vT¸yT¼zU¾|UÁ~VÃXÆ‚[Ɇ_΋dÓ‘jÔ“mÔ“nБlÊŒhĆd½�_¶{[°vWªsU¦pS¢nRžkRšiQ˜hQ•gQ“fQ‘eP�dPŒbP‰aO†_Oƒ^O€\O|ZNxXNsVMpTMnTMmSMjQL€C B)D&/F-3F47G6%>"Y7 kA$YIK]KK^KKSFJ\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀVGJ\KKbMLeOLhPLkRLmSMnTMpTMrUMuWNyYN|ZN\N‚]O„_O‡`OŠaPŒbPŽcP�eP“fP—hQ›jQžlR¢nR¥oS©qT¬sT¯uU²vU´wV¶xV¸yV¹yUºzU»zU¼{U½{U¾{U¾|U¿|U¿|U¿|U¿|U¾{U½{U¼{U¼zU»zTºyT¹yT¸xTµwT³vT´vT´vT´vT´wT´wTµwT·xT¹yTºzT¼zU½{U¾{U¿|UÀ|UÂ}UÄVÅ€WÇ‚YÉ„\͈_ÑŒdÙ”lá�uç£|쩂ſt명æ¦�ÞŸ{Õ—sËŽl†d¹^³yZ­uW¨qU¤oSŸlRžkRœjQšiQ˜hQ–gQ”fQ‘eP�dP�cPŠaP‡`O„^O�]O}[NyYNuWMpTMoTMmSMkRLgPL&D#.E,3F46G;'<(D"iB(VGJ]KK`LK[JKB>H\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀNCJYIK^LKcNLfOLiQLkRMmSMoTMqUMsVMvXNzYN}[N€\O‚^O…_Oˆ`OŠaPŒcP�dP‘eP“fQ•gQ—hQ™iQ�kR mS¤oT¨rU¬tW°wY´zZ¸}\»]¾€^À�^Á‚^‚^Â�\Á€ZÁYÁXÁ~WÁ~WÂ~VÂ~VÂ~VÃ~VÃ~UÃ~UÄ~UÄ~UÄUÄUÅVÅVÅVÅVÆVÆ€VÆ€VÇ€WÇ�WÈ‚XɃZË…[͇^ЊaÓ�dØ’iÜ—nâ�tè£zî©�ó¯‡ø´�û¸‘üº“û¹“÷¶�ñ±Œé©…à¡~Ö˜vË�mÇf»€`´z[®vX©rU¥pT£oS¢nS lRžkRœkRšjQ˜iQ–hQ”fQ’eP�dP�cP‹bPˆ`O…_O‚]O~[NzYNvWNpTMoTMnSMkRMhQLo7,2F36G99HC+@ ]8 nA"\JK`ML_LKSFJ\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀSFJ[JK`LKdNLgPLjQLlRMnSMpTMqUMtVMwXNzZN}[N€]Oƒ^O†_OˆaO‹bP�cP�dP‘eP“fQ•gQ—hQ™iQ›jRžlR mS£oU§rW¬vZ²{]¹€a¿…fÅŠjË�nГqÓ•sÕ–sÕ–rÕ–qÕ”oÓ’mÑ�jÏ�gÍŠcˈaɆ^È„\Ç‚[Æ�YÅ€XÅ€WÅWÅWÅVÅVÅWÅ€WÆ€WÇ�XÈ‚YɃ[Ê…\͇_ÏŠaÒ�eÕ‘hÙ•mÝ™qá�vä¡zç¤}꧀멃몄騃奀ߠ|Ù›wÓ•rÌ�mƉh¿„c¸~^²yZ®vX¬tWªsV¨qU¦pT¤oS¢nS mRžlRœkR›jQ™iQ—hQ•gQ“fP�ePŽcP‹bPˆaO…_O‚^O\N{ZNwXNsVMoTMnSMlRMiQL~I#26G99G?<HA*E$	i@$ZIKaMLbML[JK;:H\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀWHJ]KKbMLeOLhPLjRLlSMnTMpTMrUMuWMxXN{ZN~\N�]O„^O†`O‰aO‹bPŽcP�dP’eP”fQ–gQ˜hQšiQœkRžlS mT£oU¦rWªuZ¯y]´~aºƒfŠlË’sÔšzÜ¡€ã§†è«‰ë®‹í¯Œí®‹ë¬ˆè¨„ã£~ßžyÚ™tÖ•oÒ�jÎŒfˈbÈ…_ƃ\Å�ZÄ€YÃXÂWÂ~WÂ~WÂ~WÃXÀXÄ€YÅ�Zƃ\Ç…^Ɇ`ˈbÌŠdÍ‹fÎ�gÎŽiÎŽjÎŽjÍŽjËŒiljgÆd¿ƒaº^¸}]¶|\´{[²yZ°xY®vX¬tWªsV¨qU¦pT¤oS¢nS mRžlR�kR›jQ™iQ—hQ•gQ“fP‘ePŽdPŒbP‰aO†_Oƒ^O€\O|ZNxXNtVMpTMnSMmSMjQLgPL99G?<HG-E&b;!YIK`MLdOM`LKNCJ\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀŸlRºyTÄ~UÊ‚XʃYÄXº{W­tUšW'¢[(—hQ lR�cP€\OhQL\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀNCJYIK^LKcNLfOLiQLkRLmSMoTMqUMrVMvWNyYN|ZN\N‚]O„_O‡`O‰aPŒbPŽcP�dP’fP”gQ–hQ˜iQšjRœkRžlS¡nT¤pU§sW«vZ°z]µb»„gŠlÉ‘sИyØžÞ¤…ã©Šè­�ì±�ﳑﳑ뭊穅⣀ݞzؘtÒ“nÎ�iɉdÆ…`Â]Á€[¿~Y¾}X½|W½|V¼{V¼{V¼{V¼{V¼{V¼|W¼|W½}X½}Y½~Z½~Z¼~Z»}[º}[º}[º~\º~\º~]º~]¹~]¸~]·}]¶|\´z[²yZ°wY®vX¬tWªsV¨rU¦pT¤oS¢nS mRŸlR�kR›jQšiQ˜hQ–gQ“fQ‘eP�dPŒcPŠaP‡`O„^O�]O}[NyYNuWNpTMnTMmSMkRLhPL|H$D>IQ2P+XHK_LLfQOcNLXIK\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À©qSºyTÃ~VΈ`遲ޜv¾€]ªqS–LŽG|>g3
-S)?*%.—hQ—hQ‘eP‡`OuWM\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\ÀSFJ[JK`LKdNLgPLjQLlRMnSMoTMqUMsVMwXNzYN}[N€\O‚^O…_O‡`OŠaPŒbPŽdP‘eP“fP•gQ—hQ˜iQšjRœkRŸlS¡nT¤pV§sX«vZ°z^¶b¼…gËmÊ’sјzØŸ€Þ¤…ã©Šè­�ê¯�ë°�ꯎ謋娇ं۞|Ö™wÑ“qÌŽlljgÃ…bÀ‚_½\»}Zº{X¹zW¸yV·yU·xU·xU·xT·xT·xU·xU·xU·yV·yV·yW¸zW¸{X¹{Y¹|Zº}[º}[º}\º~\¹~]¹~]¸}]·|\µ{\´z[²yZ°wY®vX¬tWªsV¨rU¦pT¤oS¢nS¡mRŸlR�kRœjQšiQ˜hQ–gQ”fQ’eP�dP�cPŠbP‡`O…_O‚]O~[NzZNvWNrUMoTMmSMlRMiQLeOLJAIJ(h>!]KKfQOgQN_LKD>I\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À\À™iQ°tS¸yT¼{UÂYÎŒeï­ˆô´�Õ—u¶|\ Z'™LˆD
|>
-
-
&3#.$-% .% .& /&!,#,#@70A71XNHXNHWNHWNHZRLYQLYQLXQLWQLWPLUOLSNLQMKOLJMJJ0//.-.,,-&(+"(!'			
-%' %$#" ! !$


						



diff --git a/tk8.6/library/demos/items.tcl b/tk8.6/library/demos/items.tcl
deleted file mode 100644
index 000e4cb..0000000
--- a/tk8.6/library/demos/items.tcl
+++ /dev/null
@@ -1,291 +0,0 @@
-# items.tcl --
-#
-# This demonstration script creates a canvas that displays the
-# canvas item types.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .items
-catch {destroy $w}
-toplevel $w
-wm title $w "Canvas Item Demonstration"
-wm iconname $w "Items"
-positionWindow $w
-set c $w.frame.c
-
-label $w.msg -font $font -wraplength 5i -justify left -text "This window contains a canvas widget with examples of the various kinds of items supported by canvases.  The following operations are supported:\n  Button-1 drag:\tmoves item under pointer.\n  Button-2 drag:\trepositions view.\n  Button-3 drag:\tstrokes out area.\n  Ctrl+f:\t\tprints items under area."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-frame $w.frame
-pack $w.frame -side top -fill both -expand yes
-
-canvas $c -scrollregion {0c 0c 30c 24c} -width 15c -height 10c \
-	-relief sunken -borderwidth 2 \
-	-xscrollcommand "$w.frame.hscroll set" \
-	-yscrollcommand "$w.frame.vscroll set"
-ttk::scrollbar $w.frame.vscroll -command "$c yview"
-ttk::scrollbar $w.frame.hscroll -orient horiz -command "$c xview"
-
-grid $c -in $w.frame \
-    -row 0 -column 0 -rowspan 1 -columnspan 1 -sticky news
-grid $w.frame.vscroll \
-    -row 0 -column 1 -rowspan 1 -columnspan 1 -sticky news
-grid $w.frame.hscroll \
-    -row 1 -column 0 -rowspan 1 -columnspan 1 -sticky news
-grid rowconfig    $w.frame 0 -weight 1 -minsize 0
-grid columnconfig $w.frame 0 -weight 1 -minsize 0
-
-# Display a 3x3 rectangular grid.
-
-$c create rect 0c 0c 30c 24c -width 2
-$c create line 0c 8c 30c 8c -width 2
-$c create line 0c 16c 30c 16c -width 2
-$c create line 10c 0c 10c 24c -width 2
-$c create line 20c 0c 20c 24c -width 2
-
-set font1 {Helvetica 12}
-set font2 {Helvetica 24 bold}
-if {[winfo depth $c] > 1} {
-    set blue DeepSkyBlue3
-    set red red
-    set bisque bisque3
-    set green SeaGreen3
-} else {
-    set blue black
-    set red black
-    set bisque black
-    set green black
-}
-
-# Set up demos within each of the areas of the grid.
-
-$c create text 5c .2c -text Lines -anchor n
-$c create line 1c 1c 3c 1c 1c 4c 3c 4c -width 2m -fill $blue \
-	-cap butt -join miter -tags item
-$c create line 4.67c 1c 4.67c 4c -arrow last -tags item
-$c create line 6.33c 1c 6.33c 4c -arrow both -tags item
-$c create line 5c 6c 9c 6c 9c 1c 8c 1c 8c 4.8c 8.8c 4.8c 8.8c 1.2c \
-	8.2c 1.2c 8.2c 4.6c 8.6c 4.6c 8.6c 1.4c 8.4c 1.4c 8.4c 4.4c \
-	-width 3 -fill $red -tags item
-# Main widget program sets variable tk_demoDirectory
-$c create line 1c 5c 7c 5c 7c 7c 9c 7c -width .5c \
-	-stipple @[file join $tk_demoDirectory images gray25.xbm] \
-	-arrow both -arrowshape {15 15 7} -tags item
-$c create line 1c 7c 1.75c 5.8c 2.5c 7c 3.25c 5.8c 4c 7c -width .5c \
-	-cap round -join round -tags item
-
-$c create text 15c .2c -text "Curves (smoothed lines)" -anchor n
-$c create line 11c 4c 11.5c 1c 13.5c 1c 14c 4c -smooth on \
-	-fill $blue -tags item
-$c create line 15.5c 1c 19.5c 1.5c 15.5c 4.5c 19.5c 4c -smooth on \
-	-arrow both -width 3 -tags item
-$c create line 12c 6c 13.5c 4.5c 16.5c 7.5c 18c 6c \
-	16.5c 4.5c 13.5c 7.5c 12c 6c -smooth on -width 3m -cap round \
-	-stipple @[file join $tk_demoDirectory images gray25.xbm] \
-	-fill $red -tags item
-
-$c create text 25c .2c -text Polygons -anchor n
-$c create polygon 21c 1.0c 22.5c 1.75c 24c 1.0c 23.25c 2.5c \
-	24c 4.0c 22.5c 3.25c 21c 4.0c 21.75c 2.5c -fill $green \
-	-outline black -width 4 -tags item
-$c create polygon 25c 4c 25c 4c 25c 1c 26c 1c 27c 4c 28c 1c \
-	29c 1c 29c 4c 29c 4c -fill $red -smooth on -tags item
-$c create polygon 22c 4.5c 25c 4.5c 25c 6.75c 28c 6.75c \
-	28c 5.25c 24c 5.25c 24c 6.0c 26c 6c 26c 7.5c 22c 7.5c \
-	-stipple @[file join $tk_demoDirectory images gray25.xbm] \
-	-outline black -tags item
-
-$c create text 5c 8.2c -text Rectangles -anchor n
-$c create rectangle 1c 9.5c 4c 12.5c -outline $red -width 3m -tags item
-$c create rectangle 0.5c 13.5c 4.5c 15.5c -fill $green -tags item
-$c create rectangle 6c 10c 9c 15c -outline {} \
-	-stipple @[file join $tk_demoDirectory images gray25.xbm] \
-	-fill $blue -tags item
-
-$c create text 15c 8.2c -text Ovals -anchor n
-$c create oval 11c 9.5c 14c 12.5c -outline $red -width 3m -tags item
-$c create oval 10.5c 13.5c 14.5c 15.5c -fill $green -tags item
-$c create oval 16c 10c 19c 15c -outline {} \
-	-stipple @[file join $tk_demoDirectory images gray25.xbm] \
-	-fill $blue -tags item
-
-$c create text 25c 8.2c -text Text -anchor n
-$c create rectangle 22.4c 8.9c 22.6c 9.1c
-$c create text 22.5c 9c -anchor n -font $font1 -width 4c \
-	-text "A short string of text, word-wrapped, justified left, and anchored north (at the top).  The rectangles show the anchor points for each piece of text." -tags item
-$c create rectangle 25.4c 10.9c 25.6c 11.1c
-$c create text 25.5c 11c -anchor w -font $font1 -fill $blue \
-	-text "Several lines,\n each centered\nindividually,\nand all anchored\nat the left edge." \
-	-justify center -tags item
-$c create rectangle 24.9c 13.9c 25.1c 14.1c
-$c create text 25c 14c -font $font2 -anchor c -fill $red -angle 15 \
-	-text "Angled characters" -tags item
-
-$c create text 5c 16.2c -text Arcs -anchor n
-$c create arc 0.5c 17c 7c 20c -fill $green -outline black \
-	-start 45 -extent 270 -style pieslice -tags item
-$c create arc 6.5c 17c 9.5c 20c -width 4m -style arc \
-	-outline $blue -start -135 -extent 270 -tags item \
-	-outlinestipple @[file join $tk_demoDirectory images gray25.xbm]
-$c create arc 0.5c 20c 9.5c 24c -width 4m -style pieslice \
-	-fill {} -outline $red -start 225 -extent -90 -tags item
-$c create arc 5.5c 20.5c 9.5c 23.5c -width 4m -style chord \
-	-fill $blue -outline {} -start 45 -extent 270  -tags item
-
-image create photo items.ousterhout \
-    -file [file join $tk_demoDirectory images ouster.png]
-image create photo items.ousterhout.active -format "png -alpha 0.5" \
-    -file [file join $tk_demoDirectory images ouster.png]
-$c create text 15c 16.2c -text "Bitmaps and Images" -anchor n
-$c create image 13c 20c -tags item -image items.ousterhout \
-    -activeimage items.ousterhout.active
-$c create bitmap 17c 18.5c -tags item \
-	-bitmap @[file join $tk_demoDirectory images noletter.xbm]
-$c create bitmap 17c 21.5c -tags item \
-	-bitmap @[file join $tk_demoDirectory images letters.xbm]
-
-$c create text 25c 16.2c -text Windows -anchor n
-button $c.button -text "Press Me" -command "butPress $c $red"
-$c create window 21c 18c -window $c.button -anchor nw -tags item
-entry $c.entry -width 20 -relief sunken
-$c.entry insert end "Edit this text"
-$c create window 21c 21c -window $c.entry -anchor nw -tags item
-scale $c.scale -from 0 -to 100 -length 6c -sliderlength .4c \
-	-width .5c -tickinterval 0
-$c create window 28.5c 17.5c -window $c.scale -anchor n -tags item
-$c create text 21c 17.9c -text Button: -anchor sw
-$c create text 21c 20.9c -text Entry: -anchor sw
-$c create text 28.5c 17.4c -text Scale: -anchor s
-
-# Set up event bindings for canvas:
-
-$c bind item <Any-Enter> "itemEnter $c"
-$c bind item <Any-Leave> "itemLeave $c"
-bind $c <2> "$c scan mark %x %y"
-bind $c <B2-Motion> "$c scan dragto %x %y"
-bind $c <3> "itemMark $c %x %y"
-bind $c <B3-Motion> "itemStroke $c %x %y"
-bind $c <<NextChar>> "itemsUnderArea $c"
-bind $c <1> "itemStartDrag $c %x %y"
-bind $c <B1-Motion> "itemDrag $c %x %y"
-
-# Utility procedures for highlighting the item under the pointer:
-
-proc itemEnter {c} {
-    global restoreCmd
-
-    if {[winfo depth $c] == 1} {
-	set restoreCmd {}
-	return
-    }
-    set type [$c type current]
-    if {$type == "window" || $type == "image"} {
-	set restoreCmd {}
-	return
-    } elseif {$type == "bitmap"} {
-	set bg [lindex [$c itemconf current -background] 4]
-	set restoreCmd [list $c itemconfig current -background $bg]
-	$c itemconfig current -background SteelBlue2
-	return
-    } elseif {$type == "image"} {
-	set restoreCmd [list $c itemconfig current -state normal]
-	$c itemconfig current -state active
-	return
-    }
-    set fill [lindex [$c itemconfig current -fill] 4]
-    if {(($type == "rectangle") || ($type == "oval") || ($type == "arc"))
-	    && ($fill == "")} {
-	set outline [lindex [$c itemconfig current -outline] 4]
-	set restoreCmd "$c itemconfig current -outline $outline"
-	$c itemconfig current -outline SteelBlue2
-    } else {
-	set restoreCmd "$c itemconfig current -fill $fill"
-	$c itemconfig current -fill SteelBlue2
-    }
-}
-
-proc itemLeave {c} {
-    global restoreCmd
-
-    eval $restoreCmd
-}
-
-# Utility procedures for stroking out a rectangle and printing what's
-# underneath the rectangle's area.
-
-proc itemMark {c x y} {
-    global areaX1 areaY1
-    set areaX1 [$c canvasx $x]
-    set areaY1 [$c canvasy $y]
-    $c delete area
-}
-
-proc itemStroke {c x y} {
-    global areaX1 areaY1 areaX2 areaY2
-    set x [$c canvasx $x]
-    set y [$c canvasy $y]
-    if {($areaX1 != $x) && ($areaY1 != $y)} {
-	$c delete area
-	$c addtag area withtag [$c create rect $areaX1 $areaY1 $x $y \
-		-outline black]
-	set areaX2 $x
-	set areaY2 $y
-    }
-}
-
-proc itemsUnderArea {c} {
-    global areaX1 areaY1 areaX2 areaY2
-    set area [$c find withtag area]
-    set items ""
-    foreach i [$c find enclosed $areaX1 $areaY1 $areaX2 $areaY2] {
-	if {[lsearch [$c gettags $i] item] != -1} {
-	    lappend items $i
-	}
-    }
-    puts stdout "Items enclosed by area: $items"
-    set items ""
-    foreach i [$c find overlapping $areaX1 $areaY1 $areaX2 $areaY2] {
-	if {[lsearch [$c gettags $i] item] != -1} {
-	    lappend items $i
-	}
-    }
-    puts stdout "Items overlapping area: $items"
-}
-
-set areaX1 0
-set areaY1 0
-set areaX2 0
-set areaY2 0
-
-# Utility procedures to support dragging of items.
-
-proc itemStartDrag {c x y} {
-    global lastX lastY
-    set lastX [$c canvasx $x]
-    set lastY [$c canvasy $y]
-}
-
-proc itemDrag {c x y} {
-    global lastX lastY
-    set x [$c canvasx $x]
-    set y [$c canvasy $y]
-    $c move current [expr {$x-$lastX}] [expr {$y-$lastY}]
-    set lastX $x
-    set lastY $y
-}
-
-# Procedure that's invoked when the button embedded in the canvas
-# is invoked.
-
-proc butPress {w color} {
-    set i [$w create text 25c 18.1c -text "Oooohhh!!" -fill $color -anchor n]
-    after 500 "$w delete $i"
-}
diff --git a/tk8.6/library/demos/ixset b/tk8.6/library/demos/ixset
deleted file mode 100644
index 13235de..0000000
--- a/tk8.6/library/demos/ixset
+++ /dev/null
@@ -1,328 +0,0 @@
-#!/bin/sh
-# the next line restarts using wish \
-exec wish "$0" ${1+"$@"}
-
-# ixset --
-# A nice interface to "xset" to change X server settings
-#
-# History :
-#   91/11/23 : pda@masi.ibp.fr, jt@ratp.fr : design
-#   92/08/01 : pda@masi.ibp.fr : cleaning
-
-package require Tk
-
-#
-# Button actions
-#
-
-proc quit {} {
-    destroy .
-}
-
-proc ok {} {
-    writesettings
-    quit
-}
-
-proc cancel {} {
-    readsettings
-    dispsettings
-    .buttons.apply configure -state disabled
-    .buttons.cancel configure -state disabled
-}
-
-proc apply {} {
-    writesettings
-    .buttons.apply configure -state disabled
-    .buttons.cancel configure -state disabled
-}
-
-#
-# Read current settings
-#
-
-proc readsettings {} {
-    global kbdrep ;	set kbdrep	"on"
-    global kbdcli ;	set kbdcli	0
-    global bellvol ;	set bellvol	100
-    global bellpit ;	set bellpit	440
-    global belldur ;	set belldur	100
-    global mouseacc ;	set mouseacc	"3/1"
-    global mousethr ;	set mousethr	4
-    global screenbla ;	set screenbla	"blank"
-    global screentim ;	set screentim	600
-    global screencyc ;	set screencyc	600
-
-    set xfd [open "|xset q" r]
-    while {[gets $xfd line] > -1} {
-	switch -- [lindex $line 0] {
-	    auto {
-		set rpt [lindex $line 1]
-		if {$rpt eq "repeat:"} {
-		    set kbdrep [lindex $line 2]
-		    set kbdcli [lindex $line 6]
-		}
-	    }
-	    bell {
-		set bellvol [lindex $line 2]
-		set bellpit [lindex $line 5]
-		set belldur [lindex $line 8]
-	    }
-	    acceleration: {
-		set mouseacc [lindex $line 1]
-		set mousethr [lindex $line 3]
-	    }
-	    prefer {
-		set bla [lindex $line 2]
-		set screenbla [expr {$bla eq "yes" ? "blank" : "noblank"}]
-	    }
-	    timeout: {
-		set screentim [lindex $line 1]
-		set screencyc [lindex $line 3]
-	    }
-	}
-    }
-    close $xfd
-
-    # puts stdout [format "Key REPEAT = %s\n" $kbdrep]
-    # puts stdout [format "Key CLICK  = %s\n" $kbdcli]
-    # puts stdout [format "Bell VOLUME = %s\n" $bellvol]
-    # puts stdout [format "Bell PITCH = %s\n" $bellpit]
-    # puts stdout [format "Bell DURATION = %s\n" $belldur]
-    # puts stdout [format "Mouse ACCELERATION = %s\n" $mouseacc]
-    # puts stdout [format "Mouse THRESHOLD = %s\n" $mousethr]
-    # puts stdout [format "Screen BLANCK = %s\n" $screenbla]
-    # puts stdout [format "Screen TIMEOUT = %s\n" $screentim]
-    # puts stdout [format "Screen CYCLE = %s\n" $screencyc]
-}
-
-
-#
-# Write settings into the X server
-#
-
-proc writesettings {} {
-    global kbdrep kbdcli  bellvol bellpit belldur
-    global mouseacc mousethr  screenbla screentim screencyc
-
-    set bellvol		[.bell.vol get]
-    set bellpit		[.bell.val.pit.entry get]
-    set belldur		[.bell.val.dur.entry get]
-
-    if {$kbdrep eq "on"} {
-	set kbdcli	[.kbd.val.cli get]
-    } else {
-	set kbdcli	"off"
-    }
-
-    set mouseacc	[.mouse.hor.acc.entry get]
-    set mousethr	[.mouse.hor.thr.entry get]
-
-    set screentim	[.screen.tim.entry get]
-    set screencyc	[.screen.cyc.entry get]
-
-    exec xset \
-	b $bellvol $bellpit $belldur \
-	c $kbdcli \
-	r $kbdrep \
-	m $mouseacc $mousethr \
-	s $screentim $screencyc \
-	s $screenbla
-}
-
-
-#
-# Sends all settings to the window
-#
-
-proc dispsettings {} {
-    global kbdrep kbdcli  bellvol bellpit belldur
-    global mouseacc mousethr  screenbla screentim screencyc
-
-    .bell.vol set $bellvol
-    .bell.val.pit.entry delete 0 end
-    .bell.val.pit.entry insert 0 $bellpit
-    .bell.val.dur.entry delete 0 end
-    .bell.val.dur.entry insert 0 $belldur
-
-    .kbd.val.onoff [expr {$kbdrep eq "on" ? "select" : "deselect"}]
-    .kbd.val.cli set $kbdcli
-
-    .mouse.hor.acc.entry delete 0 end
-    .mouse.hor.acc.entry insert 0 $mouseacc
-    .mouse.hor.thr.entry delete 0 end
-    .mouse.hor.thr.entry insert 0 $mousethr
-
-    .screen.blank [expr {$screenbla eq "blank" ? "select" : "deselect"}]
-    .screen.pat   [expr {$screenbla ne "blank" ? "select" : "deselect"}]
-    .screen.tim.entry delete 0 end
-    .screen.tim.entry insert 0 $screentim
-    .screen.cyc.entry delete 0 end
-    .screen.cyc.entry insert 0 $screencyc
-}
-
-
-#
-# Create all windows, and pack them
-#
-
-proc labelentry {path text length {range {}}} {
-    frame $path
-    label $path.label -text $text
-    if {[llength $range]} {
-	spinbox $path.entry -width $length -relief sunken \
-		-from [lindex $range 0] -to [lindex $range 1]
-    } else {
-	entry $path.entry -width $length -relief sunken
-    }
-    pack $path.label -side left
-    pack $path.entry -side right -expand y -fill x
-}
-
-proc createwindows {} {
-    #
-    # Buttons
-    #
-
-    frame .buttons
-    button .buttons.ok	   -default active -command ok     -text "Ok"
-    button .buttons.apply  -default normal -command apply  -text "Apply" \
-	    -state disabled
-    button .buttons.cancel -default normal -command cancel -text "Cancel" \
-	    -state disabled
-    button .buttons.quit   -default normal -command quit   -text "Quit"
-
-    pack .buttons.ok .buttons.apply .buttons.cancel .buttons.quit \
-	    -side left -expand yes -pady 5
-
-    bind . <Return> {.buttons.ok   flash; .buttons.ok   invoke}
-    bind . <Escape> {.buttons.quit flash; .buttons.quit invoke}
-    bind . <1> {
-	if {![string match .buttons* %W]} {
-	    .buttons.apply  configure -state normal
-	    .buttons.cancel configure -state normal
-	}
-    }
-    bind . <Key> {
-	if {![string match .buttons* %W]} {
-	    switch -glob %K {
-		Return - Escape - Tab - *Shift* {}
-		default {
-		    .buttons.apply  configure -state normal
-		    .buttons.cancel configure -state normal
-		}
-	    }
-	}
-    }
-
-    #
-    # Bell settings
-    #
-
-    labelframe .bell -text "Bell Settings" -padx 1.5m -pady 1.5m
-    scale .bell.vol \
-	    -from 0 -to 100 -length 200 -tickinterval 20 \
-	    -label "Volume (%)" -orient horizontal
-
-    frame .bell.val
-    labelentry .bell.val.pit "Pitch (Hz)"    6 {25 20000}
-    labelentry .bell.val.dur "Duration (ms)" 6 {1 10000}
-    pack .bell.val.pit -side left -padx 5
-    pack .bell.val.dur -side right -padx 5
-    pack .bell.vol .bell.val -side top -expand yes
-
-    #
-    # Keyboard settings
-    #
-
-    labelframe .kbd -text "Keyboard Repeat Settings" -padx 1.5m -pady 1.5m
-
-    frame .kbd.val
-    checkbutton .kbd.val.onoff \
-	    -text "On" \
-	    -onvalue "on" -offvalue "off" -variable kbdrep \
-	    -relief flat
-    scale .kbd.val.cli \
-	    -from 0 -to 100 -length 200 -tickinterval 20 \
-	    -label "Click Volume (%)" -orient horizontal
-    pack .kbd.val.onoff -side left -fill x -expand yes -padx {0 1m}
-    pack .kbd.val.cli -side left -expand yes -fill x -padx {1m 0}
-
-    pack .kbd.val -side top -expand yes -pady 2 -fill x
-
-    #
-    # Mouse settings
-    #
-
-    labelframe .mouse -text "Mouse Settings" -padx 1.5m -pady 1.5m
-
-    frame .mouse.hor
-    labelentry .mouse.hor.acc "Acceleration" 5
-    labelentry .mouse.hor.thr "Threshold (pixels)" 3 {1 2000}
-
-    pack .mouse.hor.acc -side left -padx {0 1m}
-    pack .mouse.hor.thr -side right -padx {1m 0}
-
-    pack .mouse.hor -side top -expand yes
-
-    #
-    # Screen Saver settings
-    #
-
-    labelframe .screen -text "Screen-saver Settings" -padx 1.5m -pady 1.5m
-
-    radiobutton .screen.blank \
-	    -variable screenblank -text "Blank" -relief flat \
-	    -value "blank" -variable screenbla -anchor w
-    radiobutton .screen.pat \
-	    -variable screenblank -text "Pattern" -relief flat \
-	    -value "noblank" -variable screenbla -anchor w
-    labelentry .screen.tim "Timeout (s)" 5 {1 100000}
-    labelentry .screen.cyc "Cycle (s)" 5 {1 100000}
-
-    grid .screen.blank .screen.tim -sticky e
-    grid .screen.pat   .screen.cyc -sticky e
-    grid configure .screen.blank .screen.pat -sticky ew
-
-    #
-    # Main window
-    #
-
-    pack .buttons -side top -fill both
-    pack .bell .kbd .mouse .screen -side top -fill both -expand yes \
-	    -padx 1m -pady 1m
-
-    #
-    # Let the user resize our window
-    #
-    wm minsize . 10 10
-}
-
-##############################################################################
-# Main program
-
-#
-# Listen what "xset" tells us...
-#
-
-readsettings
-
-#
-# Create all windows
-#
-
-createwindows
-
-#
-# Write xset parameters
-#
-
-dispsettings
-
-#
-# Now, wait for user actions...
-#
-
-# Local Variables:
-# mode: tcl
-# End:
diff --git a/tk8.6/library/demos/knightstour.tcl b/tk8.6/library/demos/knightstour.tcl
deleted file mode 100644
index 6113db2..0000000
--- a/tk8.6/library/demos/knightstour.tcl
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright (C) 2008 Pat Thoyts <patthoyts@users.sourceforge.net>
-#
-#	Calculate a Knight's tour of a chessboard.
-#
-#	This uses Warnsdorff's rule to calculate the next square each
-#	time. This specifies that the next square should be the one that
-#	has the least number of available moves.
-#
-#	Using this rule it is possible to get to a position where
-#	there are no squares available to move into. In this implementation
-#	this occurs when the starting square is d6.
-#
-#	To solve this fault an enhancement to the rule is that if we
-#	have a choice of squares with an equal score, we should choose
-#	the one nearest the edge of the board.
-#
-#	If the call to the Edgemost function is commented out you can see
-#	this occur.
-#
-#	You can drag the knight to a specific square to start if you wish.
-#	If you let it repeat then it will choose random start positions
-#	for each new tour.
-
-package require Tk 8.5
-
-# Return a list of accessible squares from a given square
-proc ValidMoves {square} {
-    set moves {}
-    foreach pair {{-1 -2} {-2 -1} {-2 1} {-1 2} {1 2} {2 1} {2 -1} {1 -2}} {
-        set col [expr {($square % 8) + [lindex $pair 0]}]
-        set row [expr {($square / 8) + [lindex $pair 1]}]
-        if {$row > -1 && $row < 8 && $col > -1 && $col < 8} {
-            lappend moves [expr {$row * 8 + $col}]
-        }
-    }
-    return $moves
-}
-
-# Return the number of available moves for this square
-proc CheckSquare {square} {
-    variable visited
-    set moves 0
-    foreach test [ValidMoves $square] {
-        if {[lsearch -exact -integer $visited $test] == -1} {
-            incr moves
-        }
-    }
-    return $moves
-}
-
-# Select the next square to move to. Returns -1 if there are no available
-# squares remaining that we can move to.
-proc Next {square} {
-    variable visited
-    set minimum 9
-    set nextSquare -1
-    foreach testSquare [ValidMoves $square] {
-        if {[lsearch -exact -integer $visited $testSquare] == -1} {
-            set count [CheckSquare $testSquare]
-            if {$count < $minimum} {
-                set minimum $count
-                set nextSquare $testSquare
-            } elseif {$count == $minimum} {
-                # to remove the enhancement to Warnsdorff's rule
-                # remove the next line:
-                set nextSquare [Edgemost $nextSquare $testSquare]
-            }
-        }
-    }
-    return $nextSquare
-}
-
-# Select the square nearest the edge of the board
-proc Edgemost {a b} {
-    set colA [expr {3-int(abs(3.5-($a%8)))}]
-    set colB [expr {3-int(abs(3.5-($b%8)))}]
-    set rowA [expr {3-int(abs(3.5-($a/8)))}]
-    set rowB [expr {3-int(abs(3.5-($b/8)))}]
-    return [expr {($colA * $rowA) < ($colB * $rowB) ? $a : $b}]
-}
-
-# Display a square number as a standard chess square notation.
-proc N {square} {
-    return [format %c%d [expr {97 + $square % 8}] \
-                [expr {$square / 8 + 1}]]
-}
-
-# Perform a Knight's move and schedule the next move.
-proc MovePiece {dlg last square} {
-    variable visited
-    variable delay
-    variable continuous
-    $dlg.f.txt insert end "[llength $visited]. [N $last] .. [N $square]\n" {}
-    $dlg.f.txt see end
-    $dlg.f.c itemconfigure [expr {1+$last}] -state normal -outline black
-    $dlg.f.c itemconfigure [expr {1+$square}] -state normal -outline red
-    $dlg.f.c moveto knight {*}[lrange [$dlg.f.c coords [expr {1+$square}]] 0 1]
-    lappend visited $square
-    set next [Next $square]
-    if {$next ne -1} {
-        variable aid [after $delay [list MovePiece $dlg $square $next]]
-    } else {
-        $dlg.tf.b1 configure -state normal
-        if {[llength $visited] == 64} {
-            variable initial
-            if {$initial == $square} {
-                $dlg.f.txt insert end "Closed tour!"
-            } else {
-                $dlg.f.txt insert end "Success\n" {}
-                if {$continuous} {
-                    after [expr {$delay * 2}] [namespace code \
-                        [list Tour $dlg [expr {int(rand() * 64)}]]]
-                }
-            }
-        } else {
-            $dlg.f.txt insert end "FAILED!\n" {}
-        }
-    }
-}
-
-# Begin a new tour of the board given a random start position
-proc Tour {dlg {square {}}} {
-    variable visited {}
-    $dlg.f.txt delete 1.0 end
-    $dlg.tf.b1 configure -state disabled
-    for {set n 0} {$n < 64} {incr n} {
-        $dlg.f.c itemconfigure $n -state disabled -outline black
-    }
-    if {$square eq {}} {
-        set coords [lrange [$dlg.f.c coords knight] 0 1]
-        set square [expr {[$dlg.f.c find closest {*}$coords 0 65]-1}]
-    }
-    variable initial $square
-    after idle [list MovePiece $dlg $initial $initial]
-}
-
-proc Stop {} {
-    variable aid
-    catch {after cancel $aid}
-}
-
-proc Exit {dlg} {
-    Stop
-    destroy $dlg
-}
-
-proc SetDelay {new} {
-    variable delay [expr {int($new)}]
-}
-
-proc DragStart {w x y} {
-    $w dtag selected
-    $w addtag selected withtag current
-    variable dragging [list $x $y]
-}
-proc DragMotion {w x y} {
-    variable dragging
-    if {[info exists dragging]} {
-        $w move selected [expr {$x - [lindex $dragging 0]}] \
-            [expr {$y - [lindex $dragging 1]}]
-        variable dragging [list $x $y]
-    }
-}
-proc DragEnd {w x y} {
-    set square [$w find closest $x $y 0 65]
-    $w moveto selected {*}[lrange [$w coords $square] 0 1]
-    $w dtag selected
-    variable dragging ; unset dragging
-}
-
-proc CreateGUI {} {
-    catch {destroy .knightstour}
-    set dlg [toplevel .knightstour]
-    wm title $dlg "Knights tour"
-    wm withdraw $dlg
-    set f [ttk::frame $dlg.f]
-    set c [canvas $f.c -width 240 -height 240]
-    text $f.txt -width 10 -height 1 -background white \
-        -yscrollcommand [list $f.vs set] -font {Arial 8}
-    ttk::scrollbar $f.vs -command [list $f.txt yview]
-
-    variable delay 600
-    variable continuous 0
-    ttk::frame $dlg.tf
-    ttk::label $dlg.tf.ls -text Speed
-    ttk::scale $dlg.tf.sc  -from 8 -to 2000 -command [list SetDelay] \
-        -variable [namespace which -variable delay]
-    ttk::checkbutton $dlg.tf.cc -text Repeat \
-        -variable [namespace which -variable continuous]
-    ttk::button $dlg.tf.b1 -text Start -command [list Tour $dlg]
-    ttk::button $dlg.tf.b2 -text Exit -command [list Exit $dlg]
-    set square 0
-    for {set row 7} {$row != -1} {incr row -1} {
-        for {set col 0} {$col < 8} {incr col} {
-            if {(($col & 1) ^ ($row & 1))} {
-                set fill tan3 ; set dfill tan4
-            } else {
-                set fill bisque ; set dfill bisque3
-            }
-            set coords [list [expr {$col * 30 + 4}] [expr {$row * 30 + 4}] \
-                            [expr {$col * 30 + 30}] [expr {$row * 30 + 30}]]
-            $c create rectangle $coords -fill $fill -disabledfill $dfill \
-                -width 2 -state disabled
-        }
-    }
-    if {[tk windowingsystem] ne "x11"} {
-        catch {eval font create KnightFont -size -24}
-        $c create text 0 0 -font KnightFont -text "\u265e" \
-            -anchor nw -tags knight -fill black -activefill "#600000"
-    } else {
-        # On X11 we cannot reliably tell if the \u265e glyph is available
-        # so just use a polygon
-        set pts {
-            2 25   24 25  21 19   20 8   14 0   10 0   0 13   0 16
-            2 17    4 14   5 15    3 17   5 17   9 14  10 15  5 21
-        }
-        $c create polygon $pts -tag knight -offset 8 \
-            -fill black -activefill "#600000"
-    }
-    $c moveto knight {*}[lrange [$c coords [expr {1 + int(rand() * 64)}]] 0 1]
-    $c bind knight <ButtonPress-1> [namespace code [list DragStart %W %x %y]]
-    $c bind knight <Motion> [namespace code [list DragMotion %W %x %y]]
-    $c bind knight <ButtonRelease-1> [namespace code [list DragEnd %W %x %y]]
-
-    grid $c $f.txt $f.vs  -sticky news
-    grid rowconfigure    $f 0 -weight 1
-    grid columnconfigure $f 1 -weight 1
-
-    grid $f - - - - - -sticky news
-    set things [list $dlg.tf.ls $dlg.tf.sc $dlg.tf.cc $dlg.tf.b1]
-    if {![info exists ::widgetDemo]} {
-	lappend things $dlg.tf.b2
-	if {[tk windowingsystem] ne "aqua"} {
-	    set things [linsert $things 0 [ttk::sizegrip $dlg.tf.sg]]
-	}
-    }
-    pack {*}$things -side right
-    if {[tk windowingsystem] eq "aqua"} {
-	pack configure {*}$things -padx {4 4} -pady {12 12}
-	pack configure [lindex $things 0] -padx {4 24}
-	pack configure [lindex $things end] -padx {16 4}
-    }
-    grid $dlg.tf  - - - - - -sticky ew
-    if {[info exists ::widgetDemo]} {
-        grid [addSeeDismiss $dlg.buttons $dlg] - - - - - -sticky ew
-    }
-
-    grid rowconfigure $dlg 0 -weight 1
-    grid columnconfigure $dlg 0 -weight 1
-
-    bind $dlg <Control-F2> {console show}
-    bind $dlg <Return> [list $dlg.tf.b1 invoke]
-    bind $dlg <Escape> [list $dlg.tf.b2 invoke]
-    bind $dlg <Destroy> [namespace code [list Stop]]
-    wm protocol $dlg WM_DELETE_WINDOW [namespace code [list Exit $dlg]]
-
-    wm deiconify $dlg
-    tkwait window $dlg
-}
-
-if {![winfo exists .knightstour]} {
-    if {![info exists widgetDemo]} { wm withdraw . }
-    set r [catch [linsert $argv 0 CreateGUI] err]
-    if {$r} {
-	tk_messageBox -icon error -title "Error" -message $err
-    }
-    if {![info exists widgetDemo]} { exit $r }
-}
diff --git a/tk8.6/library/demos/label.tcl b/tk8.6/library/demos/label.tcl
deleted file mode 100644
index 13463f7..0000000
--- a/tk8.6/library/demos/label.tcl
+++ /dev/null
@@ -1,40 +0,0 @@
-# label.tcl --
-#
-# This demonstration script creates a toplevel window containing
-# several label widgets.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .label
-catch {destroy $w}
-toplevel $w
-wm title $w "Label Demonstration"
-wm iconname $w "label"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "Five labels are displayed below: three textual ones on the left, and an image label and a text label on the right.  Labels are pretty boring because you can't do anything with them."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-frame $w.left
-frame $w.right
-pack $w.left $w.right -side left -expand yes -padx 10 -pady 10 -fill both
-
-label $w.left.l1 -text "First label"
-label $w.left.l2 -text "Second label, raised" -relief raised
-label $w.left.l3 -text "Third label, sunken" -relief sunken
-pack $w.left.l1 $w.left.l2 $w.left.l3 -side top -expand yes -pady 2 -anchor w
-
-# Main widget program sets variable tk_demoDirectory
-image create photo label.ousterhout \
-    -file [file join $tk_demoDirectory images ouster.png]
-label $w.right.picture -borderwidth 2 -relief sunken -image label.ousterhout
-label $w.right.caption -text "Tcl/Tk Creator"
-pack $w.right.picture $w.right.caption -side top
diff --git a/tk8.6/library/demos/labelframe.tcl b/tk8.6/library/demos/labelframe.tcl
deleted file mode 100644
index 21d079f..0000000
--- a/tk8.6/library/demos/labelframe.tcl
+++ /dev/null
@@ -1,76 +0,0 @@
-# labelframe.tcl --
-#
-# This demonstration script creates a toplevel window containing
-# several labelframe widgets.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .labelframe
-catch {destroy $w}
-toplevel $w
-wm title $w "Labelframe Demonstration"
-wm iconname $w "labelframe"
-positionWindow $w
-
-# Some information
-
-label $w.msg -font $font -wraplength 4i -justify left -text "Labelframes are\
-	used to group related widgets together.  The label may be either \
-	plain text or another widget."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-# Demo area
-
-frame $w.f
-pack $w.f -side bottom -fill both -expand 1
-set w $w.f
-
-# A group of radiobuttons in a labelframe
-
-labelframe $w.f -text "Value" -padx 2 -pady 2
-grid $w.f -row 0 -column 0 -pady 2m -padx 2m
-
-foreach value {1 2 3 4} {
-    radiobutton $w.f.b$value -text "This is value $value" \
-            -variable lfdummy -value $value
-    pack $w.f.b$value -side top -fill x -pady 2
-}
-
-
-# Using a label window to control a group of options.
-
-proc lfEnableButtons {w} {
-    foreach child [winfo children $w] {
-        if {$child == "$w.cb"} continue
-        if {$::lfdummy2} {
-            $child configure -state normal
-        } else {
-            $child configure -state disabled
-        }
-    }
-}
-
-labelframe $w.f2 -pady 2 -padx 2
-checkbutton $w.f2.cb -text "Use this option." -variable lfdummy2 \
-        -command "lfEnableButtons $w.f2" -padx 0
-$w.f2 configure -labelwidget $w.f2.cb
-grid $w.f2 -row 0 -column 1 -pady 2m -padx 2m
-
-set t 0
-foreach str {Option1 Option2 Option3} {
-    checkbutton $w.f2.b$t -text $str
-    pack $w.f2.b$t -side top -fill x -pady 2
-    incr t
-}
-lfEnableButtons $w.f2
-
-
-grid columnconfigure $w {0 1} -weight 1
diff --git a/tk8.6/library/demos/mclist.tcl b/tk8.6/library/demos/mclist.tcl
deleted file mode 100644
index 7a4dd4c..0000000
--- a/tk8.6/library/demos/mclist.tcl
+++ /dev/null
@@ -1,119 +0,0 @@
-# mclist.tcl --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# tree widget configured as a multi-column listbox.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .mclist
-catch {destroy $w}
-toplevel $w
-wm title $w "Multi-Column List"
-wm iconname $w "mclist"
-positionWindow $w
-
-## Explanatory text
-ttk::label $w.msg -font $font -wraplength 4i -justify left -anchor n -padding {10 2 10 6} -text "Ttk is the new Tk themed widget set. One of the widgets it includes is a tree widget, which can be configured to display multiple columns of informational data without displaying the tree itself. This is a simple way to build a listbox that has multiple columns. Clicking on the heading for a column will sort the data by that column. You can also change the width of the columns by dragging the boundary between them."
-pack $w.msg -fill x
-
-## See Code / Dismiss
-pack [addSeeDismiss $w.seeDismiss $w] -side bottom -fill x
-
-ttk::frame $w.container
-ttk::treeview $w.tree -columns {country capital currency} -show headings \
-    -yscroll "$w.vsb set" -xscroll "$w.hsb set"
-ttk::scrollbar $w.vsb -orient vertical -command "$w.tree yview"
-ttk::scrollbar $w.hsb -orient horizontal -command "$w.tree xview"
-pack $w.container -fill both -expand 1
-grid $w.tree $w.vsb -in $w.container -sticky nsew
-grid $w.hsb         -in $w.container -sticky nsew
-grid column $w.container 0 -weight 1
-grid row    $w.container 0 -weight 1
-
-image create photo upArrow -data {
-    R0lGODlhDgAOAJEAANnZ2YCAgPz8/P///yH5BAEAAAAALAAAAAAOAA4AAAImhI+
-    py+1LIsJHiBAh+BgmiEAJQITgW6DgUQIAECH4JN8IPqYuNxUAOw==}
-image create photo downArrow -data {
-    R0lGODlhDgAOAJEAANnZ2YCAgPz8/P///yH5BAEAAAAALAAAAAAOAA4AAAInhI+
-    py+1I4ocQ/IgDEYIPgYJICUCE4F+YIBolEoKPEJKZmVJK6ZACADs=}
-image create photo noArrow -height 14 -width 14
-
-## The data we're going to insert
-set data {
-    Argentina		{Buenos Aires}		ARS
-    Australia		Canberra		AUD
-    Brazil		Brazilia		BRL
-    Canada		Ottawa			CAD
-    China		Beijing			CNY
-    France		Paris			EUR
-    Germany		Berlin			EUR
-    India		{New Delhi}		INR
-    Italy		Rome			EUR
-    Japan		Tokyo			JPY
-    Mexico		{Mexico City}		MXN
-    Russia		Moscow			RUB
-    {South Africa}	Pretoria		ZAR
-    {United Kingdom}	London			GBP
-    {United States}	{Washington, D.C.}	USD
-}
-
-## Code to insert the data nicely
-set font [ttk::style lookup Heading -font]
-foreach col {country capital currency} name {Country Capital Currency} {
-    $w.tree heading $col -text $name -image noArrow -anchor w \
-	-command [list SortBy $w.tree $col 0]
-    $w.tree column $col -width [expr {
-	[font measure $font $name] + [image width noArrow] + 5
-    }]
-}
-set font [ttk::style lookup Treeview -font]
-foreach {country capital currency} $data {
-    $w.tree insert {} end -values [list $country $capital $currency]
-    foreach col {country capital currency} {
-	set len [font measure $font "[set $col]  "]
-	if {[$w.tree column $col -width] < $len} {
-	    $w.tree column $col -width $len
-	}
-    }
-}
-
-## Code to do the sorting of the tree contents when clicked on
-proc SortBy {tree col direction} {
-    # Determine currently sorted column and its sort direction
-    foreach c {country capital currency} {
-	set s [$tree heading $c state]
-	if {("selected" in $s || "alternate" in $s) && $col ne $c} {
-	    # Sorted column has changed
-	    $tree heading $c -image noArrow state {!selected !alternate !user1}
-	    set direction [expr {"alternate" in $s}]
-	}
-    }
-
-    # Build something we can sort
-    set data {}
-    foreach row [$tree children {}] {
-	lappend data [list [$tree set $row $col] $row]
-    }
-
-    set dir [expr {$direction ? "-decreasing" : "-increasing"}]
-    set r -1
-
-    # Now reshuffle the rows into the sorted order
-    foreach info [lsort -dictionary -index 0 $dir $data] {
-	$tree move [lindex $info 1] {} [incr r]
-    }
-
-    # Switch the heading so that it will sort in the opposite direction
-    $tree heading $col -command [list SortBy $tree $col [expr {!$direction}]] \
-	state [expr {$direction?"!selected alternate":"selected !alternate"}]
-    if {[ttk::style theme use] eq "aqua"} {
-	# Aqua theme displays native sort arrows when user1 state is set
-	$tree heading $col state "user1"
-    } else {
-	$tree heading $col -image [expr {$direction?"upArrow":"downArrow"}]
-    }
-}
diff --git a/tk8.6/library/demos/menu.tcl b/tk8.6/library/demos/menu.tcl
deleted file mode 100644
index e32b54f..0000000
--- a/tk8.6/library/demos/menu.tcl
+++ /dev/null
@@ -1,161 +0,0 @@
-# menu.tcl --
-#
-# This demonstration script creates a window with a bunch of menus
-# and cascaded menus using menubars.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .menu
-catch {destroy $w}
-toplevel $w
-wm title $w "Menu Demonstration"
-wm iconname $w "menu"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left
-if {[tk windowingsystem] eq "aqua"} {
-    catch {set origUseCustomMDEF $::tk::mac::useCustomMDEF; set ::tk::mac::useCustomMDEF 1}
-    $w.msg configure -text "This window has a menubar with cascaded menus.  You can invoke entries with an accelerator by typing Command+x, where \"x\" is the character next to the command key symbol. The rightmost menu can be torn off into a palette by selecting the first item in the menu."
-} else {
-    $w.msg configure -text "This window contains a menubar with cascaded menus.  You can post a menu from the keyboard by typing Alt+x, where \"x\" is the character underlined on the menu.  You can then traverse among the menus using the arrow keys.  When a menu is posted, you can invoke the current entry by typing space, or you can invoke any entry by typing its underlined character.  If a menu entry has an accelerator, you can invoke the entry without posting the menu just by typing the accelerator. The rightmost menu can be torn off into a palette by selecting the first item in the menu."
-}
-pack $w.msg -side top
-
-set menustatus "    "
-frame $w.statusBar
-label $w.statusBar.label -textvariable menustatus -relief sunken -bd 1 -font "Helvetica 10" -anchor w
-pack $w.statusBar.label -side left -padx 2 -expand yes -fill both
-pack $w.statusBar -side bottom -fill x -pady 2
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-menu $w.menu -tearoff 0
-
-set m $w.menu.file
-menu $m -tearoff 0
-$w.menu add cascade -label "File" -menu $m -underline 0
-$m add command -label "Open..." -command {error "this is just a demo: no action has been defined for the \"Open...\" entry"}
-$m add command -label "New" -command {error "this is just a demo: no action has been defined for the \"New\" entry"}
-$m add command -label "Save" -command {error "this is just a demo: no action has been defined for the \"Save\" entry"}
-$m add command -label "Save As..." -command {error "this is just a demo: no action has been defined for the \"Save As...\" entry"}
-$m add separator
-$m add command -label "Print Setup..." -command {error "this is just a demo: no action has been defined for the \"Print Setup...\" entry"}
-$m add command -label "Print..." -command {error "this is just a demo: no action has been defined for the \"Print...\" entry"}
-$m add separator
-$m add command -label "Dismiss Menus Demo" -command "destroy $w"
-
-set m $w.menu.basic
-$w.menu add cascade -label "Basic" -menu $m -underline 0
-menu $m -tearoff 0
-$m add command -label "Long entry that does nothing"
-if {[tk windowingsystem] eq "aqua"} {
-    set modifier Command
-} elseif {[tk windowingsystem] == "win32"} {
-    set modifier Control
-} else {
-    set modifier Meta
-}
-foreach i {A B C D E F} {
-    $m add command -label "Print letter \"$i\"" -underline 14 \
-	    -accelerator Meta+$i -command "puts $i" -accelerator $modifier+$i
-    bind $w <$modifier-[string tolower $i]> "puts $i"
-}
-
-set m $w.menu.cascade
-$w.menu add cascade -label "Cascades" -menu $m -underline 0
-menu $m -tearoff 0
-$m add command -label "Print hello" \
-	-command {puts stdout "Hello"} -accelerator $modifier+H -underline 6
-bind $w <$modifier-h> {puts stdout "Hello"}
-$m add command -label "Print goodbye" -command {\
-    puts stdout "Goodbye"} -accelerator $modifier+G -underline 6
-bind $w <$modifier-g> {puts stdout "Goodbye"}
-$m add cascade -label "Check buttons" \
-	-menu $w.menu.cascade.check -underline 0
-$m add cascade -label "Radio buttons" \
-	-menu $w.menu.cascade.radio -underline 0
-
-set m $w.menu.cascade.check
-menu $m -tearoff 0
-$m add check -label "Oil checked" -variable oil
-$m add check -label "Transmission checked" -variable trans
-$m add check -label "Brakes checked" -variable brakes
-$m add check -label "Lights checked" -variable lights
-$m add separator
-$m add command -label "Show current values" \
-    -command "showVars $w.menu.cascade.dialog oil trans brakes lights"
-$m invoke 1
-$m invoke 3
-
-set m $w.menu.cascade.radio
-menu $m -tearoff 0
-$m add radio -label "10 point" -variable pointSize -value 10
-$m add radio -label "14 point" -variable pointSize -value 14
-$m add radio -label "18 point" -variable pointSize -value 18
-$m add radio -label "24 point" -variable pointSize -value 24
-$m add radio -label "32 point" -variable pointSize -value 32
-$m add sep
-$m add radio -label "Roman" -variable style -value roman
-$m add radio -label "Bold" -variable style -value bold
-$m add radio -label "Italic" -variable style -value italic
-$m add sep
-$m add command -label "Show current values" \
-	-command "showVars $w.menu.cascade.dialog pointSize style"
-$m invoke 1
-$m invoke 7
-
-set m $w.menu.icon
-$w.menu add cascade -label "Icons" -menu $m -underline 0
-menu $m -tearoff 0
-# Main widget program sets variable tk_demoDirectory
-$m add command -bitmap @[file join $tk_demoDirectory images pattern.xbm] \
-    -hidemargin 1 -command [list \
-	tk_dialog $w.pattern {Bitmap Menu Entry} \
-		"The menu entry you invoked displays a bitmap rather than\
-		a text string.  Other than this, it is just like any other\
-		menu entry." {} 0 OK ]
-foreach i {info questhead error} {
-    $m add command -bitmap $i -hidemargin 1 -command [list \
-	    puts "You invoked the $i bitmap" ]
-}
-$m entryconfigure 2 -columnbreak 1
-
-set m $w.menu.more
-$w.menu add cascade -label "More" -menu $m -underline 0
-menu $m -tearoff 0
-foreach i {{An entry} {Another entry} {Does nothing} {Does almost nothing} {Make life meaningful}} {
-    $m add command -label $i -command [list puts "You invoked \"$i\""]
-}
-$m entryconfigure "Does almost nothing" -bitmap questhead -compound left \
-	-command [list \
-	tk_dialog $w.compound {Compound Menu Entry} \
-		"The menu entry you invoked displays both a bitmap and a\
-		text string.  Other than this, it is just like any other\
-		menu entry." {} 0 OK ]
-
-set m $w.menu.colors
-$w.menu add cascade -label "Colors" -menu $m -underline 1
-menu $m -tearoff 1
-foreach i {red orange yellow green blue} {
-    $m add command -label $i -background $i -command [list \
-	    puts "You invoked \"$i\"" ]
-}
-
-$w configure -menu $w.menu
-
-bind Menu <<MenuSelect>> {
-    global $menustatus
-    if {[catch {%W entrycget active -label} label]} {
-	set label "    "
-    }
-    set menustatus $label
-    update idletasks
-}
-
-if {[tk windowingsystem] eq "aqua"} {catch {set ::tk::mac::useCustomMDEF $origUseCustomMDEF}}
diff --git a/tk8.6/library/demos/menubu.tcl b/tk8.6/library/demos/menubu.tcl
deleted file mode 100644
index 96e3b15..0000000
--- a/tk8.6/library/demos/menubu.tcl
+++ /dev/null
@@ -1,90 +0,0 @@
-# menubu.tcl --
-#
-# This demonstration script creates a window with a bunch of menus
-# and cascaded menus using menubuttons.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .menubu
-catch {destroy $w}
-toplevel $w
-wm title $w "Menu Button Demonstration"
-wm iconname $w "menubutton"
-positionWindow $w
-
-frame $w.body
-pack $w.body -expand 1 -fill both
-if {[tk windowingsystem] eq "aqua"} {catch {set origUseCustomMDEF $::tk::mac::useCustomMDEF; set ::tk::mac::useCustomMDEF 1}}
-
-menubutton $w.body.below -text "Below" -underline 0 -direction below -menu $w.body.below.m -relief raised
-menu $w.body.below.m -tearoff 0
-$w.body.below.m add command -label "Below menu: first item" -command "puts \"You have selected the first item from the Below menu.\""
-$w.body.below.m add command -label "Below menu: second item" -command "puts \"You have selected the second item from the Below menu.\""
-grid $w.body.below -row 0 -column 1 -sticky n
-menubutton $w.body.right -text "Right" -underline 0 -direction right -menu $w.body.right.m -relief raised
-menu $w.body.right.m -tearoff 0
-$w.body.right.m add command -label "Right menu: first item" -command "puts \"You have selected the first item from the Right menu.\""
-$w.body.right.m add command -label "Right menu: second item" -command "puts \"You have selected the second item from the Right menu.\""
-frame $w.body.center
-menubutton $w.body.left -text "Left" -underline 0 -direction left -menu $w.body.left.m -relief raised
-menu $w.body.left.m -tearoff 0
-$w.body.left.m add command -label "Left menu: first item" -command "puts \"You have selected the first item from the Left menu.\""
-$w.body.left.m add command -label "Left menu: second item" -command "puts \"You have selected the second item from the Left menu.\""
-grid $w.body.right -row 1 -column 0 -sticky w
-grid $w.body.center -row 1 -column 1 -sticky news
-grid $w.body.left -row 1 -column 2 -sticky e
-menubutton $w.body.above -text "Above" -underline 0 -direction above -menu $w.body.above.m -relief raised
-menu $w.body.above.m -tearoff 0
-$w.body.above.m add command -label "Above menu: first item" -command "puts \"You have selected the first item from the Above menu.\""
-$w.body.above.m add command -label "Above menu: second item" -command "puts \"You have selected the second item from the Above menu.\""
-grid $w.body.above -row 2 -column 1 -sticky s
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-set body $w.body.center
-label $body.label -wraplength 300 -font "Helvetica 14" -justify left -text "This is a demonstration of menubuttons. The \"Below\" menubutton pops its menu below the button; the \"Right\" button pops to the right, etc. There are two option menus directly below this text; one is just a standard menu and the other is a 16-color palette."
-pack $body.label -side top -padx 25 -pady 25
-frame $body.buttons
-pack $body.buttons -padx 25 -pady 25
-tk_optionMenu $body.buttons.options menubuttonoptions one two three
-pack $body.buttons.options -side left -padx 25 -pady 25
-set m [tk_optionMenu $body.buttons.colors paletteColor Black red4 DarkGreen NavyBlue gray75 Red Green Blue gray50 Yellow Cyan Magenta White Brown DarkSeaGreen DarkViolet]
-if {[tk windowingsystem] eq "aqua"} {
-    set topBorderColor Black
-    set bottomBorderColor Black
-} else {
-    set topBorderColor gray50
-    set bottomBorderColor gray75
-}
-for {set i 0} {$i <= [$m index last]} {incr i} {
-    set name [$m entrycget $i -label]
-    image create photo image_$name -height 16 -width 16
-    image_$name put $topBorderColor -to 0 0 16 1
-    image_$name put $topBorderColor -to 0 1 1 16
-    image_$name put $bottomBorderColor -to 0 15 16 16
-    image_$name put $bottomBorderColor -to 15 1 16 16
-    image_$name put $name -to 1 1 15 15
-
-    image create photo image_${name}_s -height 16 -width 16
-    image_${name}_s put Black -to 0 0 16 2
-    image_${name}_s put Black -to 0 2 2 16
-    image_${name}_s put Black -to 2 14 16 16
-    image_${name}_s put Black -to 14 2 16 14
-    image_${name}_s put $name -to 2 2 14 14
-
-    $m entryconfigure $i -image image_$name -selectimage image_${name}_s -hidemargin 1
-}
-$m configure -tearoff 1
-foreach i {Black gray75 gray50 White} {
-	$m entryconfigure $i -columnbreak 1
-}
-
-pack $body.buttons.colors -side left -padx 25 -pady 25
-
-if {[tk windowingsystem] eq "aqua"} {catch {set ::tk::mac::useCustomMDEF $origUseCustomMDEF}}
diff --git a/tk8.6/library/demos/msgbox.tcl b/tk8.6/library/demos/msgbox.tcl
deleted file mode 100644
index 2c2cc2d..0000000
--- a/tk8.6/library/demos/msgbox.tcl
+++ /dev/null
@@ -1,62 +0,0 @@
-# msgbox.tcl --
-#
-# This demonstration script creates message boxes of various type
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .msgbox
-catch {destroy $w}
-toplevel $w
-wm title $w "Message Box Demonstration"
-wm iconname $w "messagebox"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "Choose the icon and type option of the message box. Then press the \"Message Box\" button to see the message box."
-pack $w.msg -side top
-
-pack [addSeeDismiss $w.buttons $w {} {
-    ttk::button $w.buttons.vars -text "Message Box" -command "showMessageBox $w"
-}] -side bottom -fill x
-#pack $w.buttons.dismiss $w.buttons.code $w.buttons.vars -side left -expand 1
-
-frame $w.left
-frame $w.right
-pack $w.left $w.right -side left -expand yes -fill y  -pady .5c -padx .5c
-
-label $w.left.label -text "Icon"
-frame $w.left.sep -relief ridge -bd 1 -height 2
-pack $w.left.label -side top
-pack $w.left.sep -side top -fill x -expand no
-
-set msgboxIcon info
-foreach i {error info question warning} {
-    radiobutton $w.left.b$i -text $i -variable msgboxIcon \
-	-relief flat -value $i -width 16 -anchor w
-    pack $w.left.b$i  -side top -pady 2 -anchor w -fill x
-}
-
-label $w.right.label -text "Type"
-frame $w.right.sep -relief ridge -bd 1 -height 2
-pack $w.right.label -side top
-pack $w.right.sep -side top -fill x -expand no
-
-set msgboxType ok
-foreach t {abortretryignore ok okcancel retrycancel yesno yesnocancel} {
-    radiobutton $w.right.$t -text $t -variable msgboxType \
-	-relief flat -value $t -width 16 -anchor w
-    pack $w.right.$t -side top -pady 2 -anchor w -fill x
-}
-
-proc showMessageBox {w} {
-    global msgboxIcon msgboxType
-    set button [tk_messageBox -icon $msgboxIcon -type $msgboxType \
-	-title Message -parent $w\
-	-message "This is a \"$msgboxType\" type messagebox with the \"$msgboxIcon\" icon"]
-
-    tk_messageBox -icon info -message "You have selected \"$button\"" -type ok\
-	-parent $w
-}
diff --git a/tk8.6/library/demos/nl.msg b/tk8.6/library/demos/nl.msg
deleted file mode 100644
index cd52630..0000000
--- a/tk8.6/library/demos/nl.msg
+++ /dev/null
@@ -1,125 +0,0 @@
-::msgcat::mcset nl "Widget Demonstration" "Demonstratie van widgets"
-::msgcat::mcset nl "tkWidgetDemo" "tkWidgetDemo"
-::msgcat::mcset nl "&File"     "&Bestand"
-::msgcat::mcset nl "About..."  "Info..."
-::msgcat::mcset nl "&About..." "&Info..."
-::msgcat::mcset nl "<F1>"      "<F1>"
-::msgcat::mcset nl "&Quit"     "&Einde"
-::msgcat::mcset nl "Meta+Q"    "Meta+E"		;# Displayed hotkey
-::msgcat::mcset nl "Meta-q"    "Meta-e"		;# Actual binding sequence
-::msgcat::mcset nl "Ctrl+Q"    "Ctrl+E"		;# Displayed hotkey
-::msgcat::mcset nl "Control-q" "Control-e"	;# Actual binding sequence
-::msgcat::mcset nl "Dismiss"   "Sluiten"
-::msgcat::mcset nl "See Variables"    "Bekijk Variabelen"
-::msgcat::mcset nl "Variable Values"  "Waarden Variabelen"
-::msgcat::mcset nl "OK"        "OK"
-::msgcat::mcset nl "Run the \"%s\" sample program" "Start voorbeeld \"%s\""
-::msgcat::mcset nl "Print Code" "Code Afdrukken"
-::msgcat::mcset nl "Demo code: %s" "Code van Demo %s"
-::msgcat::mcset nl "About Widget Demo" "Over deze demonstratie"
-::msgcat::mcset nl "Tk widget demonstration" "Demonstratie van Tk widgets"
-::msgcat::mcset nl "Copyright © %s"
-
-::msgcat::mcset nl "Tk Widget Demonstrations" "Demonstratie van Tk widgets"
-::msgcat::mcset nl "This application provides a front end for several short scripts" \
-    "Dit programma is een schil rond enkele korte scripts waarmee"
-::msgcat::mcset nl "that demonstrate what you can do with Tk widgets.  Each of the" \
-    "gedemonstreerd wordt wat je kunt doen met Tk widgets.  Elk van de"
-::msgcat::mcset nl "numbered lines below describes a demonstration;  you can click on" \
-    "genummerde regels hieronder omschrijft een demonstratie;  je kunt de"
-::msgcat::mcset nl "it to invoke the demonstration.  Once the demonstration window" \
-    "demonstratie starten door op de regel te klikken."
-::msgcat::mcset nl "appears, you can click the" \
-    "Zodra het nieuwe venster verschijnt, kun je op de knop"
-::msgcat::mcset nl "See Code"  "Bekijk Code"	;# This is also button text!
-::msgcat::mcset nl "button to see the Tcl/Tk code that created the demonstration.  If" \
-    "drukken om de achterliggende Tcl/Tk code te zien.  Als je dat wilt,"
-::msgcat::mcset nl "you wish, you can edit the code and click the" \
-    "kun je de code wijzigen en op de knop"
-::msgcat::mcset nl "Rerun Demo" "Herstart Demo"	;# This is also button text!
-::msgcat::mcset nl "button in the code window to reinvoke the demonstration with the" \
-    "drukken in het codevenster om de demonstratie uit te voeren met de"
-::msgcat::mcset nl "modified code." \
-    "nieuwe code."
-
-::msgcat::mcset nl "Labels, buttons, checkbuttons, and radiobuttons" \
-    "Labels, knoppen, vinkjes/aankruishokjes en radioknoppen"
-
-::msgcat::mcset nl "Labels (text and bitmaps)" "Labels (tekst en plaatjes)"
-::msgcat::mcset nl "Labels and UNICODE text"   "Labels en tekst in UNICODE"
-::msgcat::mcset nl "Buttons" "Buttons (drukknoppen)"
-::msgcat::mcset nl "Check-buttons (select any of a group)" \
-    "Check-buttons (een of meer uit een groep)"
-::msgcat::mcset nl "Radio-buttons (select one of a group)" \
-    "Radio-buttons (een van een groep)"
-::msgcat::mcset nl "A 15-puzzle game made out of buttons" \
-    "Een schuifpuzzel van buttons"
-::msgcat::mcset nl "Iconic buttons that use bitmaps" \
-    "Buttons met pictogrammen"
-::msgcat::mcset nl "Two labels displaying images" \
-    "Twee labels met plaatjes in plaats van tekst"
-::msgcat::mcset nl "A simple user interface for viewing images" \
-    "Een eenvoudige user-interface voor het bekijken van plaatjes"
-::msgcat::mcset nl "Labelled frames" \
-    "Kaders met bijschrift"
-
-::msgcat::mcset nl "Listboxes" "Keuzelijsten"
-::msgcat::mcset nl "The 50 states" "De 50 staten van de VS"
-::msgcat::mcset nl "Colors: change the color scheme for the application" \
-         "Kleuren: verander het kleurenschema voor het programma"
-::msgcat::mcset nl "A collection of famous and infamous sayings" \
-         "Beroemde en beruchte citaten en gezegden"
-
-::msgcat::mcset nl "Entries and Spin-boxes"     "Invulvelden en Spinboxen"
-::msgcat::mcset nl "Entries without scrollbars" "Invulvelden zonder schuifbalk"
-::msgcat::mcset nl "Entries with scrollbars"    "Invulvelden met schuifbalk"
-::msgcat::mcset nl "Validated entries and password fields" \
-         "Invulvelden met controle of wachtwoorden"
-::msgcat::mcset nl "Spin-boxes" "Spinboxen"
-::msgcat::mcset nl "Simple Rolodex-like form" "Simpel kaartsysteem"
-
-::msgcat::mcset nl "Text" "Tekst"
-::msgcat::mcset nl "Basic editable text" "Voorbeeld met te wijzigen tekst"
-::msgcat::mcset nl "Text display styles" "Tekst met verschillende stijlen"
-::msgcat::mcset nl "Hypertext (tag bindings)" \
-    "Hypertext (verwijzingen via \"tags\")"
-::msgcat::mcset nl "A text widget with embedded windows" \
-    "Tekstwidget met windows erin"
-::msgcat::mcset nl "A search tool built with a text widget" \
-    "Zoeken in tekst met behulp van een tekstwidget"
-
-::msgcat::mcset nl "Canvases" "Canvaswidgets"
-::msgcat::mcset nl "The canvas item types"     "Objecten in een canvas"
-::msgcat::mcset nl "A simple 2-D plot"         "Eenvoudige 2D-grafiek"
-::msgcat::mcset nl "Text items in canvases"    "Tekstobjecten in een canvas"
-::msgcat::mcset nl "An editor for arrowheads on canvas lines" \
-    "Editor voor de vorm van de pijl (begin/eind van een lijn)"
-::msgcat::mcset nl "A ruler with adjustable tab stops" \
-    "Een meetlat met aanpasbare ruiters"
-::msgcat::mcset nl "A building floor plan"     "Plattegrond van een gebouw"
-::msgcat::mcset nl "A simple scrollable canvas" "Een schuifbaar canvas"
-
-::msgcat::mcset nl "Scales" "Schaalverdelingen"
-::msgcat::mcset nl "Horizontal scale"          "Horizontale schaal"
-::msgcat::mcset nl "Vertical scale"          "Verticale schaal"
-
-::msgcat::mcset nl "Paned Windows" "Vensters opgedeeld in stukken"
-::msgcat::mcset nl "Horizontal paned window"   "Horizontaal gedeeld venster"
-::msgcat::mcset nl "Vertical paned window"     "Verticaal gedeeld venster"
-
-::msgcat::mcset nl "Menus" "Menu's"
-::msgcat::mcset nl "Menus and cascades (sub-menus)" \
-    "Menu's en cascades (submenu's)"
-::msgcat::mcset nl "Menu-buttons" "Menu-buttons"
-
-::msgcat::mcset nl "Common Dialogs" "Veel voorkomende dialoogvensters"
-::msgcat::mcset nl "Message boxes"  "Mededeling (message box)"
-::msgcat::mcset nl "File selection dialog"     "Selectie van bestanden"
-::msgcat::mcset nl "Color picker"              "Kleurenpalet"
-
-::msgcat::mcset nl "Miscellaneous"             "Diversen"
-::msgcat::mcset nl "The built-in bitmaps"      "Ingebouwde plaatjes"
-::msgcat::mcset nl "A dialog box with a local grab" \
-    "Een dialoogvenster met een locale \"grab\""
-::msgcat::mcset nl "A dialog box with a global grab" \
-    "Een dialoogvenster met een globale \"grab\""
diff --git a/tk8.6/library/demos/paned1.tcl b/tk8.6/library/demos/paned1.tcl
deleted file mode 100644
index 783b7f3..0000000
--- a/tk8.6/library/demos/paned1.tcl
+++ /dev/null
@@ -1,32 +0,0 @@
-# paned1.tcl --
-#
-# This demonstration script creates a toplevel window containing
-# a paned window that separates two windows horizontally.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .paned1
-catch {destroy $w}
-toplevel $w
-wm title $w "Horizontal Paned Window Demonstration"
-wm iconname $w "paned1"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "The sash between the two coloured windows below can be used to divide the area between them.  Use the left mouse button to resize without redrawing by just moving the sash, and use the middle mouse button to resize opaquely (always redrawing the windows in each position.)"
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-panedwindow $w.pane
-pack $w.pane -side top -expand yes -fill both -pady 2 -padx 2m
-
-label $w.pane.left  -text "This is the\nleft side"  -bg yellow
-label $w.pane.right -text "This is the\nright side" -bg cyan
-
-$w.pane add $w.pane.left $w.pane.right
diff --git a/tk8.6/library/demos/paned2.tcl b/tk8.6/library/demos/paned2.tcl
deleted file mode 100644
index c549249..0000000
--- a/tk8.6/library/demos/paned2.tcl
+++ /dev/null
@@ -1,74 +0,0 @@
-# paned2.tcl --
-#
-# This demonstration script creates a toplevel window containing
-# a paned window that separates two windows vertically.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .paned2
-catch {destroy $w}
-toplevel $w
-wm title $w "Vertical Paned Window Demonstration"
-wm iconname $w "paned2"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "The sash between the two scrolled windows below can be used to divide the area between them.  Use the left mouse button to resize without redrawing by just moving the sash, and use the middle mouse button to resize opaquely (always redrawing the windows in each position.)"
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-# Create the pane itself
-panedwindow $w.pane -orient vertical
-pack $w.pane -side top -expand yes -fill both -pady 2 -padx 2m
-
-# The top window is a listbox with scrollbar
-set paneList {
-    {List of Tk Widgets}
-    button
-    canvas
-    checkbutton
-    entry
-    frame
-    label
-    labelframe
-    listbox
-    menu
-    menubutton
-    message
-    panedwindow
-    radiobutton
-    scale
-    scrollbar
-    spinbox
-    text
-    toplevel
-}
-set f [frame $w.pane.top]
-listbox $f.list -listvariable paneList -yscrollcommand "$f.scr set"
-# Invert the first item to highlight it
-$f.list itemconfigure 0 \
-	-background [$f.list cget -fg] -foreground [$f.list cget -bg]
-ttk::scrollbar $f.scr -orient vertical -command "$f.list yview"
-pack $f.scr -side right -fill y
-pack $f.list -fill both -expand 1
-
-# The bottom window is a text widget with scrollbar
-set f [frame $w.pane.bottom]
-text $f.text -xscrollcommand "$f.xscr set" -yscrollcommand "$f.yscr set" \
-	-width 30 -height 8 -wrap none
-ttk::scrollbar $f.xscr -orient horizontal -command "$f.text xview"
-ttk::scrollbar $f.yscr -orient vertical -command "$f.text yview"
-grid $f.text $f.yscr -sticky nsew
-grid $f.xscr         -sticky nsew
-grid columnconfigure $f 0 -weight 1
-grid rowconfigure    $f 0 -weight 1
-$f.text insert 1.0 "This is just a normal text widget"
-
-# Now add our contents to the paned window
-$w.pane add $w.pane.top $w.pane.bottom
diff --git a/tk8.6/library/demos/pendulum.tcl b/tk8.6/library/demos/pendulum.tcl
deleted file mode 100644
index d344d8d..0000000
--- a/tk8.6/library/demos/pendulum.tcl
+++ /dev/null
@@ -1,197 +0,0 @@
-# pendulum.tcl --
-#
-# This demonstration illustrates how Tcl/Tk can be used to construct
-# simulations of physical systems.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .pendulum
-catch {destroy $w}
-toplevel $w
-wm title $w "Pendulum Animation Demonstration"
-wm iconname $w "pendulum"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "This demonstration shows how Tcl/Tk can be used to carry out animations that are linked to simulations of physical systems. In the left canvas is a graphical representation of the physical system itself, a simple pendulum, and in the right canvas is a graph of the phase space of the system, which is a plot of the angle (relative to the vertical) against the angular velocity. The pendulum bob may be repositioned by clicking and dragging anywhere on the left canvas."
-pack $w.msg
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-# Create some structural widgets
-pack [panedwindow $w.p] -fill both -expand 1
-$w.p add [labelframe $w.p.l1 -text "Pendulum Simulation"]
-$w.p add [labelframe $w.p.l2 -text "Phase Space"]
-
-# Create the canvas containing the graphical representation of the
-# simulated system.
-canvas $w.c -width 320 -height 200 -background white -bd 2 -relief sunken
-$w.c create text 5 5 -anchor nw -text "Click to Adjust Bob Start Position"
-# Coordinates of these items don't matter; they will be set properly below
-$w.c create line 0 25 320 25   -tags plate -fill grey50 -width 2
-$w.c create oval 155 20 165 30 -tags pivot -fill grey50 -outline {}
-$w.c create line 1 1 1 1       -tags rod   -fill black  -width 3
-$w.c create oval 1 1 2 2       -tags bob   -fill yellow -outline black
-pack $w.c -in $w.p.l1 -fill both -expand true
-
-# Create the canvas containing the phase space graph; this consists of
-# a line that gets gradually paler as it ages, which is an extremely
-# effective visual trick.
-canvas $w.k -width 320 -height 200 -background white -bd 2 -relief sunken
-$w.k create line 160 200 160 0 -fill grey75 -arrow last -tags y_axis
-$w.k create line 0 100 320 100 -fill grey75 -arrow last -tags x_axis
-for {set i 90} {$i>=0} {incr i -10} {
-    # Coordinates of these items don't matter; they will be set properly below
-    $w.k create line 0 0 1 1 -smooth true -tags graph$i -fill grey$i
-}
-
-$w.k create text 0 0 -anchor ne -text "\u03b8" -tags label_theta
-$w.k create text 0 0 -anchor ne -text "\u03b4\u03b8" -tags label_dtheta
-pack $w.k -in $w.p.l2 -fill both -expand true
-
-# Initialize some variables
-set points {}
-set Theta   45.0
-set dTheta   0.0
-set pi       3.1415926535897933
-set length 150
-set home   160
-
-# This procedure makes the pendulum appear at the correct place on the
-# canvas. If the additional arguments "at $x $y" are passed (the 'at'
-# is really just syntactic sugar) instead of computing the position of
-# the pendulum from the length of the pendulum rod and its angle, the
-# length and angle are computed in reverse from the given location
-# (which is taken to be the centre of the pendulum bob.)
-proc showPendulum {canvas {at {}} {x {}} {y {}}} {
-    global Theta dTheta pi length home
-    if {$at eq "at" && ($x!=$home || $y!=25)} {
-	set dTheta 0.0
-	set x2 [expr {$x - $home}]
-	set y2 [expr {$y - 25}]
-	set length [expr {hypot($x2, $y2)}]
-	set Theta  [expr {atan2($x2, $y2) * 180/$pi}]
-    } else {
-	set angle [expr {$Theta * $pi/180}]
-	set x [expr {$home + $length*sin($angle)}]
-	set y [expr {25    + $length*cos($angle)}]
-    }
-    $canvas coords rod $home 25 $x $y
-    $canvas coords bob \
-	    [expr {$x-15}] [expr {$y-15}] [expr {$x+15}] [expr {$y+15}]
-}
-showPendulum $w.c
-
-# Update the phase-space graph according to the current angle and the
-# rate at which the angle is changing (the first derivative with
-# respect to time.)
-proc showPhase {canvas} {
-    global Theta dTheta points psw psh
-    lappend points [expr {$Theta+$psw}] [expr {-20*$dTheta+$psh}]
-    if {[llength $points] > 100} {
-    	 set points [lrange $points end-99 end]
-    }
-    for {set i 0} {$i<100} {incr i 10} {
-	set list [lrange $points end-[expr {$i-1}] end-[expr {$i-12}]]
-	if {[llength $list] >= 4} {
-	    $canvas coords graph$i $list
-	}
-    }
-}
-
-# Set up some bindings on the canvases.  Note that when the user
-# clicks we stop the animation until they release the mouse
-# button. Also note that both canvases are sensitive to <Configure>
-# events, which allows them to find out when they have been resized by
-# the user.
-bind $w.c <Destroy> {
-    after cancel $animationCallbacks(pendulum)
-    unset animationCallbacks(pendulum)
-}
-bind $w.c <1> {
-    after cancel $animationCallbacks(pendulum)
-    showPendulum %W at %x %y
-}
-bind $w.c <B1-Motion> {
-    showPendulum %W at %x %y
-}
-bind $w.c <ButtonRelease-1> {
-    showPendulum %W at %x %y
-    set animationCallbacks(pendulum) [after 15 repeat [winfo toplevel %W]]
-}
-bind $w.c <Configure> {
-    %W coords plate 0 25 %w 25
-    set home [expr %w/2]
-    %W coords pivot [expr $home-5] 20 [expr $home+5] 30
-}
-bind $w.k <Configure> {
-    set psh [expr %h/2]
-    set psw [expr %w/2]
-    %W coords x_axis 2 $psh [expr %w-2] $psh
-    %W coords y_axis $psw [expr %h-2] $psw 2
-    %W coords label_dtheta [expr $psw-4] 6
-    %W coords label_theta [expr %w-6] [expr $psh+4]
-}
-
-# This procedure is the "business" part of the simulation that does
-# simple numerical integration of the formula for a simple rotational
-# pendulum.
-proc recomputeAngle {} {
-    global Theta dTheta pi length
-    set scaling [expr {3000.0/$length/$length}]
-
-    # To estimate the integration accurately, we really need to
-    # compute the end-point of our time-step.  But to do *that*, we
-    # need to estimate the integration accurately!  So we try this
-    # technique, which is inaccurate, but better than doing it in a
-    # single step.  What we really want is bound up in the
-    # differential equation:
-    #       ..             - sin theta
-    #      theta + theta = -----------
-    #                         length
-    # But my math skills are not good enough to solve this!
-
-    # first estimate
-    set firstDDTheta [expr {-sin($Theta * $pi/180)*$scaling}]
-    set midDTheta [expr {$dTheta + $firstDDTheta}]
-    set midTheta [expr {$Theta + ($dTheta + $midDTheta)/2}]
-    # second estimate
-    set midDDTheta [expr {-sin($midTheta * $pi/180)*$scaling}]
-    set midDTheta [expr {$dTheta + ($firstDDTheta + $midDDTheta)/2}]
-    set midTheta [expr {$Theta + ($dTheta + $midDTheta)/2}]
-    # Now we do a double-estimate approach for getting the final value
-    # first estimate
-    set midDDTheta [expr {-sin($midTheta * $pi/180)*$scaling}]
-    set lastDTheta [expr {$midDTheta + $midDDTheta}]
-    set lastTheta [expr {$midTheta + ($midDTheta + $lastDTheta)/2}]
-    # second estimate
-    set lastDDTheta [expr {-sin($lastTheta * $pi/180)*$scaling}]
-    set lastDTheta [expr {$midDTheta + ($midDDTheta + $lastDDTheta)/2}]
-    set lastTheta [expr {$midTheta + ($midDTheta + $lastDTheta)/2}]
-    # Now put the values back in our globals
-    set dTheta $lastDTheta
-    set Theta $lastTheta
-}
-
-# This method ties together the simulation engine and the graphical
-# display code that visualizes it.
-proc repeat w {
-    global animationCallbacks
-
-    # Simulate
-    recomputeAngle
-
-    # Update the display
-    showPendulum $w.c
-    showPhase $w.k
-
-    # Reschedule ourselves
-    set animationCallbacks(pendulum) [after 15 [list repeat $w]]
-}
-# Start the simulation after a short pause
-set animationCallbacks(pendulum) [after 500 [list repeat $w]]
diff --git a/tk8.6/library/demos/plot.tcl b/tk8.6/library/demos/plot.tcl
deleted file mode 100644
index e7f0361..0000000
--- a/tk8.6/library/demos/plot.tcl
+++ /dev/null
@@ -1,97 +0,0 @@
-# plot.tcl --
-#
-# This demonstration script creates a canvas widget showing a 2-D
-# plot with data points that can be dragged with the mouse.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .plot
-catch {destroy $w}
-toplevel $w
-wm title $w "Plot Demonstration"
-wm iconname $w "Plot"
-positionWindow $w
-set c $w.c
-
-label $w.msg -font $font -wraplength 4i -justify left -text "This window displays a canvas widget containing a simple 2-dimensional plot.  You can doctor the data by dragging any of the points with mouse button 1."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-canvas $c -relief raised -width 450 -height 300
-pack $w.c -side top -fill x
-
-set plotFont {Helvetica 18}
-
-$c create line 100 250 400 250 -width 2
-$c create line 100 250 100 50 -width 2
-$c create text 225 20 -text "A Simple Plot" -font $plotFont -fill brown
-
-for {set i 0} {$i <= 10} {incr i} {
-    set x [expr {100 + ($i*30)}]
-    $c create line $x 250 $x 245 -width 2
-    $c create text $x 254 -text [expr {10*$i}] -anchor n -font $plotFont
-}
-for {set i 0} {$i <= 5} {incr i} {
-    set y [expr {250 - ($i*40)}]
-    $c create line 100 $y 105 $y -width 2
-    $c create text 96 $y -text [expr {$i*50}].0 -anchor e -font $plotFont
-}
-
-foreach point {
-    {12 56} {20 94} {33 98} {32 120} {61 180} {75 160} {98 223}
-} {
-    set x [expr {100 + (3*[lindex $point 0])}]
-    set y [expr {250 - (4*[lindex $point 1])/5}]
-    set item [$c create oval [expr {$x-6}] [expr {$y-6}] \
-	    [expr {$x+6}] [expr {$y+6}] -width 1 -outline black \
-	    -fill SkyBlue2]
-    $c addtag point withtag $item
-}
-
-$c bind point <Any-Enter> "$c itemconfig current -fill red"
-$c bind point <Any-Leave> "$c itemconfig current -fill SkyBlue2"
-$c bind point <1> "plotDown $c %x %y"
-$c bind point <ButtonRelease-1> "$c dtag selected"
-bind $c <B1-Motion> "plotMove $c %x %y"
-
-set plot(lastX) 0
-set plot(lastY) 0
-
-# plotDown --
-# This procedure is invoked when the mouse is pressed over one of the
-# data points.  It sets up state to allow the point to be dragged.
-#
-# Arguments:
-# w -		The canvas window.
-# x, y -	The coordinates of the mouse press.
-
-proc plotDown {w x y} {
-    global plot
-    $w dtag selected
-    $w addtag selected withtag current
-    $w raise current
-    set plot(lastX) $x
-    set plot(lastY) $y
-}
-
-# plotMove --
-# This procedure is invoked during mouse motion events.  It drags the
-# current item.
-#
-# Arguments:
-# w -		The canvas window.
-# x, y -	The coordinates of the mouse.
-
-proc plotMove {w x y} {
-    global plot
-    $w move selected [expr {$x-$plot(lastX)}] [expr {$y-$plot(lastY)}]
-    set plot(lastX) $x
-    set plot(lastY) $y
-}
diff --git a/tk8.6/library/demos/puzzle.tcl b/tk8.6/library/demos/puzzle.tcl
deleted file mode 100644
index 4f7f955..0000000
--- a/tk8.6/library/demos/puzzle.tcl
+++ /dev/null
@@ -1,82 +0,0 @@
-# puzzle.tcl --
-#
-# This demonstration script creates a 15-puzzle game using a collection
-# of buttons.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-# puzzleSwitch --
-# This procedure is invoked when the user clicks on a particular button;
-# if the button is next to the empty space, it moves the button into th
-# empty space.
-
-proc puzzleSwitch {w num} {
-    global xpos ypos
-    if {(($ypos($num) >= ($ypos(space) - .01))
-	    && ($ypos($num) <= ($ypos(space) + .01))
-	    && ($xpos($num) >= ($xpos(space) - .26))
-	    && ($xpos($num) <= ($xpos(space) + .26)))
-	    || (($xpos($num) >= ($xpos(space) - .01))
-	    && ($xpos($num) <= ($xpos(space) + .01))
-	    && ($ypos($num) >= ($ypos(space) - .26))
-	    && ($ypos($num) <= ($ypos(space) + .26)))} {
-	set tmp $xpos(space)
-	set xpos(space) $xpos($num)
-	set xpos($num) $tmp
-	set tmp $ypos(space)
-	set ypos(space) $ypos($num)
-	set ypos($num) $tmp
-	place $w.frame.$num -relx $xpos($num) -rely $ypos($num)
-    }
-}
-
-set w .puzzle
-catch {destroy $w}
-toplevel $w
-wm title $w "15-Puzzle Demonstration"
-wm iconname $w "15-Puzzle"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "A 15-puzzle appears below as a collection of buttons.  Click on any of the pieces next to the space, and that piece will slide over the space.  Continue this until the pieces are arranged in numerical order from upper-left to lower-right."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-# Special trick: select a darker color for the space by creating a
-# scrollbar widget and using its trough color.
-
-scrollbar $w.s
-
-# The button metrics are a bit bigger in Aqua, and since we are
-# using place which doesn't autosize, then we need to have a
-# slightly larger frame here...
-
-if {[tk windowingsystem] eq "aqua"} {
-    set frameSize 168
-} else {
-    set frameSize 120
-}
-
-frame $w.frame -width $frameSize -height $frameSize -borderwidth 2\
-	-relief sunken -bg [$w.s cget -troughcolor]
-pack $w.frame -side top -pady 1c -padx 1c
-destroy $w.s
-
-set order {3 1 6 2 5 7 15 13 4 11 8 9 14 10 12}
-for {set i 0} {$i < 15} {set i [expr {$i+1}]} {
-    set num [lindex $order $i]
-    set xpos($num) [expr {($i%4)*.25}]
-    set ypos($num) [expr {($i/4)*.25}]
-    button $w.frame.$num -relief raised -text $num -highlightthickness 0 \
-	    -command "puzzleSwitch $w $num"
-    place $w.frame.$num -relx $xpos($num) -rely $ypos($num) \
-	-relwidth .25 -relheight .25
-}
-set xpos(space) .75
-set ypos(space) .75
diff --git a/tk8.6/library/demos/radio.tcl b/tk8.6/library/demos/radio.tcl
deleted file mode 100644
index 5c73703..0000000
--- a/tk8.6/library/demos/radio.tcl
+++ /dev/null
@@ -1,66 +0,0 @@
-# radio.tcl --
-#
-# This demonstration script creates a toplevel window containing
-# several radiobutton widgets.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .radio
-catch {destroy $w}
-toplevel $w
-wm title $w "Radiobutton Demonstration"
-wm iconname $w "radio"
-positionWindow $w
-label $w.msg -font $font -wraplength 5i -justify left -text "Three groups of radiobuttons are displayed below.  If you click on a button then the button will become selected exclusively among all the buttons in its group.  A Tcl variable is associated with each group to indicate which of the group's buttons is selected.  When the 'Tristate' button is pressed, the radio buttons will display the tri-state mode. Selecting any radio button will return the buttons to their respective on/off state. Click the \"See Variables\" button to see the current values of the variables."
-grid $w.msg -row 0 -column 0 -columnspan 3 -sticky nsew
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w [list size color align]]
-grid $btns -row 3 -column 0 -columnspan 3 -sticky ew
-
-labelframe $w.left -pady 2 -text "Point Size" -padx 2
-labelframe $w.mid -pady 2 -text "Color" -padx 2
-labelframe $w.right -pady 2 -text "Alignment" -padx 2
-button $w.tristate -text Tristate -command "set size multi; set color multi" \
-    -pady 2 -padx 2
-if {[tk windowingsystem] eq "aqua"} {
-    $w.tristate configure -padx 10
-}
-grid $w.left     -column 0 -row 1 -pady .5c -padx .5c -rowspan 2
-grid $w.mid      -column 1 -row 1 -pady .5c -padx .5c -rowspan 2
-grid $w.right    -column 2 -row 1 -pady .5c -padx .5c
-grid $w.tristate -column 2 -row 2 -pady .5c -padx .5c
-
-foreach i {10 12 14 18 24} {
-    radiobutton $w.left.b$i -text "Point Size $i" -variable size \
-	    -relief flat -value $i -tristatevalue "multi"
-    pack $w.left.b$i  -side top -pady 2 -anchor w -fill x
-}
-
-foreach c {Red Green Blue Yellow Orange Purple} {
-    set lower [string tolower $c]
-    radiobutton $w.mid.$lower -text $c -variable color \
-	    -relief flat -value $lower -anchor w \
-	    -command "$w.mid configure -fg \$color" \
-	-tristatevalue "multi"
-    pack $w.mid.$lower -side top -pady 2 -fill x
-}
-
-
-label $w.right.l -text "Label" -bitmap questhead -compound left
-$w.right.l configure -width [winfo reqwidth $w.right.l] -compound top
-$w.right.l configure -height [winfo reqheight $w.right.l]
-foreach a {Top Left Right Bottom} {
-    set lower [string tolower $a]
-    radiobutton $w.right.$lower -text $a -variable align \
-	    -relief flat -value $lower -indicatoron 0 -width 7 \
-	    -command "$w.right.l configure -compound \$align"
-}
-
-grid x $w.right.top
-grid $w.right.left $w.right.l $w.right.right
-grid x $w.right.bottom
diff --git a/tk8.6/library/demos/rmt b/tk8.6/library/demos/rmt
deleted file mode 100644
index 00bdc9d..0000000
--- a/tk8.6/library/demos/rmt
+++ /dev/null
@@ -1,210 +0,0 @@
-#!/bin/sh
-# the next line restarts using wish \
-exec wish "$0" ${1+"$@"}
-
-# rmt --
-# This script implements a simple remote-control mechanism for
-# Tk applications.  It allows you to select an application and
-# then type commands to that application.
-
-package require Tk
-
-wm title . "Tk Remote Controller"
-wm iconname . "Tk Remote"
-wm minsize . 1 1
-
-# The global variable below keeps track of the remote application
-# that we're sending to.  If it's an empty string then we execute
-# the commands locally.
-
-set app "local"
-
-# The global variable below keeps track of whether we're in the
-# middle of executing a command entered via the text.
-
-set executing 0
-
-# The global variable below keeps track of the last command executed,
-# so it can be re-executed in response to !! commands.
-
-set lastCommand ""
-
-# Create menu bar.  Arrange to recreate all the information in the
-# applications sub-menu whenever it is cascaded to.
-
-. configure -menu [menu .menu]
-menu .menu.file
-menu .menu.file.apps  -postcommand fillAppsMenu
-.menu add cascade  -label "File"  -underline 0  -menu .menu.file
-.menu.file add cascade  -label "Select Application"  -underline 0 \
-	-menu .menu.file.apps
-.menu.file add command  -label "Quit"  -command "destroy ."  -underline 0
-
-# Create text window and scrollbar.
-
-text .t -yscrollcommand ".s set" -setgrid true
-scrollbar .s -command ".t yview"
-grid .t .s -sticky nsew
-grid rowconfigure . 0 -weight 1
-grid columnconfigure . 0 -weight 1
-
-# Create a binding to forward commands to the target application,
-# plus modify many of the built-in bindings so that only information
-# in the current command can be deleted (can still set the cursor
-# earlier in the text and select and insert;  just can't delete).
-
-bindtags .t {.t Text . all}
-bind .t <Return> {
-    .t mark set insert {end - 1c}
-    .t insert insert \n
-    invoke
-    break
-}
-bind .t <Delete> {
-    catch {.t tag remove sel sel.first promptEnd}
-    if {[.t tag nextrange sel 1.0 end] eq ""} {
-	if {[.t compare insert < promptEnd]} {
-	    break
-	}
-    }
-}
-bind .t <BackSpace> {
-    catch {.t tag remove sel sel.first promptEnd}
-    if {[.t tag nextrange sel 1.0 end] eq ""} {
-	if {[.t compare insert <= promptEnd]} {
-	    break
-	}
-    }
-}
-bind .t <Control-d> {
-    if {[.t compare insert < promptEnd]} {
-	break
-    }
-}
-bind .t <Control-k> {
-    if {[.t compare insert < promptEnd]} {
-	.t mark set insert promptEnd
-    }
-}
-bind .t <Control-t> {
-    if {[.t compare insert < promptEnd]} {
-	break
-    }
-}
-bind .t <Meta-d> {
-    if {[.t compare insert < promptEnd]} {
-	break
-    }
-}
-bind .t <Meta-BackSpace> {
-    if {[.t compare insert <= promptEnd]} {
-	break
-    }
-}
-bind .t <Control-h> {
-    if {[.t compare insert <= promptEnd]} {
-	break
-    }
-}
-### This next bit *isn't* nice - DKF ###
-auto_load tk::TextInsert
-proc tk::TextInsert {w s} {
-    if {$s eq ""} {
-	return
-    }
-    catch {
-	if {
-	    [$w compare sel.first <= insert] && [$w compare sel.last >= insert]
-	} then {
-	    $w tag remove sel sel.first promptEnd
-	    $w delete sel.first sel.last
-	}
-    }
-    $w insert insert $s
-    $w see insert
-}
-
-.t configure -font {Courier 12}
-.t tag configure bold -font {Courier 12 bold}
-
-# The procedure below is used to print out a prompt at the
-# insertion point (which should be at the beginning of a line
-# right now).
-
-proc prompt {} {
-    global app
-    .t insert insert "$app: "
-    .t mark set promptEnd {insert}
-    .t mark gravity promptEnd left
-    .t tag add bold {promptEnd linestart} promptEnd
-}
-
-# The procedure below executes a command (it takes everything on the
-# current line after the prompt and either sends it to the remote
-# application or executes it locally, depending on "app".
-
-proc invoke {} {
-    global app executing lastCommand
-    set cmd [.t get promptEnd insert]
-    incr executing 1
-    if {[info complete $cmd]} {
-	if {$cmd eq "!!\n"} {
-	    set cmd $lastCommand
-	} else {
-	    set lastCommand $cmd
-	}
-	if {$app eq "local"} {
-	    set result [catch [list uplevel #0 $cmd] msg]
-	} else {
-	    set result [catch [list send $app $cmd] msg]
-	}
-	if {$result != 0} {
-	    .t insert insert "Error: $msg\n"
-	} elseif {$msg ne ""} {
-	    .t insert insert $msg\n
-	}
-	prompt
-	.t mark set promptEnd insert
-    }
-    incr executing -1
-    .t yview -pickplace insert
-}
-
-# The following procedure is invoked to change the application that
-# we're talking to.  It also updates the prompt for the current
-# command, unless we're in the middle of executing a command from
-# the text item (in which case a new prompt is about to be output
-# so there's no need to change the old one).
-
-proc newApp appName {
-    global app executing
-    set app $appName
-    if {!$executing} {
-	.t mark gravity promptEnd right
-	.t delete "promptEnd linestart" promptEnd
-	.t insert promptEnd "$appName: "
-	.t tag add bold "promptEnd linestart" promptEnd
-	.t mark gravity promptEnd left
-    }
-    return
-}
-
-# The procedure below will fill in the applications sub-menu with a list
-# of all the applications that currently exist.
-
-proc fillAppsMenu {} {
-    set m .menu.file.apps
-    catch {$m delete 0 last}
-    foreach i [lsort [winfo interps]] {
-	$m add command -label $i -command [list newApp $i]
-    }
-    $m add command -label local -command {newApp local}
-}
-
-set app [winfo name .]
-prompt
-focus .t
-
-# Local Variables:
-# mode: tcl
-# End:
diff --git a/tk8.6/library/demos/rolodex b/tk8.6/library/demos/rolodex
deleted file mode 100644
index 8941570..0000000
--- a/tk8.6/library/demos/rolodex
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/bin/sh
-# the next line restarts using wish \
-exec wish "$0" ${1+"$@"}
-
-# rolodex --
-# This script was written as an entry in Tom LaStrange's rolodex
-# benchmark.  It creates something that has some of the look and
-# feel of a rolodex program, although it's lifeless and doesn't
-# actually do the rolodex application.
-
-package require Tk
-
-foreach i [winfo child .] {
-    catch {destroy $i}
-}
-
-set version 1.2
-
-#------------------------------------------
-# Phase 0: create the front end.
-#------------------------------------------
-
-frame .frame -relief flat
-pack .frame -side top -fill y -anchor center
-
-set names {{} Name: Address: {} {} {Home Phone:} {Work Phone:} Fax:}
-foreach i {1 2 3 4 5 6 7} {
-    label .frame.label$i -text [lindex $names $i] -anchor e
-    entry .frame.entry$i -width 35
-    grid .frame.label$i .frame.entry$i -sticky ew -pady 2 -padx 1
-}
-
-frame .buttons
-pack .buttons -side bottom -pady 2 -anchor center
-button .buttons.clear -text Clear
-button .buttons.add -text Add
-button .buttons.search -text Search
-button .buttons.delete -text "Delete ..."
-pack .buttons.clear .buttons.add .buttons.search .buttons.delete \
-	-side left -padx 2
-
-#------------------------------------------
-# Phase 1: Add menus, dialog boxes
-#------------------------------------------
-
-# DKF - note that this is an old-style menu bar; I just have not yet
-# got around to converting the context help code to work with the new
-# menu system and its <<MenuSelect>> virtual event.
-
-frame .menu -relief raised -borderwidth 1
-pack .menu -before .frame -side top -fill x
-
-menubutton .menu.file -text "File" -menu .menu.file.m -underline 0
-menu .menu.file.m
-.menu.file.m add command -label "Load ..." -command fileAction -underline 0
-.menu.file.m add command -label "Exit" -command {destroy .} -underline 0
-pack .menu.file -side left
-
-menubutton .menu.help -text "Help" -menu .menu.help.m -underline 0
-menu .menu.help.m
-pack .menu.help -side right
-
-proc deleteAction {} {
-    if {[tk_dialog .delete {Confirm Action} {Are you sure?} {} 0  Cancel]
-	    == 0} {
-	clearAction
-    }
-}
-.buttons.delete config -command deleteAction
-
-proc fileAction {} {
-    tk_dialog .fileSelection {File Selection} {This is a dummy file selection dialog box, which is used because there isn't a good file selection dialog built into Tk yet.} {} 0 OK
-    puts stderr {dummy file name}
-}
-
-#------------------------------------------
-# Phase 3: Print contents of card
-#------------------------------------------
-
-proc addAction {} {
-    global names
-    foreach i {1 2 3 4 5 6 7} {
-	puts stderr [format "%-12s %s" [lindex $names $i] [.frame.entry$i get]]
-    }
-}
-.buttons.add config -command addAction
-
-#------------------------------------------
-# Phase 4: Miscellaneous other actions
-#------------------------------------------
-
-proc clearAction {} {
-    foreach i {1 2 3 4 5 6 7} {
-	.frame.entry$i delete 0 end
-    }
-}
-.buttons.clear config -command clearAction
-
-proc fillCard {} {
-    clearAction
-    .frame.entry1 insert 0 "John Ousterhout"
-    .frame.entry2 insert 0 "CS Division, Department of EECS"
-    .frame.entry3 insert 0 "University of California"
-    .frame.entry4 insert 0 "Berkeley, CA 94720"
-    .frame.entry5 insert 0 "private"
-    .frame.entry6 insert 0 "510-642-0865"
-    .frame.entry7 insert 0 "510-642-5775"
-}
-.buttons.search config -command "addAction; fillCard"
-
-#----------------------------------------------------
-# Phase 5: Accelerators, mnemonics, command-line info
-#----------------------------------------------------
-
-.buttons.clear config -text "Clear    Ctrl+C"
-bind . <Control-c> clearAction
-.buttons.add config -text "Add    Ctrl+A"
-bind . <Control-a> addAction
-.buttons.search config -text "Search    Ctrl+S"
-bind . <Control-s> "addAction; fillCard"
-.buttons.delete config -text "Delete...    Ctrl+D"
-bind . <Control-d> deleteAction
-
-.menu.file.m entryconfig 1 -accel Ctrl+F
-bind . <Control-f> fileAction
-.menu.file.m entryconfig 2 -accel Ctrl+Q
-bind . <Control-q> {destroy .}
-
-focus .frame.entry1
-
-#----------------------------------------------------
-# Phase 6: help
-#----------------------------------------------------
-
-proc Help {topic {x 0} {y 0}} {
-    global helpTopics helpCmds
-    if {$topic == ""} return
-    while {[info exists helpCmds($topic)]} {
-	set topic [eval $helpCmds($topic)]
-    }
-    if [info exists helpTopics($topic)] {
-	set msg $helpTopics($topic)
-    } else {
-	set msg "Sorry, but no help is available for this topic"
-    }
-    tk_dialog .help {Rolodex Help} "Information on $topic:\n\n$msg" \
-	    {} 0 OK
-}
-
-proc getMenuTopic {w x y} {
-    return $w.[$w index @[expr {$y-[winfo rooty $w]}]]
-}
-
-event add <<Help>> <F1> <Help>
-bind .    <<Help>> {Help [winfo containing %X %Y] %X %Y}
-bind Menu <<Help>> {Help [winfo containing %X %Y] %X %Y}
-
-# Help text and commands follow:
-
-set helpTopics(.menu.file) {This is the "file" menu.  It can be used to invoke some overall operations on the rolodex applications, such as loading a file or exiting.}
-
-set helpCmds(.menu.file.m) {getMenuTopic $topic $x $y}
-set helpTopics(.menu.file.m.1) {The "Load" entry in the "File" menu posts a dialog box that you can use to select a rolodex file}
-set helpTopics(.menu.file.m.2) {The "Exit" entry in the "File" menu causes the rolodex application to terminate}
-set helpCmds(.menu.file.m.none) {set topic ".menu.file"}
-
-set helpTopics(.frame.entry1) {In this field of the rolodex entry you should type the person's name}
-set helpTopics(.frame.entry2) {In this field of the rolodex entry you should type the first line of the person's address}
-set helpTopics(.frame.entry3) {In this field of the rolodex entry you should type the second line of the person's address}
-set helpTopics(.frame.entry4) {In this field of the rolodex entry you should type the third line of the person's address}
-set helpTopics(.frame.entry5) {In this field of the rolodex entry you should type the person's home phone number, or "private" if the person doesn't want his or her number publicized}
-set helpTopics(.frame.entry6) {In this field of the rolodex entry you should type the person's work phone number}
-set helpTopics(.frame.entry7) {In this field of the rolodex entry you should type the phone number for the person's FAX machine}
-
-set helpCmds(.frame.label1) {set topic .frame.entry1}
-set helpCmds(.frame.label2) {set topic .frame.entry2}
-set helpCmds(.frame.label3) {set topic .frame.entry3}
-set helpCmds(.frame.label4) {set topic .frame.entry4}
-set helpCmds(.frame.label5) {set topic .frame.entry5}
-set helpCmds(.frame.label6) {set topic .frame.entry6}
-set helpCmds(.frame.label7) {set topic .frame.entry7}
-
-set helpTopics(context) {Unfortunately, this application doesn't support context-sensitive help in the usual way, because when this demo was written Tk didn't have a grab mechanism and this is needed for context-sensitive help.  Instead, you can achieve much the same effect by simply moving the mouse over the window you're curious about and pressing the Help or F1 keys.  You can do this anytime.}
-set helpTopics(help) {This application provides only very crude help.  Besides the entries in this menu, you can get help on individual windows by moving the mouse cursor over the window and pressing the Help or F1 keys.}
-set helpTopics(window) {This window is a dummy rolodex application created as part of Tom LaStrange's toolkit benchmark.  It doesn't really do anything useful except to demonstrate a few features of the Tk toolkit.}
-set helpTopics(keys) "The following accelerator keys are defined for this application (in addition to those already available for the entry windows):\n\nCtrl+A:\t\tAdd\nCtrl+C:\t\tClear\nCtrl+D:\t\tDelete\nCtrl+F:\t\tEnter file name\nCtrl+Q:\t\tExit application (quit)\nCtrl+S:\t\tSearch (dummy operation)"
-set helpTopics(version) "This is version $version."
-
-# Entries in "Help" menu
-
-.menu.help.m add command -label "On Context..." -command {Help context} \
-	-underline 3
-.menu.help.m add command -label "On Help..." -command {Help help} \
-	-underline 3
-.menu.help.m add command -label "On Window..." -command {Help window} \
-	-underline 3
-.menu.help.m add command -label "On Keys..." -command {Help keys} \
-	-underline 3
-.menu.help.m add command -label "On Version..." -command {Help version}  \
-	-underline 3
-
-# Local Variables:
-# mode: tcl
-# End:
diff --git a/tk8.6/library/demos/ruler.tcl b/tk8.6/library/demos/ruler.tcl
deleted file mode 100644
index 557b680..0000000
--- a/tk8.6/library/demos/ruler.tcl
+++ /dev/null
@@ -1,171 +0,0 @@
-# ruler.tcl --
-#
-# This demonstration script creates a canvas widget that displays a ruler
-# with tab stops that can be set, moved, and deleted.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-# rulerMkTab --
-# This procedure creates a new triangular polygon in a canvas to
-# represent a tab stop.
-#
-# Arguments:
-# c -		The canvas window.
-# x, y -	Coordinates at which to create the tab stop.
-
-proc rulerMkTab {c x y} {
-    upvar #0 demo_rulerInfo v
-    $c create polygon $x $y [expr {$x+$v(size)}] [expr {$y+$v(size)}] \
-	    [expr {$x-$v(size)}] [expr {$y+$v(size)}]
-}
-
-set w .ruler
-catch {destroy $w}
-toplevel $w
-wm title $w "Ruler Demonstration"
-wm iconname $w "ruler"
-positionWindow $w
-set c $w.c
-
-label $w.msg -font $font -wraplength 5i -justify left -text "This canvas widget shows a mock-up of a ruler.  You can create tab stops by dragging them out of the well to the right of the ruler.  You can also drag existing tab stops.  If you drag a tab stop far enough up or down so that it turns dim, it will be deleted when you release the mouse button."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-canvas $c -width 14.8c -height 2.5c
-pack $w.c -side top -fill x
-
-set demo_rulerInfo(grid) .25c
-set demo_rulerInfo(left) [winfo fpixels $c 1c]
-set demo_rulerInfo(right) [winfo fpixels $c 13c]
-set demo_rulerInfo(top) [winfo fpixels $c 1c]
-set demo_rulerInfo(bottom) [winfo fpixels $c 1.5c]
-set demo_rulerInfo(size) [winfo fpixels $c .2c]
-set demo_rulerInfo(normalStyle) "-fill black"
-# Main widget program sets variable tk_demoDirectory
-if {[winfo depth $c] > 1} {
-    set demo_rulerInfo(activeStyle) "-fill red -stipple {}"
-    set demo_rulerInfo(deleteStyle) [list -fill red \
-	    -stipple @[file join $tk_demoDirectory images gray25.xbm]]
-} else {
-    set demo_rulerInfo(activeStyle) "-fill black -stipple {}"
-    set demo_rulerInfo(deleteStyle) [list -fill black \
-	    -stipple @[file join $tk_demoDirectory images gray25.xbm]]
-}
-
-$c create line 1c 0.5c 1c 1c 13c 1c 13c 0.5c -width 1
-for {set i 0} {$i < 12} {incr i} {
-    set x [expr {$i+1}]
-    $c create line ${x}c 1c ${x}c 0.6c -width 1
-    $c create line $x.25c 1c $x.25c 0.8c -width 1
-    $c create line $x.5c 1c $x.5c 0.7c -width 1
-    $c create line $x.75c 1c $x.75c 0.8c -width 1
-    $c create text $x.15c .75c -text $i -anchor sw
-}
-$c addtag well withtag [$c create rect 13.2c 1c 13.8c 0.5c \
-	-outline black -fill [lindex [$c config -bg] 4]]
-$c addtag well withtag [rulerMkTab $c [winfo pixels $c 13.5c] \
-	[winfo pixels $c .65c]]
-
-$c bind well <1> "rulerNewTab $c %x %y"
-$c bind tab <1> "rulerSelectTab $c %x %y"
-bind $c <B1-Motion> "rulerMoveTab $c %x %y"
-bind $c <Any-ButtonRelease-1> "rulerReleaseTab $c"
-
-# rulerNewTab --
-# Does all the work of creating a tab stop, including creating the
-# triangle object and adding tags to it to give it tab behavior.
-#
-# Arguments:
-# c -		The canvas window.
-# x, y -	The coordinates of the tab stop.
-
-proc rulerNewTab {c x y} {
-    upvar #0 demo_rulerInfo v
-    $c addtag active withtag [rulerMkTab $c $x $y]
-    $c addtag tab withtag active
-    set v(x) $x
-    set v(y) $y
-    rulerMoveTab $c $x $y
-}
-
-# rulerSelectTab --
-# This procedure is invoked when mouse button 1 is pressed over
-# a tab.  It remembers information about the tab so that it can
-# be dragged interactively.
-#
-# Arguments:
-# c -		The canvas widget.
-# x, y -	The coordinates of the mouse (identifies the point by
-#		which the tab was picked up for dragging).
-
-proc rulerSelectTab {c x y} {
-    upvar #0 demo_rulerInfo v
-    set v(x) [$c canvasx $x $v(grid)]
-    set v(y) [expr {$v(top)+2}]
-    $c addtag active withtag current
-    eval "$c itemconf active $v(activeStyle)"
-    $c raise active
-}
-
-# rulerMoveTab --
-# This procedure is invoked during mouse motion events to drag a tab.
-# It adjusts the position of the tab, and changes its appearance if
-# it is about to be dragged out of the ruler.
-#
-# Arguments:
-# c -		The canvas widget.
-# x, y -	The coordinates of the mouse.
-
-proc rulerMoveTab {c x y} {
-    upvar #0 demo_rulerInfo v
-    if {[$c find withtag active] == ""} {
-	return
-    }
-    set cx [$c canvasx $x $v(grid)]
-    set cy [$c canvasy $y]
-    if {$cx < $v(left)} {
-	set cx $v(left)
-    }
-    if {$cx > $v(right)} {
-	set cx $v(right)
-    }
-    if {($cy >= $v(top)) && ($cy <= $v(bottom))} {
-	set cy [expr {$v(top)+2}]
-	eval "$c itemconf active $v(activeStyle)"
-    } else {
-	set cy [expr {$cy-$v(size)-2}]
-	eval "$c itemconf active $v(deleteStyle)"
-    }
-    $c move active [expr {$cx-$v(x)}] [expr {$cy-$v(y)}]
-    set v(x) $cx
-    set v(y) $cy
-}
-
-# rulerReleaseTab --
-# This procedure is invoked during button release events that end
-# a tab drag operation.  It deselects the tab and deletes the tab if
-# it was dragged out of the ruler.
-#
-# Arguments:
-# c -		The canvas widget.
-# x, y -	The coordinates of the mouse.
-
-proc rulerReleaseTab c {
-    upvar #0 demo_rulerInfo v
-    if {[$c find withtag active] == {}} {
-	return
-    }
-    if {$v(y) != $v(top)+2} {
-	$c delete active
-    } else {
-	eval "$c itemconf active $v(normalStyle)"
-	$c dtag active
-    }
-}
diff --git a/tk8.6/library/demos/sayings.tcl b/tk8.6/library/demos/sayings.tcl
deleted file mode 100644
index aa3479c..0000000
--- a/tk8.6/library/demos/sayings.tcl
+++ /dev/null
@@ -1,44 +0,0 @@
-# sayings.tcl --
-#
-# This demonstration script creates a listbox that can be scrolled
-# both horizontally and vertically.  It displays a collection of
-# well-known sayings.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .sayings
-catch {destroy $w}
-toplevel $w
-wm title $w "Listbox Demonstration (well-known sayings)"
-wm iconname $w "sayings"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "The listbox below contains a collection of well-known sayings.  You can scan the list using either of the scrollbars or by dragging in the listbox window with button 2 pressed."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-frame $w.frame -borderwidth 10
-pack $w.frame -side top -expand yes -fill both -padx 1c
-
-
-ttk::scrollbar $w.frame.yscroll -command "$w.frame.list yview"
-ttk::scrollbar $w.frame.xscroll -orient horizontal \
-    -command "$w.frame.list xview"
-listbox $w.frame.list -width 20 -height 10 -setgrid 1 \
-    -yscroll "$w.frame.yscroll set" -xscroll "$w.frame.xscroll set"
-
-grid $w.frame.list -row 0 -column 0 -rowspan 1 -columnspan 1 -sticky news
-grid $w.frame.yscroll -row 0 -column 1 -rowspan 1 -columnspan 1 -sticky news
-grid $w.frame.xscroll -row 1 -column 0 -rowspan 1 -columnspan 1 -sticky news
-grid rowconfig    $w.frame 0 -weight 1 -minsize 0
-grid columnconfig $w.frame 0 -weight 1 -minsize 0
-
-
-$w.frame.list insert 0 "Don't speculate, measure" "Waste not, want not" "Early to bed and early to rise makes a man healthy, wealthy, and wise" "Ask not what your country can do for you, ask what you can do for your country" "I shall return" "NOT" "A picture is worth a thousand words" "User interfaces are hard to build" "Thou shalt not steal" "A penny for your thoughts" "Fool me once, shame on you;  fool me twice, shame on me" "Every cloud has a silver lining" "Where there's smoke there's fire" "It takes one to know one" "Curiosity killed the cat" "Take this job and shove it" "Up a creek without a paddle" "I'm mad as hell and I'm not going to take it any more" "An apple a day keeps the doctor away" "Don't look a gift horse in the mouth" "Measure twice, cut once"
diff --git a/tk8.6/library/demos/search.tcl b/tk8.6/library/demos/search.tcl
deleted file mode 100644
index a1a3d7f..0000000
--- a/tk8.6/library/demos/search.tcl
+++ /dev/null
@@ -1,139 +0,0 @@
-# search.tcl --
-#
-# This demonstration script creates a collection of widgets that
-# allow you to load a file into a text widget, then perform searches
-# on that file.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-# textLoadFile --
-# This procedure below loads a file into a text widget, discarding
-# the previous contents of the widget. Tags for the old widget are
-# not affected, however.
-#
-# Arguments:
-# w -		The window into which to load the file.  Must be a
-#		text widget.
-# file -	The name of the file to load.  Must be readable.
-
-proc textLoadFile {w file} {
-    set f [open $file]
-    $w delete 1.0 end
-    while {![eof $f]} {
-	$w insert end [read $f 10000]
-    }
-    close $f
-}
-
-# textSearch --
-# Search for all instances of a given string in a text widget and
-# apply a given tag to each instance found.
-#
-# Arguments:
-# w -		The window in which to search.  Must be a text widget.
-# string -	The string to search for.  The search is done using
-#		exact matching only;  no special characters.
-# tag -		Tag to apply to each instance of a matching string.
-
-proc textSearch {w string tag} {
-    $w tag remove search 0.0 end
-    if {$string == ""} {
-	return
-    }
-    set cur 1.0
-    while 1 {
-	set cur [$w search -count length $string $cur end]
-	if {$cur == ""} {
-	    break
-	}
-	$w tag add $tag $cur "$cur + $length char"
-	set cur [$w index "$cur + $length char"]
-    }
-}
-
-# textToggle --
-# This procedure is invoked repeatedly to invoke two commands at
-# periodic intervals.  It normally reschedules itself after each
-# execution but if an error occurs (e.g. because the window was
-# deleted) then it doesn't reschedule itself.
-#
-# Arguments:
-# cmd1 -	Command to execute when procedure is called.
-# sleep1 -	Ms to sleep after executing cmd1 before executing cmd2.
-# cmd2 -	Command to execute in the *next* invocation of this
-#		procedure.
-# sleep2 -	Ms to sleep after executing cmd2 before executing cmd1 again.
-
-proc textToggle {cmd1 sleep1 cmd2 sleep2} {
-    catch {
-	eval $cmd1
-	after $sleep1 [list textToggle $cmd2 $sleep2 $cmd1 $sleep1]
-    }
-}
-
-set w .search
-catch {destroy $w}
-toplevel $w
-wm title $w "Text Demonstration - Search and Highlight"
-wm iconname $w "search"
-positionWindow $w
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-frame $w.file
-label $w.file.label -text "File name:" -width 13 -anchor w
-entry $w.file.entry -width 40 -textvariable fileName
-button $w.file.button -text "Load File" \
-	-command "textLoadFile $w.text \$fileName"
-pack $w.file.label $w.file.entry -side left
-pack $w.file.button -side left -pady 5 -padx 10
-bind $w.file.entry <Return> "
-    textLoadFile $w.text \$fileName
-    focus $w.string.entry
-"
-focus $w.file.entry
-
-frame $w.string
-label $w.string.label -text "Search string:" -width 13 -anchor w
-entry $w.string.entry -width 40 -textvariable searchString
-button $w.string.button -text "Highlight" \
-	-command "textSearch $w.text \$searchString search"
-pack $w.string.label $w.string.entry -side left
-pack $w.string.button -side left -pady 5 -padx 10
-bind $w.string.entry <Return> "textSearch $w.text \$searchString search"
-
-text $w.text -yscrollcommand "$w.scroll set" -setgrid true
-ttk::scrollbar $w.scroll -command "$w.text yview"
-pack $w.file $w.string -side top -fill x
-pack $w.scroll -side right -fill y
-pack $w.text -expand yes -fill both
-
-# Set up display styles for text highlighting.
-
-if {[winfo depth $w] > 1} {
-    textToggle "$w.text tag configure search -background \
-	    #ce5555 -foreground white" 800 "$w.text tag configure \
-	    search -background {} -foreground {}" 200
-} else {
-    textToggle "$w.text tag configure search -background \
-	    black -foreground white" 800 "$w.text tag configure \
-	    search -background {} -foreground {}" 200
-}
-$w.text insert 1.0 \
-{This window demonstrates how to use the tagging facilities in text
-widgets to implement a searching mechanism.  First, type a file name
-in the top entry, then type <Return> or click on "Load File".  Then
-type a string in the lower entry and type <Return> or click on
-"Load File".  This will cause all of the instances of the string to
-be tagged with the tag "search", and it will arrange for the tag's
-display attributes to change to make all of the strings blink.}
-$w.text mark set insert 0.0
-
-set fileName ""
-set searchString ""
diff --git a/tk8.6/library/demos/spin.tcl b/tk8.6/library/demos/spin.tcl
deleted file mode 100644
index d897e6d..0000000
--- a/tk8.6/library/demos/spin.tcl
+++ /dev/null
@@ -1,53 +0,0 @@
-# spin.tcl --
-#
-# This demonstration script creates several spinbox widgets.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .spin
-catch {destroy $w}
-toplevel $w
-wm title $w "Spinbox Demonstration"
-wm iconname $w "spin"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 5i -justify left -text "Three different\
-	spin-boxes are displayed below.  You can add characters by pointing,\
-	clicking and typing.  The normal Motif editing characters are\
-	supported, along with many Emacs bindings.  For example, Backspace\
-	and Control-h delete the character to the left of the insertion\
-	cursor and Delete and Control-d delete the chararacter to the right\
-	of the insertion cursor.  For values that are too large to fit in the\
-	window all at once, you can scan through the value by dragging with\
-	mouse button2 pressed.  Note that the first spin-box will only permit\
-	you to type in integers, and the third selects from a list of\
-	Australian cities."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-set australianCities {
-    Canberra Sydney Melbourne Perth Adelaide Brisbane
-    Hobart Darwin "Alice Springs"
-}
-
-spinbox $w.s1 -from 1 -to 10 -width 10 -validate key \
-	-vcmd {string is integer %P}
-spinbox $w.s2 -from 0 -to 3 -increment .5 -format %05.2f -width 10
-spinbox $w.s3 -values $australianCities -width 10
-
-#entry $w.e1
-#entry $w.e2
-#entry $w.e3
-pack $w.s1 $w.s2 $w.s3 -side top -pady 5 -padx 10 ;#-fill x
-
-#$w.e1 insert 0 "Initial value"
-#$w.e2 insert end "This entry contains a long value, much too long "
-#$w.e2 insert end "to fit in the window at one time, so long in fact "
-#$w.e2 insert end "that you'll have to scan or scroll to see the end."
diff --git a/tk8.6/library/demos/square b/tk8.6/library/demos/square
deleted file mode 100644
index 1d7eb20..0000000
--- a/tk8.6/library/demos/square
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-# the next line restarts using wish \
-exec wish "$0" ${1+"$@"}
-
-# square --
-# This script generates a demo application containing only a "square"
-# widget.  It's only usable in the "tktest" application or if Tk has
-# been compiled with tkSquare.c. This demo arranges the following
-# bindings for the widget:
-#
-# Button-1 press/drag:		moves square to mouse
-# "a":				toggle size animation on/off
-
-package require Tk		;# We use Tk generally, and...
-package require Tktest		;# ... we use the square widget too.
-
-square .s
-pack .s -expand yes -fill both
-wm minsize . 1 1
-
-bind .s <1> {center %x %y}
-bind .s <B1-Motion> {center %x %y}
-bind .s a animate
-focus .s
-
-# The procedure below centers the square on a given position.
-
-proc center {x y} {
-    set a [.s size]
-    .s position [expr $x-($a/2)] [expr $y-($a/2)]
-}
-
-# The procedures below provide a simple form of animation where
-# the box changes size in a pulsing pattern: larger, smaller, larger,
-# and so on.
-
-set inc 0
-proc animate {} {
-    global inc
-    if {$inc == 0} {
-	set inc 3
-	timer
-    } else {
-	set inc 0
-    }
-}
-
-proc timer {} {
-    global inc
-    set s [.s size]
-    if {$inc == 0} return
-    if {$s >= 40} {set inc -3}
-    if {$s <= 10} {set inc 3}
-    .s size [expr {$s+$inc}]
-    after 30 timer
-}
-
-# Local Variables:
-# mode: tcl
-# End:
diff --git a/tk8.6/library/demos/states.tcl b/tk8.6/library/demos/states.tcl
deleted file mode 100644
index aeb3d5b..0000000
--- a/tk8.6/library/demos/states.tcl
+++ /dev/null
@@ -1,54 +0,0 @@
-# states.tcl --
-#
-# This demonstration script creates a listbox widget that displays
-# the names of the 50 states in the United States of America.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .states
-catch {destroy $w}
-toplevel $w
-wm title $w "Listbox Demonstration (50 states)"
-wm iconname $w "states"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -justify left -text "A listbox containing the 50 states is displayed below, along with a scrollbar.  You can scan the list either using the scrollbar or by scanning.  To scan, press button 2 in the widget and drag up or down."
-pack $w.msg -side top
-
-labelframe $w.justif -text Justification
-foreach c {Left Center Right} {
-    set lower [string tolower $c]
-    radiobutton $w.justif.$lower -text $c -variable just \
-        -relief flat -value $lower -anchor w \
-        -command "$w.frame.list configure -justify \$just" \
-        -tristatevalue "multi"
-    pack $w.justif.$lower -side left -pady 2 -fill x
-}
-pack $w.justif
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-frame $w.frame -borderwidth .5c
-pack $w.frame -side top -expand yes -fill y
-
-ttk::scrollbar $w.frame.scroll -command "$w.frame.list yview"
-listbox $w.frame.list -yscroll "$w.frame.scroll set" -setgrid 1 -height 12
-pack $w.frame.scroll -side right -fill y
-pack $w.frame.list -side left -expand 1 -fill both
-
-$w.frame.list insert 0 Alabama Alaska Arizona Arkansas California \
-    Colorado Connecticut Delaware Florida Georgia Hawaii Idaho Illinois \
-    Indiana Iowa Kansas Kentucky Louisiana Maine Maryland \
-    Massachusetts Michigan Minnesota Mississippi Missouri \
-    Montana Nebraska Nevada "New Hampshire" "New Jersey" "New Mexico" \
-    "New York" "North Carolina" "North Dakota" \
-    Ohio Oklahoma Oregon Pennsylvania "Rhode Island" \
-    "South Carolina" "South Dakota" \
-    Tennessee Texas Utah Vermont Virginia Washington \
-    "West Virginia" Wisconsin Wyoming
diff --git a/tk8.6/library/demos/style.tcl b/tk8.6/library/demos/style.tcl
deleted file mode 100644
index a529a03..0000000
--- a/tk8.6/library/demos/style.tcl
+++ /dev/null
@@ -1,155 +0,0 @@
-# style.tcl --
-#
-# This demonstration script creates a text widget that illustrates the
-# various display styles that may be set for tags.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .style
-catch {destroy $w}
-toplevel $w
-wm title $w "Text Demonstration - Display Styles"
-wm iconname $w "style"
-positionWindow $w
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-# Only set the font family in one place for simplicity and consistency
-
-set family Courier
-
-text $w.text -yscrollcommand "$w.scroll set" -setgrid true \
-	-width 70 -height 32 -wrap word -font "$family 12"
-ttk::scrollbar $w.scroll -command "$w.text yview"
-pack $w.scroll -side right -fill y
-pack $w.text -expand yes -fill both
-
-# Set up display styles
-
-$w.text tag configure bold -font "$family 12 bold italic"
-$w.text tag configure big -font "$family 14 bold"
-$w.text tag configure verybig -font "Helvetica 24 bold"
-$w.text tag configure tiny -font "Times 8 bold"
-if {[winfo depth $w] > 1} {
-    $w.text tag configure color1 -background #a0b7ce
-    $w.text tag configure color2 -foreground red
-    $w.text tag configure raised -relief raised -borderwidth 1
-    $w.text tag configure sunken -relief sunken -borderwidth 1
-} else {
-    $w.text tag configure color1 -background black -foreground white
-    $w.text tag configure color2 -background black -foreground white
-    $w.text tag configure raised -background white -relief raised \
-	    -borderwidth 1
-    $w.text tag configure sunken -background white -relief sunken \
-	    -borderwidth 1
-}
-$w.text tag configure bgstipple -background black -borderwidth 0 \
-	-bgstipple gray12
-$w.text tag configure fgstipple -fgstipple gray50
-$w.text tag configure underline -underline on
-$w.text tag configure overstrike -overstrike on
-$w.text tag configure right -justify right
-$w.text tag configure center -justify center
-$w.text tag configure super -offset 4p -font "$family 10"
-$w.text tag configure sub -offset -2p -font "$family 10"
-$w.text tag configure margins -lmargin1 12m -lmargin2 6m -rmargin 10m
-$w.text tag configure spacing -spacing1 10p -spacing2 2p \
-	-lmargin1 12m -lmargin2 6m -rmargin 10m
-
-$w.text insert end {Text widgets like this one allow you to display information in a
-variety of styles.  Display styles are controlled using a mechanism
-called }
-$w.text insert end tags bold
-$w.text insert end {.  Tags are just textual names that you can apply to one
-or more ranges of characters within a text widget.  You can configure
-tags with various display styles.  If you do this, then the tagged
-characters will be displayed with the styles you chose.  The
-available display styles are:
-}
-$w.text insert end "\n1. Font." big
-$w.text insert end "  You can choose any system font, "
-$w.text insert end large verybig
-$w.text insert end " or "
-$w.text insert end "small" tiny ".\n"
-$w.text insert end "\n2. Color." big
-$w.text insert end "  You can change either the "
-$w.text insert end background color1
-$w.text insert end " or "
-$w.text insert end foreground color2
-$w.text insert end "\ncolor, or "
-$w.text insert end both {color1 color2}
-$w.text insert end ".\n"
-$w.text insert end "\n3. Stippling." big
-$w.text insert end "  You can cause either the "
-$w.text insert end background bgstipple
-$w.text insert end " or "
-$w.text insert end foreground fgstipple
-$w.text insert end {
-information to be drawn with a stipple fill instead of a solid fill.
-}
-$w.text insert end "\n4. Underlining." big
-$w.text insert end "  You can "
-$w.text insert end underline underline
-$w.text insert end " ranges of text.\n"
-$w.text insert end "\n5. Overstrikes." big
-$w.text insert end "  You can "
-$w.text insert end "draw lines through" overstrike
-$w.text insert end " ranges of text.\n"
-$w.text insert end "\n6. 3-D effects." big
-$w.text insert end {  You can arrange for the background to be drawn
-with a border that makes characters appear either }
-$w.text insert end raised raised
-$w.text insert end " or "
-$w.text insert end sunken sunken
-$w.text insert end ".\n"
-$w.text insert end "\n7. Justification." big
-$w.text insert end " You can arrange for lines to be displayed\n"
-$w.text insert end "left-justified,\n"
-$w.text insert end "right-justified, or\n" right
-$w.text insert end "centered.\n" center
-$w.text insert end "\n8. Superscripts and subscripts."  big
-$w.text insert end " You can control the vertical\n"
-$w.text insert end "position of text to generate superscript effects like 10"
-$w.text insert end "n" super
-$w.text insert end " or\nsubscript effects like X"
-$w.text insert end "i" sub
-$w.text insert end ".\n"
-$w.text insert end "\n9. Margins." big
-$w.text insert end " You can control the amount of extra space left"
-$w.text insert end " on\neach side of the text:\n"
-$w.text insert end "This paragraph is an example of the use of " margins
-$w.text insert end "margins.  It consists of a single line of text " margins
-$w.text insert end "that wraps around on the screen.  There are two " margins
-$w.text insert end "separate left margin values, one for the first " margins
-$w.text insert end "display line associated with the text line, " margins
-$w.text insert end "and one for the subsequent display lines, which " margins
-$w.text insert end "occur because of wrapping.  There is also a " margins
-$w.text insert end "separate specification for the right margin, " margins
-$w.text insert end "which is used to choose wrap points for lines.\n" margins
-$w.text insert end "\n10. Spacing." big
-$w.text insert end " You can control the spacing of lines with three\n"
-$w.text insert end "separate parameters.  \"Spacing1\" tells how much "
-$w.text insert end "extra space to leave\nabove a line, \"spacing3\" "
-$w.text insert end "tells how much space to leave below a line,\nand "
-$w.text insert end "if a text line wraps, \"spacing2\" tells how much "
-$w.text insert end "space to leave\nbetween the display lines that "
-$w.text insert end "make up the text line.\n"
-$w.text insert end "These indented paragraphs illustrate how spacing " spacing
-$w.text insert end "can be used.  Each paragraph is actually a " spacing
-$w.text insert end "single line in the text widget, which is " spacing
-$w.text insert end "word-wrapped by the widget.\n" spacing
-$w.text insert end "Spacing1 is set to 10 points for this text, " spacing
-$w.text insert end "which results in relatively large gaps between " spacing
-$w.text insert end "the paragraphs.  Spacing2 is set to 2 points, " spacing
-$w.text insert end "which results in just a bit of extra space " spacing
-$w.text insert end "within a pararaph.  Spacing3 isn't used " spacing
-$w.text insert end "in this example.\n" spacing
-$w.text insert end "To see where the space is, select ranges of " spacing
-$w.text insert end "text within these paragraphs.  The selection " spacing
-$w.text insert end "highlight will cover the extra space." spacing
diff --git a/tk8.6/library/demos/tclIndex b/tk8.6/library/demos/tclIndex
deleted file mode 100644
index 86a72e2..0000000
--- a/tk8.6/library/demos/tclIndex
+++ /dev/null
@@ -1,67 +0,0 @@
-# Tcl autoload index file, version 2.0
-# This file is generated by the "auto_mkindex" command
-# and sourced to set up indexing information for one or
-# more commands.  Typically each line is a command that
-# sets an element in the auto_index array, where the
-# element name is the name of a command and the value is
-# a script that loads the command.
-
-set auto_index(arrowSetup) [list source [file join $dir arrow.tcl]]
-set auto_index(arrowMove1) [list source [file join $dir arrow.tcl]]
-set auto_index(arrowMove2) [list source [file join $dir arrow.tcl]]
-set auto_index(arrowMove3) [list source [file join $dir arrow.tcl]]
-set auto_index(textLoadFile) [list source [file join $dir search.tcl]]
-set auto_index(textSearch) [list source [file join $dir search.tcl]]
-set auto_index(textToggle) [list source [file join $dir search.tcl]]
-set auto_index(itemEnter) [list source [file join $dir items.tcl]]
-set auto_index(itemLeave) [list source [file join $dir items.tcl]]
-set auto_index(itemMark) [list source [file join $dir items.tcl]]
-set auto_index(itemStroke) [list source [file join $dir items.tcl]]
-set auto_index(itemsUnderArea) [list source [file join $dir items.tcl]]
-set auto_index(itemStartDrag) [list source [file join $dir items.tcl]]
-set auto_index(itemDrag) [list source [file join $dir items.tcl]]
-set auto_index(butPress) [list source [file join $dir items.tcl]]
-set auto_index(loadDir) [list source [file join $dir image2.tcl]]
-set auto_index(loadImage) [list source [file join $dir image2.tcl]]
-set auto_index(rulerMkTab) [list source [file join $dir ruler.tcl]]
-set auto_index(rulerNewTab) [list source [file join $dir ruler.tcl]]
-set auto_index(rulerSelectTab) [list source [file join $dir ruler.tcl]]
-set auto_index(rulerMoveTab) [list source [file join $dir ruler.tcl]]
-set auto_index(rulerReleaseTab) [list source [file join $dir ruler.tcl]]
-set auto_index(mkTextConfig) [list source [file join $dir ctext.tcl]]
-set auto_index(textEnter) [list source [file join $dir ctext.tcl]]
-set auto_index(textInsert) [list source [file join $dir ctext.tcl]]
-set auto_index(textPaste) [list source [file join $dir ctext.tcl]]
-set auto_index(textB1Press) [list source [file join $dir ctext.tcl]]
-set auto_index(textB1Move) [list source [file join $dir ctext.tcl]]
-set auto_index(textBs) [list source [file join $dir ctext.tcl]]
-set auto_index(textDel) [list source [file join $dir ctext.tcl]]
-set auto_index(bitmapRow) [list source [file join $dir bitmap.tcl]]
-set auto_index(scrollEnter) [list source [file join $dir cscroll.tcl]]
-set auto_index(scrollLeave) [list source [file join $dir cscroll.tcl]]
-set auto_index(scrollButton) [list source [file join $dir cscroll.tcl]]
-set auto_index(textWindOn) [list source [file join $dir twind.tcl]]
-set auto_index(textWindOff) [list source [file join $dir twind.tcl]]
-set auto_index(textWindPlot) [list source [file join $dir twind.tcl]]
-set auto_index(embPlotDown) [list source [file join $dir twind.tcl]]
-set auto_index(embPlotMove) [list source [file join $dir twind.tcl]]
-set auto_index(textWindDel) [list source [file join $dir twind.tcl]]
-set auto_index(embDefBg) [list source [file join $dir twind.tcl]]
-set auto_index(floorDisplay) [list source [file join $dir floor.tcl]]
-set auto_index(newRoom) [list source [file join $dir floor.tcl]]
-set auto_index(roomChanged) [list source [file join $dir floor.tcl]]
-set auto_index(bg1) [list source [file join $dir floor.tcl]]
-set auto_index(bg2) [list source [file join $dir floor.tcl]]
-set auto_index(bg3) [list source [file join $dir floor.tcl]]
-set auto_index(fg1) [list source [file join $dir floor.tcl]]
-set auto_index(fg2) [list source [file join $dir floor.tcl]]
-set auto_index(fg3) [list source [file join $dir floor.tcl]]
-set auto_index(setWidth) [list source [file join $dir hscale.tcl]]
-set auto_index(plotDown) [list source [file join $dir plot.tcl]]
-set auto_index(plotMove) [list source [file join $dir plot.tcl]]
-set auto_index(puzzleSwitch) [list source [file join $dir puzzle.tcl]]
-set auto_index(setHeight) [list source [file join $dir vscale.tcl]]
-set auto_index(showMessageBox) [list source [file join $dir msgbox.tcl]]
-set auto_index(setColor) [list source [file join $dir clrpick.tcl]]
-set auto_index(setColor_helper) [list source [file join $dir clrpick.tcl]]
-set auto_index(fileDialog) [list source [file join $dir filebox.tcl]]
diff --git a/tk8.6/library/demos/tcolor b/tk8.6/library/demos/tcolor
deleted file mode 100644
index 6e50c61..0000000
--- a/tk8.6/library/demos/tcolor
+++ /dev/null
@@ -1,358 +0,0 @@
-#!/bin/sh
-# the next line restarts using wish \
-exec wish "$0" ${1+"$@"}
-
-# tcolor --
-# This script implements a simple color editor, where you can
-# create colors using either the RGB, HSB, or CYM color spaces
-# and apply the color to existing applications.
-
-package require Tk 8.4
-wm title . "Color Editor"
-
-# Global variables that control the program:
-#
-# colorSpace -			Color space currently being used for
-#				editing.  Must be "rgb", "cmy", or "hsb".
-# label1, label2, label3 -	Labels for the scales.
-# red, green, blue -		Current color intensities in decimal
-#				on a scale of 0-65535.
-# color -			A string giving the current color value
-#				in the proper form for x:
-#				#RRRRGGGGBBBB
-# updating -			Non-zero means that we're in the middle of
-#				updating the scales to load a new color,so
-#				information shouldn't be propagating back
-#				from the scales to other elements of the
-#				program:  this would make an infinite loop.
-# command -			Holds the command that has been typed
-#				into the "Command" entry.
-# autoUpdate -			1 means execute the update command
-#				automatically whenever the color changes.
-# name -			Name for new color, typed into entry.
-
-set colorSpace hsb
-set red 65535
-set green 0
-set blue 0
-set color #ffff00000000
-set updating 0
-set autoUpdate 1
-set name ""
-
-# Create the menu bar at the top of the window.
-
-. configure -menu [menu .menu]
-menu .menu.file
-.menu add cascade  -menu .menu.file  -label File  -underline 0
-.menu.file add radio -label "RGB color space" -variable colorSpace \
-	-value rgb -underline 0 -command {changeColorSpace rgb}
-.menu.file add radio -label "CMY color space" -variable colorSpace \
-	-value cmy -underline 0 -command {changeColorSpace cmy}
-.menu.file add radio -label "HSB color space" -variable colorSpace \
-	-value hsb -underline 0 -command {changeColorSpace hsb}
-.menu.file add separator
-.menu.file add radio -label "Automatic updates" -variable autoUpdate \
-	-value 1 -underline 0
-.menu.file add radio -label "Manual updates" -variable autoUpdate \
-	-value 0 -underline 0
-.menu.file add separator
-.menu.file add command -label "Exit program" -underline 0 -command {exit}
-
-# Create the command entry window at the bottom of the window, along
-# with the update button.
-
-labelframe .command -text "Command:" -padx {1m 0}
-entry .command.e -textvariable command
-button .command.update -text Update -command doUpdate
-pack .command.update -side right -pady .1c -padx {.25c 0}
-pack .command.e -expand yes -fill x -ipadx 0.25c
-
-
-# Create the listbox that holds all of the color names in rgb.txt,
-# if an rgb.txt file can be found.
-
-grid .command -sticky nsew -row 2 -columnspan 3 -padx 1m -pady {0 1m}
-
-grid columnconfigure . {1 2} -weight 1
-grid rowconfigure . 0 -weight 1
-foreach i {
-    /usr/local/lib/X11/rgb.txt /usr/lib/X11/rgb.txt
-    /X11/R5/lib/X11/rgb.txt /X11/R4/lib/rgb/rgb.txt
-    /usr/openwin/lib/X11/rgb.txt
-} {
-    if {![file readable $i]} {
-	continue;
-    }
-    set f [open $i]
-    labelframe .names -text "Select:" -padx .1c -pady .1c
-    grid .names -row 0 -column 0 -sticky nsew -padx .15c -pady .15c -rowspan 2
-    grid columnconfigure . 0 -weight 1
-    listbox .names.lb -width 20 -height 12 -yscrollcommand ".names.s set" \
-	-exportselection false
-    bind .names.lb <Double-1> {
-	    tc_loadNamedColor [.names.lb get [.names.lb curselection]]
-    }
-    scrollbar .names.s -orient vertical -command ".names.lb yview"
-    pack .names.lb .names.s -side left -fill y -expand 1
-    while {[gets $f line] >= 0} {
-	if {[regexp {^\s*\d+\s+\d+\s+\d+\s+(\S+)$} $line -> col]} {
-	    .names.lb insert end $col
-	}
-    }
-    close $f
-    break
-}
-
-# Create the three scales for editing the color, and the entry for
-# typing in a color value.
-
-frame .adjust
-foreach i {1 2 3} {
-    label .adjust.l$i -textvariable label$i -pady 0
-    labelframe .adjust.$i -labelwidget .adjust.l$i -padx 1m -pady 1m
-    scale .scale$i -from 0 -to 1000 -length 6c -orient horizontal \
-	    -command tc_scaleChanged
-    pack .scale$i -in .adjust.$i
-    pack .adjust.$i
-}
-grid .adjust -row 0 -column 1 -sticky nsew -padx .15c -pady .15c
-
-labelframe .name -text "Name:" -padx 1m -pady 1m
-entry .name.e -textvariable name -width 10
-pack .name.e -side right -expand 1 -fill x
-bind .name.e <Return> {tc_loadNamedColor $name}
-grid .name   -column 1 -row 1 -sticky nsew -padx .15c -pady .15c
-
-# Create the color display swatch on the right side of the window.
-
-labelframe .sample -text "Color:" -padx 1m -pady 1m
-frame .sample.swatch -width 2c -height 5c -background $color
-label .sample.value -textvariable color -width 13 -font {Courier 12}
-pack .sample.swatch -side top -expand yes -fill both
-pack .sample.value -side bottom -pady .25c
-grid .sample -row 0 -column 2 -sticky nsew -padx .15c -pady .15c -rowspan 2
-
-
-# The procedure below is invoked when one of the scales is adjusted.
-# It propagates color information from the current scale readings
-# to everywhere else that it is used.
-
-proc tc_scaleChanged args {
-    global red green blue colorSpace color updating autoUpdate
-    if {$updating} {
-	return
-    }
-    switch $colorSpace {
-	rgb {
-	    set red   [format %.0f [expr {[.scale1 get]*65.535}]]
-	    set green [format %.0f [expr {[.scale2 get]*65.535}]]
-	    set blue  [format %.0f [expr {[.scale3 get]*65.535}]]
-	}
-	cmy {
-	    set red   [format %.0f [expr {65535 - [.scale1 get]*65.535}]]
-	    set green [format %.0f [expr {65535 - [.scale2 get]*65.535}]]
-	    set blue  [format %.0f [expr {65535 - [.scale3 get]*65.535}]]
-	}
-	hsb {
-	    set list [hsbToRgb [expr {[.scale1 get]/1000.0}] \
-		    [expr {[.scale2 get]/1000.0}] \
-		    [expr {[.scale3 get]/1000.0}]]
-	    set red [lindex $list 0]
-	    set green [lindex $list 1]
-	    set blue [lindex $list 2]
-	}
-    }
-    set color [format "#%04x%04x%04x" $red $green $blue]
-    .sample.swatch config -bg $color
-    if {$autoUpdate} doUpdate
-    update idletasks
-}
-
-# The procedure below is invoked to update the scales from the
-# current red, green, and blue intensities.  It's invoked after
-# a change in the color space and after a named color value has
-# been loaded.
-
-proc tc_setScales {} {
-    global red green blue colorSpace updating
-    set updating 1
-    switch $colorSpace {
-	rgb {
-	    .scale1 set [format %.0f [expr {$red/65.535}]]
-	    .scale2 set [format %.0f [expr {$green/65.535}]]
-	    .scale3 set [format %.0f [expr {$blue/65.535}]]
-	}
-	cmy {
-	    .scale1 set [format %.0f [expr {(65535-$red)/65.535}]]
-	    .scale2 set [format %.0f [expr {(65535-$green)/65.535}]]
-	    .scale3 set [format %.0f [expr {(65535-$blue)/65.535}]]
-	}
-	hsb {
-	    set list [rgbToHsv $red $green $blue]
-	    .scale1 set [format %.0f [expr {[lindex $list 0] * 1000.0}]]
-	    .scale2 set [format %.0f [expr {[lindex $list 1] * 1000.0}]]
-	    .scale3 set [format %.0f [expr {[lindex $list 2] * 1000.0}]]
-	}
-    }
-    set updating 0
-}
-
-# The procedure below is invoked when a named color has been
-# selected from the listbox or typed into the entry.  It loads
-# the color into the editor.
-
-proc tc_loadNamedColor name {
-    global red green blue color autoUpdate
-
-    if {[string index $name 0] != "#"} {
-	set list [winfo rgb .sample.swatch $name]
-	set red [lindex $list 0]
-	set green [lindex $list 1]
-	set blue [lindex $list 2]
-    } else {
-	switch [string length $name] {
-	    4  {set format "#%1x%1x%1x"; set shift 12}
-	    7  {set format "#%2x%2x%2x"; set shift 8}
-	    10 {set format "#%3x%3x%3x"; set shift 4}
-	    13 {set format "#%4x%4x%4x"; set shift 0}
-	    default {error "syntax error in color name \"$name\""}
-	}
-	if {[scan $name $format red green blue] != 3} {
-	    error "syntax error in color name \"$name\""
-	}
-	set red   [expr {$red<<$shift}]
-	set green [expr {$green<<$shift}]
-	set blue  [expr {$blue<<$shift}]
-    }
-    tc_setScales
-    set color [format "#%04x%04x%04x" $red $green $blue]
-    .sample.swatch config -bg $color
-    if {$autoUpdate} doUpdate
-}
-
-# The procedure below is invoked when a new color space is selected.
-# It changes the labels on the scales and re-loads the scales with
-# the appropriate values for the current color in the new color space
-
-proc changeColorSpace space {
-    global label1 label2 label3
-    switch $space {
-	rgb {
-	    set label1 "Adjust Red:"
-	    set label2 "Adjust Green:"
-	    set label3 "Adjust Blue:"
-	    tc_setScales
-	    return
-	}
-	cmy {
-	    set label1 "Adjust Cyan:"
-	    set label2 "Adjust Magenta:"
-	    set label3 "Adjust Yellow:"
-	    tc_setScales
-	    return
-	}
-	hsb {
-	    set label1 "Adjust Hue:"
-	    set label2 "Adjust Saturation:"
-	    set label3 "Adjust Brightness:"
-	    tc_setScales
-	    return
-	}
-    }
-}
-
-# The procedure below converts an RGB value to HSB.  It takes red, green,
-# and blue components (0-65535) as arguments, and returns a list containing
-# HSB components (floating-point, 0-1) as result.  The code here is a copy
-# of the code on page 615 of "Fundamentals of Interactive Computer Graphics"
-# by Foley and Van Dam.
-
-proc rgbToHsv {red green blue} {
-    if {$red > $green} {
-	set max [expr {double($red)}]
-	set min [expr {double($green)}]
-    } else {
-	set max [expr {double($green)}]
-	set min [expr {double($red)}]
-    }
-    if {$blue > $max} {
-	set max [expr {double($blue)}]
-    } elseif {$blue < $min} {
-	set min [expr {double($blue)}]
-    }
-    set range [expr {$max-$min}]
-    if {$max == 0} {
-	set sat 0
-    } else {
-	set sat [expr {($max-$min)/$max}]
-    }
-    if {$sat == 0} {
-	set hue 0
-    } else {
-	set rc [expr {($max - $red)/$range}]
-	set gc [expr {($max - $green)/$range}]
-	set bc [expr {($max - $blue)/$range}]
-	if {$red == $max} {
-	    set hue [expr {($bc - $gc)/6.0}]
-	} elseif {$green == $max} {
-	    set hue [expr {(2 + $rc - $bc)/6.0}]
-	} else {
-	    set hue [expr {(4 + $gc - $rc)/6.0}]
-	}
-	if {$hue < 0.0} {
-	    set hue [expr {$hue + 1.0}]
-	}
-    }
-    return [list $hue $sat [expr {$max/65535}]]
-}
-
-# The procedure below converts an HSB value to RGB.  It takes hue, saturation,
-# and value components (floating-point, 0-1.0) as arguments, and returns a
-# list containing RGB components (integers, 0-65535) as result.  The code
-# here is a copy of the code on page 616 of "Fundamentals of Interactive
-# Computer Graphics" by Foley and Van Dam.
-
-proc hsbToRgb {hue sat value} {
-    set v [format %.0f [expr {65535.0*$value}]]
-    if {$sat == 0} {
-	return "$v $v $v"
-    } else {
-	set hue [expr {$hue*6.0}]
-	if {$hue >= 6.0} {
-	    set hue 0.0
-	}
-	scan $hue. %d i
-	set f [expr {$hue-$i}]
-	set p [format %.0f [expr {65535.0*$value*(1 - $sat)}]]
-	set q [format %.0f [expr {65535.0*$value*(1 - ($sat*$f))}]]
-	set t [format %.0f [expr {65535.0*$value*(1 - ($sat*(1 - $f)))}]]
-	switch $i {
-	    0 {return "$v $t $p"}
-	    1 {return "$q $v $p"}
-	    2 {return "$p $v $t"}
-	    3 {return "$p $q $v"}
-	    4 {return "$t $p $v"}
-	    5 {return "$v $p $q"}
-	    default {error "i value $i is out of range"}
-	}
-    }
-}
-
-# The procedure below is invoked when the "Update" button is pressed,
-# and whenever the color changes if update mode is enabled.  It
-# propagates color information as determined by the command in the
-# Command entry.
-
-proc doUpdate {} {
-    global color command
-    set newCmd $command
-    regsub -all %% $command $color newCmd
-    eval $newCmd
-}
-
-changeColorSpace hsb
-
-# Local Variables:
-# mode: tcl
-# End:
diff --git a/tk8.6/library/demos/text.tcl b/tk8.6/library/demos/text.tcl
deleted file mode 100644
index d1801d1..0000000
--- a/tk8.6/library/demos/text.tcl
+++ /dev/null
@@ -1,111 +0,0 @@
-# text.tcl --
-#
-# This demonstration script creates a text widget that describes
-# the basic editing functions.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .text
-catch {destroy $w}
-toplevel $w
-wm title $w "Text Demonstration - Basic Facilities"
-wm iconname $w "text"
-positionWindow $w
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w {} \
-	{ttk::button $w.buttons.fontchooser -command fontchooserToggle}]
-pack $btns -side bottom -fill x
-
-text $w.text -yscrollcommand [list $w.scroll set] -setgrid 1 \
-	-height 30 -undo 1 -autosep 1
-ttk::scrollbar $w.scroll -command [list $w.text yview]
-pack $w.scroll -side right -fill y
-pack $w.text -expand yes -fill both
-
-# TIP 324 Demo: [tk fontchooser]
-proc fontchooserToggle {} {
-    tk fontchooser [expr {[tk fontchooser configure -visible] ?
-            "hide" : "show"}]
-}
-proc fontchooserVisibility {w} {
-    $w configure -text [expr {[tk fontchooser configure -visible] ?
-            "Hide Font Dialog" : "Show Font Dialog"}]
-}
-proc fontchooserFocus {w} {
-    tk fontchooser configure -font [$w cget -font] \
-	    -command [list fontchooserFontSel $w]
-}
-proc fontchooserFontSel {w font args} {
-    $w configure -font [font actual $font]
-}
-tk fontchooser configure -parent $w
-bind $w.text <FocusIn> [list fontchooserFocus $w.text]
-fontchooserVisibility $w.buttons.fontchooser
-bind $w <<TkFontchooserVisibility>> [list \
-	fontchooserVisibility $w.buttons.fontchooser]
-focus $w.text
-
-$w.text insert 0.0 \
-{This window is a text widget.  It displays one or more lines of text
-and allows you to edit the text.  Here is a summary of the things you
-can do to a text widget:
-
-1. Scrolling. Use the scrollbar to adjust the view in the text window.
-
-2. Scanning. Press mouse button 2 in the text window and drag up or down.
-This will drag the text at high speed to allow you to scan its contents.
-
-3. Insert text. Press mouse button 1 to set the insertion cursor, then
-type text.  What you type will be added to the widget.
-
-4. Select. Press mouse button 1 and drag to select a range of characters.
-Once you've released the button, you can adjust the selection by pressing
-button 1 with the shift key down.  This will reset the end of the
-selection nearest the mouse cursor and you can drag that end of the
-selection by dragging the mouse before releasing the mouse button.
-You can double-click to select whole words or triple-click to select
-whole lines.
-
-5. Delete and replace. To delete text, select the characters you'd like
-to delete and type Backspace or Delete.  Alternatively, you can type new
-text, in which case it will replace the selected text.
-
-6. Copy the selection. To copy the selection into this window, select
-what you want to copy (either here or in another application), then
-click button 2 to copy the selection to the point of the mouse cursor.
-
-7. Edit.  Text widgets support the standard Motif editing characters
-plus many Emacs editing characters.  Backspace and Control-h erase the
-character to the left of the insertion cursor.  Delete and Control-d
-erase the character to the right of the insertion cursor.  Meta-backspace
-deletes the word to the left of the insertion cursor, and Meta-d deletes
-the word to the right of the insertion cursor.  Control-k deletes from
-the insertion cursor to the end of the line, or it deletes the newline
-character if that is the only thing left on the line.  Control-o opens
-a new line by inserting a newline character to the right of the insertion
-cursor.  Control-t transposes the two characters on either side of the
-insertion cursor.  Control-z undoes the last editing action performed,
-and }
-
-switch [tk windowingsystem] {
-    "aqua" - "x11" {
-	$w.text insert end "Control-Shift-z"
-    }
-    "win32" {
-	$w.text insert end "Control-y"
-    }
-}
-
-$w.text insert end { redoes undone edits.
-
-7. Resize the window.  This widget has been configured with the "setGrid"
-option on, so that if you resize the window it will always resize to an
-even number of characters high and wide.  Also, if you make the window
-narrow you can see that long lines automatically wrap around onto
-additional lines so that all the information is always visible.}
-$w.text mark set insert 0.0
diff --git a/tk8.6/library/demos/textpeer.tcl b/tk8.6/library/demos/textpeer.tcl
deleted file mode 100644
index 83e8e14..0000000
--- a/tk8.6/library/demos/textpeer.tcl
+++ /dev/null
@@ -1,62 +0,0 @@
-# textpeer.tcl --
-#
-# This demonstration script creates a pair of text widgets that can edit a
-# single logical buffer. This is particularly useful when editing related text
-# in two (or more) parts of the same file.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .textpeer
-catch {destroy $w}
-toplevel $w
-wm title $w "Text Widget Peering Demonstration"
-wm iconname $w "textpeer"
-positionWindow $w
-
-set count 0
-
-## Define a widget that we peer from; it won't ever actually be shown though
-set first [text $w.text[incr count]]
-$first insert end "This is a coupled pair of text widgets; they are peers to "
-$first insert end "each other. They have the same underlying data model, but "
-$first insert end "can show different locations, have different current edit "
-$first insert end "locations, and have different selections. You can also "
-$first insert end "create additional peers of any of these text widgets using "
-$first insert end "the Make Peer button beside the text widget to clone, and "
-$first insert end "delete a particular peer widget using the Delete Peer "
-$first insert end "button."
-
-## Procedures to make and kill clones; most of this is just so that the demo
-## looks nice...
-proc makeClone {w parent} {
-    global count
-    set t [$parent peer create $w.text[incr count] -yscroll "$w.sb$count set"\
-		  -height 10 -wrap word]
-    set sb [ttk::scrollbar $w.sb$count -command "$t yview" -orient vertical]
-    set b1 [button $w.clone$count -command "makeClone $w $t" \
-		    -text "Make Peer"]
-    set b2 [button $w.kill$count -command "killClone $w $count" \
-		    -text "Delete Peer"]
-    set row [expr {$count * 2}]
-    grid $t $sb $b1 -sticky nsew -row $row
-    grid ^  ^   $b2 -row [incr row]
-    grid configure $b1 $b2 -sticky new
-    grid rowconfigure $w $b2 -weight 1
-}
-proc killClone {w count} {
-    destroy $w.text$count $w.sb$count
-    destroy $w.clone$count $w.kill$count
-}
-
-## Now set up the GUI
-makeClone $w $first
-makeClone $w $first
-destroy $first
-
-## See Code / Dismiss buttons
-grid [addSeeDismiss $w.buttons $w] - - -sticky ew -row 5000
-grid columnconfigure $w 0 -weight 1
diff --git a/tk8.6/library/demos/timer b/tk8.6/library/demos/timer
deleted file mode 100644
index 6b61ca4..0000000
--- a/tk8.6/library/demos/timer
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-# the next line restarts using wish \
-exec wish "$0" ${1+"$@"}
-
-# timer --
-# This script generates a counter with start and stop buttons.
-
-package require Tk
-
-label .counter -text 0.00 -relief raised -width 10 -padx 2m -pady 1m
-button .start -text Start -command {
-    if {$stopped} {
-	set stopped 0
-	set startMoment [clock clicks -milliseconds]
-	tick
-	.stop configure -state normal
-	.start configure -state disabled
-    }
-}
-button .stop -text Stop -state disabled -command {
-    set stopped 1
-    .stop configure -state disabled
-    .start configure -state normal
-}
-pack .counter -side bottom -fill both
-pack .start -side left -fill both -expand yes
-pack .stop -side right -fill both -expand yes
-
-set startMoment {}
-
-set stopped 1
-
-proc tick {} {
-    global startMoment stopped
-    if {$stopped} {return}
-    after 50 tick
-    set elapsedMS [expr {[clock clicks -milliseconds] - $startMoment}]
-    .counter config -text [format "%.2f" [expr {double($elapsedMS)/1000}]]
-}
-
-bind . <Control-c> {destroy .}
-bind . <Control-q> {destroy .}
-focus .
-
-# Local Variables:
-# mode: tcl
-# End:
diff --git a/tk8.6/library/demos/toolbar.tcl b/tk8.6/library/demos/toolbar.tcl
deleted file mode 100644
index 0ae4669..0000000
--- a/tk8.6/library/demos/toolbar.tcl
+++ /dev/null
@@ -1,92 +0,0 @@
-# toolbar.tcl --
-#
-# This demonstration script creates a toolbar that can be torn off.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .toolbar
-destroy $w
-toplevel $w
-wm title $w "Toolbar Demonstration"
-wm iconname $w "toolbar"
-positionWindow $w
-
-ttk::label $w.msg -wraplength 4i -text "This is a demonstration of how to do\
-	a toolbar that is styled correctly and which can be torn off. The\
-	buttons are configured to be \u201Ctoolbar style\u201D buttons by\
-	telling them that they are to use the Toolbutton style. At the left\
-	end of the toolbar is a simple marker that the cursor changes to a\
-	movement icon over; drag that away from the toolbar to tear off the\
-	whole toolbar into a separate toplevel widget. When the dragged-off\
-	toolbar is no longer needed, just close it like any normal toplevel\
-	and it will reattach to the window it was torn off from."
-
-## Set up the toolbar hull
-set t [frame $w.toolbar]		;# Must be a frame!
-ttk::separator $w.sep
-ttk::frame $t.tearoff -cursor fleur
-ttk::separator $t.tearoff.to -orient vertical
-ttk::separator $t.tearoff.to2 -orient vertical
-pack $t.tearoff.to -fill y -expand 1 -padx 2 -side left
-pack $t.tearoff.to2 -fill y -expand 1 -side left
-ttk::frame $t.contents
-grid $t.tearoff $t.contents -sticky nsew
-grid columnconfigure $t $t.contents -weight 1
-grid columnconfigure $t.contents 1000 -weight 1
-
-## Bindings so that the toolbar can be torn off and reattached
-bind $t.tearoff     <B1-Motion> [list tearoff $t %X %Y]
-bind $t.tearoff.to  <B1-Motion> [list tearoff $t %X %Y]
-bind $t.tearoff.to2 <B1-Motion> [list tearoff $t %X %Y]
-proc tearoff {w x y} {
-    if {[string match $w* [winfo containing $x $y]]} {
-	return
-    }
-    grid remove $w
-    grid remove $w.tearoff
-    wm manage $w
-    wm protocol $w WM_DELETE_WINDOW [list untearoff $w]
-}
-proc untearoff {w} {
-    wm forget $w
-    grid $w.tearoff
-    grid $w
-}
-
-## Toolbar contents
-ttk::button $t.button -text "Button" -style Toolbutton -command [list \
-	$w.txt insert end "Button Pressed\n"]
-ttk::checkbutton $t.check -text "Check" -variable check -style Toolbutton \
-	-command [concat [list $w.txt insert end] {"check is $check\n"}]
-ttk::menubutton $t.menu -text "Menu" -menu $t.menu.m
-ttk::combobox $t.combo -value [lsort [font families]] -state readonly
-menu $t.menu.m
-$t.menu.m add command -label "Just" -command [list $w.txt insert end Just\n]
-$t.menu.m add command -label "An" -command [list $w.txt insert end An\n]
-$t.menu.m add command -label "Example" \
-	-command [list $w.txt insert end Example\n]
-bind $t.combo <<ComboboxSelected>> [list changeFont $w.txt $t.combo]
-proc changeFont {txt combo} {
-    $txt configure -font [list [$combo get] 10]
-}
-
-## Some content for the rest of the toplevel
-text $w.txt -width 40 -height 10
-interp alias {} doInsert {} $w.txt insert end	;# Make bindings easy to write
-
-## Arrange contents
-grid $t.button $t.check $t.menu $t.combo -in $t.contents -padx 2 -sticky ns
-grid $t -sticky ew
-grid $w.sep -sticky ew
-grid $w.msg -sticky ew
-grid $w.txt -sticky nsew
-grid rowconfigure $w $w.txt -weight 1
-grid columnconfigure $w $w.txt -weight 1
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-grid $btns -sticky ew
diff --git a/tk8.6/library/demos/tree.tcl b/tk8.6/library/demos/tree.tcl
deleted file mode 100644
index 71c32c1..0000000
--- a/tk8.6/library/demos/tree.tcl
+++ /dev/null
@@ -1,88 +0,0 @@
-# tree.tcl --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# tree widget.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .tree
-catch {destroy $w}
-toplevel $w
-wm title $w "Directory Browser"
-wm iconname $w "tree"
-positionWindow $w
-
-## Explanatory text
-ttk::label $w.msg -font $font -wraplength 4i -justify left -anchor n -padding {10 2 10 6} -text "Ttk is the new Tk themed widget set. One of the widgets it includes is a tree widget, which allows the user to browse a hierarchical data-set such as a filesystem. The tree widget not only allows for the tree part itself, but it also supports an arbitrary number of additional columns which can show additional data (in this case, the size of the files found in your filesystem). You can also change the width of the columns by dragging the boundary between them."
-pack $w.msg -fill x
-
-## See Code / Dismiss
-pack [addSeeDismiss $w.seeDismiss $w] -side bottom -fill x
-
-## Code to populate the roots of the tree (can be more than one on Windows)
-proc populateRoots {tree} {
-    foreach dir [lsort -dictionary [file volumes]] {
-	populateTree $tree [$tree insert {} end -text $dir \
-		-values [list $dir directory]]
-    }
-}
-
-## Code to populate a node of the tree
-proc populateTree {tree node} {
-    if {[$tree set $node type] ne "directory"} {
-	return
-    }
-    set path [$tree set $node fullpath]
-    $tree delete [$tree children $node]
-    foreach f [lsort -dictionary [glob -nocomplain -dir $path *]] {
-	set type [file type $f]
-	set id [$tree insert $node end -text [file tail $f] \
-		-values [list $f $type]]
-
-	if {$type eq "directory"} {
-	    ## Make it so that this node is openable
-	    $tree insert $id 0 -text dummy ;# a dummy
-	    $tree item $id -text [file tail $f]/
-
-	} elseif {$type eq "file"} {
-	    set size [file size $f]
-	    ## Format the file size nicely
-	    if {$size >= 1024*1024*1024} {
-		set size [format %.1f\ GB [expr {$size/1024/1024/1024.}]]
-	    } elseif {$size >= 1024*1024} {
-		set size [format %.1f\ MB [expr {$size/1024/1024.}]]
-	    } elseif {$size >= 1024} {
-		set size [format %.1f\ kB [expr {$size/1024.}]]
-	    } else {
-		append size " bytes"
-	    }
-	    $tree set $id size $size
-	}
-    }
-
-    # Stop this code from rerunning on the current node
-    $tree set $node type processedDirectory
-}
-
-## Create the tree and set it up
-ttk::treeview $w.tree -columns {fullpath type size} -displaycolumns {size} \
-	-yscroll "$w.vsb set" -xscroll "$w.hsb set"
-ttk::scrollbar $w.vsb -orient vertical -command "$w.tree yview"
-ttk::scrollbar $w.hsb -orient horizontal -command "$w.tree xview"
-$w.tree heading \#0 -text "Directory Structure"
-$w.tree heading size -text "File Size"
-$w.tree column size -stretch 0 -width 70
-populateRoots $w.tree
-bind $w.tree <<TreeviewOpen>> {populateTree %W [%W focus]}
-
-## Arrange the tree and its scrollbars in the toplevel
-lower [ttk::frame $w.dummy]
-pack $w.dummy -fill both -expand 1
-grid $w.tree $w.vsb -sticky nsew -in $w.dummy
-grid $w.hsb -sticky nsew -in $w.dummy
-grid columnconfigure $w.dummy 0 -weight 1
-grid rowconfigure $w.dummy 0 -weight 1
diff --git a/tk8.6/library/demos/ttkbut.tcl b/tk8.6/library/demos/ttkbut.tcl
deleted file mode 100644
index 904cd31..0000000
--- a/tk8.6/library/demos/ttkbut.tcl
+++ /dev/null
@@ -1,84 +0,0 @@
-# ttkbut.tcl --
-#
-# This demonstration script creates a toplevel window containing several
-# simple Ttk widgets, such as labels, labelframes, buttons, checkbuttons and
-# radiobuttons.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .ttkbut
-catch {destroy $w}
-toplevel $w
-wm title $w "Simple Ttk Widgets"
-wm iconname $w "ttkbut"
-positionWindow $w
-
-ttk::label $w.msg -font $font -wraplength 4i -justify left -text "Ttk is the new Tk themed widget set. This is a Ttk themed label, and below are three groups of Ttk widgets in Ttk labelframes. The first group are all buttons that set the current application theme when pressed. The second group contains three sets of checkbuttons, with a separator widget between the sets. Note that the \u201cEnabled\u201d button controls whether all the other themed widgets in this toplevel are in the disabled state. The third group has a collection of linked radiobuttons."
-pack $w.msg -side top -fill x
-
-## See Code / Dismiss
-pack [addSeeDismiss $w.seeDismiss $w {enabled cheese tomato basil oregano happyness}]\
-	-side bottom -fill x
-
-## Add buttons for setting the theme
-ttk::labelframe $w.buttons -text "Buttons"
-foreach theme [ttk::themes] {
-    ttk::button $w.buttons.$theme -text $theme \
-	    -command [list ttk::setTheme $theme]
-    pack $w.buttons.$theme -pady 2
-}
-
-## Helper procedure for the top checkbutton
-proc setState {rootWidget exceptThese value} {
-    if {$rootWidget in $exceptThese} {
-	return
-    }
-    ## Non-Ttk widgets (e.g. the toplevel) will fail, so make it silent
-    catch {
-	$rootWidget state $value
-    }
-    ## Recursively invoke on all children of this root that are in the same
-    ## toplevel widget
-    foreach w [winfo children $rootWidget] {
-	if {[winfo toplevel $w] eq [winfo toplevel $rootWidget]} {
-	    setState $w $exceptThese $value
-	}
-    }
-}
-
-## Set up the checkbutton group
-ttk::labelframe $w.checks -text "Checkbuttons"
-ttk::checkbutton $w.checks.e  -text Enabled -variable enabled -command {
-    setState .ttkbut .ttkbut.checks.e \
-	    [expr {$enabled ? "!disabled" : "disabled"}]
-}
-set enabled 1
-## See ttk_widget(n) for other possible state flags
-ttk::separator   $w.checks.sep1
-ttk::checkbutton $w.checks.c1 -text Cheese  -variable cheese
-ttk::checkbutton $w.checks.c2 -text Tomato  -variable tomato
-ttk::separator   $w.checks.sep2
-ttk::checkbutton $w.checks.c3 -text Basil   -variable basil
-ttk::checkbutton $w.checks.c4 -text Oregano -variable oregano
-pack $w.checks.e $w.checks.sep1 $w.checks.c1 $w.checks.c2 $w.checks.sep2 \
-	$w.checks.c3 $w.checks.c4   -fill x -pady 2
-
-## Set up the radiobutton group
-ttk::labelframe $w.radios -text "Radiobuttons"
-ttk::radiobutton $w.radios.r1 -text "Great" -variable happyness -value great
-ttk::radiobutton $w.radios.r2 -text "Good" -variable happyness -value good
-ttk::radiobutton $w.radios.r3 -text "OK" -variable happyness -value ok
-ttk::radiobutton $w.radios.r4 -text "Poor" -variable happyness -value poor
-ttk::radiobutton $w.radios.r5 -text "Awful" -variable happyness -value awful
-pack $w.radios.r1 $w.radios.r2 $w.radios.r3 $w.radios.r4 $w.radios.r5 \
-	-fill x -padx 3 -pady 2
-
-## Arrange things neatly
-pack [ttk::frame $w.f] -fill both -expand 1
-lower $w.f
-grid $w.buttons $w.checks $w.radios -in $w.f -sticky nwe -pady 2 -padx 3
-grid columnconfigure $w.f {0 1 2} -weight 1 -uniform yes
diff --git a/tk8.6/library/demos/ttkmenu.tcl b/tk8.6/library/demos/ttkmenu.tcl
deleted file mode 100644
index 0084dd6..0000000
--- a/tk8.6/library/demos/ttkmenu.tcl
+++ /dev/null
@@ -1,53 +0,0 @@
-# ttkmenu.tcl --
-#
-# This demonstration script creates a toplevel window containing several Ttk
-# menubutton widgets.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .ttkmenu
-catch {destroy $w}
-toplevel $w
-wm title $w "Ttk Menu Buttons"
-wm iconname $w "ttkmenu"
-positionWindow $w
-
-ttk::label $w.msg -font $font -wraplength 4i -justify left -text "Ttk is the new Tk themed widget set, and one widget that is available in themed form is the menubutton. Below are some themed menu buttons that allow you to pick the current theme in use. Notice how picking a theme changes the way that the menu buttons themselves look, and that the central menu button is styled differently (in a way that is normally suitable for toolbars). However, there are no themed menus; the standard Tk menus were judged to have a sufficiently good look-and-feel on all platforms, especially as they are implemented as native controls in many places."
-pack $w.msg [ttk::separator $w.msgSep] -side top -fill x
-
-## See Code / Dismiss
-pack [addSeeDismiss $w.seeDismiss $w] -side bottom -fill x
-
-ttk::menubutton $w.m1 -menu $w.m1.menu -text "Select a theme" -direction above
-ttk::menubutton $w.m2 -menu $w.m1.menu -text "Select a theme" -direction left
-ttk::menubutton $w.m3 -menu $w.m1.menu -text "Select a theme" -direction right
-ttk::menubutton $w.m4 -menu $w.m1.menu -text "Select a theme" \
-	-direction flush -style TMenubutton.Toolbutton
-ttk::menubutton $w.m5 -menu $w.m1.menu -text "Select a theme" -direction below
-
-menu $w.m1.menu -tearoff 0
-menu $w.m2.menu -tearoff 0
-menu $w.m3.menu -tearoff 0
-menu $w.m4.menu -tearoff 0
-menu $w.m5.menu -tearoff 0
-
-foreach theme [ttk::themes] {
-    $w.m1.menu add command -label $theme -command [list ttk::setTheme $theme]
-    $w.m2.menu add command -label $theme -command [list ttk::setTheme $theme]
-    $w.m3.menu add command -label $theme -command [list ttk::setTheme $theme]
-    $w.m4.menu add command -label $theme -command [list ttk::setTheme $theme]
-    $w.m5.menu add command -label $theme -command [list ttk::setTheme $theme]
-}
-
-pack [ttk::frame $w.f] -fill x
-pack [ttk::frame $w.f1] -fill both -expand yes
-lower $w.f
-
-grid anchor $w.f center
-grid   x   $w.m1   x    -in $w.f -padx 3 -pady 2
-grid $w.m2 $w.m4 $w.m3  -in $w.f -padx 3 -pady 2
-grid   x   $w.m5   x    -in $w.f -padx 3 -pady 2
diff --git a/tk8.6/library/demos/ttknote.tcl b/tk8.6/library/demos/ttknote.tcl
deleted file mode 100644
index 50a9258..0000000
--- a/tk8.6/library/demos/ttknote.tcl
+++ /dev/null
@@ -1,57 +0,0 @@
-# ttknote.tcl --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# notebook widget.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .ttknote
-catch {destroy $w}
-toplevel $w
-wm title $w "Ttk Notebook Widget"
-wm iconname $w "ttknote"
-positionWindow $w
-
-## See Code / Dismiss
-pack [addSeeDismiss $w.seeDismiss $w] -side bottom -fill x
-
-ttk::frame $w.f
-pack $w.f -fill both -expand 1
-set w $w.f
-
-## Make the notebook and set up Ctrl+Tab traversal
-ttk::notebook $w.note
-pack $w.note -fill both -expand 1 -padx 2 -pady 3
-ttk::notebook::enableTraversal $w.note
-
-## Popuplate the first pane
-ttk::frame $w.note.msg
-ttk::label $w.note.msg.m -font $font -wraplength 4i -justify left -anchor n -text "Ttk is the new Tk themed widget set. One of the widgets it includes is the notebook widget, which provides a set of tabs that allow the selection of a group of panels, each with distinct content. They are a feature of many modern user interfaces. Not only can the tabs be selected with the mouse, but they can also be switched between using Ctrl+Tab when the notebook page heading itself is selected. Note that the second tab is disabled, and cannot be selected."
-ttk::button $w.note.msg.b -text "Neat!" -underline 0 -command {
-    set neat "Yeah, I know..."
-    after 500 {set neat {}}
-}
-bind $w <Alt-n> "focus $w.note.msg.b; $w.note.msg.b invoke"
-ttk::label $w.note.msg.l -textvariable neat
-$w.note add $w.note.msg -text "Description" -underline 0 -padding 2
-grid $w.note.msg.m - -sticky new -pady 2
-grid $w.note.msg.b $w.note.msg.l -pady {2 4}
-grid rowconfigure $w.note.msg 1 -weight 1
-grid columnconfigure $w.note.msg {0 1} -weight 1 -uniform 1
-
-## Populate the second pane. Note that the content doesn't really matter
-ttk::frame $w.note.disabled
-$w.note add $w.note.disabled -text "Disabled" -state disabled
-
-## Popuplate the third pane
-ttk::frame $w.note.editor
-$w.note add $w.note.editor -text "Text Editor" -underline 0
-text $w.note.editor.t -width 40 -height 10 -wrap char \
-	-yscroll "$w.note.editor.s set"
-ttk::scrollbar $w.note.editor.s -orient vertical -command "$w.note.editor.t yview"
-pack $w.note.editor.s -side right -fill y -padx {0 2} -pady 2
-pack $w.note.editor.t -fill both -expand 1 -pady 2 -padx {2 0}
diff --git a/tk8.6/library/demos/ttkpane.tcl b/tk8.6/library/demos/ttkpane.tcl
deleted file mode 100644
index 7575d76..0000000
--- a/tk8.6/library/demos/ttkpane.tcl
+++ /dev/null
@@ -1,112 +0,0 @@
-# ttkpane.tcl --
-#
-# This demonstration script creates a Ttk pane with some content.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .ttkpane
-catch {destroy $w}
-toplevel $w
-wm title $w "Themed Nested Panes"
-wm iconname $w "ttkpane"
-positionWindow $w
-
-ttk::label $w.msg -font $font -wraplength 4i -justify left -text "This demonstration shows off a nested set of themed paned windows. Their sizes can be changed by grabbing the area between each contained pane and dragging the divider."
-pack $w.msg [ttk::separator $w.msgSep] -side top -fill x
-
-## See Code / Dismiss
-pack [addSeeDismiss $w.seeDismiss $w] -side bottom -fill x
-
-ttk::frame $w.f
-pack $w.f -fill both -expand 1
-set w $w.f
-ttk::panedwindow $w.outer -orient horizontal
-$w.outer add [ttk::panedwindow $w.outer.inLeft -orient vertical]
-$w.outer add [ttk::panedwindow $w.outer.inRight -orient vertical]
-$w.outer.inLeft  add [ttk::labelframe $w.outer.inLeft.top  -text Button]
-$w.outer.inLeft  add [ttk::labelframe $w.outer.inLeft.bot  -text Clocks]
-$w.outer.inRight add [ttk::labelframe $w.outer.inRight.top -text Progress]
-$w.outer.inRight add [ttk::labelframe $w.outer.inRight.bot -text Text]
-if {[tk windowingsystem] eq "aqua"} {
-    foreach i [list inLeft.top inLeft.bot inRight.top inRight.bot] {
-	$w.outer.$i configure -padding 3
-    }
-}
-
-# Fill the button pane
-ttk::button $w.outer.inLeft.top.b -text "Press Me" -command {
-    tk_messageBox -type ok -icon info -message "Ouch!" -detail "That hurt..." \
-	    -parent .ttkpane -title "Button Pressed"
-}
-pack $w.outer.inLeft.top.b -padx 2 -pady 5
-
-# Fill the clocks pane
-set i 0
-proc every {delay script} {
-    uplevel #0 $script
-    after $delay [list every $delay $script]
-}
-set testzones {
-    :Europe/Berlin
-    :America/Argentina/Buenos_Aires
-    :Africa/Johannesburg
-    :Europe/London
-    :America/Los_Angeles
-    :Europe/Moscow
-    :America/New_York
-    :Asia/Singapore
-    :Australia/Sydney
-    :Asia/Tokyo
-}
-# Force a pre-load of all the timezones needed; otherwise can end up
-# poor-looking synch problems!
-set zones {}
-foreach zone $testzones {
-    if {![catch {clock format 0 -timezone $zone}]} {
-        lappend zones $zone
-    }
-}
-if {[llength $zones] < 2} { lappend zones -0200 :GMT :UTC +0200 }
-foreach zone $zones {
-    set city [string map {_ " "} [regexp -inline {[^/]+$} $zone]]
-    if {$i} {
-	pack [ttk::separator $w.outer.inLeft.bot.s$i] -fill x
-    }
-    ttk::label $w.outer.inLeft.bot.l$i -text $city -anchor w
-    ttk::label $w.outer.inLeft.bot.t$i -textvariable time($zone) -anchor w
-    pack $w.outer.inLeft.bot.l$i $w.outer.inLeft.bot.t$i -fill x
-    every 1000 "set time($zone) \[clock format \[clock seconds\] -timezone $zone -format %T\]"
-    incr i
-}
-
-# Fill the progress pane
-ttk::progressbar $w.outer.inRight.top.progress -mode indeterminate
-pack $w.outer.inRight.top.progress -fill both -expand 1
-$w.outer.inRight.top.progress start
-
-# Fill the text pane
-if {[tk windowingsystem] ne "aqua"} {
-    # The trick with the ttk::frame makes the text widget look like it fits with
-    # the current Ttk theme despite not being a themed widget itself. It is done
-    # by styling the frame like an entry, turning off the border in the text
-    # widget, and putting the text widget in the frame with enough space to allow
-    # the surrounding border to show through (2 pixels seems to be enough).
-    ttk::frame $w.outer.inRight.bot.f				-style TEntry
-    text $w.txt -wrap word -yscroll "$w.sb set" -width 30	-borderwidth 0
-    pack $w.txt -fill both -expand 1 -in $w.outer.inRight.bot.f	-pady 2 -padx 2
-    ttk::scrollbar $w.sb -orient vertical -command "$w.txt yview"
-    pack $w.sb -side right -fill y -in $w.outer.inRight.bot
-    pack $w.outer.inRight.bot.f -fill both -expand 1
-    pack $w.outer -fill both -expand 1
-} else {
-    text $w.txt -wrap word -yscroll "$w.sb set" -width 30 -borderwidth 0
-    scrollbar $w.sb -orient vertical -command "$w.txt yview"
-    pack $w.sb -side right -fill y -in $w.outer.inRight.bot
-    pack $w.txt -fill both -expand 1 -in $w.outer.inRight.bot
-    pack $w.outer -fill both -expand 1 -padx 10 -pady {6 10}
-}
-
diff --git a/tk8.6/library/demos/ttkprogress.tcl b/tk8.6/library/demos/ttkprogress.tcl
deleted file mode 100644
index 8a72cf9..0000000
--- a/tk8.6/library/demos/ttkprogress.tcl
+++ /dev/null
@@ -1,46 +0,0 @@
-# ttkprogress.tcl --
-#
-# This demonstration script creates several progress bar widgets.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .ttkprogress
-catch {destroy $w}
-toplevel $w
-wm title $w "Progress Bar Demonstration"
-wm iconname $w "ttkprogress"
-positionWindow $w
-
-ttk::label $w.msg -font $font -wraplength 4i -justify left -text "Below are two progress bars. The top one is a \u201Cdeterminate\u201D progress bar, which is used for showing how far through a defined task the program has got. The bottom one is an \u201Cindeterminate\u201D progress bar, which is used to show that the program is busy but does not know how long for. Both are run here in self-animated mode, which can be turned on and off using the buttons underneath."
-pack $w.msg -side top -fill x
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-ttk::frame $w.f
-pack $w.f -fill both -expand 1
-set w $w.f
-
-proc doBars {op args} {
-    foreach w $args {
-	$w $op
-    }
-}
-ttk::progressbar $w.p1 -mode determinate
-ttk::progressbar $w.p2 -mode indeterminate
-ttk::button $w.start -text "Start Progress" -command [list \
-	doBars start $w.p1 $w.p2]
-ttk::button $w.stop -text "Stop Progress" -command [list \
-	doBars stop $w.p1 $w.p2]
-
-grid $w.p1 - -pady 5 -padx 10
-grid $w.p2 - -pady 5 -padx 10
-grid $w.start $w.stop -padx 10 -pady 5
-grid configure $w.start -sticky e
-grid configure $w.stop -sticky w
-grid columnconfigure $w all -weight 1
diff --git a/tk8.6/library/demos/ttkscale.tcl b/tk8.6/library/demos/ttkscale.tcl
deleted file mode 100644
index 1a95416..0000000
--- a/tk8.6/library/demos/ttkscale.tcl
+++ /dev/null
@@ -1,39 +0,0 @@
-# ttkscale.tcl --
-#
-# This demonstration script shows an example with a horizontal scale.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .ttkscale
-catch {destroy $w}
-toplevel $w -bg [ttk::style lookup TLabel -background]
-wm title $w "Themed Scale Demonstration"
-wm iconname $w "ttkscale"
-positionWindow $w
-
-pack [ttk::frame [set w $w.contents]] -fill both -expand 1
-
-ttk::label $w.msg -font $font -wraplength 3.5i -justify left -text "A label tied to a horizontal scale is displayed below.  If you click or drag mouse button 1 in the scale, you can change the contents of the label; a callback command is used to couple the slider to both the text and the coloring of the label."
-pack $w.msg -side top -padx .5c
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons [winfo toplevel $w]]
-pack $btns -side bottom -fill x
-
-ttk::frame $w.frame -borderwidth 10
-pack $w.frame -side top -fill x
-
-# List of colors from rainbox; "Indigo" is not a standard color
-set colorList {Red Orange Yellow Green Blue Violet}
-ttk::label $w.frame.label
-ttk::scale $w.frame.scale -from 0 -to 5 -command [list apply {{w idx} {
-    set c [lindex $::colorList [tcl::mathfunc::int $idx]]
-    $w.frame.label configure -foreground $c -text "Color: $c"
-}} $w]
-# Trigger the setting of the label's text
-$w.frame.scale set 0
-pack $w.frame.label $w.frame.scale
diff --git a/tk8.6/library/demos/twind.tcl b/tk8.6/library/demos/twind.tcl
deleted file mode 100644
index bafb57e..0000000
--- a/tk8.6/library/demos/twind.tcl
+++ /dev/null
@@ -1,325 +0,0 @@
-# twind.tcl --
-#
-# This demonstration script creates a text widget with a bunch of
-# embedded windows.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .twind
-catch {destroy $w}
-toplevel $w
-wm title $w "Text Demonstration - Embedded Windows and Other Features"
-wm iconname $w "Embedded Windows"
-positionWindow $w
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-frame $w.f -highlightthickness 1 -borderwidth 1 -relief sunken
-set t $w.f.text
-text $t -yscrollcommand "$w.scroll set" -setgrid true -font $font -width 70 \
-	-height 35 -wrap word -highlightthickness 0 -borderwidth 0
-pack $t -expand  yes -fill both
-ttk::scrollbar $w.scroll -command "$t yview"
-pack $w.scroll -side right -fill y
-panedwindow $w.pane
-pack $w.pane -expand yes -fill both
-$w.pane add $w.f
-# Import to raise given creation order above
-raise $w.f
-
-$t tag configure center -justify center -spacing1 5m -spacing3 5m
-$t tag configure buttons -lmargin1 1c -lmargin2 1c -rmargin 1c \
-	-spacing1 3m -spacing2 0 -spacing3 0
-
-button $t.on -text "Turn On" -command "textWindOn $w" \
-	-cursor top_left_arrow
-button $t.off -text "Turn Off" -command "textWindOff $w" \
-	-cursor top_left_arrow
-
-$t insert end "A text widget can contain many different kinds of items, "
-$t insert end "both active and passive.  It can lay these out in various "
-$t insert end "ways, with wrapping, tabs, centering, etc.  In addition, "
-$t insert end "when the contents are too big for the window, smooth "
-$t insert end "scrolling in all directions is provided.\n\n"
-
-$t insert end "A text widget can contain other widgets embedded "
-$t insert end "it.  These are called \"embedded windows\", "
-$t insert end "and they can consist of arbitrary widgets.  "
-$t insert end "For example, here are two embedded button "
-$t insert end "widgets.  You can click on the first button to "
-$t window create end -window $t.on
-$t insert end " horizontal scrolling, which also turns off "
-$t insert end "word wrapping.  Or, you can click on the second "
-$t insert end "button to\n"
-$t window create end -window $t.off
-$t insert end " horizontal scrolling and turn back on word wrapping.\n\n"
-
-$t insert end "Or, here is another example.  If you "
-$t window create end -create {
-    button %W.click -text "Click Here" -command "textWindPlot %W" \
-	    -cursor top_left_arrow}
-
-$t insert end " a canvas displaying an x-y plot will appear right here."
-$t mark set plot insert
-$t mark gravity plot left
-$t insert end "  You can drag the data points around with the mouse, "
-$t insert end "or you can click here to "
-$t window create end -create {
-    button %W.delete -text "Delete" -command "textWindDel %W" \
-	    -cursor top_left_arrow
-}
-$t insert end " the plot again.\n\n"
-
-$t insert end "You can also create multiple text widgets each of which "
-$t insert end "display the same underlying text. Click this button to "
-$t window create end \
-  -create {button %W.peer -text "Make A Peer" -command "textMakePeer %W" \
-  -cursor top_left_arrow} -padx 3
-$t insert end " widget.  Notice how peer widgets can have different "
-$t insert end "font settings, and by default contain all the images "
-$t insert end "of the 'parent', but many of the embedded windows, "
-$t insert end "such as buttons will not be there.  The easiest way "
-$t insert end "to ensure they are in all peers is to use '-create' "
-$t insert end "embedded window creation scripts "
-$t insert end "(the plot above and the 'Make A Peer' button are "
-$t insert end "designed to show up in all peers).  A good use of "
-$t insert end "peers is for "
-$t window create end \
-  -create {button %W.split -text "Split Windows" -command "textSplitWindow %W" \
-  -cursor top_left_arrow} -padx 3
-$t insert end " \n\n"
-
-$t insert end "Users of previous versions of Tk will also be interested "
-$t insert end "to note that now cursor movement is now by visual line by "
-$t insert end "default, and that all scrolling of this widget is by pixel.\n\n"
-
-$t insert end "You may also find it useful to put embedded windows in "
-$t insert end "a text without any actual text.  In this case the "
-$t insert end "text widget acts like a geometry manager.  For "
-$t insert end "example, here is a collection of buttons laid out "
-$t insert end "neatly into rows by the text widget.  These buttons "
-$t insert end "can be used to change the background color of the "
-$t insert end "text widget (\"Default\" restores the color to "
-$t insert end "its default).  If you click on the button labeled "
-$t insert end "\"Short\", it changes to a longer string so that "
-$t insert end "you can see how the text widget automatically "
-$t insert end "changes the layout.  Click on the button again "
-$t insert end "to restore the short string.\n"
-
-button $t.default -text Default -command "embDefBg $t" \
-	-cursor top_left_arrow
-$t window create end -window $t.default -padx 3
-global embToggle
-set embToggle Short
-checkbutton $t.toggle -textvariable embToggle -indicatoron 0 \
-	-variable embToggle -onvalue "A much longer string" \
-	-offvalue "Short" -cursor top_left_arrow -pady 5 -padx 2
-$t window create end -window $t.toggle -padx 3 -pady 2
-set i 1
-foreach color {AntiqueWhite3 Bisque1 Bisque2 Bisque3 Bisque4
-	SlateBlue3 RoyalBlue1 SteelBlue2 DeepSkyBlue3 LightBlue1
-	DarkSlateGray1 Aquamarine2 DarkSeaGreen2 SeaGreen1
-	Yellow1 IndianRed1 IndianRed2 Tan1 Tan4} {
-    button $t.color$i -text $color -cursor top_left_arrow -command \
-	    "$t configure -bg $color"
-    $t window create end -window $t.color$i -padx 3 -pady 2
-    incr i
-}
-$t tag add buttons $t.default end
-
-button $t.bigB -text "Big borders" -command "textWindBigB $t" \
-  -cursor top_left_arrow
-button $t.smallB -text "Small borders" -command "textWindSmallB $t" \
-  -cursor top_left_arrow
-button $t.bigH -text "Big highlight" -command "textWindBigH $t" \
-  -cursor top_left_arrow
-button $t.smallH -text "Small highlight" -command "textWindSmallH $t" \
-  -cursor top_left_arrow
-button $t.bigP -text "Big pad" -command "textWindBigP $t" \
-  -cursor top_left_arrow
-button $t.smallP -text "Small pad" -command "textWindSmallP $t" \
-  -cursor top_left_arrow
-
-set text_normal(border) [$t cget -borderwidth]
-set text_normal(highlight) [$t cget -highlightthickness]
-set text_normal(pad) [$t cget -padx]
-
-$t insert end "\nYou can also change the usual border width and "
-$t insert end "highlightthickness and padding.\n"
-$t window create end -window $t.bigB
-$t window create end -window $t.smallB
-$t window create end -window $t.bigH
-$t window create end -window $t.smallH
-$t window create end -window $t.bigP
-$t window create end -window $t.smallP
-
-$t insert end "\n\nFinally, images fit comfortably in text widgets too:"
-
-$t image create end -image \
-    [image create photo -file [file join $tk_demoDirectory images ouster.png]]
-
-
-proc textWindBigB w {
-    $w configure -borderwidth 15
-}
-
-proc textWindBigH w {
-    $w configure -highlightthickness 15
-}
-
-proc textWindBigP w {
-    $w configure -padx 15 -pady 15
-}
-
-proc textWindSmallB w {
-    $w configure -borderwidth $::text_normal(border)
-}
-
-proc textWindSmallH w {
-    $w configure -highlightthickness $::text_normal(highlight)
-}
-
-proc textWindSmallP w {
-    $w configure -padx $::text_normal(pad) -pady $::text_normal(pad)
-}
-
-
-proc textWindOn w {
-    catch {destroy $w.scroll2}
-    set t $w.f.text
-    ttk::scrollbar $w.scroll2 -orient horizontal -command "$t xview"
-    pack $w.scroll2 -after $w.buttons -side bottom -fill x
-    $t configure -xscrollcommand "$w.scroll2 set" -wrap none
-}
-
-proc textWindOff w {
-    catch {destroy $w.scroll2}
-    set t $w.f.text
-    $t configure -xscrollcommand {} -wrap word
-}
-
-proc textWindPlot t {
-    set c $t.c
-    if {[winfo exists $c]} {
-	return
-    }
-
-    while {[string first [$t get plot] " \t\n"] >= 0} {
-	$t delete plot
-    }
-    $t insert plot "\n"
-
-    $t window create plot -create {createPlot %W}
-    $t tag add center plot
-    $t insert plot "\n"
-}
-
-proc createPlot {t} {
-    set c $t.c
-
-    canvas $c -relief sunken -width 450 -height 300 -cursor top_left_arrow
-
-    set font {Helvetica 18}
-
-    $c create line 100 250 400 250 -width 2
-    $c create line 100 250 100 50 -width 2
-    $c create text 225 20 -text "A Simple Plot" -font $font -fill brown
-
-    for {set i 0} {$i <= 10} {incr i} {
-	set x [expr {100 + ($i*30)}]
-	$c create line $x 250 $x 245 -width 2
-	$c create text $x 254 -text [expr {10*$i}] -anchor n -font $font
-    }
-    for {set i 0} {$i <= 5} {incr i} {
-	set y [expr {250 - ($i*40)}]
-	$c create line 100 $y 105 $y -width 2
-	$c create text 96 $y -text [expr {$i*50}].0 -anchor e -font $font
-    }
-
-    foreach point {
-	{12 56} {20 94} {33 98} {32 120} {61 180} {75 160} {98 223}
-    } {
-	set x [expr {100 + (3*[lindex $point 0])}]
-	set y [expr {250 - (4*[lindex $point 1])/5}]
-	set item [$c create oval [expr {$x-6}] [expr {$y-6}] \
-		[expr {$x+6}] [expr {$y+6}] -width 1 -outline black \
-		-fill SkyBlue2]
-	$c addtag point withtag $item
-    }
-
-    $c bind point <Any-Enter> "$c itemconfig current -fill red"
-    $c bind point <Any-Leave> "$c itemconfig current -fill SkyBlue2"
-    $c bind point <1> "embPlotDown $c %x %y"
-    $c bind point <ButtonRelease-1> "$c dtag selected"
-    bind $c <B1-Motion> "embPlotMove $c %x %y"
-    return $c
-}
-
-set embPlot(lastX) 0
-set embPlot(lastY) 0
-
-proc embPlotDown {w x y} {
-    global embPlot
-    $w dtag selected
-    $w addtag selected withtag current
-    $w raise current
-    set embPlot(lastX) $x
-    set embPlot(lastY) $y
-}
-
-proc embPlotMove {w x y} {
-    global embPlot
-    $w move selected [expr {$x-$embPlot(lastX)}] [expr {$y-$embPlot(lastY)}]
-    set embPlot(lastX) $x
-    set embPlot(lastY) $y
-}
-
-proc textWindDel t {
-    if {[winfo exists $t.c]} {
-	$t delete $t.c
-	while {[string first [$t get plot] " \t\n"] >= 0} {
-	    $t delete plot
-	}
-	$t insert plot "  "
-    }
-}
-
-proc embDefBg t {
-    $t configure -background [lindex [$t configure -background] 3]
-}
-
-proc textMakePeer {parent} {
-    set n 1
-    while {[winfo exists .peer$n]} { incr n }
-    set w [toplevel .peer$n]
-    wm title $w "Text Peer #$n"
-    frame $w.f -highlightthickness 1 -borderwidth 1 -relief sunken
-    set t [$parent peer create $w.f.text -yscrollcommand "$w.scroll set" \
-	       -borderwidth 0 -highlightthickness 0]
-    pack $t -expand  yes -fill both
-    ttk::scrollbar $w.scroll -command "$t yview"
-    pack $w.scroll -side right -fill y
-    pack $w.f -expand yes -fill both
-}
-
-proc textSplitWindow {textW} {
-    if {$textW eq ".twind.f.text"} {
-	if {[winfo exists .twind.peer]} {
-	    destroy .twind.peer
-	} else {
-	    set parent [winfo parent $textW]
-	    set w [winfo parent $parent]
-	    set t [$textW peer create $w.peer \
-	      -yscrollcommand "$w.scroll set"]
-	    $w.pane add $t
-	}
-    } else {
-        return
-    }
-}
diff --git a/tk8.6/library/demos/unicodeout.tcl b/tk8.6/library/demos/unicodeout.tcl
deleted file mode 100644
index faa9f90..0000000
--- a/tk8.6/library/demos/unicodeout.tcl
+++ /dev/null
@@ -1,137 +0,0 @@
-# unicodeout.tcl --
-#
-# This demonstration script shows how you can produce output (in label
-# widgets) using many different alphabets.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .unicodeout
-catch {destroy $w}
-toplevel $w
-wm title $w "Unicode Label Demonstration"
-wm iconname $w "unicodeout"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 4i -anchor w -justify left \
-	-text "This is a sample of Tk's support for languages that use\
-	non-Western character sets.  However, what you will actually see\
-	below depends largely on what character sets you have installed,\
-	and what you see for characters that are not present varies greatly\
-	between platforms as well.  The strings are written in Tcl using\
-	UNICODE characters using the \\uXXXX escape so as to do so in a\
-	portable fashion."
-pack $w.msg -side top
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-## The frame that will contain the sample texts.
-pack [frame $w.f] -side bottom -expand 1 -fill both -padx 2m -pady 1m
-grid columnconfigure $w.f 1 -weight 1
-set i 0
-proc addSample {w language args} {
-    global font i
-    set sample [join $args ""]
-    set j [incr i]
-    label $w.f.l$j -font $font -text "${language}:" -anchor nw -pady 0
-    label $w.f.s$j -font $font -text $sample -anchor nw -width 30 -pady 0
-    grid $w.f.l$j $w.f.s$j -sticky ew -pady 0
-    grid configure $w.f.l$j -padx 1m
-}
-
-## A helper procedure that determines what form to use to express languages
-## that have complex rendering rules...
-proc usePresentationFormsFor {language} {
-    switch [tk windowingsystem] {
-	aqua {
-	    # OSX wants natural character order; the renderer knows how to
-	    # compose things for display for all languages.
-	    return false
-	}
-	x11 {
-	    # The X11 font renderers that Tk supports all know nothing about
-	    # composing characters, so we need to use presentation forms.
-	    return true
-	}
-	win32 {
-	    # On Windows, we need to determine whether the font system will
-	    # render right-to-left text. This varies by language!
-	    try {
-		package require registry
-		set rkey [join {
-		    HKEY_LOCAL_MACHINE
-		    SOFTWARE
-		    Microsoft
-		    {Windows NT}
-		    CurrentVersion
-		    LanguagePack
-		} \\]
-		return [expr {
-		    [string toupper $language] ni [registry values $rkey]
-		}]
-	    } trap error {} {
-		# Cannot work it out, so use presentation forms.
-		return true
-	    }
-	}
-	default {
-	    # Default to using presentation forms.
-	    return true
-	}
-    }
-}
-
-## Processing when some characters are not currently cached by the display
-## engine might take a while, so make sure we're displaying something in the
-## meantime...
-pack [label $w.wait -text "Please wait while loading fonts..." \
-	-font {Helvetica 12 italic}]
-set oldCursor [$w cget -cursor]
-$w conf -cursor watch
-update
-
-## Add the samples...
-if {[usePresentationFormsFor Arabic]} {
-    # Using presentation forms (pre-layouted)
-    addSample $w Arabic \
-	    "\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D " \
-	    "\uFE94\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D"
-} else {
-    # Using standard text characters
-    addSample $w Arabic \
-	    "\u0627\u0644\u0643\u0644\u0645\u0629 " \
-	    "\u0627\u0644\u0639\u0631\u0628\u064A\u0629"
-}
-addSample $w "Trad. Chinese"  "\u4E2D\u570B\u7684\u6F22\u5B57"
-addSample $w "Simpl. Chinese" "\u6C49\u8BED"
-addSample $w French "Langue fran\u00E7aise"
-addSample $w Greek \
-	 "\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE " \
-	 "\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1"
-if {[usePresentationFormsFor Hebrew]} {
-    # Visual order (pre-layouted)
-    addSample $w Hebrew \
-	    "\u05EA\u05D9\u05E8\u05D1\u05E2 \u05D1\u05EA\u05DB"
-} else {
-    # Standard logical order
-    addSample $w Hebrew \
-	    "\u05DB\u05EA\u05D1 \u05E2\u05D1\u05E8\u05D9\u05EA"
-}
-addSample $w Hindi \
-    "\u0939\u093f\u0928\u094d\u0926\u0940 \u092d\u093e\u0937\u093e"
-addSample $w Icelandic "\u00CDslenska"
-addSample $w Japanese \
-	 "\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, " \
-	 "\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA"
-addSample $w Korean "\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00"
-addSample $w Russian \
-	"\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A"
-
-## We're done processing, so change things back to normal running...
-destroy $w.wait
-$w conf -cursor $oldCursor
diff --git a/tk8.6/library/demos/vscale.tcl b/tk8.6/library/demos/vscale.tcl
deleted file mode 100644
index 2c7ea76..0000000
--- a/tk8.6/library/demos/vscale.tcl
+++ /dev/null
@@ -1,46 +0,0 @@
-# vscale.tcl --
-#
-# This demonstration script shows an example with a vertical scale.
-
-if {![info exists widgetDemo]} {
-    error "This script should be run from the \"widget\" demo."
-}
-
-package require Tk
-
-set w .vscale
-catch {destroy $w}
-toplevel $w
-wm title $w "Vertical Scale Demonstration"
-wm iconname $w "vscale"
-positionWindow $w
-
-label $w.msg -font $font -wraplength 3.5i -justify left -text "An arrow and a vertical scale are displayed below.  If you click or drag mouse button 1 in the scale, you can change the size of the arrow."
-pack $w.msg -side top -padx .5c
-
-## See Code / Dismiss buttons
-set btns [addSeeDismiss $w.buttons $w]
-pack $btns -side bottom -fill x
-
-frame $w.frame -borderwidth 10
-pack $w.frame
-
-scale $w.frame.scale -orient vertical -length 284 -from 0 -to 250 \
-	-command "setHeight $w.frame.canvas" -tickinterval 50
-canvas $w.frame.canvas -width 50 -height 50 -bd 0 -highlightthickness 0
-$w.frame.canvas create polygon 0 0 1 1 2 2 -fill SeaGreen3 -tags poly
-$w.frame.canvas create line 0 0 1 1 2 2 0 0 -fill black -tags line
-frame $w.frame.right -borderwidth 15
-pack $w.frame.scale -side left -anchor ne
-pack $w.frame.canvas -side left -anchor nw -fill y
-$w.frame.scale set 75
-
-proc setHeight {w height} {
-    incr height 21
-    set y2 [expr {$height - 30}]
-    if {$y2 < 21} {
-	set y2 21
-    }
-    $w coords poly 15 20 35 20 35 $y2 45 $y2 25 $height 5 $y2 15 $y2 15 20
-    $w coords line 15 20 35 20 35 $y2 45 $y2 25 $height 5 $y2 15 $y2 15 20
-}
diff --git a/tk8.6/library/demos/widget b/tk8.6/library/demos/widget
deleted file mode 100644
index 1d838ad..0000000
--- a/tk8.6/library/demos/widget
+++ /dev/null
@@ -1,721 +0,0 @@
-#!/bin/sh
-# the next line restarts using wish \
-exec wish "$0" ${1+"$@"}
-
-# widget --
-# This script demonstrates the various widgets provided by Tk, along with many
-# of the features of the Tk toolkit. This file only contains code to generate
-# the main window for the application, which invokes individual
-# demonstrations. The code for the actual demonstrations is contained in
-# separate ".tcl" files is this directory, which are sourced by this script as
-# needed.
-
-package require Tk	8.5
-package require msgcat
-
-eval destroy [winfo child .]
-set tk_demoDirectory [file join [pwd] [file dirname [info script]]]
-::msgcat::mcload $tk_demoDirectory
-namespace import ::msgcat::mc
-wm title . [mc "Widget Demonstration"]
-if {[tk windowingsystem] eq "x11"} {
-    # This won't work everywhere, but there's no other way in core Tk at the
-    # moment to display a coloured icon.
-    image create photo TclPowered \
-	    -file [file join $tk_library images logo64.gif]
-    wm iconwindow . [toplevel ._iconWindow]
-    pack [label ._iconWindow.i -image TclPowered]
-    wm iconname . [mc "tkWidgetDemo"]
-}
-
-if {"defaultFont" ni [font names]} {
-    # TIP #145 defines some standard named fonts
-    if {"TkDefaultFont" in [font names] && "TkFixedFont" in [font names]} {
-        # FIX ME: the following technique of cloning the font to copy it works
-        #         fine but means that if the system font is changed by Tk
-        #         cannot update the copied font. font alias might be useful
-        #         here -- or fix the app to use TkDefaultFont etc.
-        font create mainFont   {*}[font configure TkDefaultFont]
-        font create fixedFont  {*}[font configure TkFixedFont]
-        font create boldFont   {*}[font configure TkDefaultFont] -weight bold
-        font create titleFont  {*}[font configure TkDefaultFont] -weight bold
-        font create statusFont {*}[font configure TkDefaultFont]
-        font create varsFont   {*}[font configure TkDefaultFont]
-	if {[tk windowingsystem] eq "aqua"} {
-	    font configure titleFont -size 17
-	}
-    } else {
-        font create mainFont   -family Helvetica -size 12
-        font create fixedFont  -family Courier   -size 10
-        font create boldFont   -family Helvetica -size 12 -weight bold
-        font create titleFont  -family Helvetica -size 18 -weight bold
-        font create statusFont -family Helvetica -size 10
-        font create varsFont   -family Helvetica -size 14
-    }
-}
-
-set widgetDemo 1
-set font mainFont
-
-image create photo ::img::refresh -format GIF -data {
-    R0lGODlhEAAQAJEDAP///wAAACpnKv///yH5BAEAAAMALAAAAAAQABAAAAI63IKp
-    xgcPH2ouwgBCw1HIxHCQ4F3hSJKmwZXqWrmWxj7lKJ2dndcon9EBUq+gz3brVXAR
-    2tICU0gXBQA7
-}
-
-image create photo ::img::view -format GIF -data {
-    R0lGODlhEAAQAKIHAP///wwMDAAAAMDAwNnZ2SYmJmZmZv///yH5BAEAAAcALAAA
-    AAAQABAAAANMKLos90+ASamDRxJCgw9YVnlDOXiQBgRDBRgHKE6sW8QR3doPKK27
-    yg33q/GIOhdg6OsEJzeZykiBSUcs06e56Xx6np8ScIkFGuhQAgA7
-}
-
-image create photo ::img::delete -format GIF -data {
-    R0lGODlhEAAQAIABAIQAAP///yH5BAEAAAEALAAAAAAQABAAAAIjjI+pmwAc3HGy
-    PUSvqYpuvWQg40FfSVacBa5nN6JYDI3mzRQAOw==
-}
-
-image create photo ::img::print -format GIF -data {
-    R0lGODlhEAAQALMKAAAAAP///52VunNkl8C82Yl+qldBgq+pyrOzs1fYAP///wAA
-    AAAAAAAAAAAAAAAAACH5BAEAAAoALAAAAAAQABAAAARGUMlJKwU4AztB+ODGeUiJ
-    fGLlgeEYmGWQXmx7aXgmAUTv/74N4EAsGhOJg1DAbDqbwoJ0Sp0KB9isNis0eL/g
-    ryhH5pgnEQA7
-}
-
-# Note that this is run through the message catalog! This is because this is
-# actually an image of a word.
-image create photo ::img::new -format GIF -data [mc {
-    R0lGODlhHgAOALMPALMAANyIiOu7u8dEROaqqvru7sxVVeGZmbgREfXd3b0iItZ3
-    d8IzM9FmZvDMzP///yH5BAEAAA8ALAAAAAAeAA4AAASa8MlJq7046827WVOCHEkw
-    nANhUgJlEBIABJIwL3K+4IcUALCHjfbItYZDSgJgkBiYPmBMAUAkkLPKs/BAyLgM
-    wAQwOAAY2ByCaw4QAFQSoDEePJ6DmU1xInYZTw5nOEFFdgVUelkVDTIMd3AKFGQ1
-    MgI2AwEmQW8APZ0gdRONAks5nhIFVVxdAAkUAS2pAVwFl7ITB4UqHb0XEQA7
-}]
-
-#----------------------------------------------------------------
-# The code below create the main window, consisting of a menu bar and a text
-# widget that explains how to use the program, plus lists all of the demos as
-# hypertext items.
-#----------------------------------------------------------------
-
-menu .menuBar -tearoff 0
-
-if {[tk windowingsystem] ne "aqua"} {
-    # This is a tk-internal procedure to make i18n easier
-    ::tk::AmpMenuArgs .menuBar add cascade -label [mc "&File"] \
-	    -menu .menuBar.file
-    menu .menuBar.file -tearoff 0
-    ::tk::AmpMenuArgs .menuBar.file add command -label [mc "&About..."] \
-	    -command {tkAboutDialog} -accelerator [mc "<F1>"]
-    bind . <F1> {tkAboutDialog}
-    .menuBar.file add sep
-    if {[string match win* [tk windowingsystem]]} {
-	# Windows doesn't usually have a Meta key
-	::tk::AmpMenuArgs .menuBar.file add command -label [mc "&Quit"] \
-		-command {exit} -accelerator [mc "Ctrl+Q"]
-	bind . <[mc "Control-q"]> {exit}
-    } else {
-	::tk::AmpMenuArgs .menuBar.file add command -label [mc "&Quit"] \
-		-command {exit} -accelerator [mc "Meta-Q"]
-	bind . <[mc "Meta-q"]> {exit}
-    }
-}
-
-. configure -menu .menuBar
-
-ttk::frame .statusBar
-ttk::label .statusBar.lab -text "   " -anchor w
-if {[tk windowingsystem] eq "aqua"} {
-    ttk::separator .statusBar.sep
-    pack .statusBar.sep -side top -expand yes -fill x -pady 0
-}
-pack .statusBar.lab -side left -padx 2 -expand yes -fill both
-if {[tk windowingsystem] ne "aqua"} {
-    ttk::sizegrip .statusBar.foo
-    pack .statusBar.foo -side left -padx 2
-}
-pack .statusBar -side bottom -fill x -pady 2
-
-set textheight 30
-catch {
-    set textheight [expr {
-	([winfo screenheight .] * 0.7) /
-	[font metrics mainFont -displayof . -linespace]
-    }]
-}
-
-ttk::frame .textFrame
-ttk::scrollbar .s -orient vertical -command {.t yview} -takefocus 1
-pack .s -in .textFrame -side right -fill y
-text .t -yscrollcommand {.s set} -wrap word -width 70 -height $textheight \
-	-font mainFont -setgrid 1 -highlightthickness 0 \
-	-padx 4 -pady 2 -takefocus 0
-pack .t -in .textFrame -expand y -fill both -padx 1
-pack .textFrame -expand yes -fill both
-if {[tk windowingsystem] eq "aqua"} {
-    pack configure .statusBar.lab -padx {10 18} -pady {4 6}
-    pack configure .statusBar -pady 0
-    .t configure -padx 10 -pady 0
-}
-
-# Create a bunch of tags to use in the text widget, such as those for section
-# titles and demo descriptions. Also define the bindings for tags.
-
-.t tag configure title -font titleFont
-.t tag configure subtitle -font titleFont
-.t tag configure bold  -font boldFont
-if {[tk windowingsystem] eq "aqua"} {
-    .t tag configure title -spacing1 8
-    .t tag configure subtitle -spacing3 3
-}
-
-# We put some "space" characters to the left and right of each demo
-# description so that the descriptions are highlighted only when the mouse
-# cursor is right over them (but not when the cursor is to their left or
-# right).
-#
-.t tag configure demospace -lmargin1 1c -lmargin2 1c
-
-if {[winfo depth .] == 1} {
-    .t tag configure demo -lmargin1 1c -lmargin2 1c \
-	-underline 1
-    .t tag configure visited -lmargin1 1c -lmargin2 1c \
-	-underline 1
-    .t tag configure hot -background black -foreground white
-} else {
-    .t tag configure demo -lmargin1 1c -lmargin2 1c \
-	-foreground blue -underline 1
-    .t tag configure visited -lmargin1 1c -lmargin2 1c \
-	-foreground #303080 -underline 1
-    .t tag configure hot -foreground red -underline 1
-}
-.t tag bind demo <ButtonRelease-1> {
-    invoke [.t index {@%x,%y}]
-}
-set lastLine ""
-.t tag bind demo <Enter> {
-    set lastLine [.t index {@%x,%y linestart}]
-    .t tag add hot "$lastLine +1 chars" "$lastLine lineend -1 chars"
-    .t config -cursor [::ttk::cursor link]
-    showStatus [.t index {@%x,%y}]
-}
-.t tag bind demo <Leave> {
-    .t tag remove hot 1.0 end
-    .t config -cursor [::ttk::cursor text]
-    .statusBar.lab config -text ""
-}
-.t tag bind demo <Motion> {
-    set newLine [.t index {@%x,%y linestart}]
-    if {$newLine ne $lastLine} {
-	.t tag remove hot 1.0 end
-	set lastLine $newLine
-
-	set tags [.t tag names {@%x,%y}]
-	set i [lsearch -glob $tags demo-*]
-	if {$i >= 0} {
-	    .t tag add hot "$lastLine +1 chars" "$lastLine lineend -1 chars"
-	}
-    }
-    showStatus [.t index {@%x,%y}]
-}
-
-##############################################################################
-# Create the text for the text widget.
-
-# addFormattedText --
-#
-#	Add formatted text (but not hypertext) to the text widget after first
-#	passing it through the message catalog to allow for localization.
-#	Lines starting with @@ are formatting directives (insert title, insert
-#	demo hyperlink, begin newline, or change style) and all other lines
-#	are literal strings to be inserted. Substitutions are performed,
-#	allowing processing pieces through the message catalog. Blank lines
-#	are ignored.
-#
-proc addFormattedText {formattedText} {
-    set style normal
-    set isNL 1
-    set demoCount 0
-    set new 0
-    foreach line [split $formattedText \n] {
-	set line [string trim $line]
-	if {$line eq ""} {
-	    continue
-	}
-	if {[string match @@* $line]} {
-	    set data [string range $line 2 end]
-	    set key [lindex $data 0]
-	    set values [lrange $data 1 end]
-	    switch -exact -- $key {
-		title {
-		    .t insert end [mc $values]\n title \n normal
-		}
-		newline {
-		    .t insert end \n $style
-		    set isNL 1
-		}
-		subtitle {
-		    .t insert end "\n" {} [mc $values] subtitle \
-			    " \n " demospace
-		    set demoCount 0
-		}
-		demo {
-		    set description [lassign $values name]
-		    .t insert end "[incr demoCount]. [mc $description]" \
-			    [list demo demo-$name]
-		    if {$new} {
-			.t image create end -image ::img::new -padx 5
-			set new 0
-		    }
-		    .t insert end " \n " demospace
-		}
-		new {
-		    set new 1
-		}
-		default {
-		    set style $key
-		}
-	    }
-	    continue
-	}
-	if {!$isNL} {
-	    .t insert end " " $style
-	}
-	set isNL 0
-	.t insert end [mc $line] $style
-    }
-}
-
-addFormattedText {
-    @@title	Tk Widget Demonstrations
-
-    This application provides a front end for several short scripts
-    that demonstrate what you can do with Tk widgets.  Each of the
-    numbered lines below describes a demonstration; you can click on
-    it to invoke the demonstration.  Once the demonstration window
-    appears, you can click the
-    @@bold
-    See Code
-    @@normal
-    button to see the Tcl/Tk code that created the demonstration.  If
-    you wish, you can edit the code and click the
-    @@bold
-    Rerun Demo
-    @@normal
-    button in the code window to reinvoke the demonstration with the
-    modified code.
-    @@newline
-
-    @@subtitle	Labels, buttons, checkbuttons, and radiobuttons
-    @@demo label	Labels (text and bitmaps)
-    @@demo unicodeout	Labels and UNICODE text
-    @@demo button	Buttons
-    @@demo check	Check-buttons (select any of a group)
-    @@demo radio	Radio-buttons (select one of a group)
-    @@demo puzzle	A 15-puzzle game made out of buttons
-    @@demo icon		Iconic buttons that use bitmaps
-    @@demo image1	Two labels displaying images
-    @@demo image2	A simple user interface for viewing images
-    @@demo labelframe	Labelled frames
-    @@demo ttkbut	The simple Themed Tk widgets
-
-    @@subtitle	Listboxes and Trees
-    @@demo states	The 50 states
-    @@demo colors	Colors: change the color scheme for the application
-    @@demo sayings	A collection of famous and infamous sayings
-    @@demo mclist	A multi-column list of countries
-    @@demo tree		A directory browser tree
-
-    @@subtitle	Entries, Spin-boxes and Combo-boxes
-    @@demo entry1	Entries without scrollbars
-    @@demo entry2	Entries with scrollbars
-    @@demo entry3	Validated entries and password fields
-    @@demo spin		Spin-boxes
-    @@demo combo	Combo-boxes
-    @@demo form		Simple Rolodex-like form
-
-    @@subtitle	Text
-    @@demo text		Basic editable text
-    @@demo style	Text display styles
-    @@demo bind		Hypertext (tag bindings)
-    @@demo twind	A text widget with embedded windows and other features
-    @@demo search	A search tool built with a text widget
-    @@demo textpeer	Peering text widgets
-
-    @@subtitle	Canvases
-    @@demo items	The canvas item types
-    @@demo plot		A simple 2-D plot
-    @@demo ctext	Text items in canvases
-    @@demo arrow	An editor for arrowheads on canvas lines
-    @@demo ruler	A ruler with adjustable tab stops
-    @@demo floor	A building floor plan
-    @@demo cscroll	A simple scrollable canvas
-    @@demo knightstour  A Knight's tour of the chess board
-
-    @@subtitle	Scales and Progress Bars
-    @@demo hscale	Horizontal scale
-    @@demo vscale	Vertical scale
-    @@new
-    @@demo ttkscale	Themed scale linked to a label with traces
-    @@demo ttkprogress	Progress bar
-
-    @@subtitle	Paned Windows and Notebooks
-    @@demo paned1	Horizontal paned window
-    @@demo paned2	Vertical paned window
-    @@demo ttkpane	Themed nested panes
-    @@demo ttknote	Notebook widget
-
-    @@subtitle	Menus and Toolbars
-    @@demo menu		Menus and cascades (sub-menus)
-    @@demo menubu	Menu-buttons
-    @@demo ttkmenu	Themed menu buttons
-    @@demo toolbar	Themed toolbar
-
-    @@subtitle	Common Dialogs
-    @@demo msgbox	Message boxes
-    @@demo filebox	File selection dialog
-    @@demo clrpick	Color picker
-    @@demo fontchoose	Font selection dialog
-
-    @@subtitle	Animation
-    @@demo anilabel	Animated labels
-    @@demo aniwave	Animated wave
-    @@demo pendulum	Pendulum simulation
-    @@demo goldberg	A celebration of Rube Goldberg
-
-    @@subtitle	Miscellaneous
-    @@demo bitmap	The built-in bitmaps
-    @@demo dialog1	A dialog box with a local grab
-    @@demo dialog2	A dialog box with a global grab
-}
-
-##############################################################################
-
-.t configure -state disabled
-focus .s
-
-# addSeeDismiss --
-# Add "See Code" and "Dismiss" button frame, with optional "See Vars"
-#
-# Arguments:
-# w -		The name of the frame to use.
-
-proc addSeeDismiss {w show {vars {}} {extra {}}} {
-    ## See Code / Dismiss buttons
-    ttk::frame $w
-    ttk::separator $w.sep
-    #ttk::frame $w.sep -height 2 -relief sunken
-    grid $w.sep -columnspan 4 -row 0 -sticky ew -pady 2
-    ttk::button $w.dismiss -text [mc "Dismiss"] \
-	-image ::img::delete -compound left \
-	-command [list destroy [winfo toplevel $w]]
-    ttk::button $w.code -text [mc "See Code"] \
-	-image ::img::view -compound left \
-	-command [list showCode $show]
-    set buttons [list x $w.code $w.dismiss]
-    if {[llength $vars]} {
-	ttk::button $w.vars -text [mc "See Variables"] \
-	    -image ::img::view -compound left \
-	    -command [concat [list showVars $w.dialog] $vars]
-	set buttons [linsert $buttons 1 $w.vars]
-    }
-    if {$extra ne ""} {
-	set buttons [linsert $buttons 1 [uplevel 1 $extra]]
-    }
-    grid {*}$buttons -padx 4 -pady 4
-    grid columnconfigure $w 0 -weight 1
-    if {[tk windowingsystem] eq "aqua"} {
-	foreach b [lrange $buttons 1 end] {$b configure -takefocus 0}
-	grid configure $w.sep -pady 0
-	grid configure {*}$buttons -pady {10 12}
-	grid configure [lindex $buttons 1] -padx {16 4}
-	grid configure [lindex $buttons end] -padx {4 18}
-    }
-    return $w
-}
-
-# positionWindow --
-# This procedure is invoked by most of the demos to position a new demo
-# window.
-#
-# Arguments:
-# w -		The name of the window to position.
-
-proc positionWindow w {
-    wm geometry $w +300+300
-}
-
-# showVars --
-# Displays the values of one or more variables in a window, and updates the
-# display whenever any of the variables changes.
-#
-# Arguments:
-# w -		Name of new window to create for display.
-# args -	Any number of names of variables.
-
-proc showVars {w args} {
-    catch {destroy $w}
-    toplevel $w
-    if {[tk windowingsystem] eq "x11"} {wm attributes $w -type dialog}
-    wm title $w [mc "Variable values"]
-
-    set b [ttk::frame $w.frame]
-    grid $b -sticky news
-    set f [ttk::labelframe $b.title -text [mc "Variable values:"]]
-    foreach var $args {
-	ttk::label $f.n$var -text "$var:" -anchor w
-	ttk::label $f.v$var -textvariable $var -anchor w
-	grid $f.n$var $f.v$var -padx 2 -pady 2 -sticky w
-    }
-    ttk::button $b.ok -text [mc "OK"] \
-	-command [list destroy $w] -default active
-    bind $w <Return> [list $b.ok invoke]
-    bind $w <Escape> [list $b.ok invoke]
-
-    grid $f -sticky news -padx 4
-    grid $b.ok -sticky e -padx 4 -pady {6 4}
-    if {[tk windowingsystem] eq "aqua"} {
-	$b.ok configure -takefocus 0
-	grid configure $b.ok -pady {10 12} -padx {16 18}
-	grid configure $f -padx 10 -pady {10 0}
-    }
-    grid columnconfig $f 1 -weight 1
-    grid rowconfigure $f 100 -weight 1
-    grid columnconfig $b 0 -weight 1
-    grid rowconfigure $b 0 -weight 1
-    grid columnconfig $w 0 -weight 1
-    grid rowconfigure $w 0 -weight 1
-}
-
-# invoke --
-# This procedure is called when the user clicks on a demo description. It is
-# responsible for invoking the demonstration.
-#
-# Arguments:
-# index -	The index of the character that the user clicked on.
-
-proc invoke index {
-    global tk_demoDirectory
-    set tags [.t tag names $index]
-    set i [lsearch -glob $tags demo-*]
-    if {$i < 0} {
-	return
-    }
-    set cursor [.t cget -cursor]
-    .t configure -cursor [::ttk::cursor busy]
-    update
-    set demo [string range [lindex $tags $i] 5 end]
-    uplevel 1 [list source [file join $tk_demoDirectory $demo.tcl]]
-    update
-    .t configure -cursor $cursor
-
-    .t tag add visited "$index linestart +1 chars" "$index lineend -1 chars"
-}
-
-# showStatus --
-#
-#	Show the name of the demo program in the status bar. This procedure is
-#	called when the user moves the cursor over a demo description.
-#
-proc showStatus index {
-    set tags [.t tag names $index]
-    set i [lsearch -glob $tags demo-*]
-    set cursor [.t cget -cursor]
-    if {$i < 0} {
-	.statusBar.lab config -text " "
-	set newcursor [::ttk::cursor text]
-    } else {
-	set demo [string range [lindex $tags $i] 5 end]
-	.statusBar.lab config -text [mc "Run the \"%s\" sample program" $demo]
-	set newcursor [::ttk::cursor link]
-    }
-    if {$cursor ne $newcursor} {
-	.t config -cursor $newcursor
-    }
-}
-
-# evalShowCode --
-#
-# Arguments:
-# w -		Name of text widget containing code to eval
-
-proc evalShowCode {w} {
-    set code [$w get 1.0 end-1c]
-    uplevel #0 $code
-}
-
-# showCode --
-# This procedure creates a toplevel window that displays the code for a
-# demonstration and allows it to be edited and reinvoked.
-#
-# Arguments:
-# w -		The name of the demonstration's window, which can be used to
-#		derive the name of the file containing its code.
-
-proc showCode w {
-    global tk_demoDirectory
-    set file [string range $w 1 end].tcl
-    set top .code
-    if {![winfo exists $top]} {
-	toplevel $top
-	if {[tk windowingsystem] eq "x11"} {wm attributes $top -type dialog}
-
-	set t [frame $top.f]
-	set text [text $t.text -font fixedFont -height 24 -wrap word \
-		      -xscrollcommand [list $t.xscroll set] \
-		      -yscrollcommand [list $t.yscroll set] \
-		      -setgrid 1 -highlightthickness 0 -pady 2 -padx 3]
-	ttk::scrollbar $t.xscroll -command [list $t.text xview] \
-	    -orient horizontal
-	ttk::scrollbar $t.yscroll -command [list $t.text yview] \
-	    -orient vertical
-
-	grid $t.text $t.yscroll -sticky news
-	#grid $t.xscroll
-	grid rowconfigure $t 0 -weight 1
-	grid columnconfig $t 0 -weight 1
-
-	set btns [ttk::frame $top.btns]
-	ttk::separator $btns.sep
-	grid $btns.sep -columnspan 4 -row 0 -sticky ew -pady 2
-	ttk::button $btns.dismiss -text [mc "Dismiss"] \
-	    -default active -command [list destroy $top] \
-	    -image ::img::delete -compound left
-	ttk::button $btns.print   -text [mc "Print Code"] \
-	    -command [list printCode $text $file] \
-	    -image ::img::print -compound left
-	ttk::button $btns.rerun   -text [mc "Rerun Demo"] \
-	    -command [list evalShowCode $text] \
-	    -image ::img::refresh -compound left
-	set buttons [list x $btns.rerun $btns.print $btns.dismiss]
-	grid {*}$buttons -padx 4 -pady 4
-	grid columnconfigure $btns 0 -weight 1
-	if {[tk windowingsystem] eq "aqua"} {
-	    foreach b [lrange $buttons 1 end] {$b configure -takefocus 0}
-	    grid configure $btns.sep -pady 0
-	    grid configure {*}$buttons -pady {10 12}
-	    grid configure [lindex $buttons 1] -padx {16 4}
-	    grid configure [lindex $buttons end] -padx {4 18}
-	}
-	grid $t    -sticky news
-	grid $btns -sticky ew
-	grid rowconfigure $top 0 -weight 1
-	grid columnconfig $top 0 -weight 1
-
-	bind $top <Return> {
-	    if {[winfo class %W] ne "Text"} { .code.btns.dismiss invoke }
-	}
-	bind $top <Escape> [bind $top <Return>]
-    } else {
-	wm deiconify $top
-	raise $top
-    }
-    wm title $top [mc "Demo code: %s" [file join $tk_demoDirectory $file]]
-    wm iconname $top $file
-    set id [open [file join $tk_demoDirectory $file]]
-    $top.f.text delete 1.0 end
-    $top.f.text insert 1.0 [read $id]
-    $top.f.text mark set insert 1.0
-    close $id
-}
-
-# printCode --
-# Prints the source code currently displayed in the See Code dialog. Much
-# thanks to Arjen Markus for this.
-#
-# Arguments:
-# w -		Name of text widget containing code to print
-# file -		Name of the original file (implicitly for title)
-
-proc printCode {w file} {
-    set code [$w get 1.0 end-1c]
-
-    set dir "."
-    if {[info exists ::env(HOME)]} {
-	set dir "$::env(HOME)"
-    }
-    if {[info exists ::env(TMP)]} {
-	set dir $::env(TMP)
-    }
-    if {[info exists ::env(TEMP)]} {
-	set dir $::env(TEMP)
-    }
-
-    set filename [file join $dir "tkdemo-$file"]
-    set outfile [open $filename "w"]
-    puts $outfile $code
-    close $outfile
-
-    switch -- $::tcl_platform(platform) {
-	unix {
-	    if {[catch {exec lp -c $filename} msg]} {
-		tk_messageBox -title "Print spooling failure" \
-			-message "Print spooling probably failed: $msg"
-	    }
-	}
-	windows {
-	    if {[catch {PrintTextWin32 $filename} msg]} {
-		tk_messageBox -title "Print spooling failure" \
-			-message "Print spooling probably failed: $msg"
-	    }
-	}
-	default {
-	    tk_messageBox -title "Operation not Implemented" \
-		    -message "Wow! Unknown platform: $::tcl_platform(platform)"
-	}
-    }
-
-    #
-    # Be careful to throw away the temporary file in a gentle manner ...
-    #
-    if {[file exists $filename]} {
-	catch {file delete $filename}
-    }
-}
-
-# PrintTextWin32 --
-#    Print a file under Windows using all the "intelligence" necessary
-#
-# Arguments:
-# filename -		Name of the file
-#
-# Note:
-# Taken from the Wiki page by Keith Vetter, "Printing text files under
-# Windows".
-# Note:
-# Do not execute the command in the background: that way we can dispose of the
-# file smoothly.
-#
-proc PrintTextWin32 {filename} {
-    package require registry
-    set app [auto_execok notepad.exe]
-    set pcmd "$app /p %1"
-    catch {
-	set app [registry get {HKEY_CLASSES_ROOT\.txt} {}]
-	set pcmd [registry get \
-		{HKEY_CLASSES_ROOT\\$app\\shell\\print\\command} {}]
-    }
-
-    regsub -all {%1} $pcmd $filename pcmd
-    puts $pcmd
-
-    regsub -all {\\} $pcmd {\\\\} pcmd
-    set command "[auto_execok start] /min $pcmd"
-    eval exec $command
-}
-
-# tkAboutDialog --
-#
-#	Pops up a message box with an "about" message
-#
-proc tkAboutDialog {} {
-    tk_messageBox -icon info -type ok -title [mc "About Widget Demo"] \
-	    -message [mc "Tk widget demonstration application"] -detail \
-"[mc "Copyright \u00a9 %s" {1996-1997 Sun Microsystems, Inc.}]
-[mc "Copyright \u00a9 %s" {1997-2000 Ajuba Solutions, Inc.}]
-[mc "Copyright \u00a9 %s" {2001-2009 Donal K. Fellows}]
-[mc "Copyright \u00a9 %s" {2002-2007 Daniel A. Steffen}]"
-}
-
-# Local Variables:
-# mode: tcl
-# End:
diff --git a/tk8.6/library/dialog.tcl b/tk8.6/library/dialog.tcl
deleted file mode 100644
index c751621..0000000
--- a/tk8.6/library/dialog.tcl
+++ /dev/null
@@ -1,180 +0,0 @@
-# dialog.tcl --
-#
-# This file defines the procedure tk_dialog, which creates a dialog
-# box containing a bitmap, a message, and one or more buttons.
-#
-# Copyright (c) 1992-1993 The Regents of the University of California.
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-#
-# ::tk_dialog:
-#
-# This procedure displays a dialog box, waits for a button in the dialog
-# to be invoked, then returns the index of the selected button.  If the
-# dialog somehow gets destroyed, -1 is returned.
-#
-# Arguments:
-# w -		Window to use for dialog top-level.
-# title -	Title to display in dialog's decorative frame.
-# text -	Message to display in dialog.
-# bitmap -	Bitmap to display in dialog (empty string means none).
-# default -	Index of button that is to display the default ring
-#		(-1 means none).
-# args -	One or more strings to display in buttons across the
-#		bottom of the dialog box.
-
-proc ::tk_dialog {w title text bitmap default args} {
-    variable ::tk::Priv
-
-    # Check that $default was properly given
-    if {[string is integer -strict $default]} {
-	if {$default >= [llength $args]} {
-	    return -code error -errorcode {TK DIALOG BAD_DEFAULT} \
-		"default button index greater than number of buttons\
-		specified for tk_dialog"
-	}
-    } elseif {"" eq $default} {
-	set default -1
-    } else {
-	set default [lsearch -exact $args $default]
-    }
-
-    set windowingsystem [tk windowingsystem]
-    if {$windowingsystem eq "aqua"} {
-	option add *Dialog*background systemDialogBackgroundActive widgetDefault
-	option add *Dialog*Button.highlightBackground \
-		systemDialogBackgroundActive widgetDefault
-    }
-
-    # 1. Create the top-level window and divide it into top
-    # and bottom parts.
-
-    destroy $w
-    toplevel $w -class Dialog
-    wm title $w $title
-    wm iconname $w Dialog
-    wm protocol $w WM_DELETE_WINDOW { }
-
-    # Dialog boxes should be transient with respect to their parent,
-    # so that they will always stay on top of their parent window.  However,
-    # some window managers will create the window as withdrawn if the parent
-    # window is withdrawn or iconified.  Combined with the grab we put on the
-    # window, this can hang the entire application.  Therefore we only make
-    # the dialog transient if the parent is viewable.
-    #
-    if {[winfo viewable [winfo toplevel [winfo parent $w]]] } {
-	wm transient $w [winfo toplevel [winfo parent $w]]
-    }
-
-    if {$windowingsystem eq "aqua"} {
-	::tk::unsupported::MacWindowStyle style $w moveableModal {}
-    } elseif {$windowingsystem eq "x11"} {
-	wm attributes $w -type dialog
-    }
-
-    frame $w.bot
-    frame $w.top
-    if {$windowingsystem eq "x11"} {
-	$w.bot configure -relief raised -bd 1
-	$w.top configure -relief raised -bd 1
-    }
-    pack $w.bot -side bottom -fill both
-    pack $w.top -side top -fill both -expand 1
-    grid anchor $w.bot center
-
-    # 2. Fill the top part with bitmap and message (use the option
-    # database for -wraplength and -font so that they can be
-    # overridden by the caller).
-
-    option add *Dialog.msg.wrapLength 3i widgetDefault
-    option add *Dialog.msg.font TkCaptionFont widgetDefault
-
-    label $w.msg -justify left -text $text
-    pack $w.msg -in $w.top -side right -expand 1 -fill both -padx 3m -pady 3m
-    if {$bitmap ne ""} {
-	if {$windowingsystem eq "aqua" && $bitmap eq "error"} {
-	    set bitmap "stop"
-	}
-	label $w.bitmap -bitmap $bitmap
-	pack $w.bitmap -in $w.top -side left -padx 3m -pady 3m
-    }
-
-    # 3. Create a row of buttons at the bottom of the dialog.
-
-    set i 0
-    foreach but $args {
-	button $w.button$i -text $but -command [list set ::tk::Priv(button) $i]
-	if {$i == $default} {
-	    $w.button$i configure -default active
-	} else {
-	    $w.button$i configure -default normal
-	}
-	grid $w.button$i -in $w.bot -column $i -row 0 -sticky ew \
-		-padx 10 -pady 4
-	grid columnconfigure $w.bot $i
-	# We boost the size of some Mac buttons for l&f
-	if {$windowingsystem eq "aqua"} {
-	    set tmp [string tolower $but]
-	    if {$tmp eq "ok" || $tmp eq "cancel"} {
-		grid columnconfigure $w.bot $i -minsize 90
-	    }
-	    grid configure $w.button$i -pady 7
-	}
-	incr i
-    }
-
-    # 4. Create a binding for <Return> on the dialog if there is a
-    # default button.
-    # Convention also dictates that if the keyboard focus moves among the
-    # the buttons that the <Return> binding affects the button with the focus.
-
-    if {$default >= 0} {
-	bind $w <Return> [list $w.button$default invoke]
-    }
-    bind $w <<PrevWindow>> [list bind $w <Return> {[tk_focusPrev %W] invoke}]
-    bind $w <<NextWindow>> [list bind $w <Return> {[tk_focusNext %W] invoke}]
-
-    # 5. Create a <Destroy> binding for the window that sets the
-    # button variable to -1;  this is needed in case something happens
-    # that destroys the window, such as its parent window being destroyed.
-
-    bind $w <Destroy> {set ::tk::Priv(button) -1}
-
-    # 6. Withdraw the window, then update all the geometry information
-    # so we know how big it wants to be, then center the window in the
-    # display (Motif style) and de-iconify it.
-
-    ::tk::PlaceWindow $w
-    tkwait visibility $w
-
-    # 7. Set a grab and claim the focus too.
-
-    if {$default >= 0} {
-        set focus $w.button$default
-    } else {
-        set focus $w
-    }
-    tk::SetFocusGrab $w $focus
-
-    # 8. Wait for the user to respond, then restore the focus and
-    # return the index of the selected button.  Restore the focus
-    # before deleting the window, since otherwise the window manager
-    # may take the focus away so we can't redirect it.  Finally,
-    # restore any grab that was in effect.
-
-    vwait ::tk::Priv(button)
-
-    catch {
-	# It's possible that the window has already been destroyed,
-	# hence this "catch".  Delete the Destroy handler so that
-	# Priv(button) doesn't get reset by it.
-
-	bind $w <Destroy> {}
-    }
-    tk::RestoreFocusGrab $w $focus
-    return $Priv(button)
-}
diff --git a/tk8.6/library/entry.tcl b/tk8.6/library/entry.tcl
deleted file mode 100644
index 6243d26..0000000
--- a/tk8.6/library/entry.tcl
+++ /dev/null
@@ -1,654 +0,0 @@
-# entry.tcl --
-#
-# This file defines the default bindings for Tk entry widgets and provides
-# procedures that help in implementing those bindings.
-#
-# Copyright (c) 1992-1994 The Regents of the University of California.
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-#-------------------------------------------------------------------------
-# Elements of tk::Priv that are used in this file:
-#
-# afterId -		If non-null, it means that auto-scanning is underway
-#			and it gives the "after" id for the next auto-scan
-#			command to be executed.
-# mouseMoved -		Non-zero means the mouse has moved a significant
-#			amount since the button went down (so, for example,
-#			start dragging out a selection).
-# pressX -		X-coordinate at which the mouse button was pressed.
-# selectMode -		The style of selection currently underway:
-#			char, word, or line.
-# x, y -		Last known mouse coordinates for scanning
-#			and auto-scanning.
-# data -		Used for Cut and Copy
-#-------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------
-# The code below creates the default class bindings for entries.
-#-------------------------------------------------------------------------
-bind Entry <<Cut>> {
-    if {![catch {tk::EntryGetSelection %W} tk::Priv(data)]} {
-	clipboard clear -displayof %W
-	clipboard append -displayof %W $tk::Priv(data)
-	%W delete sel.first sel.last
-	unset tk::Priv(data)
-    }
-}
-bind Entry <<Copy>> {
-    if {![catch {tk::EntryGetSelection %W} tk::Priv(data)]} {
-	clipboard clear -displayof %W
-	clipboard append -displayof %W $tk::Priv(data)
-	unset tk::Priv(data)
-    }
-}
-bind Entry <<Paste>> {
-    catch {
-	if {[tk windowingsystem] ne "x11"} {
-	    catch {
-		%W delete sel.first sel.last
-	    }
-	}
-	%W insert insert [::tk::GetSelection %W CLIPBOARD]
-	tk::EntrySeeInsert %W
-    }
-}
-bind Entry <<Clear>> {
-    # ignore if there is no selection
-    catch { %W delete sel.first sel.last }
-}
-bind Entry <<PasteSelection>> {
-    if {$tk_strictMotif || ![info exists tk::Priv(mouseMoved)]
-	|| !$tk::Priv(mouseMoved)} {
-	tk::EntryPaste %W %x
-    }
-}
-
-bind Entry <<TraverseIn>> {
-    %W selection range 0 end
-    %W icursor end
-}
-
-# Standard Motif bindings:
-
-bind Entry <1> {
-    tk::EntryButton1 %W %x
-    %W selection clear
-}
-bind Entry <B1-Motion> {
-    set tk::Priv(x) %x
-    tk::EntryMouseSelect %W %x
-}
-bind Entry <Double-1> {
-    set tk::Priv(selectMode) word
-    tk::EntryMouseSelect %W %x
-    catch {%W icursor sel.last}
-}
-bind Entry <Triple-1> {
-    set tk::Priv(selectMode) line
-    tk::EntryMouseSelect %W %x
-    catch {%W icursor sel.last}
-}
-bind Entry <Shift-1> {
-    set tk::Priv(selectMode) char
-    %W selection adjust @%x
-}
-bind Entry <Double-Shift-1>	{
-    set tk::Priv(selectMode) word
-    tk::EntryMouseSelect %W %x
-}
-bind Entry <Triple-Shift-1>	{
-    set tk::Priv(selectMode) line
-    tk::EntryMouseSelect %W %x
-}
-bind Entry <B1-Leave> {
-    set tk::Priv(x) %x
-    tk::EntryAutoScan %W
-}
-bind Entry <B1-Enter> {
-    tk::CancelRepeat
-}
-bind Entry <ButtonRelease-1> {
-    tk::CancelRepeat
-}
-bind Entry <Control-1> {
-    %W icursor @%x
-}
-
-bind Entry <<PrevChar>> {
-    tk::EntrySetCursor %W [expr {[%W index insert] - 1}]
-}
-bind Entry <<NextChar>> {
-    tk::EntrySetCursor %W [expr {[%W index insert] + 1}]
-}
-bind Entry <<SelectPrevChar>> {
-    tk::EntryKeySelect %W [expr {[%W index insert] - 1}]
-    tk::EntrySeeInsert %W
-}
-bind Entry <<SelectNextChar>> {
-    tk::EntryKeySelect %W [expr {[%W index insert] + 1}]
-    tk::EntrySeeInsert %W
-}
-bind Entry <<PrevWord>> {
-    tk::EntrySetCursor %W [tk::EntryPreviousWord %W insert]
-}
-bind Entry <<NextWord>> {
-    tk::EntrySetCursor %W [tk::EntryNextWord %W insert]
-}
-bind Entry <<SelectPrevWord>> {
-    tk::EntryKeySelect %W [tk::EntryPreviousWord %W insert]
-    tk::EntrySeeInsert %W
-}
-bind Entry <<SelectNextWord>> {
-    tk::EntryKeySelect %W [tk::EntryNextWord %W insert]
-    tk::EntrySeeInsert %W
-}
-bind Entry <<LineStart>> {
-    tk::EntrySetCursor %W 0
-}
-bind Entry <<SelectLineStart>> {
-    tk::EntryKeySelect %W 0
-    tk::EntrySeeInsert %W
-}
-bind Entry <<LineEnd>> {
-    tk::EntrySetCursor %W end
-}
-bind Entry <<SelectLineEnd>> {
-    tk::EntryKeySelect %W end
-    tk::EntrySeeInsert %W
-}
-
-bind Entry <Delete> {
-    if {[%W selection present]} {
-	%W delete sel.first sel.last
-    } else {
-	%W delete insert
-    }
-}
-bind Entry <BackSpace> {
-    tk::EntryBackspace %W
-}
-
-bind Entry <Control-space> {
-    %W selection from insert
-}
-bind Entry <Select> {
-    %W selection from insert
-}
-bind Entry <Control-Shift-space> {
-    %W selection adjust insert
-}
-bind Entry <Shift-Select> {
-    %W selection adjust insert
-}
-bind Entry <<SelectAll>> {
-    %W selection range 0 end
-}
-bind Entry <<SelectNone>> {
-    %W selection clear
-}
-bind Entry <KeyPress> {
-    tk::CancelRepeat
-    tk::EntryInsert %W %A
-}
-
-# Ignore all Alt, Meta, and Control keypresses unless explicitly bound.
-# Otherwise, if a widget binding for one of these is defined, the
-# <KeyPress> class binding will also fire and insert the character,
-# which is wrong.  Ditto for Escape, Return, and Tab.
-
-bind Entry <Alt-KeyPress> {# nothing}
-bind Entry <Meta-KeyPress> {# nothing}
-bind Entry <Control-KeyPress> {# nothing}
-bind Entry <Escape> {# nothing}
-bind Entry <Return> {# nothing}
-bind Entry <KP_Enter> {# nothing}
-bind Entry <Tab> {# nothing}
-bind Entry <Prior> {# nothing}
-bind Entry <Next> {# nothing}
-if {[tk windowingsystem] eq "aqua"} {
-    bind Entry <Command-KeyPress> {# nothing}
-}
-# Tk-on-Cocoa generates characters for these two keys. [Bug 2971663]
-bind Entry <<NextLine>> {# nothing}
-bind Entry <<PrevLine>> {# nothing}
-
-# On Windows, paste is done using Shift-Insert.  Shift-Insert already
-# generates the <<Paste>> event, so we don't need to do anything here.
-if {[tk windowingsystem] ne "win32"} {
-    bind Entry <Insert> {
-	catch {tk::EntryInsert %W [::tk::GetSelection %W PRIMARY]}
-    }
-}
-
-# Additional emacs-like bindings:
-
-bind Entry <Control-d> {
-    if {!$tk_strictMotif} {
-	%W delete insert
-    }
-}
-bind Entry <Control-h> {
-    if {!$tk_strictMotif} {
-	tk::EntryBackspace %W
-    }
-}
-bind Entry <Control-k> {
-    if {!$tk_strictMotif} {
-	%W delete insert end
-    }
-}
-bind Entry <Control-t> {
-    if {!$tk_strictMotif} {
-	tk::EntryTranspose %W
-    }
-}
-bind Entry <Meta-b> {
-    if {!$tk_strictMotif} {
-	tk::EntrySetCursor %W [tk::EntryPreviousWord %W insert]
-    }
-}
-bind Entry <Meta-d> {
-    if {!$tk_strictMotif} {
-	%W delete insert [tk::EntryNextWord %W insert]
-    }
-}
-bind Entry <Meta-f> {
-    if {!$tk_strictMotif} {
-	tk::EntrySetCursor %W [tk::EntryNextWord %W insert]
-    }
-}
-bind Entry <Meta-BackSpace> {
-    if {!$tk_strictMotif} {
-	%W delete [tk::EntryPreviousWord %W insert] insert
-    }
-}
-bind Entry <Meta-Delete> {
-    if {!$tk_strictMotif} {
-	%W delete [tk::EntryPreviousWord %W insert] insert
-    }
-}
-
-# A few additional bindings of my own.
-
-bind Entry <2> {
-    if {!$tk_strictMotif} {
-	::tk::EntryScanMark %W %x
-    }
-}
-bind Entry <B2-Motion> {
-    if {!$tk_strictMotif} {
-	::tk::EntryScanDrag %W %x
-    }
-}
-
-# ::tk::EntryClosestGap --
-# Given x and y coordinates, this procedure finds the closest boundary
-# between characters to the given coordinates and returns the index
-# of the character just after the boundary.
-#
-# Arguments:
-# w -		The entry window.
-# x -		X-coordinate within the window.
-
-proc ::tk::EntryClosestGap {w x} {
-    set pos [$w index @$x]
-    set bbox [$w bbox $pos]
-    if {($x - [lindex $bbox 0]) < ([lindex $bbox 2]/2)} {
-	return $pos
-    }
-    incr pos
-}
-
-# ::tk::EntryButton1 --
-# This procedure is invoked to handle button-1 presses in entry
-# widgets.  It moves the insertion cursor, sets the selection anchor,
-# and claims the input focus.
-#
-# Arguments:
-# w -		The entry window in which the button was pressed.
-# x -		The x-coordinate of the button press.
-
-proc ::tk::EntryButton1 {w x} {
-    variable ::tk::Priv
-
-    set Priv(selectMode) char
-    set Priv(mouseMoved) 0
-    set Priv(pressX) $x
-    $w icursor [EntryClosestGap $w $x]
-    $w selection from insert
-    if {"disabled" ne [$w cget -state]} {
-	focus $w
-    }
-}
-
-# ::tk::EntryMouseSelect --
-# This procedure is invoked when dragging out a selection with
-# the mouse.  Depending on the selection mode (character, word,
-# line) it selects in different-sized units.  This procedure
-# ignores mouse motions initially until the mouse has moved from
-# one character to another or until there have been multiple clicks.
-#
-# Arguments:
-# w -		The entry window in which the button was pressed.
-# x -		The x-coordinate of the mouse.
-
-proc ::tk::EntryMouseSelect {w x} {
-    variable ::tk::Priv
-
-    set cur [EntryClosestGap $w $x]
-    set anchor [$w index anchor]
-    if {($cur != $anchor) || (abs($Priv(pressX) - $x) >= 3)} {
-	set Priv(mouseMoved) 1
-    }
-    switch $Priv(selectMode) {
-	char {
-	    if {$Priv(mouseMoved)} {
-		if {$cur < $anchor} {
-		    $w selection range $cur $anchor
-		} elseif {$cur > $anchor} {
-		    $w selection range $anchor $cur
-		} else {
-		    $w selection clear
-		}
-	    }
-	}
-	word {
-	    if {$cur < $anchor} {
-		set before [tcl_wordBreakBefore [$w get] $cur]
-		set after [tcl_wordBreakAfter [$w get] [expr {$anchor-1}]]
-	    } elseif {$cur > $anchor} {
-		set before [tcl_wordBreakBefore [$w get] $anchor]
-		set after [tcl_wordBreakAfter [$w get] [expr {$cur - 1}]]
-	    } else {
-		if {[$w index @$Priv(pressX)] < $anchor} {
-		      incr anchor -1
-		}
-		set before [tcl_wordBreakBefore [$w get] $anchor]
-		set after [tcl_wordBreakAfter [$w get] $anchor]
-	    }
-	    if {$before < 0} {
-		set before 0
-	    }
-	    if {$after < 0} {
-		set after end
-	    }
-	    $w selection range $before $after
-	}
-	line {
-	    $w selection range 0 end
-	}
-    }
-    if {$Priv(mouseMoved)} {
-        $w icursor $cur
-    }
-    update idletasks
-}
-
-# ::tk::EntryPaste --
-# This procedure sets the insertion cursor to the current mouse position,
-# pastes the selection there, and sets the focus to the window.
-#
-# Arguments:
-# w -		The entry window.
-# x -		X position of the mouse.
-
-proc ::tk::EntryPaste {w x} {
-    $w icursor [EntryClosestGap $w $x]
-    catch {$w insert insert [::tk::GetSelection $w PRIMARY]}
-    if {"disabled" ne [$w cget -state]} {
-	focus $w
-    }
-}
-
-# ::tk::EntryAutoScan --
-# This procedure is invoked when the mouse leaves an entry window
-# with button 1 down.  It scrolls the window left or right,
-# depending on where the mouse is, and reschedules itself as an
-# "after" command so that the window continues to scroll until the
-# mouse moves back into the window or the mouse button is released.
-#
-# Arguments:
-# w -		The entry window.
-
-proc ::tk::EntryAutoScan {w} {
-    variable ::tk::Priv
-    set x $Priv(x)
-    if {![winfo exists $w]} {
-	return
-    }
-    if {$x >= [winfo width $w]} {
-	$w xview scroll 2 units
-	EntryMouseSelect $w $x
-    } elseif {$x < 0} {
-	$w xview scroll -2 units
-	EntryMouseSelect $w $x
-    }
-    set Priv(afterId) [after 50 [list tk::EntryAutoScan $w]]
-}
-
-# ::tk::EntryKeySelect --
-# This procedure is invoked when stroking out selections using the
-# keyboard.  It moves the cursor to a new position, then extends
-# the selection to that position.
-#
-# Arguments:
-# w -		The entry window.
-# new -		A new position for the insertion cursor (the cursor hasn't
-#		actually been moved to this position yet).
-
-proc ::tk::EntryKeySelect {w new} {
-    if {![$w selection present]} {
-	$w selection from insert
-	$w selection to $new
-    } else {
-	$w selection adjust $new
-    }
-    $w icursor $new
-}
-
-# ::tk::EntryInsert --
-# Insert a string into an entry at the point of the insertion cursor.
-# If there is a selection in the entry, and it covers the point of the
-# insertion cursor, then delete the selection before inserting.
-#
-# Arguments:
-# w -		The entry window in which to insert the string
-# s -		The string to insert (usually just a single character)
-
-proc ::tk::EntryInsert {w s} {
-    if {$s eq ""} {
-	return
-    }
-    catch {
-	set insert [$w index insert]
-	if {([$w index sel.first] <= $insert)
-		&& ([$w index sel.last] >= $insert)} {
-	    $w delete sel.first sel.last
-	}
-    }
-    $w insert insert $s
-    EntrySeeInsert $w
-}
-
-# ::tk::EntryBackspace --
-# Backspace over the character just before the insertion cursor.
-# If backspacing would move the cursor off the left edge of the
-# window, reposition the cursor at about the middle of the window.
-#
-# Arguments:
-# w -		The entry window in which to backspace.
-
-proc ::tk::EntryBackspace w {
-    if {[$w selection present]} {
-	$w delete sel.first sel.last
-    } else {
-	set x [expr {[$w index insert] - 1}]
-	if {$x >= 0} {
-	    $w delete $x
-	}
-	if {[$w index @0] >= [$w index insert]} {
-	    set range [$w xview]
-	    set left [lindex $range 0]
-	    set right [lindex $range 1]
-	    $w xview moveto [expr {$left - ($right - $left)/2.0}]
-	}
-    }
-}
-
-# ::tk::EntrySeeInsert --
-# Make sure that the insertion cursor is visible in the entry window.
-# If not, adjust the view so that it is.
-#
-# Arguments:
-# w -		The entry window.
-
-proc ::tk::EntrySeeInsert w {
-    set c [$w index insert]
-    if {($c < [$w index @0]) || ($c > [$w index @[winfo width $w]])} {
-	$w xview $c
-    }
-}
-
-# ::tk::EntrySetCursor -
-# Move the insertion cursor to a given position in an entry.  Also
-# clears the selection, if there is one in the entry, and makes sure
-# that the insertion cursor is visible.
-#
-# Arguments:
-# w -		The entry window.
-# pos -		The desired new position for the cursor in the window.
-
-proc ::tk::EntrySetCursor {w pos} {
-    $w icursor $pos
-    $w selection clear
-    EntrySeeInsert $w
-}
-
-# ::tk::EntryTranspose -
-# This procedure implements the "transpose" function for entry widgets.
-# It tranposes the characters on either side of the insertion cursor,
-# unless the cursor is at the end of the line.  In this case it
-# transposes the two characters to the left of the cursor.  In either
-# case, the cursor ends up to the right of the transposed characters.
-#
-# Arguments:
-# w -		The entry window.
-
-proc ::tk::EntryTranspose w {
-    set i [$w index insert]
-    if {$i < [$w index end]} {
-	incr i
-    }
-    set first [expr {$i-2}]
-    if {$first < 0} {
-	return
-    }
-    set data [$w get]
-    set new [string index $data [expr {$i-1}]][string index $data $first]
-    $w delete $first $i
-    $w insert insert $new
-    EntrySeeInsert $w
-}
-
-# ::tk::EntryNextWord --
-# Returns the index of the next word position after a given position in the
-# entry.  The next word is platform dependent and may be either the next
-# end-of-word position or the next start-of-word position after the next
-# end-of-word position.
-#
-# Arguments:
-# w -		The entry window in which the cursor is to move.
-# start -	Position at which to start search.
-
-if {[tk windowingsystem] eq "win32"}  {
-    proc ::tk::EntryNextWord {w start} {
-	set pos [tcl_endOfWord [$w get] [$w index $start]]
-	if {$pos >= 0} {
-	    set pos [tcl_startOfNextWord [$w get] $pos]
-	}
-	if {$pos < 0} {
-	    return end
-	}
-	return $pos
-    }
-} else {
-    proc ::tk::EntryNextWord {w start} {
-	set pos [tcl_endOfWord [$w get] [$w index $start]]
-	if {$pos < 0} {
-	    return end
-	}
-	return $pos
-    }
-}
-
-# ::tk::EntryPreviousWord --
-#
-# Returns the index of the previous word position before a given
-# position in the entry.
-#
-# Arguments:
-# w -		The entry window in which the cursor is to move.
-# start -	Position at which to start search.
-
-proc ::tk::EntryPreviousWord {w start} {
-    set pos [tcl_startOfPreviousWord [$w get] [$w index $start]]
-    if {$pos < 0} {
-	return 0
-    }
-    return $pos
-}
-
-# ::tk::EntryScanMark --
-#
-# Marks the start of a possible scan drag operation
-#
-# Arguments:
-# w -	The entry window from which the text to get
-# x -	x location on screen
-
-proc ::tk::EntryScanMark {w x} {
-    $w scan mark $x
-    set ::tk::Priv(x) $x
-    set ::tk::Priv(y) 0 ; # not used
-    set ::tk::Priv(mouseMoved) 0
-}
-
-# ::tk::EntryScanDrag --
-#
-# Marks the start of a possible scan drag operation
-#
-# Arguments:
-# w -	The entry window from which the text to get
-# x -	x location on screen
-
-proc ::tk::EntryScanDrag {w x} {
-    # Make sure these exist, as some weird situations can trigger the
-    # motion binding without the initial press.  [Bug #220269]
-    if {![info exists ::tk::Priv(x)]} { set ::tk::Priv(x) $x }
-    # allow for a delta
-    if {abs($x-$::tk::Priv(x)) > 2} {
-	set ::tk::Priv(mouseMoved) 1
-    }
-    $w scan dragto $x
-}
-
-# ::tk::EntryGetSelection --
-#
-# Returns the selected text of the entry with respect to the -show option.
-#
-# Arguments:
-# w -         The entry window from which the text to get
-
-proc ::tk::EntryGetSelection {w} {
-    set entryString [string range [$w get] [$w index sel.first] \
-	    [expr {[$w index sel.last] - 1}]]
-    if {[$w cget -show] ne ""} {
-	return [string repeat [string index [$w cget -show] 0] \
-		[string length $entryString]]
-    }
-    return $entryString
-}
diff --git a/tk8.6/library/focus.tcl b/tk8.6/library/focus.tcl
deleted file mode 100644
index 640406e..0000000
--- a/tk8.6/library/focus.tcl
+++ /dev/null
@@ -1,178 +0,0 @@
-# focus.tcl --
-#
-# This file defines several procedures for managing the input
-# focus.
-#
-# Copyright (c) 1994-1995 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-# ::tk_focusNext --
-# This procedure returns the name of the next window after "w" in
-# "focus order" (the window that should receive the focus next if
-# Tab is typed in w).  "Next" is defined by a pre-order search
-# of a top-level and its non-top-level descendants, with the stacking
-# order determining the order of siblings.  The "-takefocus" options
-# on windows determine whether or not they should be skipped.
-#
-# Arguments:
-# w -		Name of a window.
-
-proc ::tk_focusNext w {
-    set cur $w
-    while {1} {
-
-	# Descend to just before the first child of the current widget.
-
-	set parent $cur
-	set children [winfo children $cur]
-	set i -1
-
-	# Look for the next sibling that isn't a top-level.
-
-	while {1} {
-	    incr i
-	    if {$i < [llength $children]} {
-		set cur [lindex $children $i]
-		if {[winfo toplevel $cur] eq $cur} {
-		    continue
-		} else {
-		    break
-		}
-	    }
-
-	    # No more siblings, so go to the current widget's parent.
-	    # If it's a top-level, break out of the loop, otherwise
-	    # look for its next sibling.
-
-	    set cur $parent
-	    if {[winfo toplevel $cur] eq $cur} {
-		break
-	    }
-	    set parent [winfo parent $parent]
-	    set children [winfo children $parent]
-	    set i [lsearch -exact $children $cur]
-	}
-	if {$w eq $cur || [tk::FocusOK $cur]} {
-	    return $cur
-	}
-    }
-}
-
-# ::tk_focusPrev --
-# This procedure returns the name of the previous window before "w" in
-# "focus order" (the window that should receive the focus next if
-# Shift-Tab is typed in w).  "Next" is defined by a pre-order search
-# of a top-level and its non-top-level descendants, with the stacking
-# order determining the order of siblings.  The "-takefocus" options
-# on windows determine whether or not they should be skipped.
-#
-# Arguments:
-# w -		Name of a window.
-
-proc ::tk_focusPrev w {
-    set cur $w
-    while {1} {
-
-	# Collect information about the current window's position
-	# among its siblings.  Also, if the window is a top-level,
-	# then reposition to just after the last child of the window.
-
-	if {[winfo toplevel $cur] eq $cur}  {
-	    set parent $cur
-	    set children [winfo children $cur]
-	    set i [llength $children]
-	} else {
-	    set parent [winfo parent $cur]
-	    set children [winfo children $parent]
-	    set i [lsearch -exact $children $cur]
-	}
-
-	# Go to the previous sibling, then descend to its last descendant
-	# (highest in stacking order.  While doing this, ignore top-levels
-	# and their descendants.  When we run out of descendants, go up
-	# one level to the parent.
-
-	while {$i > 0} {
-	    incr i -1
-	    set cur [lindex $children $i]
-	    if {[winfo toplevel $cur] eq $cur} {
-		continue
-	    }
-	    set parent $cur
-	    set children [winfo children $parent]
-	    set i [llength $children]
-	}
-	set cur $parent
-	if {$w eq $cur || [tk::FocusOK $cur]} {
-	    return $cur
-	}
-    }
-}
-
-# ::tk::FocusOK --
-#
-# This procedure is invoked to decide whether or not to focus on
-# a given window.  It returns 1 if it's OK to focus on the window,
-# 0 if it's not OK.  The code first checks whether the window is
-# viewable.  If not, then it never focuses on the window.  Then it
-# checks the -takefocus option for the window and uses it if it's
-# set.  If there's no -takefocus option, the procedure checks to
-# see if (a) the widget isn't disabled, and (b) it has some key
-# bindings.  If all of these are true, then 1 is returned.
-#
-# Arguments:
-# w -		Name of a window.
-
-proc ::tk::FocusOK w {
-    set code [catch {$w cget -takefocus} value]
-    if {($code == 0) && ($value ne "")} {
-	if {$value == 0} {
-	    return 0
-	} elseif {$value == 1} {
-	    return [winfo viewable $w]
-	} else {
-	    set value [uplevel #0 $value [list $w]]
-	    if {$value ne ""} {
-		return $value
-	    }
-	}
-    }
-    if {![winfo viewable $w]} {
-	return 0
-    }
-    set code [catch {$w cget -state} value]
-    if {($code == 0) && $value eq "disabled"} {
-	return 0
-    }
-    regexp Key|Focus "[bind $w] [bind [winfo class $w]]"
-}
-
-# ::tk_focusFollowsMouse --
-#
-# If this procedure is invoked, Tk will enter "focus-follows-mouse"
-# mode, where the focus is always on whatever window contains the
-# mouse.  If this procedure isn't invoked, then the user typically
-# has to click on a window to give it the focus.
-#
-# Arguments:
-# None.
-
-proc ::tk_focusFollowsMouse {} {
-    set old [bind all <Enter>]
-    set script {
-	if {"%d" eq "NotifyAncestor" || "%d" eq "NotifyNonlinear" \
-		|| "%d" eq "NotifyInferior"} {
-	    if {[tk::FocusOK %W]} {
-		focus %W
-	    }
-	}
-    }
-    if {$old ne ""} {
-	bind all <Enter> "$old; $script"
-    } else {
-	bind all <Enter> $script
-    }
-}
diff --git a/tk8.6/library/fontchooser.tcl b/tk8.6/library/fontchooser.tcl
deleted file mode 100644
index 8f91ade..0000000
--- a/tk8.6/library/fontchooser.tcl
+++ /dev/null
@@ -1,449 +0,0 @@
-# fontchooser.tcl -
-#
-#	A themeable Tk font selection dialog. See TIP #324.
-#
-# Copyright (C) 2008 Keith Vetter
-# Copyright (C) 2008 Pat Thoyts <patthoyts@users.sourceforge.net>
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-
-namespace eval ::tk::fontchooser {
-    variable S
-
-    set S(W) .__tk__fontchooser
-    set S(fonts) [lsort -dictionary [font families]]
-    set S(styles) [list \
-                       [::msgcat::mc "Regular"] \
-                       [::msgcat::mc "Italic"] \
-                       [::msgcat::mc "Bold"] \
-                       [::msgcat::mc "Bold Italic"] \
-                      ]
-
-    set S(sizes) {8 9 10 11 12 14 16 18 20 22 24 26 28 36 48 72}
-    set S(strike) 0
-    set S(under) 0
-    set S(first) 1
-    set S(sampletext) [::msgcat::mc "AaBbYyZz01"]
-    set S(-parent) .
-    set S(-title) [::msgcat::mc "Font"]
-    set S(-command) ""
-    set S(-font) TkDefaultFont
-}
-
-proc ::tk::fontchooser::Setup {} {
-    variable S
-
-    # Canonical versions of font families, styles, etc. for easier searching
-    set S(fonts,lcase) {}
-    foreach font $S(fonts) { lappend S(fonts,lcase) [string tolower $font]}
-    set S(styles,lcase) {}
-    foreach style $S(styles) { lappend S(styles,lcase) [string tolower $style]}
-    set S(sizes,lcase) $S(sizes)
-
-    ::ttk::style layout FontchooserFrame {
-        Entry.field -sticky news -border true -children {
-            FontchooserFrame.padding -sticky news
-        }
-    }
-    bind [winfo class .] <<ThemeChanged>> \
-        [list +ttk::style layout FontchooserFrame \
-             [ttk::style layout FontchooserFrame]]
-
-    namespace ensemble create -map {
-        show ::tk::fontchooser::Show
-        hide ::tk::fontchooser::Hide
-        configure ::tk::fontchooser::Configure
-    }
-}
-::tk::fontchooser::Setup
-
-proc ::tk::fontchooser::Show {} {
-    variable S
-    if {![winfo exists $S(W)]} {
-        Create
-        wm transient $S(W) [winfo toplevel $S(-parent)]
-        tk::PlaceWindow $S(W) widget $S(-parent)
-    }
-    wm deiconify $S(W)
-}
-
-proc ::tk::fontchooser::Hide {} {
-    variable S
-    wm withdraw $S(W)
-}
-
-proc ::tk::fontchooser::Configure {args} {
-    variable S
-
-    set specs {
-        {-parent  "" "" . }
-        {-title   "" "" ""}
-        {-font    "" "" ""}
-        {-command "" "" ""}
-    }
-
-    if {[llength $args] == 0} {
-        set result {}
-        foreach spec $specs {
-            foreach {name xx yy default} $spec break
-            lappend result $name \
-                [expr {[info exists S($name)] ? $S($name) : $default}]
-        }
-        lappend result -visible \
-            [expr {[winfo exists $S(W)] && [winfo ismapped $S(W)]}]
-        return $result
-    }
-    if {[llength $args] == 1} {
-        set option [lindex $args 0]
-        if {[string equal $option "-visible"]} {
-            return [expr {[winfo exists $S(W)] && [winfo ismapped $S(W)]}]
-        } elseif {[info exists S($option)]} {
-            return $S($option)
-        }
-        return -code error -errorcode [list TK LOOKUP OPTION $option] \
-	    "bad option \"$option\": must be\
-            -command, -font, -parent, -title or -visible"
-    }
-
-    set cache [dict create -parent $S(-parent) -title $S(-title) \
-                   -font $S(-font) -command $S(-command)]
-    set r [tclParseConfigSpec [namespace which -variable S] $specs "" $args]
-    if {![winfo exists $S(-parent)]} {
-	set code [list TK LOOKUP WINDOW $S(-parent)]
-        set err "bad window path name \"$S(-parent)\""
-        array set S $cache
-        return -code error -errorcode $code $err
-    }
-    if {[string trim $S(-title)] eq ""} {
-        set S(-title) [::msgcat::mc "Font"]
-    }
-    if {[winfo exists $S(W)] && [lsearch $args -font] != -1} {
-	Init $S(-font)
-	event generate $S(-parent) <<TkFontchooserFontChanged>>
-    }
-    return $r
-}
-
-proc ::tk::fontchooser::Create {} {
-    variable S
-    set windowName __tk__fontchooser
-    if {$S(-parent) eq "."} {
-        set S(W) .$windowName
-    } else {
-        set S(W) $S(-parent).$windowName
-    }
-
-    # Now build the dialog
-    if {![winfo exists $S(W)]} {
-        toplevel $S(W) -class TkFontDialog
-        if {[package provide tcltest] ne {}} {set ::tk_dialog $S(W)}
-        wm withdraw $S(W)
-        wm title $S(W) $S(-title)
-        wm transient $S(W) [winfo toplevel $S(-parent)]
-
-        set outer [::ttk::frame $S(W).outer -padding {10 10}]
-        ::tk::AmpWidget ::ttk::label $S(W).font -text [::msgcat::mc "&Font:"]
-        ::tk::AmpWidget ::ttk::label $S(W).style -text [::msgcat::mc "Font st&yle:"]
-        ::tk::AmpWidget ::ttk::label $S(W).size -text [::msgcat::mc "&Size:"]
-        ttk::entry $S(W).efont -width 18 \
-            -textvariable [namespace which -variable S](font)
-        ttk::entry $S(W).estyle -width 10 \
-            -textvariable [namespace which -variable S](style)
-        ttk::entry $S(W).esize -textvariable [namespace which -variable S](size) \
-            -width 3 -validate key -validatecommand {string is double %P}
-
-        ttk_slistbox $S(W).lfonts -height 7 -exportselection 0 \
-            -selectmode browse -activestyle none \
-            -listvariable [namespace which -variable S](fonts)
-        ttk_slistbox $S(W).lstyles -width 5 -height 7 -exportselection 0 \
-            -selectmode browse -activestyle none \
-            -listvariable [namespace which -variable S](styles)
-        ttk_slistbox $S(W).lsizes -width 4 -height 7 -exportselection 0 \
-            -selectmode browse -activestyle none \
-            -listvariable [namespace which -variable S](sizes)
-
-        set WE $S(W).effects
-        ::ttk::labelframe $WE -text [::msgcat::mc "Effects"]
-        ::tk::AmpWidget ::ttk::checkbutton $WE.strike \
-            -variable [namespace which -variable S](strike) \
-            -text [::msgcat::mc "Stri&keout"] \
-            -command [namespace code [list Click strike]]
-        ::tk::AmpWidget ::ttk::checkbutton $WE.under \
-            -variable [namespace which -variable S](under) \
-            -text [::msgcat::mc "&Underline"] \
-            -command [namespace code [list Click under]]
-
-        set bbox [::ttk::frame $S(W).bbox]
-        ::ttk::button $S(W).ok -text [::msgcat::mc OK] -default active\
-            -command [namespace code [list Done 1]]
-        ::ttk::button $S(W).cancel -text [::msgcat::mc Cancel] \
-            -command [namespace code [list Done 0]]
-        ::tk::AmpWidget ::ttk::button $S(W).apply -text [::msgcat::mc "&Apply"] \
-            -command [namespace code [list Apply]]
-        wm protocol $S(W) WM_DELETE_WINDOW [namespace code [list Done 0]]
-
-        # Calculate minimum sizes
-        ttk::scrollbar $S(W).tmpvs
-        set scroll_width [winfo reqwidth $S(W).tmpvs]
-        destroy $S(W).tmpvs
-        set minsize(gap) 10
-        set minsize(bbox) [winfo reqwidth $S(W).ok]
-        set minsize(fonts) \
-            [expr {[font measure TkDefaultFont "Helvetica"] + $scroll_width}]
-        set minsize(styles) \
-            [expr {[font measure TkDefaultFont "Bold Italic"] + $scroll_width}]
-        set minsize(sizes) \
-            [expr {[font measure TkDefaultFont "-99"] + $scroll_width}]
-        set min [expr {$minsize(gap) * 4}]
-        foreach {what width} [array get minsize] { incr min $width }
-        wm minsize $S(W) $min 260
-
-        bind $S(W) <Return> [namespace code [list Done 1]]
-        bind $S(W) <Escape> [namespace code [list Done 0]]
-        bind $S(W) <Map> [namespace code [list Visibility %W 1]]
-        bind $S(W) <Unmap> [namespace code [list Visibility %W 0]]
-        bind $S(W) <Destroy> [namespace code [list Visibility %W 0]]
-        bind $S(W).lfonts.list <<ListboxSelect>> [namespace code [list Click font]]
-        bind $S(W).lstyles.list <<ListboxSelect>> [namespace code [list Click style]]
-        bind $S(W).lsizes.list <<ListboxSelect>> [namespace code [list Click size]]
-        bind $S(W) <Alt-Key> [list ::tk::AltKeyInDialog $S(W) %A]
-        bind $S(W).font <<AltUnderlined>> [list ::focus $S(W).efont]
-        bind $S(W).style <<AltUnderlined>> [list ::focus $S(W).estyle]
-        bind $S(W).size <<AltUnderlined>> [list ::focus $S(W).esize]
-        bind $S(W).apply <<AltUnderlined>> [namespace code [list Apply]]
-        bind $WE.strike <<AltUnderlined>> [list $WE.strike invoke]
-        bind $WE.under <<AltUnderlined>> [list $WE.under invoke]
-
-        set WS $S(W).sample
-        ::ttk::labelframe $WS -text [::msgcat::mc "Sample"]
-        ::ttk::label $WS.sample -relief sunken -anchor center \
-            -textvariable [namespace which -variable S](sampletext)
-        set S(sample) $WS.sample
-        grid $WS.sample -sticky news -padx 6 -pady 4
-        grid rowconfigure $WS 0 -weight 1
-        grid columnconfigure $WS 0 -weight 1
-        grid propagate $WS 0
-
-        grid $S(W).ok     -in $bbox -sticky new -pady {0 2}
-        grid $S(W).cancel -in $bbox -sticky new -pady 2
-        if {$S(-command) ne ""} {
-            grid $S(W).apply -in $bbox -sticky new -pady 2
-        }
-        grid columnconfigure $bbox 0 -weight 1
-
-        grid $WE.strike -sticky w -padx 10
-        grid $WE.under -sticky w -padx 10 -pady {0 30}
-        grid columnconfigure $WE 1 -weight 1
-
-        grid $S(W).font   x $S(W).style   x $S(W).size   x       -in $outer -sticky w
-        grid $S(W).efont  x $S(W).estyle  x $S(W).esize  x $bbox -in $outer -sticky ew
-        grid $S(W).lfonts x $S(W).lstyles x $S(W).lsizes x ^     -in $outer -sticky news
-        grid $WE          x $WS           - -            x ^     -in $outer -sticky news -pady {15 30}
-        grid configure $bbox -sticky n
-        grid columnconfigure $outer {1 3 5} -minsize $minsize(gap)
-        grid columnconfigure $outer {0 2 4} -weight 1
-        grid columnconfigure $outer 0 -minsize $minsize(fonts)
-        grid columnconfigure $outer 2 -minsize $minsize(styles)
-        grid columnconfigure $outer 4 -minsize $minsize(sizes)
-        grid columnconfigure $outer 6 -minsize $minsize(bbox)
-
-        grid $outer -sticky news
-        grid rowconfigure $S(W) 0 -weight 1
-        grid columnconfigure $S(W) 0 -weight 1
-
-        Init $S(-font)
-
-        trace add variable [namespace which -variable S](size) \
-            write [namespace code [list Tracer]]
-        trace add variable [namespace which -variable S](style) \
-            write [namespace code [list Tracer]]
-        trace add variable [namespace which -variable S](font) \
-            write [namespace code [list Tracer]]
-    } else {
-        Init $S(-font)
-    }
-
-    return
-}
-
-# ::tk::fontchooser::Done --
-#
-#       Handles teardown of the dialog, calling -command if needed
-#
-# Arguments:
-#       ok              true if user pressed OK
-#
-proc ::tk::::fontchooser::Done {ok} {
-    variable S
-
-    if {! $ok} {
-        set S(result) ""
-    }
-    trace vdelete S(size) w [namespace code [list Tracer]]
-    trace vdelete S(style) w [namespace code [list Tracer]]
-    trace vdelete S(font) w [namespace code [list Tracer]]
-    destroy $S(W)
-    if {$ok && $S(-command) ne ""} {
-        uplevel #0 $S(-command) [list $S(result)]
-    }
-}
-
-# ::tk::fontchooser::Apply --
-#
-#	Call the -command procedure appending the current font
-#	Errors are reported via the background error mechanism
-#
-proc ::tk::fontchooser::Apply {} {
-    variable S
-    if {$S(-command) ne ""} {
-        if {[catch {uplevel #0 $S(-command) [list $S(result)]} err]} {
-            ::bgerror $err
-        }
-    }
-    event generate $S(-parent) <<TkFontchooserFontChanged>>
-}
-
-# ::tk::fontchooser::Init --
-#
-#       Initializes dialog to a default font
-#
-# Arguments:
-#       defaultFont     font to use as the default
-#
-proc ::tk::fontchooser::Init {{defaultFont ""}} {
-    variable S
-
-    if {$S(first) || $defaultFont ne ""} {
-        if {$defaultFont eq ""} {
-            set defaultFont [[entry .___e] cget -font]
-            destroy .___e
-        }
-        array set F [font actual $defaultFont]
-        set S(font) $F(-family)
-        set S(size) $F(-size)
-        set S(strike) $F(-overstrike)
-        set S(under) $F(-underline)
-        set S(style) "Regular"
-        if {$F(-weight) eq "bold" && $F(-slant) eq "italic"} {
-            set S(style) "Bold Italic"
-        } elseif {$F(-weight) eq "bold"} {
-            set S(style) "Bold"
-        } elseif {$F(-slant) eq "italic"} {
-            set S(style) "Italic"
-        }
-
-        set S(first) 0
-    }
-
-    Tracer a b c
-    Update
-}
-
-# ::tk::fontchooser::Click --
-#
-#       Handles all button clicks, updating the appropriate widgets
-#
-# Arguments:
-#       who             which widget got pressed
-#
-proc ::tk::fontchooser::Click {who} {
-    variable S
-
-    if {$who eq "font"} {
-        set S(font) [$S(W).lfonts get [$S(W).lfonts curselection]]
-    } elseif {$who eq "style"} {
-        set S(style) [$S(W).lstyles get [$S(W).lstyles curselection]]
-    } elseif {$who eq "size"} {
-        set S(size) [$S(W).lsizes get [$S(W).lsizes curselection]]
-    }
-    Update
-}
-
-# ::tk::fontchooser::Tracer --
-#
-#       Handles traces on key variables, updating the appropriate widgets
-#
-# Arguments:
-#       standard trace arguments (not used)
-#
-proc ::tk::fontchooser::Tracer {var1 var2 op} {
-    variable S
-
-    set bad 0
-    set nstate normal
-    # Make selection in each listbox
-    foreach var {font style size} {
-        set value [string tolower $S($var)]
-        $S(W).l${var}s selection clear 0 end
-        set n [lsearch -exact $S(${var}s,lcase) $value]
-        $S(W).l${var}s selection set $n
-        if {$n != -1} {
-            set S($var) [lindex $S(${var}s) $n]
-            $S(W).e$var icursor end
-            $S(W).e$var selection clear
-        } else {                                ;# No match, try prefix
-            # Size is weird: valid numbers are legal but don't display
-            # unless in the font size list
-            set n [lsearch -glob $S(${var}s,lcase) "$value*"]
-            set bad 1
-            if {$var ne "size" || ! [string is double -strict $value]} {
-                set nstate disabled
-            }
-        }
-        $S(W).l${var}s see $n
-    }
-    if {!$bad} { Update }
-    $S(W).ok configure -state $nstate
-}
-
-# ::tk::fontchooser::Update --
-#
-#       Shows a sample of the currently selected font
-#
-proc ::tk::fontchooser::Update {} {
-    variable S
-
-    set S(result) [list $S(font) $S(size)]
-    if {$S(style) eq "Bold"} { lappend S(result) bold }
-    if {$S(style) eq "Italic"} { lappend S(result) italic }
-    if {$S(style) eq "Bold Italic"} { lappend S(result) bold italic}
-    if {$S(strike)} { lappend S(result) overstrike}
-    if {$S(under)} { lappend S(result) underline}
-
-    $S(sample) configure -font $S(result)
-}
-
-# ::tk::fontchooser::Visibility --
-#
-#	Notify the parent when the dialog visibility changes
-#
-proc ::tk::fontchooser::Visibility {w visible} {
-    variable S
-    if {$w eq $S(W)} {
-        event generate $S(-parent) <<TkFontchooserVisibility>>
-    }
-}
-
-# ::tk::fontchooser::ttk_listbox --
-#
-#	Create a properly themed scrolled listbox.
-#	This is exactly right on XP but may need adjusting on other platforms.
-#
-proc ::tk::fontchooser::ttk_slistbox {w args} {
-    set f [ttk::frame $w -style FontchooserFrame -padding 2]
-    if {[catch {
-        listbox $f.list -relief flat -highlightthickness 0 -borderwidth 0 {*}$args
-        ttk::scrollbar $f.vs -command [list $f.list yview]
-        $f.list configure -yscrollcommand [list $f.vs set]
-        grid $f.list $f.vs -sticky news
-        grid rowconfigure $f 0 -weight 1
-        grid columnconfigure $f 0 -weight 1
-        interp hide {} $w
-        interp alias {} $w {} $f.list
-    } err opt]} {
-        destroy $f
-        return -options $opt $err
-    }
-    return $w
-}
diff --git a/tk8.6/library/iconlist.tcl b/tk8.6/library/iconlist.tcl
deleted file mode 100644
index 62b0b2d..0000000
--- a/tk8.6/library/iconlist.tcl
+++ /dev/null
@@ -1,696 +0,0 @@
-# iconlist.tcl
-#
-#	Implements the icon-list megawidget used in the "Tk" standard file
-#	selection dialog boxes.
-#
-# Copyright (c) 1994-1998 Sun Microsystems, Inc.
-# Copyright (c) 2009 Donal K. Fellows
-#
-# See the file "license.terms" for information on usage and redistribution of
-# this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# API Summary:
-#	tk::IconList <path> ?<option> <value>? ...
-#	<path> add <imageName> <itemList>
-#	<path> cget <option>
-#	<path> configure ?<option>? ?<value>? ...
-#	<path> deleteall
-#	<path> destroy
-#	<path> get <itemIndex>
-#	<path> index <index>
-#	<path> invoke
-#	<path> see <index>
-#	<path> selection anchor ?<int>?
-#	<path> selection clear <first> ?<last>?
-#	<path> selection get
-#	<path> selection includes <item>
-#	<path> selection set <first> ?<last>?
-
-package require Tk 8.6
-
-::tk::Megawidget create ::tk::IconList ::tk::FocusableWidget {
-    variable w canvas sbar accel accelCB fill font index \
-	itemList itemsPerColumn list maxIH maxIW maxTH maxTW noScroll \
-	numItems oldX oldY options rect selected selection textList
-    constructor args {
-	next {*}$args
-	set accelCB {}
-    }
-    destructor {
-	my Reset
-	next
-    }
-
-    method GetSpecs {} {
-	concat [next] {
-	    {-command "" "" ""}
-	    {-font "" "" "TkIconFont"}
-	    {-multiple "" "" "0"}
-	}
-    }
-
-    # ----------------------------------------------------------------------
-
-    method index i {
-	if {![info exist list]} {
-	    set list {}
-	}
-	switch -regexp -- $i {
-	    "^-?[0-9]+$" {
-		if {$i < 0} {
-		    set i 0
-		}
-		if {$i >= [llength $list]} {
-		    set i [expr {[llength $list] - 1}]
-		}
-		return $i
-	    }
-	    "^anchor$" {
-		return $index(anchor)
-	    }
-	    "^end$" {
-		return [llength $list]
-	    }
-	    "@-?[0-9]+,-?[0-9]+" {
-		scan $i "@%d,%d" x y
-		set item [$canvas find closest \
-			[$canvas canvasx $x] [$canvas canvasy $y]]
-		return [lindex [$canvas itemcget $item -tags] 1]
-	    }
-	}
-    }
-
-    method selection {op args} {
-	switch -exact -- $op {
-	    anchor {
-		if {[llength $args] == 1} {
-		    set index(anchor) [$w index [lindex $args 0]]
-		} else {
-		    return $index(anchor)
-		}
-	    }
-	    clear {
-		switch [llength $args] {
-		    2 {
-			lassign $args first last
-		    }
-		    1 {
-			set first [set last [lindex $args 0]]
-		    }
-		    default {
-			return -code error -errorcode {TCL WRONGARGS} \
-			    "wrong # args: should be\
-			    \"[lrange [info level 0] 0 1] first ?last?\""
-		    }
-		}
-
-		set first [$w index $first]
-		set last [$w index $last]
-		if {$first > $last} {
-		    set tmp $first
-		    set first $last
-		    set last $tmp
-		}
-		set ind 0
-		foreach item $selection {
-		    if {$item >= $first} {
-			set first $ind
-			break
-		    }
-		    incr ind
-		}
-		set ind [expr {[llength $selection] - 1}]
-		for {} {$ind >= 0} {incr ind -1} {
-		    set item [lindex $selection $ind]
-		    if {$item <= $last} {
-			set last $ind
-			break
-		    }
-		}
-
-		if {$first > $last} {
-		    return
-		}
-		set selection [lreplace $selection $first $last]
-		event generate $w <<ListboxSelect>>
-		my DrawSelection
-	    }
-	    get {
-		return $selection
-	    }
-	    includes {
-		return [expr {[lindex $args 0] in $selection}]
-	    }
-	    set {
-		switch [llength $args] {
-		    2 {
-			lassign $args first last
-		    }
-		    1 {
-			set first [set last [lindex $args 0]]
-		    }
-		    default {
-			return -code error -errorcode {TCL WRONGARGS} \
-			    "wrong # args: should be\
-			    \"[lrange [info level 0] 0 1] first ?last?\""
-		    }
-		}
-
-		set first [$w index $first]
-		set last [$w index $last]
-		if {$first > $last} {
-		    set tmp $first
-		    set first $last
-		    set last $tmp
-		}
-
-		for {set i $first} {$i <= $last} {incr i} {
-		    lappend selection $i
-		}
-		set selection [lsort -integer -unique $selection]
-		event generate $w <<ListboxSelect>>
-		my DrawSelection
-	    }
-	}
-    }
-
-    method get item {
-	set rTag [lindex $list $item 2]
-	lassign $itemList($rTag) iTag tTag text serial
-	return $text
-    }
-
-    #	Deletes all the items inside the canvas subwidget and reset the
-    #	iconList's state.
-    #
-    method deleteall {} {
-	$canvas delete all
-	unset -nocomplain selected rect list itemList
-	set maxIW 1
-	set maxIH 1
-	set maxTW 1
-	set maxTH 1
-	set numItems 0
-	set noScroll 1
-	set selection {}
-	set index(anchor) ""
-	$sbar set 0.0 1.0
-	$canvas xview moveto 0
-    }
-
-    #	Adds an icon into the IconList with the designated image and text
-    #
-    method add {image items} {
-	foreach text $items {
-	    set iID item$numItems
-	    set iTag [$canvas create image 0 0 -image $image -anchor nw \
-			  -tags [list icon $numItems $iID]]
-	    set tTag [$canvas create text  0 0 -text  $text  -anchor nw \
-			  -font $options(-font) -fill $fill \
-			  -tags [list text $numItems $iID]]
-	    set rTag [$canvas create rect  0 0 0 0 -fill "" -outline "" \
-			  -tags [list rect $numItems $iID]]
-
-	    lassign [$canvas bbox $iTag] x1 y1 x2 y2
-	    set iW [expr {$x2 - $x1}]
-	    set iH [expr {$y2 - $y1}]
-	    if {$maxIW < $iW} {
-		set maxIW $iW
-	    }
-	    if {$maxIH < $iH} {
-		set maxIH $iH
-	    }
-
-	    lassign [$canvas bbox $tTag] x1 y1 x2 y2
-	    set tW [expr {$x2 - $x1}]
-	    set tH [expr {$y2 - $y1}]
-	    if {$maxTW < $tW} {
-		set maxTW $tW
-	    }
-	    if {$maxTH < $tH} {
-		set maxTH $tH
-	    }
-
-	    lappend list [list $iTag $tTag $rTag $iW $iH $tW $tH $numItems]
-	    set itemList($rTag) [list $iTag $tTag $text $numItems]
-	    set textList($numItems) [string tolower $text]
-	    incr numItems
-	}
-	my WhenIdle Arrange
-	return
-    }
-
-    #	Gets called when the user invokes the IconList (usually by
-    #	double-clicking or pressing the Return key).
-    #
-    method invoke {} {
-	if {$options(-command) ne "" && [llength $selection]} {
-	    uplevel #0 $options(-command)
-	}
-    }
-
-    #	If the item is not (completely) visible, scroll the canvas so that it
-    #	becomes visible.
-    #
-    method see rTag {
-	if {$noScroll} {
-	    return
-	}
-	set sRegion [$canvas cget -scrollregion]
-	if {$sRegion eq ""} {
-	    return
-	}
-
-	if {$rTag < 0 || $rTag >= [llength $list]} {
-	    return
-	}
-
-	set bbox [$canvas bbox item$rTag]
-	set pad [expr {[$canvas cget -highlightthickness]+[$canvas cget -bd]}]
-
-	set x1 [lindex $bbox 0]
-	set x2 [lindex $bbox 2]
-	incr x1 [expr {$pad * -2}]
-	incr x2 [expr {$pad * -1}]
-
-	set cW [expr {[winfo width $canvas] - $pad*2}]
-
-	set scrollW [expr {[lindex $sRegion 2]-[lindex $sRegion 0]+1}]
-	set dispX [expr {int([lindex [$canvas xview] 0]*$scrollW)}]
-	set oldDispX $dispX
-
-	# check if out of the right edge
-	#
-	if {($x2 - $dispX) >= $cW} {
-	    set dispX [expr {$x2 - $cW}]
-	}
-	# check if out of the left edge
-	#
-	if {($x1 - $dispX) < 0} {
-	    set dispX $x1
-	}
-
-	if {$oldDispX ne $dispX} {
-	    set fraction [expr {double($dispX) / double($scrollW)}]
-	    $canvas xview moveto $fraction
-	}
-    }
-
-    # ----------------------------------------------------------------------
-
-    #	Places the icons in a column-major arrangement.
-    #
-    method Arrange {} {
-	if {![info exists list]} {
-	    if {[info exists canvas] && [winfo exists $canvas]} {
-		set noScroll 1
-		$sbar configure -command ""
-	    }
-	    return
-	}
-
-	set W [winfo width  $canvas]
-	set H [winfo height $canvas]
-	set pad [expr {[$canvas cget -highlightthickness]+[$canvas cget -bd]}]
-	if {$pad < 2} {
-	    set pad 2
-	}
-
-	incr W [expr {$pad*-2}]
-	incr H [expr {$pad*-2}]
-
-	set dx [expr {$maxIW + $maxTW + 8}]
-	if {$maxTH > $maxIH} {
-	    set dy $maxTH
-	} else {
-	    set dy $maxIH
-	}
-	incr dy 2
-	set shift [expr {$maxIW + 4}]
-
-	set x [expr {$pad * 2}]
-	set y [expr {$pad * 1}] ; # Why * 1 ?
-	set usedColumn 0
-	foreach sublist $list {
-	    set usedColumn 1
-	    lassign $sublist iTag tTag rTag iW iH tW tH
-
-	    set i_dy [expr {($dy - $iH)/2}]
-	    set t_dy [expr {($dy - $tH)/2}]
-
-	    $canvas coords $iTag $x                    [expr {$y + $i_dy}]
-	    $canvas coords $tTag [expr {$x + $shift}]  [expr {$y + $t_dy}]
-	    $canvas coords $rTag $x $y [expr {$x+$dx}] [expr {$y+$dy}]
-
-	    incr y $dy
-	    if {($y + $dy) > $H} {
-		set y [expr {$pad * 1}] ; # *1 ?
-		incr x $dx
-		set usedColumn 0
-	    }
-	}
-
-	if {$usedColumn} {
-	    set sW [expr {$x + $dx}]
-	} else {
-	    set sW $x
-	}
-
-	if {$sW < $W} {
-	    $canvas configure -scrollregion [list $pad $pad $sW $H]
-	    $sbar configure -command ""
-	    $canvas xview moveto 0
-	    set noScroll 1
-	} else {
-	    $canvas configure -scrollregion [list $pad $pad $sW $H]
-	    $sbar configure -command [list $canvas xview]
-	    set noScroll 0
-	}
-
-	set itemsPerColumn [expr {($H-$pad) / $dy}]
-	if {$itemsPerColumn < 1} {
-	    set itemsPerColumn 1
-	}
-
-	my DrawSelection
-    }
-
-    method DrawSelection {} {
-	$canvas delete selection
-	$canvas itemconfigure selectionText -fill black
-	$canvas dtag selectionText
-	set cbg [ttk::style lookup TEntry -selectbackground focus]
-	set cfg [ttk::style lookup TEntry -selectforeground focus]
-	foreach item $selection {
-	    set rTag [lindex $list $item 2]
-	    foreach {iTag tTag text serial} $itemList($rTag) {
-		break
-	    }
-
-	    set bbox [$canvas bbox $tTag]
-	    $canvas create rect $bbox -fill $cbg -outline $cbg \
-		-tags selection
-	    $canvas itemconfigure $tTag -fill $cfg -tags selectionText
-	}
-	$canvas lower selection
-	return
-    }
-
-    #	Creates an IconList widget by assembling a canvas widget and a
-    #	scrollbar widget. Sets all the bindings necessary for the IconList's
-    #	operations.
-    #
-    method Create {} {
-	variable hull
-	set sbar [ttk::scrollbar $hull.sbar -orient horizontal -takefocus 0]
-	catch {$sbar configure -highlightthickness 0}
-	set canvas [canvas $hull.canvas -highlightthick 0 -takefocus 1 \
-			-width 400 -height 120 -background white]
-	pack $sbar -side bottom -fill x -padx 2 -pady {0 2}
-	pack $canvas -expand yes -fill both -padx 2 -pady {2 0}
-
-	$sbar configure -command [list $canvas xview]
-	$canvas configure -xscrollcommand [list $sbar set]
-
-	# Initializes the max icon/text width and height and other variables
-	#
-	set maxIW 1
-	set maxIH 1
-	set maxTW 1
-	set maxTH 1
-	set numItems 0
-	set noScroll 1
-	set selection {}
-	set index(anchor) ""
-	set fg [option get $canvas foreground Foreground]
-	if {$fg eq ""} {
-	    set fill black
-	} else {
-	    set fill $fg
-	}
-
-	# Creates the event bindings.
-	#
-	bind $canvas <Configure>	[namespace code {my WhenIdle Arrange}]
-
-	bind $canvas <1>		[namespace code {my Btn1 %x %y}]
-	bind $canvas <B1-Motion>	[namespace code {my Motion1 %x %y}]
-	bind $canvas <B1-Leave>		[namespace code {my Leave1 %x %y}]
-	bind $canvas <Control-1>	[namespace code {my CtrlBtn1 %x %y}]
-	bind $canvas <Shift-1>		[namespace code {my ShiftBtn1 %x %y}]
-	bind $canvas <B1-Enter>		[list tk::CancelRepeat]
-	bind $canvas <ButtonRelease-1>	[list tk::CancelRepeat]
-	bind $canvas <Double-ButtonRelease-1> \
-	    [namespace code {my Double1 %x %y}]
-
-	bind $canvas <Control-B1-Motion> {;}
-	bind $canvas <Shift-B1-Motion>	[namespace code {my ShiftMotion1 %x %y}]
-
-	bind $canvas <<PrevLine>>	[namespace code {my UpDown -1}]
-	bind $canvas <<NextLine>>	[namespace code {my UpDown  1}]
-	bind $canvas <<PrevChar>>	[namespace code {my LeftRight -1}]
-	bind $canvas <<NextChar>>	[namespace code {my LeftRight  1}]
-	bind $canvas <Return>		[namespace code {my ReturnKey}]
-	bind $canvas <KeyPress>		[namespace code {my KeyPress %A}]
-	bind $canvas <Control-KeyPress> ";"
-	bind $canvas <Alt-KeyPress>	";"
-
-	bind $canvas <FocusIn>		[namespace code {my FocusIn}]
-	bind $canvas <FocusOut>		[namespace code {my FocusOut}]
-
-	return $w
-    }
-
-    #	This procedure is invoked when the mouse leaves an entry window with
-    #	button 1 down.  It scrolls the window up, down, left, or right,
-    #	depending on where the mouse left the window, and reschedules itself
-    #	as an "after" command so that the window continues to scroll until the
-    #	mouse moves back into the window or the mouse button is released.
-    #
-    method AutoScan {} {
-	if {![winfo exists $w]} return
-	set x $oldX
-	set y $oldY
-	if {$noScroll} {
-	    return
-	}
-	if {$x >= [winfo width $canvas]} {
-	    $canvas xview scroll 1 units
-	} elseif {$x < 0} {
-	    $canvas xview scroll -1 units
-	} elseif {$y >= [winfo height $canvas]} {
-	    # do nothing
-	} elseif {$y < 0} {
-	    # do nothing
-	} else {
-	    return
-	}
-	my Motion1 $x $y
-	set ::tk::Priv(afterId) [after 50 [namespace code {my AutoScan}]]
-    }
-
-    # ----------------------------------------------------------------------
-
-    # Event handlers
-    method Btn1 {x y} {
-	focus $canvas
-	set i [$w index @$x,$y]
-	if {$i eq ""} {
-	    return
-	}
-	$w selection clear 0 end
-	$w selection set $i
-	$w selection anchor $i
-    }
-    method CtrlBtn1 {x y} {
-	if {$options(-multiple)} {
-	    focus $canvas
-	    set i [$w index @$x,$y]
-	    if {$i eq ""} {
-		return
-	    }
-	    if {[$w selection includes $i]} {
-		$w selection clear $i
-	    } else {
-		$w selection set $i
-		$w selection anchor $i
-	    }
-	}
-    }
-    method ShiftBtn1 {x y} {
-	if {$options(-multiple)} {
-	    focus $canvas
-	    set i [$w index @$x,$y]
-	    if {$i eq ""} {
-		return
-	    }
-	    if {[$w index anchor] eq ""} {
-		$w selection anchor $i
-	    }
-	    $w selection clear 0 end
-	    $w selection set anchor $i
-	}
-    }
-
-    #	Gets called on button-1 motions
-    #
-    method Motion1 {x y} {
-	set oldX $x
-	set oldY $y
-	set i [$w index @$x,$y]
-	if {$i eq ""} {
-	    return
-	}
-	$w selection clear 0 end
-	$w selection set $i
-    }
-    method ShiftMotion1 {x y} {
-	set oldX $x
-	set oldY $y
-	set i [$w index @$x,$y]
-	if {$i eq ""} {
-	    return
-	}
-	$w selection clear 0 end
-	$w selection set anchor $i
-    }
-    method Double1 {x y} {
-	if {[llength $selection]} {
-	    $w invoke
-	}
-    }
-    method ReturnKey {} {
-	$w invoke
-    }
-    method Leave1 {x y} {
-	set oldX $x
-	set oldY $y
-	my AutoScan
-    }
-    method FocusIn {} {
-	$w state focus
-	if {![info exists list]} {
-	    return
-	}
-	if {[llength $selection]} {
-	    my DrawSelection
-	}
-    }
-    method FocusOut {} {
-	$w state !focus
-	$w selection clear 0 end
-    }
-
-    #	Moves the active element up or down by one element
-    #
-    # Arguments:
-    #	amount -	+1 to move down one item, -1 to move back one item.
-    #
-    method UpDown amount {
-	if {![info exists list]} {
-	    return
-	}
-	set curr [$w selection get]
-	if {[llength $curr] == 0} {
-	    set i 0
-	} else {
-	    set i [$w index anchor]
-	    if {$i eq ""} {
-		return
-	    }
-	    incr i $amount
-	}
-	$w selection clear 0 end
-	$w selection set $i
-	$w selection anchor $i
-	$w see $i
-    }
-
-    #	Moves the active element left or right by one column
-    #
-    # Arguments:
-    #	amount -	+1 to move right one column, -1 to move left one
-    #			column
-    #
-    method LeftRight amount {
-	if {![info exists list]} {
-	    return
-	}
-	set curr [$w selection get]
-	if {[llength $curr] == 0} {
-	    set i 0
-	} else {
-	    set i [$w index anchor]
-	    if {$i eq ""} {
-		return
-	    }
-	    incr i [expr {$amount * $itemsPerColumn}]
-	}
-	$w selection clear 0 end
-	$w selection set $i
-	$w selection anchor $i
-	$w see $i
-    }
-
-    #	Gets called when user enters an arbitrary key in the listbox.
-    #
-    method KeyPress key {
-	append accel $key
-	my Goto $accel
-	after cancel $accelCB
-	set accelCB [after 500 [namespace code {my Reset}]]
-    }
-
-    method Goto text {
-	if {![info exists list]} {
-	    return
-	}
-	if {$text eq "" || $numItems == 0} {
-	    return
-	}
-
-	if {[llength [$w selection get]]} {
-	    set start [$w index anchor]
-	} else {
-	    set start 0
-	}
-	set theIndex -1
-	set less 0
-	set len [string length $text]
-	set len0 [expr {$len - 1}]
-	set i $start
-
-	# Search forward until we find a filename whose prefix is a
-	# case-insensitive match with $text
-	while {1} {
-	    if {[string equal -nocase -length $len0 $textList($i) $text]} {
-		set theIndex $i
-		break
-	    }
-	    incr i
-	    if {$i == $numItems} {
-		set i 0
-	    }
-	    if {$i == $start} {
-		break
-	    }
-	}
-
-	if {$theIndex > -1} {
-	    $w selection clear 0 end
-	    $w selection set $theIndex
-	    $w selection anchor $theIndex
-	    $w see $theIndex
-	}
-    }
-    method Reset {} {
-	unset -nocomplain accel
-    }
-}
-
-return
-
-# Local Variables:
-# mode: tcl
-# fill-column: 78
-# End:
diff --git a/tk8.6/library/icons.tcl b/tk8.6/library/icons.tcl
deleted file mode 100644
index e53a1bd..0000000
--- a/tk8.6/library/icons.tcl
+++ /dev/null
@@ -1,153 +0,0 @@
-# icons.tcl --
-#
-#	A set of stock icons for use in Tk dialogs. The icons used here
-#	were provided by the Tango Desktop project which provides a
-#	unified set of high quality icons licensed under the
-#	Creative Commons Attribution Share-Alike license
-#	(http://creativecommons.org/licenses/by-sa/3.0/)
-#
-#	See http://tango.freedesktop.org/Tango_Desktop_Project
-#
-# Copyright (c) 2009 Pat Thoyts <patthoyts@users.sourceforge.net>
-
-namespace eval ::tk::icons {}
-
-image create photo ::tk::icons::warning -data {
-    iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAABSZJREFU
-    WIXll1toVEcYgL+Zc87u2Yu7MYmrWRuTJuvdiMuqiJd4yYKXgMQKVkSjFR80kFIVJfWCWlvpg4h9
-    8sXGWGof8iKNICYSo6JgkCBEJRG8ImYThNrNxmaTeM7pQ5IlJkabi0/9YZhhZv7///4z/8zPgf+7
-    KCNRLgdlJijXwRyuDTlcxV9hbzv8nQmxMjg+XDtiOEplkG9PSfkztGmTgmFQd+FCVzwa3fYN/PHZ
-    AcpBaReicW5xcbb64IEQqko8Lc26d/58cxS+/BY6hmJvyEfQBoUpwWCmW1FErKaGWHU13uRk4QkE
-    UtxQNFR7QwIoB4eiKD9PWbVKbb10CZmaCqmpxCormRYO26QQx85B0mcD+AeK0xYvHqu1tNDx+DH6
-    gQM4jh0j3tCA3tGBLyfHLuD7zwJwAcYqun44sHy51nr5MsqsWWj5+djCYdS5c4ldvUr24sU2qarf
-    lUL6qAN0wqH0vDy7+fAhXZEI+v79CNmt7igpofPVK5SmJvyhkJBwYlQBSiHd7vUWZ86bp8WqqtCW
-    LkVbuBAhBEIItGAQ2+rVxG7cICMY1KTDsekc5IwagIQTmStXis47dzBiMfR9+xCi+wb39s79+zFi
-    MczGRjLmzTMlnBoVgLMwyzF+/Cb/lClq2/Xr2AoKUKdPxzAMWltbiUajmKaJkpGBY8sW3tbW4g8E
-    VNXrXVEKK0YMoMKp7Px8K15Tg2VZOHbvBiASiRAMBgkGg0QiEYQQOIuLsRSFrnv3yJo/HxVOW594
-    7D4KUAa57qysvNSUFOVtbS32rVuRfj9CCFwuV2Kfy+VCCIFMScFVVET7/fukJidLm883rQy+HhaA
-    BUII8cvUNWt4W1WFcLvRd+5MnHl/AOjOB+eOHchx44jX1ZEdCqkSTpaDbcgA5+GrpNmzc9ymKdvr
-    67Hv2oVMSko4cjgcKIqCoijoup64EdLpxLV3Lx1PnuCVUrgmTfK9hV1DAjgKqlSUk1PCYdl25QrS
-    70cvLEw4SWS+04nT6XxvXgiBc8MGtKlTaa+rIysnR1Ok/OF38PxngAzY4VuwYKL99WvR8fQpjj17
-    kLqeiL6393g8eDyeAWBSVfEcOkRXczOOaBRvVpZuDPJEDwD4DVyKrv+UlZurxSorUWfMQC8oGOBc
-    CDHgC/Rdc4TD2BctIl5fT+bkyTahaXvOw8RPApiwd2Ju7hjZ2EhXSwvOkhKQcoADgIqKCioqKgYc
-    QW9LOnIEIxZDbWpiXCCABT9+FKAUxtm83pKMUEiLVVejLVqEtmTJB50LIdi2bRuFPbnRd7232efM
-    wbVuHR2PHjHR77dJXS8sg5mDAihweFJenmrevYvR1oazpGTQ6IQQaJqG7ClI/dd655IOHsSyLMSL
-    F6QFAib9nugEQClk2Xy+orTsbK3t1i3sa9ei5eQMGr0QgvLyci5evDiocyEEtsxMPNu30/nsGRO8
-    XlVzu8NlkNvrV+0T/fHMZcusrtu3MeNx9PXrobUVq8cYQrw3TrRub1h9+v573Bs3Ej1zBvP5c/zp
-    6dbLhoaTwPy+ANKCfF92thq7dg2A6JYt/fNlxGK8eUNSerryHEJHQT8K8V4A5ztojty8OeaLzZul
-    1DSwLCzDANPEMozusWFgmWZ33288YK3/nGlixuM0v3xpWfDX0Z4i1VupXEWwIgRnJfhGPfQ+YsLr
-    +7DzNFwCuvqWyiRg7DSYoIBu9smPkYqEd4AwIN4ITUAL0A4Da7UC6ICdEfy2fUBMoAvo7GnWKNoe
-    mfwLcAuinuFNL7QAAAAASUVORK5CYII=
-}
-
-image create photo ::tk::icons::error -data {
-    iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAABiRJREFU
-    WIXFl11sHFcVgL97Z/bX693sbtd2ipOqCU7sQKukFYUigQgv/a+hoZGoqipvfQKpAsEDD0hIvCHE
-    j/pQ3sIDUdOiIqUyqXioEFSUhqit7cRJFJpEruxs1mt77Z3d2Z259/KwM5vZXTtOERJXOrozZ+6e
-    852fuXcW/s9D3O3Cs1Bow1Nx234BKQ9qpYpK6yFLSseScsVoveApdUrAzNOw9j8DOAMTtmX9RsM3
-    SqOjevcXDqUzu8dI5AvEc8O0axu4q6s4yzdZvnCxUSmXLWHMXzxjXpmGq/81wGmIZ6T8NXDi8w8d
-    id//+GPS8j1YWQXHgVYbfA/sGCRiMDQExTzKtvn3zDv6k9m5FsacXNT6+y+D95kAZqCEEO/cMzIy
-    9eBLLybjyodrN6DpDqw1/dfpFNw3TtuSfPz7P7irlZUL2pjHn4GVuwJ4G/JCiLl9U1OjB58/ZnP5
-    Mqxv3NGpMWZAz64cHNzHlTf/5N9YuHzTMeaLx6HW78+K3pwGKynEu/snJycOHPuWzdw81BuDUQZO
-    dfQ+MmvAuC1MdY3i178izUo15VZXj07DyTf6OGX0Jivlz0vFwgMTz3/bNnMXO0ZCo8b0iIk4C0WF
-    zsP1TRc1e4l9x56N5YuFwxkpf9afgW4J/gi7M1IuHH3lezm5uAQbmwOpjc79ujArA2uMgWwGMz7K
-    P377u/WW1pPTUB7IQFrKXx44NJWRbQ9d2+hGqbeRMEoTZEQFJdERfVgmvVFH+D57Jw9k4lL+YqAE
-    pyGnjZm+95knLHVjcVvHA6WIPgtLE+hVH4i6vsS9T3zTVsY8NwPZHoAUPFUs5JVQCt1q9zqORKm3
-    iLKrF6IjkfSHOiUlqu0hhCSXHdYePNYDEBPiu6MT+zOquo6JGNGhESkxUnYNmkCnLQtjWRgpMRG9
-    CtZ3JdD7axsU9+3N2EK8EALYQcNMpvfuQTcaXUMIAa+/Hi0Xgs9weASjefx4p5mFQDdbpD63G/HR
-    hakeAA2l+EgJU652iIMMyO2sRoYxBq1191oIgZQSITqooT0A7fnEirswUAp/LwG0MZlYIY9WqpPa
-    IHU7Da01Sqluo4UQSil830dr3emVsBeMIZbLoI0Z7gGQQtTbjoOOxW/XewcApVQ38jsBNs6fx6tW
-    O70Si+GWKwghNsM1NoCAW81KJTeUjKNbrR2N7uS4B7TRwJ+fR6TTxO4fxzUeAio9AMCl+tVrE0NH
-    DmM2nU4DAu6JE53UGoNfLuNdv45xnO4OF/ZKz+4X2T179I6D5To0NupouNgD4Btzqjx/8WjpS0cy
-    PU1Tr6MqFfylpc4bss1W26/rBwyfybECtcvXNrUxp3oAXJjZ2Kxb7cVP8P61gDGgWy2M624Z5d1E
-    3wNkDDKdwMQkjtuygbMhgAQ4DjUhxFvL/5z15X1jeLUaynW7p1u484WiuL3V9m/NoV6F50Ogjx3Y
-    Q/mDBV8a3piGzR4AAFfrHy4vlesmm0bks7edRQ6aAafcPoZVH2AUXOYzkI5TvbVa9+FHREYX4Bgs
-    I8RrV9/9oJF4eBKTjO8YvdoCJgqujcGkEqQemmDxb7OOFOLV6FHcAwBQ1/onTtOd/fTvH3rJRx/A
-    pBIDqd0q+p5sRaInnWDoywdZem+u7bbaH9W1/il9Y2Brfwt22TBfKOVHxr92JOacv4S/UuttuC06
-    PKoHsEs5hg7vZ/m9eW+zWltuwoNbfRNuebacgXsEnE2lkof2Hn04ZRouzQvXUU5z29cwFGs4TWpy
-    HJGK8+lfP256bnuuDU8+B9WtfG17uL0GsTF4VQrxYn60kBh55JDEbdG6uYq/7qDdFtpTELOQyQRW
-    Lk1sLI+MW9w6d8Wv3Vrz2nDyJPzgDDS287MVgAAywBCQ+Q5MTsOPs/BIMpVQ2bFCKlnMYg+nsYeS
-    eE6TVq1Be3WD9ZtrTc9tWetw7k341dtwBagDTmTeESAdAAxH5z0w9iQ8ehi+moWxBGRsiPvguVBf
-    h8qH8P6f4dxSp9PrdN73cN6k859R3U0J0nS+28JMpIM5FUgCiNP5X2ECox7gAk06KQ8ldLzZ7/xO
-    ANHnscBhCkgGjuOB3gb8CEAbaAWO3UA34DQ6/gPnmhBFs5mqXAAAAABJRU5ErkJggg==
-}
-
-image create photo ::tk::icons::information -data {
-    iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
-    WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1gUdFDM4pWaDogAABwNJREFUWMPFlltsVNcVhv+199ln
-    bh7PjAdfMGNDcA04EKMkJlIsBVJVbRqlEVUrqyW0QAtFTVWpjVpFfamUF6K+tCTKQyXn0jaiShOr
-    bRqRoHJpEEoIEBucENuk2OViPB5f5j5zrvuc3YcMFQ8FPBFVj7S0paN91v+tf1/OAv7PD9UzeeCp
-    p0KRCrYyHtymoPrgySYAANdyBBr2Peu1agP+NrR/v3nHAb6/52d7wfivWlet11NdvZG21laEwzo0
-    RvA9F4uLi7h08bxxaWLUVp78xSsv/XrwjgAMDDyjRxPWUGOy5Uu9/VsjEA3I5KvIVQ240gHIh9CA
-    5YkwelIJRATw94NvGpnpK0fL+eDA0NAzzq3ya7cDjCbsoWWr1j+y4f4vB/41Z8JTeaxqE7hndSNi
-    EeELzn3LkapQdfzJTE5JV/GBb28LHz327lcnzp4ZAvB1AOpmAvyWtv/g6R9GW1c+uf6Bx0Kfzpjo
-    TmnYtDaKtkTAj4aEFBqTnJPUOfciIeG3N4XVQtmyzl/JuY8/fH9wOjO/smvVmuy5s+8P1w2wa9dP
-    46SLN3sf2ha7uiixaU0Qna06NA6PMXIZQRJBMiIXRBKABygv3hBQV+bK1dmcoR7d3Bc5c/pk/8YN
-    fYOjo6es/6bDbgbAdLa9uXNj2PYF2pOEloQGAiRIuUTkME42J7IZweYES+NkckZWWNfseEPAKJtO
-    oWxLu69/c5jpbPtNdW7qPwvsbO1cF8pVLKxs0+HD94gpl0AOQTlEsDkjizFmMk4WESyNM4NzMgOC
-    VYI6q17OlIp9992ngek769+EvtfVEI3jWqaKgAgAIAlFLuOwGZHDiTnElGQgF4DvM1LKV7Bdz2NE
-    xaCuhQpVm1Y0p5qhvNV1AyjlRTWhwVM2TMdzgkJzieAQyGGMbMZgfwZBEiBPA3xX+VSouAvBAFeM
-    yDddD7rgpHw/WjcAMa0EZScZk5heqFrxiO4BzCGCzYgsBrI4I5sYcxlBKl/5WdOdd6S0gxoLEZEi
-    Iq4AnzGq1r0HiPhYuZRFU1R3FgqWkS1aZQA2gWzOyGQcJudkaAwVR3qz8yXzvCXlzJoViaagrlWC
-    jJnLm8Jarli2GNMm6wbwPPO31y6Ollc2N3pcI+fyYjW/8a5EKqQTz5WtdLHsTi1W7Im5vDlcMdxx
-    wVk2Ys9/pTI3+WhAaIauM+MLbYnlH46MVKVyX6v7Hhg9e2ps3doN32ld0Rlrb1nmmK4stCdCSCUj
-    Le1NwW6uXJ08m/t2OarBXh0ie0syHu0plKtTFGw8n4o33q1z1XngD7+X3C/uHBkZces7hoAi1946
-    fPSvtpDlYFdLPDI8mR03HC87frXwFpgqLYuFuzrbkg8m49EeDsqDa+cizXcNpppia5ui+sYXnn+O
-    29LbOTg4aHzun9GOPT/pDemhf3xzx25DicjkiqaAIs4zhumMRUJaPhzgJZ0LQ5C7gXjQL1kS0YD+
-    o337nhWlYvHJV178zZ9vlZ/dDuDVl57/2HWt755894hINoYSmZx11TYKCUZKCs4cnQuDmGtfvDiR
-    dD3n04aA6J4YHzeLhfLg7cSXBAAA5NPpufS1WFjwkFSelZ6ZLWfn0kliTDJdue8dO9qenp2d1DVR
-    4cTarlyZJgV5dim5lwTw8sv7c1L6H89cm6FlDcHVhlOJffThsa9d+ud72y5+cnTn2PjJJ1avjOoE
-    SnBiPadOfRDTGT5YSm5tqR2R7Zp7//L6gRPf27NjVaolqS9MCzh28W6mgDXdKxCNRb/oOlV18O3D
-    1xzXGXpx8LnZO94Tbt/x+MFYouexh7dsQU/PWjRGI+BcAyMgm1vAO28fxvj4xOX5jL7u0KEX7Dvq
-    AAC0Nucf2rLZhq8Y3njjT8gulOBKDw0NAQjNQT435eQWL3iHDk3YS81ZF0B6psI/GbuAXbu+gQf7
-    H4ArPeQWC5jLZKCUhQvjWb2QD3bVk5PVM9nz5LML8waOH38fekBHIhFDqqMFXd0pnDhxGmMTU3Bd
-    9/X/GQDntO/eezswMPBjaFwAABxH4sKFq+jt7cX6ni6EQuJbdeWsZ3J3d/PTmqaEYUyhXDZBTEOh
-    WIIQwOi5jzA1eRnZXPFSPO7/bmbGlLfqhus5BVotRH9/x7rGxtBeIQJPACrMOYNSPpRiUIpnlTIO
-    nzmT+eX8fLH8WZMKF4Csje7ncUAHEKhFcHq6ZE5OZoc7O3tlc3N33+7dP9c2bXoE09NlO52uHDhy
-    ZOTVatUWte+otsTXg2pQSwagG6r/jwsAQul0erqjo+OesbGx1tHRUT+fz48dP378j57neQD8mtB1
-    B1TtnV9zo64loJqoXhtFDUQHEGhvb2/2fZ9nMpliTcAFYNdC1sIBYN1sCeq5Ca9bqtWcu9Fe3FDl
-    9Uqvu3HLjfhvTUo85WzjhogAAAAASUVORK5CYII=
-}
-
-image create photo ::tk::icons::question -data {
-    iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAACG5JREFU
-    WIXFl3twVdUVxn97n3Nubm7euZcghEdeBBICEQUFIgVECqIo1uJMp3WodqyjMzpjZ7TTh20cK31N
-    /2jL2FYdKXaqRcbnDKGpoBFaAY1BHgHMgyRKQkJy87yv3Nyzd/84594k1RlppzPumTXn3Dl3r/Wd
-    b31rrbPhS17iSv+4bl2t2ZFhrRGI7QKxRkMAyHEfjwgYEOgjNnpfcXjiSENDbeL/AqBoW22uGE/7
-    MYL7yubN4MYVpVkrquaKqwJZ+LPTARgcjdIbHKOx+aI+9EH7WGvnZdA8q9PGf9b5eu3w/wygaPPO
-    h6Uhntxcsyj9/q+vtMrnBa6Is7ZPgzzzyvGJ/YfPRpWWj3fWff93/xWAonW1Xu3z/nVx6cxNTz74
-    1YzK4gIQjuN/nfyEEx9fIjgaYXAkhhAQyE3Hn5PBsvJZrF46l5I5+QB83NnP40+/FT7d1ltPOPrN
-    zoba2BcCWLy91hMOp72/bX1VxU/u3+BJ91i0fhrkuTcaaTzbjTQkhpQIIZBSIBApL1prtNYsryhk
-    xy1XUzonn1g8wVPPvh1/5dDpcz5f7LrmfbXxqfGM6eG1yCw+9uq2G6tW7nxoU5plGrzecJYnnnub
-    SwMhTNPAmmKmYWCaBoYpMQyJaRhIQ3IpGOKt4+1k+dKoLJ7BjStKjb6hcN7JloFrhlsO7oUnPh9A
-    8Rbvo6uuLrr3N4/ckm4Ykt/vPcqe/R9hGAamaWJZbnDL+W2axqRJA8NlxzAkAI3newhF4lxbMZs1
-    y4rNM+19c0PZ++NDLQff+0wKCu/Y6c/UVsubv/12/ryZubxUf5Ln3vgQ0zKnvK1kadkMlpQUUFEU
-    oCDPR25WOuPxBH2DYZpa+qg/3kEoGsdWCttWJGzF3ZuXcuf6Ci5eHmXrw7sHR4mXd7/2w+A0Bvyl
-    N+265/bl19+8eqE8c6GPn+85jGkYWC4Ay3Luf/3AV1g038+MXB8+rwfDkKR5TPKyvCyan8+qqtmc
-    au8nFrcdnQCn2vuoLptJSWEeE7bynDjdXTDUcvBNAAmweF1tpmXKu+65bYWh0Ty97zhSyGkUO0BM
-    hBAI4RAXTyjiCYWUEukKMz/Ly/b1C7EsE49lYlkmhjTYvf8jNHD3lmsM0zTuWryuNhPABIj4vFvW
-    Xl0s87PTOdXWS8snQTwec4ro3DSYBglbcfx8P+8199I7FMEQgg3L53N7TWkKXOV8Px7LJCFtXKx0
-    dA9zrnOAyqIAa68tkQePtm4BXpaO9vWOm65b4EPAkY+6HDEZTt4NN/dJML946QSv/fMCA6PjpHks
-    LI/F2a5BtNYpMUtJirGpLL7f3A3AxpXlPiHFjhQDaJZVlc0EoPWT4DQ1m8ZkKizTJDRuY1mmC04i
-    pWDNksJUD9Bac7E/jGUZrmuN1qCU5sKlIQAqSwrQWi+bBCDwF+RnAk5fl27wqeYAkZM9wLWaxVex
-    qnJmKritFO+e7sMyDdBOc1JKYxiSkdA4CMGM3Aw02j+VAfLcwTIWibuiEpNApJMSw208ydJcu3QW
-    axZPCW7bHGjspmcwimkYTmAlMWzHTyTmDMiczLRU/ctkNxgajboPvUghppuUGFJMY6O6OJ/ViwIo
-    pVBKYds2dR9e4uPuMbc7Tm9MUgqyM70AjITHUy1IAghNsH8oDEAgz4cQOIqWjkkpEC4rSYfXL/Sn
-    giulONYyRFd/1GXKAZxkUrgvkp/tAAgORxAQnAQg5InmC5cBWDgv4NS5EAhAINzyIlVmUgiy040U
-    9Uop2voiKYakEAiRvDp7EYKS2XkAnOvsR0h5IqUBrfWeQ8fb1t2xvtJXs3QuB462TfZokbxMGZxC
-    8If6DtI8Fh6PhcdjojSpBuXin7Kc3csXzQLgrWOtEWWrPSkAvkis7kjTBTU8FqOypIAF8/x09Y6Q
-    FGjyTdHJstLsWDsnNZIBXj7Wj1LKYSS5B412nRTNymHBnHxGQ+O8836r8kVidakUNDfUhhIJtfcv
-    dU22AO69dRlCCNeZU8fJe6U0ylZYBlgGmNKx+ESCiYRNwlYoWzn/UxqtHOB3ra8AAX/7x0nbttXe
-    5oba0GQVAPGE9dju1z4Y7u4fY9F8P9/YWOUEV06O7eTVnXBTBaiUIj4xwcSETSJhk7BtbNtOPdta
-    U0ZpYS59wRB/2ndsOBa3HkvGTU3D0fb6aE7ZBt3RM1yzuabcqiwKEI5N0N495ChaSKcihJPRa0pz
-    sbUmYTugPmgbJmErB4DLxETC5oYlhWxdXUrCVvxgV32krav/qa4Djx76D4kllxalt/7q9e2bqjf9
-    9Lsb0oQQHGrsYO+hc0gp3emW/Bhxm5NbZlqD0g79CTcFt60u4YYlhWhg5/MN4y/WNdW3vfnoNhD6
-    Mww46wlmV9/w6snzA1sHRqKBVUvnGQvm+qkuKyA4GqVvKOJAdrcn8zz14yNh2ywozOVbGyuoKg4w
-    PmHzyxcOx1+sazqTlhbZ3H92vT29Pj5nzVn1SLqVH3ipunzOxqceutlX6n7lXrw8yqn2flq7hxgL
-    TzAWiyOFICfTS44vjbLCXKqK/cwOOHOl49IwP9r192hT84V3e4+9cF90sC0IRL8QAOADsgvXfu9B
-    b3bgkTs3LPN+52srzPlX5V7RUerTy6M8/0Zj4uUDH45Hg13PdB/9425gzLUhQH0RgDQgC8hKLyid
-    7a/c9oCV4d9WVTpLbF5TmX5tRaGYkecjJ8MLAkZD4wyMRGg636PrDjfHzrT26NhYT33w1Kt/Hh/u
-    6XUDh4BBIHwlDIBTohlANpBhWb6s7PKNK30FCzZa6dnVYORoIX2OExVF26Px8NCZSN/5d0bb3mlK
-    JGIhHLpDwLAL4jPnxSs9nBqABXhddrw4XdRygSrABuKuxYBx9/6KDqlf2vo3PYe56vmkuwMAAAAA
-    SUVORK5CYII=
-}
diff --git a/tk8.6/library/images/README b/tk8.6/library/images/README
deleted file mode 100644
index 7b61d5a..0000000
--- a/tk8.6/library/images/README
+++ /dev/null
@@ -1,7 +0,0 @@
-README - images directory
-
-This directory includes images for the Tcl Logo and the Tcl Powered
-Logo.  Please feel free to use the Tcl Powered Logo on any of your
-products that employ the use of Tcl or Tk.  The Tcl logo may also be
-used to promote Tcl in your product documentation, web site or other
-places you so desire.
diff --git a/tk8.6/library/images/logo.eps b/tk8.6/library/images/logo.eps
deleted file mode 100644
index 0d05d34..0000000
--- a/tk8.6/library/images/logo.eps
+++ /dev/null
@@ -1,2091 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Adobe Illustrator(TM) 5.5
-%%For: (Bud Northern) (Mark Anderson Design)
-%%Title: (TCL/TK LOGO.ILLUS)
-%%CreationDate: (8/1/96) (4:58 PM)
-%%BoundingBox: 251 331 371 512
-%%HiResBoundingBox: 251.3386 331.5616 370.5213 511.775
-%%DocumentProcessColors: Cyan Magenta Yellow
-%%DocumentSuppliedResources: procset Adobe_level2_AI5 1.0 0
-%%+ procset Adobe_IllustratorA_AI5 1.0 0
-%AI5_FileFormat 1.2
-%AI3_ColorUsage: Color
-%%DocumentCustomColors: (TCL RED)
-%%CMYKCustomColor: 0 0.45 1 0 (Orange)
-%%+ 0 0.25 1 0 (Orange Yellow)
-%%+ 0 0.79 0.91 0 (TCL RED)
-%AI3_TemplateBox: 306 396 306 396
-%AI3_TileBox: 12 12 600 780
-%AI3_DocumentPreview: Macintosh_ColorPic
-%AI5_ArtSize: 612 792
-%AI5_RulerUnits: 0
-%AI5_ArtFlags: 1 0 0 1 0 0 1 1 0
-%AI5_TargetResolution: 800
-%AI5_NumLayers: 1
-%AI5_OpenToView: 90 576 2 938 673 18 1 1 2 40
-%AI5_OpenViewLayers: 7
-%%EndComments
-%%BeginProlog
-%%BeginResource: procset Adobe_level2_AI5 1.0 0
-%%Title: (Adobe Illustrator (R) Version 5.0 Level 2 Emulation)
-%%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
-	put
-	/packedarray where not
-	{
-		userdict begin
-		/packedarray
-		{
-			array astore readonly
-		} bind def
-		/setpacking /pop load def
-		/currentpacking false def
-	 end
-		0
-	} if
-	pop
-	userdict /defaultpacking currentpacking put true setpacking
-	/initialize
-	{
-		Adobe_level2_AI5 begin
-	} bind def
-	/terminate
-	{
-		currentdict Adobe_level2_AI5 eq
-		{
-		 end
-		} if
-	} bind def
-	mark
-	/setcustomcolor where not
-	{
-		/findcmykcustomcolor
-		{
-			5 packedarray
-		} bind def
-		/setcustomcolor
-		{
-			exch aload pop pop
-			4
-			{
-				4 index mul 4 1 roll
-			} repeat
-			5 -1 roll pop
-			setcmykcolor
-		}
-		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?
-	systemdict /languagelevel known dup
-	{
-		pop systemdict /languagelevel get 2 ge
-	} if
-	put
-	level2? not
-	{
-		/setcmykcolor where not
-		{
-			/setcmykcolor
-			{
-				exch .11 mul add exch .59 mul add exch .3 mul add
-				1 exch sub setgray
-			} def
-		} if
-		/currentcmykcolor where not
-		{
-			/currentcmykcolor
-			{
-				0 0 0 1 currentgray sub
-			} def
-		} if
-		/setoverprint where not
-		{
-			/setoverprint /pop load def
-		} if
-		/selectfont where not
-		{
-			/selectfont
-			{
-				exch findfont exch
-				dup type /arraytype eq
-				{
-					makefont
-				}
-				{
-					scalefont
-				} ifelse
-				setfont
-			} bind def
-		} if
-		/cshow where not
-		{
-			/cshow
-			{
-				[
-				0 0 5 -1 roll aload pop
-				] cvx bind forall
-			} bind def
-		} if
-	} if
-	cleartomark
-	/anyColor?
-	{
-		add add add 0 ne
-	} bind def
-	/testColor
-	{
-		gsave
-		setcmykcolor currentcmykcolor
-		grestore
-	} bind def
-	/testCMYKColorThrough
-	{
-		testColor anyColor?
-	} bind def
-	userdict /composite?
-	level2?
-	{
-		gsave 1 1 1 1 setcmykcolor currentcmykcolor grestore
-		add add add 4 eq
-	}
-	{
-		1 0 0 0 testCMYKColorThrough
-		0 1 0 0 testCMYKColorThrough
-		0 0 1 0 testCMYKColorThrough
-		0 0 0 1 testCMYKColorThrough
-		and and and
-	} ifelse
-	put
-	composite? not
-	{
-		userdict begin
-		gsave
-		/cyan? 1 0 0 0 testCMYKColorThrough def
-		/magenta? 0 1 0 0 testCMYKColorThrough def
-		/yellow? 0 0 1 0 testCMYKColorThrough def
-		/black? 0 0 0 1 testCMYKColorThrough def
-		grestore
-		/isCMYKSep? cyan? magenta? yellow? black? or or or def
-		/customColor? isCMYKSep? not def
-	 end
-	} if
- end defaultpacking setpacking
-%%EndResource
-%%BeginResource: procset Adobe_IllustratorA_AI5 1.1 0
-%%Title: (Adobe Illustrator (R) Version 5.0 Abbreviated Prolog)
-%%Version: 1.1 
-%%CreationDate: (3/7/1994) ()
-%%Copyright: ((C) 1987-1994 Adobe Systems Incorporated All Rights Reserved)
-currentpacking true setpacking
-userdict /Adobe_IllustratorA_AI5_vars 70 dict dup begin
-put
-/_lp /none def
-/_pf
-{
-} def
-/_ps
-{
-} def
-/_psf
-{
-} def
-/_pss
-{
-} def
-/_pjsf
-{
-} def
-/_pjss
-{
-} def
-/_pola 0 def
-/_doClip 0 def
-/cf currentflat def
-/_tm matrix def
-/_renderStart
-[
-/e0 /r0 /a0 /o0 /e1 /r1 /a1 /i0
-] def
-/_renderEnd
-[
-null null null null /i1 /i1 /i1 /i1
-] def
-/_render -1 def
-/_rise 0 def
-/_ax 0 def
-/_ay 0 def
-/_cx 0 def
-/_cy 0 def
-/_leading
-[
-0 0
-] def
-/_ctm matrix def
-/_mtx matrix def
-/_sp 16#020 def
-/_hyphen (-) def
-/_fScl 0 def
-/_cnt 0 def
-/_hs 1 def
-/_nativeEncoding 0 def
-/_useNativeEncoding 0 def
-/_tempEncode 0 def
-/_pntr 0 def
-/_tDict 2 dict def
-/_wv 0 def
-/Tx
-{
-} def
-/Tj
-{
-} def
-/CRender
-{
-} def
-/_AI3_savepage
-{
-} def
-/_gf null def
-/_cf 4 array def
-/_if null def
-/_of false def
-/_fc
-{
-} def
-/_gs null def
-/_cs 4 array def
-/_is null def
-/_os false def
-/_sc
-{
-} def
-/discardSave null def
-/buffer 256 string def
-/beginString null def
-/endString null def
-/endStringLength null def
-/layerCnt 1 def
-/layerCount 1 def
-/perCent (%) 0 get def
-/perCentSeen? false def
-/newBuff null def
-/newBuffButFirst null def
-/newBuffLast null def
-/clipForward? false def
-end
-userdict /Adobe_IllustratorA_AI5 74 dict dup begin
-put
-/initialize
-{
-	Adobe_IllustratorA_AI5 dup begin
-	Adobe_IllustratorA_AI5_vars begin
-	discardDict
-	{
-		bind pop pop
-	} forall
-	dup /nc get begin
-	{
-		dup xcheck 1 index type /operatortype ne and
-		{
-			bind
-		} if
-		pop pop
-	} forall
- end
-	newpath
-} def
-/terminate
-{
- end
- end
-} def
-/_
-null def
-/ddef
-{
-	Adobe_IllustratorA_AI5_vars 3 1 roll put
-} def
-/xput
-{
-	dup load dup length exch maxlength eq
-	{
-		dup dup load dup
-		length 2 mul dict copy def
-	} if
-	load begin
-	def
- end
-} def
-/npop
-{
-	{
-		pop
-	} repeat
-} def
-/sw
-{
-	dup length exch stringwidth
-	exch 5 -1 roll 3 index mul add
-	4 1 roll 3 1 roll mul add
-} def
-/swj
-{
-	dup 4 1 roll
-	dup length exch stringwidth
-	exch 5 -1 roll 3 index mul add
-	4 1 roll 3 1 roll mul add
-	6 2 roll /_cnt 0 ddef
-	{
-		1 index eq
-		{
-			/_cnt _cnt 1 add ddef
-		} if
-	} forall
-	pop
-	exch _cnt mul exch _cnt mul 2 index add 4 1 roll 2 index add 4 1 roll pop pop
-} def
-/ss
-{
-	4 1 roll
-	{
-		2 npop
-		(0) exch 2 copy 0 exch put pop
-		gsave
-		false charpath currentpoint
-		4 index setmatrix
-		stroke
-		grestore
-		moveto
-		2 copy rmoveto
-	} exch cshow
-	3 npop
-} def
-/jss
-{
-	4 1 roll
-	{
-		2 npop
-		(0) exch 2 copy 0 exch put
-		gsave
-		_sp eq
-		{
-			exch 6 index 6 index 6 index 5 -1 roll widthshow
-			currentpoint
-		}
-		{
-			false charpath currentpoint
-			4 index setmatrix stroke
-		} ifelse
-		grestore
-		moveto
-		2 copy rmoveto
-	} exch cshow
-	6 npop
-} def
-/sp
-{
-	{
-		2 npop (0) exch
-		2 copy 0 exch put pop
-		false charpath
-		2 copy rmoveto
-	} exch cshow
-	2 npop
-} def
-/jsp
-{
-	{
-		2 npop
-		(0) exch 2 copy 0 exch put
-		_sp eq
-		{
-			exch 5 index 5 index 5 index 5 -1 roll widthshow
-		}
-		{
-			false charpath
-		} ifelse
-		2 copy rmoveto
-	} exch cshow
-	5 npop
-} def
-/pl
-{
-	transform
-	0.25 sub round 0.25 add exch
-	0.25 sub round 0.25 add exch
-	itransform
-} def
-/setstrokeadjust where
-{
-	pop true setstrokeadjust
-	/c
-	{
-		curveto
-	} def
-	/C
-	/c load def
-	/v
-	{
-		currentpoint 6 2 roll curveto
-	} def
-	/V
-	/v load def
-	/y
-	{
-		2 copy curveto
-	} def
-	/Y
-	/y load def
-	/l
-	{
-		lineto
-	} def
-	/L
-	/l load def
-	/m
-	{
-		moveto
-	} def
-}
-{
-	/c
-	{
-		pl curveto
-	} def
-	/C
-	/c load def
-	/v
-	{
-		currentpoint 6 2 roll pl curveto
-	} def
-	/V
-	/v load def
-	/y
-	{
-		pl 2 copy curveto
-	} def
-	/Y
-	/y load def
-	/l
-	{
-		pl lineto
-	} def
-	/L
-	/l load def
-	/m
-	{
-		pl moveto
-	} def
-} ifelse
-/d
-{
-	setdash
-} def
-/cf
-{
-} def
-/i
-{
-	dup 0 eq
-	{
-		pop cf
-	} if
-	setflat
-} def
-/j
-{
-	setlinejoin
-} def
-/J
-{
-	setlinecap
-} def
-/M
-{
-	setmiterlimit
-} def
-/w
-{
-	setlinewidth
-} def
-/H
-{
-} def
-/h
-{
-	closepath
-} def
-/N
-{
-	_pola 0 eq
-	{
-		_doClip 1 eq
-		{
-			clip /_doClip 0 ddef
-		} if
-		newpath
-	}
-	{
-		/CRender
-		{
-			N
-		} ddef
-	} ifelse
-} def
-/n
-{
-	N
-} def
-/F
-{
-	_pola 0 eq
-	{
-		_doClip 1 eq
-		{
-			gsave _pf grestore clip newpath /_lp /none ddef _fc
-			/_doClip 0 ddef
-		}
-		{
-			_pf
-		} ifelse
-	}
-	{
-		/CRender
-		{
-			F
-		} ddef
-	} ifelse
-} def
-/f
-{
-	closepath
-	F
-} def
-/S
-{
-	_pola 0 eq
-	{
-		_doClip 1 eq
-		{
-			gsave _ps grestore clip newpath /_lp /none ddef _sc
-			/_doClip 0 ddef
-		}
-		{
-			_ps
-		} ifelse
-	}
-	{
-		/CRender
-		{
-			S
-		} ddef
-	} ifelse
-} def
-/s
-{
-	closepath
-	S
-} def
-/B
-{
-	_pola 0 eq
-	{
-		_doClip 1 eq
-		gsave F grestore
-		{
-			gsave S grestore clip newpath /_lp /none ddef _sc
-			/_doClip 0 ddef
-		}
-		{
-			S
-		} ifelse
-	}
-	{
-		/CRender
-		{
-			B
-		} ddef
-	} ifelse
-} def
-/b
-{
-	closepath
-	B
-} def
-/W
-{
-	/_doClip 1 ddef
-} def
-/*
-{
-	count 0 ne
-	{
-		dup type /stringtype eq
-		{
-			pop
-		} if
-	} if
-	newpath
-} def
-/u
-{
-} def
-/U
-{
-} def
-/q
-{
-	_pola 0 eq
-	{
-		gsave
-	} if
-} def
-/Q
-{
-	_pola 0 eq
-	{
-		grestore
-	} if
-} def
-/*u
-{
-	_pola 1 add /_pola exch ddef
-} def
-/*U
-{
-	_pola 1 sub /_pola exch ddef
-	_pola 0 eq
-	{
-		CRender
-	} if
-} def
-/D
-{
-	pop
-} def
-/*w
-{
-} def
-/*W
-{
-} def
-/`
-{
-	/_i save ddef
-	clipForward?
-	{
-		nulldevice
-	} if
-	6 1 roll 4 npop
-	concat pop
-	userdict begin
-	/showpage
-	{
-	} def
-	0 setgray
-	0 setlinecap
-	1 setlinewidth
-	0 setlinejoin
-	10 setmiterlimit
-	[] 0 setdash
-	/setstrokeadjust where {pop false setstrokeadjust} if
-	newpath
-	0 setgray
-	false setoverprint
-} def
-/~
-{
- end
-	_i restore
-} def
-/O
-{
-	0 ne
-	/_of exch ddef
-	/_lp /none ddef
-} def
-/R
-{
-	0 ne
-	/_os exch ddef
-	/_lp /none ddef
-} def
-/g
-{
-	/_gf exch ddef
-	/_fc
-	{
-		_lp /fill ne
-		{
-			_of setoverprint
-			_gf setgray
-			/_lp /fill ddef
-		} if
-	} ddef
-	/_pf
-	{
-		_fc
-		fill
-	} ddef
-	/_psf
-	{
-		_fc
-		ashow
-	} ddef
-	/_pjsf
-	{
-		_fc
-		awidthshow
-	} ddef
-	/_lp /none ddef
-} def
-/G
-{
-	/_gs exch ddef
-	/_sc
-	{
-		_lp /stroke ne
-		{
-			_os setoverprint
-			_gs setgray
-			/_lp /stroke ddef
-		} if
-	} ddef
-	/_ps
-	{
-		_sc
-		stroke
-	} ddef
-	/_pss
-	{
-		_sc
-		ss
-	} ddef
-	/_pjss
-	{
-		_sc
-		jss
-	} ddef
-	/_lp /none ddef
-} def
-/k
-{
-	_cf astore pop
-	/_fc
-	{
-		_lp /fill ne
-		{
-			_of setoverprint
-			_cf aload pop setcmykcolor
-			/_lp /fill ddef
-		} if
-	} ddef
-	/_pf
-	{
-		_fc
-		fill
-	} ddef
-	/_psf
-	{
-		_fc
-		ashow
-	} ddef
-	/_pjsf
-	{
-		_fc
-		awidthshow
-	} ddef
-	/_lp /none ddef
-} def
-/K
-{
-	_cs astore pop
-	/_sc
-	{
-		_lp /stroke ne
-		{
-			_os setoverprint
-			_cs aload pop setcmykcolor
-			/_lp /stroke ddef
-		} if
-	} ddef
-	/_ps
-	{
-		_sc
-		stroke
-	} ddef
-	/_pss
-	{
-		_sc
-		ss
-	} ddef
-	/_pjss
-	{
-		_sc
-		jss
-	} ddef
-	/_lp /none ddef
-} def
-/x
-{
-	/_gf exch ddef
-	findcmykcustomcolor
-	/_if exch ddef
-	/_fc
-	{
-		_lp /fill ne
-		{
-			_of setoverprint
-			_if _gf 1 exch sub setcustomcolor
-			/_lp /fill ddef
-		} if
-	} ddef
-	/_pf
-	{
-		_fc
-		fill
-	} ddef
-	/_psf
-	{
-		_fc
-		ashow
-	} ddef
-	/_pjsf
-	{
-		_fc
-		awidthshow
-	} ddef
-	/_lp /none ddef
-} def
-/X
-{
-	/_gs exch ddef
-	findcmykcustomcolor
-	/_is exch ddef
-	/_sc
-	{
-		_lp /stroke ne
-		{
-			_os setoverprint
-			_is _gs 1 exch sub setcustomcolor
-			/_lp /stroke ddef
-		} if
-	} ddef
-	/_ps
-	{
-		_sc
-		stroke
-	} ddef
-	/_pss
-	{
-		_sc
-		ss
-	} ddef
-	/_pjss
-	{
-		_sc
-		jss
-	} ddef
-	/_lp /none ddef
-} def
-/A
-{
-	pop
-} def
-/annotatepage
-{
-userdict /annotatepage 2 copy known {get exec} {pop pop} ifelse
-} def
-/discard
-{
-	save /discardSave exch store
-	discardDict begin
-	/endString exch store
-	gt38?
-	{
-		2 add
-	} if
-	load
-	stopped
-	pop
- end
-	discardSave restore
-} bind def
-userdict /discardDict 7 dict dup begin
-put
-/pre38Initialize
-{
-	/endStringLength endString length store
-	/newBuff buffer 0 endStringLength getinterval store
-	/newBuffButFirst newBuff 1 endStringLength 1 sub getinterval store
-	/newBuffLast newBuff endStringLength 1 sub 1 getinterval store
-} def
-/shiftBuffer
-{
-	newBuff 0 newBuffButFirst putinterval
-	newBuffLast 0
-	currentfile read not
-	{
-	stop
-	} if
-	put
-} def
-0
-{
-	pre38Initialize
-	mark
-	currentfile newBuff readstring exch pop
-	{
-		{
-			newBuff endString eq
-			{
-				cleartomark stop
-			} if
-			shiftBuffer
-		} loop
-	}
-	{
-	stop
-	} ifelse
-} def
-1
-{
-	pre38Initialize
-	/beginString exch store
-	mark
-	currentfile newBuff readstring exch pop
-	{
-		{
-			newBuff beginString eq
-			{
-				/layerCount dup load 1 add store
-			}
-			{
-				newBuff endString eq
-				{
-					/layerCount dup load 1 sub store
-					layerCount 0 eq
-					{
-						cleartomark stop
-					} if
-				} if
-			} ifelse
-			shiftBuffer
-		} loop
-	}
-	{
-	stop
-	} ifelse
-} def
-2
-{
-	mark
-	{
-		currentfile buffer readline not
-		{
-		stop
-		} if
-		endString eq
-		{
-			cleartomark stop
-		} if
-	} loop
-} def
-3
-{
-	/beginString exch store
-	/layerCnt 1 store
-	mark
-	{
-		currentfile buffer readline not
-		{
-		stop
-		} if
-		dup beginString eq
-		{
-			pop /layerCnt dup load 1 add store
-		}
-		{
-			endString eq
-			{
-				layerCnt 1 eq
-				{
-					cleartomark stop
-				}
-				{
-					/layerCnt dup load 1 sub store
-				} ifelse
-			} if
-		} ifelse
-	} loop
-} def
-end
-userdict /clipRenderOff 15 dict dup begin
-put
-{
-	/n /N /s /S /f /F /b /B
-}
-{
-	{
-		_doClip 1 eq
-		{
-			/_doClip 0 ddef clip
-		} if
-		newpath
-	} def
-} forall
-/Tr /pop load def
-/Bb {} def
-/BB /pop load def
-/Bg {12 npop} def
-/Bm {6 npop} def
-/Bc /Bm load def
-/Bh {4 npop} def
-end
-/Lb
-{
-	4 npop
-	6 1 roll
-	pop
-	4 1 roll
-	pop pop pop
-	0 eq
-	{
-		0 eq
-		{
-			(%AI5_BeginLayer) 1 (%AI5_EndLayer--) discard
-		}
-		{
-			/clipForward? true def
-			
-			/Tx /pop load def
-			/Tj /pop load def
-			currentdict end clipRenderOff begin begin
-		} ifelse
-	}
-	{
-		0 eq
-		{
-			save /discardSave exch store
-		} if
-	} ifelse
-} bind def
-/LB
-{
-	discardSave dup null ne
-	{
-		restore
-	}
-	{
-		pop
-		clipForward?
-		{
-			currentdict
-		 end
-		 end
-		 begin
-			
-			/clipForward? false ddef
-		} if
-	} ifelse
-} bind def
-/Pb
-{
-	pop pop
-	0 (%AI5_EndPalette) discard
-} bind def
-/Np
-{
-	0 (%AI5_End_NonPrinting--) discard
-} bind def
-/Ln /pop load def
-/Ap
-/pop load def
-/Ar
-{
-	72 exch div
-	0 dtransform dup mul exch dup mul add sqrt
-	dup 1 lt
-	{
-		pop 1
-	} if
-	setflat
-} def
-/Mb
-{
-	q
-} def
-/Md
-{
-} def
-/MB
-{
-	Q
-} def
-/nc 3 dict def
-nc begin
-/setgray
-{
-	pop
-} bind def
-/setcmykcolor
-{
-	4 npop
-} bind def
-/setcustomcolor
-{
-	2 npop
-} bind def
-currentdict readonly pop
-end
-currentdict readonly pop
-end
-setpacking
-%%EndResource
-%%EndProlog
-%%BeginSetup
-Adobe_level2_AI5 /initialize get exec
-Adobe_IllustratorA_AI5 /initialize get exec
-%AI5_Begin_NonPrinting
-Np
-%AI3_BeginPattern: (Yellow Stripe)
-(Yellow Stripe) 8.4499 4.6 80.4499 76.6 [
-%AI3_Tile
-(0 O 0 R 0 0.4 1 0 k 0 0.4 1 0 K) @
-(
-800 Ar
-0 J 0 j 3.6 w 4 M []0 d
-%AI3_Note:
-0 D
-8.1999 8.1999 m
-80.6999 8.1999 L
-S
-8.1999 22.6 m
-80.6999 22.6 L
-S
-8.1999 37.0001 m
-80.6999 37.0001 L
-S
-8.1999 51.3999 m
-80.6999 51.3999 L
-S
-8.1999 65.8 m
-80.6999 65.8 L
-S
-8.1999 15.3999 m
-80.6999 15.3999 L
-S
-8.1999 29.8 m
-80.6999 29.8 L
-S
-8.1999 44.1999 m
-80.6999 44.1999 L
-S
-8.1999 58.6 m
-80.6999 58.6 L
-S
-8.1999 73.0001 m
-80.6999 73.0001 L
-S
-) &
-] E
-%AI3_EndPattern
-%AI5_End_NonPrinting--
-%AI5_Begin_NonPrinting
-Np
-3 Bn
-%AI5_BeginGradient: (Black & White)
-(Black & White) 0 2 Bd
-[
-<
-FFFEFDFCFBFAF9F8F7F6F5F4F3F2F1F0EFEEEDECEBEAE9E8E7E6E5E4E3E2E1E0DFDEDDDCDBDAD9D8
-D7D6D5D4D3D2D1D0CFCECDCCCBCAC9C8C7C6C5C4C3C2C1C0BFBEBDBCBBBAB9B8B7B6B5B4B3B2B1B0
-AFAEADACABAAA9A8A7A6A5A4A3A2A1A09F9E9D9C9B9A999897969594939291908F8E8D8C8B8A8988
-87868584838281807F7E7D7C7B7A797877767574737271706F6E6D6C6B6A69686766656463626160
-5F5E5D5C5B5A595857565554535251504F4E4D4C4B4A494847464544434241403F3E3D3C3B3A3938
-37363534333231302F2E2D2C2B2A292827262524232221201F1E1D1C1B1A19181716151413121110
-0F0E0D0C0B0A09080706050403020100
->
-0 %_Br
-[
-0 0 50 100 %_Bs
-1 0 50 0 %_Bs
-BD
-%AI5_EndGradient
-%AI5_BeginGradient: (Red & Yellow)
-(Red & Yellow) 0 2 Bd
-[
-0
-<
-000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627
-28292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F
-505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F7071727374757677
-78797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9F
-A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7
-C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEF
-F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF
->
-<
-FFFFFEFEFDFDFDFCFCFBFBFBFAFAF9F9F9F8F8F7F7F7F6F6F5F5F5F4F4F3F3F3F2F2F1F1F1F0F0EF
-EFEFEEEEEDEDEDECECEBEBEBEAEAE9E9E9E8E8E7E7E7E6E6E5E5E5E4E4E3E3E3E2E2E1E1E1E0E0DF
-DFDFDEDEDDDDDDDCDCDBDBDBDADAD9D9D9D8D8D7D7D7D6D6D5D5D5D4D4D3D3D3D2D2D1D1D1D0D0CF
-CFCFCECECDCDCDCCCCCBCBCBCACAC9C9C9C8C8C7C7C7C6C6C5C5C5C4C4C3C3C3C2C2C1C1C1C0C0BF
-BFBFBEBEBDBDBDBCBCBBBBBBBABAB9B9B9B8B8B7B7B7B6B6B5B5B5B4B4B3B3B3B2B2B1B1B1B0B0AF
-AFAFAEAEADADADACACABABABAAAAA9A9A9A8A8A7A7A7A6A6A5A5A5A4A4A3A3A3A2A2A1A1A1A0A09F
-9F9F9E9E9D9D9D9C9C9B9B9B9A9A9999
->
-0
-1 %_Br
-[
-0 1 0.6 0 1 50 100 %_Bs
-0 0 1 0 1 50 0 %_Bs
-BD
-%AI5_EndGradient
-%AI5_BeginGradient: (Yellow & Blue Radial)
-(Yellow & Blue Radial) 1 2 Bd
-[
-<
-000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627
-28292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F
-505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F7071727374757677
-78797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9F
-A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7
-C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEF
-F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF
->
-<
-1415161718191A1B1C1D1E1F1F202122232425262728292A2A2B2C2D2E2F30313233343536363738
-393A3B3C3D3E3F40414142434445464748494A4B4C4D4D4E4F50515253545556575858595A5B5C5D
-5E5F60616263646465666768696A6B6C6D6E6F6F707172737475767778797A7B7B7C7D7E7F808182
-83848586868788898A8B8C8D8E8F90919292939495969798999A9B9C9D9D9E9FA0A1A2A3A4A5A6A7
-A8A9A9AAABACADAEAFB0B1B2B3B4B4B5B6B7B8B9BABBBCBDBEBFC0C0C1C2C3C4C5C6C7C8C9CACBCB
-CCCDCECFD0D1D2D3D4D5D6D7D7D8D9DADBDCDDDEDFE0E1E2E2E3E4E5E6E7E8E9EAEBECEDEEEEEFF0
-F1F2F3F4F5F6F7F8F9F9FAFBFCFDFEFF
->
-<
-ABAAAAA9A8A7A7A6A5A5A4A3A3A2A1A1A09F9F9E9D9D9C9B9B9A9999989797969595949393929191
-908F8F8E8D8D8C8B8B8A8989888787868585848383828181807F7F7E7D7D7C7B7B7A797978777776
-7575747373727171706F6F6E6D6D6C6B6B6A6969686767666565646362626160605F5E5E5D5C5C5B
-5A5A5958585756565554545352525150504F4E4E4D4C4C4B4A4A4948484746464544444342424140
-403F3E3E3D3C3C3B3A3A3938383736363534343332323130302F2E2E2D2C2C2B2A2A292828272626
-25242423222121201F1F1E1D1D1C1B1B1A1919181717161515141313121111100F0F0E0D0D0C0B0B
-0A090908070706050504030302010100
->
-0
-1 %_Br
-[
-0 0.08 0.67 0 1 50 14 %_Bs
-1 1 0 0 1 50 100 %_Bs
-BD
-%AI5_EndGradient
-%AI5_End_NonPrinting--
-%AI5_BeginPalette
-144 170 Pb
-Pn
-Pc
-1 g
-Pc
-0 g
-Pc
-0 0 0 0 k
-Pc
-0.75 g
-Pc
-0.5 g
-Pc
-0.25 g
-Pc
-0 g
-Pc
-Bb
-2 (Black & White) -4014 4716 0 0 1 0 0 1 0 0 Bg
-0 BB
-Pc
-0.25 0 0 0 k
-Pc
-0.5 0 0 0 k
-Pc
-0.75 0 0 0 k
-Pc
-1 0 0 0 k
-Pc
-0.25 0.25 0 0 k
-Pc
-0.5 0.5 0 0 k
-Pc
-0.75 0.75 0 0 k
-Pc
-1 1 0 0 k
-Pc
-Bb
-2 (Red & Yellow) -4014 4716 0 0 1 0 0 1 0 0 Bg
-0 BB
-Pc
-0 0.25 0 0 k
-Pc
-0 0.5 0 0 k
-Pc
-0 0.75 0 0 k
-Pc
-0 1 0 0 k
-Pc
-0 0.25 0.25 0 k
-Pc
-0 0.5 0.5 0 k
-Pc
-0 0.75 0.75 0 k
-Pc
-0 1 1 0 k
-Pc
-Bb
-0 0 0 0 Bh
-2 (Yellow & Blue Radial) -4014 4716 0 0 1 0 0 1 0 0 Bg
-0 BB
-Pc
-0 0 0.25 0 k
-Pc
-0 0 0.5 0 k
-Pc
-0 0 0.75 0 k
-Pc
-0 0 1 0 k
-Pc
-0.25 0 0.25 0 k
-Pc
-0.5 0 0.5 0 k
-Pc
-0.75 0 0.75 0 k
-Pc
-1 0 1 0 k
-Pc
-(Yellow Stripe) 0 0 1 1 0 0 0 0 0 [1 0 0 1 0 0] p
-Pc
-0.25 0.125 0 0 k
-Pc
-0.5 0.25 0 0 k
-Pc
-0.75 0.375 0 0 k
-Pc
-1 0.5 0 0 k
-Pc
-0.125 0.25 0 0 k
-Pc
-0.25 0.5 0 0 k
-Pc
-0.375 0.75 0 0 k
-Pc
-0.5 1 0 0 k
-Pc
-0.375 0.375 0.75 0 k
-Pc
-0 0.25 0.125 0 k
-Pc
-0 0.5 0.25 0 k
-Pc
-0 0.75 0.375 0 k
-Pc
-0 1 0.5 0 k
-Pc
-0 0.125 0.25 0 k
-Pc
-0 0.25 0.5 0 k
-Pc
-0 0.375 0.75 0 k
-Pc
-0 0.5 1 0 k
-Pc
-0 0.79 0.91 0 (TCL RED) 0 x
-Pc
-0.125 0 0.25 0 k
-Pc
-0.25 0 0.5 0 k
-Pc
-0.375 0 0.75 0 k
-Pc
-0.5 0 1 0 k
-Pc
-0.25 0 0.125 0 k
-Pc
-0.5 0 0.25 0 k
-Pc
-0.75 0 0.375 0 k
-Pc
-1 0 0.5 0 k
-Pc
-0.5 1 0 0 k
-Pc
-0.25 0.125 0.125 0 k
-Pc
-0.5 0.25 0.25 0 k
-Pc
-0.75 0.375 0.375 0 k
-Pc
-1 0.5 0.5 0 k
-Pc
-0.25 0.25 0.125 0 k
-Pc
-0.5 0.5 0.25 0 k
-Pc
-0.75 0.75 0.375 0 k
-Pc
-1 1 0.5 0 k
-Pc
-0 1 0.5 0 k
-Pc
-0.125 0.25 0.125 0 k
-Pc
-0.25 0.5 0.25 0 k
-Pc
-0.375 0.75 0.375 0 k
-Pc
-0.5 1 0.5 0 k
-Pc
-0.125 0.25 0.25 0 k
-Pc
-0.25 0.5 0.5 0 k
-Pc
-0.375 0.75 0.75 0 k
-Pc
-0.5 1 1 0 k
-Pc
-0.75 0.75 0.375 0 k
-Pc
-0.125 0.125 0.25 0 k
-Pc
-0.25 0.25 0.5 0 k
-Pc
-0.375 0.375 0.75 0 k
-Pc
-0.5 0.5 1 0 k
-Pc
-0.25 0.125 0.25 0 k
-Pc
-0.5 0.25 0.5 0 k
-Pc
-0.75 0.375 0.75 0 k
-Pc
-1 0.5 1 0 k
-Pc
-0 0.79 0.91 0 (TCL RED) 0 x
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-1 0.5 0.5 0 k
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-0 0.25 1 0 (Orange Yellow) 0 x
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-0 1 0.5 0 k
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-1 0 0.5 0 k
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-0 0.45 1 0 (Orange) 0 x
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-0.375 0.375 0.75 0 k
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-0 0.79 0.91 0 (TCL RED) 0 x
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-1 0.65 0 0 k
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-0 0 1 0 k
-Pc
-PB
-%AI5_EndPalette
-%%EndSetup
-%AI5_BeginLayer
-1 1 1 1 0 0 0 79 128 255 Lb
-(Layer 1) Ln
-0 A
-u
-1 Ap
-0 O
-0 0.79 0.91 0 (TCL RED) 0 x
-800 Ar
-0 J 0 j 1.25 w 4 M []0 d
-%AI3_Note:
-0 D
-294.5207 335.3041 m
-368.2181 333.001 L
-363.6121 423.9713 L
-370.5213 507.1689 L
-336.5513 505.4417 L
-320.7179 511.775 L
-251.3386 508.0325 L
-254.7931 425.9866 L
-251.3386 331.5616 L
-294.5207 335.3041 L
-f
-u
-0 Ap
-1 0.65 0 0 k
-1 w
-318.1366 400.9627 m
-311.8663 399.2526 l
-315.2864 407.5177 l
-318.7064 430.6032 l
-314.4314 431.4581 l
-319.5616 438.5832 l
-325.9526 462.6014 l
-314.7164 460.2436 l
-320.6412 471.0911 326.9284 478.1557 v
-318.7064 484.469 l
-292.2183 472.8011 299.3434 434.8954 v
-293.8679 435.8542 l
-299.1189 396.1175 l
-294.6797 394.9775 l
-299.2277 385.6974 305.5963 381.2973 v
-306.1744 380.8979 297.6162 412.3629 306.7363 443.7133 c
-307.5914 441.7183 l
-300.3238 408.3015 307.5914 381.2973 v
-307.9261 380.656 311.5598 381.0836 v
-318.1366 393.4813 318.1366 400.9627 v
-f
-u
-*u
-1 g
-271.4311 372.5074 m
-272.7184 372.5074 L
-272.7184 375.1913 L
-273.2858 375.1913 273.8313 375.1913 274.3768 375.2786 c
-274.3768 372.5074 L
-276.2969 372.5074 L
-276.2969 372.0056 L
-274.3768 372.0056 L
-274.3768 365.3286 L
-274.3768 364.9359 274.3768 364.3467 275.2059 364.3467 c
-275.7733 364.3467 276.0787 364.7395 276.4279 365.1541 c
-276.777 364.9141 L
-276.3624 364.0849 275.2932 363.583 274.4204 363.583 c
-272.8494 363.583 272.6748 364.434 272.6748 365.4814 c
-272.6748 372.0056 L
-271.4311 372.0056 L
-271.4311 372.5074 l
-f
-*U
-*u
-290.5617 366.5724 m
-290.0598 365.0232 289.187 363.6703 286.9178 363.583 c
-283.5356 363.583 282.5101 366.3978 282.5101 367.9034 c
-282.5101 371.7874 285.6304 372.7256 286.8741 372.7256 c
-288.2924 372.7256 290.2999 372.071 290.2999 370.3909 c
-290.2999 369.8018 289.9289 369.2344 289.318 369.2344 c
-288.7288 369.2344 288.2924 369.6272 288.2924 370.26 c
-288.2924 371.111 288.9907 371.2201 288.9907 371.4601 c
-288.9907 372.0492 287.616 372.2892 287.136 372.2892 c
-285.0412 372.2892 284.4957 370.7618 284.4957 367.9034 c
-284.4957 366.5942 284.823 365.5905 284.9539 365.285 c
-285.2812 364.5649 285.9577 364.1067 287.0923 364.0413 c
-288.3579 363.9758 289.5798 365.0013 290.1035 366.5724 C
-290.5617 366.5724 l
-f
-*U
-*u
-296.6 363.8667 m
-296.6 364.3686 L
-298.2802 364.3686 L
-298.2802 378.3989 L
-296.6 378.3989 L
-296.6 378.9007 L
-297.5383 378.9007 L
-298.3457 378.9007 299.1966 378.9444 299.9822 379.0971 c
-299.9822 364.3686 L
-301.6623 364.3686 L
-301.6623 363.8667 L
-296.6 363.8667 l
-f
-*U
-*u
-317.4527 372.5074 m
-318.7401 372.5074 L
-318.7401 375.1913 L
-319.3074 375.1913 319.8529 375.1913 320.3984 375.2786 c
-320.3984 372.5074 L
-322.3186 372.5074 L
-322.3186 372.0056 L
-320.3984 372.0056 L
-320.3984 365.3286 L
-320.3984 364.9359 320.3984 364.3467 321.2276 364.3467 c
-321.7949 364.3467 322.1004 364.7395 322.4495 365.1541 c
-322.7986 364.9141 L
-322.384 364.0849 321.3148 363.583 320.442 363.583 c
-318.871 363.583 318.6964 364.434 318.6964 365.4814 c
-318.6964 372.0056 L
-317.4527 372.0056 L
-317.4527 372.5074 l
-f
-*U
-*u
-333.7467 372.0056 m
-333.7467 372.5074 L
-337.3252 372.5074 L
-337.3252 372.0056 L
-335.9942 372.0056 L
-332.983 369.3872 L
-337.1288 364.3686 L
-338.0453 364.3686 L
-338.0453 363.8667 L
-333.8995 363.8667 L
-333.8995 364.3686 L
-334.9905 364.3686 L
-331.3465 368.798 L
-335.0341 371.9401 L
-335.0341 372.0056 L
-333.7467 372.0056 l
-f
-328.4881 363.8667 m
-328.4881 364.3686 L
-329.6227 364.3686 L
-329.6227 378.3989 L
-328.4881 378.3989 L
-328.4881 378.9007 L
-328.8809 378.9007 L
-329.6882 378.9007 330.5392 378.9444 331.3247 379.0971 c
-331.3247 364.3686 L
-332.6339 364.3686 L
-332.6339 363.8667 L
-328.4881 363.8667 l
-f
-*U
-u
-309.5341 446.5364 m
-305.6878 429.3874 306.7947 401.5837 v
-307.1266 393.2441 308.0387 385.5779 309.1527 378.9301 C
-309.1587 378.9297 L
-309.8832 373.0923 310.3679 370.9791 312.2568 363.9454 C
-312.1466 359.4091 L
-297.0216 407.7015 309.5341 446.5364 V
-f
-318.8187 461.4058 m
-322.2203 463.1 327.0966 463.7165 v
-332.427 453.9463 319.3087 437.2655 v
-327.1346 454.735 325.2889 460.2079 v
-323.225 461.4903 318.8187 461.4058 v
-f
-317.2065 432.0795 m
-320.2613 431.3723 321.7279 432.5601 v
-318.8383 421.2839 319.5958 415.0813 v
-320.3533 408.8787 314.8881 404.9079 y
-319.5435 410.7982 318.0802 415.5959 v
-317.0657 418.9214 318.2006 427.4326 319.4809 430.1349 c
-318.2853 430.3025 317.2065 432.0795 v
-f
-314.1861 402.3703 m
-319.2343 402.9744 319.7646 405.5244 v
-320.3824 390.2725 313.3689 383.9873 v
-318.7204 392.3347 317.8807 400.9697 v
-314.1861 402.3703 l
-f
-299.9864 396.0219 m
-298.3586 394.1986 293.4739 398.2203 v
-295.0301 387.9694 304.6978 383.2767 v
-298.0444 388.2897 296.2519 393.7045 v
-298.6029 394.3966 299.9864 396.0219 v
-f
-298.4281 399.9096 m
-291.8229 416.6749 293.2382 439.3286 v
-294.7808 435.2261 299.738 433.7875 v
-297.4026 433.3101 296.0372 433.517 v
-292.5816 423.9535 298.4281 399.9096 v
-f
-326.1736 477.812 m
-323.6983 496.0028 308.2122 477.6066 v
-295.8813 462.9582 297.3508 450.5217 298.1072 443.5831 c
-298.3007 441.8079 295.8131 462.1138 309.3231 475.4768 c
-322.8328 488.8398 325.8846 478.5879 326.1736 477.812 c
-f
-U
-0 0 1 0 k
-303.3623 493.3274 m
-291.211 496.7978 287.3437 456.5222 v
-284.3599 468.9535 292.0777 486.5353 v
-299.7955 504.1172 303.3623 493.3274 y
-f
-288.2873 496.2718 m
-282.0897 486.9502 283.4958 477.0213 v
-278.7953 495.712 288.2873 496.2718 v
-f
-333.8987 470.1328 m
-341.2276 472.8361 330.7334 445.5571 v
-336.1654 453.5292 339.5844 466.0531 v
-341.7789 474.0903 333.8987 470.1328 y
-f
-345.752 472.2583 m
-350.9334 467.5681 347.2615 461.3636 v
-356.4779 471.0481 345.752 472.2583 v
-f
-U
-*u
-273.1765 354.3318 m
-273.1765 353.7507 273.1305 353.2908 272.5159 353.2908 c
-271.8846 353.2908 271.8554 353.7674 271.8554 354.3318 c
-271.8554 356.485 L
-272.148 356.485 L
-272.148 354.3486 L
-272.148 353.8259 272.1773 353.5751 272.5159 353.5751 c
-272.8504 353.5751 272.8839 353.8259 272.8839 354.3486 c
-272.8839 356.485 L
-273.1765 356.485 L
-273.1765 354.3318 l
-f
-*U
-*u
-277.1612 356.485 m
-276.9062 356.485 L
-276.9062 354.3862 l
-276.9062 354.2482 276.9271 354.1061 276.9355 353.9681 C
-276.9229 353.9681 l
-276.8937 354.0768 276.8644 354.1855 276.8268 354.2942 C
-276.1035 356.485 L
-275.8484 356.485 L
-275.8484 353.3326 L
-276.1035 353.3326 L
-276.1035 355.2474 l
-276.1035 355.4523 276.0826 355.653 276.07 355.8579 C
-276.0867 355.8579 l
-276.1244 355.7241 276.1495 355.5819 276.1954 355.4523 C
-276.9062 353.3326 L
-277.1612 353.3326 l
-277.1612 356.485 L
-f
-*U
-*u
-280.1421 353.3326 m
-279.8494 353.3326 L
-279.8494 356.485 L
-280.1421 356.485 L
-280.1421 353.3326 l
-f
-*U
-*u
-283.5141 353.3326 m
-283.2549 353.3326 L
-282.6194 356.485 L
-282.9205 356.485 L
-283.3344 354.1897 L
-283.3511 354.1102 283.3678 353.9054 283.3845 353.7632 c
-283.4013 353.7632 L
-283.4138 353.9054 283.4305 354.1144 283.4431 354.1897 c
-283.8528 356.485 L
-284.1496 356.485 L
-283.5141 353.3326 l
-f
-*U
-*u
-287.6238 356.2174 m
-286.9256 356.2174 L
-286.9256 355.1053 L
-287.6029 355.1053 L
-287.6029 354.8377 L
-286.9256 354.8377 L
-286.9256 353.6002 L
-287.6238 353.6002 L
-287.6238 353.3326 L
-286.6329 353.3326 L
-286.6329 356.485 L
-287.6238 356.485 L
-287.6238 356.2174 l
-f
-*U
-*u
-290.2278 353.3326 m
-290.2278 356.485 L
-290.5414 356.485 L
-290.9804 356.485 291.4026 356.4515 291.4026 355.6823 c
-291.4026 355.2809 291.3148 354.8879 290.8089 354.8712 c
-291.5072 353.3326 L
-291.1978 353.3326 L
-290.5288 354.8753 L
-290.5205 354.8753 L
-290.5205 353.3326 L
-290.2278 353.3326 l
-f
-290.5205 355.1137 m
-290.625 355.1137 L
-291.0347 355.1137 291.1016 355.2558 291.1016 355.6697 c
-291.1016 356.1672 290.9511 356.2174 290.579 356.2174 c
-290.5205 356.2174 L
-290.5205 355.1137 l
-f
-*U
-*u
-295.0981 355.9875 m
-294.9727 356.1296 294.8347 356.2425 294.634 356.2425 c
-294.3414 356.2425 294.1783 356 294.1783 355.7324 c
-294.1783 355.3645 294.4459 355.1931 294.7176 355.0091 c
-294.9852 354.821 295.2528 354.6203 295.2528 354.1855 c
-295.2528 353.7256 294.9559 353.2908 294.4626 353.2908 c
-294.287 353.2908 294.1072 353.341 293.9651 353.4497 c
-293.9651 353.8301 L
-294.0989 353.688 294.2745 353.5751 294.4751 353.5751 c
-294.7845 353.5751 294.9559 353.8468 294.9518 354.1311 c
-294.9559 354.4991 294.6842 354.6621 294.4166 354.8503 c
-294.149 355.0342 293.8773 355.2391 293.8773 355.6906 c
-293.8773 356.1129 294.1365 356.5268 294.6006 356.5268 c
-294.7887 356.5268 294.9476 356.4641 295.0981 356.3596 C
-295.0981 355.9875 l
-f
-*U
-*u
-299.0865 353.3326 m
-298.773 353.3326 L
-298.6559 353.9806 L
-297.9869 353.9806 L
-297.8741 353.3326 L
-297.5605 353.3326 L
-298.1793 356.485 L
-298.4552 356.485 L
-299.0865 353.3326 l
-f
-298.6099 354.2357 m
-298.4009 355.444 L
-298.3632 355.6572 298.3465 355.8746 298.3214 356.0878 c
-298.3047 356.0878 L
-298.2754 355.8746 298.2545 355.6572 298.2211 355.444 c
-298.0371 354.2357 L
-298.6099 354.2357 l
-f
-*U
-*u
-301.8124 353.6002 m
-302.4981 353.6002 L
-302.4981 353.3326 L
-301.5198 353.3326 L
-301.5198 356.485 L
-301.8124 356.485 L
-301.8124 353.6002 l
-f
-*U
-*u
-309.0754 355.9875 m
-308.95 356.1296 308.812 356.2425 308.6114 356.2425 c
-308.3187 356.2425 308.1556 356 308.1556 355.7324 c
-308.1556 355.3645 308.4232 355.1931 308.695 355.0091 c
-308.9626 354.821 309.2301 354.6203 309.2301 354.1855 c
-309.2301 353.7256 308.9333 353.2908 308.4399 353.2908 c
-308.2643 353.2908 308.0846 353.341 307.9424 353.4497 c
-307.9424 353.8301 L
-308.0762 353.688 308.2518 353.5751 308.4525 353.5751 c
-308.7619 353.5751 308.9333 353.8468 308.9291 354.1311 c
-308.9333 354.4991 308.6615 354.6621 308.3939 354.8503 c
-308.1264 355.0342 307.8546 355.2391 307.8546 355.6906 c
-307.8546 356.1129 308.1138 356.5268 308.5779 356.5268 c
-308.766 356.5268 308.9249 356.4641 309.0754 356.3596 C
-309.0754 355.9875 l
-f
-*U
-*u
-312.9468 353.7172 m
-312.8339 353.6378 312.7001 353.5751 312.558 353.5751 c
-311.9977 353.5751 311.9977 354.5492 311.9977 354.9172 c
-311.9977 355.5025 312.0688 356.2425 312.5789 356.2425 c
-312.7252 356.2425 312.8297 356.184 312.9468 356.1045 C
-312.9468 356.4265 l
-312.8506 356.4975 312.6918 356.5268 312.5747 356.5268 c
-311.7134 356.5268 311.6967 355.306 311.6967 354.7959 c
-311.6967 354.2566 311.8054 353.2908 312.5454 353.2908 c
-312.6834 353.2908 312.8381 353.3451 312.9468 353.4204 c
-312.9468 353.7172 L
-f
-*U
-*u
-315.5053 353.3326 m
-315.5053 356.485 L
-315.8188 356.485 L
-316.2578 356.485 316.6801 356.4515 316.6801 355.6823 c
-316.6801 355.2809 316.5923 354.8879 316.0864 354.8712 c
-316.7846 353.3326 L
-316.4752 353.3326 L
-315.8063 354.8753 L
-315.7979 354.8753 L
-315.7979 353.3326 L
-315.5053 353.3326 l
-f
-315.7979 355.1137 m
-315.9025 355.1137 L
-316.3122 355.1137 316.3791 355.2558 316.3791 355.6697 c
-316.3791 356.1672 316.2286 356.2174 315.8565 356.2174 c
-315.7979 356.2174 L
-315.7979 355.1137 l
-f
-*U
-*u
-319.5728 353.3326 m
-319.2802 353.3326 L
-319.2802 356.485 L
-319.5728 356.485 L
-319.5728 353.3326 l
-f
-*U
-*u
-322.2551 353.3326 m
-322.2551 356.485 L
-322.5812 356.485 L
-323.0327 356.485 323.4341 356.4432 323.4341 355.6655 c
-323.4341 355.0551 323.2209 354.8419 322.623 354.8419 c
-322.5477 354.8419 L
-322.5477 353.3326 L
-322.2551 353.3326 l
-f
-322.5477 355.1095 m
-322.6606 355.1095 L
-323.0703 355.1095 323.1205 355.26 323.1331 355.6655 c
-323.1331 356.1004 323.016 356.2174 322.6063 356.2174 c
-322.5477 356.2174 L
-322.5477 355.1095 l
-f
-*U
-*u
-326.9539 356.485 m
-325.7164 356.485 L
-325.7164 356.2174 L
-326.1888 356.2174 L
-326.1888 353.3326 L
-326.4815 353.3326 L
-326.4815 356.2174 L
-326.9539 356.2174 l
-326.9539 356.485 L
-f
-*U
-*u
-329.7077 353.3326 m
-329.4151 353.3326 L
-329.4151 356.485 L
-329.7077 356.485 L
-329.7077 353.3326 l
-f
-*U
-*u
-333.7028 353.3326 m
-333.4477 353.3326 L
-332.737 355.4523 L
-332.691 355.5819 332.6659 355.7241 332.6283 355.8579 c
-332.6116 355.8579 L
-332.6241 355.653 332.645 355.4523 332.645 355.2474 c
-332.645 353.3326 L
-332.39 353.3326 L
-332.39 356.485 L
-332.645 356.485 L
-333.3683 354.2942 L
-333.4059 354.1855 333.4352 354.0768 333.4645 353.9681 c
-333.477 353.9681 L
-333.4686 354.1061 333.4477 354.2482 333.4477 354.3862 c
-333.4477 356.485 L
-333.7028 356.485 L
-333.7028 353.3326 l
-f
-*U
-*u
-336.9846 354.9966 m
-337.7037 354.9966 L
-337.7037 354.4154 L
-337.7037 353.9179 337.6787 353.2908 337.0264 353.2908 c
-336.3617 353.2908 336.299 353.989 336.299 354.9841 c
-336.299 355.7283 336.3868 356.5268 337.0557 356.5268 c
-337.432 356.5268 337.6201 356.276 337.6996 355.9331 c
-337.4111 355.8202 L
-337.3776 356.0084 337.2982 356.2425 337.0682 356.2425 c
-336.6334 356.2383 336.6 355.5652 336.6 355.0091 c
-336.6 353.8427 336.7463 353.5751 337.0515 353.5751 c
-337.3818 353.5751 337.4111 353.8176 337.4111 354.4907 c
-337.4111 354.729 L
-336.9846 354.729 L
-336.9846 354.9966 l
-f
-*U
-U
-U
-337.6667 -3924 m
-(N) *
-337.6667 4716 m
-(N) *
-LB
-%AI5_EndLayer--
-%%PageTrailer
-gsave annotatepage grestore showpage
-%%Trailer
-Adobe_IllustratorA_AI5 /terminate get exec
-Adobe_level2_AI5 /terminate get exec
-%%EOF
diff --git a/tk8.6/library/images/logo100.gif b/tk8.6/library/images/logo100.gif
deleted file mode 100644
index 4603d4f..0000000
--- a/tk8.6/library/images/logo100.gif
+++ /dev/null
diff --git a/tk8.6/library/images/logo64.gif b/tk8.6/library/images/logo64.gif
deleted file mode 100644
index 749d55b..0000000
--- a/tk8.6/library/images/logo64.gif
+++ /dev/null
diff --git a/tk8.6/library/images/logoLarge.gif b/tk8.6/library/images/logoLarge.gif
deleted file mode 100644
index bd7530a..0000000
--- a/tk8.6/library/images/logoLarge.gif
+++ /dev/null
diff --git a/tk8.6/library/images/logoMed.gif b/tk8.6/library/images/logoMed.gif
deleted file mode 100644
index d41801a..0000000
--- a/tk8.6/library/images/logoMed.gif
+++ /dev/null
diff --git a/tk8.6/library/images/pwrdLogo.eps b/tk8.6/library/images/pwrdLogo.eps
deleted file mode 100644
index e11d9e9..0000000
--- a/tk8.6/library/images/pwrdLogo.eps
+++ /dev/null
@@ -1,1897 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Adobe Illustrator(TM) 5.5
-%%For: (Bud Northern) (Mark Anderson Design)
-%%Title: (TCL PWRD LOGO.ILLUS)
-%%CreationDate: (8/1/96) (4:59 PM)
-%%BoundingBox: 242 302 377 513
-%%HiResBoundingBox: 242.0523 302.5199 376.3322 512.5323
-%%DocumentProcessColors: Cyan Magenta Yellow
-%%DocumentSuppliedResources: procset Adobe_level2_AI5 1.0 0
-%%+ procset Adobe_IllustratorA_AI5 1.0 0
-%AI5_FileFormat 1.2
-%AI3_ColorUsage: Color
-%%CMYKCustomColor: 0 0.45 1 0 (Orange)
-%%+ 0 0.25 1 0 (Orange Yellow)
-%%+ 0 0.79 0.91 0 (PANTONE Warm Red CV)
-%%+ 0 0.79 0.91 0 (TCL RED)
-%AI3_TemplateBox: 306 396 306 396
-%AI3_TileBox: 12 12 600 780
-%AI3_DocumentPreview: Macintosh_ColorPic
-%AI5_ArtSize: 612 792
-%AI5_RulerUnits: 0
-%AI5_ArtFlags: 1 0 0 1 0 0 1 1 0
-%AI5_TargetResolution: 800
-%AI5_NumLayers: 1
-%AI5_OpenToView: 102 564 2 938 673 18 1 1 2 40
-%AI5_OpenViewLayers: 7
-%%EndComments
-%%BeginProlog
-%%BeginResource: procset Adobe_level2_AI5 1.0 0
-%%Title: (Adobe Illustrator (R) Version 5.0 Level 2 Emulation)
-%%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
-	put
-	/packedarray where not
-	{
-		userdict begin
-		/packedarray
-		{
-			array astore readonly
-		} bind def
-		/setpacking /pop load def
-		/currentpacking false def
-	 end
-		0
-	} if
-	pop
-	userdict /defaultpacking currentpacking put true setpacking
-	/initialize
-	{
-		Adobe_level2_AI5 begin
-	} bind def
-	/terminate
-	{
-		currentdict Adobe_level2_AI5 eq
-		{
-		 end
-		} if
-	} bind def
-	mark
-	/setcustomcolor where not
-	{
-		/findcmykcustomcolor
-		{
-			5 packedarray
-		} bind def
-		/setcustomcolor
-		{
-			exch aload pop pop
-			4
-			{
-				4 index mul 4 1 roll
-			} repeat
-			5 -1 roll pop
-			setcmykcolor
-		}
-		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?
-	systemdict /languagelevel known dup
-	{
-		pop systemdict /languagelevel get 2 ge
-	} if
-	put
-	level2? not
-	{
-		/setcmykcolor where not
-		{
-			/setcmykcolor
-			{
-				exch .11 mul add exch .59 mul add exch .3 mul add
-				1 exch sub setgray
-			} def
-		} if
-		/currentcmykcolor where not
-		{
-			/currentcmykcolor
-			{
-				0 0 0 1 currentgray sub
-			} def
-		} if
-		/setoverprint where not
-		{
-			/setoverprint /pop load def
-		} if
-		/selectfont where not
-		{
-			/selectfont
-			{
-				exch findfont exch
-				dup type /arraytype eq
-				{
-					makefont
-				}
-				{
-					scalefont
-				} ifelse
-				setfont
-			} bind def
-		} if
-		/cshow where not
-		{
-			/cshow
-			{
-				[
-				0 0 5 -1 roll aload pop
-				] cvx bind forall
-			} bind def
-		} if
-	} if
-	cleartomark
-	/anyColor?
-	{
-		add add add 0 ne
-	} bind def
-	/testColor
-	{
-		gsave
-		setcmykcolor currentcmykcolor
-		grestore
-	} bind def
-	/testCMYKColorThrough
-	{
-		testColor anyColor?
-	} bind def
-	userdict /composite?
-	level2?
-	{
-		gsave 1 1 1 1 setcmykcolor currentcmykcolor grestore
-		add add add 4 eq
-	}
-	{
-		1 0 0 0 testCMYKColorThrough
-		0 1 0 0 testCMYKColorThrough
-		0 0 1 0 testCMYKColorThrough
-		0 0 0 1 testCMYKColorThrough
-		and and and
-	} ifelse
-	put
-	composite? not
-	{
-		userdict begin
-		gsave
-		/cyan? 1 0 0 0 testCMYKColorThrough def
-		/magenta? 0 1 0 0 testCMYKColorThrough def
-		/yellow? 0 0 1 0 testCMYKColorThrough def
-		/black? 0 0 0 1 testCMYKColorThrough def
-		grestore
-		/isCMYKSep? cyan? magenta? yellow? black? or or or def
-		/customColor? isCMYKSep? not def
-	 end
-	} if
- end defaultpacking setpacking
-%%EndResource
-%%BeginResource: procset Adobe_IllustratorA_AI5 1.1 0
-%%Title: (Adobe Illustrator (R) Version 5.0 Abbreviated Prolog)
-%%Version: 1.1 
-%%CreationDate: (3/7/1994) ()
-%%Copyright: ((C) 1987-1994 Adobe Systems Incorporated All Rights Reserved)
-currentpacking true setpacking
-userdict /Adobe_IllustratorA_AI5_vars 70 dict dup begin
-put
-/_lp /none def
-/_pf
-{
-} def
-/_ps
-{
-} def
-/_psf
-{
-} def
-/_pss
-{
-} def
-/_pjsf
-{
-} def
-/_pjss
-{
-} def
-/_pola 0 def
-/_doClip 0 def
-/cf currentflat def
-/_tm matrix def
-/_renderStart
-[
-/e0 /r0 /a0 /o0 /e1 /r1 /a1 /i0
-] def
-/_renderEnd
-[
-null null null null /i1 /i1 /i1 /i1
-] def
-/_render -1 def
-/_rise 0 def
-/_ax 0 def
-/_ay 0 def
-/_cx 0 def
-/_cy 0 def
-/_leading
-[
-0 0
-] def
-/_ctm matrix def
-/_mtx matrix def
-/_sp 16#020 def
-/_hyphen (-) def
-/_fScl 0 def
-/_cnt 0 def
-/_hs 1 def
-/_nativeEncoding 0 def
-/_useNativeEncoding 0 def
-/_tempEncode 0 def
-/_pntr 0 def
-/_tDict 2 dict def
-/_wv 0 def
-/Tx
-{
-} def
-/Tj
-{
-} def
-/CRender
-{
-} def
-/_AI3_savepage
-{
-} def
-/_gf null def
-/_cf 4 array def
-/_if null def
-/_of false def
-/_fc
-{
-} def
-/_gs null def
-/_cs 4 array def
-/_is null def
-/_os false def
-/_sc
-{
-} def
-/discardSave null def
-/buffer 256 string def
-/beginString null def
-/endString null def
-/endStringLength null def
-/layerCnt 1 def
-/layerCount 1 def
-/perCent (%) 0 get def
-/perCentSeen? false def
-/newBuff null def
-/newBuffButFirst null def
-/newBuffLast null def
-/clipForward? false def
-end
-userdict /Adobe_IllustratorA_AI5 74 dict dup begin
-put
-/initialize
-{
-	Adobe_IllustratorA_AI5 dup begin
-	Adobe_IllustratorA_AI5_vars begin
-	discardDict
-	{
-		bind pop pop
-	} forall
-	dup /nc get begin
-	{
-		dup xcheck 1 index type /operatortype ne and
-		{
-			bind
-		} if
-		pop pop
-	} forall
- end
-	newpath
-} def
-/terminate
-{
- end
- end
-} def
-/_
-null def
-/ddef
-{
-	Adobe_IllustratorA_AI5_vars 3 1 roll put
-} def
-/xput
-{
-	dup load dup length exch maxlength eq
-	{
-		dup dup load dup
-		length 2 mul dict copy def
-	} if
-	load begin
-	def
- end
-} def
-/npop
-{
-	{
-		pop
-	} repeat
-} def
-/sw
-{
-	dup length exch stringwidth
-	exch 5 -1 roll 3 index mul add
-	4 1 roll 3 1 roll mul add
-} def
-/swj
-{
-	dup 4 1 roll
-	dup length exch stringwidth
-	exch 5 -1 roll 3 index mul add
-	4 1 roll 3 1 roll mul add
-	6 2 roll /_cnt 0 ddef
-	{
-		1 index eq
-		{
-			/_cnt _cnt 1 add ddef
-		} if
-	} forall
-	pop
-	exch _cnt mul exch _cnt mul 2 index add 4 1 roll 2 index add 4 1 roll pop pop
-} def
-/ss
-{
-	4 1 roll
-	{
-		2 npop
-		(0) exch 2 copy 0 exch put pop
-		gsave
-		false charpath currentpoint
-		4 index setmatrix
-		stroke
-		grestore
-		moveto
-		2 copy rmoveto
-	} exch cshow
-	3 npop
-} def
-/jss
-{
-	4 1 roll
-	{
-		2 npop
-		(0) exch 2 copy 0 exch put
-		gsave
-		_sp eq
-		{
-			exch 6 index 6 index 6 index 5 -1 roll widthshow
-			currentpoint
-		}
-		{
-			false charpath currentpoint
-			4 index setmatrix stroke
-		} ifelse
-		grestore
-		moveto
-		2 copy rmoveto
-	} exch cshow
-	6 npop
-} def
-/sp
-{
-	{
-		2 npop (0) exch
-		2 copy 0 exch put pop
-		false charpath
-		2 copy rmoveto
-	} exch cshow
-	2 npop
-} def
-/jsp
-{
-	{
-		2 npop
-		(0) exch 2 copy 0 exch put
-		_sp eq
-		{
-			exch 5 index 5 index 5 index 5 -1 roll widthshow
-		}
-		{
-			false charpath
-		} ifelse
-		2 copy rmoveto
-	} exch cshow
-	5 npop
-} def
-/pl
-{
-	transform
-	0.25 sub round 0.25 add exch
-	0.25 sub round 0.25 add exch
-	itransform
-} def
-/setstrokeadjust where
-{
-	pop true setstrokeadjust
-	/c
-	{
-		curveto
-	} def
-	/C
-	/c load def
-	/v
-	{
-		currentpoint 6 2 roll curveto
-	} def
-	/V
-	/v load def
-	/y
-	{
-		2 copy curveto
-	} def
-	/Y
-	/y load def
-	/l
-	{
-		lineto
-	} def
-	/L
-	/l load def
-	/m
-	{
-		moveto
-	} def
-}
-{
-	/c
-	{
-		pl curveto
-	} def
-	/C
-	/c load def
-	/v
-	{
-		currentpoint 6 2 roll pl curveto
-	} def
-	/V
-	/v load def
-	/y
-	{
-		pl 2 copy curveto
-	} def
-	/Y
-	/y load def
-	/l
-	{
-		pl lineto
-	} def
-	/L
-	/l load def
-	/m
-	{
-		pl moveto
-	} def
-} ifelse
-/d
-{
-	setdash
-} def
-/cf
-{
-} def
-/i
-{
-	dup 0 eq
-	{
-		pop cf
-	} if
-	setflat
-} def
-/j
-{
-	setlinejoin
-} def
-/J
-{
-	setlinecap
-} def
-/M
-{
-	setmiterlimit
-} def
-/w
-{
-	setlinewidth
-} def
-/H
-{
-} def
-/h
-{
-	closepath
-} def
-/N
-{
-	_pola 0 eq
-	{
-		_doClip 1 eq
-		{
-			clip /_doClip 0 ddef
-		} if
-		newpath
-	}
-	{
-		/CRender
-		{
-			N
-		} ddef
-	} ifelse
-} def
-/n
-{
-	N
-} def
-/F
-{
-	_pola 0 eq
-	{
-		_doClip 1 eq
-		{
-			gsave _pf grestore clip newpath /_lp /none ddef _fc
-			/_doClip 0 ddef
-		}
-		{
-			_pf
-		} ifelse
-	}
-	{
-		/CRender
-		{
-			F
-		} ddef
-	} ifelse
-} def
-/f
-{
-	closepath
-	F
-} def
-/S
-{
-	_pola 0 eq
-	{
-		_doClip 1 eq
-		{
-			gsave _ps grestore clip newpath /_lp /none ddef _sc
-			/_doClip 0 ddef
-		}
-		{
-			_ps
-		} ifelse
-	}
-	{
-		/CRender
-		{
-			S
-		} ddef
-	} ifelse
-} def
-/s
-{
-	closepath
-	S
-} def
-/B
-{
-	_pola 0 eq
-	{
-		_doClip 1 eq
-		gsave F grestore
-		{
-			gsave S grestore clip newpath /_lp /none ddef _sc
-			/_doClip 0 ddef
-		}
-		{
-			S
-		} ifelse
-	}
-	{
-		/CRender
-		{
-			B
-		} ddef
-	} ifelse
-} def
-/b
-{
-	closepath
-	B
-} def
-/W
-{
-	/_doClip 1 ddef
-} def
-/*
-{
-	count 0 ne
-	{
-		dup type /stringtype eq
-		{
-			pop
-		} if
-	} if
-	newpath
-} def
-/u
-{
-} def
-/U
-{
-} def
-/q
-{
-	_pola 0 eq
-	{
-		gsave
-	} if
-} def
-/Q
-{
-	_pola 0 eq
-	{
-		grestore
-	} if
-} def
-/*u
-{
-	_pola 1 add /_pola exch ddef
-} def
-/*U
-{
-	_pola 1 sub /_pola exch ddef
-	_pola 0 eq
-	{
-		CRender
-	} if
-} def
-/D
-{
-	pop
-} def
-/*w
-{
-} def
-/*W
-{
-} def
-/`
-{
-	/_i save ddef
-	clipForward?
-	{
-		nulldevice
-	} if
-	6 1 roll 4 npop
-	concat pop
-	userdict begin
-	/showpage
-	{
-	} def
-	0 setgray
-	0 setlinecap
-	1 setlinewidth
-	0 setlinejoin
-	10 setmiterlimit
-	[] 0 setdash
-	/setstrokeadjust where {pop false setstrokeadjust} if
-	newpath
-	0 setgray
-	false setoverprint
-} def
-/~
-{
- end
-	_i restore
-} def
-/O
-{
-	0 ne
-	/_of exch ddef
-	/_lp /none ddef
-} def
-/R
-{
-	0 ne
-	/_os exch ddef
-	/_lp /none ddef
-} def
-/g
-{
-	/_gf exch ddef
-	/_fc
-	{
-		_lp /fill ne
-		{
-			_of setoverprint
-			_gf setgray
-			/_lp /fill ddef
-		} if
-	} ddef
-	/_pf
-	{
-		_fc
-		fill
-	} ddef
-	/_psf
-	{
-		_fc
-		ashow
-	} ddef
-	/_pjsf
-	{
-		_fc
-		awidthshow
-	} ddef
-	/_lp /none ddef
-} def
-/G
-{
-	/_gs exch ddef
-	/_sc
-	{
-		_lp /stroke ne
-		{
-			_os setoverprint
-			_gs setgray
-			/_lp /stroke ddef
-		} if
-	} ddef
-	/_ps
-	{
-		_sc
-		stroke
-	} ddef
-	/_pss
-	{
-		_sc
-		ss
-	} ddef
-	/_pjss
-	{
-		_sc
-		jss
-	} ddef
-	/_lp /none ddef
-} def
-/k
-{
-	_cf astore pop
-	/_fc
-	{
-		_lp /fill ne
-		{
-			_of setoverprint
-			_cf aload pop setcmykcolor
-			/_lp /fill ddef
-		} if
-	} ddef
-	/_pf
-	{
-		_fc
-		fill
-	} ddef
-	/_psf
-	{
-		_fc
-		ashow
-	} ddef
-	/_pjsf
-	{
-		_fc
-		awidthshow
-	} ddef
-	/_lp /none ddef
-} def
-/K
-{
-	_cs astore pop
-	/_sc
-	{
-		_lp /stroke ne
-		{
-			_os setoverprint
-			_cs aload pop setcmykcolor
-			/_lp /stroke ddef
-		} if
-	} ddef
-	/_ps
-	{
-		_sc
-		stroke
-	} ddef
-	/_pss
-	{
-		_sc
-		ss
-	} ddef
-	/_pjss
-	{
-		_sc
-		jss
-	} ddef
-	/_lp /none ddef
-} def
-/x
-{
-	/_gf exch ddef
-	findcmykcustomcolor
-	/_if exch ddef
-	/_fc
-	{
-		_lp /fill ne
-		{
-			_of setoverprint
-			_if _gf 1 exch sub setcustomcolor
-			/_lp /fill ddef
-		} if
-	} ddef
-	/_pf
-	{
-		_fc
-		fill
-	} ddef
-	/_psf
-	{
-		_fc
-		ashow
-	} ddef
-	/_pjsf
-	{
-		_fc
-		awidthshow
-	} ddef
-	/_lp /none ddef
-} def
-/X
-{
-	/_gs exch ddef
-	findcmykcustomcolor
-	/_is exch ddef
-	/_sc
-	{
-		_lp /stroke ne
-		{
-			_os setoverprint
-			_is _gs 1 exch sub setcustomcolor
-			/_lp /stroke ddef
-		} if
-	} ddef
-	/_ps
-	{
-		_sc
-		stroke
-	} ddef
-	/_pss
-	{
-		_sc
-		ss
-	} ddef
-	/_pjss
-	{
-		_sc
-		jss
-	} ddef
-	/_lp /none ddef
-} def
-/A
-{
-	pop
-} def
-/annotatepage
-{
-userdict /annotatepage 2 copy known {get exec} {pop pop} ifelse
-} def
-/discard
-{
-	save /discardSave exch store
-	discardDict begin
-	/endString exch store
-	gt38?
-	{
-		2 add
-	} if
-	load
-	stopped
-	pop
- end
-	discardSave restore
-} bind def
-userdict /discardDict 7 dict dup begin
-put
-/pre38Initialize
-{
-	/endStringLength endString length store
-	/newBuff buffer 0 endStringLength getinterval store
-	/newBuffButFirst newBuff 1 endStringLength 1 sub getinterval store
-	/newBuffLast newBuff endStringLength 1 sub 1 getinterval store
-} def
-/shiftBuffer
-{
-	newBuff 0 newBuffButFirst putinterval
-	newBuffLast 0
-	currentfile read not
-	{
-	stop
-	} if
-	put
-} def
-0
-{
-	pre38Initialize
-	mark
-	currentfile newBuff readstring exch pop
-	{
-		{
-			newBuff endString eq
-			{
-				cleartomark stop
-			} if
-			shiftBuffer
-		} loop
-	}
-	{
-	stop
-	} ifelse
-} def
-1
-{
-	pre38Initialize
-	/beginString exch store
-	mark
-	currentfile newBuff readstring exch pop
-	{
-		{
-			newBuff beginString eq
-			{
-				/layerCount dup load 1 add store
-			}
-			{
-				newBuff endString eq
-				{
-					/layerCount dup load 1 sub store
-					layerCount 0 eq
-					{
-						cleartomark stop
-					} if
-				} if
-			} ifelse
-			shiftBuffer
-		} loop
-	}
-	{
-	stop
-	} ifelse
-} def
-2
-{
-	mark
-	{
-		currentfile buffer readline not
-		{
-		stop
-		} if
-		endString eq
-		{
-			cleartomark stop
-		} if
-	} loop
-} def
-3
-{
-	/beginString exch store
-	/layerCnt 1 store
-	mark
-	{
-		currentfile buffer readline not
-		{
-		stop
-		} if
-		dup beginString eq
-		{
-			pop /layerCnt dup load 1 add store
-		}
-		{
-			endString eq
-			{
-				layerCnt 1 eq
-				{
-					cleartomark stop
-				}
-				{
-					/layerCnt dup load 1 sub store
-				} ifelse
-			} if
-		} ifelse
-	} loop
-} def
-end
-userdict /clipRenderOff 15 dict dup begin
-put
-{
-	/n /N /s /S /f /F /b /B
-}
-{
-	{
-		_doClip 1 eq
-		{
-			/_doClip 0 ddef clip
-		} if
-		newpath
-	} def
-} forall
-/Tr /pop load def
-/Bb {} def
-/BB /pop load def
-/Bg {12 npop} def
-/Bm {6 npop} def
-/Bc /Bm load def
-/Bh {4 npop} def
-end
-/Lb
-{
-	4 npop
-	6 1 roll
-	pop
-	4 1 roll
-	pop pop pop
-	0 eq
-	{
-		0 eq
-		{
-			(%AI5_BeginLayer) 1 (%AI5_EndLayer--) discard
-		}
-		{
-			/clipForward? true def
-			
-			/Tx /pop load def
-			/Tj /pop load def
-			currentdict end clipRenderOff begin begin
-		} ifelse
-	}
-	{
-		0 eq
-		{
-			save /discardSave exch store
-		} if
-	} ifelse
-} bind def
-/LB
-{
-	discardSave dup null ne
-	{
-		restore
-	}
-	{
-		pop
-		clipForward?
-		{
-			currentdict
-		 end
-		 end
-		 begin
-			
-			/clipForward? false ddef
-		} if
-	} ifelse
-} bind def
-/Pb
-{
-	pop pop
-	0 (%AI5_EndPalette) discard
-} bind def
-/Np
-{
-	0 (%AI5_End_NonPrinting--) discard
-} bind def
-/Ln /pop load def
-/Ap
-/pop load def
-/Ar
-{
-	72 exch div
-	0 dtransform dup mul exch dup mul add sqrt
-	dup 1 lt
-	{
-		pop 1
-	} if
-	setflat
-} def
-/Mb
-{
-	q
-} def
-/Md
-{
-} def
-/MB
-{
-	Q
-} def
-/nc 3 dict def
-nc begin
-/setgray
-{
-	pop
-} bind def
-/setcmykcolor
-{
-	4 npop
-} bind def
-/setcustomcolor
-{
-	2 npop
-} bind def
-currentdict readonly pop
-end
-currentdict readonly pop
-end
-setpacking
-%%EndResource
-%%EndProlog
-%%BeginSetup
-Adobe_level2_AI5 /initialize get exec
-Adobe_IllustratorA_AI5 /initialize get exec
-%AI5_Begin_NonPrinting
-Np
-%AI3_BeginPattern: (Yellow Stripe)
-(Yellow Stripe) 8.4499 4.6 80.4499 76.6 [
-%AI3_Tile
-(0 O 0 R 0 0.4 1 0 k 0 0.4 1 0 K) @
-(
-800 Ar
-0 J 0 j 3.6 w 4 M []0 d
-%AI3_Note:
-0 D
-8.1999 8.1999 m
-80.6999 8.1999 L
-S
-8.1999 22.6 m
-80.6999 22.6 L
-S
-8.1999 37.0001 m
-80.6999 37.0001 L
-S
-8.1999 51.3999 m
-80.6999 51.3999 L
-S
-8.1999 65.8 m
-80.6999 65.8 L
-S
-8.1999 15.3999 m
-80.6999 15.3999 L
-S
-8.1999 29.8 m
-80.6999 29.8 L
-S
-8.1999 44.1999 m
-80.6999 44.1999 L
-S
-8.1999 58.6 m
-80.6999 58.6 L
-S
-8.1999 73.0001 m
-80.6999 73.0001 L
-S
-) &
-] E
-%AI3_EndPattern
-%AI5_End_NonPrinting--
-%AI5_Begin_NonPrinting
-Np
-3 Bn
-%AI5_BeginGradient: (Black & White)
-(Black & White) 0 2 Bd
-[
-<
-FFFEFDFCFBFAF9F8F7F6F5F4F3F2F1F0EFEEEDECEBEAE9E8E7E6E5E4E3E2E1E0DFDEDDDCDBDAD9D8
-D7D6D5D4D3D2D1D0CFCECDCCCBCAC9C8C7C6C5C4C3C2C1C0BFBEBDBCBBBAB9B8B7B6B5B4B3B2B1B0
-AFAEADACABAAA9A8A7A6A5A4A3A2A1A09F9E9D9C9B9A999897969594939291908F8E8D8C8B8A8988
-87868584838281807F7E7D7C7B7A797877767574737271706F6E6D6C6B6A69686766656463626160
-5F5E5D5C5B5A595857565554535251504F4E4D4C4B4A494847464544434241403F3E3D3C3B3A3938
-37363534333231302F2E2D2C2B2A292827262524232221201F1E1D1C1B1A19181716151413121110
-0F0E0D0C0B0A09080706050403020100
->
-0 %_Br
-[
-0 0 50 100 %_Bs
-1 0 50 0 %_Bs
-BD
-%AI5_EndGradient
-%AI5_BeginGradient: (Red & Yellow)
-(Red & Yellow) 0 2 Bd
-[
-0
-<
-000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627
-28292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F
-505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F7071727374757677
-78797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9F
-A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7
-C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEF
-F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF
->
-<
-FFFFFEFEFDFDFDFCFCFBFBFBFAFAF9F9F9F8F8F7F7F7F6F6F5F5F5F4F4F3F3F3F2F2F1F1F1F0F0EF
-EFEFEEEEEDEDEDECECEBEBEBEAEAE9E9E9E8E8E7E7E7E6E6E5E5E5E4E4E3E3E3E2E2E1E1E1E0E0DF
-DFDFDEDEDDDDDDDCDCDBDBDBDADAD9D9D9D8D8D7D7D7D6D6D5D5D5D4D4D3D3D3D2D2D1D1D1D0D0CF
-CFCFCECECDCDCDCCCCCBCBCBCACAC9C9C9C8C8C7C7C7C6C6C5C5C5C4C4C3C3C3C2C2C1C1C1C0C0BF
-BFBFBEBEBDBDBDBCBCBBBBBBBABAB9B9B9B8B8B7B7B7B6B6B5B5B5B4B4B3B3B3B2B2B1B1B1B0B0AF
-AFAFAEAEADADADACACABABABAAAAA9A9A9A8A8A7A7A7A6A6A5A5A5A4A4A3A3A3A2A2A1A1A1A0A09F
-9F9F9E9E9D9D9D9C9C9B9B9B9A9A9999
->
-0
-1 %_Br
-[
-0 1 0.6 0 1 50 100 %_Bs
-0 0 1 0 1 50 0 %_Bs
-BD
-%AI5_EndGradient
-%AI5_BeginGradient: (Yellow & Blue Radial)
-(Yellow & Blue Radial) 1 2 Bd
-[
-<
-000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627
-28292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F
-505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F7071727374757677
-78797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9F
-A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7
-C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEF
-F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF
->
-<
-1415161718191A1B1C1D1E1F1F202122232425262728292A2A2B2C2D2E2F30313233343536363738
-393A3B3C3D3E3F40414142434445464748494A4B4C4D4D4E4F50515253545556575858595A5B5C5D
-5E5F60616263646465666768696A6B6C6D6E6F6F707172737475767778797A7B7B7C7D7E7F808182
-83848586868788898A8B8C8D8E8F90919292939495969798999A9B9C9D9D9E9FA0A1A2A3A4A5A6A7
-A8A9A9AAABACADAEAFB0B1B2B3B4B4B5B6B7B8B9BABBBCBDBEBFC0C0C1C2C3C4C5C6C7C8C9CACBCB
-CCCDCECFD0D1D2D3D4D5D6D7D7D8D9DADBDCDDDEDFE0E1E2E2E3E4E5E6E7E8E9EAEBECEDEEEEEFF0
-F1F2F3F4F5F6F7F8F9F9FAFBFCFDFEFF
->
-<
-ABAAAAA9A8A7A7A6A5A5A4A3A3A2A1A1A09F9F9E9D9D9C9B9B9A9999989797969595949393929191
-908F8F8E8D8D8C8B8B8A8989888787868585848383828181807F7F7E7D7D7C7B7B7A797978777776
-7575747373727171706F6F6E6D6D6C6B6B6A6969686767666565646362626160605F5E5E5D5C5C5B
-5A5A5958585756565554545352525150504F4E4E4D4C4C4B4A4A4948484746464544444342424140
-403F3E3E3D3C3C3B3A3A3938383736363534343332323130302F2E2E2D2C2C2B2A2A292828272626
-25242423222121201F1F1E1D1D1C1B1B1A1919181717161515141313121111100F0F0E0D0D0C0B0B
-0A090908070706050504030302010100
->
-0
-1 %_Br
-[
-0 0.08 0.67 0 1 50 14 %_Bs
-1 1 0 0 1 50 100 %_Bs
-BD
-%AI5_EndGradient
-%AI5_End_NonPrinting--
-%AI5_BeginPalette
-144 161 Pb
-Pn
-Pc
-1 g
-Pc
-0 g
-Pc
-0 0 0 0 k
-Pc
-0.75 g
-Pc
-0.5 g
-Pc
-0.25 g
-Pc
-0 g
-Pc
-Bb
-2 (Black & White) -4014 4716 0 0 1 0 0 1 0 0 Bg
-0 BB
-Pc
-0.25 0 0 0 k
-Pc
-0.5 0 0 0 k
-Pc
-0.75 0 0 0 k
-Pc
-1 0 0 0 k
-Pc
-0.25 0.25 0 0 k
-Pc
-0.5 0.5 0 0 k
-Pc
-0.75 0.75 0 0 k
-Pc
-1 1 0 0 k
-Pc
-Bb
-2 (Red & Yellow) -4014 4716 0 0 1 0 0 1 0 0 Bg
-0 BB
-Pc
-0 0.25 0 0 k
-Pc
-0 0.5 0 0 k
-Pc
-0 0.75 0 0 k
-Pc
-0 1 0 0 k
-Pc
-0 0.25 0.25 0 k
-Pc
-0 0.5 0.5 0 k
-Pc
-0 0.75 0.75 0 k
-Pc
-0 1 1 0 k
-Pc
-Bb
-0 0 0 0 Bh
-2 (Yellow & Blue Radial) -4014 4716 0 0 1 0 0 1 0 0 Bg
-0 BB
-Pc
-0 0 0.25 0 k
-Pc
-0 0 0.5 0 k
-Pc
-0 0 0.75 0 k
-Pc
-0 0 1 0 k
-Pc
-0.25 0 0.25 0 k
-Pc
-0.5 0 0.5 0 k
-Pc
-0.75 0 0.75 0 k
-Pc
-1 0 1 0 k
-Pc
-(Yellow Stripe) 0 0 1 1 0 0 0 0 0 [1 0 0 1 0 0] p
-Pc
-0.25 0.125 0 0 k
-Pc
-0.5 0.25 0 0 k
-Pc
-0.75 0.375 0 0 k
-Pc
-1 0.5 0 0 k
-Pc
-0.125 0.25 0 0 k
-Pc
-0.25 0.5 0 0 k
-Pc
-0.375 0.75 0 0 k
-Pc
-0.5 1 0 0 k
-Pc
-0.375 0.375 0.75 0 k
-Pc
-0 0.25 0.125 0 k
-Pc
-0 0.5 0.25 0 k
-Pc
-0 0.75 0.375 0 k
-Pc
-0 1 0.5 0 k
-Pc
-0 0.125 0.25 0 k
-Pc
-0 0.25 0.5 0 k
-Pc
-0 0.375 0.75 0 k
-Pc
-0 0.5 1 0 k
-Pc
-0 0.79 0.91 0 (PANTONE Warm Red CV) 0 x
-Pc
-0.125 0 0.25 0 k
-Pc
-0.25 0 0.5 0 k
-Pc
-0.375 0 0.75 0 k
-Pc
-0.5 0 1 0 k
-Pc
-0.25 0 0.125 0 k
-Pc
-0.5 0 0.25 0 k
-Pc
-0.75 0 0.375 0 k
-Pc
-1 0 0.5 0 k
-Pc
-0.5 1 0 0 k
-Pc
-0.25 0.125 0.125 0 k
-Pc
-0.5 0.25 0.25 0 k
-Pc
-0.75 0.375 0.375 0 k
-Pc
-1 0.5 0.5 0 k
-Pc
-0.25 0.25 0.125 0 k
-Pc
-0.5 0.5 0.25 0 k
-Pc
-0.75 0.75 0.375 0 k
-Pc
-1 1 0.5 0 k
-Pc
-0 1 0.5 0 k
-Pc
-0.125 0.25 0.125 0 k
-Pc
-0.25 0.5 0.25 0 k
-Pc
-0.375 0.75 0.375 0 k
-Pc
-0.5 1 0.5 0 k
-Pc
-0.125 0.25 0.25 0 k
-Pc
-0.25 0.5 0.5 0 k
-Pc
-0.375 0.75 0.75 0 k
-Pc
-0.5 1 1 0 k
-Pc
-0.75 0.75 0.375 0 k
-Pc
-0.125 0.125 0.25 0 k
-Pc
-0.25 0.25 0.5 0 k
-Pc
-0.375 0.375 0.75 0 k
-Pc
-0.5 0.5 1 0 k
-Pc
-0.25 0.125 0.25 0 k
-Pc
-0.5 0.25 0.5 0 k
-Pc
-0.75 0.375 0.75 0 k
-Pc
-1 0.5 1 0 k
-Pc
-0 0.79 0.91 0 (PANTONE Warm Red CV) 0 x
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-1 0.5 0.5 0 k
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-0 0.25 1 0 (Orange Yellow) 0 x
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-0 1 0.5 0 k
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-1 0 0.5 0 k
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-0 0.45 1 0 (Orange) 0 x
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-0.375 0.375 0.75 0 k
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-0 0.79 0.91 0 (PANTONE Warm Red CV) 0 x
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-1 0.65 0 0 k
-Pc
-0 0 0 0 k
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-Pc
-0 0 1 0 k
-Pc
-PB
-%AI5_EndPalette
-%%EndSetup
-%AI5_BeginLayer
-1 1 1 1 0 0 0 79 128 255 Lb
-(Layer 1) Ln
-0 A
-1 Ap
-0 O
-1 0.65 0 0 k
-800 Ar
-0 J 0 j 1 w 4 M []0 d
-%AI3_Note:
-0 D
-285.0121 311.7976 m
-357.5043 302.5199 L
-361.6071 392.7105 L
-376.3322 474.1377 L
-342.6527 475.6628 L
-327.6333 483.4165 L
-258.8269 486.3189 L
-254.4361 405.0427 L
-242.0523 312.2099 L
-285.0121 311.7976 L
-f
-0 0.79 0.91 0 k
-1.25 w
-295.4466 337.6172 m
-368.4943 335.3343 L
-363.9288 425.5026 L
-370.7771 507.9667 L
-337.1066 506.2547 L
-321.4128 512.5323 L
-252.6452 508.8228 L
-256.0692 427.5002 L
-252.6452 333.9077 L
-295.4466 337.6172 L
-f
-u
-0 Ap
-1 0.65 0 0 k
-1 w
-320.532 390.6149 m
-312.9017 388.534 l
-317.0637 398.5921 l
-321.2256 426.6854 l
-316.0232 427.7258 l
-322.2662 436.3965 l
-330.0436 465.6249 l
-316.3701 462.7557 l
-323.5798 475.9563 331.2311 484.5534 v
-321.2256 492.2363 l
-288.9913 478.0373 297.6622 431.9088 v
-290.9988 433.0755 l
-297.3888 384.7188 l
-291.9867 383.3315 l
-297.5214 372.0383 305.2714 366.6837 v
-305.9749 366.1976 295.5601 404.4882 306.6587 442.6395 c
-307.6992 440.2117 l
-298.855 399.5459 307.6992 366.6837 v
-308.1064 365.9033 312.5286 366.4235 v
-320.532 381.5106 320.532 390.6149 v
-f
-u
-*u
-1 g
-263.6948 355.9856 m
-265.2612 355.9856 L
-265.2612 359.2513 L
-265.9515 359.2513 266.6153 359.2513 267.2791 359.3575 c
-267.2791 355.9856 L
-269.6155 355.9856 L
-269.6155 355.3749 L
-267.2791 355.3749 L
-267.2791 347.2505 L
-267.2791 346.7726 267.2791 346.0558 268.288 346.0558 c
-268.9783 346.0558 269.35 346.5337 269.7748 347.0381 c
-270.1996 346.7461 L
-269.6951 345.7372 268.3942 345.1265 267.3322 345.1265 c
-265.4205 345.1265 265.2081 346.162 265.2081 347.4364 c
-265.2081 355.3749 L
-263.6948 355.3749 L
-263.6948 355.9856 l
-f
-*U
-*u
-285.7796 348.7639 m
-285.1689 346.8788 284.1069 345.2327 281.3457 345.1265 c
-277.2304 345.1265 275.9825 348.5515 275.9825 350.3835 c
-275.9825 355.1094 279.7792 356.2511 281.2926 356.2511 c
-283.0184 356.2511 285.461 355.4546 285.461 353.4102 c
-285.461 352.6934 285.0096 352.003 284.2662 352.003 c
-283.5494 352.003 283.0184 352.481 283.0184 353.2509 c
-283.0184 354.2864 283.868 354.4191 283.868 354.7112 c
-283.868 355.428 282.1953 355.7201 281.6112 355.7201 c
-279.0624 355.7201 278.3986 353.8616 278.3986 350.3835 c
-278.3986 348.7905 278.7969 347.5691 278.9562 347.1974 c
-279.3544 346.3213 280.1775 345.7637 281.5581 345.6841 c
-283.098 345.6044 284.5848 346.8523 285.222 348.7639 C
-285.7796 348.7639 l
-f
-*U
-*u
-291.9344 345.4717 m
-291.9344 346.0823 L
-293.9788 346.0823 L
-293.9788 363.1542 L
-291.9344 363.1542 L
-291.9344 363.7648 L
-293.0761 363.7648 L
-294.0585 363.7648 295.0939 363.8179 296.0497 364.0038 c
-296.0497 346.0823 L
-298.0941 346.0823 L
-298.0941 345.4717 L
-291.9344 345.4717 l
-f
-*U
-u
-310.0634 446.075 m
-305.3828 425.2059 306.7298 391.3708 v
-307.1338 381.222 308.2436 371.8929 309.5993 363.8029 C
-309.6066 363.8025 L
-310.4883 356.6987 311.0781 354.1272 313.3768 345.5676 C
-313.2426 340.0473 L
-294.8367 398.8155 310.0634 446.075 V
-f
-321.3622 464.1699 m
-325.5016 466.2317 331.4359 466.9819 v
-337.9224 455.0924 321.9584 434.793 v
-331.4821 456.0522 329.2358 462.7122 v
-326.7243 464.2727 321.3622 464.1699 v
-f
-319.4002 428.4819 m
-323.1177 427.6214 324.9024 429.0668 v
-321.386 415.3445 322.3077 407.7964 v
-323.2297 400.2483 316.5788 395.4159 y
-322.2441 402.584 320.4635 408.4226 v
-319.2289 412.4694 320.6101 422.8271 322.1681 426.1155 c
-320.7131 426.3196 319.4002 428.4819 v
-f
-315.7246 392.3281 m
-321.8677 393.0631 322.5131 396.1662 v
-323.265 377.6058 314.7299 369.9571 v
-321.2425 380.1152 320.2206 390.6235 v
-315.7246 392.3281 l
-f
-298.4445 384.6023 m
-296.4635 382.3836 290.5192 387.2778 v
-292.4131 374.803 304.1781 369.0924 v
-296.0814 375.1928 293.9 381.7824 v
-296.7611 382.6245 298.4445 384.6023 v
-f
-296.5483 389.3335 m
-288.5102 409.7356 290.2325 437.3036 v
-292.1098 432.3112 298.1424 430.5604 v
-295.3003 429.9794 293.6387 430.2313 v
-289.4335 418.5932 296.5483 389.3335 v
-f
-330.3126 484.1353 m
-327.3003 506.2722 308.4549 483.8853 v
-293.4491 466.0592 295.2373 450.9247 296.1578 442.4811 c
-296.3932 440.3206 293.366 465.0316 309.8067 481.2933 c
-326.2471 497.5553 329.9609 485.0794 330.3126 484.1353 c
-f
-U
-0 0 1 0 k
-302.5528 503.0164 m
-287.7656 507.2395 283.0593 458.227 v
-279.4282 473.3549 288.8204 494.7509 v
-298.2122 516.1468 302.5528 503.0164 y
-f
-284.2076 506.5994 m
-276.6655 495.2557 278.3767 483.1729 v
-272.6565 505.9183 284.2076 506.5994 v
-f
-339.7135 474.7902 m
-348.6321 478.0799 335.8615 444.8834 v
-342.4718 454.5848 346.6326 469.8253 v
-349.303 479.6062 339.7135 474.7902 y
-f
-354.1382 477.3767 m
-360.4435 471.669 355.9752 464.1187 v
-367.1908 475.904 354.1382 477.3767 v
-f
-U
-U
-*u
-1 g
-258.2029 317.4593 m
-256.6821 317.4593 L
-256.6821 325.2598 L
-258.7512 325.2598 L
-260.3858 325.2598 261.4514 324.608 261.4514 322.839 c
-261.4514 321.1837 260.5513 320.3767 258.9581 320.3767 c
-258.2029 320.3767 L
-258.2029 317.4593 l
-f
-1 D
-258.2029 321.6389 m
-258.5132 321.6389 L
-259.4133 321.6389 259.8995 321.8354 259.8995 322.8493 c
-259.8995 323.8528 259.3202 323.9976 258.4719 323.9976 c
-258.2029 323.9976 L
-258.2029 321.6389 l
-f
-*U
-*u
-0 D
-269.0694 321.3699 m
-269.0694 323.5528 270.6523 325.4667 272.9283 325.4667 c
-275.2043 325.4667 276.7871 323.5528 276.7871 321.3699 c
-276.7871 319.1353 275.2043 317.2524 272.9283 317.2524 c
-270.6523 317.2524 269.0694 319.1353 269.0694 321.3699 c
-f
-1 D
-270.6419 321.432 m
-270.6419 320.2526 271.6351 318.7525 272.9283 318.7525 c
-274.2215 318.7525 275.2146 320.2526 275.2146 321.432 c
-275.2146 322.6941 274.2628 323.9666 272.9283 323.9666 c
-271.5937 323.9666 270.6419 322.6941 270.6419 321.432 c
-f
-*U
-*u
-0 D
-287.2943 319.9422 m
-287.315 319.9422 L
-288.8668 325.3632 L
-289.7668 325.3632 L
-291.3807 319.9422 L
-291.4014 319.9422 L
-292.9326 325.2598 L
-294.5258 325.2598 L
-291.8877 317.3041 L
-290.7704 317.3041 L
-289.2185 322.4044 L
-289.1978 322.4044 L
-287.7288 317.3041 L
-286.6115 317.3041 L
-284.1286 325.2598 L
-285.7218 325.2598 L
-287.2943 319.9422 l
-f
-*U
-*u
-303.7595 323.9356 m
-303.7595 322.2182 L
-306.1803 322.2182 L
-306.1803 320.894 L
-303.7595 320.894 L
-303.7595 318.7835 L
-306.2734 318.7835 L
-306.2734 317.4593 L
-302.2387 317.4593 L
-302.2387 325.2598 L
-306.2734 325.2598 L
-306.2734 323.9356 L
-303.7595 323.9356 l
-f
-*U
-*u
-319.8602 317.4593 m
-318.0187 317.4593 L
-316.1255 320.6043 L
-316.1048 320.6043 L
-316.1048 317.4593 L
-314.5841 317.4593 L
-314.5841 325.2598 L
-316.6428 325.2598 L
-318.1843 325.2598 319.2499 324.577 319.2499 322.9114 c
-319.2499 321.9182 318.7015 320.925 317.6567 320.7492 C
-319.8602 317.4593 l
-f
-1 D
-316.1048 321.6699 m
-316.3014 321.6699 L
-317.1394 321.6699 317.7291 321.9182 317.7291 322.87 c
-317.7291 323.8321 317.1187 324.0183 316.3117 324.0183 c
-316.1048 324.0183 L
-316.1048 321.6699 l
-f
-*U
-*u
-0 D
-329.1754 323.9356 m
-329.1754 322.2182 L
-331.5962 322.2182 L
-331.5962 320.894 L
-329.1754 320.894 L
-329.1754 318.7835 L
-331.6894 318.7835 L
-331.6894 317.4593 L
-327.6546 317.4593 L
-327.6546 325.2598 L
-331.6894 325.2598 L
-331.6894 323.9356 L
-329.1754 323.9356 l
-f
-*U
-*u
-340 325.2598 m
-342.1725 325.2598 L
-344.4279 325.2598 345.9383 323.5735 345.9383 321.3492 c
-345.9383 319.156 344.3865 317.4593 342.1622 317.4593 c
-340 317.4593 L
-340 325.2598 l
-f
-1 D
-341.5208 318.7835 m
-341.7691 318.7835 L
-343.6416 318.7835 344.3658 319.8181 344.3658 321.3596 c
-344.3658 323.0562 343.4968 323.9356 341.7691 323.9356 c
-341.5208 323.9356 L
-341.5208 318.7835 l
-f
-*U
-LB
-%AI5_EndLayer--
-%%PageTrailer
-gsave annotatepage grestore showpage
-%%Trailer
-Adobe_IllustratorA_AI5 /terminate get exec
-Adobe_level2_AI5 /terminate get exec
-%%EOF
diff --git a/tk8.6/library/images/pwrdLogo100.gif b/tk8.6/library/images/pwrdLogo100.gif
deleted file mode 100644
index d2f8cbb..0000000
--- a/tk8.6/library/images/pwrdLogo100.gif
+++ /dev/null
diff --git a/tk8.6/library/images/pwrdLogo150.gif b/tk8.6/library/images/pwrdLogo150.gif
deleted file mode 100644
index 89eec7c..0000000
--- a/tk8.6/library/images/pwrdLogo150.gif
+++ /dev/null
diff --git a/tk8.6/library/images/pwrdLogo175.gif b/tk8.6/library/images/pwrdLogo175.gif
deleted file mode 100644
index 02dcd92..0000000
--- a/tk8.6/library/images/pwrdLogo175.gif
+++ /dev/null
diff --git a/tk8.6/library/images/pwrdLogo200.gif b/tk8.6/library/images/pwrdLogo200.gif
deleted file mode 100644
index 66426bf..0000000
--- a/tk8.6/library/images/pwrdLogo200.gif
+++ /dev/null
diff --git a/tk8.6/library/images/pwrdLogo75.gif b/tk8.6/library/images/pwrdLogo75.gif
deleted file mode 100644
index e75925c..0000000
--- a/tk8.6/library/images/pwrdLogo75.gif
+++ /dev/null
diff --git a/tk8.6/library/images/tai-ku.gif b/tk8.6/library/images/tai-ku.gif
deleted file mode 100644
index a5aea47..0000000
--- a/tk8.6/library/images/tai-ku.gif
+++ /dev/null
diff --git a/tk8.6/library/listbox.tcl b/tk8.6/library/listbox.tcl
deleted file mode 100644
index 17c03c0..0000000
--- a/tk8.6/library/listbox.tcl
+++ /dev/null
@@ -1,552 +0,0 @@
-# listbox.tcl --
-#
-# This file defines the default bindings for Tk listbox widgets
-# and provides procedures that help in implementing those bindings.
-#
-# Copyright (c) 1994 The Regents of the University of California.
-# Copyright (c) 1994-1995 Sun Microsystems, Inc.
-# Copyright (c) 1998 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-
-#--------------------------------------------------------------------------
-# tk::Priv elements used in this file:
-#
-# afterId -		Token returned by "after" for autoscanning.
-# listboxPrev -		The last element to be selected or deselected
-#			during a selection operation.
-# listboxSelection -	All of the items that were selected before the
-#			current selection operation (such as a mouse
-#			drag) started;  used to cancel an operation.
-#--------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------
-# The code below creates the default class bindings for listboxes.
-#-------------------------------------------------------------------------
-
-# Note: the check for existence of %W below is because this binding
-# is sometimes invoked after a window has been deleted (e.g. because
-# there is a double-click binding on the widget that deletes it).  Users
-# can put "break"s in their bindings to avoid the error, but this check
-# makes that unnecessary.
-
-bind Listbox <1> {
-    if {[winfo exists %W]} {
-	tk::ListboxBeginSelect %W [%W index @%x,%y] 1
-    }
-}
-
-# Ignore double clicks so that users can define their own behaviors.
-# Among other things, this prevents errors if the user deletes the
-# listbox on a double click.
-
-bind Listbox <Double-1> {
-    # Empty script
-}
-
-bind Listbox <B1-Motion> {
-    set tk::Priv(x) %x
-    set tk::Priv(y) %y
-    tk::ListboxMotion %W [%W index @%x,%y]
-}
-bind Listbox <ButtonRelease-1> {
-    tk::CancelRepeat
-    %W activate @%x,%y
-}
-bind Listbox <Shift-1> {
-    tk::ListboxBeginExtend %W [%W index @%x,%y]
-}
-bind Listbox <Control-1> {
-    tk::ListboxBeginToggle %W [%W index @%x,%y]
-}
-bind Listbox <B1-Leave> {
-    set tk::Priv(x) %x
-    set tk::Priv(y) %y
-    tk::ListboxAutoScan %W
-}
-bind Listbox <B1-Enter> {
-    tk::CancelRepeat
-}
-
-bind Listbox <<PrevLine>> {
-    tk::ListboxUpDown %W -1
-}
-bind Listbox <<SelectPrevLine>> {
-    tk::ListboxExtendUpDown %W -1
-}
-bind Listbox <<NextLine>> {
-    tk::ListboxUpDown %W 1
-}
-bind Listbox <<SelectNextLine>> {
-    tk::ListboxExtendUpDown %W 1
-}
-bind Listbox <<PrevChar>> {
-    %W xview scroll -1 units
-}
-bind Listbox <<PrevWord>> {
-    %W xview scroll -1 pages
-}
-bind Listbox <<NextChar>> {
-    %W xview scroll 1 units
-}
-bind Listbox <<NextWord>> {
-    %W xview scroll 1 pages
-}
-bind Listbox <Prior> {
-    %W yview scroll -1 pages
-    %W activate @0,0
-}
-bind Listbox <Next> {
-    %W yview scroll 1 pages
-    %W activate @0,0
-}
-bind Listbox <Control-Prior> {
-    %W xview scroll -1 pages
-}
-bind Listbox <Control-Next> {
-    %W xview scroll 1 pages
-}
-bind Listbox <<LineStart>> {
-    %W xview moveto 0
-}
-bind Listbox <<LineEnd>> {
-    %W xview moveto 1
-}
-bind Listbox <Control-Home> {
-    %W activate 0
-    %W see 0
-    %W selection clear 0 end
-    %W selection set 0
-    tk::FireListboxSelectEvent %W
-}
-bind Listbox <Control-Shift-Home> {
-    tk::ListboxDataExtend %W 0
-}
-bind Listbox <Control-End> {
-    %W activate end
-    %W see end
-    %W selection clear 0 end
-    %W selection set end
-    tk::FireListboxSelectEvent %W
-}
-bind Listbox <Control-Shift-End> {
-    tk::ListboxDataExtend %W [%W index end]
-}
-bind Listbox <<Copy>> {
-    if {[selection own -displayof %W] eq "%W"} {
-	clipboard clear -displayof %W
-	clipboard append -displayof %W [selection get -displayof %W]
-    }
-}
-bind Listbox <space> {
-    tk::ListboxBeginSelect %W [%W index active]
-}
-bind Listbox <<Invoke>> {
-    tk::ListboxBeginSelect %W [%W index active]
-}
-bind Listbox <Select> {
-    tk::ListboxBeginSelect %W [%W index active]
-}
-bind Listbox <Control-Shift-space> {
-    tk::ListboxBeginExtend %W [%W index active]
-}
-bind Listbox <Shift-Select> {
-    tk::ListboxBeginExtend %W [%W index active]
-}
-bind Listbox <Escape> {
-    tk::ListboxCancel %W
-}
-bind Listbox <<SelectAll>> {
-    tk::ListboxSelectAll %W
-}
-bind Listbox <<SelectNone>> {
-    if {[%W cget -selectmode] ne "browse"} {
-	%W selection clear 0 end
-        tk::FireListboxSelectEvent %W
-    }
-}
-
-# Additional Tk bindings that aren't part of the Motif look and feel:
-
-bind Listbox <2> {
-    %W scan mark %x %y
-}
-bind Listbox <B2-Motion> {
-    %W scan dragto %x %y
-}
-
-# The MouseWheel will typically only fire on Windows and Mac OS X.
-# However, someone could use the "event generate" command to produce
-# one on other platforms.
-
-if {[tk windowingsystem] eq "aqua"} {
-    bind Listbox <MouseWheel> {
-        %W yview scroll [expr {- (%D)}] units
-    }
-    bind Listbox <Option-MouseWheel> {
-        %W yview scroll [expr {-10 * (%D)}] units
-    }
-    bind Listbox <Shift-MouseWheel> {
-        %W xview scroll [expr {- (%D)}] units
-    }
-    bind Listbox <Shift-Option-MouseWheel> {
-        %W xview scroll [expr {-10 * (%D)}] units
-    }
-} else {
-    bind Listbox <MouseWheel> {
-        %W yview scroll [expr {- (%D / 120) * 4}] units
-    }
-    bind Listbox <Shift-MouseWheel> {
-        %W xview scroll [expr {- (%D / 120) * 4}] units
-    }
-}
-
-if {"x11" eq [tk windowingsystem]} {
-    # Support for mousewheels on Linux/Unix commonly comes through mapping
-    # the wheel to the extended buttons.  If you have a mousewheel, find
-    # Linux configuration info at:
-    #	http://www.inria.fr/koala/colas/mouse-wheel-scroll/
-    bind Listbox <4> {
-	if {!$tk_strictMotif} {
-	    %W yview scroll -5 units
-	}
-    }
-    bind Listbox <Shift-4> {
-	if {!$tk_strictMotif} {
-	    %W xview scroll -5 units
-	}
-    }
-    bind Listbox <5> {
-	if {!$tk_strictMotif} {
-	    %W yview scroll 5 units
-	}
-    }
-    bind Listbox <Shift-5> {
-	if {!$tk_strictMotif} {
-	    %W xview scroll 5 units
-	}
-    }
-}
-
-# ::tk::ListboxBeginSelect --
-#
-# This procedure is typically invoked on button-1 presses.  It begins
-# the process of making a selection in the listbox.  Its exact behavior
-# depends on the selection mode currently in effect for the listbox;
-# see the Motif documentation for details.
-#
-# Arguments:
-# w -		The listbox widget.
-# el -		The element for the selection operation (typically the
-#		one under the pointer).  Must be in numerical form.
-
-proc ::tk::ListboxBeginSelect {w el {focus 1}} {
-    variable ::tk::Priv
-    if {[$w cget -selectmode] eq "multiple"} {
-	if {[$w selection includes $el]} {
-	    $w selection clear $el
-	} else {
-	    $w selection set $el
-	}
-    } else {
-	$w selection clear 0 end
-	$w selection set $el
-	$w selection anchor $el
-	set Priv(listboxSelection) {}
-	set Priv(listboxPrev) $el
-    }
-    tk::FireListboxSelectEvent $w
-    # check existence as ListboxSelect may destroy us
-    if {$focus && [winfo exists $w] && [$w cget -state] eq "normal"} {
-	focus $w
-    }
-}
-
-# ::tk::ListboxMotion --
-#
-# This procedure is called to process mouse motion events while
-# button 1 is down.  It may move or extend the selection, depending
-# on the listbox's selection mode.
-#
-# Arguments:
-# w -		The listbox widget.
-# el -		The element under the pointer (must be a number).
-
-proc ::tk::ListboxMotion {w el} {
-    variable ::tk::Priv
-    if {$el == $Priv(listboxPrev)} {
-	return
-    }
-    set anchor [$w index anchor]
-    switch [$w cget -selectmode] {
-	browse {
-	    $w selection clear 0 end
-	    $w selection set $el
-	    set Priv(listboxPrev) $el
-	    tk::FireListboxSelectEvent $w
-	}
-	extended {
-	    set i $Priv(listboxPrev)
-	    if {$i eq ""} {
-		set i $el
-		$w selection set $el
-	    }
-	    if {[$w selection includes anchor]} {
-		$w selection clear $i $el
-		$w selection set anchor $el
-	    } else {
-		$w selection clear $i $el
-		$w selection clear anchor $el
-	    }
-	    if {![info exists Priv(listboxSelection)]} {
-		set Priv(listboxSelection) [$w curselection]
-	    }
-	    while {($i < $el) && ($i < $anchor)} {
-		if {[lsearch $Priv(listboxSelection) $i] >= 0} {
-		    $w selection set $i
-		}
-		incr i
-	    }
-	    while {($i > $el) && ($i > $anchor)} {
-		if {[lsearch $Priv(listboxSelection) $i] >= 0} {
-		    $w selection set $i
-		}
-		incr i -1
-	    }
-	    set Priv(listboxPrev) $el
-	    tk::FireListboxSelectEvent $w
-	}
-    }
-}
-
-# ::tk::ListboxBeginExtend --
-#
-# This procedure is typically invoked on shift-button-1 presses.  It
-# begins the process of extending a selection in the listbox.  Its
-# exact behavior depends on the selection mode currently in effect
-# for the listbox;  see the Motif documentation for details.
-#
-# Arguments:
-# w -		The listbox widget.
-# el -		The element for the selection operation (typically the
-#		one under the pointer).  Must be in numerical form.
-
-proc ::tk::ListboxBeginExtend {w el} {
-    if {[$w cget -selectmode] eq "extended"} {
-	if {[$w selection includes anchor]} {
-	    ListboxMotion $w $el
-	} else {
-	    # No selection yet; simulate the begin-select operation.
-	    ListboxBeginSelect $w $el
-	}
-    }
-}
-
-# ::tk::ListboxBeginToggle --
-#
-# This procedure is typically invoked on control-button-1 presses.  It
-# begins the process of toggling a selection in the listbox.  Its
-# exact behavior depends on the selection mode currently in effect
-# for the listbox;  see the Motif documentation for details.
-#
-# Arguments:
-# w -		The listbox widget.
-# el -		The element for the selection operation (typically the
-#		one under the pointer).  Must be in numerical form.
-
-proc ::tk::ListboxBeginToggle {w el} {
-    variable ::tk::Priv
-    if {[$w cget -selectmode] eq "extended"} {
-	set Priv(listboxSelection) [$w curselection]
-	set Priv(listboxPrev) $el
-	$w selection anchor $el
-	if {[$w selection includes $el]} {
-	    $w selection clear $el
-	} else {
-	    $w selection set $el
-	}
-	tk::FireListboxSelectEvent $w
-    }
-}
-
-# ::tk::ListboxAutoScan --
-# This procedure is invoked when the mouse leaves an entry window
-# with button 1 down.  It scrolls the window up, down, left, or
-# right, depending on where the mouse left the window, and reschedules
-# itself as an "after" command so that the window continues to scroll until
-# the mouse moves back into the window or the mouse button is released.
-#
-# Arguments:
-# w -		The entry window.
-
-proc ::tk::ListboxAutoScan {w} {
-    variable ::tk::Priv
-    if {![winfo exists $w]} return
-    set x $Priv(x)
-    set y $Priv(y)
-    if {$y >= [winfo height $w]} {
-	$w yview scroll 1 units
-    } elseif {$y < 0} {
-	$w yview scroll -1 units
-    } elseif {$x >= [winfo width $w]} {
-	$w xview scroll 2 units
-    } elseif {$x < 0} {
-	$w xview scroll -2 units
-    } else {
-	return
-    }
-    ListboxMotion $w [$w index @$x,$y]
-    set Priv(afterId) [after 50 [list tk::ListboxAutoScan $w]]
-}
-
-# ::tk::ListboxUpDown --
-#
-# Moves the location cursor (active element) up or down by one element,
-# and changes the selection if we're in browse or extended selection
-# mode.
-#
-# Arguments:
-# w -		The listbox widget.
-# amount -	+1 to move down one item, -1 to move back one item.
-
-proc ::tk::ListboxUpDown {w amount} {
-    variable ::tk::Priv
-    $w activate [expr {[$w index active] + $amount}]
-    $w see active
-    switch [$w cget -selectmode] {
-	browse {
-	    $w selection clear 0 end
-	    $w selection set active
-	    tk::FireListboxSelectEvent $w
-	}
-	extended {
-	    $w selection clear 0 end
-	    $w selection set active
-	    $w selection anchor active
-	    set Priv(listboxPrev) [$w index active]
-	    set Priv(listboxSelection) {}
-	    tk::FireListboxSelectEvent $w
-	}
-    }
-}
-
-# ::tk::ListboxExtendUpDown --
-#
-# Does nothing unless we're in extended selection mode;  in this
-# case it moves the location cursor (active element) up or down by
-# one element, and extends the selection to that point.
-#
-# Arguments:
-# w -		The listbox widget.
-# amount -	+1 to move down one item, -1 to move back one item.
-
-proc ::tk::ListboxExtendUpDown {w amount} {
-    variable ::tk::Priv
-    if {[$w cget -selectmode] ne "extended"} {
-	return
-    }
-    set active [$w index active]
-    if {![info exists Priv(listboxSelection)]} {
-	$w selection set $active
-	set Priv(listboxSelection) [$w curselection]
-    }
-    $w activate [expr {$active + $amount}]
-    $w see active
-    ListboxMotion $w [$w index active]
-}
-
-# ::tk::ListboxDataExtend
-#
-# This procedure is called for key-presses such as Shift-KEndData.
-# If the selection mode isn't multiple or extend then it does nothing.
-# Otherwise it moves the active element to el and, if we're in
-# extended mode, extends the selection to that point.
-#
-# Arguments:
-# w -		The listbox widget.
-# el -		An integer element number.
-
-proc ::tk::ListboxDataExtend {w el} {
-    set mode [$w cget -selectmode]
-    if {$mode eq "extended"} {
-	$w activate $el
-	$w see $el
-        if {[$w selection includes anchor]} {
-	    ListboxMotion $w $el
-	}
-    } elseif {$mode eq "multiple"} {
-	$w activate $el
-	$w see $el
-    }
-}
-
-# ::tk::ListboxCancel
-#
-# This procedure is invoked to cancel an extended selection in
-# progress.  If there is an extended selection in progress, it
-# restores all of the items between the active one and the anchor
-# to their previous selection state.
-#
-# Arguments:
-# w -		The listbox widget.
-
-proc ::tk::ListboxCancel w {
-    variable ::tk::Priv
-    if {[$w cget -selectmode] ne "extended"} {
-	return
-    }
-    set first [$w index anchor]
-    set last $Priv(listboxPrev)
-    if {$last eq ""} {
-	# Not actually doing any selection right now
-	return
-    }
-    if {$first > $last} {
-	set tmp $first
-	set first $last
-	set last $tmp
-    }
-    $w selection clear $first $last
-    while {$first <= $last} {
-	if {[lsearch $Priv(listboxSelection) $first] >= 0} {
-	    $w selection set $first
-	}
-	incr first
-    }
-    tk::FireListboxSelectEvent $w
-}
-
-# ::tk::ListboxSelectAll
-#
-# This procedure is invoked to handle the "select all" operation.
-# For single and browse mode, it just selects the active element.
-# Otherwise it selects everything in the widget.
-#
-# Arguments:
-# w -		The listbox widget.
-
-proc ::tk::ListboxSelectAll w {
-    set mode [$w cget -selectmode]
-    if {$mode eq "single" || $mode eq "browse"} {
-	$w selection clear 0 end
-	$w selection set active
-    } else {
-	$w selection set 0 end
-    }
-    tk::FireListboxSelectEvent $w
-}
-
-# ::tk::FireListboxSelectEvent
-#
-# Fire the <<ListboxSelect>> event if the listbox is not in disabled
-# state.
-#
-# Arguments:
-# w -		The listbox widget.
-
-proc ::tk::FireListboxSelectEvent w {
-    if {[$w cget -state] eq "normal"} {
-        event generate $w <<ListboxSelect>>
-    }
-}
diff --git a/tk8.6/library/megawidget.tcl b/tk8.6/library/megawidget.tcl
deleted file mode 100644
index aeb1263..0000000
--- a/tk8.6/library/megawidget.tcl
+++ /dev/null
@@ -1,297 +0,0 @@
-# megawidget.tcl
-#
-#	Basic megawidget support classes. Experimental for any use other than
-#	the ::tk::IconList megawdget, which is itself only designed for use in
-#	the Unix file dialogs.
-#
-# Copyright (c) 2009-2010 Donal K. Fellows
-#
-# See the file "license.terms" for information on usage and redistribution of
-# this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-package require Tk 8.6
-
-::oo::class create ::tk::Megawidget {
-    superclass ::oo::class
-    method unknown {w args} {
-	if {[string match .* $w]} {
-	    [self] create $w {*}$args
-	    return $w
-	}
-	next $w {*}$args
-    }
-    unexport new unknown
-    self method create {name superclasses body} {
-	next $name [list \
-		superclass ::tk::MegawidgetClass {*}$superclasses]\;$body
-    }
-}
-
-::oo::class create ::tk::MegawidgetClass {
-    variable w hull options IdleCallbacks
-    constructor args {
-	# Extract the "widget name" from the object name
-	set w [namespace tail [self]]
-
-	# Configure things
-	tclParseConfigSpec [my varname options] [my GetSpecs] "" $args
-
-	# Move the object out of the way of the hull widget
-	rename [self] _tmp
-
-	# Make the hull widget(s)
-	my CreateHull
-	bind $hull <Destroy> [list [namespace which my] destroy]
-
-	# Rename things into their final places
-	rename ::$w theWidget
-	rename [self] ::$w
-
-	# Make the contents
-	my Create
-    }
-    destructor {
-	foreach {name cb} [array get IdleCallbacks] {
-	    after cancel $cb
-	    unset IdleCallbacks($name)
-	}
-	if {[winfo exists $w]} {
-	    bind $hull <Destroy> {}
-	    destroy $w
-	}
-    }
-
-    ####################################################################
-    #
-    # MegawidgetClass::configure --
-    #
-    #	Implementation of 'configure' for megawidgets. Emulates the operation
-    #	of the standard Tk configure method fairly closely, which makes things
-    #	substantially more complex than they otherwise would be.
-    #
-    #	This method assumes that the 'GetSpecs' method returns a description
-    #	of all the specifications of the options (i.e., as Tk returns except
-    #	with the actual values removed). It also assumes that the 'options'
-    #	array in the class holds all options; it is up to subclasses to set
-    #	traces on that array if they want to respond to configuration changes.
-    #
-    #	TODO: allow unambiguous abbreviations.
-    #
-    method configure args {
-	# Configure behaves differently depending on the number of arguments
-	set argc [llength $args]
-	if {$argc == 0} {
-	    return [lmap spec [my GetSpecs] {
-		lappend spec $options([lindex $spec 0])
-	    }]
-	} elseif {$argc == 1} {
-	    set opt [lindex $args 0]
-	    if {[info exists options($opt)]} {
-		set spec [lsearch -inline -index 0 -exact [my GetSpecs] $opt]
-		return [linsert $spec end $options($opt)]
-	    }
-	} elseif {$argc == 2} {
-	    # Special case for where we're setting a single option. This
-	    # avoids some of the costly operations. We still do the [array
-	    # get] as this gives a sufficiently-consistent trace.
-	    set opt [lindex $args 0]
-	    if {[dict exists [array get options] $opt]} {
-		# Actually set the new value of the option. Use a catch to
-		# allow a megawidget user to throw an error from a write trace
-		# on the options array to reject invalid values.
-		try {
-		    array set options $args
-		} on error {ret info} {
-		    # Rethrow the error to get a clean stack trace
-		    return -code error -errorcode [dict get $info -errorcode] $ret
-		}
-		return
-	    }
-	} elseif {$argc % 2 == 0} {
-	    # Check that all specified options exist. Any unknown option will
-	    # cause the merged dictionary to be bigger than the options array
-	    set merge [dict merge [array get options] $args]
-	    if {[dict size $merge] == [array size options]} {
-		# Actually set the new values of the options. Use a catch to
-		# allow a megawidget user to throw an error from a write trace
-		# on the options array to reject invalid values
-		try {
-		    array set options $args
-		} on error {ret info} {
-		    # Rethrow the error to get a clean stack trace
-		    return -code error -errorcode [dict get $info -errorcode] $ret
-		}
-		return
-	    }
-	    # Due to the order of the merge, the unknown options will be at
-	    # the end of the dict. This makes the first unknown option easy to
-	    # find.
-	    set opt [lindex [dict keys $merge] [array size options]]
-	} else {
-	    set opt [lindex $args end]
-	    return -code error -errorcode [list TK VALUE_MISSING] \
-		"value for \"$opt\" missing"
-	}
-	return -code error -errorcode [list TK LOOKUP OPTION $opt] \
-	    "bad option \"$opt\": must be [tclListValidFlags options]"
-    }
-
-    ####################################################################
-    #
-    # MegawidgetClass::cget --
-    #
-    #	Implementation of 'cget' for megawidgets. Emulates the operation of
-    #	the standard Tk cget method fairly closely.
-    #
-    #	This method assumes that the 'options' array in the class holds all
-    #	options; it is up to subclasses to set traces on that array if they
-    #	want to respond to configuration reads.
-    #
-    #	TODO: allow unambiguous abbreviations.
-    #
-    method cget option {
-	return $options($option)
-    }
-
-    ####################################################################
-    #
-    # MegawidgetClass::TraceOption --
-    #
-    #	Sets up the tracing of an element of the options variable.
-    #
-    method TraceOption {option method args} {
-	set callback [list my $method {*}$args]
-	trace add variable options($option) write [namespace code $callback]
-    }
-
-    ####################################################################
-    #
-    # MegawidgetClass::GetSpecs --
-    #
-    #	Return a list of descriptions of options supported by this
-    #	megawidget. Each option is described by the 4-tuple list, consisting
-    #	of the name of the option, the "option database" name, the "option
-    #	database" class-name, and the default value of the option. These are
-    #	the same values returned by calling the configure method of a widget,
-    #	except without the current values of the options.
-    #
-    method GetSpecs {} {
-	return {
-	    {-takefocus takeFocus TakeFocus {}}
-	}
-    }
-
-    ####################################################################
-    #
-    # MegawidgetClass::CreateHull --
-    #
-    #	Creates the real main widget of the megawidget. This is often a frame
-    #	or toplevel widget, but isn't always (lightweight megawidgets might
-    #	use a content widget directly).
-    #
-    #	The name of the hull widget is given by the 'w' instance variable. The
-    #	name should be written into the 'hull' instance variable. The command
-    #	created by this method will be renamed.
-    #
-    method CreateHull {} {
-	return -code error -errorcode {TCL OO ABSTRACT_METHOD} \
-	    "method must be overridden"
-    }
-
-    ####################################################################
-    #
-    # MegawidgetClass::Create --
-    #
-    #	Creates the content of the megawidget. The name of the widget to
-    #	create the content in will be in the 'hull' instance variable.
-    #
-    method Create {} {
-	return -code error -errorcode {TCL OO ABSTRACT_METHOD} \
-	    "method must be overridden"
-    }
-
-    ####################################################################
-    #
-    # MegawidgetClass::WhenIdle --
-    #
-    #	Arrange for a method to be called on the current instance when Tk is
-    #	idle. Only one such method call per method will be queued; subsequent
-    #	queuing actions before the callback fires will be silently ignored.
-    #	The additional args will be passed to the callback, and the callbacks
-    #	will be properly cancelled if the widget is destroyed.
-    #
-    method WhenIdle {method args} {
-	if {![info exists IdleCallbacks($method)]} {
-	    set IdleCallbacks($method) [after idle [list \
-		    [namespace which my] DoWhenIdle $method $args]]
-	}
-    }
-    method DoWhenIdle {method arguments} {
-	unset IdleCallbacks($method)
-	tailcall my $method {*}$arguments
-    }
-}
-
-####################################################################
-#
-# tk::SimpleWidget --
-#
-#	Simple megawidget class that makes it easy create widgets that behave
-#	like a ttk widget. It creates the hull as a ttk::frame and maps the
-#	state manipulation methods of the overall megawidget to the equivalent
-#	operations on the ttk::frame.
-#
-::tk::Megawidget create ::tk::SimpleWidget {} {
-    variable w hull options
-    method GetSpecs {} {
-	return {
-	    {-cursor cursor Cursor {}}
-	    {-takefocus takeFocus TakeFocus {}}
-	}
-    }
-    method CreateHull {} {
-	set hull [::ttk::frame $w -cursor $options(-cursor)]
-	my TraceOption -cursor UpdateCursorOption
-    }
-    method UpdateCursorOption args {
-	$hull configure -cursor $options(-cursor)
-    }
-    # Not fixed names, so can't forward
-    method state args {
-	tailcall $hull state {*}$args
-    }
-    method instate args {
-	tailcall $hull instate {*}$args
-    }
-}
-
-####################################################################
-#
-# tk::FocusableWidget --
-#
-#	Simple megawidget class that makes a ttk-like widget that has a focus
-#	ring.
-#
-::tk::Megawidget create ::tk::FocusableWidget ::tk::SimpleWidget {
-    variable w hull options
-    method GetSpecs {} {
-	return {
-	    {-cursor cursor Cursor {}}
-	    {-takefocus takeFocus TakeFocus ::ttk::takefocus}
-	}
-    }
-    method CreateHull {} {
-	ttk::frame $w
-	set hull [ttk::entry $w.cHull -takefocus 0 -cursor $options(-cursor)]
-	pack $hull -expand yes -fill both -ipadx 2 -ipady 2
-	my TraceOption -cursor UpdateCursorOption
-    }
-}
-
-return
-
-# Local Variables:
-# mode: tcl
-# fill-column: 78
-# End:
diff --git a/tk8.6/library/menu.tcl b/tk8.6/library/menu.tcl
deleted file mode 100644
index e1c94c9..0000000
--- a/tk8.6/library/menu.tcl
+++ /dev/null
@@ -1,1354 +0,0 @@
-# menu.tcl --
-#
-# This file defines the default bindings for Tk menus and menubuttons.
-# It also implements keyboard traversal of menus and implements a few
-# other utility procedures related to menus.
-#
-# Copyright (c) 1992-1994 The Regents of the University of California.
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-# Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net>
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-#-------------------------------------------------------------------------
-# Elements of tk::Priv that are used in this file:
-#
-# cursor -		Saves the -cursor option for the posted menubutton.
-# focus -		Saves the focus during a menu selection operation.
-#			Focus gets restored here when the menu is unposted.
-# grabGlobal -		Used in conjunction with tk::Priv(oldGrab):  if
-#			tk::Priv(oldGrab) is non-empty, then tk::Priv(grabGlobal)
-#			contains either an empty string or "-global" to
-#			indicate whether the old grab was a local one or
-#			a global one.
-# inMenubutton -	The name of the menubutton widget containing
-#			the mouse, or an empty string if the mouse is
-#			not over any menubutton.
-# menuBar -		The name of the menubar that is the root
-#			of the cascade hierarchy which is currently
-#			posted. This is null when there is no menu currently
-#			being pulled down from a menu bar.
-# oldGrab -		Window that had the grab before a menu was posted.
-#			Used to restore the grab state after the menu
-#			is unposted.  Empty string means there was no
-#			grab previously set.
-# popup -		If a menu has been popped up via tk_popup, this
-#			gives the name of the menu.  Otherwise this
-#			value is empty.
-# postedMb -		Name of the menubutton whose menu is currently
-#			posted, or an empty string if nothing is posted
-#			A grab is set on this widget.
-# relief -		Used to save the original relief of the current
-#			menubutton.
-# window -		When the mouse is over a menu, this holds the
-#			name of the menu;  it's cleared when the mouse
-#			leaves the menu.
-# tearoff -		Whether the last menu posted was a tearoff or not.
-#			This is true always for unix, for tearoffs for Mac
-#			and Windows.
-# activeMenu -		This is the last active menu for use
-#			with the <<MenuSelect>> virtual event.
-# activeItem -		This is the last active menu item for
-#			use with the <<MenuSelect>> virtual event.
-#-------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------
-# Overall note:
-# This file is tricky because there are five different ways that menus
-# can be used:
-#
-# 1. As a pulldown from a menubutton. In this style, the variable
-#    tk::Priv(postedMb) identifies the posted menubutton.
-# 2. As a torn-off menu copied from some other menu.  In this style
-#    tk::Priv(postedMb) is empty, and menu's type is "tearoff".
-# 3. As an option menu, triggered from an option menubutton.  In this
-#    style tk::Priv(postedMb) identifies the posted menubutton.
-# 4. As a popup menu.  In this style tk::Priv(postedMb) is empty and
-#    the top-level menu's type is "normal".
-# 5. As a pulldown from a menubar. The variable tk::Priv(menubar) has
-#    the owning menubar, and the menu itself is of type "normal".
-#
-# The various binding procedures use the  state described above to
-# distinguish the various cases and take different actions in each
-# case.
-#-------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------
-# The code below creates the default class bindings for menus
-# and menubuttons.
-#-------------------------------------------------------------------------
-
-bind Menubutton <FocusIn> {}
-bind Menubutton <Enter> {
-    tk::MbEnter %W
-}
-bind Menubutton <Leave> {
-    tk::MbLeave %W
-}
-bind Menubutton <1> {
-    if {$tk::Priv(inMenubutton) ne ""} {
-	tk::MbPost $tk::Priv(inMenubutton) %X %Y
-    }
-}
-bind Menubutton <Motion> {
-    tk::MbMotion %W up %X %Y
-}
-bind Menubutton <B1-Motion> {
-    tk::MbMotion %W down %X %Y
-}
-bind Menubutton <ButtonRelease-1> {
-    tk::MbButtonUp %W
-}
-bind Menubutton <space> {
-    tk::MbPost %W
-    tk::MenuFirstEntry [%W cget -menu]
-}
-bind Menubutton <<Invoke>> {
-    tk::MbPost %W
-    tk::MenuFirstEntry [%W cget -menu]
-}
-
-# Must set focus when mouse enters a menu, in order to allow
-# mixed-mode processing using both the mouse and the keyboard.
-# Don't set the focus if the event comes from a grab release,
-# though:  such an event can happen after as part of unposting
-# a cascaded chain of menus, after the focus has already been
-# restored to wherever it was before menu selection started.
-
-bind Menu <FocusIn> {}
-
-bind Menu <Enter> {
-    set tk::Priv(window) %W
-    if {[%W cget -type] eq "tearoff"} {
-	if {"%m" ne "NotifyUngrab"} {
-	    if {[tk windowingsystem] eq "x11"} {
-		tk_menuSetFocus %W
-	    }
-	}
-    }
-    tk::MenuMotion %W %x %y %s
-}
-
-bind Menu <Leave> {
-    tk::MenuLeave %W %X %Y %s
-}
-bind Menu <Motion> {
-    tk::MenuMotion %W %x %y %s
-}
-bind Menu <ButtonPress> {
-    tk::MenuButtonDown %W
-}
-bind Menu <ButtonRelease> {
-   tk::MenuInvoke %W 1
-}
-bind Menu <space> {
-    tk::MenuInvoke %W 0
-}
-bind Menu <<Invoke>> {
-    tk::MenuInvoke %W 0
-}
-bind Menu <Return> {
-    tk::MenuInvoke %W 0
-}
-bind Menu <Escape> {
-    tk::MenuEscape %W
-}
-bind Menu <<PrevChar>> {
-    tk::MenuLeftArrow %W
-}
-bind Menu <<NextChar>> {
-    tk::MenuRightArrow %W
-}
-bind Menu <<PrevLine>> {
-    tk::MenuUpArrow %W
-}
-bind Menu <<NextLine>> {
-    tk::MenuDownArrow %W
-}
-bind Menu <KeyPress> {
-    tk::TraverseWithinMenu %W %A
-    break
-}
-
-# The following bindings apply to all windows, and are used to
-# implement keyboard menu traversal.
-
-if {[tk windowingsystem] eq "x11"} {
-    bind all <Alt-KeyPress> {
-	tk::TraverseToMenu %W %A
-    }
-
-    bind all <F10> {
-	tk::FirstMenu %W
-    }
-} else {
-    bind Menubutton <Alt-KeyPress> {
-	tk::TraverseToMenu %W %A
-    }
-
-    bind Menubutton <F10> {
-	tk::FirstMenu %W
-    }
-}
-
-# ::tk::MbEnter --
-# This procedure is invoked when the mouse enters a menubutton
-# widget.  It activates the widget unless it is disabled.  Note:
-# this procedure is only invoked when mouse button 1 is *not* down.
-# The procedure ::tk::MbB1Enter is invoked if the button is down.
-#
-# Arguments:
-# w -			The  name of the widget.
-
-proc ::tk::MbEnter w {
-    variable ::tk::Priv
-
-    if {$Priv(inMenubutton) ne ""} {
-	MbLeave $Priv(inMenubutton)
-    }
-    set Priv(inMenubutton) $w
-    if {[$w cget -state] ne "disabled" && [tk windowingsystem] ne "aqua"} {
-	$w configure -state active
-    }
-}
-
-# ::tk::MbLeave --
-# This procedure is invoked when the mouse leaves a menubutton widget.
-# It de-activates the widget, if the widget still exists.
-#
-# Arguments:
-# w -			The  name of the widget.
-
-proc ::tk::MbLeave w {
-    variable ::tk::Priv
-
-    set Priv(inMenubutton) {}
-    if {![winfo exists $w]} {
-	return
-    }
-    if {[$w cget -state] eq "active" && [tk windowingsystem] ne "aqua"} {
-	$w configure -state normal
-    }
-}
-
-# ::tk::MbPost --
-# Given a menubutton, this procedure does all the work of posting
-# its associated menu and unposting any other menu that is currently
-# posted.
-#
-# Arguments:
-# w -			The name of the menubutton widget whose menu
-#			is to be posted.
-# x, y -		Root coordinates of cursor, used for positioning
-#			option menus.  If not specified, then the center
-#			of the menubutton is used for an option menu.
-
-proc ::tk::MbPost {w {x {}} {y {}}} {
-    global errorInfo
-    variable ::tk::Priv
-
-    if {[$w cget -state] eq "disabled" || $w eq $Priv(postedMb)} {
-	return
-    }
-    set menu [$w cget -menu]
-    if {$menu eq ""} {
-	return
-    }
-    set tearoff [expr {[tk windowingsystem] eq "x11" \
-	    || [$menu cget -type] eq "tearoff"}]
-    if {[string first $w $menu] != 0} {
-	return -code error -errorcode {TK MENUBUTTON POST_NONCHILD} \
-	    "can't post $menu: it isn't a descendant of $w"
-    }
-    set cur $Priv(postedMb)
-    if {$cur ne ""} {
-	MenuUnpost {}
-    }
-    if {$::tk_strictMotif} {
-        set Priv(cursor) [$w cget -cursor]
-        $w configure -cursor arrow
-    }
-    if {[tk windowingsystem] ne "aqua"} {
-	set Priv(relief) [$w cget -relief]
-	$w configure -relief raised
-    } else {
-	$w configure -state active
-    }
-
-    set Priv(postedMb) $w
-    set Priv(focus) [focus]
-    $menu activate none
-    GenerateMenuSelect $menu
-
-    # If this looks like an option menubutton then post the menu so
-    # that the current entry is on top of the mouse.  Otherwise post
-    # the menu just below the menubutton, as for a pull-down.
-
-    update idletasks
-    if {[catch {
-	switch [$w cget -direction] {
-	    above {
-		set x [winfo rootx $w]
-		set y [expr {[winfo rooty $w] - [winfo reqheight $menu]}]
-		# if we go offscreen to the top, show as 'below'
-		if {$y < [winfo vrooty $w]} {
-		    set y [expr {[winfo vrooty $w] + [winfo rooty $w] + [winfo reqheight $w]}]
-		}
-		PostOverPoint $menu $x $y
-	    }
-	    below {
-		set x [winfo rootx $w]
-		set y [expr {[winfo rooty $w] + [winfo height $w]}]
-		# if we go offscreen to the bottom, show as 'above'
-		set mh [winfo reqheight $menu]
-		if {($y + $mh) > ([winfo vrooty $w] + [winfo vrootheight $w])} {
-		    set y [expr {[winfo vrooty $w] + [winfo vrootheight $w] + [winfo rooty $w] - $mh}]
-		}
-		PostOverPoint $menu $x $y
-	    }
-	    left {
-		set x [expr {[winfo rootx $w] - [winfo reqwidth $menu]}]
-		set y [expr {(2 * [winfo rooty $w] + [winfo height $w]) / 2}]
-		set entry [MenuFindName $menu [$w cget -text]]
-		if {$entry eq ""} {
-                    set entry 0
-		}
-		if {[$w cget -indicatoron]} {
-		    if {$entry == [$menu index last]} {
-			incr y [expr {-([$menu yposition $entry] \
-				+ [winfo reqheight $menu])/2}]
-		    } else {
-			incr y [expr {-([$menu yposition $entry] \
-			        + [$menu yposition [expr {$entry+1}]])/2}]
-		    }
-		}
-		PostOverPoint $menu $x $y
-		if {$entry ne "" \
-			&& [$menu entrycget $entry -state] ne "disabled"} {
-		    $menu activate $entry
-		    GenerateMenuSelect $menu
-		}
-	    }
-	    right {
-		set x [expr {[winfo rootx $w] + [winfo width $w]}]
-		set y [expr {(2 * [winfo rooty $w] + [winfo height $w]) / 2}]
-		set entry [MenuFindName $menu [$w cget -text]]
-		if {$entry eq ""} {
-                    set entry 0
-		}
-		if {[$w cget -indicatoron]} {
-		    if {$entry == [$menu index last]} {
-			incr y [expr {-([$menu yposition $entry] \
-				+ [winfo reqheight $menu])/2}]
-		    } else {
-			incr y [expr {-([$menu yposition $entry] \
-			        + [$menu yposition [expr {$entry+1}]])/2}]
-		    }
-		}
-		PostOverPoint $menu $x $y
-		if {$entry ne "" \
-			&& [$menu entrycget $entry -state] ne "disabled"} {
-		    $menu activate $entry
-		    GenerateMenuSelect $menu
-		}
-	    }
-	    default {
-		if {[$w cget -indicatoron]} {
-		    if {$y eq ""} {
-			set x [expr {[winfo rootx $w] + [winfo width $w]/2}]
-			set y [expr {[winfo rooty $w] + [winfo height $w]/2}]
-		    }
-	            PostOverPoint $menu $x $y [MenuFindName $menu [$w cget -text]]
-		} else {
-		    PostOverPoint $menu [winfo rootx $w] [expr {[winfo rooty $w]+[winfo height $w]}]
-		}
-	    }
-	}
-    } msg opt]} {
-	# Error posting menu (e.g. bogus -postcommand). Unpost it and
-	# reflect the error.
-
-	MenuUnpost {}
-	return -options $opt $msg
-    }
-
-    set Priv(tearoff) $tearoff
-    if {$tearoff != 0} {
-	focus $menu
-	if {[winfo viewable $w]} {
-	    SaveGrabInfo $w
-	    grab -global $w
-	}
-    }
-}
-
-# ::tk::MenuUnpost --
-# This procedure unposts a given menu, plus all of its ancestors up
-# to (and including) a menubutton, if any.  It also restores various
-# values to what they were before the menu was posted, and releases
-# a grab if there's a menubutton involved.  Special notes:
-# 1. It's important to unpost all menus before releasing the grab, so
-#    that any Enter-Leave events (e.g. from menu back to main
-#    application) have mode NotifyGrab.
-# 2. Be sure to enclose various groups of commands in "catch" so that
-#    the procedure will complete even if the menubutton or the menu
-#    or the grab window has been deleted.
-#
-# Arguments:
-# menu -		Name of a menu to unpost.  Ignored if there
-#			is a posted menubutton.
-
-proc ::tk::MenuUnpost menu {
-    variable ::tk::Priv
-    set mb $Priv(postedMb)
-
-    # Restore focus right away (otherwise X will take focus away when
-    # the menu is unmapped and under some window managers (e.g. olvwm)
-    # we'll lose the focus completely).
-
-    catch {focus $Priv(focus)}
-    set Priv(focus) ""
-
-    # Unpost menu(s) and restore some stuff that's dependent on
-    # what was posted.
-
-    after cancel [array get Priv menuActivatedTimer]
-    unset -nocomplain Priv(menuActivated)
-    after cancel [array get Priv menuDeactivatedTimer]
-    unset -nocomplain Priv(menuDeactivated)
-
-    catch {
-	if {$mb ne ""} {
-	    set menu [$mb cget -menu]
-	    $menu unpost
-	    set Priv(postedMb) {}
-	    if {$::tk_strictMotif} {
-	        $mb configure -cursor $Priv(cursor)
-	    }
-	    if {[tk windowingsystem] ne "aqua"} {
-		$mb configure -relief $Priv(relief)
-	    } else {
-		$mb configure -state normal
-	    }
-	} elseif {$Priv(popup) ne ""} {
-	    $Priv(popup) unpost
-	    set Priv(popup) {}
-	} elseif {[$menu cget -type] ne "menubar" && [$menu cget -type] ne "tearoff"} {
-	    # We're in a cascaded sub-menu from a torn-off menu or popup.
-	    # Unpost all the menus up to the toplevel one (but not
-	    # including the top-level torn-off one) and deactivate the
-	    # top-level torn off menu if there is one.
-
-	    while {1} {
-		set parent [winfo parent $menu]
-		if {[winfo class $parent] ne "Menu" || ![winfo ismapped $parent]} {
-		    break
-		}
-		$parent activate none
-		$parent postcascade none
-		GenerateMenuSelect $parent
-		set type [$parent cget -type]
-		if {$type eq "menubar" || $type eq "tearoff"} {
-		    break
-		}
-		set menu $parent
-	    }
-	    if {[$menu cget -type] ne "menubar"} {
-		$menu unpost
-	    }
-	}
-    }
-
-    if {($Priv(tearoff) != 0) || $Priv(menuBar) ne ""} {
-	# Release grab, if any, and restore the previous grab, if there
-	# was one.
-	if {$menu ne ""} {
-	    set grab [grab current $menu]
-	    if {$grab ne ""} {
-		grab release $grab
-	    }
-	}
-	RestoreOldGrab
-	if {$Priv(menuBar) ne ""} {
-	    if {$::tk_strictMotif} {
-		$Priv(menuBar) configure -cursor $Priv(cursor)
-	    }
-	    set Priv(menuBar) {}
-	}
-	if {[tk windowingsystem] ne "x11"} {
-	    set Priv(tearoff) 0
-	}
-    }
-}
-
-# ::tk::MbMotion --
-# This procedure handles mouse motion events inside menubuttons, and
-# also outside menubuttons when a menubutton has a grab (e.g. when a
-# menu selection operation is in progress).
-#
-# Arguments:
-# w -			The name of the menubutton widget.
-# upDown - 		"down" means button 1 is pressed, "up" means
-#			it isn't.
-# rootx, rooty -	Coordinates of mouse, in (virtual?) root window.
-
-proc ::tk::MbMotion {w upDown rootx rooty} {
-    variable ::tk::Priv
-
-    if {$Priv(inMenubutton) eq $w} {
-	return
-    }
-    set new [winfo containing $rootx $rooty]
-    if {$new ne $Priv(inMenubutton) \
-	    && ($new eq "" || [winfo toplevel $new] eq [winfo toplevel $w])} {
-	if {$Priv(inMenubutton) ne ""} {
-	    MbLeave $Priv(inMenubutton)
-	}
-	if {$new ne "" \
-		&& [winfo class $new] eq "Menubutton" \
-		&& ([$new cget -indicatoron] == 0) \
-		&& ([$w cget -indicatoron] == 0)} {
-	    if {$upDown eq "down"} {
-		MbPost $new $rootx $rooty
-	    } else {
-		MbEnter $new
-	    }
-	}
-    }
-}
-
-# ::tk::MbButtonUp --
-# This procedure is invoked to handle button 1 releases for menubuttons.
-# If the release happens inside the menubutton then leave its menu
-# posted with element 0 activated.  Otherwise, unpost the menu.
-#
-# Arguments:
-# w -			The name of the menubutton widget.
-
-proc ::tk::MbButtonUp w {
-    variable ::tk::Priv
-
-    set menu [$w cget -menu]
-    set tearoff [expr {[tk windowingsystem] eq "x11" || \
-	    ($menu ne "" && [$menu cget -type] eq "tearoff")}]
-    if {($tearoff != 0) && $Priv(postedMb) eq $w \
-	    && $Priv(inMenubutton) eq $w} {
-	MenuFirstEntry [$Priv(postedMb) cget -menu]
-    } else {
-	MenuUnpost {}
-    }
-}
-
-# ::tk::MenuMotion --
-# This procedure is called to handle mouse motion events for menus.
-# It does two things.  First, it resets the active element in the
-# menu, if the mouse is over the menu.  Second, if a mouse button
-# is down, it posts and unposts cascade entries to match the mouse
-# position.
-#
-# Arguments:
-# menu -		The menu window.
-# x -			The x position of the mouse.
-# y -			The y position of the mouse.
-# state -		Modifier state (tells whether buttons are down).
-
-proc ::tk::MenuMotion {menu x y state} {
-    variable ::tk::Priv
-    if {$menu eq $Priv(window)} {
-        set activeindex [$menu index active]
-	if {[$menu cget -type] eq "menubar"} {
-	    if {[info exists Priv(focus)] && $menu ne $Priv(focus)} {
-		$menu activate @$x,$y
-		GenerateMenuSelect $menu
-	    }
-	} else {
-	    $menu activate @$x,$y
-	    GenerateMenuSelect $menu
-	}
-        set index [$menu index @$x,$y]
-        if {[info exists Priv(menuActivated)] \
-                && $index ne "none" \
-                && $index ne $activeindex} {
-            set mode [option get $menu clickToFocus ClickToFocus]
-            if {[string is false $mode]} {
-                set delay [expr {[$menu cget -type] eq "menubar" ? 0 : 50}]
-                if {[$menu type $index] eq "cascade"} {
-                    set Priv(menuActivatedTimer) \
-                        [after $delay [list $menu postcascade active]]
-                } else {
-                    set Priv(menuDeactivatedTimer) \
-                        [after $delay [list $menu postcascade none]]
-                }
-            }
-        }
-    }
-}
-
-# ::tk::MenuButtonDown --
-# Handles button presses in menus.  There are a couple of tricky things
-# here:
-# 1. Change the posted cascade entry (if any) to match the mouse position.
-# 2. If there is a posted menubutton, must grab to the menubutton;  this
-#    overrrides the implicit grab on button press, so that the menu
-#    button can track mouse motions over other menubuttons and change
-#    the posted menu.
-# 3. If there's no posted menubutton (e.g. because we're a torn-off menu
-#    or one of its descendants) must grab to the top-level menu so that
-#    we can track mouse motions across the entire menu hierarchy.
-#
-# Arguments:
-# menu -		The menu window.
-
-proc ::tk::MenuButtonDown menu {
-    variable ::tk::Priv
-
-    if {![winfo viewable $menu]} {
-        return
-    }
-    if {[$menu index active] eq "none"} {
-        set Priv(window) {}
-        return
-    }
-    $menu postcascade active
-    if {$Priv(postedMb) ne "" && [winfo viewable $Priv(postedMb)]} {
-	grab -global $Priv(postedMb)
-    } else {
-	while {[$menu cget -type] eq "normal" \
-		&& [winfo class [winfo parent $menu]] eq "Menu" \
-		&& [winfo ismapped [winfo parent $menu]]} {
-	    set menu [winfo parent $menu]
-	}
-
-	if {$Priv(menuBar) eq {}} {
-	    set Priv(menuBar) $menu
-	    if {$::tk_strictMotif} {
-		set Priv(cursor) [$menu cget -cursor]
-		$menu configure -cursor arrow
-	    }
-	    if {[$menu type active] eq "cascade"} {
-		set Priv(menuActivated) 1
-	    }
-        }
-
-	# Don't update grab information if the grab window isn't changing.
-	# Otherwise, we'll get an error when we unpost the menus and
-	# restore the grab, since the old grab window will not be viewable
-	# anymore.
-
-	if {$menu ne [grab current $menu]} {
-	    SaveGrabInfo $menu
-	}
-
-	# Must re-grab even if the grab window hasn't changed, in order
-	# to release the implicit grab from the button press.
-
-	if {[tk windowingsystem] eq "x11"} {
-	    grab -global $menu
-	}
-    }
-}
-
-# ::tk::MenuLeave --
-# This procedure is invoked to handle Leave events for a menu.  It
-# deactivates everything unless the active element is a cascade element
-# and the mouse is now over the submenu.
-#
-# Arguments:
-# menu -		The menu window.
-# rootx, rooty -	Root coordinates of mouse.
-# state -		Modifier state.
-
-proc ::tk::MenuLeave {menu rootx rooty state} {
-    variable ::tk::Priv
-    set Priv(window) {}
-    if {[$menu index active] eq "none"} {
-	return
-    }
-    if {[$menu type active] eq "cascade" \
-	    && [winfo containing $rootx $rooty] eq \
-		[$menu entrycget active -menu]} {
-	return
-    }
-    $menu activate none
-    GenerateMenuSelect $menu
-}
-
-# ::tk::MenuInvoke --
-# This procedure is invoked when button 1 is released over a menu.
-# It invokes the appropriate menu action and unposts the menu if
-# it came from a menubutton.
-#
-# Arguments:
-# w -			Name of the menu widget.
-# buttonRelease -	1 means this procedure is called because of
-#			a button release;  0 means because of keystroke.
-
-proc ::tk::MenuInvoke {w buttonRelease} {
-    variable ::tk::Priv
-
-    if {$buttonRelease && $Priv(window) eq ""} {
-	# Mouse was pressed over a menu without a menu button, then
-	# dragged off the menu (possibly with a cascade posted) and
-	# released.  Unpost everything and quit.
-
-	$w postcascade none
-	$w activate none
-	event generate $w <<MenuSelect>>
-	MenuUnpost $w
-	return
-    }
-    if {[$w type active] eq "cascade"} {
-	$w postcascade active
-	set menu [$w entrycget active -menu]
-	MenuFirstEntry $menu
-    } elseif {[$w type active] eq "tearoff"} {
-	::tk::TearOffMenu $w
-	MenuUnpost $w
-    } elseif {[$w cget -type] eq "menubar"} {
-	$w postcascade none
-	set active [$w index active]
-	set isCascade [string equal [$w type $active] "cascade"]
-
-	# Only de-activate the active item if it's a cascade; this prevents
-	# the annoying "activation flicker" you otherwise get with
-	# checkbuttons/commands/etc. on menubars
-
-	if { $isCascade } {
-	    $w activate none
-	    event generate $w <<MenuSelect>>
-	}
-
-	MenuUnpost $w
-
-	# If the active item is not a cascade, invoke it.  This enables
-	# the use of checkbuttons/commands/etc. on menubars (which is legal,
-	# but not recommended)
-
-	if { !$isCascade } {
-	    uplevel #0 [list $w invoke $active]
-	}
-    } else {
-	set active [$w index active]
-	if {$Priv(popup) eq "" || $active ne "none"} {
-	    MenuUnpost $w
-	}
-	uplevel #0 [list $w invoke active]
-    }
-}
-
-# ::tk::MenuEscape --
-# This procedure is invoked for the Cancel (or Escape) key.  It unposts
-# the given menu and, if it is the top-level menu for a menu button,
-# unposts the menu button as well.
-#
-# Arguments:
-# menu -		Name of the menu window.
-
-proc ::tk::MenuEscape menu {
-    set parent [winfo parent $menu]
-    if {[winfo class $parent] ne "Menu"} {
-	MenuUnpost $menu
-    } elseif {[$parent cget -type] eq "menubar"} {
-	MenuUnpost $menu
-	RestoreOldGrab
-    } else {
-	MenuNextMenu $menu left
-    }
-}
-
-# The following routines handle arrow keys. Arrow keys behave
-# differently depending on whether the menu is a menu bar or not.
-
-proc ::tk::MenuUpArrow {menu} {
-    if {[$menu cget -type] eq "menubar"} {
-	MenuNextMenu $menu left
-    } else {
-	MenuNextEntry $menu -1
-    }
-}
-
-proc ::tk::MenuDownArrow {menu} {
-    if {[$menu cget -type] eq "menubar"} {
-	MenuNextMenu $menu right
-    } else {
-	MenuNextEntry $menu 1
-    }
-}
-
-proc ::tk::MenuLeftArrow {menu} {
-    if {[$menu cget -type] eq "menubar"} {
-	MenuNextEntry $menu -1
-    } else {
-	MenuNextMenu $menu left
-    }
-}
-
-proc ::tk::MenuRightArrow {menu} {
-    if {[$menu cget -type] eq "menubar"} {
-	MenuNextEntry $menu 1
-    } else {
-	MenuNextMenu $menu right
-    }
-}
-
-# ::tk::MenuNextMenu --
-# This procedure is invoked to handle "left" and "right" traversal
-# motions in menus.  It traverses to the next menu in a menu bar,
-# or into or out of a cascaded menu.
-#
-# Arguments:
-# menu -		The menu that received the keyboard
-#			event.
-# direction -		Direction in which to move: "left" or "right"
-
-proc ::tk::MenuNextMenu {menu direction} {
-    variable ::tk::Priv
-
-    # First handle traversals into and out of cascaded menus.
-
-    if {$direction eq "right"} {
-	set count 1
-	set parent [winfo parent $menu]
-	set class [winfo class $parent]
-	if {[$menu type active] eq "cascade"} {
-	    $menu postcascade active
-	    set m2 [$menu entrycget active -menu]
-	    if {$m2 ne ""} {
-		MenuFirstEntry $m2
-	    }
-	    return
-	} else {
-	    set parent [winfo parent $menu]
-	    while {$parent ne "."} {
-		if {[winfo class $parent] eq "Menu" \
-			&& [$parent cget -type] eq "menubar"} {
-		    tk_menuSetFocus $parent
-		    MenuNextEntry $parent 1
-		    return
-		}
-		set parent [winfo parent $parent]
-	    }
-	}
-    } else {
-	set count -1
-	set m2 [winfo parent $menu]
-	if {[winfo class $m2] eq "Menu"} {
-	    $menu activate none
-	    GenerateMenuSelect $menu
-	    tk_menuSetFocus $m2
-
-	    $m2 postcascade none
-
-	    if {[$m2 cget -type] ne "menubar"} {
-		return
-	    }
-	}
-    }
-
-    # Can't traverse into or out of a cascaded menu. Go to the next
-    # or previous menubutton, if that makes sense.
-
-    set m2 [winfo parent $menu]
-    if {[winfo class $m2] eq "Menu" && [$m2 cget -type] eq "menubar"} {
-	tk_menuSetFocus $m2
-	MenuNextEntry $m2 -1
-	return
-    }
-
-    set w $Priv(postedMb)
-    if {$w eq ""} {
-	return
-    }
-    set buttons [winfo children [winfo parent $w]]
-    set length [llength $buttons]
-    set i [expr {[lsearch -exact $buttons $w] + $count}]
-    while {1} {
-	while {$i < 0} {
-	    incr i $length
-	}
-	while {$i >= $length} {
-	    incr i -$length
-	}
-	set mb [lindex $buttons $i]
-	if {[winfo class $mb] eq "Menubutton" \
-		&& [$mb cget -state] ne "disabled" \
-		&& [$mb cget -menu] ne "" \
-		&& [[$mb cget -menu] index last] ne "none"} {
-	    break
-	}
-	if {$mb eq $w} {
-	    return
-	}
-	incr i $count
-    }
-    MbPost $mb
-    MenuFirstEntry [$mb cget -menu]
-}
-
-# ::tk::MenuNextEntry --
-# Activate the next higher or lower entry in the posted menu,
-# wrapping around at the ends.  Disabled entries are skipped.
-#
-# Arguments:
-# menu -			Menu window that received the keystroke.
-# count -			1 means go to the next lower entry,
-#				-1 means go to the next higher entry.
-
-proc ::tk::MenuNextEntry {menu count} {
-    if {[$menu index last] eq "none"} {
-	return
-    }
-    set length [expr {[$menu index last]+1}]
-    set quitAfter $length
-    set active [$menu index active]
-    if {$active eq "none"} {
-	set i 0
-    } else {
-	set i [expr {$active + $count}]
-    }
-    while {1} {
-	if {$quitAfter <= 0} {
-	    # We've tried every entry in the menu.  Either there are
-	    # none, or they're all disabled.  Just give up.
-
-	    return
-	}
-	while {$i < 0} {
-	    incr i $length
-	}
-	while {$i >= $length} {
-	    incr i -$length
-	}
-	if {[catch {$menu entrycget $i -state} state] == 0} {
-	    if {$state ne "disabled" && \
-		    ($i!=0 || [$menu cget -type] ne "tearoff" \
-		    || [$menu type 0] ne "tearoff")} {
-		break
-	    }
-	}
-	if {$i == $active} {
-	    return
-	}
-	incr i $count
-	incr quitAfter -1
-    }
-    $menu activate $i
-    GenerateMenuSelect $menu
-
-    if {[$menu type $i] eq "cascade" && [$menu cget -type] eq "menubar"} {
-	set cascade [$menu entrycget $i -menu]
-	if {$cascade ne ""} {
-	    # Here we auto-post a cascade.  This is necessary when
-	    # we traverse left/right in the menubar, but undesirable when
-	    # we traverse up/down in a menu.
-	    $menu postcascade $i
-	    MenuFirstEntry $cascade
-	}
-    }
-}
-
-# ::tk::MenuFind --
-# This procedure searches the entire window hierarchy under w for
-# a menubutton that isn't disabled and whose underlined character
-# is "char" or an entry in a menubar that isn't disabled and whose
-# underlined character is "char".
-# It returns the name of that window, if found, or an
-# empty string if no matching window was found.  If "char" is an
-# empty string then the procedure returns the name of the first
-# menubutton found that isn't disabled.
-#
-# Arguments:
-# w -				Name of window where key was typed.
-# char -			Underlined character to search for;
-#				may be either upper or lower case, and
-#				will match either upper or lower case.
-
-proc ::tk::MenuFind {w char} {
-    set char [string tolower $char]
-    set windowlist [winfo child $w]
-
-    foreach child $windowlist {
-	# Don't descend into other toplevels.
-        if {[winfo toplevel $w] ne [winfo toplevel $child]} {
-	    continue
-	}
-	if {[winfo class $child] eq "Menu" && \
-		[$child cget -type] eq "menubar"} {
-	    if {$char eq ""} {
-		return $child
-	    }
-	    set last [$child index last]
-	    for {set i [$child cget -tearoff]} {$i <= $last} {incr i} {
-		if {[$child type $i] eq "separator"} {
-		    continue
-		}
-		set char2 [string index [$child entrycget $i -label] \
-			[$child entrycget $i -underline]]
-		if {$char eq [string tolower $char2] || $char eq ""} {
-		    if {[$child entrycget $i -state] ne "disabled"} {
-			return $child
-		    }
-		}
-	    }
-	}
-    }
-
-    foreach child $windowlist {
-	# Don't descend into other toplevels.
-        if {[winfo toplevel $w] ne [winfo toplevel $child]} {
-	    continue
-	}
-	switch -- [winfo class $child] {
-	    Menubutton {
-		set char2 [string index [$child cget -text] \
-			[$child cget -underline]]
-		if {$char eq [string tolower $char2] || $char eq ""} {
-		    if {[$child cget -state] ne "disabled"} {
-			return $child
-		    }
-		}
-	    }
-
-	    default {
-		set match [MenuFind $child $char]
-		if {$match ne ""} {
-		    return $match
-		}
-	    }
-	}
-    }
-    return {}
-}
-
-# ::tk::TraverseToMenu --
-# This procedure implements keyboard traversal of menus.  Given an
-# ASCII character "char", it looks for a menubutton with that character
-# underlined.  If one is found, it posts the menubutton's menu
-#
-# Arguments:
-# w -				Window in which the key was typed (selects
-#				a toplevel window).
-# char -			Character that selects a menu.  The case
-#				is ignored.  If an empty string, nothing
-#				happens.
-
-proc ::tk::TraverseToMenu {w char} {
-    variable ::tk::Priv
-    if {![winfo exists $w] || $char eq ""} {
-	return
-    }
-    while {[winfo class $w] eq "Menu"} {
-	if {[$w cget -type] eq "menubar"} {
-	    break
-	} elseif {$Priv(postedMb) eq ""} {
-	    return
-	}
-	set w [winfo parent $w]
-    }
-    set w [MenuFind [winfo toplevel $w] $char]
-    if {$w ne ""} {
-	if {[winfo class $w] eq "Menu"} {
-	    tk_menuSetFocus $w
-	    set Priv(window) $w
-	    SaveGrabInfo $w
-	    grab -global $w
-	    TraverseWithinMenu $w $char
-	} else {
-	    MbPost $w
-	    MenuFirstEntry [$w cget -menu]
-	}
-    }
-}
-
-# ::tk::FirstMenu --
-# This procedure traverses to the first menubutton in the toplevel
-# for a given window, and posts that menubutton's menu.
-#
-# Arguments:
-# w -				Name of a window.  Selects which toplevel
-#				to search for menubuttons.
-
-proc ::tk::FirstMenu w {
-    variable ::tk::Priv
-    set w [MenuFind [winfo toplevel $w] ""]
-    if {$w ne ""} {
-	if {[winfo class $w] eq "Menu"} {
-	    tk_menuSetFocus $w
-	    set Priv(window) $w
-	    SaveGrabInfo $w
-	    grab -global $w
-	    MenuFirstEntry $w
-	} else {
-	    MbPost $w
-	    MenuFirstEntry [$w cget -menu]
-	}
-    }
-}
-
-# ::tk::TraverseWithinMenu
-# This procedure implements keyboard traversal within a menu.  It
-# searches for an entry in the menu that has "char" underlined.  If
-# such an entry is found, it is invoked and the menu is unposted.
-#
-# Arguments:
-# w -				The name of the menu widget.
-# char -			The character to look for;  case is
-#				ignored.  If the string is empty then
-#				nothing happens.
-
-proc ::tk::TraverseWithinMenu {w char} {
-    if {$char eq ""} {
-	return
-    }
-    set char [string tolower $char]
-    set last [$w index last]
-    if {$last eq "none"} {
-	return
-    }
-    for {set i 0} {$i <= $last} {incr i} {
-	if {[catch {set char2 [string index \
-		[$w entrycget $i -label] [$w entrycget $i -underline]]}]} {
-	    continue
-	}
-	if {$char eq [string tolower $char2]} {
-	    if {[$w type $i] eq "cascade"} {
-		$w activate $i
-		$w postcascade active
-		event generate $w <<MenuSelect>>
-		set m2 [$w entrycget $i -menu]
-		if {$m2 ne ""} {
-		    MenuFirstEntry $m2
-		}
-	    } else {
-		MenuUnpost $w
-		uplevel #0 [list $w invoke $i]
-	    }
-	    return
-	}
-    }
-}
-
-# ::tk::MenuFirstEntry --
-# Given a menu, this procedure finds the first entry that isn't
-# disabled or a tear-off or separator, and activates that entry.
-# However, if there is already an active entry in the menu (e.g.,
-# because of a previous call to tk::PostOverPoint) then the active
-# entry isn't changed.  This procedure also sets the input focus
-# to the menu.
-#
-# Arguments:
-# menu -		Name of the menu window (possibly empty).
-
-proc ::tk::MenuFirstEntry menu {
-    if {$menu eq ""} {
-	return
-    }
-    tk_menuSetFocus $menu
-    if {[$menu index active] ne "none"} {
-	return
-    }
-    set last [$menu index last]
-    if {$last eq "none"} {
-	return
-    }
-    for {set i 0} {$i <= $last} {incr i} {
-	if {([catch {set state [$menu entrycget $i -state]}] == 0) \
-		&& $state ne "disabled" && [$menu type $i] ne "tearoff"} {
-	    $menu activate $i
-	    GenerateMenuSelect $menu
-	    # Only post the cascade if the current menu is a menubar;
-	    # otherwise, if the first entry of the cascade is a cascade,
-	    # we can get an annoying cascading effect resulting in a bunch of
-	    # menus getting posted (bug 676)
-	    if {[$menu type $i] eq "cascade" && [$menu cget -type] eq "menubar"} {
-		set cascade [$menu entrycget $i -menu]
-		if {$cascade ne ""} {
-		    $menu postcascade $i
-		    MenuFirstEntry $cascade
-		}
-	    }
-	    return
-	}
-    }
-}
-
-# ::tk::MenuFindName --
-# Given a menu and a text string, return the index of the menu entry
-# that displays the string as its label.  If there is no such entry,
-# return an empty string.  This procedure is tricky because some names
-# like "active" have a special meaning in menu commands, so we can't
-# always use the "index" widget command.
-#
-# Arguments:
-# menu -		Name of the menu widget.
-# s -			String to look for.
-
-proc ::tk::MenuFindName {menu s} {
-    set i ""
-    if {![regexp {^active$|^last$|^none$|^[0-9]|^@} $s]} {
-	catch {set i [$menu index $s]}
-	return $i
-    }
-    set last [$menu index last]
-    if {$last eq "none"} {
-	return
-    }
-    for {set i 0} {$i <= $last} {incr i} {
-	if {![catch {$menu entrycget $i -label} label]} {
-	    if {$label eq $s} {
-		return $i
-	    }
-	}
-    }
-    return ""
-}
-
-# ::tk::PostOverPoint --
-# This procedure posts a given menu such that a given entry in the
-# menu is centered over a given point in the root window.  It also
-# activates the given entry.
-#
-# Arguments:
-# menu -		Menu to post.
-# x, y -		Root coordinates of point.
-# entry -		Index of entry within menu to center over (x,y).
-#			If omitted or specified as {}, then the menu's
-#			upper-left corner goes at (x,y).
-
-proc ::tk::PostOverPoint {menu x y {entry {}}}  {
-    if {$entry ne ""} {
-	if {$entry == [$menu index last]} {
-	    incr y [expr {-([$menu yposition $entry] \
-		    + [winfo reqheight $menu])/2}]
-	} else {
-	    incr y [expr {-([$menu yposition $entry] \
-		    + [$menu yposition [expr {$entry+1}]])/2}]
-	}
-	incr x [expr {-[winfo reqwidth $menu]/2}]
-    }
-
-    if {[tk windowingsystem] eq "win32"} {
-	# osVersion is not available in safe interps
-	set ver 5
-	if {[info exists ::tcl_platform(osVersion)]} {
-	    scan $::tcl_platform(osVersion) %d ver
-	}
-
-	# We need to fix some problems with menu posting on Windows,
-	# where, if the menu would overlap top or bottom of screen,
-	# Windows puts it in the wrong place for us.  We must also
-	# subtract an extra amount for half the height of the current
-	# entry.  To be safe we subtract an extra 10.
-	# NOTE: this issue appears to have been resolved in the Window
-	# manager provided with Vista and Windows 7.
-	if {$ver < 6} {
-	    set yoffset [expr {[winfo screenheight $menu] \
-		    - $y - [winfo reqheight $menu] - 10}]
-	    if {$yoffset < [winfo vrooty $menu]} {
-		# The bottom of the menu is offscreen, so adjust upwards
-		incr y [expr {$yoffset - [winfo vrooty $menu]}]
-	    }
-	    # If we're off the top of the screen (either because we were
-	    # originally or because we just adjusted too far upwards),
-	    # then make the menu popup on the top edge.
-	    if {$y < [winfo vrooty $menu]} {
-		set y [winfo vrooty $menu]
-	    }
-	}
-    }
-    $menu post $x $y
-    if {$entry ne "" && [$menu entrycget $entry -state] ne "disabled"} {
-	$menu activate $entry
-	GenerateMenuSelect $menu
-    }
-}
-
-# ::tk::SaveGrabInfo --
-# Sets the variables tk::Priv(oldGrab) and tk::Priv(grabStatus) to record
-# the state of any existing grab on the w's display.
-#
-# Arguments:
-# w -			Name of a window;  used to select the display
-#			whose grab information is to be recorded.
-
-proc tk::SaveGrabInfo w {
-    variable ::tk::Priv
-    set Priv(oldGrab) [grab current $w]
-    if {$Priv(oldGrab) ne ""} {
-	set Priv(grabStatus) [grab status $Priv(oldGrab)]
-    }
-}
-
-# ::tk::RestoreOldGrab --
-# Restores the grab to what it was before TkSaveGrabInfo was called.
-#
-
-proc ::tk::RestoreOldGrab {} {
-    variable ::tk::Priv
-
-    if {$Priv(oldGrab) ne ""} {
-	# Be careful restoring the old grab, since it's window may not
-	# be visible anymore.
-
-	catch {
-	    if {$Priv(grabStatus) eq "global"} {
-		grab set -global $Priv(oldGrab)
-	    } else {
-		grab set $Priv(oldGrab)
-	    }
-	}
-	set Priv(oldGrab) ""
-    }
-}
-
-proc ::tk_menuSetFocus {menu} {
-    variable ::tk::Priv
-    if {![info exists Priv(focus)] || $Priv(focus) eq ""} {
-	set Priv(focus) [focus]
-    }
-    focus $menu
-}
-
-proc ::tk::GenerateMenuSelect {menu} {
-    variable ::tk::Priv
-
-    if {$Priv(activeMenu) eq $menu \
-	    && $Priv(activeItem) eq [$menu index active]} {
-	return
-    }
-
-    set Priv(activeMenu) $menu
-    set Priv(activeItem) [$menu index active]
-    event generate $menu <<MenuSelect>>
-}
-
-# ::tk_popup --
-# This procedure pops up a menu and sets things up for traversing
-# the menu and its submenus.
-#
-# Arguments:
-# menu -		Name of the menu to be popped up.
-# x, y -		Root coordinates at which to pop up the
-#			menu.
-# entry -		Index of a menu entry to center over (x,y).
-#			If omitted or specified as {}, then menu's
-#			upper-left corner goes at (x,y).
-
-proc ::tk_popup {menu x y {entry {}}} {
-    variable ::tk::Priv
-    if {$Priv(popup) ne "" || $Priv(postedMb) ne ""} {
-	tk::MenuUnpost {}
-    }
-    tk::PostOverPoint $menu $x $y $entry
-    if {[tk windowingsystem] eq "x11" && [winfo viewable $menu]} {
-        tk::SaveGrabInfo $menu
-	grab -global $menu
-	set Priv(popup) $menu
-	set Priv(window) $menu
-	set Priv(menuActivated) 1
-	tk_menuSetFocus $menu
-    }
-}
diff --git a/tk8.6/library/mkpsenc.tcl b/tk8.6/library/mkpsenc.tcl
deleted file mode 100644
index b3fd13d..0000000
--- a/tk8.6/library/mkpsenc.tcl
+++ /dev/null
@@ -1,1488 +0,0 @@
-# mkpsenc.tcl --
-#
-# This file generates the postscript prolog used by Tk.
-
-namespace eval ::tk {
-    # Creates Postscript encoding vector for ISO-8859-1 (could theoretically
-    # handle any 8-bit encoding, but Tk never generates characters outside
-    # ASCII).
-    #
-    proc CreatePostscriptEncoding {} {
-	variable psglyphs
-	# Now check for known. Even if it is known, it can be other than we
-	# need. GhostScript seems to be happy with such approach
-	set result "\[\n"
-	for {set i 0} {$i<256} {incr i 8} {
-	    for {set j 0} {$j<8} {incr j} {
-		set enc [encoding convertfrom "iso8859-1" \
-			[format %c [expr {$i+$j}]]]
-		catch {
-		    set hexcode {}
-		    set hexcode [format %04X [scan $enc %c]]
-		}
-		if {[info exists psglyphs($hexcode)]} {
-		    append result "/$psglyphs($hexcode)"
-		} else {
-		    append result "/space"
-		}
-	    }
-	    append result "\n"
-	}
-	append result "\]"
-	return $result
-    }
-
-    # List of adobe glyph names. Converted from glyphlist.txt, downloaded from
-    # Adobe.
-
-    variable psglyphs
-    array set psglyphs {
-	0020 space
-	0021 exclam
-	0022 quotedbl
-	0023 numbersign
-	0024 dollar
-	0025 percent
-	0026 ampersand
-	0027 quotesingle
-	0028 parenleft
-	0029 parenright
-	002A asterisk
-	002B plus
-	002C comma
-	002D hyphen
-	002E period
-	002F slash
-	0030 zero
-	0031 one
-	0032 two
-	0033 three
-	0034 four
-	0035 five
-	0036 six
-	0037 seven
-	0038 eight
-	0039 nine
-	003A colon
-	003B semicolon
-	003C less
-	003D equal
-	003E greater
-	003F question
-	0040 at
-	0041 A
-	0042 B
-	0043 C
-	0044 D
-	0045 E
-	0046 F
-	0047 G
-	0048 H
-	0049 I
-	004A J
-	004B K
-	004C L
-	004D M
-	004E N
-	004F O
-	0050 P
-	0051 Q
-	0052 R
-	0053 S
-	0054 T
-	0055 U
-	0056 V
-	0057 W
-	0058 X
-	0059 Y
-	005A Z
-	005B bracketleft
-	005C backslash
-	005D bracketright
-	005E asciicircum
-	005F underscore
-	0060 grave
-	0061 a
-	0062 b
-	0063 c
-	0064 d
-	0065 e
-	0066 f
-	0067 g
-	0068 h
-	0069 i
-	006A j
-	006B k
-	006C l
-	006D m
-	006E n
-	006F o
-	0070 p
-	0071 q
-	0072 r
-	0073 s
-	0074 t
-	0075 u
-	0076 v
-	0077 w
-	0078 x
-	0079 y
-	007A z
-	007B braceleft
-	007C bar
-	007D braceright
-	007E asciitilde
-	00A0 space
-	00A1 exclamdown
-	00A2 cent
-	00A3 sterling
-	00A4 currency
-	00A5 yen
-	00A6 brokenbar
-	00A7 section
-	00A8 dieresis
-	00A9 copyright
-	00AA ordfeminine
-	00AB guillemotleft
-	00AC logicalnot
-	00AD hyphen
-	00AE registered
-	00AF macron
-	00B0 degree
-	00B1 plusminus
-	00B2 twosuperior
-	00B3 threesuperior
-	00B4 acute
-	00B5 mu
-	00B6 paragraph
-	00B7 periodcentered
-	00B8 cedilla
-	00B9 onesuperior
-	00BA ordmasculine
-	00BB guillemotright
-	00BC onequarter
-	00BD onehalf
-	00BE threequarters
-	00BF questiondown
-	00C0 Agrave
-	00C1 Aacute
-	00C2 Acircumflex
-	00C3 Atilde
-	00C4 Adieresis
-	00C5 Aring
-	00C6 AE
-	00C7 Ccedilla
-	00C8 Egrave
-	00C9 Eacute
-	00CA Ecircumflex
-	00CB Edieresis
-	00CC Igrave
-	00CD Iacute
-	00CE Icircumflex
-	00CF Idieresis
-	00D0 Eth
-	00D1 Ntilde
-	00D2 Ograve
-	00D3 Oacute
-	00D4 Ocircumflex
-	00D5 Otilde
-	00D6 Odieresis
-	00D7 multiply
-	00D8 Oslash
-	00D9 Ugrave
-	00DA Uacute
-	00DB Ucircumflex
-	00DC Udieresis
-	00DD Yacute
-	00DE Thorn
-	00DF germandbls
-	00E0 agrave
-	00E1 aacute
-	00E2 acircumflex
-	00E3 atilde
-	00E4 adieresis
-	00E5 aring
-	00E6 ae
-	00E7 ccedilla
-	00E8 egrave
-	00E9 eacute
-	00EA ecircumflex
-	00EB edieresis
-	00EC igrave
-	00ED iacute
-	00EE icircumflex
-	00EF idieresis
-	00F0 eth
-	00F1 ntilde
-	00F2 ograve
-	00F3 oacute
-	00F4 ocircumflex
-	00F5 otilde
-	00F6 odieresis
-	00F7 divide
-	00F8 oslash
-	00F9 ugrave
-	00FA uacute
-	00FB ucircumflex
-	00FC udieresis
-	00FD yacute
-	00FE thorn
-	00FF ydieresis
-	0100 Amacron
-	0101 amacron
-	0102 Abreve
-	0103 abreve
-	0104 Aogonek
-	0105 aogonek
-	0106 Cacute
-	0107 cacute
-	0108 Ccircumflex
-	0109 ccircumflex
-	010A Cdotaccent
-	010B cdotaccent
-	010C Ccaron
-	010D ccaron
-	010E Dcaron
-	010F dcaron
-	0110 Dcroat
-	0111 dcroat
-	0112 Emacron
-	0113 emacron
-	0114 Ebreve
-	0115 ebreve
-	0116 Edotaccent
-	0117 edotaccent
-	0118 Eogonek
-	0119 eogonek
-	011A Ecaron
-	011B ecaron
-	011C Gcircumflex
-	011D gcircumflex
-	011E Gbreve
-	011F gbreve
-	0120 Gdotaccent
-	0121 gdotaccent
-	0122 Gcommaaccent
-	0123 gcommaaccent
-	0124 Hcircumflex
-	0125 hcircumflex
-	0126 Hbar
-	0127 hbar
-	0128 Itilde
-	0129 itilde
-	012A Imacron
-	012B imacron
-	012C Ibreve
-	012D ibreve
-	012E Iogonek
-	012F iogonek
-	0130 Idotaccent
-	0131 dotlessi
-	0132 IJ
-	0133 ij
-	0134 Jcircumflex
-	0135 jcircumflex
-	0136 Kcommaaccent
-	0137 kcommaaccent
-	0138 kgreenlandic
-	0139 Lacute
-	013A lacute
-	013B Lcommaaccent
-	013C lcommaaccent
-	013D Lcaron
-	013E lcaron
-	013F Ldot
-	0140 ldot
-	0141 Lslash
-	0142 lslash
-	0143 Nacute
-	0144 nacute
-	0145 Ncommaaccent
-	0146 ncommaaccent
-	0147 Ncaron
-	0148 ncaron
-	0149 napostrophe
-	014A Eng
-	014B eng
-	014C Omacron
-	014D omacron
-	014E Obreve
-	014F obreve
-	0150 Ohungarumlaut
-	0151 ohungarumlaut
-	0152 OE
-	0153 oe
-	0154 Racute
-	0155 racute
-	0156 Rcommaaccent
-	0157 rcommaaccent
-	0158 Rcaron
-	0159 rcaron
-	015A Sacute
-	015B sacute
-	015C Scircumflex
-	015D scircumflex
-	015E Scedilla
-	015F scedilla
-	0160 Scaron
-	0161 scaron
-	0162 Tcommaaccent
-	0163 tcommaaccent
-	0164 Tcaron
-	0165 tcaron
-	0166 Tbar
-	0167 tbar
-	0168 Utilde
-	0169 utilde
-	016A Umacron
-	016B umacron
-	016C Ubreve
-	016D ubreve
-	016E Uring
-	016F uring
-	0170 Uhungarumlaut
-	0171 uhungarumlaut
-	0172 Uogonek
-	0173 uogonek
-	0174 Wcircumflex
-	0175 wcircumflex
-	0176 Ycircumflex
-	0177 ycircumflex
-	0178 Ydieresis
-	0179 Zacute
-	017A zacute
-	017B Zdotaccent
-	017C zdotaccent
-	017D Zcaron
-	017E zcaron
-	017F longs
-	0192 florin
-	01A0 Ohorn
-	01A1 ohorn
-	01AF Uhorn
-	01B0 uhorn
-	01E6 Gcaron
-	01E7 gcaron
-	01FA Aringacute
-	01FB aringacute
-	01FC AEacute
-	01FD aeacute
-	01FE Oslashacute
-	01FF oslashacute
-	0218 Scommaaccent
-	0219 scommaaccent
-	021A Tcommaaccent
-	021B tcommaaccent
-	02BC afii57929
-	02BD afii64937
-	02C6 circumflex
-	02C7 caron
-	02C9 macron
-	02D8 breve
-	02D9 dotaccent
-	02DA ring
-	02DB ogonek
-	02DC tilde
-	02DD hungarumlaut
-	0300 gravecomb
-	0301 acutecomb
-	0303 tildecomb
-	0309 hookabovecomb
-	0323 dotbelowcomb
-	0384 tonos
-	0385 dieresistonos
-	0386 Alphatonos
-	0387 anoteleia
-	0388 Epsilontonos
-	0389 Etatonos
-	038A Iotatonos
-	038C Omicrontonos
-	038E Upsilontonos
-	038F Omegatonos
-	0390 iotadieresistonos
-	0391 Alpha
-	0392 Beta
-	0393 Gamma
-	0394 Delta
-	0395 Epsilon
-	0396 Zeta
-	0397 Eta
-	0398 Theta
-	0399 Iota
-	039A Kappa
-	039B Lambda
-	039C Mu
-	039D Nu
-	039E Xi
-	039F Omicron
-	03A0 Pi
-	03A1 Rho
-	03A3 Sigma
-	03A4 Tau
-	03A5 Upsilon
-	03A6 Phi
-	03A7 Chi
-	03A8 Psi
-	03A9 Omega
-	03AA Iotadieresis
-	03AB Upsilondieresis
-	03AC alphatonos
-	03AD epsilontonos
-	03AE etatonos
-	03AF iotatonos
-	03B0 upsilondieresistonos
-	03B1 alpha
-	03B2 beta
-	03B3 gamma
-	03B4 delta
-	03B5 epsilon
-	03B6 zeta
-	03B7 eta
-	03B8 theta
-	03B9 iota
-	03BA kappa
-	03BB lambda
-	03BC mu
-	03BD nu
-	03BE xi
-	03BF omicron
-	03C0 pi
-	03C1 rho
-	03C2 sigma1
-	03C3 sigma
-	03C4 tau
-	03C5 upsilon
-	03C6 phi
-	03C7 chi
-	03C8 psi
-	03C9 omega
-	03CA iotadieresis
-	03CB upsilondieresis
-	03CC omicrontonos
-	03CD upsilontonos
-	03CE omegatonos
-	03D1 theta1
-	03D2 Upsilon1
-	03D5 phi1
-	03D6 omega1
-	0401 afii10023
-	0402 afii10051
-	0403 afii10052
-	0404 afii10053
-	0405 afii10054
-	0406 afii10055
-	0407 afii10056
-	0408 afii10057
-	0409 afii10058
-	040A afii10059
-	040B afii10060
-	040C afii10061
-	040E afii10062
-	040F afii10145
-	0410 afii10017
-	0411 afii10018
-	0412 afii10019
-	0413 afii10020
-	0414 afii10021
-	0415 afii10022
-	0416 afii10024
-	0417 afii10025
-	0418 afii10026
-	0419 afii10027
-	041A afii10028
-	041B afii10029
-	041C afii10030
-	041D afii10031
-	041E afii10032
-	041F afii10033
-	0420 afii10034
-	0421 afii10035
-	0422 afii10036
-	0423 afii10037
-	0424 afii10038
-	0425 afii10039
-	0426 afii10040
-	0427 afii10041
-	0428 afii10042
-	0429 afii10043
-	042A afii10044
-	042B afii10045
-	042C afii10046
-	042D afii10047
-	042E afii10048
-	042F afii10049
-	0430 afii10065
-	0431 afii10066
-	0432 afii10067
-	0433 afii10068
-	0434 afii10069
-	0435 afii10070
-	0436 afii10072
-	0437 afii10073
-	0438 afii10074
-	0439 afii10075
-	043A afii10076
-	043B afii10077
-	043C afii10078
-	043D afii10079
-	043E afii10080
-	043F afii10081
-	0440 afii10082
-	0441 afii10083
-	0442 afii10084
-	0443 afii10085
-	0444 afii10086
-	0445 afii10087
-	0446 afii10088
-	0447 afii10089
-	0448 afii10090
-	0449 afii10091
-	044A afii10092
-	044B afii10093
-	044C afii10094
-	044D afii10095
-	044E afii10096
-	044F afii10097
-	0451 afii10071
-	0452 afii10099
-	0453 afii10100
-	0454 afii10101
-	0455 afii10102
-	0456 afii10103
-	0457 afii10104
-	0458 afii10105
-	0459 afii10106
-	045A afii10107
-	045B afii10108
-	045C afii10109
-	045E afii10110
-	045F afii10193
-	0462 afii10146
-	0463 afii10194
-	0472 afii10147
-	0473 afii10195
-	0474 afii10148
-	0475 afii10196
-	0490 afii10050
-	0491 afii10098
-	04D9 afii10846
-	05B0 afii57799
-	05B1 afii57801
-	05B2 afii57800
-	05B3 afii57802
-	05B4 afii57793
-	05B5 afii57794
-	05B6 afii57795
-	05B7 afii57798
-	05B8 afii57797
-	05B9 afii57806
-	05BB afii57796
-	05BC afii57807
-	05BD afii57839
-	05BE afii57645
-	05BF afii57841
-	05C0 afii57842
-	05C1 afii57804
-	05C2 afii57803
-	05C3 afii57658
-	05D0 afii57664
-	05D1 afii57665
-	05D2 afii57666
-	05D3 afii57667
-	05D4 afii57668
-	05D5 afii57669
-	05D6 afii57670
-	05D7 afii57671
-	05D8 afii57672
-	05D9 afii57673
-	05DA afii57674
-	05DB afii57675
-	05DC afii57676
-	05DD afii57677
-	05DE afii57678
-	05DF afii57679
-	05E0 afii57680
-	05E1 afii57681
-	05E2 afii57682
-	05E3 afii57683
-	05E4 afii57684
-	05E5 afii57685
-	05E6 afii57686
-	05E7 afii57687
-	05E8 afii57688
-	05E9 afii57689
-	05EA afii57690
-	05F0 afii57716
-	05F1 afii57717
-	05F2 afii57718
-	060C afii57388
-	061B afii57403
-	061F afii57407
-	0621 afii57409
-	0622 afii57410
-	0623 afii57411
-	0624 afii57412
-	0625 afii57413
-	0626 afii57414
-	0627 afii57415
-	0628 afii57416
-	0629 afii57417
-	062A afii57418
-	062B afii57419
-	062C afii57420
-	062D afii57421
-	062E afii57422
-	062F afii57423
-	0630 afii57424
-	0631 afii57425
-	0632 afii57426
-	0633 afii57427
-	0634 afii57428
-	0635 afii57429
-	0636 afii57430
-	0637 afii57431
-	0638 afii57432
-	0639 afii57433
-	063A afii57434
-	0640 afii57440
-	0641 afii57441
-	0642 afii57442
-	0643 afii57443
-	0644 afii57444
-	0645 afii57445
-	0646 afii57446
-	0647 afii57470
-	0648 afii57448
-	0649 afii57449
-	064A afii57450
-	064B afii57451
-	064C afii57452
-	064D afii57453
-	064E afii57454
-	064F afii57455
-	0650 afii57456
-	0651 afii57457
-	0652 afii57458
-	0660 afii57392
-	0661 afii57393
-	0662 afii57394
-	0663 afii57395
-	0664 afii57396
-	0665 afii57397
-	0666 afii57398
-	0667 afii57399
-	0668 afii57400
-	0669 afii57401
-	066A afii57381
-	066D afii63167
-	0679 afii57511
-	067E afii57506
-	0686 afii57507
-	0688 afii57512
-	0691 afii57513
-	0698 afii57508
-	06A4 afii57505
-	06AF afii57509
-	06BA afii57514
-	06D2 afii57519
-	06D5 afii57534
-	1E80 Wgrave
-	1E81 wgrave
-	1E82 Wacute
-	1E83 wacute
-	1E84 Wdieresis
-	1E85 wdieresis
-	1EF2 Ygrave
-	1EF3 ygrave
-	200C afii61664
-	200D afii301
-	200E afii299
-	200F afii300
-	2012 figuredash
-	2013 endash
-	2014 emdash
-	2015 afii00208
-	2017 underscoredbl
-	2018 quoteleft
-	2019 quoteright
-	201A quotesinglbase
-	201B quotereversed
-	201C quotedblleft
-	201D quotedblright
-	201E quotedblbase
-	2020 dagger
-	2021 daggerdbl
-	2022 bullet
-	2024 onedotenleader
-	2025 twodotenleader
-	2026 ellipsis
-	202C afii61573
-	202D afii61574
-	202E afii61575
-	2030 perthousand
-	2032 minute
-	2033 second
-	2039 guilsinglleft
-	203A guilsinglright
-	203C exclamdbl
-	2044 fraction
-	2070 zerosuperior
-	2074 foursuperior
-	2075 fivesuperior
-	2076 sixsuperior
-	2077 sevensuperior
-	2078 eightsuperior
-	2079 ninesuperior
-	207D parenleftsuperior
-	207E parenrightsuperior
-	207F nsuperior
-	2080 zeroinferior
-	2081 oneinferior
-	2082 twoinferior
-	2083 threeinferior
-	2084 fourinferior
-	2085 fiveinferior
-	2086 sixinferior
-	2087 seveninferior
-	2088 eightinferior
-	2089 nineinferior
-	208D parenleftinferior
-	208E parenrightinferior
-	20A1 colonmonetary
-	20A3 franc
-	20A4 lira
-	20A7 peseta
-	20AA afii57636
-	20AB dong
-	20AC Euro
-	2105 afii61248
-	2111 Ifraktur
-	2113 afii61289
-	2116 afii61352
-	2118 weierstrass
-	211C Rfraktur
-	211E prescription
-	2122 trademark
-	2126 Omega
-	212E estimated
-	2135 aleph
-	2153 onethird
-	2154 twothirds
-	215B oneeighth
-	215C threeeighths
-	215D fiveeighths
-	215E seveneighths
-	2190 arrowleft
-	2191 arrowup
-	2192 arrowright
-	2193 arrowdown
-	2194 arrowboth
-	2195 arrowupdn
-	21A8 arrowupdnbse
-	21B5 carriagereturn
-	21D0 arrowdblleft
-	21D1 arrowdblup
-	21D2 arrowdblright
-	21D3 arrowdbldown
-	21D4 arrowdblboth
-	2200 universal
-	2202 partialdiff
-	2203 existential
-	2205 emptyset
-	2206 Delta
-	2207 gradient
-	2208 element
-	2209 notelement
-	220B suchthat
-	220F product
-	2211 summation
-	2212 minus
-	2215 fraction
-	2217 asteriskmath
-	2219 periodcentered
-	221A radical
-	221D proportional
-	221E infinity
-	221F orthogonal
-	2220 angle
-	2227 logicaland
-	2228 logicalor
-	2229 intersection
-	222A union
-	222B integral
-	2234 therefore
-	223C similar
-	2245 congruent
-	2248 approxequal
-	2260 notequal
-	2261 equivalence
-	2264 lessequal
-	2265 greaterequal
-	2282 propersubset
-	2283 propersuperset
-	2284 notsubset
-	2286 reflexsubset
-	2287 reflexsuperset
-	2295 circleplus
-	2297 circlemultiply
-	22A5 perpendicular
-	22C5 dotmath
-	2302 house
-	2310 revlogicalnot
-	2320 integraltp
-	2321 integralbt
-	2329 angleleft
-	232A angleright
-	2500 SF100000
-	2502 SF110000
-	250C SF010000
-	2510 SF030000
-	2514 SF020000
-	2518 SF040000
-	251C SF080000
-	2524 SF090000
-	252C SF060000
-	2534 SF070000
-	253C SF050000
-	2550 SF430000
-	2551 SF240000
-	2552 SF510000
-	2553 SF520000
-	2554 SF390000
-	2555 SF220000
-	2556 SF210000
-	2557 SF250000
-	2558 SF500000
-	2559 SF490000
-	255A SF380000
-	255B SF280000
-	255C SF270000
-	255D SF260000
-	255E SF360000
-	255F SF370000
-	2560 SF420000
-	2561 SF190000
-	2562 SF200000
-	2563 SF230000
-	2564 SF470000
-	2565 SF480000
-	2566 SF410000
-	2567 SF450000
-	2568 SF460000
-	2569 SF400000
-	256A SF540000
-	256B SF530000
-	256C SF440000
-	2580 upblock
-	2584 dnblock
-	2588 block
-	258C lfblock
-	2590 rtblock
-	2591 ltshade
-	2592 shade
-	2593 dkshade
-	25A0 filledbox
-	25A1 H22073
-	25AA H18543
-	25AB H18551
-	25AC filledrect
-	25B2 triagup
-	25BA triagrt
-	25BC triagdn
-	25C4 triaglf
-	25CA lozenge
-	25CB circle
-	25CF H18533
-	25D8 invbullet
-	25D9 invcircle
-	25E6 openbullet
-	263A smileface
-	263B invsmileface
-	263C sun
-	2640 female
-	2642 male
-	2660 spade
-	2663 club
-	2665 heart
-	2666 diamond
-	266A musicalnote
-	266B musicalnotedbl
-	F6BE dotlessj
-	F6BF LL
-	F6C0 ll
-	F6C1 Scedilla
-	F6C2 scedilla
-	F6C3 commaaccent
-	F6C4 afii10063
-	F6C5 afii10064
-	F6C6 afii10192
-	F6C7 afii10831
-	F6C8 afii10832
-	F6C9 Acute
-	F6CA Caron
-	F6CB Dieresis
-	F6CC DieresisAcute
-	F6CD DieresisGrave
-	F6CE Grave
-	F6CF Hungarumlaut
-	F6D0 Macron
-	F6D1 cyrBreve
-	F6D2 cyrFlex
-	F6D3 dblGrave
-	F6D4 cyrbreve
-	F6D5 cyrflex
-	F6D6 dblgrave
-	F6D7 dieresisacute
-	F6D8 dieresisgrave
-	F6D9 copyrightserif
-	F6DA registerserif
-	F6DB trademarkserif
-	F6DC onefitted
-	F6DD rupiah
-	F6DE threequartersemdash
-	F6DF centinferior
-	F6E0 centsuperior
-	F6E1 commainferior
-	F6E2 commasuperior
-	F6E3 dollarinferior
-	F6E4 dollarsuperior
-	F6E5 hypheninferior
-	F6E6 hyphensuperior
-	F6E7 periodinferior
-	F6E8 periodsuperior
-	F6E9 asuperior
-	F6EA bsuperior
-	F6EB dsuperior
-	F6EC esuperior
-	F6ED isuperior
-	F6EE lsuperior
-	F6EF msuperior
-	F6F0 osuperior
-	F6F1 rsuperior
-	F6F2 ssuperior
-	F6F3 tsuperior
-	F6F4 Brevesmall
-	F6F5 Caronsmall
-	F6F6 Circumflexsmall
-	F6F7 Dotaccentsmall
-	F6F8 Hungarumlautsmall
-	F6F9 Lslashsmall
-	F6FA OEsmall
-	F6FB Ogoneksmall
-	F6FC Ringsmall
-	F6FD Scaronsmall
-	F6FE Tildesmall
-	F6FF Zcaronsmall
-	F721 exclamsmall
-	F724 dollaroldstyle
-	F726 ampersandsmall
-	F730 zerooldstyle
-	F731 oneoldstyle
-	F732 twooldstyle
-	F733 threeoldstyle
-	F734 fouroldstyle
-	F735 fiveoldstyle
-	F736 sixoldstyle
-	F737 sevenoldstyle
-	F738 eightoldstyle
-	F739 nineoldstyle
-	F73F questionsmall
-	F760 Gravesmall
-	F761 Asmall
-	F762 Bsmall
-	F763 Csmall
-	F764 Dsmall
-	F765 Esmall
-	F766 Fsmall
-	F767 Gsmall
-	F768 Hsmall
-	F769 Ismall
-	F76A Jsmall
-	F76B Ksmall
-	F76C Lsmall
-	F76D Msmall
-	F76E Nsmall
-	F76F Osmall
-	F770 Psmall
-	F771 Qsmall
-	F772 Rsmall
-	F773 Ssmall
-	F774 Tsmall
-	F775 Usmall
-	F776 Vsmall
-	F777 Wsmall
-	F778 Xsmall
-	F779 Ysmall
-	F77A Zsmall
-	F7A1 exclamdownsmall
-	F7A2 centoldstyle
-	F7A8 Dieresissmall
-	F7AF Macronsmall
-	F7B4 Acutesmall
-	F7B8 Cedillasmall
-	F7BF questiondownsmall
-	F7E0 Agravesmall
-	F7E1 Aacutesmall
-	F7E2 Acircumflexsmall
-	F7E3 Atildesmall
-	F7E4 Adieresissmall
-	F7E5 Aringsmall
-	F7E6 AEsmall
-	F7E7 Ccedillasmall
-	F7E8 Egravesmall
-	F7E9 Eacutesmall
-	F7EA Ecircumflexsmall
-	F7EB Edieresissmall
-	F7EC Igravesmall
-	F7ED Iacutesmall
-	F7EE Icircumflexsmall
-	F7EF Idieresissmall
-	F7F0 Ethsmall
-	F7F1 Ntildesmall
-	F7F2 Ogravesmall
-	F7F3 Oacutesmall
-	F7F4 Ocircumflexsmall
-	F7F5 Otildesmall
-	F7F6 Odieresissmall
-	F7F8 Oslashsmall
-	F7F9 Ugravesmall
-	F7FA Uacutesmall
-	F7FB Ucircumflexsmall
-	F7FC Udieresissmall
-	F7FD Yacutesmall
-	F7FE Thornsmall
-	F7FF Ydieresissmall
-	F8E5 radicalex
-	F8E6 arrowvertex
-	F8E7 arrowhorizex
-	F8E8 registersans
-	F8E9 copyrightsans
-	F8EA trademarksans
-	F8EB parenlefttp
-	F8EC parenleftex
-	F8ED parenleftbt
-	F8EE bracketlefttp
-	F8EF bracketleftex
-	F8F0 bracketleftbt
-	F8F1 bracelefttp
-	F8F2 braceleftmid
-	F8F3 braceleftbt
-	F8F4 braceex
-	F8F5 integralex
-	F8F6 parenrighttp
-	F8F7 parenrightex
-	F8F8 parenrightbt
-	F8F9 bracketrighttp
-	F8FA bracketrightex
-	F8FB bracketrightbt
-	F8FC bracerighttp
-	F8FD bracerightmid
-	F8FE bracerightbt
-	FB00 ff
-	FB01 fi
-	FB02 fl
-	FB03 ffi
-	FB04 ffl
-	FB1F afii57705
-	FB2A afii57694
-	FB2B afii57695
-	FB35 afii57723
-	FB4B afii57700
-    }
-
-    variable ps_preamble {}
-
-    namespace eval ps {
-	namespace ensemble create
-	namespace export {[a-z]*}
-	proc literal {string} {
-	    upvar 0 ::tk::ps_preamble preamble
-	    foreach line [split $string \n] {
-		set line [string trim $line]
-		if {$line eq ""} continue
-		append preamble $line \n
-	    }
-	    return
-	}
-	proc variable {name value} {
-	    upvar 0 ::tk::ps_preamble preamble
-	    append preamble "/$name $value def\n"
-	    return
-	}
-	proc function {name body} {
-	    upvar 0 ::tk::ps_preamble preamble
-	    append preamble "/$name \{"
-	    foreach line [split $body \n] {
-		set line [string trim $line]
-		# Strip blank lines and comments from the bodies of functions
-		if {$line eq "" } continue
-		if {[string match {[%#]*} $line]} continue
-		append preamble $line " "
-	    }
-	    append preamble "\} bind def\n"
-	    return
-	}
-    }
-
-    ps literal {
-	%%BeginProlog
-	% This is a standard prolog for Postscript generated by Tk's canvas
-	% widget.
-    }
-    ps variable CurrentEncoding [CreatePostscriptEncoding]
-    ps literal {50 dict begin}
-
-    # The definitions below just define all of the variables used in any of
-    # the procedures here. This is needed for obscure reasons explained on
-    # p. 716 of the Postscript manual (Section H.2.7, "Initializing
-    # Variables," in the section on Encapsulated Postscript).
-    ps variable baseline 0
-    ps variable stipimage 0
-    ps variable height 0
-    ps variable justify 0
-    ps variable lineLength 0
-    ps variable spacing 0
-    ps variable stipple 0
-    ps variable strings 0
-    ps variable xoffset 0
-    ps variable yoffset 0
-    ps variable tmpstip null
-    ps variable baselineSampler "( TXygqPZ)"
-    # Put an extra-tall character in; done this way to avoid encoding trouble
-    ps literal {baselineSampler 0 196 put}
-
-    ps function cstringshow {
-	{
-	    dup type /stringtype eq
-	    { show } { glyphshow }
-	    ifelse
-	} forall
-    }
-
-    ps function cstringwidth {
-	0 exch 0 exch
-	{
-	    dup type /stringtype eq
-	    { stringwidth } {
-		currentfont /Encoding get exch 1 exch put (\001)
-		stringwidth
-	    }
-	    ifelse
-	    exch 3 1 roll add 3 1 roll add exch
-	} forall
-    }
-
-    # font ISOEncode font
-    #
-    # This procedure changes the encoding of a font from the default
-    # Postscript encoding to current system encoding. It's typically invoked
-    # just before invoking "setfont". The body of this procedure comes from
-    # Section 5.6.1 of the Postscript book.
-    ps function ISOEncode {
-	dup length dict begin
-	{1 index /FID ne {def} {pop pop} ifelse} forall
-	/Encoding CurrentEncoding def
-	currentdict
-	end
-	% I'm not sure why it's necessary to use "definefont" on this new
-	% font, but it seems to be important; just use the name "Temporary"
-	% for the font.
-	/Temporary exch definefont
-    }
-
-    # StrokeClip
-    #
-    # This procedure converts the current path into a clip area under the
-    # assumption of stroking. It's a bit tricky because some Postscript
-    # interpreters get errors during strokepath for dashed lines. If this
-    # happens then turn off dashes and try again.
-    ps function StrokeClip {
-	{strokepath} stopped {
-	    (This Postscript printer gets limitcheck overflows when) =
-	    (stippling dashed lines;  lines will be printed solid instead.) =
-	    [] 0 setdash strokepath} if
-	clip
-    }
-
-    # desiredSize EvenPixels closestSize
-    #
-    # The procedure below is used for stippling. Given the optimal size of a
-    # dot in a stipple pattern in the current user coordinate system, compute
-    # the closest size that is an exact multiple of the device's pixel
-    # size. This allows stipple patterns to be displayed without aliasing
-    # effects.
-    ps function EvenPixels {
-	% Compute exact number of device pixels per stipple dot.
-	dup 0 matrix currentmatrix dtransform
-	dup mul exch dup mul add sqrt
-	% Round to an integer, make sure the number is at least 1, and
-	% compute user coord distance corresponding to this.
-	dup round dup 1 lt {pop 1} if
-	exch div mul
-    }
-
-    # width height string StippleFill --
-    #
-    # Given a path already set up and a clipping region generated from it,
-    # this procedure will fill the clipping region with a stipple pattern.
-    # "String" contains a proper image description of the stipple pattern and
-    # "width" and "height" give its dimensions. Each stipple dot is assumed to
-    # be about one unit across in the current user coordinate system. This
-    # procedure trashes the graphics state.
-    ps function StippleFill {
-	% The following code is needed to work around a NeWSprint bug.
-	/tmpstip 1 index def
-	% Change the scaling so that one user unit in user coordinates
-	% corresponds to the size of one stipple dot.
-	1 EvenPixels dup scale
-	% Compute the bounding box occupied by the path (which is now the
-	% clipping region), and round the lower coordinates down to the
-	% nearest starting point for the stipple pattern. Be careful about
-	% negative numbers, since the rounding works differently on them.
-	pathbbox
-	4 2 roll
-	5 index div dup 0 lt {1 sub} if cvi 5 index mul 4 1 roll
-	6 index div dup 0 lt {1 sub} if cvi 6 index mul 3 2 roll
-	% Stack now: width height string y1 y2 x1 x2
-	% Below is a doubly-nested for loop to iterate across this area
-	% in units of the stipple pattern size, going up columns then
-	% across rows, blasting out a stipple-pattern-sized rectangle at
-	% each position
-	6 index exch {
-	    2 index 5 index 3 index {
-		% Stack now: width height string y1 y2 x y
-		gsave
-		1 index exch translate
-		5 index 5 index true matrix tmpstip imagemask
-		grestore
-	    } for
-	    pop
-	} for
-	pop pop pop pop pop
-    }
-
-    # -- AdjustColor --
-    #
-    # Given a color value already set for output by the caller, adjusts that
-    # value to a grayscale or mono value if requested by the CL variable.
-    ps function AdjustColor {
-	CL 2 lt {
-	    currentgray
-	    CL 0 eq {
-		.5 lt {0} {1} ifelse
-	    } if
-	    setgray
-	} if
-    }
-
-    # x y strings spacing xoffset yoffset justify stipple DrawText --
-    #
-    # This procedure does all of the real work of drawing text. The color and
-    # font must already have been set by the caller, and the following
-    # arguments must be on the stack:
-    #
-    # x, y -	Coordinates at which to draw text.
-    # strings - An array of strings, one for each line of the text item, in
-    #		order from top to bottom.
-    # spacing -	Spacing between lines.
-    # xoffset - Horizontal offset for text bbox relative to x and y: 0 for
-    #		nw/w/sw anchor, -0.5 for n/center/s, and -1.0 for ne/e/se.
-    # yoffset - Vertical offset for text bbox relative to x and y: 0 for
-    #		nw/n/ne anchor, +0.5 for w/center/e, and +1.0 for sw/s/se.
-    # justify - 0 for left justification, 0.5 for center, 1 for right justify.
-    # stipple - Boolean value indicating whether or not text is to be drawn in
-    #		stippled fashion. If text is stippled, function StippleText
-    #		must have been defined to call StippleFill in the right way.
-    #
-    # Also, when this procedure is invoked, the color and font must already
-    # have been set for the text.
-    ps function DrawText {
-	/stipple exch def
-	/justify exch def
-	/yoffset exch def
-	/xoffset exch def
-	/spacing exch def
-	/strings exch def
-	% First scan through all of the text to find the widest line.
-	/lineLength 0 def
-	strings {
-	    cstringwidth pop
-	    dup lineLength gt {/lineLength exch def} {pop} ifelse
-	    newpath
-	} forall
-	% Compute the baseline offset and the actual font height.
-	0 0 moveto baselineSampler false charpath
-	pathbbox dup /baseline exch def
-	exch pop exch sub /height exch def pop
-	newpath
-	% Translate and rotate coordinates first so that the origin is at
-	% the upper-left corner of the text's bounding box. Remember that
-	% angle for rotating, and x and y for positioning are still on the
-	% stack.
-	translate
-	rotate
-	lineLength xoffset mul
-	strings length 1 sub spacing mul height add yoffset mul translate
-	% Now use the baseline and justification information to translate
-	% so that the origin is at the baseline and positioning point for
-	% the first line of text.
-	justify lineLength mul baseline neg translate
-	% Iterate over each of the lines to output it.  For each line,
-	% compute its width again so it can be properly justified, then
-	% display it.
-	strings {
-	    dup cstringwidth pop
-	    justify neg mul 0 moveto
-	    stipple {
-		% The text is stippled, so turn it into a path and print
-		% by calling StippledText, which in turn calls
-		% StippleFill. Unfortunately, many Postscript interpreters
-		% will get overflow errors if we try to do the whole
-		% string at once, so do it a character at a time.
-		gsave
-		/char (X) def
-		{
-		    dup type /stringtype eq {
-			% This segment is a string.
-			{
-			    char 0 3 -1 roll put
-			    currentpoint
-			    gsave
-			    char true charpath clip StippleText
-			    grestore
-			    char stringwidth translate
-			    moveto
-			} forall
-		    } {
-			% This segment is glyph name
-			% Temporary override
-			currentfont /Encoding get exch 1 exch put
-			currentpoint
-			gsave (\001) true charpath clip StippleText
-			grestore
-			(\001) stringwidth translate
-			moveto
-		    } ifelse
-		} forall
-		grestore
-	    } {cstringshow} ifelse
-	    0 spacing neg translate
-	} forall
-    }
-
-    # Define the "TkPhoto" function variants, which are modified versions
-    # of the original "transparentimage" function posted by ian@five-d.com
-    # (Ian Kemmish) to comp.lang.postscript. For a monochrome colorLevel
-    # this is a slightly different version that uses the imagemask command
-    # instead of image.
-
-    ps function TkPhotoColor {
-	gsave
-	32 dict begin
-	/tinteger exch def
-	/transparent 1 string def
-	transparent 0 tinteger put
-	/olddict exch def
-	olddict /DataSource get dup type /filetype ne {
-	    olddict /DataSource 3 -1 roll
-	    0 () /SubFileDecode filter put
-	} {
-	    pop
-	} ifelse
-	/newdict olddict maxlength dict def
-	olddict newdict copy pop
-	/w newdict /Width get def
-	/crpp newdict /Decode get length 2 idiv def
-	/str w string def
-	/pix w crpp mul string def
-	/substrlen 2 w log 2 log div floor exp cvi def
-	/substrs [ {
-	    substrlen string
-	    0 1 substrlen 1 sub {
-		1 index exch tinteger put
-	    } for
-	    /substrlen substrlen 2 idiv def
-	    substrlen 0 eq {exit} if
-	} loop ] def
-	/h newdict /Height get def
-	1 w div 1 h div matrix scale
-	olddict /ImageMatrix get exch matrix concatmatrix
-	matrix invertmatrix concat
-	newdict /Height 1 put
-	newdict /DataSource pix put
-	/mat [w 0 0 h 0 0] def
-	newdict /ImageMatrix mat put
-	0 1 h 1 sub {
-	    mat 5 3 -1 roll neg put
-	    olddict /DataSource get str readstring pop pop
-	    /tail str def
-	    /x 0 def
-	    olddict /DataSource get pix readstring pop pop
-	    {
-		tail transparent search dup /done exch not def
-		{exch pop exch pop} if
-		/w1 exch length def
-		w1 0 ne {
-		    newdict /DataSource
-		    pix x crpp mul w1 crpp mul getinterval put
-		    newdict /Width w1 put
-		    mat 4 x neg put
-		    /x x w1 add def
-		    newdict image
-		    /tail tail w1 tail length w1 sub getinterval def
-		} if
-		done {exit} if
-		tail substrs {
-		    anchorsearch {pop} if
-		} forall
-		/tail exch def
-		tail length 0 eq {exit} if
-		/x w tail length sub def
-	    } loop
-	} for
-	end
-	grestore
-    }
-    ps function TkPhotoMono {
-	gsave
-	32 dict begin
-	/dummyInteger exch def
-	/olddict exch def
-	olddict /DataSource get dup type /filetype ne {
-	    olddict /DataSource 3 -1 roll
-	    0 () /SubFileDecode filter put
-	} {
-	    pop
-	} ifelse
-	/newdict olddict maxlength dict def
-	olddict newdict copy pop
-	/w newdict /Width get def
-	/pix w 7 add 8 idiv string def
-	/h newdict /Height get def
-	1 w div 1 h div matrix scale
-	olddict /ImageMatrix get exch matrix concatmatrix
-	matrix invertmatrix concat
-	newdict /Height 1 put
-	newdict /DataSource pix put
-	/mat [w 0 0 h 0 0] def
-	newdict /ImageMatrix mat put
-	0 1 h 1 sub {
-	    mat 5 3 -1 roll neg put
-	    0.000 0.000 0.000 setrgbcolor
-	    olddict /DataSource get pix readstring pop pop
-	    newdict /DataSource pix put
-	    newdict imagemask
-	    1.000 1.000 1.000 setrgbcolor
-	    olddict /DataSource get pix readstring pop pop
-	    newdict /DataSource pix put
-	    newdict imagemask
-	} for
-	end
-	grestore
-    }
-
-    ps literal %%EndProlog
-}
-
-proc tk::ensure_psenc_is_loaded {} {
-}
diff --git a/tk8.6/library/msgbox.tcl b/tk8.6/library/msgbox.tcl
deleted file mode 100644
index 6d329c2..0000000
--- a/tk8.6/library/msgbox.tcl
+++ /dev/null
@@ -1,429 +0,0 @@
-# msgbox.tcl --
-#
-#	Implements messageboxes for platforms that do not have native
-#	messagebox support.
-#
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-# Ensure existence of ::tk::dialog namespace
-#
-namespace eval ::tk::dialog {}
-
-image create bitmap ::tk::dialog::b1 -foreground black \
--data "#define b1_width 32\n#define b1_height 32
-static unsigned char q1_bits[] = {
-   0x00, 0xf8, 0x1f, 0x00, 0x00, 0x07, 0xe0, 0x00, 0xc0, 0x00, 0x00, 0x03,
-   0x20, 0x00, 0x00, 0x04, 0x10, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x10,
-   0x04, 0x00, 0x00, 0x20, 0x02, 0x00, 0x00, 0x40, 0x02, 0x00, 0x00, 0x40,
-   0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x80,
-   0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x80,
-   0x01, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x40, 0x02, 0x00, 0x00, 0x40,
-   0x04, 0x00, 0x00, 0x20, 0x08, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x08,
-   0x60, 0x00, 0x00, 0x04, 0x80, 0x03, 0x80, 0x03, 0x00, 0x0c, 0x78, 0x00,
-   0x00, 0x30, 0x04, 0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x40, 0x04, 0x00,
-   0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};"
-image create bitmap ::tk::dialog::b2 -foreground white \
--data "#define b2_width 32\n#define b2_height 32
-static unsigned char b2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x00,
-   0xc0, 0xff, 0xff, 0x03, 0xe0, 0xff, 0xff, 0x07, 0xf0, 0xff, 0xff, 0x0f,
-   0xf8, 0xff, 0xff, 0x1f, 0xfc, 0xff, 0xff, 0x3f, 0xfc, 0xff, 0xff, 0x3f,
-   0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f,
-   0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f,
-   0xfe, 0xff, 0xff, 0x7f, 0xfc, 0xff, 0xff, 0x3f, 0xfc, 0xff, 0xff, 0x3f,
-   0xf8, 0xff, 0xff, 0x1f, 0xf0, 0xff, 0xff, 0x0f, 0xe0, 0xff, 0xff, 0x07,
-   0x80, 0xff, 0xff, 0x03, 0x00, 0xfc, 0x7f, 0x00, 0x00, 0xf0, 0x07, 0x00,
-   0x00, 0xc0, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00,
-   0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};"
-image create bitmap ::tk::dialog::q -foreground blue \
--data "#define q_width 32\n#define q_height 32
-static unsigned char q_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00,
-   0x00, 0x10, 0x0f, 0x00, 0x00, 0x18, 0x1e, 0x00, 0x00, 0x38, 0x1e, 0x00,
-   0x00, 0x38, 0x1e, 0x00, 0x00, 0x10, 0x0f, 0x00, 0x00, 0x80, 0x07, 0x00,
-   0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00,
-   0x00, 0xe0, 0x01, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};"
-image create bitmap ::tk::dialog::i -foreground blue \
--data "#define i_width 32\n#define i_height 32
-static unsigned char i_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xe0, 0x01, 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0xf0, 0x03, 0x00,
-   0x00, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf8, 0x03, 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0xe0, 0x03, 0x00,
-   0x00, 0xe0, 0x03, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x00, 0xe0, 0x03, 0x00,
-   0x00, 0xe0, 0x03, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x00, 0xf0, 0x07, 0x00,
-   0x00, 0xf8, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};"
-image create bitmap ::tk::dialog::w1 -foreground black \
--data "#define w1_width 32\n#define w1_height 32
-static unsigned char w1_bits[] = {
-   0x00, 0x80, 0x01, 0x00, 0x00, 0x40, 0x02, 0x00, 0x00, 0x20, 0x04, 0x00,
-   0x00, 0x10, 0x04, 0x00, 0x00, 0x10, 0x08, 0x00, 0x00, 0x08, 0x08, 0x00,
-   0x00, 0x08, 0x10, 0x00, 0x00, 0x04, 0x10, 0x00, 0x00, 0x04, 0x20, 0x00,
-   0x00, 0x02, 0x20, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x01, 0x40, 0x00,
-   0x00, 0x01, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x01,
-   0x40, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x02, 0x20, 0x00, 0x00, 0x02,
-   0x20, 0x00, 0x00, 0x04, 0x10, 0x00, 0x00, 0x04, 0x10, 0x00, 0x00, 0x08,
-   0x08, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x10, 0x04, 0x00, 0x00, 0x10,
-   0x04, 0x00, 0x00, 0x20, 0x02, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x40,
-   0x01, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x40, 0x02, 0x00, 0x00, 0x20,
-   0xfc, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00};"
-image create bitmap ::tk::dialog::w2 -foreground yellow \
--data "#define w2_width 32\n#define w2_height 32
-static unsigned char w2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0xc0, 0x03, 0x00,
-   0x00, 0xe0, 0x03, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, 0xf0, 0x07, 0x00,
-   0x00, 0xf0, 0x0f, 0x00, 0x00, 0xf8, 0x0f, 0x00, 0x00, 0xf8, 0x1f, 0x00,
-   0x00, 0xfc, 0x1f, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00, 0xfe, 0x3f, 0x00,
-   0x00, 0xfe, 0x7f, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0xff, 0xff, 0x00,
-   0x80, 0xff, 0xff, 0x00, 0x80, 0xff, 0xff, 0x01, 0xc0, 0xff, 0xff, 0x01,
-   0xc0, 0xff, 0xff, 0x03, 0xe0, 0xff, 0xff, 0x03, 0xe0, 0xff, 0xff, 0x07,
-   0xf0, 0xff, 0xff, 0x07, 0xf0, 0xff, 0xff, 0x0f, 0xf8, 0xff, 0xff, 0x0f,
-   0xf8, 0xff, 0xff, 0x1f, 0xfc, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0x3f,
-   0xfe, 0xff, 0xff, 0x3f, 0xfe, 0xff, 0xff, 0x3f, 0xfc, 0xff, 0xff, 0x1f,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};"
-image create bitmap ::tk::dialog::w3 -foreground black \
--data "#define w3_width 32\n#define w3_height 32
-static unsigned char w3_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xc0, 0x03, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, 0xe0, 0x07, 0x00,
-   0x00, 0xe0, 0x07, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, 0xe0, 0x07, 0x00,
-   0x00, 0xc0, 0x03, 0x00, 0x00, 0xc0, 0x03, 0x00, 0x00, 0xc0, 0x03, 0x00,
-   0x00, 0x80, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0xc0, 0x03, 0x00,
-   0x00, 0xc0, 0x03, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};"
-
-# ::tk::MessageBox --
-#
-#	Pops up a messagebox with an application-supplied message with
-#	an icon and a list of buttons. This procedure will be called
-#	by tk_messageBox if the platform does not have native
-#	messagebox support, or if the particular type of messagebox is
-#	not supported natively.
-#
-#	Color icons are used on Unix displays that have a color
-#	depth of 4 or more and $tk_strictMotif is not on.
-#
-#	This procedure is a private procedure shouldn't be called
-#	directly. Call tk_messageBox instead.
-#
-#	See the user documentation for details on what tk_messageBox does.
-#
-proc ::tk::MessageBox {args} {
-    global tk_strictMotif
-    variable ::tk::Priv
-
-    set w ::tk::PrivMsgBox
-    upvar $w data
-
-    #
-    # The default value of the title is space (" ") not the empty string
-    # because for some window managers, a
-    #		wm title .foo ""
-    # causes the window title to be "foo" instead of the empty string.
-    #
-    set specs {
-	{-default "" "" ""}
-	{-detail "" "" ""}
-        {-icon "" "" "info"}
-        {-message "" "" ""}
-        {-parent "" "" .}
-        {-title "" "" " "}
-        {-type "" "" "ok"}
-    }
-
-    tclParseConfigSpec $w $specs "" $args
-
-    if {$data(-icon) ni {info warning error question}} {
-	return -code error -errorcode [list TK LOOKUP ICON $data(-icon)] \
-	    "bad -icon value \"$data(-icon)\": must be error, info, question, or warning"
-    }
-    set windowingsystem [tk windowingsystem]
-    if {$windowingsystem eq "aqua"} {
-	switch -- $data(-icon) {
-	    "error"     {set data(-icon) "stop"}
-	    "warning"   {set data(-icon) "caution"}
-	    "info"      {set data(-icon) "note"}
-	}
-	option add *Dialog*background systemDialogBackgroundActive widgetDefault
-	option add *Dialog*Button.highlightBackground \
-		systemDialogBackgroundActive widgetDefault
-    }
-
-    if {![winfo exists $data(-parent)]} {
-	return -code error -errorcode [list TK LOOKUP WINDOW $data(-parent)] \
-	    "bad window path name \"$data(-parent)\""
-    }
-
-    switch -- $data(-type) {
-	abortretryignore {
-	    set names [list abort retry ignore]
-	    set labels [list &Abort &Retry &Ignore]
-	    set cancel abort
-	}
-	ok {
-	    set names [list ok]
-	    set labels {&OK}
-	    set cancel ok
-	}
-	okcancel {
-	    set names [list ok cancel]
-	    set labels [list &OK &Cancel]
-	    set cancel cancel
-	}
-	retrycancel {
-	    set names [list retry cancel]
-	    set labels [list &Retry &Cancel]
-	    set cancel cancel
-	}
-	yesno {
-	    set names [list yes no]
-	    set labels [list &Yes &No]
-	    set cancel no
-	}
-	yesnocancel {
-	    set names [list yes no cancel]
-	    set labels [list &Yes &No &Cancel]
-	    set cancel cancel
-	}
-	default {
-	    return -code error -errorcode [list TK LOOKUP DLG_TYPE $data(-type)] \
-		"bad -type value \"$data(-type)\": must be\
-		abortretryignore, ok, okcancel, retrycancel,\
-		yesno, or yesnocancel"
-	}
-    }
-
-    set buttons {}
-    foreach name $names lab $labels {
-	lappend buttons [list $name -text [mc $lab]]
-    }
-
-    # If no default button was specified, the default default is the
-    # first button (Bug: 2218).
-
-    if {$data(-default) eq ""} {
-	set data(-default) [lindex [lindex $buttons 0] 0]
-    }
-
-    set valid 0
-    foreach btn $buttons {
-	if {[lindex $btn 0] eq $data(-default)} {
-	    set valid 1
-	    break
-	}
-    }
-    if {!$valid} {
-	return -code error -errorcode {TK MSGBOX DEFAULT} \
-	    "invalid default button \"$data(-default)\""
-    }
-
-    # 2. Set the dialog to be a child window of $parent
-    #
-    #
-    if {$data(-parent) ne "."} {
-	set w $data(-parent).__tk__messagebox
-    } else {
-	set w .__tk__messagebox
-    }
-
-    # There is only one background colour for the whole dialog
-    set bg [ttk::style lookup . -background]
-
-    # 3. Create the top-level window and divide it into top
-    # and bottom parts.
-
-    catch {destroy $w}
-    toplevel $w -class Dialog -bg $bg
-    wm title $w $data(-title)
-    wm iconname $w Dialog
-    wm protocol $w WM_DELETE_WINDOW [list $w.$cancel invoke]
-
-    # Message boxes should be transient with respect to their parent so that
-    # they always stay on top of the parent window.  But some window managers
-    # will simply create the child window as withdrawn if the parent is not
-    # viewable (because it is withdrawn or iconified).  This is not good for
-    # "grab"bed windows.  So only make the message box transient if the parent
-    # is viewable.
-    #
-    if {[winfo viewable [winfo toplevel $data(-parent)]] } {
-	wm transient $w $data(-parent)
-    }
-
-    if {$windowingsystem eq "aqua"} {
-	::tk::unsupported::MacWindowStyle style $w moveableModal {}
-    } elseif {$windowingsystem eq "x11"} {
-        wm attributes $w -type dialog
-    }
-
-    ttk::frame $w.bot
-    grid anchor $w.bot center
-    pack $w.bot -side bottom -fill both
-    ttk::frame $w.top
-    pack $w.top -side top -fill both -expand 1
-
-    # 4. Fill the top part with bitmap, message and detail (use the
-    # option database for -wraplength and -font so that they can be
-    # overridden by the caller).
-
-    option add *Dialog.msg.wrapLength 3i widgetDefault
-    option add *Dialog.dtl.wrapLength 3i widgetDefault
-    option add *Dialog.msg.font TkCaptionFont widgetDefault
-    option add *Dialog.dtl.font TkDefaultFont widgetDefault
-
-    ttk::label $w.msg -anchor nw -justify left -text $data(-message)
-    if {$data(-detail) ne ""} {
-	ttk::label $w.dtl -anchor nw -justify left -text $data(-detail)
-    }
-    if {$data(-icon) ne ""} {
-	if {([winfo depth $w] < 4) || $tk_strictMotif} {
-	    # ttk::label has no -bitmap option
-	    label $w.bitmap -bitmap $data(-icon) -background $bg
-	} else {
-	    switch $data(-icon) {
-                error {
-                    ttk::label $w.bitmap -image ::tk::icons::error
-                }
-                info {
-                    ttk::label $w.bitmap -image ::tk::icons::information
-                }
-                question {
-                    ttk::label $w.bitmap -image ::tk::icons::question
-                }
-                default {
-                    ttk::label $w.bitmap -image ::tk::icons::warning
-                }
-	    }
-	}
-    }
-    grid $w.bitmap $w.msg -in $w.top -sticky news -padx 2m -pady 2m
-    grid configure $w.bitmap -sticky nw
-    grid columnconfigure $w.top 1 -weight 1
-    if {$data(-detail) ne ""} {
-	grid ^ $w.dtl -in $w.top -sticky news -padx 2m -pady {0 2m}
-	grid rowconfigure $w.top 1 -weight 1
-    } else {
-	grid rowconfigure $w.top 0 -weight 1
-    }
-
-    # 5. Create a row of buttons at the bottom of the dialog.
-
-    set i 0
-    foreach but $buttons {
-	set name [lindex $but 0]
-	set opts [lrange $but 1 end]
-	if {![llength $opts]} {
-	    # Capitalize the first letter of $name
-	    set capName [string toupper $name 0]
-	    set opts [list -text $capName]
-	}
-
-	eval [list tk::AmpWidget ttk::button $w.$name] $opts \
-		[list -command [list set tk::Priv(button) $name]]
-
-	if {$name eq $data(-default)} {
-	    $w.$name configure -default active
-	} else {
-	    $w.$name configure -default normal
-	}
-	grid $w.$name -in $w.bot -row 0 -column $i -padx 3m -pady 2m -sticky ew
-	grid columnconfigure $w.bot $i -uniform buttons
-	# We boost the size of some Mac buttons for l&f
-	if {$windowingsystem eq "aqua"} {
-	    set tmp [string tolower $name]
-	    if {$tmp eq "ok" || $tmp eq "cancel" || $tmp eq "yes" ||
-		    $tmp eq "no" || $tmp eq "abort" || $tmp eq "retry" ||
-		    $tmp eq "ignore"} {
-		grid columnconfigure $w.bot $i -minsize 90
-	    }
-	    grid configure $w.$name -pady 7
-	}
-        incr i
-
-	# create the binding for the key accelerator, based on the underline
-	#
-        # set underIdx [$w.$name cget -under]
-        # if {$underIdx >= 0} {
-        #     set key [string index [$w.$name cget -text] $underIdx]
-        #     bind $w <Alt-[string tolower $key]>  [list $w.$name invoke]
-        #     bind $w <Alt-[string toupper $key]>  [list $w.$name invoke]
-        # }
-    }
-    bind $w <Alt-Key> [list ::tk::AltKeyInDialog $w %A]
-
-    if {$data(-default) ne ""} {
-	bind $w <FocusIn> {
-	    if {[winfo class %W] in "Button TButton"} {
-		%W configure -default active
-	    }
-	}
-	bind $w <FocusOut> {
-	    if {[winfo class %W] in "Button TButton"} {
-		%W configure -default normal
-	    }
-	}
-    }
-
-    # 6. Create bindings for <Return>, <Escape> and <Destroy> on the dialog
-
-    bind $w <Return> {
-	if {[winfo class %W] in "Button TButton"} {
-	    %W invoke
-	}
-    }
-
-    # Invoke the designated cancelling operation
-    bind $w <Escape> [list $w.$cancel invoke]
-
-    # At <Destroy> the buttons have vanished, so must do this directly.
-    bind $w.msg <Destroy> [list set tk::Priv(button) $cancel]
-
-    # 7. Withdraw the window, then update all the geometry information
-    # so we know how big it wants to be, then center the window in the
-    # display (Motif style) and de-iconify it.
-
-    ::tk::PlaceWindow $w widget $data(-parent)
-
-    # 8. Set a grab and claim the focus too.
-
-    if {$data(-default) ne ""} {
-	set focus $w.$data(-default)
-    } else {
-	set focus $w
-    }
-    ::tk::SetFocusGrab $w $focus
-
-    # 9. Wait for the user to respond, then restore the focus and
-    # return the index of the selected button.  Restore the focus
-    # before deleting the window, since otherwise the window manager
-    # may take the focus away so we can't redirect it.  Finally,
-    # restore any grab that was in effect.
-
-    vwait ::tk::Priv(button)
-    # Copy the result now so any <Destroy> that happens won't cause
-    # trouble
-    set result $Priv(button)
-
-    ::tk::RestoreFocusGrab $w $focus
-
-    return $result
-}
diff --git a/tk8.6/library/msgs/cs.msg b/tk8.6/library/msgs/cs.msg
deleted file mode 100644
index d6be730..0000000
--- a/tk8.6/library/msgs/cs.msg
+++ /dev/null
@@ -1,77 +0,0 @@
-namespace eval ::tk {
-    ::msgcat::mcset cs "&Abort" "&P\u0159eru\u0161it"
-    ::msgcat::mcset cs "&About..." "&O programu..."
-    ::msgcat::mcset cs "All Files" "V\u0161echny soubory"
-    ::msgcat::mcset cs "Application Error" "Chyba programu"
-    ::msgcat::mcset cs "Bold Italic"
-    ::msgcat::mcset cs "&Blue" "&Modr\341"
-    ::msgcat::mcset cs "Cancel" "Zru\u0161it"
-    ::msgcat::mcset cs "&Cancel" "&Zru\u0161it"
-    ::msgcat::mcset cs "Cannot change to the directory \"%1\$s\".\nPermission denied." "Nemohu zm\u011bnit atku\341ln\355 adres\341\u0159 na \"%1\$s\".\nP\u0159\355stup odm\355tnut."
-    ::msgcat::mcset cs "Choose Directory" "V\375b\u011br adres\341\u0159e"
-    ::msgcat::mcset cs "Cl&ear" "Sma&zat"
-    ::msgcat::mcset cs "&Clear Console" "&Smazat konzolu"
-    ::msgcat::mcset cs "Color" "Barva"
-    ::msgcat::mcset cs "Console" "Konzole"
-    ::msgcat::mcset cs "&Copy" "&Kop\355rovat"
-    ::msgcat::mcset cs "Cu&t" "V&y\u0159\355znout"
-    ::msgcat::mcset cs "&Delete" "&Smazat"
-    ::msgcat::mcset cs "Details >>" "Detaily >>"
-    ::msgcat::mcset cs "Directory \"%1\$s\" does not exist." "Adres\341\u0159 \"%1\$s\" neexistuje."
-    ::msgcat::mcset cs "&Directory:" "&Adres\341\u0159:"
-    ::msgcat::mcset cs "&Edit" "&\332pravy"
-    ::msgcat::mcset cs "Error: %1\$s" "Chyba: %1\$s"
-    ::msgcat::mcset cs "E&xit" "&Konec"
-    ::msgcat::mcset cs "&File" "&Soubor"
-    ::msgcat::mcset cs "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Soubor \"%1\$s\" ji\u017e existuje.\nChcete jej p\u0159epsat?"
-    ::msgcat::mcset cs "File \"%1\$s\" already exists.\n\n" "Soubor \"%1\$s\" ji\u017e existuje.\n\n"
-    ::msgcat::mcset cs "File \"%1\$s\" does not exist." "Soubor \"%1\$s\" neexistuje."
-    ::msgcat::mcset cs "File &name:" "&Jm\351no souboru:"
-    ::msgcat::mcset cs "File &names:" "&Jm\351na soubor\u016f:"
-    ::msgcat::mcset cs "Files of &type:" "&Typy soubor\u016f:"
-    ::msgcat::mcset cs "Fi&les:" "Sou&bory:"
-    ::msgcat::mcset cs "&Filter" "&Filtr"
-    ::msgcat::mcset cs "Fil&ter:" "Fil&tr:"
-    ::msgcat::mcset cs "Font st&yle:"
-    ::msgcat::mcset cs "&Green" "Ze&len\341"
-    ::msgcat::mcset cs "&Help" "&N\341pov\u011bda"
-    ::msgcat::mcset cs "Hi" "Ahoj"
-    ::msgcat::mcset cs "&Hide Console" "&Schovat Konzolu"
-    ::msgcat::mcset cs "&Ignore" "&Ignorovat"
-    ::msgcat::mcset cs "Invalid file name \"%1\$s\"." "\u0160patn\351 jm\351no souboru \"%1\$s\"."
-    ::msgcat::mcset cs "Log Files" "Log soubory"
-    ::msgcat::mcset cs "&No" "&Ne"
-    ::msgcat::mcset cs "&OK"
-    ::msgcat::mcset cs "OK"
-    ::msgcat::mcset cs "Ok"
-    ::msgcat::mcset cs "Open" "Otev\u0159\355t"
-    ::msgcat::mcset cs "&Open" "&Otev\u0159\355t"
-    ::msgcat::mcset cs "Open Multiple Files" "Otev\u0159\355t v\355ce soubor\u016f"
-    ::msgcat::mcset cs "P&aste" "&Vlo\u017eit"
-    ::msgcat::mcset cs "&Quit" "&Ukon\u010dit"
-    ::msgcat::mcset cs "&Red" "\u010ce&rven\341"
-    ::msgcat::mcset cs "Replace existing file?" "Nahradit st\341vaj\355c\355 soubor?"
-    ::msgcat::mcset cs "&Retry" "Z&novu"
-    ::msgcat::mcset cs "&Save" "&Ulo\u017eit"
-    ::msgcat::mcset cs "Save As" "Ulo\u017eit jako"
-    ::msgcat::mcset cs "Save To Log" "Ulo\u017eit do logu"
-    ::msgcat::mcset cs "Select Log File" "Vybrat log soubor"
-    ::msgcat::mcset cs "Select a file to source" "Vybrat soubor k nahr\341n\355"
-    ::msgcat::mcset cs "&Selection:" "&V\375b\u011br:"
-    ::msgcat::mcset cs "Skip Messages" "P\u0159esko\u010dit zpr\341vy"
-    ::msgcat::mcset cs "&Source..." "&Zdroj..."
-    ::msgcat::mcset cs "Tcl Scripts" "Tcl skripty"
-    ::msgcat::mcset cs "Tcl for Windows" "Tcl pro Windows"
-    ::msgcat::mcset cs "Text Files" "Textov\351 soubory"
-    ::msgcat::mcset cs "abort" "p\u0159eru\u0161it"
-    ::msgcat::mcset cs "blue" "modr\341"
-    ::msgcat::mcset cs "cancel" "zru\u0161it"
-    ::msgcat::mcset cs "extension" "p\u0159\355pona"
-    ::msgcat::mcset cs "extensions" "p\u0159\355pony"
-    ::msgcat::mcset cs "green" "zelen\341"
-    ::msgcat::mcset cs "ignore" "ignorovat"
-    ::msgcat::mcset cs "ok"
-    ::msgcat::mcset cs "red" "\u010derven\341"
-    ::msgcat::mcset cs "retry" "znovu"
-    ::msgcat::mcset cs "yes" "ano"
-}
diff --git a/tk8.6/library/msgs/da.msg b/tk8.6/library/msgs/da.msg
deleted file mode 100644
index c302c79..0000000
--- a/tk8.6/library/msgs/da.msg
+++ /dev/null
@@ -1,78 +0,0 @@
-namespace eval ::tk {
-    ::msgcat::mcset da "&Abort" "&Afbryd"
-    ::msgcat::mcset da "&About..." "&Om..."
-    ::msgcat::mcset da "All Files" "Alle filer"
-    ::msgcat::mcset da "Application Error" "Programfejl"
-    ::msgcat::mcset da "&Blue" "&Bl\u00E5"
-    ::msgcat::mcset da "Cancel" "Annuller"
-    ::msgcat::mcset da "&Cancel" "&Annuller"
-    ::msgcat::mcset da "Cannot change to the directory \"%1\$s\".\nPermission denied." "Kan ikke skifte til katalog \"%1\$s\".\nIngen rettigheder."
-    ::msgcat::mcset da "Choose Directory" "V\u00E6lg katalog"
-    ::msgcat::mcset da "Cl&ear" "&Ryd"
-    ::msgcat::mcset da "&Clear Console" "&Ryd konsolen"
-    ::msgcat::mcset da "Color" "Farve"
-    ::msgcat::mcset da "Console" "Konsol"
-    ::msgcat::mcset da "&Copy" "&Kopier"
-    ::msgcat::mcset da "Cu&t" "Kli&p"
-    ::msgcat::mcset da "&Delete" "&Slet"
-    ::msgcat::mcset da "Details >>" "Detailer"
-    ::msgcat::mcset da "Directory \"%1\$s\" does not exist." "Katalog \"%1\$s\" findes ikke."
-    ::msgcat::mcset da "&Directory:" "&Katalog:"
-    ::msgcat::mcset da "&Edit" "&Rediger"
-    ::msgcat::mcset da "Error: %1\$s" "Fejl: %1\$s"
-    ::msgcat::mcset da "E&xit" "&Afslut"
-    ::msgcat::mcset da "&File" "&Fil"
-    ::msgcat::mcset da "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Filen \"%1\$s\" findes allerede.\nSkal den overskrives?"
-    ::msgcat::mcset da "File \"%1\$s\" already exists.\n\n" "Filen \"%1\$s\" findes allerede.\n\n"
-    ::msgcat::mcset da "File \"%1\$s\" does not exist." "Filen \"%1\$s\" findes ikke."
-    ::msgcat::mcset da "File &name:" "Fil&navn:"
-    ::msgcat::mcset da "File &names:" "Fil&navne:"
-    ::msgcat::mcset da "Files of &type:" "Fil&typer:"
-    ::msgcat::mcset da "Fi&les:" "Fi&ler:"
-    ::msgcat::mcset da "&Filter"
-    ::msgcat::mcset da "Fil&ter:"
-    ::msgcat::mcset da "&Green" "&Gr\u00F8n"
-    ::msgcat::mcset da "&Help" "&Hj\u00E6lp"
-    ::msgcat::mcset da "Hi" "Hej"
-    ::msgcat::mcset da "&Hide Console" "Skjul &konsol"
-    ::msgcat::mcset da "&Ignore" "&Ignorer"
-    ::msgcat::mcset da "Invalid file name \"%1\$s\"." "Ugyldig fil navn \"%1\$s\"."
-    ::msgcat::mcset da "Log Files" "Logfiler"
-    ::msgcat::mcset da "&No" "&Nej"
-    ::msgcat::mcset da "&OK" "&O.K."
-    ::msgcat::mcset da "OK" "O.K."
-    ::msgcat::mcset da "Ok"
-    ::msgcat::mcset da "Open" "\u00C5bn"
-    ::msgcat::mcset da "&Open" "&\u00C5bn"
-    ::msgcat::mcset da "Open Multiple Files" "\u00C5bn flere filer"
-    ::msgcat::mcset da "P&aste" "&Inds\u00E6t"
-    ::msgcat::mcset da "&Quit" "&Afslut"
-    ::msgcat::mcset da "&Red" "&R\u00F8d"
-    ::msgcat::mcset da "Replace existing file?" "Erstat eksisterende fil?"
-    ::msgcat::mcset da "&Retry" "&Gentag"
-    ::msgcat::mcset da "&Save" "&Gem"
-    ::msgcat::mcset da "Save As" "Gem som"
-    ::msgcat::mcset da "Save To Log" "Gem i log"
-    ::msgcat::mcset da "Select Log File" "V\u00E6lg logfil"
-    ::msgcat::mcset da "Select a file to source" "V\u00E6lg k\u00F8rbar fil"
-    ::msgcat::mcset da "&Selection:" "&Udvalg:"
-    ::msgcat::mcset da "Show &Hidden Directories" "Vis &skjulte kataloger"
-    ::msgcat::mcset da "Show &Hidden Files and Directories" "Vis &skjulte filer og kataloger"
-    ::msgcat::mcset da "Skip Messages" "Overspring beskeder"
-    ::msgcat::mcset da "&Source..." "&K\u00F8r..."
-    ::msgcat::mcset da "Tcl Scripts" "Tcl-Skripter"
-    ::msgcat::mcset da "Tcl for Windows" "Tcl for Windows"
-    ::msgcat::mcset da "Text Files" "Tekstfiler"
-    ::msgcat::mcset da "&Yes" "&Ja"
-    ::msgcat::mcset da "abort" "afbryd"
-    ::msgcat::mcset da "blue" "bl\u00E5"
-    ::msgcat::mcset da "cancel" "afbryd"
-    ::msgcat::mcset da "extension"
-    ::msgcat::mcset da "extensions"
-    ::msgcat::mcset da "green" "gr\u00F8n"
-    ::msgcat::mcset da "ignore" "ignorer"
-    ::msgcat::mcset da "ok"
-    ::msgcat::mcset da "red" "r\u00F8d"
-    ::msgcat::mcset da "retry" "gentag"
-    ::msgcat::mcset da "yes" "ja"
-}
diff --git a/tk8.6/library/msgs/de.msg b/tk8.6/library/msgs/de.msg
deleted file mode 100644
index e420f8a..0000000
--- a/tk8.6/library/msgs/de.msg
+++ /dev/null
@@ -1,91 +0,0 @@
-namespace eval ::tk {
-    ::msgcat::mcset de "&Abort" "&Abbruch"
-    ::msgcat::mcset de "&About..." "&\u00dcber..."
-    ::msgcat::mcset de "All Files" "Alle Dateien"
-    ::msgcat::mcset de "Application Error" "Applikationsfehler"
-    ::msgcat::mcset de "&Apply" "&Anwenden"
-    ::msgcat::mcset de "Bold" "Fett"
-    ::msgcat::mcset de "Bold Italic" "Fett kursiv"
-    ::msgcat::mcset de "&Blue" "&Blau"
-    ::msgcat::mcset de "Cancel" "Abbruch"
-    ::msgcat::mcset de "&Cancel" "&Abbruch"
-    ::msgcat::mcset de "Cannot change to the directory \"%1\$s\".\nPermission denied." "Kann nicht in das Verzeichnis \"%1\$s\" wechseln.\nKeine Rechte vorhanden."
-    ::msgcat::mcset de "Choose Directory" "W\u00e4hle Verzeichnis"
-    ::msgcat::mcset de "Cl&ear" "&R\u00fccksetzen"
-    ::msgcat::mcset de "&Clear Console" "&Konsole l\u00f6schen"
-    ::msgcat::mcset de "Color" "Farbe"
-    ::msgcat::mcset de "Console" "Konsole"
-    ::msgcat::mcset de "&Copy" "&Kopieren"
-    ::msgcat::mcset de "Cu&t" "Aus&schneiden"
-    ::msgcat::mcset de "&Delete" "&L\u00f6schen"
-    ::msgcat::mcset de "Details >>"
-    ::msgcat::mcset de "Directory \"%1\$s\" does not exist." "Das Verzeichnis \"%1\$s\" existiert nicht."
-    ::msgcat::mcset de "&Directory:" "&Verzeichnis:"
-    ::msgcat::mcset de "&Edit" "&Bearbeiten"
-    ::msgcat::mcset de "Effects" "Effekte"
-    ::msgcat::mcset de "Error: %1\$s" "Fehler: %1\$s"
-    ::msgcat::mcset de "E&xit" "&Ende"
-    ::msgcat::mcset de "&File" "&Datei"
-    ::msgcat::mcset de "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Die Datei \"%1\$s\" ist bereits vorhanden.\nWollen sie diese Datei \u00fcberschreiben ?"
-    ::msgcat::mcset de "File \"%1\$s\" already exists.\n\n" "Die Datei \"%1\$s\" ist bereits vorhanden.\n\n"
-    ::msgcat::mcset de "File \"%1\$s\" does not exist." "Die Datei \"%1\$s\" existiert nicht."
-    ::msgcat::mcset de "File &name:" "Datei&name:"
-    ::msgcat::mcset de "File &names:" "Datei&namen:"
-    ::msgcat::mcset de "Files of &type:" "Dateien des &Typs:"
-    ::msgcat::mcset de "Fi&les:" "Dat&eien:"
-    ::msgcat::mcset de "&Filter"
-    ::msgcat::mcset de "Fil&ter:"
-    ::msgcat::mcset de "Font" "Schriftart"
-    ::msgcat::mcset de "&Font:" "Schriftart:"
-    ::msgcat::mcset de "Font st&yle:" "Schriftschnitt:"
-    ::msgcat::mcset de "&Green" "&Gr\u00fcn"
-    ::msgcat::mcset de "&Help" "&Hilfe"
-    ::msgcat::mcset de "Hi" "Hallo"
-    ::msgcat::mcset de "&Hide Console" "&Konsole unsichtbar machen"
-    ::msgcat::mcset de "&Ignore" "&Ignorieren"
-    ::msgcat::mcset de "Invalid file name \"%1\$s\"." "Ung\u00fcltiger Dateiname \"%1\$s\"."
-    ::msgcat::mcset de "Italic" "Kursiv"
-    ::msgcat::mcset de "Log Files" "Protokolldatei"
-    ::msgcat::mcset de "&No" "&Nein"
-    ::msgcat::mcset de "&OK"
-    ::msgcat::mcset de "OK"
-    ::msgcat::mcset de "Ok"
-    ::msgcat::mcset de "Open" "\u00d6ffnen"
-    ::msgcat::mcset de "&Open" "\u00d6&ffnen"
-    ::msgcat::mcset de "Open Multiple Files" "Mehrere Dateien \u00F6ffnen"
-    ::msgcat::mcset de "P&aste" "E&inf\u00fcgen"
-    ::msgcat::mcset de "&Quit" "&Beenden"
-    ::msgcat::mcset de "&Red" "&Rot"
-    ::msgcat::mcset de "Regular" "Standard"
-    ::msgcat::mcset de "Replace existing file?" "Existierende Datei ersetzen?"
-    ::msgcat::mcset de "&Retry" "&Wiederholen"
-    ::msgcat::mcset de "Sample" "Beispiel"
-    ::msgcat::mcset de "&Save" "&Speichern"
-    ::msgcat::mcset de "Save As" "Speichern unter"
-    ::msgcat::mcset de "Save To Log" "In Protokoll speichern"
-    ::msgcat::mcset de "Select Log File" "Protokolldatei ausw\u00e4hlen"
-    ::msgcat::mcset de "Select a file to source" "Auszuf\u00fchrende Datei ausw\u00e4hlen"
-    ::msgcat::mcset de "&Selection:" "Auswah&l:"
-    ::msgcat::mcset de "&Size:" "Schriftgrad:"
-    ::msgcat::mcset de "Show &Hidden Directories" "Zeige versteckte Dateien"
-    ::msgcat::mcset de "Show &Hidden Files and Directories" "Zeige versteckte Dateien und Verzeichnisse"
-    ::msgcat::mcset de "Skip Messages" "Weitere Nachrichten \u00fcberspringen"
-    ::msgcat::mcset de "&Source..." "&Ausf\u00fchren..."
-    ::msgcat::mcset de "Stri&keout" "&Durchgestrichen"
-    ::msgcat::mcset de "Tcl Scripts" "Tcl-Skripte"
-    ::msgcat::mcset de "Tcl for Windows" "Tcl f\u00fcr Windows"
-    ::msgcat::mcset de "Text Files" "Textdateien"
-    ::msgcat::mcset de "&Underline" "&Unterstrichen"
-    ::msgcat::mcset de "&Yes" "&Ja"
-    ::msgcat::mcset de "abort" "abbrechen"
-    ::msgcat::mcset de "blue" "blau"
-    ::msgcat::mcset de "cancel" "abbrechen"
-    ::msgcat::mcset de "extension" "Erweiterung"
-    ::msgcat::mcset de "extensions" "Erweiterungen"
-    ::msgcat::mcset de "green" "gr\u00fcn"
-    ::msgcat::mcset de "ignore" "ignorieren"
-    ::msgcat::mcset de "ok"
-    ::msgcat::mcset de "red" "rot"
-    ::msgcat::mcset de "retry" "wiederholen"
-    ::msgcat::mcset de "yes" "ja"
-}
diff --git a/tk8.6/library/msgs/el.msg b/tk8.6/library/msgs/el.msg
deleted file mode 100644
index 2e3f236..0000000
--- a/tk8.6/library/msgs/el.msg
+++ /dev/null
@@ -1,86 +0,0 @@
-## Messages for the Greek (Hellenic - "el") language.
-## Please report any changes/suggestions to:
-##    petasis@iit.demokritos.gr
-
-namespace eval ::tk {
-    ::msgcat::mcset el "&Abort"              "\u03a4\u03b5\u03c1\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2"
-    ::msgcat::mcset el "About..."           "\u03a3\u03c7\u03b5\u03c4\u03b9\u03ba\u03ac..."
-    ::msgcat::mcset el "All Files"          "\u038c\u03bb\u03b1 \u03c4\u03b1 \u0391\u03c1\u03c7\u03b5\u03af\u03b1"
-    ::msgcat::mcset el "Application Error"  "\u039b\u03ac\u03b8\u03bf\u03c2 \u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae\u03c2"
-    ::msgcat::mcset el "&Blue"               "\u039c\u03c0\u03bb\u03b5"
-    ::msgcat::mcset el "&Cancel"             "\u0391\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7"
-    ::msgcat::mcset el \
-"Cannot change to the directory \"%1\$s\".\nPermission denied." \
-"\u0394\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ae \u03ba\u03b1\u03c4\u03b1\u03bb\u03cc\u03b3\u03bf\u03c5 \u03c3\u03b5 \"%1\$s\".\n\u0397 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7 \u03b4\u03b5\u03bd \u03b5\u03c0\u03b9\u03c4\u03c1\u03ad\u03c0\u03b5\u03c4\u03b1\u03b9."
-    ::msgcat::mcset el "Choose Directory"   "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u039a\u03b1\u03c4\u03b1\u03bb\u03cc\u03b3\u03bf\u03c5"
-    ::msgcat::mcset el "Clear"              "\u039a\u03b1\u03b8\u03b1\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2"
-    ::msgcat::mcset el "Color"              "\u03a7\u03c1\u03ce\u03bc\u03b1"
-    ::msgcat::mcset el "Console"            "\u039a\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1"
-    ::msgcat::mcset el "Copy"               "\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae"
-    ::msgcat::mcset el "Cut"                "\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae"
-    ::msgcat::mcset el "Delete"             "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae"
-    ::msgcat::mcset el "Details >>"         "\u039b\u03b5\u03c0\u03c4\u03bf\u03bc\u03ad\u03c1\u03b5\u03b9\u03b5\u03c2 >>"
-    ::msgcat::mcset el "Directory \"%1\$s\" does not exist." \
-                                        "\u039f \u03ba\u03b1\u03c4\u03ac\u03bb\u03bf\u03b3\u03bf\u03c2 \"%1\$s\" \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9."
-    ::msgcat::mcset el "&Directory:"         "&\u039a\u03b1\u03c4\u03ac\u03bb\u03bf\u03b3\u03bf\u03c2:"
-    ::msgcat::mcset el "Error: %1\$s"       "\u039b\u03ac\u03b8\u03bf\u03c2: %1\$s"
-    ::msgcat::mcset el "Exit"               "\u0388\u03be\u03bf\u03b4\u03bf\u03c2"
-    ::msgcat::mcset el \
-               "File \"%1\$s\" already exists.\nDo you want to overwrite it?" \
-               "\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \"%1\$s\" \u03ae\u03b4\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.\n\u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03b5\u03c0\u03b9\u03ba\u03b1\u03bb\u03c5\u03c6\u03b8\u03b5\u03af;"
-    ::msgcat::mcset el "File \"%1\$s\" already exists.\n\n" \
-                   "\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \"%1\$s\" \u03ae\u03b4\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.\n\n"
-    ::msgcat::mcset el "File \"%1\$s\" does not exist." \
-                   "\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \"%1\$s\" \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9."
-    ::msgcat::mcset el "File &name:"         "\u038c&\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5:"
-    ::msgcat::mcset el "File &names:"        "\u038c&\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd:"
-    ::msgcat::mcset el "Files of &type:"     "\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u03c4\u03bf\u03c5 &\u03c4\u03cd\u03c0\u03bf\u03c5:"
-    ::msgcat::mcset el "Fi&les:"             "\u0391\u03c1\u03c7\u03b5\u03af\u03b1:"
-    ::msgcat::mcset el "&Filter"             "\u03a6\u03af\u03bb\u03c4\u03c1\u03bf"
-    ::msgcat::mcset el "Fil&ter:"            "\u03a6\u03af\u03bb\u03c4\u03c1\u03bf:"
-    ::msgcat::mcset el "&Green"              "\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "Hi"                 "\u0393\u03b5\u03b9\u03b1"
-    ::msgcat::mcset el "Hide Console"       "\u0391\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7 \u03ba\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1\u03c2"
-    ::msgcat::mcset el "&Ignore"             "\u0391\u03b3\u03bd\u03cc\u03b7\u03c3\u03b7"
-    ::msgcat::mcset el "Invalid file name \"%1\$s\"." \
-                   "\u0386\u03ba\u03c5\u03c1\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5 \"%1\$s\"."
-    ::msgcat::mcset el "Log Files"          "\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u039a\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2"
-    ::msgcat::mcset el "&No"                 "\u038c\u03c7\u03b9"
-    ::msgcat::mcset el "&OK"                 "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9"
-    ::msgcat::mcset el "OK"                 "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9"
-    ::msgcat::mcset el "Ok"                 "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9"
-    ::msgcat::mcset el "Open"               "\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1"
-    ::msgcat::mcset el "&Open"               "\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1"
-    ::msgcat::mcset el "Open Multiple Files" \
-                                        "\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1 \u03c0\u03bf\u03bb\u03bb\u03b1\u03c0\u03bb\u03ce\u03bd \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd"
-    ::msgcat::mcset el "P&aste"              "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7"
-    ::msgcat::mcset el "Quit"               "\u0388\u03be\u03bf\u03b4\u03bf\u03c2"
-    ::msgcat::mcset el "&Red"                "\u039a\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "Replace existing file?" \
-                                        "\u0395\u03c0\u03b9\u03ba\u03ac\u03bb\u03c5\u03c8\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03bf\u03bd\u03c4\u03bf\u03c2 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5;"
-    ::msgcat::mcset el "&Retry"              "\u03a0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b7\u03c3\u03b5 \u03be\u03b1\u03bd\u03ac"
-    ::msgcat::mcset el "&Save"               "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7"
-    ::msgcat::mcset el "Save As"            "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03c3\u03b1\u03bd"
-    ::msgcat::mcset el "Save To Log"        "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03c3\u03c4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2"
-    ::msgcat::mcset el "Select Log File"    "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5 \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2"
-    ::msgcat::mcset el "Select a file to source" \
-                                        "\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03b3\u03b9\u03b1 \u03b5\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7"
-    ::msgcat::mcset el "&Selection:"         "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae:"
-    ::msgcat::mcset el "Skip Messages"      "\u0391\u03c0\u03bf\u03c6\u03c5\u03b3\u03ae\u03bc\u03b7\u03bd\u03c5\u03bc\u03ac\u03c4\u03c9\u03bd"
-    ::msgcat::mcset el "&Source..."          "\u0395\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7..."
-    ::msgcat::mcset el "Tcl Scripts"        "Tcl Scripts"
-    ::msgcat::mcset el "Tcl for Windows"    "Tcl \u03b3\u03b9\u03b1 Windows"
-    ::msgcat::mcset el "Text Files"         "\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u039a\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5"
-    ::msgcat::mcset el "&Yes"                "\u039d\u03b1\u03b9"
-    ::msgcat::mcset el "abort"              "\u03c4\u03b5\u03c1\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2"
-    ::msgcat::mcset el "blue"               "\u03bc\u03c0\u03bb\u03b5"
-    ::msgcat::mcset el "cancel"             "\u03b1\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7"
-    ::msgcat::mcset el "extension"          "\u03b5\u03c0\u03ad\u03ba\u03c4\u03b1\u03c3\u03b7"
-    ::msgcat::mcset el "extensions"         "\u03b5\u03c0\u03b5\u03ba\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2"
-    ::msgcat::mcset el "green"              "\u03c0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "ignore"             "\u03b1\u03b3\u03bd\u03cc\u03b7\u03c3\u03b7"
-    ::msgcat::mcset el "ok"                 "\u03b5\u03bd\u03c4\u03ac\u03be\u03b5\u03b9"
-    ::msgcat::mcset el "red"                "\u03ba\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "retry"              "\u03c0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b7\u03c3\u03b5 \u03be\u03b1\u03bd\u03ac"
-    ::msgcat::mcset el "yes"                "\u03bd\u03b1\u03b9"
-}
diff --git a/tk8.6/library/msgs/en.msg b/tk8.6/library/msgs/en.msg
deleted file mode 100644
index 5ad1094..0000000
--- a/tk8.6/library/msgs/en.msg
+++ /dev/null
@@ -1,91 +0,0 @@
-namespace eval ::tk {
-    ::msgcat::mcset en "&Abort"
-    ::msgcat::mcset en "&About..."
-    ::msgcat::mcset en "All Files"
-    ::msgcat::mcset en "Application Error"
-    ::msgcat::mcset en "&Apply"
-    ::msgcat::mcset en "Bold"
-    ::msgcat::mcset en "Bold Italic"
-    ::msgcat::mcset en "&Blue"
-    ::msgcat::mcset en "Cancel"
-    ::msgcat::mcset en "&Cancel"
-    ::msgcat::mcset en "Cannot change to the directory \"%1\$s\".\nPermission denied."
-    ::msgcat::mcset en "Choose Directory"
-    ::msgcat::mcset en "Cl&ear"
-    ::msgcat::mcset en "&Clear Console"
-    ::msgcat::mcset en "Color"
-    ::msgcat::mcset en "Console"
-    ::msgcat::mcset en "&Copy"
-    ::msgcat::mcset en "Cu&t"
-    ::msgcat::mcset en "&Delete"
-    ::msgcat::mcset en "Details >>"
-    ::msgcat::mcset en "Directory \"%1\$s\" does not exist."
-    ::msgcat::mcset en "&Directory:"
-    ::msgcat::mcset en "&Edit"
-    ::msgcat::mcset en "Effects"
-    ::msgcat::mcset en "Error: %1\$s"
-    ::msgcat::mcset en "E&xit"
-    ::msgcat::mcset en "&File"
-    ::msgcat::mcset en "File \"%1\$s\" already exists.\nDo you want to overwrite it?"
-    ::msgcat::mcset en "File \"%1\$s\" already exists.\n\n"
-    ::msgcat::mcset en "File \"%1\$s\" does not exist."
-    ::msgcat::mcset en "File &name:"
-    ::msgcat::mcset en "File &names:"
-    ::msgcat::mcset en "Files of &type:"
-    ::msgcat::mcset en "Fi&les:"
-    ::msgcat::mcset en "&Filter"
-    ::msgcat::mcset en "Fil&ter:"
-    ::msgcat::mcset en "Font"
-    ::msgcat::mcset en "&Font:"
-    ::msgcat::mcset en "Font st&yle:"
-    ::msgcat::mcset en "&Green"
-    ::msgcat::mcset en "&Help"
-    ::msgcat::mcset en "Hi"
-    ::msgcat::mcset en "&Hide Console"
-    ::msgcat::mcset en "&Ignore"
-    ::msgcat::mcset en "Invalid file name \"%1\$s\"."
-    ::msgcat::mcset en "Italic"
-    ::msgcat::mcset en "Log Files"
-    ::msgcat::mcset en "&No"
-    ::msgcat::mcset en "&OK"
-    ::msgcat::mcset en "OK"
-    ::msgcat::mcset en "Ok"
-    ::msgcat::mcset en "Open"
-    ::msgcat::mcset en "&Open"
-    ::msgcat::mcset en "Open Multiple Files"
-    ::msgcat::mcset en "P&aste"
-    ::msgcat::mcset en "&Quit"
-    ::msgcat::mcset en "&Red"
-    ::msgcat::mcset en "Regular"
-    ::msgcat::mcset en "Replace existing file?"
-    ::msgcat::mcset en "&Retry"
-    ::msgcat::mcset en "Sample"
-    ::msgcat::mcset en "&Save"
-    ::msgcat::mcset en "Save As"
-    ::msgcat::mcset en "Save To Log"
-    ::msgcat::mcset en "Select Log File"
-    ::msgcat::mcset en "Select a file to source"
-    ::msgcat::mcset en "&Selection:"
-    ::msgcat::mcset en "&Size:"
-    ::msgcat::mcset en "Show &Hidden Directories"
-    ::msgcat::mcset en "Show &Hidden Files and Directories"
-    ::msgcat::mcset en "Skip Messages"
-    ::msgcat::mcset en "&Source..."
-    ::msgcat::mcset en "Stri&keout"
-    ::msgcat::mcset en "Tcl Scripts"
-    ::msgcat::mcset en "Tcl for Windows"
-    ::msgcat::mcset en "Text Files"
-    ::msgcat::mcset en "&Underline"
-    ::msgcat::mcset en "&Yes"
-    ::msgcat::mcset en "abort"
-    ::msgcat::mcset en "blue"
-    ::msgcat::mcset en "cancel"
-    ::msgcat::mcset en "extension"
-    ::msgcat::mcset en "extensions"
-    ::msgcat::mcset en "green"
-    ::msgcat::mcset en "ignore"
-    ::msgcat::mcset en "ok"
-    ::msgcat::mcset en "red"
-    ::msgcat::mcset en "retry"
-    ::msgcat::mcset en "yes"
-}
diff --git a/tk8.6/library/msgs/en_gb.msg b/tk8.6/library/msgs/en_gb.msg
deleted file mode 100644
index efafa38..0000000
--- a/tk8.6/library/msgs/en_gb.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace eval ::tk {
-    ::msgcat::mcset en_gb Color Colour
-}
diff --git a/tk8.6/library/msgs/eo.msg b/tk8.6/library/msgs/eo.msg
deleted file mode 100644
index 3645630..0000000
--- a/tk8.6/library/msgs/eo.msg
+++ /dev/null
@@ -1,75 +0,0 @@
-namespace eval ::tk {
-    ::msgcat::mcset eo "&Abort" "&\u0108esigo"
-    ::msgcat::mcset eo "&About..." "Pri..."
-    ::msgcat::mcset eo "All Files" "\u0108ioj dosieroj"
-    ::msgcat::mcset eo "Application Error" "Aplikoerraro"
-    ::msgcat::mcset eo "&Blue" "&Blua"
-    ::msgcat::mcset eo "Cancel" "Rezignu"
-    ::msgcat::mcset eo "&Cancel" "&Rezignu"
-    ::msgcat::mcset eo "Cannot change to the directory \"%1\$s\".\nPermission denied." "Neeble \u0109angi al dosierulon \"%1\$s\".\nVi ne rajtas tion."
-    ::msgcat::mcset eo "Choose Directory" "Elektu Dosierujo"
-    ::msgcat::mcset eo "Cl&ear" "&Klaru"
-    ::msgcat::mcset eo "&Clear Console" "&Klaru konzolon"
-    ::msgcat::mcset eo "Color" "Farbo"
-    ::msgcat::mcset eo "Console" "Konzolo"
-    ::msgcat::mcset eo "&Copy" "&Kopiu"
-    ::msgcat::mcset eo "Cu&t" "&Enpo\u015digu"
-    ::msgcat::mcset eo "&Delete" "&Forprenu"
-    ::msgcat::mcset eo "Details >>" "Detaloj >>"
-    ::msgcat::mcset eo "Directory \"%1\$s\" does not exist." "La dosierujo \"%1\$s\" ne ekzistas."
-    ::msgcat::mcset eo "&Directory:" "&Dosierujo:"
-    ::msgcat::mcset eo "&Edit" "&Redaktu"
-    ::msgcat::mcset eo "Error: %1\$s" "Eraro: %1\$s"
-    ::msgcat::mcset eo "E&xit" "&Eliru"
-    ::msgcat::mcset eo "&File" "&Dosiero"
-    ::msgcat::mcset eo "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "La dosiero \"%1\$s\" jam ekzistas.\n\u0108u vi volas anstata\u00fbigi la dosieron?"
-    ::msgcat::mcset eo "File \"%1\$s\" already exists.\n\n" "La dosiero \"%1\$s\" jam egzistas. \n\n"
-    ::msgcat::mcset eo "File \"%1\$s\" does not exist." "La dosierp \"%1\$s\" ne estas."
-    ::msgcat::mcset eo "File &name:" "Dosiero&nomo:"
-    ::msgcat::mcset eo "File &names:" "Dosiero&nomoj:"
-    ::msgcat::mcset eo "Files of &type:" "Dosieroj de &Typo:"
-    ::msgcat::mcset eo "Fi&les:" "Do&sieroj:"
-    ::msgcat::mcset eo "&Filter" "&Filtrilo"
-    ::msgcat::mcset eo "Fil&ter:" "&Filtrilo:"
-    ::msgcat::mcset eo "&Green" "&Verda"
-    ::msgcat::mcset eo "&Help" "&Helpu"
-    ::msgcat::mcset eo "Hi" "Saluton"
-    ::msgcat::mcset eo "&Hide Console" "&Ka\u015du konzolon"
-    ::msgcat::mcset eo "&Ignore" "&Ignoru"
-    ::msgcat::mcset eo "Invalid file name \"%1\$s\"." "Malvalida dosieronomo \"%1\$s\"."
-    ::msgcat::mcset eo "Log Files" "Protokolo"
-    ::msgcat::mcset eo "&No" "&Ne"
-    ::msgcat::mcset eo "&OK"
-    ::msgcat::mcset eo "OK"
-    ::msgcat::mcset eo "Ok"
-    ::msgcat::mcset eo "Open" "Malfermu"
-    ::msgcat::mcset eo "&Open" "&Malfermu"
-    ::msgcat::mcset eo "Open Multiple Files" "Melfermu multan dosierojn"
-    ::msgcat::mcset eo "P&aste" "&Elpo\u015digi"
-    ::msgcat::mcset eo "&Quit" "&Finigu"
-    ::msgcat::mcset eo "&Red" "&Rosa"
-    ::msgcat::mcset eo "Replace existing file?" "\u0108u anstata\u00fbu ekzistantan dosieron?"
-    ::msgcat::mcset eo "&Retry" "&Ripetu"
-    ::msgcat::mcset eo "&Save" "&Savu"
-    ::msgcat::mcset eo "Save As" "Savu kiel"
-    ::msgcat::mcset eo "Save To Log" "Savu en protokolon"
-    ::msgcat::mcset eo "Select Log File" "Elektu prokolodosieron"
-    ::msgcat::mcset eo "Select a file to source" "Elektu dosieron por interpreti"
-    ::msgcat::mcset eo "&Selection:" "&Elekto:"
-    ::msgcat::mcset eo "Skip Messages" "transsaltu pluajn mesa\u011dojn"
-    ::msgcat::mcset eo "&Source..." "&Fontoprogramo..."
-    ::msgcat::mcset eo "Tcl Scripts" "Tcl-skriptoj"
-    ::msgcat::mcset eo "Tcl for Windows" "Tcl por vindoso"
-    ::msgcat::mcset eo "Text Files" "Tekstodosierojn"
-    ::msgcat::mcset eo "&Yes" "&Jes"
-    ::msgcat::mcset eo "abort" "\u0109esigo"
-    ::msgcat::mcset eo "blue" "blua"
-    ::msgcat::mcset eo "cancel" "rezignu"
-    ::msgcat::mcset eo "extension" "ekspansio"
-    ::msgcat::mcset eo "extensions" "ekspansioj"
-    ::msgcat::mcset eo "green" "verda"
-    ::msgcat::mcset eo "ignore" "ignorieren"
-    ::msgcat::mcset eo "red" "ru\u011da"
-    ::msgcat::mcset eo "retry" "ripetu"
-    ::msgcat::mcset eo "yes" "jes"
-}
diff --git a/tk8.6/library/msgs/es.msg b/tk8.6/library/msgs/es.msg
deleted file mode 100644
index 578c52c..0000000
--- a/tk8.6/library/msgs/es.msg
+++ /dev/null
@@ -1,76 +0,0 @@
-namespace eval ::tk {
-    ::msgcat::mcset es "&Abort" "&Abortar"
-    ::msgcat::mcset es "&About..." "&Acerca de ..."
-    ::msgcat::mcset es "All Files" "Todos los archivos"
-    ::msgcat::mcset es "Application Error" "Error de la aplicaci\u00f3n"
-    ::msgcat::mcset es "&Blue" "&Azul"
-    ::msgcat::mcset es "Cancel" "Cancelar"
-    ::msgcat::mcset es "&Cancel" "&Cancelar"
-    ::msgcat::mcset es "Cannot change to the directory \"%1\$s\".\nPermission denied." "No es posible acceder al directorio \"%1\$s\".\nPermiso denegado."
-    ::msgcat::mcset es "Choose Directory" "Elegir directorio"
-    ::msgcat::mcset es "Cl&ear" "&Borrar"
-    ::msgcat::mcset es "&Clear Console" "&Borrar consola"
-    ::msgcat::mcset es "Color"
-    ::msgcat::mcset es "Console" "Consola"
-    ::msgcat::mcset es "&Copy" "&Copiar"
-    ::msgcat::mcset es "Cu&t" "Cor&tar"
-    ::msgcat::mcset es "&Delete" "&Borrar"
-    ::msgcat::mcset es "Details >>" "Detalles >>"
-    ::msgcat::mcset es "Directory \"%1\$s\" does not exist." "El directorio \"%1\$s\" no existe."
-    ::msgcat::mcset es "&Directory:" "&Directorio:"
-    ::msgcat::mcset es "&Edit" "&Editar"
-    ::msgcat::mcset es "Error: %1\$s"
-    ::msgcat::mcset es "E&xit" "Salir"
-    ::msgcat::mcset es "&File" "&Archivo"
-    ::msgcat::mcset es "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "El archivo \"%1\$s\" ya existe.\n\u00bfDesea sobreescribirlo?"
-    ::msgcat::mcset es "File \"%1\$s\" already exists.\n\n" "El archivo \"%1\$s\" ya existe.\n\n"
-    ::msgcat::mcset es "File \"%1\$s\" does not exist." "El archivo \"%1\$s\" no existe."
-    ::msgcat::mcset es "File &name:" "&Nombre de archivo:"
-    ::msgcat::mcset es "File &names:" "&Nombres de archivo:"
-    ::msgcat::mcset es "Files of &type:" "Archivos de &tipo:"
-    ::msgcat::mcset es "Fi&les:" "&Archivos:"
-    ::msgcat::mcset es "&Filter" "&Filtro"
-    ::msgcat::mcset es "Fil&ter:" "Fil&tro:"
-    ::msgcat::mcset es "&Green" "&Verde"
-    ::msgcat::mcset es "&Help" "&Ayuda"
-    ::msgcat::mcset es "Hi"  "Hola"
-    ::msgcat::mcset es "&Hide Console" "&Esconder la consola"
-    ::msgcat::mcset es "&Ignore" "&Ignorar"
-    ::msgcat::mcset es "Invalid file name \"%1\$s\"." "Nombre de archivo inv\u00e1lido \"%1\$s\"."
-    ::msgcat::mcset es "Log Files"  "Ficheros de traza"
-    ::msgcat::mcset es "&No"
-    ::msgcat::mcset es "&OK"
-    ::msgcat::mcset es "OK"
-    ::msgcat::mcset es "Ok"
-    ::msgcat::mcset es "Open" "Abrir"
-    ::msgcat::mcset es "&Open" "&Abrir"
-    ::msgcat::mcset es "Open Multiple Files" "Abrir m\u00faltiples archivos"
-    ::msgcat::mcset es "P&aste" "Peg&ar"
-    ::msgcat::mcset es "&Quit" "&Abandonar"
-    ::msgcat::mcset es "&Red" "&Rojo"
-    ::msgcat::mcset es "Replace existing file?" "\u00bfReemplazar el archivo existente?"
-    ::msgcat::mcset es "&Retry" "&Reintentar"
-    ::msgcat::mcset es "&Save" "&Guardar"
-    ::msgcat::mcset es "Save As" "Guardar como"
-    ::msgcat::mcset es "Save To Log" "Guardar al archivo de traza"
-    ::msgcat::mcset es "Select Log File"  "Elegir un archivo de traza"
-    ::msgcat::mcset es "Select a file to source" "Seleccionar un archivo a evaluar"
-    ::msgcat::mcset es "&Selection:" "&Selecci\u00f3n:"
-    ::msgcat::mcset es "Skip Messages" "Omitir los mensajes"
-    ::msgcat::mcset es "&Source..." "E&valuar..."
-    ::msgcat::mcset es "Tcl Scripts" "Scripts Tcl"
-    ::msgcat::mcset es "Tcl for Windows" "Tcl para Windows"
-    ::msgcat::mcset es "Text Files" "Archivos de texto"
-    ::msgcat::mcset es "&Yes" "&S\u00ed"
-    ::msgcat::mcset es "abort" "abortar"
-    ::msgcat::mcset es "blue" "azul"
-    ::msgcat::mcset es "cancel" "cancelar"
-    ::msgcat::mcset es "extension"  "extensi\u00f3n"
-    ::msgcat::mcset es "extensions" "extensiones"
-    ::msgcat::mcset es "green" "verde"
-    ::msgcat::mcset es "ignore" "ignorar"
-    ::msgcat::mcset es "ok"
-    ::msgcat::mcset es "red" "rojo"
-    ::msgcat::mcset es "retry" "reintentar"
-    ::msgcat::mcset es "yes" "s\u00ed"
-}
diff --git a/tk8.6/library/msgs/fr.msg b/tk8.6/library/msgs/fr.msg
deleted file mode 100644
index 7f42aca..0000000
--- a/tk8.6/library/msgs/fr.msg
+++ /dev/null
@@ -1,72 +0,0 @@
-namespace eval ::tk {
-    ::msgcat::mcset fr "&Abort" "&Annuler"
-    ::msgcat::mcset fr "About..." "\u00c0 propos..."
-    ::msgcat::mcset fr "All Files" "Tous les fichiers"
-    ::msgcat::mcset fr "Application Error" "Erreur d'application"
-    ::msgcat::mcset fr "&Blue" "&Bleu"
-    ::msgcat::mcset fr "Cancel" "Annuler"
-    ::msgcat::mcset fr "&Cancel" "&Annuler"
-    ::msgcat::mcset fr "Cannot change to the directory \"%1\$s\".\nPermission denied." "Impossible d'acc\u00e9der au r\u00e9pertoire \"%1\$s\".\nPermission refus\u00e9e."
-    ::msgcat::mcset fr "Choose Directory" "Choisir r\u00e9pertoire"
-    ::msgcat::mcset fr "Cl&ear" "Effacer"
-    ::msgcat::mcset fr "Color" "Couleur"
-    ::msgcat::mcset fr "Console"
-    ::msgcat::mcset fr "Copy" "Copier"
-    ::msgcat::mcset fr "Cu&t" "Couper"
-    ::msgcat::mcset fr "Delete" "Effacer"
-    ::msgcat::mcset fr "Details >>" "D\u00e9tails >>"
-    ::msgcat::mcset fr "Directory \"%1\$s\" does not exist." "Le r\u00e9pertoire \"%1\$s\" n'existe pas."
-    ::msgcat::mcset fr "&Directory:" "&R\u00e9pertoire:"
-    ::msgcat::mcset fr "Error: %1\$s" "Erreur: %1\$s"
-    ::msgcat::mcset fr "E&xit" "Quitter"
-    ::msgcat::mcset fr "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Le fichier \"%1\$s\" existe d\u00e9j\u00e0.\nVoulez-vous l'\u00e9craser?"
-    ::msgcat::mcset fr "File \"%1\$s\" already exists.\n\n" "Le fichier \"%1\$s\" existe d\u00e9j\u00e0.\n\n"
-    ::msgcat::mcset fr "File \"%1\$s\" does not exist." "Le fichier \"%1\$s\" n'existe pas."
-    ::msgcat::mcset fr "File &name:" "&Nom de fichier:"
-    ::msgcat::mcset fr "File &names:" "&Noms de fichiers:"
-    ::msgcat::mcset fr "Files of &type:" "&Type de fichiers:"
-    ::msgcat::mcset fr "Fi&les:" "Fich&iers:"
-    ::msgcat::mcset fr "&Filter" "&Filtre"
-    ::msgcat::mcset fr "Fil&ter:" "Fil&tre:"
-    ::msgcat::mcset fr "&Green" "&Vert"
-    ::msgcat::mcset fr "Hi" "Salut"
-    ::msgcat::mcset fr "&Hide Console" "Cacher la Console"
-    ::msgcat::mcset fr "&Ignore" "&Ignorer"
-    ::msgcat::mcset fr "Invalid file name \"%1\$s\"." "Nom de fichier invalide \"%1\$s\"."
-    ::msgcat::mcset fr "Log Files" "Fichiers de trace"
-    ::msgcat::mcset fr "&No" "&Non"
-    ::msgcat::mcset fr "&OK"
-    ::msgcat::mcset fr "OK"
-    ::msgcat::mcset fr "Ok"
-    ::msgcat::mcset fr "Open" "Ouvrir"
-    ::msgcat::mcset fr "&Open" "&Ouvrir"
-    ::msgcat::mcset fr "Open Multiple Files" "Ouvrir plusieurs fichiers"
-    ::msgcat::mcset fr "P&aste" "Coller"
-    ::msgcat::mcset fr "&Quit" "&Quitter"
-    ::msgcat::mcset fr "&Red" "&Rouge"
-    ::msgcat::mcset fr "Replace existing file?" "Remplacer le fichier existant?"
-    ::msgcat::mcset fr "&Retry" "&R\u00e9-essayer"
-    ::msgcat::mcset fr "&Save" "&Sauvegarder"
-    ::msgcat::mcset fr "Save As" "Sauvegarder sous"
-    ::msgcat::mcset fr "Save To Log" "Sauvegarde au fichier de trace"
-    ::msgcat::mcset fr "Select Log File" "Choisir un fichier de trace"
-    ::msgcat::mcset fr "Select a file to source" "Choisir un fichier \u00e0 \u00e9valuer"
-    ::msgcat::mcset fr "&Selection:" "&S\u00e9lection:"
-    ::msgcat::mcset fr "Skip Messages" "Omettre les messages"
-    ::msgcat::mcset fr "&Source..." "\u00c9valuer..."
-    ::msgcat::mcset fr "Tcl Scripts" "Scripts Tcl"
-    ::msgcat::mcset fr "Tcl for Windows" "Tcl pour Windows"
-    ::msgcat::mcset fr "Text Files" "Fichiers texte"
-    ::msgcat::mcset fr "&Yes" "&Oui"
-    ::msgcat::mcset fr "abort" "abandonner"
-    ::msgcat::mcset fr "blue" "bleu"
-    ::msgcat::mcset fr "cancel" "annuler"
-    ::msgcat::mcset fr "extension"
-    ::msgcat::mcset fr "extensions"
-    ::msgcat::mcset fr "green" "vert"
-    ::msgcat::mcset fr "ignore" "ignorer"
-    ::msgcat::mcset fr "ok"
-    ::msgcat::mcset fr "red" "rouge"
-    ::msgcat::mcset fr "retry" "r\u00e9essayer"
-    ::msgcat::mcset fr "yes" "oui"
-}
diff --git a/tk8.6/library/msgs/hu.msg b/tk8.6/library/msgs/hu.msg
deleted file mode 100644
index 38ef0b8..0000000
--- a/tk8.6/library/msgs/hu.msg
+++ /dev/null
@@ -1,78 +0,0 @@
-namespace eval ::tk {
-    ::msgcat::mcset hu "&Abort" "&Megszak\u00edt\u00e1s"
-    ::msgcat::mcset hu "&About..." "N\u00e9vjegy..."
-    ::msgcat::mcset hu "All Files" "Minden f\u00e1jl"
-    ::msgcat::mcset hu "Application Error" "Alkalmaz\u00e1s hiba"
-    ::msgcat::mcset hu "&Blue" "&K\u00e9k"
-    ::msgcat::mcset hu "Cancel" "M\u00e9gsem"
-    ::msgcat::mcset hu "&Cancel" "M\u00e9g&sem"
-    ::msgcat::mcset hu "Cannot change to the directory \"%1\$s\".\nPermission denied." "A k\u00f6nyvt\u00e1rv\u00e1lt\u00e1s nem siker\u00fclt: \"%1\$s\".\nHozz\u00e1f\u00e9r\u00e9s megtagadva."
-    ::msgcat::mcset hu "Choose Directory" "K\u00f6nyvt\u00e1r kiv\u00e1laszt\u00e1sa"
-    ::msgcat::mcset hu "Cl&ear" "T\u00f6rl\u00e9s"
-    ::msgcat::mcset hu "&Clear Console" "&T\u00f6rl\u00e9s Konzol"
-    ::msgcat::mcset hu "Color" "Sz\u00edn"
-    ::msgcat::mcset hu "Console" "Konzol"
-    ::msgcat::mcset hu "&Copy" "&M\u00e1sol\u00e1s"
-    ::msgcat::mcset hu "Cu&t" "&Kiv\u00e1g\u00e1s"
-    ::msgcat::mcset hu "&Delete" "&T\u00f6rl\u00e9s"
-    ::msgcat::mcset hu "Details >>" "R\u00e9szletek >>"
-    ::msgcat::mcset hu "Directory \"%1\$s\" does not exist." "\"%1\$s\" k\u00f6nyvt\u00e1r nem l\u00e9tezik."
-    ::msgcat::mcset hu "&Directory:" "&K\u00f6nyvt\u00e1r:"
-    #::msgcat::mcset hu "&Edit"
-    ::msgcat::mcset hu "Error: %1\$s" "Hiba: %1\$s"
-    ::msgcat::mcset hu "E&xit" "Kil\u00e9p\u00e9s"
-    ::msgcat::mcset hu "&File" "&F\u00e1jl"
-    ::msgcat::mcset hu "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "\"%1\$s\" f\u00e1jl m\u00e1r l\u00e9tezik.\nFel\u00fcl\u00edrjam?"
-    ::msgcat::mcset hu "File \"%1\$s\" already exists.\n\n" "\"%1\$s\" f\u00e1jl m\u00e1r l\u00e9tezik.\n\n"
-    ::msgcat::mcset hu "File \"%1\$s\" does not exist." "\"%1\$s\" f\u00e1jl nem l\u00e9tezik."
-    ::msgcat::mcset hu "File &name:" "F\u00e1jl &neve:"
-    ::msgcat::mcset hu "File &names:" "F\u00e1jlok &nevei:"
-    ::msgcat::mcset hu "Files of &type:" "F\u00e1jlok &t\u00edpusa:"
-    ::msgcat::mcset hu "Fi&les:" "F\u00e1j&lok:"
-    ::msgcat::mcset hu "&Filter" "&Sz\u0171r\u0151"
-    ::msgcat::mcset hu "Fil&ter:" "S&z\u0171r\u0151:"
-    ::msgcat::mcset hu "&Green" "&Z\u00f6ld"
-    #::msgcat::mcset hu "&Help"
-    ::msgcat::mcset hu "Hi" "\u00dcdv"
-    ::msgcat::mcset hu "&Hide Console" "Konzol &elrejt\u00e9se"
-    ::msgcat::mcset hu "&Ignore" "K&ihagy\u00e1s"
-    ::msgcat::mcset hu "Invalid file name \"%1\$s\"." "\u00c9rv\u00e9nytelen f\u00e1jln\u00e9v: \"%1\$s\"."
-    ::msgcat::mcset hu "Log Files" "Log f\u00e1jlok"
-    ::msgcat::mcset hu "&No" "&Nem"
-    ::msgcat::mcset hu "&OK"
-    ::msgcat::mcset hu "OK"
-    ::msgcat::mcset hu "Ok"
-    ::msgcat::mcset hu "Open" "Megnyit\u00e1s"
-    ::msgcat::mcset hu "&Open" "&Megnyit\u00e1s"
-    ::msgcat::mcset hu "Open Multiple Files" "T\u00f6bb f\u00e1jl megnyit\u00e1sa"
-    ::msgcat::mcset hu "P&aste" "&Beilleszt\u00e9s"
-    ::msgcat::mcset hu "&Quit" "&Kil\u00e9p\u00e9s"
-    ::msgcat::mcset hu "&Red" "&V\u00f6r\u00f6s"
-    ::msgcat::mcset hu "Replace existing file?" "Megl\u00e9v\u0151 f\u00e1jl cser\u00e9je?"
-    ::msgcat::mcset hu "&Retry" "\u00daj&ra"
-    ::msgcat::mcset hu "&Save" "&Ment\u00e9s"
-    ::msgcat::mcset hu "Save As" "Ment\u00e9s m\u00e1sk\u00e9nt"
-    ::msgcat::mcset hu "Save To Log" "Ment\u00e9s log f\u00e1jlba"
-    ::msgcat::mcset hu "Select Log File" "Log f\u00e1jl kiv\u00e1laszt\u00e1sa"
-    ::msgcat::mcset hu "Select a file to source" "Forr\u00e1sf\u00e1jl kiv\u00e1laszt\u00e1sa"
-    ::msgcat::mcset hu "&Selection:" "&Kijel\u00f6l\u00e9s:"
-    ::msgcat::mcset hu "Show &Hidden Directories" "&Rejtett k\u00f6nyvt\u00e1rak megjelen\u00edt\u00e9se"
-    ::msgcat::mcset hu "Show &Hidden Files and Directories" "&Rejtett f\u00e1jlok \u00e9s k\u00f6nyvt\u00e1rak megjelen\u00edt\u00e9se"
-    ::msgcat::mcset hu "Skip Messages" "\u00dczenetek kihagy\u00e1sa"
-    ::msgcat::mcset hu "&Source..." "&Forr\u00e1s..."
-    ::msgcat::mcset hu "Tcl Scripts" "Tcl scriptek"
-    ::msgcat::mcset hu "Tcl for Windows" "Tcl Windows-hoz"
-    ::msgcat::mcset hu "Text Files" "Sz\u00f6vegf\u00e1jlok"
-    ::msgcat::mcset hu "&Yes" "&Igen"
-    ::msgcat::mcset hu "abort" "megszak\u00edt\u00e1s"
-    ::msgcat::mcset hu "blue" "k\u00e9k"
-    ::msgcat::mcset hu "cancel" "m\u00e9gsem"
-    ::msgcat::mcset hu "extension" "kiterjeszt\u00e9s"
-    ::msgcat::mcset hu "extensions" "kiterjeszt\u00e9sek"
-    ::msgcat::mcset hu "green" "z\u00f6ld"
-    ::msgcat::mcset hu "ignore" "ignorer"
-    ::msgcat::mcset hu "ok"
-    ::msgcat::mcset hu "red" "v\u00f6r\u00f6s"
-    ::msgcat::mcset hu "retry" "\u00fajra"
-    ::msgcat::mcset hu "yes" "igen"
-}
diff --git a/tk8.6/library/msgs/it.msg b/tk8.6/library/msgs/it.msg
deleted file mode 100644
index 2e1b4bd..0000000
--- a/tk8.6/library/msgs/it.msg
+++ /dev/null
@@ -1,73 +0,0 @@
-namespace eval ::tk {
-    ::msgcat::mcset it "&Abort" "&Interrompi"
-    ::msgcat::mcset it "&About..." "Informazioni..."
-    ::msgcat::mcset it "All Files" "Tutti i file"
-    ::msgcat::mcset it "Application Error" "Errore dell' applicazione"
-    ::msgcat::mcset it "&Blue" "&Blu"
-    ::msgcat::mcset it "Cancel" "Annulla"
-    ::msgcat::mcset it "&Cancel" "&Annulla"
-    ::msgcat::mcset it "Cannot change to the directory \"%1\$s\".\nPermission denied." "Impossibile accedere alla directory \"%1\$s\".\nPermesso negato."
-    ::msgcat::mcset it "Choose Directory" "Scegli una directory"
-    ::msgcat::mcset it "Cl&ear" "Azzera"
-    ::msgcat::mcset it "&Clear Console" "Azzera Console"
-    ::msgcat::mcset it "Color" "Colore"
-    ::msgcat::mcset it "Console"
-    ::msgcat::mcset it "&Copy" "Copia"
-    ::msgcat::mcset it "Cu&t" "Taglia"
-    ::msgcat::mcset it "Delete" "Cancella"
-    ::msgcat::mcset it "Details >>" "Dettagli >>"
-    ::msgcat::mcset it "Directory \"%1\$s\" does not exist." "La directory \"%1\$s\" non esiste."
-    ::msgcat::mcset it "&Directory:"
-    ::msgcat::mcset it "Error: %1\$s" "Errore: %1\$s"
-    ::msgcat::mcset it "E&xit" "Esci"
-    ::msgcat::mcset it "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Il file \"%1\$s\" esiste gi\u00e0.\nVuoi sovrascriverlo?"
-    ::msgcat::mcset it "File \"%1\$s\" already exists.\n\n" "Il file \"%1\$s\" esiste gi\u00e0.\n\n"
-    ::msgcat::mcset it "File \"%1\$s\" does not exist." "Il file \"%1\$s\" non esiste."
-    ::msgcat::mcset it "File &name:" "&Nome del file:"
-    ::msgcat::mcset it "File &names:" "&Nomi dei file:"
-    ::msgcat::mcset it "Files of &type:" "File di &tipo:"
-    ::msgcat::mcset it "Fi&les:" "Fi&le:"
-    ::msgcat::mcset it "&Filter" "&Filtro"
-    ::msgcat::mcset it "Fil&ter:" "Fil&tro:"
-    ::msgcat::mcset it "&Green" "&Verde"
-    ::msgcat::mcset it "Hi" "Salve"
-    ::msgcat::mcset it "&Hide Console" "Nascondi la console"
-    ::msgcat::mcset it "&Ignore" "&Ignora"
-    ::msgcat::mcset it "Invalid file name \"%1\$s\"." "Nome di file non valido \"%1\$s\"."
-    ::msgcat::mcset it "Log Files" "File di log"
-    ::msgcat::mcset it "&No"
-    ::msgcat::mcset it "&OK"
-    ::msgcat::mcset it "OK"
-    ::msgcat::mcset it "Ok"
-    ::msgcat::mcset it "Open" "Apri"
-    ::msgcat::mcset it "&Open" "A&pri"
-    ::msgcat::mcset it "Open Multiple Files" "Apri file multipli"
-    ::msgcat::mcset it "P&aste" "Incolla"
-    ::msgcat::mcset it "&Quit" "Esci"
-    ::msgcat::mcset it "&Red" "&Rosso"
-    ::msgcat::mcset it "Replace existing file?" "Sostituisci il file esistente?"
-    ::msgcat::mcset it "&Retry" "&Riprova"
-    ::msgcat::mcset it "&Save" "&Salva"
-    ::msgcat::mcset it "Save As" "Salva come"
-    ::msgcat::mcset it "Save To Log" "Salva il log"
-    ::msgcat::mcset it "Select Log File" "Scegli un file di log"
-    ::msgcat::mcset it "Select a file to source" "Scegli un file da eseguire"
-    ::msgcat::mcset it "&Selection:" "&Selezione:"
-    ::msgcat::mcset it "Skip Messages" "Salta i messaggi"
-    ::msgcat::mcset it "Source..." "Esegui..."
-    ::msgcat::mcset it "Tcl Scripts" "Script Tcl"
-    ::msgcat::mcset it "Tcl for Windows" "Tcl per Windows"
-    ::msgcat::mcset it "Text Files" "File di testo"
-    ::msgcat::mcset it "&Yes" "&S\u00ec"
-    ::msgcat::mcset it "abort" "interrompi"
-    ::msgcat::mcset it "blue" "blu"
-    ::msgcat::mcset it "cancel" "annulla"
-    ::msgcat::mcset it "extension" "estensione"
-    ::msgcat::mcset it "extensions" "estensioni"
-    ::msgcat::mcset it "green" "verde"
-    ::msgcat::mcset it "ignore" "ignora"
-    ::msgcat::mcset it "ok"
-    ::msgcat::mcset it "red" "rosso"
-    ::msgcat::mcset it "retry" "riprova"
-    ::msgcat::mcset it "yes" "s\u00ec"
-}
diff --git a/tk8.6/library/msgs/nl.msg b/tk8.6/library/msgs/nl.msg
deleted file mode 100644
index 148a9e6..0000000
--- a/tk8.6/library/msgs/nl.msg
+++ /dev/null
@@ -1,91 +0,0 @@
-namespace eval ::tk {
-    ::msgcat::mcset nl "&Abort" "&Afbreken"
-    ::msgcat::mcset nl "&About..." "Over..."
-    ::msgcat::mcset nl "All Files" "Alle Bestanden"
-    ::msgcat::mcset nl "Application Error" "Toepassingsfout"
-    ::msgcat::mcset nl "&Apply" "Toepassen"
-    ::msgcat::mcset nl "Bold" "Vet"
-    ::msgcat::mcset nl "Bold Italic" "Vet Cursief"
-    ::msgcat::mcset nl "&Blue" "&Blauw"
-    ::msgcat::mcset nl "Cancel" "Annuleren"
-    ::msgcat::mcset nl "&Cancel" "&Annuleren"
-    ::msgcat::mcset nl "Cannot change to the directory \"%1\$s\".\nPermission denied." "Kan niet naar map \"%1\$s\" gaan.\nU heeft hiervoor geen toestemming."
-    ::msgcat::mcset nl "Choose Directory" "Kies map"
-    ::msgcat::mcset nl "Cl&ear" "Wissen"
-    ::msgcat::mcset nl "&Clear Console" "&Wis Console"
-    ::msgcat::mcset nl "Color" "Kleur"
-    ::msgcat::mcset nl "Console"
-    ::msgcat::mcset nl "&Copy" "Kopi\u00ebren"
-    ::msgcat::mcset nl "Cu&t" "Knippen"
-    ::msgcat::mcset nl "&Delete" "Wissen"
-    ::msgcat::mcset nl "Details >>"
-    ::msgcat::mcset nl "Directory \"%1\$s\" does not exist." "Map \"%1\$s\" bestaat niet."
-    ::msgcat::mcset nl "&Directory:" "&Map:"
-    ::msgcat::mcset nl "&Edit" "Bewerken"
-    ::msgcat::mcset nl "Effects" "Effecten"
-    ::msgcat::mcset nl "Error: %1\$s" "Fout: %1\$s"
-    ::msgcat::mcset nl "E&xit" "Be\u00ebindigen"
-    ::msgcat::mcset nl "&File" "Bestand"
-    ::msgcat::mcset nl "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Bestand \"%1\$s\" bestaat al.\nWilt u het overschrijven?"
-    ::msgcat::mcset nl "File \"%1\$s\" already exists.\n\n" "Bestand \"%1\$s\" bestaat al.\n\n"
-    ::msgcat::mcset nl "File \"%1\$s\" does not exist." "Bestand \"%1\$s\" bestaat niet."
-    ::msgcat::mcset nl "File &name:" "Bestands&naam:"
-    ::msgcat::mcset nl "File &names:" "Bestands&namen:"
-    ::msgcat::mcset nl "Files of &type:" "Bestanden van het &type:"
-    ::msgcat::mcset nl "Fi&les:" "&Bestanden:"
-    ::msgcat::mcset nl "&Filter"
-    ::msgcat::mcset nl "Fil&ter:"
-    ::msgcat::mcset nl "Font"
-    ::msgcat::mcset nl "&Font:"
-    ::msgcat::mcset nl "Font st&yle:" "Font stijl:"
-    ::msgcat::mcset nl "&Green" "&Groen"
-    ::msgcat::mcset nl "&Help"
-    ::msgcat::mcset nl "Hi" "H\u00e9"
-    ::msgcat::mcset nl "&Hide Console" "Verberg Console"
-    ::msgcat::mcset nl "&Ignore" "&Negeren"
-    ::msgcat::mcset nl "Invalid file name \"%1\$s\"." "Ongeldige bestandsnaam \"%1\$s\"."
-    ::msgcat::mcset nl "Italic" "Cursief"
-    ::msgcat::mcset nl "Log Files" "Log Bestanden"
-    ::msgcat::mcset nl "&No" "&Nee"
-    ::msgcat::mcset nl "&OK"
-    ::msgcat::mcset nl "OK"
-    ::msgcat::mcset nl "Ok"
-    ::msgcat::mcset nl "Open" "Openen"
-    ::msgcat::mcset nl "&Open" "&Openen"
-    ::msgcat::mcset nl "Open Multiple Files" "Open meerdere bestanden"
-    ::msgcat::mcset nl "P&aste" "Pl&akken"
-    ::msgcat::mcset nl "&Quit" "Stoppen"
-    ::msgcat::mcset nl "&Red" "&Rood"
-    ::msgcat::mcset nl "Regular" "Standaard"
-    ::msgcat::mcset nl "Replace existing file?" "Vervang bestaand bestand?"
-    ::msgcat::mcset nl "&Retry" "&Herhalen"
-    ::msgcat::mcset nl "Sample"
-    ::msgcat::mcset nl "&Save" "Op&slaan"
-    ::msgcat::mcset nl "Save As" "Opslaan als"
-    ::msgcat::mcset nl "Save To Log" "Opslaan naar Log"
-    ::msgcat::mcset nl "Select Log File" "Selecteer Log bestand"
-    ::msgcat::mcset nl "Select a file to source" "Selecteer bronbestand"
-    ::msgcat::mcset nl "&Selection:" "&Selectie:"
-    ::msgcat::mcset nl "&Size:" "Grootte"
-    ::msgcat::mcset nl "Show &Hidden Directories" "Laat verborgen mappen zien"
-    ::msgcat::mcset nl "Show &Hidden Files and Directories" "Laat verborgen bestanden mappen zien"
-    ::msgcat::mcset nl "Skip Messages" "Berichten overslaan"
-    ::msgcat::mcset nl "&Source..." "Bron..."
-    ::msgcat::mcset nl "Stri&keout"
-    ::msgcat::mcset nl "Tcl Scripts"
-    ::msgcat::mcset nl "Tcl for Windows" "Tcl voor Windows"
-    ::msgcat::mcset nl "Text Files" "Tekstbestanden"
-    ::msgcat::mcset nl "&Underline" "Onderstreept"
-    ::msgcat::mcset nl "&Yes" "&Ja"
-    ::msgcat::mcset nl "abort" "afbreken"
-    ::msgcat::mcset nl "blue" "blauw"
-    ::msgcat::mcset nl "cancel" "annuleren"
-    ::msgcat::mcset nl "extension"
-    ::msgcat::mcset nl "extensions"
-    ::msgcat::mcset nl "green" "groen"
-    ::msgcat::mcset nl "ignore" "negeren"
-    ::msgcat::mcset nl "ok"
-    ::msgcat::mcset nl "red" "rood"
-    ::msgcat::mcset nl "retry" "opnieuw"
-    ::msgcat::mcset nl "yes" "ja"
-}
diff --git a/tk8.6/library/msgs/pl.msg b/tk8.6/library/msgs/pl.msg
deleted file mode 100644
index c20f41e..0000000
--- a/tk8.6/library/msgs/pl.msg
+++ /dev/null
@@ -1,91 +0,0 @@
-namespace eval ::tk {
-    ::msgcat::mcset pl "&Abort" "&Przerwij"
-    ::msgcat::mcset pl "&About..." "O programie..."
-    ::msgcat::mcset pl "All Files" "Wszystkie pliki"
-    ::msgcat::mcset pl "Application Error" "B\u0142\u0105d w programie"
-    ::msgcat::mcset pl "&Apply" "Zastosuj"
-    ::msgcat::mcset pl "Bold" "Pogrubienie"
-    ::msgcat::mcset pl "Bold Italic" "Pogrubiona kursywa"
-    ::msgcat::mcset pl "&Blue" "&Niebieski"
-    ::msgcat::mcset pl "Cancel" "Anuluj"
-    ::msgcat::mcset pl "&Cancel" "&Anuluj"
-    ::msgcat::mcset pl "Cannot change to the directory \"%1\$s\".\nPermission denied." "Nie mo\u017cna otworzy\u0107 katalogu \"%1\$s\".\nOdmowa dost\u0119pu."
-    ::msgcat::mcset pl "Choose Directory" "Wybierz katalog"
-    ::msgcat::mcset pl "Cl&ear" "&Wyczy\u015b\u0107"
-    ::msgcat::mcset pl "&Clear Console" "&Wyczy\u015b\u0107 konsol\u0119"
-    ::msgcat::mcset pl "Color" "Kolor"
-    ::msgcat::mcset pl "Console" "Konsola"
-    ::msgcat::mcset pl "&Copy" "&Kopiuj"
-    ::msgcat::mcset pl "Cu&t" "&Wytnij"
-    ::msgcat::mcset pl "&Delete" "&Usu\u0144"
-    ::msgcat::mcset pl "Details >>" "Szczeg\u00f3\u0142y >>"
-    ::msgcat::mcset pl "Directory \"%1\$s\" does not exist." "Katalog \"%1\$s\" nie istnieje."
-    ::msgcat::mcset pl "&Directory:" "&Katalog:"
-    ::msgcat::mcset pl "&Edit" "&Edytuj"
-    ::msgcat::mcset pl "Effects" "Efekty"
-    ::msgcat::mcset pl "Error: %1\$s" "B\u0142\u0105d: %1\$s"
-    ::msgcat::mcset pl "E&xit" "&Wyjd\u017a"
-    ::msgcat::mcset pl "&File" "&Plik"
-    ::msgcat::mcset pl "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Plik \"%1\$s\" ju\u017c istnieje.\nCzy chcesz go nadpisa\u0107?"
-    ::msgcat::mcset pl "File \"%1\$s\" already exists.\n\n" "Plik \"%1\$s\" ju\u017c istnieje.\n\n"
-    ::msgcat::mcset pl "File \"%1\$s\" does not exist." "Plik \"%1\$s\" nie istnieje."
-    ::msgcat::mcset pl "File &name:" "Nazwa &pliku:"
-    ::msgcat::mcset pl "File &names:" "Nazwy &plik\u00f3w:"
-    ::msgcat::mcset pl "Files of &type:" "Pliki &typu:"
-    ::msgcat::mcset pl "Fi&les:" "Pli&ki:"
-    ::msgcat::mcset pl "&Filter" "&Filtr"
-    ::msgcat::mcset pl "Fil&ter:" "&Filtr:"
-    ::msgcat::mcset pl "Font" "Czcionka"
-    ::msgcat::mcset pl "&Font:" "Czcio&nka:"
-    ::msgcat::mcset pl "Font st&yle:" "&Styl czcionki:"
-    ::msgcat::mcset pl "&Green" "&Zielony"
-    ::msgcat::mcset pl "&Help" "&Pomoc"
-    ::msgcat::mcset pl "Hi" "Witaj"
-    ::msgcat::mcset pl "&Hide Console" "&Ukryj konsol\u0119"
-    ::msgcat::mcset pl "&Ignore" "&Ignoruj"
-    ::msgcat::mcset pl "Invalid file name \"%1\$s\"." "Niew\u0142a\u015bciwa nazwa pliku \"%1\$s\"."
-    ::msgcat::mcset pl "Italic" "Kursywa"
-    ::msgcat::mcset pl "Log Files" "Pliki dziennika"
-    ::msgcat::mcset pl "&No" "&Nie"
-    ::msgcat::mcset pl "&OK"
-    ::msgcat::mcset pl "OK"
-    ::msgcat::mcset pl "Ok"
-    ::msgcat::mcset pl "Open" "Otw\u00f3rz"
-    ::msgcat::mcset pl "&Open" "&Otw\u00f3rz"
-    ::msgcat::mcset pl "Open Multiple Files" "Otw\u00f3rz wiele plik\u00f3w"
-    ::msgcat::mcset pl "P&aste" "&Wklej"
-    ::msgcat::mcset pl "&Quit" "&Zako\u0144cz"
-    ::msgcat::mcset pl "&Red" "&Czerwony"
-    ::msgcat::mcset pl "Regular" "Regularne"
-    ::msgcat::mcset pl "Replace existing file?" "Czy zast\u0105pi\u0107 istniej\u0105cy plik?"
-    ::msgcat::mcset pl "&Retry" "&Pon\u00f3w"
-    ::msgcat::mcset pl "Sample" "Przyk\u0142ad"
-    ::msgcat::mcset pl "&Save" "&Zapisz"
-    ::msgcat::mcset pl "Save As" "Zapisz jako"
-    ::msgcat::mcset pl "Save To Log" "Wpisz do dziennika"
-    ::msgcat::mcset pl "Select Log File" "Wybierz plik dziennika"
-    ::msgcat::mcset pl "Select a file to source" "Wybierz plik do wykonania"
-    ::msgcat::mcset pl "&Selection:" "&Wyb\u00f3r:"
-    ::msgcat::mcset pl "&Size:" "&Rozmiar:"
-    ::msgcat::mcset pl "Show &Hidden Directories" "Poka\u017c &ukryte katalogi"
-    ::msgcat::mcset pl "Show &Hidden Files and Directories" "Poka\u017c &ukryte pliki i katalogi"
-    ::msgcat::mcset pl "Skip Messages" "Pomi\u0144 pozosta\u0142e komunikaty"
-    ::msgcat::mcset pl "&Source..." "&Kod \u017ar\u00f3d\u0142owy..."
-    ::msgcat::mcset pl "Stri&keout" "&Przekre\u015blenie"
-    ::msgcat::mcset pl "Tcl Scripts" "Skrypty Tcl"
-    ::msgcat::mcset pl "Tcl for Windows" "Tcl dla Windows"
-    ::msgcat::mcset pl "Text Files" "Pliki tekstowe"
-    ::msgcat::mcset pl "&Underline" "Po&dkre\u015blenie"
-    ::msgcat::mcset pl "&Yes" "&Tak"
-    ::msgcat::mcset pl "abort" "przerwij"
-    ::msgcat::mcset pl "blue" "niebieski"
-    ::msgcat::mcset pl "cancel" "anuluj"
-    ::msgcat::mcset pl "extension" "rozszerzenie"
-    ::msgcat::mcset pl "extensions" "rozszerzenia"
-    ::msgcat::mcset pl "green" "zielony"
-    ::msgcat::mcset pl "ignore" "ignoruj"
-    ::msgcat::mcset pl "ok"
-    ::msgcat::mcset pl "red" "czerwony"
-    ::msgcat::mcset pl "retry" "pon\u00f3w"
-    ::msgcat::mcset pl "yes" "tak"
-}
diff --git a/tk8.6/library/msgs/pt.msg b/tk8.6/library/msgs/pt.msg
deleted file mode 100644
index c29e293..0000000
--- a/tk8.6/library/msgs/pt.msg
+++ /dev/null
@@ -1,74 +0,0 @@
-namespace eval ::tk {
-    ::msgcat::mcset pt "&Abort" "&Abortar"
-    ::msgcat::mcset pt "About..." "Sobre ..."
-    ::msgcat::mcset pt "All Files" "Todos os arquivos"
-    ::msgcat::mcset pt "Application Error" "Erro de aplica\u00e7\u00e3o"
-    ::msgcat::mcset pt "&Blue" "&Azul"
-    ::msgcat::mcset pt "Cancel" "Cancelar"
-    ::msgcat::mcset pt "&Cancel" "&Cancelar"
-    ::msgcat::mcset pt "Cannot change to the directory \"%1\$s\".\nPermission denied." "N\u00e3o foi poss\u00edvel mudar para o diret\u00f3rio \"%1\$s\".\nPermiss\u00e3o negada."
-    ::msgcat::mcset pt "Choose Directory" "Escolha um diret\u00f3rio"
-    ::msgcat::mcset pt "Cl&ear" "Apagar"
-    ::msgcat::mcset pt "&Clear Console" "Apagar Console"
-    ::msgcat::mcset pt "Color" "Cor"
-    ::msgcat::mcset pt "Console"
-    ::msgcat::mcset pt "&Copy" "Copiar"
-    ::msgcat::mcset pt "Cu&t" "Recortar"
-    ::msgcat::mcset pt "&Delete" "Excluir"
-    ::msgcat::mcset pt "Details >>" "Detalhes >>"
-    ::msgcat::mcset pt "Directory \"%1\$s\" does not exist." "O diret\u00f3rio \"%1\$s\" n\u00e3o existe."
-    ::msgcat::mcset pt "&Directory:" "&Diret\u00f3rio:"
-    ::msgcat::mcset pt "Error: %1\$s" "Erro: %1\$s"
-    ::msgcat::mcset pt "E&xit" "Sair"
-    ::msgcat::mcset pt "&File" "Arquivo"
-    ::msgcat::mcset pt "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "O arquivo \"%1\$s\" j\u00e1 existe.\nDeseja sobrescreve-lo?"
-    ::msgcat::mcset pt "File \"%1\$s\" already exists.\n\n" "O arquivo \"%1\$s\" j\u00e1 existe.\n\n"
-    ::msgcat::mcset pt "File \"%1\$s\" does not exist." "Arquivo \"%1\$s\" n\u00e3o existe."
-    ::msgcat::mcset pt "File &name:" "&Nome do arquivo:"
-    ::msgcat::mcset pt "File &names:" "&Nomes dos arquivos:"
-    ::msgcat::mcset pt "Files of &type:" "Arquivos do &tipo:"
-    ::msgcat::mcset pt "Fi&les:" "&Arquivos:"
-    ::msgcat::mcset pt "&Filter" "&Filtro"
-    ::msgcat::mcset pt "Fil&ter:" "Fil&tro:"
-    ::msgcat::mcset pt "&Green" "&Verde"
-    ::msgcat::mcset pt "Hi" "Oi"
-    ::msgcat::mcset pt "&Hide Console" "Ocultar console"
-    ::msgcat::mcset pt "&Ignore" "&Ignorar"
-    ::msgcat::mcset pt "Invalid file name \"%1\$s\"." "O nome do arquivo \u00e9 inv\u00e1lido \"%1\$s\"."
-    ::msgcat::mcset pt "Log Files" "Arquivos de log"
-    ::msgcat::mcset pt "&No" "&N\u00e3o"
-    ::msgcat::mcset pt "&OK"
-    ::msgcat::mcset pt "OK"
-    ::msgcat::mcset pt "Ok"
-    ::msgcat::mcset pt "Open" "Abrir"
-    ::msgcat::mcset pt "&Open" "&Abrir"
-    ::msgcat::mcset pt "Open Multiple Files" "Abrir m\u00faltiplos arquivos"
-    ::msgcat::mcset pt "P&aste" "Col&ar"
-    ::msgcat::mcset pt "Quit" "Encerrar"
-    ::msgcat::mcset pt "&Red" "&Vermelho"
-    ::msgcat::mcset pt "Replace existing file?" "Substituir arquivo existente?"
-    ::msgcat::mcset pt "&Retry" "Tenta&r novamente"
-    ::msgcat::mcset pt "&Save" "&Salvar"
-    ::msgcat::mcset pt "Save As" "Salvar como"
-    ::msgcat::mcset pt "Save To Log" "Salvar arquivo de log"
-    ::msgcat::mcset pt "Select Log File" "Selecionar arquivo de log"
-    ::msgcat::mcset pt "Select a file to source" "Selecione um arquivo como fonte"
-    ::msgcat::mcset pt "&Selection:" "&Sele\u00e7\u00e3o:"
-    ::msgcat::mcset pt "Skip Messages" "Omitir as mensagens"
-    ::msgcat::mcset pt "&Source..." "&Fonte..."
-    ::msgcat::mcset pt "Tcl Scripts" "Scripts Tcl"
-    ::msgcat::mcset pt "Tcl for Windows" "Tcl para Windows"
-    ::msgcat::mcset pt "Text Files" "Arquivos de texto"
-    ::msgcat::mcset pt "&Yes" "&Sim"
-    ::msgcat::mcset pt "abort" "abortar"
-    ::msgcat::mcset pt "blue" "azul"
-    ::msgcat::mcset pt "cancel" "cancelar"
-    ::msgcat::mcset pt "extension" "extens\u00e3o"
-    ::msgcat::mcset pt "extensions" "extens\u00f5es"
-    ::msgcat::mcset pt "green" "verde"
-    ::msgcat::mcset pt "ignore" "ignorar"
-    ::msgcat::mcset pt "ok"
-    ::msgcat::mcset pt "red" "vermelho"
-    ::msgcat::mcset pt "retry" "tentar novamente"
-    ::msgcat::mcset pt "yes" "sim"
-}
diff --git a/tk8.6/library/msgs/ru.msg b/tk8.6/library/msgs/ru.msg
deleted file mode 100644
index 2aac5bb..0000000
--- a/tk8.6/library/msgs/ru.msg
+++ /dev/null
@@ -1,75 +0,0 @@
-namespace eval ::tk {
-    ::msgcat::mcset ru "&Abort" "&\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c"
-    ::msgcat::mcset ru "&About..." "\u041f\u0440\u043e..."
-    ::msgcat::mcset ru "All Files" "\u0412\u0441\u0435 \u0444\u0430\u0439\u043b\u044b"
-    ::msgcat::mcset ru "Application Error" "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435"
-    ::msgcat::mcset ru "&Blue" " &\u0413\u043e\u043b\u0443\u0431\u043e\u0439"
-    ::msgcat::mcset ru "Cancel" "\u041e\u0442&\u043c\u0435\u043d\u0430"
-    ::msgcat::mcset ru "&Cancel" "\u041e\u0442&\u043c\u0435\u043d\u0430"
-    ::msgcat::mcset ru "Cannot change to the directory \"%1\$s\".\nPermission denied." \
-			"\u041d\u0435 \u043c\u043e\u0433\u0443 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u0432 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \"%1\$s\".\n\u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e \u043f\u0440\u0430\u0432 \u0434\u043e\u0441\u0442\u0443\u043f\u0430"
-    ::msgcat::mcset ru "Choose Directory" "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043a\u0430\u0442\u0430\u043b\u043e\u0433"
-    ::msgcat::mcset ru "Cl&ear" "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c"
-    ::msgcat::mcset ru "Color" "\u0426\u0432\u0435\u0442"
-    ::msgcat::mcset ru "Console" "\u041a\u043e\u043d\u0441\u043e\u043b\u044c"
-    ::msgcat::mcset ru "&Copy" "\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c"
-    ::msgcat::mcset ru "Cu&t" "\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c"
-    ::msgcat::mcset ru "&Delete" "\u0423\u0434\u0430\u043b\u0438\u0442\u044c"
-    ::msgcat::mcset ru "Details >>" "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435 >>"
-    ::msgcat::mcset ru "Directory \"%1\$s\" does not exist." "\u041a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 \"%1\$s\" \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442."
-    ::msgcat::mcset ru "&Directory:" "&\u041a\u0430\u0442\u0430\u043b\u043e\u0433:"
-    ::msgcat::mcset ru "Error: %1\$s" "\u041e\u0448\u0438\u0431\u043a\u0430: %1\$s"
-    ::msgcat::mcset ru "E&xit" "\u0412\u044b\u0445\u043e\u0434"
-    ::msgcat::mcset ru "File \"%1\$s\" already exists.\nDo you want to overwrite it?" \
-			    "\u0424\u0430\u0439\u043b \"%1\$s\" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.\n\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0435\u0433\u043e?"
-    ::msgcat::mcset ru "File \"%1\$s\" already exists.\n\n" "\u0424\u0430\u0439\u043b \"%1\$s\" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.\n\n"
-    ::msgcat::mcset ru "File \"%1\$s\" does not exist." "\u0424\u0430\u0439\u043b \"%1\$s\" \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d."
-    ::msgcat::mcset ru "File &name:" "&\u0418\u043c\u044f \u0444\u0430\u0439\u043b\u0430:"
-    ::msgcat::mcset ru "File &names:" "&\u0418\u043c\u0435\u043d\u0430 \u0444\u0430\u0439\u043b\u043e\u0432:"
-    ::msgcat::mcset ru "Files of &type:" "&\u0422\u0438\u043f \u0444\u0430\u0439\u043b\u043e\u0432:"
-    ::msgcat::mcset ru "Fi&les:" "\u0424\u0430\u0439&\u043b\u044b:"
-    ::msgcat::mcset ru "&Filter" "&\u0424\u0438\u043b\u044c\u0442\u0440"
-    ::msgcat::mcset ru "Fil&ter:" "\u0424\u0438\u043b\u044c&\u0442\u0440:"
-    ::msgcat::mcset ru "&Green" " &\u0417\u0435\u043b\u0435\u043d\u044b\u0439"
-    ::msgcat::mcset ru "Hi" "\u041f\u0440\u0438\u0432\u0435\u0442"
-    ::msgcat::mcset ru "&Hide Console" "\u0421\u043f\u0440\u044f\u0442\u0430\u0442\u044c \u043a\u043e\u043d\u0441\u043e\u043b\u044c"
-    ::msgcat::mcset ru "&Ignore" "&\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c"
-    ::msgcat::mcset ru "Invalid file name \"%1\$s\"." "\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0438\u043c\u044f \u0444\u0430\u0439\u043b\u0430 \"%1\$s\"."
-    ::msgcat::mcset ru "Log Files" "\u0424\u0430\u0439\u043b\u044b \u0436\u0443\u0440\u043d\u0430\u043b\u0430"
-    ::msgcat::mcset ru "&No" "&\u041d\u0435\u0442"
-    ::msgcat::mcset ru "&OK" "&\u041e\u041a"
-    ::msgcat::mcset ru "OK" "\u041e\u041a"
-    ::msgcat::mcset ru "Ok" "\u0414\u0430"
-    ::msgcat::mcset ru "Open" "\u041e\u0442\u043a\u0440\u044b\u0442\u044c"
-    ::msgcat::mcset ru "&Open" "&\u041e\u0442\u043a\u0440\u044b\u0442\u044c"
-    ::msgcat::mcset ru "Open Multiple Files" "\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0444\u0430\u0439\u043b\u043e\u0432"
-    ::msgcat::mcset ru "P&aste" "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c"
-    ::msgcat::mcset ru "&Quit" "\u0412\u044b\u0445\u043e\u0434"
-    ::msgcat::mcset ru "&Red" " &\u041a\u0440\u0430\u0441\u043d\u044b\u0439"
-    ::msgcat::mcset ru "Replace existing file?" "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 \u0444\u0430\u0439\u043b?"
-    ::msgcat::mcset ru "&Retry" "&\u041f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c"
-    ::msgcat::mcset ru "&Save" "&\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c"
-    ::msgcat::mcset ru "Save As" "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043a\u0430\u043a"
-    ::msgcat::mcset ru "Save To Log" "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0432 \u0436\u0443\u0440\u043d\u0430\u043b"
-    ::msgcat::mcset ru "Select Log File" "\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0436\u0443\u0440\u043d\u0430\u043b"
-    ::msgcat::mcset ru "Select a file to source" "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043b \u0434\u043b\u044f \u0438\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0430\u0446\u0438\u0438"
-    ::msgcat::mcset ru "&Selection:"
-    ::msgcat::mcset ru "Skip Messages" "\u041f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f"
-    ::msgcat::mcset ru "&Source..." "\u0418\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0444\u0430\u0439\u043b..."
-    ::msgcat::mcset ru "Tcl Scripts" "\u041f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0430 \u043d\u0430 \u044f\u0437\u044b\u043a\u0435 TCL"
-    ::msgcat::mcset ru "Tcl for Windows" "TCL \u0434\u043b\u044f Windows"
-    ::msgcat::mcset ru "Text Files" "\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u044b\u0435 \u0444\u0430\u0439\u043b\u044b"
-    ::msgcat::mcset ru "&Yes" "&\u0414\u0430"
-    ::msgcat::mcset ru "abort" "\u043e\u0442\u043c\u0435\u043d\u0430"
-    ::msgcat::mcset ru "blue" " \u0433\u043e\u043b\u0443\u0431\u043e\u0439"
-    ::msgcat::mcset ru "cancel" "\u043e\u0442\u043c\u0435\u043d\u0430"
-    ::msgcat::mcset ru "extension" "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435"
-    ::msgcat::mcset ru "extensions" "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f"
-    ::msgcat::mcset ru "green" " \u0437\u0435\u043b\u0435\u043d\u044b\u0439"
-    ::msgcat::mcset ru "ignore" "\u043f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c"
-    ::msgcat::mcset ru "ok" "\u043e\u043a"
-    ::msgcat::mcset ru "red" " \u043a\u0440\u0430\u0441\u043d\u044b\u0439"
-    ::msgcat::mcset ru "retry" "\u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c"
-    ::msgcat::mcset ru "yes" "\u0434\u0430"
-}
-
diff --git a/tk8.6/library/msgs/sv.msg b/tk8.6/library/msgs/sv.msg
deleted file mode 100644
index 62bfcbd..0000000
--- a/tk8.6/library/msgs/sv.msg
+++ /dev/null
@@ -1,76 +0,0 @@
-namespace eval ::tk {
-    ::msgcat::mcset sv "&Abort" "&Avsluta"
-    ::msgcat::mcset sv "&About..." "&Om..."
-    ::msgcat::mcset sv "All Files" "Samtliga filer"
-    ::msgcat::mcset sv "Application Error" "Programfel"
-    ::msgcat::mcset sv "&Blue" "&Bl\u00e5"
-    ::msgcat::mcset sv "Cancel" "Avbryt"
-    ::msgcat::mcset sv "&Cancel" "&Avbryt"
-    ::msgcat::mcset sv "Cannot change to the directory \"%1\$s\".\nPermission denied." "Kan ej n\u00e5 mappen \"%1\$s\".\nSaknar r\u00e4ttigheter."
-    ::msgcat::mcset sv "Choose Directory" "V\u00e4lj mapp"
-    ::msgcat::mcset sv "Cl&ear" "&Radera"
-    ::msgcat::mcset sv "&Clear Console" "&Radera konsollen"
-    ::msgcat::mcset sv "Color" "F\u00e4rg"
-    ::msgcat::mcset sv "Console" "Konsoll"
-    ::msgcat::mcset sv "&Copy" "&Kopiera"
-    ::msgcat::mcset sv "Cu&t" "Klipp u&t"
-    ::msgcat::mcset sv "&Delete" "&Radera"
-    ::msgcat::mcset sv "Details >>" "Detaljer >>"
-    ::msgcat::mcset sv "Directory \"%1\$s\" does not exist." "Mappen \"%1\$s\" finns ej."
-    ::msgcat::mcset sv "&Directory:" "&Mapp:"
-    ::msgcat::mcset sv "&Edit" "R&edigera"
-    ::msgcat::mcset sv "Error: %1\$s" "Fel: %1\$s"
-    ::msgcat::mcset sv "E&xit" "&Avsluta"
-    ::msgcat::mcset sv "&File" "&Fil"
-    ::msgcat::mcset sv "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Filen \"%1\$s\" finns redan.\nVill du skriva \u00f6ver den?"
-    ::msgcat::mcset sv "File \"%1\$s\" already exists.\n\n" "Filen \"%1\$s\" finns redan.\n\n"
-    ::msgcat::mcset sv "File \"%1\$s\" does not exist." "Filen \"%1\$s\" finns ej."
-    ::msgcat::mcset sv "File &name:" "Fil&namn:"
-    ::msgcat::mcset sv "File &names:" "Fil&namn:"
-    ::msgcat::mcset sv "Files of &type:" "Filer av &typ:"
-    ::msgcat::mcset sv "Fi&les:" "Fi&ler:"
-    ::msgcat::mcset sv "&Filter"
-    ::msgcat::mcset sv "Fil&ter:"
-    ::msgcat::mcset sv "&Green" "&Gr\u00f6n"
-    ::msgcat::mcset sv "&Help" "&Hj\u00e4lp"
-    ::msgcat::mcset sv "Hi" "Hej"
-    ::msgcat::mcset sv "&Hide Console" "&G\u00f6m konsollen"
-    ::msgcat::mcset sv "&Ignore" "&Ignorera"
-    ::msgcat::mcset sv "Invalid file name \"%1\$s\"." "Ogiltigt filnamn \"%1\$s\"."
-    ::msgcat::mcset sv "Log Files" "Loggfiler"
-    ::msgcat::mcset sv "&No" "&Nej"
-    ::msgcat::mcset sv "&OK"
-    ::msgcat::mcset sv "OK"
-    ::msgcat::mcset sv "Ok"
-    ::msgcat::mcset sv "Open" "\u00d6ppna"
-    ::msgcat::mcset sv "&Open" "&\u00d6ppna"
-    ::msgcat::mcset sv "Open Multiple Files" "\u00d6ppna flera filer"
-    ::msgcat::mcset sv "P&aste" "&Klistra in"
-    ::msgcat::mcset sv "&Quit" "&Avsluta"
-    ::msgcat::mcset sv "&Red" "&R\u00f6d"
-    ::msgcat::mcset sv "Replace existing file?" "Ers\u00e4tt existerande fil?"
-    ::msgcat::mcset sv "&Retry" "&F\u00f6rs\u00f6k igen"
-    ::msgcat::mcset sv "&Save" "&Spara"
-    ::msgcat::mcset sv "Save As" "Spara som"
-    ::msgcat::mcset sv "Save To Log" "Spara till logg"
-    ::msgcat::mcset sv "Select Log File" "V\u00e4lj loggfil"
-    ::msgcat::mcset sv "Select a file to source" "V\u00e4lj k\u00e4llfil"
-    ::msgcat::mcset sv "&Selection:" "&Val:"
-    ::msgcat::mcset sv "Skip Messages" "Hoppa \u00f6ver meddelanden"
-    ::msgcat::mcset sv "&Source..." "&K\u00e4lla..."
-    ::msgcat::mcset sv "Tcl Scripts" "Tcl skript"
-    ::msgcat::mcset sv "Tcl for Windows" "Tcl f\u00f6r Windows"
-    ::msgcat::mcset sv "Text Files" "Textfiler"
-    ::msgcat::mcset sv "&Yes" "&Ja"
-    ::msgcat::mcset sv "abort" "avbryt"
-    ::msgcat::mcset sv "blue" "bl\u00e5"
-    ::msgcat::mcset sv "cancel" "avbryt"
-    ::msgcat::mcset sv "extension" "utvidgning"
-    ::msgcat::mcset sv "extensions" "utvidgningar"
-    ::msgcat::mcset sv "green" "gr\u00f6n"
-    ::msgcat::mcset sv "ignore" "ignorera"
-    ::msgcat::mcset sv "ok"
-    ::msgcat::mcset sv "red" "r\u00f6d"
-    ::msgcat::mcset sv "retry" "f\u00f6rs\u00f6k igen"
-    ::msgcat::mcset sv "yes" "ja"
-}
diff --git a/tk8.6/library/obsolete.tcl b/tk8.6/library/obsolete.tcl
deleted file mode 100644
index 3ee7f28..0000000
--- a/tk8.6/library/obsolete.tcl
+++ /dev/null
@@ -1,178 +0,0 @@
-# obsolete.tcl --
-#
-# This file contains obsolete procedures that people really shouldn't
-# be using anymore, but which are kept around for backward compatibility.
-#
-# Copyright (c) 1994 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-# The procedures below are here strictly for backward compatibility with
-# Tk version 3.6 and earlier.  The procedures are no longer needed, so
-# they are no-ops.  You should not use these procedures anymore, since
-# they may be removed in some future release.
-
-proc tk_menuBar args {}
-proc tk_bindForTraversal args {}
-
-# ::tk::classic::restore --
-#
-# Restore the pre-8.5 (Tk classic) look as the widget defaults for classic
-# Tk widgets.
-#
-# The value following an 'option add' call is the new 8.5 value.
-#
-namespace eval ::tk::classic {
-    # This may need to be adjusted for some window managers that are
-    # more aggressive with their own Xdefaults (like KDE and CDE)
-    variable prio "widgetDefault"
-}
-
-proc ::tk::classic::restore {args} {
-    # Restore classic (8.4) look to classic Tk widgets
-    variable prio
-
-    if {[llength $args]} {
-	foreach what $args {
-	    ::tk::classic::restore_$what
-	}
-    } else {
-	foreach cmd [info procs restore_*] {
-	    $cmd
-	}
-    }
-}
-
-proc ::tk::classic::restore_font {args} {
-    # Many widgets were adjusted from hard-coded defaults to using the
-    # TIP#145 fonts defined in fonts.tcl (eg TkDefaultFont, TkFixedFont, ...)
-    # For restoring compatibility, we only correct size and weighting changes,
-    # as the fonts themselves remained mostly the same.
-    if {[tk windowingsystem] eq "x11"} {
-	font configure TkDefaultFont -weight bold ; # normal
-	font configure TkFixedFont -size -12 ; # -10
-    }
-    # Add these with prio 21 to override value in dialog/msgbox.tcl
-    if {[tk windowingsystem] eq "aqua"} {
-	option add *Dialog.msg.font system 21; # TkCaptionFont
-	option add *Dialog.dtl.font system 21; # TkCaptionFont
-	option add *ErrorDialog*Label.font system 21; # TkCaptionFont
-    } else {
-	option add *Dialog.msg.font {Times 12} 21; # TkCaptionFont
-	option add *Dialog.dtl.font {Times 10} 21; # TkCaptionFont
-	option add *ErrorDialog*Label.font {Times -18} 21; # TkCaptionFont
-    }
-}
-
-proc ::tk::classic::restore_button {args} {
-    variable prio
-    if {[tk windowingsystem] eq "x11"} {
-	foreach cls {Button Radiobutton Checkbutton} {
-	    option add *$cls.borderWidth 2 $prio; # 1
-	}
-    }
-}
-
-proc ::tk::classic::restore_entry {args} {
-    variable prio
-    # Entry and Spinbox share core defaults
-    foreach cls {Entry Spinbox} {
-	if {[tk windowingsystem] ne "aqua"} {
-	    option add *$cls.borderWidth	2 $prio; # 1
-	}
-	if {[tk windowingsystem] eq "x11"} {
-	    option add *$cls.background		"#d9d9d9" $prio; # "white"
-	    option add *$cls.selectBorderWidth	1 $prio; # 0
-	}
-    }
-}
-
-proc ::tk::classic::restore_listbox {args} {
-    variable prio
-    if {[tk windowingsystem] ne "win32"} {
-	option add *Listbox.background		"#d9d9d9" $prio; # "white"
-	option add *Listbox.activeStyle		"underline" $prio; # "dotbox"
-    }
-    if {[tk windowingsystem] ne "aqua"} {
-	option add *Listbox.borderWidth		2 $prio; # 1
-    }
-    if {[tk windowingsystem] eq "x11"} {
-	option add *Listbox.selectBorderWidth	1 $prio; # 0
-    }
-    # Remove focus into Listbox added for 8.5
-    bind Listbox <1> {
-	if {[winfo exists %W]} {
-	    tk::ListboxBeginSelect %W [%W index @%x,%y]
-	}
-    }
-}
-
-proc ::tk::classic::restore_menu {args} {
-    variable prio
-    if {[tk windowingsystem] eq "x11"} {
-	option add *Menu.activeBorderWidth	2 $prio; # 1
-	option add *Menu.borderWidth		2 $prio; # 1
-        option add *Menu.clickToFocus		true $prio
-        option add *Menu.useMotifHelp		true $prio
-    }
-    if {[tk windowingsystem] ne "aqua"} {
-	option add *Menu.font		"TkDefaultFont" $prio; # "TkMenuFont"
-    }
-}
-
-proc ::tk::classic::restore_menubutton {args} {
-    variable prio
-    option add *Menubutton.borderWidth	2 $prio; # 1
-}
-
-proc ::tk::classic::restore_message {args} {
-    variable prio
-    option add *Message.borderWidth	2 $prio; # 1
-}
-
-proc ::tk::classic::restore_panedwindow {args} {
-    variable prio
-    option add *Panedwindow.borderWidth	2 $prio; # 1
-    option add *Panedwindow.sashWidth	2 $prio; # 3
-    option add *Panedwindow.sashPad	2 $prio; # 0
-    option add *Panedwindow.sashRelief	raised $prio; # flat
-    option add *Panedwindow.opaqueResize	0 $prio; # 1
-    if {[tk windowingsystem] ne "win32"} {
-	option add *Panedwindow.showHandle	1 $prio; # 0
-    }
-}
-
-proc ::tk::classic::restore_scale {args} {
-    variable prio
-    option add *Scale.borderWidth	2 $prio; # 1
-    if {[tk windowingsystem] eq "x11"} {
-	option add *Scale.troughColor	"#c3c3c3" $prio; # "#b3b3b3"
-    }
-}
-
-proc ::tk::classic::restore_scrollbar {args} {
-    variable prio
-    if {[tk windowingsystem] eq "x11"} {
-	option add *Scrollbar.borderWidth	2 $prio; # 1
-	option add *Scrollbar.highlightThickness 1 $prio; # 0
-	option add *Scrollbar.width		15 $prio; # 11
-	option add *Scrollbar.troughColor	"#c3c3c3" $prio; # "#b3b3b3"
-    }
-}
-
-proc ::tk::classic::restore_text {args} {
-    variable prio
-    if {[tk windowingsystem] ne "aqua"} {
-	option add *Text.borderWidth	2 $prio; # 1
-    }
-    if {[tk windowingsystem] eq "win32"} {
-	option add *Text.font		"TkDefaultFont" $prio; # "TkFixedFont"
-    }
-    if {[tk windowingsystem] eq "x11"} {
-	option add *Text.background		"#d9d9d9" $prio; # white
-	option add *Text.selectBorderWidth	1 $prio; # 0
-    }
-}
diff --git a/tk8.6/library/optMenu.tcl b/tk8.6/library/optMenu.tcl
deleted file mode 100644
index 7cfdaa0..0000000
--- a/tk8.6/library/optMenu.tcl
+++ /dev/null
@@ -1,43 +0,0 @@
-# optMenu.tcl --
-#
-# This file defines the procedure tk_optionMenu, which creates
-# an option button and its associated menu.
-#
-# Copyright (c) 1994 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-# ::tk_optionMenu --
-# This procedure creates an option button named $w and an associated
-# menu.  Together they provide the functionality of Motif option menus:
-# they can be used to select one of many values, and the current value
-# appears in the global variable varName, as well as in the text of
-# the option menubutton.  The name of the menu is returned as the
-# procedure's result, so that the caller can use it to change configuration
-# options on the menu or otherwise manipulate it.
-#
-# Arguments:
-# w -			The name to use for the menubutton.
-# varName -		Global variable to hold the currently selected value.
-# firstValue -		First of legal values for option (must be >= 1).
-# args -		Any number of additional values.
-
-proc ::tk_optionMenu {w varName firstValue args} {
-    upvar #0 $varName var
-
-    if {![info exists var]} {
-	set var $firstValue
-    }
-    menubutton $w -textvariable $varName -indicatoron 1 -menu $w.menu \
-	    -relief raised -highlightthickness 1 -anchor c \
-	    -direction flush
-    menu $w.menu -tearoff 0
-    $w.menu add radiobutton -label $firstValue -variable $varName
-    foreach i $args {
-    	$w.menu add radiobutton -label $i -variable $varName
-    }
-    return $w.menu
-}
diff --git a/tk8.6/library/palette.tcl b/tk8.6/library/palette.tcl
deleted file mode 100644
index 9cecf5b..0000000
--- a/tk8.6/library/palette.tcl
+++ /dev/null
@@ -1,244 +0,0 @@
-# palette.tcl --
-#
-# This file contains procedures that change the color palette used
-# by Tk.
-#
-# Copyright (c) 1995-1997 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-# ::tk_setPalette --
-# Changes the default color scheme for a Tk application by setting
-# default colors in the option database and by modifying all of the
-# color options for existing widgets that have the default value.
-#
-# Arguments:
-# The arguments consist of either a single color name, which
-# will be used as the new background color (all other colors will
-# be computed from this) or an even number of values consisting of
-# option names and values.  The name for an option is the one used
-# for the option database, such as activeForeground, not -activeforeground.
-
-proc ::tk_setPalette {args} {
-    if {[winfo depth .] == 1} {
-	# Just return on monochrome displays, otherwise errors will occur
-	return
-    }
-
-    # Create an array that has the complete new palette.  If some colors
-    # aren't specified, compute them from other colors that are specified.
-
-    if {[llength $args] == 1} {
-	set new(background) [lindex $args 0]
-    } else {
-	array set new $args
-    }
-    if {![info exists new(background)]} {
-	return -code error -errorcode {TK SET_PALETTE BACKGROUND} \
-	    "must specify a background color"
-    }
-    set bg [winfo rgb . $new(background)]
-    if {![info exists new(foreground)]} {
-	# Note that the range of each value in the triple returned by
-	# [winfo rgb] is 0-65535, and your eyes are more sensitive to
-	# green than to red, and more to red than to blue.
-	foreach {r g b} $bg {break}
-	if {$r+1.5*$g+0.5*$b > 100000} {
-	    set new(foreground) black
-	} else {
-	    set new(foreground) white
-	}
-    }
-    lassign [winfo rgb . $new(foreground)] fg_r fg_g fg_b
-    lassign $bg bg_r bg_g bg_b
-    set darkerBg [format #%02x%02x%02x [expr {(9*$bg_r)/2560}] \
-	    [expr {(9*$bg_g)/2560}] [expr {(9*$bg_b)/2560}]]
-
-    foreach i {activeForeground insertBackground selectForeground \
-	    highlightColor} {
-	if {![info exists new($i)]} {
-	    set new($i) $new(foreground)
-	}
-    }
-    if {![info exists new(disabledForeground)]} {
-	set new(disabledForeground) [format #%02x%02x%02x \
-		[expr {(3*$bg_r + $fg_r)/1024}] \
-		[expr {(3*$bg_g + $fg_g)/1024}] \
-		[expr {(3*$bg_b + $fg_b)/1024}]]
-    }
-    if {![info exists new(highlightBackground)]} {
-	set new(highlightBackground) $new(background)
-    }
-    if {![info exists new(activeBackground)]} {
-	# Pick a default active background that islighter than the
-	# normal background.  To do this, round each color component
-	# up by 15% or 1/3 of the way to full white, whichever is
-	# greater.
-
-	foreach i {0 1 2} color $bg {
-	    set light($i) [expr {$color/256}]
-	    set inc1 [expr {($light($i)*15)/100}]
-	    set inc2 [expr {(255-$light($i))/3}]
-	    if {$inc1 > $inc2} {
-		incr light($i) $inc1
-	    } else {
-		incr light($i) $inc2
-	    }
-	    if {$light($i) > 255} {
-		set light($i) 255
-	    }
-	}
-	set new(activeBackground) [format #%02x%02x%02x $light(0) \
-		$light(1) $light(2)]
-    }
-    if {![info exists new(selectBackground)]} {
-	set new(selectBackground) $darkerBg
-    }
-    if {![info exists new(troughColor)]} {
-	set new(troughColor) $darkerBg
-    }
-
-    # let's make one of each of the widgets so we know what the
-    # defaults are currently for this platform.
-    toplevel .___tk_set_palette
-    wm withdraw .___tk_set_palette
-    foreach q {
-	button canvas checkbutton entry frame label labelframe
-	listbox menubutton menu message radiobutton scale scrollbar
-	spinbox text
-    } {
-	$q .___tk_set_palette.$q
-    }
-
-    # Walk the widget hierarchy, recoloring all existing windows.
-    # The option database must be set according to what we do here,
-    # but it breaks things if we set things in the database while
-    # we are changing colors...so, ::tk::RecolorTree now returns the
-    # option database changes that need to be made, and they
-    # need to be evalled here to take effect.
-    # We have to walk the whole widget tree instead of just
-    # relying on the widgets we've created above to do the work
-    # because different extensions may provide other kinds
-    # of widgets that we don't currently know about, so we'll
-    # walk the whole hierarchy just in case.
-
-    eval [tk::RecolorTree . new]
-
-    destroy .___tk_set_palette
-
-    # Change the option database so that future windows will get the
-    # same colors.
-
-    foreach option [array names new] {
-	option add *$option $new($option) widgetDefault
-    }
-
-    # Save the options in the variable ::tk::Palette, for use the
-    # next time we change the options.
-
-    array set ::tk::Palette [array get new]
-}
-
-# ::tk::RecolorTree --
-# This procedure changes the colors in a window and all of its
-# descendants, according to information provided by the colors
-# argument. This looks at the defaults provided by the option
-# database, if it exists, and if not, then it looks at the default
-# value of the widget itself.
-#
-# Arguments:
-# w -			The name of a window.  This window and all its
-#			descendants are recolored.
-# colors -		The name of an array variable in the caller,
-#			which contains color information.  Each element
-#			is named after a widget configuration option, and
-#			each value is the value for that option.
-
-proc ::tk::RecolorTree {w colors} {
-    upvar $colors c
-    set result {}
-    set prototype .___tk_set_palette.[string tolower [winfo class $w]]
-    if {![winfo exists $prototype]} {
-	unset prototype
-    }
-    foreach dbOption [array names c] {
-	set option -[string tolower $dbOption]
-	set class [string replace $dbOption 0 0 [string toupper \
-		[string index $dbOption 0]]]
-	if {![catch {$w configure $option} value]} {
-	    # if the option database has a preference for this
-	    # dbOption, then use it, otherwise use the defaults
-	    # for the widget.
-	    set defaultcolor [option get $w $dbOption $class]
-	    if {$defaultcolor eq "" || \
-		    ([info exists prototype] && \
-		    [$prototype cget $option] ne "$defaultcolor")} {
-		set defaultcolor [lindex $value 3]
-	    }
-	    if {$defaultcolor ne ""} {
-		set defaultcolor [winfo rgb . $defaultcolor]
-	    }
-	    set chosencolor [lindex $value 4]
-	    if {$chosencolor ne ""} {
-		set chosencolor [winfo rgb . $chosencolor]
-	    }
-	    if {[string match $defaultcolor $chosencolor]} {
-		# Change the option database so that future windows will get
-		# the same colors.
-		append result ";\noption add [list \
-		    *[winfo class $w].$dbOption $c($dbOption) 60]"
-		$w configure $option $c($dbOption)
-	    }
-	}
-    }
-    foreach child [winfo children $w] {
-	append result ";\n[::tk::RecolorTree $child c]"
-    }
-    return $result
-}
-
-# ::tk::Darken --
-# Given a color name, computes a new color value that darkens (or
-# brightens) the given color by a given percent.
-#
-# Arguments:
-# color -	Name of starting color.
-# perecent -	Integer telling how much to brighten or darken as a
-#		percent: 50 means darken by 50%, 110 means brighten
-#		by 10%.
-
-proc ::tk::Darken {color percent} {
-    foreach {red green blue} [winfo rgb . $color] {
-	set red [expr {($red/256)*$percent/100}]
-	set green [expr {($green/256)*$percent/100}]
-	set blue [expr {($blue/256)*$percent/100}]
-	break
-    }
-    if {$red > 255} {
-	set red 255
-    }
-    if {$green > 255} {
-	set green 255
-    }
-    if {$blue > 255} {
-	set blue 255
-    }
-    return [format "#%02x%02x%02x" $red $green $blue]
-}
-
-# ::tk_bisque --
-# Reset the Tk color palette to the old "bisque" colors.
-#
-# Arguments:
-# None.
-
-proc ::tk_bisque {} {
-    tk_setPalette activeBackground #e6ceb1 activeForeground black \
-	    background #ffe4c4 disabledForeground #b0b0b0 foreground black \
-	    highlightBackground #ffe4c4 highlightColor black \
-	    insertBackground black \
-	    selectBackground #e6ceb1 selectForeground black \
-	    troughColor #cdb79e
-}
diff --git a/tk8.6/library/panedwindow.tcl b/tk8.6/library/panedwindow.tcl
deleted file mode 100644
index d3dfabc..0000000
--- a/tk8.6/library/panedwindow.tcl
+++ /dev/null
@@ -1,194 +0,0 @@
-# panedwindow.tcl --
-#
-# This file defines the default bindings for Tk panedwindow widgets and
-# provides procedures that help in implementing those bindings.
-
-bind Panedwindow <Button-1> { ::tk::panedwindow::MarkSash %W %x %y 1 }
-bind Panedwindow <Button-2> { ::tk::panedwindow::MarkSash %W %x %y 0 }
-
-bind Panedwindow <B1-Motion> { ::tk::panedwindow::DragSash %W %x %y 1 }
-bind Panedwindow <B2-Motion> { ::tk::panedwindow::DragSash %W %x %y 0 }
-
-bind Panedwindow <ButtonRelease-1> {::tk::panedwindow::ReleaseSash %W 1}
-bind Panedwindow <ButtonRelease-2> {::tk::panedwindow::ReleaseSash %W 0}
-
-bind Panedwindow <Motion> { ::tk::panedwindow::Motion %W %x %y }
-
-bind Panedwindow <Leave> { ::tk::panedwindow::Leave %W }
-
-# Initialize namespace
-namespace eval ::tk::panedwindow {}
-
-# ::tk::panedwindow::MarkSash --
-#
-#   Handle marking the correct sash for possible dragging
-#
-# Arguments:
-#   w		the widget
-#   x		widget local x coord
-#   y		widget local y coord
-#   proxy	whether this should be a proxy sash
-# Results:
-#   None
-#
-proc ::tk::panedwindow::MarkSash {w x y proxy} {
-    variable ::tk::Priv
-    if {[$w cget -opaqueresize]} {
-	set proxy 0
-    }
-    set what [$w identify $x $y]
-    if { [llength $what] == 2 } {
-	lassign $what index which
-	if {!$::tk_strictMotif || $which eq "handle"} {
-	    if {!$proxy} {
-		$w sash mark $index $x $y
-	    }
-	    set Priv(sash) $index
-	    lassign [$w sash coord $index] sx sy
-	    set Priv(dx) [expr {$sx-$x}]
-	    set Priv(dy) [expr {$sy-$y}]
-	    # Do this to init the proxy location
-	    DragSash $w $x $y $proxy
-	}
-    }
-}
-
-# ::tk::panedwindow::DragSash --
-#
-#   Handle dragging of the correct sash
-#
-# Arguments:
-#   w		the widget
-#   x		widget local x coord
-#   y		widget local y coord
-#   proxy	whether this should be a proxy sash
-# Results:
-#   Moves sash
-#
-proc ::tk::panedwindow::DragSash {w x y proxy} {
-    variable ::tk::Priv
-    if {[$w cget -opaqueresize]} {
-	set proxy 0
-    }
-    if {[info exists Priv(sash)]} {
-	if {$proxy} {
-	    $w proxy place [expr {$x+$Priv(dx)}] [expr {$y+$Priv(dy)}]
-	} else {
-	    $w sash place $Priv(sash) \
-		    [expr {$x+$Priv(dx)}] [expr {$y+$Priv(dy)}]
-	}
-    }
-}
-
-# ::tk::panedwindow::ReleaseSash --
-#
-#   Handle releasing of the sash
-#
-# Arguments:
-#   w		the widget
-#   proxy	whether this should be a proxy sash
-# Results:
-#   Returns ...
-#
-proc ::tk::panedwindow::ReleaseSash {w proxy} {
-    variable ::tk::Priv
-    if {[$w cget -opaqueresize]} {
-	set proxy 0
-    }
-    if {[info exists Priv(sash)]} {
-	if {$proxy} {
-	    lassign [$w proxy coord] x y
-	    $w sash place $Priv(sash) $x $y
-	    $w proxy forget
-	}
-	unset Priv(sash) Priv(dx) Priv(dy)
-    }
-}
-
-# ::tk::panedwindow::Motion --
-#
-#   Handle motion on the widget.  This is used to change the cursor
-#   when the user moves over the sash area.
-#
-# Arguments:
-#   w		the widget
-#   x		widget local x coord
-#   y		widget local y coord
-# Results:
-#   May change the cursor.  Sets up a timer to verify that we are still
-#   over the widget.
-#
-proc ::tk::panedwindow::Motion {w x y} {
-    variable ::tk::Priv
-    set id [$w identify $x $y]
-    if {([llength $id] == 2) && \
-	    (!$::tk_strictMotif || [lindex $id 1] eq "handle")} {
-	if {![info exists Priv($w,panecursor)]} {
-	    set Priv($w,panecursor) [$w cget -cursor]
-	    if {[$w cget -sashcursor] ne ""} {
-		$w configure -cursor [$w cget -sashcursor]
-	    } elseif {[$w cget -orient] eq "horizontal"} {
-		$w configure -cursor sb_h_double_arrow
-	    } else {
-		$w configure -cursor sb_v_double_arrow
-	    }
-	    if {[info exists Priv($w,pwAfterId)]} {
-		after cancel $Priv($w,pwAfterId)
-	    }
-	    set Priv($w,pwAfterId) [after 150 \
-		    [list ::tk::panedwindow::Cursor $w]]
-	}
-	return
-    }
-    if {[info exists Priv($w,panecursor)]} {
-	$w configure -cursor $Priv($w,panecursor)
-	unset Priv($w,panecursor)
-    }
-}
-
-# ::tk::panedwindow::Cursor --
-#
-#   Handles returning the normal cursor when we are no longer over the
-#   sash area.  This needs to be done this way, because the panedwindow
-#   won't see Leave events when the mouse moves from the sash to a
-#   paned child, although the child does receive an Enter event.
-#
-# Arguments:
-#   w		the widget
-# Results:
-#   May restore the default cursor, or schedule a timer to do it.
-#
-proc ::tk::panedwindow::Cursor {w} {
-    variable ::tk::Priv
-    # Make sure to check window existence in case it is destroyed.
-    if {[info exists Priv($w,panecursor)] && [winfo exists $w]} {
-	if {[winfo containing [winfo pointerx $w] [winfo pointery $w]] eq $w} {
-	    set Priv($w,pwAfterId) [after 150 \
-		    [list ::tk::panedwindow::Cursor $w]]
-	} else {
-	    $w configure -cursor $Priv($w,panecursor)
-	    unset Priv($w,panecursor)
-	    if {[info exists Priv($w,pwAfterId)]} {
-		after cancel $Priv($w,pwAfterId)
-		unset Priv($w,pwAfterId)
-	    }
-	}
-    }
-}
-
-# ::tk::panedwindow::Leave --
-#
-#   Return to default cursor when leaving the pw widget.
-#
-# Arguments:
-#   w		the widget
-# Results:
-#   Restores the default cursor
-#
-proc ::tk::panedwindow::Leave {w} {
-    variable ::tk::Priv
-    if {[info exists Priv($w,panecursor)]} {
-        $w configure -cursor $Priv($w,panecursor)
-        unset Priv($w,panecursor)
-    }
-}
diff --git a/tk8.6/library/safetk.tcl b/tk8.6/library/safetk.tcl
deleted file mode 100644
index 9f8e25d..0000000
--- a/tk8.6/library/safetk.tcl
+++ /dev/null
@@ -1,262 +0,0 @@
-# safetk.tcl --
-#
-# Support procs to use Tk in safe interpreters.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-
-# see safetk.n for documentation
-
-#
-#
-# Note: It is now ok to let untrusted code being executed
-#       between the creation of the interp and the actual loading
-#       of Tk in that interp because the C side Tk_Init will
-#       now look up the master interp and ask its safe::TkInit
-#       for the actual parameters to use for it's initialization (if allowed),
-#       not relying on the slave state.
-#
-
-# We use opt (optional arguments parsing)
-package require opt 0.4.1;
-
-namespace eval ::safe {
-
-    # counter for safe toplevels
-    variable tkSafeId 0
-}
-
-#
-# tkInterpInit : prepare the slave interpreter for tk loading
-#                most of the real job is done by loadTk
-# returns the slave name (tkInterpInit does)
-#
-proc ::safe::tkInterpInit {slave argv} {
-    global env tk_library
-
-    # We have to make sure that the tk_library variable is normalized.
-    set tk_library [file normalize $tk_library]
-
-    # Clear Tk's access for that interp (path).
-    allowTk $slave $argv
-
-    # Ensure tk_library and subdirs (eg, ttk) are on the access path
-    ::interp eval $slave [list set tk_library [::safe::interpAddToAccessPath $slave $tk_library]]
-    foreach subdir [::safe::AddSubDirs [list $tk_library]] {
-	::safe::interpAddToAccessPath $slave $subdir
-    }
-    return $slave
-}
-
-
-# tkInterpLoadTk:
-# Do additional configuration as needed (calling tkInterpInit)
-# and actually load Tk into the slave.
-#
-# Either contained in the specified windowId (-use) or
-# creating a decorated toplevel for it.
-
-# empty definition for auto_mkIndex
-proc ::safe::loadTk {} {}
-
-::tcl::OptProc ::safe::loadTk {
-    {slave -interp "name of the slave interpreter"}
-    {-use  -windowId {} "window Id to use (new toplevel otherwise)"}
-    {-display -displayName {} "display name to use (current one otherwise)"}
-} {
-    set displayGiven [::tcl::OptProcArgGiven "-display"]
-    if {!$displayGiven} {
-	# Try to get the current display from "."
-	# (which might not exist if the master is tk-less)
-	if {[catch {set display [winfo screen .]}]} {
-	    if {[info exists ::env(DISPLAY)]} {
-		set display $::env(DISPLAY)
-	    } else {
-		Log $slave "no winfo screen . nor env(DISPLAY)" WARNING
-		set display ":0.0"
-	    }
-	}
-    }
-
-    # Get state for access to the cleanupHook.
-    namespace upvar ::safe S$slave state
-
-    if {![::tcl::OptProcArgGiven "-use"]} {
-	# create a decorated toplevel
-	lassign [tkTopLevel $slave $display] w use
-
-	# set our delete hook (slave arg is added by interpDelete)
-	# to clean up both window related code and tkInit(slave)
-	set state(cleanupHook) [list tkDelete {} $w]
-    } else {
-	# set our delete hook (slave arg is added by interpDelete)
-	# to clean up tkInit(slave)
-	set state(cleanupHook) [list disallowTk]
-
-	# Let's be nice and also accept tk window names instead of ids
-	if {[string match ".*" $use]} {
-	    set windowName $use
-	    set use [winfo id $windowName]
-	    set nDisplay [winfo screen $windowName]
-	} else {
-	    # Check for a better -display value
-	    # (works only for multi screens on single host, but not
-	    #  cross hosts, for that a tk window name would be better
-	    #  but embeding is also usefull for non tk names)
-	    if {![catch {winfo pathname $use} name]} {
-		set nDisplay [winfo screen $name]
-	    } else {
-		# Can't have a better one
-		set nDisplay $display
-	    }
-	}
-	if {$nDisplay ne $display} {
-	    if {$displayGiven} {
-		return -code error -errorcode {TK DISPLAY SAFE} \
-		    "conflicting -display $display and -use $use -> $nDisplay"
-	    } else {
-		set display $nDisplay
-	    }
-	}
-    }
-
-    # Prepares the slave for tk with those parameters
-    tkInterpInit $slave [list "-use" $use "-display" $display]
-
-    load {} Tk $slave
-
-    return $slave
-}
-
-proc ::safe::TkInit {interpPath} {
-    variable tkInit
-    if {[info exists tkInit($interpPath)]} {
-	set value $tkInit($interpPath)
-	Log $interpPath "TkInit called, returning \"$value\"" NOTICE
-	return $value
-    } else {
-	Log $interpPath "TkInit called for interp with clearance:\
-		preventing Tk init" ERROR
-	return -code error -errorcode {TK SAFE PERMISSION} "not allowed"
-    }
-}
-
-# safe::allowTk --
-#
-#	Set tkInit(interpPath) to allow Tk to be initialized in
-#	safe::TkInit.
-#
-# Arguments:
-#	interpPath	slave interpreter handle
-#	argv		arguments passed to safe::TkInterpInit
-#
-# Results:
-#	none.
-
-proc ::safe::allowTk {interpPath argv} {
-    variable tkInit
-    set tkInit($interpPath) $argv
-    return
-}
-
-
-# safe::disallowTk --
-#
-#	Unset tkInit(interpPath) to disallow Tk from getting initialized
-#	in safe::TkInit.
-#
-# Arguments:
-#	interpPath	slave interpreter handle
-#
-# Results:
-#	none.
-
-proc ::safe::disallowTk {interpPath} {
-    variable tkInit
-    # This can already be deleted by the DeleteHook of the interp
-    if {[info exists tkInit($interpPath)]} {
-	unset tkInit($interpPath)
-    }
-    return
-}
-
-
-# safe::tkDelete --
-#
-#	Clean up the window associated with the interp being deleted.
-#
-# Arguments:
-#	interpPath	slave interpreter handle
-#
-# Results:
-#	none.
-
-proc ::safe::tkDelete {W window slave} {
-
-    # we are going to be called for each widget... skip untill it's
-    # top level
-
-    Log $slave "Called tkDelete $W $window" NOTICE
-    if {[::interp exists $slave]} {
-	if {[catch {::safe::interpDelete $slave} msg]} {
-	    Log $slave "Deletion error : $msg"
-	}
-    }
-    if {[winfo exists $window]} {
-	Log $slave "Destroy toplevel $window" NOTICE
-	destroy $window
-    }
-
-    # clean up tkInit(slave)
-    disallowTk $slave
-    return
-}
-
-proc ::safe::tkTopLevel {slave display} {
-    variable tkSafeId
-    incr tkSafeId
-    set w ".safe$tkSafeId"
-    if {[catch {toplevel $w -screen $display -class SafeTk} msg]} {
-	return -code error -errorcode {TK TOPLEVEL SAFE} \
-	    "Unable to create toplevel for safe slave \"$slave\" ($msg)"
-    }
-    Log $slave "New toplevel $w" NOTICE
-
-    set msg "Untrusted Tcl applet ($slave)"
-    wm title $w $msg
-
-    # Control frame (we must create a style for it)
-    ttk::style layout TWarningFrame {WarningFrame.border -sticky nswe}
-    ttk::style configure TWarningFrame -background red
-
-    set wc $w.fc
-    ttk::frame $wc -relief ridge -borderwidth 4 -style TWarningFrame
-
-    # We will destroy the interp when the window is destroyed
-    bindtags $wc [concat Safe$wc [bindtags $wc]]
-    bind Safe$wc <Destroy> [list ::safe::tkDelete %W $w $slave]
-
-    ttk::label $wc.l -text $msg -anchor w
-
-    # We want the button to be the last visible item
-    # (so be packed first) and at the right and not resizing horizontally
-
-    # frame the button so it does not expand horizontally
-    # but still have the default background instead of red one from the parent
-    ttk::frame  $wc.fb -borderwidth 0
-    ttk::button $wc.fb.b -text "Delete" \
-	    -command [list ::safe::tkDelete $w $w $slave]
-    pack $wc.fb.b -side right -fill both
-    pack $wc.fb -side right -fill both -expand 1
-    pack $wc.l -side left -fill both -expand 1 -ipady 2
-    pack $wc -side bottom -fill x
-
-    # Container frame
-    frame $w.c -container 1
-    pack $w.c -fill both -expand 1
-
-    # return both the toplevel window name and the id to use for embedding
-    list $w [winfo id $w.c]
-}
diff --git a/tk8.6/library/scale.tcl b/tk8.6/library/scale.tcl
deleted file mode 100644
index fb9b81b..0000000
--- a/tk8.6/library/scale.tcl
+++ /dev/null
@@ -1,290 +0,0 @@
-# scale.tcl --
-#
-# This file defines the default bindings for Tk scale widgets and provides
-# procedures that help in implementing the bindings.
-#
-# Copyright (c) 1994 The Regents of the University of California.
-# Copyright (c) 1994-1995 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-#-------------------------------------------------------------------------
-# The code below creates the default class bindings for entries.
-#-------------------------------------------------------------------------
-
-# Standard Motif bindings:
-
-bind Scale <Enter> {
-    if {$tk_strictMotif} {
-	set tk::Priv(activeBg) [%W cget -activebackground]
-	%W configure -activebackground [%W cget -background]
-    }
-    tk::ScaleActivate %W %x %y
-}
-bind Scale <Motion> {
-    tk::ScaleActivate %W %x %y
-}
-bind Scale <Leave> {
-    if {$tk_strictMotif} {
-	%W configure -activebackground $tk::Priv(activeBg)
-    }
-    if {[%W cget -state] eq "active"} {
-	%W configure -state normal
-    }
-}
-bind Scale <1> {
-    tk::ScaleButtonDown %W %x %y
-}
-bind Scale <B1-Motion> {
-    tk::ScaleDrag %W %x %y
-}
-bind Scale <B1-Leave> { }
-bind Scale <B1-Enter> { }
-bind Scale <ButtonRelease-1> {
-    tk::CancelRepeat
-    tk::ScaleEndDrag %W
-    tk::ScaleActivate %W %x %y
-}
-bind Scale <2> {
-    tk::ScaleButton2Down %W %x %y
-}
-bind Scale <B2-Motion> {
-    tk::ScaleDrag %W %x %y
-}
-bind Scale <B2-Leave> { }
-bind Scale <B2-Enter> { }
-bind Scale <ButtonRelease-2> {
-    tk::CancelRepeat
-    tk::ScaleEndDrag %W
-    tk::ScaleActivate %W %x %y
-}
-if {[tk windowingsystem] eq "win32"} {
-    # On Windows do the same with button 3, as that is the right mouse button
-    bind Scale <3>		[bind Scale <2>]
-    bind Scale <B3-Motion>	[bind Scale <B2-Motion>]
-    bind Scale <B3-Leave>	[bind Scale <B2-Leave>]
-    bind Scale <B3-Enter>	[bind Scale <B2-Enter>]
-    bind Scale <ButtonRelease-3> [bind Scale <ButtonRelease-2>]
-}
-bind Scale <Control-1> {
-    tk::ScaleControlPress %W %x %y
-}
-bind Scale <<PrevLine>> {
-    tk::ScaleIncrement %W up little noRepeat
-}
-bind Scale <<NextLine>> {
-    tk::ScaleIncrement %W down little noRepeat
-}
-bind Scale <<PrevChar>> {
-    tk::ScaleIncrement %W up little noRepeat
-}
-bind Scale <<NextChar>> {
-    tk::ScaleIncrement %W down little noRepeat
-}
-bind Scale <<PrevPara>> {
-    tk::ScaleIncrement %W up big noRepeat
-}
-bind Scale <<NextPara>> {
-    tk::ScaleIncrement %W down big noRepeat
-}
-bind Scale <<PrevWord>> {
-    tk::ScaleIncrement %W up big noRepeat
-}
-bind Scale <<NextWord>> {
-    tk::ScaleIncrement %W down big noRepeat
-}
-bind Scale <<LineStart>> {
-    %W set [%W cget -from]
-}
-bind Scale <<LineEnd>> {
-    %W set [%W cget -to]
-}
-
-# ::tk::ScaleActivate --
-# This procedure is invoked to check a given x-y position in the
-# scale and activate the slider if the x-y position falls within
-# the slider.
-#
-# Arguments:
-# w -		The scale widget.
-# x, y -	Mouse coordinates.
-
-proc ::tk::ScaleActivate {w x y} {
-    if {[$w cget -state] eq "disabled"} {
-	return
-    }
-    if {[$w identify $x $y] eq "slider"} {
-	set state active
-    } else {
-	set state normal
-    }
-    if {[$w cget -state] ne $state} {
-	$w configure -state $state
-    }
-}
-
-# ::tk::ScaleButtonDown --
-# This procedure is invoked when a button is pressed in a scale.  It
-# takes different actions depending on where the button was pressed.
-#
-# Arguments:
-# w -		The scale widget.
-# x, y -	Mouse coordinates of button press.
-
-proc ::tk::ScaleButtonDown {w x y} {
-    variable ::tk::Priv
-    set Priv(dragging) 0
-    set el [$w identify $x $y]
-
-    # save the relief
-    set Priv($w,relief) [$w cget -sliderrelief]
-
-    if {$el eq "trough1"} {
-	ScaleIncrement $w up little initial
-    } elseif {$el eq "trough2"} {
-	ScaleIncrement $w down little initial
-    } elseif {$el eq "slider"} {
-	set Priv(dragging) 1
-	set Priv(initValue) [$w get]
-	set coords [$w coords]
-	set Priv(deltaX) [expr {$x - [lindex $coords 0]}]
-	set Priv(deltaY) [expr {$y - [lindex $coords 1]}]
-        switch -exact -- $Priv($w,relief) {
-            "raised" { $w configure -sliderrelief sunken }
-            "ridge"  { $w configure -sliderrelief groove }
-        }
-    }
-}
-
-# ::tk::ScaleDrag --
-# This procedure is called when the mouse is dragged with
-# mouse button 1 down.  If the drag started inside the slider
-# (i.e. the scale is active) then the scale's value is adjusted
-# to reflect the mouse's position.
-#
-# Arguments:
-# w -		The scale widget.
-# x, y -	Mouse coordinates.
-
-proc ::tk::ScaleDrag {w x y} {
-    variable ::tk::Priv
-    if {!$Priv(dragging)} {
-	return
-    }
-    $w set [$w get [expr {$x-$Priv(deltaX)}] [expr {$y-$Priv(deltaY)}]]
-}
-
-# ::tk::ScaleEndDrag --
-# This procedure is called to end an interactive drag of the
-# slider.  It just marks the drag as over.
-#
-# Arguments:
-# w -		The scale widget.
-
-proc ::tk::ScaleEndDrag {w} {
-    variable ::tk::Priv
-    set Priv(dragging) 0
-    if {[info exists Priv($w,relief)]} {
-        $w configure -sliderrelief $Priv($w,relief)
-        unset Priv($w,relief)
-    }
-}
-
-# ::tk::ScaleIncrement --
-# This procedure is invoked to increment the value of a scale and
-# to set up auto-repeating of the action if that is desired.  The
-# way the value is incremented depends on the "dir" and "big"
-# arguments.
-#
-# Arguments:
-# w -		The scale widget.
-# dir -		"up" means move value towards -from, "down" means
-#		move towards -to.
-# big -		Size of increments: "big" or "little".
-# repeat -	Whether and how to auto-repeat the action:  "noRepeat"
-#		means don't auto-repeat, "initial" means this is the
-#		first action in an auto-repeat sequence, and "again"
-#		means this is the second repetition or later.
-
-proc ::tk::ScaleIncrement {w dir big repeat} {
-    variable ::tk::Priv
-    if {![winfo exists $w]} return
-    if {$big eq "big"} {
-	set inc [$w cget -bigincrement]
-	if {$inc == 0} {
-	    set inc [expr {abs([$w cget -to] - [$w cget -from])/10.0}]
-	}
-	if {$inc < [$w cget -resolution]} {
-	    set inc [$w cget -resolution]
-	}
-    } else {
-	set inc [$w cget -resolution]
-    }
-    if {([$w cget -from] > [$w cget -to]) ^ ($dir eq "up")} {
-        if {$inc > 0} {
-            set inc [expr {-$inc}]
-        }
-    } else {
-        if {$inc < 0} {
-            set inc [expr {-$inc}]
-        }
-    }
-    $w set [expr {[$w get] + $inc}]
-
-    if {$repeat eq "again"} {
-	set Priv(afterId) [after [$w cget -repeatinterval] \
-		[list tk::ScaleIncrement $w $dir $big again]]
-    } elseif {$repeat eq "initial"} {
-	set delay [$w cget -repeatdelay]
-	if {$delay > 0} {
-	    set Priv(afterId) [after $delay \
-		    [list tk::ScaleIncrement $w $dir $big again]]
-	}
-    }
-}
-
-# ::tk::ScaleControlPress --
-# This procedure handles button presses that are made with the Control
-# key down.  Depending on the mouse position, it adjusts the scale
-# value to one end of the range or the other.
-#
-# Arguments:
-# w -		The scale widget.
-# x, y -	Mouse coordinates where the button was pressed.
-
-proc ::tk::ScaleControlPress {w x y} {
-    set el [$w identify $x $y]
-    if {$el eq "trough1"} {
-	$w set [$w cget -from]
-    } elseif {$el eq "trough2"} {
-	$w set [$w cget -to]
-    }
-}
-
-# ::tk::ScaleButton2Down
-# This procedure is invoked when button 2 is pressed over a scale.
-# It sets the value to correspond to the mouse position and starts
-# a slider drag.
-#
-# Arguments:
-# w -		The scrollbar widget.
-# x, y -	Mouse coordinates within the widget.
-
-proc ::tk::ScaleButton2Down {w x y} {
-    variable ::tk::Priv
-
-    if {[$w cget -state] eq "disabled"} {
-	return
-    }
-
-    $w configure -state active
-    $w set [$w get $x $y]
-    set Priv(dragging) 1
-    set Priv(initValue) [$w get]
-    set Priv($w,relief) [$w cget -sliderrelief]
-    set coords "$x $y"
-    set Priv(deltaX) 0
-    set Priv(deltaY) 0
-}
diff --git a/tk8.6/library/scrlbar.tcl b/tk8.6/library/scrlbar.tcl
deleted file mode 100644
index 6f1caa2..0000000
--- a/tk8.6/library/scrlbar.tcl
+++ /dev/null
@@ -1,454 +0,0 @@
-# scrlbar.tcl --
-#
-# This file defines the default bindings for Tk scrollbar widgets.
-# It also provides procedures that help in implementing the bindings.
-#
-# Copyright (c) 1994 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-#-------------------------------------------------------------------------
-# The code below creates the default class bindings for scrollbars.
-#-------------------------------------------------------------------------
-
-# Standard Motif bindings:
-if {[tk windowingsystem] eq "x11" || [tk windowingsystem] eq "aqua"} {
-
-bind Scrollbar <Enter> {
-    if {$tk_strictMotif} {
-	set tk::Priv(activeBg) [%W cget -activebackground]
-	%W configure -activebackground [%W cget -background]
-    }
-    %W activate [%W identify %x %y]
-}
-bind Scrollbar <Motion> {
-    %W activate [%W identify %x %y]
-}
-
-# The "info exists" command in the following binding handles the
-# situation where a Leave event occurs for a scrollbar without the Enter
-# event.  This seems to happen on some systems (such as Solaris 2.4) for
-# unknown reasons.
-
-bind Scrollbar <Leave> {
-    if {$tk_strictMotif && [info exists tk::Priv(activeBg)]} {
-	%W configure -activebackground $tk::Priv(activeBg)
-    }
-    %W activate {}
-}
-bind Scrollbar <1> {
-    tk::ScrollButtonDown %W %x %y
-}
-bind Scrollbar <B1-Motion> {
-    tk::ScrollDrag %W %x %y
-}
-bind Scrollbar <B1-B2-Motion> {
-    tk::ScrollDrag %W %x %y
-}
-bind Scrollbar <ButtonRelease-1> {
-    tk::ScrollButtonUp %W %x %y
-}
-bind Scrollbar <B1-Leave> {
-    # Prevents <Leave> binding from being invoked.
-}
-bind Scrollbar <B1-Enter> {
-    # Prevents <Enter> binding from being invoked.
-}
-bind Scrollbar <2> {
-    tk::ScrollButton2Down %W %x %y
-}
-bind Scrollbar <B1-2> {
-    # Do nothing, since button 1 is already down.
-}
-bind Scrollbar <B2-1> {
-    # Do nothing, since button 2 is already down.
-}
-bind Scrollbar <B2-Motion> {
-    tk::ScrollDrag %W %x %y
-}
-bind Scrollbar <ButtonRelease-2> {
-    tk::ScrollButtonUp %W %x %y
-}
-bind Scrollbar <B1-ButtonRelease-2> {
-    # Do nothing:  B1 release will handle it.
-}
-bind Scrollbar <B2-ButtonRelease-1> {
-    # Do nothing:  B2 release will handle it.
-}
-bind Scrollbar <B2-Leave> {
-    # Prevents <Leave> binding from being invoked.
-}
-bind Scrollbar <B2-Enter> {
-    # Prevents <Enter> binding from being invoked.
-}
-bind Scrollbar <Control-1> {
-    tk::ScrollTopBottom %W %x %y
-}
-bind Scrollbar <Control-2> {
-    tk::ScrollTopBottom %W %x %y
-}
-
-bind Scrollbar <<PrevLine>> {
-    tk::ScrollByUnits %W v -1
-}
-bind Scrollbar <<NextLine>> {
-    tk::ScrollByUnits %W v 1
-}
-bind Scrollbar <<PrevPara>> {
-    tk::ScrollByPages %W v -1
-}
-bind Scrollbar <<NextPara>> {
-    tk::ScrollByPages %W v 1
-}
-bind Scrollbar <<PrevChar>> {
-    tk::ScrollByUnits %W h -1
-}
-bind Scrollbar <<NextChar>> {
-    tk::ScrollByUnits %W h 1
-}
-bind Scrollbar <<PrevWord>> {
-    tk::ScrollByPages %W h -1
-}
-bind Scrollbar <<NextWord>> {
-    tk::ScrollByPages %W h 1
-}
-bind Scrollbar <Prior> {
-    tk::ScrollByPages %W hv -1
-}
-bind Scrollbar <Next> {
-    tk::ScrollByPages %W hv 1
-}
-bind Scrollbar <<LineStart>> {
-    tk::ScrollToPos %W 0
-}
-bind Scrollbar <<LineEnd>> {
-    tk::ScrollToPos %W 1
-}
-}
-switch [tk windowingsystem] {
-    "aqua" {
-	bind Scrollbar <MouseWheel> {
-	    tk::ScrollByUnits %W v [expr {- (%D)}]
-	}
-	bind Scrollbar <Option-MouseWheel> {
-	    tk::ScrollByUnits %W v [expr {-10 * (%D)}]
-	}
-	bind Scrollbar <Shift-MouseWheel> {
-	    tk::ScrollByUnits %W h [expr {- (%D)}]
-	}
-	bind Scrollbar <Shift-Option-MouseWheel> {
-	    tk::ScrollByUnits %W h [expr {-10 * (%D)}]
-	}
-    }
-    "win32" {
-	bind Scrollbar <MouseWheel> {
-	    tk::ScrollByUnits %W v [expr {- (%D / 120) * 4}]
-	}
-	bind Scrollbar <Shift-MouseWheel> {
-	    tk::ScrollByUnits %W h [expr {- (%D / 120) * 4}]
-	}
-    }
-    "x11" {
-	bind Scrollbar <MouseWheel> {
-	    tk::ScrollByUnits %W v [expr {- (%D /120 ) * 4}]
-	}
-	bind Scrollbar <Shift-MouseWheel> {
-	    tk::ScrollByUnits %W h [expr {- (%D /120 ) * 4}]
-	}
-	bind Scrollbar <4> {tk::ScrollByUnits %W v -5}
-	bind Scrollbar <5> {tk::ScrollByUnits %W v 5}
-	bind Scrollbar <Shift-4> {tk::ScrollByUnits %W h -5}
-	bind Scrollbar <Shift-5> {tk::ScrollByUnits %W h 5}
-    }
-}
-# tk::ScrollButtonDown --
-# This procedure is invoked when a button is pressed in a scrollbar.
-# It changes the way the scrollbar is displayed and takes actions
-# depending on where the mouse is.
-#
-# Arguments:
-# w -		The scrollbar widget.
-# x, y -	Mouse coordinates.
-
-proc tk::ScrollButtonDown {w x y} {
-    variable ::tk::Priv
-    set Priv(relief) [$w cget -activerelief]
-    $w configure -activerelief sunken
-    set element [$w identify $x $y]
-    if {$element eq "slider"} {
-	ScrollStartDrag $w $x $y
-    } else {
-	ScrollSelect $w $element initial
-    }
-}
-
-# ::tk::ScrollButtonUp --
-# This procedure is invoked when a button is released in a scrollbar.
-# It cancels scans and auto-repeats that were in progress, and restores
-# the way the active element is displayed.
-#
-# Arguments:
-# w -		The scrollbar widget.
-# x, y -	Mouse coordinates.
-
-proc ::tk::ScrollButtonUp {w x y} {
-    variable ::tk::Priv
-    tk::CancelRepeat
-    if {[info exists Priv(relief)]} {
-	# Avoid error due to spurious release events
-	$w configure -activerelief $Priv(relief)
-	ScrollEndDrag $w $x $y
-	$w activate [$w identify $x $y]
-    }
-}
-
-# ::tk::ScrollSelect --
-# This procedure is invoked when a button is pressed over the scrollbar.
-# It invokes one of several scrolling actions depending on where in
-# the scrollbar the button was pressed.
-#
-# Arguments:
-# w -		The scrollbar widget.
-# element -	The element of the scrollbar that was selected, such
-#		as "arrow1" or "trough2".  Shouldn't be "slider".
-# repeat -	Whether and how to auto-repeat the action:  "noRepeat"
-#		means don't auto-repeat, "initial" means this is the
-#		first action in an auto-repeat sequence, and "again"
-#		means this is the second repetition or later.
-
-proc ::tk::ScrollSelect {w element repeat} {
-    variable ::tk::Priv
-    if {![winfo exists $w]} return
-    switch -- $element {
-	"arrow1"	{ScrollByUnits $w hv -1}
-	"trough1"	{ScrollByPages $w hv -1}
-	"trough2"	{ScrollByPages $w hv 1}
-	"arrow2"	{ScrollByUnits $w hv 1}
-	default		{return}
-    }
-    if {$repeat eq "again"} {
-	set Priv(afterId) [after [$w cget -repeatinterval] \
-		[list tk::ScrollSelect $w $element again]]
-    } elseif {$repeat eq "initial"} {
-	set delay [$w cget -repeatdelay]
-	if {$delay > 0} {
-	    set Priv(afterId) [after $delay \
-		    [list tk::ScrollSelect $w $element again]]
-	}
-    }
-}
-
-# ::tk::ScrollStartDrag --
-# This procedure is called to initiate a drag of the slider.  It just
-# remembers the starting position of the mouse and slider.
-#
-# Arguments:
-# w -		The scrollbar widget.
-# x, y -	The mouse position at the start of the drag operation.
-
-proc ::tk::ScrollStartDrag {w x y} {
-    variable ::tk::Priv
-
-    if {[$w cget -command] eq ""} {
-	return
-    }
-    set Priv(pressX) $x
-    set Priv(pressY) $y
-    set Priv(initValues) [$w get]
-    set iv0 [lindex $Priv(initValues) 0]
-    if {[llength $Priv(initValues)] == 2} {
-	set Priv(initPos) $iv0
-    } elseif {$iv0 == 0} {
-	set Priv(initPos) 0.0
-    } else {
-	set Priv(initPos) [expr {(double([lindex $Priv(initValues) 2])) \
-		/ [lindex $Priv(initValues) 0]}]
-    }
-}
-
-# ::tk::ScrollDrag --
-# This procedure is called for each mouse motion even when the slider
-# is being dragged.  It notifies the associated widget if we're not
-# jump scrolling, and it just updates the scrollbar if we are jump
-# scrolling.
-#
-# Arguments:
-# w -		The scrollbar widget.
-# x, y -	The current mouse position.
-
-proc ::tk::ScrollDrag {w x y} {
-    variable ::tk::Priv
-
-    if {$Priv(initPos) eq ""} {
-	return
-    }
-    set delta [$w delta [expr {$x - $Priv(pressX)}] [expr {$y - $Priv(pressY)}]]
-    if {[$w cget -jump]} {
-	if {[llength $Priv(initValues)] == 2} {
-	    $w set [expr {[lindex $Priv(initValues) 0] + $delta}] \
-		    [expr {[lindex $Priv(initValues) 1] + $delta}]
-	} else {
-	    set delta [expr {round($delta * [lindex $Priv(initValues) 0])}]
-	    eval [list $w] set [lreplace $Priv(initValues) 2 3 \
-		    [expr {[lindex $Priv(initValues) 2] + $delta}] \
-		    [expr {[lindex $Priv(initValues) 3] + $delta}]]
-	}
-    } else {
-	ScrollToPos $w [expr {$Priv(initPos) + $delta}]
-    }
-}
-
-# ::tk::ScrollEndDrag --
-# This procedure is called to end an interactive drag of the slider.
-# It scrolls the window if we're in jump mode, otherwise it does nothing.
-#
-# Arguments:
-# w -		The scrollbar widget.
-# x, y -	The mouse position at the end of the drag operation.
-
-proc ::tk::ScrollEndDrag {w x y} {
-    variable ::tk::Priv
-
-    if {$Priv(initPos) eq ""} {
-	return
-    }
-    if {[$w cget -jump]} {
-	set delta [$w delta [expr {$x - $Priv(pressX)}] \
-		[expr {$y - $Priv(pressY)}]]
-	ScrollToPos $w [expr {$Priv(initPos) + $delta}]
-    }
-    set Priv(initPos) ""
-}
-
-# ::tk::ScrollByUnits --
-# This procedure tells the scrollbar's associated widget to scroll up
-# or down by a given number of units.  It notifies the associated widget
-# in different ways for old and new command syntaxes.
-#
-# Arguments:
-# w -		The scrollbar widget.
-# orient -	Which kinds of scrollbars this applies to:  "h" for
-#		horizontal, "v" for vertical, "hv" for both.
-# amount -	How many units to scroll:  typically 1 or -1.
-
-proc ::tk::ScrollByUnits {w orient amount} {
-    set cmd [$w cget -command]
-    if {$cmd eq "" || ([string first \
-	    [string index [$w cget -orient] 0] $orient] < 0)} {
-	return
-    }
-    set info [$w get]
-    if {[llength $info] == 2} {
-	uplevel #0 $cmd scroll $amount units
-    } else {
-	uplevel #0 $cmd [expr {[lindex $info 2] + $amount}]
-    }
-}
-
-# ::tk::ScrollByPages --
-# This procedure tells the scrollbar's associated widget to scroll up
-# or down by a given number of screenfuls.  It notifies the associated
-# widget in different ways for old and new command syntaxes.
-#
-# Arguments:
-# w -		The scrollbar widget.
-# orient -	Which kinds of scrollbars this applies to:  "h" for
-#		horizontal, "v" for vertical, "hv" for both.
-# amount -	How many screens to scroll:  typically 1 or -1.
-
-proc ::tk::ScrollByPages {w orient amount} {
-    set cmd [$w cget -command]
-    if {$cmd eq "" || ([string first \
-	    [string index [$w cget -orient] 0] $orient] < 0)} {
-	return
-    }
-    set info [$w get]
-    if {[llength $info] == 2} {
-	uplevel #0 $cmd scroll $amount pages
-    } else {
-	uplevel #0 $cmd [expr {[lindex $info 2] + $amount*([lindex $info 1] - 1)}]
-    }
-}
-
-# ::tk::ScrollToPos --
-# This procedure tells the scrollbar's associated widget to scroll to
-# a particular location, given by a fraction between 0 and 1.  It notifies
-# the associated widget in different ways for old and new command syntaxes.
-#
-# Arguments:
-# w -		The scrollbar widget.
-# pos -		A fraction between 0 and 1 indicating a desired position
-#		in the document.
-
-proc ::tk::ScrollToPos {w pos} {
-    set cmd [$w cget -command]
-    if {$cmd eq ""} {
-	return
-    }
-    set info [$w get]
-    if {[llength $info] == 2} {
-	uplevel #0 $cmd moveto $pos
-    } else {
-	uplevel #0 $cmd [expr {round([lindex $info 0]*$pos)}]
-    }
-}
-
-# ::tk::ScrollTopBottom
-# Scroll to the top or bottom of the document, depending on the mouse
-# position.
-#
-# Arguments:
-# w -		The scrollbar widget.
-# x, y -	Mouse coordinates within the widget.
-
-proc ::tk::ScrollTopBottom {w x y} {
-    variable ::tk::Priv
-    set element [$w identify $x $y]
-    if {[string match *1 $element]} {
-	ScrollToPos $w 0
-    } elseif {[string match *2 $element]} {
-	ScrollToPos $w 1
-    }
-
-    # Set Priv(relief), since it's needed by tk::ScrollButtonUp.
-
-    set Priv(relief) [$w cget -activerelief]
-}
-
-# ::tk::ScrollButton2Down
-# This procedure is invoked when button 2 is pressed over a scrollbar.
-# If the button is over the trough or slider, it sets the scrollbar to
-# the mouse position and starts a slider drag.  Otherwise it just
-# behaves the same as button 1.
-#
-# Arguments:
-# w -		The scrollbar widget.
-# x, y -	Mouse coordinates within the widget.
-
-proc ::tk::ScrollButton2Down {w x y} {
-    variable ::tk::Priv
-    if {![winfo exists $w]} {
-        return
-    }
-    set element [$w identify $x $y]
-    if {[string match {arrow[12]} $element]} {
-	ScrollButtonDown $w $x $y
-	return
-    }
-    ScrollToPos $w [$w fraction $x $y]
-    set Priv(relief) [$w cget -activerelief]
-
-    # Need the "update idletasks" below so that the widget calls us
-    # back to reset the actual scrollbar position before we start the
-    # slider drag.
-
-    update idletasks
-    if {[winfo exists $w]} {
-        $w configure -activerelief sunken
-        $w activate slider
-        ScrollStartDrag $w $x $y
-    }
-}
diff --git a/tk8.6/library/spinbox.tcl b/tk8.6/library/spinbox.tcl
deleted file mode 100644
index 1965ed8..0000000
--- a/tk8.6/library/spinbox.tcl
+++ /dev/null
@@ -1,580 +0,0 @@
-# spinbox.tcl --
-#
-# This file defines the default bindings for Tk spinbox widgets and provides
-# procedures that help in implementing those bindings.  The spinbox builds
-# off the entry widget, so it can reuse Entry bindings and procedures.
-#
-# Copyright (c) 1992-1994 The Regents of the University of California.
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-# Copyright (c) 1999-2000 Jeffrey Hobbs
-# Copyright (c) 2000 Ajuba Solutions
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-#-------------------------------------------------------------------------
-# Elements of tk::Priv that are used in this file:
-#
-# afterId -		If non-null, it means that auto-scanning is underway
-#			and it gives the "after" id for the next auto-scan
-#			command to be executed.
-# mouseMoved -		Non-zero means the mouse has moved a significant
-#			amount since the button went down (so, for example,
-#			start dragging out a selection).
-# pressX -		X-coordinate at which the mouse button was pressed.
-# selectMode -		The style of selection currently underway:
-#			char, word, or line.
-# x, y -		Last known mouse coordinates for scanning
-#			and auto-scanning.
-# data -		Used for Cut and Copy
-#-------------------------------------------------------------------------
-
-# Initialize namespace
-namespace eval ::tk::spinbox {}
-
-#-------------------------------------------------------------------------
-# The code below creates the default class bindings for entries.
-#-------------------------------------------------------------------------
-bind Spinbox <<Cut>> {
-    if {![catch {::tk::spinbox::GetSelection %W} tk::Priv(data)]} {
-	clipboard clear -displayof %W
-	clipboard append -displayof %W $tk::Priv(data)
-	%W delete sel.first sel.last
-	unset tk::Priv(data)
-    }
-}
-bind Spinbox <<Copy>> {
-    if {![catch {::tk::spinbox::GetSelection %W} tk::Priv(data)]} {
-	clipboard clear -displayof %W
-	clipboard append -displayof %W $tk::Priv(data)
-	unset tk::Priv(data)
-    }
-}
-bind Spinbox <<Paste>> {
-    catch {
-	if {[tk windowingsystem] ne "x11"} {
-	    catch {
-		%W delete sel.first sel.last
-	    }
-	}
-	%W insert insert [::tk::GetSelection %W CLIPBOARD]
-	::tk::EntrySeeInsert %W
-    }
-}
-bind Spinbox <<Clear>> {
-    %W delete sel.first sel.last
-}
-bind Spinbox <<PasteSelection>> {
-    if {$tk_strictMotif || ![info exists tk::Priv(mouseMoved)]
-	|| !$tk::Priv(mouseMoved)} {
-	::tk::spinbox::Paste %W %x
-    }
-}
-
-bind Spinbox <<TraverseIn>> {
-    %W selection range 0 end
-    %W icursor end
-}
-
-# Standard Motif bindings:
-
-bind Spinbox <1> {
-    ::tk::spinbox::ButtonDown %W %x %y
-}
-bind Spinbox <B1-Motion> {
-    ::tk::spinbox::Motion %W %x %y
-}
-bind Spinbox <Double-1> {
-    ::tk::spinbox::ArrowPress %W %x %y
-    set tk::Priv(selectMode) word
-    ::tk::spinbox::MouseSelect %W %x sel.first
-}
-bind Spinbox <Triple-1> {
-    ::tk::spinbox::ArrowPress %W %x %y
-    set tk::Priv(selectMode) line
-    ::tk::spinbox::MouseSelect %W %x 0
-}
-bind Spinbox <Shift-1> {
-    set tk::Priv(selectMode) char
-    %W selection adjust @%x
-}
-bind Spinbox <Double-Shift-1> {
-    set tk::Priv(selectMode) word
-    ::tk::spinbox::MouseSelect %W %x
-}
-bind Spinbox <Triple-Shift-1> {
-    set tk::Priv(selectMode) line
-    ::tk::spinbox::MouseSelect %W %x
-}
-bind Spinbox <B1-Leave> {
-    set tk::Priv(x) %x
-    ::tk::spinbox::AutoScan %W
-}
-bind Spinbox <B1-Enter> {
-    tk::CancelRepeat
-}
-bind Spinbox <ButtonRelease-1> {
-    ::tk::spinbox::ButtonUp %W %x %y
-}
-bind Spinbox <Control-1> {
-    %W icursor @%x
-}
-
-bind Spinbox <<PrevLine>> {
-    %W invoke buttonup
-}
-bind Spinbox <<NextLine>> {
-    %W invoke buttondown
-}
-
-bind Spinbox <<PrevChar>> {
-    ::tk::EntrySetCursor %W [expr {[%W index insert] - 1}]
-}
-bind Spinbox <<NextChar>> {
-    ::tk::EntrySetCursor %W [expr {[%W index insert] + 1}]
-}
-bind Spinbox <<SelectPrevChar>> {
-    ::tk::EntryKeySelect %W [expr {[%W index insert] - 1}]
-    ::tk::EntrySeeInsert %W
-}
-bind Spinbox <<SelectNextChar>> {
-    ::tk::EntryKeySelect %W [expr {[%W index insert] + 1}]
-    ::tk::EntrySeeInsert %W
-}
-bind Spinbox <<PrevWord>> {
-    ::tk::EntrySetCursor %W [::tk::EntryPreviousWord %W insert]
-}
-bind Spinbox <<NextWord>> {
-    ::tk::EntrySetCursor %W [::tk::EntryNextWord %W insert]
-}
-bind Spinbox <<SelectPrevWord>> {
-    ::tk::EntryKeySelect %W [::tk::EntryPreviousWord %W insert]
-    ::tk::EntrySeeInsert %W
-}
-bind Spinbox <<SelectNextWord>> {
-    ::tk::EntryKeySelect %W [::tk::EntryNextWord %W insert]
-    ::tk::EntrySeeInsert %W
-}
-bind Spinbox <<LineStart>> {
-    ::tk::EntrySetCursor %W 0
-}
-bind Spinbox <<SelectLineStart>> {
-    ::tk::EntryKeySelect %W 0
-    ::tk::EntrySeeInsert %W
-}
-bind Spinbox <<LineEnd>> {
-    ::tk::EntrySetCursor %W end
-}
-bind Spinbox <<SelectLineEnd>> {
-    ::tk::EntryKeySelect %W end
-    ::tk::EntrySeeInsert %W
-}
-
-bind Spinbox <Delete> {
-    if {[%W selection present]} {
-	%W delete sel.first sel.last
-    } else {
-	%W delete insert
-    }
-}
-bind Spinbox <BackSpace> {
-    ::tk::EntryBackspace %W
-}
-
-bind Spinbox <Control-space> {
-    %W selection from insert
-}
-bind Spinbox <Select> {
-    %W selection from insert
-}
-bind Spinbox <Control-Shift-space> {
-    %W selection adjust insert
-}
-bind Spinbox <Shift-Select> {
-    %W selection adjust insert
-}
-bind Spinbox <<SelectAll>> {
-    %W selection range 0 end
-}
-bind Spinbox <<SelectNone>> {
-    %W selection clear
-}
-bind Spinbox <KeyPress> {
-    ::tk::EntryInsert %W %A
-}
-
-# Ignore all Alt, Meta, and Control keypresses unless explicitly bound.
-# Otherwise, if a widget binding for one of these is defined, the
-# <KeyPress> class binding will also fire and insert the character,
-# which is wrong.  Ditto for Escape, Return, and Tab.
-
-bind Spinbox <Alt-KeyPress> {# nothing}
-bind Spinbox <Meta-KeyPress> {# nothing}
-bind Spinbox <Control-KeyPress> {# nothing}
-bind Spinbox <Escape> {# nothing}
-bind Spinbox <Return> {# nothing}
-bind Spinbox <KP_Enter> {# nothing}
-bind Spinbox <Tab> {# nothing}
-bind Spinbox <Prior> {# nothing}
-bind Spinbox <Next> {# nothing}
-if {[tk windowingsystem] eq "aqua"} {
-    bind Spinbox <Command-KeyPress> {# nothing}
-}
-
-# On Windows, paste is done using Shift-Insert.  Shift-Insert already
-# generates the <<Paste>> event, so we don't need to do anything here.
-if {[tk windowingsystem] ne "win32"} {
-    bind Spinbox <Insert> {
-	catch {::tk::EntryInsert %W [::tk::GetSelection %W PRIMARY]}
-    }
-}
-
-# Additional emacs-like bindings:
-
-bind Spinbox <Control-d> {
-    if {!$tk_strictMotif} {
-	%W delete insert
-    }
-}
-bind Spinbox <Control-h> {
-    if {!$tk_strictMotif} {
-	::tk::EntryBackspace %W
-    }
-}
-bind Spinbox <Control-k> {
-    if {!$tk_strictMotif} {
-	%W delete insert end
-    }
-}
-bind Spinbox <Control-t> {
-    if {!$tk_strictMotif} {
-	::tk::EntryTranspose %W
-    }
-}
-bind Spinbox <Meta-b> {
-    if {!$tk_strictMotif} {
-	::tk::EntrySetCursor %W [::tk::EntryPreviousWord %W insert]
-    }
-}
-bind Spinbox <Meta-d> {
-    if {!$tk_strictMotif} {
-	%W delete insert [::tk::EntryNextWord %W insert]
-    }
-}
-bind Spinbox <Meta-f> {
-    if {!$tk_strictMotif} {
-	::tk::EntrySetCursor %W [::tk::EntryNextWord %W insert]
-    }
-}
-bind Spinbox <Meta-BackSpace> {
-    if {!$tk_strictMotif} {
-	%W delete [::tk::EntryPreviousWord %W insert] insert
-    }
-}
-bind Spinbox <Meta-Delete> {
-    if {!$tk_strictMotif} {
-	%W delete [::tk::EntryPreviousWord %W insert] insert
-    }
-}
-
-# A few additional bindings of my own.
-
-bind Spinbox <2> {
-    if {!$tk_strictMotif} {
-	::tk::EntryScanMark %W %x
-    }
-}
-bind Spinbox <B2-Motion> {
-    if {!$tk_strictMotif} {
-	::tk::EntryScanDrag %W %x
-    }
-}
-
-# ::tk::spinbox::Invoke --
-# Invoke an element of the spinbox
-#
-# Arguments:
-# w -		The spinbox window.
-# elem -	Element to invoke
-
-proc ::tk::spinbox::Invoke {w elem} {
-    variable ::tk::Priv
-
-    if {![winfo exists $w]} {
-      return
-    }
-
-    if {![info exists Priv(outsideElement)]} {
-	$w invoke $elem
-	incr Priv(repeated)
-    }
-    set delay [$w cget -repeatinterval]
-    if {$delay > 0} {
-	set Priv(afterId) [after $delay \
-		[list ::tk::spinbox::Invoke $w $elem]]
-    }
-}
-
-# ::tk::spinbox::ClosestGap --
-# Given x and y coordinates, this procedure finds the closest boundary
-# between characters to the given coordinates and returns the index
-# of the character just after the boundary.
-#
-# Arguments:
-# w -		The spinbox window.
-# x -		X-coordinate within the window.
-
-proc ::tk::spinbox::ClosestGap {w x} {
-    set pos [$w index @$x]
-    set bbox [$w bbox $pos]
-    if {($x - [lindex $bbox 0]) < ([lindex $bbox 2]/2)} {
-	return $pos
-    }
-    incr pos
-}
-
-# ::tk::spinbox::ArrowPress --
-# This procedure is invoked to handle button-1 presses in buttonup
-# or buttondown elements of spinbox widgets.
-#
-# Arguments:
-# w -		The spinbox window in which the button was pressed.
-# x -		The x-coordinate of the button press.
-# y -		The y-coordinate of the button press.
-
-proc ::tk::spinbox::ArrowPress {w x y} {
-    variable ::tk::Priv
-
-    if {[$w cget -state] ne "disabled" && \
-            [string match "button*" $Priv(element)]} {
-        $w selection element $Priv(element)
-        set Priv(repeated) 0
-        set Priv(relief) [$w cget -$Priv(element)relief]
-        catch {after cancel $Priv(afterId)}
-        set delay [$w cget -repeatdelay]
-        if {$delay > 0} {
-            set Priv(afterId) [after $delay \
-                    [list ::tk::spinbox::Invoke $w $Priv(element)]]
-        }
-        if {[info exists Priv(outsideElement)]} {
-            unset Priv(outsideElement)
-        }
-    }
-}
-
-# ::tk::spinbox::ButtonDown --
-# This procedure is invoked to handle button-1 presses in spinbox
-# widgets.  It moves the insertion cursor, sets the selection anchor,
-# and claims the input focus.
-#
-# Arguments:
-# w -		The spinbox window in which the button was pressed.
-# x -		The x-coordinate of the button press.
-# y -		The y-coordinate of the button press.
-
-proc ::tk::spinbox::ButtonDown {w x y} {
-    variable ::tk::Priv
-
-    # Get the element that was clicked in.  If we are not directly over
-    # the spinbox, default to entry.  This is necessary for spinbox grabs.
-    #
-    set Priv(element) [$w identify $x $y]
-    if {$Priv(element) eq ""} {
-	set Priv(element) "entry"
-    }
-
-    switch -exact $Priv(element) {
-	"buttonup" - "buttondown" {
-	    ::tk::spinbox::ArrowPress $w $x $y
-	}
-	"entry" {
-	    set Priv(selectMode) char
-	    set Priv(mouseMoved) 0
-	    set Priv(pressX) $x
-	    $w icursor [::tk::spinbox::ClosestGap $w $x]
-	    $w selection from insert
-	    if {"disabled" ne [$w cget -state]} {focus $w}
-	    $w selection clear
-	}
-	default {
-	    return -code error -errorcode {TK SPINBOX UNKNOWN_ELEMENT} \
-		"unknown spinbox element \"$Priv(element)\""
-	}
-    }
-}
-
-# ::tk::spinbox::ButtonUp --
-# This procedure is invoked to handle button-1 releases in spinbox
-# widgets.
-#
-# Arguments:
-# w -		The spinbox window in which the button was pressed.
-# x -		The x-coordinate of the button press.
-# y -		The y-coordinate of the button press.
-
-proc ::tk::spinbox::ButtonUp {w x y} {
-    variable ::tk::Priv
-
-    ::tk::CancelRepeat
-
-    # Priv(relief) may not exist if the ButtonUp is not paired with
-    # a preceding ButtonDown
-    if {[info exists Priv(element)] && [info exists Priv(relief)] && \
-	    [string match "button*" $Priv(element)]} {
-	if {[info exists Priv(repeated)] && !$Priv(repeated)} {
-	    $w invoke $Priv(element)
-	}
-	$w configure -$Priv(element)relief $Priv(relief)
-	$w selection element none
-    }
-}
-
-# ::tk::spinbox::MouseSelect --
-# This procedure is invoked when dragging out a selection with
-# the mouse.  Depending on the selection mode (character, word,
-# line) it selects in different-sized units.  This procedure
-# ignores mouse motions initially until the mouse has moved from
-# one character to another or until there have been multiple clicks.
-#
-# Arguments:
-# w -		The spinbox window in which the button was pressed.
-# x -		The x-coordinate of the mouse.
-# cursor -	optional place to set cursor.
-
-proc ::tk::spinbox::MouseSelect {w x {cursor {}}} {
-    variable ::tk::Priv
-
-    if {$Priv(element) ne "entry"} {
-	# The ButtonUp command triggered by ButtonRelease-1 handles
-	# invoking one of the spinbuttons.
-	return
-    }
-    set cur [::tk::spinbox::ClosestGap $w $x]
-    set anchor [$w index anchor]
-    if {($cur ne $anchor) || (abs($Priv(pressX) - $x) >= 3)} {
-	set Priv(mouseMoved) 1
-    }
-    switch $Priv(selectMode) {
-	char {
-	    if {$Priv(mouseMoved)} {
-		if {$cur < $anchor} {
-		    $w selection range $cur $anchor
-		} elseif {$cur > $anchor} {
-		    $w selection range $anchor $cur
-		} else {
-		    $w selection clear
-		}
-	    }
-	}
-	word {
-	    if {$cur < [$w index anchor]} {
-		set before [tcl_wordBreakBefore [$w get] $cur]
-		set after [tcl_wordBreakAfter [$w get] [expr {$anchor-1}]]
-	    } else {
-		set before [tcl_wordBreakBefore [$w get] $anchor]
-		set after [tcl_wordBreakAfter [$w get] [expr {$cur - 1}]]
-	    }
-	    if {$before < 0} {
-		set before 0
-	    }
-	    if {$after < 0} {
-		set after end
-	    }
-	    $w selection range $before $after
-	}
-	line {
-	    $w selection range 0 end
-	}
-    }
-    if {$cursor ne {} && $cursor ne "ignore"} {
-	catch {$w icursor $cursor}
-    }
-    update idletasks
-}
-
-# ::tk::spinbox::Paste --
-# This procedure sets the insertion cursor to the current mouse position,
-# pastes the selection there, and sets the focus to the window.
-#
-# Arguments:
-# w -		The spinbox window.
-# x -		X position of the mouse.
-
-proc ::tk::spinbox::Paste {w x} {
-    $w icursor [::tk::spinbox::ClosestGap $w $x]
-    catch {$w insert insert [::tk::GetSelection $w PRIMARY]}
-    if {"disabled" eq [$w cget -state]} {
-	focus $w
-    }
-}
-
-# ::tk::spinbox::Motion --
-# This procedure is invoked when the mouse moves in a spinbox window
-# with button 1 down.
-#
-# Arguments:
-# w -		The spinbox window.
-# x -		The x-coordinate of the mouse.
-# y -		The y-coordinate of the mouse.
-
-proc ::tk::spinbox::Motion {w x y} {
-    variable ::tk::Priv
-
-    if {![info exists Priv(element)]} {
-	set Priv(element) [$w identify $x $y]
-    }
-
-    set Priv(x) $x
-    if {"entry" eq $Priv(element)} {
-	::tk::spinbox::MouseSelect $w $x ignore
-    } elseif {[$w identify $x $y] ne $Priv(element)} {
-	if {![info exists Priv(outsideElement)]} {
-	    # We've wandered out of the spin button
-	    # setting outside element will cause ::tk::spinbox::Invoke to
-	    # loop without doing anything
-	    set Priv(outsideElement) ""
-	    $w selection element none
-	}
-    } elseif {[info exists Priv(outsideElement)]} {
-	unset Priv(outsideElement)
-	$w selection element $Priv(element)
-    }
-}
-
-# ::tk::spinbox::AutoScan --
-# This procedure is invoked when the mouse leaves an spinbox window
-# with button 1 down.  It scrolls the window left or right,
-# depending on where the mouse is, and reschedules itself as an
-# "after" command so that the window continues to scroll until the
-# mouse moves back into the window or the mouse button is released.
-#
-# Arguments:
-# w -		The spinbox window.
-
-proc ::tk::spinbox::AutoScan {w} {
-    variable ::tk::Priv
-
-    set x $Priv(x)
-    if {$x >= [winfo width $w]} {
-	$w xview scroll 2 units
-	::tk::spinbox::MouseSelect $w $x ignore
-    } elseif {$x < 0} {
-	$w xview scroll -2 units
-	::tk::spinbox::MouseSelect $w $x ignore
-    }
-    set Priv(afterId) [after 50 [list ::tk::spinbox::AutoScan $w]]
-}
-
-# ::tk::spinbox::GetSelection --
-#
-# Returns the selected text of the spinbox.  Differs from entry in that
-# a spinbox has no -show option to obscure contents.
-#
-# Arguments:
-# w -         The spinbox window from which the text to get
-
-proc ::tk::spinbox::GetSelection {w} {
-    return [string range [$w get] [$w index sel.first] \
-	    [expr {[$w index sel.last] - 1}]]
-}
diff --git a/tk8.6/library/tclIndex b/tk8.6/library/tclIndex
deleted file mode 100644
index b3f37fa..0000000
--- a/tk8.6/library/tclIndex
+++ /dev/null
@@ -1,253 +0,0 @@
-# Tcl autoload index file, version 2.0
-# This file is generated by the "auto_mkindex" command
-# and sourced to set up indexing information for one or
-# more commands.  Typically each line is a command that
-# sets an element in the auto_index array, where the
-# element name is the name of a command and the value is
-# a script that loads the command.
-
-set auto_index(::tk::dialog::error::Return) [list source [file join $dir bgerror.tcl]]
-set auto_index(::tk::dialog::error::Details) [list source [file join $dir bgerror.tcl]]
-set auto_index(::tk::dialog::error::SaveToLog) [list source [file join $dir bgerror.tcl]]
-set auto_index(::tk::dialog::error::Destroy) [list source [file join $dir bgerror.tcl]]
-set auto_index(::tk::dialog::error::bgerror) [list source [file join $dir bgerror.tcl]]
-set auto_index(bgerror) [list source [file join $dir bgerror.tcl]]
-set auto_index(::tk::ButtonInvoke) [list source [file join $dir button.tcl]]
-set auto_index(::tk::ButtonAutoInvoke) [list source [file join $dir button.tcl]]
-set auto_index(::tk::CheckRadioInvoke) [list source [file join $dir button.tcl]]
-set auto_index(::tk::dialog::file::chooseDir::) [list source [file join $dir choosedir.tcl]]
-set auto_index(::tk::dialog::file::chooseDir::Config) [list source [file join $dir choosedir.tcl]]
-set auto_index(::tk::dialog::file::chooseDir::OkCmd) [list source [file join $dir choosedir.tcl]]
-set auto_index(::tk::dialog::file::chooseDir::DblClick) [list source [file join $dir choosedir.tcl]]
-set auto_index(::tk::dialog::file::chooseDir::ListBrowse) [list source [file join $dir choosedir.tcl]]
-set auto_index(::tk::dialog::file::chooseDir::Done) [list source [file join $dir choosedir.tcl]]
-set auto_index(::tk::dialog::color::) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::InitValues) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::Config) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::BuildDialog) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::SetRGBValue) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::XToRgb) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::RgbToX) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::DrawColorScale) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::CreateSelector) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::RedrawFinalColor) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::RedrawColorBars) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::StartMove) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::MoveSelector) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::ReleaseMouse) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::ResizeColorBars) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::HandleSelEntry) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::HandleRGBEntry) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::EnterColorBar) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::LeaveColorBar) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::OkCmd) [list source [file join $dir clrpick.tcl]]
-set auto_index(::tk::dialog::color::CancelCmd) [list source [file join $dir clrpick.tcl]]
-set auto_index(tclParseConfigSpec) [list source [file join $dir comdlg.tcl]]
-set auto_index(tclListValidFlags) [list source [file join $dir comdlg.tcl]]
-set auto_index(::tk::FocusGroup_Create) [list source [file join $dir comdlg.tcl]]
-set auto_index(::tk::FocusGroup_BindIn) [list source [file join $dir comdlg.tcl]]
-set auto_index(::tk::FocusGroup_BindOut) [list source [file join $dir comdlg.tcl]]
-set auto_index(::tk::FocusGroup_Destroy) [list source [file join $dir comdlg.tcl]]
-set auto_index(::tk::FocusGroup_In) [list source [file join $dir comdlg.tcl]]
-set auto_index(::tk::FocusGroup_Out) [list source [file join $dir comdlg.tcl]]
-set auto_index(::tk::FDGetFileTypes) [list source [file join $dir comdlg.tcl]]
-set auto_index(::tk::ConsoleInit) [list source [file join $dir console.tcl]]
-set auto_index(::tk::ConsoleSource) [list source [file join $dir console.tcl]]
-set auto_index(::tk::ConsoleInvoke) [list source [file join $dir console.tcl]]
-set auto_index(::tk::ConsoleHistory) [list source [file join $dir console.tcl]]
-set auto_index(::tk::ConsolePrompt) [list source [file join $dir console.tcl]]
-set auto_index(::tk::ConsoleBind) [list source [file join $dir console.tcl]]
-set auto_index(::tk::ConsoleInsert) [list source [file join $dir console.tcl]]
-set auto_index(::tk::ConsoleOutput) [list source [file join $dir console.tcl]]
-set auto_index(::tk::ConsoleExit) [list source [file join $dir console.tcl]]
-set auto_index(::tk::ConsoleAbout) [list source [file join $dir console.tcl]]
-set auto_index(tk_dialog) [list source [file join $dir dialog.tcl]]
-set auto_index(::tk::EntryClosestGap) [list source [file join $dir entry.tcl]]
-set auto_index(::tk::EntryButton1) [list source [file join $dir entry.tcl]]
-set auto_index(::tk::EntryMouseSelect) [list source [file join $dir entry.tcl]]
-set auto_index(::tk::EntryPaste) [list source [file join $dir entry.tcl]]
-set auto_index(::tk::EntryAutoScan) [list source [file join $dir entry.tcl]]
-set auto_index(::tk::EntryKeySelect) [list source [file join $dir entry.tcl]]
-set auto_index(::tk::EntryInsert) [list source [file join $dir entry.tcl]]
-set auto_index(::tk::EntryBackspace) [list source [file join $dir entry.tcl]]
-set auto_index(::tk::EntrySeeInsert) [list source [file join $dir entry.tcl]]
-set auto_index(::tk::EntrySetCursor) [list source [file join $dir entry.tcl]]
-set auto_index(::tk::EntryTranspose) [list source [file join $dir entry.tcl]]
-set auto_index(::tk::EntryPreviousWord) [list source [file join $dir entry.tcl]]
-set auto_index(::tk::EntryGetSelection) [list source [file join $dir entry.tcl]]
-set auto_index(tk_focusNext) [list source [file join $dir focus.tcl]]
-set auto_index(tk_focusPrev) [list source [file join $dir focus.tcl]]
-set auto_index(::tk::FocusOK) [list source [file join $dir focus.tcl]]
-set auto_index(tk_focusFollowsMouse) [list source [file join $dir focus.tcl]]
-set auto_index(::tk::IconList) [list source [file join $dir iconlist.tcl]]
-set auto_index(::tk::ListboxBeginSelect) [list source [file join $dir listbox.tcl]]
-set auto_index(::tk::ListboxMotion) [list source [file join $dir listbox.tcl]]
-set auto_index(::tk::ListboxBeginExtend) [list source [file join $dir listbox.tcl]]
-set auto_index(::tk::ListboxBeginToggle) [list source [file join $dir listbox.tcl]]
-set auto_index(::tk::ListboxAutoScan) [list source [file join $dir listbox.tcl]]
-set auto_index(::tk::ListboxUpDown) [list source [file join $dir listbox.tcl]]
-set auto_index(::tk::ListboxExtendUpDown) [list source [file join $dir listbox.tcl]]
-set auto_index(::tk::ListboxDataExtend) [list source [file join $dir listbox.tcl]]
-set auto_index(::tk::ListboxCancel) [list source [file join $dir listbox.tcl]]
-set auto_index(::tk::ListboxSelectAll) [list source [file join $dir listbox.tcl]]
-set auto_index(::tk::Megawidget) [list source [file join $dir megawidget.tcl]]
-set auto_index(::tk::MbEnter) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MbLeave) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MbPost) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MenuUnpost) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MbMotion) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MbButtonUp) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MenuMotion) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MenuButtonDown) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MenuLeave) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MenuInvoke) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MenuEscape) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MenuUpArrow) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MenuDownArrow) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MenuLeftArrow) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MenuRightArrow) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MenuNextMenu) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MenuNextEntry) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MenuFind) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::TraverseToMenu) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::FirstMenu) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::TraverseWithinMenu) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MenuFirstEntry) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::MenuFindName) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::PostOverPoint) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::SaveGrabInfo) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::RestoreOldGrab) [list source [file join $dir menu.tcl]]
-set auto_index(tk_menuSetFocus) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::GenerateMenuSelect) [list source [file join $dir menu.tcl]]
-set auto_index(tk_popup) [list source [file join $dir menu.tcl]]
-set auto_index(::tk::ensure_psenc_is_loaded) [list source [file join $dir mkpsenc.tcl]]
-set auto_index(::tk::MessageBox) [list source [file join $dir msgbox.tcl]]
-set auto_index(tk_menuBar) [list source [file join $dir obsolete.tcl]]
-set auto_index(tk_bindForTraversal) [list source [file join $dir obsolete.tcl]]
-set auto_index(::tk::classic::restore) [list source [file join $dir obsolete.tcl]]
-set auto_index(tk_optionMenu) [list source [file join $dir optMenu.tcl]]
-set auto_index(tk_setPalette) [list source [file join $dir palette.tcl]]
-set auto_index(::tk::RecolorTree) [list source [file join $dir palette.tcl]]
-set auto_index(::tk::Darken) [list source [file join $dir palette.tcl]]
-set auto_index(tk_bisque) [list source [file join $dir palette.tcl]]
-set auto_index(::safe::tkInterpInit) [list source [file join $dir safetk.tcl]]
-set auto_index(::safe::loadTk) [list source [file join $dir safetk.tcl]]
-set auto_index(::safe::TkInit) [list source [file join $dir safetk.tcl]]
-set auto_index(::safe::allowTk) [list source [file join $dir safetk.tcl]]
-set auto_index(::safe::disallowTk) [list source [file join $dir safetk.tcl]]
-set auto_index(::safe::tkDelete) [list source [file join $dir safetk.tcl]]
-set auto_index(::safe::tkTopLevel) [list source [file join $dir safetk.tcl]]
-set auto_index(::tk::ScaleActivate) [list source [file join $dir scale.tcl]]
-set auto_index(::tk::ScaleButtonDown) [list source [file join $dir scale.tcl]]
-set auto_index(::tk::ScaleDrag) [list source [file join $dir scale.tcl]]
-set auto_index(::tk::ScaleEndDrag) [list source [file join $dir scale.tcl]]
-set auto_index(::tk::ScaleIncrement) [list source [file join $dir scale.tcl]]
-set auto_index(::tk::ScaleControlPress) [list source [file join $dir scale.tcl]]
-set auto_index(::tk::ScaleButton2Down) [list source [file join $dir scale.tcl]]
-set auto_index(::tk::ScrollButtonDown) [list source [file join $dir scrlbar.tcl]]
-set auto_index(::tk::ScrollButtonUp) [list source [file join $dir scrlbar.tcl]]
-set auto_index(::tk::ScrollSelect) [list source [file join $dir scrlbar.tcl]]
-set auto_index(::tk::ScrollStartDrag) [list source [file join $dir scrlbar.tcl]]
-set auto_index(::tk::ScrollDrag) [list source [file join $dir scrlbar.tcl]]
-set auto_index(::tk::ScrollEndDrag) [list source [file join $dir scrlbar.tcl]]
-set auto_index(::tk::ScrollByUnits) [list source [file join $dir scrlbar.tcl]]
-set auto_index(::tk::ScrollByPages) [list source [file join $dir scrlbar.tcl]]
-set auto_index(::tk::ScrollToPos) [list source [file join $dir scrlbar.tcl]]
-set auto_index(::tk::ScrollTopBottom) [list source [file join $dir scrlbar.tcl]]
-set auto_index(::tk::ScrollButton2Down) [list source [file join $dir scrlbar.tcl]]
-set auto_index(::tk::spinbox::Invoke) [list source [file join $dir spinbox.tcl]]
-set auto_index(::tk::spinbox::ClosestGap) [list source [file join $dir spinbox.tcl]]
-set auto_index(::tk::spinbox::ButtonDown) [list source [file join $dir spinbox.tcl]]
-set auto_index(::tk::spinbox::ButtonUp) [list source [file join $dir spinbox.tcl]]
-set auto_index(::tk::spinbox::MouseSelect) [list source [file join $dir spinbox.tcl]]
-set auto_index(::tk::spinbox::Paste) [list source [file join $dir spinbox.tcl]]
-set auto_index(::tk::spinbox::Motion) [list source [file join $dir spinbox.tcl]]
-set auto_index(::tk::spinbox::AutoScan) [list source [file join $dir spinbox.tcl]]
-set auto_index(::tk::spinbox::KeySelect) [list source [file join $dir spinbox.tcl]]
-set auto_index(::tk::spinbox::Insert) [list source [file join $dir spinbox.tcl]]
-set auto_index(::tk::spinbox::Backspace) [list source [file join $dir spinbox.tcl]]
-set auto_index(::tk::spinbox::SeeInsert) [list source [file join $dir spinbox.tcl]]
-set auto_index(::tk::spinbox::SetCursor) [list source [file join $dir spinbox.tcl]]
-set auto_index(::tk::spinbox::Transpose) [list source [file join $dir spinbox.tcl]]
-set auto_index(::tk::spinbox::PreviousWord) [list source [file join $dir spinbox.tcl]]
-set auto_index(::tk::spinbox::GetSelection) [list source [file join $dir spinbox.tcl]]
-set auto_index(::tk::TearOffMenu) [list source [file join $dir tearoff.tcl]]
-set auto_index(::tk::MenuDup) [list source [file join $dir tearoff.tcl]]
-set auto_index(::tk::TextClosestGap) [list source [file join $dir text.tcl]]
-set auto_index(::tk::TextButton1) [list source [file join $dir text.tcl]]
-set auto_index(::tk::TextSelectTo) [list source [file join $dir text.tcl]]
-set auto_index(::tk::TextKeyExtend) [list source [file join $dir text.tcl]]
-set auto_index(::tk::TextPaste) [list source [file join $dir text.tcl]]
-set auto_index(::tk::TextAutoScan) [list source [file join $dir text.tcl]]
-set auto_index(::tk::TextSetCursor) [list source [file join $dir text.tcl]]
-set auto_index(::tk::TextKeySelect) [list source [file join $dir text.tcl]]
-set auto_index(::tk::TextResetAnchor) [list source [file join $dir text.tcl]]
-set auto_index(::tk::TextInsert) [list source [file join $dir text.tcl]]
-set auto_index(::tk::TextUpDownLine) [list source [file join $dir text.tcl]]
-set auto_index(::tk::TextPrevPara) [list source [file join $dir text.tcl]]
-set auto_index(::tk::TextNextPara) [list source [file join $dir text.tcl]]
-set auto_index(::tk::TextScrollPages) [list source [file join $dir text.tcl]]
-set auto_index(::tk::TextTranspose) [list source [file join $dir text.tcl]]
-set auto_index(tk_textCopy) [list source [file join $dir text.tcl]]
-set auto_index(tk_textCut) [list source [file join $dir text.tcl]]
-set auto_index(tk_textPaste) [list source [file join $dir text.tcl]]
-set auto_index(::tk::TextNextPos) [list source [file join $dir text.tcl]]
-set auto_index(::tk::TextPrevPos) [list source [file join $dir text.tcl]]
-set auto_index(::tk::PlaceWindow) [list source [file join $dir tk.tcl]]
-set auto_index(::tk::SetFocusGrab) [list source [file join $dir tk.tcl]]
-set auto_index(::tk::RestoreFocusGrab) [list source [file join $dir tk.tcl]]
-set auto_index(::tk::ScreenChanged) [list source [file join $dir tk.tcl]]
-set auto_index(::tk::EventMotifBindings) [list source [file join $dir tk.tcl]]
-set auto_index(::tk::CancelRepeat) [list source [file join $dir tk.tcl]]
-set auto_index(::tk::TabToWindow) [list source [file join $dir tk.tcl]]
-set auto_index(::tk::dialog::file::) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::Config) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::Create) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::SetSelectMode) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::UpdateWhenIdle) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::Update) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::SetPathSilently) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::SetPath) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::SetFilter) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::ResolveFile) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::EntFocusIn) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::EntFocusOut) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::ActivateEnt) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::VerifyFileName) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::InvokeBtn) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::UpDirCmd) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::JoinFile) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::OkCmd) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::CancelCmd) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::ListBrowse) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::ListInvoke) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::dialog::file::Done) [list source [file join $dir tkfbox.tcl]]
-set auto_index(::tk::MotifFDialog) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_Create) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_FileTypes) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_SetFilter) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_Config) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_BuildUI) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_SetListMode) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_MakeSList) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_InterpFilter) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_Update) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_LoadFiles) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_BrowseDList) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_ActivateDList) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_BrowseFList) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_ActivateFList) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_ActivateFEnt) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_ActivateSEnt) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_OkCmd) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_FilterCmd) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::MotifFDialog_CancelCmd) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::ListBoxKeyAccel_Set) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::ListBoxKeyAccel_Unset) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::ListBoxKeyAccel_Key) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::ListBoxKeyAccel_Goto) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::ListBoxKeyAccel_Reset) [list source [file join $dir xmfbox.tcl]]
-set auto_index(tk_getFileType) [list source [file join $dir xmfbox.tcl]]
-set auto_index(::tk::unsupported::ExposePrivateCommand) [list source [file join $dir unsupported.tcl]]
-set auto_index(::tk::unsupported::ExposePrivateVariable) [list source [file join $dir unsupported.tcl]]
-set auto_index(::tk::fontchooser) [list source [file join $dir fontchooser.tcl]]
diff --git a/tk8.6/library/tearoff.tcl b/tk8.6/library/tearoff.tcl
deleted file mode 100644
index b500023..0000000
--- a/tk8.6/library/tearoff.tcl
+++ /dev/null
@@ -1,180 +0,0 @@
-# tearoff.tcl --
-#
-# This file contains procedures that implement tear-off menus.
-#
-# Copyright (c) 1994 The Regents of the University of California.
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-# ::tk::TearoffMenu --
-# Given the name of a menu, this procedure creates a torn-off menu
-# that is identical to the given menu (including nested submenus).
-# The new torn-off menu exists as a toplevel window managed by the
-# window manager.  The return value is the name of the new menu.
-# The window is created at the point specified by x and y
-#
-# Arguments:
-# w -			The menu to be torn-off (duplicated).
-# x -			x coordinate where window is created
-# y -			y coordinate where window is created
-
-proc ::tk::TearOffMenu {w {x 0} {y 0}} {
-    # Find a unique name to use for the torn-off menu.  Find the first
-    # ancestor of w that is a toplevel but not a menu, and use this as
-    # the parent of the new menu.  This guarantees that the torn off
-    # menu will be on the same screen as the original menu.  By making
-    # it a child of the ancestor, rather than a child of the menu, it
-    # can continue to live even if the menu is deleted;  it will go
-    # away when the toplevel goes away.
-
-    if {$x == 0} {
-    	set x [winfo rootx $w]
-    }
-    if {$y == 0} {
-    	set y [winfo rooty $w]
-	if {[tk windowingsystem] eq "aqua"} {
-	    # Shift by height of tearoff entry minus height of window titlebar
-	    catch {incr y [expr {[$w yposition 1] - 16}]}
-	    # Avoid the native menu bar which sits on top of everything.
-	    if {$y < 22} { set y 22 }
-	}
-    }
-
-    set parent [winfo parent $w]
-    while {[winfo toplevel $parent] ne $parent \
-	    || [winfo class $parent] eq "Menu"} {
-	set parent [winfo parent $parent]
-    }
-    if {$parent eq "."} {
-	set parent ""
-    }
-    for {set i 1} 1 {incr i} {
-	set menu $parent.tearoff$i
-	if {![winfo exists $menu]} {
-	    break
-	}
-    }
-
-    $w clone $menu tearoff
-
-    # Pick a title for the new menu by looking at the parent of the
-    # original: if the parent is a menu, then use the text of the active
-    # entry.  If it's a menubutton then use its text.
-
-    set parent [winfo parent $w]
-    if {[$menu cget -title] ne ""} {
-    	wm title $menu [$menu cget -title]
-    } else {
-    	switch -- [winfo class $parent] {
-	    Menubutton {
-	    	wm title $menu [$parent cget -text]
-	    }
-	    Menu {
-	    	wm title $menu [$parent entrycget active -label]
-	    }
-	}
-    }
-
-    if {[tk windowingsystem] eq "win32"} {
-        # [Bug 3181181]: Find the toplevel window for the menu
-        set parent [winfo toplevel $parent]
-        while {[winfo class $parent] eq "Menu"} {
-            set parent [winfo toplevel [winfo parent $parent]]
-        }
-	wm transient $menu [winfo toplevel $parent]
-	wm attributes $menu -toolwindow 1
-    }
-
-    $menu post $x $y
-
-    if {[winfo exists $menu] == 0} {
-	return ""
-    }
-
-    # Set tk::Priv(focus) on entry:  otherwise the focus will get lost
-    # after keyboard invocation of a sub-menu (it will stay on the
-    # submenu).
-
-    bind $menu <Enter> {
-	set tk::Priv(focus) %W
-    }
-
-    # If there is a -tearoffcommand option for the menu, invoke it
-    # now.
-
-    set cmd [$w cget -tearoffcommand]
-    if {$cmd ne ""} {
-	uplevel #0 $cmd [list $w $menu]
-    }
-    return $menu
-}
-
-# ::tk::MenuDup --
-# Given a menu (hierarchy), create a duplicate menu (hierarchy)
-# in a given window.
-#
-# Arguments:
-# src -			Source window.  Must be a menu.  It and its
-#			menu descendants will be duplicated at dst.
-# dst -			Name to use for topmost menu in duplicate
-#			hierarchy.
-
-proc ::tk::MenuDup {src dst type} {
-    set cmd [list menu $dst -type $type]
-    foreach option [$src configure] {
-	if {[llength $option] == 2} {
-	    continue
-	}
-	if {[lindex $option 0] eq "-type"} {
-	    continue
-	}
-	lappend cmd [lindex $option 0] [lindex $option 4]
-    }
-    eval $cmd
-    set last [$src index last]
-    if {$last eq "none"} {
-	return
-    }
-    for {set i [$src cget -tearoff]} {$i <= $last} {incr i} {
-	set cmd [list $dst add [$src type $i]]
-	foreach option [$src entryconfigure $i]  {
-	    lappend cmd [lindex $option 0] [lindex $option 4]
-	}
-	eval $cmd
-    }
-
-    # Duplicate the binding tags and bindings from the source menu.
-
-    set tags [bindtags $src]
-    set srcLen [string length $src]
-
-    # Copy tags to x, replacing each substring of src with dst.
-
-    while {[set index [string first $src $tags]] != -1} {
-	append x [string range $tags 0 [expr {$index - 1}]]$dst
-	set tags [string range $tags [expr {$index + $srcLen}] end]
-    }
-    append x $tags
-
-    bindtags $dst $x
-
-    foreach event [bind $src] {
-	unset x
-	set script [bind $src $event]
-	set eventLen [string length $event]
-
-	# Copy script to x, replacing each substring of event with dst.
-
-	while {[set index [string first $event $script]] != -1} {
-	    append x [string range $script 0 [expr {$index - 1}]]
-	    append x $dst
-	    set script [string range $script [expr {$index + $eventLen}] end]
-	}
-	append x $script
-
-	bind $dst $event $x
-    }
-}
diff --git a/tk8.6/library/text.tcl b/tk8.6/library/text.tcl
deleted file mode 100644
index 2bf1b2b..0000000
--- a/tk8.6/library/text.tcl
+++ /dev/null
@@ -1,1204 +0,0 @@
-# text.tcl --
-#
-# This file defines the default bindings for Tk text widgets and provides
-# procedures that help in implementing the bindings.
-#
-# Copyright (c) 1992-1994 The Regents of the University of California.
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-#-------------------------------------------------------------------------
-# Elements of ::tk::Priv that are used in this file:
-#
-# afterId -		If non-null, it means that auto-scanning is underway
-#			and it gives the "after" id for the next auto-scan
-#			command to be executed.
-# char -		Character position on the line;  kept in order
-#			to allow moving up or down past short lines while
-#			still remembering the desired position.
-# mouseMoved -		Non-zero means the mouse has moved a significant
-#			amount since the button went down (so, for example,
-#			start dragging out a selection).
-# prevPos -		Used when moving up or down lines via the keyboard.
-#			Keeps track of the previous insert position, so
-#			we can distinguish a series of ups and downs, all
-#			in a row, from a new up or down.
-# selectMode -		The style of selection currently underway:
-#			char, word, or line.
-# x, y -		Last known mouse coordinates for scanning
-#			and auto-scanning.
-#
-#-------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------
-# The code below creates the default class bindings for text widgets.
-#-------------------------------------------------------------------------
-
-# Standard Motif bindings:
-
-bind Text <1> {
-    tk::TextButton1 %W %x %y
-    %W tag remove sel 0.0 end
-}
-bind Text <B1-Motion> {
-    set tk::Priv(x) %x
-    set tk::Priv(y) %y
-    tk::TextSelectTo %W %x %y
-}
-bind Text <Double-1> {
-    set tk::Priv(selectMode) word
-    tk::TextSelectTo %W %x %y
-    catch {%W mark set insert sel.first}
-}
-bind Text <Triple-1> {
-    set tk::Priv(selectMode) line
-    tk::TextSelectTo %W %x %y
-    catch {%W mark set insert sel.first}
-}
-bind Text <Shift-1> {
-    tk::TextResetAnchor %W @%x,%y
-    set tk::Priv(selectMode) char
-    tk::TextSelectTo %W %x %y
-}
-bind Text <Double-Shift-1>	{
-    set tk::Priv(selectMode) word
-    tk::TextSelectTo %W %x %y 1
-}
-bind Text <Triple-Shift-1>	{
-    set tk::Priv(selectMode) line
-    tk::TextSelectTo %W %x %y
-}
-bind Text <B1-Leave> {
-    set tk::Priv(x) %x
-    set tk::Priv(y) %y
-    tk::TextAutoScan %W
-}
-bind Text <B1-Enter> {
-    tk::CancelRepeat
-}
-bind Text <ButtonRelease-1> {
-    tk::CancelRepeat
-}
-bind Text <Control-1> {
-    %W mark set insert @%x,%y
-    # An operation that moves the insert mark without making it
-    # one end of the selection must insert an autoseparator
-    if {[%W cget -autoseparators]} {
-	%W edit separator
-    }
-}
-# stop an accidental double click triggering <Double-Button-1>
-bind Text <Double-Control-1> { # nothing }
-# stop an accidental movement triggering <B1-Motion>
-bind Text <Control-B1-Motion> { # nothing }
-bind Text <<PrevChar>> {
-    tk::TextSetCursor %W insert-1displayindices
-}
-bind Text <<NextChar>> {
-    tk::TextSetCursor %W insert+1displayindices
-}
-bind Text <<PrevLine>> {
-    tk::TextSetCursor %W [tk::TextUpDownLine %W -1]
-}
-bind Text <<NextLine>> {
-    tk::TextSetCursor %W [tk::TextUpDownLine %W 1]
-}
-bind Text <<SelectPrevChar>> {
-    tk::TextKeySelect %W [%W index {insert - 1displayindices}]
-}
-bind Text <<SelectNextChar>> {
-    tk::TextKeySelect %W [%W index {insert + 1displayindices}]
-}
-bind Text <<SelectPrevLine>> {
-    tk::TextKeySelect %W [tk::TextUpDownLine %W -1]
-}
-bind Text <<SelectNextLine>> {
-    tk::TextKeySelect %W [tk::TextUpDownLine %W 1]
-}
-bind Text <<PrevWord>> {
-    tk::TextSetCursor %W [tk::TextPrevPos %W insert tcl_startOfPreviousWord]
-}
-bind Text <<NextWord>> {
-    tk::TextSetCursor %W [tk::TextNextWord %W insert]
-}
-bind Text <<PrevPara>> {
-    tk::TextSetCursor %W [tk::TextPrevPara %W insert]
-}
-bind Text <<NextPara>> {
-    tk::TextSetCursor %W [tk::TextNextPara %W insert]
-}
-bind Text <<SelectPrevWord>> {
-    tk::TextKeySelect %W [tk::TextPrevPos %W insert tcl_startOfPreviousWord]
-}
-bind Text <<SelectNextWord>> {
-    tk::TextKeySelect %W [tk::TextNextWord %W insert]
-}
-bind Text <<SelectPrevPara>> {
-    tk::TextKeySelect %W [tk::TextPrevPara %W insert]
-}
-bind Text <<SelectNextPara>> {
-    tk::TextKeySelect %W [tk::TextNextPara %W insert]
-}
-bind Text <Prior> {
-    tk::TextSetCursor %W [tk::TextScrollPages %W -1]
-}
-bind Text <Shift-Prior> {
-    tk::TextKeySelect %W [tk::TextScrollPages %W -1]
-}
-bind Text <Next> {
-    tk::TextSetCursor %W [tk::TextScrollPages %W 1]
-}
-bind Text <Shift-Next> {
-    tk::TextKeySelect %W [tk::TextScrollPages %W 1]
-}
-bind Text <Control-Prior> {
-    %W xview scroll -1 page
-}
-bind Text <Control-Next> {
-    %W xview scroll 1 page
-}
-
-bind Text <<LineStart>> {
-    tk::TextSetCursor %W {insert display linestart}
-}
-bind Text <<SelectLineStart>> {
-    tk::TextKeySelect %W {insert display linestart}
-}
-bind Text <<LineEnd>> {
-    tk::TextSetCursor %W {insert display lineend}
-}
-bind Text <<SelectLineEnd>> {
-    tk::TextKeySelect %W {insert display lineend}
-}
-bind Text <Control-Home> {
-    tk::TextSetCursor %W 1.0
-}
-bind Text <Control-Shift-Home> {
-    tk::TextKeySelect %W 1.0
-}
-bind Text <Control-End> {
-    tk::TextSetCursor %W {end - 1 indices}
-}
-bind Text <Control-Shift-End> {
-    tk::TextKeySelect %W {end - 1 indices}
-}
-
-bind Text <Tab> {
-    if {[%W cget -state] eq "normal"} {
-	tk::TextInsert %W \t
-	focus %W
-	break
-    }
-}
-bind Text <Shift-Tab> {
-    # Needed only to keep <Tab> binding from triggering;  doesn't
-    # have to actually do anything.
-    break
-}
-bind Text <Control-Tab> {
-    focus [tk_focusNext %W]
-}
-bind Text <Control-Shift-Tab> {
-    focus [tk_focusPrev %W]
-}
-bind Text <Control-i> {
-    tk::TextInsert %W \t
-}
-bind Text <Return> {
-    tk::TextInsert %W \n
-    if {[%W cget -autoseparators]} {
-	%W edit separator
-    }
-}
-bind Text <Delete> {
-    if {[tk::TextCursorInSelection %W]} {
-	%W delete sel.first sel.last
-    } else {
-	if {[%W compare end != insert+1c]} {
-	    %W delete insert
-	}
-	%W see insert
-    }
-}
-bind Text <BackSpace> {
-    if {[tk::TextCursorInSelection %W]} {
-	%W delete sel.first sel.last
-    } else {
-	if {[%W compare insert != 1.0]} {
-	    %W delete insert-1c
-	}
-	%W see insert
-    }
-}
-
-bind Text <Control-space> {
-    %W mark set [tk::TextAnchor %W] insert
-}
-bind Text <Select> {
-    %W mark set [tk::TextAnchor %W] insert
-}
-bind Text <Control-Shift-space> {
-    set tk::Priv(selectMode) char
-    tk::TextKeyExtend %W insert
-}
-bind Text <Shift-Select> {
-    set tk::Priv(selectMode) char
-    tk::TextKeyExtend %W insert
-}
-bind Text <<SelectAll>> {
-    %W tag add sel 1.0 end
-}
-bind Text <<SelectNone>> {
-    %W tag remove sel 1.0 end
-    # An operation that clears the selection must insert an autoseparator,
-    # because the selection operation may have moved the insert mark
-    if {[%W cget -autoseparators]} {
-	%W edit separator
-    }
-}
-bind Text <<Cut>> {
-    tk_textCut %W
-}
-bind Text <<Copy>> {
-    tk_textCopy %W
-}
-bind Text <<Paste>> {
-    tk_textPaste %W
-}
-bind Text <<Clear>> {
-    # Make <<Clear>> an atomic operation on the Undo stack,
-    # i.e. separate it from other delete operations on either side
-    if {[%W cget -autoseparators]} {
-	%W edit separator
-    }
-    catch {%W delete sel.first sel.last}
-    if {[%W cget -autoseparators]} {
-	%W edit separator
-    }
-}
-bind Text <<PasteSelection>> {
-    if {$tk_strictMotif || ![info exists tk::Priv(mouseMoved)]
-	    || !$tk::Priv(mouseMoved)} {
-	tk::TextPasteSelection %W %x %y
-    }
-}
-bind Text <Insert> {
-    catch {tk::TextInsert %W [::tk::GetSelection %W PRIMARY]}
-}
-bind Text <KeyPress> {
-    tk::TextInsert %W %A
-}
-
-# Ignore all Alt, Meta, and Control keypresses unless explicitly bound.
-# Otherwise, if a widget binding for one of these is defined, the
-# <KeyPress> class binding will also fire and insert the character,
-# which is wrong.  Ditto for <Escape>.
-
-bind Text <Alt-KeyPress> {# nothing }
-bind Text <Meta-KeyPress> {# nothing}
-bind Text <Control-KeyPress> {# nothing}
-bind Text <Escape> {# nothing}
-bind Text <KP_Enter> {# nothing}
-if {[tk windowingsystem] eq "aqua"} {
-    bind Text <Command-KeyPress> {# nothing}
-}
-
-# Additional emacs-like bindings:
-
-bind Text <Control-d> {
-    if {!$tk_strictMotif && [%W compare end != insert+1c]} {
-	%W delete insert
-    }
-}
-bind Text <Control-k> {
-    if {!$tk_strictMotif && [%W compare end != insert+1c]} {
-	if {[%W compare insert == {insert lineend}]} {
-	    %W delete insert
-	} else {
-	    %W delete insert {insert lineend}
-	}
-    }
-}
-bind Text <Control-o> {
-    if {!$tk_strictMotif} {
-	%W insert insert \n
-	%W mark set insert insert-1c
-    }
-}
-bind Text <Control-t> {
-    if {!$tk_strictMotif} {
-	tk::TextTranspose %W
-    }
-}
-
-bind Text <<Undo>> {
-    # An Undo operation may remove the separator at the top of the Undo stack.
-    # Then the item at the top of the stack gets merged with the subsequent changes.
-    # Place separators before and after Undo to prevent this.
-    if {[%W cget -autoseparators]} {
-	%W edit separator
-    }
-    catch { %W edit undo }
-    if {[%W cget -autoseparators]} {
-	%W edit separator
-    }
-}
-
-bind Text <<Redo>> {
-    catch { %W edit redo }
-}
-
-bind Text <Meta-b> {
-    if {!$tk_strictMotif} {
-	tk::TextSetCursor %W [tk::TextPrevPos %W insert tcl_startOfPreviousWord]
-    }
-}
-bind Text <Meta-d> {
-    if {!$tk_strictMotif && [%W compare end != insert+1c]} {
-	%W delete insert [tk::TextNextWord %W insert]
-    }
-}
-bind Text <Meta-f> {
-    if {!$tk_strictMotif} {
-	tk::TextSetCursor %W [tk::TextNextWord %W insert]
-    }
-}
-bind Text <Meta-less> {
-    if {!$tk_strictMotif} {
-	tk::TextSetCursor %W 1.0
-    }
-}
-bind Text <Meta-greater> {
-    if {!$tk_strictMotif} {
-	tk::TextSetCursor %W end-1c
-    }
-}
-bind Text <Meta-BackSpace> {
-    if {!$tk_strictMotif} {
-	%W delete [tk::TextPrevPos %W insert tcl_startOfPreviousWord] insert
-    }
-}
-bind Text <Meta-Delete> {
-    if {!$tk_strictMotif} {
-	%W delete [tk::TextPrevPos %W insert tcl_startOfPreviousWord] insert
-    }
-}
-
-# Macintosh only bindings:
-
-if {[tk windowingsystem] eq "aqua"} {
-bind Text <Control-v> {
-    tk::TextScrollPages %W 1
-}
-
-# End of Mac only bindings
-}
-
-# A few additional bindings of my own.
-
-bind Text <Control-h> {
-    if {!$tk_strictMotif && [%W compare insert != 1.0]} {
-	%W delete insert-1c
-	%W see insert
-    }
-}
-bind Text <2> {
-    if {!$tk_strictMotif} {
-	tk::TextScanMark %W %x %y
-    }
-}
-bind Text <B2-Motion> {
-    if {!$tk_strictMotif} {
-	tk::TextScanDrag %W %x %y
-    }
-}
-set ::tk::Priv(prevPos) {}
-
-# The MouseWheel will typically only fire on Windows and MacOS X.
-# However, someone could use the "event generate" command to produce one
-# on other platforms.  We must be careful not to round -ve values of %D
-# down to zero.
-
-if {[tk windowingsystem] eq "aqua"} {
-    bind Text <MouseWheel> {
-        %W yview scroll [expr {-15 * (%D)}] pixels
-    }
-    bind Text <Option-MouseWheel> {
-        %W yview scroll [expr {-150 * (%D)}] pixels
-    }
-    bind Text <Shift-MouseWheel> {
-        %W xview scroll [expr {-15 * (%D)}] pixels
-    }
-    bind Text <Shift-Option-MouseWheel> {
-        %W xview scroll [expr {-150 * (%D)}] pixels
-    }
-} else {
-    # We must make sure that positive and negative movements are rounded
-    # equally to integers, avoiding the problem that
-    #     (int)1/3 = 0,
-    # but
-    #     (int)-1/3 = -1
-    # The following code ensure equal +/- behaviour.
-    bind Text <MouseWheel> {
-	if {%D >= 0} {
-	    %W yview scroll [expr {-%D/3}] pixels
-	} else {
-	    %W yview scroll [expr {(2-%D)/3}] pixels
-	}
-    }
-    bind Text <Shift-MouseWheel> {
-	if {%D >= 0} {
-	    %W xview scroll [expr {-%D/3}] pixels
-	} else {
-	    %W xview scroll [expr {(2-%D)/3}] pixels
-	}
-    }
-}
-
-if {"x11" eq [tk windowingsystem]} {
-    # Support for mousewheels on Linux/Unix commonly comes through mapping
-    # the wheel to the extended buttons.  If you have a mousewheel, find
-    # Linux configuration info at:
-    #	http://www.inria.fr/koala/colas/mouse-wheel-scroll/
-    bind Text <4> {
-	if {!$tk_strictMotif} {
-	    %W yview scroll -50 pixels
-	}
-    }
-    bind Text <5> {
-	if {!$tk_strictMotif} {
-	    %W yview scroll 50 pixels
-	}
-    }
-    bind Text <Shift-4> {
-	if {!$tk_strictMotif} {
-	    %W xview scroll -50 pixels
-	}
-    }
-    bind Text <Shift-5> {
-	if {!$tk_strictMotif} {
-	    %W xview scroll 50 pixels
-	}
-    }
-}
-
-# ::tk::TextClosestGap --
-# Given x and y coordinates, this procedure finds the closest boundary
-# between characters to the given coordinates and returns the index
-# of the character just after the boundary.
-#
-# Arguments:
-# w -		The text window.
-# x -		X-coordinate within the window.
-# y -		Y-coordinate within the window.
-
-proc ::tk::TextClosestGap {w x y} {
-    set pos [$w index @$x,$y]
-    set bbox [$w bbox $pos]
-    if {$bbox eq ""} {
-	return $pos
-    }
-    if {($x - [lindex $bbox 0]) < ([lindex $bbox 2]/2)} {
-	return $pos
-    }
-    $w index "$pos + 1 char"
-}
-
-# ::tk::TextButton1 --
-# This procedure is invoked to handle button-1 presses in text
-# widgets.  It moves the insertion cursor, sets the selection anchor,
-# and claims the input focus.
-#
-# Arguments:
-# w -		The text window in which the button was pressed.
-# x -		The x-coordinate of the button press.
-# y -		The x-coordinate of the button press.
-
-proc ::tk::TextButton1 {w x y} {
-    variable ::tk::Priv
-
-    set Priv(selectMode) char
-    set Priv(mouseMoved) 0
-    set Priv(pressX) $x
-    set anchorname [tk::TextAnchor $w]
-    $w mark set insert [TextClosestGap $w $x $y]
-    $w mark set $anchorname insert
-    # Set the anchor mark's gravity depending on the click position
-    # relative to the gap
-    set bbox [$w bbox [$w index $anchorname]]
-    if {$x > [lindex $bbox 0]} {
-	$w mark gravity $anchorname right
-    } else {
-	$w mark gravity $anchorname left
-    }
-    # Allow focus in any case on Windows, because that will let the
-    # selection be displayed even for state disabled text widgets.
-    if {[tk windowingsystem] eq "win32" \
-	    || [$w cget -state] eq "normal"} {
-	focus $w
-    }
-    if {[$w cget -autoseparators]} {
-	$w edit separator
-    }
-}
-
-# ::tk::TextSelectTo --
-# This procedure is invoked to extend the selection, typically when
-# dragging it with the mouse.  Depending on the selection mode (character,
-# word, line) it selects in different-sized units.  This procedure
-# ignores mouse motions initially until the mouse has moved from
-# one character to another or until there have been multiple clicks.
-#
-# Note that the 'anchor' is implemented programmatically using
-# a text widget mark, and uses a name that will be unique for each
-# text widget (even when there are multiple peers).  Currently the
-# anchor is considered private to Tk, hence the name 'tk::anchor$w'.
-#
-# Arguments:
-# w -		The text window in which the button was pressed.
-# x -		Mouse x position.
-# y - 		Mouse y position.
-
-set ::tk::Priv(textanchoruid) 0
-
-proc ::tk::TextAnchor {w} {
-    variable Priv
-    if {![info exists Priv(textanchor,$w)]} {
-        set Priv(textanchor,$w) tk::anchor[incr Priv(textanchoruid)]
-    }
-    return $Priv(textanchor,$w)
-}
-
-proc ::tk::TextSelectTo {w x y {extend 0}} {
-    variable ::tk::Priv
-
-    set anchorname [tk::TextAnchor $w]
-    set cur [TextClosestGap $w $x $y]
-    if {[catch {$w index $anchorname}]} {
-	$w mark set $anchorname $cur
-    }
-    set anchor [$w index $anchorname]
-    if {[$w compare $cur != $anchor] || (abs($Priv(pressX) - $x) >= 3)} {
-	set Priv(mouseMoved) 1
-    }
-    switch -- $Priv(selectMode) {
-	char {
-	    if {[$w compare $cur < $anchorname]} {
-		set first $cur
-		set last $anchorname
-	    } else {
-		set first $anchorname
-		set last $cur
-	    }
-	}
-	word {
-	    # Set initial range based only on the anchor (1 char min width)
-	    if {[$w mark gravity $anchorname] eq "right"} {
-		set first $anchorname
-		set last "$anchorname + 1c"
-	    } else {
-		set first "$anchorname - 1c"
-		set last $anchorname
-	    }
-	    # Extend range (if necessary) based on the current point
-	    if {[$w compare $cur < $first]} {
-		set first $cur
-	    } elseif {[$w compare $cur > $last]} {
-		set last $cur
-	    }
-
-	    # Now find word boundaries
-	    set first [TextPrevPos $w "$first + 1c" tcl_wordBreakBefore]
-	    set last [TextNextPos $w "$last - 1c" tcl_wordBreakAfter]
-	}
-	line {
-	    # Set initial range based only on the anchor
-	    set first "$anchorname linestart"
-	    set last "$anchorname lineend"
-
-	    # Extend range (if necessary) based on the current point
-	    if {[$w compare $cur < $first]} {
-		set first "$cur linestart"
-	    } elseif {[$w compare $cur > $last]} {
-		set last "$cur lineend"
-	    }
-	    set first [$w index $first]
-	    set last [$w index "$last + 1c"]
-	}
-    }
-    if {$Priv(mouseMoved) || ($Priv(selectMode) ne "char")} {
-	$w tag remove sel 0.0 end
-	$w mark set insert $cur
-	$w tag add sel $first $last
-	$w tag remove sel $last end
-	update idletasks
-    }
-}
-
-# ::tk::TextKeyExtend --
-# This procedure handles extending the selection from the keyboard,
-# where the point to extend to is really the boundary between two
-# characters rather than a particular character.
-#
-# Arguments:
-# w -		The text window.
-# index -	The point to which the selection is to be extended.
-
-proc ::tk::TextKeyExtend {w index} {
-
-    set anchorname [tk::TextAnchor $w]
-    set cur [$w index $index]
-    if {[catch {$w index $anchorname}]} {
-	$w mark set $anchorname $cur
-    }
-    set anchor [$w index $anchorname]
-    if {[$w compare $cur < $anchorname]} {
-	set first $cur
-	set last $anchorname
-    } else {
-	set first $anchorname
-	set last $cur
-    }
-    $w tag remove sel 0.0 $first
-    $w tag add sel $first $last
-    $w tag remove sel $last end
-}
-
-# ::tk::TextPasteSelection --
-# This procedure sets the insertion cursor to the mouse position,
-# inserts the selection, and sets the focus to the window.
-#
-# Arguments:
-# w -		The text window.
-# x, y - 	Position of the mouse.
-
-proc ::tk::TextPasteSelection {w x y} {
-    $w mark set insert [TextClosestGap $w $x $y]
-    if {![catch {::tk::GetSelection $w PRIMARY} sel]} {
-	set oldSeparator [$w cget -autoseparators]
-	if {$oldSeparator} {
-	    $w configure -autoseparators 0
-	    $w edit separator
-	}
-	$w insert insert $sel
-	if {$oldSeparator} {
-	    $w edit separator
-	    $w configure -autoseparators 1
-	}
-    }
-    if {[$w cget -state] eq "normal"} {
-	focus $w
-    }
-}
-
-# ::tk::TextAutoScan --
-# This procedure is invoked when the mouse leaves a text window
-# with button 1 down.  It scrolls the window up, down, left, or right,
-# depending on where the mouse is (this information was saved in
-# ::tk::Priv(x) and ::tk::Priv(y)), and reschedules itself as an "after"
-# command so that the window continues to scroll until the mouse
-# moves back into the window or the mouse button is released.
-#
-# Arguments:
-# w -		The text window.
-
-proc ::tk::TextAutoScan {w} {
-    variable ::tk::Priv
-    if {![winfo exists $w]} {
-	return
-    }
-    if {$Priv(y) >= [winfo height $w]} {
-	$w yview scroll [expr {1 + $Priv(y) - [winfo height $w]}] pixels
-    } elseif {$Priv(y) < 0} {
-	$w yview scroll [expr {-1 + $Priv(y)}] pixels
-    } elseif {$Priv(x) >= [winfo width $w]} {
-	$w xview scroll 2 units
-    } elseif {$Priv(x) < 0} {
-	$w xview scroll -2 units
-    } else {
-	return
-    }
-    TextSelectTo $w $Priv(x) $Priv(y)
-    set Priv(afterId) [after 50 [list tk::TextAutoScan $w]]
-}
-
-# ::tk::TextSetCursor
-# Move the insertion cursor to a given position in a text.  Also
-# clears the selection, if there is one in the text, and makes sure
-# that the insertion cursor is visible.  Also, don't let the insertion
-# cursor appear on the dummy last line of the text.
-#
-# Arguments:
-# w -		The text window.
-# pos -		The desired new position for the cursor in the window.
-
-proc ::tk::TextSetCursor {w pos} {
-    if {[$w compare $pos == end]} {
-	set pos {end - 1 chars}
-    }
-    $w mark set insert $pos
-    $w tag remove sel 1.0 end
-    $w see insert
-    if {[$w cget -autoseparators]} {
-	$w edit separator
-    }
-}
-
-# ::tk::TextKeySelect
-# This procedure is invoked when stroking out selections using the
-# keyboard.  It moves the cursor to a new position, then extends
-# the selection to that position.
-#
-# Arguments:
-# w -		The text window.
-# new -		A new position for the insertion cursor (the cursor hasn't
-#		actually been moved to this position yet).
-
-proc ::tk::TextKeySelect {w new} {
-    set anchorname [tk::TextAnchor $w]
-    if {[$w tag nextrange sel 1.0 end] eq ""} {
-	if {[$w compare $new < insert]} {
-	    $w tag add sel $new insert
-	} else {
-	    $w tag add sel insert $new
-	}
-	$w mark set $anchorname insert
-    } else {
-	if {[$w compare $new < $anchorname]} {
-	    set first $new
-	    set last $anchorname
-	} else {
-	    set first $anchorname
-	    set last $new
-	}
-	$w tag remove sel 1.0 $first
-	$w tag add sel $first $last
-	$w tag remove sel $last end
-    }
-    $w mark set insert $new
-    $w see insert
-    update idletasks
-}
-
-# ::tk::TextResetAnchor --
-# Set the selection anchor to whichever end is farthest from the
-# index argument.  One special trick: if the selection has two or
-# fewer characters, just leave the anchor where it is.  In this
-# case it doesn't matter which point gets chosen for the anchor,
-# and for the things like Shift-Left and Shift-Right this produces
-# better behavior when the cursor moves back and forth across the
-# anchor.
-#
-# Arguments:
-# w -		The text widget.
-# index -	Position at which mouse button was pressed, which determines
-#		which end of selection should be used as anchor point.
-
-proc ::tk::TextResetAnchor {w index} {
-    if {[$w tag ranges sel] eq ""} {
-	# Don't move the anchor if there is no selection now; this
-	# makes the widget behave "correctly" when the user clicks
-	# once, then shift-clicks somewhere -- ie, the area between
-	# the two clicks will be selected. [Bug: 5929].
-	return
-    }
-    set anchorname [tk::TextAnchor $w]
-    set a [$w index $index]
-    set b [$w index sel.first]
-    set c [$w index sel.last]
-    if {[$w compare $a < $b]} {
-	$w mark set $anchorname sel.last
-	return
-    }
-    if {[$w compare $a > $c]} {
-	$w mark set $anchorname sel.first
-	return
-    }
-    scan $a "%d.%d" lineA chA
-    scan $b "%d.%d" lineB chB
-    scan $c "%d.%d" lineC chC
-    if {$lineB < $lineC+2} {
-	set total [string length [$w get $b $c]]
-	if {$total <= 2} {
-	    return
-	}
-	if {[string length [$w get $b $a]] < ($total/2)} {
-	    $w mark set $anchorname sel.last
-	} else {
-	    $w mark set $anchorname sel.first
-	}
-	return
-    }
-    if {($lineA-$lineB) < ($lineC-$lineA)} {
-	$w mark set $anchorname sel.last
-    } else {
-	$w mark set $anchorname sel.first
-    }
-}
-
-# ::tk::TextCursorInSelection --
-# Check whether the selection exists and contains the insertion cursor. Note
-# that it assumes that the selection is contiguous.
-#
-# Arguments:
-# w -		The text widget whose selection is to be checked
-
-proc ::tk::TextCursorInSelection {w} {
-    expr {
-	[llength [$w tag ranges sel]]
-	&& [$w compare sel.first <= insert]
-	&& [$w compare sel.last >= insert]
-    }
-}
-
-# ::tk::TextInsert --
-# Insert a string into a text at the point of the insertion cursor.
-# If there is a selection in the text, and it covers the point of the
-# insertion cursor, then delete the selection before inserting.
-#
-# Arguments:
-# w -		The text window in which to insert the string
-# s -		The string to insert (usually just a single character)
-
-proc ::tk::TextInsert {w s} {
-    if {$s eq "" || [$w cget -state] eq "disabled"} {
-	return
-    }
-    set compound 0
-    if {[TextCursorInSelection $w]} {
-	set oldSeparator [$w cget -autoseparators]
-	if {$oldSeparator} {
-	    $w configure -autoseparators 0
-	    $w edit separator
-	    set compound 1
-	}
-	$w delete sel.first sel.last
-    }
-    $w insert insert $s
-    $w see insert
-    if {$compound && $oldSeparator} {
-	$w edit separator
-	$w configure -autoseparators 1
-    }
-}
-
-# ::tk::TextUpDownLine --
-# Returns the index of the character one display line above or below the
-# insertion cursor.  There are two tricky things here.  First, we want to
-# maintain the original x position across repeated operations, even though
-# some lines that will get passed through don't have enough characters to
-# cover the original column.  Second, don't try to scroll past the
-# beginning or end of the text.
-#
-# Arguments:
-# w -		The text window in which the cursor is to move.
-# n -		The number of display lines to move: -1 for up one line,
-#		+1 for down one line.
-
-proc ::tk::TextUpDownLine {w n} {
-    variable ::tk::Priv
-
-    set i [$w index insert]
-    if {$Priv(prevPos) ne $i} {
-	set Priv(textPosOrig) $i
-    }
-    set lines [$w count -displaylines $Priv(textPosOrig) $i]
-    set new [$w index \
-	    "$Priv(textPosOrig) + [expr {$lines + $n}] displaylines"]
-    if {[$w compare $new == end] \
-	    || [$w compare $new == "insert display linestart"]} {
-	set new $i
-    }
-    set Priv(prevPos) $new
-    return $new
-}
-
-# ::tk::TextPrevPara --
-# Returns the index of the beginning of the paragraph just before a given
-# position in the text (the beginning of a paragraph is the first non-blank
-# character after a blank line).
-#
-# Arguments:
-# w -		The text window in which the cursor is to move.
-# pos -		Position at which to start search.
-
-proc ::tk::TextPrevPara {w pos} {
-    set pos [$w index "$pos linestart"]
-    while {1} {
-	if {([$w get "$pos - 1 line"] eq "\n" && ([$w get $pos] ne "\n")) \
-		|| $pos eq "1.0"} {
-	    if {[regexp -indices -- {^[ \t]+(.)} \
-		    [$w get $pos "$pos lineend"] -> index]} {
-		set pos [$w index "$pos + [lindex $index 0] chars"]
-	    }
-	    if {[$w compare $pos != insert] || [lindex [split $pos .] 0]==1} {
-		return $pos
-	    }
-	}
-	set pos [$w index "$pos - 1 line"]
-    }
-}
-
-# ::tk::TextNextPara --
-# Returns the index of the beginning of the paragraph just after a given
-# position in the text (the beginning of a paragraph is the first non-blank
-# character after a blank line).
-#
-# Arguments:
-# w -		The text window in which the cursor is to move.
-# start -	Position at which to start search.
-
-proc ::tk::TextNextPara {w start} {
-    set pos [$w index "$start linestart + 1 line"]
-    while {[$w get $pos] ne "\n"} {
-	if {[$w compare $pos == end]} {
-	    return [$w index "end - 1c"]
-	}
-	set pos [$w index "$pos + 1 line"]
-    }
-    while {[$w get $pos] eq "\n"} {
-	set pos [$w index "$pos + 1 line"]
-	if {[$w compare $pos == end]} {
-	    return [$w index "end - 1c"]
-	}
-    }
-    if {[regexp -indices -- {^[ \t]+(.)} \
-	    [$w get $pos "$pos lineend"] -> index]} {
-	return [$w index "$pos + [lindex $index 0] chars"]
-    }
-    return $pos
-}
-
-# ::tk::TextScrollPages --
-# This is a utility procedure used in bindings for moving up and down
-# pages and possibly extending the selection along the way.  It scrolls
-# the view in the widget by the number of pages, and it returns the
-# index of the character that is at the same position in the new view
-# as the insertion cursor used to be in the old view.
-#
-# Arguments:
-# w -		The text window in which the cursor is to move.
-# count -	Number of pages forward to scroll;  may be negative
-#		to scroll backwards.
-
-proc ::tk::TextScrollPages {w count} {
-    set bbox [$w bbox insert]
-    $w yview scroll $count pages
-    if {$bbox eq ""} {
-	return [$w index @[expr {[winfo height $w]/2}],0]
-    }
-    return [$w index @[lindex $bbox 0],[lindex $bbox 1]]
-}
-
-# ::tk::TextTranspose --
-# This procedure implements the "transpose" function for text widgets.
-# It tranposes the characters on either side of the insertion cursor,
-# unless the cursor is at the end of the line.  In this case it
-# transposes the two characters to the left of the cursor.  In either
-# case, the cursor ends up to the right of the transposed characters.
-#
-# Arguments:
-# w -		Text window in which to transpose.
-
-proc ::tk::TextTranspose w {
-    set pos insert
-    if {[$w compare $pos != "$pos lineend"]} {
-	set pos [$w index "$pos + 1 char"]
-    }
-    set new [$w get "$pos - 1 char"][$w get  "$pos - 2 char"]
-    if {[$w compare "$pos - 1 char" == 1.0]} {
-	return
-    }
-    # ensure this is seen as an atomic op to undo
-    set autosep [$w cget -autoseparators]
-    if {$autosep} {
-	$w configure -autoseparators 0
-	$w edit separator
-    }
-    $w delete "$pos - 2 char" $pos
-    $w insert insert $new
-    $w see insert
-    if {$autosep} {
-	$w edit separator
-	$w configure -autoseparators $autosep
-    }
-}
-
-# ::tk_textCopy --
-# This procedure copies the selection from a text widget into the
-# clipboard.
-#
-# Arguments:
-# w -		Name of a text widget.
-
-proc ::tk_textCopy w {
-    if {![catch {set data [$w get sel.first sel.last]}]} {
-	clipboard clear -displayof $w
-	clipboard append -displayof $w $data
-    }
-}
-
-# ::tk_textCut --
-# This procedure copies the selection from a text widget into the
-# clipboard, then deletes the selection (if it exists in the given
-# widget).
-#
-# Arguments:
-# w -		Name of a text widget.
-
-proc ::tk_textCut w {
-    if {![catch {set data [$w get sel.first sel.last]}]} {
-        # make <<Cut>> an atomic operation on the Undo stack,
-        # i.e. separate it from other delete operations on either side
-	set oldSeparator [$w cget -autoseparators]
-	if {$oldSeparator} {
-	    $w edit separator
-	}
-	clipboard clear -displayof $w
-	clipboard append -displayof $w $data
-	$w delete sel.first sel.last
-	if {$oldSeparator} {
-	    $w edit separator
-	}
-    }
-}
-
-# ::tk_textPaste --
-# This procedure pastes the contents of the clipboard to the insertion
-# point in a text widget.
-#
-# Arguments:
-# w -		Name of a text widget.
-
-proc ::tk_textPaste w {
-    if {![catch {::tk::GetSelection $w CLIPBOARD} sel]} {
-	set oldSeparator [$w cget -autoseparators]
-	if {$oldSeparator} {
-	    $w configure -autoseparators 0
-	    $w edit separator
-	}
-	if {[tk windowingsystem] ne "x11"} {
-	    catch { $w delete sel.first sel.last }
-	}
-	$w insert insert $sel
-	if {$oldSeparator} {
-	    $w edit separator
-	    $w configure -autoseparators 1
-	}
-    }
-}
-
-# ::tk::TextNextWord --
-# Returns the index of the next word position after a given position in the
-# text.  The next word is platform dependent and may be either the next
-# end-of-word position or the next start-of-word position after the next
-# end-of-word position.
-#
-# Arguments:
-# w -		The text window in which the cursor is to move.
-# start -	Position at which to start search.
-
-if {[tk windowingsystem] eq "win32"}  {
-    proc ::tk::TextNextWord {w start} {
-	TextNextPos $w [TextNextPos $w $start tcl_endOfWord] \
-		tcl_startOfNextWord
-    }
-} else {
-    proc ::tk::TextNextWord {w start} {
-	TextNextPos $w $start tcl_endOfWord
-    }
-}
-
-# ::tk::TextNextPos --
-# Returns the index of the next position after the given starting
-# position in the text as computed by a specified function.
-#
-# Arguments:
-# w -		The text window in which the cursor is to move.
-# start -	Position at which to start search.
-# op -		Function to use to find next position.
-
-proc ::tk::TextNextPos {w start op} {
-    set text ""
-    set cur $start
-    while {[$w compare $cur < end]} {
-	set text $text[$w get -displaychars $cur "$cur lineend + 1c"]
-	set pos [$op $text 0]
-	if {$pos >= 0} {
-	    return [$w index "$start + $pos display chars"]
-	}
-	set cur [$w index "$cur lineend +1c"]
-    }
-    return end
-}
-
-# ::tk::TextPrevPos --
-# Returns the index of the previous position before the given starting
-# position in the text as computed by a specified function.
-#
-# Arguments:
-# w -		The text window in which the cursor is to move.
-# start -	Position at which to start search.
-# op -		Function to use to find next position.
-
-proc ::tk::TextPrevPos {w start op} {
-    set text ""
-    set cur $start
-    while {[$w compare $cur > 0.0]} {
-	set text [$w get -displaychars "$cur linestart - 1c" $cur]$text
-	set pos [$op $text end]
-	if {$pos >= 0} {
-	    return [$w index "$cur linestart - 1c + $pos display chars"]
-	}
-	set cur [$w index "$cur linestart - 1c"]
-    }
-    return 0.0
-}
-
-# ::tk::TextScanMark --
-#
-# Marks the start of a possible scan drag operation
-#
-# Arguments:
-# w -	The text window from which the text to get
-# x -	x location on screen
-# y -	y location on screen
-
-proc ::tk::TextScanMark {w x y} {
-    variable ::tk::Priv
-    $w scan mark $x $y
-    set Priv(x) $x
-    set Priv(y) $y
-    set Priv(mouseMoved) 0
-}
-
-# ::tk::TextScanDrag --
-#
-# Marks the start of a possible scan drag operation
-#
-# Arguments:
-# w -	The text window from which the text to get
-# x -	x location on screen
-# y -	y location on screen
-
-proc ::tk::TextScanDrag {w x y} {
-    variable ::tk::Priv
-    # Make sure these exist, as some weird situations can trigger the
-    # motion binding without the initial press.  [Bug #220269]
-    if {![info exists Priv(x)]} {
-	set Priv(x) $x
-    }
-    if {![info exists Priv(y)]} {
-	set Priv(y) $y
-    }
-    if {($x != $Priv(x)) || ($y != $Priv(y))} {
-	set Priv(mouseMoved) 1
-    }
-    if {[info exists Priv(mouseMoved)] && $Priv(mouseMoved)} {
-	$w scan dragto $x $y
-    }
-}
diff --git a/tk8.6/library/tk.tcl b/tk8.6/library/tk.tcl
deleted file mode 100644
index fc61c4d..0000000
--- a/tk8.6/library/tk.tcl
+++ /dev/null
@@ -1,694 +0,0 @@
-# tk.tcl --
-#
-# Initialization script normally executed in the interpreter for each Tk-based
-# application.  Arranges class bindings for widgets.
-#
-# Copyright (c) 1992-1994 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-2000 Ajuba Solutions.
-#
-# See the file "license.terms" for information on usage and redistribution of
-# 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.7
-
-# Create a ::tk namespace
-namespace eval ::tk {
-    # Set up the msgcat commands
-    namespace eval msgcat {
-	namespace export mc mcmax
-        if {[interp issafe] || [catch {package require msgcat}]} {
-            # The msgcat package is not available.  Supply our own
-            # minimal replacement.
-            proc mc {src args} {
-                return [format $src {*}$args]
-            }
-            proc mcmax {args} {
-                set max 0
-                foreach string $args {
-                    set len [string length $string]
-                    if {$len>$max} {
-                        set max $len
-                    }
-                }
-                return $max
-            }
-        } else {
-            # Get the commands from the msgcat package that Tk uses.
-            namespace import ::msgcat::mc
-            namespace import ::msgcat::mcmax
-            ::msgcat::mcload [file join $::tk_library msgs]
-        }
-    }
-    namespace import ::tk::msgcat::*
-}
-# and a ::ttk namespace
-namespace eval ::ttk {
-    if {$::tk_library ne ""} {
-	# avoid file join to work in safe interps, but this is also x-plat ok
-	variable library $::tk_library/ttk
-    }
-}
-
-# Add Ttk & Tk's directory to the end of the auto-load search path, if it
-# isn't already on the path:
-
-if {[info exists ::auto_path] && ($::tk_library ne "")
-    && ($::tk_library ni $::auto_path)
-} then {
-    lappend ::auto_path $::tk_library $::ttk::library
-}
-
-# Turn off strict Motif look and feel as a default.
-
-set ::tk_strictMotif 0
-
-# Turn on useinputmethods (X Input Methods) by default.
-# We catch this because safe interpreters may not allow the call.
-
-catch {tk useinputmethods 1}
-
-# ::tk::PlaceWindow --
-#   place a toplevel at a particular position
-# Arguments:
-#   toplevel	name of toplevel window
-#   ?placement?	pointer ?center? ; places $w centered on the pointer
-#		widget widgetPath ; centers $w over widget_name
-#		defaults to placing toplevel in the middle of the screen
-#   ?anchor?	center or widgetPath
-# Results:
-#   Returns nothing
-#
-proc ::tk::PlaceWindow {w {place ""} {anchor ""}} {
-    wm withdraw $w
-    update idletasks
-    set checkBounds 1
-    if {$place eq ""} {
-	set x [expr {([winfo screenwidth $w]-[winfo reqwidth $w])/2}]
-	set y [expr {([winfo screenheight $w]-[winfo reqheight $w])/2}]
-	set checkBounds 0
-    } elseif {[string equal -length [string length $place] $place "pointer"]} {
-	## place at POINTER (centered if $anchor == center)
-	if {[string equal -length [string length $anchor] $anchor "center"]} {
-	    set x [expr {[winfo pointerx $w]-[winfo reqwidth $w]/2}]
-	    set y [expr {[winfo pointery $w]-[winfo reqheight $w]/2}]
-	} else {
-	    set x [winfo pointerx $w]
-	    set y [winfo pointery $w]
-	}
-    } elseif {[string equal -length [string length $place] $place "widget"] && \
-	    [winfo exists $anchor] && [winfo ismapped $anchor]} {
-	## center about WIDGET $anchor, widget must be mapped
-	set x [expr {[winfo rootx $anchor] + \
-		([winfo width $anchor]-[winfo reqwidth $w])/2}]
-	set y [expr {[winfo rooty $anchor] + \
-		([winfo height $anchor]-[winfo reqheight $w])/2}]
-    } else {
-	set x [expr {([winfo screenwidth $w]-[winfo reqwidth $w])/2}]
-	set y [expr {([winfo screenheight $w]-[winfo reqheight $w])/2}]
-	set checkBounds 0
-    }
-    if {$checkBounds} {
-	if {$x < [winfo vrootx $w]} {
-	    set x [winfo vrootx $w]
-	} elseif {$x > ([winfo vrootx $w]+[winfo vrootwidth $w]-[winfo reqwidth $w])} {
-	    set x [expr {[winfo vrootx $w]+[winfo vrootwidth $w]-[winfo reqwidth $w]}]
-	}
-	if {$y < [winfo vrooty $w]} {
-	    set y [winfo vrooty $w]
-	} elseif {$y > ([winfo vrooty $w]+[winfo vrootheight $w]-[winfo reqheight $w])} {
-	    set y [expr {[winfo vrooty $w]+[winfo vrootheight $w]-[winfo reqheight $w]}]
-	}
-	if {[tk windowingsystem] eq "aqua"} {
-	    # Avoid the native menu bar which sits on top of everything.
-	    if {$y < 22} {
-		set y 22
-	    }
-	}
-    }
-    wm maxsize $w [winfo vrootwidth $w] [winfo vrootheight $w]
-    wm geometry $w +$x+$y
-    wm deiconify $w
-}
-
-# ::tk::SetFocusGrab --
-#   swap out current focus and grab temporarily (for dialogs)
-# Arguments:
-#   grab	new window to grab
-#   focus	window to give focus to
-# Results:
-#   Returns nothing
-#
-proc ::tk::SetFocusGrab {grab {focus {}}} {
-    set index "$grab,$focus"
-    upvar ::tk::FocusGrab($index) data
-
-    lappend data [focus]
-    set oldGrab [grab current $grab]
-    lappend data $oldGrab
-    if {[winfo exists $oldGrab]} {
-	lappend data [grab status $oldGrab]
-    }
-    # The "grab" command will fail if another application
-    # already holds the grab.  So catch it.
-    catch {grab $grab}
-    if {[winfo exists $focus]} {
-	focus $focus
-    }
-}
-
-# ::tk::RestoreFocusGrab --
-#   restore old focus and grab (for dialogs)
-# Arguments:
-#   grab	window that had taken grab
-#   focus	window that had taken focus
-#   destroy	destroy|withdraw - how to handle the old grabbed window
-# Results:
-#   Returns nothing
-#
-proc ::tk::RestoreFocusGrab {grab focus {destroy destroy}} {
-    set index "$grab,$focus"
-    if {[info exists ::tk::FocusGrab($index)]} {
-	foreach {oldFocus oldGrab oldStatus} $::tk::FocusGrab($index) { break }
-	unset ::tk::FocusGrab($index)
-    } else {
-	set oldGrab ""
-    }
-
-    catch {focus $oldFocus}
-    grab release $grab
-    if {$destroy eq "withdraw"} {
-	wm withdraw $grab
-    } else {
-	destroy $grab
-    }
-    if {[winfo exists $oldGrab] && [winfo ismapped $oldGrab]} {
-	if {$oldStatus eq "global"} {
-	    grab -global $oldGrab
-	} else {
-	    grab $oldGrab
-	}
-    }
-}
-
-# ::tk::GetSelection --
-#   This tries to obtain the default selection.  On Unix, we first try
-#   and get a UTF8_STRING, a type supported by modern Unix apps for
-#   passing Unicode data safely.  We fall back on the default STRING
-#   type otherwise.  On Windows, only the STRING type is necessary.
-# Arguments:
-#   w	The widget for which the selection will be retrieved.
-#	Important for the -displayof property.
-#   sel	The source of the selection (PRIMARY or CLIPBOARD)
-# Results:
-#   Returns the selection, or an error if none could be found
-#
-if {[tk windowingsystem] ne "win32"} {
-    proc ::tk::GetSelection {w {sel PRIMARY}} {
-	if {[catch {
-	    selection get -displayof $w -selection $sel -type UTF8_STRING
-	} txt] && [catch {
-	    selection get -displayof $w -selection $sel
-	} txt]} then {
-	    return -code error -errorcode {TK SELECTION NONE} \
-		"could not find default selection"
-	} else {
-	    return $txt
-	}
-    }
-} else {
-    proc ::tk::GetSelection {w {sel PRIMARY}} {
-	if {[catch {
-	    selection get -displayof $w -selection $sel
-	} txt]} then {
-	    return -code error -errorcode {TK SELECTION NONE} \
-		"could not find default selection"
-	} else {
-	    return $txt
-	}
-    }
-}
-
-# ::tk::ScreenChanged --
-# This procedure is invoked by the binding mechanism whenever the
-# "current" screen is changing.  The procedure does two things.
-# First, it uses "upvar" to make variable "::tk::Priv" point at an
-# array variable that holds state for the current display.  Second,
-# it initializes the array if it didn't already exist.
-#
-# Arguments:
-# screen -		The name of the new screen.
-
-proc ::tk::ScreenChanged screen {
-    # Extract the display name.
-    set disp [string range $screen 0 [string last . $screen]-1]
-
-    # Ensure that namespace separators never occur in the display name (as
-    # they cause problems in variable names). Double-colons exist in some VNC
-    # display names. [Bug 2912473]
-    set disp [string map {:: _doublecolon_} $disp]
-
-    uplevel #0 [list upvar #0 ::tk::Priv.$disp ::tk::Priv]
-    variable ::tk::Priv
-
-    if {[info exists Priv]} {
-	set Priv(screen) $screen
-	return
-    }
-    array set Priv {
-	activeMenu	{}
-	activeItem	{}
-	afterId		{}
-	buttons		0
-	buttonWindow	{}
-	dragging	0
-	focus		{}
-	grab		{}
-	initPos		{}
-	inMenubutton	{}
-	listboxPrev	{}
-	menuBar		{}
-	mouseMoved	0
-	oldGrab		{}
-	popup		{}
-	postedMb	{}
-	pressX		0
-	pressY		0
-	prevPos		0
-	selectMode	char
-    }
-    set Priv(screen) $screen
-    set Priv(tearoff) [string equal [tk windowingsystem] "x11"]
-    set Priv(window) {}
-}
-
-# Do initial setup for Priv, so that it is always bound to something
-# (otherwise, if someone references it, it may get set to a non-upvar-ed
-# value, which will cause trouble later).
-
-tk::ScreenChanged [winfo screen .]
-
-# ::tk::EventMotifBindings --
-# This procedure is invoked as a trace whenever ::tk_strictMotif is
-# changed.  It is used to turn on or turn off the motif virtual
-# bindings.
-#
-# Arguments:
-# n1 - the name of the variable being changed ("::tk_strictMotif").
-
-proc ::tk::EventMotifBindings {n1 dummy dummy} {
-    upvar $n1 name
-
-    if {$name} {
-	set op delete
-    } else {
-	set op add
-    }
-
-    event $op <<Cut>> <Control-Key-w> <Control-Lock-Key-W> <Shift-Key-Delete>
-    event $op <<Copy>> <Meta-Key-w> <Meta-Lock-Key-W> <Control-Key-Insert>
-    event $op <<Paste>> <Control-Key-y> <Control-Lock-Key-Y> <Shift-Key-Insert>
-    event $op <<PrevChar>> <Control-Key-b> <Control-Lock-Key-B>
-    event $op <<NextChar>> <Control-Key-f> <Control-Lock-Key-F>
-    event $op <<PrevLine>> <Control-Key-p> <Control-Lock-Key-P>
-    event $op <<NextLine>> <Control-Key-n> <Control-Lock-Key-N>
-    event $op <<LineStart>> <Control-Key-a> <Control-Lock-Key-A>
-    event $op <<LineEnd>> <Control-Key-e> <Control-Lock-Key-E>
-    event $op <<SelectPrevChar>> <Control-Key-B> <Control-Lock-Key-b>
-    event $op <<SelectNextChar>> <Control-Key-F> <Control-Lock-Key-f>
-    event $op <<SelectPrevLine>> <Control-Key-P> <Control-Lock-Key-p>
-    event $op <<SelectNextLine>> <Control-Key-N> <Control-Lock-Key-n>
-    event $op <<SelectLineStart>> <Control-Key-A> <Control-Lock-Key-a>
-    event $op <<SelectLineEnd>> <Control-Key-E> <Control-Lock-Key-e>
-}
-
-#----------------------------------------------------------------------
-# Define common dialogs on platforms where they are not implemented
-# using compiled code.
-#----------------------------------------------------------------------
-
-if {![llength [info commands tk_chooseColor]]} {
-    proc ::tk_chooseColor {args} {
-	return [::tk::dialog::color:: {*}$args]
-    }
-}
-if {![llength [info commands tk_getOpenFile]]} {
-    proc ::tk_getOpenFile {args} {
-	if {$::tk_strictMotif} {
-	    return [::tk::MotifFDialog open {*}$args]
-	} else {
-	    return [::tk::dialog::file:: open {*}$args]
-	}
-    }
-}
-if {![llength [info commands tk_getSaveFile]]} {
-    proc ::tk_getSaveFile {args} {
-	if {$::tk_strictMotif} {
-	    return [::tk::MotifFDialog save {*}$args]
-	} else {
-	    return [::tk::dialog::file:: save {*}$args]
-	}
-    }
-}
-if {![llength [info commands tk_messageBox]]} {
-    proc ::tk_messageBox {args} {
-	return [::tk::MessageBox {*}$args]
-    }
-}
-if {![llength [info command tk_chooseDirectory]]} {
-    proc ::tk_chooseDirectory {args} {
-	return [::tk::dialog::file::chooseDir:: {*}$args]
-    }
-}
-
-#----------------------------------------------------------------------
-# Define the set of common virtual events.
-#----------------------------------------------------------------------
-
-switch -exact -- [tk windowingsystem] {
-    "x11" {
-	event add <<Cut>>		<Control-Key-x> <Key-F20> <Control-Lock-Key-X>
-	event add <<Copy>>		<Control-Key-c> <Key-F16> <Control-Lock-Key-C>
-	event add <<Paste>>		<Control-Key-v> <Key-F18> <Control-Lock-Key-V>
-	event add <<PasteSelection>>	<ButtonRelease-2>
-	event add <<Undo>>		<Control-Key-z> <Control-Lock-Key-Z>
-	event add <<Redo>>		<Control-Key-Z> <Control-Lock-Key-z>
-	event add <<ContextMenu>>	<Button-3>
-	# On Darwin/Aqua, buttons from left to right are 1,3,2.  On Darwin/X11 with recent
-	# XQuartz as the X server, they are 1,2,3; other X servers may differ.
-
-	event add <<SelectAll>>		<Control-Key-slash>
-	event add <<SelectNone>>	<Control-Key-backslash>
-	event add <<NextChar>>		<Right>
-	event add <<SelectNextChar>>	<Shift-Right>
-	event add <<PrevChar>>		<Left>
-	event add <<SelectPrevChar>>	<Shift-Left>
-	event add <<NextWord>>		<Control-Right>
-	event add <<SelectNextWord>>	<Control-Shift-Right>
-	event add <<PrevWord>>		<Control-Left>
-	event add <<SelectPrevWord>>	<Control-Shift-Left>
-	event add <<LineStart>>		<Home>
-	event add <<SelectLineStart>>	<Shift-Home>
-	event add <<LineEnd>>		<End>
-	event add <<SelectLineEnd>>	<Shift-End>
-	event add <<PrevLine>>		<Up>
-	event add <<NextLine>>		<Down>
-	event add <<SelectPrevLine>>	<Shift-Up>
-	event add <<SelectNextLine>>	<Shift-Down>
-	event add <<PrevPara>>		<Control-Up>
-	event add <<NextPara>>		<Control-Down>
-	event add <<SelectPrevPara>>	<Control-Shift-Up>
-	event add <<SelectNextPara>>	<Control-Shift-Down>
-	event add <<ToggleSelection>>	<Control-ButtonPress-1>
-
-	# Some OS's define a goofy (as in, not <Shift-Tab>) keysym that is
-	# returned when the user presses <Shift-Tab>. In order for tab
-	# traversal to work, we have to add these keysyms to the PrevWindow
-	# event. We use catch just in case the keysym isn't recognized.
-
-	# This is needed for XFree86 systems
-	catch { event add <<PrevWindow>> <ISO_Left_Tab> }
-	# This seems to be correct on *some* HP systems.
-	catch { event add <<PrevWindow>> <hpBackTab> }
-
-	trace add variable ::tk_strictMotif write ::tk::EventMotifBindings
-	set ::tk_strictMotif $::tk_strictMotif
-	# On unix, we want to always display entry/text selection,
-	# regardless of which window has focus
-	set ::tk::AlwaysShowSelection 1
-    }
-    "win32" {
-	event add <<Cut>>		<Control-Key-x> <Shift-Key-Delete> <Control-Lock-Key-X>
-	event add <<Copy>>		<Control-Key-c> <Control-Key-Insert> <Control-Lock-Key-C>
-	event add <<Paste>>		<Control-Key-v> <Shift-Key-Insert> <Control-Lock-Key-V>
-	event add <<PasteSelection>>	<ButtonRelease-2>
-  	event add <<Undo>>		<Control-Key-z> <Control-Lock-Key-Z>
-	event add <<Redo>>		<Control-Key-y> <Control-Lock-Key-Y>
-	event add <<ContextMenu>>	<Button-3>
-
-	event add <<SelectAll>>		<Control-Key-slash> <Control-Key-a> <Control-Lock-Key-A>
-	event add <<SelectNone>>	<Control-Key-backslash>
-	event add <<NextChar>>		<Right>
-	event add <<SelectNextChar>>	<Shift-Right>
-	event add <<PrevChar>>		<Left>
-	event add <<SelectPrevChar>>	<Shift-Left>
-	event add <<NextWord>>		<Control-Right>
-	event add <<SelectNextWord>>	<Control-Shift-Right>
-	event add <<PrevWord>>		<Control-Left>
-	event add <<SelectPrevWord>>	<Control-Shift-Left>
-	event add <<LineStart>>		<Home>
-	event add <<SelectLineStart>>	<Shift-Home>
-	event add <<LineEnd>>		<End>
-	event add <<SelectLineEnd>>	<Shift-End>
-	event add <<PrevLine>>		<Up>
-	event add <<NextLine>>		<Down>
-	event add <<SelectPrevLine>>	<Shift-Up>
-	event add <<SelectNextLine>>	<Shift-Down>
-	event add <<PrevPara>>		<Control-Up>
-	event add <<NextPara>>		<Control-Down>
-	event add <<SelectPrevPara>>	<Control-Shift-Up>
-	event add <<SelectNextPara>>	<Control-Shift-Down>
-	event add <<ToggleSelection>>	<Control-ButtonPress-1>
-    }
-    "aqua" {
-	event add <<Cut>>		<Command-Key-x> <Key-F2> <Command-Lock-Key-X>
-	event add <<Copy>>		<Command-Key-c> <Key-F3> <Command-Lock-Key-C>
-	event add <<Paste>>		<Command-Key-v> <Key-F4> <Command-Lock-Key-V>
-	event add <<PasteSelection>>	<ButtonRelease-3>
-	event add <<Clear>>		<Clear>
-	event add <<ContextMenu>>	<Button-2>
-
-	# Official bindings
-	# See http://support.apple.com/kb/HT1343
-	event add <<SelectAll>>		<Command-Key-a>
-	event add <<SelectNone>>	<Option-Command-Key-a>
-	event add <<Undo>>		<Command-Key-z> <Command-Lock-Key-Z>
-	event add <<Redo>>		<Shift-Command-Key-z> <Shift-Command-Lock-Key-z>
-	event add <<NextChar>>		<Right> <Control-Key-f> <Control-Lock-Key-F>
-	event add <<SelectNextChar>>	<Shift-Right> <Shift-Control-Key-F> <Shift-Control-Lock-Key-F>
-	event add <<PrevChar>>		<Left> <Control-Key-b> <Control-Lock-Key-B>
-	event add <<SelectPrevChar>>	<Shift-Left> <Shift-Control-Key-B> <Shift-Control-Lock-Key-B>
-	event add <<NextWord>>		<Option-Right>
-	event add <<SelectNextWord>>	<Shift-Option-Right>
-	event add <<PrevWord>>		<Option-Left>
-	event add <<SelectPrevWord>>	<Shift-Option-Left>
-	event add <<LineStart>>		<Home> <Command-Left> <Control-Key-a> <Control-Lock-Key-A>
-	event add <<SelectLineStart>>	<Shift-Home> <Shift-Command-Left> <Shift-Control-Key-A> <Shift-Control-Lock-Key-A>
-	event add <<LineEnd>>		<End> <Command-Right> <Control-Key-e> <Control-Lock-Key-E>
-	event add <<SelectLineEnd>>	<Shift-End> <Shift-Command-Right> <Shift-Control-Key-E> <Shift-Control-Lock-Key-E>
-	event add <<PrevLine>>		<Up> <Control-Key-p> <Control-Lock-Key-P>
-	event add <<SelectPrevLine>>	<Shift-Up> <Shift-Control-Key-P> <Shift-Control-Lock-Key-P>
-	event add <<NextLine>>		<Down> <Control-Key-n> <Control-Lock-Key-N>
-	event add <<SelectNextLine>>	<Shift-Down> <Shift-Control-Key-N> <Shift-Control-Lock-Key-N>
-	# Not official, but logical extensions of above. Also derived from
-	# bindings present in MS Word on OSX.
-	event add <<PrevPara>>		<Option-Up>
-	event add <<NextPara>>		<Option-Down>
-	event add <<SelectPrevPara>>	<Shift-Option-Up>
-	event add <<SelectNextPara>>	<Shift-Option-Down>
-	event add <<ToggleSelection>>	<Command-ButtonPress-1>
-    }
-}
-
-# ----------------------------------------------------------------------
-# Read in files that define all of the class bindings.
-# ----------------------------------------------------------------------
-
-if {$::tk_library ne ""} {
-    proc ::tk::SourceLibFile {file} {
-        namespace eval :: [list source [file join $::tk_library $file.tcl]]
-    }
-    namespace eval ::tk {
-	SourceLibFile icons
-	SourceLibFile button
-	SourceLibFile entry
-	SourceLibFile listbox
-	SourceLibFile menu
-	SourceLibFile panedwindow
-	SourceLibFile scale
-	SourceLibFile scrlbar
-	SourceLibFile spinbox
-	SourceLibFile text
-    }
-}
-
-# ----------------------------------------------------------------------
-# Default bindings for keyboard traversal.
-# ----------------------------------------------------------------------
-
-event add <<PrevWindow>> <Shift-Tab>
-event add <<NextWindow>> <Tab>
-bind all <<NextWindow>> {tk::TabToWindow [tk_focusNext %W]}
-bind all <<PrevWindow>> {tk::TabToWindow [tk_focusPrev %W]}
-
-# ::tk::CancelRepeat --
-# This procedure is invoked to cancel an auto-repeat action described
-# by ::tk::Priv(afterId).  It's used by several widgets to auto-scroll
-# the widget when the mouse is dragged out of the widget with a
-# button pressed.
-#
-# Arguments:
-# None.
-
-proc ::tk::CancelRepeat {} {
-    variable ::tk::Priv
-    after cancel $Priv(afterId)
-    set Priv(afterId) {}
-}
-
-# ::tk::TabToWindow --
-# This procedure moves the focus to the given widget.
-# It sends a <<TraverseOut>> virtual event to the previous focus window,
-# if any, before changing the focus, and a <<TraverseIn>> event
-# to the new focus window afterwards.
-#
-# Arguments:
-# w - Window to which focus should be set.
-
-proc ::tk::TabToWindow {w} {
-    set focus [focus]
-    if {$focus ne ""} {
-	event generate $focus <<TraverseOut>>
-    }
-    focus $w
-    event generate $w <<TraverseIn>>
-}
-
-# ::tk::UnderlineAmpersand --
-#	This procedure takes some text with ampersand and returns text w/o
-#	ampersand and position of the ampersand.  Double ampersands are
-#	converted to single ones.  Position returned is -1 when there is no
-#	ampersand.
-#
-proc ::tk::UnderlineAmpersand {text} {
-    set s [string map {&& & & \ufeff} $text]
-    set idx [string first \ufeff $s]
-    return [list [string map {\ufeff {}} $s] $idx]
-}
-
-# ::tk::SetAmpText --
-#	Given widget path and text with "magic ampersands", sets -text and
-#	-underline options for the widget
-#
-proc ::tk::SetAmpText {widget text} {
-    lassign [UnderlineAmpersand $text] newtext under
-    $widget configure -text $newtext -underline $under
-}
-
-# ::tk::AmpWidget --
-#	Creates new widget, turning -text option into -text and -underline
-#	options, returned by ::tk::UnderlineAmpersand.
-#
-proc ::tk::AmpWidget {class path args} {
-    set options {}
-    foreach {opt val} $args {
-	if {$opt eq "-text"} {
-	    lassign [UnderlineAmpersand $val] newtext under
-	    lappend options -text $newtext -underline $under
-	} else {
-	    lappend options $opt $val
-	}
-    }
-    set result [$class $path {*}$options]
-    if {[string match "*button" $class]} {
-	bind $path <<AltUnderlined>> [list $path invoke]
-    }
-    return $result
-}
-
-# ::tk::AmpMenuArgs --
-#	Processes arguments for a menu entry, turning -label option into
-#	-label and -underline options, returned by ::tk::UnderlineAmpersand.
-#
-proc ::tk::AmpMenuArgs {widget add type args} {
-    set options {}
-    foreach {opt val} $args {
-	if {$opt eq "-label"} {
-	    lassign [UnderlineAmpersand $val] newlabel under
-	    lappend options -label $newlabel -underline $under
-	} else {
-	    lappend options $opt $val
-	}
-    }
-    $widget add $type {*}$options
-}
-
-# ::tk::FindAltKeyTarget --
-#	Search recursively through the hierarchy of visible widgets to find
-#	button or label which has $char as underlined character.
-#
-proc ::tk::FindAltKeyTarget {path char} {
-    set class [winfo class $path]
-    if {$class in {
-	Button Checkbutton Label Radiobutton
-	TButton TCheckbutton TLabel TRadiobutton
-    } && [string equal -nocase $char \
-	    [string index [$path cget -text] [$path cget -underline]]]} {
-	return $path
-    }
-    set subwins [concat [grid slaves $path] [pack slaves $path] \
-	    [place slaves $path]]
-    if {$class eq "Canvas"} {
-	foreach item [$path find all] {
-	    if {[$path type $item] eq "window"} {
-		set w [$path itemcget $item -window]
-		if {$w ne ""} {lappend subwins $w}
-	    }
-	}
-    } elseif {$class eq "Text"} {
-	lappend subwins {*}[$path window names]
-    }
-    foreach child $subwins {
-	set target [FindAltKeyTarget $child $char]
-	if {$target ne ""} {
-	    return $target
-	}
-    }
-}
-
-# ::tk::AltKeyInDialog --
-#	<Alt-Key> event handler for standard dialogs. Sends <<AltUnderlined>>
-#	to button or label which has appropriate underlined character.
-#
-proc ::tk::AltKeyInDialog {path key} {
-    set target [FindAltKeyTarget $path $key]
-    if {$target ne ""} {
-	event generate $target <<AltUnderlined>>
-    }
-}
-
-# ::tk::mcmaxamp --
-#	Replacement for mcmax, used for texts with "magic ampersand" in it.
-#
-
-proc ::tk::mcmaxamp {args} {
-    set maxlen 0
-    foreach arg $args {
-	# Should we run [mc] in caller's namespace?
-	lassign [UnderlineAmpersand [mc $arg]] msg
-	set length [string length $msg]
-	if {$length > $maxlen} {
-	    set maxlen $length
-	}
-    }
-    return $maxlen
-}
-
-# For now, turn off the custom mdef proc for the mac:
-
-if {[tk windowingsystem] eq "aqua"} {
-    namespace eval ::tk::mac {
-	set useCustomMDEF 0
-    }
-}
-
-# Run the Ttk themed widget set initialization
-if {$::ttk::library ne ""} {
-    uplevel \#0 [list source $::ttk::library/ttk.tcl]
-}
-
-# Local Variables:
-# mode: tcl
-# fill-column: 78
-# End:
diff --git a/tk8.6/library/tkfbox.tcl b/tk8.6/library/tkfbox.tcl
deleted file mode 100644
index f73fdc5..0000000
--- a/tk8.6/library/tkfbox.tcl
+++ /dev/null
@@ -1,1240 +0,0 @@
-# tkfbox.tcl --
-#
-#	Implements the "TK" standard file selection dialog box.  This dialog
-#	box is used on the Unix platforms whenever the tk_strictMotif flag is
-#	not set.
-#
-#	The "TK" standard file selection dialog box is similar to the file
-#	selection dialog box on Win95(TM).  The user can navigate the
-#	directories by clicking on the folder icons or by selecting the
-#	"Directory" option menu.  The user can select files by clicking on the
-#	file icons or by entering a filename in the "Filename:" entry.
-#
-# Copyright (c) 1994-1998 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-namespace eval ::tk::dialog {}
-namespace eval ::tk::dialog::file {
-    namespace import -force ::tk::msgcat::*
-    variable showHiddenBtn 0
-    variable showHiddenVar 1
-
-    # Create the images if they did not already exist.
-    if {![info exists ::tk::Priv(updirImage)]} {
-	set ::tk::Priv(updirImage) [image create photo -data {
-	    iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/gD+AP7rGN
-	    SCAAAACXBIWXMAAA3WAAAN1gGQb3mcAAAACXZwQWcAAAAWAAAAFgDcxelYAAAENUlE
-	    QVQ4y7WUbWiVZRjHf/f9POcc9+Kc5bC2aIq5sGG0XnTzNU13zAIlFMNc9CEhTCKwCC
-	    JIgt7AglaR0RcrolAKg14+GBbiGL6xZiYyy63cmzvu7MVznnOe537rw7bDyvlBoT/c
-	    n+6L3/3nf13XLZLJJP+HfICysjKvqqpq+rWKysvLR1tbW+11g+fPn/+bEGIe4KYqCs
-	    Owu66u7oG2trah6wJrrRc0NTVhjME5h7Vj5pxzCCE4duxYZUdHx/aGhoZmgJ+yb+wF
-	    uCO19RmAffv25f8LFslkktraWtvU1CS6u7vRWmOtxVpbAPu+T0tLS04pFU/J34Wd3S
-	    cdFtlfZWeZBU4IcaS5uXn1ZLAEMMY4ay1aa4wx/zpKKYIgoL6+vmjxqoXe5ZLTcsPq
-	    bTyycjODpe1y3WMrvDAMV14jCuW0VhhjiJQpOJ5w7Zwjk8/y9R+vsHHNNq6oFMrkeX
-	    BxI+8d2sktap3YvOPD0lRQrH+Z81fE7t3WB4gihVKazsuaA20aKSUgAG/seQdy2l6W
-	    37+EyopqTv39I6HJUT2zlnlza2jLdgiTaxwmDov6alLHcZUTzXPGGAauWJbfO4dHl9
-	    bgJs3HyfNf0N4ZsOa+jbT3/ownY/hO09p1kBULtjBw+Tvq7xzwauds4dWPDleAcP5E
-	    xlprgtBRUZRgYCRPTzoHwEi2g6OnX+eFrW/RM9qBE4p43CeTz5ATaU6nDrFm2cPs/+
-	    E1SopqkZ7MFJqntXZaa7IKppckwIEvJbg8LWd28OT6nVihCPQQ8UScWCLGqO4hXuQx
-	    qDtJ204eWrqWb1ufRspwtABWaqx5gRKUFSdwDnxPcuLcyyxbuIyaqntIBV34MY9YzC
-	    Owg+S9YeJFkniRpGPkCLMrZzG3+jbktA/KClMxFoUhiKC0OAbAhd79CO8i6xe/STyW
-	    4O7KVRgUJ/sP0heeJV4kEVKw/vZd40sFKxat4mLvp6VLdvnb/XHHGGPIKwBBpC1/9n
-	    3DpfRZnn9/AwCxRII9O79kVPdjvByxuET6Ai8mePeTt4lyheXzhOSpCcdWa00uckTG
-	    kckbGu76nEhbIm2xznH4VB3OWYaiXqQn8GKSWGIMHuXyPL76LBcupmhp69pz4uMnXi
-	    w4VloTGcdQRtGdzmHs1f+RdYZslMZJhzUOHVnceN1ooEiP5JUzdqCQMWCD0JCIeQzn
-	    NNpO+clhrCYf5rC+A2cxWmDUWG2oHEOZMEKIwclgMnnLrTeXUV7sUzpNXgU9DmijWV
-	    v9LEKCkAIhKIBnlvpks6F21qUZ31u/sbExPa9h0/RzwzMov2nGlG5TmW1YOzzlnSfL
-	    mVnyGf19Q7lwZHBp+1fPtflAIgiC7389n9qkihP+lWyeqfUO15ZwQTqlw9H+o2cOvN
-	    QJCAHEgEqgYnI0NyALjAJdyWQy7wMa6AEujUdzo3LjcAXwD/XCTKIRjWytAAAAJXRF
-	    WHRjcmVhdGUtZGF0ZQAyMDA5LTA0LTA2VDIxOjI1OjQxLTAzOjAw8s+uCAAAACV0RV
-	    h0bW9kaWZ5LWRhdGUAMjAwOC0wMS0wM1QxNTowODoyMS0wMjowMJEc/44AAAAZdEVY
-	    dFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC
-	}]
-    }
-    if {![info exists ::tk::Priv(folderImage)]} {
-	set ::tk::Priv(folderImage) [image create photo -data {
-	    iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiA
-	    AAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBl
-	    Lm9yZ5vuPBoAAAHCSURBVDiNpZAxa5NRFIafc+9XLCni4BC6FBycMnbrLpkcgtDVX6
-	    C70D/g4lZX/4coxLlgxFkpiiSSUGm/JiXfveee45AmNlhawXc53HvPee55X+l2u/yP
-	    qt3d3Tfu/viatwt3fzIYDI5uBJhZr9fr3TMzzAx3B+D09PR+v98/7HQ6z5fNOWdCCG
-	    U4HH6s67oAVDlnV1UmkwmllBUkhMD29nYHeLuEAkyn06qU8qqu64MrgIyqYmZrkHa7
-	    3drc3KTVahFjJITAaDRiPB4/XFlQVVMtHH5IzJo/P4EA4MyB+erWPQB7++zs7ccYvl
-	    U5Z08pMW2cl88eIXLZeDUpXzsBkNQ5eP1+p0opmaoCTgzw6fjs6gLLsp58FB60t0Dc
-	    K1Ul54yIEIMQ43Uj68pquDmCeJVztpwzuBNE2LgBoMVpslHMCUEAFgDVxQbzVAiA+a
-	    K5uGPmmDtZF3VpoUm2ArhqQaRiUjcMf81p1G60UEVhcjZfAFTVUkrgkS+jc06mDX9n
-	    vq4YhJ9nlxZExMwMEaHJRutOdWuIIsJFUoBSuTvHJ4YIfP46unV4qdlsjsBRZRtb/X
-	    fHd5+C8+P7+J8BIoxFwovfRxYhnhxjpzEAAAAASUVORK5CYII=
-	}]
-    }
-    if {![info exists ::tk::Priv(fileImage)]} {
-	set ::tk::Priv(fileImage)   [image create photo -data {
-	    iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gva
-	    eTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QQWFA84umAmQgAAANpJREFU
-	    OMutkj1uhDAQhb8HSLtbISGfgZ+zbJkix0HmFhwhUdocBnMBGvqtTIqIFSReWKK8ai
-	    x73nwzHrVt+zEMwwvH9FrX9TsA1trpqKy10+yUzME4jnjvAZB0LzXHkojjmDRNVyh3
-	    A+89zrlVwlKSqKrqVy/J8lAUxSZBSMny4ZLgp54iyPM8UPHGNJ2IomibAKDv+9VlWZ
-	    bABbgB5/0WQgSSkC4PF2JF4JzbHN430c4vhAm0TyCJruuClefph4yCBCGT3T3Isoy/
-	    KDHGfDZNcz2SZIx547/0BVRRX7n8uT/sAAAAAElFTkSuQmCC
-	}]
-    }
-}
-
-# ::tk::dialog::file:: --
-#
-#	Implements the TK file selection dialog.  This dialog is used when the
-#	tk_strictMotif flag is set to false.  This procedure shouldn't be
-#	called directly.  Call tk_getOpenFile or tk_getSaveFile instead.
-#
-# Arguments:
-#	type		"open" or "save"
-#	args		Options parsed by the procedure.
-#
-
-proc ::tk::dialog::file:: {type args} {
-    variable ::tk::Priv
-    variable showHiddenBtn
-    set dataName __tk_filedialog
-    upvar ::tk::dialog::file::$dataName data
-
-    Config $dataName $type $args
-
-    if {$data(-parent) eq "."} {
-	set w .$dataName
-    } else {
-	set w $data(-parent).$dataName
-    }
-
-    # (re)create the dialog box if necessary
-    #
-    if {![winfo exists $w]} {
-	Create $w TkFDialog
-    } elseif {[winfo class $w] ne "TkFDialog"} {
-	destroy $w
-	Create $w TkFDialog
-    } else {
-	set data(dirMenuBtn) $w.contents.f1.menu
-	set data(dirMenu) $w.contents.f1.menu.menu
-	set data(upBtn) $w.contents.f1.up
-	set data(icons) $w.contents.icons
-	set data(ent) $w.contents.f2.ent
-	set data(typeMenuLab) $w.contents.f2.lab2
-	set data(typeMenuBtn) $w.contents.f2.menu
-	set data(typeMenu) $data(typeMenuBtn).m
-	set data(okBtn) $w.contents.f2.ok
-	set data(cancelBtn) $w.contents.f2.cancel
-	set data(hiddenBtn) $w.contents.f2.hidden
-	SetSelectMode $w $data(-multiple)
-    }
-    if {$showHiddenBtn} {
-	$data(hiddenBtn) configure -state normal
-	grid $data(hiddenBtn)
-    } else {
-	$data(hiddenBtn) configure -state disabled
-	grid remove $data(hiddenBtn)
-    }
-
-    # Make sure subseqent uses of this dialog are independent [Bug 845189]
-    unset -nocomplain data(extUsed)
-
-    # Dialog boxes should be transient with respect to their parent, so that
-    # they will always stay on top of their parent window.  However, some
-    # window managers will create the window as withdrawn if the parent window
-    # is withdrawn or iconified.  Combined with the grab we put on the window,
-    # this can hang the entire application.  Therefore we only make the dialog
-    # transient if the parent is viewable.
-
-    if {[winfo viewable [winfo toplevel $data(-parent)]]} {
-	wm transient $w $data(-parent)
-    }
-
-    # Add traces on the selectPath variable
-    #
-
-    trace add variable data(selectPath) write \
-	    [list ::tk::dialog::file::SetPath $w]
-    $data(dirMenuBtn) configure \
-	    -textvariable ::tk::dialog::file::${dataName}(selectPath)
-
-    # Cleanup previous menu
-    #
-    $data(typeMenu) delete 0 end
-    $data(typeMenuBtn) configure -state normal -text ""
-
-    # Initialize the file types menu
-    #
-    if {[llength $data(-filetypes)]} {
-	# Default type and name to first entry
-	set initialtype     [lindex $data(-filetypes) 0]
-	set initialTypeName [lindex $initialtype 0]
-	if {$data(-typevariable) ne ""} {
-	    upvar #0 $data(-typevariable) typeVariable
-	    if {[info exists typeVariable]} {
-		set initialTypeName $typeVariable
-	    }
-	}
-	foreach type $data(-filetypes) {
-	    set title  [lindex $type 0]
-	    set filter [lindex $type 1]
-	    $data(typeMenu) add command -label $title \
-		-command [list ::tk::dialog::file::SetFilter $w $type]
-	    # [string first] avoids glob-pattern char issues
-	    if {[string first ${initialTypeName} $title] == 0} {
-		set initialtype $type
-	    }
-	}
-	SetFilter $w $initialtype
-	$data(typeMenuBtn) configure -state normal
-	$data(typeMenuLab) configure -state normal
-    } else {
-	set data(filter) "*"
-	$data(typeMenuBtn) configure -state disabled -takefocus 0
-	$data(typeMenuLab) configure -state disabled
-    }
-    UpdateWhenIdle $w
-
-    # Withdraw the window, then update all the geometry information
-    # so we know how big it wants to be, then center the window in the
-    # display (Motif style) and de-iconify it.
-
-    ::tk::PlaceWindow $w widget $data(-parent)
-    wm title $w $data(-title)
-
-    # Set a grab and claim the focus too.
-
-    ::tk::SetFocusGrab $w $data(ent)
-    $data(ent) delete 0 end
-    $data(ent) insert 0 $data(selectFile)
-    $data(ent) selection range 0 end
-    $data(ent) icursor end
-
-    # Wait for the user to respond, then restore the focus and return the
-    # index of the selected button.  Restore the focus before deleting the
-    # window, since otherwise the window manager may take the focus away so we
-    # can't redirect it.  Finally, restore any grab that was in effect.
-
-    vwait ::tk::Priv(selectFilePath)
-
-    ::tk::RestoreFocusGrab $w $data(ent) withdraw
-
-    # Cleanup traces on selectPath variable
-    #
-
-    foreach trace [trace info variable data(selectPath)] {
-	trace remove variable data(selectPath) {*}$trace
-    }
-    $data(dirMenuBtn) configure -textvariable {}
-
-    return $Priv(selectFilePath)
-}
-
-# ::tk::dialog::file::Config --
-#
-#	Configures the TK filedialog according to the argument list
-#
-proc ::tk::dialog::file::Config {dataName type argList} {
-    upvar ::tk::dialog::file::$dataName data
-
-    set data(type) $type
-
-    # 0: Delete all variable that were set on data(selectPath) the
-    # last time the file dialog is used. The traces may cause troubles
-    # if the dialog is now used with a different -parent option.
-
-    foreach trace [trace info variable data(selectPath)] {
-	trace remove variable data(selectPath) {*}$trace
-    }
-
-    # 1: the configuration specs
-    #
-    set specs {
-	{-defaultextension "" "" ""}
-	{-filetypes "" "" ""}
-	{-initialdir "" "" ""}
-	{-initialfile "" "" ""}
-	{-parent "" "" "."}
-	{-title "" "" ""}
-	{-typevariable "" "" ""}
-    }
-
-    # The "-multiple" option is only available for the "open" file dialog.
-    #
-    if {$type eq "open"} {
-	lappend specs {-multiple "" "" "0"}
-    }
-
-    # The "-confirmoverwrite" option is only for the "save" file dialog.
-    #
-    if {$type eq "save"} {
-	lappend specs {-confirmoverwrite "" "" "1"}
-    }
-
-    # 2: default values depending on the type of the dialog
-    #
-    if {![info exists data(selectPath)]} {
-	# first time the dialog has been popped up
-	set data(selectPath) [pwd]
-	set data(selectFile) ""
-    }
-
-    # 3: parse the arguments
-    #
-    tclParseConfigSpec ::tk::dialog::file::$dataName $specs "" $argList
-
-    if {$data(-title) eq ""} {
-	if {$type eq "open"} {
-	    set data(-title) [mc "Open"]
-	} else {
-	    set data(-title) [mc "Save As"]
-	}
-    }
-
-    # 4: set the default directory and selection according to the -initial
-    #    settings
-    #
-    if {$data(-initialdir) ne ""} {
-	# Ensure that initialdir is an absolute path name.
-	if {[file isdirectory $data(-initialdir)]} {
-	    set old [pwd]
-	    cd $data(-initialdir)
-	    set data(selectPath) [pwd]
-	    cd $old
-	} else {
-	    set data(selectPath) [pwd]
-	}
-    }
-    set data(selectFile) $data(-initialfile)
-
-    # 5. Parse the -filetypes option
-    #
-    set data(origfiletypes) $data(-filetypes)
-    set data(-filetypes) [::tk::FDGetFileTypes $data(-filetypes)]
-
-    if {![winfo exists $data(-parent)]} {
-	return -code error -errorcode [list TK LOOKUP WINDOW $data(-parent)] \
-	    "bad window path name \"$data(-parent)\""
-    }
-
-    # Set -multiple to a one or zero value (not other boolean types like
-    # "yes") so we can use it in tests more easily.
-    if {$type eq "save"} {
-	set data(-multiple) 0
-    } elseif {$data(-multiple)} {
-	set data(-multiple) 1
-    } else {
-	set data(-multiple) 0
-    }
-}
-
-proc ::tk::dialog::file::Create {w class} {
-    set dataName [lindex [split $w .] end]
-    upvar ::tk::dialog::file::$dataName data
-    variable ::tk::Priv
-    global tk_library
-
-    toplevel $w -class $class
-    if {[tk windowingsystem] eq "x11"} {wm attributes $w -type dialog}
-    pack [ttk::frame $w.contents] -expand 1 -fill both
-    #set w $w.contents
-
-    # f1: the frame with the directory option menu
-    #
-    set f1 [ttk::frame $w.contents.f1]
-    bind [::tk::AmpWidget ttk::label $f1.lab -text [mc "&Directory:"]] \
-	    <<AltUnderlined>> [list focus $f1.menu]
-
-    set data(dirMenuBtn) $f1.menu
-    if {![info exists data(selectPath)]} {
-	set data(selectPath) ""
-    }
-    set data(dirMenu) $f1.menu.menu
-    ttk::menubutton $f1.menu -menu $data(dirMenu) -direction flush \
-	    -textvariable [format %s(selectPath) ::tk::dialog::file::$dataName]
-    menu $data(dirMenu) -tearoff 0
-    $data(dirMenu) add radiobutton -label "" -variable \
-	    [format %s(selectPath) ::tk::dialog::file::$dataName]
-    set data(upBtn) [ttk::button $f1.up]
-    $data(upBtn) configure -image $Priv(updirImage)
-
-    $f1.menu configure -takefocus 1;# -highlightthickness 2
-
-    pack $data(upBtn) -side right -padx 4 -fill both
-    pack $f1.lab -side left -padx 4 -fill both
-    pack $f1.menu -expand yes -fill both -padx 4
-
-    # data(icons): the IconList that list the files and directories.
-    #
-    if {$class eq "TkFDialog"} {
-	if { $data(-multiple) } {
-	    set fNameCaption [mc "File &names:"]
-	} else {
-	    set fNameCaption [mc "File &name:"]
-	}
-	set fTypeCaption [mc "Files of &type:"]
-	set iconListCommand [list ::tk::dialog::file::OkCmd $w]
-    } else {
-	set fNameCaption [mc "&Selection:"]
-	set iconListCommand [list ::tk::dialog::file::chooseDir::DblClick $w]
-    }
-    set data(icons) [::tk::IconList $w.contents.icons \
-	    -command $iconListCommand -multiple $data(-multiple)]
-    bind $data(icons) <<ListboxSelect>> \
-	    [list ::tk::dialog::file::ListBrowse $w]
-
-    # f2: the frame with the OK button, cancel button, "file name" field
-    #     and file types field.
-    #
-    set f2 [ttk::frame $w.contents.f2]
-    bind [::tk::AmpWidget ttk::label $f2.lab -text $fNameCaption -anchor e]\
-	    <<AltUnderlined>> [list focus $f2.ent]
-    # -pady 0
-    set data(ent) [ttk::entry $f2.ent]
-
-    # The font to use for the icons. The default Canvas font on Unix is just
-    # deviant.
-    set ::tk::$w.contents.icons(font) [$data(ent) cget -font]
-
-    # Make the file types bits only if this is a File Dialog
-    if {$class eq "TkFDialog"} {
-	set data(typeMenuLab) [::tk::AmpWidget ttk::label $f2.lab2 \
-		-text $fTypeCaption -anchor e]
-	# -pady [$f2.lab cget -pady]
-	set data(typeMenuBtn) [ttk::menubutton $f2.menu \
-		-menu $f2.menu.m]
-	# -indicatoron 1
-	set data(typeMenu) [menu $data(typeMenuBtn).m -tearoff 0]
-	# $data(typeMenuBtn) configure -takefocus 1 -relief raised -anchor w
-	bind $data(typeMenuLab) <<AltUnderlined>> [list \
-		focus $data(typeMenuBtn)]
-    }
-
-    # The hidden button is displayed when ::tk::dialog::file::showHiddenBtn is
-    # true.  Create it disabled so the binding doesn't trigger if it isn't
-    # shown.
-    if {$class eq "TkFDialog"} {
-	set text [mc "Show &Hidden Files and Directories"]
-    } else {
-	set text [mc "Show &Hidden Directories"]
-    }
-    set data(hiddenBtn) [::tk::AmpWidget ttk::checkbutton $f2.hidden \
-	    -text $text -state disabled \
-	    -variable ::tk::dialog::file::showHiddenVar \
-	    -command [list ::tk::dialog::file::UpdateWhenIdle $w]]
-# -anchor w -padx 3
-
-    # the okBtn is created after the typeMenu so that the keyboard traversal
-    # is in the right order, and add binding so that we find out when the
-    # dialog is destroyed by the user (added here instead of to the overall
-    # window so no confusion about how much <Destroy> gets called; exactly
-    # once will do). [Bug 987169]
-
-    set data(okBtn)     [::tk::AmpWidget ttk::button $f2.ok \
-	    -text [mc "&OK"]     -default active];# -pady 3]
-    bind $data(okBtn) <Destroy> [list ::tk::dialog::file::Destroyed $w]
-    set data(cancelBtn) [::tk::AmpWidget ttk::button $f2.cancel \
-	    -text [mc "&Cancel"] -default normal];# -pady 3]
-
-    # grid the widgets in f2
-    #
-    grid $f2.lab $f2.ent $data(okBtn) -padx 4 -pady 3 -sticky ew
-    grid configure $f2.ent -padx 2
-    if {$class eq "TkFDialog"} {
-	grid $data(typeMenuLab) $data(typeMenuBtn) $data(cancelBtn) \
-		-padx 4 -sticky ew
-	grid configure $data(typeMenuBtn) -padx 0
-	grid $data(hiddenBtn) -columnspan 2 -padx 4 -sticky ew
-    } else {
-	grid $data(hiddenBtn) - $data(cancelBtn) -padx 4 -sticky ew
-    }
-    grid columnconfigure $f2 1 -weight 1
-
-    # Pack all the frames together. We are done with widget construction.
-    #
-    pack $f1 -side top -fill x -pady 4
-    pack $f2 -side bottom -pady 4 -fill x
-    pack $data(icons) -expand yes -fill both -padx 4 -pady 1
-
-    # Set up the event handlers that are common to Directory and File Dialogs
-    #
-
-    wm protocol $w WM_DELETE_WINDOW [list ::tk::dialog::file::CancelCmd $w]
-    $data(upBtn)     configure -command [list ::tk::dialog::file::UpDirCmd $w]
-    $data(cancelBtn) configure -command [list ::tk::dialog::file::CancelCmd $w]
-    bind $w <KeyPress-Escape> [list $data(cancelBtn) invoke]
-    bind $w <Alt-Key> [list tk::AltKeyInDialog $w %A]
-
-    # Set up event handlers specific to File or Directory Dialogs
-    #
-    if {$class eq "TkFDialog"} {
-	bind $data(ent) <Return> [list ::tk::dialog::file::ActivateEnt $w]
-	$data(okBtn)     configure -command [list ::tk::dialog::file::OkCmd $w]
-	bind $w <Alt-t> [format {
-	    if {[%s cget -state] eq "normal"} {
-		focus %s
-	    }
-	} $data(typeMenuBtn) $data(typeMenuBtn)]
-    } else {
-	set okCmd [list ::tk::dialog::file::chooseDir::OkCmd $w]
-	bind $data(ent) <Return> $okCmd
-	$data(okBtn) configure -command $okCmd
-	bind $w <Alt-s> [list focus $data(ent)]
-	bind $w <Alt-o> [list $data(okBtn) invoke]
-    }
-    bind $w <Alt-h> [list $data(hiddenBtn) invoke]
-    bind $data(ent) <Tab> [list ::tk::dialog::file::CompleteEnt $w]
-
-    # Build the focus group for all the entries
-    #
-    ::tk::FocusGroup_Create $w
-    ::tk::FocusGroup_BindIn $w  $data(ent) [list \
-	    ::tk::dialog::file::EntFocusIn $w]
-    ::tk::FocusGroup_BindOut $w $data(ent) [list \
-	    ::tk::dialog::file::EntFocusOut $w]
-}
-
-# ::tk::dialog::file::SetSelectMode --
-#
-#	Set the select mode of the dialog to single select or multi-select.
-#
-# Arguments:
-#	w		The dialog path.
-#	multi		1 if the dialog is multi-select; 0 otherwise.
-#
-# Results:
-#	None.
-
-proc ::tk::dialog::file::SetSelectMode {w multi} {
-    set dataName __tk_filedialog
-    upvar ::tk::dialog::file::$dataName data
-    if { $multi } {
-	set fNameCaption [mc "File &names:"]
-    } else {
-	set fNameCaption [mc "File &name:"]
-    }
-    set iconListCommand [list ::tk::dialog::file::OkCmd $w]
-    ::tk::SetAmpText $w.contents.f2.lab $fNameCaption
-    $data(icons) configure -multiple $multi -command $iconListCommand
-    return
-}
-
-# ::tk::dialog::file::UpdateWhenIdle --
-#
-#	Creates an idle event handler which updates the dialog in idle time.
-#	This is important because loading the directory may take a long time
-#	and we don't want to load the same directory for multiple times due to
-#	multiple concurrent events.
-#
-proc ::tk::dialog::file::UpdateWhenIdle {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    if {[info exists data(updateId)]} {
-	return
-    }
-    set data(updateId) [after idle [list ::tk::dialog::file::Update $w]]
-}
-
-# ::tk::dialog::file::Update --
-#
-#	Loads the files and directories into the IconList widget. Also sets up
-#	the directory option menu for quick access to parent directories.
-#
-proc ::tk::dialog::file::Update {w} {
-    # This proc may be called within an idle handler. Make sure that the
-    # window has not been destroyed before this proc is called
-    if {![winfo exists $w]} {
-	return
-    }
-    set class [winfo class $w]
-    if {($class ne "TkFDialog") && ($class ne "TkChooseDir")} {
-	return
-    }
-
-    set dataName [winfo name $w]
-    upvar ::tk::dialog::file::$dataName data
-    variable ::tk::Priv
-    variable showHiddenVar
-    global tk_library
-    unset -nocomplain data(updateId)
-
-    set folder $Priv(folderImage)
-    set file   $Priv(fileImage)
-
-    set appPWD [pwd]
-    if {[catch {
-	cd $data(selectPath)
-    }]} then {
-	# We cannot change directory to $data(selectPath). $data(selectPath)
-	# should have been checked before ::tk::dialog::file::Update is
-	# called, so we normally won't come to here. Anyways, give an error
-	# and abort action.
-	tk_messageBox -type ok -parent $w -icon warning -message [mc \
-	       "Cannot change to the directory \"%1\$s\".\nPermission denied."\
-		$data(selectPath)]
-	cd $appPWD
-	return
-    }
-
-    # Turn on the busy cursor. BUG?? We haven't disabled X events, though,
-    # so the user may still click and cause havoc ...
-    #
-    set entCursor [$data(ent) cget -cursor]
-    set dlgCursor [$w         cget -cursor]
-    $data(ent) configure -cursor watch
-    $w         configure -cursor watch
-    update idletasks
-
-    $data(icons) deleteall
-
-    set showHidden $showHiddenVar
-
-    # Make the dir list. Note that using an explicit [pwd] (instead of '.') is
-    # better in some VFS cases.
-    $data(icons) add $folder [GlobFiltered [pwd] d 1]
-
-    if {$class eq "TkFDialog"} {
-	# Make the file list if this is a File Dialog, selecting all but
-	# 'd'irectory type files.
-	#
-	$data(icons) add $file [GlobFiltered [pwd] {f b c l p s}]
-    }
-
-    # Update the Directory: option menu
-    #
-    set list ""
-    set dir ""
-    foreach subdir [file split $data(selectPath)] {
-	set dir [file join $dir $subdir]
-	lappend list $dir
-    }
-
-    $data(dirMenu) delete 0 end
-    set var [format %s(selectPath) ::tk::dialog::file::$dataName]
-    foreach path $list {
-	$data(dirMenu) add command -label $path -command [list set $var $path]
-    }
-
-    # Restore the PWD to the application's PWD
-    #
-    cd $appPWD
-
-    if {$class eq "TkFDialog"} {
-	# Restore the Open/Save Button if this is a File Dialog
-	#
-	if {$data(type) eq "open"} {
-	    ::tk::SetAmpText $data(okBtn) [mc "&Open"]
-	} else {
-	    ::tk::SetAmpText $data(okBtn) [mc "&Save"]
-	}
-    }
-
-    # turn off the busy cursor.
-    #
-    $data(ent) configure -cursor $entCursor
-    $w         configure -cursor $dlgCursor
-}
-
-# ::tk::dialog::file::SetPathSilently --
-#
-# 	Sets data(selectPath) without invoking the trace procedure
-#
-proc ::tk::dialog::file::SetPathSilently {w path} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    set cb [list ::tk::dialog::file::SetPath $w]
-    trace remove variable data(selectPath) write $cb
-    set data(selectPath) $path
-    trace add variable data(selectPath) write $cb
-}
-
-
-# This proc gets called whenever data(selectPath) is set
-#
-proc ::tk::dialog::file::SetPath {w name1 name2 op} {
-    if {[winfo exists $w]} {
-	upvar ::tk::dialog::file::[winfo name $w] data
-	UpdateWhenIdle $w
-	# On directory dialogs, we keep the entry in sync with the currentdir.
-	if {[winfo class $w] eq "TkChooseDir"} {
-	    $data(ent) delete 0 end
-	    $data(ent) insert end $data(selectPath)
-	}
-    }
-}
-
-# This proc gets called whenever data(filter) is set
-#
-proc ::tk::dialog::file::SetFilter {w type} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    set data(filterType) $type
-    set data(filter) [lindex $type 1]
-    $data(typeMenuBtn) configure -text [lindex $type 0] ;#-indicatoron 1
-
-    # If we aren't using a default extension, use the one suppled by the
-    # filter.
-    if {![info exists data(extUsed)]} {
-	if {[string length $data(-defaultextension)]} {
-	    set data(extUsed) 1
-	} else {
-	    set data(extUsed) 0
-	}
-    }
-
-    if {!$data(extUsed)} {
-	# Get the first extension in the list that matches {^\*\.\w+$} and
-	# remove all * from the filter.
-	set index [lsearch -regexp $data(filter) {^\*\.\w+$}]
-	if {$index >= 0} {
-	    set data(-defaultextension) \
-		    [string trimleft [lindex $data(filter) $index] "*"]
-	} else {
-	    # Couldn't find anything!  Reset to a safe default...
-	    set data(-defaultextension) ""
-	}
-    }
-
-    $data(icons) see 0
-
-    UpdateWhenIdle $w
-}
-
-# tk::dialog::file::ResolveFile --
-#
-#	Interpret the user's text input in a file selection dialog.  Performs:
-#
-#	(1) ~ substitution
-#	(2) resolve all instances of . and ..
-#	(3) check for non-existent files/directories
-#	(4) check for chdir permissions
-#	(5) conversion of environment variable references to their
-#	    contents (once only)
-#
-# Arguments:
-#	context:  the current directory you are in
-#	text:	  the text entered by the user
-#	defaultext: the default extension to add to files with no extension
-#	expandEnv: whether to expand environment variables (yes by default)
-#
-# Return vaue:
-#	[list $flag $directory $file]
-#
-#	 flag = OK	: valid input
-#	      = PATTERN	: valid directory/pattern
-#	      = PATH	: the directory does not exist
-#	      = FILE	: the directory exists by the file doesn't exist
-#	      = CHDIR	: Cannot change to the directory
-#	      = ERROR	: Invalid entry
-#
-#	 directory      : valid only if flag = OK or PATTERN or FILE
-#	 file           : valid only if flag = OK or PATTERN
-#
-#	directory may not be the same as context, because text may contain a
-#	subdirectory name
-#
-proc ::tk::dialog::file::ResolveFile {context text defaultext {expandEnv 1}} {
-    set appPWD [pwd]
-
-    set path [JoinFile $context $text]
-
-    # If the file has no extension, append the default.  Be careful not to do
-    # this for directories, otherwise typing a dirname in the box will give
-    # back "dirname.extension" instead of trying to change dir.
-    if {
-	![file isdirectory $path] && ([file ext $path] eq "") &&
-	![string match {$*} [file tail $path]]
-    } then {
-	set path "$path$defaultext"
-    }
-
-    if {[catch {file exists $path}]} {
-	# This "if" block can be safely removed if the following code stop
-	# generating errors.
-	#
-	#	file exists ~nonsuchuser
-	#
-	return [list ERROR $path ""]
-    }
-
-    if {[file exists $path]} {
-	if {[file isdirectory $path]} {
-	    if {[catch {cd $path}]} {
-		return [list CHDIR $path ""]
-	    }
-	    set directory [pwd]
-	    set file ""
-	    set flag OK
-	    cd $appPWD
-	} else {
-	    if {[catch {cd [file dirname $path]}]} {
-		return [list CHDIR [file dirname $path] ""]
-	    }
-	    set directory [pwd]
-	    set file [file tail $path]
-	    set flag OK
-	    cd $appPWD
-	}
-    } else {
-	set dirname [file dirname $path]
-	if {[file exists $dirname]} {
-	    if {[catch {cd $dirname}]} {
-		return [list CHDIR $dirname ""]
-	    }
-	    set directory [pwd]
-	    cd $appPWD
-	    set file [file tail $path]
-	    # It's nothing else, so check to see if it is an env-reference
-	    if {$expandEnv && [string match {$*} $file]} {
-		set var [string range $file 1 end]
-		if {[info exist ::env($var)]} {
-		    return [ResolveFile $context $::env($var) $defaultext 0]
-		}
-	    }
-	    if {[regexp {[*?]} $file]} {
-		set flag PATTERN
-	    } else {
-		set flag FILE
-	    }
-	} else {
-	    set directory $dirname
-	    set file [file tail $path]
-	    set flag PATH
-	    # It's nothing else, so check to see if it is an env-reference
-	    if {$expandEnv && [string match {$*} $file]} {
-		set var [string range $file 1 end]
-		if {[info exist ::env($var)]} {
-		    return [ResolveFile $context $::env($var) $defaultext 0]
-		}
-	    }
-	}
-    }
-
-    return [list $flag $directory $file]
-}
-
-
-# Gets called when the entry box gets keyboard focus. We clear the selection
-# from the icon list . This way the user can be certain that the input in the
-# entry box is the selection.
-#
-proc ::tk::dialog::file::EntFocusIn {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    if {[$data(ent) get] ne ""} {
-	$data(ent) selection range 0 end
-	$data(ent) icursor end
-    } else {
-	$data(ent) selection clear
-    }
-
-    if {[winfo class $w] eq "TkFDialog"} {
-	# If this is a File Dialog, make sure the buttons are labeled right.
-	if {$data(type) eq "open"} {
-	    ::tk::SetAmpText $data(okBtn) [mc "&Open"]
-	} else {
-	    ::tk::SetAmpText $data(okBtn) [mc "&Save"]
-	}
-    }
-}
-
-proc ::tk::dialog::file::EntFocusOut {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    $data(ent) selection clear
-}
-
-
-# Gets called when user presses Return in the "File name" entry.
-#
-proc ::tk::dialog::file::ActivateEnt {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    set text [$data(ent) get]
-    if {$data(-multiple)} {
-	foreach t $text {
-	    VerifyFileName $w $t
-	}
-    } else {
-	VerifyFileName $w $text
-    }
-}
-
-# Verification procedure
-#
-proc ::tk::dialog::file::VerifyFileName {w filename} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    set list [ResolveFile $data(selectPath) $filename $data(-defaultextension)]
-    foreach {flag path file} $list {
-	break
-    }
-
-    switch -- $flag {
-	OK {
-	    if {$file eq ""} {
-		# user has entered an existing (sub)directory
-		set data(selectPath) $path
-		$data(ent) delete 0 end
-	    } else {
-		SetPathSilently $w $path
-		if {$data(-multiple)} {
-		    lappend data(selectFile) $file
-		} else {
-		    set data(selectFile) $file
-		}
-		Done $w
-	    }
-	}
-	PATTERN {
-	    set data(selectPath) $path
-	    set data(filter) $file
-	}
-	FILE {
-	    if {$data(type) eq "open"} {
-		tk_messageBox -icon warning -type ok -parent $w \
-			-message [mc "File \"%1\$s\"  does not exist." \
-			[file join $path $file]]
-		$data(ent) selection range 0 end
-		$data(ent) icursor end
-	    } else {
-		SetPathSilently $w $path
-		if {$data(-multiple)} {
-		    lappend data(selectFile) $file
-		} else {
-		    set data(selectFile) $file
-		}
-		Done $w
-	    }
-	}
-	PATH {
-	    tk_messageBox -icon warning -type ok -parent $w \
-		    -message [mc "Directory \"%1\$s\" does not exist." $path]
-	    $data(ent) selection range 0 end
-	    $data(ent) icursor end
-	}
-	CHDIR {
-	    tk_messageBox -type ok -parent $w -icon warning -message  \
-		[mc "Cannot change to the directory\
-                     \"%1\$s\".\nPermission denied." $path]
-	    $data(ent) selection range 0 end
-	    $data(ent) icursor end
-	}
-	ERROR {
-	    tk_messageBox -type ok -parent $w -icon warning -message \
-		    [mc "Invalid file name \"%1\$s\"." $path]
-	    $data(ent) selection range 0 end
-	    $data(ent) icursor end
-	}
-    }
-}
-
-# Gets called when user presses the Alt-s or Alt-o keys.
-#
-proc ::tk::dialog::file::InvokeBtn {w key} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    if {[$data(okBtn) cget -text] eq $key} {
-	$data(okBtn) invoke
-    }
-}
-
-# Gets called when user presses the "parent directory" button
-#
-proc ::tk::dialog::file::UpDirCmd {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    if {$data(selectPath) ne "/"} {
-	set data(selectPath) [file dirname $data(selectPath)]
-    }
-}
-
-# Join a file name to a path name. The "file join" command will break if the
-# filename begins with ~
-#
-proc ::tk::dialog::file::JoinFile {path file} {
-    if {[string match {~*} $file] && [file exists $path/$file]} {
-	return [file join $path ./$file]
-    } else {
-	return [file join $path $file]
-    }
-}
-
-# Gets called when user presses the "OK" button
-#
-proc ::tk::dialog::file::OkCmd {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    set filenames {}
-    foreach item [$data(icons) selection get] {
-	lappend filenames [$data(icons) get $item]
-    }
-
-    if {
-	([llength $filenames] && !$data(-multiple)) ||
-	($data(-multiple) && ([llength $filenames] == 1))
-    } then {
-	set filename [lindex $filenames 0]
-	set file [JoinFile $data(selectPath) $filename]
-	if {[file isdirectory $file]} {
-	    ListInvoke $w [list $filename]
-	    return
-	}
-    }
-
-    ActivateEnt $w
-}
-
-# Gets called when user presses the "Cancel" button
-#
-proc ::tk::dialog::file::CancelCmd {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-    variable ::tk::Priv
-
-    bind $data(okBtn) <Destroy> {}
-    set Priv(selectFilePath) ""
-}
-
-# Gets called when user destroys the dialog directly [Bug 987169]
-#
-proc ::tk::dialog::file::Destroyed {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-    variable ::tk::Priv
-
-    set Priv(selectFilePath) ""
-}
-
-# Gets called when user browses the IconList widget (dragging mouse, arrow
-# keys, etc)
-#
-proc ::tk::dialog::file::ListBrowse {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    set text {}
-    foreach item [$data(icons) selection get] {
-	lappend text [$data(icons) get $item]
-    }
-    if {[llength $text] == 0} {
-	return
-    }
-    if {$data(-multiple)} {
-	set newtext {}
-	foreach file $text {
-	    set fullfile [JoinFile $data(selectPath) $file]
-	    if { ![file isdirectory $fullfile] } {
-		lappend newtext $file
-	    }
-	}
-	set text $newtext
-	set isDir 0
-    } else {
-	set text [lindex $text 0]
-	set file [JoinFile $data(selectPath) $text]
-	set isDir [file isdirectory $file]
-    }
-    if {!$isDir} {
-	$data(ent) delete 0 end
-	$data(ent) insert 0 $text
-
-	if {[winfo class $w] eq "TkFDialog"} {
-	    if {$data(type) eq "open"} {
-		::tk::SetAmpText $data(okBtn) [mc "&Open"]
-	    } else {
-		::tk::SetAmpText $data(okBtn) [mc "&Save"]
-	    }
-	}
-    } elseif {[winfo class $w] eq "TkFDialog"} {
-	::tk::SetAmpText $data(okBtn) [mc "&Open"]
-    }
-}
-
-# Gets called when user invokes the IconList widget (double-click, Return key,
-# etc)
-#
-proc ::tk::dialog::file::ListInvoke {w filenames} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    if {[llength $filenames] == 0} {
-	return
-    }
-
-    set file [JoinFile $data(selectPath) [lindex $filenames 0]]
-
-    set class [winfo class $w]
-    if {$class eq "TkChooseDir" || [file isdirectory $file]} {
-	set appPWD [pwd]
-	if {[catch {cd $file}]} {
-	    tk_messageBox -type ok -parent $w -icon warning -message \
-		    [mc "Cannot change to the directory \"%1\$s\".\nPermission denied." $file]
-	} else {
-	    cd $appPWD
-	    set data(selectPath) $file
-	}
-    } else {
-	if {$data(-multiple)} {
-	    set data(selectFile) $filenames
-	} else {
-	    set data(selectFile) $file
-	}
-	Done $w
-    }
-}
-
-# ::tk::dialog::file::Done --
-#
-#	Gets called when user has input a valid filename.  Pops up a dialog
-#	box to confirm selection when necessary.  Sets the
-#	tk::Priv(selectFilePath) variable, which will break the "vwait" loop
-#	in ::tk::dialog::file:: and return the selected filename to the script
-#	that calls tk_getOpenFile or tk_getSaveFile
-#
-proc ::tk::dialog::file::Done {w {selectFilePath ""}} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-    variable ::tk::Priv
-
-    if {$selectFilePath eq ""} {
-	if {$data(-multiple)} {
-	    set selectFilePath {}
-	    foreach f $data(selectFile) {
-		lappend selectFilePath [JoinFile $data(selectPath) $f]
-	    }
-	} else {
-	    set selectFilePath [JoinFile $data(selectPath) $data(selectFile)]
-	}
-
-	set Priv(selectFile) $data(selectFile)
-	set Priv(selectPath) $data(selectPath)
-
-	if {($data(type) eq "save") && $data(-confirmoverwrite) && [file exists $selectFilePath]} {
-	    set reply [tk_messageBox -icon warning -type yesno -parent $w \
-		    -message [mc "File \"%1\$s\" already exists.\nDo you want\
-		    to overwrite it?" $selectFilePath]]
-	    if {$reply eq "no"} {
-		return
-	    }
-	}
-	if {
-	    [info exists data(-typevariable)] && $data(-typevariable) ne ""
-	    && [info exists data(-filetypes)] && [llength $data(-filetypes)]
-	    && [info exists data(filterType)] && $data(filterType) ne ""
-	} then {
-	    upvar #0 $data(-typevariable) typeVariable
-	    set typeVariable [lindex $data(origfiletypes) \
-	            [lsearch -exact $data(-filetypes) $data(filterType)] 0]
-
-	}
-    }
-    bind $data(okBtn) <Destroy> {}
-    set Priv(selectFilePath) $selectFilePath
-}
-
-# ::tk::dialog::file::GlobFiltered --
-#
-#	Gets called to do globbing, returning the results and filtering them
-#	according to the current filter (and removing the entries for '.' and
-#	'..' which are never shown). Deals with evil cases such as where the
-#	user is supplying a filter which is an invalid list or where it has an
-#	unbalanced brace. The resulting list will be dictionary sorted.
-#
-#	Arguments:
-#	  dir		 Which directory to search
-#	  type		 List of filetypes to look for ('d' or 'f b c l p s')
-#	  overrideFilter Whether to ignore the filter for this search.
-#
-#	NB: Assumes that the caller has mapped the state variable to 'data'.
-#
-proc ::tk::dialog::file::GlobFiltered {dir type {overrideFilter 0}} {
-    variable showHiddenVar
-    upvar 1 data(filter) filter
-
-    if {$filter eq "*" || $overrideFilter} {
-	set patterns [list *]
-	if {$showHiddenVar} {
-	    lappend patterns .*
-	}
-    } elseif {[string is list $filter]} {
-	set patterns $filter
-    } else {
-	# Invalid list; assume we can use non-whitespace sequences as words
-	set patterns [regexp -inline -all {\S+} $filter]
-    }
-
-    set opts [list -tails -directory $dir -type $type -nocomplain]
-
-    set result {}
-    catch {
-	# We have a catch because we might have a really bad pattern (e.g.,
-	# with an unbalanced brace); even [glob -nocomplain] doesn't like it.
-	# Using a catch ensures that it just means we match nothing instead of
-	# throwing a nasty error at the user...
-	foreach f [glob {*}$opts -- {*}$patterns] {
-	    if {$f eq "." || $f eq ".."} {
-		continue
-	    }
-	    # See ticket [1641721], $f might be a link pointing to a dir
-	    if {$type != "d" && [file isdir [file join $dir $f]]} {
-		continue
-	    }
-	    lappend result $f
-	}
-    }
-    return [lsort -dictionary -unique $result]
-}
-
-proc ::tk::dialog::file::CompleteEnt {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-    set f [$data(ent) get]
-    if {$data(-multiple)} {
-	if {![string is list $f] || [llength $f] != 1} {
-	    return -code break
-	}
-	set f [lindex $f 0]
-    }
-
-    # Get list of matching filenames and dirnames
-    set files [if {[winfo class $w] eq "TkFDialog"} {
-	GlobFiltered $data(selectPath) {f b c l p s}
-    }]
-    set dirs2 {}
-    foreach d [GlobFiltered $data(selectPath) d] {lappend dirs2 $d/}
-
-    set targets [concat \
-	    [lsearch -glob -all -inline $files $f*] \
-	    [lsearch -glob -all -inline $dirs2 $f*]]
-
-    if {[llength $targets] == 1} {
-	# We have a winner!
-	set f [lindex $targets 0]
-    } elseif {$f in $targets || [llength $targets] == 0} {
-	if {[string length $f] > 0} {
-	    bell
-	}
-	return
-    } elseif {[llength $targets] > 1} {
-	# Multiple possibles
-	if {[string length $f] == 0} {
-	    return
-	}
-	set t0 [lindex $targets 0]
-	for {set len [string length $t0]} {$len>0} {} {
-	    set allmatch 1
-	    foreach s $targets {
-		if {![string equal -length $len $s $t0]} {
-		    set allmatch 0
-		    break
-		}
-	    }
-	    incr len -1
-	    if {$allmatch} break
-	}
-	set f [string range $t0 0 $len]
-    }
-
-    if {$data(-multiple)} {
-	set f [list $f]
-    }
-    $data(ent) delete 0 end
-    $data(ent) insert 0 $f
-    return -code break
-}
diff --git a/tk8.6/library/ttk/altTheme.tcl b/tk8.6/library/ttk/altTheme.tcl
deleted file mode 100644
index 5630e6c..0000000
--- a/tk8.6/library/ttk/altTheme.tcl
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# Ttk widget set: Alternate theme
-#
-
-namespace eval ttk::theme::alt {
-
-    variable colors
-    array set colors {
-	-frame 		"#d9d9d9"
-	-window		"#ffffff"
-	-darker 	"#c3c3c3"
-	-border		"#414141"
-	-activebg 	"#ececec"
-	-disabledfg	"#a3a3a3"
-	-selectbg	"#4a6984"
-	-selectfg	"#ffffff"
-	-altindicator	"#aaaaaa"
-    }
-
-    ttk::style theme settings alt {
-
-	ttk::style configure "." \
-	    -background 	$colors(-frame) \
-	    -foreground 	black \
-	    -troughcolor	$colors(-darker) \
-	    -bordercolor	$colors(-border) \
-	    -selectbackground 	$colors(-selectbg) \
-	    -selectforeground 	$colors(-selectfg) \
-	    -font 		TkDefaultFont \
-	    ;
-
-	ttk::style map "." -background \
-	    [list disabled $colors(-frame)  active $colors(-activebg)] ;
-	ttk::style map "." -foreground [list disabled $colors(-disabledfg)] ;
-        ttk::style map "." -embossed [list disabled 1] ;
-
-	ttk::style configure TButton \
-	    -anchor center -width -11 -padding "1 1" \
-	    -relief raised -shiftrelief 1 \
-	    -highlightthickness 1 -highlightcolor $colors(-frame)
-
-	ttk::style map TButton -relief {
-	    {pressed !disabled} 	sunken
-	    {active !disabled} 	raised
-	} -highlightcolor {alternate black}
-
-	ttk::style configure TCheckbutton -indicatorcolor "#ffffff" -padding 2
-	ttk::style configure TRadiobutton -indicatorcolor "#ffffff" -padding 2
-	ttk::style map TCheckbutton -indicatorcolor \
-	    [list  pressed $colors(-frame) \
-	           alternate $colors(-altindicator) \
-	           disabled $colors(-frame)]
-	ttk::style map TRadiobutton -indicatorcolor \
-	    [list  pressed $colors(-frame) \
-	           alternate $colors(-altindicator) \
-	           disabled $colors(-frame)]
-
-	ttk::style configure TMenubutton \
-	    -width -11 -padding "3 3" -relief raised
-
-	ttk::style configure TEntry -padding 1
-	ttk::style map TEntry -fieldbackground \
-		[list readonly $colors(-frame) disabled $colors(-frame)]
-	ttk::style configure TCombobox -padding 1
-	ttk::style map TCombobox -fieldbackground \
-		[list readonly $colors(-frame) disabled $colors(-frame)] \
-		-arrowcolor [list disabled $colors(-disabledfg)]
-	ttk::style configure ComboboxPopdownFrame \
-	    -relief solid -borderwidth 1
-
-	ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0}
-	ttk::style map TSpinbox -fieldbackground \
-	    [list readonly $colors(-frame) disabled $colors(-frame)] \
-	    -arrowcolor [list disabled $colors(-disabledfg)]
-
-	ttk::style configure Toolbutton -relief flat -padding 2
-	ttk::style map Toolbutton -relief \
-	    {disabled flat selected sunken pressed sunken active raised}
-	ttk::style map Toolbutton -background \
-	    [list pressed $colors(-darker)  active $colors(-activebg)]
-
-	ttk::style configure TScrollbar -relief raised
-
-	ttk::style configure TLabelframe -relief groove -borderwidth 2
-
-	ttk::style configure TNotebook -tabmargins {2 2 1 0}
-	ttk::style configure TNotebook.Tab \
-	    -padding {4 2} -background $colors(-darker)
-	ttk::style map TNotebook.Tab \
-	    -background [list selected $colors(-frame)] \
-	    -expand [list selected {2 2 1 0}] \
-	    ;
-
-	# Treeview:
-	ttk::style configure Heading -font TkHeadingFont -relief raised
-	ttk::style configure Treeview -background $colors(-window)
-	ttk::style map Treeview \
-	    -background [list selected $colors(-selectbg)] \
-	    -foreground [list selected $colors(-selectfg)] ;
-
-	ttk::style configure TScale \
-	    -groovewidth 4 -troughrelief sunken \
-	    -sliderwidth raised -borderwidth 2
-	ttk::style configure TProgressbar \
-	    -background $colors(-selectbg) -borderwidth 0
-    }
-}
diff --git a/tk8.6/library/ttk/aquaTheme.tcl b/tk8.6/library/ttk/aquaTheme.tcl
deleted file mode 100644
index fa0fa12..0000000
--- a/tk8.6/library/ttk/aquaTheme.tcl
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Aqua theme (OSX native look and feel)
-#
-
-namespace eval ttk::theme::aqua {
-    ttk::style theme settings aqua {
-
-	ttk::style configure . \
-	    -font TkDefaultFont \
-	    -background systemWindowBody \
-	    -foreground systemModelessDialogActiveText \
-	    -selectbackground systemHighlight \
-	    -selectforeground systemModelessDialogActiveText \
-	    -selectborderwidth 0 \
-	    -insertwidth 1
-
-	ttk::style map . \
-	    -foreground {disabled systemModelessDialogInactiveText
-		    background systemModelessDialogInactiveText} \
-	    -selectbackground {background systemHighlightSecondary
-		    !focus systemHighlightSecondary} \
-	    -selectforeground {background systemModelessDialogInactiveText
-		    !focus systemDialogActiveText}
-
-	# Workaround for #1100117:
-	# Actually, on Aqua we probably shouldn't stipple images in
-	# disabled buttons even if it did work...
-	ttk::style configure . -stipple {}
-
-	ttk::style configure TButton -anchor center -width -6
-	ttk::style configure Toolbutton -padding 4
-
-	ttk::style configure TNotebook -tabmargins {10 0} -tabposition n
-	ttk::style configure TNotebook -padding {18 8 18 17}
-	ttk::style configure TNotebook.Tab -padding {12 3 12 2}
-
-	# Combobox:
-	ttk::style configure TCombobox -postoffset {5 -2 -10 0}
-
-	# Treeview:
-	ttk::style configure Heading -font TkHeadingFont
-	ttk::style configure Treeview -rowheight 18 -background White
-	ttk::style map Treeview \
-	    -background {{selected background} systemHighlightSecondary
-		    selected systemHighlight}
-
-	# Enable animation for ttk::progressbar widget:
-	ttk::style configure TProgressbar -period 100 -maxphase 255
-
-	# For Aqua, labelframe labels should appear outside the border,
-	# with a 14 pixel inset and 4 pixels spacing between border and label
-	# (ref: Apple Human Interface Guidelines / Controls / Grouping Controls)
-	#
-	ttk::style configure TLabelframe \
-		-labeloutside true -labelmargins {14 0 14 4}
-
-	# TODO: panedwindow sashes should be 9 pixels (HIG:Controls:Split Views)
-    }
-}
diff --git a/tk8.6/library/ttk/button.tcl b/tk8.6/library/ttk/button.tcl
deleted file mode 100644
index 9f2cec7..0000000
--- a/tk8.6/library/ttk/button.tcl
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# Bindings for Buttons, Checkbuttons, and Radiobuttons.
-#
-# Notes: <Button1-Leave>, <Button1-Enter> only control the "pressed"
-# state; widgets remain "active" if the pointer is dragged out.
-# This doesn't seem to be conventional, but it's a nice way
-# to provide extra feedback while the grab is active.
-# (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 
-# 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
-# <Button1-Enter> events, the <Button1-Enter> binding only sets
-# the pressed state if the button is currently active.
-#
-
-namespace eval ttk::button {}
-
-bind TButton <Enter> 		{ %W instate !disabled {%W state active} }
-bind TButton <Leave>		{ %W state !active }
-bind TButton <Key-space>	{ ttk::button::activate %W }
-bind TButton <<Invoke>> 	{ ttk::button::activate %W }
-
-bind TButton <ButtonPress-1> \
-    { %W instate !disabled { ttk::clickToFocus %W; %W state pressed } }
-bind TButton <ButtonRelease-1> \
-    { %W instate pressed { %W state !pressed; %W instate !disabled { %W invoke } } }
-bind TButton <Button1-Leave> \
-    { %W state !pressed }
-bind TButton <Button1-Enter> \
-    { %W instate {active !disabled} { %W state pressed } }
-
-# Checkbuttons and Radiobuttons have the same bindings as Buttons:
-#
-ttk::copyBindings TButton TCheckbutton
-ttk::copyBindings TButton TRadiobutton
-
-# ...plus a few more:
-
-bind TRadiobutton <KeyPress-Up> 	{ ttk::button::RadioTraverse %W -1 }
-bind TRadiobutton <KeyPress-Down> 	{ ttk::button::RadioTraverse %W +1 }
-
-# bind TCheckbutton <KeyPress-plus> { %W select }
-# bind TCheckbutton <KeyPress-minus> { %W deselect }
-
-# activate --
-#	Simulate a button press: temporarily set the state to 'pressed',
-#	then invoke the button.
-#
-proc ttk::button::activate {w} {
-    $w instate disabled { return }
-    set oldState [$w state pressed]
-    update idletasks; after 100	;# block event loop to avoid reentrancy
-    $w state $oldState
-    $w invoke
-}
-
-# RadioTraverse -- up/down keyboard traversal for radiobutton groups.
-# 	Set focus to previous/next radiobutton in a group.
-#	A radiobutton group consists of all the radiobuttons with
-#	the same parent and -variable; this is a pretty good heuristic
-#	that works most of the time.
-#
-proc ttk::button::RadioTraverse {w dir} {
-    set group [list]
-    foreach sibling [winfo children [winfo parent $w]] {
-    	if {   [winfo class $sibling] eq "TRadiobutton"
-	    && [$sibling cget -variable] eq [$w cget -variable]
-	    && ![$sibling instate disabled]
-	} {
-	   lappend group $sibling
-	}
-    }
-
-    if {![llength $group]} {	 # Shouldn't happen, but can.
-    	return
-    }
-
-    set pos [expr {([lsearch -exact $group $w] + $dir) % [llength $group]}]
-    tk::TabToWindow [lindex $group $pos]
-}
diff --git a/tk8.6/library/ttk/clamTheme.tcl b/tk8.6/library/ttk/clamTheme.tcl
deleted file mode 100644
index 808c365..0000000
--- a/tk8.6/library/ttk/clamTheme.tcl
+++ /dev/null
@@ -1,145 +0,0 @@
-#
-# "Clam" theme.
-#
-# Inspired by the XFCE family of Gnome themes.
-#
-
-namespace eval ttk::theme::clam {
-    variable colors 
-    array set colors {
-	-disabledfg		"#999999"
-	-frame  		"#dcdad5"
-	-window  		"#ffffff"
-	-dark			"#cfcdc8"
-	-darker 		"#bab5ab"
-	-darkest		"#9e9a91"
-	-lighter		"#eeebe7"
-	-lightest 		"#ffffff"
-	-selectbg		"#4a6984"
-	-selectfg		"#ffffff"
-	-altindicator		"#5895bc"
-	-disabledaltindicator	"#a0a0a0"
-    }
-
-    ttk::style theme settings clam {
-
-	ttk::style configure "." \
-	    -background $colors(-frame) \
-	    -foreground black \
-	    -bordercolor $colors(-darkest) \
-	    -darkcolor $colors(-dark) \
-	    -lightcolor $colors(-lighter) \
-	    -troughcolor $colors(-darker) \
-	    -selectbackground $colors(-selectbg) \
-	    -selectforeground $colors(-selectfg) \
-	    -selectborderwidth 0 \
-	    -font TkDefaultFont \
-	    ;
-
-	ttk::style map "." \
-	    -background [list disabled $colors(-frame) \
-			     active $colors(-lighter)] \
-	    -foreground [list disabled $colors(-disabledfg)] \
-	    -selectbackground [list  !focus $colors(-darkest)] \
-	    -selectforeground [list  !focus white] \
-	    ;
-	# -selectbackground [list  !focus "#847d73"]
-
-	ttk::style configure TButton \
-	    -anchor center -width -11 -padding 5 -relief raised
-	ttk::style map TButton \
-	    -background [list \
-			     disabled $colors(-frame) \
-			     pressed $colors(-darker) \
-			     active $colors(-lighter)] \
-	    -lightcolor [list pressed $colors(-darker)] \
-	    -darkcolor [list pressed $colors(-darker)] \
-	    -bordercolor [list alternate "#000000"] \
-	    ;
-
-	ttk::style configure Toolbutton \
-	    -anchor center -padding 2 -relief flat
-	ttk::style map Toolbutton \
-	    -relief [list \
-		    disabled flat \
-		    selected sunken \
-		    pressed sunken \
-		    active raised] \
-	    -background [list \
-		    disabled $colors(-frame) \
-		    pressed $colors(-darker) \
-		    active $colors(-lighter)] \
-	    -lightcolor [list pressed $colors(-darker)] \
-	    -darkcolor [list pressed $colors(-darker)] \
-	    ;
-
-	ttk::style configure TCheckbutton \
-	    -indicatorbackground "#ffffff" \
-	    -indicatormargin {1 1 4 1} \
-	    -padding 2 ;
-	ttk::style configure TRadiobutton \
-	    -indicatorbackground "#ffffff" \
-	    -indicatormargin {1 1 4 1} \
-	    -padding 2 ;
-	ttk::style map TCheckbutton -indicatorbackground \
-	    [list  pressed $colors(-frame) \
-			{!disabled alternate} $colors(-altindicator) \
-			{disabled alternate} $colors(-disabledaltindicator) \
-			disabled $colors(-frame)]
-	ttk::style map TRadiobutton -indicatorbackground \
-	    [list  pressed $colors(-frame) \
-			{!disabled alternate} $colors(-altindicator) \
-			{disabled alternate} $colors(-disabledaltindicator) \
-			disabled $colors(-frame)]
-
-	ttk::style configure TMenubutton \
-	    -width -11 -padding 5 -relief raised
-
-	ttk::style configure TEntry -padding 1 -insertwidth 1
-	ttk::style map TEntry \
-	    -background [list  readonly $colors(-frame)] \
-	    -bordercolor [list  focus $colors(-selectbg)] \
-	    -lightcolor [list  focus "#6f9dc6"] \
-	    -darkcolor [list  focus "#6f9dc6"] \
-	    ;
-
-	ttk::style configure TCombobox -padding 1 -insertwidth 1
-	ttk::style map TCombobox \
-	    -background [list active $colors(-lighter) \
-			     pressed $colors(-lighter)] \
-	    -fieldbackground [list {readonly focus} $colors(-selectbg) \
-				  readonly $colors(-frame)] \
-	    -foreground [list {readonly focus} $colors(-selectfg)] \
-	    -arrowcolor [list disabled $colors(-disabledfg)]
-	ttk::style configure ComboboxPopdownFrame \
-	    -relief solid -borderwidth 1
-
-	ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0}
-	ttk::style map TSpinbox \
-	    -background [list  readonly $colors(-frame)] \
-            -arrowcolor [list disabled $colors(-disabledfg)]
-
-	ttk::style configure TNotebook.Tab -padding {6 2 6 2}
-	ttk::style map TNotebook.Tab \
-	    -padding [list selected {6 4 6 2}] \
-	    -background [list selected $colors(-frame) {} $colors(-darker)] \
-	    -lightcolor [list selected $colors(-lighter) {} $colors(-dark)] \
-	    ;
-
-	# Treeview:
-	ttk::style configure Heading \
-	    -font TkHeadingFont -relief raised -padding {3}
-	ttk::style configure Treeview -background $colors(-window)
-	ttk::style map Treeview \
-	    -background [list selected $colors(-selectbg)] \
-	    -foreground [list selected $colors(-selectfg)] ;
-
-    	ttk::style configure TLabelframe \
-	    -labeloutside true -labelmargins {0 0 0 4} \
-	    -borderwidth 2 -relief raised
-
-	ttk::style configure TProgressbar -background $colors(-frame)
-
-	ttk::style configure Sash -sashthickness 6 -gripcount 10
-    }
-}
diff --git a/tk8.6/library/ttk/classicTheme.tcl b/tk8.6/library/ttk/classicTheme.tcl
deleted file mode 100644
index 3cb2b18..0000000
--- a/tk8.6/library/ttk/classicTheme.tcl
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-# "classic" Tk theme.
-#
-# Implements Tk's traditional Motif-like look and feel.
-#
-
-namespace eval ttk::theme::classic {
-
-    variable colors; array set colors {
-	-frame		"#d9d9d9"
-	-window		"#ffffff"
-	-activebg	"#ececec"
-	-troughbg	"#c3c3c3"
-	-selectbg	"#c3c3c3"
-	-selectfg	"#000000"
-	-disabledfg	"#a3a3a3"
-	-indicator	"#b03060"
-	-altindicator	"#b05e5e"
-    }
-
-    ttk::style theme settings classic {
-	ttk::style configure "." \
-	    -font		TkDefaultFont \
-	    -background		$colors(-frame) \
-	    -foreground		black \
-	    -selectbackground	$colors(-selectbg) \
-	    -selectforeground	$colors(-selectfg) \
-	    -troughcolor	$colors(-troughbg) \
-	    -indicatorcolor	$colors(-frame) \
-	    -highlightcolor	$colors(-frame) \
-	    -highlightthickness	1 \
-	    -selectborderwidth	1 \
-	    -insertwidth	2 \
-	    ;
-
-	# To match pre-Xft X11 appearance, use:
-	#	ttk::style configure . -font {Helvetica 12 bold}
-
-	ttk::style map "." -background \
-	    [list disabled $colors(-frame) active $colors(-activebg)]
-	ttk::style map "." -foreground \
-	    [list disabled $colors(-disabledfg)]
-
-	ttk::style map "." -highlightcolor [list focus black]
-
-	ttk::style configure TButton \
-	    -anchor center -padding "3m 1m" -relief raised -shiftrelief 1
-	ttk::style map TButton -relief [list {!disabled pressed} sunken]
-
-	ttk::style configure TCheckbutton -indicatorrelief raised
-	ttk::style map TCheckbutton \
-	    -indicatorcolor [list \
-		    pressed $colors(-frame) \
-		    alternate $colors(-altindicator) \
-		    selected $colors(-indicator)] \
-	    -indicatorrelief {alternate raised  selected sunken  pressed sunken} \
-	    ;
-
-	ttk::style configure TRadiobutton -indicatorrelief raised
-	ttk::style map TRadiobutton \
-	    -indicatorcolor [list \
-		    pressed $colors(-frame) \
-		    alternate $colors(-altindicator) \
-		    selected $colors(-indicator)] \
-	    -indicatorrelief {alternate raised  selected sunken  pressed sunken} \
-	    ;
-
-	ttk::style configure TMenubutton -relief raised -padding "3m 1m"
-
-	ttk::style configure TEntry -relief sunken -padding 1 -font TkTextFont
-	ttk::style map TEntry -fieldbackground \
-		[list readonly $colors(-frame) disabled $colors(-frame)]
-	ttk::style configure TCombobox -padding 1
-	ttk::style map TCombobox -fieldbackground \
-		[list readonly $colors(-frame) disabled $colors(-frame)]
-	ttk::style configure ComboboxPopdownFrame \
-	    -relief solid -borderwidth 1
-
-	ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0}
-	ttk::style map TSpinbox -fieldbackground \
-	    [list readonly $colors(-frame) disabled $colors(-frame)]
-
-	ttk::style configure TLabelframe -borderwidth 2 -relief groove
-
-	ttk::style configure TScrollbar -relief raised
-	ttk::style map TScrollbar -relief {{pressed !disabled} sunken}
-
-	ttk::style configure TScale -sliderrelief raised
-	ttk::style map TScale -sliderrelief {{pressed !disabled} sunken}
-
-	ttk::style configure TProgressbar -background SteelBlue
-	ttk::style configure TNotebook.Tab \
-	    -padding {3m 1m} \
-	    -background $colors(-troughbg)
-	ttk::style map TNotebook.Tab -background [list selected $colors(-frame)]
-
-	# Treeview:
-	ttk::style configure Heading -font TkHeadingFont -relief raised
-	ttk::style configure Treeview -background $colors(-window)
-	ttk::style map Treeview \
-	    -background [list selected $colors(-selectbg)] \
-	    -foreground [list selected $colors(-selectfg)] ;
-
-	#
-	# Toolbar buttons:
-	#
-	ttk::style configure Toolbutton -padding 2 -relief flat -shiftrelief 2
-	ttk::style map Toolbutton -relief \
-	    {disabled flat selected sunken pressed sunken active raised}
-	ttk::style map Toolbutton -background \
-	    [list pressed $colors(-troughbg)  active $colors(-activebg)]
-    }
-}
diff --git a/tk8.6/library/ttk/combobox.tcl b/tk8.6/library/ttk/combobox.tcl
deleted file mode 100644
index 6ceccef..0000000
--- a/tk8.6/library/ttk/combobox.tcl
+++ /dev/null
@@ -1,457 +0,0 @@
-#
-# Combobox bindings.
-#
-# <<NOTE-WM-TRANSIENT>>:
-#
-#	Need to set [wm transient] just before mapping the popdown
-#	instead of when it's created, in case a containing frame
-#	has been reparented [#1818441].
-#
-#	On Windows: setting [wm transient] prevents the parent
-#	toplevel from becoming inactive when the popdown is posted
-#	(Tk 8.4.8+)
-#
-#	On X11: WM_TRANSIENT_FOR on override-redirect windows
-#	may be used by compositing managers and by EWMH-aware
-#	window managers (even though the older ICCCM spec says
-#	it's meaningless).
-#
-#	On OSX: [wm transient] does utterly the wrong thing.
-#	Instead, we use [MacWindowStyle "help" "noActivates hideOnSuspend"].
-#	The "noActivates" attribute prevents the parent toplevel
-#	from deactivating when the popdown is posted, and is also
-#	necessary for "help" windows to receive mouse events.
-#	"hideOnSuspend" makes the popdown disappear (resp. reappear)
-#	when the parent toplevel is deactivated (resp. reactivated).
-#	(see [#1814778]).  Also set [wm resizable 0 0], to prevent
-#	TkAqua from shrinking the scrollbar to make room for a grow box
-#	that isn't there.
-#
-#	In order to work around other platform quirks in TkAqua,
-#	[grab] and [focus] are set in <Map> bindings instead of
-#	immediately after deiconifying the window.
-#
-
-namespace eval ttk::combobox {
-    variable Values	;# Values($cb) is -listvariable of listbox widget
-    variable State
-    set State(entryPress) 0
-}
-
-### Combobox bindings.
-#
-# Duplicate the Entry bindings, override if needed:
-#
-
-ttk::copyBindings TEntry TCombobox
-
-bind TCombobox <KeyPress-Down> 		{ ttk::combobox::Post %W }
-bind TCombobox <KeyPress-Escape> 	{ ttk::combobox::Unpost %W }
-
-bind TCombobox <ButtonPress-1> 		{ ttk::combobox::Press "" %W %x %y }
-bind TCombobox <Shift-ButtonPress-1>	{ ttk::combobox::Press "s" %W %x %y }
-bind TCombobox <Double-ButtonPress-1> 	{ ttk::combobox::Press "2" %W %x %y }
-bind TCombobox <Triple-ButtonPress-1> 	{ ttk::combobox::Press "3" %W %x %y }
-bind TCombobox <B1-Motion>		{ ttk::combobox::Drag %W %x }
-bind TCombobox <Motion>			{ ttk::combobox::Motion %W %x %y }
-
-ttk::bindMouseWheel TCombobox [list ttk::combobox::Scroll %W]
-
-bind TCombobox <<TraverseIn>> 		{ ttk::combobox::TraverseIn %W }
-
-### Combobox listbox bindings.
-#
-bind ComboboxListbox <ButtonRelease-1>	{ ttk::combobox::LBSelected %W }
-bind ComboboxListbox <KeyPress-Return>	{ ttk::combobox::LBSelected %W }
-bind ComboboxListbox <KeyPress-Escape>  { ttk::combobox::LBCancel %W }
-bind ComboboxListbox <KeyPress-Tab>	{ ttk::combobox::LBTab %W next }
-bind ComboboxListbox <<PrevWindow>>	{ ttk::combobox::LBTab %W prev }
-bind ComboboxListbox <Destroy>		{ ttk::combobox::LBCleanup %W }
-bind ComboboxListbox <Motion>		{ ttk::combobox::LBHover %W %x %y }
-bind ComboboxListbox <Map>		{ focus -force %W }
-
-switch -- [tk windowingsystem] {
-    win32 {
-	# Dismiss listbox when user switches to a different application.
-	# NB: *only* do this on Windows (see #1814778)
-	bind ComboboxListbox <FocusOut>		{ ttk::combobox::LBCancel %W }
-    }
-}
-
-### Combobox popdown window bindings.
-#
-bind ComboboxPopdown	<Map>		{ ttk::combobox::MapPopdown %W }
-bind ComboboxPopdown	<Unmap>		{ ttk::combobox::UnmapPopdown %W }
-bind ComboboxPopdown	<ButtonPress> \
-			{ ttk::combobox::Unpost [winfo parent %W] }
-
-### Option database settings.
-#
-
-option add *TCombobox*Listbox.font TkTextFont
-option add *TCombobox*Listbox.relief flat
-option add *TCombobox*Listbox.highlightThickness 0
-
-## Platform-specific settings.
-#
-switch -- [tk windowingsystem] {
-    x11 {
-	option add *TCombobox*Listbox.background white
-    }
-    aqua {
-	option add *TCombobox*Listbox.borderWidth 0
-    }
-}
-
-### Binding procedures.
-#
-
-## Press $mode $x $y -- ButtonPress binding for comboboxes.
-#	Either post/unpost the listbox, or perform Entry widget binding,
-#	depending on widget state and location of button press.
-#
-proc ttk::combobox::Press {mode w x y} {
-    variable State
-
-    $w instate disabled { return }
-
-    set State(entryPress) [expr {
-	   [$w instate !readonly]
-	&& [string match *textarea [$w identify element $x $y]]
-    }]
-
-    focus $w
-    if {$State(entryPress)} {
-	switch -- $mode {
-	    s 	{ ttk::entry::Shift-Press $w $x 	; # Shift }
-	    2	{ ttk::entry::Select $w $x word 	; # Double click}
-	    3	{ ttk::entry::Select $w $x line 	; # Triple click }
-	    ""	-
-	    default { ttk::entry::Press $w $x }
-	}
-    } else {
-	Post $w
-    }
-}
-
-## Drag -- B1-Motion binding for comboboxes.
-#	If the initial ButtonPress event was handled by Entry binding,
-#	perform Entry widget drag binding; otherwise nothing.
-#
-proc ttk::combobox::Drag {w x}  {
-    variable State
-    if {$State(entryPress)} {
-	ttk::entry::Drag $w $x
-    }
-}
-
-## Motion --
-#	Set cursor.
-#
-proc ttk::combobox::Motion {w x y} {
-    if {   [$w identify $x $y] eq "textarea"
-        && [$w instate {!readonly !disabled}]
-    } {
-	ttk::setCursor $w text
-    } else {
-	ttk::setCursor $w ""
-    }
-}
-
-## TraverseIn -- receive focus due to keyboard navigation
-#	For editable comboboxes, set the selection and insert cursor.
-#
-proc ttk::combobox::TraverseIn {w} {
-    $w instate {!readonly !disabled} {
-	$w selection range 0 end
-	$w icursor end
-    }
-}
-
-## SelectEntry $cb $index --
-#	Set the combobox selection in response to a user action.
-#
-proc ttk::combobox::SelectEntry {cb index} {
-    $cb current $index
-    $cb selection range 0 end
-    $cb icursor end
-    event generate $cb <<ComboboxSelected>> -when mark
-}
-
-## Scroll -- Mousewheel binding
-#
-proc ttk::combobox::Scroll {cb dir} {
-    $cb instate disabled { return }
-    set max [llength [$cb cget -values]]
-    set current [$cb current]
-    incr current $dir
-    if {$max != 0 && $current == $current % $max} {
-	SelectEntry $cb $current
-    }
-}
-
-## LBSelected $lb -- Activation binding for listbox
-#	Set the combobox value to the currently-selected listbox value
-#	and unpost the listbox.
-#
-proc ttk::combobox::LBSelected {lb} {
-    set cb [LBMaster $lb]
-    LBSelect $lb
-    Unpost $cb
-    focus $cb
-}
-
-## LBCancel --
-#	Unpost the listbox.
-#
-proc ttk::combobox::LBCancel {lb} {
-    Unpost [LBMaster $lb]
-}
-
-## LBTab -- Tab key binding for combobox listbox.
-#	Set the selection, and navigate to next/prev widget.
-#
-proc ttk::combobox::LBTab {lb dir} {
-    set cb [LBMaster $lb]
-    switch -- $dir {
-	next	{ set newFocus [tk_focusNext $cb] }
-	prev	{ set newFocus [tk_focusPrev $cb] }
-    }
-
-    if {$newFocus ne ""} {
-	LBSelect $lb
-	Unpost $cb
-	# The [grab release] call in [Unpost] queues events that later
-	# re-set the focus (@@@ NOTE: this might not be true anymore).
-	# Set new focus later:
-	after 0 [list ttk::traverseTo $newFocus]
-    }
-}
-
-## LBHover -- <Motion> binding for combobox listbox.
-#	Follow selection on mouseover.
-#
-proc ttk::combobox::LBHover {w x y} {
-    $w selection clear 0 end
-    $w activate @$x,$y
-    $w selection set @$x,$y
-}
-
-## MapPopdown -- <Map> binding for ComboboxPopdown
-#
-proc ttk::combobox::MapPopdown {w} {
-    [winfo parent $w] state pressed
-    ttk::globalGrab $w
-}
-
-## UnmapPopdown -- <Unmap> binding for ComboboxPopdown
-#
-proc ttk::combobox::UnmapPopdown {w} {
-    [winfo parent $w] state !pressed
-    ttk::releaseGrab $w
-}
-
-###
-#
-
-namespace eval ::ttk::combobox {
-    # @@@ Until we have a proper native scrollbar on Aqua, use
-    # @@@ the regular Tk one.  Use ttk::scrollbar on other platforms.
-    variable scrollbar ttk::scrollbar
-    if {[tk windowingsystem] eq "aqua"} {
-	set scrollbar ::scrollbar
-    }
-}
-
-## PopdownWindow --
-#	Returns the popdown widget associated with a combobox,
-#	creating it if necessary.
-#
-proc ttk::combobox::PopdownWindow {cb} {
-    variable scrollbar
-
-    if {![winfo exists $cb.popdown]} {
-	set poplevel [PopdownToplevel $cb.popdown]
-	set popdown [ttk::frame $poplevel.f -style ComboboxPopdownFrame]
-
-	$scrollbar $popdown.sb \
-	    -orient vertical -command [list $popdown.l yview]
-	listbox $popdown.l \
-	    -listvariable ttk::combobox::Values($cb) \
-	    -yscrollcommand [list $popdown.sb set] \
-	    -exportselection false \
-	    -selectmode browse \
-	    -activestyle none \
-	    ;
-
-	bindtags $popdown.l \
-	    [list $popdown.l ComboboxListbox Listbox $popdown all]
-
-	grid $popdown.l -row 0 -column 0 -padx {1 0} -pady 1 -sticky nsew
-        grid $popdown.sb -row 0 -column 1 -padx {0 1} -pady 1 -sticky ns
-	grid columnconfigure $popdown 0 -weight 1
-	grid rowconfigure $popdown 0 -weight 1
-
-        grid $popdown -sticky news -padx 0 -pady 0
-        grid rowconfigure $poplevel 0 -weight 1
-        grid columnconfigure $poplevel 0 -weight 1
-    }
-    return $cb.popdown
-}
-
-## PopdownToplevel -- Create toplevel window for the combobox popdown
-#
-#	See also <<NOTE-WM-TRANSIENT>>
-#
-proc ttk::combobox::PopdownToplevel {w} {
-    toplevel $w -class ComboboxPopdown
-    wm withdraw $w
-    switch -- [tk windowingsystem] {
-	default -
-	x11 {
-	    $w configure -relief flat -borderwidth 0
-	    wm attributes $w -type combo
-	    wm overrideredirect $w true
-	}
-	win32 {
-	    $w configure -relief flat -borderwidth 0
-	    wm overrideredirect $w true
-	    wm attributes $w -topmost 1
-	}
-	aqua {
-	    $w configure -relief solid -borderwidth 0
-	    tk::unsupported::MacWindowStyle style $w \
-	    	help {noActivates hideOnSuspend}
-	    wm resizable $w 0 0
-	}
-    }
-    return $w
-}
-
-## ConfigureListbox --
-#	Set listbox values, selection, height, and scrollbar visibility
-#	from current combobox values.
-#
-proc ttk::combobox::ConfigureListbox {cb} {
-    variable Values
-
-    set popdown [PopdownWindow $cb].f
-    set values [$cb cget -values]
-    set current [$cb current]
-    if {$current < 0} {
-	set current 0 		;# no current entry, highlight first one
-    }
-    set Values($cb) $values
-    $popdown.l selection clear 0 end
-    $popdown.l selection set $current
-    $popdown.l activate $current
-    $popdown.l see $current
-    set height [llength $values]
-    if {$height > [$cb cget -height]} {
-	set height [$cb cget -height]
-    	grid $popdown.sb
-        grid configure $popdown.l -padx {1 0}
-    } else {
-	grid remove $popdown.sb
-        grid configure $popdown.l -padx 1
-    }
-    $popdown.l configure -height $height
-}
-
-## PlacePopdown --
-#	Set popdown window geometry.
-#
-# @@@TODO: factor with menubutton::PostPosition
-#
-proc ttk::combobox::PlacePopdown {cb popdown} {
-    set x [winfo rootx $cb]
-    set y [winfo rooty $cb]
-    set w [winfo width $cb]
-    set h [winfo height $cb]
-    set style [$cb cget -style]
-    set postoffset [ttk::style lookup $style -postoffset {} {0 0 0 0}]
-    foreach var {x y w h} delta $postoffset {
-    	incr $var $delta
-    }
-
-    set H [winfo reqheight $popdown]
-    if {$y + $h + $H > [winfo screenheight $popdown]} {
-	set Y [expr {$y - $H}]
-    } else {
-	set Y [expr {$y + $h}]
-    }
-    wm geometry $popdown ${w}x${H}+${x}+${Y}
-}
-
-## Post $cb --
-#	Pop down the associated listbox.
-#
-proc ttk::combobox::Post {cb} {
-    # Don't do anything if disabled:
-    #
-    $cb instate disabled { return }
-
-    # ASSERT: ![$cb instate pressed]
-
-    # Run -postcommand callback:
-    #
-    uplevel #0 [$cb cget -postcommand]
-
-    set popdown [PopdownWindow $cb]
-    ConfigureListbox $cb
-    update idletasks	;# needed for geometry propagation.
-    PlacePopdown $cb $popdown
-    # See <<NOTE-WM-TRANSIENT>>
-    switch -- [tk windowingsystem] {
-	x11 - win32 { wm transient $popdown [winfo toplevel $cb] }
-    }
-
-    # Post the listbox:
-    #
-    wm attribute $popdown -topmost 1
-    wm deiconify $popdown
-    raise $popdown
-}
-
-## Unpost $cb --
-#	Unpost the listbox.
-#
-proc ttk::combobox::Unpost {cb} {
-    if {[winfo exists $cb.popdown]} {
-	wm withdraw $cb.popdown
-    }
-    grab release $cb.popdown ;# in case of stuck or unexpected grab [#1239190]
-}
-
-## LBMaster $lb --
-#	Return the combobox main widget that owns the listbox.
-#
-proc ttk::combobox::LBMaster {lb} {
-    winfo parent [winfo parent [winfo parent $lb]]
-}
-
-## LBSelect $lb --
-#	Transfer listbox selection to combobox value.
-#
-proc ttk::combobox::LBSelect {lb} {
-    set cb [LBMaster $lb]
-    set selection [$lb curselection]
-    if {[llength $selection] == 1} {
-	SelectEntry $cb [lindex $selection 0]
-    }
-}
-
-## LBCleanup $lb --
-#	<Destroy> binding for combobox listboxes.
-#	Cleans up by unsetting the linked textvariable.
-#
-#	Note: we can't just use { unset [%W cget -listvariable] }
-#	because the widget command is already gone when this binding fires).
-#	[winfo parent] still works, fortunately.
-#
-proc ttk::combobox::LBCleanup {lb} {
-    variable Values
-    unset Values([LBMaster $lb])
-}
-
-#*EOF*
diff --git a/tk8.6/library/ttk/cursors.tcl b/tk8.6/library/ttk/cursors.tcl
deleted file mode 100644
index 75f7791..0000000
--- a/tk8.6/library/ttk/cursors.tcl
+++ /dev/null
@@ -1,186 +0,0 @@
-#
-# Map symbolic cursor names to platform-appropriate cursors.
-#
-# The following cursors are defined:
-#
-#	standard	-- default cursor for most controls
-#	""		-- inherit cursor from parent window
-#	none		-- no cursor
-#
-#	text		-- editable widgets (entry, text)
-#	link		-- hyperlinks within text
-#	crosshair	-- graphic selection, fine control
-#	busy		-- operation in progress
-#	forbidden	-- action not allowed
-#
-#	hresize		-- horizontal resizing
-#	vresize		-- vertical resizing
-#
-# Also resize cursors for each of the compass points,
-# {nw,n,ne,w,e,sw,s,se}resize.
-#
-# Platform notes:
-#
-# Windows doesn't distinguish resizing at the 8 compass points,
-# only horizontal, vertical, and the two diagonals.
-#
-# OSX doesn't have resize cursors for nw, ne, sw, or se corners.
-# We use the Tk-defined X11 fallbacks for these.
-#
-# X11 doesn't have a "forbidden" cursor (usually a slashed circle);
-# "pirate" seems to be the conventional cursor for this purpose.
-#
-# Windows has an IDC_HELP cursor, but it's not available from Tk.
-#
-# Tk does not support "none" on Windows.
-#
-
-namespace eval ttk {
-
-    variable Cursors
-
-    # Use X11 cursor names as defaults, since Tk supplies these
-    # on all platforms.
-    #
-    array set Cursors {
-	""		""
-	none		none
-
-	standard	left_ptr
-	text 		xterm
-	link		hand2
-	crosshair	crosshair
-	busy		watch
-	forbidden	pirate
-
-	hresize 	sb_h_double_arrow
-	vresize 	sb_v_double_arrow
-
-	nresize 	top_side
-	sresize 	bottom_side
-	wresize 	left_side
-	eresize 	right_side
-	nwresize	top_left_corner
-	neresize	top_right_corner
-	swresize	bottom_left_corner
-	seresize	bottom_right_corner
-	move		fleur
-
-    }
-
-    # Platform-specific overrides for Windows and OSX.
-    #
-    switch [tk windowingsystem] {
-	"win32" {
-	    array set Cursors {
-		none		{}
-
-		standard	arrow
-		text		ibeam
-		link		hand2
-		crosshair	crosshair
-		busy		wait
-		forbidden	no
-
-		vresize 	size_ns
-		nresize 	size_ns
-		sresize		size_ns
-
-		wresize		size_we
-		eresize		size_we
-		hresize 	size_we
-
-		nwresize	size_nw_se
-		swresize	size_ne_sw
-
-		neresize	size_ne_sw
-		seresize	size_nw_se
-	    }
-	}
-
-	"aqua" {
-	    if {[package vsatisfies [package provide Tk] 8.5]} {
-		# appeared 2007-04-23, Tk 8.5a6
-		array set Cursors {
-		    standard	arrow
-		    text 	ibeam
-		    link	pointinghand
-		    crosshair	crosshair
-		    busy	watch
-		    forbidden	notallowed
-
-		    hresize 	resizeleftright
-		    vresize 	resizeupdown
-		    nresize	resizeup
-		    sresize	resizedown
-		    wresize	resizeleft
-		    eresize	resizeright
-		}
-	    }
-	}
-    }
-}
-
-## ttk::cursor $cursor --
-#	Return platform-specific cursor for specified symbolic cursor.
-#
-proc ttk::cursor {name} {
-    variable Cursors
-    return $Cursors($name)
-}
-
-## ttk::setCursor $w $cursor --
-#	Set the cursor for specified window.
-#
-# [ttk::setCursor] should be used in <Motion> bindings
-# instead of directly calling [$w configure -cursor ...],
-# as the latter always incurs a server round-trip and
-# can lead to high CPU load (see [#1184746])
-#
-
-proc ttk::setCursor {w name} {
-    variable Cursors
-    if {[$w cget -cursor] ne $Cursors($name)} {
-	$w configure -cursor $Cursors($name)
-    }
-}
-
-## Interactive test harness:
-#
-proc ttk::CursorSampler {f} {
-    ttk::frame $f
-
-    set r 0
-    foreach row {
-	{nwresize nresize   neresize}
-	{ wresize move       eresize}
-	{swresize sresize   seresize}
-	{text link crosshair}
-	{hresize vresize ""}
-	{busy forbidden ""}
-	{none standard ""}
-    } {
-	set c 0
-	foreach cursor $row {
-	    set w $f.${r}${c}
-	    ttk::label $w -text $cursor -cursor [ttk::cursor $cursor] \
-		-relief solid -borderwidth 1 -padding 3
-	    grid $w -row $r -column $c -sticky nswe
-	    grid columnconfigure $f $c -uniform cols -weight 1
-	    incr c
-	}
-	grid rowconfigure $f $r -uniform rows -weight 1
-	incr r
-    }
-
-    return $f
-}
-
-if {[info exists argv0] && $argv0 eq [info script]} {
-    wm title . "[array size ::ttk::Cursors] cursors"
-    pack [ttk::CursorSampler .f] -expand true -fill both
-    bind . <KeyPress-Escape> [list destroy .]
-    focus .f
-}
-
-#*EOF*
diff --git a/tk8.6/library/ttk/defaults.tcl b/tk8.6/library/ttk/defaults.tcl
deleted file mode 100644
index 56e2176..0000000
--- a/tk8.6/library/ttk/defaults.tcl
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# Settings for default theme.
-#
-
-namespace eval ttk::theme::default {
-    variable colors
-    array set colors {
-	-frame			"#d9d9d9"
-	-foreground		"#000000"
-	-window			"#ffffff"
-	-text   		"#000000"
-	-activebg		"#ececec"
-	-selectbg		"#4a6984"
-	-selectfg		"#ffffff"
-	-darker 		"#c3c3c3"
-	-disabledfg		"#a3a3a3"
-	-indicator		"#4a6984"
-	-disabledindicator	"#a3a3a3"
-	-altindicator		"#9fbdd8"
-	-disabledaltindicator	"#c0c0c0"
-    }
-
-    ttk::style theme settings default {
-
-	ttk::style configure "." \
-	    -borderwidth 	1 \
-	    -background 	$colors(-frame) \
-	    -foreground 	$colors(-foreground) \
-	    -troughcolor 	$colors(-darker) \
-	    -font 		TkDefaultFont \
-	    -selectborderwidth	1 \
-	    -selectbackground	$colors(-selectbg) \
-	    -selectforeground	$colors(-selectfg) \
-	    -insertwidth 	1 \
-	    -indicatordiameter	10 \
-	    ;
-
-	ttk::style map "." -background \
-	    [list disabled $colors(-frame)  active $colors(-activebg)]
-	ttk::style map "." -foreground \
-	    [list disabled $colors(-disabledfg)]
-
-	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 configure TCheckbutton \
-	    -indicatorcolor "#ffffff" -indicatorrelief sunken -padding 1
-	ttk::style map TCheckbutton -indicatorcolor \
-	    [list pressed $colors(-activebg)  \
-			{!disabled alternate} $colors(-altindicator) \
-			{disabled alternate} $colors(-disabledaltindicator) \
-			{!disabled selected} $colors(-indicator) \
-			{disabled selected} $colors(-disabledindicator)]
-	ttk::style map TCheckbutton -indicatorrelief \
-	    [list alternate raised]
-
-	ttk::style configure TRadiobutton \
-	    -indicatorcolor "#ffffff" -indicatorrelief sunken -padding 1
-	ttk::style map TRadiobutton -indicatorcolor \
-	    [list pressed $colors(-activebg)  \
-			{!disabled alternate} $colors(-altindicator) \
-			{disabled alternate} $colors(-disabledaltindicator) \
-			{!disabled selected} $colors(-indicator) \
-			{disabled selected} $colors(-disabledindicator)]
-	ttk::style map TRadiobutton -indicatorrelief \
-	    [list alternate raised]
-
-	ttk::style configure TMenubutton \
-	    -relief raised -padding "10 3"
-
-	ttk::style configure TEntry \
-	    -relief sunken -fieldbackground white -padding 1
-	ttk::style map TEntry -fieldbackground \
-	    [list readonly $colors(-frame) disabled $colors(-frame)]
-
-	ttk::style configure TCombobox -arrowsize 12 -padding 1
-	ttk::style map TCombobox -fieldbackground \
-	    [list readonly $colors(-frame) disabled $colors(-frame)] \
-	    -arrowcolor [list disabled $colors(-disabledfg)]
-
-	ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0}
-	ttk::style map TSpinbox -fieldbackground \
-	    [list readonly $colors(-frame) disabled $colors(-frame)] \
-	    -arrowcolor [list disabled $colors(-disabledfg)]
-
-	ttk::style configure TLabelframe \
-	    -relief groove -borderwidth 2
-
-	ttk::style configure TScrollbar \
-	    -width 12 -arrowsize 12
-	ttk::style map TScrollbar \
-	    -arrowcolor [list disabled $colors(-disabledfg)]
-
-	ttk::style configure TScale \
-	    -sliderrelief raised
-	ttk::style configure TProgressbar \
-	    -background $colors(-selectbg)
-
-	ttk::style configure TNotebook.Tab \
-	    -padding {4 2} -background $colors(-darker)
-	ttk::style map TNotebook.Tab \
-	    -background [list selected $colors(-frame)]
-
-	# Treeview.
-	#
-	ttk::style configure Heading -font TkHeadingFont -relief raised
-	ttk::style configure Treeview \
-	    -background $colors(-window) \
-	    -foreground $colors(-text) ;
-	ttk::style map Treeview \
-	    -background [list selected $colors(-selectbg)] \
-	    -foreground [list selected $colors(-selectfg)] ;
-
-	# Combobox popdown frame
-	ttk::style layout ComboboxPopdownFrame {
-	    ComboboxPopdownFrame.border -sticky nswe
-	}
- 	ttk::style configure ComboboxPopdownFrame \
-	    -borderwidth 1 -relief solid
-
-	#
-	# Toolbar buttons:
-	#
-	ttk::style layout Toolbutton {
-	    Toolbutton.border -children {
-		Toolbutton.padding -children {
-		    Toolbutton.label
-		}
-	    }
-	}
-
-	ttk::style configure Toolbutton \
-	    -padding 2 -relief flat
-	ttk::style map Toolbutton -relief \
-	    [list disabled flat selected sunken pressed sunken active raised]
-	ttk::style map Toolbutton -background \
-	    [list pressed $colors(-darker)  active $colors(-activebg)]
-    }
-}
diff --git a/tk8.6/library/ttk/entry.tcl b/tk8.6/library/ttk/entry.tcl
deleted file mode 100644
index b3ebcbd..0000000
--- a/tk8.6/library/ttk/entry.tcl
+++ /dev/null
@@ -1,607 +0,0 @@
-#
-# DERIVED FROM: tk/library/entry.tcl r1.22
-#
-# Copyright (c) 1992-1994 The Regents of the University of California.
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-# Copyright (c) 2004, Joe English
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-namespace eval ttk {
-    namespace eval entry {
-	variable State
-
-	set State(x) 0
-	set State(selectMode) none
-	set State(anchor) 0
-	set State(scanX) 0
-	set State(scanIndex) 0
-	set State(scanMoved) 0
-
-	# Button-2 scan speed is (scanNum/scanDen) characters
-	# per pixel of mouse movement.
-	# The standard Tk entry widget uses the equivalent of
-	# scanNum = 10, scanDen = average character width.
-	# I don't know why that was chosen.
-	#
-	set State(scanNum) 1
-	set State(scanDen) 1
-	set State(deadband) 3	;# #pixels for mouse-moved deadband.
-    }
-}
-
-### Option database settings.
-#
-option add *TEntry.cursor [ttk::cursor text]
-
-### Bindings.
-#
-# Removed the following standard Tk bindings:
-#
-# <Control-Key-space>, <Control-Shift-Key-space>,
-# <Key-Select>,  <Shift-Key-Select>:
-#	Ttk entry widget doesn't use selection anchor.
-# <Key-Insert>:
-#	Inserts PRIMARY selection (on non-Windows platforms).
-#	This is inconsistent with typical platform bindings.
-# <Double-Shift-ButtonPress-1>, <Triple-Shift-ButtonPress-1>:
-#	These don't do the right thing to start with.
-# <Meta-Key-b>, <Meta-Key-d>, <Meta-Key-f>,
-# <Meta-Key-BackSpace>, <Meta-Key-Delete>:
-#	Judgment call.  If <Meta> happens to be assigned to the Alt key,
-#	these could conflict with application accelerators.
-#	(Plus, who has a Meta key these days?)
-# <Control-Key-t>:
-#	Another judgment call.  If anyone misses this, let me know
-#	and I'll put it back.
-#
-
-## Clipboard events:
-#
-bind TEntry <<Cut>> 			{ ttk::entry::Cut %W }
-bind TEntry <<Copy>> 			{ ttk::entry::Copy %W }
-bind TEntry <<Paste>> 			{ ttk::entry::Paste %W }
-bind TEntry <<Clear>> 			{ ttk::entry::Clear %W }
-
-## Button1 bindings:
-#	Used for selection and navigation.
-#
-bind TEntry <ButtonPress-1> 		{ ttk::entry::Press %W %x }
-bind TEntry <Shift-ButtonPress-1>	{ ttk::entry::Shift-Press %W %x }
-bind TEntry <Double-ButtonPress-1> 	{ ttk::entry::Select %W %x word }
-bind TEntry <Triple-ButtonPress-1> 	{ ttk::entry::Select %W %x line }
-bind TEntry <B1-Motion>			{ ttk::entry::Drag %W %x }
-
-bind TEntry <B1-Leave> 		{ ttk::entry::DragOut %W %m }
-bind TEntry <B1-Enter>		{ ttk::entry::DragIn %W }
-bind TEntry <ButtonRelease-1>	{ ttk::entry::Release %W }
-
-bind TEntry <<ToggleSelection>> {
-    %W instate {!readonly !disabled} { %W icursor @%x ; focus %W }
-}
-
-## Button2 bindings:
-#	Used for scanning and primary transfer.
-#	Note: ButtonRelease-2 is mapped to <<PasteSelection>> in tk.tcl.
-#
-bind TEntry <ButtonPress-2> 		{ ttk::entry::ScanMark %W %x }
-bind TEntry <B2-Motion> 		{ ttk::entry::ScanDrag %W %x }
-bind TEntry <ButtonRelease-2>		{ ttk::entry::ScanRelease %W %x }
-bind TEntry <<PasteSelection>>		{ ttk::entry::ScanRelease %W %x }
-
-## Keyboard navigation bindings:
-#
-bind TEntry <<PrevChar>>		{ ttk::entry::Move %W prevchar }
-bind TEntry <<NextChar>> 		{ ttk::entry::Move %W nextchar }
-bind TEntry <<PrevWord>>		{ ttk::entry::Move %W prevword }
-bind TEntry <<NextWord>>		{ ttk::entry::Move %W nextword }
-bind TEntry <<LineStart>>		{ ttk::entry::Move %W home }
-bind TEntry <<LineEnd>>			{ ttk::entry::Move %W end }
-
-bind TEntry <<SelectPrevChar>> 		{ ttk::entry::Extend %W prevchar }
-bind TEntry <<SelectNextChar>>		{ ttk::entry::Extend %W nextchar }
-bind TEntry <<SelectPrevWord>>		{ ttk::entry::Extend %W prevword }
-bind TEntry <<SelectNextWord>>		{ ttk::entry::Extend %W nextword }
-bind TEntry <<SelectLineStart>>		{ ttk::entry::Extend %W home }
-bind TEntry <<SelectLineEnd>>		{ ttk::entry::Extend %W end }
-
-bind TEntry <<SelectAll>> 		{ %W selection range 0 end }
-bind TEntry <<SelectNone>> 		{ %W selection clear }
-
-bind TEntry <<TraverseIn>> 	{ %W selection range 0 end; %W icursor end }
-
-## Edit bindings:
-#
-bind TEntry <KeyPress> 			{ ttk::entry::Insert %W %A }
-bind TEntry <Key-Delete>		{ ttk::entry::Delete %W }
-bind TEntry <Key-BackSpace> 		{ ttk::entry::Backspace %W }
-
-# Ignore all Alt, Meta, and Control keypresses unless explicitly bound.
-# Otherwise, the <KeyPress> class binding will fire and insert the character.
-# Ditto for Escape, Return, and Tab.
-#
-bind TEntry <Alt-KeyPress>		{# nothing}
-bind TEntry <Meta-KeyPress>		{# nothing}
-bind TEntry <Control-KeyPress> 		{# nothing}
-bind TEntry <Key-Escape> 		{# nothing}
-bind TEntry <Key-Return> 		{# nothing}
-bind TEntry <Key-KP_Enter> 		{# nothing}
-bind TEntry <Key-Tab> 			{# nothing}
-
-# Argh.  Apparently on Windows, the NumLock modifier is interpreted
-# as a Command modifier.
-if {[tk windowingsystem] eq "aqua"} {
-    bind TEntry <Command-KeyPress>	{# nothing}
-}
-# Tk-on-Cocoa generates characters for these two keys. [Bug 2971663]
-bind TEntry <<PrevLine>>		{# nothing}
-bind TEntry <<NextLine>>		{# nothing}
-
-## Additional emacs-like bindings:
-#
-bind TEntry <Control-Key-d>		{ ttk::entry::Delete %W }
-bind TEntry <Control-Key-h>		{ ttk::entry::Backspace %W }
-bind TEntry <Control-Key-k>		{ %W delete insert end }
-
-### Clipboard procedures.
-#
-
-## EntrySelection -- Return the selected text of the entry.
-#	Raises an error if there is no selection.
-#
-proc ttk::entry::EntrySelection {w} {
-    set entryString [string range [$w get] [$w index sel.first] \
-	    [expr {[$w index sel.last] - 1}]]
-    if {[$w cget -show] ne ""} {
-	return [string repeat [string index [$w cget -show] 0] \
-		[string length $entryString]]
-    }
-    return $entryString
-}
-
-## Paste -- Insert clipboard contents at current insert point.
-#
-proc ttk::entry::Paste {w} {
-    catch {
-	set clipboard [::tk::GetSelection $w CLIPBOARD]
-	PendingDelete $w
-	$w insert insert $clipboard
-	See $w insert
-    }
-}
-
-## Copy -- Copy selection to clipboard.
-#
-proc ttk::entry::Copy {w} {
-    if {![catch {EntrySelection $w} selection]} {
-	clipboard clear -displayof $w
-	clipboard append -displayof $w $selection
-    }
-}
-
-## Clear -- Delete the selection.
-#
-proc ttk::entry::Clear {w} {
-    catch { $w delete sel.first sel.last }
-}
-
-## Cut -- Copy selection to clipboard then delete it.
-#
-proc ttk::entry::Cut {w} {
-    Copy $w; Clear $w
-}
-
-### Navigation procedures.
-#
-
-## ClosestGap -- Find closest boundary between characters.
-# 	Returns the index of the character just after the boundary.
-#
-proc ttk::entry::ClosestGap {w x} {
-    set pos [$w index @$x]
-    set bbox [$w bbox $pos]
-    if {$x - [lindex $bbox 0] > [lindex $bbox 2]/2} {
-	incr pos
-    }
-    return $pos
-}
-
-## See $index -- Make sure that the character at $index is visible.
-#
-proc ttk::entry::See {w {index insert}} {
-    update idletasks	;# ensure scroll data up-to-date
-    set c [$w index $index]
-    # @@@ OR: check [$w index left] / [$w index right]
-    if {$c < [$w index @0] || $c >= [$w index @[winfo width $w]]} {
-	$w xview $c
-    }
-}
-
-## NextWord -- Find the next word position.
-#	Note: The "next word position" follows platform conventions:
-#	either the next end-of-word position, or the start-of-word
-#	position following the next end-of-word position.
-#
-set ::ttk::entry::State(startNext) \
-	[string equal [tk windowingsystem] "win32"]
-
-proc ttk::entry::NextWord {w start} {
-    variable State
-    set pos [tcl_endOfWord [$w get] [$w index $start]]
-    if {$pos >= 0 && $State(startNext)} {
-	set pos [tcl_startOfNextWord [$w get] $pos]
-    }
-    if {$pos < 0} {
-	return end
-    }
-    return $pos
-}
-
-## PrevWord -- Find the previous word position.
-#
-proc ttk::entry::PrevWord {w start} {
-    set pos [tcl_startOfPreviousWord [$w get] [$w index $start]]
-    if {$pos < 0} {
-	return 0
-    }
-    return $pos
-}
-
-## RelIndex -- Compute character/word/line-relative index.
-#
-proc ttk::entry::RelIndex {w where {index insert}} {
-    switch -- $where {
-	prevchar	{ expr {[$w index $index] - 1} }
-    	nextchar	{ expr {[$w index $index] + 1} }
-	prevword	{ PrevWord $w $index }
-	nextword	{ NextWord $w $index }
-	home		{ return 0 }
-	end		{ $w index end }
-	default		{ error "Bad relative index $index" }
-    }
-}
-
-## Move -- Move insert cursor to relative location.
-#	Also clears the selection, if any, and makes sure
-#	that the insert cursor is visible.
-#
-proc ttk::entry::Move {w where} {
-    $w icursor [RelIndex $w $where]
-    $w selection clear
-    See $w insert
-}
-
-### Selection procedures.
-#
-
-## ExtendTo -- Extend the selection to the specified index.
-#
-# The other end of the selection (the anchor) is determined as follows:
-#
-# (1) if there is no selection, the anchor is the insert cursor;
-# (2) if the index is outside the selection, grow the selection;
-# (3) if the insert cursor is at one end of the selection, anchor the other end
-# (4) otherwise anchor the start of the selection
-#
-# The insert cursor is placed at the new end of the selection.
-#
-# Returns: selection anchor.
-#
-proc ttk::entry::ExtendTo {w index} {
-    set index [$w index $index]
-    set insert [$w index insert]
-
-    # Figure out selection anchor:
-    if {![$w selection present]} {
-    	set anchor $insert
-    } else {
-    	set selfirst [$w index sel.first]
-	set sellast  [$w index sel.last]
-
-	if {   ($index < $selfirst)
-	    || ($insert == $selfirst && $index <= $sellast)
-	} {
-	    set anchor $sellast
-	} else {
-	    set anchor $selfirst
-	}
-    }
-
-    # Extend selection:
-    if {$anchor < $index} {
-	$w selection range $anchor $index
-    } else {
-    	$w selection range $index $anchor
-    }
-
-    $w icursor $index
-    return $anchor
-}
-
-## Extend -- Extend the selection to a relative position, show insert cursor
-#
-proc ttk::entry::Extend {w where} {
-    ExtendTo $w [RelIndex $w $where]
-    See $w
-}
-
-### Button 1 binding procedures.
-#
-# Double-clicking followed by a drag enters "word-select" mode.
-# Triple-clicking enters "line-select" mode.
-#
-
-## Press -- ButtonPress-1 binding.
-#	Set the insertion cursor, claim the input focus, set up for
-#	future drag operations.
-#
-proc ttk::entry::Press {w x} {
-    variable State
-
-    $w icursor [ClosestGap $w $x]
-    $w selection clear
-    $w instate !disabled { focus $w }
-
-    # Set up for future drag, double-click, or triple-click.
-    set State(x) $x
-    set State(selectMode) char
-    set State(anchor) [$w index insert]
-}
-
-## Shift-Press -- Shift-ButtonPress-1 binding.
-#	Extends the selection, sets anchor for future drag operations.
-#
-proc ttk::entry::Shift-Press {w x} {
-    variable State
-
-    focus $w
-    set anchor [ExtendTo $w @$x]
-
-    set State(x) $x
-    set State(selectMode) char
-    set State(anchor) $anchor
-}
-
-## Select $w $x $mode -- Binding for double- and triple- clicks.
-#	Selects a word or line (according to mode),
-#	and sets the selection mode for subsequent drag operations.
-#
-proc ttk::entry::Select {w x mode} {
-    variable State
-    set cur [ClosestGap $w $x]
-
-    switch -- $mode {
-    	word	{ WordSelect $w $cur $cur }
-    	line	{ LineSelect $w $cur $cur }
-	char	{ # no-op }
-    }
-
-    set State(anchor) $cur
-    set State(selectMode) $mode
-}
-
-## Drag -- Button1 motion binding.
-#
-proc ttk::entry::Drag {w x} {
-    variable State
-    set State(x) $x
-    DragTo $w $x
-}
-
-## DragTo $w $x -- Extend selection to $x based on current selection mode.
-#
-proc ttk::entry::DragTo {w x} {
-    variable State
-
-    set cur [ClosestGap $w $x]
-    switch $State(selectMode) {
-	char { CharSelect $w $State(anchor) $cur }
-	word { WordSelect $w $State(anchor) $cur }
-	line { LineSelect $w $State(anchor) $cur }
-	none { # no-op }
-    }
-}
-
-## <B1-Leave> binding:
-#	Begin autoscroll.
-#
-proc ttk::entry::DragOut {w mode} {
-    variable State
-    if {$State(selectMode) ne "none" && $mode eq "NotifyNormal"} {
-	ttk::Repeatedly ttk::entry::AutoScroll $w
-    }
-}
-
-## <B1-Enter> binding
-# 	Suspend autoscroll.
-#
-proc ttk::entry::DragIn {w} {
-    ttk::CancelRepeat 
-}
-
-## <ButtonRelease-1> binding
-#
-proc ttk::entry::Release {w} {
-    variable State
-    set State(selectMode) none
-    ttk::CancelRepeat 	;# suspend autoscroll
-}
-
-## 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 
-#	the selection according to the current selection mode.
-#
-# TODO: AutoScroll should repeat faster (50ms) than normal autorepeat.
-# TODO: Need a way for Repeat scripts to cancel themselves.
-#
-proc ttk::entry::AutoScroll {w} {
-    variable State
-    if {![winfo exists $w]} return
-    set x $State(x)
-    if {$x > [winfo width $w]} {
-	$w xview scroll 2 units
-	DragTo $w $x
-    } elseif {$x < 0} {
-	$w xview scroll -2 units
-	DragTo $w $x
-    }
-}
-
-## CharSelect -- select characters between index $from and $to
-#
-proc ttk::entry::CharSelect {w from to} {
-    if {$to <= $from} {
-	$w selection range $to $from
-    } else {
-	$w selection range $from $to
-    }
-    $w icursor $to
-}
-
-## WordSelect -- Select whole words between index $from and $to
-#
-proc ttk::entry::WordSelect {w from to} {
-    if {$to < $from} {
-	set first [WordBack [$w get] $to]
-	set last [WordForward [$w get] $from]
-	$w icursor $first
-    } else {
-	set first [WordBack [$w get] $from]
-	set last [WordForward [$w get] $to]
-	$w icursor $last
-    }
-    $w selection range $first $last
-}
-
-## WordBack, WordForward -- helper routines for WordSelect.
-#
-proc ttk::entry::WordBack {text index} {
-    if {[set pos [tcl_wordBreakBefore $text $index]] < 0} { return 0 }
-    return $pos
-}
-proc ttk::entry::WordForward {text index} {
-    if {[set pos [tcl_wordBreakAfter $text $index]] < 0} { return end }
-    return $pos
-}
-
-## LineSelect -- Select the entire line.
-#
-proc ttk::entry::LineSelect {w _ _} {
-    variable State
-    $w selection range 0 end
-    $w icursor end
-}
-
-### Button 2 binding procedures.
-#
-
-## ScanMark -- ButtonPress-2 binding.
-#	Marks the start of a scan or primary transfer operation.
-#
-proc ttk::entry::ScanMark {w x} {
-    variable State
-    set State(scanX) $x
-    set State(scanIndex) [$w index @0]
-    set State(scanMoved) 0
-}
-
-## ScanDrag -- Button2 motion binding.
-#
-proc ttk::entry::ScanDrag {w x} {
-    variable State
-
-    set dx [expr {$State(scanX) - $x}]
-    if {abs($dx) > $State(deadband)} {
-	set State(scanMoved) 1
-    }
-    set left [expr {$State(scanIndex) + ($dx*$State(scanNum))/$State(scanDen)}]
-    $w xview $left
-
-    if {$left != [set newLeft [$w index @0]]} {
-    	# We've scanned past one end of the entry;
-	# reset the mark so that the text will start dragging again
-	# as soon as the mouse reverses direction.
-	#
-	set State(scanX) $x
-	set State(scanIndex) $newLeft
-    }
-}
-
-## ScanRelease -- Button2 release binding.
-#	Do a primary transfer if the mouse has not moved since the button press.
-#
-proc ttk::entry::ScanRelease {w x} {
-    variable State
-    if {!$State(scanMoved)} {
-	$w instate {!disabled !readonly} {
-	    $w icursor [ClosestGap $w $x]
-	    catch {$w insert insert [::tk::GetSelection $w PRIMARY]}
-	}
-    }
-}
-
-### Insertion and deletion procedures.
-#
-
-## PendingDelete -- Delete selection prior to insert.
-#	If the entry currently has a selection, delete it and
-#	set the insert position to where the selection was.
-#	Returns: 1 if pending delete occurred, 0 if nothing was selected.
-#
-proc ttk::entry::PendingDelete {w} {
-    if {[$w selection present]} {
-	$w icursor sel.first
-	$w delete sel.first sel.last
-	return 1
-    }
-    return 0
-}
-
-## Insert -- Insert text into the entry widget.
-#	If a selection is present, the new text replaces it.
-#	Otherwise, the new text is inserted at the insert cursor.
-#
-proc ttk::entry::Insert {w s} {
-    if {$s eq ""} { return }
-    PendingDelete $w
-    $w insert insert $s
-    See $w insert
-}
-
-## Backspace -- Backspace over the character just before the insert cursor.
-#	If there is a selection, delete that instead.
-#	If the new insert position is offscreen to the left,
-#	scroll to place the cursor at about the middle of the window.
-#
-proc ttk::entry::Backspace {w} {
-    if {[PendingDelete $w]} {
-    	See $w
-	return
-    }
-    set x [expr {[$w index insert] - 1}]
-    if {$x < 0} { return }
-
-    $w delete $x
-
-    if {[$w index @0] >= [$w index insert]} {
-	set range [$w xview]
-	set left [lindex $range 0]
-	set right [lindex $range 1]
-	$w xview moveto [expr {$left - ($right - $left)/2.0}]
-    }
-}
-
-## Delete -- Delete the character after the insert cursor.
-#	If there is a selection, delete that instead.
-#
-proc ttk::entry::Delete {w} {
-    if {![PendingDelete $w]} {
-	$w delete insert
-    }
-}
-
-#*EOF*
diff --git a/tk8.6/library/ttk/fonts.tcl b/tk8.6/library/ttk/fonts.tcl
deleted file mode 100644
index a2781c6..0000000
--- a/tk8.6/library/ttk/fonts.tcl
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Font specifications.
-#
-# This file, [source]d at initialization time, sets up the following
-# symbolic fonts based on the current platform:
-#
-# TkDefaultFont	-- default for GUI items not otherwise specified
-# TkTextFont	-- font for user text (entry, listbox, others)
-# TkFixedFont	-- standard fixed width font
-# TkHeadingFont	-- headings (column headings, etc)
-# TkCaptionFont -- dialog captions (primary text in alert dialogs, etc.)
-# TkTooltipFont	-- font to use for tooltip windows
-# TkIconFont	-- font to use for icon captions
-# TkMenuFont	-- used to use for menu items
-#
-# In Tk 8.5, some of these fonts may be provided by the TIP#145 implementation
-# (On Windows and Mac OS X as of Oct 2007).
-#
-# +++ Platform notes:
-#
-# Windows:
-#	The default system font changed from "MS Sans Serif" to "Tahoma"
-# 	in Windows XP/Windows 2000.
-#
-#	MS documentation says to use "Tahoma 8" in Windows 2000/XP,
-#	although many MS programs still use "MS Sans Serif 8"
-#
-#	Should use SystemParametersInfo() instead.
-#
-# Mac OSX / Aqua:
-#	Quoth the Apple HIG:
-#	The _system font_ (Lucida Grande Regular 13 pt) is used for text
-#	in menus, dialogs, and full-size controls.
-#	[...] Use the _view font_ (Lucida Grande Regular 12pt) as the default
-#	font of text in lists and tables.
-#	[...] Use the _emphasized system font_ (Lucida Grande Bold 13 pt)
-#	sparingly. It is used for the message text in alerts.
-#	[...] The _small system font_ (Lucida Grande Regular 11 pt) [...]
-#	is also the default font for column headings in lists, for help tags,
-#	and for small controls.
-#
-#	Note that the font for column headings (TkHeadingFont) is
-#	_smaller_ than the default font.
-#
-#	There does not appear to be any recommendations for fixed-width fonts.
-#
-# X11:
-#	Need a way to tell if Xft is enabled or not.
-#	For now, assume patch #971980 applied.
-#
-#	"Classic" look used Helvetica bold for everything except
-#	for entry widgets, which use Helvetica medium.
-#	Most other toolkits use medium weight for all UI elements,
-#	which is what we do now.
-#
-#	Font size specified in pixels on X11, not points.
-#	This is Theoretically Wrong, but in practice works better; using
-#	points leads to huge inconsistencies across different servers.
-#
-
-namespace eval ttk {
-
-variable tip145 [catch {font create TkDefaultFont}]
-catch {font create TkTextFont}
-catch {font create TkHeadingFont}
-catch {font create TkCaptionFont}
-catch {font create TkTooltipFont}
-catch {font create TkFixedFont}
-catch {font create TkIconFont}
-catch {font create TkMenuFont}
-catch {font create TkSmallCaptionFont}
-
-if {!$tip145} {
-variable F	;# miscellaneous platform-specific font parameters
-switch -- [tk windowingsystem] {
-    win32 {
-        # In safe interps there is no osVersion element.
-	if {[info exists tcl_platform(osVersion)]} {
-            if {$tcl_platform(osVersion) >= 5.0} {
-                set F(family) "Tahoma"
-            } else {
-                set F(family) "MS Sans Serif"
-            }
-        } else {
-            if {[lsearch -exact [font families] Tahoma] != -1} {
-                set F(family) "Tahoma"
-            } else {
-                set F(family) "MS Sans Serif"
-            }
-        }
-	set F(size) 8
-
-	font configure TkDefaultFont -family $F(family) -size $F(size)
-	font configure TkTextFont    -family $F(family) -size $F(size)
-	font configure TkHeadingFont -family $F(family) -size $F(size)
-	font configure TkCaptionFont -family $F(family) -size $F(size) \
-	    -weight bold
-	font configure TkTooltipFont -family $F(family) -size $F(size)
-	font configure TkFixedFont   -family Courier -size 10
-	font configure TkIconFont    -family $F(family) -size $F(size)
-	font configure TkMenuFont    -family $F(family) -size $F(size)
-	font configure TkSmallCaptionFont -family $F(family) -size $F(size)
-    }
-    aqua {
-	set F(family) "Lucida Grande"
-	set F(fixed) "Monaco"
-	set F(menusize) 14
-	set F(size) 13
-	set F(viewsize) 12
-	set F(smallsize) 11
-	set F(labelsize) 10
-	set F(fixedsize) 11
-
-	font configure TkDefaultFont -family $F(family) -size $F(size)
-	font configure TkTextFont    -family $F(family) -size $F(size)
-	font configure TkHeadingFont -family $F(family) -size $F(smallsize)
-	font configure TkCaptionFont -family $F(family) -size $F(size) \
-					-weight bold
-	font configure TkTooltipFont -family $F(family) -size $F(smallsize)
-	font configure TkFixedFont   -family $F(fixed)  -size $F(fixedsize)
-	font configure TkIconFont    -family $F(family) -size $F(size)
-	font configure TkMenuFont    -family $F(family) -size $F(menusize)
-	font configure TkSmallCaptionFont -family $F(family) -size $F(labelsize)
-    }
-    default -
-    x11 {
-	if {![catch {tk::pkgconfig get fontsystem} F(fs)] && $F(fs) eq "xft"} {
-	    set F(family) "sans-serif"
-	    set F(fixed)  "monospace"
-	} else {
-	    set F(family) "Helvetica"
-	    set F(fixed)  "courier"
-	}
-	set F(size) -12
-	set F(ttsize) -10
-	set F(capsize) -14
-	set F(fixedsize) -12
-
-	font configure TkDefaultFont -family $F(family) -size $F(size)
-	font configure TkTextFont    -family $F(family) -size $F(size)
-	font configure TkHeadingFont -family $F(family) -size $F(size) \
-			-weight bold
-	font configure TkCaptionFont -family $F(family) -size $F(capsize) \
-			-weight bold
-	font configure TkTooltipFont -family $F(family) -size $F(ttsize)
-	font configure TkFixedFont   -family $F(fixed)  -size $F(fixedsize)
-	font configure TkIconFont    -family $F(family) -size $F(size)
-	font configure TkMenuFont    -family $F(family) -size $F(size)
-	font configure TkSmallCaptionFont -family $F(family) -size $F(ttsize)
-    }
-}
-unset -nocomplain F
-}
-
-}
-
-#*EOF*
diff --git a/tk8.6/library/ttk/menubutton.tcl b/tk8.6/library/ttk/menubutton.tcl
deleted file mode 100644
index 2be064c..0000000
--- a/tk8.6/library/ttk/menubutton.tcl
+++ /dev/null
@@ -1,169 +0,0 @@
-#
-# Bindings for Menubuttons.
-#
-# Menubuttons have three interaction modes:
-#
-# Pulldown: Press menubutton, drag over menu, release to activate menu entry
-# Popdown: Click menubutton to post menu
-# Keyboard: <Key-space> or accelerator key to post menu
-#
-# (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 
-# the built-in Tk bindings handle the rest of the interaction.
-#
-# ON X11:
-#
-# Standard Tk menubuttons use a global grab on the menubutton.
-# This won't work for Ttk menubuttons in pulldown mode,
-# since we need to process the final <ButtonRelease> event,
-# and this might be delivered to the menu.  So instead we
-# 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 
-# 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.
-#
-
-namespace eval ttk {
-    namespace eval menubutton {
-	variable State
-	array set State {
-	    pulldown	0
-	    oldcursor	{}
-	}
-    }
-}
-
-bind TMenubutton <Enter>	{ %W instate !disabled {%W state active } }
-bind TMenubutton <Leave>	{ %W state !active }
-bind TMenubutton <Key-space> 	{ ttk::menubutton::Popdown %W }
-bind TMenubutton <<Invoke>> 	{ ttk::menubutton::Popdown %W }
-
-if {[tk windowingsystem] eq "x11"} {
-    bind TMenubutton <ButtonPress-1>  	{ ttk::menubutton::Pulldown %W }
-    bind TMenubutton <ButtonRelease-1>	{ ttk::menubutton::TransferGrab %W }
-    bind TMenubutton <B1-Leave> 	{ ttk::menubutton::TransferGrab %W }
-} else {
-    bind TMenubutton <ButtonPress-1>  \
-	{ %W state pressed ; ttk::menubutton::Popdown %W }
-    bind TMenubutton <ButtonRelease-1>  \
-	{ if {[winfo exists %W]} { %W state !pressed } }
-}
-
-# PostPosition --
-#	Returns the x and y coordinates where the menu 
-#	should be posted, based on the menubutton and menu size
-#	and -direction option.
-#
-# TODO: adjust menu width to be at least as wide as the button
-#	for -direction above, below.
-#
-proc ttk::menubutton::PostPosition {mb menu} {
-    set x [winfo rootx $mb]
-    set y [winfo rooty $mb]
-    set dir [$mb cget -direction]
-
-    set bw [winfo width $mb]
-    set bh [winfo height $mb]
-    set mw [winfo reqwidth $menu]
-    set mh [winfo reqheight $menu]
-    set sw [expr {[winfo screenwidth  $menu] - $bw - $mw}]
-    set sh [expr {[winfo screenheight $menu] - $bh - $mh}]
-
-    switch -- $dir {
-	above { if {$y >= $mh} { incr y -$mh } { incr y  $bh } }
-	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 { 
-	    # post menu atop menubutton.
-	    # If there's a menu entry whose label matches the
-	    # menubutton -text, assume this is an optionmenu
-	    # and place that entry over the menubutton.
-	    set index [FindMenuEntry $menu [$mb cget -text]]
-	    if {$index ne ""} {
-		incr y -[$menu yposition $index]
-	    }
-	}
-    }
-
-    return [list $x $y]
-}
-
-# Popdown --
-#	Post the menu and set a grab on the menu.
-#
-proc ttk::menubutton::Popdown {mb} {
-    if {[$mb instate disabled] || [set menu [$mb cget -menu]] eq ""} {
-	return
-    }
-    foreach {x y} [PostPosition $mb $menu] { break }
-    tk_popup $menu $x $y
-}
-
-# Pulldown (X11 only) --
-#	Called when Button1 is pressed on a menubutton.
-#	Posts the menu; a subsequent ButtonRelease 
-#	or Leave event will set a grab on the menu.
-#
-proc ttk::menubutton::Pulldown {mb} {
-    variable State
-    if {[$mb instate disabled] || [set menu [$mb cget -menu]] eq ""} {
-	return
-    }
-    foreach {x y} [PostPosition $mb $menu] { break }
-    set State(pulldown) 1
-    set State(oldcursor) [$mb cget -cursor]
-
-    $mb state pressed
-    $mb configure -cursor [$menu cget -cursor]
-    $menu post $x $y
-    tk_menuSetFocus $menu
-}
-
-# TransferGrab (X11 only) --
-#	Switch from pulldown mode (menubutton has an implicit grab)
-#	to popdown mode (menu has an explicit grab).
-#
-proc ttk::menubutton::TransferGrab {mb} {
-    variable State
-    if {$State(pulldown)} {
-	$mb configure -cursor $State(oldcursor)
-	$mb state {!pressed !active}
-	set State(pulldown) 0
-
-	set menu [$mb cget -menu]
-    	tk_popup $menu [winfo rootx $menu] [winfo rooty $menu]
-    }
-}
-
-# FindMenuEntry --
-#	Hack to support tk_optionMenus.
-#	Returns the index of the menu entry with a matching -label,
-#	-1 if not found.
-#
-proc ttk::menubutton::FindMenuEntry {menu s} {
-    set last [$menu index last]
-    if {$last eq "none"} {
-	return ""
-    }
-    for {set i 0} {$i <= $last} {incr i} {
-	if {![catch {$menu entrycget $i -label} label]
-	    && ($label eq $s)} {
-	    return $i
-	}
-    }
-    return ""
-}
-
-#*EOF*
diff --git a/tk8.6/library/ttk/notebook.tcl b/tk8.6/library/ttk/notebook.tcl
deleted file mode 100644
index 72b85e6..0000000
--- a/tk8.6/library/ttk/notebook.tcl
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# Bindings for TNotebook widget
-#
-
-namespace eval ttk::notebook {
-    variable TLNotebooks ;# See enableTraversal
-}
-
-bind TNotebook <ButtonPress-1>		{ ttk::notebook::Press %W %x %y }
-bind TNotebook <Key-Right>		{ ttk::notebook::CycleTab %W  1; break }
-bind TNotebook <Key-Left>		{ ttk::notebook::CycleTab %W -1; break }
-bind TNotebook <Control-Key-Tab>	{ ttk::notebook::CycleTab %W  1; break }
-bind TNotebook <Control-Shift-Key-Tab>	{ ttk::notebook::CycleTab %W -1; break }
-catch {
-bind TNotebook <Control-ISO_Left_Tab>	{ ttk::notebook::CycleTab %W -1; break }
-}
-bind TNotebook <Destroy>		{ ttk::notebook::Cleanup %W }
-
-# ActivateTab $nb $tab --
-#	Select the specified tab and set focus.
-#
-#  Desired behavior:
-#	+ take focus when reselecting the currently-selected tab;
-#	+ keep focus if the notebook already has it;
-#	+ otherwise set focus to the first traversable widget
-#	  in the newly-selected tab;
-#	+ do not leave the focus in a deselected tab.
-#
-proc ttk::notebook::ActivateTab {w tab} {
-    set oldtab [$w select]
-    $w select $tab
-    set newtab [$w select] ;# NOTE: might not be $tab, if $tab is disabled
-
-    if {[focus] eq $w} { return }
-    if {$newtab eq $oldtab} { focus $w ; return }
-
-    update idletasks ;# needed so focus logic sees correct mapped states
-    if {[set f [ttk::focusFirst $newtab]] ne ""} {
-	ttk::traverseTo $f
-    } else {
-	focus $w
-    }
-}
-
-# Press $nb $x $y --
-#	ButtonPress-1 binding for notebook widgets.
-#	Activate the tab under the mouse cursor, if any.
-#
-proc ttk::notebook::Press {w x y} {
-    set index [$w index @$x,$y]
-    if {$index ne ""} {
-	ActivateTab $w $index
-    }
-}
-
-# CycleTab --
-#	Select the next/previous tab in the list.
-#
-proc ttk::notebook::CycleTab {w dir} {
-    if {[$w index end] != 0} {
-	set current [$w index current]
-	set select [expr {($current + $dir) % [$w index end]}]
-	while {[$w tab $select -state] != "normal" && ($select != $current)} {
-	    set select [expr {($select + $dir) % [$w index end]}]
-	}
-	if {$select != $current} {
-	    ActivateTab $w $select
-	}
-    }
-}
-
-# MnemonicTab $nb $key --
-#	Scan all tabs in the specified notebook for one with the 
-#	specified mnemonic. If found, returns path name of tab;
-#	otherwise returns ""
-#
-proc ttk::notebook::MnemonicTab {nb key} {
-    set key [string toupper $key]
-    foreach tab [$nb tabs] {
-	set label [$nb tab $tab -text]
-	set underline [$nb tab $tab -underline]
-	set mnemonic [string toupper [string index $label $underline]]
-	if {$mnemonic ne "" && $mnemonic eq $key} {
-	    return $tab
-	}
-    }
-    return ""
-}
-
-# +++ Toplevel keyboard traversal.
-#
-
-# enableTraversal --
-#	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 
-#
-proc ttk::notebook::enableTraversal {nb} {
-    variable TLNotebooks
-
-    set top [winfo toplevel $nb]
-
-    if {![info exists TLNotebooks($top)]} {
-	# Augment $top bindings:
-	#
-	bind $top <Control-Key-Next>         {+ttk::notebook::TLCycleTab %W  1}
-	bind $top <Control-Key-Prior>        {+ttk::notebook::TLCycleTab %W -1}
-	bind $top <Control-Key-Tab> 	     {+ttk::notebook::TLCycleTab %W  1}
-	bind $top <Control-Shift-Key-Tab>    {+ttk::notebook::TLCycleTab %W -1}
-	catch {
-	bind $top <Control-Key-ISO_Left_Tab> {+ttk::notebook::TLCycleTab %W -1}
-	}
-	if {[tk windowingsystem] eq "aqua"} {
-	    bind $top <Option-KeyPress> \
-		+[list ttk::notebook::MnemonicActivation $top %K]
-	} else {
-	    bind $top <Alt-KeyPress> \
-		+[list ttk::notebook::MnemonicActivation $top %K]
-	}
-	bind $top <Destroy> {+ttk::notebook::TLCleanup %W}
-    }
-
-    lappend TLNotebooks($top) $nb
-}
-
-# TLCleanup -- <Destroy> binding for traversal-enabled toplevels
-#
-proc ttk::notebook::TLCleanup {w} {
-    variable TLNotebooks
-    if {$w eq [winfo toplevel $w]} {
-	unset -nocomplain -please TLNotebooks($w)
-    }
-}
-
-# Cleanup -- <Destroy> binding for notebooks
-#
-proc ttk::notebook::Cleanup {nb} {
-    variable TLNotebooks
-    set top [winfo toplevel $nb]
-    if {[info exists TLNotebooks($top)]} {
-	set index [lsearch -exact $TLNotebooks($top) $nb]
-        set TLNotebooks($top) [lreplace $TLNotebooks($top) $index $index]
-    }
-}
-
-# EnclosingNotebook $w -- 
-#	Return the nearest traversal-enabled notebook widget
-#	that contains $w.
-#
-# BUGS: this only works properly for tabs that are direct children
-#	of the notebook widget.  This routine should follow the
-#	geometry manager hierarchy, not window ancestry, but that
-#	information is not available in Tk.
-#
-proc ttk::notebook::EnclosingNotebook {w} {
-    variable TLNotebooks
-
-    set top [winfo toplevel $w]
-    if {![info exists TLNotebooks($top)]} { return }
-
-    while {$w ne $top  && $w ne ""} {
-	if {[lsearch -exact $TLNotebooks($top) $w] >= 0} {
-	    return $w
-	}
-	set w [winfo parent $w]
-    }
-    return ""
-}
-
-# TLCycleTab --
-#	toplevel binding procedure for Control-Tab / Control-Shift-Tab
-#	Select the next/previous tab in the nearest ancestor notebook. 
-#
-proc ttk::notebook::TLCycleTab {w dir} {
-    set nb [EnclosingNotebook $w]
-    if {$nb ne ""} {
-	CycleTab $nb $dir
-	return -code break
-    }
-}
-
-# MnemonicActivation $nb $key --
-#	Alt-KeyPress binding procedure for mnemonic activation.
-#	Scan all notebooks in specified toplevel for a tab with the
-#	the specified mnemonic.  If found, activate it and return TCL_BREAK.
-#
-proc ttk::notebook::MnemonicActivation {top key} {
-    variable TLNotebooks
-    foreach nb $TLNotebooks($top) {
-	if {[set tab [MnemonicTab $nb $key]] ne ""} {
-	    ActivateTab $nb [$nb index $tab]
-	    return -code break
-	}
-    }
-}
diff --git a/tk8.6/library/ttk/panedwindow.tcl b/tk8.6/library/ttk/panedwindow.tcl
deleted file mode 100644
index a2e073b..0000000
--- a/tk8.6/library/ttk/panedwindow.tcl
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Bindings for ttk::panedwindow widget.
-#
-
-namespace eval ttk::panedwindow {
-    variable State
-    array set State {
-	pressed 0
-    	pressX	-
-	pressY	-
-	sash 	-
-	sashPos -
-    }
-}
-
-## Bindings:
-#
-bind TPanedwindow <ButtonPress-1> 	{ ttk::panedwindow::Press %W %x %y }
-bind TPanedwindow <B1-Motion>		{ ttk::panedwindow::Drag %W %x %y }
-bind TPanedwindow <ButtonRelease-1> 	{ ttk::panedwindow::Release %W %x %y }
-
-bind TPanedwindow <Motion> 		{ ttk::panedwindow::SetCursor %W %x %y }
-bind TPanedwindow <Enter> 		{ ttk::panedwindow::SetCursor %W %x %y }
-bind TPanedwindow <Leave> 		{ ttk::panedwindow::ResetCursor %W }
-# See <<NOTE-PW-LEAVE-NOTIFYINFERIOR>>
-bind TPanedwindow <<EnteredChild>>	{ ttk::panedwindow::ResetCursor %W }
-
-## Sash movement:
-#
-proc ttk::panedwindow::Press {w x y} {
-    variable State
-
-    set sash [$w identify $x $y]
-    if {$sash eq ""} {
-    	set State(pressed) 0
-	return
-    }
-    set State(pressed) 	1
-    set State(pressX) 	$x
-    set State(pressY) 	$y
-    set State(sash) 	$sash
-    set State(sashPos)	[$w sashpos $sash]
-}
-
-proc ttk::panedwindow::Drag {w x y} {
-    variable State
-    if {!$State(pressed)} { return }
-    switch -- [$w cget -orient] {
-    	horizontal 	{ set delta [expr {$x - $State(pressX)}] }
-    	vertical 	{ set delta [expr {$y - $State(pressY)}] }
-    }
-    $w sashpos $State(sash) [expr {$State(sashPos) + $delta}]
-}
-
-proc ttk::panedwindow::Release {w x y} {
-    variable State
-    set State(pressed) 0
-    SetCursor $w $x $y
-}
-
-## Cursor management:
-#
-proc ttk::panedwindow::ResetCursor {w} {
-    variable State
-    if {!$State(pressed)} {
-	ttk::setCursor $w {}
-    }
-}
-
-proc ttk::panedwindow::SetCursor {w x y} {
-    set cursor ""
-    if {[llength [$w identify $x $y]]} {
-    	# Assume we're over a sash.
-	switch -- [$w cget -orient] {
-	    horizontal 	{ set cursor hresize }
-	    vertical 	{ set cursor vresize }
-	}
-    }
-    ttk::setCursor $w $cursor
-}
-
-#*EOF*
diff --git a/tk8.6/library/ttk/progress.tcl b/tk8.6/library/ttk/progress.tcl
deleted file mode 100644
index 34dce72..0000000
--- a/tk8.6/library/ttk/progress.tcl
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Ttk widget set: progress bar utilities.
-#
-
-namespace eval ttk::progressbar {
-    variable Timers	;# Map: widget name -> after ID
-}
-
-# Autoincrement --
-#	Periodic callback procedure for autoincrement mode
-#
-proc ttk::progressbar::Autoincrement {pb steptime stepsize} {
-    variable Timers
-
-    if {![winfo exists $pb]} {
-    	# widget has been destroyed -- cancel timer
-	unset -nocomplain Timers($pb)
-	return
-    }
-
-    set Timers($pb) [after $steptime \
-    	[list ttk::progressbar::Autoincrement $pb $steptime $stepsize] ]
-
-    $pb step $stepsize
-}
-
-# ttk::progressbar::start --
-#	Start autoincrement mode.  Invoked by [$pb start] widget code.
-#
-proc ttk::progressbar::start {pb {steptime 50} {stepsize 1}} {
-    variable Timers
-    if {![info exists Timers($pb)]} {
-	Autoincrement $pb $steptime $stepsize
-    }
-}
-
-# ttk::progressbar::stop --
-#	Cancel autoincrement mode. Invoked by [$pb stop] widget code.
-#
-proc ttk::progressbar::stop {pb} {
-    variable Timers
-    if {[info exists Timers($pb)]} {
-	after cancel $Timers($pb)
-	unset Timers($pb)
-    }
-    $pb configure -value 0
-}
-
-
diff --git a/tk8.6/library/ttk/scale.tcl b/tk8.6/library/ttk/scale.tcl
deleted file mode 100644
index 62c85bf..0000000
--- a/tk8.6/library/ttk/scale.tcl
+++ /dev/null
@@ -1,94 +0,0 @@
-# scale.tcl - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sourceforge.net>
-#
-# Bindings for the TScale widget
-
-namespace eval ttk::scale {
-    variable State
-    array set State  {
-	dragging 0
-    }
-}
-
-bind TScale <ButtonPress-1>   { ttk::scale::Press %W %x %y }
-bind TScale <B1-Motion>       { ttk::scale::Drag %W %x %y }
-bind TScale <ButtonRelease-1> { ttk::scale::Release %W %x %y }
-
-bind TScale <ButtonPress-2>   { ttk::scale::Jump %W %x %y }
-bind TScale <B2-Motion>       { ttk::scale::Drag %W %x %y }
-bind TScale <ButtonRelease-2> { ttk::scale::Release %W %x %y }
-
-bind TScale <ButtonPress-3>   { ttk::scale::Jump %W %x %y }
-bind TScale <B3-Motion>       { ttk::scale::Drag %W %x %y }
-bind TScale <ButtonRelease-3> { ttk::scale::Release %W %x %y }
-
-## Keyboard navigation bindings:
-#
-bind TScale <<LineStart>>     { %W set [%W cget -from] }
-bind TScale <<LineEnd>>       { %W set [%W cget -to] }
-
-bind TScale <<PrevChar>>      { ttk::scale::Increment %W -1 }
-bind TScale <<PrevLine>>      { ttk::scale::Increment %W -1 }
-bind TScale <<NextChar>>      { ttk::scale::Increment %W 1 }
-bind TScale <<NextLine>>      { ttk::scale::Increment %W 1 }
-bind TScale <<PrevWord>>      { ttk::scale::Increment %W -10 }
-bind TScale <<PrevPara>>      { ttk::scale::Increment %W -10 }
-bind TScale <<NextWord>>      { ttk::scale::Increment %W 10 }
-bind TScale <<NextPara>>      { ttk::scale::Increment %W 10 }
-
-proc ttk::scale::Press {w x y} {
-    variable State
-    set State(dragging) 0
-
-    switch -glob -- [$w identify $x $y] {
-	*track -
-        *trough {
-            set inc [expr {([$w get $x $y] <= [$w get]) ^ ([$w cget -from] > [$w cget -to]) ? -1 : 1}]
-            ttk::Repeatedly Increment $w $inc
-        }
-        *slider {
-            set State(dragging) 1
-            set State(initial) [$w get]
-        }
-    }
-}
-
-# scale::Jump -- ButtonPress-2/3 binding for scale acts like
-#	Press except that clicking in the trough jumps to the
-#	clicked position.
-proc ttk::scale::Jump {w x y} {
-    variable State
-    set State(dragging) 0
-
-    switch -glob -- [$w identify $x $y] {
-	*track -
-        *trough {
-            $w set [$w get $x $y]
-            set State(dragging) 1
-            set State(initial) [$w get]
-        }
-        *slider {
-            Press $w $x $y
-        }
-    }
-}
-
-proc ttk::scale::Drag {w x y} {
-    variable State
-    if {$State(dragging)} {
-	$w set [$w get $x $y]
-    }
-}
-
-proc ttk::scale::Release {w x y} {
-    variable State
-    set State(dragging) 0
-    ttk::CancelRepeat
-}
-
-proc ttk::scale::Increment {w delta} {
-    if {![winfo exists $w]} return
-    if {([$w cget -from] > [$w cget -to])} {
-	set delta [expr {-$delta}]
-    }
-    $w set [expr {[$w get] + $delta}]
-}
diff --git a/tk8.6/library/ttk/scrollbar.tcl b/tk8.6/library/ttk/scrollbar.tcl
deleted file mode 100644
index 4bd5107..0000000
--- a/tk8.6/library/ttk/scrollbar.tcl
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Bindings for TScrollbar widget
-#
-
-# Still don't have a working ttk::scrollbar under OSX -
-# Swap in a [tk::scrollbar] on that platform,
-# unless user specifies -class or -style.
-#
-if {[tk windowingsystem] eq "aqua"} {
-    rename ::ttk::scrollbar ::ttk::_scrollbar
-    proc ttk::scrollbar {w args} {
-	set constructor ::tk::scrollbar
-	foreach {option _} $args {
-	    if {$option eq "-class" || $option eq "-style"} {
-		set constructor ::ttk::_scrollbar
-		break
-	    }
-	}
-	return [$constructor $w {*}$args]
-    }
-}
-
-namespace eval ttk::scrollbar {
-    variable State
-    # State(xPress)	--
-    # State(yPress)	-- initial position of mouse at start of drag.
-    # State(first)	-- value of -first at start of drag.
-}
-
-bind TScrollbar <ButtonPress-1> 	{ ttk::scrollbar::Press %W %x %y }
-bind TScrollbar <B1-Motion>		{ ttk::scrollbar::Drag %W %x %y }
-bind TScrollbar <ButtonRelease-1>	{ ttk::scrollbar::Release %W %x %y }
-
-bind TScrollbar <ButtonPress-2> 	{ ttk::scrollbar::Jump %W %x %y }
-bind TScrollbar <B2-Motion>		{ ttk::scrollbar::Drag %W %x %y }
-bind TScrollbar <ButtonRelease-2>	{ ttk::scrollbar::Release %W %x %y }
-
-proc ttk::scrollbar::Scroll {w n units} {
-    set cmd [$w cget -command]
-    if {$cmd ne ""} {
-	uplevel #0 $cmd scroll $n $units
-    }
-}
-
-proc ttk::scrollbar::Moveto {w fraction} {
-    set cmd [$w cget -command]
-    if {$cmd ne ""} {
-	uplevel #0 $cmd moveto $fraction
-    }
-}
-
-proc ttk::scrollbar::Press {w x y} {
-    variable State
-
-    set State(xPress) $x
-    set State(yPress) $y
-
-    switch -glob -- [$w identify $x $y] {
-    	*uparrow -
-	*leftarrow {
-	    ttk::Repeatedly Scroll $w -1 units
-	}
-	*downarrow -
-	*rightarrow {
-	    ttk::Repeatedly Scroll $w  1 units
-	}
-	*thumb {
-	    set State(first) [lindex [$w get] 0]
-	}
-	*trough {
-	    set f [$w fraction $x $y]
-	    if {$f < [lindex [$w get] 0]} {
-		# Clicked in upper/left trough
-		ttk::Repeatedly Scroll $w -1 pages
-	    } elseif {$f > [lindex [$w get] 1]} {
-		# Clicked in lower/right trough
-		ttk::Repeatedly Scroll $w 1 pages
-	    } else {
-		# Clicked on thumb (???)
-		set State(first) [lindex [$w get] 0]
-	    }
-	}
-    }
-}
-
-proc ttk::scrollbar::Drag {w x y} {
-    variable State
-    if {![info exists State(first)]} {
-    	# Initial buttonpress was not on the thumb, 
-	# or something screwy has happened.  In either case, ignore:
-	return;
-    }
-    set xDelta [expr {$x - $State(xPress)}]
-    set yDelta [expr {$y - $State(yPress)}]
-    Moveto $w [expr {$State(first) + [$w delta $xDelta $yDelta]}]
-}
-
-proc ttk::scrollbar::Release {w x y} {
-    variable State
-    unset -nocomplain State(xPress) State(yPress) State(first)
-    ttk::CancelRepeat
-}
-
-# scrollbar::Jump -- ButtonPress-2 binding for scrollbars.
-# 	Behaves exactly like scrollbar::Press, except that
-#	clicking in the trough jumps to the the selected position.
-#
-proc ttk::scrollbar::Jump {w x y} {
-    variable State
-
-    switch -glob -- [$w identify $x $y] {
-	*thumb -
-	*trough {
-	    set State(first) [$w fraction $x $y]
-	    Moveto $w $State(first)
-	    set State(xPress) $x
-	    set State(yPress) $y
-	}
-	default {
-	    Press $w $x $y
-	}
-    }
-}
diff --git a/tk8.6/library/ttk/sizegrip.tcl b/tk8.6/library/ttk/sizegrip.tcl
deleted file mode 100644
index 153e310..0000000
--- a/tk8.6/library/ttk/sizegrip.tcl
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# Sizegrip widget bindings.
-#
-# Dragging a sizegrip widget resizes the containing toplevel.
-#
-# NOTE: the sizegrip widget must be in the lower right hand corner.
-#
-
-switch -- [tk windowingsystem] {
-    x11 -
-    win32 {
-	option add *TSizegrip.cursor [ttk::cursor seresize]
-    }
-    aqua {
-    	# Aqua sizegrips use default Arrow cursor.
-    }
-}
-
-namespace eval ttk::sizegrip {
-    variable State
-    array set State {
-	pressed 	0
-	pressX 		0
-	pressY 		0
-	width 		0
-	height 		0
-	widthInc	1
-	heightInc	1
-        resizeX         1
-        resizeY         1
-	toplevel 	{}
-    }
-}
-
-bind TSizegrip <ButtonPress-1> 		{ ttk::sizegrip::Press	%W %X %Y }
-bind TSizegrip <B1-Motion> 		{ ttk::sizegrip::Drag 	%W %X %Y }
-bind TSizegrip <ButtonRelease-1> 	{ ttk::sizegrip::Release %W %X %Y }
-
-proc ttk::sizegrip::Press {W X Y} {
-    variable State
-
-    if {[$W instate disabled]} { return }
-
-    set top [winfo toplevel $W]
-
-    # If the toplevel is not resizable then bail
-    foreach {State(resizeX) State(resizeY)} [wm resizable $top] break
-    if {!$State(resizeX) && !$State(resizeY)} {
-        return
-    }
-
-    # Sanity-checks:
-    #	If a negative X or Y position was specified for [wm geometry],
-    #   just bail out -- there's no way to handle this cleanly.
-    #
-    if {[scan [wm geometry $top] "%dx%d+%d+%d" width height x y] != 4} {
-	return;
-    }
-
-    # Account for gridded geometry:
-    #
-    set grid [wm grid $top]
-    if {[llength $grid]} {
-	set State(widthInc) [lindex $grid 2]
-	set State(heightInc) [lindex $grid 3]
-    } else {
-	set State(widthInc) [set State(heightInc) 1]
-    }
-
-    set State(toplevel) $top
-    set State(pressX) $X
-    set State(pressY) $Y
-    set State(width)  $width
-    set State(height) $height
-    set State(x)      $x
-    set State(y)      $y
-    set State(pressed) 1
-}
-
-proc ttk::sizegrip::Drag {W X Y} {
-    variable State
-    if {!$State(pressed)} { return }
-    set w $State(width)
-    set h $State(height)
-    if {$State(resizeX)} {
-        set w [expr {$w + ($X - $State(pressX))/$State(widthInc)}]
-    }
-    if {$State(resizeY)} {
-        set h [expr {$h + ($Y - $State(pressY))/$State(heightInc)}]
-    }
-    if {$w <= 0} { set w 1 }
-    if {$h <= 0} { set h 1 }
-    set x $State(x) ; set y $State(y)
-    wm geometry $State(toplevel) ${w}x${h}+${x}+${y}
-}
-
-proc ttk::sizegrip::Release {W X Y} {
-    variable State
-    set State(pressed) 0
-}
-
-#*EOF*
diff --git a/tk8.6/library/ttk/spinbox.tcl b/tk8.6/library/ttk/spinbox.tcl
deleted file mode 100644
index 1aa0ccb..0000000
--- a/tk8.6/library/ttk/spinbox.tcl
+++ /dev/null
@@ -1,173 +0,0 @@
-#
-# ttk::spinbox bindings
-#
-
-namespace eval ttk::spinbox { }
-
-### Spinbox bindings.
-#
-# Duplicate the Entry bindings, override if needed:
-#
-
-ttk::copyBindings TEntry TSpinbox
-
-bind TSpinbox <Motion>			{ ttk::spinbox::Motion %W %x %y }
-bind TSpinbox <ButtonPress-1> 		{ ttk::spinbox::Press %W %x %y }
-bind TSpinbox <ButtonRelease-1> 	{ ttk::spinbox::Release %W }
-bind TSpinbox <Double-Button-1> 	{ ttk::spinbox::DoubleClick %W %x %y }
-bind TSpinbox <Triple-Button-1> 	{} ;# disable TEntry triple-click
-
-bind TSpinbox <KeyPress-Up>		{ event generate %W <<Increment>> }
-bind TSpinbox <KeyPress-Down> 		{ event generate %W <<Decrement>> }
-
-bind TSpinbox <<Increment>>		{ ttk::spinbox::Spin %W +1 }
-bind TSpinbox <<Decrement>> 		{ ttk::spinbox::Spin %W -1 }
-
-ttk::bindMouseWheel TSpinbox 		[list ttk::spinbox::MouseWheel %W]
-
-## Motion --
-#	Sets cursor.
-#
-proc ttk::spinbox::Motion {w x y} {
-    if {   [$w identify $x $y] eq "textarea"
-        && [$w instate {!readonly !disabled}]
-    } {
-	ttk::setCursor $w text
-    } else {
-	ttk::setCursor $w ""
-    }
-}
-
-## Press --
-#
-proc ttk::spinbox::Press {w x y} {
-    if {[$w instate disabled]} { return }
-    focus $w
-    switch -glob -- [$w identify $x $y] {
-        *textarea	{ ttk::entry::Press $w $x }
-	*rightarrow	-
-        *uparrow 	{ ttk::Repeatedly event generate $w <<Increment>> }
-	*leftarrow	-
-        *downarrow	{ ttk::Repeatedly event generate $w <<Decrement>> }
-	*spinbutton {
-	    if {$y * 2 >= [winfo height $w]} {
-	    	set event <<Decrement>>
-	    } else {
-	    	set event <<Increment>>
-	    }
-	    ttk::Repeatedly event generate $w $event
-	}
-    }
-}
-
-## DoubleClick --
-#	Select all if over the text area; otherwise same as Press.
-#
-proc ttk::spinbox::DoubleClick {w x y} {
-    if {[$w instate disabled]} { return }
-
-    switch -glob -- [$w identify $x $y] {
-        *textarea	{ SelectAll $w }
-	*		{ Press $w $x $y }
-    }
-}
-
-proc ttk::spinbox::Release {w} {
-    ttk::CancelRepeat
-}
-
-## MouseWheel --
-#	Mousewheel callback.  Turn these into <<Increment>> (-1, up)
-# 	or <<Decrement> (+1, down) events.
-#
-proc ttk::spinbox::MouseWheel {w dir} {
-    if {$dir < 0} {
-	event generate $w <<Increment>>
-    } else {
-	event generate $w <<Decrement>>
-    }
-}
-
-## SelectAll --
-#	Select widget contents.
-#
-proc ttk::spinbox::SelectAll {w} {
-    $w selection range 0 end
-    $w icursor end
-}
-
-## Limit --
-#	Limit $v to lie between $min and $max
-#
-proc ttk::spinbox::Limit {v min max} {
-    if {$v < $min} { return $min }
-    if {$v > $max} { return $max }
-    return $v
-}
-
-## Wrap --
-#	Adjust $v to lie between $min and $max, wrapping if out of bounds.
-#
-proc ttk::spinbox::Wrap {v min max} {
-    if {$v < $min} { return $max }
-    if {$v > $max} { return $min }
-    return $v
-}
-
-## Adjust --
-#	Limit or wrap spinbox value depending on -wrap.
-#
-proc ttk::spinbox::Adjust {w v min max} {
-    if {[$w cget -wrap]} {
-	return [Wrap $v $min $max]
-    } else  {
-	return [Limit $v $min $max]
-    }
-}
-
-## Spin --
-#	Handle <<Increment>> and <<Decrement>> events.
-#	If -values is specified, cycle through the list.
-#	Otherwise cycle through numeric range based on
-#	-from, -to, and -increment.
-#
-proc ttk::spinbox::Spin {w dir} {
-    set nvalues [llength [set values [$w cget -values]]]
-    set value [$w get]
-    if {$nvalues} {
-	set current [lsearch -exact $values $value]
-	set index [Adjust $w [expr {$current + $dir}] 0 [expr {$nvalues - 1}]]
-	$w set [lindex $values $index]
-    } else {
-        if {[catch {
-    	    set v [expr {[scan [$w get] %f] + $dir * [$w cget -increment]}]
-	}]} {
-	    set v [$w cget -from]
-	}
-	$w set [FormatValue $w [Adjust $w $v [$w cget -from] [$w cget -to]]]
-    }
-    SelectAll $w
-    uplevel #0 [$w cget -command]
-}
-
-## FormatValue --
-#	Reformat numeric value based on -format.
-#
-proc ttk::spinbox::FormatValue {w val} {
-    set fmt [$w cget -format]
-    if {$fmt eq ""} {
-	# Try to guess a suitable -format based on -increment.
-	set delta [expr {abs([$w cget -increment])}]
-        if {0 < $delta && $delta < 1} {
-	    # NB: This guesses wrong if -increment has more than 1
-	    # significant digit itself, e.g., -increment 0.25
-	    set nsd [expr {int(ceil(-log10($delta)))}]
-	    set fmt "%.${nsd}f"
-	} else {
-	    set fmt "%.0f"
-	}
-    }
-    return [format $fmt $val]
-}
-
-#*EOF*
diff --git a/tk8.6/library/ttk/treeview.tcl b/tk8.6/library/ttk/treeview.tcl
deleted file mode 100644
index 8772587..0000000
--- a/tk8.6/library/ttk/treeview.tcl
+++ /dev/null
@@ -1,363 +0,0 @@
-#
-# ttk::treeview widget bindings and utilities.
-#
-
-namespace eval ttk::treeview {
-    variable State
-
-    # Enter/Leave/Motion
-    #
-    set State(activeWidget) 	{}
-    set State(activeHeading) 	{}
-
-    # Press/drag/release:
-    #
-    set State(pressMode) 	none
-    set State(pressX)		0
-
-    # For pressMode == "resize"
-    set State(resizeColumn)	#0
-
-    # For pressmode == "heading"
-    set State(heading)  	{}
-}
-
-### Widget bindings.
-#
-
-bind Treeview	<Motion> 		{ ttk::treeview::Motion %W %x %y }
-bind Treeview	<B1-Leave>		{ #nothing }
-bind Treeview	<Leave>			{ ttk::treeview::ActivateHeading {} {}}
-bind Treeview	<ButtonPress-1> 	{ ttk::treeview::Press %W %x %y }
-bind Treeview	<Double-ButtonPress-1> 	{ ttk::treeview::DoubleClick %W %x %y }
-bind Treeview	<ButtonRelease-1> 	{ ttk::treeview::Release %W %x %y }
-bind Treeview	<B1-Motion> 		{ ttk::treeview::Drag %W %x %y }
-bind Treeview 	<KeyPress-Up>    	{ ttk::treeview::Keynav %W up }
-bind Treeview 	<KeyPress-Down>  	{ ttk::treeview::Keynav %W down }
-bind Treeview 	<KeyPress-Right> 	{ ttk::treeview::Keynav %W right }
-bind Treeview 	<KeyPress-Left>  	{ ttk::treeview::Keynav %W left }
-bind Treeview	<KeyPress-Prior>	{ %W yview scroll -1 pages }
-bind Treeview	<KeyPress-Next> 	{ %W yview scroll  1 pages }
-bind Treeview	<KeyPress-Return>	{ ttk::treeview::ToggleFocus %W }
-bind Treeview	<KeyPress-space>	{ ttk::treeview::ToggleFocus %W }
-
-bind Treeview	<Shift-ButtonPress-1> \
-		{ ttk::treeview::Select %W %x %y extend }
-bind Treeview	<<ToggleSelection>> \
-		{ ttk::treeview::Select %W %x %y toggle }
-
-ttk::copyBindings TtkScrollable Treeview 
-
-### Binding procedures.
-#
-
-## Keynav -- Keyboard navigation
-#
-# @@@ TODO: verify/rewrite up and down code.
-#
-proc ttk::treeview::Keynav {w dir} {
-    set focus [$w focus]
-    if {$focus eq ""} { return }
-
-    switch -- $dir {
-	up {
-	    if {[set up [$w prev $focus]] eq ""} {
-	        set focus [$w parent $focus]
-	    } else {
-		while {[$w item $up -open] && [llength [$w children $up]]} {
-		    set up [lindex [$w children $up] end]
-		}
-		set focus $up
-	    }
-	}
-	down {
-	    if {[$w item $focus -open] && [llength [$w children $focus]]} {
-	        set focus [lindex [$w children $focus] 0]
-	    } else {
-		set up $focus
-		while {$up ne "" && [set down [$w next $up]] eq ""} {
-		    set up [$w parent $up]
-		}
-		set focus $down
-	    }
-	}
-	left {
-	    if {[$w item $focus -open] && [llength [$w children $focus]]} {
-	    	CloseItem $w $focus
-	    } else {
-	    	set focus [$w parent $focus]
-	    }
-	}
-	right {
-	    OpenItem $w $focus
-	}
-    }
-
-    if {$focus != {}} {
-	SelectOp $w $focus choose
-    }
-}
-
-## Motion -- pointer motion binding.
-#	Sets cursor, active element ...
-#
-proc ttk::treeview::Motion {w x y} {
-    set cursor {}
-    set activeHeading {}
-
-    switch -- [$w identify region $x $y] {
-	separator { set cursor hresize }
-	heading { set activeHeading [$w identify column $x $y] }
-    }
-
-    ttk::setCursor $w $cursor
-    ActivateHeading $w $activeHeading
-}
-
-## ActivateHeading -- track active heading element
-#
-proc ttk::treeview::ActivateHeading {w heading} {
-    variable State
-
-    if {$w != $State(activeWidget) || $heading != $State(activeHeading)} {
-	if {$State(activeHeading) != {}} {
-	    $State(activeWidget) heading $State(activeHeading) state !active
-	}
-	if {$heading != {}} {
-	    $w heading $heading state active
-	}
-	set State(activeHeading) $heading
-	set State(activeWidget) $w
-    }
-}
-
-## Select $w $x $y $selectop
-#	Binding procedure for selection operations.
-#	See "Selection modes", below.
-#
-proc ttk::treeview::Select {w x y op} {
-    if {[set item [$w identify row $x $y]] ne "" } {
-	SelectOp $w $item $op
-    }
-}
-
-## DoubleClick -- Double-ButtonPress-1 binding.
-#
-proc ttk::treeview::DoubleClick {w x y} {
-    if {[set row [$w identify row $x $y]] ne ""} {
-	Toggle $w $row
-    } else {
-	Press $w $x $y ;# perform single-click action
-    }
-}
-
-## Press -- ButtonPress binding.
-#
-proc ttk::treeview::Press {w x y} {
-    focus $w
-    switch -- [$w identify region $x $y] {
-	nothing { }
-	heading { heading.press $w $x $y }
-	separator { resize.press $w $x $y }
-	tree -
-	cell {
-	    set item [$w identify item $x $y]
-	    SelectOp $w $item choose
-	    switch -glob -- [$w identify element $x $y] {
-		*indicator -
-		*disclosure { Toggle $w $item }
-	    }
-	}
-    }
-}
-
-## Drag -- B1-Motion binding
-#
-proc ttk::treeview::Drag {w x y} {
-    variable State
-    switch $State(pressMode) {
-	resize	{ resize.drag $w $x }
-	heading	{ heading.drag $w $x $y }
-    }
-}
-
-proc ttk::treeview::Release {w x y} {
-    variable State
-    switch $State(pressMode) {
-	resize	{ resize.release $w $x }
-	heading	{ heading.release $w }
-    }
-    set State(pressMode) none
-    Motion $w $x $y
-}
-
-### Interactive column resizing.
-#
-proc ttk::treeview::resize.press {w x y} {
-    variable State
-    set State(pressMode) "resize"
-    set State(resizeColumn) [$w identify column $x $y]
-}
-
-proc ttk::treeview::resize.drag {w x} {
-    variable State
-    $w drag $State(resizeColumn) $x
-}
-
-proc ttk::treeview::resize.release {w x} {
-    # no-op
-}
-
-### Heading activation.
-#
-
-proc ttk::treeview::heading.press {w x y} {
-    variable State
-    set column [$w identify column $x $y]
-    set State(pressMode) "heading"
-    set State(heading) $column
-    $w heading $column state pressed
-}
-
-proc ttk::treeview::heading.drag {w x y} {
-    variable State
-    if {   [$w identify region $x $y] eq "heading"
-        && [$w identify column $x $y] eq $State(heading)
-    } {
-    	$w heading $State(heading) state pressed
-    } else {
-    	$w heading $State(heading) state !pressed
-    }
-}
-
-proc ttk::treeview::heading.release {w} {
-    variable State
-    if {[lsearch -exact [$w heading $State(heading) state] pressed] >= 0} {
-	after 0 [$w heading $State(heading) -command]
-    }
-    $w heading $State(heading) state !pressed
-}
-
-### Selection modes.
-#
-
-## SelectOp $w $item [ choose | extend | toggle ] --
-#	Dispatch to appropriate selection operation
-#	depending on current value of -selectmode.
-#
-proc ttk::treeview::SelectOp {w item op} {
-    select.$op.[$w cget -selectmode] $w $item
-}
-
-## -selectmode none:
-#
-proc ttk::treeview::select.choose.none {w item} { $w focus $item }
-proc ttk::treeview::select.toggle.none {w item} { $w focus $item }
-proc ttk::treeview::select.extend.none {w item} { $w focus $item }
-
-## -selectmode browse:
-#
-proc ttk::treeview::select.choose.browse {w item} { BrowseTo $w $item }
-proc ttk::treeview::select.toggle.browse {w item} { BrowseTo $w $item }
-proc ttk::treeview::select.extend.browse {w item} { BrowseTo $w $item }
-
-## -selectmode multiple:
-#
-proc ttk::treeview::select.choose.extended {w item} {
-    BrowseTo $w $item
-}
-proc ttk::treeview::select.toggle.extended {w item} {
-    $w selection toggle [list $item]
-}
-proc ttk::treeview::select.extend.extended {w item} {
-    if {[set anchor [$w focus]] ne ""} {
-	$w selection set [between $w $anchor $item]
-    } else {
-    	BrowseTo $w $item
-    }
-}
-
-### Tree structure utilities.
-#
-
-## between $tv $item1 $item2 --
-#	Returns a list of all items between $item1 and $item2,
-#	in preorder traversal order.  $item1 and $item2 may be
-#	in either order.
-#
-# NOTES:
-#	This routine is O(N) in the size of the tree.
-#	There's probably a way to do this that's O(N) in the number
-#	of items returned, but I'm not clever enough to figure it out.
-#
-proc ttk::treeview::between {tv item1 item2} {
-    variable between [list]
-    variable selectingBetween 0
-    ScanBetween $tv $item1 $item2 {}
-    return $between
-}
-
-## ScanBetween --
-#	Recursive worker routine for ttk::treeview::between
-#
-proc ttk::treeview::ScanBetween {tv item1 item2 item} {
-    variable between
-    variable selectingBetween
-
-    if {$item eq $item1 || $item eq $item2} {
-    	lappend between $item
-	set selectingBetween [expr {!$selectingBetween}]
-    } elseif {$selectingBetween} {
-    	lappend between $item
-    }
-    foreach child [$tv children $item] {
-	ScanBetween $tv $item1 $item2 $child
-    }
-}
-
-### User interaction utilities.
-#
-
-## OpenItem, CloseItem -- Set the open state of an item, generate event
-#
-
-proc ttk::treeview::OpenItem {w item} {
-    $w focus $item
-    event generate $w <<TreeviewOpen>>
-    $w item $item -open true
-}
-
-proc ttk::treeview::CloseItem {w item} {
-    $w item $item -open false
-    $w focus $item
-    event generate $w <<TreeviewClose>>
-}
-
-## Toggle -- toggle opened/closed state of item
-#
-proc ttk::treeview::Toggle {w item} {
-    if {[$w item $item -open]} {
-	CloseItem $w $item
-    } else {
-	OpenItem $w $item
-    }
-}
-
-## ToggleFocus -- toggle opened/closed state of focus item
-#
-proc ttk::treeview::ToggleFocus {w} {
-    set item [$w focus]
-    if {$item ne ""} {
-    	Toggle $w $item
-    }
-}
-
-## BrowseTo -- navigate to specified item; set focus and selection
-#
-proc ttk::treeview::BrowseTo {w item} {
-    $w see $item
-    $w focus $item
-    $w selection set [list $item]
-}
-
-#*EOF*
diff --git a/tk8.6/library/ttk/ttk.tcl b/tk8.6/library/ttk/ttk.tcl
deleted file mode 100644
index 7bae211..0000000
--- a/tk8.6/library/ttk/ttk.tcl
+++ /dev/null
@@ -1,176 +0,0 @@
-#
-# Ttk widget set initialization script.
-#
-
-### Source library scripts.
-#
-
-namespace eval ::ttk {
-    variable library
-    if {![info exists library]} {
-	set library [file dirname [info script]]
-    }
-}
-
-source [file join $::ttk::library fonts.tcl]
-source [file join $::ttk::library cursors.tcl]
-source [file join $::ttk::library utils.tcl]
-
-## ttk::deprecated $old $new --
-#	Define $old command as a deprecated alias for $new command
-#	$old and $new must be fully namespace-qualified.
-#
-proc ttk::deprecated {old new} {
-    interp alias {} $old {} ttk::do'deprecate $old $new
-}
-## do'deprecate --
-#	Implementation procedure for deprecated commands --
-#	issue a warning (once), then re-alias old to new.
-#
-proc ttk::do'deprecate {old new args} {
-    deprecated'warning $old $new
-    interp alias {} $old {} $new
-    uplevel 1 [linsert $args 0 $new]
-}
-
-## deprecated'warning --
-#	Gripe about use of deprecated commands.
-#
-proc ttk::deprecated'warning {old new} {
-    puts stderr "$old deprecated -- use $new instead"
-}
-
-### Backward-compatibility.
-#
-#
-# Make [package require tile] an effective no-op;
-# see SF#3016598 for discussion.
-#
-package ifneeded tile 0.8.6 { package provide tile 0.8.6 }
-
-# ttk::panedwindow used to be named ttk::paned.  Keep the alias for now.
-#
-::ttk::deprecated ::ttk::paned ::ttk::panedwindow
-
-### ::ttk::ThemeChanged --
-#	Called from [::ttk::style theme use].
-#	Sends a <<ThemeChanged>> virtual event to all widgets.
-#
-proc ::ttk::ThemeChanged {} {
-    set Q .
-    while {[llength $Q]} {
-	set QN [list]
-	foreach w $Q {
-	    event generate $w <<ThemeChanged>>
-	    foreach child [winfo children $w] {
-		lappend QN $child
-	    }
-	}
-	set Q $QN
-    }
-}
-
-### Public API.
-#
-
-proc ::ttk::themes {{ptn *}} {
-    set themes [list]
-
-    foreach pkg [lsearch -inline -all -glob [package names] ttk::theme::$ptn] {
-	lappend themes [namespace tail $pkg]
-    }
-
-    return $themes
-}
-
-## ttk::setTheme $theme --
-#	Set the current theme to $theme, loading it if necessary.
-#
-proc ::ttk::setTheme {theme} {
-    variable currentTheme ;# @@@ Temp -- [::ttk::style theme use] doesn't work
-    if {$theme ni [::ttk::style theme names]} {
-	package require ttk::theme::$theme
-    }
-    ::ttk::style theme use $theme
-    set currentTheme $theme
-}
-
-### Load widget bindings.
-#
-source [file join $::ttk::library button.tcl]
-source [file join $::ttk::library menubutton.tcl]
-source [file join $::ttk::library scrollbar.tcl]
-source [file join $::ttk::library scale.tcl]
-source [file join $::ttk::library progress.tcl]
-source [file join $::ttk::library notebook.tcl]
-source [file join $::ttk::library panedwindow.tcl]
-source [file join $::ttk::library entry.tcl]
-source [file join $::ttk::library combobox.tcl]	;# dependency: entry.tcl
-source [file join $::ttk::library spinbox.tcl]  ;# dependency: entry.tcl
-source [file join $::ttk::library treeview.tcl]
-source [file join $::ttk::library sizegrip.tcl]
-
-## Label and Labelframe bindings:
-#  (not enough to justify their own file...)
-#
-bind TLabelframe <<Invoke>>	{ tk::TabToWindow [tk_focusNext %W] }
-bind TLabel <<Invoke>>		{ tk::TabToWindow [tk_focusNext %W] }
-
-### Load settings for built-in themes:
-#
-proc ttk::LoadThemes {} {
-    variable library
-
-    # "default" always present:
-    uplevel #0 [list source [file join $library defaults.tcl]] 
-
-    set builtinThemes [style theme names]
-    foreach {theme scripts} {
-	classic 	classicTheme.tcl
-	alt 		altTheme.tcl
-	clam 		clamTheme.tcl
-	winnative	winTheme.tcl
-	xpnative	{xpTheme.tcl vistaTheme.tcl}
-	aqua 		aquaTheme.tcl
-    } {
-	if {[lsearch -exact $builtinThemes $theme] >= 0} {
-            foreach script $scripts {
-                uplevel #0 [list source [file join $library $script]]
-            }
-	}
-    }
-}
-
-ttk::LoadThemes; rename ::ttk::LoadThemes {}
-
-### Select platform-specific default theme:
-#
-# Notes:
-#	+ On OSX, aqua theme is the default
-#	+ On Windows, xpnative takes precedence over winnative if available.
-#	+ On X11, users can use the X resource database to
-#	  specify a preferred theme (*TkTheme: themeName);
-#	  otherwise "default" is used.
-#
-
-proc ttk::DefaultTheme {} {
-    set preferred [list aqua vista xpnative winnative]
-
-    set userTheme [option get . tkTheme TkTheme]
-    if {$userTheme ne {} && ![catch {
-	uplevel #0 [list package require ttk::theme::$userTheme]
-    }]} {
-	return $userTheme
-    }
-
-    foreach theme $preferred {
-	if {[package provide ttk::theme::$theme] ne ""} {
-	    return $theme
-	}
-    }
-    return "default"
-}
-
-ttk::setTheme [ttk::DefaultTheme] ; rename ttk::DefaultTheme {}
-
-#*EOF*
diff --git a/tk8.6/library/ttk/utils.tcl b/tk8.6/library/ttk/utils.tcl
deleted file mode 100644
index 7cc1bb7..0000000
--- a/tk8.6/library/ttk/utils.tcl
+++ /dev/null
@@ -1,350 +0,0 @@
-#
-# Utilities for widget implementations.
-#
-
-### Focus management.
-#
-# See also: #1516479
-#
-
-## ttk::takefocus --
-#	This is the default value of the "-takefocus" option
-#	for ttk::* widgets that participate in keyboard navigation.
-#
-# NOTES:
-#	tk::FocusOK (called by tk_focusNext) tests [winfo viewable]
-#	if -takefocus is 1, empty, or missing; but not if it's a
-#	script prefix, so we have to check that here as well.
-#
-#
-proc ttk::takefocus {w} {
-    expr {[$w instate !disabled] && [winfo viewable $w]}
-}
-
-## ttk::GuessTakeFocus --
-#	This routine is called as a fallback for widgets
-#	with a missing or empty -takefocus option.
-#
-#	It implements the same heuristics as tk::FocusOK.
-#
-proc ttk::GuessTakeFocus {w} {
-    # Don't traverse to widgets with '-state disabled':
-    #
-    if {![catch {$w cget -state} state] && $state eq "disabled"} {
-	return 0
-    }
-
-    # Allow traversal to widgets with explicit key or focus bindings:
-    #
-    if {[regexp {Key|Focus} [concat [bind $w] [bind [winfo class $w]]]]} {
-	return 1;
-    }
-
-    # Default is nontraversable:
-    #
-    return 0;
-}
-
-## ttk::traverseTo $w --
-# 	Set the keyboard focus to the specified window.
-#
-proc ttk::traverseTo {w} {
-    set focus [focus]
-    if {$focus ne ""} {
-	event generate $focus <<TraverseOut>>
-    }
-    focus $w
-    event generate $w <<TraverseIn>>
-}
-
-## ttk::clickToFocus $w --
-#	Utility routine, used in <ButtonPress-1> bindings --
-#	Assign keyboard focus to the specified widget if -takefocus is enabled.
-#
-proc ttk::clickToFocus {w} {
-    if {[ttk::takesFocus $w]} { focus $w }
-}
-
-## ttk::takesFocus w --
-#	Test if the widget can take keyboard focus.
-#
-#	See the description of the -takefocus option in options(n)
-#	for details.
-#
-proc ttk::takesFocus {w} {
-    if {![winfo viewable $w]} {
-    	return 0
-    } elseif {[catch {$w cget -takefocus} takefocus]} {
-	return [GuessTakeFocus $w]
-    } else {
-	switch -- $takefocus {
-	    "" { return [GuessTakeFocus $w] }
-	    0  { return 0 }
-	    1  { return 1 }
-	    default {
-		return [expr {[uplevel #0 $takefocus [list $w]] == 1}]
-	    }
-	}
-    }
-}
-
-## ttk::focusFirst $w --
-#	Return the first descendant of $w, in preorder traversal order,
-#	that can take keyboard focus, "" if none do.
-#
-# See also: tk_focusNext
-#
-
-proc ttk::focusFirst {w} {
-    if {[ttk::takesFocus $w]} {
-	return $w
-    }
-    foreach child [winfo children $w] {
-	if {[set c [ttk::focusFirst $child]] ne ""} {
-	    return $c
-	}
-    }
-    return ""
-}
-
-### Grabs.
-#
-# Rules:
-#	Each call to [grabWindow $w] or [globalGrab $w] must be
-#	matched with a call to [releaseGrab $w] in LIFO order.
-#
-#	Do not call [grabWindow $w] for a window that currently
-#	appears on the grab stack.
-#
-#	See #1239190 and #1411983 for more discussion.
-#
-namespace eval ttk {
-    variable Grab 		;# map: window name -> grab token
-
-    # grab token details:
-    #	Two-element list containing:
-    #	1) a script to evaluate to restore the previous grab (if any);
-    #	2) a script to evaluate to restore the focus (if any)
-}
-
-## SaveGrab --
-#	Record current grab and focus windows.
-#
-proc ttk::SaveGrab {w} {
-    variable Grab
-
-    if {[info exists Grab($w)]} {
-	# $w is already on the grab stack.
-	# This should not happen, but bail out in case it does anyway:
-	#
-	return
-    }
-
-    set restoreGrab [set restoreFocus ""]
-
-    set grabbed [grab current $w]
-    if {[winfo exists $grabbed]} {
-    	switch [grab status $grabbed] {
-	    global { set restoreGrab [list grab -global $grabbed] }
-	    local  { set restoreGrab [list grab $grabbed] }
-	    none   { ;# grab window is really in a different interp }
-	}
-    }
-
-    set focus [focus]
-    if {$focus ne ""} {
-    	set restoreFocus [list focus -force $focus]
-    }
-
-    set Grab($w) [list $restoreGrab $restoreFocus]
-}
-
-## RestoreGrab --
-#	Restore previous grab and focus windows.
-#	If called more than once without an intervening [SaveGrab $w],
-#	does nothing.
-#
-proc ttk::RestoreGrab {w} {
-    variable Grab
-
-    if {![info exists Grab($w)]} {	# Ignore
-	return;
-    }
-
-    # The previous grab/focus window may have been destroyed,
-    # unmapped, or some other abnormal condition; ignore any errors.
-    #
-    foreach script $Grab($w) {
-	catch $script
-    }
-
-    unset Grab($w)
-}
-
-## ttk::grabWindow $w --
-#	Records the current focus and grab windows, sets an application-modal
-#	grab on window $w.
-#
-proc ttk::grabWindow {w} {
-    SaveGrab $w
-    grab $w
-}
-
-## ttk::globalGrab $w --
-#	Same as grabWindow, but sets a global grab on $w.
-#
-proc ttk::globalGrab {w} {
-    SaveGrab $w
-    grab -global $w
-}
-
-## ttk::releaseGrab --
-#	Release the grab previously set by [ttk::grabWindow]
-#	or [ttk::globalGrab].
-#
-proc ttk::releaseGrab {w} {
-    grab release $w
-    RestoreGrab $w
-}
-
-### Auto-repeat.
-#
-# NOTE: repeating widgets do not have -repeatdelay
-# or -repeatinterval resources as in standard Tk;
-# instead a single set of settings is applied application-wide.
-# (TODO: make this user-configurable)
-#
-# (@@@ Windows seems to use something like 500/50 milliseconds
-#  @@@ for -repeatdelay/-repeatinterval)
-#
-
-namespace eval ttk {
-    variable Repeat
-    array set Repeat {
-	delay		300
-	interval	100
-	timer		{}
-	script		{}
-    }
-}
-
-## ttk::Repeatedly --
-#	Begin auto-repeat.
-#
-proc ttk::Repeatedly {args} {
-    variable Repeat
-    after cancel $Repeat(timer)
-    set script [uplevel 1 [list namespace code $args]]
-    set Repeat(script) $script
-    uplevel #0 $script
-    set Repeat(timer) [after $Repeat(delay) ttk::Repeat]
-}
-
-## Repeat --
-#	Continue auto-repeat
-#
-proc ttk::Repeat {} {
-    variable Repeat
-    uplevel #0 $Repeat(script)
-    set Repeat(timer) [after $Repeat(interval) ttk::Repeat]
-}
-
-## ttk::CancelRepeat --
-#	Halt auto-repeat.
-#
-proc ttk::CancelRepeat {} {
-    variable Repeat
-    after cancel $Repeat(timer)
-}
-
-### Bindings.
-#
-
-## ttk::copyBindings $from $to --
-#	Utility routine; copies bindings from one bindtag onto another.
-#
-proc ttk::copyBindings {from to} {
-    foreach event [bind $from] {
-	bind $to $event [bind $from $event]
-    }
-}
-
-### Mousewheel bindings.
-#
-# Platform inconsistencies:
-#
-# On X11, the server typically maps the mouse wheel to Button4 and Button5.
-#
-# On OSX, Tk generates sensible values for the %D field in <MouseWheel> events.
-#
-# On Windows, %D must be scaled by a factor of 120.
-# In addition, Tk redirects mousewheel events to the window with
-# keyboard focus instead of sending them to the window under the pointer.
-# We do not attempt to fix that here, see also TIP#171.
-#
-# OSX conventionally uses Shift+MouseWheel for horizontal scrolling,
-# and Option+MouseWheel for accelerated scrolling.
-#
-# The Shift+MouseWheel behavior is not conventional on Windows or most
-# X11 toolkits, but it's useful.
-#
-# MouseWheel scrolling is accelerated on X11, which is conventional
-# for Tk and appears to be conventional for other toolkits (although
-# Gtk+ and Qt do not appear to use as large a factor).
-#
-
-## ttk::bindMouseWheel $bindtag $command...
-#	Adds basic mousewheel support to $bindtag.
-#	$command will be passed one additional argument
-#	specifying the mousewheel direction (-1: up, +1: down).
-#
-
-proc ttk::bindMouseWheel {bindtag callback} {
-    switch -- [tk windowingsystem] {
-	x11 {
-	    bind $bindtag <ButtonPress-4> "$callback -1"
-	    bind $bindtag <ButtonPress-5> "$callback +1"
-	}
-	win32 {
-	    bind $bindtag <MouseWheel> [append callback { [expr {-(%D/120)}]}]
-	}
-	aqua {
-	    bind $bindtag <MouseWheel> [append callback { [expr {-(%D)}]} ]
-	}
-    }
-}
-
-## Mousewheel bindings for standard scrollable widgets.
-#
-# Usage: [ttk::copyBindings TtkScrollable $bindtag]
-#
-# $bindtag should be for a widget that supports the
-# standard scrollbar protocol.
-#
-
-switch -- [tk windowingsystem] {
-    x11 {
-	bind TtkScrollable <ButtonPress-4>       { %W yview scroll -5 units }
-	bind TtkScrollable <ButtonPress-5>       { %W yview scroll  5 units }
-	bind TtkScrollable <Shift-ButtonPress-4> { %W xview scroll -5 units }
-	bind TtkScrollable <Shift-ButtonPress-5> { %W xview scroll  5 units }
-    }
-    win32 {
-	bind TtkScrollable <MouseWheel> \
-	    { %W yview scroll [expr {-(%D/120)}] units }
-	bind TtkScrollable <Shift-MouseWheel> \
-	    { %W xview scroll [expr {-(%D/120)}] units }
-    }
-    aqua {
-	bind TtkScrollable <MouseWheel> \
-	    { %W yview scroll [expr {-(%D)}] units }
-	bind TtkScrollable <Shift-MouseWheel> \
-	    { %W xview scroll [expr {-(%D)}] units }
-	bind TtkScrollable <Option-MouseWheel> \
-	    { %W yview scroll  [expr {-10*(%D)}] units }
-	bind TtkScrollable <Shift-Option-MouseWheel> \
-	    { %W xview scroll [expr {-10*(%D)}] units }
-    }
-}
-
-#*EOF*
diff --git a/tk8.6/library/ttk/vistaTheme.tcl b/tk8.6/library/ttk/vistaTheme.tcl
deleted file mode 100644
index 3f75f51..0000000
--- a/tk8.6/library/ttk/vistaTheme.tcl
+++ /dev/null
@@ -1,224 +0,0 @@
-#
-# Settings for Microsoft Windows Vista and Server 2008
-#
-
-# The Vista theme can only be defined on Windows Vista and above. The theme
-# is created in C due to the need to assign a theme-enabled function for 
-# detecting when themeing is disabled. On systems that cannot support the
-# Vista theme, there will be no such theme created and we must not
-# evaluate this script.
-
-if {"vista" ni [ttk::style theme names]} {
-    return
-}
-
-namespace eval ttk::theme::vista {
-
-    ttk::style theme settings vista {
-
- 	ttk::style configure . \
-	    -background SystemButtonFace \
-	    -foreground SystemWindowText \
-	    -selectforeground SystemHighlightText \
-	    -selectbackground SystemHighlight \
-	    -font TkDefaultFont \
-	    ;
-
-	ttk::style map "." \
-	    -foreground [list disabled SystemGrayText] \
-	    ;
-
-	ttk::style configure TButton -anchor center -padding {1 1} -width -11
-	ttk::style configure TRadiobutton -padding 2
-	ttk::style configure TCheckbutton -padding 2
-	ttk::style configure TMenubutton -padding {8 4}
-
-	ttk::style element create Menubutton.dropdown vsapi \
-	    TOOLBAR 4 {{selected active} 6 {selected !active} 5
-		disabled 4 pressed 3 active 2 {} 1} \
-	    -syssize {SM_CXVSCROLL SM_CYVSCROLL}
-
-	ttk::style configure TNotebook -tabmargins {2 2 2 0}
-	ttk::style map TNotebook.Tab \
-	    -expand [list selected {2 2 2 2}]
-
-	# Treeview:
-	ttk::style configure Heading -font TkHeadingFont
-	ttk::style configure Treeview -background SystemWindow
-	ttk::style map Treeview \
-	    -background [list selected SystemHighlight] \
-	    -foreground [list selected SystemHighlightText] ;
-
-        # Label and Toolbutton
-	ttk::style configure TLabelframe.Label -foreground "#0046d5"
-
-	ttk::style configure Toolbutton -padding {4 4}
-
-        # Combobox
-	ttk::style configure TCombobox -padding 2
-        ttk::style element create Combobox.field vsapi \
-            COMBOBOX 2 {{} 1}
-        ttk::style element create Combobox.border vsapi \
-            COMBOBOX 4 {disabled 4 focus 3 active 2 hover 2 {} 1}
-        ttk::style element create Combobox.rightdownarrow vsapi \
-            COMBOBOX 6 {disabled 4 pressed 3 active 2 {} 1} \
-            -syssize {SM_CXVSCROLL SM_CYVSCROLL}
-        ttk::style layout TCombobox {
-            Combobox.border -sticky nswe -border 0 -children {
-                Combobox.rightdownarrow -side right -sticky ns
-                Combobox.padding -expand 1 -sticky nswe -children {
-                    Combobox.focus -expand 1 -sticky nswe -children {
-                        Combobox.textarea -sticky nswe
-                    }
-                }
-            }
-        }
-        # Vista.Combobox droplist frame
-        ttk::style element create ComboboxPopdownFrame.background vsapi\
-            LISTBOX 3 {disabled 4 active 3 focus 2 {} 1}
-        ttk::style layout ComboboxPopdownFrame {
-            ComboboxPopdownFrame.background -sticky news -border 1 -children {
-                ComboboxPopdownFrame.padding -sticky news
-            }
-        }
-	ttk::style map TCombobox \
-	    -selectbackground [list !focus SystemWindow] \
-	    -selectforeground [list !focus SystemWindowText] \
-	    -foreground	[list \
-		disabled		SystemGrayText \
-	    	{readonly focus}	SystemHighlightText \
-	    ] \
-	    -focusfill	[list {readonly focus} SystemHighlight] \
-	    ;
-
-        # Entry
-        ttk::style configure TEntry -padding {1 1 1 1} ;# Needs lookup
-        ttk::style element create Entry.field vsapi \
-            EDIT 6 {disabled 4 focus 3 hover 2 {} 1} -padding {2 2 2 2}
-        ttk::style element create Entry.background vsapi \
-            EDIT 3 {disabled 3 readonly 3 focus 4 hover 2 {} 1}
-        ttk::style layout TEntry {
-            Entry.field -sticky news -border 0 -children {
-                Entry.background -sticky news -children {
-                    Entry.padding -sticky news -children {
-                        Entry.textarea -sticky news
-                    }
-                }
-            }
-        }
-	ttk::style map TEntry \
-	    -selectbackground [list !focus SystemWindow] \
-	    -selectforeground [list !focus SystemWindowText] \
-	    ;
-
-        # Spinbox
-        ttk::style configure TSpinbox -padding 0
-        ttk::style element create Spinbox.field vsapi \
-            EDIT 9 {disabled 4 focus 3 hover 2 {} 1} -padding {1 1 1 2}
-        ttk::style element create Spinbox.background vsapi \
-            EDIT 3 {disabled 3 readonly 3 focus 4 hover 2 {} 1}
-        ttk::style element create Spinbox.innerbg vsapi \
-            EDIT 3 {disabled 3 readonly 3 focus 4 hover 2 {} 1}\
-            -padding {2 0 15 2}
-        ttk::style element create Spinbox.uparrow vsapi \
-            SPIN 1 {disabled 4 pressed 3 active 2 {} 1} \
-            -padding 1 -halfheight 1 \
-            -syssize { SM_CXVSCROLL SM_CYVSCROLL }
-        ttk::style element create Spinbox.downarrow vsapi \
-            SPIN 2 {disabled 4 pressed 3 active 2 {} 1} \
-            -padding 1 -halfheight 1 \
-            -syssize { SM_CXVSCROLL SM_CYVSCROLL }
-        ttk::style layout TSpinbox {
-            Spinbox.field -sticky nswe -children {
-                Spinbox.background -sticky news -children {
-                    Spinbox.padding -sticky news -children {
-                        Spinbox.innerbg -sticky news -children {
-                            Spinbox.textarea -expand 1
-                        }
-                    }
-                    Spinbox.uparrow -side top -sticky ens
-                    Spinbox.downarrow -side bottom -sticky ens
-                }
-            }
-        }
-	ttk::style map TSpinbox \
-	    -selectbackground [list !focus SystemWindow] \
-	    -selectforeground [list !focus SystemWindowText] \
-	    ;
-
-        
-        # SCROLLBAR elements (Vista includes a state for 'hover')
-        ttk::style element create Vertical.Scrollbar.uparrow vsapi \
-            SCROLLBAR 1 {disabled 4 pressed 3 active 2 hover 17 {} 1} \
-            -syssize {SM_CXVSCROLL SM_CYVSCROLL}
-        ttk::style element create Vertical.Scrollbar.downarrow vsapi \
-            SCROLLBAR 1 {disabled 8 pressed 7 active 6 hover 18 {} 5} \
-            -syssize {SM_CXVSCROLL SM_CYVSCROLL}
-        ttk::style element create Vertical.Scrollbar.trough vsapi \
-            SCROLLBAR 7 {disabled 4 pressed 3 active 2 hover 5 {} 1}
-        ttk::style element create Vertical.Scrollbar.thumb vsapi \
-            SCROLLBAR 3 {disabled 4 pressed 3 active 2 hover 5 {} 1} \
-            -syssize {SM_CXVSCROLL SM_CYVSCROLL}
-        ttk::style element create Vertical.Scrollbar.grip vsapi \
-            SCROLLBAR 9 {disabled 4 pressed 3 active 2 hover 5 {} 1} \
-            -syssize {SM_CXVSCROLL SM_CYVSCROLL}
-        ttk::style element create Horizontal.Scrollbar.leftarrow vsapi \
-            SCROLLBAR 1 {disabled 12 pressed 11 active 10 hover 19 {} 9} \
-            -syssize {SM_CXHSCROLL SM_CYHSCROLL}
-        ttk::style element create Horizontal.Scrollbar.rightarrow vsapi \
-            SCROLLBAR 1 {disabled 16 pressed 15 active 14 hover 20 {} 13} \
-            -syssize {SM_CXHSCROLL SM_CYHSCROLL}
-        ttk::style element create Horizontal.Scrollbar.trough vsapi \
-            SCROLLBAR 5 {disabled 4 pressed 3 active 2 hover 5 {} 1}
-        ttk::style element create Horizontal.Scrollbar.thumb vsapi \
-            SCROLLBAR 2 {disabled 4 pressed 3 active 2 hover 5 {} 1} \
-            -syssize {SM_CXHSCROLL SM_CYHSCROLL}
-        ttk::style element create Horizontal.Scrollbar.grip vsapi \
-            SCROLLBAR 8 {disabled 4 pressed 3 active 2 hover 5 {} 1}
-
-        # Progressbar
-        ttk::style element create Horizontal.Progressbar.pbar vsapi \
-            PROGRESS 3 {{} 1} -padding 8
-        ttk::style layout Horizontal.TProgressbar {
-            Horizontal.Progressbar.trough -sticky nswe -children {
-                Horizontal.Progressbar.pbar -side left -sticky ns
-            }
-        }
-        ttk::style element create Vertical.Progressbar.pbar vsapi \
-            PROGRESS 3 {{} 1} -padding 8
-        ttk::style layout Vertical.TProgressbar {
-            Vertical.Progressbar.trough -sticky nswe -children {
-                Vertical.Progressbar.pbar -side bottom -sticky we
-            }
-        }
-        
-        # Scale
-        ttk::style element create Horizontal.Scale.slider vsapi \
-            TRACKBAR 3 {disabled 5 focus 4 pressed 3 active 2 {} 1} \
-            -width 6 -height 12
-        ttk::style layout Horizontal.TScale {
-            Scale.focus -expand 1 -sticky nswe -children {
-                Horizontal.Scale.trough -expand 1 -sticky nswe -children {
-                    Horizontal.Scale.track -sticky we
-                    Horizontal.Scale.slider -side left -sticky {}
-                }
-            }
-        }
-        ttk::style element create Vertical.Scale.slider vsapi \
-            TRACKBAR 6 {disabled 5 focus 4 pressed 3 active 2 {} 1} \
-            -width 12 -height 6
-        ttk::style layout Vertical.TScale {
-            Scale.focus -expand 1 -sticky nswe -children {
-                Vertical.Scale.trough -expand 1 -sticky nswe -children {
-                    Vertical.Scale.track -sticky ns
-                    Vertical.Scale.slider -side top -sticky {}
-                }
-            }
-        }
-        
-        # Treeview
-        ttk::style configure Item -padding {4 0 0 0}
-        
-        package provide ttk::theme::vista 1.0
-    }
-}
diff --git a/tk8.6/library/ttk/winTheme.tcl b/tk8.6/library/ttk/winTheme.tcl
deleted file mode 100644
index 55367bc..0000000
--- a/tk8.6/library/ttk/winTheme.tcl
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Settings for 'winnative' theme.
-#
-
-namespace eval ttk::theme::winnative {
-    ttk::style theme settings winnative {
-
-	ttk::style configure "." \
-	    -background SystemButtonFace \
-	    -foreground SystemWindowText \
-	    -selectforeground SystemHighlightText \
-	    -selectbackground SystemHighlight \
-	    -troughcolor SystemScrollbar \
-	    -font TkDefaultFont \
-	    ;
-
-	ttk::style map "." -foreground [list disabled SystemGrayText] ;
-        ttk::style map "." -embossed [list disabled 1] ;
-
-	ttk::style configure TButton \
-	    -anchor center -width -11 -relief raised -shiftrelief 1
-	ttk::style configure TCheckbutton -padding "2 4"
-	ttk::style configure TRadiobutton -padding "2 4"
-	ttk::style configure TMenubutton \
-	    -padding "8 4" -arrowsize 3 -relief raised
-
-	ttk::style map TButton -relief {{!disabled pressed} sunken}
-
-	ttk::style configure TEntry \
-	    -padding 2 -selectborderwidth 0 -insertwidth 1
-	ttk::style map TEntry \
-	    -fieldbackground \
-	    	[list readonly SystemButtonFace disabled SystemButtonFace] \
-	    -selectbackground [list !focus SystemWindow] \
-	    -selectforeground [list !focus SystemWindowText] \
-	    ;
-
-	ttk::style configure TCombobox -padding 2
-	ttk::style map TCombobox \
-	    -selectbackground [list !focus SystemWindow] \
-	    -selectforeground [list !focus SystemWindowText] \
-	    -fieldbackground [list \
-	    	readonly SystemButtonFace \
-		disabled SystemButtonFace] \
-	    -foreground	[list \
-		disabled		SystemGrayText \
-	    	{readonly focus}	SystemHighlightText \
-	    ] \
-	    -focusfill	[list {readonly focus} SystemHighlight] \
-	    ;
-
-	ttk::style element create ComboboxPopdownFrame.border from default
-	ttk::style configure ComboboxPopdownFrame \
-	    -borderwidth 1 -relief solid
-
-        ttk::style configure TSpinbox -padding {2 0 16 0}
-
-	ttk::style configure TLabelframe -borderwidth 2 -relief groove
-
-	ttk::style configure Toolbutton -relief flat -padding {8 4}
-	ttk::style map Toolbutton -relief \
-	    {disabled flat selected sunken  pressed sunken  active raised}
-
-	ttk::style configure TScale -groovewidth 4
-
-	ttk::style configure TNotebook -tabmargins {2 2 2 0}
-	ttk::style configure TNotebook.Tab -padding {3 1} -borderwidth 1
-	ttk::style map TNotebook.Tab -expand [list selected {2 2 2 0}]
-
-	# Treeview:
-	ttk::style configure Heading -font TkHeadingFont -relief raised
-	ttk::style configure Treeview -background SystemWindow
-	ttk::style map Treeview \
-	    -background [list selected SystemHighlight] \
-	    -foreground [list selected SystemHighlightText] ;
-
-        ttk::style configure TProgressbar \
-	    -background SystemHighlight -borderwidth 0 ;
-    }
-}
diff --git a/tk8.6/library/ttk/xpTheme.tcl b/tk8.6/library/ttk/xpTheme.tcl
deleted file mode 100644
index 187ce0b..0000000
--- a/tk8.6/library/ttk/xpTheme.tcl
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# Settings for 'xpnative' theme
-#
-
-namespace eval ttk::theme::xpnative {
-
-    ttk::style theme settings xpnative {
-
-	ttk::style configure . \
-	    -background SystemButtonFace \
-	    -foreground SystemWindowText \
-	    -selectforeground SystemHighlightText \
-	    -selectbackground SystemHighlight \
-	    -font TkDefaultFont \
-	    ;
-
-	ttk::style map "." \
-	    -foreground [list disabled SystemGrayText] \
-	    ;
-
-	ttk::style configure TButton -anchor center -padding {1 1} -width -11
-	ttk::style configure TRadiobutton -padding 2
-	ttk::style configure TCheckbutton -padding 2
-	ttk::style configure TMenubutton -padding {8 4}
-
-	ttk::style configure TNotebook -tabmargins {2 2 2 0}
-	ttk::style map TNotebook.Tab \
-	    -expand [list selected {2 2 2 2}]
-
-	# Treeview:
-	ttk::style configure Heading -font TkHeadingFont
-	ttk::style configure Treeview -background SystemWindow
-	ttk::style map Treeview \
-	    -background [list selected SystemHighlight] \
-	    -foreground [list selected SystemHighlightText] ;
-
-	ttk::style configure TLabelframe.Label -foreground "#0046d5"
-
-	# OR: -padding {3 3 3 6}, which some apps seem to use.
-	ttk::style configure TEntry -padding {2 2 2 4}
-	ttk::style map TEntry \
-	    -selectbackground [list !focus SystemWindow] \
-	    -selectforeground [list !focus SystemWindowText] \
-	    ;
-	ttk::style configure TCombobox -padding 2
-	ttk::style map TCombobox \
-	    -selectbackground [list !focus SystemWindow] \
-	    -selectforeground [list !focus SystemWindowText] \
-	    -foreground	[list \
-		disabled		SystemGrayText \
-	    	{readonly focus}	SystemHighlightText \
-	    ] \
-	    -focusfill	[list {readonly focus} SystemHighlight] \
-	    ;
-
-	ttk::style configure TSpinbox -padding {2 0 14 0}
-	ttk::style map TSpinbox \
-	    -selectbackground [list !focus SystemWindow] \
-	    -selectforeground [list !focus SystemWindowText] \
-	    ;
-
-	ttk::style configure Toolbutton -padding {4 4}
-
-    }
-}
diff --git a/tk8.6/library/unsupported.tcl b/tk8.6/library/unsupported.tcl
deleted file mode 100644
index b5f404a..0000000
--- a/tk8.6/library/unsupported.tcl
+++ /dev/null
@@ -1,269 +0,0 @@
-# unsupported.tcl --
-#
-# Commands provided by Tk without official support.  Use them at your
-# own risk.  They may change or go away without notice.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-
-# ----------------------------------------------------------------------
-# Unsupported compatibility interface for folks accessing Tk's private
-# commands and variable against recommended usage.
-# ----------------------------------------------------------------------
-
-namespace eval ::tk::unsupported {
-
-    # Map from the old global names of Tk private commands to their
-    # new namespace-encapsulated names.
-
-    variable PrivateCommands
-    array set PrivateCommands {
-	tkButtonAutoInvoke		::tk::ButtonAutoInvoke
-	tkButtonDown			::tk::ButtonDown
-	tkButtonEnter			::tk::ButtonEnter
-	tkButtonInvoke			::tk::ButtonInvoke
-	tkButtonLeave			::tk::ButtonLeave
-	tkButtonUp			::tk::ButtonUp
-	tkCancelRepeat			::tk::CancelRepeat
-	tkCheckRadioDown		::tk::CheckRadioDown
-	tkCheckRadioEnter		::tk::CheckRadioEnter
-	tkCheckRadioInvoke		::tk::CheckRadioInvoke
-	tkColorDialog			::tk::dialog::color::
-	tkColorDialog_BuildDialog	::tk::dialog::color::BuildDialog
-	tkColorDialog_CancelCmd		::tk::dialog::color::CancelCmd
-	tkColorDialog_Config		::tk::dialog::color::Config
-	tkColorDialog_CreateSelector	::tk::dialog::color::CreateSelector
-	tkColorDialog_DrawColorScale	::tk::dialog::color::DrawColorScale
-	tkColorDialog_EnterColorBar	::tk::dialog::color::EnterColorBar
-	tkColorDialog_InitValues	::tk::dialog::color::InitValues
-	tkColorDialog_HandleRGBEntry	::tk::dialog::color::HandleRGBEntry
-	tkColorDialog_HandleSelEntry	::tk::dialog::color::HandleSelEntry
-	tkColorDialog_LeaveColorBar	::tk::dialog::color::LeaveColorBar
-	tkColorDialog_MoveSelector	::tk::dialog::color::MoveSelector
-	tkColorDialog_OkCmd		::tk::dialog::color::OkCmd
-	tkColorDialog_RedrawColorBars	::tk::dialog::color::RedrawColorBars
-	tkColorDialog_RedrawFinalColor	::tk::dialog::color::RedrawFinalColor
-	tkColorDialog_ReleaseMouse	::tk::dialog::color::ReleaseMouse
-	tkColorDialog_ResizeColorBars	::tk::dialog::color::ResizeColorBars
-	tkColorDialog_RgbToX		::tk::dialog::color::RgbToX
-	tkColorDialog_SetRGBValue	::tk::dialog::color::SetRGBValue
-	tkColorDialog_StartMove		::tk::dialog::color::StartMove
-	tkColorDialog_XToRgb		::tk::dialog::color::XToRGB
-	tkConsoleAbout			::tk::ConsoleAbout
-	tkConsoleBind			::tk::ConsoleBind
-	tkConsoleExit			::tk::ConsoleExit
-	tkConsoleHistory		::tk::ConsoleHistory
-	tkConsoleInit			::tk::ConsoleInit
-	tkConsoleInsert			::tk::ConsoleInsert
-	tkConsoleInvoke			::tk::ConsoleInvoke
-	tkConsoleOutput			::tk::ConsoleOutput
-	tkConsolePrompt			::tk::ConsolePrompt
-	tkConsoleSource			::tk::ConsoleSource
-	tkDarken			::tk::Darken
-	tkEntryAutoScan			::tk::EntryAutoScan
-	tkEntryBackspace		::tk::EntryBackspace
-	tkEntryButton1			::tk::EntryButton1
-	tkEntryClosestGap		::tk::EntryClosestGap
-	tkEntryGetSelection		::tk::EntryGetSelection
-	tkEntryInsert			::tk::EntryInsert
-	tkEntryKeySelect		::tk::EntryKeySelect
-	tkEntryMouseSelect		::tk::EntryMouseSelect
-	tkEntryNextWord			::tk::EntryNextWord
-	tkEntryPaste			::tk::EntryPaste
-	tkEntryPreviousWord		::tk::EntryPreviousWord
-	tkEntrySeeInsert		::tk::EntrySeeInsert
-	tkEntrySetCursor		::tk::EntrySetCursor
-	tkEntryTranspose		::tk::EntryTranspose
-	tkEventMotifBindings		::tk::EventMotifBindings
-	tkFDGetFileTypes		::tk::FDGetFileTypes
-	tkFirstMenu			::tk::FirstMenu
-	tkFocusGroup_BindIn		::tk::FocusGroup_BindIn
-	tkFocusGroup_BindOut		::tk::FocusGroup_BindOut
-	tkFocusGroup_Create		::tk::FocusGroup_Create
-	tkFocusGroup_Destroy		::tk::FocusGroup_Destroy
-	tkFocusGroup_In			::tk::FocusGroup_In
-	tkFocusGroup_Out		::tk::FocusGroup_Out
-	tkFocusOK			::tk::FocusOK
-	tkGenerateMenuSelect		::tk::GenerateMenuSelect
-	tkIconList			::tk::IconList
-	tkListbox			::tk::Listbox
-	tkListboxAutoScan		::tk::ListboxAutoScan
-	tkListboxBeginExtend		::tk::ListboxBeginExtend
-	tkListboxBeginSelect		::tk::ListboxBeginSelect
-	tkListboxBeginToggle		::tk::ListboxBeginToggle
-	tkListboxCancel			::tk::ListboxCancel
-	tkListboxDataExtend		::tk::ListboxDataExtend
-	tkListboxExtendUpDown		::tk::ListboxExtendUpDown
-	tkListboxKeyAccel_Goto		::tk::ListboxKeyAccel_Goto
-	tkListboxKeyAccel_Key		::tk::ListboxKeyAccel_Key
-	tkListboxKeyAccel_Reset		::tk::ListboxKeyAccel_Reset
-	tkListboxKeyAccel_Set		::tk::ListboxKeyAccel_Set
-	tkListboxKeyAccel_Unset		::tk::ListboxKeyAccel_Unxet
-	tkListboxMotion			::tk::ListboxMotion
-	tkListboxSelectAll		::tk::ListboxSelectAll
-	tkListboxUpDown			::tk::ListboxUpDown
-	tkListboxBeginToggle		::tk::ListboxBeginToggle
-	tkMbButtonUp			::tk::MbButtonUp
-	tkMbEnter			::tk::MbEnter
-	tkMbLeave			::tk::MbLeave
-	tkMbMotion			::tk::MbMotion
-	tkMbPost			::tk::MbPost
-	tkMenuButtonDown		::tk::MenuButtonDown
-	tkMenuDownArrow			::tk::MenuDownArrow
-	tkMenuDup			::tk::MenuDup
-	tkMenuEscape			::tk::MenuEscape
-	tkMenuFind			::tk::MenuFind
-	tkMenuFindName			::tk::MenuFindName
-	tkMenuFirstEntry		::tk::MenuFirstEntry
-	tkMenuInvoke			::tk::MenuInvoke
-	tkMenuLeave			::tk::MenuLeave
-	tkMenuLeftArrow			::tk::MenuLeftArrow
-	tkMenuMotion			::tk::MenuMotion
-	tkMenuNextEntry			::tk::MenuNextEntry
-	tkMenuNextMenu			::tk::MenuNextMenu
-	tkMenuRightArrow		::tk::MenuRightArrow
-	tkMenuUnpost			::tk::MenuUnpost
-	tkMenuUpArrow			::tk::MenuUpArrow
-	tkMessageBox			::tk::MessageBox
-	tkMotifFDialog			::tk::MotifFDialog
-	tkMotifFDialog_ActivateDList	::tk::MotifFDialog_ActivateDList
-	tkMotifFDialog_ActivateFList	::tk::MotifFDialog_ActivateFList
-	tkMotifFDialog_ActivateFEnt	::tk::MotifFDialog_ActivateFEnt
-	tkMotifFDialog_ActivateSEnt	::tk::MotifFDialog_ActivateSEnt
-	tkMotifFDialog			::tk::MotifFDialog
-	tkMotifFDialog_BrowseDList	::tk::MotifFDialog_BrowseDList
-	tkMotifFDialog_BrowseFList	::tk::MotifFDialog_BrowseFList
-	tkMotifFDialog_BuildUI		::tk::MotifFDialog_BuildUI
-	tkMotifFDialog_CancelCmd	::tk::MotifFDialog_CancelCmd
-	tkMotifFDialog_Config		::tk::MotifFDialog_Config
-	tkMotifFDialog_Create		::tk::MotifFDialog_Create
-	tkMotifFDialog_FileTypes	::tk::MotifFDialog_FileTypes
-	tkMotifFDialog_FilterCmd	::tk::MotifFDialog_FilterCmd
-	tkMotifFDialog_InterpFilter	::tk::MotifFDialog_InterpFilter
-	tkMotifFDialog_LoadFiles	::tk::MotifFDialog_LoadFiles
-	tkMotifFDialog_MakeSList	::tk::MotifFDialog_MakeSList
-	tkMotifFDialog_OkCmd		::tk::MotifFDialog_OkCmd
-	tkMotifFDialog_SetFilter	::tk::MotifFDialog_SetFilter
-	tkMotifFDialog_SetListMode	::tk::MotifFDialog_SetListMode
-	tkMotifFDialog_Update		::tk::MotifFDialog_Update
-	tkPostOverPoint			::tk::PostOverPoint
-	tkRecolorTree			::tk::RecolorTree
-	tkRestoreOldGrab		::tk::RestoreOldGrab
-	tkSaveGrabInfo			::tk::SaveGrabInfo
-	tkScaleActivate			::tk::ScaleActivate
-	tkScaleButtonDown		::tk::ScaleButtonDown
-	tkScaleButton2Down		::tk::ScaleButton2Down
-	tkScaleControlPress		::tk::ScaleControlPress
-	tkScaleDrag			::tk::ScaleDrag
-	tkScaleEndDrag			::tk::ScaleEndDrag
-	tkScaleIncrement		::tk::ScaleIncrement
-	tkScreenChanged			::tk::ScreenChanged
-	tkScrollButtonDown		::tk::ScrollButtonDown
-	tkScrollButton2Down		::tk::ScrollButton2Down
-	tkScrollButtonDrag		::tk::ScrollButtonDrag
-	tkScrollButtonUp		::tk::ScrollButtonUp
-	tkScrollByPages			::tk::ScrollByPages
-	tkScrollByUnits			::tk::ScrollByUnits
-	tkScrollEndDrag			::tk::ScrollEndDrag
-	tkScrollSelect			::tk::ScrollSelect
-	tkScrollStartDrag		::tk::ScrollStartDrag
-	tkScrollTopBottom		::tk::ScrollTopBottom
-	tkScrollToPos			::tk::ScrollToPos
-	tkTabToWindow			::tk::TabToWindow
-	tkTearOffMenu			::tk::TearOffMenu
-	tkTextAutoScan			::tk::TextAutoScan
-	tkTextButton1			::tk::TextButton1
-	tkTextClosestGap		::tk::TextClosestGap
-	tkTextInsert			::tk::TextInsert
-	tkTextKeyExtend			::tk::TextKeyExtend
-	tkTextKeySelect			::tk::TextKeySelect
-	tkTextNextPara			::tk::TextNextPara
-	tkTextNextPos			::tk::TextNextPos
-	tkTextNextWord			::tk::TextNextWord
-	tkTextPaste			::tk::TextPaste
-	tkTextPrevPara			::tk::TextPrevPara
-	tkTextPrevPos			::tk::TextPrevPos
-	tkTextPrevWord			::tk::TextPrevWord
-	tkTextResetAnchor		::tk::TextResetAnchor
-	tkTextScrollPages		::tk::TextScrollPages
-	tkTextSelectTo			::tk::TextSelectTo
-	tkTextSetCursor			::tk::TextSetCursor
-	tkTextTranspose			::tk::TextTranspose
-	tkTextUpDownLine		::tk::TextUpDownLine
-	tkTraverseToMenu		::tk::TraverseToMenu
-	tkTraverseWithinMenu		::tk::TraverseWithinMenu
-	unsupported1			::tk::unsupported::MacWindowStyle
-    }
-
-    # Map from the old global names of Tk private variable to their
-    # new namespace-encapsulated names.
-
-    variable PrivateVariables
-    array set PrivateVariables {
-	droped_to_start		::tk::mac::Droped_to_start
-	histNum			::tk::HistNum
-	stub_location		::tk::mac::Stub_location
-	tkFocusIn		::tk::FocusIn
-	tkFocusOut		::tk::FocusOut
-	tkPalette		::tk::Palette
-	tkPriv			::tk::Priv
-	tkPrivMsgBox		::tk::PrivMsgBox
-    }
-}
-
-# ::tk::unsupported::ExposePrivateCommand --
-#
-#	Expose one of Tk's private commands to be visible under its
-#	old global name
-#
-# Arguments:
-#	cmd	Global name by which the command was once known,
-#               or a glob-style pattern.
-#
-# Results:
-#	None.
-#
-# Side effects:
-#	The old command name in the global namespace is aliased to the
-#	new private name.
-
-proc ::tk::unsupported::ExposePrivateCommand {cmd} {
-    variable PrivateCommands
-    set cmds [array get PrivateCommands $cmd]
-    if {[llength $cmds] == 0} {
-	return -code error -errorcode {TK EXPOSE_PRIVATE_COMMAND} \
-	    "No compatibility support for \[$cmd]"
-    }
-    foreach {old new} $cmds {
-	namespace eval :: [list interp alias {} $old {}] $new
-    }
-}
-
-# ::tk::unsupported::ExposePrivateVariable --
-#
-#	Expose one of Tk's private variables to be visible under its
-#	old global name
-#
-# Arguments:
-#	var	Global name by which the variable was once known,
-#               or a glob-style pattern.
-#
-# Results:
-#	None.
-#
-# Side effects:
-#	The old variable name in the global namespace is aliased to the
-#	new private name.
-
-proc ::tk::unsupported::ExposePrivateVariable {var} {
-    variable PrivateVariables
-    set vars [array get PrivateVariables $var]
-    if {[llength $vars] == 0} {
-	return -code error -errorcode {TK EXPOSE_PRIVATE_VARIABLE} \
-	    "No compatibility support for \$$var"
-    }
-    namespace eval ::tk::mac {}
-    foreach {old new} $vars {
-	namespace eval :: [list upvar "#0" $new $old]
-    }
-}
diff --git a/tk8.6/library/xmfbox.tcl b/tk8.6/library/xmfbox.tcl
deleted file mode 100644
index 14d2be5..0000000
--- a/tk8.6/library/xmfbox.tcl
+++ /dev/null
@@ -1,989 +0,0 @@
-# xmfbox.tcl --
-#
-#	Implements the "Motif" style file selection dialog for the
-#	Unix platform. This implementation is used only if the
-#	"::tk_strictMotif" flag is set.
-#
-# Copyright (c) 1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-2000 Scriptics Corporation
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-
-namespace eval ::tk::dialog {}
-namespace eval ::tk::dialog::file {}
-
-
-# ::tk::MotifFDialog --
-#
-#	Implements a file dialog similar to the standard Motif file
-#	selection box.
-#
-# Arguments:
-#	type		"open" or "save"
-#	args		Options parsed by the procedure.
-#
-# Results:
-#	When -multiple is set to 0, this returns the absolute pathname
-#	of the selected file. (NOTE: This is not the same as a single
-#	element list.)
-#
-#	When -multiple is set to > 0, this returns a Tcl list of absolute
-#       pathnames. The argument for -multiple is ignored, but for consistency
-#       with Windows it defines the maximum amount of memory to allocate for
-#       the returned filenames.
-
-proc ::tk::MotifFDialog {type args} {
-    variable ::tk::Priv
-    set dataName __tk_filedialog
-    upvar ::tk::dialog::file::$dataName data
-
-    set w [MotifFDialog_Create $dataName $type $args]
-
-    # Set a grab and claim the focus too.
-
-    ::tk::SetFocusGrab $w $data(sEnt)
-    $data(sEnt) selection range 0 end
-
-    # Wait for the user to respond, then restore the focus and
-    # return the index of the selected button.  Restore the focus
-    # before deleting the window, since otherwise the window manager
-    # may take the focus away so we can't redirect it.  Finally,
-    # restore any grab that was in effect.
-
-    vwait ::tk::Priv(selectFilePath)
-    set result $Priv(selectFilePath)
-    ::tk::RestoreFocusGrab $w $data(sEnt) withdraw
-
-    return $result
-}
-
-# ::tk::MotifFDialog_Create --
-#
-#	Creates the Motif file dialog (if it doesn't exist yet) and
-#	initialize the internal data structure associated with the
-#	dialog.
-#
-#	This procedure is used by ::tk::MotifFDialog to create the
-#	dialog. It's also used by the test suite to test the Motif
-#	file dialog implementation. User code shouldn't call this
-#	procedure directly.
-#
-# Arguments:
-#	dataName	Name of the global "data" array for the file dialog.
-#	type		"Save" or "Open"
-#	argList		Options parsed by the procedure.
-#
-# Results:
-#	Pathname of the file dialog.
-
-proc ::tk::MotifFDialog_Create {dataName type argList} {
-    upvar ::tk::dialog::file::$dataName data
-
-    MotifFDialog_Config $dataName $type $argList
-
-    if {$data(-parent) eq "."} {
-        set w .$dataName
-    } else {
-        set w $data(-parent).$dataName
-    }
-
-    # (re)create the dialog box if necessary
-    #
-    if {![winfo exists $w]} {
-	MotifFDialog_BuildUI $w
-    } elseif {[winfo class $w] ne "TkMotifFDialog"} {
-	destroy $w
-	MotifFDialog_BuildUI $w
-    } else {
-	set data(fEnt) $w.top.f1.ent
-	set data(dList) $w.top.f2.a.l
-	set data(fList) $w.top.f2.b.l
-	set data(sEnt) $w.top.f3.ent
-	set data(okBtn) $w.bot.ok
-	set data(filterBtn) $w.bot.filter
-	set data(cancelBtn) $w.bot.cancel
-    }
-    MotifFDialog_SetListMode $w
-
-    # Dialog boxes should be transient with respect to their parent,
-    # so that they will always stay on top of their parent window.  However,
-    # some window managers will create the window as withdrawn if the parent
-    # window is withdrawn or iconified.  Combined with the grab we put on the
-    # window, this can hang the entire application.  Therefore we only make
-    # the dialog transient if the parent is viewable.
-
-    if {[winfo viewable [winfo toplevel $data(-parent)]] } {
-	wm transient $w $data(-parent)
-    }
-
-    MotifFDialog_FileTypes $w
-    MotifFDialog_Update $w
-
-    # Withdraw the window, then update all the geometry information
-    # so we know how big it wants to be, then center the window in the
-    # display (Motif style) and de-iconify it.
-
-    ::tk::PlaceWindow $w
-    wm title $w $data(-title)
-
-    return $w
-}
-
-# ::tk::MotifFDialog_FileTypes --
-#
-#	Checks the -filetypes option. If present this adds a list of radio-
-#	buttons to pick the file types from.
-#
-# Arguments:
-#	w		Pathname of the tk_get*File dialogue.
-#
-# Results:
-#	none
-
-proc ::tk::MotifFDialog_FileTypes {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    set f $w.top.f3.types
-    destroy $f
-
-    # No file types: use "*" as the filter and display no radio-buttons
-    if {$data(-filetypes) eq ""} {
-	set data(filter) *
-	return
-    }
-
-    # The filetypes radiobuttons
-    # set data(fileType) $data(-defaulttype)
-    # Default type to first entry
-    set initialTypeName [lindex $data(origfiletypes) 0 0]
-    if {$data(-typevariable) ne ""} {
-	upvar #0 $data(-typevariable) typeVariable
-	if {[info exists typeVariable]} {
-	    set initialTypeName $typeVariable
-	}
-    }
-    set ix 0
-    set data(fileType) 0
-    foreach fltr $data(origfiletypes) {
-	set fname [lindex $fltr 0]
-	if {[string first $initialTypeName $fname] == 0} {
-	    set data(fileType) $ix
-	    break
-	}
-	incr ix
-    }
-
-    MotifFDialog_SetFilter $w [lindex $data(-filetypes) $data(fileType)]
-
-    #don't produce radiobuttons for only one filetype
-    if {[llength $data(-filetypes)] == 1} {
-	return
-    }
-
-    frame $f
-    set cnt 0
-    if {$data(-filetypes) ne {}} {
-	foreach type $data(-filetypes) {
-	    set title  [lindex $type 0]
-	    set filter [lindex $type 1]
-	    radiobutton $f.b$cnt \
-		-text $title \
-		-variable ::tk::dialog::file::[winfo name $w](fileType) \
-		-value $cnt \
-		-command [list tk::MotifFDialog_SetFilter $w $type]
-	    pack $f.b$cnt -side left
-	    incr cnt
-	}
-    }
-    $f.b$data(fileType) invoke
-
-    pack $f -side bottom -fill both
-
-    return
-}
-
-# This proc gets called whenever data(filter) is set
-#
-proc ::tk::MotifFDialog_SetFilter {w type} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-    variable ::tk::Priv
-
-    set data(filter) [lindex $type 1]
-    set Priv(selectFileType) [lindex [lindex $type 0] 0]
-
-    MotifFDialog_Update $w
-}
-
-# ::tk::MotifFDialog_Config --
-#
-#	Iterates over the optional arguments to determine the option
-#	values for the Motif file dialog; gives default values to
-#	unspecified options.
-#
-# Arguments:
-#	dataName	The name of the global variable in which
-#			data for the file dialog is stored.
-#	type		"Save" or "Open"
-#	argList		Options parsed by the procedure.
-
-proc ::tk::MotifFDialog_Config {dataName type argList} {
-    upvar ::tk::dialog::file::$dataName data
-
-    set data(type) $type
-
-    # 1: the configuration specs
-    #
-    set specs {
-	{-defaultextension "" "" ""}
-	{-filetypes "" "" ""}
-	{-initialdir "" "" ""}
-	{-initialfile "" "" ""}
-	{-parent "" "" "."}
-	{-title "" "" ""}
-	{-typevariable "" "" ""}
-    }
-    if {$type eq "open"} {
-	lappend specs {-multiple "" "" "0"}
-    }
-    if {$type eq "save"} {
-	lappend specs {-confirmoverwrite "" "" "1"}
-    }
-
-    set data(-multiple) 0
-    set data(-confirmoverwrite) 1
-    # 2: default values depending on the type of the dialog
-    #
-    if {![info exists data(selectPath)]} {
-	# first time the dialog has been popped up
-	set data(selectPath) [pwd]
-	set data(selectFile) ""
-    }
-
-    # 3: parse the arguments
-    #
-    tclParseConfigSpec ::tk::dialog::file::$dataName $specs "" $argList
-
-    if {$data(-title) eq ""} {
-	if {$type eq "open"} {
-	    if {$data(-multiple) != 0} {
-		set data(-title) "[mc {Open Multiple Files}]"
-	    } else {
-		set data(-title) [mc "Open"]
-	    }
-	} else {
-	    set data(-title) [mc "Save As"]
-	}
-    }
-
-    # 4: set the default directory and selection according to the -initial
-    #    settings
-    #
-    if {$data(-initialdir) ne ""} {
-	if {[file isdirectory $data(-initialdir)]} {
-	    set data(selectPath) [lindex [glob $data(-initialdir)] 0]
-	} else {
-	    set data(selectPath) [pwd]
-	}
-
-	# Convert the initialdir to an absolute path name.
-
-	set old [pwd]
-	cd $data(selectPath)
-	set data(selectPath) [pwd]
-	cd $old
-    }
-    set data(selectFile) $data(-initialfile)
-
-    # 5. Parse the -filetypes option. It is not used by the motif
-    #    file dialog, but we check for validity of the value to make sure
-    #    the application code also runs fine with the TK file dialog.
-    #
-    set data(origfiletypes) $data(-filetypes)
-    set data(-filetypes) [::tk::FDGetFileTypes $data(-filetypes)]
-
-    if {![info exists data(filter)]} {
-	set data(filter) *
-    }
-    if {![winfo exists $data(-parent)]} {
-	return -code error -errorcode [list TK LOOKUP WINDOW $data(-parent)] \
-	    "bad window path name \"$data(-parent)\""
-    }
-}
-
-# ::tk::MotifFDialog_BuildUI --
-#
-#	Builds the UI components of the Motif file dialog.
-#
-# Arguments:
-# 	w		Pathname of the dialog to build.
-#
-# Results:
-# 	None.
-
-proc ::tk::MotifFDialog_BuildUI {w} {
-    set dataName [lindex [split $w .] end]
-    upvar ::tk::dialog::file::$dataName data
-
-    # Create the dialog toplevel and internal frames.
-    #
-    toplevel $w -class TkMotifFDialog
-    set top [frame $w.top -relief raised -bd 1]
-    set bot [frame $w.bot -relief raised -bd 1]
-
-    pack $w.bot -side bottom -fill x
-    pack $w.top -side top -expand yes -fill both
-
-    set f1 [frame $top.f1]
-    set f2 [frame $top.f2]
-    set f3 [frame $top.f3]
-
-    pack $f1 -side top    -fill x
-    pack $f3 -side bottom -fill x
-    pack $f2 -expand yes -fill both
-
-    set f2a [frame $f2.a]
-    set f2b [frame $f2.b]
-
-    grid $f2a -row 0 -column 0 -rowspan 1 -columnspan 1 -padx 4 -pady 4 \
-	-sticky news
-    grid $f2b -row 0 -column 1 -rowspan 1 -columnspan 1 -padx 4 -pady 4 \
-	-sticky news
-    grid rowconfigure $f2 0    -minsize 0   -weight 1
-    grid columnconfigure $f2 0 -minsize 0   -weight 1
-    grid columnconfigure $f2 1 -minsize 150 -weight 2
-
-    # The Filter box
-    #
-    bind [::tk::AmpWidget label $f1.lab -text [mc "Fil&ter:"] -anchor w] \
-	<<AltUnderlined>> [list focus $f1.ent]
-    entry $f1.ent
-    pack $f1.lab -side top -fill x -padx 6 -pady 4
-    pack $f1.ent -side top -fill x -padx 4 -pady 0
-    set data(fEnt) $f1.ent
-
-    # The file and directory lists
-    #
-    set data(dList) [MotifFDialog_MakeSList $w $f2a \
-	    [mc "&Directory:"] DList]
-    set data(fList) [MotifFDialog_MakeSList $w $f2b \
-	    [mc "Fi&les:"]     FList]
-
-    # The Selection box
-    #
-    bind [::tk::AmpWidget label $f3.lab -text [mc "&Selection:"] -anchor w] \
-	<<AltUnderlined>> [list focus $f3.ent]
-    entry $f3.ent
-    pack $f3.lab -side top -fill x -padx 6 -pady 0
-    pack $f3.ent -side top -fill x -padx 4 -pady 4
-    set data(sEnt) $f3.ent
-
-    # The buttons
-    #
-    set maxWidth [::tk::mcmaxamp &OK &Filter &Cancel]
-    set maxWidth [expr {$maxWidth<6?6:$maxWidth}]
-    set data(okBtn) [::tk::AmpWidget button $bot.ok -text [mc "&OK"] \
-	    -width $maxWidth \
-	    -command [list tk::MotifFDialog_OkCmd $w]]
-    set data(filterBtn) [::tk::AmpWidget button $bot.filter -text [mc "&Filter"] \
-	    -width $maxWidth \
-	    -command [list tk::MotifFDialog_FilterCmd $w]]
-    set data(cancelBtn) [::tk::AmpWidget button $bot.cancel -text [mc "&Cancel"] \
-	    -width $maxWidth \
-	    -command [list tk::MotifFDialog_CancelCmd $w]]
-
-    pack $bot.ok $bot.filter $bot.cancel -padx 10 -pady 10 -expand yes \
-	-side left
-
-    # Create the bindings:
-    #
-    bind $w <Alt-Key> [list ::tk::AltKeyInDialog $w %A]
-
-    bind $data(fEnt) <Return> [list tk::MotifFDialog_ActivateFEnt $w]
-    bind $data(sEnt) <Return> [list tk::MotifFDialog_ActivateSEnt $w]
-    bind $w <Escape> [list tk::MotifFDialog_CancelCmd $w]
-    bind $w.bot <Destroy> {set ::tk::Priv(selectFilePath) {}}
-
-    wm protocol $w WM_DELETE_WINDOW [list tk::MotifFDialog_CancelCmd $w]
-}
-
-proc ::tk::MotifFDialog_SetListMode {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    if {$data(-multiple) != 0} {
-	set selectmode extended
-    } else {
-	set selectmode browse
-    }
-    set f $w.top.f2.b
-    $f.l configure -selectmode $selectmode
-}
-
-# ::tk::MotifFDialog_MakeSList --
-#
-#	Create a scrolled-listbox and set the keyboard accelerator
-#	bindings so that the list selection follows what the user
-#	types.
-#
-# Arguments:
-#	w		Pathname of the dialog box.
-#	f		Frame widget inside which to create the scrolled
-#			listbox. This frame widget already exists.
-#	label		The string to display on top of the listbox.
-#	under		Sets the -under option of the label.
-#	cmdPrefix	Specifies procedures to call when the listbox is
-#			browsed or activated.
-
-proc ::tk::MotifFDialog_MakeSList {w f label cmdPrefix} {
-    bind [::tk::AmpWidget label $f.lab -text $label -anchor w] \
-	<<AltUnderlined>> [list focus $f.l]
-    listbox $f.l -width 12 -height 5 -exportselection 0\
-	-xscrollcommand [list $f.h set]	-yscrollcommand [list $f.v set]
-    scrollbar $f.v -orient vertical   -takefocus 0 -command [list $f.l yview]
-    scrollbar $f.h -orient horizontal -takefocus 0 -command [list $f.l xview]
-    grid $f.lab -row 0 -column 0 -sticky news -rowspan 1 -columnspan 2 \
-	-padx 2 -pady 2
-    grid $f.l -row 1 -column 0 -rowspan 1 -columnspan 1 -sticky news
-    grid $f.v -row 1 -column 1 -rowspan 1 -columnspan 1 -sticky news
-    grid $f.h -row 2 -column 0 -rowspan 1 -columnspan 1 -sticky news
-
-    grid rowconfigure    $f 0 -weight 0 -minsize 0
-    grid rowconfigure    $f 1 -weight 1 -minsize 0
-    grid columnconfigure $f 0 -weight 1 -minsize 0
-
-    # bindings for the listboxes
-    #
-    set list $f.l
-    bind $list <<ListboxSelect>> [list tk::MotifFDialog_Browse$cmdPrefix $w]
-    bind $list <Double-ButtonRelease-1> \
-	    [list tk::MotifFDialog_Activate$cmdPrefix $w]
-    bind $list <Return>	"tk::MotifFDialog_Browse$cmdPrefix [list $w]; \
-	    tk::MotifFDialog_Activate$cmdPrefix [list $w]"
-
-    bindtags $list [list Listbox $list [winfo toplevel $list] all]
-    ListBoxKeyAccel_Set $list
-
-    return $f.l
-}
-
-# ::tk::MotifFDialog_InterpFilter --
-#
-#	Interpret the string in the filter entry into two components:
-#	the directory and the pattern. If the string is a relative
-#	pathname, give a warning to the user and restore the pattern
-#	to original.
-#
-# Arguments:
-#	w		pathname of the dialog box.
-#
-# Results:
-# 	A list of two elements. The first element is the directory
-# 	specified # by the filter. The second element is the filter
-# 	pattern itself.
-
-proc ::tk::MotifFDialog_InterpFilter {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    set text [string trim [$data(fEnt) get]]
-
-    # Perform tilde substitution
-    #
-    set badTilde 0
-    if {[string index $text 0] eq "~"} {
-	set list [file split $text]
-	set tilde [lindex $list 0]
-	if {[catch {set tilde [glob $tilde]}]} {
-	    set badTilde 1
-	} else {
-	    set text [eval file join [concat $tilde [lrange $list 1 end]]]
-	}
-    }
-
-    # If the string is a relative pathname, combine it
-    # with the current selectPath.
-
-    set relative 0
-    if {[file pathtype $text] eq "relative"} {
-	set relative 1
-    } elseif {$badTilde} {
-	set relative 1
-    }
-
-    if {$relative} {
-	tk_messageBox -icon warning -type ok \
-		-message "\"$text\" must be an absolute pathname"
-
-	$data(fEnt) delete 0 end
-	$data(fEnt) insert 0 [::tk::dialog::file::JoinFile $data(selectPath) \
-		$data(filter)]
-
-	return [list $data(selectPath) $data(filter)]
-    }
-
-    set resolved [::tk::dialog::file::JoinFile [file dirname $text] [file tail $text]]
-
-    if {[file isdirectory $resolved]} {
-	set dir $resolved
-	set fil $data(filter)
-    } else {
-	set dir [file dirname $resolved]
-	set fil [file tail    $resolved]
-    }
-
-    return [list $dir $fil]
-}
-
-# ::tk::MotifFDialog_Update
-#
-#	Load the files and synchronize the "filter" and "selection" fields
-#	boxes.
-#
-# Arguments:
-# 	w 		pathname of the dialog box.
-#
-# Results:
-#	None.
-
-proc ::tk::MotifFDialog_Update {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    $data(fEnt) delete 0 end
-    $data(fEnt) insert 0 \
-            [::tk::dialog::file::JoinFile $data(selectPath) $data(filter)]
-    $data(sEnt) delete 0 end
-    $data(sEnt) insert 0 [::tk::dialog::file::JoinFile $data(selectPath) \
-	    $data(selectFile)]
-
-    MotifFDialog_LoadFiles $w
-}
-
-# ::tk::MotifFDialog_LoadFiles --
-#
-#	Loads the files and directories into the two listboxes according
-#	to the filter setting.
-#
-# Arguments:
-# 	w 		pathname of the dialog box.
-#
-# Results:
-#	None.
-
-proc ::tk::MotifFDialog_LoadFiles {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    $data(dList) delete 0 end
-    $data(fList) delete 0 end
-
-    set appPWD [pwd]
-    if {[catch {cd $data(selectPath)}]} {
-	cd $appPWD
-
-	$data(dList) insert end ".."
-	return
-    }
-
-    # Make the dir and file lists
-    #
-    # For speed we only have one glob, which reduces the file system
-    # calls (good for slow NFS networks).
-    #
-    # We also do two smaller sorts (files + dirs) instead of one large sort,
-    # which gives a small speed increase.
-    #
-    set top 0
-    set dlist ""
-    set flist ""
-    foreach f [glob -nocomplain .* *] {
-	if {[file isdir ./$f]} {
-	    lappend dlist $f
-	} else {
-            foreach pat $data(filter) {
-                if {[string match $pat $f]} {
-		    if {[string match .* $f]} {
-			incr top
-		    }
-		    lappend flist $f
-                    break
-		}
-            }
-	}
-    }
-    eval [list $data(dList) insert end] [lsort -dictionary $dlist]
-    eval [list $data(fList) insert end] [lsort -dictionary $flist]
-
-    # The user probably doesn't want to see the . files. We adjust the view
-    # so that the listbox displays all the non-dot files
-    $data(fList) yview $top
-
-    cd $appPWD
-}
-
-# ::tk::MotifFDialog_BrowseDList --
-#
-#	This procedure is called when the directory list is browsed
-#	(clicked-over) by the user.
-#
-# Arguments:
-# 	w		The pathname of the dialog box.
-#
-# Results:
-#	None.
-
-proc ::tk::MotifFDialog_BrowseDList {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    focus $data(dList)
-    if {[$data(dList) curselection] eq ""} {
-	return
-    }
-    set subdir [$data(dList) get [$data(dList) curselection]]
-    if {$subdir eq ""} {
-	return
-    }
-
-    $data(fList) selection clear 0 end
-
-    set list [MotifFDialog_InterpFilter $w]
-    set data(filter) [lindex $list 1]
-
-    switch -- $subdir {
-	. {
-	    set newSpec [::tk::dialog::file::JoinFile $data(selectPath) $data(filter)]
-	}
-	.. {
-	    set newSpec [::tk::dialog::file::JoinFile [file dirname $data(selectPath)] \
-		$data(filter)]
-	}
-	default {
-	    set newSpec [::tk::dialog::file::JoinFile [::tk::dialog::file::JoinFile \
-		    $data(selectPath) $subdir] $data(filter)]
-	}
-    }
-
-    $data(fEnt) delete 0 end
-    $data(fEnt) insert 0 $newSpec
-}
-
-# ::tk::MotifFDialog_ActivateDList --
-#
-#	This procedure is called when the directory list is activated
-#	(double-clicked) by the user.
-#
-# Arguments:
-# 	w		The pathname of the dialog box.
-#
-# Results:
-#	None.
-
-proc ::tk::MotifFDialog_ActivateDList {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    if {[$data(dList) curselection] eq ""} {
-	return
-    }
-    set subdir [$data(dList) get [$data(dList) curselection]]
-    if {$subdir eq ""} {
-	return
-    }
-
-    $data(fList) selection clear 0 end
-
-    switch -- $subdir {
-	. {
-	    set newDir $data(selectPath)
-	}
-	.. {
-	    set newDir [file dirname $data(selectPath)]
-	}
-	default {
-	    set newDir [::tk::dialog::file::JoinFile $data(selectPath) $subdir]
-	}
-    }
-
-    set data(selectPath) $newDir
-    MotifFDialog_Update $w
-
-    if {$subdir ne ".."} {
-	$data(dList) selection set 0
-	$data(dList) activate 0
-    } else {
-	$data(dList) selection set 1
-	$data(dList) activate 1
-    }
-}
-
-# ::tk::MotifFDialog_BrowseFList --
-#
-#	This procedure is called when the file list is browsed
-#	(clicked-over) by the user.
-#
-# Arguments:
-# 	w		The pathname of the dialog box.
-#
-# Results:
-#	None.
-
-proc ::tk::MotifFDialog_BrowseFList {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    focus $data(fList)
-    set data(selectFile) ""
-    foreach item [$data(fList) curselection] {
-	lappend data(selectFile) [$data(fList) get $item]
-    }
-    if {[llength $data(selectFile)] == 0} {
-	return
-    }
-
-    $data(dList) selection clear 0 end
-
-    $data(fEnt) delete 0 end
-    $data(fEnt) insert 0 [::tk::dialog::file::JoinFile $data(selectPath) \
-	    $data(filter)]
-    $data(fEnt) xview end
-
-    # if it's a multiple selection box, just put in the filenames
-    # otherwise put in the full path as usual
-    $data(sEnt) delete 0 end
-    if {$data(-multiple) != 0} {
-	$data(sEnt) insert 0 $data(selectFile)
-    } else {
-	$data(sEnt) insert 0 [::tk::dialog::file::JoinFile $data(selectPath) \
-		[lindex $data(selectFile) 0]]
-    }
-    $data(sEnt) xview end
-}
-
-# ::tk::MotifFDialog_ActivateFList --
-#
-#	This procedure is called when the file list is activated
-#	(double-clicked) by the user.
-#
-# Arguments:
-# 	w		The pathname of the dialog box.
-#
-# Results:
-#	None.
-
-proc ::tk::MotifFDialog_ActivateFList {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    if {[$data(fList) curselection] eq ""} {
-	return
-    }
-    set data(selectFile) [$data(fList) get [$data(fList) curselection]]
-    if {$data(selectFile) eq ""} {
-	return
-    } else {
-	MotifFDialog_ActivateSEnt $w
-    }
-}
-
-# ::tk::MotifFDialog_ActivateFEnt --
-#
-#	This procedure is called when the user presses Return inside
-#	the "filter" entry. It updates the dialog according to the
-#	text inside the filter entry.
-#
-# Arguments:
-# 	w		The pathname of the dialog box.
-#
-# Results:
-#	None.
-
-proc ::tk::MotifFDialog_ActivateFEnt {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    set list [MotifFDialog_InterpFilter $w]
-    set data(selectPath) [lindex $list 0]
-    set data(filter)    [lindex $list 1]
-
-    MotifFDialog_Update $w
-}
-
-# ::tk::MotifFDialog_ActivateSEnt --
-#
-#	This procedure is called when the user presses Return inside
-#	the "selection" entry. It sets the ::tk::Priv(selectFilePath)
-#	variable so that the vwait loop in tk::MotifFDialog will be
-#	terminated.
-#
-# Arguments:
-# 	w		The pathname of the dialog box.
-#
-# Results:
-#	None.
-
-proc ::tk::MotifFDialog_ActivateSEnt {w} {
-    variable ::tk::Priv
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    set selectFilePath [string trim [$data(sEnt) get]]
-
-    if {$selectFilePath eq ""} {
-	MotifFDialog_FilterCmd $w
-	return
-    }
-
-    if {$data(-multiple) == 0} {
-	set selectFilePath [list $selectFilePath]
-    }
-
-    if {[file isdirectory [lindex $selectFilePath 0]]} {
-	set data(selectPath) [lindex [glob $selectFilePath] 0]
-	set data(selectFile) ""
-	MotifFDialog_Update $w
-	return
-    }
-
-    set newFileList ""
-    foreach item $selectFilePath {
-	if {[file pathtype $item] ne "absolute"} {
-	    set item [file join $data(selectPath) $item]
-	} elseif {![file exists [file dirname $item]]} {
-	    tk_messageBox -icon warning -type ok \
-		    -message [mc {Directory "%1$s" does not exist.} \
-		    [file dirname $item]]
-	    return
-	}
-
-	if {![file exists $item]} {
-	    if {$data(type) eq "open"} {
-		tk_messageBox -icon warning -type ok \
-			-message [mc {File "%1$s" does not exist.} $item]
-		return
-	    }
-	} elseif {$data(type) eq "save" && $data(-confirmoverwrite)} {
-	    set message [format %s%s \
-		    [mc "File \"%1\$s\" already exists.\n\n" $selectFilePath] \
-		    [mc {Replace existing file?}]]
-	    set answer [tk_messageBox -icon warning -type yesno \
-		    -message $message]
-	    if {$answer eq "no"} {
-		return
-	    }
-	}
-
-	lappend newFileList $item
-    }
-
-    # Return selected filter
-    if {[info exists data(-typevariable)] && $data(-typevariable) ne ""
-	    && [info exists data(-filetypes)] && $data(-filetypes) ne ""} {
-	upvar #0 $data(-typevariable) typeVariable
-	set typeVariable [lindex $data(origfiletypes) $data(fileType) 0]
-    }
-
-    if {$data(-multiple) != 0} {
-	set Priv(selectFilePath) $newFileList
-    } else {
-	set Priv(selectFilePath) [lindex $newFileList 0]
-    }
-
-    # Set selectFile and selectPath to first item in list
-    set Priv(selectFile)     [file tail    [lindex $newFileList 0]]
-    set Priv(selectPath)     [file dirname [lindex $newFileList 0]]
-}
-
-
-proc ::tk::MotifFDialog_OkCmd {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    MotifFDialog_ActivateSEnt $w
-}
-
-proc ::tk::MotifFDialog_FilterCmd {w} {
-    upvar ::tk::dialog::file::[winfo name $w] data
-
-    MotifFDialog_ActivateFEnt $w
-}
-
-proc ::tk::MotifFDialog_CancelCmd {w} {
-    variable ::tk::Priv
-
-    set Priv(selectFilePath) ""
-    set Priv(selectFile)     ""
-    set Priv(selectPath)     ""
-}
-
-proc ::tk::ListBoxKeyAccel_Set {w} {
-    bind Listbox <Any-KeyPress> ""
-    bind $w <Destroy> [list tk::ListBoxKeyAccel_Unset $w]
-    bind $w <Any-KeyPress> [list tk::ListBoxKeyAccel_Key $w %A]
-}
-
-proc ::tk::ListBoxKeyAccel_Unset {w} {
-    variable ::tk::Priv
-
-    catch {after cancel $Priv(lbAccel,$w,afterId)}
-    unset -nocomplain Priv(lbAccel,$w) Priv(lbAccel,$w,afterId)
-}
-
-# ::tk::ListBoxKeyAccel_Key--
-#
-#	This procedure maintains a list of recently entered keystrokes
-#	over a listbox widget. It arranges an idle event to move the
-#	selection of the listbox to the entry that begins with the
-#	keystrokes.
-#
-# Arguments:
-# 	w		The pathname of the listbox.
-#	key		The key which the user just pressed.
-#
-# Results:
-#	None.
-
-proc ::tk::ListBoxKeyAccel_Key {w key} {
-    variable ::tk::Priv
-
-    if { $key eq "" } {
-	return
-    }
-    append Priv(lbAccel,$w) $key
-    ListBoxKeyAccel_Goto $w $Priv(lbAccel,$w)
-    catch {
-	after cancel $Priv(lbAccel,$w,afterId)
-    }
-    set Priv(lbAccel,$w,afterId) [after 500 \
-	    [list tk::ListBoxKeyAccel_Reset $w]]
-}
-
-proc ::tk::ListBoxKeyAccel_Goto {w string} {
-    variable ::tk::Priv
-
-    set string [string tolower $string]
-    set end [$w index end]
-    set theIndex -1
-
-    for {set i 0} {$i < $end} {incr i} {
-	set item [string tolower [$w get $i]]
-	if {[string compare $string $item] >= 0} {
-	    set theIndex $i
-	}
-	if {[string compare $string $item] <= 0} {
-	    set theIndex $i
-	    break
-	}
-    }
-
-    if {$theIndex >= 0} {
-	$w selection clear 0 end
-	$w selection set $theIndex $theIndex
-	$w activate $theIndex
-	$w see $theIndex
-	event generate $w <<ListboxSelect>>
-    }
-}
-
-proc ::tk::ListBoxKeyAccel_Reset {w} {
-    variable ::tk::Priv
-
-    unset -nocomplain Priv(lbAccel,$w)
-}
-
-proc ::tk_getFileType {} {
-    variable ::tk::Priv
-
-    return $Priv(selectFileType)
-}
-