initial tk8.1a2 version

30 files changed, 4986 insertions, 675 deletions

diff --git a/library/bgerror.tcl b/library/bgerror.tcl
index d2b1cdc..ccfaccb 100644
--- a/library/bgerror.tcl
+++ b/library/bgerror.tcl
@@ -4,7 +4,7 @@
 # posts a dialog box with the error message and gives the user a chance
 # to see a more detailed stack trace.
 #
-# SCCS: @(#) bgerror.tcl 1.16 97/08/06 09:19:50
+# SCCS: @(#) bgerror.tcl 1.17 97/12/03 15:28:53
 #
 # Copyright (c) 1992-1994 The Regents of the University of California.
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -82,10 +82,10 @@ proc bgerror err {
 
     wm withdraw $w
     update idletasks
-    set x [expr [winfo screenwidth $w]/2 - [winfo reqwidth $w]/2 \
-	    - [winfo vrootx [winfo parent $w]]]
-    set y [expr [winfo screenheight $w]/2 - [winfo reqheight $w]/2 \
-	    - [winfo vrooty [winfo parent $w]]]
+    set x [expr {[winfo screenwidth $w]/2 - [winfo reqwidth $w]/2 \
+	    - [winfo vrootx [winfo parent $w]]}]
+    set y [expr {[winfo screenheight $w]/2 - [winfo reqheight $w]/2 \
+	    - [winfo vrooty [winfo parent $w]]}]
     wm geom $w +$x+$y
     wm deiconify $w
 
diff --git a/library/button.tcl b/library/button.tcl
index b017b80..665f7b6 100644
--- a/library/button.tcl
+++ b/library/button.tcl
@@ -4,7 +4,7 @@
 # checkbutton, and radiobutton widgets and provides procedures
 # that help in implementing those bindings.
 #
-# SCCS: @(#) button.tcl 1.22 96/11/14 14:49:11
+# SCCS: @(#) button.tcl 1.23 97/12/03 15:28:54
 #
 # Copyright (c) 1992-1994 The Regents of the University of California.
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -69,12 +69,12 @@ if {$tcl_platform(platform) == "windows"} {
 }
 if {$tcl_platform(platform) == "unix"} {
     bind Checkbutton <Return> {
-	if !$tk_strictMotif {
+	if {!$tk_strictMotif} {
 	    tkCheckRadioInvoke %W
 	}
     }
     bind Radiobutton <Return> {
-	if !$tk_strictMotif {
+	if {!$tk_strictMotif} {
 	    tkCheckRadioInvoke %W
 	}
     }
diff --git a/library/clrpick.tcl b/library/clrpick.tcl
index af5f980..383f799 100644
--- a/library/clrpick.tcl
+++ b/library/clrpick.tcl
@@ -3,7 +3,7 @@
 #	Color selection dialog for platforms that do not support a
 #	standard color selection dialog.
 #
-# SCCS: @(#) clrpick.tcl 1.3 96/09/05 09:59:24
+# SCCS: @(#) clrpick.tcl 1.4 97/12/03 15:28:55
 #
 # Copyright (c) 1996 Sun Microsystems, Inc.
 #
@@ -59,7 +59,7 @@ proc tkColorDialog {args} {
     tkColorDialog_Config $w $args
     tkColorDialog_InitValues $w
 
-    if ![winfo exists $w] {
+    if {![winfo exists $w]} {
 	toplevel $w -class tkColorDialog
 	tkColorDialog_BuildDialog $w
     }
@@ -72,10 +72,10 @@ proc tkColorDialog {args} {
 
     wm withdraw $w
     update idletasks
-    set x [expr [winfo screenwidth $w]/2 - [winfo reqwidth $w]/2 \
-	- [winfo vrootx [winfo parent $w]]]
-    set y [expr [winfo screenheight $w]/2 - [winfo reqheight $w]/2 \
-	- [winfo vrooty [winfo parent $w]]]
+    set x [expr {[winfo screenwidth $w]/2 - [winfo reqwidth $w]/2 \
+	    - [winfo vrootx [winfo parent $w]]}]
+    set y [expr {[winfo screenheight $w]/2 - [winfo reqheight $w]/2 \
+	    - [winfo vrooty [winfo parent $w]]}]
     wm geom $w +$x+$y
     wm deiconify $w
     wm title $w $data(-title)
@@ -120,19 +120,19 @@ proc tkColorDialog_InitValues {w} {
 
     # IntensityIncr is the difference in color intensity between a colorbar
     # and its neighbors.
-    set data(intensityIncr) [expr 256 / $data(NUM_COLORBARS)]
+    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)]
+	    [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(indent) [expr {$data(PLGN_WIDTH) / 2}]
 
     set data(colorPad) 2
-    set data(selPad)   [expr $data(PLGN_WIDTH) / 2]
+    set data(selPad)   [expr {$data(PLGN_WIDTH) / 2}]
 
     #
     # minX is the x coordinate of the first colorbar
@@ -142,13 +142,13 @@ proc tkColorDialog_InitValues {w} {
     #
     # maxX is the x coordinate of the last colorbar
     #
-    set data(maxX) [expr $data(BARS_WIDTH) + $data(indent)-1]
+    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 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.
@@ -156,9 +156,9 @@ proc tkColorDialog_InitValues {w} {
     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]
+    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}]
 }
 
 # tkColorDialog_Config  --
@@ -181,10 +181,10 @@ proc tkColorDialog_Config {w argList} {
     #
     tclParseConfigSpec $w $specs "" $argList
 
-    if ![string compare $data(-title) ""] {
+    if {![string compare $data(-title) ""]} {
 	set data(-title) " "
     }
-    if ![string compare $data(-initialcolor) ""] {
+    if {![string compare $data(-initialcolor) ""]} {
 	if {[info exists tkPriv(selectColor)] && \
 		[string compare $tkPriv(selectColor) ""]} {
 	    set data(-initialcolor) $tkPriv(selectColor)
@@ -192,12 +192,12 @@ proc tkColorDialog_Config {w argList} {
 	    set data(-initialcolor) [. cget -background]
 	}
     } else {
-	if [catch {winfo rgb . $data(-initialcolor)} err] {
+	if {[catch {winfo rgb . $data(-initialcolor)} err]} {
 	    error $err
 	}
     }
 
-    if ![winfo exists $data(-parent)] {
+    if {![winfo exists $data(-parent)]} {
 	error "bad window path name \"$data(-parent)\""
     }
 }
@@ -233,8 +233,8 @@ proc tkColorDialog_BuildDialog {w} {
 	pack $box -side left -fill both
 
 	set height [expr \
-	    [winfo reqheight $box.entry] - \
-	    2*([$box.entry cget -highlightthickness] + [$box.entry cget -bd])]
+	    {[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
@@ -341,7 +341,7 @@ proc tkColorDialog_SetRGBValue {w color} {
 proc tkColorDialog_XToRgb {w x} {
     upvar #0 $w data
     
-    return [expr ($x * $data(intensityIncr))/ $data(colorbarWidth)]
+    return [expr {($x * $data(intensityIncr))/ $data(colorbarWidth)}]
 }
 
 # tkColorDialog_RgbToX
@@ -351,7 +351,7 @@ proc tkColorDialog_XToRgb {w x} {
 proc tkColorDialog_RgbToX {w color} {
     upvar #0 $w data
     
-    return [expr ($color * $data(colorbarWidth)/ $data(intensityIncr))]
+    return [expr {($color * $data(colorbarWidth)/ $data(intensityIncr))}]
 }
 
 
@@ -370,7 +370,7 @@ proc tkColorDialog_DrawColorScale {w c {create 0}} {
     set sel $data($c,sel)
 
     # First handle the case that we are creating everything for the first time.
-    if $create {
+    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)} \
@@ -379,7 +379,7 @@ proc tkColorDialog_DrawColorScale {w c {create 0}} {
 	    }
 	}
 	# Delete the selector if it exists
-	if [info exists data($c,index)] {
+	if {[info exists data($c,index)]} {
 	    $sel delete $data($c,index)
 	}
 	
@@ -418,10 +418,10 @@ proc tkColorDialog_DrawColorScale {w c {create 0}} {
     
     # Draw the color bars.
     set highlightW [expr \
-	[$col cget -highlightthickness] + [$col cget -bd]]
+	    {[$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]
+	set intensity [expr {$i * $data(intensityIncr)}]
+	set startx [expr {$i * $data(colorbarWidth) + $highlightW}]
 	if { $c == "red" } {
 	    set color [format "#%02x%02x%02x" \
 			   $intensity \
@@ -439,10 +439,10 @@ proc tkColorDialog_DrawColorScale {w c {create 0}} {
 			   $intensity]
 	}
 
-	if $create {
+	if {$create} {
 	    set index [$col create rect $startx $highlightW \
-		[expr $startx +$data(colorbarWidth)] \
-		[expr [winfo height $col] + $highlightW]\
+		    [expr {$startx +$data(colorbarWidth)}] \
+		    [expr {[winfo height $col] + $highlightW}]\
 	        -fill $color -outline $color]
 	} else {
 	    $col itemconf $l -fill $color -outline $color
@@ -451,9 +451,9 @@ proc tkColorDialog_DrawColorScale {w c {create 0}} {
     }
     $sel raise $data($c,index)
 
-    if $create {
+    if {$create} {
 	set data(lines,$c,last) $index
-	set data(lines,$c,start) [expr $index - $data(NUM_COLORBARS) + 1 ]
+	set data(lines,$c,start) [expr {$index - $data(NUM_COLORBARS) + 1}]
     }
 
     tkColorDialog_RedrawFinalColor $w
@@ -539,7 +539,7 @@ proc tkColorDialog_RedrawColorBars {w colorChanged} {
 proc tkColorDialog_StartMove {w sel color x delta {dontMove 0}} {
     upvar #0 $w data
 
-    if !$dontMove {
+    if {!$dontMove} {
 	tkColorDialog_MoveSelector $w $sel $color $x $delta
     }
 }
@@ -561,11 +561,11 @@ proc tkColorDialog_MoveSelector {w sel color x delta} {
     if { $x < 0 } {
 	set x 0
     } elseif { $x >= $data(BARS_WIDTH)} {
-	set x [expr $data(BARS_WIDTH) - 1]
+	set x [expr {$data(BARS_WIDTH) - 1}]
     }
-    set diff [expr  $x - $data($color,x)]
+    set diff [expr {$x - $data($color,x)}]
     $sel move $data($color,index) $diff 0
-    set data($color,x) [expr $data($color,x) + $diff]
+    set data($color,x) [expr {$data($color,x) + $diff}]
     
     # Return the x value that it was actually set at
     return $x
@@ -617,14 +617,14 @@ proc tkColorDialog_HandleSelEntry {w} {
 
     set text [string trim $data(selection)]
     # Check to make sure that the color is valid
-    if [catch {set color [winfo rgb . $text]} ] {
+    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]
+    set R [expr {[lindex $color 0]/0x100}]
+    set G [expr {[lindex $color 1]/0x100}]
+    set B [expr {[lindex $color 2]/0x100}]
 
     tkColorDialog_SetRGBValue $w "$R $G $B"
     set data(selection) $text
@@ -638,9 +638,9 @@ proc tkColorDialog_HandleRGBEntry {w} {
     upvar #0 $w data
 
     foreach c {red green blue} {
-	if [catch {
-	    set data($c,intensity) [expr int($data($c,intensity))]
-	}] {
+	if {[catch {
+	    set data($c,intensity) [expr {int($data($c,intensity))}]
+	}]} {
 	    set data($c,intensity) 0
 	}
 
diff --git a/library/comdlg.tcl b/library/comdlg.tcl
index 4f00217..cc2a895 100644
--- a/library/comdlg.tcl
+++ b/library/comdlg.tcl
@@ -3,7 +3,7 @@
 #	Some functions needed for the common dialog boxes. Probably need to go
 #	in a different file.
 #
-# SCCS: @(#) comdlg.tcl 1.4 96/09/05 09:07:54
+# SCCS: @(#) comdlg.tcl 1.6 97/12/03 17:09:19
 #
 # Copyright (c) 1996 Sun Microsystems, Inc.
 #
@@ -52,13 +52,12 @@ proc tclParseConfigSpec {w specs flags argList} {
 	set verproc($cmdsw) [lindex $spec 4]
     }
 
-    if {[expr [llength $argList] %2] != 0} {
-	foreach {cmdsw value} $argList {
-	    if ![info exists cmd($cmdsw)] {
-	        error "unknown option \"$cmdsw\", must be [tclListValidFlags cmd]"
-	    }
+    if {[llength $argList] & 1} {
+	set cmdsw [lindex $argList end]
+	if {![info exists cmd($cmdsw)]} {
+	    error "bad option \"$cmdsw\": must be [tclListValidFlags cmd]"
 	}
-	error "value for \"[lindex $argList end]\" missing"
+	error "value for \"$cmdsw\" missing"
     }
 
     # 2: set the default values
@@ -70,8 +69,8 @@ proc tclParseConfigSpec {w specs flags argList} {
     # 3: parse the argument list
     #
     foreach {cmdsw value} $argList {
-	if ![info exists cmd($cmdsw)] {
-	    error "unknown option \"$cmdsw\", must be [tclListValidFlags cmd]"
+	if {![info exists cmd($cmdsw)]} {
+	    error "bad option \"$cmdsw\": must be [tclListValidFlags cmd]"
 	}
 	set data($cmdsw) $value
     }
@@ -90,7 +89,7 @@ proc tclListValidFlags {v} {
 	append errormsg "$separator$cmdsw"
 	incr i
 	if {$i == $len} {
-	    set separator " or "
+	    set separator ", or "
 	} else {
 	    set separator ", "
 	}
@@ -137,10 +136,10 @@ proc tclVerifyInteger {string} {
 #
 proc tkFocusGroup_Create {t} {
     global tkPriv
-    if [string compare [winfo toplevel $t] $t] {
+    if {[string compare [winfo toplevel $t] $t]} {
 	error "$t is not a toplevel window"
     }
-    if ![info exists tkPriv(fg,$t)] {
+    if {![info exists tkPriv(fg,$t)]} {
 	set tkPriv(fg,$t) 1
 	set tkPriv(focus,$t) ""
 	bind $t <FocusIn>  "tkFocusGroup_In  $t %W %d"
@@ -156,7 +155,7 @@ proc tkFocusGroup_Create {t} {
 #
 proc tkFocusGroup_BindIn {t w cmd} {
     global tkFocusIn tkPriv
-    if ![info exists tkPriv(fg,$t)] {
+    if {![info exists tkPriv(fg,$t)]} {
 	error "focus group \"$t\" doesn't exist"
     }
     set tkFocusIn($t,$w) $cmd
@@ -171,7 +170,7 @@ proc tkFocusGroup_BindIn {t w cmd} {
 #
 proc tkFocusGroup_BindOut {t w cmd} {
     global tkFocusOut tkPriv
-    if ![info exists tkPriv(fg,$t)] {
+    if {![info exists tkPriv(fg,$t)]} {
 	error "focus group \"$t\" doesn't exist"
     }
     set tkFocusOut($t,$w) $cmd
@@ -185,7 +184,7 @@ proc tkFocusGroup_BindOut {t w cmd} {
 proc tkFocusGroup_Destroy {t w} {
     global tkPriv tkFocusIn tkFocusOut
 
-    if ![string compare $t $w] {
+    if {![string compare $t $w]} {
 	unset tkPriv(fg,$t)
 	unset tkPriv(focus,$t) 
 
@@ -196,8 +195,8 @@ proc tkFocusGroup_Destroy {t w} {
 	    unset tkFocusOut($name)
 	}
     } else {
-	if [info exists tkPriv(focus,$t)] {
-	    if ![string compare $tkPriv(focus,$t) $w] {
+	if {[info exists tkPriv(focus,$t)]} {
+	    if {![string compare $tkPriv(focus,$t) $w]} {
 		set tkPriv(focus,$t) ""
 	    }
 	}
@@ -218,14 +217,14 @@ proc tkFocusGroup_Destroy {t w} {
 proc tkFocusGroup_In {t w detail} {
     global tkPriv tkFocusIn
 
-    if ![info exists tkFocusIn($t,$w)] {
+    if {![info exists tkFocusIn($t,$w)]} {
 	set tkFocusIn($t,$w) ""
 	return
     }
-    if ![info exists tkPriv(focus,$t)] {
+    if {![info exists tkPriv(focus,$t)]} {
 	return
     }
-    if ![string compare $tkPriv(focus,$t) $w] {
+    if {![string compare $tkPriv(focus,$t) $w]} {
 	# This is already in focus
 	#
 	return
@@ -250,10 +249,10 @@ proc tkFocusGroup_Out {t w detail} {
 	# This is caused by mouse moving out of the window
 	return
     }
-    if ![info exists tkPriv(focus,$t)] {
+    if {![info exists tkPriv(focus,$t)]} {
 	return
     }
-    if ![info exists tkFocusOut($t,$w)] {
+    if {![info exists tkFocusOut($t,$w)]} {
 	return
     } else {
 	eval $tkFocusOut($t,$w)
@@ -280,18 +279,18 @@ proc tkFDGetFileTypes {string} {
 	set label [lindex $t 0]
 	set exts {}
 
-	if [info exists hasDoneType($label)] {
+	if {[info exists hasDoneType($label)]} {
 	    continue
 	}
 
 	set name "$label ("
 	set sep ""
 	foreach ext $fileTypes($label) {
-	    if ![string compare $ext ""] {
+	    if {![string compare $ext ""]} {
 		continue
 	    }
 	    regsub {^[.]} $ext "*." ext
-	    if ![info exists hasGotExt($label,$ext)] {
+	    if {![info exists hasGotExt($label,$ext)]} {
 		append name $sep$ext
 		lappend exts $ext
 		set hasGotExt($label,$ext) 1
diff --git a/library/console.tcl b/library/console.tcl
index d2c28b2..c046e21 100644
--- a/library/console.tcl
+++ b/library/console.tcl
@@ -4,7 +4,7 @@
 # can be used by non-unix systems that do not have built-in support
 # for shells.
 #
-# SCCS: @(#) console.tcl 1.45 97/09/17 16:52:40
+# SCCS: @(#) console.tcl 1.47 98/01/02 17:42:06
 #
 # Copyright (c) 1995-1997 Sun Microsystems, Inc.
 #
@@ -108,7 +108,7 @@ proc tkConsoleSource {} {
 		      -filetypes {{"Tcl Scripts" .tcl} {"All Files" *}}]
     if {"$filename" != ""} {
     	set cmd [list source $filename]
-	if [catch {consoleinterp eval $cmd} result] {
+	if {[catch {consoleinterp eval $cmd} result]} {
 	    tkConsoleOutput stderr "$result\n"
 	}
     }
@@ -136,12 +136,12 @@ proc tkConsoleInvoke {args} {
     }
     if {$cmd == ""} {
 	tkConsolePrompt
-    } elseif [info complete $cmd] {
+    } elseif {[info complete $cmd]} {
 	.console mark set output end
 	.console tag delete input
 	set result [consoleinterp record $cmd]
 	if {$result != ""} {
-	    .console insert insert "$result\n"
+	    puts $result
 	}
 	tkConsoleHistory reset
 	tkConsolePrompt
@@ -168,7 +168,7 @@ proc tkConsoleHistory {cmd} {
     	prev {
 	    incr histNum -1
 	    if {$histNum == 0} {
-		set cmd {history event [expr [history nextid] -1]}
+		set cmd {history event [expr {[history nextid] -1}]}
 	    } else {
 		set cmd "history event $histNum"
 	    }
@@ -182,7 +182,7 @@ proc tkConsoleHistory {cmd} {
     	next {
 	    incr histNum
 	    if {$histNum == 0} {
-		set cmd {history event [expr [history nextid] -1]}
+		set cmd {history event [expr {[history nextid] -1}]}
 	    } elseif {$histNum > 0} {
 		set cmd ""
 		set histNum 1
@@ -213,7 +213,7 @@ proc tkConsolePrompt {{partial normal}} {
     if {$partial == "normal"} {
 	set temp [.console index "end - 1 char"]
 	.console mark set output end
-    	if [consoleinterp eval "info exists tcl_prompt1"] {
+    	if {[consoleinterp eval "info exists tcl_prompt1"]} {
     	    consoleinterp eval "eval \[set tcl_prompt1\]"
     	} else {
     	    puts -nonewline "% "
@@ -221,7 +221,7 @@ proc tkConsolePrompt {{partial normal}} {
     } else {
 	set temp [.console index output]
 	.console mark set output end
-    	if [consoleinterp eval "info exists tcl_prompt2"] {
+    	if {[consoleinterp eval "info exists tcl_prompt2"]} {
     	    consoleinterp eval "eval \[set tcl_prompt2\]"
     	} else {
 	    puts -nonewline "> "
@@ -271,7 +271,7 @@ proc tkConsoleBind {win} {
 	if {[%W tag nextrange sel 1.0 end] != ""} {
 	    %W tag remove sel sel.first promptEnd
 	} else {
-	    if [%W compare insert < promptEnd] {
+	    if {[%W compare insert < promptEnd]} {
 		break
 	    }
 	}
@@ -280,14 +280,14 @@ proc tkConsoleBind {win} {
 	if {[%W tag nextrange sel 1.0 end] != ""} {
 	    %W tag remove sel sel.first promptEnd
 	} else {
-	    if [%W compare insert <= promptEnd] {
+	    if {[%W compare insert <= promptEnd]} {
 		break
 	    }
 	}
     }
     foreach left {Control-a Home} {
 	bind $win <$left> {
-	    if [%W compare insert < promptEnd] {
+	    if {[%W compare insert < promptEnd]} {
 		tkTextSetCursor %W {insert linestart}
 	    } else {
 		tkTextSetCursor %W promptEnd
@@ -302,32 +302,32 @@ proc tkConsoleBind {win} {
 	}
     }
     bind $win <Control-d> {
-	if [%W compare insert < promptEnd] {
+	if {[%W compare insert < promptEnd]} {
 	    break
 	}
     }
     bind $win <Control-k> {
-	if [%W compare insert < promptEnd] {
+	if {[%W compare insert < promptEnd]} {
 	    %W mark set insert promptEnd
 	}
     }
     bind $win <Control-t> {
-	if [%W compare insert < promptEnd] {
+	if {[%W compare insert < promptEnd]} {
 	    break
 	}
     }
     bind $win <Meta-d> {
-	if [%W compare insert < promptEnd] {
+	if {[%W compare insert < promptEnd]} {
 	    break
 	}
     }
     bind $win <Meta-BackSpace> {
-	if [%W compare insert <= promptEnd] {
+	if {[%W compare insert <= promptEnd]} {
 	    break
 	}
     }
     bind $win <Control-h> {
-	if [%W compare insert <= promptEnd] {
+	if {[%W compare insert <= promptEnd]} {
 	    break
 	}
     }
@@ -353,7 +353,7 @@ proc tkConsoleBind {win} {
     }
     foreach left {Control-b Left} {
 	bind $win <$left> {
-	    if [%W compare insert == promptEnd] {
+	    if {[%W compare insert == promptEnd]} {
 		break
 	    }
 	    tkTextSetCursor %W insert-1c
diff --git a/library/demos/style.tcl b/library/demos/style.tcl
index 6ed31f8..bb1d29b 100644
--- a/library/demos/style.tcl
+++ b/library/demos/style.tcl
@@ -3,7 +3,7 @@
 # This demonstration script creates a text widget that illustrates the
 # various display styles that may be set for tags.
 #
-# SCCS: @(#) style.tcl 1.8 97/04/18 11:41:47
+# SCCS: @(#) style.tcl 1.9 97/05/06 13:59:06
 
 if {![info exists widgetDemo]} {
     error "This script should be run from the \"widget\" demo."
diff --git a/library/dialog.tcl b/library/dialog.tcl
index a9fcfa5..1c4a5ba 100644
--- a/library/dialog.tcl
+++ b/library/dialog.tcl
@@ -3,7 +3,7 @@
 # This file defines the procedure tk_dialog, which creates a dialog
 # box containing a bitmap, a message, and one or more buttons.
 #
-# SCCS: @(#) dialog.tcl 1.33 97/06/06 11:20:04
+# SCCS: @(#) dialog.tcl 1.35 97/12/19 16:07:49
 #
 # Copyright (c) 1992-1993 The Regents of the University of California.
 # Copyright (c) 1994-1997 Sun Microsystems, Inc.
@@ -61,16 +61,17 @@ proc tk_dialog {w title text bitmap default args} {
     pack $w.top -side top -fill both -expand 1
 
     # 2. Fill the top part with bitmap and message (use the option
-    # database for -wraplength so that it can be overridden by
-    # the caller).
+    # database for -wraplength and -font so that they can be
+    # overridden by the caller).
 
     option add *Dialog.msg.wrapLength 3i widgetDefault
-    label $w.msg -justify left -text $text
     if {$tcl_platform(platform) == "macintosh"} {
-	$w.msg configure -font system
+	option add *Dialog.msg.font system widgetDefault
     } else {
-	$w.msg configure -font {Times 18}
+	option add *Dialog.msg.font {Times 18} 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 != ""} {
 	if {($tcl_platform(platform) == "macintosh") && ($bitmap == "error")} {
@@ -126,10 +127,10 @@ proc tk_dialog {w title text bitmap default args} {
 
     wm withdraw $w
     update idletasks
-    set x [expr [winfo screenwidth $w]/2 - [winfo reqwidth $w]/2 \
-	    - [winfo vrootx [winfo parent $w]]]
-    set y [expr [winfo screenheight $w]/2 - [winfo reqheight $w]/2 \
-	    - [winfo vrooty [winfo parent $w]]]
+    set x [expr {[winfo screenwidth $w]/2 - [winfo reqwidth $w]/2 \
+	    - [winfo vrootx [winfo parent $w]]}]
+    set y [expr {[winfo screenheight $w]/2 - [winfo reqheight $w]/2 \
+	    - [winfo vrooty [winfo parent $w]]}]
     wm geom $w +$x+$y
     wm deiconify $w
 
diff --git a/library/entry.tcl b/library/entry.tcl
index 4a0b764..5668b6b 100644
--- a/library/entry.tcl
+++ b/library/entry.tcl
@@ -3,7 +3,7 @@
 # This file defines the default bindings for Tk entry widgets and provides
 # procedures that help in implementing those bindings.
 #
-# SCCS: @(#) entry.tcl 1.49 97/09/17 19:08:48
+# SCCS: @(#) entry.tcl 1.50 97/12/03 15:28:57
 #
 # Copyright (c) 1992-1994 The Regents of the University of California.
 # Copyright (c) 1994-1997 Sun Microsystems, Inc.
@@ -34,7 +34,7 @@
 
 bind Entry <<Cut>> {
     if {![catch {set data [string range [%W get] [%W index sel.first]\
-		 [expr [%W index sel.last] - 1]]}]} {
+	    [expr {[%W index sel.last] - 1}]]}]} {
 	clipboard clear -displayof %W
 	clipboard append -displayof %W $data
 	%W delete sel.first sel.last
@@ -42,7 +42,7 @@ bind Entry <<Cut>> {
 }
 bind Entry <<Copy>> {
     if {![catch {set data [string range [%W get] [%W index sel.first]\
-		 [expr [%W index sel.last] - 1]]}]} {
+	    [expr {[%W index sel.last] - 1}]]}]} {
 	clipboard clear -displayof %W
 	clipboard append -displayof %W $data
     }
@@ -115,17 +115,17 @@ bind Entry <ButtonRelease-2> {
 }
 
 bind Entry <Left> {
-    tkEntrySetCursor %W [expr [%W index insert] - 1]
+    tkEntrySetCursor %W [expr {[%W index insert] - 1}]
 }
 bind Entry <Right> {
-    tkEntrySetCursor %W [expr [%W index insert] + 1]
+    tkEntrySetCursor %W [expr {[%W index insert] + 1}]
 }
 bind Entry <Shift-Left> {
-    tkEntryKeySelect %W [expr [%W index insert] - 1]
+    tkEntryKeySelect %W [expr {[%W index insert] - 1}]
     tkEntrySeeInsert %W
 }
 bind Entry <Shift-Right> {
-    tkEntryKeySelect %W [expr [%W index insert] + 1]
+    tkEntryKeySelect %W [expr {[%W index insert] + 1}]
     tkEntrySeeInsert %W
 }
 bind Entry <Control-Left> {
@@ -158,7 +158,7 @@ bind Entry <Shift-End> {
 }
 
 bind Entry <Delete> {
-    if [%W selection present] {
+    if {[%W selection present]} {
 	%W delete sel.first sel.last
     } else {
 	%W delete insert
@@ -213,67 +213,67 @@ bind Entry <Insert> {
 # Additional emacs-like bindings:
 
 bind Entry <Control-a> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkEntrySetCursor %W 0
     }
 }
 bind Entry <Control-b> {
-    if !$tk_strictMotif {
-	tkEntrySetCursor %W [expr [%W index insert] - 1]
+    if {!$tk_strictMotif} {
+	tkEntrySetCursor %W [expr {[%W index insert] - 1}]
     }
 }
 bind Entry <Control-d> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	%W delete insert
     }
 }
 bind Entry <Control-e> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkEntrySetCursor %W end
     }
 }
 bind Entry <Control-f> {
-    if !$tk_strictMotif {
-	tkEntrySetCursor %W [expr [%W index insert] + 1]
+    if {!$tk_strictMotif} {
+	tkEntrySetCursor %W [expr {[%W index insert] + 1}]
     }
 }
 bind Entry <Control-h> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkEntryBackspace %W
     }
 }
 bind Entry <Control-k> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	%W delete insert end
     }
 }
 bind Entry <Control-t> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkEntryTranspose %W
     }
 }
 bind Entry <Meta-b> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkEntrySetCursor %W [tkEntryPreviousWord %W insert]
     }
 }
 bind Entry <Meta-d> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	%W delete insert [tkEntryNextWord %W insert]
     }
 }
 bind Entry <Meta-f> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkEntrySetCursor %W [tkEntryNextWord %W insert]
     }
 }
 bind Entry <Meta-BackSpace> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	%W delete [tkEntryPreviousWord %W insert] insert
     }
 }
 bind Entry <Meta-Delete> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	%W delete [tkEntryPreviousWord %W insert] insert
     }
 }
@@ -281,7 +281,7 @@ bind Entry <Meta-Delete> {
 # A few additional bindings of my own.
 
 bind Entry <2> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	%W scan mark %x
 	set tkPriv(x) %x
 	set tkPriv(y) %y
@@ -289,7 +289,7 @@ bind Entry <2> {
     }
 }
 bind Entry <B2-Motion> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	if {abs(%x-$tkPriv(x)) > 2} {
 	    set tkPriv(mouseMoved) 1
 	}
@@ -356,7 +356,7 @@ proc tkEntryMouseSelect {w x} {
     }
     switch $tkPriv(selectMode) {
 	char {
-	    if $tkPriv(mouseMoved) {
+	    if {$tkPriv(mouseMoved)} {
 		if {$cur < $anchor} {
 		    $w selection range $cur $anchor
 		} elseif {$cur > $anchor} {
@@ -369,10 +369,10 @@ proc tkEntryMouseSelect {w x} {
 	word {
 	    if {$cur < [$w index anchor]} {
 		set before [tcl_wordBreakBefore [$w get] $cur]
-		set after [tcl_wordBreakAfter [$w get] [expr $anchor-1]]
+		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]]
+		set after [tcl_wordBreakAfter [$w get] [expr {$cur - 1}]]
 	    }
 	    if {$before < 0} {
 		set before 0
@@ -440,7 +440,7 @@ proc tkEntryAutoScan {w} {
 #		actually been moved to this position yet).
 
 proc tkEntryKeySelect {w new} {
-    if ![$w selection present] {
+    if {![$w selection present]} {
 	$w selection from insert
 	$w selection to $new
     } else {
@@ -482,7 +482,7 @@ proc tkEntryInsert {w s} {
 # w -		The entry window in which to backspace.
 
 proc tkEntryBackspace w {
-    if [$w selection present] {
+    if {[$w selection present]} {
 	$w delete sel.first sel.last
     } else {
 	set x [expr {[$w index insert] - 1}]
@@ -491,7 +491,7 @@ proc tkEntryBackspace w {
 	    set range [$w xview]
 	    set left [lindex $range 0]
 	    set right [lindex $range 1]
-	    $w xview moveto [expr $left - ($right - $left)/2.0]
+	    $w xview moveto [expr {$left - ($right - $left)/2.0}]
 	}
     }
 }
@@ -547,11 +547,11 @@ proc tkEntryTranspose w {
     if {$i < [$w index end]} {
 	incr i
     }
-    set first [expr $i-2]
+    set first [expr {$i-2}]
     if {$first < 0} {
 	return
     }
-    set new [string index [$w get] [expr $i-1]][string index [$w get] $first]
+    set new [string index [$w get] [expr {$i-1}]][string index [$w get] $first]
     $w delete $first $i
     $w insert insert $new
     tkEntrySeeInsert $w
diff --git a/library/focus.tcl b/library/focus.tcl
index bf0476d..0847e4c 100644
--- a/library/focus.tcl
+++ b/library/focus.tcl
@@ -3,7 +3,7 @@
 # This file defines several procedures for managing the input
 # focus.
 #
-# SCCS: @(#) focus.tcl 1.17 96/02/16 10:48:21
+# SCCS: @(#) focus.tcl 1.18 97/12/03 15:28:58
 #
 # Copyright (c) 1994-1995 Sun Microsystems, Inc.
 #
@@ -167,9 +167,9 @@ proc tk_focusFollowsMouse {} {
     set script {
 	if {("%d" == "NotifyAncestor") || ("%d" == "NotifyNonlinear")
 		|| ("%d" == "NotifyInferior")} {
-	    if [tkFocusOK %W] {
-		focus %W
-	    }
+		    if {[tkFocusOK %W]} {
+			focus %W
+		    }
 	}
     }
     if {$old != ""} {
diff --git a/library/images/logo.eps b/library/images/logo.eps
new file mode 100644
index 0000000..0d05d34
--- /dev/null
+++ b/library/images/logo.eps
@@ -0,0 +1,2091 @@
+%!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/library/images/pwrdLogo.eps b/library/images/pwrdLogo.eps
new file mode 100644
index 0000000..e11d9e9
--- /dev/null
+++ b/library/images/pwrdLogo.eps
@@ -0,0 +1,1897 @@
+%!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/library/images/pwrdLogo100.gif b/library/images/pwrdLogo100.gif
new file mode 100644
index 0000000..d2f8cbb
--- /dev/null
+++ b/library/images/pwrdLogo100.gif
diff --git a/library/images/pwrdLogo150.gif b/library/images/pwrdLogo150.gif
new file mode 100644
index 0000000..89eec7c
--- /dev/null
+++ b/library/images/pwrdLogo150.gif
diff --git a/library/images/pwrdLogo175.gif b/library/images/pwrdLogo175.gif
new file mode 100644
index 0000000..02dcd92
--- /dev/null
+++ b/library/images/pwrdLogo175.gif
diff --git a/library/images/pwrdLogo200.gif b/library/images/pwrdLogo200.gif
new file mode 100644
index 0000000..66426bf
--- /dev/null
+++ b/library/images/pwrdLogo200.gif
diff --git a/library/images/pwrdLogo75.gif b/library/images/pwrdLogo75.gif
new file mode 100644
index 0000000..e75925c
--- /dev/null
+++ b/library/images/pwrdLogo75.gif
diff --git a/library/listbox.tcl b/library/listbox.tcl
index 4e84b3a..b2ad4d3 100644
--- a/library/listbox.tcl
+++ b/library/listbox.tcl
@@ -3,7 +3,7 @@
 # This file defines the default bindings for Tk listbox widgets
 # and provides procedures that help in implementing those bindings.
 #
-# SCCS: @(#) listbox.tcl 1.21 97/06/10 17:13:55
+# SCCS: @(#) listbox.tcl 1.22 97/12/03 15:28:59
 #
 # Copyright (c) 1994 The Regents of the University of California.
 # Copyright (c) 1994-1995 Sun Microsystems, Inc.
@@ -33,7 +33,7 @@
 # makes that unnecessary.
 
 bind Listbox <1> {
-    if [winfo exists %W] {
+    if {[winfo exists %W]} {
 	tkListboxBeginSelect %W [%W index @%x,%y]
     }
 }
@@ -186,7 +186,7 @@ bind Listbox <B2-Motion> {
 proc tkListboxBeginSelect {w el} {
     global tkPriv
     if {[$w cget -selectmode]  == "multiple"} {
-	if [$w selection includes $el] {
+	if {[$w selection includes $el]} {
 	    $w selection clear $el
 	} else {
 	    $w selection set $el
@@ -224,7 +224,7 @@ proc tkListboxMotion {w el} {
 	}
 	extended {
 	    set i $tkPriv(listboxPrev)
-	    if [$w selection includes anchor] {
+	    if {[$w selection includes anchor]} {
 		$w selection clear $i $el
 		$w selection set anchor $el
 	    } else {
@@ -290,7 +290,7 @@ proc tkListboxBeginToggle {w el} {
 	set tkPriv(listboxSelection) [$w curselection]
 	set tkPriv(listboxPrev) $el
 	$w selection anchor $el
-	if [$w selection includes $el] {
+	if {[$w selection includes $el]} {
 	    $w selection clear $el
 	} else {
 	    $w selection set $el
@@ -340,7 +340,7 @@ proc tkListboxAutoScan {w} {
 
 proc tkListboxUpDown {w amount} {
     global tkPriv
-    $w activate [expr [$w index active] + $amount]
+    $w activate [expr {[$w index active] + $amount}]
     $w see active
     switch [$w cget -selectmode] {
 	browse {
@@ -371,7 +371,7 @@ proc tkListboxExtendUpDown {w amount} {
     if {[$w cget -selectmode] != "extended"} {
 	return
     }
-    $w activate [expr [$w index active] + $amount]
+    $w activate [expr {[$w index active] + $amount}]
     $w see active
     tkListboxMotion $w [$w index active]
 }
@@ -392,7 +392,7 @@ proc tkListboxDataExtend {w el} {
     if {$mode == "extended"} {
 	$w activate $el
 	$w see $el
-        if [$w selection includes anchor] {
+        if {[$w selection includes anchor]} {
 	    tkListboxMotion $w $el
 	}
     } elseif {$mode == "multiple"} {
diff --git a/library/menu.tcl b/library/menu.tcl
index 21b69d9..eaa694f 100644
--- a/library/menu.tcl
+++ b/library/menu.tcl
@@ -4,7 +4,7 @@
 # It also implements keyboard traversal of menus and implements a few
 # other utility procedures related to menus.
 #
-# SCCS: @(#) menu.tcl 1.103 97/10/31 15:26:08
+# SCCS: @(#) menu.tcl 1.104 97/12/03 15:28:59
 #
 # Copyright (c) 1992-1994 The Regents of the University of California.
 # Copyright (c) 1994-1997 Sun Microsystems, Inc.
@@ -218,7 +218,7 @@ proc tkMbLeave w {
     global tkPriv
 
     set tkPriv(inMenubutton) {}
-    if ![winfo exists $w] {
+    if {![winfo exists $w]} {
 	return
     }
     if {[$w cget -state] == "active"} {
@@ -273,29 +273,29 @@ proc tkMbPost {w {x {}} {y {}}} {
     # the menu just below the menubutton, as for a pull-down.
 
     update idletasks
-    if [catch {
+    if {[catch {
     	 switch [$w cget -direction] {
     	    above {
     	    	set x [winfo rootx $w]
-    	    	set y [expr [winfo rooty $w] - [winfo reqheight $menu]]
+    	    	set y [expr {[winfo rooty $w] - [winfo reqheight $menu]}]
     	    	$menu post $x $y
     	    }
     	    below {
     	    	set x [winfo rootx $w]
-    	    	set y [expr [winfo rooty $w] + [winfo height $w]]
+    	    	set y [expr {[winfo rooty $w] + [winfo height $w]}]
     	    	$menu post $x $y
     	    }
     	    left {
-    	    	set x [expr [winfo rootx $w] - [winfo reqwidth $menu]]
-    	    	set y [expr (2 * [winfo rooty $w] + [winfo height $w]) / 2]
+    	    	set x [expr {[winfo rootx $w] - [winfo reqwidth $menu]}]
+    	    	set y [expr {(2 * [winfo rooty $w] + [winfo height $w]) / 2}]
     	    	set entry [tkMenuFindName $menu [$w cget -text]]
-    	    	if [$w cget -indicatoron] {
+    	    	if {[$w cget -indicatoron]} {
 		    if {$entry == [$menu index last]} {
-		    	incr y [expr -([$menu yposition $entry] \
-			    	+ [winfo reqheight $menu])/2]
+		    	incr y [expr {-([$menu yposition $entry] \
+			    	+ [winfo reqheight $menu])/2}]
 		    } else {
-		    	incr y [expr -([$menu yposition $entry] \
-			        + [$menu yposition [expr $entry+1]])/2]
+		    	incr y [expr {-([$menu yposition $entry] \
+			        + [$menu yposition [expr {$entry+1}]])/2}]
 		    }
     	    	}
     	    	$menu post $x $y
@@ -305,16 +305,16 @@ proc tkMbPost {w {x {}} {y {}}} {
     	    	}
     	    }
     	    right {
-    	    	set x [expr [winfo rootx $w] + [winfo width $w]]
-    	    	set y [expr (2 * [winfo rooty $w] + [winfo height $w]) / 2]
+    	    	set x [expr {[winfo rootx $w] + [winfo width $w]}]
+    	    	set y [expr {(2 * [winfo rooty $w] + [winfo height $w]) / 2}]
     	    	set entry [tkMenuFindName $menu [$w cget -text]]
-    	    	if [$w cget -indicatoron] {
+    	    	if {[$w cget -indicatoron]} {
 		    if {$entry == [$menu index last]} {
-		    	incr y [expr -([$menu yposition $entry] \
-			    	+ [winfo reqheight $menu])/2]
+		    	incr y [expr {-([$menu yposition $entry] \
+			    	+ [winfo reqheight $menu])/2}]
 		    } else {
-		    	incr y [expr -([$menu yposition $entry] \
-			        + [$menu yposition [expr $entry+1]])/2]
+		    	incr y [expr {-([$menu yposition $entry] \
+			        + [$menu yposition [expr {$entry+1}]])/2}]
 		    }
     	    	}
     	    	$menu post $x $y
@@ -324,18 +324,18 @@ proc tkMbPost {w {x {}} {y {}}} {
     	    	}
     	    }
     	    default {
-    	    	if [$w cget -indicatoron] {
+    	    	if {[$w cget -indicatoron]} {
 	    	    if {$y == ""} {
-			set x [expr [winfo rootx $w] + [winfo width $w]/2]
-			set y [expr [winfo rooty $w] + [winfo height $w]/2]
+			set x [expr {[winfo rootx $w] + [winfo width $w]/2}]
+			set y [expr {[winfo rooty $w] + [winfo height $w]/2}]
 	    	    }
 	            tkPostOverPoint $menu $x $y [tkMenuFindName $menu [$w cget -text]]
 		} else {
-	    	    $menu post [winfo rootx $w] [expr [winfo rooty $w]+[winfo height $w]]
+	    	    $menu post [winfo rootx $w] [expr {[winfo rooty $w]+[winfo height $w]}]
     	    	}  
     	    }
     	 }
-     } msg] {
+     } msg]} {
 	# Error posting menu (e.g. bogus -postcommand). Unpost it and
 	# reflect the error.
 	
@@ -781,7 +781,7 @@ proc tkMenuNextMenu {menu direction} {
     }
     set buttons [winfo children [winfo parent $w]]
     set length [llength $buttons]
-    set i [expr [lsearch -exact $buttons $w] + $count]
+    set i [expr {[lsearch -exact $buttons $w] + $count}]
     while 1 {
 	while {$i < 0} {
 	    incr i $length
@@ -820,13 +820,13 @@ proc tkMenuNextEntry {menu count} {
     if {[$menu index last] == "none"} {
 	return
     }
-    set length [expr [$menu index last]+1]
+    set length [expr {[$menu index last]+1}]
     set quitAfter $length
     set active [$menu index active]
     if {$active == "none"} {
 	set i 0
     } else {
-	set i [expr $active + $count]
+	set i [expr {$active + $count}]
     }
     while 1 {
 	if {$quitAfter <= 0} {
@@ -1020,9 +1020,9 @@ proc tkTraverseWithinMenu {w char} {
 	return
     }
     for {set i 0} {$i <= $last} {incr i} {
-	if [catch {set char2 [string index \
+	if {[catch {set char2 [string index \
 		[$w entrycget $i -label] \
-		[$w entrycget $i -underline]]}] {
+		[$w entrycget $i -underline]]}]} {
 	    continue
 	}
 	if {[string compare $char [string tolower $char2]] == 0} {
@@ -1105,7 +1105,7 @@ proc tkMenuFindName {menu s} {
 	return
     }
     for {set i 0} {$i <= $last} {incr i} {
-	if ![catch {$menu entrycget $i -label} label] {
+	if {![catch {$menu entrycget $i -label} label]} {
 	    if {$label == $s} {
 		return $i
 	    }
@@ -1131,13 +1131,13 @@ proc tkPostOverPoint {menu x y {entry {}}}  {
     
     if {$entry != {}} {
 	if {$entry == [$menu index last]} {
-	    incr y [expr -([$menu yposition $entry] \
-		    + [winfo reqheight $menu])/2]
+	    incr y [expr {-([$menu yposition $entry] \
+		    + [winfo reqheight $menu])/2}]
 	} else {
-	    incr y [expr -([$menu yposition $entry] \
-		    + [$menu yposition [expr $entry+1]])/2]
+	    incr y [expr {-([$menu yposition $entry] \
+		    + [$menu yposition [expr {$entry+1}]])/2}]
 	}
-	incr x [expr -[winfo reqwidth $menu]/2]
+	incr x [expr {-[winfo reqwidth $menu]/2}]
     }
     $menu post $x $y
     if {($entry != {}) && ([$menu entrycget $entry -state] != "disabled")} {
diff --git a/library/msgbox.tcl b/library/msgbox.tcl
index 07df82b..5724508 100644
--- a/library/msgbox.tcl
+++ b/library/msgbox.tcl
@@ -3,7 +3,7 @@
 #	Implements messageboxes for platforms that do not have native
 #	messagebox support.
 #
-# SCCS: @(#) msgbox.tcl 1.8 97/07/28 17:20:01
+# SCCS: @(#) msgbox.tcl 1.11 97/12/19 16:07:48
 #
 # Copyright (c) 1994-1997 Sun Microsystems, Inc.
 #
@@ -49,7 +49,7 @@ proc tkMessageBox {args} {
     tclParseConfigSpec $w $specs "" $args
 
     if {[lsearch {info warning error question} $data(-icon)] == -1} {
-	error "invalid icon \"$data(-icon)\", must be error, info, question or warning"
+	error "bad -icon value \"$data(-icon)\": must be error, info, question, or warning"
     }
     if {$tcl_platform(platform) == "macintosh"} {
 	if {$data(-icon) == "error"} {
@@ -61,7 +61,7 @@ proc tkMessageBox {args} {
 	}
     }
 
-    if ![winfo exists $data(-parent)] {
+    if {![winfo exists $data(-parent)]} {
 	error "bad window path name \"$data(-parent)\""
     }
 
@@ -107,27 +107,27 @@ proc tkMessageBox {args} {
 	    }
 	}
 	default {
-	    error "invalid message box type \"$data(-type)\", must be abortretryignore, ok, okcancel, retrycancel, yesno or yesnocancel"
+	    error "bad -type value \"$data(-type)\": must be abortretryignore, ok, okcancel, retrycancel, yesno, or yesnocancel"
 	}
     }
 
-    if [string compare $data(-default) ""] {
+    if {[string compare $data(-default) ""]} {
 	set valid 0
 	foreach btn $buttons {
-	    if ![string compare [lindex $btn 0] $data(-default)] {
+	    if {![string compare [lindex $btn 0] $data(-default)]} {
 		set valid 1
 		break
 	    }
 	}
-	if !$valid {
-	    error "invalid default button \"$data(-default)\""
+	if {!$valid} {
+	    error "bad -default value \"$data(-default)\": must be abort, retry, ignore, ok, cancel, no, or yes"
 	}
     }
 
     # 2. Set the dialog to be a child window of $parent
     #
     #
-    if [string compare $data(-parent) .] {
+    if {[string compare $data(-parent) .]} {
 	set w $data(-parent).__tk__messagebox
     } else {
 	set w .__tk__messagebox
@@ -156,14 +156,17 @@ proc tkMessageBox {args} {
     }
 
     # 4. Fill the top part with bitmap and message (use the option
-    # database for -wraplength so that it can be overridden by
-    # the caller).
+    # database for -wraplength and -font so that they can be
+    # overridden by the caller).
 
     option add *Dialog.msg.wrapLength 3i widgetDefault
-    label $w.msg -justify left -text $data(-message)
-    catch {$w.msg configure -font \
-		-Adobe-Times-Medium-R-Normal--*-180-*-*-*-*-*-*
+    if {$tcl_platform(platform) == "macintosh"} {
+	option add *Dialog.msg.font system widgetDefault
+    } else {
+	option add *Dialog.msg.font {Times 18} widgetDefault
     }
+
+    label $w.msg -justify left -text $data(-message)
     pack $w.msg -in $w.top -side right -expand 1 -fill both -padx 3m -pady 3m
     if {$data(-icon) != ""} {
 	label $w.bitmap -bitmap $data(-icon)
@@ -176,7 +179,7 @@ proc tkMessageBox {args} {
     foreach but $buttons {
 	set name [lindex $but 0]
 	set opts [lrange $but 1 end]
-	if ![string compare $opts {}] {
+	if {![string compare $opts {}]} {
 	    # Capitalize the first letter of $name
 	    set capName \
 		[string toupper \
@@ -186,7 +189,7 @@ proc tkMessageBox {args} {
 
 	eval button $w.$name $opts -command [list "set tkPriv(button) $name"]
 
-	if ![string compare $name $data(-default)] {
+	if {![string compare $name $data(-default)]} {
 	    $w.$name configure -default active
 	}
 	pack $w.$name -in $w.bot -side left -expand 1 \
@@ -206,7 +209,7 @@ proc tkMessageBox {args} {
     # 6. Create a binding for <Return> on the dialog if there is a
     # default button.
 
-    if [string compare $data(-default) ""] {
+    if {[string compare $data(-default) ""]} {
 	bind $w <Return> "tkButtonInvoke $w.$data(-default)"
     }
 
@@ -216,10 +219,10 @@ proc tkMessageBox {args} {
 
     wm withdraw $w
     update idletasks
-    set x [expr [winfo screenwidth $w]/2 - [winfo reqwidth $w]/2 \
-	    - [winfo vrootx [winfo parent $w]]]
-    set y [expr [winfo screenheight $w]/2 - [winfo reqheight $w]/2 \
-	    - [winfo vrooty [winfo parent $w]]]
+    set x [expr {[winfo screenwidth $w]/2 - [winfo reqwidth $w]/2 \
+	    - [winfo vrootx [winfo parent $w]]}]
+    set y [expr {[winfo screenheight $w]/2 - [winfo reqheight $w]/2 \
+	    - [winfo vrooty [winfo parent $w]]}]
     wm geom $w +$x+$y
     wm deiconify $w
 
@@ -231,7 +234,7 @@ proc tkMessageBox {args} {
 	set grabStatus [grab status $oldGrab]
     }
     grab $w
-    if [string compare $data(-default) ""] {
+    if {[string compare $data(-default) ""]} {
 	focus $w.$data(-default)
     } else {
 	focus $w
diff --git a/library/optMenu.tcl b/library/optMenu.tcl
index 32ca096c..2b15f91 100644
--- a/library/optMenu.tcl
+++ b/library/optMenu.tcl
@@ -3,7 +3,7 @@
 # This file defines the procedure tk_optionMenu, which creates
 # an option button and its associated menu.
 #
-# SCCS: @(#) optMenu.tcl 1.11 97/08/22 14:21:13
+# SCCS: @(#) optMenu.tcl 1.12 97/12/03 15:29:01
 #
 # Copyright (c) 1994 The Regents of the University of California.
 # Copyright (c) 1994 Sun Microsystems, Inc.
@@ -30,7 +30,7 @@
 proc tk_optionMenu {w varName firstValue args} {
     upvar #0 $varName var
 
-    if ![info exists var] {
+    if {![info exists var]} {
 	set var $firstValue
     }
     menubutton $w -textvariable $varName -indicatoron 1 -menu $w.menu \
diff --git a/library/palette.tcl b/library/palette.tcl
index 5d5318e..b6d8313 100644
--- a/library/palette.tcl
+++ b/library/palette.tcl
@@ -3,7 +3,7 @@
 # This file contains procedures that change the color palette used
 # by Tk.
 #
-# SCCS: @(#) palette.tcl 1.11 97/06/23 20:35:44
+# SCCS: @(#) palette.tcl 1.12 97/12/03 15:29:02
 #
 # Copyright (c) 1995-1997 Sun Microsystems, Inc.
 #
@@ -34,41 +34,41 @@ proc tk_setPalette {args} {
     } else {
 	array set new $args
     }
-    if ![info exists new(background)] {
+    if {![info exists new(background)]} {
 	error "must specify a background color"
     }
-    if ![info exists new(foreground)] {
+    if {![info exists new(foreground)]} {
 	set new(foreground) black
     }
     set bg [winfo rgb . $new(background)]
     set fg [winfo rgb . $new(foreground)]
-    set darkerBg [format #%02x%02x%02x [expr (9*[lindex $bg 0])/2560] \
-	    [expr (9*[lindex $bg 1])/2560] [expr (9*[lindex $bg 2])/2560]]
+    set darkerBg [format #%02x%02x%02x [expr {(9*[lindex $bg 0])/2560}] \
+	    [expr {(9*[lindex $bg 1])/2560}] [expr {(9*[lindex $bg 2])/2560}]]
     foreach i {activeForeground insertBackground selectForeground \
 	    highlightColor} {
-	if ![info exists new($i)] {
+	if {![info exists new($i)]} {
 	    set new($i) $new(foreground)
 	}
     }
-    if ![info exists new(disabledForeground)] {
+    if {![info exists new(disabledForeground)]} {
 	set new(disabledForeground) [format #%02x%02x%02x \
-		[expr (3*[lindex $bg 0] + [lindex $fg 0])/1024] \
-		[expr (3*[lindex $bg 1] + [lindex $fg 1])/1024] \
-		[expr (3*[lindex $bg 2] + [lindex $fg 2])/1024]]
+		[expr {(3*[lindex $bg 0] + [lindex $fg 0])/1024}] \
+		[expr {(3*[lindex $bg 1] + [lindex $fg 1])/1024}] \
+		[expr {(3*[lindex $bg 2] + [lindex $fg 2])/1024}]]
     }
-    if ![info exists new(highlightBackground)] {
+    if {![info exists new(highlightBackground)]} {
 	set new(highlightBackground) $new(background)
     }
-    if ![info exists new(activeBackground)] {
+    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} {
-	    set light($i) [expr [lindex $bg $i]/256]
-	    set inc1 [expr ($light($i)*15)/100]
-	    set inc2 [expr (255-$light($i))/3]
+	    set light($i) [expr {[lindex $bg $i]/256}]
+	    set inc1 [expr {($light($i)*15)/100}]
+	    set inc2 [expr {(255-$light($i))/3}]
 	    if {$inc1 > $inc2} {
 		incr light($i) $inc1
 	    } else {
@@ -81,13 +81,13 @@ proc tk_setPalette {args} {
 	set new(activeBackground) [format #%02x%02x%02x $light(0) \
 		$light(1) $light(2)]
     }
-    if ![info exists new(selectBackground)] {
+    if {![info exists new(selectBackground)]} {
 	set new(selectBackground) $darkerBg
     }
-    if ![info exists new(troughColor)] {
+    if {![info exists new(troughColor)]} {
 	set new(troughColor) $darkerBg
     }
-    if ![info exists new(selectColor)] {
+    if {![info exists new(selectColor)]} {
 	set new(selectColor) #b03060
     }
 
@@ -188,18 +188,18 @@ proc tkRecolorTree {w colors} {
 
 proc tkDarken {color percent} {
     set l [winfo rgb . $color]
-    set red [expr [lindex $l 0]/256]
-    set green [expr [lindex $l 1]/256]
-    set blue [expr [lindex $l 2]/256]
-    set red [expr ($red*$percent)/100]
+    set red [expr {[lindex $l 0]/256}]
+    set green [expr {[lindex $l 1]/256}]
+    set blue [expr {[lindex $l 2]/256}]
+    set red [expr {($red*$percent)/100}]
     if {$red > 255} {
 	set red 255
     }
-    set green [expr ($green*$percent)/100]
+    set green [expr {($green*$percent)/100}]
     if {$green > 255} {
 	set green 255
     }
-    set blue [expr ($blue*$percent)/100]
+    set blue [expr {($blue*$percent)/100}]
     if {$blue > 255} {
 	set blue 255
     }
diff --git a/library/safetk.tcl b/library/safetk.tcl
index 1cabcd5..30574de 100644
--- a/library/safetk.tcl
+++ b/library/safetk.tcl
@@ -2,7 +2,7 @@
 #
 # Support procs to use Tk in safe interpreters.
 #
-# SCCS: @(#) safetk.tcl 1.8 97/10/29 14:59:16
+# SCCS: @(#) safetk.tcl 1.13 98/01/15 13:40:46
 #
 # Copyright (c) 1997 Sun Microsystems, Inc.
 #
@@ -13,20 +13,16 @@
 
 #
 #
-# Note: It is UNSAFE to let any untrusted code being executed
+# 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.
-#       You should "loadTk $slave" right after safe::tkInterpCreate
-#       Otherwise, if you are using an application with Tk
-#       and don't want safe slaves to have access to Tk, potentially
-#       in a malevolent way, you should use 
-#            ::safe::interpCreate -nostatics -accesspath {directories...}
-#       where the directory list does NOT contain any Tk dynamically
-#       loadable library
+#       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.1;
+package require opt 0.4.1;
 
 namespace eval ::safe {
 
@@ -35,20 +31,22 @@ namespace eval ::safe {
 
     #
     # 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} {
+    proc ::safe::tkInterpInit {slave argv} {
 	global env tk_library
-	if {[info exists env(DISPLAY)]} {
-	    $slave eval [list set env(DISPLAY) $env(DISPLAY)];
-	}
+
+	# Clear Tk's access for that interp (path).
+	allowTk $slave $argv
+
 	# there seems to be an obscure case where the tk_library
 	# variable value is changed to point to a sym link destination
 	# dir instead of the sym link itself, and thus where the $tk_library
 	# would then not be anymore one of the auto_path dir, so we use
 	# the addToAccessPath which adds if it's not already in instead
-	# of the more conventional findInAccessPath
+	# of the more conventional findInAccessPath.
+	# Might be usefull for masters without Tk really loaded too.
 	::interp eval $slave [list set tk_library [::safe::interpAddToAccessPath $slave $tk_library]]
 	return $slave;
     }
@@ -67,23 +65,81 @@ proc ::safe::loadTk {} {}
     ::tcl::OptProc 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"
+		}
+	    }
+	}
 	if {![::tcl::OptProcArgGiven "-use"]} {
 	    # create a decorated toplevel
-	    ::tcl::Lassign [tkTopLevel $slave] w use;
+	    ::tcl::Lassign [tkTopLevel $slave $display] w use;
 	    # set our delete hook (slave arg is added by interpDelete)
 	    Set [DeleteHookName $slave] [list tkDelete {} $w];
+	} else {
+	    # 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 {[string compare $nDisplay $display]} {
+		if {$displayGiven} {
+		    error "conflicting -display $display and -use\
+			    $use -> $nDisplay"
+		} else {
+		    set display $nDisplay
+		}
+	    }
 	}
-	tkInterpInit $slave;
-	::interp eval $slave [list set argv [list "-use" $use]];
-	::interp eval $slave [list set argc 2];
+
+	# Prepares the slave for tk with those parameters
+
+	tkInterpInit $slave [list "-use" $use "-display" $display]
+
 	load {} Tk $slave
-	# Remove env(DISPLAY) if it's in there (if it has been set by
-	# tkInterpInit)
-	::interp eval $slave {catch {unset env(DISPLAY)}}
+
 	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
+	error "not allowed"
+    }
+}
+
+proc ::safe::allowTk {interpPath argv} {
+    variable tkInit
+    set tkInit($interpPath) $argv
+}
+
     proc ::safe::tkDelete {W window slave} {
 	# we are going to be called for each widget... skip untill it's
 	# top level
@@ -99,11 +155,11 @@ proc ::safe::loadTk {} {}
 	}
     }
 
-proc ::safe::tkTopLevel {slave} {
+proc ::safe::tkTopLevel {slave display} {
     variable tkSafeId;
     incr tkSafeId;
     set w ".safe$tkSafeId";
-    if {[catch {toplevel $w -class SafeTk} msg]} {
+    if {[catch {toplevel $w -screen $display -class SafeTk} msg]} {
 	return -code error "Unable to create toplevel for\
 		safe slave \"$slave\" ($msg)";
     }
diff --git a/library/scale.tcl b/library/scale.tcl
index 8e96176..3da1201 100644
--- a/library/scale.tcl
+++ b/library/scale.tcl
@@ -3,7 +3,7 @@
 # This file defines the default bindings for Tk scale widgets and provides
 # procedures that help in implementing the bindings.
 #
-# SCCS: @(#) scale.tcl 1.12 96/04/16 11:42:25
+# SCCS: @(#) scale.tcl 1.13 97/12/03 15:29:03
 #
 # Copyright (c) 1994 The Regents of the University of California.
 # Copyright (c) 1994-1995 Sun Microsystems, Inc.
@@ -19,7 +19,7 @@
 # Standard Motif bindings:
 
 bind Scale <Enter> {
-    if $tk_strictMotif {
+    if {$tk_strictMotif} {
 	set tkPriv(activeBg) [%W cget -activebackground]
 	%W config -activebackground [%W cget -background]
     }
@@ -29,7 +29,7 @@ bind Scale <Motion> {
     tkScaleActivate %W %x %y
 }
 bind Scale <Leave> {
-    if $tk_strictMotif {
+    if {$tk_strictMotif} {
 	%W config -activebackground $tkPriv(activeBg)
     }
     if {[%W cget -state] == "active"} {
@@ -137,8 +137,8 @@ proc tkScaleButtonDown {w x y} {
 	set tkPriv(dragging) 1
 	set tkPriv(initValue) [$w get]
 	set coords [$w coords]
-	set tkPriv(deltaX) [expr $x - [lindex $coords 0]]
-	set tkPriv(deltaY) [expr $y - [lindex $coords 1]]
+	set tkPriv(deltaX) [expr {$x - [lindex $coords 0]}]
+	set tkPriv(deltaY) [expr {$y - [lindex $coords 1]}]
 	$w configure -sliderrelief sunken
     }
 }
@@ -155,11 +155,11 @@ proc tkScaleButtonDown {w x y} {
 
 proc tkScaleDrag {w x y} {
     global tkPriv
-    if !$tkPriv(dragging) {
+    if {!$tkPriv(dragging)} {
 	return
     }
-    $w set [$w get [expr $x - $tkPriv(deltaX)] \
-	    [expr $y - $tkPriv(deltaY)]]
+    $w set [$w get [expr {$x - $tkPriv(deltaX)}] \
+	    [expr {$y - $tkPriv(deltaY)}]]
 }
 
 # tkScaleEndDrag --
@@ -197,7 +197,7 @@ proc tkScaleIncrement {w dir big repeat} {
     if {$big == "big"} {
 	set inc [$w cget -bigincrement]
 	if {$inc == 0} {
-	    set inc [expr abs([$w cget -to] - [$w cget -from])/10.0]
+	    set inc [expr {abs([$w cget -to] - [$w cget -from])/10.0}]
 	}
 	if {$inc < [$w cget -resolution]} {
 	    set inc [$w cget -resolution]
@@ -206,9 +206,9 @@ proc tkScaleIncrement {w dir big repeat} {
 	set inc [$w cget -resolution]
     }
     if {([$w cget -from] > [$w cget -to]) ^ ($dir == "up")} {
-	set inc [expr -$inc]
+	set inc [expr {-$inc}]
     }
-    $w set [expr [$w get] + $inc]
+    $w set [expr {[$w get] + $inc}]
 
     if {$repeat == "again"} {
 	set tkPriv(afterId) [after [$w cget -repeatinterval] \
diff --git a/library/scrlbar.tcl b/library/scrlbar.tcl
index e2b04b7..9674951 100644
--- a/library/scrlbar.tcl
+++ b/library/scrlbar.tcl
@@ -3,7 +3,7 @@
 # This file defines the default bindings for Tk scrollbar widgets.
 # It also provides procedures that help in implementing the bindings.
 #
-# SCCS: @(#) scrlbar.tcl 1.26 96/11/30 17:19:16
+# SCCS: @(#) scrlbar.tcl 1.27 97/12/03 15:29:03
 #
 # Copyright (c) 1994 The Regents of the University of California.
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -20,7 +20,7 @@
 if {($tcl_platform(platform) != "windows") &&
     ($tcl_platform(platform) != "macintosh")} {
 bind Scrollbar <Enter> {
-    if $tk_strictMotif {
+    if {$tk_strictMotif} {
 	set tkPriv(activeBg) [%W cget -activebackground]
 	%W config -activebackground [%W cget -background]
     }
@@ -231,8 +231,8 @@ proc tkScrollStartDrag {w x y} {
 	if {$iv0 == 0} {
 	    set tkPriv(initPos) 0.0
 	} else {
-	    set tkPriv(initPos) [expr (double([lindex $tkPriv(initValues) 2])) \
-		    / [lindex $tkPriv(initValues) 0]]
+	    set tkPriv(initPos) [expr {(double([lindex $tkPriv(initValues) 2])) \
+		    / [lindex $tkPriv(initValues) 0]}]
 	}
     }
 }
@@ -253,19 +253,19 @@ proc tkScrollDrag {w x y} {
     if {$tkPriv(initPos) == ""} {
 	return
     }
-    set delta [$w delta [expr $x - $tkPriv(pressX)] [expr $y - $tkPriv(pressY)]]
-    if [$w cget -jump] {
+    set delta [$w delta [expr {$x - $tkPriv(pressX)}] [expr {$y - $tkPriv(pressY)}]]
+    if {[$w cget -jump]} {
 	if {[llength $tkPriv(initValues)] == 2} {
-	    $w set [expr [lindex $tkPriv(initValues) 0] + $delta] \
-		    [expr [lindex $tkPriv(initValues) 1] + $delta]
+	    $w set [expr {[lindex $tkPriv(initValues) 0] + $delta}] \
+		    [expr {[lindex $tkPriv(initValues) 1] + $delta}]
 	} else {
-	    set delta [expr round($delta * [lindex $tkPriv(initValues) 0])]
+	    set delta [expr {round($delta * [lindex $tkPriv(initValues) 0])}]
 	    eval $w set [lreplace $tkPriv(initValues) 2 3 \
-		    [expr [lindex $tkPriv(initValues) 2] + $delta] \
-		    [expr [lindex $tkPriv(initValues) 3] + $delta]]
+		    [expr {[lindex $tkPriv(initValues) 2] + $delta}] \
+		    [expr {[lindex $tkPriv(initValues) 3] + $delta}]]
 	}
     } else {
-	tkScrollToPos $w [expr $tkPriv(initPos) + $delta]
+	tkScrollToPos $w [expr {$tkPriv(initPos) + $delta}]
     }
 }
 
@@ -283,10 +283,10 @@ proc tkScrollEndDrag {w x y} {
     if {$tkPriv(initPos) == ""} {
 	return
     }
-    if [$w cget -jump] {
-	set delta [$w delta [expr $x - $tkPriv(pressX)] \
-		[expr $y - $tkPriv(pressY)]]
-	tkScrollToPos $w [expr $tkPriv(initPos) + $delta]
+    if {[$w cget -jump]} {
+	set delta [$w delta [expr {$x - $tkPriv(pressX)}] \
+		[expr {$y - $tkPriv(pressY)}]]
+	tkScrollToPos $w [expr {$tkPriv(initPos) + $delta}]
     }
     set tkPriv(initPos) ""
 }
@@ -375,9 +375,9 @@ proc tkScrollToPos {w pos} {
 proc tkScrollTopBottom {w x y} {
     global tkPriv
     set element [$w identify $x $y]
-    if [string match *1 $element] {
+    if {[string match *1 $element]} {
 	tkScrollToPos $w 0
-    } elseif [string match *2 $element] {
+    } elseif {[string match *2 $element]} {
 	tkScrollToPos $w 1
     }
 
diff --git a/library/tclIndex b/library/tclIndex
index e65708e..e2cf7f1 100644
--- a/library/tclIndex
+++ b/library/tclIndex
@@ -72,6 +72,7 @@ set auto_index(tkPostOverPoint) [list source [file join $dir menu.tcl]]
 set auto_index(tkSaveGrabInfo) [list source [file join $dir menu.tcl]]
 set auto_index(tkRestoreOldGrab) [list source [file join $dir menu.tcl]]
 set auto_index(tk_menuSetFocus) [list source [file join $dir menu.tcl]]
+set auto_index(tkGenerateMenuSelect) [list source [file join $dir menu.tcl]]
 set auto_index(tk_popup) [list source [file join $dir menu.tcl]]
 set auto_index(tkScrollButtonDown) [list source [file join $dir scrlbar.tcl]]
 set auto_index(tkScrollButtonUp) [list source [file join $dir scrlbar.tcl]]
@@ -172,6 +173,8 @@ set auto_index(tkFocusGroup_In) [list source [file join $dir comdlg.tcl]]
 set auto_index(tkFocusGroup_Out) [list source [file join $dir comdlg.tcl]]
 set auto_index(tkFDGetFileTypes) [list source [file join $dir comdlg.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::tkTopLevel) [list source [file join $dir safetk.tcl]]
 set auto_index(tkMessageBox) [list source [file join $dir msgbox.tcl]]
 set auto_index(tkIconList) [list source [file join $dir tkfbox.tcl]]
diff --git a/library/tearoff.tcl b/library/tearoff.tcl
index 7cbe8e7..2b318c6 100644
--- a/library/tearoff.tcl
+++ b/library/tearoff.tcl
@@ -2,7 +2,7 @@
 #
 # This file contains procedures that implement tear-off menus.
 #
-# SCCS: @(#) tearoff.tcl 1.20 97/08/21 14:49:27
+# SCCS: @(#) tearoff.tcl 1.22 98/01/16 15:21:49
 #
 # Copyright (c) 1994 The Regents of the University of California.
 # Copyright (c) 1994-1997 Sun Microsystems, Inc.
@@ -49,7 +49,7 @@ proc tkTearOffMenu {w {x 0} {y 0}} {
     }
     for {set i 1} 1 {incr i} {
 	set menu $parent.tearoff$i
-	if ![winfo exists $menu] {
+	if {![winfo exists $menu]} {
 	    break
 	}
     }
@@ -134,12 +134,34 @@ proc tkMenuDup {src dst type} {
 
     # Duplicate the binding tags and bindings from the source menu.
 
-    regsub -all . $src {\\&} quotedSrc
-    regsub -all . $dst {\\&} quotedDst
-    regsub -all $quotedSrc [bindtags $src] $dst x
+    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]]
+	append x $dst
+	set tags [string range $tags [expr $index + $srcLen] end]
+    }
+    append x $tags
+
     bindtags $dst $x
+
     foreach event [bind $src] {
-	regsub -all $quotedSrc [bind $src $event] $dst x
+	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/library/text.tcl b/library/text.tcl
index 891a9ed..d07544e 100644
--- a/library/text.tcl
+++ b/library/text.tcl
@@ -3,7 +3,7 @@
 # This file defines the default bindings for Tk text widgets and provides
 # procedures that help in implementing the bindings.
 #
-# SCCS: @(#) text.tcl 1.58 97/09/17 18:54:56
+# SCCS: @(#) text.tcl 1.59 97/12/03 15:29:05
 #
 # Copyright (c) 1992-1994 The Regents of the University of California.
 # Copyright (c) 1994-1997 Sun Microsystems, Inc.
@@ -216,7 +216,7 @@ bind Text <Delete> {
 bind Text <BackSpace> {
     if {[%W tag nextrange sel 1.0 end] != ""} {
 	%W delete sel.first sel.last
-    } elseif [%W compare insert != 1.0] {
+    } elseif {[%W compare insert != 1.0]} {
 	%W delete insert-1c
 	%W see insert
     }
@@ -278,33 +278,33 @@ if {$tcl_platform(platform) == "macintosh"} {
 # Additional emacs-like bindings:
 
 bind Text <Control-a> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkTextSetCursor %W {insert linestart}
     }
 }
 bind Text <Control-b> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkTextSetCursor %W insert-1c
     }
 }
 bind Text <Control-d> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	%W delete insert
     }
 }
 bind Text <Control-e> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkTextSetCursor %W {insert lineend}
     }
 }
 bind Text <Control-f> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkTextSetCursor %W insert+1c
     }
 }
 bind Text <Control-k> {
-    if !$tk_strictMotif {
-	if [%W compare insert == {insert lineend}] {
+    if {!$tk_strictMotif} {
+	if {[%W compare insert == {insert lineend}]} {
 	    %W delete insert
 	} else {
 	    %W delete insert {insert lineend}
@@ -312,67 +312,67 @@ bind Text <Control-k> {
     }
 }
 bind Text <Control-n> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkTextSetCursor %W [tkTextUpDownLine %W 1]
     }
 }
 bind Text <Control-o> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	%W insert insert \n
 	%W mark set insert insert-1c
     }
 }
 bind Text <Control-p> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkTextSetCursor %W [tkTextUpDownLine %W -1]
     }
 }
 bind Text <Control-t> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkTextTranspose %W
     }
 }
 
 if {$tcl_platform(platform) != "windows"} {
 bind Text <Control-v> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkTextScrollPages %W 1
     }
 }
 }
 
 bind Text <Meta-b> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkTextSetCursor %W [tkTextPrevPos %W insert tcl_startOfPreviousWord]
     }
 }
 bind Text <Meta-d> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	%W delete insert [tkTextNextWord %W insert]
     }
 }
 bind Text <Meta-f> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkTextSetCursor %W [tkTextNextWord %W insert]
     }
 }
 bind Text <Meta-less> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkTextSetCursor %W 1.0
     }
 }
 bind Text <Meta-greater> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	tkTextSetCursor %W end-1c
     }
 }
 bind Text <Meta-BackSpace> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	%W delete [tkTextPrevPos %W insert tcl_startOfPreviousWord] insert
     }
 }
 bind Text <Meta-Delete> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	%W delete [tkTextPrevPos %W insert tcl_startOfPreviousWord] insert
     }
 }
@@ -420,15 +420,15 @@ bind Text <Shift-Option-Down> {
 # A few additional bindings of my own.
 
 bind Text <Control-h> {
-    if !$tk_strictMotif {
-	if [%W compare insert != 1.0] {
+    if {!$tk_strictMotif} {
+	if {[%W compare insert != 1.0]} {
 	    %W delete insert-1c
 	    %W see insert
 	}
     }
 }
 bind Text <2> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	%W scan mark %x %y
 	set tkPriv(x) %x
 	set tkPriv(y) %y
@@ -436,11 +436,11 @@ bind Text <2> {
     }
 }
 bind Text <B2-Motion> {
-    if !$tk_strictMotif {
+    if {!$tk_strictMotif} {
 	if {(%x != $tkPriv(x)) || (%y != $tkPriv(y))} {
 	    set tkPriv(mouseMoved) 1
 	}
-	if $tkPriv(mouseMoved) {
+	if {$tkPriv(mouseMoved)} {
 	    %W scan dragto %x %y
 	}
     }
@@ -460,7 +460,7 @@ set tkPriv(prevPos) {}
 proc tkTextClosestGap {w x y} {
     set pos [$w index @$x,$y]
     set bbox [$w bbox $pos]
-    if ![string compare $bbox ""] {
+    if {![string compare $bbox ""]} {
 	return $pos
     }
     if {($x - [lindex $bbox 0]) < ([lindex $bbox 2]/2)} {
@@ -506,7 +506,7 @@ proc tkTextSelectTo {w x y} {
     global tkPriv tcl_platform
 
     set cur [tkTextClosestGap $w $x $y]
-    if [catch {$w index anchor}] {
+    if {[catch {$w index anchor}]} {
 	$w mark set anchor $cur
     }
     set anchor [$w index anchor]
@@ -515,7 +515,7 @@ proc tkTextSelectTo {w x y} {
     }
     switch $tkPriv(selectMode) {
 	char {
-	    if [$w compare $cur < anchor] {
+	    if {[$w compare $cur < anchor]} {
 		set first $cur
 		set last anchor
 	    } else {
@@ -524,7 +524,7 @@ proc tkTextSelectTo {w x y} {
 	    }
 	}
 	word {
-	    if [$w compare $cur < anchor] {
+	    if {[$w compare $cur < anchor]} {
 		set first [tkTextPrevPos $w "$cur + 1c" tcl_wordBreakBefore]
 		set last [tkTextNextPos $w "anchor" tcl_wordBreakAfter]
 	    } else {
@@ -533,7 +533,7 @@ proc tkTextSelectTo {w x y} {
 	    }
 	}
 	line {
-	    if [$w compare $cur < anchor] {
+	    if {[$w compare $cur < anchor]} {
 		set first [$w index "$cur linestart"]
 		set last [$w index "anchor - 1c lineend + 1c"]
 	    } else {
@@ -568,11 +568,11 @@ proc tkTextKeyExtend {w index} {
     global tkPriv
 
     set cur [$w index $index]
-    if [catch {$w index anchor}] {
+    if {[catch {$w index anchor}]} {
 	$w mark set anchor $cur
     }
     set anchor [$w index anchor]
-    if [$w compare $cur < anchor] {
+    if {[$w compare $cur < anchor]} {
 	set first $cur
 	set last anchor
     } else {
@@ -640,7 +640,7 @@ proc tkTextAutoScan {w} {
 proc tkTextSetCursor {w pos} {
     global tkPriv
 
-    if [$w compare $pos == end] {
+    if {[$w compare $pos == end]} {
 	set pos {end - 1 chars}
     }
     $w mark set insert $pos
@@ -662,14 +662,14 @@ proc tkTextKeySelect {w new} {
     global tkPriv
 
     if {[$w tag nextrange sel 1.0 end] == ""} {
-	if [$w compare $new < insert] {
+	if {[$w compare $new < insert]} {
 	    $w tag add sel $new insert
 	} else {
 	    $w tag add sel insert $new
 	}
 	$w mark set anchor insert
     } else {
-	if [$w compare $new < anchor] {
+	if {[$w compare $new < anchor]} {
 	    set first $new
 	    set last anchor
 	} else {
@@ -709,11 +709,11 @@ proc tkTextResetAnchor {w index} {
     set a [$w index $index]
     set b [$w index sel.first]
     set c [$w index sel.last]
-    if [$w compare $a < $b] {
+    if {[$w compare $a < $b]} {
 	$w mark set anchor sel.last
 	return
     }
-    if [$w compare $a > $c] {
+    if {[$w compare $a > $c]} {
 	$w mark set anchor sel.first
 	return
     }
@@ -783,7 +783,7 @@ proc tkTextUpDownLine {w n} {
     if {[string compare $tkPriv(prevPos) $i] != 0} {
 	set tkPriv(char) $char
     }
-    set new [$w index [expr $line + $n].$tkPriv(char)]
+    set new [$w index [expr {$line + $n}].$tkPriv(char)]
     if {[$w compare $new == end] || [$w compare $new == "insert linestart"]} {
 	set new $i
     }
@@ -805,8 +805,8 @@ proc tkTextPrevPara {w pos} {
     while 1 {
 	if {(([$w get "$pos - 1 line"] == "\n") && ([$w get $pos] != "\n"))
 		|| ($pos == "1.0")} {
-	    if [regexp -indices {^[ 	]+(.)} [$w get $pos "$pos lineend"] \
-		    dummy index] {
+	    if {[regexp -indices {^[ 	]+(.)} [$w get $pos "$pos lineend"] \
+		    dummy index]} {
 		set pos [$w index "$pos + [lindex $index 0] chars"]
 	    }
 	    if {[$w compare $pos != insert] || ($pos == "1.0")} {
@@ -829,19 +829,19 @@ proc tkTextPrevPara {w pos} {
 proc tkTextNextPara {w start} {
     set pos [$w index "$start linestart + 1 line"]
     while {[$w get $pos] != "\n"} {
-	if [$w compare $pos == end] {
+	if {[$w compare $pos == end]} {
 	    return [$w index "end - 1c"]
 	}
 	set pos [$w index "$pos + 1 line"]
     }
     while {[$w get $pos] == "\n"} {
 	set pos [$w index "$pos + 1 line"]
-	if [$w compare $pos == end] {
+	if {[$w compare $pos == end]} {
 	    return [$w index "end - 1c"]
 	}
     }
-    if [regexp -indices {^[ 	]+(.)} [$w get $pos "$pos lineend"] \
-	    dummy index] {
+    if {[regexp -indices {^[ 	]+(.)} [$w get $pos "$pos lineend"] \
+	    dummy index]} {
 	return [$w index "$pos + [lindex $index 0] chars"]
     }
     return $pos
@@ -863,7 +863,7 @@ proc tkTextScrollPages {w count} {
     set bbox [$w bbox insert]
     $w yview scroll $count pages
     if {$bbox == ""} {
-	return [$w index @[expr [winfo height $w]/2],0]
+	return [$w index @[expr {[winfo height $w]/2}],0]
     }
     return [$w index @[lindex $bbox 0],[lindex $bbox 1]]
 }
@@ -880,11 +880,11 @@ proc tkTextScrollPages {w count} {
 
 proc tkTextTranspose w {
     set pos insert
-    if [$w compare $pos != "$pos lineend"] {
+    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] {
+    if {[$w compare "$pos - 1 char" == 1.0]} {
 	return
     }
     $w delete "$pos - 2 char" $pos
diff --git a/library/tk.tcl b/library/tk.tcl
index 4ecbeaf..1a1fbd0 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -3,7 +3,7 @@
 # Initialization script normally executed in the interpreter for each
 # Tk-based application.  Arranges class bindings for widgets.
 #
-# SCCS: @(#) tk.tcl 1.98 97/10/28 15:21:04
+# SCCS: @(#) tk.tcl 1.101 97/12/19 16:16:40
 #
 # Copyright (c) 1992-1994 The Regents of the University of California.
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -13,8 +13,8 @@
 
 # Insist on running with compatible versions of Tcl and Tk.
 
-package require -exact Tk 8.0
-package require -exact Tcl 8.0
+package require -exact Tk 8.1
+package require -exact Tcl 8.1
 
 # Add Tk's directory to the end of the auto-load search path, if it
 # isn't already on the path:
@@ -42,7 +42,7 @@ set tk_strictMotif 0
 proc tkScreenChanged screen {
     set x [string last . $screen]
     if {$x > 0} {
-	set disp [string range $screen 0 [expr $x - 1]]
+	set disp [string range $screen 0 [expr {$x - 1}]]
     } else {
 	set disp $screen
     }
@@ -51,7 +51,7 @@ proc tkScreenChanged screen {
     global tkPriv
     global tcl_platform
 
-    if [info exists tkPriv] {
+    if {[info exists tkPriv]} {
 	set tkPriv(screen) $screen
 	return
     }
@@ -101,7 +101,7 @@ tkScreenChanged [winfo screen .]
 proc tkEventMotifBindings {n1 dummy dummy} {
     upvar $n1 name
     
-    if $name {
+    if {$name} {
 	set op delete
     } else {
 	set op add
@@ -113,6 +113,40 @@ proc tkEventMotifBindings {n1 dummy dummy} {
 }
 
 #----------------------------------------------------------------------
+# Define common dialogs on platforms where they are not implemented 
+# using compiled code.
+#----------------------------------------------------------------------
+
+if {[info commands tk_chooseColor] == ""} {
+    proc tk_chooseColor {args} {
+	return [eval tkColorDialog $args]
+    }
+}
+if {[info commands tk_getOpenFile] == ""} {
+    proc tk_getOpenFile {args} {
+	if {$::tk_strictMotif} {
+	    return [eval tkMotifFDialog open $args]
+	} else {
+	    return [eval tkFDialog open $args]
+	}
+    }
+}
+if {[info commands tk_getSaveFile] == ""} {
+    proc tk_getSaveFile {args} {
+	if {$::tk_strictMotif} {
+	    return [eval tkMotifFDialog save $args]
+	} else {
+	    return [eval tkFDialog save $args]
+	}
+    }
+}
+if {[info commands tk_messageBox] == ""} {
+    proc tk_messageBox {args} {
+	return [eval tkMessageBox $args]
+    }
+}
+	
+#----------------------------------------------------------------------
 # Define the set of common virtual events.
 #----------------------------------------------------------------------
 
diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl
index d81a5a2..8e2bd73 100644
--- a/library/tkfbox.tcl
+++ b/library/tkfbox.tcl
@@ -11,9 +11,9 @@
 #	files by clicking on the file icons or by entering a filename
 #	in the "Filename:" entry.
 #
-# SCCS: @(#) tkfbox.tcl 1.13 97/10/01 14:51:01
+# SCCS: @(#) tkfbox.tcl 1.22 98/01/26 19:42:37
 #
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
+# 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.
@@ -95,10 +95,10 @@ proc tkIconList_Create {w} {
 
     bind $data(canvas) <1>         "tkIconList_Btn1 $w %x %y"
     bind $data(canvas) <B1-Motion> "tkIconList_Motion1 $w %x %y"
-    bind $data(canvas) <Double-1>  "tkIconList_Double1 $w %x %y"
-    bind $data(canvas) <ButtonRelease-1> "tkCancelRepeat"
     bind $data(canvas) <B1-Leave>  "tkIconList_Leave1 $w %x %y"
     bind $data(canvas) <B1-Enter>  "tkCancelRepeat"
+    bind $data(canvas) <ButtonRelease-1> "tkCancelRepeat"
+    bind $data(canvas) <Double-ButtonRelease-1> "tkIconList_Double1 $w %x %y"
 
     bind $data(canvas) <Up>        "tkIconList_UpDown $w -1"
     bind $data(canvas) <Down>      "tkIconList_UpDown $w  1"
@@ -133,7 +133,7 @@ proc tkIconList_AutoScan {w} {
     set x $tkPriv(x)
     set y $tkPriv(y)
 
-    if $data(noScroll) {
+    if {$data(noScroll)} {
 	return
     }
     if {$x >= [winfo width $data(canvas)]} {
@@ -188,8 +188,8 @@ proc tkIconList_Add {w image text} {
     set rTag [$data(canvas) create rect  0 0 0 0 -fill "" -outline ""]
     
     set b [$data(canvas) bbox $iTag]
-    set iW [expr [lindex $b 2]-[lindex $b 0]]
-    set iH [expr [lindex $b 3]-[lindex $b 1]]
+    set iW [expr {[lindex $b 2]-[lindex $b 0]}]
+    set iH [expr {[lindex $b 3]-[lindex $b 1]}]
     if {$data(maxIW) < $iW} {
 	set data(maxIW) $iW
     }
@@ -198,8 +198,8 @@ proc tkIconList_Add {w image text} {
     }
     
     set b [$data(canvas) bbox $tTag]
-    set tW [expr [lindex $b 2]-[lindex $b 0]]
-    set tH [expr [lindex $b 3]-[lindex $b 1]]
+    set tW [expr {[lindex $b 2]-[lindex $b 0]}]
+    set tH [expr {[lindex $b 3]-[lindex $b 1]}]
     if {$data(maxTW) < $tW} {
 	set data(maxTW) $tW
     }
@@ -218,7 +218,7 @@ proc tkIconList_Add {w image text} {
 proc tkIconList_Arrange {w} {
     upvar #0 $w data
 
-    if ![info exists data(list)] {
+    if {![info exists data(list)]} {
 	if {[info exists data(canvas)] && [winfo exists $data(canvas)]} {
 	    set data(noScroll) 1
 	    $data(sbar) config -command ""
@@ -228,26 +228,26 @@ proc tkIconList_Arrange {w} {
 
     set W [winfo width  $data(canvas)]
     set H [winfo height $data(canvas)]
-    set pad [expr [$data(canvas) cget -highlightthickness] + \
-	[$data(canvas) cget -bd]]
+    set pad [expr {[$data(canvas) cget -highlightthickness] + \
+	    [$data(canvas) cget -bd]}]
     if {$pad < 2} {
 	set pad 2
     }
 
-    incr W -[expr $pad*2]
-    incr H -[expr $pad*2]
+    incr W -[expr {$pad*2}]
+    incr H -[expr {$pad*2}]
 
-    set dx [expr $data(maxIW) + $data(maxTW) + 8]
+    set dx [expr {$data(maxIW) + $data(maxTW) + 8}]
     if {$data(maxTH) > $data(maxIH)} {
 	set dy $data(maxTH)
     } else {
 	set dy $data(maxIH)
     }
     incr dy 2
-    set shift [expr $data(maxIW) + 4]
+    set shift [expr {$data(maxIW) + 4}]
 
-    set x [expr $pad * 2]
-    set y [expr $pad * 1]
+    set x [expr {$pad * 2}]
+    set y [expr {$pad * 1}] ; # Why * 1 ?
     set usedColumn 0
     foreach sublist $data(list) {
 	set usedColumn 1
@@ -259,24 +259,24 @@ proc tkIconList_Arrange {w} {
 	set tW   [lindex $sublist 5]
 	set tH   [lindex $sublist 6]
 
-	set i_dy [expr ($dy - $iH)/2]
-	set t_dy [expr ($dy - $tH)/2]
+	set i_dy [expr {($dy - $iH)/2}]
+	set t_dy [expr {($dy - $tH)/2}]
 
-	$data(canvas) coords $iTag $x                 [expr $y + $i_dy]
-	$data(canvas) coords $tTag [expr $x + $shift] [expr $y + $t_dy]
-	$data(canvas) coords $tTag [expr $x + $shift] [expr $y + $t_dy]
-	$data(canvas) coords $rTag $x $y [expr $x+$dx] [expr $y+$dy]
+	$data(canvas) coords $iTag $x                    [expr {$y + $i_dy}]
+	$data(canvas) coords $tTag [expr {$x + $shift}]  [expr {$y + $t_dy}]
+	$data(canvas) coords $tTag [expr {$x + $shift}]  [expr {$y + $t_dy}]
+	$data(canvas) coords $rTag $x $y [expr {$x+$dx}] [expr {$y+$dy}]
 
 	incr y $dy
-	if {[expr $y + $dy] > $H} {
-	    set y [expr $pad * 1]
+	if {($y + $dy) > $H} {
+	    set y [expr {$pad * 1}] ; # *1 ?
 	    incr x $dx
 	    set usedColumn 0
 	}
     }
 
     if {$usedColumn} {
-	set sW [expr $x + $dx]
+	set sW [expr {$x + $dx}]
     } else {
 	set sW $x
     }
@@ -292,7 +292,7 @@ proc tkIconList_Arrange {w} {
 	set data(noScroll) 0
     }
 
-    set data(itemsPerColumn) [expr ($H-$pad)/$dy]
+    set data(itemsPerColumn) [expr {($H-$pad)/$dy}]
     if {$data(itemsPerColumn) < 1} {
 	set data(itemsPerColumn) 1
     }
@@ -321,47 +321,47 @@ proc tkIconList_See {w rTag} {
     upvar #0 $w data
     upvar #0 $w:itemList itemList
 
-    if $data(noScroll) {
+    if {$data(noScroll)} {
 	return
     }
     set sRegion [$data(canvas) cget -scrollregion]
-    if ![string compare $sRegion {}] {
+    if {![string compare $sRegion {}]} {
 	return
     }
 
-    if ![info exists itemList($rTag)] {
+    if {![info exists itemList($rTag)]} {
 	return
     }
 
 
     set bbox [$data(canvas) bbox $rTag]
-    set pad [expr [$data(canvas) cget -highlightthickness] + \
-	[$data(canvas) cget -bd]]
+    set pad [expr {[$data(canvas) cget -highlightthickness] + \
+	    [$data(canvas) cget -bd]}]
 
     set x1 [lindex $bbox 0]
     set x2 [lindex $bbox 2]
-    incr x1 -[expr $pad * 2]
-    incr x2 -[expr $pad * 1]
+    incr x1 -[expr {$pad * 2}]
+    incr x2 -[expr {$pad * 1}] ; # *1 ?
 
-    set cW [expr [winfo width $data(canvas)] - $pad*2]
+    set cW [expr {[winfo width $data(canvas)] - $pad*2}]
 
-    set scrollW [expr [lindex $sRegion 2]-[lindex $sRegion 0]+1]
-    set dispX [expr int([lindex [$data(canvas) xview] 0]*$scrollW)]
+    set scrollW [expr {[lindex $sRegion 2]-[lindex $sRegion 0]+1}]
+    set dispX [expr {int([lindex [$data(canvas) xview] 0]*$scrollW)}]
     set oldDispX $dispX
 
     # check if out of the right edge
     #
-    if {[expr $x2 - $dispX] >= $cW} {
-	set dispX [expr $x2 - $cW]
+    if {($x2 - $dispX) >= $cW} {
+	set dispX [expr {$x2 - $cW}]
     }
     # check if out of the left edge
     #
-    if {[expr $x1 - $dispX] < 0} {
+    if {($x1 - $dispX) < 0} {
 	set dispX $x1
     }
 
     if {$oldDispX != $dispX} {
-	set fraction [expr double($dispX)/double($scrollW)]
+	set fraction [expr {double($dispX)/double($scrollW)}]
 	$data(canvas) xview moveto $fraction
     }
 }
@@ -377,7 +377,7 @@ proc tkIconList_Select {w rTag {callBrowse 1}} {
     upvar #0 $w data
     upvar #0 $w:itemList itemList
 
-    if ![info exists itemList($rTag)] {
+    if {![info exists itemList($rTag)]} {
 	return
     }
     set iTag   [lindex $itemList($rTag) 0]
@@ -385,7 +385,7 @@ proc tkIconList_Select {w rTag {callBrowse 1}} {
     set text   [lindex $itemList($rTag) 2]
     set serial [lindex $itemList($rTag) 3]
 
-    if ![info exists data(rect)] {
+    if {![info exists data(rect)]} {
         set data(rect) [$data(canvas) create rect 0 0 0 0 \
 	    -fill #a0a0ff -outline #a0a0ff]
     }
@@ -397,7 +397,7 @@ proc tkIconList_Select {w rTag {callBrowse 1}} {
     set data(selected) $text
     
     if {$callBrowse} {
-	if [string compare $data(-browsecmd) ""] {
+	if {[string compare $data(-browsecmd) ""]} {
 	    eval $data(-browsecmd) [list $text]
 	}
     }
@@ -406,11 +406,11 @@ proc tkIconList_Select {w rTag {callBrowse 1}} {
 proc tkIconList_Unselect {w} {
     upvar #0 $w data
 
-    if [info exists data(rect)] {
+    if {[info exists data(rect)]} {
 	$data(canvas) delete $data(rect)
 	unset data(rect)
     }
-    if [info exists data(selected)] {
+    if {[info exists data(selected)]} {
 	unset data(selected)
     }
     set data(curItem)  {}
@@ -421,7 +421,7 @@ proc tkIconList_Unselect {w} {
 proc tkIconList_Get {w} {
     upvar #0 $w data
 
-    if [info exists data(selected)] {
+    if {[info exists data(selected)]} {
 	return $data(selected)
     } else {
 	return ""
@@ -469,7 +469,7 @@ proc tkIconList_Leave1 {w x y} {
 proc tkIconList_FocusIn {w} {
     upvar #0 $w data
 
-    if ![info exists data(list)] {
+    if {![info exists data(list)]} {
 	return
     }
 
@@ -490,7 +490,7 @@ proc tkIconList_FocusIn {w} {
 proc tkIconList_UpDown {w amount} {
     upvar #0 $w data
 
-    if ![info exists data(list)] {
+    if {![info exists data(list)]} {
 	return
     }
 
@@ -498,13 +498,13 @@ proc tkIconList_UpDown {w amount} {
 	set rTag [lindex [lindex $data(list) 0] 2]
     } else {
 	set oldRTag [lindex [lindex $data(list) $data(curItem)] 2]
-	set rTag [lindex [lindex $data(list) [expr $data(curItem)+$amount]] 2]
-	if ![string compare $rTag ""] {
+	set rTag [lindex [lindex $data(list) [expr {$data(curItem)+$amount}]] 2]
+	if {![string compare $rTag ""]} {
 	    set rTag $oldRTag
 	}
     }
 
-    if [string compare $rTag ""] {
+    if {[string compare $rTag ""]} {
 	tkIconList_Select $w $rTag
 	tkIconList_See $w $rTag
     }
@@ -521,21 +521,21 @@ proc tkIconList_UpDown {w amount} {
 proc tkIconList_LeftRight {w amount} {
     upvar #0 $w data
 
-    if ![info exists data(list)] {
+    if {![info exists data(list)]} {
 	return
     }
     if {$data(curItem) == {}} {
 	set rTag [lindex [lindex $data(list) 0] 2]
     } else {
 	set oldRTag [lindex [lindex $data(list) $data(curItem)] 2]
-	set newItem [expr $data(curItem)+($amount*$data(itemsPerColumn))]
+	set newItem [expr {$data(curItem)+($amount*$data(itemsPerColumn))}]
 	set rTag [lindex [lindex $data(list) $newItem] 2]
-	if ![string compare $rTag ""] {
+	if {![string compare $rTag ""]} {
 	    set rTag $oldRTag
 	}
     }
 
-    if [string compare $rTag ""] {
+    if {[string compare $rTag ""]} {
 	tkIconList_Select $w $rTag
 	tkIconList_See $w $rTag
     }
@@ -565,7 +565,7 @@ proc tkIconList_Goto {w text} {
     upvar #0 $w:textList textList
     global tkPriv
     
-    if ![info exists data(list)] {
+    if {![info exists data(list)]} {
 	return
     }
 
@@ -583,7 +583,7 @@ proc tkIconList_Goto {w text} {
     set theIndex -1
     set less 0
     set len [string length $text]
-    set len0 [expr $len-1]
+    set len0 [expr {$len-1}]
     set i $start
 
     # Search forward until we find a filename whose prefix is an exact match
@@ -628,23 +628,22 @@ proc tkIconList_Reset {w} {
 #	the tk_strictMotif flag is set to false. This procedure shouldn't
 #	be called directly. Call tk_getOpenFile or tk_getSaveFile instead.
 #
-proc tkFDialog {args} {
-    global tkPriv
-    set w __tk_filedialog
-    upvar #0 $w data
+# Arguments:
+#	type		"open" or "save"
+#	args		Options parsed by the procedure.
+#
 
-    if ![string compare [lindex [info level 0] 0] tk_getOpenFile] {
-	set type open
-    } else {
-	set type save
-    }
+proc tkFDialog {type args} {
+    global tkPriv
+    set dataName __tk_filedialog
+    upvar #0 $dataName data
 
-    tkFDialog_Config $w $type $args
+    tkFDialog_Config $dataName $type $args
 
     if {![string compare $data(-parent) .]} {
-        set w .$w
+        set w .$dataName
     } else {
-        set w $data(-parent).$w
+        set w $data(-parent).$dataName
     }
 
     # (re)create the dialog box if necessary
@@ -657,7 +656,9 @@ proc tkFDialog {args} {
     }
     wm transient $w $data(-parent)
 
-    # 5. Initialize the file types menu
+    trace variable data(selectPath) w "tkFDialog_SetPath $w"
+
+    # Initialize the file types menu
     #
     if {$data(-filetypes) != {}} {
 	$data(typeMenu) delete 0 end
@@ -678,21 +679,21 @@ proc tkFDialog {args} {
 
     tkFDialog_UpdateWhenIdle $w
 
-    # 6. Withdraw the window, then update all the geometry information
+    # 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 and de-iconify it.
 
     wm withdraw $w
     update idletasks
-    set x [expr [winfo screenwidth $w]/2 - [winfo reqwidth $w]/2 \
-	    - [winfo vrootx [winfo parent $w]]]
-    set y [expr [winfo screenheight $w]/2 - [winfo reqheight $w]/2 \
-	    - [winfo vrooty [winfo parent $w]]]
+    set x [expr {[winfo screenwidth $w]/2 - [winfo reqwidth $w]/2 \
+	    - [winfo vrootx [winfo parent $w]]}]
+    set y [expr {[winfo screenheight $w]/2 - [winfo reqheight $w]/2 \
+	    - [winfo vrooty [winfo parent $w]]}]
     wm geom $w [winfo reqwidth $w]x[winfo reqheight $w]+$x+$y
     wm deiconify $w
     wm title $w $data(-title)
 
-    # 7. Set a grab and claim the focus too.
+    # Set a grab and claim the focus too.
 
     set oldFocus [focus]
     set oldGrab [grab current $w]
@@ -707,7 +708,7 @@ proc tkFDialog {args} {
     $data(ent) select to   end
     $data(ent) icursor end
 
-    # 8. Wait for the user to respond, then restore the focus and
+    # 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,
@@ -724,6 +725,7 @@ proc tkFDialog {args} {
 	    grab $oldGrab
 	}
     }
+
     return $tkPriv(selectFilePath)
 }
 
@@ -731,11 +733,19 @@ proc tkFDialog {args} {
 #
 #	Configures the TK filedialog according to the argument list
 #
-proc tkFDialog_Config {w type argList} {
-    upvar #0 $w data
+proc tkFDialog_Config {dataName type argList} {
+    upvar #0 $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 vinfo data(selectPath)] {
+	trace vdelete data(selectPath) [lindex $trace 0] [lindex $trace 1]
+    }
+
     # 1: the configuration specs
     #
     set specs {
@@ -749,7 +759,7 @@ proc tkFDialog_Config {w type argList} {
 
     # 2: default values depending on the type of the dialog
     #
-    if ![info exists data(selectPath)] {
+    if {![info exists data(selectPath)]} {
 	# first time the dialog has been popped up
 	set data(selectPath) [pwd]
 	set data(selectFile) ""
@@ -757,10 +767,10 @@ proc tkFDialog_Config {w type argList} {
 
     # 3: parse the arguments
     #
-    tclParseConfigSpec $w $specs "" $argList
+    tclParseConfigSpec $dataName $specs "" $argList
 
-    if ![string compare $data(-title) ""] {
-	if ![string compare $type "open"] {
+    if {![string compare $data(-title) ""]} {
+	if {![string compare $type "open"]} {
 	    set data(-title) "Open"
 	} else {
 	    set data(-title) "Save As"
@@ -770,9 +780,9 @@ proc tkFDialog_Config {w type argList} {
     # 4: set the default directory and selection according to the -initial
     #    settings
     #
-    if [string compare $data(-initialdir) ""] {
-	if [file isdirectory $data(-initialdir)] {
-	    set data(selectPath) [glob $data(-initialdir)]
+    if {[string compare $data(-initialdir) ""]} {
+	if {[file isdirectory $data(-initialdir)]} {
+	    set data(selectPath) [lindex [glob $data(-initialdir)] 0]
 	} else {
 	    error "\"$data(-initialdir)\" is not a valid directory"
 	}
@@ -783,7 +793,7 @@ proc tkFDialog_Config {w type argList} {
     #
     set data(-filetypes) [tkFDGetFileTypes $data(-filetypes)]
 
-    if ![winfo exists $data(-parent)] {
+    if {![winfo exists $data(-parent)]} {
 	error "bad window path name \"$data(-parent)\""
     }
 }
@@ -802,7 +812,7 @@ proc tkFDialog_Create {w} {
     set data(dirMenuBtn) $f1.menu
     set data(dirMenu) [tk_optionMenu $f1.menu [format %s(selectPath) $dataName] ""]
     set data(upBtn) [button $f1.up]
-    if ![info exists tkPriv(updirImage)] {
+    if {![info exists tkPriv(updirImage)]} {
 	set tkPriv(updirImage) [image create bitmap -data {
 #define updir_width 28
 #define updir_height 16
@@ -896,8 +906,6 @@ static char updir_bits[] = {
     $data(okBtn)     config -command "tkFDialog_OkCmd $w"
     $data(cancelBtn) config -command "tkFDialog_CancelCmd $w"
 
-    trace variable data(selectPath) w "tkFDialog_SetPath $w"
-
     bind $w <Alt-d> "focus $data(dirMenuBtn)"
     bind $w <Alt-t> [format {
 	if {"[%s cget -state]" == "normal"} {
@@ -929,7 +937,7 @@ static char updir_bits[] = {
 proc tkFDialog_UpdateWhenIdle {w} {
     upvar #0 [winfo name $w] data
 
-    if [info exists data(updateId)] {
+    if {[info exists data(updateId)]} {
 	return
     } else {
 	set data(updateId) [after idle tkFDialog_Update $w]
@@ -955,8 +963,7 @@ proc tkFDialog_Update {w} {
 	catch {unset data(updateId)}
     }
 
-    set TRANSPARENT_GIF_COLOR [$w cget -bg]
-    if ![info exists tkPriv(folderImage)] {
+    if {![info exists tkPriv(folderImage)]} {
 	set tkPriv(folderImage) [image create photo -data {
 R0lGODlhEAAMAKEAAAD//wAAAPD/gAAAACH5BAEAAAAALAAAAAAQAAwAAAIghINhyycvVFsB
 QtmS3rjaH1Hg141WaT5ouprt2HHcUgAAOw==}]
@@ -968,9 +975,9 @@ rSASvJTGhnhcV3EJlo3kh53ltF5nAhQAOw==}]
     set file   $tkPriv(fileImage)
 
     set appPWD [pwd]
-    if [catch {
+    if {[catch {
 	cd $data(selectPath)
-    }] {
+    }]} {
 	# We cannot change directory to $data(selectPath). $data(selectPath)
 	# should have been checked before tkFDialog_Update is called, so
 	# we normally won't come to here. Anyways, give an error and abort
@@ -996,14 +1003,14 @@ rSASvJTGhnhcV3EJlo3kh53ltF5nAhQAOw==}]
     # Make the dir list
     #
     foreach f [lsort -dictionary [glob -nocomplain .* *]] {
-	if ![string compare $f .] {
+	if {![string compare $f .]} {
 	    continue
 	}
-	if ![string compare $f ..] {
+	if {![string compare $f ..]} {
 	    continue
 	}
-	if [file isdir ./$f] {
-	    if ![info exists hasDoneDir($f)] {
+	if {[file isdir ./$f]} {
+	    if {![info exists hasDoneDir($f)]} {
 		tkIconList_Add $data(icons) $folder $f
 		set hasDoneDir($f) 1
 	    }
@@ -1011,7 +1018,7 @@ rSASvJTGhnhcV3EJlo3kh53ltF5nAhQAOw==}]
     }
     # Make the file list
     #
-    if ![string compare $data(filter) *] {
+    if {![string compare $data(filter) *]} {
 	set files [lsort -dictionary \
 	    [glob -nocomplain .* *]]
     } else {
@@ -1021,8 +1028,8 @@ rSASvJTGhnhcV3EJlo3kh53ltF5nAhQAOw==}]
 
     set top 0
     foreach f $files {
-	if ![file isdir ./$f] {
-	    if ![info exists hasDoneFile($f)] {
+	if {![file isdir ./$f]} {
+	    if {![info exists hasDoneFile($f)]} {
 		tkIconList_Add $data(icons) $file $f
 		set hasDoneFile($f) 1
 	    }
@@ -1132,24 +1139,21 @@ proc tkFDialogResolveFile {context text defaultext} {
 	set path "$path$defaultext"
     }
 
-    if [catch {file exists $path}] {
-	return [list ERROR $path ""]
-    }
 
-    if [catch {if [file exists $path] {}}] {
-	# This "if" block can be safely removed if the following code returns
-	# an error. It currently (7/22/97) doesn't
+    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 {
+    if {[file exists $path]} {
+	if {[file isdirectory $path]} {
+	    if {[catch {
 		cd $path
-	    }] {
+	    }]} {
 		return [list CHDIR $path ""]
 	    }
 	    set directory [pwd]
@@ -1157,9 +1161,9 @@ proc tkFDialogResolveFile {context text defaultext} {
 	    set flag OK
 	    cd $appPWD
 	} else {
-	    if [catch {
+	    if {[catch {
 		cd [file dirname $path]
-	    }] {
+	    }]} {
 		return [list CHDIR [file dirname $path] ""]
 	    }
 	    set directory [pwd]
@@ -1169,15 +1173,15 @@ proc tkFDialogResolveFile {context text defaultext} {
 	}
     } else {
 	set dirname [file dirname $path]
-	if [file exists $dirname] {
-	    if [catch {
+	if {[file exists $dirname]} {
+	    if {[catch {
 		cd $dirname
-	    }] {
+	    }]} {
 		return [list CHDIR $dirname ""]
 	    }
 	    set directory [pwd]
 	    set file [file tail $path]
-	    if [regexp {[*]|[?]} $file] {
+	    if {[regexp {[*]|[?]} $file]} {
 		set flag PATTERN
 	    } else {
 		set flag FILE
@@ -1201,7 +1205,7 @@ proc tkFDialogResolveFile {context text defaultext} {
 proc tkFDialog_EntFocusIn {w} {
     upvar #0 [winfo name $w] data
 
-    if [string compare [$data(ent) get] ""] {
+    if {[string compare [$data(ent) get] ""]} {
 	$data(ent) selection from 0
 	$data(ent) selection to   end
 	$data(ent) icursor end
@@ -1211,7 +1215,7 @@ proc tkFDialog_EntFocusIn {w} {
 
     tkIconList_Unselect $data(icons)
 
-    if ![string compare $data(type) open] {
+    if {![string compare $data(type) open]} {
 	$data(okBtn) config -text "Open"
     } else {
 	$data(okBtn) config -text "Save"
@@ -1239,7 +1243,7 @@ proc tkFDialog_ActivateEnt {w} {
 
     case $flag {
 	OK {
-	    if ![string compare $file ""] {
+	    if {![string compare $file ""]} {
 		# user has entered an existing (sub)directory
 		set data(selectPath) $path
 		$data(ent) delete 0 end
@@ -1254,7 +1258,7 @@ proc tkFDialog_ActivateEnt {w} {
 	    set data(filter) $file
 	}
 	FILE {
-	    if ![string compare $data(type) open] {
+	    if {![string compare $data(type) open]} {
 		tk_messageBox -icon warning -type ok -parent $data(-parent) \
 		    -message "File \"[file join $path $file]\" does not exist."
 		$data(ent) select from 0
@@ -1297,7 +1301,7 @@ proc tkFDialog_ActivateEnt {w} {
 proc tkFDialog_InvokeBtn {w key} {
     upvar #0 [winfo name $w] data
 
-    if ![string compare [$data(okBtn) cget -text] $key] {
+    if {![string compare [$data(okBtn) cget -text] $key]} {
 	tkButtonInvoke $data(okBtn)
     }
 }
@@ -1307,7 +1311,7 @@ proc tkFDialog_InvokeBtn {w key} {
 proc tkFDialog_UpDirCmd {w} {
     upvar #0 [winfo name $w] data
 
-    if [string compare $data(selectPath) "/"] {
+    if {[string compare $data(selectPath) "/"]} {
 	set data(selectPath) [file dirname $data(selectPath)]
     }
 }
@@ -1331,9 +1335,9 @@ proc tkFDialog_OkCmd {w} {
     upvar #0 [winfo name $w] data
 
     set text [tkIconList_Get $data(icons)]
-    if [string compare $text ""] {
+    if {[string compare $text ""]} {
 	set file [tkFDialog_JoinFile $data(selectPath) $text]
-	if [file isdirectory $file] {
+	if {[file isdirectory $file]} {
 	    tkFDialog_ListInvoke $w $text
 	    return
 	}
@@ -1362,11 +1366,11 @@ proc tkFDialog_ListBrowse {w text} {
     }
 
     set file [tkFDialog_JoinFile $data(selectPath) $text]
-    if ![file isdirectory $file] {
+    if {![file isdirectory $file]} {
 	$data(ent) delete 0 end
 	$data(ent) insert 0 $text
 
-	if ![string compare $data(type) open] {
+	if {![string compare $data(type) open]} {
 	    $data(okBtn) config -text "Open"
 	} else {
 	    $data(okBtn) config -text "Save"
@@ -1388,9 +1392,9 @@ proc tkFDialog_ListInvoke {w text} {
 
     set file [tkFDialog_JoinFile $data(selectPath) $text]
 
-    if [file isdirectory $file] {
+    if {[file isdirectory $file]} {
 	set appPWD [pwd]
-	if [catch {cd $file}] {
+	if {[catch {cd $file}]} {
 	    tk_messageBox -type ok -parent $data(-parent) -message \
 	       "Cannot change to the directory \"$file\".\nPermission denied."\
 		-icon warning
@@ -1416,7 +1420,7 @@ proc tkFDialog_Done {w {selectFilePath ""}} {
     upvar #0 [winfo name $w] data
     global tkPriv
 
-    if ![string compare $selectFilePath ""] {
+    if {![string compare $selectFilePath ""]} {
 	set selectFilePath [tkFDialog_JoinFile $data(selectPath) \
 		$data(selectFile)]
 	set tkPriv(selectFile)     $data(selectFile)
@@ -1425,11 +1429,13 @@ proc tkFDialog_Done {w {selectFilePath ""}} {
 	if {[file exists $selectFilePath] && 
 	    ![string compare $data(type) save]} {
 
-	    set reply [tk_messageBox -icon warning -type yesno -parent $data(-parent) \
-	        -message "File \"$selectFilePath\" already exists.\nDo you want to overwrite it?"]
-	    if ![string compare $reply "no"] {
-		return
-	    }
+		set reply [tk_messageBox -icon warning -type yesno\
+			-parent $data(-parent) -message "File\
+			\"$selectFilePath\" already exists.\nDo\
+			you want to overwrite it?"]
+		if {![string compare $reply "no"]} {
+		    return
+		}
 	}
     }
     set tkPriv(selectFilePath) $selectFilePath
diff --git a/library/xmfbox.tcl b/library/xmfbox.tcl
index 52f8b33..3d3f014 100644
--- a/library/xmfbox.tcl
+++ b/library/xmfbox.tcl
@@ -4,59 +4,112 @@
 #	Unix platform. This implementation is used only if the
 #	"tk_strictMotif" flag is set.
 #
-# SCCS: @(#) xmfbox.tcl 1.6 97/10/01 15:06:07
-#
 # 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.
 #
-
+# SCCS: @(#) xmfbox.tcl 1.11 97/12/23 14:11:40
+#
 
 # tkMotifFDialog --
 #
 #	Implements a file dialog similar to the standard Motif file
 #	selection box.
 #
-# Return value:
+# Arguments:
+#	type		"open" or "save"
+#	args		Options parsed by the procedure.
 #
+# Results:
 #	A list of two members. The first member is the absolute
 #	pathname of the selected file or "" if user hits cancel. The
 #	second member is the name of the selected file type, or ""
 #	which stands for "default file type"
-#
-proc tkMotifFDialog {args} {
+
+proc tkMotifFDialog {type args} {
     global tkPriv
-    set w __tk_filedialog
-    upvar #0 $w data
+    set dataName __tk_filedialog
+    upvar #0 $dataName data
 
-    if ![string compare [lindex [info level 0] 0] tk_getOpenFile] {
-	set type open
-    } else {
-	set type save
+    set w [tkMotifFDialog_Create $dataName $type $args]
+
+    # Set a grab and claim the focus too.
+
+    set oldFocus [focus]
+    set oldGrab [grab current $w]
+    if {$oldGrab != ""} {
+	set grabStatus [grab status $oldGrab]
     }
+    grab $w
+    focus $data(sEnt)
+    $data(sEnt) select from 0
+    $data(sEnt) select to   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.
+
+    tkwait variable tkPriv(selectFilePath)
+    catch {focus $oldFocus}
+    grab release $w
+    wm withdraw $w
+    if {$oldGrab != ""} {
+	if {$grabStatus == "global"} {
+	    grab -global $oldGrab
+	} else {
+	    grab $oldGrab
+	}
+    }
+    return $tkPriv(selectFilePath)
+}
+
+# tkMotifFDialog_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 tkMotifFDialog 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 tkMotifFDialog_Create {dataName type argList} {
+    global tkPriv
+    upvar #0 $dataName data
 
-    tkMotifFDialog_Config $w $type $args
+    tkMotifFDialog_Config $dataName $type $argList
 
     if {![string compare $data(-parent) .]} {
-        set w .$w
+        set w .$dataName
     } else {
-        set w $data(-parent).$w
+        set w $data(-parent).$dataName
     }
 
     # (re)create the dialog box if necessary
     #
     if {![winfo exists $w]} {
-	tkMotifFDialog_Create $w
+	tkMotifFDialog_BuildUI $w
     } elseif {[string compare [winfo class $w] TkMotifFDialog]} {
 	destroy $w
-	tkMotifFDialog_Create $w
+	tkMotifFDialog_BuildUI $w
     }
     wm transient $w $data(-parent)
 
     tkMotifFDialog_Update $w
 
-    # 5. Withdraw the window, then update all the geometry information
+    # 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 and de-iconify it.
 
@@ -70,40 +123,23 @@ proc tkMotifFDialog {args} {
     wm deiconify $w
     wm title $w $data(-title)
 
-    # 6. Set a grab and claim the focus too.
-
-    set oldFocus [focus]
-    set oldGrab [grab current $w]
-    if {$oldGrab != ""} {
-	set grabStatus [grab status $oldGrab]
-    }
-    grab $w
-    focus $data(sEnt)
-    $data(sEnt) select from 0
-    $data(sEnt) select to   end
-
-    # 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.
-
-    tkwait variable tkPriv(selectFilePath)
-    catch {focus $oldFocus}
-    grab release $w
-    wm withdraw $w
-    if {$oldGrab != ""} {
-	if {$grabStatus == "global"} {
-	    grab -global $oldGrab
-	} else {
-	    grab $oldGrab
-	}
-    }
-    return $tkPriv(selectFilePath)
+    return $w
 }
 
-proc tkMotifFDialog_Config {w type argList} {
-    upvar #0 $w data
+# tkMotifFDialog_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 tkMotifFDialog_Config {dataName type argList} {
+    upvar #0 $dataName data
 
     set data(type) $type
 
@@ -120,7 +156,7 @@ proc tkMotifFDialog_Config {w type argList} {
 
     # 2: default values depending on the type of the dialog
     #
-    if ![info exists data(selectPath)] {
+    if {![info exists data(selectPath)]} {
 	# first time the dialog has been popped up
 	set data(selectPath) [pwd]
 	set data(selectFile) ""
@@ -128,10 +164,10 @@ proc tkMotifFDialog_Config {w type argList} {
 
     # 3: parse the arguments
     #
-    tclParseConfigSpec $w $specs "" $argList
+    tclParseConfigSpec $dataName $specs "" $argList
 
-    if ![string compare $data(-title) ""] {
-	if ![string compare $type "open"] {
+    if {![string compare $data(-title) ""]} {
+	if {![string compare $type "open"]} {
 	    set data(-title) "Open"
 	} else {
 	    set data(-title) "Save As"
@@ -141,8 +177,8 @@ proc tkMotifFDialog_Config {w type argList} {
     # 4: set the default directory and selection according to the -initial
     #    settings
     #
-    if [string compare $data(-initialdir) ""] {
-	if [file isdirectory $data(-initialdir)] {
+    if {[string compare $data(-initialdir) ""]} {
+	if {[file isdirectory $data(-initialdir)]} {
 	    set data(selectPath) [glob $data(-initialdir)]
 	} else {
 	    error "\"$data(-initialdir)\" is not a valid directory"
@@ -156,19 +192,29 @@ proc tkMotifFDialog_Config {w type argList} {
     #
     set data(-filetypes) [tkFDGetFileTypes $data(-filetypes)]
 
-    if ![info exists data(filter)] {
+    if {![info exists data(filter)]} {
 	set data(filter) *
     }
-    if ![winfo exists $data(-parent)] {
+    if {![winfo exists $data(-parent)]} {
 	error "bad window path name \"$data(-parent)\""
     }
 }
 
-proc tkMotifFDialog_Create {w} {
+# tkMotifFDialog_BuildUI --
+#
+#	Builds the UI components of the Motif file dialog.
+#
+# Arguments:
+# 	w		Pathname of the dialog to build.
+#
+# Results:
+# 	None.
+
+proc tkMotifFDialog_BuildUI {w} {
     set dataName [lindex [split $w .] end]
     upvar #0 $dataName data
 
-    # 1: Create the dialog ...
+    # Create the dialog toplevel and internal frames.
     #
     toplevel $w -class TkMotifFDialog
     set top [frame $w.top -relief raised -bd 1]
@@ -246,7 +292,22 @@ proc tkMotifFDialog_Create {w} {
     wm protocol $w WM_DELETE_WINDOW "tkMotifFDialog_CancelCmd $w"
 }
 
-proc tkMotifFDialog_MakeSList {w f label under cmd} {
+# tkMotifFDialog_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 tkMotifFDialog_MakeSList {w f label under cmdPrefix} {
     label $f.lab -text $label -under $under -anchor w
     listbox $f.l -width 12 -height 5 -selectmode browse -exportselection 0\
 	-xscrollcommand "$f.h set" \
@@ -268,13 +329,14 @@ proc tkMotifFDialog_MakeSList {w f label under cmd} {
     # bindings for the listboxes
     #
     set list $f.l
-    bind $list <Up>        "tkMotifFDialog_Browse$cmd $w"
-    bind $list <Down>      "tkMotifFDialog_Browse$cmd $w"
-    bind $list <space>     "tkMotifFDialog_Browse$cmd $w"
-    bind $list <1>         "tkMotifFDialog_Browse$cmd $w"
-    bind $list <B1-Motion> "tkMotifFDialog_Browse$cmd $w"
-    bind $list <Double-1>  "tkMotifFDialog_Activate$cmd $w"
-    bind $list <Return>    "tkMotifFDialog_Browse$cmd $w; tkMotifFDialog_Activate$cmd $w"
+    bind $list <Up>        "tkMotifFDialog_Browse$cmdPrefix $w"
+    bind $list <Down>      "tkMotifFDialog_Browse$cmdPrefix $w"
+    bind $list <space>     "tkMotifFDialog_Browse$cmdPrefix $w"
+    bind $list <1>         "tkMotifFDialog_Browse$cmdPrefix $w"
+    bind $list <B1-Motion> "tkMotifFDialog_Browse$cmdPrefix $w"
+    bind $list <Double-ButtonRelease-1> "tkMotifFDialog_Activate$cmdPrefix $w"
+    bind $list <Return>    "tkMotifFDialog_Browse$cmdPrefix $w; \
+	    tkMotifFDialog_Activate$cmdPrefix $w"
 
     bindtags $list "Listbox $list [winfo toplevel $list] all"
     tkListBoxKeyAccel_Set $list
@@ -282,15 +344,177 @@ proc tkMotifFDialog_MakeSList {w f label under cmd} {
     return $f.l
 }
 
+# tkMotifFDialog_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 tkMotifFDialog_InterpFilter {w} {
+    upvar #0 [winfo name $w] data
+
+    set text [string trim [$data(fEnt) get]]
+
+    # Perform tilde substitution
+    #
+    set badTilde 0
+    if {[string compare [string index $text 0] ~] == 0} {
+	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] == "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 [tkFDialog_JoinFile $data(selectPath) \
+		$data(filter)]
+
+	return [list $data(selectPath) $data(filter)]
+    }
+
+    set resolved [tkFDialog_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]
+}
+
+# tkMotifFDialog_Update
+#
+#	Load the files and synchronize the "filter" and "selection" fields
+#	boxes.
+#
+# Arguments:
+# 	w 		pathname of the dialog box.
+#
+# Results:
+#	None.
+
+proc tkMotifFDialog_Update {w} {
+    upvar #0 [winfo name $w] data
+
+    $data(fEnt) delete 0 end
+    $data(fEnt) insert 0 [tkFDialog_JoinFile $data(selectPath) $data(filter)]
+    $data(sEnt) delete 0 end
+    $data(sEnt) insert 0 [tkFDialog_JoinFile $data(selectPath) \
+	    $data(selectFile)]
+ 
+    tkMotifFDialog_LoadFiles $w
+}
+
+# tkMotifFDialog_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 tkMotifFDialog_LoadFiles {w} {
+    upvar #0 [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 list
+    #
+    foreach f [lsort -dictionary [glob -nocomplain .* *]] {
+	if [file isdir ./$f] {
+	    $data(dList) insert end $f
+	}
+    }
+    # Make the file list
+    #
+    if ![string compare $data(filter) *] {
+	set files [lsort -dictionary [glob -nocomplain .* *]]
+    } else {
+	set files [lsort -dictionary \
+	    [glob -nocomplain $data(filter)]]
+    }
+
+    set top 0
+    foreach f $files {
+	if ![file isdir ./$f] {
+	    regsub {^[.]/} $f "" f
+	    $data(fList) insert end $f
+	    if [string match .* $f] {
+		incr top
+	    }
+	}
+    }
+
+    # 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
+}
+
+# tkMotifFDialog_BrowseFList --
+#
+#	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 tkMotifFDialog_BrowseDList {w} {
     upvar #0 [winfo name $w] data
 
     focus $data(dList)
-    if ![string compare [$data(dList) curselection] ""] {
+    if {![string compare [$data(dList) curselection] ""]} {
 	return
     }
     set subdir [$data(dList) get [$data(dList) curselection]]
-    if ![string compare $subdir ""] {
+    if {![string compare $subdir ""]} {
 	return
     }
 
@@ -301,14 +525,15 @@ proc tkMotifFDialog_BrowseDList {w} {
 
     case $subdir {
 	. {
-	    set newSpec [file join $data(selectPath) $data(filter)]
+	    set newSpec [tkFDialog_JoinFile $data(selectPath) $data(filter)]
 	}
 	.. {
-	    set newSpec [file join [file dirname $data(selectPath)] \
+	    set newSpec [tkFDialog_JoinFile [file dirname $data(selectPath)] \
 		$data(filter)]
 	}
 	default {
-	    set newSpec [file join $data(selectPath) $subdir $data(filter)]
+	    set newSpec [tkFDialog_JoinFile [tkFDialog_JoinFile \
+		    $data(selectPath) $subdir] $data(filter)]
 	}
     }
 
@@ -316,14 +541,25 @@ proc tkMotifFDialog_BrowseDList {w} {
     $data(fEnt) insert 0 $newSpec
 }
 
+# tkMotifFDialog_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 tkMotifFDialog_ActivateDList {w} {
     upvar #0 [winfo name $w] data
 
-    if ![string compare [$data(dList) curselection] ""] {
+    if {![string compare [$data(dList) curselection] ""]} {
 	return
     }
     set subdir [$data(dList) get [$data(dList) curselection]]
-    if ![string compare $subdir ""] {
+    if {![string compare $subdir ""]} {
 	return
     }
 
@@ -337,14 +573,14 @@ proc tkMotifFDialog_ActivateDList {w} {
 	    set newDir [file dirname $data(selectPath)]
 	}
 	default {
-	    set newDir [file join $data(selectPath) $subdir]
+	    set newDir [tkFDialog_JoinFile $data(selectPath) $subdir]
 	}
     }
 
     set data(selectPath) $newDir
     tkMotifFDialog_Update $w
 
-    if [string compare $subdir ..] {
+    if {[string compare $subdir ..]} {
 	$data(dList) selection set 0
 	$data(dList) activate 0
     } else {
@@ -353,43 +589,78 @@ proc tkMotifFDialog_ActivateDList {w} {
     }
 }
 
+# tkMotifFDialog_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 tkMotifFDialog_BrowseFList {w} {
     upvar #0 [winfo name $w] data
 
     focus $data(fList)
-    if ![string compare [$data(fList) curselection] ""] {
+    if {![string compare [$data(fList) curselection] ""]} {
 	return
     }
     set data(selectFile) [$data(fList) get [$data(fList) curselection]]
-    if ![string compare $data(selectFile) ""] {
+    if {![string compare $data(selectFile) ""]} {
 	return
     }
 
     $data(dList) selection clear 0 end
 
     $data(fEnt) delete 0 end
-    $data(fEnt) insert 0 [file join $data(selectPath) $data(filter)]
+    $data(fEnt) insert 0 [tkFDialog_JoinFile $data(selectPath) $data(filter)]
     $data(fEnt) xview end
  
     $data(sEnt) delete 0 end
-    $data(sEnt) insert 0 [file join $data(selectPath) $data(selectFile)]
+    $data(sEnt) insert 0 [tkFDialog_JoinFile $data(selectPath) \
+	    $data(selectFile)]
     $data(sEnt) xview end
 }
 
+# tkMotifFDialog_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 tkMotifFDialog_ActivateFList {w} {
     upvar #0 [winfo name $w] data
 
-    if ![string compare [$data(fList) curselection] ""] {
+    if {![string compare [$data(fList) curselection] ""]} {
 	return
     }
     set data(selectFile) [$data(fList) get [$data(fList) curselection]]
-    if ![string compare $data(selectFile) ""] {
+    if {![string compare $data(selectFile) ""]} {
 	return
     } else {
 	tkMotifFDialog_ActivateSEnt $w
     }
 }
 
+# tkMotifFDialog_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 tkMotifFDialog_ActivateFEnt {w} {
     upvar #0 [winfo name $w] data
 
@@ -400,34 +671,18 @@ proc tkMotifFDialog_ActivateFEnt {w} {
     tkMotifFDialog_Update $w
 }
 
-proc tkMotifFDialog_InterpFilter {w} {
-    upvar #0 [winfo name $w] data
-
-    set text [string trim [$data(fEnt) get]]
-    # Perform tilde substitution
-    #
-    if ![string compare [string index $text 0] ~] {
-	set list [file split $text]
-	set tilde [lindex $list 0]
-	catch {
-	    set tilde [glob $tilde]
-	}
-	set text [eval file join [concat $tilde [lrange $list 1 end]]]
-    }
-
-    set resolved [file join [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]
-}
-
+# tkMotifFDialog_ActivateSEnt --
+#
+#	This procedure is called when the user presses Return inside
+#	the "selection" entry. It sets the tkPriv(selectFilePath) global
+#	variable so that the vwait loop in tkMotifFDialog will be
+#	terminated.
+#
+# Arguments:
+# 	w		The pathname of the dialog box.
+#
+# Results:
+#	None.	
 
 proc tkMotifFDialog_ActivateSEnt {w} {
     global tkPriv
@@ -437,7 +692,6 @@ proc tkMotifFDialog_ActivateSEnt {w} {
     set selectFile     [file tail    $selectFilePath]
     set selectPath     [file dirname $selectFilePath]
 
-
     if {![string compare $selectFilePath ""]} {
 	tkMotifFDialog_FilterCmd $w
 	return
@@ -450,32 +704,32 @@ proc tkMotifFDialog_ActivateSEnt {w} {
 	return
     }
 
-    if [string compare [file pathtype $selectFilePath] "absolute"] {
+    if {[string compare [file pathtype $selectFilePath] "absolute"]} {
 	tk_messageBox -icon warning -type ok \
 	    -message "\"$selectFilePath\" must be an absolute pathname"
 	return
     }
 
-    if ![file exists $selectPath] {
+    if {![file exists $selectPath]} {
 	tk_messageBox -icon warning -type ok \
 	    -message "Directory \"$selectPath\" does not exist."
 	return
     }
 
-    if ![file exists $selectFilePath] {
-	if ![string compare $data(type) open] {
+    if {![file exists $selectFilePath]} {
+	if {![string compare $data(type) open]} {
 	    tk_messageBox -icon warning -type ok \
 		-message "File \"$selectFilePath\" does not exist."
 	    return
 	}
     } else {
-	if ![string compare $data(type) save] {
+	if {![string compare $data(type) save]} {
 	    set message [format %s%s \
 		"File \"$selectFilePath\" already exists.\n\n" \
 		"Replace existing file?"]
 	    set answer [tk_messageBox -icon warning -type yesno \
 		-message $message]
-	    if ![string compare $answer "no"] {
+	    if {![string compare $answer "no"]} {
 		return
 	    }
 	}
@@ -507,75 +761,6 @@ proc tkMotifFDialog_CancelCmd {w} {
     set tkPriv(selectPath)     ""
 }
 
-# tkMotifFDialog_Update
-#
-#	Load the files and synchronize the "filter" and "selection" fields
-#	boxes.
-#
-# popup:
-#	If this is true, then update the selection field according to the
-#	"-selection" flag
-#
-proc tkMotifFDialog_Update {w} {
-    upvar #0 [winfo name $w] data
-
-    $data(fEnt) delete 0 end
-    $data(fEnt) insert 0 [file join $data(selectPath) $data(filter)]
-    $data(sEnt) delete 0 end
-    $data(sEnt) insert 0 [file join $data(selectPath) $data(selectFile)]
- 
-    tkMotifFDialog_LoadFiles $w
-}
-
-proc tkMotifFDialog_LoadFiles {w} {
-    upvar #0 [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 list
-    #
-    foreach f [lsort -command tclSortNoCase [glob -nocomplain .* *]] {
-	if [file isdir $f] {
-	    $data(dList) insert end $f
-	}
-    }
-    # Make the file list
-    #
-    if ![string compare $data(filter) *] {
-	set files [lsort -command tclSortNoCase [glob -nocomplain .* *]]
-    } else {
-	set files [lsort -command tclSortNoCase \
-	    [glob -nocomplain $data(filter)]]
-    }
-
-    set top 0
-    foreach f $files {
-	if ![file isdir $f] {
-	    $data(fList) insert end $f
-	    if [string match .* $f] {
-		incr top
-	    }
-	}
-    }
-
-    # 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
-}
-
 proc tkListBoxKeyAccel_Set {w} {
     bind Listbox <Any-KeyPress> ""
     bind $w <Destroy> "tkListBoxKeyAccel_Unset $w"
@@ -590,6 +775,20 @@ proc tkListBoxKeyAccel_Unset {w} {
     catch {unset tkPriv(lbAccel,$w,afterId)}
 }
 
+# tkListBoxKeyAccel_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 tkListBoxKeyAccel_Key {w key} {
     global tkPriv