From c2423634f23817171376e31b484153c6949f63d8 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Wed, 19 Sep 2012 20:31:48 +0000
Subject: TIP#399 implementation: mcconfig may add additional glob pattern for
 mcload

---
 ChangeLog                   |  9 ++++++
 changes                     |  2 ++
 library/msgcat/msgcat.tcl   | 67 +++++++++++++++++++++++++++++++++++----------
 library/msgcat/pkgIndex.tcl |  2 +-
 unix/Makefile.in            |  4 +--
 win/Makefile.in             |  4 +--
 6 files changed, 69 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9a17845..8ba37af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-09-19  Harald Oehlmann  <oehhar@users.sf.net>
+
+	IMPLEMENTATION OF TIP#399.
+
+	* library/msgcat/msgcat.tcl:	[FRQ 3544988]: New commands [mcconfig]
+	* library/msgcat/pkgIndex.tcl:	to set additional mcload search pattern.
+	* unix/Makefile.in:		Bump to 1.6.0.
+	* win/Makefile.in:
+
 2012-09-19  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/tcl.h:  make Tcl_Interp a fully opaque structure
diff --git a/changes b/changes
index b902445..f4c501d 100644
--- a/changes
+++ b/changes
@@ -8116,3 +8116,5 @@ Many revisions to better support a Cygwin environment (nijtmans)
 Dropped support for OS X versions less than 10.4 (Tiger) (fellows)
 
 --- Released 8.6b3, September 18, 2012 --- See ChangeLog for details ---
+
+2012-09-19 (TIP399) New msgcat command [mcconfig] (oehlmann)
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index 112507a..42c8f20 100644
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -13,11 +13,11 @@
 package require Tcl 8.5
 # When the version number changes, be sure to update the pkgIndex.tcl file,
 # and the installation directory in the Makefiles.
-package provide msgcat 1.5.0
+package provide msgcat 1.6.0
 
 namespace eval msgcat {
     namespace export mc mcload mclocale mcmax mcmset mcpreferences mcset \
-	    mcunknown mcflset mcflmset
+	    mcunknown mcflset mcflmset mcconfig
 
     # Records the current locale as passed to mclocale
     variable Locale ""
@@ -28,6 +28,9 @@ namespace eval msgcat {
     # Records the locale of the currently sourced message catalogue file
     variable FileLocale
 
+    # List of file pattern to load in addition to Loclist.
+    variable Patternlist {}
+
     # Records the mapping between source strings and translated strings.  The
     # dict key is of the form "<locale> <namespace> <src>", where locale and
     # namespace should be themselves dict values and the value is
@@ -166,6 +169,39 @@ namespace eval msgcat {
     }
 }
 
+# msgcat::mcconfig option ?value? ?option? ?value?
+#
+#	Get or set a package option.
+#	To set options, one may specify multiple option-value pairs.
+#	To read an option value, one may specify a single option.
+#	Available options are:
+#	-pattern
+#	    List of file pattern to load in addition to mcpreferences
+#
+# Arguments:
+#	option	The name of the option
+#	value	The new value of the option
+#
+# Results:
+#	The value if options are read
+
+proc msgcat::mcconfig {args} {
+    variable Patternlist
+    variable MCFileLocale
+    if {1 == [llength $args]} {
+	switch -exact -- [lindex $args] {
+	    -pattern { return $Patternlist}
+	    default { return -code error "Unknown option" }
+	}
+    }
+    dict for {option value} $args {
+	switch -exact -- $option {
+	    -pattern { set Patternlist $value }
+	    default { return -code error "Unknown option" }
+	}
+    }
+}
+
 # msgcat::mc --
 #
 #	Find the translation for the given string based on the current
@@ -280,26 +316,29 @@ proc msgcat::mcpreferences {} {
 #	Returns the number of message catalogs that were loaded.
 
 proc msgcat::mcload {langdir} {
+    variable Patternlist
     variable FileLocale
     # Save the file locale if we are recursively called
     if {[info exists FileLocale]} {
 	set nestedFileLocale $FileLocale
     }
     set x 0
-    foreach p [mcpreferences] {
-	if { $p eq {} } {
-	    set p ROOT
+    set filelist {}
+    foreach pattern [lsort -unique [concat [mcpreferences] $Patternlist]] {
+	if { $pattern eq {} } {
+	    set pattern ROOT
 	}
-	set langfile [file join $langdir $p.msg]
-	if {[file exists $langfile]} {
-	    incr x
-	    set FileLocale [string tolower [file tail [file rootname $langfile]]]
-	    if {"root" eq $FileLocale} {
-		set FileLocale ""
-	    }
-	    uplevel 1 [list ::source -encoding utf-8 $langfile]
-	    unset FileLocale
+	lappend filelist {*}[glob -directory $langdir -nocomplain -types {f r}\
+		-- $pattern.msg]
+    }
+    foreach langfile [lsort -unique $filelist] {
+	incr x
+	set FileLocale [string tolower [file tail [file rootname $langfile]]]
+	if {"root" eq $FileLocale} {
+	    set FileLocale ""
 	}
+	uplevel 1 [list ::source -encoding utf-8 $langfile]
+	unset FileLocale
     }
     if {[info exists nestedFileLocale]} {
 	set FileLocale $nestedFileLocale
diff --git a/library/msgcat/pkgIndex.tcl b/library/msgcat/pkgIndex.tcl
index 832bf81..7399c92 100644
--- a/library/msgcat/pkgIndex.tcl
+++ b/library/msgcat/pkgIndex.tcl
@@ -1,2 +1,2 @@
 if {![package vsatisfies [package provide Tcl] 8.5]} {return}
-package ifneeded msgcat 1.5.0 [list source [file join $dir msgcat.tcl]]
+package ifneeded msgcat 1.6.0 [list source [file join $dir msgcat.tcl]]
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 9ac84f7..aa1820e 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -846,8 +846,8 @@ install-libraries: libraries
 	    do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \
 	    done;
-	@echo "Installing package msgcat 1.5.0 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.0.tm;
+	@echo "Installing package msgcat 1.6.0 as a Tcl Module";
+	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.0.tm;
 	@echo "Installing package tcltest 2.3.4 as a Tcl Module";
 	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.4.tm;
 
diff --git a/win/Makefile.in b/win/Makefile.in
index bef71c0..8ea4f0a 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -647,8 +647,8 @@ install-libraries: libraries install-tzdata install-msgs
 	    do \
 	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
 	    done;
-	@echo "Installing package msgcat 1.5.0 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/msgcat-1.5.0.tm;
+	@echo "Installing package msgcat 1.6.0 as a Tcl Module";
+	@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/msgcat-1.6.0.tm;
 	@echo "Installing package tcltest 2.3.4 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3.4.tm;
 	@echo "Installing package platform 1.0.10 as a Tcl Module";
-- 
cgit v0.12


From 496eb965fff74d179633477de87a6b8b72113c14 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Wed, 19 Sep 2012 20:40:14 +0000
Subject: (proposal) msgcat with dynamic mc file load on locale change

---
 ChangeLog                 |   8 +-
 changes                   |   2 +-
 library/msgcat/msgcat.tcl | 723 +++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 623 insertions(+), 110 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8ba37af..9920962 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,7 @@
 2012-09-19  Harald Oehlmann  <oehhar@users.sf.net>
 
-	IMPLEMENTATION OF TIP#399.
-
-	* library/msgcat/msgcat.tcl:	[FRQ 3544988]: New commands [mcconfig]
-	* library/msgcat/pkgIndex.tcl:	to set additional mcload search pattern.
-	* unix/Makefile.in:		Bump to 1.6.0.
-	* win/Makefile.in:
+	* library/msgcat/msgcat.tcl:	dynamic locale change with mc file
+	load on locale change.
 
 2012-09-19  Jan Nijtmans  <nijtmans@users.sf.net>
 
diff --git a/changes b/changes
index f4c501d..b6cacf5 100644
--- a/changes
+++ b/changes
@@ -8117,4 +8117,4 @@ Dropped support for OS X versions less than 10.4 (Tiger) (fellows)
 
 --- Released 8.6b3, September 18, 2012 --- See ChangeLog for details ---
 
-2012-09-19 (TIP399) New msgcat command [mcconfig] (oehlmann)
+2012-09-19 (feature proposal) msgcat dynamic locale change (oehlmann)
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index 42c8f20..c35803f 100644
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -16,23 +16,28 @@ package require Tcl 8.5
 package provide msgcat 1.6.0
 
 namespace eval msgcat {
-    namespace export mc mcload mclocale mcmax mcmset mcpreferences mcset \
-	    mcunknown mcflset mcflmset mcconfig
-
-    # Records the current locale as passed to mclocale
-    variable Locale ""
+    namespace export mc mcexists mcload mclocale mcmax mcmset\
+	    mcpreferences mcset mcunknown mcflset mcflmset\
+	    mcloadedlocales mcforgetpackage\
+	    mcpackageconfig mcpackagelocale
 
     # Records the list of locales to search
     variable Loclist {}
 
+    # List of currently loaded locales
+    variable LoadedLocales {}
+
     # Records the locale of the currently sourced message catalogue file
     variable FileLocale
 
-    # List of file pattern to load in addition to Loclist.
-    variable Patternlist {}
+    # Configuration values per Package (e.g. client namespace).
+    # The dict key is of the form "<option> <namespace>" and the value is the
+    # configuration option. A nonexisting key is an unset option.
+    variable PackageConfig [dict create mcfolder {} loadcmd {} changecmd {}\
+	    unknowncmd {} loadedlocales {} loclist {}]
 
     # Records the mapping between source strings and translated strings.  The
-    # dict key is of the form "<locale> <namespace> <src>", where locale and
+    # dict key is of the form "<namespace> <locale> <src>", where locale and
     # namespace should be themselves dict values and the value is
     # the translated string.
     variable Msgs [dict create]
@@ -169,39 +174,6 @@ namespace eval msgcat {
     }
 }
 
-# msgcat::mcconfig option ?value? ?option? ?value?
-#
-#	Get or set a package option.
-#	To set options, one may specify multiple option-value pairs.
-#	To read an option value, one may specify a single option.
-#	Available options are:
-#	-pattern
-#	    List of file pattern to load in addition to mcpreferences
-#
-# Arguments:
-#	option	The name of the option
-#	value	The new value of the option
-#
-# Results:
-#	The value if options are read
-
-proc msgcat::mcconfig {args} {
-    variable Patternlist
-    variable MCFileLocale
-    if {1 == [llength $args]} {
-	switch -exact -- [lindex $args] {
-	    -pattern { return $Patternlist}
-	    default { return -code error "Unknown option" }
-	}
-    }
-    dict for {option value} $args {
-	switch -exact -- $option {
-	    -pattern { set Patternlist $value }
-	    default { return -code error "Unknown option" }
-	}
-    }
-}
-
 # msgcat::mc --
 #
 #	Find the translation for the given string based on the current
@@ -209,6 +181,8 @@ proc msgcat::mcconfig {args} {
 #	parent namespace until the source is found.  If additional args are
 #	specified, use the format command to work them into the traslated
 #	string.
+#	If no catalog item is found, mcunknown is called in the caller frame
+#	and its result is returned.
 #
 # Arguments:
 #	src	The string to translate.
@@ -219,30 +193,88 @@ proc msgcat::mcconfig {args} {
 #	format command.
 
 proc msgcat::mc {src args} {
+    # this may be replaced by:
+    # return [mcget -namespace [uplevel 1 [list ::namespace current]] --\
+    #	    $src {*}$args]
+
     # Check for the src in each namespace starting from the local and
     # ending in the global.
 
     variable Msgs
     variable Loclist
-    variable Locale
+    variable PackageConfig
 
     set ns [uplevel 1 [list ::namespace current]]
+    set loclist [PackagePreferences $ns]
 
     while {$ns != ""} {
-	foreach loc $Loclist {
-	    if {[dict exists $Msgs $loc $ns $src]} {
+	foreach loc $loclist {
+	    if {[dict exists $Msgs $ns $loc $src]} {
 		if {[llength $args] == 0} {
-		    return [dict get $Msgs $loc $ns $src]
+		    return [dict get $Msgs $ns $loc $src]
 		} else {
-		    return [format [dict get $Msgs $loc $ns $src] {*}$args]
+		    return [format [dict get $Msgs $ns $loc $src] {*}$args]
 		}
 	    }
 	}
 	set ns [namespace parent $ns]
     }
-    # we have not found the translation
-    return [uplevel 1 [list [namespace origin mcunknown] \
-	    $Locale $src {*}$args]]
+    # call package local or default unknown command
+    set args [linsert $args 0 [lindex $loclist 0] $src]
+    if {[Invoke unknowncmd $args $ns result]} {
+	return $result
+    }
+    return [uplevel 1 [linsert $args 0 [namespace origin mcunknown]]]
+}
+
+# msgcat::mcexists --
+#
+#	Check if a catalog item is set or if mc would invoke mcunknown.
+#
+# Arguments:
+#	-exactnamespace		Only check the exact namespace and no
+#				parent namespaces
+#	-exactlocale		Only check the exact locale and not all members
+#				of the preferences list
+#	src			Message catalog key
+#
+# Results:
+#	true if an adequate catalog key was found
+
+proc msgcat::mcexists {args} {
+
+    variable Msgs
+    variable Loclist
+    variable PackageConfig
+
+    set ns [uplevel 1 [list ::namespace current]]
+    set loclist [PackagePreferences $ns]
+
+    while {[llength $args] > 1} {
+	set args [lassign $args option]
+	switch -glob -- $option {
+	    -exactnamespace { set exactnamespace 1 }
+	    -exactlocale { set loclist [lrange $loclist 0 0] }
+	    -* { return -code error "unknown option \"$option\"" }
+	    default {
+		return -code error "wrong # args: should be\
+			\"[lindex [info level 0] 0] ?-exactnamespace?\
+			?-exactlocale? src\""
+	    }
+	}
+    }
+    set src [lindex $args 0]
+    
+    while {$ns ne ""} {
+	foreach loc $loclist {
+	    if {[dict exists $Msgs $ns $loc $src]} {
+		return 1
+	    }
+	}
+	if {[info exists exactnamespace]} {return 0}
+	set ns [namespace parent $ns]
+    }
+    return 0
 }
 
 # msgcat::mclocale --
@@ -255,11 +287,11 @@ proc msgcat::mc {src args} {
 #			separated by underscores (e.g. en_US).
 #
 # Results:
-#	Returns the current locale.
+#	Returns the normalized set locale.
 
 proc msgcat::mclocale {args} {
     variable Loclist
-    variable Locale
+    variable LoadedLocales
     set len [llength $args]
 
     if {$len > 1} {
@@ -268,24 +300,49 @@ proc msgcat::mclocale {args} {
     }
 
     if {$len == 1} {
-	set newLocale [lindex $args 0]
+	set newLocale [string tolower [lindex $args 0]]
 	if {$newLocale ne [file tail $newLocale]} {
 	    return -code error "invalid newLocale value \"$newLocale\":\
 		    could be path to unsafe code."
 	}
-	set Locale [string tolower $newLocale]
-	set Loclist {}
-	set word ""
-	foreach part [split $Locale _] {
-	    set word [string trim "${word}_${part}" _]
-	    if {$word ne [lindex $Loclist 0]} {
-		set Loclist [linsert $Loclist 0 $word]
-	    }
+	if {[lindex $Loclist 0] ne $newLocale} {
+	    set Loclist [GetPreferences $newLocale]
+	    
+	    # locale not loaded jet
+	    LoadAll $Loclist
+	    # Invoke callback
+	    Invoke changecmd $Loclist
+	}
+    }
+    return [lindex $Loclist 0]
+}
+
+# msgcat::GetPreferences --
+#
+#	Get list of locales from a locale.
+#	The first element is always the lowercase locale.
+#	Other elements have one component separated by "_" less.
+#	Multiple "_" are seen as one separator: de__ch_spec de__ch de {}
+#
+# Arguments:
+#	Locale.
+#
+# Results:
+#	Locale list
+
+proc msgcat::GetPreferences {locale} {
+    set locale [string tolower $locale]
+    set loclist [list $locale]
+    while {-1 !=[set pos [string last "_" $locale]]} {
+	set locale [string range $locale 0 $pos-1]
+	if { "_" ne [string index $locale end] } {
+	    lappend loclist $locale
 	}
-	lappend Loclist {}
-	set Locale [lindex $Loclist 0]
     }
-    return $Locale
+    if {"" ne [lindex $loclist end]} {
+	lappend loclist {}
+    }
+    return $loclist
 }
 
 # msgcat::mcpreferences --
@@ -304,6 +361,383 @@ proc msgcat::mcpreferences {} {
     return $Loclist
 }
 
+# msgcat::mcloadedlocales --
+#
+#	Get or change the list of currently loaded default locales
+#
+#	The following subcommands are available:
+#	loaded
+#	    Get the current list of loaded locales
+#	clear
+#	    Remove all loaded locales not present in mcpreferences.
+#
+# Arguments:
+#	subcommand		One of loaded or clear
+#
+# Results:
+#	Empty string, if not stated differently for the subcommand
+
+proc msgcat::mcloadedlocales {subcommand} {
+    variable Loclist
+    variable LoadedLocales
+    variable Msgs
+    variable PackageConfig
+    switch -exact -- $subcommand {
+	clear {
+	    # Remove all locales not contained in Loclist
+	    # skip any packages with package locale
+	    set LoadedLocales $Loclist
+	    foreach ns [dict keys $Msgs] {
+		if {![dict exists $PackageConfig loclist $ns]} {
+		    foreach locale [dict keys [dict get $Msgs $ns]] {
+			if {$locale ni $Loclist} {
+			    dict unset Msgs $ns $locale
+			}
+		    }
+		}
+	    }
+	}
+	loaded { return $LoadedLocales }
+	default {
+	    return -code error "unknown subcommand \"$subcommand\": must be\
+		    clear, or loaded"
+	}
+    }
+    return
+}
+
+# msgcat::mcpackagelocale --
+#
+#	Get or change the package locale of the calling package.
+#
+#	The following subcommands are available:
+#	set
+#	    Set a package locale.
+#	    This may load message catalog files and may clear message catalog
+#	    items, if the former locale was the default locale.
+#	    Returns the normalized set locale.
+#	    The default locale is taken, if locale is not given.
+#	get
+#	    Get the locale valid for this package.
+#	isset
+#	    Returns true, if a package locale is set
+#	unset
+#	    Unset the package locale and activate the default locale.
+#	    This may clear message catalog data and may load message catalog
+#	    files
+#	preferences
+#	    Return locale preference list valid for the package.
+#	loaded
+#	    Return loaded locale list valid for the current package.
+#	clear
+#	    If the current package has a package locale, remove all package
+#	    locales not containes in package mcpreferences.
+#	    It is an error to call this without a package locale set.
+#
+#	The subcommands get, preferences and loaded return the corresponding
+#	default data, if no package locale is set.
+#
+# Arguments:
+#	subcommand		One of get, init, present, add or remove
+#	locale			package locale (only set subcommand)
+#
+# Results:
+#	Empty string, if not stated differently for the subcommand
+
+proc msgcat::mcpackagelocale {subcommand {locale ""}} {
+    # todo: implement using an ensemble
+    variable Loclist
+    variable LoadedLocales
+    variable Msgs
+    variable PackageConfig
+    # Check option
+    # check if required item is exactly provided
+    if {[llength [info level 0]] == 2} {
+	# locale not given
+	unset locale
+    } else {
+	# locale given
+	if {$subcommand in
+		{"get" "isset" "unset" "preferences" "loaded" "clear"} } {
+	    return -code error "wrong # args: should be\
+		    \"[lrange [info level 0] 0 1]\""
+	}
+        set locale [string tolower $locale]
+    }
+    set ns [uplevel 1 {::namespace current}]
+    
+    switch -exact -- $subcommand {
+	get { return [lindex [PackagePreferences $ns] 0] }
+	preferences { return [PackagePreferences $ns] }
+	loaded { return [PackageLocales $ns] }
+	isset {	return [dict exists $PackageConfig loclist $ns] }
+	set {	# set a package locale or add a package locale
+		
+	    # Copy the default locale if no package locale set so far
+	    if {![dict exists $PackageConfig loclist $ns]} {
+		dict set PackageConfig loclist $ns $Loclist
+		dict set PackageConfig loadedlocales $ns $LoadedLocales
+	    }
+
+	    # Check if changed
+	    set loclist [dict get $PackageConfig loclist $ns]
+	    if {! [info exists locale] || $locale eq [lindex $loclist 0] } {
+		return [lindex $loclist 0]
+	    }
+
+	    # Change loclist
+	    set loclist [GetPreferences $locale]
+	    set locale [lindex $loclist 0]
+	    dict set PackageConfig loclist $ns $loclist
+
+	    # load eventual missing locales
+	    set loadedLocales [dict get $PackageConfig loadedlocales $ns]
+	    if {$locale in $loadedLocales} { return $locale }
+	    set loadLocales [ListComplement $loadedLocales $loclist]
+	    dict set PackageConfig loadedlocales $ns\
+		    [concat $loadedLocales $loadLocales]
+	    Load $ns $loadLocales
+	    return $locale
+	}
+	clear { # Remove all locales not contained in Loclist
+	    if {![dict exists $PackageConfig loclist $ns]} {
+		return -code error "clear only when package locale set"
+	    }
+	    set loclist [dict get $PackageConfig loclist $ns]
+	    dict set PackageConfig loadedlocales $ns $loclist
+	    if {[dict exists $Msgs $ns]} {
+		foreach locale [dict keys [dict get $Msgs $ns]] {
+		    if {$locale ni $loclist} {
+			dict unset Msgs $ns $locale
+		    }
+		}
+	    }
+	}
+	unset {	# unset package locale and restore default locales
+	    
+	    if { ![dict exists $PackageConfig loclist $ns] } { return }
+	    
+	    # unset package locale
+	    set loadedlocales [dict get $PackageConfig loadedlocales $ns]
+	    dict unset PackageConfig loadedlocales $ns
+	    dict unset PackageConfig loclist $ns
+
+	    # Remove unwanted locales
+	    foreach locale [dict keys [dict get $Msgs $ns]] {
+		if { $locale ni $LoadedLocales } {
+		    dict unset Msgs $ns $locale
+		}
+	    }
+	    # Add missing locales
+	    Load $ns [ListComplement $loadedlocales $LoadedLocales]
+	}
+	default {
+	    return -code error "unknown subcommand \"$subcommand\": must be\
+		    clear, get, isset, loaded, present, set, or unset"
+	}
+    }
+    return
+}
+
+# msgcat::mcforgetpackage --
+#
+#	Remove any data of the calling package from msgcat
+#
+
+proc msgcat::mcforgetpackage {} {
+    # todo: this may be implemented using an ensemble
+    variable PackageConfig
+    variable Msgs
+    set ns [uplevel 1 {::namespace current}]
+    # Remove MC items
+    dict unset Msgs $ns
+    # Remove config items
+    foreach key [dict keys $PackageConfig] {
+	dict unset PackageConfig $key $ns
+    }
+    return
+}
+
+# msgcat::mcpackageconfig --
+#
+#	Get or modify the per caller namespace (e.g. packages) config options.
+#
+#	Available subcommands are:
+#
+#	    get		get the current value or an error if not set.
+#	    isset	return true, if the option is set
+#	    set		set the value (see also distinct option).
+#			Returns the number of loaded message files.
+#	    unset	Clear option. return "".
+#
+#	Available options are:
+#
+#	mcfolder
+#	    The message catalog folder of the package.
+#	    This is automatically set by mcload.
+#	    If the value is changed using the set subcommand, an evntual
+#	    loadcmd is invoked and all message files of the package locale are
+#	    loaded.
+#
+#	loadcmd
+#	    The command gets executed before a message file would be
+#	    sourced for this module.
+#	    The command is invoked with the expanded locale list to load.
+#	    The command is not invoked if the registering package namespace
+#	    is not present.
+#	    This callback might also be used as an alternative to message
+#	    files.
+#	    If the value is changed using the set subcommand, the callback is
+#	    directly invoked with the current file locale list. No file load is
+#	    executed.
+#
+#	changecmd
+#	    The command is invoked, after an executed locale change.
+#	    Appended argument is expanded mcpreferences.
+#
+#	unknowncmd
+#	    Use a package locale mcunknown procedure instead the global one.
+#	    The appended arguments are identical to mcunknown.
+#
+# Arguments:
+#	subcommand		Operation on the package
+#	option			The package option to get or set.
+#	?value?			Eventual value for the subcommand
+#
+# Results:
+#	Depends on the subcommand and option and is described there
+
+proc msgcat::mcpackageconfig {subcommand option {value ""}} {
+    variable PackageConfig
+    # get namespace
+    set ns [uplevel 1 {::namespace current}]
+
+    if {$option ni {"mcfolder" "loadcmd" "changecmd" "unknowncmd"}} {
+	return -code error "bad option \"$option\": must be mcfolder, loadcmd,\
+		changecmd, or unknowncmd"
+    }
+
+    # check if value argument is exactly provided
+    if {[llength [info level 0]] == 4 } {
+	# value provided
+	if {$subcommand in {"get" "isset" "unset"}} {
+	    return -code error "wrong # args: should be\
+		    \"[lrange [info level 0] 0 2] value\""
+	}
+    } elseif {$subcommand eq "set"} {
+        return -code error\
+		"wrong # args: should be \"[lrange [info level 0] 0 2]\""
+    }
+
+    # Execute subcommands
+    switch -exact -- $subcommand {
+	get {	# Operation get return current value
+	    if {![dict exists $PackageConfig $option $ns]} {
+		return -code error "package option \"$option\" not set"
+	    }
+	    return [dict get $PackageConfig $option $ns]
+	}
+	isset {	return [dict exists $PackageConfig $option $ns] }
+	unset {	dict unset PackageConfig $option $ns }
+	set {	# Set option
+	
+	    if {$option eq "mcfolder"} {
+		set value [file normalize $value]
+	    }
+	    # Check if changed
+	    if { [dict exists $PackageConfig $option $ns]
+		    && $value eq [dict get $PackageConfig $option $ns] } {
+		return 0
+	    }
+
+	    # set new value
+	    dict set PackageConfig $option $ns $value
+
+	    # Reload pending message catalogs
+	    switch -exact -- $option {
+		mcfolder { return [Load $ns [PackageLocales $ns]] }
+		loadcmd { return [Load $ns [PackageLocales $ns] 1] }
+	    }
+	    return 0
+	}
+	default {
+	    return -code error "unknown subcommand \"$subcommand\":\
+		    must be get, isset, unset, or set"
+	}
+    }
+    return
+}
+
+# msgcat::PackagePreferences --
+#
+#	Return eventual present package preferences or the default list if not
+#	present.
+#
+# Arguments:
+#	ns		Package namespace
+#
+# Results:
+#	locale list
+
+proc msgcat::PackagePreferences {ns} {
+    variable PackageConfig
+    if {[dict exists $PackageConfig loclist $ns]} {
+	return [dict get $PackageConfig loclist $ns]
+    }
+    variable Loclist
+    return $Loclist
+}
+
+# msgcat::PackageLocales --
+#
+#	Return eventual present package locales or the default list if not
+#	present.
+#
+# Arguments:
+#	ns		Package namespace
+#
+# Results:
+#	locale list
+
+proc msgcat::PackageLocales {ns} {
+    variable PackageConfig
+    if {[dict exists $PackageConfig loadedlocales $ns]} {
+	return [dict get $PackageConfig loadedlocales $ns]
+    }
+    variable LoadedLocales
+    return $LoadedLocales
+}
+
+# msgcat::ListComplement --
+#
+#	Build the complement of two lists.
+#	Return a list with all elements in list2 but not in list1.
+#	Optionally return the intersection.
+#
+# Arguments:
+#	list1		excluded list
+#	list2		included list
+#	inlistname	If not "", write in this variable the intersection list
+#
+# Results:
+#	list with all elements in list2 but not in list1
+
+proc msgcat::ListComplement {list1 list2 {inlistname ""}} {
+    if {"" ne $inlistname} {
+	upvar 1 $inlistname inlist
+    }
+    set inlist {}
+    set outlist {}
+    foreach item $list2 {
+	if {$item in $list1} {
+	    lappend inlist $item
+	} else {
+	    lappend outlist $item
+	}
+    }
+    return $outlist
+}
+
 # msgcat::mcload --
 #
 #	Attempt to load message catalogs for each locale in the
@@ -316,29 +750,90 @@ proc msgcat::mcpreferences {} {
 #	Returns the number of message catalogs that were loaded.
 
 proc msgcat::mcload {langdir} {
-    variable Patternlist
+    return [uplevel 1 [list\
+	    [namespace origin mcpackageconfig] set mcfolder $langdir]]
+}
+
+# msgcat::LoadAll --
+#
+#	Load a list of locales for all packages not having a package locale
+#	list.
+#
+# Arguments:
+#	langdir		The directory to search.
+#
+# Results:
+#	Returns the number of message catalogs that were loaded.
+
+proc msgcat::LoadAll {locales} {
+    variable PackageConfig
+    variable LoadedLocales
+    if {0 == [llength $locales]} { return {} }
+    # filter jet unloaded locales
+    set locales [ListComplement $LoadedLocales $locales]
+    if {0 == [llength $locales]} { return {} }
+    lappend LoadedLocales {*}$locales
+    
+    set packages [lsort -unique [concat\
+	    [dict keys [dict get $PackageConfig loadcmd]]\
+	    [dict keys [dict get $PackageConfig mcfolder]]]]
+    foreach ns $packages {
+	if {! [dict exists $PackageConfig loclist $ns] } {
+	    Load $ns $locales
+	}
+    }
+    return $locales
+}
+
+# msgcat::Load --
+#
+#	Invoke message load callback and load message catalog files.
+#
+# Arguments:
+#	ns		Namespace (equal package) to load the message catalog.
+#	locales		List of locales to load.
+#	callbackonly	true if only callback should be invoked
+#
+# Results:
+#	Returns the number of message catalogs that were loaded.
+
+proc msgcat::Load {ns locales {callbackonly 0}} {
     variable FileLocale
+    variable PackageConfig
+    variable LoadedLocals
+
+    if {0 == [llength $locales]} { return 0 }
+
+    # Invoke callback
+    Invoke loadcmd $locales $ns
+    
+    if {$callbackonly || ![dict exists $PackageConfig mcfolder $ns]} {
+	return 0
+    }
+
+    # Invoke file load
+    set langdir [dict get $PackageConfig mcfolder $ns]
+    
     # Save the file locale if we are recursively called
     if {[info exists FileLocale]} {
 	set nestedFileLocale $FileLocale
     }
     set x 0
-    set filelist {}
-    foreach pattern [lsort -unique [concat [mcpreferences] $Patternlist]] {
-	if { $pattern eq {} } {
-	    set pattern ROOT
+    foreach p $locales {
+	if { $p eq {} } {
+	    set p ROOT
 	}
-	lappend filelist {*}[glob -directory $langdir -nocomplain -types {f r}\
-		-- $pattern.msg]
-    }
-    foreach langfile [lsort -unique $filelist] {
-	incr x
-	set FileLocale [string tolower [file tail [file rootname $langfile]]]
-	if {"root" eq $FileLocale} {
-	    set FileLocale ""
+	set langfile [file join $langdir $p.msg]
+	if {[file exists $langfile]} {
+	    incr x
+	    set FileLocale [string tolower\
+		    [file tail [file rootname $langfile]]]
+	    if {"root" eq $FileLocale} {
+		set FileLocale ""
+	    }
+	    namespace inscope $ns [list ::source -encoding utf-8 $langfile]
+	    unset FileLocale
 	}
-	uplevel 1 [list ::source -encoding utf-8 $langfile]
-	unset FileLocale
     }
     if {[info exists nestedFileLocale]} {
 	set FileLocale $nestedFileLocale
@@ -346,6 +841,44 @@ proc msgcat::mcload {langdir} {
     return $x
 }
 
+# msgcat::Invoke --
+#
+#	Invoke a set of registered callbacks.
+#	The callback is only invoked, if its registered namespace exists.
+#
+# Arguments:
+#	index		Index into PackageConfig to get callback command
+#	arglist		parameters to the callback invocation
+#	ns		(Optional) package to call.
+#			If not given or empty, check all registered packages.
+#	resultname	Variable to save the callback result of the last called
+#			callback to. May be set to "" to discard the result.
+#
+# Results:
+#	Returns true if at least one command was called
+
+proc msgcat::Invoke {index arglist {ns ""} {resultname ""}} {
+    variable PackageConfig
+    variable Config
+    if {"" ne $resultname} {
+	upvar 1 $resultname result
+    }
+    if {"" eq $ns} {
+	set packageList [dict keys [dict get $PackageConfig $index]]
+    } else {
+	set packageList [list $ns]
+    }
+    set called 0
+    foreach ns $packageList {
+	if {[dict exists $PackageConfig $index $ns] && [namespace exists $ns]} {
+	    set result [namespace inscope $ns\
+		    [dict get $PackageConfig $index $ns] {*}$arglist]
+	    set called 1
+	}
+    }
+    return $called
+}
+
 # msgcat::mcset --
 #
 #	Set the translation for a given string in a specified locale.
@@ -369,7 +902,7 @@ proc msgcat::mcset {locale src {dest ""}} {
 
     set locale [string tolower $locale]
 
-    dict set Msgs $locale $ns $src $dest
+    dict set Msgs $ns $locale $src $dest
     return $dest
 }
 
@@ -390,16 +923,10 @@ proc msgcat::mcflset {src {dest ""}} {
     variable Msgs
 
     if {![info exists FileLocale]} {
-	return -code error \
-	    "must only be used inside a message catalog loaded with ::msgcat::mcload"
+	return -code error "must only be used inside a message catalog loaded\
+		with ::msgcat::mcload"
     }
-    if {[llength [info level 0]] == 2} { ;# dest not specified
-	set dest $src
-    }
-
-    set ns [uplevel 1 [list ::namespace current]]
-    dict set Msgs $FileLocale $ns $src $dest
-    return $dest
+    return [uplevel 1 [list [namespace origin mcset] $FileLocale $src $dest]]
 }
 
 # msgcat::mcmset --
@@ -419,14 +946,14 @@ proc msgcat::mcmset {locale pairs } {
     set length [llength $pairs]
     if {$length % 2} {
 	return -code error "bad translation list:\
-		 should be \"[lindex [info level 0] 0] locale {src dest ...}\""
+		should be \"[lindex [info level 0] 0] locale {src dest ...}\""
     }
 
     set locale [string tolower $locale]
     set ns [uplevel 1 [list ::namespace current]]
 
     foreach {src dest} $pairs {
-	dict set Msgs $locale $ns $src $dest
+	dict set Msgs $ns $locale $src $dest
     }
 
     return [expr {$length / 2}]
@@ -447,20 +974,10 @@ proc msgcat::mcflmset {pairs} {
     variable Msgs
 
     if {![info exists FileLocale]} {
-	return -code error \
-	    "must only be used inside a message catalog loaded with ::msgcat::mcload"
+	return -code error "must only be used inside a message catalog loaded\
+		with ::msgcat::mcload"
     }
-    set length [llength $pairs]
-    if {$length % 2} {
-	return -code error "bad translation list:\
-		should be \"[lindex [info level 0] 0] locale {src dest ...}\""
-    }
-
-    set ns [uplevel 1 [list ::namespace current]]
-    foreach {src dest} $pairs {
-	dict set Msgs $FileLocale $ns $src $dest
-    }
-    return [expr {$length / 2}]
+    return [uplevel 1 [list [namespace origin mcmset] $FileLocale $pairs]]
 }
 
 # msgcat::mcunknown --
-- 
cgit v0.12


From a4ced94ae6dec9eb42f766a2362ae08d0211e103 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Thu, 20 Sep 2012 09:53:02 +0000
Subject: clock uses new msgcat features

---
 ChangeLog                 |    3 +-
 library/clock.tcl         | 1203 +++++++++++++++++++++++----------------------
 library/msgcat/msgcat.tcl |   88 ++--
 3 files changed, 688 insertions(+), 606 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9920962..2c6a2ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2012-09-19  Harald Oehlmann  <oehhar@users.sf.net>
 
 	* library/msgcat/msgcat.tcl:	dynamic locale change with mc file
-	load on locale change.
+	* library/clock.tcl:            load on locale change.
+	clock uses new msgcat features.
 
 2012-09-19  Jan Nijtmans  <nijtmans@users.sf.net>
 
diff --git a/library/clock.tcl b/library/clock.tcl
index 0696c47..38394d2 100644
--- a/library/clock.tcl
+++ b/library/clock.tcl
@@ -2,9 +2,9 @@
 #
 # clock.tcl --
 #
-#	This file implements the portions of the [clock] ensemble that are
-#	coded in Tcl.  Refer to the users' manual to see the description of
-#	the [clock] command and its subcommands.
+#	This file implements the portions of the [clock] ensemble that
+#	are coded in Tcl.  Refer to the users' manual to see the description
+#	of the [clock] command and its subcommands.
 #
 #
 #----------------------------------------------------------------------
@@ -15,11 +15,11 @@
 #
 #----------------------------------------------------------------------
 
-# We must have message catalogs that support the root locale, and we need
-# access to the Registry on Windows systems.
+# We must have message catalogs that support the root locale, and
+# we need access to the Registry on Windows systems.
 
 uplevel \#0 {
-    package require msgcat 1.4
+    package require msgcat 1.6
     if { $::tcl_platform(platform) eq {windows} } {
 	if { [catch { package require registry 1.1 }] } {
 	    namespace eval ::tcl::clock [list variable NoRegistry {}]
@@ -27,8 +27,9 @@ uplevel \#0 {
     }
 }
 
-# Put the library directory into the namespace for the ensemble so that the
-# library code can find message catalogs and time zone definition files.
+# Put the library directory into the namespace for the ensemble
+# so that the library code can find message catalogs and time zone
+# definition files.
 
 namespace eval ::tcl::clock \
     [list variable LibDir [file dirname [info script]]]
@@ -39,10 +40,10 @@ namespace eval ::tcl::clock \
 #
 #	Manipulate times.
 #
-# The 'clock' command manipulates time.  Refer to the user documentation for
-# the available subcommands and what they do.
+# The 'clock' command manipulates time.  Refer to the user documentation
+# for the available subcommands and what they do.
 #
-#----------------------------------------------------------------------
+#----------------------------------------------------------------------	
 
 namespace eval ::tcl::clock {
 
@@ -58,8 +59,8 @@ namespace eval ::tcl::clock {
 
     # Import the message catalog commands that we use.
 
-    namespace import ::msgcat::mcload
-    namespace import ::msgcat::mclocale
+    namespace import ::msgcat::mc
+    namespace import ::msgcat::mcpackagelocale
 
 }
 
@@ -75,11 +76,11 @@ namespace eval ::tcl::clock {
 # Side effects:
 #	Namespace variable in the 'clock' subsystem are initialized.
 #
-# The '::tcl::clock::Initialize' procedure initializes the namespace variables
-# and root locale message catalog for the 'clock' subsystem.  It is broken
-# into a procedure rather than simply evaluated as a script so that it will be
-# able to use local variables, avoiding the dangers of 'creative writing' as
-# in Bug 1185933.
+# The '::tcl::clock::Initialize' procedure initializes the namespace
+# variables and root locale message catalog for the 'clock' subsystem.
+# It is broken into a procedure rather than simply evaluated as a script
+# so that it will be able to use local variables, avoiding the dangers
+# of 'creative writing' as in Bug 1185933.
 #
 #----------------------------------------------------------------------
 
@@ -106,6 +107,10 @@ proc ::tcl::clock::Initialize {} {
     }
     InitTZData
 
+    mcpackagelocale set {}
+    ::msgcat::mcpackageconfig set mcfolder [file join $LibDir msgs]
+    ::msgcat::mcpackageconfig set unknowncmd ""
+
     # Define the message catalog for the root locale.
 
     ::msgcat::mcmset {} {
@@ -171,8 +176,8 @@ proc ::tcl::clock::Initialize {} {
 
     ::msgcat::mcset fr GREGORIAN_CHANGE_DATE 2299227
 
-    # For Belgium, we follow Southern Netherlands; Liege Diocese changed
-    # several weeks later.
+    # For Belgium, we follow Southern Netherlands; Liege Diocese
+    # changed several weeks later.
 
     ::msgcat::mcset fr_BE GREGORIAN_CHANGE_DATE 2299238
     ::msgcat::mcset nl_BE GREGORIAN_CHANGE_DATE 2299238
@@ -188,13 +193,13 @@ proc ::tcl::clock::Initialize {} {
     # Germany, Norway, Denmark (Catholic Germany changed earlier)
 
     ::msgcat::mcset de_DE GREGORIAN_CHANGE_DATE 2342032
-    ::msgcat::mcset nb GREGORIAN_CHANGE_DATE 2342032
+    ::msgcat::mcset nb GREGORIAN_CHANGE_DATE 2342032    
     ::msgcat::mcset nn GREGORIAN_CHANGE_DATE 2342032
     ::msgcat::mcset no GREGORIAN_CHANGE_DATE 2342032
     ::msgcat::mcset da GREGORIAN_CHANGE_DATE 2342032
 
-    # Holland (Brabant, Gelderland, Flanders, Friesland, etc. changed at
-    # various times)
+    # Holland (Brabant, Gelderland, Flanders, Friesland, etc. changed
+    # at various times)
 
     ::msgcat::mcset nl GREGORIAN_CHANGE_DATE 2342165
 
@@ -216,23 +221,23 @@ proc ::tcl::clock::Initialize {} {
 
     ::msgcat::mcset ru GREGORIAN_CHANGE_DATE 2421639
 
-    # Romania (Transylvania changed earler - perhaps de_RO should show the
-    # earlier date?)
+    # Romania (Transylvania changed earler - perhaps de_RO should show
+    # the earlier date?)
 
     ::msgcat::mcset ro GREGORIAN_CHANGE_DATE 2422063
 
     # Greece
 
     ::msgcat::mcset el GREGORIAN_CHANGE_DATE 2423480
-
+    
     #------------------------------------------------------------------
     #
     #				CONSTANTS
     #
     #------------------------------------------------------------------
 
-    # Paths at which binary time zone data for the Olson libraries are known
-    # to reside on various operating systems
+    # Paths at which binary time zone data for the Olson libraries
+    # are known to reside on various operating systems
 
     variable ZoneinfoPaths {}
     foreach path {
@@ -249,7 +254,6 @@ proc ::tcl::clock::Initialize {} {
     # Define the directories for time zone data and message catalogs.
 
     variable DataDir [file join $LibDir tzdata]
-    variable MsgDir [file join $LibDir msgs]
 
     # Number of days in the months, in common years and leap years.
 
@@ -281,10 +285,10 @@ proc ::tcl::clock::Initialize {} {
 
     variable FEB_28	       58
 
-    # Translation table to map Windows TZI onto cities, so that the Olson
-    # rules can apply.  In some cases the mapping is ambiguous, so it's wise
-    # to specify $::env(TCL_TZ) rather than simply depending on the system
-    # time zone.
+    # Translation table to map Windows TZI onto cities, so that
+    # the Olson rules can apply.  In some cases the mapping is ambiguous,
+    # so it's wise to specify $::env(TCL_TZ) rather than simply depending
+    # on the system time zone.
 
     # The keys are long lists of values obtained from the time zone
     # information in the Registry.  In order, the list elements are:
@@ -295,10 +299,10 @@ proc ::tcl::clock::Initialize {} {
     #   DaylightDate.wYear DaylightDate.wMonth DaylightDate.wDayOfWeek
     #   DaylightDate.wDay DaylightDate.wHour DaylightDate.wMinute
     #   DaylightDate.wSecond DaylightDate.wMilliseconds
-    # The values are the names of time zones where those rules apply.  There
-    # is considerable ambiguity in certain zones; an attempt has been made to
-    # make a reasonable guess, but this table needs to be taken with a grain
-    # of salt.
+    # The values are the names of time zones where those rules apply.
+    # There is considerable ambiguity in certain zones; an attempt has
+    # been made to make a reasonable guess, but this table needs to be
+    # taken with a grain of salt.
 
     variable WinZoneInfo [dict create {*}{
 	{-43200 0 3600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0}  :Pacific/Kwajalein
@@ -377,10 +381,10 @@ proc ::tcl::clock::Initialize {} {
 	{46800 0 3600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0}   :Pacific/Tongatapu
     }]
 
-    # Groups of fields that specify the date, priorities, and code bursts that
-    # determine Julian Day Number given those groups.  The code in [clock
-    # scan] will choose the highest priority (lowest numbered) set of fields
-    # that determines the date.
+    # Groups of fields that specify the date, priorities, and 
+    # code bursts that determine Julian Day Number given those groups.
+    # The code in [clock scan] will choose the highest priority
+    # (lowest numbered) set of fields that determines the date.
 
     variable DateParseActions {
 
@@ -484,8 +488,8 @@ proc ::tcl::clock::Initialize {} {
 	}
     }
 
-    # Groups of fields that specify time of day, priorities, and code that
-    # processes them
+    # Groups of fields that specify time of day, priorities,
+    # and code that processes them
 
     variable TimeParseActions {
 
@@ -623,11 +627,6 @@ proc ::tcl::clock::Initialize {} {
 					# in the given locales and dictionaries
 					# mapping the numerals to their numeric
 					# values.
-    variable McLoaded {};		# Dictionary whose keys are locales
-					# in which [mcload] has been executed
-					# and whose values are second-level
-    					# dictionaries indexed by message
-    					# name and giving message text.
     # variable CachedSystemTimeZone;    # If 'CachedSystemTimeZone' exists,
 					# it contains the value of the
 					# system time zone, as determined from
@@ -651,14 +650,16 @@ proc ::tcl::clock::Initialize {} {
 #
 # clock format --
 #
-#	Formats a count of seconds since the Posix Epoch as a time of day.
+#	Formats a count of seconds since the Posix Epoch as a time
+#	of day.
 #
-# The 'clock format' command formats times of day for output.  Refer to the
-# user documentation to see what it does.
+# The 'clock format' command formats times of day for output.
+# Refer to the user documentation to see what it does.
 #
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::format { args } {
+
     variable FormatProc
     variable TZData
 
@@ -667,7 +668,7 @@ proc ::tcl::clock::format { args } {
     set clockval [lindex $args 0]
 
     # Get the data for time changes in the given zone
-
+    
     if {$timezone eq ""} {
 	set timezone [GetSystemTimeZone]
     }
@@ -677,11 +678,11 @@ proc ::tcl::clock::format { args } {
 	    return -options $opts $retval
 	}
     }
-
-    # Build a procedure to format the result. Cache the built procedure's name
-    # in the 'FormatProc' array to avoid losing its internal representation,
-    # which contains the name resolution.
-
+    
+    # Build a procedure to format the result. Cache the built procedure's
+    # name in the 'FormatProc' array to avoid losing its internal
+    # representation, which contains the name resolution.
+    
     set procName formatproc'$format'$locale
     set procName [namespace current]::[string map {: {\:} \\ {\\}} $procName]
     if {[info exists FormatProc($procName)]} {
@@ -690,8 +691,9 @@ proc ::tcl::clock::format { args } {
 	set FormatProc($procName) \
 	    [ParseClockFormatFormat $procName $format $locale]
     }
-
+    
     return [$procName $clockval $timezone]
+
 }
 
 #----------------------------------------------------------------------
@@ -710,31 +712,39 @@ proc ::tcl::clock::format { args } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::ParseClockFormatFormat {procName format locale} {
+
     if {[namespace which $procName] ne {}} {
 	return $procName
     }
 
     # Map away the locale-dependent composite format groups
-
-    EnterLocale $locale oldLocale
+    
+    EnterLocale $locale
 
     # Change locale if a fresh locale has been given on the command line.
 
-    try {
-	return [ParseClockFormatFormat2 $format $locale $procName]
-    } trap CLOCK {result opts} {
-	dict unset opts -errorinfo
-	return -options $opts $result
-    } finally {
-	# Restore the locale
+    set status [catch {
+
+	ParseClockFormatFormat2 $format $locale $procName
 
-	if { [info exists oldLocale] } {
-	    mclocale $oldLocale
+    } result opts]
+
+    # Return either the error or the proc name
+
+    if { $status == 1 } {
+	if { [lindex [dict get $opts -errorcode] 0] eq {clock} } {
+	    return -code error $result
+	} else {
+	    return -options $opts $result
 	}
+    } else {
+	return $result
     }
+
 }
 
 proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
+
     set didLocaleEra 0
     set didLocaleNumerals 0
     set preFormatCode \
@@ -749,7 +759,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
     set formatString {}
     set substituents {}
     set state {}
-
+	
     set format [LocalizeFormat $locale $format]
 
     foreach char [split $format {}] {
@@ -776,7 +786,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 				 { [lindex @DAYS_OF_WEEK_ABBREV@ \
 					[expr {[dict get $date dayOfWeek] \
 						   % 7}]]}]
-		    }
+		    }			 
 		    A {			# Day of week, spelt out.
 			append formatString %s
 			append substituents \
@@ -877,7 +887,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 		    k {			# Hour (0-23), no leading zero
 			append formatString %2d
 			append substituents \
-			    { [expr { [dict get $date localSeconds]
+			    { [expr { [dict get $date localSeconds] 
 				      / 3600
 				      % 24 }]}
 		    }
@@ -898,7 +908,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 		    M {			# Minute of the hour, leading zero
 			append formatString %02d
 			append substituents \
-			    { [expr { [dict get $date localSeconds]
+			    { [expr { [dict get $date localSeconds] 
 				      / 60
 				      % 60 }]}
 		    }
@@ -939,7 +949,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 			    { [expr {(([dict get $date localSeconds]
 				       % 86400) < 43200) ?
 				     $am : $pm}]}
-
+			
 		    }
 		    Q {			# Hi, Jeff!
 			append formatString %s
@@ -949,11 +959,11 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 			append formatString %s
 			append substituents { [dict get $date seconds]}
 		    }
-		    S {			# Second of the minute, with
+		    S {			# Second of the minute, with 
 			# leading zero
 			append formatString %02d
 			append substituents \
-			    { [expr { [dict get $date localSeconds]
+			    { [expr { [dict get $date localSeconds] 
 				      % 60 }]}
 		    }
 		    t {			# A literal tab character
@@ -974,7 +984,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 			    }
 			    incr dow
 			    set UweekNumber \
-				[expr { ( [dict get $date dayOfYear]
+				[expr { ( [dict get $date dayOfYear] 
 					  - $dow + 7 )
 					/ 7 }]
 			}
@@ -997,7 +1007,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 			    set WweekNumber \
 				[expr { ( [dict get $date dayOfYear]
 					  - [dict get $date dayOfWeek]
-					  + 7 )
+					  + 7 ) 
 					/ 7 }]
 			}
 			append formatString %02d
@@ -1066,7 +1076,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 	    percentO {			# Character following %O
 		set state {}
 		switch -exact -- $char {
-		    d - e {		# Day of the month in alternative
+		    d - e {		# Day of the month in alternative 
 			# numerals
 			append formatString %s
 			append substituents \
@@ -1078,7 +1088,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 			append formatString %s
 			append substituents \
 			    { [lindex $localeNumerals \
-				   [expr { [dict get $date localSeconds]
+				   [expr { [dict get $date localSeconds] 
 					   / 3600
 					   % 24 }]]}
 		    }
@@ -1104,7 +1114,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 			append formatString %s
 			append substituents \
 			    { [lindex $localeNumerals \
-				   [expr { [dict get $date localSeconds]
+				   [expr { [dict get $date localSeconds] 
 					   / 60
 					   % 60 }]]}
 		    }
@@ -1113,7 +1123,7 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 			append formatString %s
 			append substituents \
 			    { [lindex $localeNumerals \
-				   [expr { [dict get $date localSeconds]
+				   [expr { [dict get $date localSeconds] 
 					   % 60 }]]}
 		    }
 		    u {			# Day of the week (Monday=1,Sunday=7)
@@ -1144,9 +1154,9 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 	    }
 	}
     }
-
+	
     # Clean up any improperly terminated groups
-
+    
     switch -exact -- $state {
 	percent {
 	    append formatString %%
@@ -1173,14 +1183,16 @@ proc ::tcl::clock::ParseClockFormatFormat2 {format locale procName} {
 #
 # clock scan --
 #
-#	Inputs a count of seconds since the Posix Epoch as a time of day.
+#	Inputs a count of seconds since the Posix Epoch as a time
+#	of day.
 #
-# The 'clock format' command scans times of day on input.  Refer to the user
-# documentation to see what it does.
+# The 'clock format' command scans times of day on input.
+# Refer to the user documentation to see what it does.
 #
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::scan { args } {
+
     set format {}
 
     # Check the count of args
@@ -1242,17 +1254,21 @@ proc ::tcl::clock::scan { args } {
 	    "cannot use -gmt and -timezone in same call"
     }
     if { [catch { expr { wide($base) } } result] } {
-	return -code error "expected integer but got \"$base\""
+	return -code error \
+	    "expected integer but got \"$base\"" 
     }
-    if { ![string is boolean -strict $gmt] } {
-	return -code error "expected boolean value but got \"$gmt\""
-    } elseif { $gmt } {
-	set timezone :GMT
+    if { ![string is boolean $gmt] } {
+	return -code error \
+	    "expected boolean value but got \"$gmt\""
+    } else {
+	if { $gmt } {
+	    set timezone :GMT
+	}
     }
 
     if { ![info exists saw(-format)] } {
-	# Perhaps someday we'll localize the legacy code. Right now, it's not
-	# localized.
+	# Perhaps someday we'll localize the legacy code. Right now,
+	# it's not localized.
 	if { [info exists saw(-locale)] } {
 	    return -code error \
 		-errorcode [list CLOCK flagWithLegacyFormat] \
@@ -1264,25 +1280,27 @@ proc ::tcl::clock::scan { args } {
 
     # Change locale if a fresh locale has been given on the command line.
 
-    EnterLocale $locale oldLocale
+    EnterLocale $locale
+
+    set status [catch {
 
-    try {
 	# Map away the locale-dependent composite format groups
 
 	set scanner [ParseClockScanFormat $format $locale]
-	return [$scanner $string $base $timezone]
-    } trap CLOCK {result opts} {
-	# Conceal location of generation of expected errors
+	$scanner $string $base $timezone
 
-	dict unset opts -errorinfo
-	return -options $opts $result
-    } finally {
-	# Restore the locale
+    } result opts]
 
-	if { [info exists oldLocale] } {
-	    mclocale $oldLocale
+    if { $status == 1 } {
+	if { [lindex [dict get $opts -errorcode] 0] eq {clock} } {
+	    return -code error $result
+	} else {
+	    return -options $opts $result
 	}
+    } else {
+	return $result
     }
+
 }
 
 #----------------------------------------------------------------------
@@ -1298,50 +1316,52 @@ proc ::tcl::clock::scan { args } {
 #	locale - (Unused) Name of the locale where the time will be scanned.
 #
 # Results:
-#	Returns the date and time extracted from the string in seconds from
-#	the epoch
+#	Returns the date and time extracted from the string in seconds
+#	from the epoch
 #
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::FreeScan { string base timezone locale } {
+
     variable TZData
 
     # Get the data for time changes in the given zone
-
-    try {
-	SetupTimeZone $timezone
-    } on error {retval opts} {
+    
+    if {[catch {SetupTimeZone $timezone} retval opts]} {
 	dict unset opts -errorinfo
 	return -options $opts $retval
     }
 
-    # Extract year, month and day from the base time for the parser to use as
-    # defaults
+    # Extract year, month and day from the base time for the
+    # parser to use as defaults
 
-    set date [GetDateFields $base $TZData($timezone) 2361222]
-    dict set date secondOfDay [expr {
-	[dict get $date localSeconds] % 86400
-    }]
+    set date [GetDateFields \
+		  $base \
+		  $TZData($timezone) \
+		  2361222]
+    dict set date secondOfDay [expr { [dict get $date localSeconds] 
+				      % 86400 }]
 
-    # Parse the date.  The parser will return a list comprising date, time,
-    # time zone, relative month/day/seconds, relative weekday, ordinal month.
-
-    try {
-	set scanned [Oldscan $string \
-		     [dict get $date year] \
-		     [dict get $date month] \
-		     [dict get $date dayOfMonth]]
-	lassign $scanned \
-	    parseDate parseTime parseZone parseRel \
-	    parseWeekday parseOrdinalMonth
-    } on error message {
-	return -code error \
-	    "unable to convert date-time string \"$string\": $message"
+    # Parse the date.  The parser will return a list comprising
+    # date, time, time zone, relative month/day/seconds, relative
+    # weekday, ordinal month.
+
+    set status [catch {
+	Oldscan $string \
+	    [dict get $date year] \
+	    [dict get $date month] \
+	    [dict get $date dayOfMonth]
+    } result]
+    if { $status != 0 } {
+	return -code error "unable to convert date-time string \"$string\": $result"
     }
 
-    # If the caller supplied a date in the string, update the 'date' dict with
-    # the value. If the caller didn't specify a time with the date, default to
-    # midnight.
+    lassign $result parseDate parseTime parseZone parseRel \
+	parseWeekday parseOrdinalMonth
+
+    # If the caller supplied a date in the string, update the 'date' dict
+    # with the value. If the caller didn't specify a time with the date,
+    # default to midnight.
 
     if { [llength $parseDate] > 0 } {
 	lassign $parseDate y m d
@@ -1361,12 +1381,12 @@ proc ::tcl::clock::FreeScan { string base timezone locale } {
 	}
     }
 
-    # If the caller supplied a time zone in the string, it comes back as a
-    # two-element list; the first element is the number of minutes east of
-    # Greenwich, and the second is a Daylight Saving Time indicator (1 == yes,
-    # 0 == no, -1 == unknown). We make it into a time zone indicator of
-    # +-hhmm.
-
+    # If the caller supplied a time zone in the string, it comes back
+    # as a two-element list; the first element is the number of minutes
+    # east of Greenwich, and the second is a Daylight Saving Time
+    # indicator ( 1 == yes, 0 == no, -1 == unknown ). We make it into
+    # a time zone indicator of +-hhmm.
+    
     if { [llength $parseZone] > 0 } {
 	lassign $parseZone minEast dstFlag
 	set timezone [FormatNumericTimeZone \
@@ -1380,19 +1400,18 @@ proc ::tcl::clock::FreeScan { string base timezone locale } {
     set date [GetJulianDayFromEraYearMonthDay $date[set date {}] 2361222]
     if { $parseTime ne {} } {
 	dict set date secondOfDay $parseTime
-    } elseif { [llength $parseWeekday] != 0
-	       || [llength $parseOrdinalMonth] != 0
-	       || ( [llength $parseRel] != 0
+    } elseif { [llength $parseWeekday] != 0 
+	       || [llength $parseOrdinalMonth] != 0 
+	       || ( [llength $parseRel] != 0 
 		    && ( [lindex $parseRel 0] != 0
 			 || [lindex $parseRel 1] != 0 ) ) } {
 	dict set date secondOfDay 0
     }
 
-    dict set date localSeconds [expr {
-	-210866803200
-	+ ( 86400 * wide([dict get $date julianDay]) )
-	+ [dict get $date secondOfDay]
-    }]
+    dict set date localSeconds \
+	[expr { -210866803200
+		+ ( 86400 * wide([dict get $date julianDay]) )
+		+ [dict get $date secondOfDay] }]
     dict set date tzName $timezone
     set date [ConvertLocalToUTC $date[set date {}] $TZData($timezone) 2361222]
     set seconds [dict get $date seconds]
@@ -1404,17 +1423,18 @@ proc ::tcl::clock::FreeScan { string base timezone locale } {
 	set seconds [add $seconds \
 			 $relMonth months $relDay days $relSecond seconds \
 			 -timezone $timezone -locale $locale]
-    }
+    }	
 
     # Do relative weekday
-
+    
     if { [llength $parseWeekday] > 0 } {
+
 	lassign $parseWeekday dayOrdinal dayOfWeek
 	set date2 [GetDateFields $seconds $TZData($timezone) 2361222]
 	dict set date2 era CE
-	set jdwkday [WeekdayOnOrBefore $dayOfWeek [expr {
-	    [dict get $date2 julianDay] + 6
-	}]]
+	set jdwkday [WeekdayOnOrBefore $dayOfWeek \
+			 [expr { [dict get $date2 julianDay] 
+				 + 6 }]]
 	incr jdwkday [expr { 7 * $dayOrdinal }]
 	if { $dayOrdinal > 0 } {
 	    incr jdwkday -7
@@ -1422,20 +1442,21 @@ proc ::tcl::clock::FreeScan { string base timezone locale } {
 	dict set date2 secondOfDay \
 	    [expr { [dict get $date2 localSeconds] % 86400 }]
 	dict set date2 julianDay $jdwkday
-	dict set date2 localSeconds [expr {
-	    -210866803200
-	    + ( 86400 * wide([dict get $date2 julianDay]) )
-	    + [dict get $date secondOfDay]
-	}]
+	dict set date2 localSeconds \
+	    [expr { -210866803200
+		    + ( 86400 * wide([dict get $date2 julianDay]) )
+		    + [dict get $date secondOfDay] }]
 	dict set date2 tzName $timezone
 	set date2 [ConvertLocalToUTC $date2[set date2 {}] $TZData($timezone) \
 		       2361222]
 	set seconds [dict get $date2 seconds]
+
     }
 
     # Do relative month
 
     if { [llength $parseOrdinalMonth] > 0 } {
+
 	lassign $parseOrdinalMonth monthOrdinal monthNumber
 	if { $monthOrdinal > 0 } {
 	    set monthDiff [expr { $monthNumber - [dict get $date month] }]
@@ -1452,6 +1473,7 @@ proc ::tcl::clock::FreeScan { string base timezone locale } {
 	}
 	set seconds [add $seconds $monthOrdinal years $monthDiff months \
 			 -timezone $timezone -locale $locale]
+
     }
 
     return $seconds
@@ -1469,27 +1491,30 @@ proc ::tcl::clock::FreeScan { string base timezone locale } {
 #	locale - The current locale
 #
 # Results:
-#	Constructs and returns a procedure that accepts the string being
-#	scanned, the base time, and the time zone.  The procedure will either
-#	return the scanned time or else throw an error that should be rethrown
-#	to the caller of [clock scan]
+#	Constructs and returns a procedure that accepts the
+#	string being scanned, the base time, and the time zone.  
+#	The procedure will either return the scanned time or
+#	else throw an error that should be rethrown to the caller
+#	of [clock scan]
 #
 # Side effects:
-#	The given procedure is defined in the ::tcl::clock namespace.  Scan
-#	procedures are not deleted once installed.
-#
-# Why do we parse dates by defining a procedure to parse them?  The reason is
-# that by doing so, we have one convenient place to cache all the information:
-# the regular expressions that match the patterns (which will be compiled),
-# the code that assembles the date information, everything lands in one place.
-# In this way, when a given format is reused at run time, all the information
+#	The given procedure is defined in the ::tcl::clock
+#	namespace.  Scan procedures are not deleted once installed.
+#
+# Why do we parse dates by defining a procedure to parse them?
+# The reason is that by doing so, we have one convenient place to
+# cache all the information: the regular expressions that match the
+# patterns (which will be compiled), the code that assembles the
+# date information, everything lands in one place.  In this way,
+# when a given format is reused at run time, all the information
 # of how to apply it is available in a single place.
 #
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::ParseClockScanFormat {formatString locale} {
-    # Check whether the format has been parsed previously, and return the
-    # existing recognizer if it has.
+
+    # Check whether the format has been parsed previously, and return
+    # the existing recognizer if it has.
 
     set procName scanproc'$formatString'$locale
     set procName [namespace current]::[string map {: {\:} \\ {\\}} $procName]
@@ -1533,8 +1558,8 @@ proc ::tcl::clock::ParseClockScanFormat {formatString locale} {
 		    append re {[[:space:]]+}
 		} else {
 		    if { ! [string is alnum $c] } {
-			append re "\\"
-		    }
+			append re \\
+			}
 		    append re $c
 		}
 	    }
@@ -1651,7 +1676,7 @@ proc ::tcl::clock::ParseClockScanFormat {formatString locale} {
 			    "::scan \$field" [incr captureCount] " %ld" \
 			    "\]\n"
 		    }
-		    m - N {		# Month number
+		    m - N {			# Month number
 			append re \\s*(\\d\\d?)
 			dict set fieldSet month [incr fieldCount]
 			append postcode "dict set date month \[" \
@@ -1694,9 +1719,10 @@ proc ::tcl::clock::ParseClockScanFormat {formatString locale} {
 			    \] \n
 		    }
 		    s {			# Seconds from Posix Epoch
-			# This next case is insanely difficult, because it's
-			# problematic to determine whether the field is
-			# actually within the range of a wide integer.
+			# This next case is insanely difficult,
+			# because it's problematic to determine
+			# whether the field is actually within
+			# the range of a wide integer.
 			append re {\s*([-+]?\d+)}
 			dict set fieldSet seconds [incr fieldCount]
 			append postcode {dict set date seconds } \[ \
@@ -1729,13 +1755,14 @@ proc ::tcl::clock::ParseClockScanFormat {formatString locale} {
 				dict set date dayOfWeek $dow
 			    }
 		    }
-		    U {			# Week of year. The first Sunday of
-					# the year is the first day of week
-					# 01. No scan rule uses this group.
+		    U {			# Week of year. The
+					# first Sunday of the year is the
+					# first day of week 01. No scan rule
+					# uses this group.
 			append re \\s*\\d\\d?
 		    }
 		    V {			# Week of ISO8601 year
-
+			
 			append re \\s*(\\d\\d?)
 			dict set fieldSet iso8601Week [incr fieldCount]
 			append postcode "dict set date iso8601Week \[" \
@@ -1907,7 +1934,7 @@ proc ::tcl::clock::ParseClockScanFormat {formatString locale} {
 					"day of week is greater than 7"
 				}
 				dict set date dayOfWeek $dow
-			    }
+			    }				
 		    }
 		    y {
 			lassign [LocaleNumeralMatcher $locale] regex lookup
@@ -1953,11 +1980,10 @@ proc ::tcl::clock::ParseClockScanFormat {formatString locale} {
     append procBody $postcode
     append procBody [list set changeover [mc GREGORIAN_CHANGE_DATE]] \n
 
-    # Set up the time zone before doing anything with a default base date
-    # that might need a timezone to interpret it.
+    # Get time zone if needed
 
-    if { ![dict exists $fieldSet seconds]
-	    && ![dict exists $fieldSet starDate] } {
+    if { ![dict exists $fieldSet seconds] 
+	 && ![dict exists $fieldSet starDate] } {
 	if { [dict exists $fieldSet tzName] } {
 	    append procBody {
 		set timeZone [dict get $date tzName]
@@ -1976,29 +2002,24 @@ proc ::tcl::clock::ParseClockScanFormat {formatString locale} {
 
     append procBody [MakeParseCodeFromFields $fieldSet $TimeParseActions]
 
-    # Assemble seconds from the Julian day and second of the day.
-    # Convert to local time unless epoch seconds or stardate are
-    # being processed - they're always absolute
+    # Assemble seconds, and convert local nominal time to UTC.
 
-    if { ![dict exists $fieldSet seconds]
+    if { ![dict exists $fieldSet seconds] 
          && ![dict exists $fieldSet starDate] } {
 	append procBody {
 	    if { [dict get $date julianDay] > 5373484 } {
 		return -code error -errorcode [list CLOCK dateTooLarge] \
 		    "requested date too large to represent"
 	    }
-	    dict set date localSeconds [expr {
-		-210866803200
-		+ ( 86400 * wide([dict get $date julianDay]) )
-		+ [dict get $date secondOfDay]
-	    }]
+	    dict set date localSeconds \
+		[expr { -210866803200
+			+ ( 86400 * wide([dict get $date julianDay]) )
+			+ [dict get $date secondOfDay] }]
 	}
-
-	# Finally, convert the date to local time
-
 	append procBody {
 	    set date [::tcl::clock::ConvertLocalToUTC $date[set date {}] \
-			  $TZData($timeZone) $changeover]
+			  $TZData($timeZone) \
+			  $changeover]
 	}
     }
 
@@ -2012,29 +2033,31 @@ proc ::tcl::clock::ParseClockScanFormat {formatString locale} {
 
     return $procName
 }
-
+	
 #----------------------------------------------------------------------
 #
 # LocaleNumeralMatcher --
 #
-#	Composes a regexp that captures the numerals in the given locale, and
-#	a dictionary to map them to conventional numerals.
+#	Composes a regexp that captures the numerals in the given
+#	locale, and a dictionary to map them to conventional numerals.
 #
 # Parameters:
 #	locale - Name of the current locale
 #
 # Results:
-#	Returns a two-element list comprising the regexp and the dictionary.
+#	Returns a two-element list comprising the regexp and the
+#	dictionary.
 #
 # Side effects:
 #	Caches the result.
 #
 #----------------------------------------------------------------------
 
-proc ::tcl::clock::LocaleNumeralMatcher {l} {
+proc ::tcl::clock::LocaleNumeralMatcher {locale} {
+
     variable LocaleNumeralCache
 
-    if { ![dict exists $LocaleNumeralCache $l] } {
+    if { ![dict exists $LocaleNumeralCache $locale] } {
 	set d {}
 	set i 0
 	set sep \(
@@ -2046,20 +2069,20 @@ proc ::tcl::clock::LocaleNumeralMatcher {l} {
 	    incr i
 	}
 	append re \)
-	dict set LocaleNumeralCache $l [list $re $d]
+	dict set LocaleNumeralCache $locale [list $re $d]
     }
-    return [dict get $LocaleNumeralCache $l]
+    return [dict get $LocaleNumeralCache $locale]
 }
-
+	
 
 
 #----------------------------------------------------------------------
 #
 # UniquePrefixRegexp --
 #
-#	Composes a regexp that performs unique-prefix matching.  The RE
-#	matches one of a supplied set of strings, or any unique prefix
-#	thereof.
+#	Composes a regexp that performs unique-prefix matching.  The
+#	RE matches one of a supplied set of strings, or any unique
+#	prefix thereof.
 #
 # Parameters:
 #	data - List of alternating match-strings and values.
@@ -2067,10 +2090,10 @@ proc ::tcl::clock::LocaleNumeralMatcher {l} {
 #	       distinct.
 #
 # Results:
-#	Returns a two-element list.  The first is a regexp that matches any
-#	unique prefix of any of the strings.  The second is a dictionary whose
-#	keys are match values from the regexp and whose values are the
-#	corresponding values from 'data'.
+#	Returns a two-element list.  The first is a regexp that
+#	matches any unique prefix of any of the strings.  The second
+#	is a dictionary whose keys are match values from the regexp
+#	and whose values are the corresponding values from 'data'.
 #
 # Side effects:
 #	None.
@@ -2078,10 +2101,11 @@ proc ::tcl::clock::LocaleNumeralMatcher {l} {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::UniquePrefixRegexp { data } {
-    # The 'successors' dictionary will contain, for each string that is a
-    # prefix of any key, all characters that may follow that prefix.  The
-    # 'prefixMapping' dictionary will have keys that are prefixes of keys and
-    # values that correspond to the keys.
+
+    # The 'successors' dictionary will contain, for each string that
+    # is a prefix of any key, all characters that may follow that
+    # prefix.  The 'prefixMapping' dictionary will have keys that
+    # are prefixes of keys and values that correspond to the keys.
 
     set prefixMapping [dict create]
     set successors [dict create {} {}]
@@ -2089,7 +2113,8 @@ proc ::tcl::clock::UniquePrefixRegexp { data } {
     # Walk the key-value pairs
 
     foreach { key value } $data {
-	# Construct all prefixes of the key;
+
+	# Construct all prefixes of the key; 
 
 	set prefix {}
 	foreach char [split $key {}] {
@@ -2107,8 +2132,8 @@ proc ::tcl::clock::UniquePrefixRegexp { data } {
 	}
     }
 
-    # Identify those prefixes that designate unique values, and those that are
-    # the full keys
+    # Identify those prefixes that designate unique values, and
+    # those that are the full keys
 
     set uniquePrefixMapping {}
     dict for { key valueList } $prefixMapping {
@@ -2131,8 +2156,8 @@ proc ::tcl::clock::UniquePrefixRegexp { data } {
 #
 # MakeUniquePrefixRegexp --
 #
-#	Service procedure for 'UniquePrefixRegexp' that constructs a regular
-#	expresison that matches the unique prefixes.
+#	Service procedure for 'UniquePrefixRegexp' that constructs
+#	a regular expresison that matches the unique prefixes.
 #
 # Parameters:
 #	successors - Dictionary whose keys are all prefixes
@@ -2144,17 +2169,18 @@ proc ::tcl::clock::UniquePrefixRegexp { data } {
 #	prefixString - Current prefix being processed.
 #
 # Results:
-#	Returns a constructed regular expression that matches the set of
-#	unique prefixes beginning with the 'prefixString'.
+#	Returns a constructed regular expression that matches the set
+#	of unique prefixes beginning with the 'prefixString'.
 #
 # Side effects:
 #	None.
 #
 #----------------------------------------------------------------------
 
-proc ::tcl::clock::MakeUniquePrefixRegexp { successors
+proc ::tcl::clock::MakeUniquePrefixRegexp { successors 
 					  uniquePrefixMapping
 					  prefixString } {
+
     # Get the characters that may follow the current prefix string
 
     set schars [lsort -ascii [dict keys [dict get $successors $prefixString]]]
@@ -2162,15 +2188,13 @@ proc ::tcl::clock::MakeUniquePrefixRegexp { successors
 	return {}
     }
 
-    # If there is more than one successor character, or if the current prefix
-    # is a unique prefix, surround the generated re with non-capturing
+    # If there is more than one successor character, or if the current
+    # prefix is a unique prefix, surround the generated re with non-capturing
     # parentheses.
 
     set re {}
-    if {
-	[dict exists $uniquePrefixMapping $prefixString]
-	|| [llength $schars] > 1
-    } then {
+    if { [dict exists $uniquePrefixMapping $prefixString]
+	 || [llength $schars] > 1 } {
 	append re "(?:"
     }
 
@@ -2192,7 +2216,7 @@ proc ::tcl::clock::MakeUniquePrefixRegexp { successors
 
     if { [dict exists $uniquePrefixMapping $prefixString] } {
 	append re ")?"
-    } elseif { [llength $schars] > 1 } {
+    }  elseif { [llength $schars] > 1 } {
 	append re ")"
     }
 
@@ -2203,8 +2227,8 @@ proc ::tcl::clock::MakeUniquePrefixRegexp { successors
 #
 # MakeParseCodeFromFields --
 #
-#	Composes Tcl code to extract the Julian Day Number from a dictionary
-#	containing date fields.
+#	Composes Tcl code to extract the Julian Day Number from a
+#	dictionary containing date fields.
 #
 # Parameters:
 #	dateFields -- Dictionary whose keys are fields of the date,
@@ -2215,8 +2239,8 @@ proc ::tcl::clock::MakeUniquePrefixRegexp { successors
 #			the list must be in ascending order by priority
 #
 # Results:
-#	Returns a burst of code that extracts the day number from the given
-#	date.
+#	Returns a burst of code that extracts the day number from the
+#	given date.
 #
 # Side effects:
 #	None.
@@ -2224,6 +2248,7 @@ proc ::tcl::clock::MakeUniquePrefixRegexp { successors
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::MakeParseCodeFromFields { dateFields parseActions } {
+
     set currPrio 999
     set currFieldPos [list]
     set currCodeBurst {
@@ -2231,15 +2256,16 @@ proc ::tcl::clock::MakeParseCodeFromFields { dateFields parseActions } {
     }
 
     foreach { fieldSet prio parseAction } $parseActions {
-	# If we've found an answer that's better than any that follow, quit
-	# now.
+
+	# If we've found an answer that's better than any that follow,
+	# quit now.
 
 	if { $prio > $currPrio } {
 	    break
 	}
 
-	# Accumulate the field positions that are used in the current field
-	# grouping.
+	# Accumulate the field positions that are used in the current
+	# field grouping.
 
 	set fieldPos [list]
 	set ok true
@@ -2262,11 +2288,9 @@ proc ::tcl::clock::MakeParseCodeFromFields { dateFields parseActions } {
 
 	if { $prio ==  $currPrio } {
 	    foreach currPos $currFieldPos newPos $fPos {
-		if {
-		    ![string is integer $newPos]
-		    || ![string is integer $currPos]
-		    || $newPos > $currPos
-		} then {
+		if { ![string is integer $newPos]
+		     || ![string is integer $currPos]
+		     || $newPos > $currPos } {
 		    break
 		}
 		if { $newPos < $currPos } {
@@ -2284,86 +2308,75 @@ proc ::tcl::clock::MakeParseCodeFromFields { dateFields parseActions } {
 	set currPrio $prio
 	set currFieldPos $fPos
 	set currCodeBurst $parseAction
+	    
     }
 
     return $currCodeBurst
+
 }
 
 #----------------------------------------------------------------------
 #
 # EnterLocale --
 #
-#	Switch [mclocale] to a given locale if necessary
+#	By shure given locale is loaded and set variable Locale
 #
 # Parameters:
 #	locale -- Desired locale
-#	oldLocaleVar -- Name of a variable in caller's scope that
-#		        tracks the previous locale name.
 #
 # Results:
-#	Returns the locale that was previously current.
+#	%
 #
 # Side effects:
-#	Does [mclocale].  If necessary, uses [mcload] to load the designated
-#	locale's files, and tracks that it has done so in the 'McLoaded'
-#	variable.
+#	If necessary, uses [mcloadedlocales packageadd] to load the
+#	designated locale's files.
 #
 #----------------------------------------------------------------------
 
-proc ::tcl::clock::EnterLocale { locale oldLocaleVar } {
-    upvar 1 $oldLocaleVar oldLocale
-
-    variable MsgDir
-    variable McLoaded
+proc ::tcl::clock::EnterLocale { locale } {
 
-    set oldLocale [mclocale]
     if { $locale eq {system} } {
+
 	if { $::tcl_platform(platform) ne {windows} } {
-	    # On a non-windows platform, the 'system' locale is the same as
-	    # the 'current' locale
+
+	    # On a non-windows platform, the 'system' locale is
+	    # the same as the 'current' locale
 
 	    set locale current
 	} else {
-	    # On a windows platform, the 'system' locale is adapted from the
-	    # 'current' locale by applying the date and time formats from the
-	    # Control Panel.  First, load the 'current' locale if it's not yet
-	    # loaded
-
-	    if {![dict exists $McLoaded $oldLocale] } {
-		mcload $MsgDir
-		dict set McLoaded $oldLocale {}
-	    }
 
-	    # Make a new locale string for the system locale, and get the
-	    # Control Panel information
+	    # On a windows platform, the 'system' locale is
+	    # adapted from the 'current' locale by applying the
+	    # date and time formats from the Control Panel.
+	    # First, load the 'current' locale if it's not yet loaded
 
-	    set locale ${oldLocale}_windows
-	    if { ![dict exists $McLoaded $locale] } {
+	    mcpackagelocale [mclocale]
+
+	    # Make a new locale string for the system locale, and
+	    # get the Control Panel information
+
+	    # This will only load the current locale below, as it is a
+	    # descent from <locale>_windows.
+	    # The <locale>_windows will be remembered as current and as loaded.
+	    set locale [mclocale]_windows
+	    if { $locale ni [::msgcat::mcpackagelocale loaded] } {
 		LoadWindowsDateTimeFormats $locale
-		dict set McLoaded $locale {}
 	    }
 	}
     }
     if { $locale eq {current}} {
-	set locale $oldLocale
-	unset oldLocale
-    } elseif { $locale eq $oldLocale } {
-	unset oldLocale
-    } else {
-	mclocale $locale
+	set locale [mclocale]
     }
-    if { ![dict exists $McLoaded $locale] } {
-	mcload $MsgDir
-	dict set McLoaded $locale {}
-    }
-}
+    # Eventually load the locale
+    mcpackagelocale set $locale
+}    
 
 #----------------------------------------------------------------------
 #
 # LoadWindowsDateTimeFormats --
 #
-#	Load the date/time formats from the Control Panel in Windows and
-#	convert them so that they're usable by Tcl.
+#	Load the date/time formats from the Control Panel in Windows
+#	and convert them so that they're usable by Tcl.
 #
 # Parameters:
 #	locale - Name of the locale in whose message catalog
@@ -2375,12 +2388,14 @@ proc ::tcl::clock::EnterLocale { locale oldLocaleVar } {
 # Side effects:
 #	Updates the given message catalog with the locale strings.
 #
-# Presumes that on entry, [mclocale] is set to the current locale, so that
-# default strings can be obtained if the Registry query fails.
+# Presumes that on entry, [mclocale] is set to the current locale,
+# so that default strings can be obtained if the Registry query
+# fails.
 #
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::LoadWindowsDateTimeFormats { locale } {
+
     # Bail out if we can't find the Registry
 
     variable NoRegistry
@@ -2482,6 +2497,7 @@ proc ::tcl::clock::LoadWindowsDateTimeFormats { locale } {
     }
 
     return
+
 }
 
 #----------------------------------------------------------------------
@@ -2496,8 +2512,8 @@ proc ::tcl::clock::LoadWindowsDateTimeFormats { locale } {
 #	format -- Format supplied to [clock scan] or [clock format]
 #
 # Results:
-#	Returns the string with locale-dependent composite format groups
-#	substituted out.
+#	Returns the string with locale-dependent composite format
+#	groups substituted out.
 #
 # Side effects:
 #	None.
@@ -2505,18 +2521,18 @@ proc ::tcl::clock::LoadWindowsDateTimeFormats { locale } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::LocalizeFormat { locale format } {
-    variable McLoaded
 
-    if { [dict exists $McLoaded $locale FORMAT $format] } {
-	return [dict get $McLoaded $locale FORMAT $format]
-    }
-    set inFormat $format
+    # message catalog key to cache this format
+    set key FORMAT_$format
 
+    if { [::msgcat::mcexists -exactlocale -exactnamespace $key] } {
+	return [mc $key]
+    }
     # Handle locale-dependent format groups by mapping them out of the format
     # string.  Note that the order of the [string map] operations is
     # significant because later formats can refer to later ones; for example
     # %c can refer to %X, which in turn can refer to %T.
-
+    
     set list {
 	%% %%
 	%D %m/%d/%Y
@@ -2533,8 +2549,8 @@ proc ::tcl::clock::LocalizeFormat { locale format } {
     lappend list %c  [string map $list [mc DATE_TIME_FORMAT]]
     lappend list %Ec [string map $list [mc LOCALE_DATE_TIME_FORMAT]]
     set format [string map $list $format]
-
-    dict set McLoaded $locale FORMAT $inFormat $format
+				       
+    mcset $locale $key $format
     return $format
 }
 
@@ -2556,6 +2572,7 @@ proc ::tcl::clock::LocalizeFormat { locale format } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::FormatNumericTimeZone { z } {
+
     if { $z < 0 } {
 	set z [expr { - $z }]
 	set retval -
@@ -2570,6 +2587,7 @@ proc ::tcl::clock::FormatNumericTimeZone { z } {
 	append retval [::format %02d $z]
     }
     return $retval
+
 }
 
 #----------------------------------------------------------------------
@@ -2594,6 +2612,7 @@ proc ::tcl::clock::FormatNumericTimeZone { z } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::FormatStarDate { date } {
+
     variable Roddenberry
 
     # Get day of year, zero based
@@ -2644,6 +2663,7 @@ proc ::tcl::clock::FormatStarDate { date } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::ParseStarDate { year fractYear fractDay } {
+
     variable Roddenberry
 
     # Build a tentative date from year and fraction.
@@ -2659,8 +2679,8 @@ proc ::tcl::clock::ParseStarDate { year fractYear fractDay } {
 
     set lp [IsGregorianLeapYear $date]
 
-    # Reconvert the fractional year according to whether the given year is a
-    # leap year
+    # Reconvert the fractional year according to whether the given
+    # year is a leap year
 
     if { $lp } {
 	dict set date dayOfYear \
@@ -2673,11 +2693,10 @@ proc ::tcl::clock::ParseStarDate { year fractYear fractDay } {
     dict unset date gregorian
     set date [GetJulianDayFromGregorianEraYearDay $date[set date {}]]
 
-    return [expr {
-	86400 * [dict get $date julianDay]
-	- 210866803200
-	+ ( 86400 / 10 ) * $fractDay
-    }]
+    return [expr { 86400 * [dict get $date julianDay]
+		   - 210866803200
+		   + ( 86400 / 10 ) * $fractDay }]
+
 }
 
 #----------------------------------------------------------------------
@@ -2690,8 +2709,8 @@ proc ::tcl::clock::ParseStarDate { year fractYear fractDay } {
 #	str - String containing a decimal wide integer
 #
 # Results:
-#	Returns the string as a pure wide integer.  Throws an error if the
-#	string is misformatted or out of range.
+#	Returns the string as a pure wide integer.  Throws an error if
+#	the string is misformatted or out of range.
 #
 #----------------------------------------------------------------------
 
@@ -2712,8 +2731,8 @@ proc ::tcl::clock::ScanWide { str } {
 #
 # InterpretTwoDigitYear --
 #
-#	Given a date that contains only the year of the century, determines
-#	the target value of a two-digit year.
+#	Given a date that contains only the year of the century,
+#	determines the target value of a two-digit year.
 #
 # Parameters:
 #	date - Dictionary containing fields of the date.
@@ -2730,17 +2749,18 @@ proc ::tcl::clock::ScanWide { str } {
 # Side effects:
 #	None.
 #
-# The current rule for interpreting a two-digit year is that the year shall be
-# between 1937 and 2037, thus staying within the range of a 32-bit signed
-# value for time.  This rule may change to a sliding window in future
-# versions, so the 'baseTime' parameter (which is currently ignored) is
-# provided in the procedure signature.
+# The current rule for interpreting a two-digit year is that the year
+# shall be between 1937 and 2037, thus staying within the range of a
+# 32-bit signed value for time.  This rule may change to a sliding
+# window in future versions, so the 'baseTime' parameter (which is
+# currently ignored) is provided in the procedure signature.
 #
 #----------------------------------------------------------------------
 
-proc ::tcl::clock::InterpretTwoDigitYear { date baseTime
+proc ::tcl::clock::InterpretTwoDigitYear { date baseTime 
 					   { twoDigitField yearOfCentury }
 					   { fourDigitField year } } {
+
     set yr [dict get $date $twoDigitField]
     if { $yr <= 37 } {
 	dict set date $fourDigitField [expr { $yr + 2000 }]
@@ -2748,6 +2768,7 @@ proc ::tcl::clock::InterpretTwoDigitYear { date baseTime
 	dict set date $fourDigitField [expr { $yr + 1900 }]
     }
     return $date
+
 }
 
 #----------------------------------------------------------------------
@@ -2773,6 +2794,7 @@ proc ::tcl::clock::InterpretTwoDigitYear { date baseTime
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::AssignBaseYear { date baseTime timezone changeover } {
+
     variable TZData
 
     # Find the Julian Day Number corresponding to the base time, and
@@ -2786,6 +2808,7 @@ proc ::tcl::clock::AssignBaseYear { date baseTime timezone changeover } {
     dict set date year [dict get $date2 year]
 
     return $date
+
 }
 
 #----------------------------------------------------------------------
@@ -2812,6 +2835,7 @@ proc ::tcl::clock::AssignBaseYear { date baseTime timezone changeover } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::AssignBaseIso8601Year {date baseTime timeZone changeover} {
+
     variable TZData
 
     # Find the Julian Day Number corresponding to the base time
@@ -2829,7 +2853,7 @@ proc ::tcl::clock::AssignBaseIso8601Year {date baseTime timeZone changeover} {
 #
 # AssignBaseMonth --
 #
-#	Places the number of the current year and month into a
+#	Places the number of the current year and month into a 
 #	dictionary.
 #
 # Parameters:
@@ -2848,6 +2872,7 @@ proc ::tcl::clock::AssignBaseIso8601Year {date baseTime timeZone changeover} {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::AssignBaseMonth {date baseTime timezone changeover} {
+
     variable TZData
 
     # Find the year and month corresponding to the base time
@@ -2857,6 +2882,7 @@ proc ::tcl::clock::AssignBaseMonth {date baseTime timezone changeover} {
     dict set date year [dict get $date2 year]
     dict set date month [dict get $date2 month]
     return $date
+
 }
 
 #----------------------------------------------------------------------
@@ -2882,6 +2908,7 @@ proc ::tcl::clock::AssignBaseMonth {date baseTime timezone changeover} {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::AssignBaseWeek {date baseTime timeZone changeover} {
+
     variable TZData
 
     # Find the Julian Day Number corresponding to the base time
@@ -2918,6 +2945,7 @@ proc ::tcl::clock::AssignBaseWeek {date baseTime timeZone changeover} {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::AssignBaseJulianDay { date baseTime timeZone changeover } {
+
     variable TZData
 
     # Find the Julian Day Number corresponding to the base time
@@ -2947,6 +2975,7 @@ proc ::tcl::clock::AssignBaseJulianDay { date baseTime timeZone changeover } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::InterpretHMSP { date } {
+
     set hr [dict get $date hourAMPM]
     if { $hr == 12 } {
 	set hr 0
@@ -2956,6 +2985,7 @@ proc ::tcl::clock::InterpretHMSP { date } {
     }
     dict set date hour $hr
     return [InterpretHMS $date[set date {}]]
+
 }
 
 #----------------------------------------------------------------------
@@ -2978,11 +3008,11 @@ proc ::tcl::clock::InterpretHMSP { date } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::InterpretHMS { date } {
-    return [expr {
-	( [dict get $date hour] * 60
-	  + [dict get $date minute] ) * 60
-	+ [dict get $date second]
-    }]
+
+    return [expr { ( [dict get $date hour] * 60
+		     + [dict get $date minute] ) * 60
+		   + [dict get $date second] }]
+
 }
 
 #----------------------------------------------------------------------
@@ -3005,6 +3035,7 @@ proc ::tcl::clock::InterpretHMS { date } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::GetSystemTimeZone {} {
+
     variable CachedSystemTimeZone
     variable TimeZoneBad
 
@@ -3037,69 +3068,76 @@ proc ::tcl::clock::GetSystemTimeZone {} {
     } else {
 	return $timezone
     }
+
 }
 
 #----------------------------------------------------------------------
 #
 # ConvertLegacyTimeZone --
 #
-#	Given an alphanumeric time zone identifier and the system time zone,
-#	convert the alphanumeric identifier to an unambiguous time zone.
+#	Given an alphanumeric time zone identifier and the system
+#	time zone, convert the alphanumeric identifier to an
+#	unambiguous time zone.
 #
 # Parameters:
 #	tzname - Name of the time zone to convert
 #
 # Results:
-#	Returns a time zone name corresponding to tzname, but in an
-#	unambiguous form, generally +hhmm.
+#	Returns a time zone name corresponding to tzname, but
+#	in an unambiguous form, generally +hhmm.
 #
-# This procedure is implemented primarily to allow the parsing of RFC822
-# date/time strings.  Processing a time zone name on input is not recommended
-# practice, because there is considerable room for ambiguity; for instance, is
-# BST Brazilian Standard Time, or British Summer Time?
+# This procedure is implemented primarily to allow the parsing of
+# RFC822 date/time strings.  Processing a time zone name on input
+# is not recommended practice, because there is considerable room
+# for ambiguity; for instance, is BST Brazilian Standard Time, or
+# British Summer Time?
 #
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::ConvertLegacyTimeZone { tzname } {
+
     variable LegacyTimeZone
 
     set tzname [string tolower $tzname]
     if { ![dict exists $LegacyTimeZone $tzname] } {
 	return -code error -errorcode [list CLOCK badTZName $tzname] \
 	    "time zone \"$tzname\" not found"
+    } else {
+	return [dict get $LegacyTimeZone $tzname]
     }
-    return [dict get $LegacyTimeZone $tzname]
+
 }
 
 #----------------------------------------------------------------------
 #
 # SetupTimeZone --
 #
-#	Given the name or specification of a time zone, sets up its in-memory
-#	data.
+#	Given the name or specification of a time zone, sets up
+#	its in-memory data.
 #
 # Parameters:
 #	tzname - Name of a time zone
 #
 # Results:
-#	Unless the time zone is ':localtime', sets the TZData array to contain
-#	the lookup table for local<->UTC conversion.  Returns an error if the
-#	time zone cannot be parsed.
+#	Unless the time zone is ':localtime', sets the TZData array
+#	to contain the lookup table for local<->UTC conversion.
+#	Returns an error if the time zone cannot be parsed.
 #
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::SetupTimeZone { timezone } {
+
     variable TZData
 
     if {! [info exists TZData($timezone)] } {
 	variable MINWIDE
 	if { $timezone eq {:localtime} } {
+
 	    # Nothing to do, we'll convert using the localtime function
 
-	} elseif {
-	    [regexp {^([-+])(\d\d)(?::?(\d\d)(?::?(\d\d))?)?} $timezone \
-		    -> s hh mm ss]
-	} then {
+	} elseif { [regexp {^([-+])(\d\d)(?::?(\d\d)(?::?(\d\d))?)?} $timezone \
+		    -> s hh mm ss] } {
+
 	    # Make a fixed offset
 
 	    ::scan $hh %d hh
@@ -3120,21 +3158,24 @@ proc ::tcl::clock::SetupTimeZone { timezone } {
 	    set TZData($timezone) [list [list $MINWIDE $offset -1 $timezone]]
 
 	} elseif { [string index $timezone 0] eq {:} } {
+	    
 	    # Convert using a time zone file
 
-	    if {
+	    if { 
 		[catch {
 		    LoadTimeZoneFile [string range $timezone 1 end]
-		}] && [catch {
+		}]
+		&& [catch {
 		    LoadZoneinfoFile [string range $timezone 1 end]
 		}]
-	    } then {
+	    } {
 		return -code error \
 		    -errorcode [list CLOCK badTimeZone $timezone] \
 		    "time zone \"$timezone\" not found"
 	    }
-
+	    
 	} elseif { ![catch {ParsePosixTimeZone $timezone} tzfields] } {
+	    
 	    # This looks like a POSIX time zone - try to process it
 
 	    if { [catch {ProcessPosixTimeZone $tzfields} data opts] } {
@@ -3147,8 +3188,9 @@ proc ::tcl::clock::SetupTimeZone { timezone } {
 	    }
 
 	} else {
-	    # We couldn't parse this as a POSIX time zone.  Try again with a
-	    # time zone file - this time without a colon
+
+	    # We couldn't parse this as a POSIX time zone.  Try
+	    # again with a time zone file - this time without a colon
 
 	    if { [catch { LoadTimeZoneFile $timezone }]
 		 && [catch { LoadZoneinfoFile $timezone } - opts] } {
@@ -3172,22 +3214,25 @@ proc ::tcl::clock::SetupTimeZone { timezone } {
 #	None.
 #
 # Results:
-#	Returns a time zone specifier that corresponds to the system time zone
-#	information found in the Registry.
+#	Returns a time zone specifier that corresponds to the system
+#	time zone information found in the Registry.
 #
 # Bugs:
-#	Fixed dates for DST change are unimplemented at present, because no
-#	time zone information supplied with Windows actually uses them!
+#	Fixed dates for DST change are unimplemented at present, because
+#	no time zone information supplied with Windows actually uses
+#	them!
 #
-# On a Windows system where neither $env(TCL_TZ) nor $env(TZ) is specified,
-# GuessWindowsTimeZone looks in the Registry for the system time zone
-# information.  It then attempts to find an entry in WinZoneInfo for a time
-# zone that uses the same rules.  If it finds one, it returns it; otherwise,
-# it constructs a Posix-style time zone string and returns that.
+# On a Windows system where neither $env(TCL_TZ) nor $env(TZ) is 
+# specified, GuessWindowsTimeZone looks in the Registry for the
+# system time zone information.  It then attempts to find an entry
+# in WinZoneInfo for a time zone that uses the same rules.  If
+# it finds one, it returns it; otherwise, it constructs a Posix-style
+# time zone string and returns that.
 #
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::GuessWindowsTimeZone {} {
+
     variable WinZoneInfo
     variable NoRegistry
     variable TimeZoneBad
@@ -3218,14 +3263,16 @@ proc ::tcl::clock::GuessWindowsTimeZone {} {
 	    lappend data $val
 	}
     }] } {
+
 	# Missing values in the Registry - bail out
 
 	return :localtime
     }
 
-    # Make up a Posix time zone specifier if we can't find one.  Check here
-    # that the tzdata file exists, in case we're running in an environment
-    # (e.g. starpack) where tzdata is incomplete.  (Bug 1237907)
+    # Make up a Posix time zone specifier if we can't find one.
+    # Check here that the tzdata file exists, in case we're running
+    # in an environment (e.g. starpack) where tzdata is incomplete.
+    # (Bug 1237907)
 
     if { [dict exists $WinZoneInfo $data] } {
 	set tzname [dict get $WinZoneInfo $data]
@@ -3273,11 +3320,11 @@ proc ::tcl::clock::GuessWindowsTimeZone {} {
 	    if { $dstYear == 0 } {
 		append tzname ,M $dstMonth . $dstDayOfMonth . $dstDayOfWeek
 	    } else {
-		# I have not been able to find any locale on which Windows
-		# converts time zone on a fixed day of the year, hence don't
-		# know how to interpret the fields.  If someone can inform me,
-		# I'd be glad to code it up.  For right now, we bail out in
-		# such a case.
+		# I have not been able to find any locale on which
+		# Windows converts time zone on a fixed day of the year,
+		# hence don't know how to interpret the fields.
+		# If someone can inform me, I'd be glad to code it up.
+		# For right now, we bail out in such a case.
 		return :localtime
 	    }
 	    append tzname / [::format %02d $dstHour] \
@@ -3286,11 +3333,11 @@ proc ::tcl::clock::GuessWindowsTimeZone {} {
 	    if { $stdYear == 0 } {
 		append tzname ,M $stdMonth . $stdDayOfMonth . $stdDayOfWeek
 	    } else {
-		# I have not been able to find any locale on which Windows
-		# converts time zone on a fixed day of the year, hence don't
-		# know how to interpret the fields.  If someone can inform me,
-		# I'd be glad to code it up.  For right now, we bail out in
-		# such a case.
+		# I have not been able to find any locale on which
+		# Windows converts time zone on a fixed day of the year,
+		# hence don't know how to interpret the fields.
+		# If someone can inform me, I'd be glad to code it up.
+		# For right now, we bail out in such a case.
 		return :localtime
 	    }
 	    append tzname / [::format %02d $stdHour] \
@@ -3298,9 +3345,10 @@ proc ::tcl::clock::GuessWindowsTimeZone {} {
 		: [::format %02d $stdSecond]
 	}
 	dict set WinZoneInfo $data $tzname
-    }
+    } 
 
     return [dict get $WinZoneInfo $data]
+
 }
 
 #----------------------------------------------------------------------
@@ -3329,18 +3377,18 @@ proc ::tcl::clock::LoadTimeZoneFile { fileName } {
 	return
     }
 
-    # Since an unsafe interp uses the [clock] command in the master, this code
-    # is security sensitive.  Make sure that the path name cannot escape the
-    # given directory.
+    # Since an unsafe interp uses the [clock] command in the master,
+    # this code is security sensitive.  Make sure that the path name
+    # cannot escape the given directory.
 
     if { ![regexp {^[[.-.][:alpha:]_]+(?:/[[.-.][:alpha:]_]+)*$} $fileName] } {
 	return -code error \
 	    -errorcode [list CLOCK badTimeZone $:fileName] \
 	    "time zone \":$fileName\" not valid"
     }
-    try {
+    if { [catch {
 	source -encoding utf-8 [file join $DataDir $fileName]
-    } on error {} {
+    }] } {
 	return -code error \
 	    -errorcode [list CLOCK badTimeZone :$fileName] \
 	    "time zone \":$fileName\" not found"
@@ -3358,8 +3406,8 @@ proc ::tcl::clock::LoadTimeZoneFile { fileName } {
 #	fileName - Relative path name of the file to load.
 #
 # Results:
-#	Returns an empty result normally; returns an error if no Olson file
-#	was found or the file was malformed in some way.
+#	Returns an empty result normally; returns an error if no
+#	Olson file was found or the file was malformed in some way.
 #
 # Side effects:
 #	TZData(:fileName) contains the time zone data
@@ -3367,11 +3415,12 @@ proc ::tcl::clock::LoadTimeZoneFile { fileName } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::LoadZoneinfoFile { fileName } {
+
     variable ZoneinfoPaths
 
-    # Since an unsafe interp uses the [clock] command in the master, this code
-    # is security sensitive.  Make sure that the path name cannot escape the
-    # given directory.
+    # Since an unsafe interp uses the [clock] command in the master,
+    # this code is security sensitive.  Make sure that the path name
+    # cannot escape the given directory.
 
     if { ![regexp {^[[.-.][:alpha:]_]+(?:/[[.-.][:alpha:]_]+)*$} $fileName] } {
 	return -code error \
@@ -3400,14 +3449,15 @@ proc ::tcl::clock::LoadZoneinfoFile { fileName } {
 #	fname - Absolute path name of the file.
 #
 # Results:
-#	Returns an empty result normally; returns an error if no Olson file
-#	was found or the file was malformed in some way.
+#	Returns an empty result normally; returns an error if no
+#	Olson file was found or the file was malformed in some way.
 #
 # Side effects:
 #	TZData(:fileName) contains the time zone data
 #
 #----------------------------------------------------------------------
 
+
 proc ::tcl::clock::ReadZoneinfoFile {fileName fname} {
     variable MINWIDE
     variable TZData
@@ -3426,8 +3476,8 @@ proc ::tcl::clock::ReadZoneinfoFile {fileName fname} {
     set d [read $f]
     close $f
 
-    # The file begins with a magic number, sixteen reserved bytes, and then
-    # six 4-byte integers giving counts of fileds in the file.
+    # The file begins with a magic number, sixteen reserved bytes,
+    # and then six 4-byte integers giving counts of fileds in the file.
 
     binary scan $d a4a1x15IIIIII \
 	magic version nIsGMT nIsStd nLeap nTime nType nChar
@@ -3445,19 +3495,18 @@ proc ::tcl::clock::ReadZoneinfoFile {fileName fname} {
 	return -code error "$fileName contains leap seconds"
     }
 
-    # In a version 2 file, we use the second part of the file, which contains
-    # 64-bit transition times.
+    # In a version 2 file, we use the second part of the file, which
+    # contains 64-bit transition times.
 
     if {$version eq "2"} {
-	set seek [expr {
-	    44
-	    + 5 * $nTime
-	    + 6 * $nType
-	    + 4 * $nLeap
-	    + $nIsStd
-	    + $nIsGMT
-	    + $nChar
-	}]
+	set seek [expr {44
+			+ 5 * $nTime 
+			+ 6 * $nType 
+			+ 4 * $nLeap
+			+ $nIsStd 
+			+ $nIsGMT
+			+ $nChar
+		    }]
 	binary scan $d @${seek}a4a1x15IIIIII \
 	    magic version nIsGMT nIsStd nLeap nTime nType nChar
 	if {$magic ne {TZif}} {
@@ -3481,9 +3530,9 @@ proc ::tcl::clock::ReadZoneinfoFile {fileName fname} {
     }
     set codes [linsert $codes 0 0]
 
-    # Next come ${nType} time type descriptions, each of which has an offset
-    # (seconds east of GMT), a DST indicator, and an index into the
-    # abbreviation text.
+    # Next come ${nType} time type descriptions, each of which has an
+    # offset (seconds east of GMT), a DST indicator, and an index into
+    # the abbreviation text.
 
     for { set i 0 } { $i < $nType } { incr i } {
 	binary scan $d @${seek}Icc gmtOff isDst abbrInd
@@ -3491,10 +3540,10 @@ proc ::tcl::clock::ReadZoneinfoFile {fileName fname} {
 	incr seek 6
     }
 
-    # Next come $nChar characters of time zone name abbreviations, which are
-    # null-terminated.
-    # We build them up into a dictionary indexed by character index, because
-    # that's what's in the indices above.
+    # Next come $nChar characters of time zone name abbreviations,
+    # which are null-terminated.
+    # We build them up into a dictionary indexed by character index,
+    # because that's what's in the indices above.
 
     binary scan $d @${seek}a${nChar} abbrs
     incr seek ${nChar}
@@ -3524,8 +3573,8 @@ proc ::tcl::clock::ReadZoneinfoFile {fileName fname} {
     }
 
     # In a version 2 file, there is also a POSIX-style time zone description
-    # at the very end of the file.  To get to it, skip over nLeap leap second
-    # values (8 bytes each),
+    # at the very end of the file.  To get to it, skip over
+    # nLeap leap second values (8 bytes each),
     # nIsStd standard/DST indicators and nIsGMT UTC/local indicators.
 
     if {$version eq {2}} {
@@ -3558,8 +3607,8 @@ proc ::tcl::clock::ReadZoneinfoFile {fileName fname} {
 #	tz	Time zone specifier to be interpreted
 #
 # Results:
-#	Returns a dictionary whose values contain the various pieces of the
-#	time zone specification.
+#	Returns a dictionary whose values contain the various pieces of
+#	the time zone specification.
 #
 # Side effects:
 #	None.
@@ -3570,7 +3619,7 @@ proc ::tcl::clock::ReadZoneinfoFile {fileName fname} {
 # The following keys are present in the dictionary:
 #	stdName - Name of the time zone when Daylight Saving Time
 #		  is not in effect.
-#	stdSignum - Sign (+, -, or empty) of the offset from Greenwich
+#	stdSignum - Sign (+, -, or empty) of the offset from Greenwich 
 #		    to the given (non-DST) time zone.  + and the empty
 #		    string denote zones west of Greenwich, - denotes east
 #		    of Greenwich; this is contrary to the ISO convention
@@ -3615,13 +3664,14 @@ proc ::tcl::clock::ReadZoneinfoFile {fileName fname} {
 #	endHours, endMinutes, endSeconds -
 #		Specify the end of DST in the same way that the start* fields
 #		specify the beginning of DST.
-#
-# This procedure serves only to break the time specifier into fields.  No
-# attempt is made to canonicalize the fields or supply default values.
+#		
+# This procedure serves only to break the time specifier into fields.
+# No attempt is made to canonicalize the fields or supply default values.
 #
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::ParsePosixTimeZone { tz } {
+
     if {[regexp -expanded -nocase -- {
 	^
 	# 1 - Standard time zone name
@@ -3632,8 +3682,8 @@ proc ::tcl::clock::ParsePosixTimeZone { tz } {
 	([[:digit:]]{1,2})
 	(?:
 	    # 4 - Standard time zone offset, minutes
-	    : ([[:digit:]]{1,2})
-	    (?:
+	    : ([[:digit:]]{1,2}) 
+	    (?: 
 	        # 5 - Standard time zone offset, seconds
 		: ([[:digit:]]{1,2} )
 	    )?
@@ -3649,8 +3699,8 @@ proc ::tcl::clock::ParsePosixTimeZone { tz } {
 		    ([[:digit:]]{1,2})
 		    (?:
 			# 9 - DST time zone offset, minutes
-			: ([[:digit:]]{1,2})
-			(?:
+			: ([[:digit:]]{1,2}) 
+			(?: 
 		            # 10 - DST time zone offset, seconds
 			    : ([[:digit:]]{1,2})
 			)?
@@ -3663,8 +3713,8 @@ proc ::tcl::clock::ParsePosixTimeZone { tz } {
 		        ( J ? )	( [[:digit:]]+ )
                         | M
 			# 13 - Month number 14 - Week of month 15 - Day of week
-			( [[:digit:]] + )
-			[.] ( [[:digit:]] + )
+			( [[:digit:]] + ) 
+			[.] ( [[:digit:]] + ) 
 			[.] ( [[:digit:]] + )
 		    )
 		    (?:
@@ -3685,8 +3735,8 @@ proc ::tcl::clock::ParsePosixTimeZone { tz } {
 		        ( J ? )	( [[:digit:]]+ )
                         | M
 			# 21 - Month number 22 - Week of month 23 - Day of week
-			( [[:digit:]] + )
-			[.] ( [[:digit:]] + )
+			( [[:digit:]] + ) 
+			[.] ( [[:digit:]] + ) 
 			[.] ( [[:digit:]] + )
 		    )
 		    (?:
@@ -3713,21 +3763,27 @@ proc ::tcl::clock::ParsePosixTimeZone { tz } {
 	     x(endJ) x(endDayOfYear) \
 	     x(endMonth) x(endWeekOfMonth) x(endDayOfWeek) \
 	     x(endHours) x(endMinutes) x(endSeconds)] } {
+
 	# it's a good timezone
 
 	return [array get x]
+
+    } else {
+
+	return -code error\
+	    -errorcode [list CLOCK badTimeZone $tz] \
+	    "unable to parse time zone specification \"$tz\""
+
     }
 
-    return -code error\
-	-errorcode [list CLOCK badTimeZone $tz] \
-	"unable to parse time zone specification \"$tz\""
 }
 
 #----------------------------------------------------------------------
 #
 # ProcessPosixTimeZone --
 #
-#	Handle a Posix time zone after it's been broken out into fields.
+#	Handle a Posix time zone after it's been broken out into
+#	fields.
 #
 # Parameters:
 #	z - Dictionary returned from 'ParsePosixTimeZone'
@@ -3741,6 +3797,7 @@ proc ::tcl::clock::ParsePosixTimeZone { tz } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::ProcessPosixTimeZone { z } {
+
     variable MINWIDE
     variable TZData
 
@@ -3755,20 +3812,20 @@ proc ::tcl::clock::ProcessPosixTimeZone { z } {
     } else {
 	set stdSignum -1
     }
-    set stdHours [lindex [::scan [dict get $z stdHours] %d] 0]
+    set stdHours [lindex [::scan [dict get $z stdHours] %d] 0] 
     if { [dict get $z stdMinutes] ne {} } {
-	set stdMinutes [lindex [::scan [dict get $z stdMinutes] %d] 0]
+	set stdMinutes [lindex [::scan [dict get $z stdMinutes] %d] 0] 
     } else {
 	set stdMinutes 0
     }
     if { [dict get $z stdSeconds] ne {} } {
-	set stdSeconds [lindex [::scan [dict get $z stdSeconds] %d] 0]
+	set stdSeconds [lindex [::scan [dict get $z stdSeconds] %d] 0] 
     } else {
 	set stdSeconds 0
     }
-    set stdOffset [expr {
-	(($stdHours * 60 + $stdMinutes) * 60 + $stdSeconds) * $stdSignum
-    }]
+    set stdOffset [expr { ( ( $stdHours * 60 + $stdMinutes )
+			    * 60 + $stdSeconds )
+			  * $stdSignum }]
     set data [list [list $MINWIDE $stdOffset 0 $stdName]]
 
     # If there's no daylight zone, we're done
@@ -3791,20 +3848,20 @@ proc ::tcl::clock::ProcessPosixTimeZone { z } {
     if { [dict get $z dstHours] eq {} } {
 	set dstOffset [expr { 3600 + $stdOffset }]
     } else {
-	set dstHours [lindex [::scan [dict get $z dstHours] %d] 0]
+	set dstHours [lindex [::scan [dict get $z dstHours] %d] 0] 
 	if { [dict get $z dstMinutes] ne {} } {
-	    set dstMinutes [lindex [::scan [dict get $z dstMinutes] %d] 0]
+	    set dstMinutes [lindex [::scan [dict get $z dstMinutes] %d] 0] 
 	} else {
 	    set dstMinutes 0
 	}
 	if { [dict get $z dstSeconds] ne {} } {
-	    set dstSeconds [lindex [::scan [dict get $z dstSeconds] %d] 0]
+	    set dstSeconds [lindex [::scan [dict get $z dstSeconds] %d] 0] 
 	} else {
 	    set dstSeconds 0
 	}
-	set dstOffset [expr {
-	    (($dstHours*60 + $dstMinutes) * 60 + $dstSeconds) * $dstSignum
-	}]
+	set dstOffset [expr { ( ( $dstHours * 60 + $dstMinutes )
+				* 60 + $dstSeconds )
+			      * $dstSignum }]
     }
 
     # Fill in defaults for European or US DST rules
@@ -3813,10 +3870,8 @@ proc ::tcl::clock::ProcessPosixTimeZone { z } {
     # US end time is the first Sunday in November.
     # EU end time is the last Sunday in October
 
-    if {
-	[dict get $z startDayOfYear] eq {}
-	&& [dict get $z startMonth] eq {}
-    } then {
+    if { [dict get $z startDayOfYear] eq {} 
+	 && [dict get $z startMonth] eq {} } {
 	if {($stdSignum * $stdHours>=0) && ($stdSignum * $stdHours<=12)} {
 	    # EU
 	    dict set z startWeekOfMonth 5
@@ -3835,10 +3890,8 @@ proc ::tcl::clock::ProcessPosixTimeZone { z } {
 	dict set z startMinutes 0
 	dict set z startSeconds 0
     }
-    if {
-	[dict get $z endDayOfYear] eq {}
-	&& [dict get $z endMonth] eq {}
-    } then {
+    if { [dict get $z endDayOfYear] eq {} 
+	 && [dict get $z endMonth] eq {} } {
 	if {($stdSignum * $stdHours>=0) && ($stdSignum * $stdHours<=12)} {
 	    # EU
 	    dict set z endMonth 10
@@ -3878,14 +3931,15 @@ proc ::tcl::clock::ProcessPosixTimeZone { z } {
     }
 
     return $data
-}
+    
+}    
 
 #----------------------------------------------------------------------
 #
 # DeterminePosixDSTTime --
 #
-#	Determines the time that Daylight Saving Time starts or ends from a
-#	Posix time zone specification.
+#	Determines the time that Daylight Saving Time starts or ends
+#	from a Posix time zone specification.
 #
 # Parameters:
 #	z - Time zone data returned from ParsePosixTimeZone.
@@ -3895,12 +3949,13 @@ proc ::tcl::clock::ProcessPosixTimeZone { z } {
 #	y - The year for which the transition time is to be determined.
 #
 # Results:
-#	Returns the transition time as a count of seconds from the epoch.  The
-#	time is relative to the wall clock, not UTC.
+#	Returns the transition time as a count of seconds from
+#	the epoch.  The time is relative to the wall clock, not UTC.
 #
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::DeterminePosixDSTTime { z bound y } {
+
     variable FEB_28
 
     # Determine the start or end day of DST
@@ -3908,16 +3963,18 @@ proc ::tcl::clock::DeterminePosixDSTTime { z bound y } {
     set date [dict create era CE year $y]
     set doy [dict get $z ${bound}DayOfYear]
     if { $doy ne {} } {
+
 	# Time was specified as a day of the year
 
 	if { [dict get $z ${bound}J] ne {}
-	     && [IsGregorianLeapYear $y]
+	     && [IsGregorianLeapYear $y] 
 	     && ( $doy > $FEB_28 ) } {
 	    incr doy
 	}
 	dict set date dayOfYear $doy
 	set date [GetJulianDayFromEraYearDay $date[set date {}] 2361222]
     } else {
+
 	# Time was specified as a day of the week within a month
 
 	dict set date month [dict get $z ${bound}Month]
@@ -3932,9 +3989,8 @@ proc ::tcl::clock::DeterminePosixDSTTime { z bound y } {
     }
 
     set jd [dict get $date julianDay]
-    set seconds [expr {
-	wide($jd) * wide(86400) - wide(210866803200)
-    }]
+    set seconds [expr { wide($jd) * wide(86400)
+			- wide(210866803200) }]
 
     set h [dict get $z ${bound}Hours]
     if { $h eq {} } {
@@ -3956,6 +4012,7 @@ proc ::tcl::clock::DeterminePosixDSTTime { z bound y } {
     }
     set tod [expr { ( $h * 60 + $m ) * 60 + $s }]
     return [expr { $seconds + $tod }]
+
 }
 
 #----------------------------------------------------------------------
@@ -3973,26 +4030,26 @@ proc ::tcl::clock::DeterminePosixDSTTime { z bound y } {
 #	         for the target locale.
 #
 # Results:
-#	Returns the dictionary, augmented with the keys, 'localeEra' and
-#	'localeYear'.
+#	Returns the dictionary, augmented with the keys, 'localeEra'
+#	and 'localeYear'.
 #
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::GetLocaleEra { date etable } {
+
     set index [BSearch $etable [dict get $date localSeconds]]
     if { $index < 0} {
 	dict set date localeEra \
 	    [::format %02d [expr { [dict get $date year] / 100 }]]
-	dict set date localeYear [expr {
-	    [dict get $date year] % 100
-	}]
+	dict set date localeYear \
+	    [expr { [dict get $date year] % 100 }]
     } else {
 	dict set date localeEra [lindex $etable $index 1]
-	dict set date localeYear [expr {
-	    [dict get $date year] - [lindex $etable $index 2]
-	}]
+	dict set date localeYear [expr { [dict get $date year] 
+					 - [lindex $etable $index 2] }]
     }
     return $date
+
 }
 
 #----------------------------------------------------------------------
@@ -4010,9 +4067,10 @@ proc ::tcl::clock::GetLocaleEra { date etable } {
 #		adopted in the current locale.
 #
 # Results:
-#	Returns the given dictionary augmented with a 'julianDay' key whose
-#	value is the desired Julian Day Number, and a 'gregorian' key that
-#	specifies whether the calendar is Gregorian (1) or Julian (0).
+#	Returns the given dictionary augmented with a 'julianDay' key
+#	whose value is the desired Julian Day Number, and a 'gregorian'
+#	key that specifies whether the calendar is Gregorian (1) or
+#	Julian (0).
 #
 # Side effects:
 #	None.
@@ -4023,6 +4081,7 @@ proc ::tcl::clock::GetLocaleEra { date etable } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::GetJulianDayFromEraYearDay {date changeover} {
+
     # Get absolute year number from the civil year
 
     switch -exact -- [dict get $date era] {
@@ -4038,25 +4097,21 @@ proc ::tcl::clock::GetJulianDayFromEraYearDay {date changeover} {
     # Try the Gregorian calendar first.
 
     dict set date gregorian 1
-    set jd [expr {
-	1721425
-	+ [dict get $date dayOfYear]
-	+ ( 365 * $ym1 )
-	+ ( $ym1 / 4 )
-	- ( $ym1 / 100 )
-	+ ( $ym1 / 400 )
-    }]
-
+    set jd [expr { 1721425
+		   + [dict get $date dayOfYear]
+		   + ( 365 * $ym1 )
+		   + ( $ym1 / 4 )
+		   - ( $ym1 / 100 )
+		   + ( $ym1 / 400 ) }]
+    
     # If the date is before the Gregorian change, use the Julian calendar.
 
     if { $jd < $changeover } {
 	dict set date gregorian 0
-	set jd [expr {
-	    1721423
-	    + [dict get $date dayOfYear]
-	    + ( 365 * $ym1 )
-	    + ( $ym1 / 4 )
-	}]
+	set jd [expr { 1721423
+		       + [dict get $date dayOfYear]
+		       + ( 365 * $ym1 )
+		       + ( $ym1 / 4 ) }]
     }
 
     dict set date julianDay $jd
@@ -4067,8 +4122,8 @@ proc ::tcl::clock::GetJulianDayFromEraYearDay {date changeover} {
 #
 # GetJulianDayFromEraYearMonthWeekDay --
 #
-#	Determines the Julian Day number corresponding to the nth given
-#	day-of-the-week in a given month.
+#	Determines the Julian Day number corresponding to the nth
+#	given day-of-the-week in a given month.
 #
 # Parameters:
 #	date - Dictionary containing the keys, 'era', 'year', 'month'
@@ -4087,9 +4142,10 @@ proc ::tcl::clock::GetJulianDayFromEraYearDay {date changeover} {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::GetJulianDayFromEraYearMonthWeekDay {date changeover} {
-    # Come up with a reference day; either the zeroeth day of the given month
-    # (dayOfWeekInMonth >= 0) or the seventh day of the following month
-    # (dayOfWeekInMonth < 0)
+
+    # Come up with a reference day; either the zeroeth day of the
+    # given month (dayOfWeekInMonth >= 0) or the seventh day of the
+    # following month (dayOfWeekInMonth < 0)
 
     set date2 $date
     set week [dict get $date dayOfWeekInMonth]
@@ -4105,6 +4161,7 @@ proc ::tcl::clock::GetJulianDayFromEraYearMonthWeekDay {date changeover} {
 		 [dict get $date2 julianDay]]
     dict set date julianDay [expr { $wd0 + 7 * $week }]
     return $date
+
 }
 
 #----------------------------------------------------------------------
@@ -4127,8 +4184,9 @@ proc ::tcl::clock::GetJulianDayFromEraYearMonthWeekDay {date changeover} {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::IsGregorianLeapYear { date } {
+
     switch -exact -- [dict get $date era] {
-	BCE {
+	BCE { 
 	    set year [expr { 1 - [dict get $date year]}]
 	}
 	CE {
@@ -4146,14 +4204,15 @@ proc ::tcl::clock::IsGregorianLeapYear { date } {
     } else {
 	return 1
     }
+
 }
 
 #----------------------------------------------------------------------
 #
 # WeekdayOnOrBefore --
 #
-#	Determine the nearest day of week (given by the 'weekday' parameter,
-#	Sunday==0) on or before a given Julian Day.
+#	Determine the nearest day of week (given by the 'weekday'
+#	parameter, Sunday==0) on or before a given Julian Day.
 #
 # Parameters:
 #	weekday -- Day of the week
@@ -4168,16 +4227,18 @@ proc ::tcl::clock::IsGregorianLeapYear { date } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::WeekdayOnOrBefore { weekday j } {
+
     set k [expr { ( $weekday + 6 )  % 7 }]
     return [expr { $j - ( $j - $k ) % 7 }]
+
 }
 
 #----------------------------------------------------------------------
 #
 # BSearch --
 #
-#	Service procedure that does binary search in several places inside the
-#	'clock' command.
+#	Service procedure that does binary search in several places
+#	inside the 'clock' command.
 #
 # Parameters:
 #	list - List of lists, sorted in ascending order by the
@@ -4185,8 +4246,8 @@ proc ::tcl::clock::WeekdayOnOrBefore { weekday j } {
 #	key - Value to search for
 #
 # Results:
-#	Returns the index of the greatest element in $list that is less than
-#	or equal to $key.
+#	Returns the index of the greatest element in $list that is less
+#	than or equal to $key.
 #
 # Side effects:
 #	None.
@@ -4194,6 +4255,7 @@ proc ::tcl::clock::WeekdayOnOrBefore { weekday j } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::BSearch { list key } {
+
     if {[llength $list] == 0} {
 	return -1
     }
@@ -4205,12 +4267,13 @@ proc ::tcl::clock::BSearch { list key } {
     set u [expr { [llength $list] - 1 }]
 
     while { $l < $u } {
+
 	# At this point, we know that
 	#   $k >= [lindex $list $l 0]
 	#   Either $u == [llength $list] or else $k < [lindex $list $u+1 0]
 	# We find the midpoint of the interval {l,u} rounded UP, compare
-	# against it, and set l or u to maintain the invariant.  Note that the
-	# interval shrinks at each step, guaranteeing convergence.
+	# against it, and set l or u to maintain the invariant.  Note
+	# that the interval shrinks at each step, guaranteeing convergence.
 
 	set m [expr { ( $l + $u + 1 ) / 2 }]
 	if { $key >= [lindex $list $m 0] } {
@@ -4254,14 +4317,15 @@ proc ::tcl::clock::BSearch { list key } {
 #	order.
 #
 # Notes:
-#	It is possible that adding a number of months or years will adjust the
-#	day of the month as well.  For instance, the time at one month after
-#	31 January is either 28 or 29 February, because February has fewer
-#	than 31 days.
+#	It is possible that adding a number of months or years will adjust
+#	the day of the month as well.  For instance, the time at
+#	one month after 31 January is either 28 or 29 February, because
+#	February has fewer than 31 days.
 #
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::add { clockval args } {
+
     if { [llength $args] % 2 != 0 } {
 	set cmdName "clock add"
 	return -code error \
@@ -4280,10 +4344,15 @@ proc ::tcl::clock::add { clockval args } {
     set timezone [GetSystemTimeZone]
 
     foreach { a b } $args {
+
 	if { [string is integer -strict $a] } {
+
 	    lappend offsets $a $b
+
 	} else {
+
 	    switch -exact -- $a {
+
 		-g - -gm - -gmt {
 		    set gmt $b
 		}
@@ -4295,7 +4364,8 @@ proc ::tcl::clock::add { clockval args } {
 		    set timezone $b
 		}
 		default {
-		    throw [list CLOCK badSwitch $a] \
+		    return -code error \
+			-errorcode [list CLOCK badSwitch $a] \
 			"bad switch \"$a\",\
                          must be -gmt, -locale or -timezone"
 		}
@@ -4311,16 +4381,20 @@ proc ::tcl::clock::add { clockval args } {
 	    "cannot use -gmt and -timezone in same call"
     }
     if { [catch { expr { wide($clockval) } } result] } {
-	return -code error "expected integer but got \"$clockval\""
+	return -code error \
+	    "expected integer but got \"$clockval\"" 
     }
-    if { ![string is boolean -strict $gmt] } {
-	return -code error "expected boolean value but got \"$gmt\""
-    } elseif { $gmt } {
-	set timezone :GMT
+    if { ![string is boolean $gmt] } {
+	return -code error \
+	    "expected boolean value but got \"$gmt\""
+    } else {
+	if { $gmt } {
+	    set timezone :GMT
+	}
     }
 
-    EnterLocale $locale oldLocale
-
+    EnterLocale $locale
+    
     set changeover [mc GREGORIAN_CHANGE_DATE]
 
     if {[catch {SetupTimeZone $timezone} retval opts]} {
@@ -4328,25 +4402,29 @@ proc ::tcl::clock::add { clockval args } {
 	return -options $opts $retval
     }
 
-    try {
+    set status [catch {
+
 	foreach { quantity unit } $offsets {
+
 	    switch -exact -- $unit {
+
 		years - year {
-		    set clockval [AddMonths [expr { 12 * $quantity }] \
-			    $clockval $timezone $changeover]
+		    set clockval \
+			[AddMonths [expr { 12 * $quantity }] \
+			     $clockval $timezone $changeover]
 		}
 		months - month {
 		    set clockval [AddMonths $quantity $clockval $timezone \
-			    $changeover]
+				     $changeover]
 		}
 
 		weeks - week {
 		    set clockval [AddDays [expr { 7 * $quantity }] \
-			    $clockval $timezone $changeover]
+				      $clockval $timezone $changeover]
 		}
 		days - day {
 		    set clockval [AddDays $quantity $clockval $timezone \
-			    $changeover]
+				      $changeover]
 		}
 
 		hours - hour {
@@ -4360,24 +4438,27 @@ proc ::tcl::clock::add { clockval args } {
 		}
 
 		default {
-		    throw [list CLOCK badUnit $unit] \
-			"unknown unit \"$unit\", must be \
-                        years, months, weeks, days, hours, minutes or seconds"
+		    error "unknown unit \"$unit\", must be \
+                        years, months, weeks, days, hours, minutes or seconds" \
+			  "unknown unit \"$unit\", must be \
+                        years, months, weeks, days, hours, minutes or seconds" \
+			[list CLOCK badUnit $unit]
 		}
 	    }
 	}
-	return $clockval
-    } trap CLOCK {result opts} {
-	# Conceal the innards of [clock] when it's an expected error
-	dict unset opts -errorinfo
-	return -options $opts $result
-    } finally {
-	# Restore the locale
+    } result opts]
+
+    # Restore the locale
 
-	if { [info exists oldLocale] } {
-	    mclocale $oldLocale
+    if { $status == 1 } {
+	if { [lindex [dict get $opts -errorcode] 0] eq {CLOCK} } {
+	    dict unset opts -errorinfo
 	}
+	return -options $opts $result
+    } else {
+	return $clockval
     }
+
 }
 
 #----------------------------------------------------------------------
@@ -4402,6 +4483,7 @@ proc ::tcl::clock::add { clockval args } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::AddMonths { months clockval timezone changeover } {
+
     variable DaysInRomanMonthInCommonYear
     variable DaysInRomanMonthInLeapYear
     variable TZData
@@ -4409,9 +4491,8 @@ proc ::tcl::clock::AddMonths { months clockval timezone changeover } {
     # Convert the time to year, month, day, and fraction of day.
 
     set date [GetDateFields $clockval $TZData($timezone) $changeover]
-    dict set date secondOfDay [expr {
-	[dict get $date localSeconds] % 86400
-    }]
+    dict set date secondOfDay [expr { [dict get $date localSeconds]
+				      % 86400 }]
     dict set date tzName $timezone
 
     # Add the requisite number of months
@@ -4440,23 +4521,23 @@ proc ::tcl::clock::AddMonths { months clockval timezone changeover } {
     set date [GetJulianDayFromEraYearMonthDay \
 		  $date[set date {}]\
 		  $changeover]
-    dict set date localSeconds [expr {
-	-210866803200
-	+ ( 86400 * wide([dict get $date julianDay]) )
-	+ [dict get $date secondOfDay]
-    }]
+    dict set date localSeconds \
+	[expr { -210866803200
+		+ ( 86400 * wide([dict get $date julianDay]) )
+		+ [dict get $date secondOfDay] }]
     set date [ConvertLocalToUTC $date[set date {}] $TZData($timezone) \
 		 $changeover]
 
     return [dict get $date seconds]
+
 }
 
 #----------------------------------------------------------------------
 #
 # AddDays --
 #
-#	Add a given number of days to a given clock value in a given time
-#	zone.
+#	Add a given number of days to a given clock value in a given
+#	time zone.
 #
 # Parameters:
 #	days - Number of days to add (may be negative)
@@ -4466,7 +4547,8 @@ proc ::tcl::clock::AddMonths { months clockval timezone changeover } {
 #		     in the target locale.
 #
 # Results:
-#	Returns the new clock value as a number of seconds since the epoch.
+#	Returns the new clock value as a number of seconds since
+#	the epoch.
 #
 # Side effects:
 #	None.
@@ -4474,14 +4556,14 @@ proc ::tcl::clock::AddMonths { months clockval timezone changeover } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::AddDays { days clockval timezone changeover } {
+
     variable TZData
 
     # Convert the time to Julian Day
 
     set date [GetDateFields $clockval $TZData($timezone) $changeover]
-    dict set date secondOfDay [expr {
-	[dict get $date localSeconds] % 86400
-    }]
+    dict set date secondOfDay [expr { [dict get $date localSeconds]
+				      % 86400 }]
     dict set date tzName $timezone
 
     # Add the requisite number of days
@@ -4490,47 +4572,15 @@ proc ::tcl::clock::AddDays { days clockval timezone changeover } {
 
     # Reconvert to a number of seconds
 
-    dict set date localSeconds [expr {
-	-210866803200
-	+ ( 86400 * wide([dict get $date julianDay]) )
-	+ [dict get $date secondOfDay]
-    }]
+    dict set date localSeconds \
+	[expr { -210866803200
+		+ ( 86400 * wide([dict get $date julianDay]) )
+		+ [dict get $date secondOfDay] }]
     set date [ConvertLocalToUTC $date[set date {}] $TZData($timezone) \
 		  $changeover]
 
     return [dict get $date seconds]
-}
-
-#----------------------------------------------------------------------
-#
-# mc --
-#
-#	Wrapper around ::msgcat::mc that caches the result according to the
-#	locale.
-#
-# Parameters:
-#	Accepts the name of the message to retrieve.
-#
-# Results:
-#	Returns the message text.
-#
-# Side effects:
-#	Caches the message text.
-#
-# Notes:
-#	Only the single-argument version of [mc] is supported.
-#
-#----------------------------------------------------------------------
 
-proc ::tcl::clock::mc { name } {
-    variable McLoaded
-    set Locale [mclocale]
-    if { [dict exists $McLoaded $Locale $name] } {
-	return [dict get $McLoaded $Locale $name]
-    }
-    set val [::msgcat::mc $name]
-    dict set McLoaded $Locale $name $val
-    return $val
 }
 
 #----------------------------------------------------------------------
@@ -4551,9 +4601,9 @@ proc ::tcl::clock::mc { name } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::ClearCaches {} {
+
     variable FormatProc
     variable LocaleNumeralCache
-    variable McLoaded
     variable CachedSystemTimeZone
     variable TimeZoneBad
 
@@ -4566,8 +4616,11 @@ proc ::tcl::clock::ClearCaches {} {
 
     catch {unset FormatProc}
     set LocaleNumeralCache {}
-    set McLoaded {}
+    # this removes many required keys and makes the module unusable
+    mcpackagelocale set ""
+    mcpackagelocale clear
     catch {unset CachedSystemTimeZone}
     set TimeZoneBad {}
     InitTZData
+
 }
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index c35803f..92fb7f7 100644
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -202,29 +202,27 @@ proc msgcat::mc {src args} {
 
     variable Msgs
     variable Loclist
-    variable PackageConfig
 
     set ns [uplevel 1 [list ::namespace current]]
     set loclist [PackagePreferences $ns]
 
-    while {$ns != ""} {
+    set nscur $ns
+    while {$nscur != ""} {
 	foreach loc $loclist {
-	    if {[dict exists $Msgs $ns $loc $src]} {
-		if {[llength $args] == 0} {
-		    return [dict get $Msgs $ns $loc $src]
-		} else {
-		    return [format [dict get $Msgs $ns $loc $src] {*}$args]
-		}
+	    if {[dict exists $Msgs $nscur $loc $src]} {
+		return [DefaultUnknown "" [dict get $Msgs $nscur $loc $src]\
+			{*}$args]
 	    }
 	}
-	set ns [namespace parent $ns]
+	set nscur [namespace parent $nscur]
     }
     # call package local or default unknown command
     set args [linsert $args 0 [lindex $loclist 0] $src]
-    if {[Invoke unknowncmd $args $ns result]} {
-	return $result
+    switch -exact -- [Invoke unknowncmd $args $ns result] {
+	0 { return [uplevel 1 [linsert $args 0 [namespace origin mcunknown]]] }
+	1 { return [DefaultUnknown {*}$args] }
+	default { return $result }
     }
-    return [uplevel 1 [linsert $args 0 [namespace origin mcunknown]]]
 }
 
 # msgcat::mcexists --
@@ -423,8 +421,8 @@ proc msgcat::mcloadedlocales {subcommand} {
 #	    Returns true, if a package locale is set
 #	unset
 #	    Unset the package locale and activate the default locale.
-#	    This may clear message catalog data and may load message catalog
-#	    files
+#	    This loads message catalog file which where missing in the package
+#	    locale.
 #	preferences
 #	    Return locale preference list valid for the package.
 #	loaded
@@ -518,18 +516,13 @@ proc msgcat::mcpackagelocale {subcommand {locale ""}} {
 	    if { ![dict exists $PackageConfig loclist $ns] } { return }
 	    
 	    # unset package locale
-	    set loadedlocales [dict get $PackageConfig loadedlocales $ns]
+	    set loadLocales [ListComplement\
+		    [dict get $PackageConfig loadedlocales $ns] $LoadedLocales]
 	    dict unset PackageConfig loadedlocales $ns
 	    dict unset PackageConfig loclist $ns
 
-	    # Remove unwanted locales
-	    foreach locale [dict keys [dict get $Msgs $ns]] {
-		if { $locale ni $LoadedLocales } {
-		    dict unset Msgs $ns $locale
-		}
-	    }
 	    # Add missing locales
-	    Load $ns [ListComplement $loadedlocales $LoadedLocales]
+	    Load $ns $loadLocales
 	}
 	default {
 	    return -code error "unknown subcommand \"$subcommand\": must be\
@@ -598,6 +591,9 @@ proc msgcat::mcforgetpackage {} {
 #	unknowncmd
 #	    Use a package locale mcunknown procedure instead the global one.
 #	    The appended arguments are identical to mcunknown.
+#	    A default unknown handler is used if set to the empty string.
+#	    This consists in returning the key if no arguments are given.
+#	    With given arguments, format is used to process the arguments.
 #
 # Arguments:
 #	subcommand		Operation on the package
@@ -855,7 +851,11 @@ proc msgcat::Load {ns locales {callbackonly 0}} {
 #			callback to. May be set to "" to discard the result.
 #
 # Results:
-#	Returns true if at least one command was called
+#	Possible values:
+#	- 0: no valid command registered
+#	- 1: registered command was the empty string
+#	- 2: registered command called, resultname is set
+#	If multiple commands are called, the maximum of all results is returned.
 
 proc msgcat::Invoke {index arglist {ns ""} {resultname ""}} {
     variable PackageConfig
@@ -868,15 +868,19 @@ proc msgcat::Invoke {index arglist {ns ""} {resultname ""}} {
     } else {
 	set packageList [list $ns]
     }
-    set called 0
+    set ret 0
     foreach ns $packageList {
 	if {[dict exists $PackageConfig $index $ns] && [namespace exists $ns]} {
-	    set result [namespace inscope $ns\
-		    [dict get $PackageConfig $index $ns] {*}$arglist]
-	    set called 1
+	    set cmd [dict get $PackageConfig $index $ns]
+	    if {"" eq $cmd} {
+		if {$ret == 0} {set ret 1}
+	    } else {
+		set result [namespace inscope $ns $cmd {*}$arglist]
+		set ret 2
+	    }
 	}
     }
-    return $called
+    return $ret
 }
 
 # msgcat::mcset --
@@ -983,7 +987,8 @@ proc msgcat::mcflmset {pairs} {
 # msgcat::mcunknown --
 #
 #	This routine is called by msgcat::mc if a translation cannot
-#	be found for a string.  This routine is intended to be replaced
+#	be found for a string and no unknowncmd is set for the current
+#	package. This routine is intended to be replaced
 #	by an application specific routine for error reporting
 #	purposes.  The default behavior is to return the source string.
 #	If additional args are specified, the format command will be used
@@ -997,7 +1002,30 @@ proc msgcat::mcflmset {pairs} {
 # Results:
 #	Returns the translated value.
 
-proc msgcat::mcunknown {locale src args} {
+proc msgcat::mcunknown {args} {
+    return [uplevel 1 [list [namespace origin DefaultUnknown] {*}$args]]
+}
+
+# msgcat::DefaultUnknown --
+#
+#	This routine is called by msgcat::mc if a translation cannot
+#	be found for a string in the following circumstances:
+#	- Default global handler, if mcunknown is not redefined.
+#	- Per package handler, if the package sets unknowncmd to the empty
+#	  string.
+#	It returna the source string if the argument list is empty.
+#	If additional args are specified, the format command will be used
+#	to work them into the traslated string.
+#
+# Arguments:
+#	locale		(unused) The current locale.
+#	src		The string to be translated.
+#	args		Args to pass to the format command
+#
+# Results:
+#	Returns the translated value.
+
+proc msgcat::DefaultUnknown {locale src args} {
     if {[llength $args]} {
 	return [format $src {*}$args]
     } else {
-- 
cgit v0.12


From 8f43773d556745dc81ae85fbd68564eb44fd3e24 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Sun, 31 May 2015 19:03:56 +0000
Subject: clock.tcl modified that all clock tests pass

---
 library/clock.tcl | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/library/clock.tcl b/library/clock.tcl
index 982395a..e995bd1 100755
--- a/library/clock.tcl
+++ b/library/clock.tcl
@@ -58,6 +58,8 @@ namespace eval ::tcl::clock {
 
     # Import the message catalog commands that we use.
 
+    namespace import ::msgcat::mcload
+    namespace import ::msgcat::mclocale
     namespace import ::msgcat::mc
     namespace import ::msgcat::mcpackagelocale
 
@@ -1269,7 +1271,6 @@ proc ::tcl::clock::scan { args } {
 	return [$scanner $string $base $timezone]
     } trap CLOCK {result opts} {
 	# Conceal location of generation of expected errors
-
 	dict unset opts -errorinfo
 	return -options $opts $result
     }
@@ -2291,16 +2292,12 @@ proc ::tcl::clock::MakeParseCodeFromFields { dateFields parseActions } {
 #
 # Parameters:
 #	locale -- Desired locale
-#	oldLocaleVar -- Name of a variable in caller's scope that
-#		        tracks the previous locale name.
 #
 # Results:
 #	Returns the locale that was previously current.
 #
 # Side effects:
-#	Does [mclocale].  If necessary, uses [mcload] to load the designated
-#	locale's files, and tracks that it has done so in the 'McLoaded'
-#	variable.
+#	Does [mclocale].  If necessary, loades the designated locale's files.
 #
 #----------------------------------------------------------------------
 
@@ -2317,7 +2314,7 @@ proc ::tcl::clock::EnterLocale { locale } {
 	    # Control Panel.  First, load the 'current' locale if it's not yet
 	    # loaded
 
-	    mcpackagelocale [mclocale]
+	    mcpackagelocale set [mclocale]
 
 	    # Make a new locale string for the system locale, and get the
 	    # Control Panel information
@@ -2512,7 +2509,7 @@ proc ::tcl::clock::LocalizeFormat { locale format } {
     lappend list %Ec [string map $list [mc LOCALE_DATE_TIME_FORMAT]]
     set format [string map $list $format]
 
-    mcset $locale $key $format
+    ::msgcat::mcset $locale $key $format
     return $format
 }
 
@@ -4375,7 +4372,6 @@ proc ::tcl::clock::add { clockval args } {
 #----------------------------------------------------------------------
 
 proc ::tcl::clock::AddMonths { months clockval timezone changeover } {
-
     variable DaysInRomanMonthInCommonYear
     variable DaysInRomanMonthInLeapYear
     variable TZData
@@ -4509,9 +4505,6 @@ proc ::tcl::clock::ClearCaches {} {
 
     catch {unset FormatProc}
     set LocaleNumeralCache {}
-    # this removes many required keys and makes the module unusable
-    mcpackagelocale set ""
-    mcpackagelocale clear
     catch {unset CachedSystemTimeZone}
     set TimeZoneBad {}
     InitTZData
-- 
cgit v0.12


From 6f959222be89d77b961b390be662e050645c2fa3 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Mon, 1 Jun 2015 15:16:58 +0000
Subject: Make all msgcat tests pass

---
 library/msgcat/msgcat.tcl |  2 +-
 tests/msgcat.test         | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 tests/msgcat.test

diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index b217634..228ac97 100755
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -435,7 +435,7 @@ proc msgcat::mcloadedlocales {subcommand} {
 #	default data, if no package locale is set.
 #
 # Arguments:
-#	subcommand		One of get, init, present, add or remove
+#	subcommand		see list above
 #	locale			package locale (only set subcommand)
 #
 # Results:
diff --git a/tests/msgcat.test b/tests/msgcat.test
old mode 100644
new mode 100755
index 050b592..8fd94e1
--- a/tests/msgcat.test
+++ b/tests/msgcat.test
@@ -17,8 +17,8 @@ if {[catch {package require tcltest 2}]} {
     puts stderr "Skipping tests in [info script].  tcltest 2 required."
     return
 }
-if {[catch {package require msgcat 1.5}]} {
-    puts stderr "Skipping tests in [info script].  No msgcat 1.5 found to test."
+if {[catch {package require msgcat 1.6}]} {
+    puts stderr "Skipping tests in [info script].  No msgcat 1.6 found to test."
     return
 }
 
@@ -412,9 +412,14 @@ namespace eval ::msgcat::test {
     foreach loc {foo foo_BAR foo_BAR_baz} {
 	test msgcat-5.$count {mcload} -setup {
 	    variable locale [mclocale]
+	    ::msgcat::mclocale ""
+	    ::msgcat::mcloadedlocales clear
+	    ::msgcat::mcpackageconfig unset mcfolder 
 	    mclocale $loc
 	} -cleanup {
 	    mclocale $locale
+	    ::msgcat::mcloadedlocales clear
+	    ::msgcat::mcpackageconfig unset mcfolder 
 	} -body {
 	    mcload $msgdir
 	} -result [expr { $count+1 }]
@@ -428,6 +433,8 @@ namespace eval ::msgcat::test {
 	    mclocale foo_BAR_notexist
 	} -cleanup {
 	    mclocale $locale
+	    ::msgcat::mcloadedlocales clear
+	    ::msgcat::mcpackageconfig unset mcfolder 
 	} -body {
 	    mcload $msgdir
 	} -result 3
@@ -437,6 +444,8 @@ namespace eval ::msgcat::test {
 	    mclocale no_FI_notexist
 	} -cleanup {
 	    mclocale $locale
+	    ::msgcat::mcloadedlocales clear
+	    ::msgcat::mcpackageconfig unset mcfolder 
 	} -body {
 	    mcload $msgdir
 	} -result 1
-- 
cgit v0.12


From c793ae92e4644ee89193f422a81cb49b75330b92 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 23 Jun 2015 13:04:09 +0000
Subject: If the file system changes when "cwd" changes, force a filesystem
 refresh on path objects. Needed for AndroWish/TclKit (???) in obscure
 situations, harmless on systems which only have a single native filesystem.

---
 generic/tclIOUtil.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index d2919fc..06e1b32 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -2890,9 +2890,13 @@ int
 Tcl_FSChdir(
     Tcl_Obj *pathPtr)
 {
-    const Tcl_Filesystem *fsPtr;
+    const Tcl_Filesystem *fsPtr, *oldFsPtr = NULL;
+    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&fsDataKey);
     int retVal = -1;
 
+    if (tsdPtr->cwdPathPtr != NULL) {
+	oldFsPtr = Tcl_FSGetFileSystemForPath(tsdPtr->cwdPathPtr);
+    }
     if (Tcl_FSGetNormalizedPath(NULL, pathPtr) == NULL) {
 	Tcl_SetErrno(ENOENT);
 	return retVal;
@@ -2992,7 +2996,6 @@ Tcl_FSChdir(
 	     * instead. This should be examined by someone on Unix.
 	     */
 
-	    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&fsDataKey);
 	    ClientData cd;
 	    ClientData oldcd = tsdPtr->cwdClientData;
 
@@ -3009,6 +3012,14 @@ Tcl_FSChdir(
 	} else {
 	    FsUpdateCwd(normDirName, NULL);
 	}
+
+	/*
+	 * If the filesystem changed between old and new cwd
+	 * force filesystem refresh on path objects.
+	 */
+	if (oldFsPtr != NULL && fsPtr != oldFsPtr) {
+	    Tcl_FSMountsChanged(NULL);
+	}
     }
 
     return retVal;
@@ -3150,7 +3161,7 @@ TclSkipUnlink (Tcl_Obj* shlibFile)
      *
      * Ad 2: This variable can disable/override the AUFS detection, i.e. for
      * testing if a newer AUFS does not have the bug any more.
-     * 
+     *
      * Ad 3: This is conditionally compiled in. Condition currently must be set manually.
      *       This part needs proper tests in the configure(.in).
      */
@@ -3460,7 +3471,7 @@ Tcl_LoadFile(
     return retVal;
 
   resolveSymbols:
-    /* 
+    /*
      * At this point, *handlePtr is already set up to the handle for the
      * loaded library. We now try to resolve the symbols.
      */
@@ -3469,7 +3480,7 @@ Tcl_LoadFile(
 	for (i=0 ; symbols[i] != NULL; i++) {
 	    procPtrs[i] = Tcl_FindSymbol(interp, *handlePtr, symbols[i]);
 	    if (procPtrs[i] == NULL) {
-		/* 
+		/*
 		 * At least one symbol in the list was not found.  Unload the
 		 * file, and report the problem back to the caller.
 		 * (Tcl_FindSymbol should already have left an appropriate
@@ -3489,7 +3500,7 @@ Tcl_LoadFile(
  *----------------------------------------------------------------------
  *
  * DivertFindSymbol --
- *	
+ *
  *	Find a symbol in a shared library loaded by copy-from-VFS.
  *
  *----------------------------------------------------------------------
-- 
cgit v0.12


From fde157fe110c3d91ac52522c38683329a33f70b9 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 23 Jun 2015 19:58:38 +0000
Subject: Member field which should not have been CONST, because it is
 dynamically allocated

---
 generic/tclIO.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclIO.h b/generic/tclIO.h
index b4a5405..20e0ccd 100644
--- a/generic/tclIO.h
+++ b/generic/tclIO.h
@@ -126,7 +126,7 @@ typedef struct Channel {
  */
 
 typedef struct ChannelState {
-    CONST char *channelName;	/* The name of the channel instance in Tcl
+    char *channelName;	/* The name of the channel instance in Tcl
 				 * commands. Storage is owned by the generic
 				 * IO code, is dynamically allocated. */
     int	flags;			/* ORed combination of the flags defined
-- 
cgit v0.12


From 71ef3ba08253f4e24d21ad290a5346b7580bf1aa Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 23 Jun 2015 21:47:41 +0000
Subject: Registry extension 1.3.0 -> 1.3.1: SendMessageTimeoutA ->
 SendMessageTimeout, so make sure only win32 UNICODE API is used.

---
 library/reg/pkgIndex.tcl |  4 ++--
 tests/registry.test      |  4 ++--
 win/Makefile.in          |  4 ++--
 win/makefile.vc          |  4 ++--
 win/tclWinConsole.c      |  2 +-
 win/tclWinReg.c          | 11 +++++------
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/library/reg/pkgIndex.tcl b/library/reg/pkgIndex.tcl
index 55af4b3..49fd1ac 100755
--- a/library/reg/pkgIndex.tcl
+++ b/library/reg/pkgIndex.tcl
@@ -1,9 +1,9 @@
 if {([info commands ::tcl::pkgconfig] eq "")
 	|| ([info sharedlibextension] ne ".dll")} return
 if {[::tcl::pkgconfig get debug]} {
-    package ifneeded registry 1.3.0 \
+    package ifneeded registry 1.3.1 \
             [list load [file join $dir tclreg13g.dll] registry]
 } else {
-    package ifneeded registry 1.3.0 \
+    package ifneeded registry 1.3.1 \
             [list load [file join $dir tclreg13.dll] registry]
 }
diff --git a/tests/registry.test b/tests/registry.test
index 77588e3..0f78212 100644
--- a/tests/registry.test
+++ b/tests/registry.test
@@ -19,7 +19,7 @@ testConstraint reg 0
 if {[testConstraint win]} {
     if {![catch {
 	    ::tcltest::loadTestedCommands
-	    set ::regver [package require registry 1.3.0]
+	    set ::regver [package require registry 1.3.1]
 	}]} {
 	testConstraint reg 1
     }
@@ -33,7 +33,7 @@ testConstraint english [expr {
 
 test registry-1.0 {check if we are testing the right dll} {win reg} {
     set ::regver
-} {1.3.0}
+} {1.3.1}
 test registry-1.1 {argument parsing for registry command} {win reg} {
     list [catch {registry} msg] $msg
 } {1 {wrong # args: should be "registry ?-32bit|-64bit? option ?arg ...?"}}
diff --git a/win/Makefile.in b/win/Makefile.in
index 168da2e..690d476 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -705,14 +705,14 @@ test-tcl: binaries $(TCLSH) $(CAT32) $(TEST_DLL_FILE)
 	./$(TCLSH) "$(ROOT_DIR_NATIVE)/tests/all.tcl" $(TESTFLAGS) \
 	-load "package ifneeded Tcltest ${VERSION}@TCL_PATCH_LEVEL@ [list load [file normalize ${TEST_DLL_FILE}] Tcltest]; \
 	package ifneeded dde 1.4.0 [list load [file normalize ${DDE_DLL_FILE}] dde]; \
-	package ifneeded registry 1.3.0 [list load [file normalize ${REG_DLL_FILE}] registry]" | ./$(CAT32)
+	package ifneeded registry 1.3.1 [list load [file normalize ${REG_DLL_FILE}] registry]" | ./$(CAT32)
 
 # Useful target to launch a built tclsh with the proper path,...
 runtest: binaries $(TCLSH) $(TEST_DLL_FILE)
 	@TCL_LIBRARY="$(LIBRARY_DIR)"; export TCL_LIBRARY; \
 	./$(TCLSH) $(TESTFLAGS) -load "package ifneeded Tcltest ${VERSION}@TCL_PATCH_LEVEL@ [list load [file normalize ${TEST_DLL_FILE}] Tcltest]; \
 	package ifneeded dde 1.4.0 [list load [file normalize ${DDE_DLL_FILE}] dde]; \
-	package ifneeded registry 1.3.0 [list load [file normalize ${REG_DLL_FILE}] registry]" $(SCRIPT)
+	package ifneeded registry 1.3.1 [list load [file normalize ${REG_DLL_FILE}] registry]" $(SCRIPT)
 
 # This target can be used to run tclsh from the build directory via
 # `make shell SCRIPT=foo.tcl`
diff --git a/win/makefile.vc b/win/makefile.vc
index 8c65bd0..2ae5964 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -582,13 +582,13 @@ test-core: setup $(TCLTEST) dlls $(CAT32)
 !if "$(OS)" == "Windows_NT"  || "$(MSVCDIR)" == "IDE"
 	$(DEBUGGER) $(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile <<
 		package ifneeded dde 1.4.0 [list load "$(TCLDDELIB:\=/)" dde]
-		package ifneeded registry 1.3.0 [list load "$(TCLREGLIB:\=/)" registry]
+		package ifneeded registry 1.3.1 [list load "$(TCLREGLIB:\=/)" registry]
 <<
 !else
 	@echo Please wait while the tests are collected...
 	$(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile << > tests.log
 		package ifneeded dde 1.4.0 "$(TCLDDELIB:\=/)" dde]
-		package ifneeded registry 1.3.0 "$(TCLREGLIB:\=/)" registry]
+		package ifneeded registry 1.3.1 "$(TCLREGLIB:\=/)" registry]
 <<
 	type tests.log | more
 !endif
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index 7380003..ab55035 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -225,7 +225,7 @@ ReadConsoleBytes(
      * success with ntchars == 0 and GetLastError() will be
      * ERROR_OPERATION_ABORTED. We do not want to treat this case
      * as EOF so we will loop around again. If no Ctrl signal handlers
-     * have been established, the default signal OS handler in a separate 
+     * have been established, the default signal OS handler in a separate
      * thread will terminate the program. If a Ctrl signal handler
      * has been established (through an extension for example), it
      * will run and take whatever action it deems appropriate.
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index 327e4a3..4403519 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -172,7 +172,7 @@ Registry_Init(
     cmd = Tcl_CreateObjCommand(interp, "registry", RegistryObjCmd,
 	    interp, DeleteCmd);
     Tcl_SetAssocData(interp, REGISTRY_ASSOC_KEY, NULL, cmd);
-    return Tcl_PkgProvide(interp, "registry", "1.3.0");
+    return Tcl_PkgProvide(interp, "registry", "1.3.1");
 }
 
 /*
@@ -415,7 +415,6 @@ DeleteKey(
     const TCHAR *nativeTail;
     HKEY rootKey, subkey;
     DWORD result;
-    int length;
     Tcl_DString buf;
     REGSAM saveMode = mode;
 
@@ -423,8 +422,8 @@ DeleteKey(
      * Find the parent of the key being deleted and open it.
      */
 
-    keyName = Tcl_GetStringFromObj(keyNameObj, &length);
-    buffer = ckalloc(length + 1);
+    keyName = Tcl_GetString(keyNameObj);
+    buffer = ckalloc(keyNameObj->length + 1);
     strcpy(buffer, keyName);
 
     if (ParseKeyName(interp, buffer, &hostName, &rootKey,
@@ -1408,7 +1407,7 @@ BroadcastValue(
 	}
     }
 
-    str = Tcl_GetStringFromObj(objv[0], &len);
+    str = (char*)Tcl_GetUnicodeFromObj(objv[0], &len);
     if (len == 0) {
 	str = NULL;
     }
@@ -1417,7 +1416,7 @@ BroadcastValue(
      * Use the ignore the result.
      */
 
-    result = SendMessageTimeoutA(HWND_BROADCAST, WM_SETTINGCHANGE,
+    result = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE,
 	    (WPARAM) 0, (LPARAM) str, SMTO_ABORTIFHUNG, timeout, &sendResult);
 
     objPtr = Tcl_NewObj();
-- 
cgit v0.12


From 3ea3c1f2f99b0ca58203368be9c7baeff3f6c5e4 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Wed, 24 Jun 2015 13:55:46 +0000
Subject: Make sure that an input lying precisely 1/2 ULP between two floating
 point values is rounded to even.

---
 generic/tclStrToD.c | 38 ++++++++++++++++++++++++++++++--------
 tests/expr.test     |  8 ++++++++
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index 76adf75..ec5e764 100644
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -1515,7 +1515,7 @@ MakeLowPrecisionDouble(
      * Test for the easy cases.
      */
 
-    if (numSigDigs <= DBL_DIG) {
+    if (numSigDigs <= QUICK_MAX) {
 	if (exponent >= 0) {
 	    if (exponent <= mmaxpow) {
 		/*
@@ -1527,7 +1527,7 @@ MakeLowPrecisionDouble(
 		retval = (double)(Tcl_WideInt)significand * pow10vals[exponent];
 		goto returnValue;
 	    } else {
-		int diff = DBL_DIG - numSigDigs;
+		int diff = QUICK_MAX - numSigDigs;
 		if (exponent-diff <= mmaxpow) {
 		    /*
 		     * 10**exponent is not an exact integer, but
@@ -1779,6 +1779,12 @@ RefineApproximation(
     double quot;		/* Correction term */
     double minincr;		/* Lower bound on the absolute value of the
 				 * correction term. */
+    int roundToEven = 0;	/* Flag == TRUE if we need to invoke
+				 * "round to even" functionality */
+    double rteSignificand;	/* Significand of the round-to-even result */
+    int rteExponent;		/* Exponent of the round-to-even result */
+    Tcl_WideInt rteSigWide;	/* Wide integer version of the significand
+				 * for testing evenness */
     int i;
 
     /*
@@ -1874,17 +1880,33 @@ RefineApproximation(
 	mp_div_2d(&twoMv, -multiplier, &twoMv, NULL);
     }
 
-    /*
-     * If the result is less than unity, the error is less than 1/2 unit in
-     * the last place, so there's no correction to make.
-     */
-
-    if (mp_cmp_mag(&twoMd, &twoMv) == MP_LT) {
+    switch (mp_cmp_mag(&twoMd, &twoMv)) {
+    case MP_LT:
+	/*
+	 * If the result is less than unity, the error is less than 1/2 unit in
+	 * the last place, so there's no correction to make.
+	 */
         mp_clear(&twoMd);
         mp_clear(&twoMv);
 	return approxResult;
+    case MP_EQ:
+	/*
+	 * If the result is exactly unity, we need to round to even.
+	 */
+	roundToEven = 1;
+	break;
+    case MP_GT:
+	break;
     }
 
+    if (roundToEven) {
+	rteSignificand = frexp(approxResult, &rteExponent);
+	rteSigWide = (Tcl_WideInt) ldexp(rteSignificand, FP_PRECISION);
+	if ((rteSigWide & 1) == 0) {
+	    return approxResult;
+	}
+    }	
+
     /*
      * Convert the numerator and denominator of the corrector term accurately
      * to floating point numbers.
diff --git a/tests/expr.test b/tests/expr.test
index 42d0c79..bd5ed8f 100644
--- a/tests/expr.test
+++ b/tests/expr.test
@@ -7165,6 +7165,14 @@ test expr-48.1 {Bug 1770224} {
     expr {-0x8000000000000001 >> 0x8000000000000000}
 } -1
 
+test expr-50.1 {test sqrt() of bignums with non-Inf answer} {
+    expr {sqrt("1[string repeat 0 616]") == 1e308}
+} 1
+
+test expr-51.1 {test round-to-even on input} {
+    expr 6.9294956446009195e15
+} 6929495644600920.0
+
 # cleanup
 if {[info exists a]} {
     unset a
-- 
cgit v0.12


From 50ccb92ce743a012a9b42ab6ae7e73980a8566a8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 24 Jun 2015 14:28:47 +0000
Subject: Tcl_GetStringFromObj(..., NULL) -> Tcl_GetString(...). Use size_t in
 stead of int for more internal variables.

---
 generic/tclScan.c            |  4 +--
 generic/tclStubInit.c        |  2 +-
 generic/tclTest.c            |  4 +--
 generic/tclTestProcBodyObj.c |  2 +-
 win/tclWinPipe.c             | 12 ++++----
 win/tclWinReg.c              | 69 ++++++++++++++++++++++----------------------
 6 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/generic/tclScan.c b/generic/tclScan.c
index 4dfc2d6..3edb8be 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -595,7 +595,7 @@ Tcl_ScanObjCmd(
 	return TCL_ERROR;
     }
 
-    format = Tcl_GetStringFromObj(objv[2], NULL);
+    format = Tcl_GetString(objv[2]);
     numVars = objc-3;
 
     /*
@@ -617,7 +617,7 @@ Tcl_ScanObjCmd(
 	}
     }
 
-    string = Tcl_GetStringFromObj(objv[1], NULL);
+    string = Tcl_GetString(objv[1]);
     baseString = string;
 
     /*
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 7a84cba..7d44163 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -82,7 +82,7 @@ static const char *TclGetStartupScriptFileName(void)
     if (path == NULL) {
 	return NULL;
     }
-    return Tcl_GetStringFromObj(path, NULL);
+    return Tcl_GetString(path);
 }
 
 #if defined(_WIN32) || defined(__CYGWIN__)
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 0f4b6d4..19a9033 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -2306,9 +2306,9 @@ TesteventDeleteProc(
 	return 0;
     }
     targetName = (Tcl_Obj *) clientData;
-    targetNameStr = (char *) Tcl_GetStringFromObj(targetName, NULL);
+    targetNameStr = (char *) Tcl_GetString(targetName);
     ev = (TestEvent *) event;
-    evNameStr = Tcl_GetStringFromObj(ev->tag, NULL);
+    evNameStr = Tcl_GetString(ev->tag);
     if (strcmp(evNameStr, targetNameStr) == 0) {
 	Tcl_DecrRefCount(ev->tag);
 	Tcl_DecrRefCount(ev->command);
diff --git a/generic/tclTestProcBodyObj.c b/generic/tclTestProcBodyObj.c
index a3f89f6..0d3617e 100644
--- a/generic/tclTestProcBodyObj.c
+++ b/generic/tclTestProcBodyObj.c
@@ -245,7 +245,7 @@ ProcBodyTestProcObjCmd(
      * Find the Command pointer to this procedure
      */
 
-    fullName = Tcl_GetStringFromObj(objv[3], NULL);
+    fullName = Tcl_GetString(objv[3]);
     procCmd = Tcl_FindCommand(interp, fullName, NULL, TCL_LEAVE_ERR_MSG);
     if (procCmd == NULL) {
 	return TCL_ERROR;
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index a9eec6d..aff8836 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -50,7 +50,7 @@ TCL_DECLARE_MUTEX(pipeMutex)
  * used in a pipeline.
  */
 
-typedef struct WinFile {
+typedef struct {
     int type;			/* One of the file types defined above. */
     HANDLE handle;		/* Open file handle. */
 } WinFile;
@@ -148,7 +148,7 @@ typedef struct PipeInfo {
 				 * synchronized with the readable object. */
 } PipeInfo;
 
-typedef struct ThreadSpecificData {
+typedef struct {
     /*
      * The following pointer refers to the head of the list of pipes that are
      * being watched for file events.
@@ -164,7 +164,7 @@ static Tcl_ThreadDataKey dataKey;
  * events are generated.
  */
 
-typedef struct PipeEvent {
+typedef struct {
     Tcl_Event header;		/* Information that is standard for all
 				 * events. */
     PipeInfo *infoPtr;		/* Pointer to pipe info structure. Note that
@@ -2653,7 +2653,7 @@ Tcl_PidObjCmd(
     if (objc == 1) {
 	Tcl_SetObjResult(interp, Tcl_NewWideIntObj((unsigned) getpid()));
     } else {
-	chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], NULL),
+	chan = Tcl_GetChannel(interp, Tcl_GetString(objv[1]),
 		NULL);
 	if (chan == (Tcl_Channel) NULL) {
 	    return TCL_ERROR;
@@ -3106,9 +3106,9 @@ TclpOpenTemporaryFile(
     }
     namePtr += length * sizeof(TCHAR);
     if (basenameObj) {
-	const char *string = Tcl_GetStringFromObj(basenameObj, &length);
+	const char *string = Tcl_GetString(basenameObj);
 
-	Tcl_WinUtfToTChar(string, length, &buf);
+	Tcl_WinUtfToTChar(string, basenameObj->length, &buf);
 	memcpy(namePtr, Tcl_DStringValue(&buf), Tcl_DStringLength(&buf));
 	namePtr += Tcl_DStringLength(&buf);
 	Tcl_DStringFree(&buf);
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index 4403519..56aa991 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -49,15 +49,6 @@
 #endif
 
 /*
- * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the
- * Registry_Init declaration is in the source file itself, which is only
- * accessed when we are building a library.
- */
-
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
-/*
  * The following macros convert between different endian ints.
  */
 
@@ -140,8 +131,8 @@ static int		SetValue(Tcl_Interp *interp, Tcl_Obj *keyNameObj,
 			    Tcl_Obj *valueNameObj, Tcl_Obj *dataObj,
 			    Tcl_Obj *typeObj, REGSAM mode);
 
-EXTERN int		Registry_Init(Tcl_Interp *interp);
-EXTERN int		Registry_Unload(Tcl_Interp *interp, int flags);
+DLLEXPORT int		Registry_Init(Tcl_Interp *interp);
+DLLEXPORT int		Registry_Unload(Tcl_Interp *interp, int flags);
 
 /*
  *----------------------------------------------------------------------
@@ -508,7 +499,7 @@ DeleteValue(
 {
     HKEY key;
     char *valueName;
-    int length;
+    size_t length;
     DWORD result;
     Tcl_DString ds;
 
@@ -521,7 +512,8 @@ DeleteValue(
 	return TCL_ERROR;
     }
 
-    valueName = Tcl_GetStringFromObj(valueNameObj, &length);
+    valueName = Tcl_GetString(valueNameObj);
+    length = valueNameObj->length;
     Tcl_WinUtfToTChar(valueName, length, &ds);
     result = RegDeleteValue(key, (const TCHAR *)Tcl_DStringValue(&ds));
     Tcl_DStringFree(&ds);
@@ -663,7 +655,7 @@ GetType(
     Tcl_DString ds;
     const char *valueName;
     const TCHAR *nativeValue;
-    int length;
+    size_t length;
 
     /*
      * Attempt to open the key for reading.
@@ -678,7 +670,8 @@ GetType(
      * Get the type of the value.
      */
 
-    valueName = Tcl_GetStringFromObj(valueNameObj, &length);
+    valueName = Tcl_GetString(valueNameObj);
+    length = valueNameObj->length;
     nativeValue = Tcl_WinUtfToTChar(valueName, length, &ds);
     result = RegQueryValueEx(key, nativeValue, NULL, &type,
 	    NULL, NULL);
@@ -735,7 +728,7 @@ GetValue(
     const TCHAR *nativeValue;
     DWORD result, length, type;
     Tcl_DString data, buf;
-    int nameLen;
+    size_t nameLen;
 
     /*
      * Attempt to open the key for reading.
@@ -760,7 +753,8 @@ GetValue(
     Tcl_DStringSetLength(&data, TCL_DSTRING_STATIC_SIZE - 1);
     length = TCL_DSTRING_STATIC_SIZE/sizeof(TCHAR) - 1;
 
-    valueName = Tcl_GetStringFromObj(valueNameObj, &nameLen);
+    valueName = Tcl_GetString(valueNameObj);
+    nameLen = valueNameObj->length;
     nativeValue = Tcl_WinUtfToTChar(valueName, nameLen, &buf);
 
     result = RegQueryValueEx(key, nativeValue, NULL, &type,
@@ -950,11 +944,12 @@ OpenKey(
     HKEY *keyPtr)		/* Returned HKEY. */
 {
     char *keyName, *buffer, *hostName;
-    int length;
+    size_t length;
     HKEY rootKey;
     DWORD result;
 
-    keyName = Tcl_GetStringFromObj(keyNameObj, &length);
+    keyName = Tcl_GetString(keyNameObj);
+    length = keyNameObj->length;
     buffer = ckalloc(length + 1);
     strcpy(buffer, keyName);
 
@@ -1254,7 +1249,8 @@ SetValue(
     Tcl_Obj *typeObj,		/* Type of data to be written. */
     REGSAM mode)		/* Mode flags to pass. */
 {
-    int type, length;
+    int type;
+    size_t length;
     DWORD result;
     HKEY key;
     const char *valueName;
@@ -1274,7 +1270,8 @@ SetValue(
 	return TCL_ERROR;
     }
 
-    valueName = Tcl_GetStringFromObj(valueNameObj, &length);
+    valueName = Tcl_GetString(valueNameObj);
+    length = valueNameObj->length;
     valueName = (char *) Tcl_WinUtfToTChar(valueName, length, &nameBuf);
 
     if (type == REG_DWORD || type == REG_DWORD_BIG_ENDIAN) {
@@ -1308,8 +1305,9 @@ SetValue(
 
 	Tcl_DStringInit(&data);
 	for (i = 0; i < objc; i++) {
-	    const char *bytes = Tcl_GetStringFromObj(objv[i], &length);
+	    const char *bytes = Tcl_GetString(objv[i]);
 
+	    length = objv[i]->length;
 	    Tcl_DStringAppend(&data, bytes, length);
 
 	    /*
@@ -1328,8 +1326,9 @@ SetValue(
 	Tcl_DStringFree(&buf);
     } else if (type == REG_SZ || type == REG_EXPAND_SZ) {
 	Tcl_DString buf;
-	const char *data = Tcl_GetStringFromObj(dataObj, &length);
+	const char *data = Tcl_GetString(dataObj);
 
+	length = dataObj->length;
 	data = (char *) Tcl_WinUtfToTChar(data, length, &buf);
 
 	/*
@@ -1344,14 +1343,15 @@ SetValue(
 	Tcl_DStringFree(&buf);
     } else {
 	BYTE *data;
+	int bytelength;
 
 	/*
 	 * Store binary data in the registry.
 	 */
 
-	data = (BYTE *) Tcl_GetByteArrayFromObj(dataObj, &length);
+	data = (BYTE *) Tcl_GetByteArrayFromObj(dataObj, &bytelength);
 	result = RegSetValueEx(key, (TCHAR *) valueName, 0,
-		(DWORD) type, data, (DWORD) length);
+		(DWORD) type, data, (DWORD) bytelength);
     }
 
     Tcl_DStringFree(&nameBuf);
@@ -1391,24 +1391,25 @@ BroadcastValue(
 {
     LRESULT result;
     DWORD_PTR sendResult;
-    UINT timeout = 3000;
-    int len;
+    int timeout = 3000;
+    size_t len;
+    int unilen;
     const char *str;
     Tcl_Obj *objPtr;
 
     if (objc == 3) {
-	str = Tcl_GetStringFromObj(objv[1], &len);
-	if ((len < 2) || (*str != '-')
-		|| strncmp(str, "-timeout", (size_t) len)) {
+	str = Tcl_GetString(objv[1]);
+	len = objv[1]->length;
+	if ((len < 2) || (*str != '-') || strncmp(str, "-timeout", len)) {
 	    return TCL_BREAK;
 	}
-	if (Tcl_GetIntFromObj(interp, objv[2], (int *) &timeout) != TCL_OK) {
+	if (Tcl_GetIntFromObj(interp, objv[2], &timeout) != TCL_OK) {
 	    return TCL_ERROR;
 	}
     }
 
-    str = (char*)Tcl_GetUnicodeFromObj(objv[0], &len);
-    if (len == 0) {
+    str = (char*)Tcl_GetUnicodeFromObj(objv[0], &unilen);
+    if (unilen == 0) {
 	str = NULL;
     }
 
@@ -1417,7 +1418,7 @@ BroadcastValue(
      */
 
     result = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE,
-	    (WPARAM) 0, (LPARAM) str, SMTO_ABORTIFHUNG, timeout, &sendResult);
+	    (WPARAM) 0, (LPARAM) str, SMTO_ABORTIFHUNG, (UINT) timeout, &sendResult);
 
     objPtr = Tcl_NewObj();
     Tcl_ListObjAppendElement(NULL, objPtr, Tcl_NewLongObj((long) result));
-- 
cgit v0.12


From 14f9ede96158ae37b5c8513a27bd864e32b250da Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 25 Jun 2015 07:52:36 +0000
Subject: Fix bug in "make dist" when system-encoding is UTF-8: eolFix will
 then translate some windows-specific files to UTF-8 too. Solution: commit
 those files with CRLF line-ending, which eliminates the need for eolFix
 altgether. See als: [495120] for the reason why eolFix was introduced in the
 first place. No longer needed with fossil.

---
 .fossil-settings/crnl-glob           |   10 +
 .fossil-settings/encoding-glob       |   10 +
 ChangeLog                            |    4 +-
 changes                              |    2 +-
 library/encoding/jis0208.enc         |   12 +-
 license.terms                        |    4 +-
 macosx/Tcl.xcode/project.pbxproj     |    2 -
 macosx/Tcl.xcodeproj/project.pbxproj |    2 -
 tools/Makefile.in                    |    4 +-
 tools/tcl.hpj.in                     |   38 +-
 tools/tcl.wse.in                     | 4752 +++++++++++++++++-----------------
 unix/Makefile.in                     |    9 -
 unix/configure.in                    |   12 +-
 unix/tcl.spec                        |    2 +-
 unix/tclConfig.h.in                  |   26 +-
 win/buildall.vc.bat                  |  206 +-
 win/coffbase.txt                     |   84 +-
 win/makefile.bc                      | 1194 ++++-----
 win/makefile.vc                      | 2274 ++++++++--------
 win/rules.vc                         | 1396 +++++-----
 win/tcl.dsp                          | 3134 +++++++++++-----------
 win/tcl.dsw                          |   58 +-
 win/tcl.hpj.in                       |   38 +-
 win/tcl.rc                           |    2 +-
 win/tclConfig.sh.in                  |    2 +-
 25 files changed, 6649 insertions(+), 6628 deletions(-)
 create mode 100644 .fossil-settings/encoding-glob

diff --git a/.fossil-settings/crnl-glob b/.fossil-settings/crnl-glob
index e69de29..c014320 100644
--- a/.fossil-settings/crnl-glob
+++ b/.fossil-settings/crnl-glob
@@ -0,0 +1,10 @@
+tools/tcl.hpj.in
+tools/tcl.wse.in
+win/buildall.vc.bat
+win/coffbase.txt
+win/makefile.bc
+win/makefile.vc
+win/rules.vc
+win/tcl.dsp
+win/tcl.dsw
+win/tcl.hpj.in
diff --git a/.fossil-settings/encoding-glob b/.fossil-settings/encoding-glob
new file mode 100644
index 0000000..c014320
--- /dev/null
+++ b/.fossil-settings/encoding-glob
@@ -0,0 +1,10 @@
+tools/tcl.hpj.in
+tools/tcl.wse.in
+win/buildall.vc.bat
+win/coffbase.txt
+win/makefile.bc
+win/makefile.vc
+win/rules.vc
+win/tcl.dsp
+win/tcl.dsw
+win/tcl.hpj.in
diff --git a/ChangeLog b/ChangeLog
index fd8c7c7..e5e62f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -66,7 +66,7 @@ a better first place to look now.
 	(https://groups.google.com/forum/?fromgroups#!topic/comp.lang.tcl/vfpI3bc-DkQ),
 	diagnosed by dgp to be a close relative of [Bug 781585], which was
 	fixed by commit	[f46fb50cb3]. This bug was introduced by myself in
-	commit [cbfe055d8c]. 
+	commit [cbfe055d8c].
 
 2013-05-28 Harald Oehlmann  <oehhar@users.sf.net>
 
@@ -268,7 +268,7 @@ a better first place to look now.
 
 2013-02-05  Don Porter  <dgp@users.sourceforge.net>
 
-	* win/tclWinFile.c:	[Bug 3603434]: Make sure TclpObjNormalizePath() 
+	* win/tclWinFile.c:	[Bug 3603434]: Make sure TclpObjNormalizePath()
 	properly declares "a:/" to be normalized, even when no "A:" drive is
 	present on the system.
 
diff --git a/changes b/changes
index 22242cb..6d61b5e 100644
--- a/changes
+++ b/changes
@@ -7678,7 +7678,7 @@ Many revisions to better support a Cygwin environment (nijtmans)
 
 2012-10-14 (bug fix) [tcl::Bgerror] crash on non-dict options (nijtmans)
 
-2012-11-06 (bug fix)[3581754] avoid multiple callback on keep-alive (fellows) 
+2012-11-06 (bug fix)[3581754] avoid multiple callback on keep-alive (fellows)
 => http 2.7.10
 
 2012-11-07 (bug fix)[3574493] hang in Windows socket finalization (fassel)
diff --git a/library/encoding/jis0208.enc b/library/encoding/jis0208.enc
index 8460b69..11c49a4 100644
--- a/library/encoding/jis0208.enc
+++ b/library/encoding/jis0208.enc
@@ -1311,9 +1311,9 @@ FF50FF51FF52FF53FF54FF55FF56FF57FF58FF59FF5A00000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 R
-2141 301C FF5E 
-2142 2016 2225 
-215D 2212 FF0D 
-2171 00A2 FFE0 
-2172 00A3 FFE1 
-224C 00AC FFE2 
+2141 301C FF5E
+2142 2016 2225
+215D 2212 FF0D
+2171 00A2 FFE0
+2172 00A3 FFE1
+224C 00AC FFE2
diff --git a/license.terms b/license.terms
index d44f069..fd6d69a 100644
--- a/license.terms
+++ b/license.terms
@@ -29,7 +29,7 @@ MODIFICATIONS.
 
 GOVERNMENT USE: If you are acquiring this software on behalf of the
 U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal 
+in the software and related documentation as defined in the Federal
 Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
 are acquiring the software on behalf of the Department of Defense, the
 software shall be classified as "Commercial Computer Software" and the
@@ -37,4 +37,4 @@ Government shall have only "Restricted Rights" as defined in Clause
 252.227-7013 (b) (3) of DFARs.  Notwithstanding the foregoing, the
 authors grant the U.S. Government and others acting in its behalf
 permission to use and distribute the software in accordance with the
-terms specified in this license. 
+terms specified in this license.
diff --git a/macosx/Tcl.xcode/project.pbxproj b/macosx/Tcl.xcode/project.pbxproj
index 0153b26..83056c3 100644
--- a/macosx/Tcl.xcode/project.pbxproj
+++ b/macosx/Tcl.xcode/project.pbxproj
@@ -788,7 +788,6 @@
 		F96D43D108F272B8004A47F5 /* checkLibraryDoc.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = checkLibraryDoc.tcl; sourceTree = "<group>"; };
 		F96D43D208F272B8004A47F5 /* configure */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = configure; sourceTree = "<group>"; };
 		F96D43D308F272B8004A47F5 /* configure.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.in; sourceTree = "<group>"; };
-		F96D442208F272B8004A47F5 /* eolFix.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = eolFix.tcl; sourceTree = "<group>"; };
 		F96D442408F272B8004A47F5 /* fix_tommath_h.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = fix_tommath_h.tcl; sourceTree = "<group>"; };
 		F96D442508F272B8004A47F5 /* genStubs.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = genStubs.tcl; sourceTree = "<group>"; };
 		F96D442708F272B8004A47F5 /* index.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = index.tcl; sourceTree = "<group>"; };
@@ -1695,7 +1694,6 @@
 				F96D43D108F272B8004A47F5 /* checkLibraryDoc.tcl */,
 				F96D43D208F272B8004A47F5 /* configure */,
 				F96D43D308F272B8004A47F5 /* configure.in */,
-				F96D442208F272B8004A47F5 /* eolFix.tcl */,
 				F96D442408F272B8004A47F5 /* fix_tommath_h.tcl */,
 				F96D442508F272B8004A47F5 /* genStubs.tcl */,
 				F96D442708F272B8004A47F5 /* index.tcl */,
diff --git a/macosx/Tcl.xcodeproj/project.pbxproj b/macosx/Tcl.xcodeproj/project.pbxproj
index 97158b0..7b39b54 100644
--- a/macosx/Tcl.xcodeproj/project.pbxproj
+++ b/macosx/Tcl.xcodeproj/project.pbxproj
@@ -789,7 +789,6 @@
 		F96D43D108F272B8004A47F5 /* checkLibraryDoc.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = checkLibraryDoc.tcl; sourceTree = "<group>"; };
 		F96D43D208F272B8004A47F5 /* configure */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = configure; sourceTree = "<group>"; };
 		F96D43D308F272B8004A47F5 /* configure.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.in; sourceTree = "<group>"; };
-		F96D442208F272B8004A47F5 /* eolFix.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = eolFix.tcl; sourceTree = "<group>"; };
 		F96D442408F272B8004A47F5 /* fix_tommath_h.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = fix_tommath_h.tcl; sourceTree = "<group>"; };
 		F96D442508F272B8004A47F5 /* genStubs.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = genStubs.tcl; sourceTree = "<group>"; };
 		F96D442708F272B8004A47F5 /* index.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = index.tcl; sourceTree = "<group>"; };
@@ -1698,7 +1697,6 @@
 				F96D43D108F272B8004A47F5 /* checkLibraryDoc.tcl */,
 				F96D43D208F272B8004A47F5 /* configure */,
 				F96D43D308F272B8004A47F5 /* configure.in */,
-				F96D442208F272B8004A47F5 /* eolFix.tcl */,
 				F96D442408F272B8004A47F5 /* fix_tommath_h.tcl */,
 				F96D442508F272B8004A47F5 /* genStubs.tcl */,
 				F96D442708F272B8004A47F5 /* index.tcl */,
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 6034fe9..5e9f88e 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -32,9 +32,9 @@ ITCL_DOCS	= \
 
 #	$(ITCL_SOURCE)/iwidgets3.0.0/doc/*.[13n]
 
-COREDOCS	= $(TCL_DOCS) $(TK_DOCS) 
+COREDOCS	= $(TCL_DOCS) $(TK_DOCS)
 #PRODOCS	= $(COREDOCS) $(PRO_DOCS) $(ITCL_DOCS)
-PRODOCS		= $(COREDOCS) $(PRO_DOCS) 
+PRODOCS		= $(COREDOCS) $(PRO_DOCS)
 TCLSH		= $(TCL_BIN_DIR)/tclsh
 CC		= @CC@
 
diff --git a/tools/tcl.hpj.in b/tools/tcl.hpj.in
index 0d01f35..8efff0b 100644
--- a/tools/tcl.hpj.in
+++ b/tools/tcl.hpj.in
@@ -1,19 +1,19 @@
-; This file is maintained by HCW. Do not modify this file directly.
-
-[OPTIONS]
-HCW=0
-LCID=0x409 0x0 0x0 ;English (United States)
-REPORT=Yes
-TITLE=Tcl/Tk Reference Manual
-CNT=tcl85.cnt
-COPYRIGHT=Copyright © 2000 Ajuba Solutions
-HLP=tcl85.hlp
-
-[FILES]
-tcl.rtf
-
-[WINDOWS]
-main="Tcl/Tk Reference Manual",,0
-
-[CONFIG]
-BrowseButtons()
+; This file is maintained by HCW. Do not modify this file directly.
+
+[OPTIONS]
+HCW=0
+LCID=0x409 0x0 0x0 ;English (United States)
+REPORT=Yes
+TITLE=Tcl/Tk Reference Manual
+CNT=tcl85.cnt
+COPYRIGHT=Copyright © 2000 Ajuba Solutions
+HLP=tcl85.hlp
+
+[FILES]
+tcl.rtf
+
+[WINDOWS]
+main="Tcl/Tk Reference Manual",,0
+
+[CONFIG]
+BrowseButtons()
diff --git a/tools/tcl.wse.in b/tools/tcl.wse.in
index 0c1ee4c..3bc8ee4 100644
--- a/tools/tcl.wse.in
+++ b/tools/tcl.wse.in
@@ -1,2376 +1,2376 @@
-Document Type: WSE
-item: Global
-  Version=6.01
-  Title=Tcl 8.5 for Windows Installation
-  Flags=00010100
-  Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-  Japanese Font Name=MS Gothic
-  Japanese Font Size=10
-  Start Gradient=0 0 255
-  End Gradient=0 0 0
-  Windows Flags=00000000000000010010110000001000
-  Log Pathname=%MAINDIR%\INSTALL.LOG
-  Message Font=MS Sans Serif
-  Font Size=8
-  Disk Label=tcl8.5.18
-  Disk Filename=setup
-  Patch Flags=0000000000000001
-  Patch Threshold=85
-  Patch Memory=4000
-  Variable Name1=_SYS_
-  Variable Default1=C:\WINDOWS\SYSTEM
-  Variable Flags1=00001000
-  Variable Name2=_ODBC16_
-  Variable Default2=C:\WINDOWS\SYSTEM
-  Variable Flags2=00001000
-  Variable Name3=_WISE_
-  Variable Default3=${__WISE__}
-  Variable Flags3=00001000
-end
-item: Open/Close INSTALL.LOG
-  Flags=00000001
-end
-item: Check if File/Dir Exists
-  Pathname=%SYS%
-  Flags=10000100
-end
-item: Set Variable
-  Variable=SYS
-  Value=%WIN%
-end
-item: End Block
-end
-item: Set Variable
-  Variable=VER
-  Value=8.5
-end
-item: Set Variable
-  Variable=PATCHLEVEL
-  Value=${__TCL_PATCH_LEVEL__}
-end
-item: Set Variable
-  Variable=APPTITLE
-  Value=Tcl/Tk %PATCHLEVEL% for Windows
-end
-item: Set Variable
-  Variable=URL
-  Value=http://www.tcl.tk/
-end
-item: Set Variable
-  Variable=GROUP
-  Value=Tcl
-end
-item: Set Variable
-  Variable=DISABLED
-  Value=!
-end
-item: Set Variable
-  Variable=MAINDIR
-  Value=Tcl
-end
-item: Check Configuration
-  Flags=10111011
-end
-item: Get Registry Key Value
-  Variable=PROGRAM_FILES
-  Key=SOFTWARE\Microsoft\Windows\CurrentVersion
-  Default=C:\Program Files
-  Value Name=ProgramFilesDir
-  Flags=00000100
-end
-item: Set Variable
-  Variable=MAINDIR
-  Value=%PROGRAM_FILES%\%MAINDIR%
-end
-item: Set Variable
-  Variable=EXPLORER
-  Value=1
-end
-item: Else Statement
-end
-item: Set Variable
-  Variable=MAINDIR
-  Value=C:\%MAINDIR%
-end
-item: End Block
-end
-item: Set Variable
-  Variable=BACKUP
-  Value=%MAINDIR%\BACKUP
-end
-item: Set Variable
-  Variable=DOBACKUP
-  Value=B
-end
-item: Set Variable
-  Variable=BRANDING
-  Value=0
-end
-remarked item: If/While Statement
-  Variable=BRANDING
-  Value=1
-end
-remarked item: Read INI Value
-  Variable=NAME
-  Pathname=%INST%\CUSTDATA.INI
-  Section=Registration
-  Item=Name
-end
-remarked item: Read INI Value
-  Variable=COMPANY
-  Pathname=%INST%\CUSTDATA.INI
-  Section=Registration
-  Item=Company
-end
-remarked item: If/While Statement
-  Variable=NAME
-end
-remarked item: Set Variable
-  Variable=DOBRAND
-  Value=1
-end
-remarked item: End Block
-end
-remarked item: End Block
-end
-item: Set Variable
-  Variable=TYPE
-  Value=C
-end
-item: Set Variable
-  Variable=COMPONENTS
-  Value=ABC
-end
-item: Wizard Block
-  Direction Variable=DIRECTION
-  Display Variable=DISPLAY
-  X Position=0
-  Y Position=0
-  Filler Color=8421440
-  Flags=00000001
-end
-item: Custom Dialog Set
-  Name=Splash
-  Display Variable=DISPLAY
-  item: Dialog
-    Title=%APPTITLE% Installation
-    Title French=Bienvenue
-    Title German=Willkommen
-    Title Portuguese=Bem-vindo 
-    Title Spanish=Bienvenido
-    Title Italian=Benvenuto
-    Title Danish=Velkommen
-    Title Dutch=Welkom
-    Title Norwegian=Velkommen
-    Title Swedish=Välkommen
-    Width=273
-    Height=250
-    Font Name=Helv
-    Font Size=8
-    item: Push Button
-      Rectangle=166 214 208 228
-      Variable=DIRECTION
-      Value=N
-      Create Flags=01010000000000010000000000000001
-      Text=&Next >
-    end
-    item: Push Button
-      Rectangle=212 214 254 228
-      Action=3
-      Create Flags=01010000000000010000000000000000
-      Text=Cancel
-    end
-    item: Static
-      Rectangle=0 0 268 233
-      Action=2
-      Enabled Color=00000000000000001111111111111111
-      Create Flags=01010000000000000000000000001011
-      Pathname=${__TCLBASEDIR__}\tools\white.bmp
-    end
-    item: Static
-      Rectangle=5 5 268 215
-      Destination Dialog=1
-      Action=2
-      Enabled Color=00000000000000001111111111111111
-      Create Flags=01010000000000000000000000001011
-      Pathname=${__TCLBASEDIR__}\tools\tclSplash.bmp
-    end
-  end
-end
-item: End Block
-end
-item: Wizard Block
-  Direction Variable=DIRECTION
-  Display Variable=DISPLAY
-  Bitmap Pathname=%_WISE_%\DIALOGS\TEMPLATE\WIZARD.BMP
-  X Position=9
-  Y Position=10
-  Filler Color=8421440
-  Dialog=Welcome
-  Dialog=Select Destination Directory
-  Dialog=Select Installation Type
-  Dialog=Select Components
-  Dialog=Select Program Manager Group
-  Variable=
-  Variable=
-  Variable=
-  Variable=TYPE
-  Variable=EXPLORER
-  Value=
-  Value=
-  Value=
-  Value=C
-  Value=1
-  Compare=0
-  Compare=0
-  Compare=0
-  Compare=1
-  Compare=0
-  Flags=00000011
-end
-item: Custom Dialog Set
-  Name=Welcome
-  Display Variable=DISPLAY
-  item: Dialog
-    Title=%APPTITLE% Installation
-    Title French=Installation de %APPTITLE%
-    Title German=Installation von %APPTITLE%
-    Title Spanish=Instalación de %APPTITLE%
-    Title Italian=Installazione di %APPTITLE%
-    Width=271
-    Height=224
-    Font Name=Helv
-    Font Size=8
-    item: Static
-      Rectangle=86 8 258 42
-      Create Flags=01010000000000000000000000000000
-      Flags=0000000000000001
-      Name=Times New Roman
-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
-      Text=Welcome!
-      Text French=Bienvenue !
-      Text German=Willkommen!
-      Text Spanish=¡Bienvenido!
-      Text Italian=Benvenuti!
-    end
-    item: Push Button
-      Rectangle=150 187 195 202
-      Variable=DIRECTION
-      Value=N
-      Create Flags=01010000000000010000000000000001
-      Text=&Next >
-      Text French=&Suite >
-      Text German=&Weiter >
-      Text Spanish=&Siguiente >
-      Text Italian=&Avanti >
-    end
-    item: Push Button
-      Rectangle=105 187 150 202
-      Variable=DISABLED
-      Value=!
-      Create Flags=01010000000000010000000000000000
-      Text=< &Back
-      Text French=< &Retour
-      Text German=< &Zurück
-      Text Spanish=< &Atrás
-      Text Italian=< &Indietro
-    end
-    item: Push Button
-      Rectangle=211 187 256 202
-      Action=3
-      Create Flags=01010000000000010000000000000000
-      Text=&Cancel
-      Text French=&Annuler
-      Text German=&Abbrechen
-      Text Spanish=&Cancelar
-      Text Italian=&Annulla
-    end
-    item: Static
-      Rectangle=85 41 255 130
-      Create Flags=01010000000000000000000000000000
-      Text=This installation program will install %APPTITLE%.
-      Text=
-      Text=Press the Next button to start the installation. You can press the Exit Setup button now if you do not want to install %APPTITLE% at this time. 
-      Text=
-      Text=It is strongly recommended that you exit all Windows programs before running this installation program.
-      Text French=Ce programme d'installation va installer %APPTITLE%.
-      Text French=
-      Text French=Cliquez sur le bouton Suite pour démarrer l'installation. Vous pouvez cliquer sur le bouton Quitter l'installation si vous ne voulez pas installer %APPTITLE% tout de suite.
-      Text German=Mit diesem Installationsprogramm wird %APPTITLE% installiert.
-      Text German=
-      Text German=Klicken Sie auf "Weiter", um mit der Installation zu beginnen. Klicken Sie auf "Abbrechen", um die Installation von %APPTITLE% abzubrechen.
-      Text Spanish=Este programa de instalación instalará %APPTITLE%.
-      Text Spanish=
-      Text Spanish=Presione el botón Siguiente para iniciar la instalación. Puede presionar el botón Salir de instalación si no desea instalar %APPTITLE% en este momento.
-      Text Italian=Questo programma installerà %APPTITLE%.
-      Text Italian=
-      Text Italian=Per avvviare l'installazione premere il pulsante Avanti. Se non si desidera installare %APPTITLE% ora, premere il pulsante Esci dall'installazione.
-    end
-    item: Static
-      Rectangle=8 180 256 181
-      Action=3
-      Create Flags=01010000000000000000000000000111
-    end
-  end
-end
-item: Custom Dialog Set
-  Name=Select Destination Directory
-  Display Variable=DISPLAY
-  item: Dialog
-    Title=%APPTITLE% Installation
-    Title French=Installation de %APPTITLE%
-    Title German=Installation von %APPTITLE%
-    Title Spanish=Instalación de %APPTITLE%
-    Title Italian=Installazione di %APPTITLE%
-    Width=271
-    Height=224
-    Font Name=Helv
-    Font Size=8
-    item: Push Button
-      Rectangle=150 187 195 202
-      Variable=DIRECTION
-      Value=N
-      Create Flags=01010000000000010000000000000001
-      Text=&Next >
-      Text French=&Suite >
-      Text German=&Weiter >
-      Text Spanish=&Siguiente >
-      Text Italian=&Avanti >
-    end
-    item: Push Button
-      Rectangle=105 187 150 202
-      Variable=DIRECTION
-      Value=B
-      Create Flags=01010000000000010000000000000000
-      Flags=0000000000000001
-      Text=< &Back
-      Text French=< &Retour
-      Text German=< &Zurück
-      Text Spanish=< &Atrás
-      Text Italian=< &Indietro
-    end
-    item: Push Button
-      Rectangle=211 187 256 202
-      Action=3
-      Create Flags=01010000000000010000000000000000
-      Text=&Cancel
-      Text French=&Annuler
-      Text German=&Abbrechen
-      Text Spanish=&Cancelar
-      Text Italian=&Annulla
-    end
-    item: Static
-      Rectangle=8 180 256 181
-      Action=3
-      Create Flags=01010000000000000000000000000111
-    end
-    item: Static
-      Rectangle=86 8 258 42
-      Create Flags=01010000000000000000000000000000
-      Flags=0000000000000001
-      Name=Times New Roman
-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
-      Text=Select Destination Directory
-      Text French=Sélectionner le répertoire de destination
-      Text German=Zielverzeichnis wählen
-      Text Spanish=Seleccione el directorio de destino
-      Text Italian=Selezionare Directory di destinazione
-    end
-    item: Static
-      Rectangle=86 39 256 114
-      Create Flags=01010000000000000000000000000000
-      Text=Please select the directory where the %APPTITLE% files are to be installed.
-      Text=
-      Text=To install in the default directory below, click Next.
-      Text=
-      Text=To install in a different directory, click Browse and select another directory.
-      Text French=Veuillez sélectionner le répertoire dans lequel les fichiers %APPTITLE% doivent être installés.
-      Text German=Geben Sie an, in welchem Verzeichnis die %APPTITLE%-Dateien installiert werden sollen.
-      Text Spanish=Por favor seleccione el directorio donde desee instalar los archivos de %APPTITLE%.
-      Text Italian=Selezionare la directory dove verranno installati i file %APPTITLE%.
-    end
-    item: Static
-      Rectangle=86 130 256 157
-      Action=1
-      Create Flags=01010000000000000000000000000111
-    end
-    item: Push Button
-      Rectangle=205 138 250 153
-      Variable=MAINDIR_SAVE
-      Value=%MAINDIR%
-      Destination Dialog=1
-      Action=2
-      Create Flags=01010000000000010000000000000000
-      Text=Browse
-      Text French=Parcourir
-      Text German=Durchsuchen
-      Text Spanish=Buscar
-      Text Italian=Sfoglie
-    end
-    item: Static
-      Rectangle=91 140 198 151
-      Create Flags=01010000000000000000000000000000
-      Text=%MAINDIR%
-      Text French=%MAINDIR%
-      Text German=%MAINDIR%
-      Text Spanish=%MAINDIR%
-      Text Italian=%MAINDIR%
-    end
-  end
-  item: Dialog
-    Title=Select Destination Directory
-    Title French=Sélectionner le répertoire de destination
-    Title German=Zielverzeichnis wählen
-    Title Spanish=Seleccione el directorio de destino
-    Title Italian=Selezionare Directory di destinazione
-    Width=221
-    Height=173
-    Font Name=Helv
-    Font Size=8
-    item: Listbox
-      Rectangle=5 5 163 149
-      Variable=MAINDIR
-      Create Flags=01010000100000010000000101000000
-      Flags=0000110000100010
-      Text=%MAINDIR%
-      Text French=%MAINDIR%
-      Text German=%MAINDIR%
-      Text Spanish=%MAINDIR%
-      Text Italian=%MAINDIR%
-    end
-    item: Push Button
-      Rectangle=167 6 212 21
-      Create Flags=01010000000000010000000000000001
-      Text=OK
-      Text French=OK
-      Text German=OK
-      Text Spanish=Aceptar
-      Text Italian=OK
-    end
-    item: Push Button
-      Rectangle=167 25 212 40
-      Variable=MAINDIR
-      Value=%MAINDIR_SAVE%
-      Create Flags=01010000000000010000000000000000
-      Flags=0000000000000001
-      Text=Cancel
-      Text French=Annuler
-      Text German=Abbrechen
-      Text Spanish=Cancelar
-      Text Italian=Annulla
-    end
-  end
-end
-remarked item: Custom Dialog Set
-  Name=Select Installation Type
-  Display Variable=DISPLAY
-  item: Dialog
-    Title=%APPTITLE% Installation
-    Title French=Installation de %APPTITLE%
-    Title German=Installation von %APPTITLE%
-    Title Spanish=Instalación de %APPTITLE%
-    Title Italian=Installazione di %APPTITLE%
-    Width=271
-    Height=224
-    Font Name=Helv
-    Font Size=8
-    item: Push Button
-      Rectangle=150 187 195 202
-      Variable=DIRECTION
-      Value=N
-      Create Flags=01010000000000010000000000000001
-      Text=&Next >
-      Text French=&Suite >
-      Text German=&Weiter >
-      Text Spanish=&Siguiente >
-      Text Italian=&Avanti >
-    end
-    item: Push Button
-      Rectangle=105 187 150 202
-      Variable=DIRECTION
-      Value=B
-      Create Flags=01010000000000010000000000000000
-      Text=< &Back
-      Text French=< &Retour
-      Text German=< &Zurück
-      Text Spanish=< &Atrás
-      Text Italian=< &Indietro
-    end
-    item: Push Button
-      Rectangle=211 187 256 202
-      Action=3
-      Create Flags=01010000000000010000000000000000
-      Text=&Cancel
-      Text French=&Annuler
-      Text German=&Abbrechen
-      Text Spanish=&Cancelar
-      Text Italian=&Annulla
-    end
-    item: Static
-      Rectangle=8 180 256 181
-      Action=3
-      Create Flags=01010000000000000000000000000111
-    end
-    item: Static
-      Rectangle=86 8 258 42
-      Create Flags=01010000000000000000000000000000
-      Flags=0000000000000001
-      Name=Times New Roman
-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
-      Text=Select Installation Type
-      Text French=Sélectionner les composants
-      Text German=Komponenten auswählen
-      Text Spanish=Seleccione componentes
-      Text Italian=Selezionare i componenti
-    end
-    item: Static
-      Rectangle=194 162 242 172
-      Variable=COMPONENTS
-      Value=MAINDIR
-      Create Flags=01010000000000000000000000000010
-    end
-    item: Static
-      Rectangle=194 153 242 162
-      Variable=COMPONENTS
-      Create Flags=01010000000000000000000000000010
-    end
-    item: Static
-      Rectangle=107 153 196 164
-      Create Flags=01010000000000000000000000000000
-      Text=Disk Space Required:
-      Text French=Espace disque requis :
-      Text German=Notwendiger Speicherplatz:
-      Text Spanish=Espacio requerido en el disco:
-      Text Italian=Spazio su disco necessario:
-    end
-    item: Static
-      Rectangle=107 162 196 172
-      Create Flags=01010000000000000000000000000000
-      Text=Disk Space Remaining:
-      Text French=Espace disque disponible :
-      Text German=Verbleibender Speicherplatz:
-      Text Spanish=Espacio en disco disponible:
-      Text Italian=Spazio su disco disponibile:
-    end
-    item: Static
-      Rectangle=86 145 256 175
-      Action=1
-      Create Flags=01010000000000000000000000000111
-    end
-    item: Static
-      Rectangle=86 42 256 61
-      Create Flags=01010000000000000000000000000000
-      Text=Choose which type of installation to perform by selecting one of the buttons below.
-      Text French=Choisissez les composants que vous voulez installer en cochant les cases ci-dessous.
-      Text German=Wählen Sie die zu installierenden Komponenten, indem Sie in die entsprechenden Kästchen klicken.
-      Text Spanish=Elija los componentes que desee instalar marcando los cuadros de abajo.
-      Text Italian=Scegliere quali componenti installare selezionando le caselle sottostanti.
-    end
-    item: Radio Button
-      Rectangle=86 74 256 128
-      Variable=TYPE
-      Create Flags=01010000000000010000000000001001
-      Text=&Full Installation (Recommended)
-      Text=&Minimal Installation
-      Text=C&ustom Installation
-      Text=
-    end
-  end
-end
-item: Custom Dialog Set
-  Name=Select Components
-  Display Variable=DISPLAY
-  item: Dialog
-    Title=%APPTITLE% Installation
-    Title French=Installation de %APPTITLE%
-    Title German=Installation von %APPTITLE%
-    Title Spanish=Instalación de %APPTITLE%
-    Title Italian=Installazione di %APPTITLE%
-    Width=271
-    Height=224
-    Font Name=Helv
-    Font Size=8
-    item: Push Button
-      Rectangle=150 187 195 202
-      Variable=DIRECTION
-      Value=N
-      Create Flags=01010000000000010000000000000001
-      Text=&Next >
-      Text French=&Suite >
-      Text German=&Weiter >
-      Text Spanish=&Siguiente >
-      Text Italian=&Avanti >
-    end
-    item: Push Button
-      Rectangle=105 187 150 202
-      Variable=DIRECTION
-      Value=B
-      Create Flags=01010000000000010000000000000000
-      Text=< &Back
-      Text French=< &Retour
-      Text German=< &Zurück
-      Text Spanish=< &Atrás
-      Text Italian=< &Indietro
-    end
-    item: Push Button
-      Rectangle=211 187 256 202
-      Action=3
-      Create Flags=01010000000000010000000000000000
-      Text=&Cancel
-      Text French=&Annuler
-      Text German=&Abbrechen
-      Text Spanish=&Cancelar
-      Text Italian=&Annulla
-    end
-    item: Static
-      Rectangle=8 180 256 181
-      Action=3
-      Create Flags=01010000000000000000000000000111
-    end
-    item: Static
-      Rectangle=86 8 258 42
-      Create Flags=01010000000000000000000000000000
-      Flags=0000000000000001
-      Name=Times New Roman
-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
-      Text=Select Components
-      Text French=Sélectionner les composants
-      Text German=Komponenten auswählen
-      Text Spanish=Seleccione componentes
-      Text Italian=Selezionare i componenti
-    end
-    item: Checkbox
-      Rectangle=86 75 256 129
-      Variable=COMPONENTS
-      Create Flags=01010000000000010000000000000011
-      Flags=0000000000000110
-      Text=Tcl Run-Time Files
-      Text=Example Scripts
-      Text=Help Files
-      Text=Header and Library Files
-      Text=
-      Text French=Tcl Run-Time Files
-      Text French=Example Scripts
-      Text French=Help Files
-      Text French=Header and Library Files
-      Text French=
-      Text German=Tcl Run-Time Files
-      Text German=Example Scripts
-      Text German=Help Files
-      Text German=Header and Library Files
-      Text German=
-      Text Spanish=Tcl Run-Time Files
-      Text Spanish=Example Scripts
-      Text Spanish=Help Files
-      Text Spanish=Header and Library Files
-      Text Spanish=
-      Text Italian=Tcl Run-Time Files
-      Text Italian=Example Scripts
-      Text Italian=Help Files
-      Text Italian=Header and Library Files
-      Text Italian=
-    end
-    item: Static
-      Rectangle=194 162 242 172
-      Variable=COMPONENTS
-      Value=MAINDIR
-      Create Flags=01010000000000000000000000000010
-    end
-    item: Static
-      Rectangle=194 153 242 162
-      Variable=COMPONENTS
-      Create Flags=01010000000000000000000000000010
-    end
-    item: Static
-      Rectangle=107 153 196 164
-      Create Flags=01010000000000000000000000000000
-      Text=Disk Space Required:
-      Text French=Espace disque requis :
-      Text German=Notwendiger Speicherplatz:
-      Text Spanish=Espacio requerido en el disco:
-      Text Italian=Spazio su disco necessario:
-    end
-    item: Static
-      Rectangle=107 162 196 172
-      Create Flags=01010000000000000000000000000000
-      Text=Disk Space Remaining:
-      Text French=Espace disque disponible :
-      Text German=Verbleibender Speicherplatz:
-      Text Spanish=Espacio en disco disponible:
-      Text Italian=Spazio su disco disponibile:
-    end
-    item: Static
-      Rectangle=86 145 256 175
-      Action=1
-      Create Flags=01010000000000000000000000000111
-    end
-    item: Static
-      Rectangle=86 42 256 61
-      Create Flags=01010000000000000000000000000000
-      Text=Choose which components to install by checking the boxes below.
-      Text French=Choisissez les composants que vous voulez installer en cochant les cases ci-dessous.
-      Text German=Wählen Sie die zu installierenden Komponenten, indem Sie in die entsprechenden Kästchen klicken.
-      Text Spanish=Elija los componentes que desee instalar marcando los cuadros de abajo.
-      Text Italian=Scegliere quali componenti installare selezionando le caselle sottostanti.
-    end
-  end
-end
-item: Custom Dialog Set
-  Name=Select Program Manager Group
-  Display Variable=DISPLAY
-  item: Dialog
-    Title=%APPTITLE% Installation
-    Title French=Installation de %APPTITLE%
-    Title German=Installation von %APPTITLE%
-    Title Spanish=Instalación de %APPTITLE%
-    Title Italian=Installazione di %APPTITLE%
-    Width=271
-    Height=224
-    Font Name=Helv
-    Font Size=8
-    item: Push Button
-      Rectangle=150 187 195 202
-      Variable=DIRECTION
-      Value=N
-      Create Flags=01010000000000010000000000000001
-      Text=&Next >
-      Text French=&Suite >
-      Text German=&Weiter >
-      Text Spanish=&Siguiente >
-      Text Italian=&Avanti >
-    end
-    item: Push Button
-      Rectangle=105 187 150 202
-      Variable=DIRECTION
-      Value=B
-      Create Flags=01010000000000010000000000000000
-      Flags=0000000000000001
-      Text=< &Back
-      Text French=< &Retour
-      Text German=< &Zurück
-      Text Spanish=< &Atrás
-      Text Italian=< &Indietro
-    end
-    item: Push Button
-      Rectangle=211 187 256 202
-      Action=3
-      Create Flags=01010000000000010000000000000000
-      Text=&Cancel
-      Text French=&Annuler
-      Text German=&Abbrechen
-      Text Spanish=&Cancelar
-      Text Italian=&Annulla
-    end
-    item: Static
-      Rectangle=8 180 256 181
-      Action=3
-      Create Flags=01010000000000000000000000000111
-    end
-    item: Static
-      Rectangle=86 8 258 42
-      Create Flags=01010000000000000000000000000000
-      Flags=0000000000000001
-      Name=Times New Roman
-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
-      Text=Select ProgMan Group
-      Text French=Sélectionner le groupe du Gestionnaire de programme 
-      Text German=Bestimmung der Programm-Managergruppe
-      Text Spanish=Seleccione grupo del Administrador de programas
-      Text Italian=Selezionare il gruppo ProgMan 
-    end
-    item: Static
-      Rectangle=86 44 256 68
-      Create Flags=01010000000000000000000000000000
-      Text=Enter the name of the Program Manager group to add the %APPTITLE% icons to:
-      Text French=Entrez le nom du groupe du Gestionnaire de programme dans lequel vous souhaitez ajouter les icônes de %APPTITLE% :
-      Text German=Geben Sie den Namen der Programmgruppe ein, der das Symbol %APPTITLE% hinzugefügt werden soll:
-      Text Spanish=Escriba el nombre del grupo del Administrador de programas en el que desea agregar los iconos de %APPTITLE%:
-      Text Italian=Inserire il nome del gruppo Program Manager per aggiungere le icone %APPTITLE% a:
-    end
-    item: Combobox
-      Rectangle=86 69 256 175
-      Variable=GROUP
-      Create Flags=01010000000000010000001000000001
-      Flags=0000000000000001
-      Text=%GROUP%
-      Text French=%GROUP%
-      Text German=%GROUP%
-      Text Spanish=%GROUP%
-      Text Italian=%GROUP%
-    end
-  end
-end
-item: Custom Dialog Set
-  Name=Start Installation
-  Display Variable=DISPLAY
-  item: Dialog
-    Title=%APPTITLE% Installation
-    Title French=Installation de %APPTITLE%
-    Title German=Installation von %APPTITLE%
-    Title Spanish=Instalación de %APPTITLE%
-    Title Italian=Installazione di %APPTITLE%
-    Width=271
-    Height=224
-    Font Name=Helv
-    Font Size=8
-    item: Push Button
-      Rectangle=150 187 195 202
-      Variable=DIRECTION
-      Value=N
-      Create Flags=01010000000000010000000000000001
-      Text=&Next >
-      Text French=&Suite >
-      Text German=&Weiter >
-      Text Spanish=&Siguiente >
-      Text Italian=&Avanti >
-    end
-    item: Push Button
-      Rectangle=105 187 150 202
-      Variable=DIRECTION
-      Value=B
-      Create Flags=01010000000000010000000000000000
-      Text=< &Back
-      Text French=< &Retour
-      Text German=< &Zurück
-      Text Spanish=< &Atrás
-      Text Italian=< &Indietro
-    end
-    item: Push Button
-      Rectangle=211 187 256 202
-      Action=3
-      Create Flags=01010000000000010000000000000000
-      Text=&Cancel
-      Text French=&Annuler
-      Text German=&Abbrechen
-      Text Spanish=&Cancelar
-      Text Italian=&Annulla
-    end
-    item: Static
-      Rectangle=8 180 256 181
-      Action=3
-      Create Flags=01010000000000000000000000000111
-    end
-    item: Static
-      Rectangle=86 8 258 42
-      Create Flags=01010000000000000000000000000000
-      Flags=0000000000000001
-      Name=Times New Roman
-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
-      Text=Ready to Install!
-      Text French=Prêt à installer !
-      Text German=Installationsbereit!
-      Text Spanish=¡Preparado para la instalación!
-      Text Italian=Pronto per l'installazione!
-    end
-    item: Static
-      Rectangle=86 42 256 102
-      Create Flags=01010000000000000000000000000000
-      Text=You are now ready to install %APPTITLE%.
-      Text=
-      Text=Press the Next button to begin the installation or the Back button to reenter the installation information.
-      Text French=Vous êtes maintenant prêt à installer les fichiers %APPTITLE%.
-      Text French=
-      Text French=Cliquez sur le bouton Suite pour commencer l'installation ou sur le bouton Retour pour entrer les informations d'installation à nouveau.
-      Text German=Sie können %APPTITLE% nun installieren.
-      Text German=
-      Text German=Klicken Sie auf "Weiter", um mit der Installation zu beginnen. Klicken Sie auf "Zurück", um die Installationsinformationen neu einzugeben.
-      Text Spanish=Ya está listo para instalar %APPTITLE%.
-      Text Spanish=
-      Text Spanish=Presione el botón Siguiente para comenzar la instalación o presione Atrás para volver a ingresar la información para la instalación.
-      Text Italian=Ora è possibile installare %APPTITLE%.
-      Text Italian=
-      Text Italian=Premere il pulsante Avanti per avviare l'installazione o il pulsante Indietro per reinserire le informazioni di installazione.
-    end
-  end
-end
-item: If/While Statement
-  Variable=DISPLAY
-  Value=Select Destination Directory
-end
-item: Set Variable
-  Variable=BACKUP
-  Value=%MAINDIR%\BACKUP
-end
-item: End Block
-end
-item: End Block
-end
-item: If/While Statement
-  Variable=TYPE
-  Value=B
-end
-item: Set Variable
-  Variable=COMPONENTS
-  Value=A
-end
-item: End Block
-end
-item: If/While Statement
-  Variable=DOBACKUP
-  Value=A
-end
-item: Set Variable
-  Variable=BACKUPDIR
-  Value=%BACKUP%
-end
-item: End Block
-end
-remarked item: If/While Statement
-  Variable=BRANDING
-  Value=1
-end
-remarked item: If/While Statement
-  Variable=DOBRAND
-  Value=1
-end
-remarked item: Edit INI File
-  Pathname=%INST%\CUSTDATA.INI
-  Settings=[Registration]
-  Settings=NAME=%NAME%
-  Settings=COMPANY=%COMPANY%
-  Settings=
-end
-remarked item: End Block
-end
-remarked item: End Block
-end
-item: Set Variable
-  Variable=MAINDIRSHORT
-  Value=%MAINDIR%
-  Flags=00010100
-end
-item: Open/Close INSTALL.LOG
-end
-item: Check Disk Space
-  Component=COMPONENTS
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\license.txt
-  Destination=%MAINDIR%\license.txt
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\win\Readme.txt
-  Destination=%MAINDIR%\Readme.txt
-  Flags=0000000000000010
-end
-item: If/While Statement
-  Variable=COMPONENTS
-  Value=D
-  Flags=00001010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\win\release\tk85.lib
-  Destination=%MAINDIR%\lib\tk85.lib
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\win\release\tkstub85.lib
-  Destination=%MAINDIR%\lib\tkstub85.lib
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\win\release\tcl85.lib
-  Destination=%MAINDIR%\lib\tcl85.lib
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\win\release\tclstub85.lib
-  Destination=%MAINDIR%\lib\tclstub85.lib
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\xlib\X11\Xutil.h
-  Destination=%MAINDIR%\include\X11\Xutil.h
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\xlib\X11\Xlib.h
-  Destination=%MAINDIR%\include\X11\Xlib.h
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\xlib\X11\Xfuncproto.h
-  Destination=%MAINDIR%\include\X11\Xfuncproto.h
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\xlib\X11\Xatom.h
-  Destination=%MAINDIR%\include\X11\Xatom.h
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\xlib\X11\X.h
-  Destination=%MAINDIR%\include\X11\X.h
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\xlib\X11\keysymdef.h
-  Destination=%MAINDIR%\include\X11\keysymdef.h
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\xlib\X11\keysym.h
-  Destination=%MAINDIR%\include\X11\keysym.h
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\xlib\X11\cursorfont.h
-  Destination=%MAINDIR%\include\X11\cursorfont.h
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\generic\tk.h
-  Destination=%MAINDIR%\include\tk.h
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\generic\tkDecls.h
-  Destination=%MAINDIR%\include\tkDecls.h
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\generic\tkPlatDecls.h
-  Destination=%MAINDIR%\include\tkPlatDecls.h
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\generic\tkIntXlibDecls.h
-  Destination=%MAINDIR%\include\tkIntXlibDecls.h
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\generic\tcl.h
-  Destination=%MAINDIR%\include\tcl.h
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\generic\tclDecls.h
-  Destination=%MAINDIR%\include\tclDecls.h
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\generic\tclPlatDecls.h
-  Destination=%MAINDIR%\include\tclPlatDecls.h
-  Flags=0000000000000010
-end
-item: End Block
-end
-item: If/While Statement
-  Variable=COMPONENTS
-  Value=A
-  Flags=00001010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\msgcat\pkgIndex.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\msgcat1.5\pkgIndex.tcl
-  Flags=0000000010000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\msgcat\msgcat.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\msgcat1.5\msgcat.tcl
-  Flags=0000000010000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\tcltest\pkgIndex.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\tcltest2.0\pkgIndex.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\tcltest\tcltest.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\tcltest2.0\tcltest.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\symbol.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\symbol.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\shiftjis.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\shiftjis.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\macUkraine.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macUkraine.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\macTurkish.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macTurkish.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\macThai.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macThai.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\macRomania.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macRomania.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\macRoman.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macRoman.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\macJapan.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macJapan.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\macIceland.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macIceland.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\macGreek.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macGreek.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\macDingbats.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macDingbats.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\macCyrillic.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macCyrillic.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\macCroatian.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macCroatian.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\macCentEuro.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macCentEuro.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\ksc5601.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\ksc5601.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\koi8-r.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\koi8-r.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\jis0212.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\jis0212.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\jis0208.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\jis0208.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\jis0201.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\jis0201.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-15.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-15.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-9.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-9.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-8.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-8.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-7.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-7.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-6.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-6.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-5.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-5.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-4.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-4.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-3.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-3.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-2.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-2.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-1.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-1.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\iso2022.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso2022.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\iso2022-kr.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso2022-kr.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\iso2022-jp.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso2022-jp.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\gb2312.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\gb2312.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\gb1988.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\gb1988.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\gb12345.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\gb12345.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\euc-cn.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\euc-cn.enc
-  Flags=0000000010000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\euc-jp.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\euc-jp.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\euc-kr.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\euc-kr.enc
-  Flags=0000000010000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\dingbats.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\dingbats.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp950.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp950.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp949.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp949.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp936.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp936.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp932.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp932.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp874.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp874.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp869.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp869.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp866.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp866.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp865.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp865.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp864.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp864.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp863.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp863.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp862.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp862.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp861.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp861.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp860.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp860.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp857.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp857.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp855.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp855.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp852.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp852.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp850.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp850.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp775.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp775.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp737.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp737.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp437.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp437.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp1258.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1258.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp1257.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1257.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp1256.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1256.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp1255.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1255.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp1254.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1254.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp1253.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1253.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp1252.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1252.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp1251.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1251.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\cp1250.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1250.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\ascii.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\ascii.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\encoding\big5.enc
-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\big5.enc
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\opt\pkgIndex.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\opt0.4\pkgIndex.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\opt\optparse.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\opt0.4\optparse.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\http\pkgIndex.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\http2.4\pkgIndex.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\http\http.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\http2.4\http.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\msgbox.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\msgbox.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\optMenu.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\optMenu.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\clrpick.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\clrpick.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\entry.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\entry.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\spinbox.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\spinbox.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\comdlg.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\comdlg.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\bgerror.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\bgerror.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\obsolete.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\obsolete.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\button.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\button.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\xmfbox.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\xmfbox.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\console.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\console.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\listbox.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\listbox.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\menu.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\menu.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\dialog.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\dialog.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\focus.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\focus.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\palette.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\palette.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\tkfbox.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\tkfbox.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\tk.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\tk.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\text.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\text.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\tearoff.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\tearoff.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\tclIndex
-  Destination=%MAINDIR%\lib\tk%VER%\tclIndex
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\scrlbar.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\scrlbar.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\scale.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\scale.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\safetk.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\safetk.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\http1.0\pkgIndex.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\http1.0\pkgIndex.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\http1.0\http.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\http1.0\http.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\reg\pkgIndex.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\reg1.0\pkgIndex.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\win\release\tclreg10.dll
-  Destination=%MAINDIR%\lib\tcl%VER%\reg1.0\tclreg10.dll
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\dde\pkgIndex.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\dde1.2\pkgIndex.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\win\release\tcldde12.dll
-  Destination=%MAINDIR%\lib\tcl%VER%\dde1.2\tcldde12.dll
-  Flags=0000000000000010
-end
-item: Install File
-  Source=C:\WINNT\SYSTEM32\Msvcrt.dll
-  Destination=%MAINDIR%\bin\msvcrt.dll
-  Flags=0010001000000011
-end
-item: Install File
-  Source=${__TKBASEDIR__}\win\release\wish85.exe
-  Destination=%MAINDIR%\bin\wish85.exe
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\win\release\tclsh85.exe
-  Destination=%MAINDIR%\bin\tclsh85.exe
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\win\release\tclpip85.dll
-  Destination=%MAINDIR%\bin\tclpip85.dll
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\win\release\tcl85.dll
-  Destination=%MAINDIR%\bin\tcl85.dll
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\win\release\tk85.dll
-  Destination=%MAINDIR%\bin\tk85.dll
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\auto.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\auto.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\history.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\history.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\init.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\init.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\package.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\package.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\parray.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\parray.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\safe.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\safe.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\tclIndex
-  Destination=%MAINDIR%\lib\tcl%VER%\tclIndex
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\library\word.tcl
-  Destination=%MAINDIR%\lib\tcl%VER%\word.tcl
-  Flags=0000000000000010
-end
-item: End Block
-end
-item: If/While Statement
-  Variable=COMPONENTS
-  Value=B
-  Flags=00001010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\images\tai-ku.gif
-  Destination=%MAINDIR%\lib\tk%VER%\images\tai-ku.gif
-  Flags=0000000010000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\images\teapot.ppm
-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\teapot.ppm
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\images\tcllogo.gif
-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\tcllogo.gif
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\images\pattern.bmp
-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\pattern.bmp
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\images\noletter.bmp
-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\noletter.bmp
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\images\letters.bmp
-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\letters.bmp
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\images\gray25.bmp
-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\gray25.bmp
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\images\flagup.bmp
-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\flagup.bmp
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\images\flagdown.bmp
-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\flagdown.bmp
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\images\face.bmp
-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\face.bmp
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\images\earthris.gif
-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\earthris.gif
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\images\earth.gif
-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\earth.gif
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\vscale.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\vscale.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\twind.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\twind.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\text.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\text.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\style.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\style.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\states.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\states.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\search.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\search.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\sayings.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\sayings.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\ruler.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\ruler.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\radio.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\radio.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\puzzle.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\puzzle.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\plot.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\plot.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\msgbox.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\msgbox.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\menubu.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\menubu.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\menu.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\menu.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\label.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\label.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\items.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\items.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\image2.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\image2.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\image1.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\image1.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\icon.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\icon.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\hscale.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\hscale.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\form.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\form.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\ixset
-  Destination=%MAINDIR%\lib\tk%VER%\demos\ixset.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\rolodex
-  Destination=%MAINDIR%\lib\tk%VER%\demos\rolodex.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\square
-  Destination=%MAINDIR%\lib\tk%VER%\demos\square.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\Readme
-  Destination=%MAINDIR%\lib\tk%VER%\demos\Readme
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\hello
-  Destination=%MAINDIR%\lib\tk%VER%\demos\hello.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\tclIndex
-  Destination=%MAINDIR%\lib\tk%VER%\demos\tclIndex
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\browse
-  Destination=%MAINDIR%\lib\tk%VER%\demos\browse.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\timer
-  Destination=%MAINDIR%\lib\tk%VER%\demos\timer.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\widget
-  Destination=%MAINDIR%\lib\tk%VER%\demos\widget.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\tcolor
-  Destination=%MAINDIR%\lib\tk%VER%\demos\tcolor.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\rmt
-  Destination=%MAINDIR%\lib\tk%VER%\demos\rmt.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\floor.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\floor.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\filebox.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\filebox.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\images\pwrdLogo75.gif
-  Destination=%MAINDIR%\lib\tk%VER%\images\pwrdLogo75.gif
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\images\pwrdLogo200.gif
-  Destination=%MAINDIR%\lib\tk%VER%\images\pwrdLogo200.gif
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\images\pwrdLogo175.gif
-  Destination=%MAINDIR%\lib\tk%VER%\images\pwrdLogo175.gif
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\images\pwrdLogo150.gif
-  Destination=%MAINDIR%\lib\tk%VER%\images\pwrdLogo150.gif
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\images\pwrdLogo100.gif
-  Destination=%MAINDIR%\lib\tk%VER%\images\pwrdLogo100.gif
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\images\logoMed.gif
-  Destination=%MAINDIR%\lib\tk%VER%\images\logoMed.gif
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\images\logoLarge.gif
-  Destination=%MAINDIR%\lib\tk%VER%\images\logoLarge.gif
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\images\logo64.gif
-  Destination=%MAINDIR%\lib\tk%VER%\images\logo64.gif
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\images\logo100.gif
-  Destination=%MAINDIR%\lib\tk%VER%\images\logo100.gif
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\images\Readme
-  Destination=%MAINDIR%\lib\tk%VER%\images\Readme
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\arrow.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\arrow.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\bind.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\bind.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\bitmap.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\bitmap.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\button.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\button.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\check.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\check.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\clrpick.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\clrpick.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\colors.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\colors.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\cscroll.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\cscroll.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\ctext.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\ctext.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\dialog1.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\dialog1.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\dialog2.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\dialog2.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\entry1.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\entry1.tcl
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TKBASEDIR__}\library\demos\entry2.tcl
-  Destination=%MAINDIR%\lib\tk%VER%\demos\entry2.tcl
-  Flags=0000000000000010
-end
-item: End Block
-end
-item: If/While Statement
-  Variable=COMPONENTS
-  Value=C
-  Flags=00001010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\tools\tcl85.cnt
-  Destination=%MAINDIR%\doc\tcl85.cnt
-  Flags=0000000000000010
-end
-item: Install File
-  Source=${__TCLBASEDIR__}\tools\tcl85.hlp
-  Destination=%MAINDIR%\doc\tcl85.hlp
-  Flags=0000000000000010
-end
-item: End Block
-end
-item: Set Variable
-  Variable=MAINDIR
-  Value=%MAINDIR%
-  Flags=00010100
-end
-item: Include Script
-  Pathname=\\pop\tools\1.2\win32-ix86\wise\INCLUDE\uninstal.wse
-end
-item: Check Configuration
-  Flags=10111011
-end
-item: Get Registry Key Value
-  Variable=GROUPDIR
-  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders
-  Default=%WIN%\Start Menu\Programs
-  Value Name=Programs
-  Flags=00000010
-end
-item: Set Variable
-  Variable=GROUP
-  Value=%GROUPDIR%\%GROUP%
-end
-item: If/While Statement
-  Variable=COMPONENTS
-  Value=A
-  Flags=00001010
-end
-item: Create Shortcut
-  Source=%MAINDIR%\bin\wish85.exe
-  Destination=%GROUP%\Wish.lnk
-  Working Directory=%MAINDIR%
-end
-item: End Block
-end
-item: If/While Statement
-  Variable=COMPONENTS
-  Value=A
-  Flags=00001010
-end
-item: Create Shortcut
-  Source=%MAINDIR%\bin\tclsh85.exe
-  Destination=%GROUP%\Tclsh.lnk
-  Working Directory=%MAINDIR%
-  Key Type=1536
-  Flags=00000001
-end
-item: End Block
-end
-item: If/While Statement
-  Variable=COMPONENTS
-  Value=C
-  Flags=00001010
-end
-item: Create Shortcut
-  Source=%MAINDIR%\doc\tcl85.hlp
-  Destination=%GROUP%\Tcl Help.lnk
-  Working Directory=%MAINDIR%
-end
-item: End Block
-end
-item: Create Shortcut
-  Source=%MAINDIR%\Readme.txt
-  Destination=%GROUP%\Readme.lnk
-  Working Directory=%MAINDIR%
-end
-item: If/While Statement
-  Variable=COMPONENTS
-  Value=B
-  Flags=00001010
-end
-item: Create Shortcut
-  Source=%MAINDIR%\lib\tk%VER%\demos\widget.tcl
-  Destination=%GROUP%\Widget Tour.lnk
-  Working Directory=%MAINDIR%
-  Key Type=1536
-  Flags=00000001
-end
-item: End Block
-end
-item: Else Statement
-end
-item: If/While Statement
-  Variable=COMPONENTS
-  Value=B
-  Flags=00001010
-end
-item: Add ProgMan Icon
-  Group=%GROUP%
-  Icon Name=Widget Tour
-  Command Line=%MAINDIR%\lib\tk%VER%\demos\widget.tcl
-  Icon Pathname=%MAINDIR%\bin\wish85.exe
-  Default Directory=%MAINDIR%
-end
-item: End Block
-end
-item: If/While Statement
-  Variable=COMPONENTS
-  Value=C
-  Flags=00001010
-end
-item: Add ProgMan Icon
-  Group=%GROUP%
-  Icon Name=Tcl Help
-  Command Line=%MAINDIR%\doc\tcl85.hlp
-  Default Directory=%MAINDIR%
-end
-item: End Block
-end
-item: Add ProgMan Icon
-  Group=%GROUP%
-  Icon Name=Readme
-  Command Line=%MAINDIR%\Readme.txt
-  Default Directory=%MAINDIR%
-end
-item: If/While Statement
-  Variable=COMPONENTS
-  Value=A
-  Flags=00001010
-end
-item: Add ProgMan Icon
-  Group=%GROUP%
-  Icon Name=Wish
-  Command Line=%MAINDIR%\bin\wish85.exe
-  Default Directory=%MAINDIR%
-end
-item: End Block
-end
-item: If/While Statement
-  Variable=COMPONENTS
-  Value=A
-  Flags=00001010
-end
-item: Add ProgMan Icon
-  Group=%GROUP%
-  Icon Name=Tclsh
-  Command Line=%MAINDIR%\bin\tclsh85.exe
-  Default Directory=%MAINDIR%
-end
-item: End Block
-end
-item: End Block
-end
-item: Self-Register OCXs/DLLs
-  Description=Updating System Configuration, Please Wait...
-end
-item: Edit Registry
-  Total Keys=1
-  Key=SOFTWARE\Scriptics\Tcl\%VER%
-  New Value=%MAINDIR%
-  Value Name=Root
-  Root=2
-end
-item: Edit Registry
-  Total Keys=1
-  Key=TclScript\DefaultIcon
-  New Value=%MAINDIR%\bin\tk85.dll
-end
-item: Edit Registry
-  Total Keys=1
-  Key=.tcl
-  New Value=TclScript
-end
-item: Edit Registry
-  Total Keys=1
-  Key=TclScript
-  New Value=TclScript
-end
-item: Edit Registry
-  Total Keys=1
-  Key=TclScript\shell\open\command
-  New Value=%MAINDIRSHORT%\bin\wish85.exe "%%1" %%*
-end
-item: Edit Registry
-  Total Keys=1
-  Key=TclScript\shell\edit
-  New Value=&Edit
-end
-item: Edit Registry
-  Total Keys=1
-  Key=TclScript\shell\edit\command
-  New Value=notepad "%%1"
-end
-item: Add Directory to Path
-  Directory=%MAINDIR%\bin
-end
-item: Check Configuration
-  Flags=10111011
-end
-item: Set Variable
-  Variable=TO_SCRIPTICS
-  Value=A
-end
-item: Else Statement
-end
-item: Set Variable
-  Variable=TO_SCRIPTICS
-end
-item: End Block
-end
-item: Wizard Block
-  Direction Variable=DIRECTION
-  Display Variable=DISPLAY
-  Bitmap Pathname=%_WISE_%\DIALOGS\TEMPLATE\WIZARD.BMP
-  X Position=9
-  Y Position=10
-  Filler Color=8421440
-  Flags=00000011
-end
-item: Custom Dialog Set
-  Name=Finished
-  Display Variable=DISPLAY
-  item: Dialog
-    Title=%APPTITLE% Installation
-    Title French=Installation de %APPTITLE%
-    Title German=Installation von %APPTITLE%
-    Title Spanish=Instalación de %APPTITLE%
-    Title Italian=Installazione di %APPTITLE%
-    Width=271
-    Height=224
-    Font Name=Helv
-    Font Size=8
-    item: Push Button
-      Rectangle=150 187 195 202
-      Variable=DIRECTION
-      Value=N
-      Create Flags=01010000000000010000000000000001
-      Text=&Finish
-      Text French=&Fin
-      Text German=&Weiter
-      Text Spanish=&Terminar
-      Text Italian=&Fine
-    end
-    item: Push Button
-      Rectangle=105 187 150 202
-      Variable=DISABLED
-      Value=!
-      Create Flags=01010000000000010000000000000000
-      Text=< &Back
-      Text French=< &Retour
-      Text German=< &Zurück
-      Text Spanish=< &Atrás
-      Text Italian=< &Indietro
-    end
-    item: Push Button
-      Rectangle=211 187 256 202
-      Variable=DISABLED
-      Value=!
-      Action=3
-      Create Flags=01010000000000010000000000000000
-      Text=&Cancel
-      Text French=&Annuler
-      Text German=&Abbrechen
-      Text Spanish=&Cancelar
-      Text Italian=&Annulla
-    end
-    item: Static
-      Rectangle=8 180 256 181
-      Action=3
-      Create Flags=01010000000000000000000000000111
-    end
-    item: Static
-      Rectangle=86 8 258 42
-      Create Flags=01010000000000000000000000000000
-      Flags=0000000000000001
-      Name=Times New Roman
-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
-      Text=Installation Completed!
-      Text French=Installation terminée !
-      Text German=Die Installation ist abgeschlossen!
-      Text Spanish=¡Instalación terminada!
-      Text Italian=Installazione completata!
-    end
-    item: Static
-      Rectangle=86 42 256 153
-      Create Flags=01010000000000000000000000000000
-      Text=%APPTITLE% has been successfully installed.
-      Text=
-      Text=Click the Finish button to exit this installation.
-      Text=
-      Text=You can learn more about Tcl/Tk %VER%, including release notes, updates, tutorials, and more at %URL%.  Check the box below to start your web browser and go there now.
-      Text=
-      Text=The installer may ask you to reboot your computer, this is to update your PATH and is not necessary to do immediately.
-      Text French=%APPTITLE% est maintenant installé.
-      Text French=
-      Text French=Cliquez sur le bouton Fin pour quitter l'installation.
-      Text German=%APPTITLE% wurde erfolgreich installiert.
-      Text German=
-      Text German=Klicken Sie auf "Weiter", um die Installation zu beenden.
-      Text Spanish=%APPTITLE% se ha instalado con éxito.
-      Text Spanish=
-      Text Spanish=Presione el botón Terminar para salir de esta instalación.
-      Text Italian=L'installazione %APPTITLE% è stata portata a termine con successo.
-      Text Italian=
-      Text Italian=Premere il pulsante Fine per uscire dall'installazione.
-    end
-    item: Checkbox
-      Rectangle=88 143 245 157
-      Variable=TO_SCRIPTICS
-      Enabled Color=00000000000000001111111111111111
-      Create Flags=01010000000000010000000000000011
-      Text=Show me important information about
-      Text=
-    end
-    item: Static
-      Rectangle=99 156 245 170
-      Enabled Color=00000000000000001111111111111111
-      Create Flags=01010000000000000000000000000000
-      Text=Tcl/Tk %VER% and TclPro
-    end
-  end
-end
-item: End Block
-end
-item: Check Configuration
-  Flags=10111011
-end
-item: If/While Statement
-  Variable=TO_SCRIPTICS
-  Value=A
-  Flags=00000010
-end
-item: Execute Program
-  Command Line=%URL%
-end
-item: End Block
-end
-item: Execute Program
-  Pathname=explorer
-  Command Line=%GROUP%
-end
-item: End Block
-end
+Document Type: WSE
+item: Global
+  Version=6.01
+  Title=Tcl 8.5 for Windows Installation
+  Flags=00010100
+  Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+  Japanese Font Name=MS Gothic
+  Japanese Font Size=10
+  Start Gradient=0 0 255
+  End Gradient=0 0 0
+  Windows Flags=00000000000000010010110000001000
+  Log Pathname=%MAINDIR%\INSTALL.LOG
+  Message Font=MS Sans Serif
+  Font Size=8
+  Disk Label=tcl8.5.18
+  Disk Filename=setup
+  Patch Flags=0000000000000001
+  Patch Threshold=85
+  Patch Memory=4000
+  Variable Name1=_SYS_
+  Variable Default1=C:\WINDOWS\SYSTEM
+  Variable Flags1=00001000
+  Variable Name2=_ODBC16_
+  Variable Default2=C:\WINDOWS\SYSTEM
+  Variable Flags2=00001000
+  Variable Name3=_WISE_
+  Variable Default3=${__WISE__}
+  Variable Flags3=00001000
+end
+item: Open/Close INSTALL.LOG
+  Flags=00000001
+end
+item: Check if File/Dir Exists
+  Pathname=%SYS%
+  Flags=10000100
+end
+item: Set Variable
+  Variable=SYS
+  Value=%WIN%
+end
+item: End Block
+end
+item: Set Variable
+  Variable=VER
+  Value=8.5
+end
+item: Set Variable
+  Variable=PATCHLEVEL
+  Value=${__TCL_PATCH_LEVEL__}
+end
+item: Set Variable
+  Variable=APPTITLE
+  Value=Tcl/Tk %PATCHLEVEL% for Windows
+end
+item: Set Variable
+  Variable=URL
+  Value=http://www.tcl.tk/
+end
+item: Set Variable
+  Variable=GROUP
+  Value=Tcl
+end
+item: Set Variable
+  Variable=DISABLED
+  Value=!
+end
+item: Set Variable
+  Variable=MAINDIR
+  Value=Tcl
+end
+item: Check Configuration
+  Flags=10111011
+end
+item: Get Registry Key Value
+  Variable=PROGRAM_FILES
+  Key=SOFTWARE\Microsoft\Windows\CurrentVersion
+  Default=C:\Program Files
+  Value Name=ProgramFilesDir
+  Flags=00000100
+end
+item: Set Variable
+  Variable=MAINDIR
+  Value=%PROGRAM_FILES%\%MAINDIR%
+end
+item: Set Variable
+  Variable=EXPLORER
+  Value=1
+end
+item: Else Statement
+end
+item: Set Variable
+  Variable=MAINDIR
+  Value=C:\%MAINDIR%
+end
+item: End Block
+end
+item: Set Variable
+  Variable=BACKUP
+  Value=%MAINDIR%\BACKUP
+end
+item: Set Variable
+  Variable=DOBACKUP
+  Value=B
+end
+item: Set Variable
+  Variable=BRANDING
+  Value=0
+end
+remarked item: If/While Statement
+  Variable=BRANDING
+  Value=1
+end
+remarked item: Read INI Value
+  Variable=NAME
+  Pathname=%INST%\CUSTDATA.INI
+  Section=Registration
+  Item=Name
+end
+remarked item: Read INI Value
+  Variable=COMPANY
+  Pathname=%INST%\CUSTDATA.INI
+  Section=Registration
+  Item=Company
+end
+remarked item: If/While Statement
+  Variable=NAME
+end
+remarked item: Set Variable
+  Variable=DOBRAND
+  Value=1
+end
+remarked item: End Block
+end
+remarked item: End Block
+end
+item: Set Variable
+  Variable=TYPE
+  Value=C
+end
+item: Set Variable
+  Variable=COMPONENTS
+  Value=ABC
+end
+item: Wizard Block
+  Direction Variable=DIRECTION
+  Display Variable=DISPLAY
+  X Position=0
+  Y Position=0
+  Filler Color=8421440
+  Flags=00000001
+end
+item: Custom Dialog Set
+  Name=Splash
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Bienvenue
+    Title German=Willkommen
+    Title Portuguese=Bem-vindo
+    Title Spanish=Bienvenido
+    Title Italian=Benvenuto
+    Title Danish=Velkommen
+    Title Dutch=Welkom
+    Title Norwegian=Velkommen
+    Title Swedish=Välkommen
+    Width=273
+    Height=250
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=166 214 208 228
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+    end
+    item: Push Button
+      Rectangle=212 214 254 228
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=Cancel
+    end
+    item: Static
+      Rectangle=0 0 268 233
+      Action=2
+      Enabled Color=00000000000000001111111111111111
+      Create Flags=01010000000000000000000000001011
+      Pathname=${__TCLBASEDIR__}\tools\white.bmp
+    end
+    item: Static
+      Rectangle=5 5 268 215
+      Destination Dialog=1
+      Action=2
+      Enabled Color=00000000000000001111111111111111
+      Create Flags=01010000000000000000000000001011
+      Pathname=${__TCLBASEDIR__}\tools\tclSplash.bmp
+    end
+  end
+end
+item: End Block
+end
+item: Wizard Block
+  Direction Variable=DIRECTION
+  Display Variable=DISPLAY
+  Bitmap Pathname=%_WISE_%\DIALOGS\TEMPLATE\WIZARD.BMP
+  X Position=9
+  Y Position=10
+  Filler Color=8421440
+  Dialog=Welcome
+  Dialog=Select Destination Directory
+  Dialog=Select Installation Type
+  Dialog=Select Components
+  Dialog=Select Program Manager Group
+  Variable=
+  Variable=
+  Variable=
+  Variable=TYPE
+  Variable=EXPLORER
+  Value=
+  Value=
+  Value=
+  Value=C
+  Value=1
+  Compare=0
+  Compare=0
+  Compare=0
+  Compare=1
+  Compare=0
+  Flags=00000011
+end
+item: Custom Dialog Set
+  Name=Welcome
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Installation de %APPTITLE%
+    Title German=Installation von %APPTITLE%
+    Title Spanish=Instalación de %APPTITLE%
+    Title Italian=Installazione di %APPTITLE%
+    Width=271
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Static
+      Rectangle=86 8 258 42
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=Times New Roman
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+      Text=Welcome!
+      Text French=Bienvenue !
+      Text German=Willkommen!
+      Text Spanish=¡Bienvenido!
+      Text Italian=Benvenuti!
+    end
+    item: Push Button
+      Rectangle=150 187 195 202
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suite >
+      Text German=&Weiter >
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+    end
+    item: Push Button
+      Rectangle=105 187 150 202
+      Variable=DISABLED
+      Value=!
+      Create Flags=01010000000000010000000000000000
+      Text=< &Back
+      Text French=< &Retour
+      Text German=< &Zurück
+      Text Spanish=< &Atrás
+      Text Italian=< &Indietro
+    end
+    item: Push Button
+      Rectangle=211 187 256 202
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=&Cancel
+      Text French=&Annuler
+      Text German=&Abbrechen
+      Text Spanish=&Cancelar
+      Text Italian=&Annulla
+    end
+    item: Static
+      Rectangle=85 41 255 130
+      Create Flags=01010000000000000000000000000000
+      Text=This installation program will install %APPTITLE%.
+      Text=
+      Text=Press the Next button to start the installation. You can press the Exit Setup button now if you do not want to install %APPTITLE% at this time.
+      Text=
+      Text=It is strongly recommended that you exit all Windows programs before running this installation program.
+      Text French=Ce programme d'installation va installer %APPTITLE%.
+      Text French=
+      Text French=Cliquez sur le bouton Suite pour démarrer l'installation. Vous pouvez cliquer sur le bouton Quitter l'installation si vous ne voulez pas installer %APPTITLE% tout de suite.
+      Text German=Mit diesem Installationsprogramm wird %APPTITLE% installiert.
+      Text German=
+      Text German=Klicken Sie auf "Weiter", um mit der Installation zu beginnen. Klicken Sie auf "Abbrechen", um die Installation von %APPTITLE% abzubrechen.
+      Text Spanish=Este programa de instalación instalará %APPTITLE%.
+      Text Spanish=
+      Text Spanish=Presione el botón Siguiente para iniciar la instalación. Puede presionar el botón Salir de instalación si no desea instalar %APPTITLE% en este momento.
+      Text Italian=Questo programma installerà %APPTITLE%.
+      Text Italian=
+      Text Italian=Per avvviare l'installazione premere il pulsante Avanti. Se non si desidera installare %APPTITLE% ora, premere il pulsante Esci dall'installazione.
+    end
+    item: Static
+      Rectangle=8 180 256 181
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+  end
+end
+item: Custom Dialog Set
+  Name=Select Destination Directory
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Installation de %APPTITLE%
+    Title German=Installation von %APPTITLE%
+    Title Spanish=Instalación de %APPTITLE%
+    Title Italian=Installazione di %APPTITLE%
+    Width=271
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=150 187 195 202
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suite >
+      Text German=&Weiter >
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+    end
+    item: Push Button
+      Rectangle=105 187 150 202
+      Variable=DIRECTION
+      Value=B
+      Create Flags=01010000000000010000000000000000
+      Flags=0000000000000001
+      Text=< &Back
+      Text French=< &Retour
+      Text German=< &Zurück
+      Text Spanish=< &Atrás
+      Text Italian=< &Indietro
+    end
+    item: Push Button
+      Rectangle=211 187 256 202
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=&Cancel
+      Text French=&Annuler
+      Text German=&Abbrechen
+      Text Spanish=&Cancelar
+      Text Italian=&Annulla
+    end
+    item: Static
+      Rectangle=8 180 256 181
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=86 8 258 42
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=Times New Roman
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+      Text=Select Destination Directory
+      Text French=Sélectionner le répertoire de destination
+      Text German=Zielverzeichnis wählen
+      Text Spanish=Seleccione el directorio de destino
+      Text Italian=Selezionare Directory di destinazione
+    end
+    item: Static
+      Rectangle=86 39 256 114
+      Create Flags=01010000000000000000000000000000
+      Text=Please select the directory where the %APPTITLE% files are to be installed.
+      Text=
+      Text=To install in the default directory below, click Next.
+      Text=
+      Text=To install in a different directory, click Browse and select another directory.
+      Text French=Veuillez sélectionner le répertoire dans lequel les fichiers %APPTITLE% doivent être installés.
+      Text German=Geben Sie an, in welchem Verzeichnis die %APPTITLE%-Dateien installiert werden sollen.
+      Text Spanish=Por favor seleccione el directorio donde desee instalar los archivos de %APPTITLE%.
+      Text Italian=Selezionare la directory dove verranno installati i file %APPTITLE%.
+    end
+    item: Static
+      Rectangle=86 130 256 157
+      Action=1
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Push Button
+      Rectangle=205 138 250 153
+      Variable=MAINDIR_SAVE
+      Value=%MAINDIR%
+      Destination Dialog=1
+      Action=2
+      Create Flags=01010000000000010000000000000000
+      Text=Browse
+      Text French=Parcourir
+      Text German=Durchsuchen
+      Text Spanish=Buscar
+      Text Italian=Sfoglie
+    end
+    item: Static
+      Rectangle=91 140 198 151
+      Create Flags=01010000000000000000000000000000
+      Text=%MAINDIR%
+      Text French=%MAINDIR%
+      Text German=%MAINDIR%
+      Text Spanish=%MAINDIR%
+      Text Italian=%MAINDIR%
+    end
+  end
+  item: Dialog
+    Title=Select Destination Directory
+    Title French=Sélectionner le répertoire de destination
+    Title German=Zielverzeichnis wählen
+    Title Spanish=Seleccione el directorio de destino
+    Title Italian=Selezionare Directory di destinazione
+    Width=221
+    Height=173
+    Font Name=Helv
+    Font Size=8
+    item: Listbox
+      Rectangle=5 5 163 149
+      Variable=MAINDIR
+      Create Flags=01010000100000010000000101000000
+      Flags=0000110000100010
+      Text=%MAINDIR%
+      Text French=%MAINDIR%
+      Text German=%MAINDIR%
+      Text Spanish=%MAINDIR%
+      Text Italian=%MAINDIR%
+    end
+    item: Push Button
+      Rectangle=167 6 212 21
+      Create Flags=01010000000000010000000000000001
+      Text=OK
+      Text French=OK
+      Text German=OK
+      Text Spanish=Aceptar
+      Text Italian=OK
+    end
+    item: Push Button
+      Rectangle=167 25 212 40
+      Variable=MAINDIR
+      Value=%MAINDIR_SAVE%
+      Create Flags=01010000000000010000000000000000
+      Flags=0000000000000001
+      Text=Cancel
+      Text French=Annuler
+      Text German=Abbrechen
+      Text Spanish=Cancelar
+      Text Italian=Annulla
+    end
+  end
+end
+remarked item: Custom Dialog Set
+  Name=Select Installation Type
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Installation de %APPTITLE%
+    Title German=Installation von %APPTITLE%
+    Title Spanish=Instalación de %APPTITLE%
+    Title Italian=Installazione di %APPTITLE%
+    Width=271
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=150 187 195 202
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suite >
+      Text German=&Weiter >
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+    end
+    item: Push Button
+      Rectangle=105 187 150 202
+      Variable=DIRECTION
+      Value=B
+      Create Flags=01010000000000010000000000000000
+      Text=< &Back
+      Text French=< &Retour
+      Text German=< &Zurück
+      Text Spanish=< &Atrás
+      Text Italian=< &Indietro
+    end
+    item: Push Button
+      Rectangle=211 187 256 202
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=&Cancel
+      Text French=&Annuler
+      Text German=&Abbrechen
+      Text Spanish=&Cancelar
+      Text Italian=&Annulla
+    end
+    item: Static
+      Rectangle=8 180 256 181
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=86 8 258 42
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=Times New Roman
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+      Text=Select Installation Type
+      Text French=Sélectionner les composants
+      Text German=Komponenten auswählen
+      Text Spanish=Seleccione componentes
+      Text Italian=Selezionare i componenti
+    end
+    item: Static
+      Rectangle=194 162 242 172
+      Variable=COMPONENTS
+      Value=MAINDIR
+      Create Flags=01010000000000000000000000000010
+    end
+    item: Static
+      Rectangle=194 153 242 162
+      Variable=COMPONENTS
+      Create Flags=01010000000000000000000000000010
+    end
+    item: Static
+      Rectangle=107 153 196 164
+      Create Flags=01010000000000000000000000000000
+      Text=Disk Space Required:
+      Text French=Espace disque requis :
+      Text German=Notwendiger Speicherplatz:
+      Text Spanish=Espacio requerido en el disco:
+      Text Italian=Spazio su disco necessario:
+    end
+    item: Static
+      Rectangle=107 162 196 172
+      Create Flags=01010000000000000000000000000000
+      Text=Disk Space Remaining:
+      Text French=Espace disque disponible :
+      Text German=Verbleibender Speicherplatz:
+      Text Spanish=Espacio en disco disponible:
+      Text Italian=Spazio su disco disponibile:
+    end
+    item: Static
+      Rectangle=86 145 256 175
+      Action=1
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=86 42 256 61
+      Create Flags=01010000000000000000000000000000
+      Text=Choose which type of installation to perform by selecting one of the buttons below.
+      Text French=Choisissez les composants que vous voulez installer en cochant les cases ci-dessous.
+      Text German=Wählen Sie die zu installierenden Komponenten, indem Sie in die entsprechenden Kästchen klicken.
+      Text Spanish=Elija los componentes que desee instalar marcando los cuadros de abajo.
+      Text Italian=Scegliere quali componenti installare selezionando le caselle sottostanti.
+    end
+    item: Radio Button
+      Rectangle=86 74 256 128
+      Variable=TYPE
+      Create Flags=01010000000000010000000000001001
+      Text=&Full Installation (Recommended)
+      Text=&Minimal Installation
+      Text=C&ustom Installation
+      Text=
+    end
+  end
+end
+item: Custom Dialog Set
+  Name=Select Components
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Installation de %APPTITLE%
+    Title German=Installation von %APPTITLE%
+    Title Spanish=Instalación de %APPTITLE%
+    Title Italian=Installazione di %APPTITLE%
+    Width=271
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=150 187 195 202
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suite >
+      Text German=&Weiter >
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+    end
+    item: Push Button
+      Rectangle=105 187 150 202
+      Variable=DIRECTION
+      Value=B
+      Create Flags=01010000000000010000000000000000
+      Text=< &Back
+      Text French=< &Retour
+      Text German=< &Zurück
+      Text Spanish=< &Atrás
+      Text Italian=< &Indietro
+    end
+    item: Push Button
+      Rectangle=211 187 256 202
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=&Cancel
+      Text French=&Annuler
+      Text German=&Abbrechen
+      Text Spanish=&Cancelar
+      Text Italian=&Annulla
+    end
+    item: Static
+      Rectangle=8 180 256 181
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=86 8 258 42
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=Times New Roman
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+      Text=Select Components
+      Text French=Sélectionner les composants
+      Text German=Komponenten auswählen
+      Text Spanish=Seleccione componentes
+      Text Italian=Selezionare i componenti
+    end
+    item: Checkbox
+      Rectangle=86 75 256 129
+      Variable=COMPONENTS
+      Create Flags=01010000000000010000000000000011
+      Flags=0000000000000110
+      Text=Tcl Run-Time Files
+      Text=Example Scripts
+      Text=Help Files
+      Text=Header and Library Files
+      Text=
+      Text French=Tcl Run-Time Files
+      Text French=Example Scripts
+      Text French=Help Files
+      Text French=Header and Library Files
+      Text French=
+      Text German=Tcl Run-Time Files
+      Text German=Example Scripts
+      Text German=Help Files
+      Text German=Header and Library Files
+      Text German=
+      Text Spanish=Tcl Run-Time Files
+      Text Spanish=Example Scripts
+      Text Spanish=Help Files
+      Text Spanish=Header and Library Files
+      Text Spanish=
+      Text Italian=Tcl Run-Time Files
+      Text Italian=Example Scripts
+      Text Italian=Help Files
+      Text Italian=Header and Library Files
+      Text Italian=
+    end
+    item: Static
+      Rectangle=194 162 242 172
+      Variable=COMPONENTS
+      Value=MAINDIR
+      Create Flags=01010000000000000000000000000010
+    end
+    item: Static
+      Rectangle=194 153 242 162
+      Variable=COMPONENTS
+      Create Flags=01010000000000000000000000000010
+    end
+    item: Static
+      Rectangle=107 153 196 164
+      Create Flags=01010000000000000000000000000000
+      Text=Disk Space Required:
+      Text French=Espace disque requis :
+      Text German=Notwendiger Speicherplatz:
+      Text Spanish=Espacio requerido en el disco:
+      Text Italian=Spazio su disco necessario:
+    end
+    item: Static
+      Rectangle=107 162 196 172
+      Create Flags=01010000000000000000000000000000
+      Text=Disk Space Remaining:
+      Text French=Espace disque disponible :
+      Text German=Verbleibender Speicherplatz:
+      Text Spanish=Espacio en disco disponible:
+      Text Italian=Spazio su disco disponibile:
+    end
+    item: Static
+      Rectangle=86 145 256 175
+      Action=1
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=86 42 256 61
+      Create Flags=01010000000000000000000000000000
+      Text=Choose which components to install by checking the boxes below.
+      Text French=Choisissez les composants que vous voulez installer en cochant les cases ci-dessous.
+      Text German=Wählen Sie die zu installierenden Komponenten, indem Sie in die entsprechenden Kästchen klicken.
+      Text Spanish=Elija los componentes que desee instalar marcando los cuadros de abajo.
+      Text Italian=Scegliere quali componenti installare selezionando le caselle sottostanti.
+    end
+  end
+end
+item: Custom Dialog Set
+  Name=Select Program Manager Group
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Installation de %APPTITLE%
+    Title German=Installation von %APPTITLE%
+    Title Spanish=Instalación de %APPTITLE%
+    Title Italian=Installazione di %APPTITLE%
+    Width=271
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=150 187 195 202
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suite >
+      Text German=&Weiter >
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+    end
+    item: Push Button
+      Rectangle=105 187 150 202
+      Variable=DIRECTION
+      Value=B
+      Create Flags=01010000000000010000000000000000
+      Flags=0000000000000001
+      Text=< &Back
+      Text French=< &Retour
+      Text German=< &Zurück
+      Text Spanish=< &Atrás
+      Text Italian=< &Indietro
+    end
+    item: Push Button
+      Rectangle=211 187 256 202
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=&Cancel
+      Text French=&Annuler
+      Text German=&Abbrechen
+      Text Spanish=&Cancelar
+      Text Italian=&Annulla
+    end
+    item: Static
+      Rectangle=8 180 256 181
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=86 8 258 42
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=Times New Roman
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+      Text=Select ProgMan Group
+      Text French=Sélectionner le groupe du Gestionnaire de programme
+      Text German=Bestimmung der Programm-Managergruppe
+      Text Spanish=Seleccione grupo del Administrador de programas
+      Text Italian=Selezionare il gruppo ProgMan
+    end
+    item: Static
+      Rectangle=86 44 256 68
+      Create Flags=01010000000000000000000000000000
+      Text=Enter the name of the Program Manager group to add the %APPTITLE% icons to:
+      Text French=Entrez le nom du groupe du Gestionnaire de programme dans lequel vous souhaitez ajouter les icônes de %APPTITLE% :
+      Text German=Geben Sie den Namen der Programmgruppe ein, der das Symbol %APPTITLE% hinzugefügt werden soll:
+      Text Spanish=Escriba el nombre del grupo del Administrador de programas en el que desea agregar los iconos de %APPTITLE%:
+      Text Italian=Inserire il nome del gruppo Program Manager per aggiungere le icone %APPTITLE% a:
+    end
+    item: Combobox
+      Rectangle=86 69 256 175
+      Variable=GROUP
+      Create Flags=01010000000000010000001000000001
+      Flags=0000000000000001
+      Text=%GROUP%
+      Text French=%GROUP%
+      Text German=%GROUP%
+      Text Spanish=%GROUP%
+      Text Italian=%GROUP%
+    end
+  end
+end
+item: Custom Dialog Set
+  Name=Start Installation
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Installation de %APPTITLE%
+    Title German=Installation von %APPTITLE%
+    Title Spanish=Instalación de %APPTITLE%
+    Title Italian=Installazione di %APPTITLE%
+    Width=271
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=150 187 195 202
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suite >
+      Text German=&Weiter >
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+    end
+    item: Push Button
+      Rectangle=105 187 150 202
+      Variable=DIRECTION
+      Value=B
+      Create Flags=01010000000000010000000000000000
+      Text=< &Back
+      Text French=< &Retour
+      Text German=< &Zurück
+      Text Spanish=< &Atrás
+      Text Italian=< &Indietro
+    end
+    item: Push Button
+      Rectangle=211 187 256 202
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=&Cancel
+      Text French=&Annuler
+      Text German=&Abbrechen
+      Text Spanish=&Cancelar
+      Text Italian=&Annulla
+    end
+    item: Static
+      Rectangle=8 180 256 181
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=86 8 258 42
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=Times New Roman
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+      Text=Ready to Install!
+      Text French=Prêt à installer !
+      Text German=Installationsbereit!
+      Text Spanish=¡Preparado para la instalación!
+      Text Italian=Pronto per l'installazione!
+    end
+    item: Static
+      Rectangle=86 42 256 102
+      Create Flags=01010000000000000000000000000000
+      Text=You are now ready to install %APPTITLE%.
+      Text=
+      Text=Press the Next button to begin the installation or the Back button to reenter the installation information.
+      Text French=Vous êtes maintenant prêt à installer les fichiers %APPTITLE%.
+      Text French=
+      Text French=Cliquez sur le bouton Suite pour commencer l'installation ou sur le bouton Retour pour entrer les informations d'installation à nouveau.
+      Text German=Sie können %APPTITLE% nun installieren.
+      Text German=
+      Text German=Klicken Sie auf "Weiter", um mit der Installation zu beginnen. Klicken Sie auf "Zurück", um die Installationsinformationen neu einzugeben.
+      Text Spanish=Ya está listo para instalar %APPTITLE%.
+      Text Spanish=
+      Text Spanish=Presione el botón Siguiente para comenzar la instalación o presione Atrás para volver a ingresar la información para la instalación.
+      Text Italian=Ora è possibile installare %APPTITLE%.
+      Text Italian=
+      Text Italian=Premere il pulsante Avanti per avviare l'installazione o il pulsante Indietro per reinserire le informazioni di installazione.
+    end
+  end
+end
+item: If/While Statement
+  Variable=DISPLAY
+  Value=Select Destination Directory
+end
+item: Set Variable
+  Variable=BACKUP
+  Value=%MAINDIR%\BACKUP
+end
+item: End Block
+end
+item: End Block
+end
+item: If/While Statement
+  Variable=TYPE
+  Value=B
+end
+item: Set Variable
+  Variable=COMPONENTS
+  Value=A
+end
+item: End Block
+end
+item: If/While Statement
+  Variable=DOBACKUP
+  Value=A
+end
+item: Set Variable
+  Variable=BACKUPDIR
+  Value=%BACKUP%
+end
+item: End Block
+end
+remarked item: If/While Statement
+  Variable=BRANDING
+  Value=1
+end
+remarked item: If/While Statement
+  Variable=DOBRAND
+  Value=1
+end
+remarked item: Edit INI File
+  Pathname=%INST%\CUSTDATA.INI
+  Settings=[Registration]
+  Settings=NAME=%NAME%
+  Settings=COMPANY=%COMPANY%
+  Settings=
+end
+remarked item: End Block
+end
+remarked item: End Block
+end
+item: Set Variable
+  Variable=MAINDIRSHORT
+  Value=%MAINDIR%
+  Flags=00010100
+end
+item: Open/Close INSTALL.LOG
+end
+item: Check Disk Space
+  Component=COMPONENTS
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\license.txt
+  Destination=%MAINDIR%\license.txt
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\win\Readme.txt
+  Destination=%MAINDIR%\Readme.txt
+  Flags=0000000000000010
+end
+item: If/While Statement
+  Variable=COMPONENTS
+  Value=D
+  Flags=00001010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\win\release\tk85.lib
+  Destination=%MAINDIR%\lib\tk85.lib
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\win\release\tkstub85.lib
+  Destination=%MAINDIR%\lib\tkstub85.lib
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\win\release\tcl85.lib
+  Destination=%MAINDIR%\lib\tcl85.lib
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\win\release\tclstub85.lib
+  Destination=%MAINDIR%\lib\tclstub85.lib
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\xlib\X11\Xutil.h
+  Destination=%MAINDIR%\include\X11\Xutil.h
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\xlib\X11\Xlib.h
+  Destination=%MAINDIR%\include\X11\Xlib.h
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\xlib\X11\Xfuncproto.h
+  Destination=%MAINDIR%\include\X11\Xfuncproto.h
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\xlib\X11\Xatom.h
+  Destination=%MAINDIR%\include\X11\Xatom.h
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\xlib\X11\X.h
+  Destination=%MAINDIR%\include\X11\X.h
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\xlib\X11\keysymdef.h
+  Destination=%MAINDIR%\include\X11\keysymdef.h
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\xlib\X11\keysym.h
+  Destination=%MAINDIR%\include\X11\keysym.h
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\xlib\X11\cursorfont.h
+  Destination=%MAINDIR%\include\X11\cursorfont.h
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\generic\tk.h
+  Destination=%MAINDIR%\include\tk.h
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\generic\tkDecls.h
+  Destination=%MAINDIR%\include\tkDecls.h
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\generic\tkPlatDecls.h
+  Destination=%MAINDIR%\include\tkPlatDecls.h
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\generic\tkIntXlibDecls.h
+  Destination=%MAINDIR%\include\tkIntXlibDecls.h
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\generic\tcl.h
+  Destination=%MAINDIR%\include\tcl.h
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\generic\tclDecls.h
+  Destination=%MAINDIR%\include\tclDecls.h
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\generic\tclPlatDecls.h
+  Destination=%MAINDIR%\include\tclPlatDecls.h
+  Flags=0000000000000010
+end
+item: End Block
+end
+item: If/While Statement
+  Variable=COMPONENTS
+  Value=A
+  Flags=00001010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\msgcat\pkgIndex.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\msgcat1.5\pkgIndex.tcl
+  Flags=0000000010000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\msgcat\msgcat.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\msgcat1.5\msgcat.tcl
+  Flags=0000000010000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\tcltest\pkgIndex.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\tcltest2.0\pkgIndex.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\tcltest\tcltest.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\tcltest2.0\tcltest.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\symbol.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\symbol.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\shiftjis.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\shiftjis.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\macUkraine.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macUkraine.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\macTurkish.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macTurkish.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\macThai.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macThai.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\macRomania.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macRomania.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\macRoman.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macRoman.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\macJapan.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macJapan.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\macIceland.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macIceland.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\macGreek.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macGreek.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\macDingbats.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macDingbats.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\macCyrillic.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macCyrillic.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\macCroatian.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macCroatian.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\macCentEuro.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macCentEuro.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\ksc5601.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\ksc5601.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\koi8-r.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\koi8-r.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\jis0212.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\jis0212.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\jis0208.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\jis0208.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\jis0201.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\jis0201.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\iso8859-15.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-15.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\iso8859-9.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-9.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\iso8859-8.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-8.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\iso8859-7.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-7.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\iso8859-6.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-6.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\iso8859-5.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-5.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\iso8859-4.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-4.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\iso8859-3.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-3.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\iso8859-2.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-2.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\iso8859-1.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-1.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\iso2022.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso2022.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\iso2022-kr.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso2022-kr.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\iso2022-jp.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso2022-jp.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\gb2312.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\gb2312.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\gb1988.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\gb1988.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\gb12345.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\gb12345.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\euc-cn.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\euc-cn.enc
+  Flags=0000000010000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\euc-jp.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\euc-jp.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\euc-kr.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\euc-kr.enc
+  Flags=0000000010000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\dingbats.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\dingbats.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp950.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp950.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp949.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp949.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp936.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp936.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp932.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp932.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp874.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp874.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp869.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp869.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp866.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp866.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp865.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp865.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp864.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp864.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp863.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp863.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp862.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp862.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp861.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp861.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp860.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp860.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp857.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp857.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp855.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp855.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp852.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp852.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp850.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp850.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp775.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp775.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp737.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp737.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp437.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp437.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp1258.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1258.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp1257.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1257.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp1256.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1256.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp1255.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1255.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp1254.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1254.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp1253.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1253.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp1252.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1252.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp1251.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1251.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\cp1250.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1250.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\ascii.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\ascii.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\encoding\big5.enc
+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\big5.enc
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\opt\pkgIndex.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\opt0.4\pkgIndex.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\opt\optparse.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\opt0.4\optparse.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\http\pkgIndex.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\http2.4\pkgIndex.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\http\http.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\http2.4\http.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\msgbox.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\msgbox.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\optMenu.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\optMenu.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\clrpick.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\clrpick.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\entry.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\entry.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\spinbox.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\spinbox.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\comdlg.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\comdlg.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\bgerror.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\bgerror.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\obsolete.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\obsolete.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\button.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\button.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\xmfbox.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\xmfbox.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\console.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\console.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\listbox.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\listbox.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\menu.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\menu.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\dialog.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\dialog.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\focus.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\focus.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\palette.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\palette.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\tkfbox.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\tkfbox.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\tk.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\tk.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\text.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\text.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\tearoff.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\tearoff.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\tclIndex
+  Destination=%MAINDIR%\lib\tk%VER%\tclIndex
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\scrlbar.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\scrlbar.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\scale.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\scale.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\safetk.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\safetk.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\http1.0\pkgIndex.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\http1.0\pkgIndex.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\http1.0\http.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\http1.0\http.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\reg\pkgIndex.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\reg1.0\pkgIndex.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\win\release\tclreg10.dll
+  Destination=%MAINDIR%\lib\tcl%VER%\reg1.0\tclreg10.dll
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\dde\pkgIndex.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\dde1.2\pkgIndex.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\win\release\tcldde12.dll
+  Destination=%MAINDIR%\lib\tcl%VER%\dde1.2\tcldde12.dll
+  Flags=0000000000000010
+end
+item: Install File
+  Source=C:\WINNT\SYSTEM32\Msvcrt.dll
+  Destination=%MAINDIR%\bin\msvcrt.dll
+  Flags=0010001000000011
+end
+item: Install File
+  Source=${__TKBASEDIR__}\win\release\wish85.exe
+  Destination=%MAINDIR%\bin\wish85.exe
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\win\release\tclsh85.exe
+  Destination=%MAINDIR%\bin\tclsh85.exe
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\win\release\tclpip85.dll
+  Destination=%MAINDIR%\bin\tclpip85.dll
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\win\release\tcl85.dll
+  Destination=%MAINDIR%\bin\tcl85.dll
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\win\release\tk85.dll
+  Destination=%MAINDIR%\bin\tk85.dll
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\auto.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\auto.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\history.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\history.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\init.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\init.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\package.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\package.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\parray.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\parray.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\safe.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\safe.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\tclIndex
+  Destination=%MAINDIR%\lib\tcl%VER%\tclIndex
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\library\word.tcl
+  Destination=%MAINDIR%\lib\tcl%VER%\word.tcl
+  Flags=0000000000000010
+end
+item: End Block
+end
+item: If/While Statement
+  Variable=COMPONENTS
+  Value=B
+  Flags=00001010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\images\tai-ku.gif
+  Destination=%MAINDIR%\lib\tk%VER%\images\tai-ku.gif
+  Flags=0000000010000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\images\teapot.ppm
+  Destination=%MAINDIR%\lib\tk%VER%\demos\images\teapot.ppm
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\images\tcllogo.gif
+  Destination=%MAINDIR%\lib\tk%VER%\demos\images\tcllogo.gif
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\images\pattern.bmp
+  Destination=%MAINDIR%\lib\tk%VER%\demos\images\pattern.bmp
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\images\noletter.bmp
+  Destination=%MAINDIR%\lib\tk%VER%\demos\images\noletter.bmp
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\images\letters.bmp
+  Destination=%MAINDIR%\lib\tk%VER%\demos\images\letters.bmp
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\images\gray25.bmp
+  Destination=%MAINDIR%\lib\tk%VER%\demos\images\gray25.bmp
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\images\flagup.bmp
+  Destination=%MAINDIR%\lib\tk%VER%\demos\images\flagup.bmp
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\images\flagdown.bmp
+  Destination=%MAINDIR%\lib\tk%VER%\demos\images\flagdown.bmp
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\images\face.bmp
+  Destination=%MAINDIR%\lib\tk%VER%\demos\images\face.bmp
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\images\earthris.gif
+  Destination=%MAINDIR%\lib\tk%VER%\demos\images\earthris.gif
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\images\earth.gif
+  Destination=%MAINDIR%\lib\tk%VER%\demos\images\earth.gif
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\vscale.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\vscale.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\twind.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\twind.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\text.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\text.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\style.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\style.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\states.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\states.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\search.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\search.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\sayings.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\sayings.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\ruler.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\ruler.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\radio.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\radio.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\puzzle.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\puzzle.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\plot.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\plot.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\msgbox.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\msgbox.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\menubu.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\menubu.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\menu.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\menu.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\label.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\label.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\items.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\items.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\image2.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\image2.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\image1.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\image1.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\icon.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\icon.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\hscale.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\hscale.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\form.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\form.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\ixset
+  Destination=%MAINDIR%\lib\tk%VER%\demos\ixset.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\rolodex
+  Destination=%MAINDIR%\lib\tk%VER%\demos\rolodex.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\square
+  Destination=%MAINDIR%\lib\tk%VER%\demos\square.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\Readme
+  Destination=%MAINDIR%\lib\tk%VER%\demos\Readme
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\hello
+  Destination=%MAINDIR%\lib\tk%VER%\demos\hello.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\tclIndex
+  Destination=%MAINDIR%\lib\tk%VER%\demos\tclIndex
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\browse
+  Destination=%MAINDIR%\lib\tk%VER%\demos\browse.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\timer
+  Destination=%MAINDIR%\lib\tk%VER%\demos\timer.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\widget
+  Destination=%MAINDIR%\lib\tk%VER%\demos\widget.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\tcolor
+  Destination=%MAINDIR%\lib\tk%VER%\demos\tcolor.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\rmt
+  Destination=%MAINDIR%\lib\tk%VER%\demos\rmt.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\floor.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\floor.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\filebox.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\filebox.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\images\pwrdLogo75.gif
+  Destination=%MAINDIR%\lib\tk%VER%\images\pwrdLogo75.gif
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\images\pwrdLogo200.gif
+  Destination=%MAINDIR%\lib\tk%VER%\images\pwrdLogo200.gif
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\images\pwrdLogo175.gif
+  Destination=%MAINDIR%\lib\tk%VER%\images\pwrdLogo175.gif
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\images\pwrdLogo150.gif
+  Destination=%MAINDIR%\lib\tk%VER%\images\pwrdLogo150.gif
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\images\pwrdLogo100.gif
+  Destination=%MAINDIR%\lib\tk%VER%\images\pwrdLogo100.gif
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\images\logoMed.gif
+  Destination=%MAINDIR%\lib\tk%VER%\images\logoMed.gif
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\images\logoLarge.gif
+  Destination=%MAINDIR%\lib\tk%VER%\images\logoLarge.gif
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\images\logo64.gif
+  Destination=%MAINDIR%\lib\tk%VER%\images\logo64.gif
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\images\logo100.gif
+  Destination=%MAINDIR%\lib\tk%VER%\images\logo100.gif
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\images\Readme
+  Destination=%MAINDIR%\lib\tk%VER%\images\Readme
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\arrow.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\arrow.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\bind.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\bind.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\bitmap.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\bitmap.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\button.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\button.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\check.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\check.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\clrpick.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\clrpick.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\colors.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\colors.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\cscroll.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\cscroll.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\ctext.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\ctext.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\dialog1.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\dialog1.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\dialog2.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\dialog2.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\entry1.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\entry1.tcl
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TKBASEDIR__}\library\demos\entry2.tcl
+  Destination=%MAINDIR%\lib\tk%VER%\demos\entry2.tcl
+  Flags=0000000000000010
+end
+item: End Block
+end
+item: If/While Statement
+  Variable=COMPONENTS
+  Value=C
+  Flags=00001010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\tools\tcl85.cnt
+  Destination=%MAINDIR%\doc\tcl85.cnt
+  Flags=0000000000000010
+end
+item: Install File
+  Source=${__TCLBASEDIR__}\tools\tcl85.hlp
+  Destination=%MAINDIR%\doc\tcl85.hlp
+  Flags=0000000000000010
+end
+item: End Block
+end
+item: Set Variable
+  Variable=MAINDIR
+  Value=%MAINDIR%
+  Flags=00010100
+end
+item: Include Script
+  Pathname=\\pop\tools\1.2\win32-ix86\wise\INCLUDE\uninstal.wse
+end
+item: Check Configuration
+  Flags=10111011
+end
+item: Get Registry Key Value
+  Variable=GROUPDIR
+  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders
+  Default=%WIN%\Start Menu\Programs
+  Value Name=Programs
+  Flags=00000010
+end
+item: Set Variable
+  Variable=GROUP
+  Value=%GROUPDIR%\%GROUP%
+end
+item: If/While Statement
+  Variable=COMPONENTS
+  Value=A
+  Flags=00001010
+end
+item: Create Shortcut
+  Source=%MAINDIR%\bin\wish85.exe
+  Destination=%GROUP%\Wish.lnk
+  Working Directory=%MAINDIR%
+end
+item: End Block
+end
+item: If/While Statement
+  Variable=COMPONENTS
+  Value=A
+  Flags=00001010
+end
+item: Create Shortcut
+  Source=%MAINDIR%\bin\tclsh85.exe
+  Destination=%GROUP%\Tclsh.lnk
+  Working Directory=%MAINDIR%
+  Key Type=1536
+  Flags=00000001
+end
+item: End Block
+end
+item: If/While Statement
+  Variable=COMPONENTS
+  Value=C
+  Flags=00001010
+end
+item: Create Shortcut
+  Source=%MAINDIR%\doc\tcl85.hlp
+  Destination=%GROUP%\Tcl Help.lnk
+  Working Directory=%MAINDIR%
+end
+item: End Block
+end
+item: Create Shortcut
+  Source=%MAINDIR%\Readme.txt
+  Destination=%GROUP%\Readme.lnk
+  Working Directory=%MAINDIR%
+end
+item: If/While Statement
+  Variable=COMPONENTS
+  Value=B
+  Flags=00001010
+end
+item: Create Shortcut
+  Source=%MAINDIR%\lib\tk%VER%\demos\widget.tcl
+  Destination=%GROUP%\Widget Tour.lnk
+  Working Directory=%MAINDIR%
+  Key Type=1536
+  Flags=00000001
+end
+item: End Block
+end
+item: Else Statement
+end
+item: If/While Statement
+  Variable=COMPONENTS
+  Value=B
+  Flags=00001010
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Widget Tour
+  Command Line=%MAINDIR%\lib\tk%VER%\demos\widget.tcl
+  Icon Pathname=%MAINDIR%\bin\wish85.exe
+  Default Directory=%MAINDIR%
+end
+item: End Block
+end
+item: If/While Statement
+  Variable=COMPONENTS
+  Value=C
+  Flags=00001010
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Tcl Help
+  Command Line=%MAINDIR%\doc\tcl85.hlp
+  Default Directory=%MAINDIR%
+end
+item: End Block
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Readme
+  Command Line=%MAINDIR%\Readme.txt
+  Default Directory=%MAINDIR%
+end
+item: If/While Statement
+  Variable=COMPONENTS
+  Value=A
+  Flags=00001010
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Wish
+  Command Line=%MAINDIR%\bin\wish85.exe
+  Default Directory=%MAINDIR%
+end
+item: End Block
+end
+item: If/While Statement
+  Variable=COMPONENTS
+  Value=A
+  Flags=00001010
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Tclsh
+  Command Line=%MAINDIR%\bin\tclsh85.exe
+  Default Directory=%MAINDIR%
+end
+item: End Block
+end
+item: End Block
+end
+item: Self-Register OCXs/DLLs
+  Description=Updating System Configuration, Please Wait...
+end
+item: Edit Registry
+  Total Keys=1
+  Key=SOFTWARE\Scriptics\Tcl\%VER%
+  New Value=%MAINDIR%
+  Value Name=Root
+  Root=2
+end
+item: Edit Registry
+  Total Keys=1
+  Key=TclScript\DefaultIcon
+  New Value=%MAINDIR%\bin\tk85.dll
+end
+item: Edit Registry
+  Total Keys=1
+  Key=.tcl
+  New Value=TclScript
+end
+item: Edit Registry
+  Total Keys=1
+  Key=TclScript
+  New Value=TclScript
+end
+item: Edit Registry
+  Total Keys=1
+  Key=TclScript\shell\open\command
+  New Value=%MAINDIRSHORT%\bin\wish85.exe "%%1" %%*
+end
+item: Edit Registry
+  Total Keys=1
+  Key=TclScript\shell\edit
+  New Value=&Edit
+end
+item: Edit Registry
+  Total Keys=1
+  Key=TclScript\shell\edit\command
+  New Value=notepad "%%1"
+end
+item: Add Directory to Path
+  Directory=%MAINDIR%\bin
+end
+item: Check Configuration
+  Flags=10111011
+end
+item: Set Variable
+  Variable=TO_SCRIPTICS
+  Value=A
+end
+item: Else Statement
+end
+item: Set Variable
+  Variable=TO_SCRIPTICS
+end
+item: End Block
+end
+item: Wizard Block
+  Direction Variable=DIRECTION
+  Display Variable=DISPLAY
+  Bitmap Pathname=%_WISE_%\DIALOGS\TEMPLATE\WIZARD.BMP
+  X Position=9
+  Y Position=10
+  Filler Color=8421440
+  Flags=00000011
+end
+item: Custom Dialog Set
+  Name=Finished
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Installation de %APPTITLE%
+    Title German=Installation von %APPTITLE%
+    Title Spanish=Instalación de %APPTITLE%
+    Title Italian=Installazione di %APPTITLE%
+    Width=271
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=150 187 195 202
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Finish
+      Text French=&Fin
+      Text German=&Weiter
+      Text Spanish=&Terminar
+      Text Italian=&Fine
+    end
+    item: Push Button
+      Rectangle=105 187 150 202
+      Variable=DISABLED
+      Value=!
+      Create Flags=01010000000000010000000000000000
+      Text=< &Back
+      Text French=< &Retour
+      Text German=< &Zurück
+      Text Spanish=< &Atrás
+      Text Italian=< &Indietro
+    end
+    item: Push Button
+      Rectangle=211 187 256 202
+      Variable=DISABLED
+      Value=!
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=&Cancel
+      Text French=&Annuler
+      Text German=&Abbrechen
+      Text Spanish=&Cancelar
+      Text Italian=&Annulla
+    end
+    item: Static
+      Rectangle=8 180 256 181
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=86 8 258 42
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=Times New Roman
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+      Text=Installation Completed!
+      Text French=Installation terminée !
+      Text German=Die Installation ist abgeschlossen!
+      Text Spanish=¡Instalación terminada!
+      Text Italian=Installazione completata!
+    end
+    item: Static
+      Rectangle=86 42 256 153
+      Create Flags=01010000000000000000000000000000
+      Text=%APPTITLE% has been successfully installed.
+      Text=
+      Text=Click the Finish button to exit this installation.
+      Text=
+      Text=You can learn more about Tcl/Tk %VER%, including release notes, updates, tutorials, and more at %URL%.  Check the box below to start your web browser and go there now.
+      Text=
+      Text=The installer may ask you to reboot your computer, this is to update your PATH and is not necessary to do immediately.
+      Text French=%APPTITLE% est maintenant installé.
+      Text French=
+      Text French=Cliquez sur le bouton Fin pour quitter l'installation.
+      Text German=%APPTITLE% wurde erfolgreich installiert.
+      Text German=
+      Text German=Klicken Sie auf "Weiter", um die Installation zu beenden.
+      Text Spanish=%APPTITLE% se ha instalado con éxito.
+      Text Spanish=
+      Text Spanish=Presione el botón Terminar para salir de esta instalación.
+      Text Italian=L'installazione %APPTITLE% è stata portata a termine con successo.
+      Text Italian=
+      Text Italian=Premere il pulsante Fine per uscire dall'installazione.
+    end
+    item: Checkbox
+      Rectangle=88 143 245 157
+      Variable=TO_SCRIPTICS
+      Enabled Color=00000000000000001111111111111111
+      Create Flags=01010000000000010000000000000011
+      Text=Show me important information about
+      Text=
+    end
+    item: Static
+      Rectangle=99 156 245 170
+      Enabled Color=00000000000000001111111111111111
+      Create Flags=01010000000000000000000000000000
+      Text=Tcl/Tk %VER% and TclPro
+    end
+  end
+end
+item: End Block
+end
+item: Check Configuration
+  Flags=10111011
+end
+item: If/While Statement
+  Variable=TO_SCRIPTICS
+  Value=A
+  Flags=00000010
+end
+item: Execute Program
+  Command Line=%URL%
+end
+item: End Block
+end
+item: Execute Program
+  Pathname=explorer
+  Command Line=%GROUP%
+end
+item: End Block
+end
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 4fcdd14..1358f29 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1660,7 +1660,6 @@ $(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac $(UNIX_DIR)/configure
 $(UNIX_DIR)/tclConfig.h.in: $(MAC_OSX_DIR)/configure
 	cd $(MAC_OSX_DIR); autoheader; touch $@
 
-EOLFIX=$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl
 dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(MAC_OSX_DIR)/configure genstubs
 	rm -rf $(DISTDIR)
 	mkdir -p $(DISTDIR)/unix
@@ -1721,17 +1720,11 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(M
 	cp -p $(TOP_DIR)/win/*.[ch] $(TOP_DIR)/win/*.ico $(TOP_DIR)/win/*.rc \
 		$(DISTDIR)/win
 	cp -p $(TOP_DIR)/win/*.bat $(DISTDIR)/win
-	@$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/*.bat
 	cp -p $(TOP_DIR)/win/makefile.* $(DISTDIR)/win
-	@$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/makefile.bc $(DISTDIR)/win/makefile.vc
 	cp -p $(TOP_DIR)/win/rules.vc $(DISTDIR)/win
-	@$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rules.vc
 	cp -p $(TOP_DIR)/win/coffbase.txt $(DISTDIR)/win
-	@$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/coffbase.txt
 	cp -p $(TOP_DIR)/win/tcl.hpj.in $(DISTDIR)/win
-	@$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/tcl.hpj.in
 	cp -p $(TOP_DIR)/win/tcl.ds* $(DISTDIR)/win
-	@$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/tcl.ds*
 	cp -p $(TOP_DIR)/win/README $(DISTDIR)/win
 	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/win
 	@mkdir $(DISTDIR)/macosx
@@ -1757,8 +1750,6 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(M
 		$(TOOL_DIR)/tcl.wse.in $(TOOL_DIR)/*.bmp \
 		$(TOOL_DIR)/tcl.hpj.in \
 		$(DISTDIR)/tools
-	@$(EOLFIX) -crlf $(DISTDIR)/tools/tcl.hpj.in \
-		$(DISTDIR)/tools/tcl.wse.in
 	@mkdir $(DISTDIR)/libtommath
 	cp -p $(TOMMATH_SRCS) $(TOMMATH_DIR)/*.h \
 		$(DISTDIR)/libtommath
diff --git a/unix/configure.in b/unix/configure.in
index e9f5aa5..6c7cc09 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -165,7 +165,7 @@ AC_CHECK_FUNC(realpath, , [AC_DEFINE(NO_REALPATH, 1, [Do we have realpath()])])
 
 SC_TCL_GETADDRINFO
 
-#-------------------------------------------------------------------- 
+#--------------------------------------------------------------------
 #	Look for thread-safe variants of some library functions.
 #--------------------------------------------------------------------
 
@@ -339,7 +339,7 @@ AC_CHECK_TYPE([intptr_t], [
     for tcl_cv_intptr_t in "int" "long" "long long" none; do
 	if test "$tcl_cv_intptr_t" != none; then
 	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT],
-		    [[sizeof (void *) <= sizeof ($tcl_cv_intptr_t)]])], 
+		    [[sizeof (void *) <= sizeof ($tcl_cv_intptr_t)]])],
 		[tcl_ok=yes], [tcl_ok=no])
 	    test "$tcl_ok" = yes && break; fi
     done])
@@ -355,7 +355,7 @@ AC_CHECK_TYPE([uintptr_t], [
 	    none; do
 	if test "$tcl_cv_uintptr_t" != none; then
 	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT],
-		    [[sizeof (void *) <= sizeof ($tcl_cv_uintptr_t)]])], 
+		    [[sizeof (void *) <= sizeof ($tcl_cv_uintptr_t)]])],
 		[tcl_ok=yes], [tcl_ok=no])
 	    test "$tcl_ok" = yes && break; fi
     done])
@@ -622,7 +622,7 @@ AC_ARG_WITH(tzdata,
 # Any directories that get added here must also be added to the
 # search path in ::tcl::clock::Initialize (library/clock.tcl).
 #
-case $tcl_ok in 
+case $tcl_ok in
     no)
 	AC_MSG_RESULT([supplied by OS vendor])
     ;;
@@ -649,7 +649,7 @@ case $tcl_ok in
 	fi
     ;;
     *)
-	AC_MSG_ERROR([invalid argument: $tcl_ok])	
+	AC_MSG_ERROR([invalid argument: $tcl_ok])
     ;;
 esac
 if test $tcl_ok = yes
@@ -749,7 +749,7 @@ TCL_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX}
 eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
 
 # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
-# since on some platforms TCL_LIB_FILE contains shell escapes. 
+# since on some platforms TCL_LIB_FILE contains shell escapes.
 # (See also: TCL_TRIM_DOTS).
 
 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
diff --git a/unix/tcl.spec b/unix/tcl.spec
index 940fd1e..76ab925 100644
--- a/unix/tcl.spec
+++ b/unix/tcl.spec
@@ -30,7 +30,7 @@ CFLAGS="%optflags" ./configure \
 	--prefix=%{directory} \
 	--exec-prefix=%{directory} \
 	--libdir=%{directory}/%{_lib}
-make 
+make
 
 %install
 cd unix
diff --git a/unix/tclConfig.h.in b/unix/tclConfig.h.in
index 9774ce9..710949f 100644
--- a/unix/tclConfig.h.in
+++ b/unix/tclConfig.h.in
@@ -4,6 +4,9 @@
     #ifndef _TCLCONFIG
     #define _TCLCONFIG
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Is pthread_attr_get_np() declared in <pthread.h>? */
 #undef ATTRGETNP_NOT_DECLARED
 
@@ -196,10 +199,10 @@
 /* Is 'struct stat64' in <sys/stat.h>? */
 #undef HAVE_STRUCT_STAT64
 
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
-/* Define to 1 if `st_blocks' is member of `struct stat'. */
+/* Define to 1 if `st_blocks' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLOCKS
 
 /* Define to 1 if you have the <sys/filio.h> header file. */
@@ -334,6 +337,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -427,9 +433,17 @@
 /* Should we use vfork() instead of fork()? */
 #undef USE_VFORK
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
 
 /* Are Darwin SUSv3 extensions available? */
 #undef _DARWIN_C_SOURCE
@@ -484,7 +498,7 @@
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
 /* Define as int if socklen_t is not available */
diff --git a/win/buildall.vc.bat b/win/buildall.vc.bat
index 0c9b3ac..1a0f36d 100644
--- a/win/buildall.vc.bat
+++ b/win/buildall.vc.bat
@@ -1,103 +1,103 @@
-@echo off
-
-::  This is an example batchfile for building everything. Please
-::  edit this (or make your own) for your needs and wants using
-::  the instructions for calling makefile.vc found in makefile.vc
-
-set SYMBOLS=
-
-:OPTIONS
-if "%1" == "/?" goto help
-if /i "%1" == "/help" goto help
-if %1.==symbols. goto SYMBOLS
-if %1.==debug. goto SYMBOLS
-goto OPTIONS_DONE
-
-:SYMBOLS
-   set SYMBOLS=symbols
-   shift
-   goto OPTIONS
-
-:OPTIONS_DONE
-
-:: reset errorlevel
-cd > nul
-
-:: You might have installed your developer studio to add itself to the
-:: path or have already run vcvars32.bat.  Testing these envars proves
-:: cl.exe and friends are in your path.
-::
-if defined VCINSTALLDIR  (goto :startBuilding)
-if defined MSDEVDIR      (goto :startBuilding)
-if defined MSVCDIR       (goto :startBuilding)
-if defined MSSDK         (goto :startBuilding)
-if defined WINDOWSSDKDIR (goto :startBuilding)
-
-:: We need to run the development environment batch script that comes
-:: with developer studio (v4,5,6,7,etc...)  All have it.  This path
-:: might not be correct.  You should call it yourself prior to running
-:: this batchfile.
-::
-call "C:\Program Files\Microsoft Developer Studio\vc98\bin\vcvars32.bat"
-if errorlevel 1 (goto no_vcvars)
-
-:startBuilding
-
-echo.
-echo Sit back and have a cup of coffee while this grinds through ;)
-echo You asked for *everything*, remember?
-echo.
-title Building Tcl, please wait...
-
-
-:: makefile.vc uses this for its default anyways, but show its use here
-:: just to be explicit and convey understanding to the user.  Setting
-:: the INSTALLDIR envar prior to running this batchfile affects all builds.
-::
-if "%INSTALLDIR%" == "" set INSTALLDIR=C:\Program Files\Tcl
-
-
-:: Build the normal stuff along with the help file.
-::
-set OPTS=threads
-if not %SYMBOLS%.==. set OPTS=symbols,threads
-nmake -nologo -f makefile.vc release winhelp OPTS=%OPTS% %1
-if errorlevel 1 goto error
-
-:: Build the static core and shell.
-::
-set OPTS=static,msvcrt,threads
-if not %SYMBOLS%.==. set OPTS=symbols,static,msvcrt,threads
-nmake -nologo -f makefile.vc shell OPTS=%OPTS% %1
-if errorlevel 1 goto error
-
-set OPTS=
-set SYMBOLS=
-goto end
-
-:error
-echo *** BOOM! ***
-goto end
-
-:no_vcvars
-echo vcvars32.bat was not run prior to this batchfile, nor are the MS tools in your path.
-goto out
-
-:help
-title buildall.vc.bat help message
-echo usage:
-echo   %0                 : builds Tcl for all build types (do this first)
-echo   %0 install         : installs all the release builds (do this second)
-echo   %0 symbols         : builds Tcl for all debugging build types
-echo   %0 symbols install : install all the debug builds.
-echo.
-goto out
-
-:end
-title Building Tcl, please wait... DONE!
-echo DONE!
-goto out
-
-:out
-pause
-title Command Prompt
+@echo off
+
+::  This is an example batchfile for building everything. Please
+::  edit this (or make your own) for your needs and wants using
+::  the instructions for calling makefile.vc found in makefile.vc
+
+set SYMBOLS=
+
+:OPTIONS
+if "%1" == "/?" goto help
+if /i "%1" == "/help" goto help
+if %1.==symbols. goto SYMBOLS
+if %1.==debug. goto SYMBOLS
+goto OPTIONS_DONE
+
+:SYMBOLS
+   set SYMBOLS=symbols
+   shift
+   goto OPTIONS
+
+:OPTIONS_DONE
+
+:: reset errorlevel
+cd > nul
+
+:: You might have installed your developer studio to add itself to the
+:: path or have already run vcvars32.bat.  Testing these envars proves
+:: cl.exe and friends are in your path.
+::
+if defined VCINSTALLDIR  (goto :startBuilding)
+if defined MSDEVDIR      (goto :startBuilding)
+if defined MSVCDIR       (goto :startBuilding)
+if defined MSSDK         (goto :startBuilding)
+if defined WINDOWSSDKDIR (goto :startBuilding)
+
+:: We need to run the development environment batch script that comes
+:: with developer studio (v4,5,6,7,etc...)  All have it.  This path
+:: might not be correct.  You should call it yourself prior to running
+:: this batchfile.
+::
+call "C:\Program Files\Microsoft Developer Studio\vc98\bin\vcvars32.bat"
+if errorlevel 1 (goto no_vcvars)
+
+:startBuilding
+
+echo.
+echo Sit back and have a cup of coffee while this grinds through ;)
+echo You asked for *everything*, remember?
+echo.
+title Building Tcl, please wait...
+
+
+:: makefile.vc uses this for its default anyways, but show its use here
+:: just to be explicit and convey understanding to the user.  Setting
+:: the INSTALLDIR envar prior to running this batchfile affects all builds.
+::
+if "%INSTALLDIR%" == "" set INSTALLDIR=C:\Program Files\Tcl
+
+
+:: Build the normal stuff along with the help file.
+::
+set OPTS=threads
+if not %SYMBOLS%.==. set OPTS=symbols,threads
+nmake -nologo -f makefile.vc release winhelp OPTS=%OPTS% %1
+if errorlevel 1 goto error
+
+:: Build the static core and shell.
+::
+set OPTS=static,msvcrt,threads
+if not %SYMBOLS%.==. set OPTS=symbols,static,msvcrt,threads
+nmake -nologo -f makefile.vc shell OPTS=%OPTS% %1
+if errorlevel 1 goto error
+
+set OPTS=
+set SYMBOLS=
+goto end
+
+:error
+echo *** BOOM! ***
+goto end
+
+:no_vcvars
+echo vcvars32.bat was not run prior to this batchfile, nor are the MS tools in your path.
+goto out
+
+:help
+title buildall.vc.bat help message
+echo usage:
+echo   %0                 : builds Tcl for all build types (do this first)
+echo   %0 install         : installs all the release builds (do this second)
+echo   %0 symbols         : builds Tcl for all debugging build types
+echo   %0 symbols install : install all the debug builds.
+echo.
+goto out
+
+:end
+title Building Tcl, please wait... DONE!
+echo DONE!
+goto out
+
+:out
+pause
+title Command Prompt
diff --git a/win/coffbase.txt b/win/coffbase.txt
index bdf5506..0ebe18a 100644
--- a/win/coffbase.txt
+++ b/win/coffbase.txt
@@ -1,42 +1,42 @@
-;
-; This file defines the virtual base addresses for the Dynamic Link Libraries
-; that are part of the Tcl system.  The first token on a line is the key (or name
-; of the DLL) and the second token is the virtual base address, in hexidecimal.
-; The third token is the maximum size of the DLL image file, including symbols.
-;
-; Using a specified "prefered load address" should speed loading time by avoiding
-; relocations (NT supported only).  It is assumed extension authors will contribute
-; their modules to this grand-master list.  You can use the dumpbin utility with
-; the /headers option to get the "size of image" data (already in hex).  If the
-; maximum size is too small a linker warning will occur.  Modules can overlap when
-; they're mutually exclusive.  This info is placed in the DLL's PE header by the
-; linker with the `-base:@$(TCLDIR)\win\coffbase.txt,<key>` option.
-
-tcl		0x10000000	0x00200000
-tcldde		0x10200000	0x00010000
-tclreg		0x10210000	0x00010000
-tk		0x10220000	0x00200000
-expect		0x10480000	0x00080000
-itcl		0x10500000	0x00080000
-itk		0x10580000	0x00080000
-bltlite		0x10600000	0x00080000
-blt		0x10680000	0x00080000
-iocpsock	0x10700000	0x00080000
-tls		0x10780000	0x00100000
-winico		0x10880000	0x00010000
-sample		0x108B0000	0x00010000
-tile		0x10900000	0x00080000
-memchan		0x109D0000	0x00010000
-tdom		0x109E0000	0x00080000
-tclvfs		0x10A70000	0x00010000
-tkvideo		0x10B00000	0x00010000
-tclsdl		0x10B20000	0x00080000
-vqtcl		0x10C00000	0x00010000
-tdbc		0x10C40000	0x00010000
-thread		0x10C80000	0x00020000
-;
-; insert new packages here
-;
-snack		0x1E000000	0x00400000
-sound		0x1E400000	0x00400000
-snackogg	0x1E800000	0x00200000
+;
+; This file defines the virtual base addresses for the Dynamic Link Libraries
+; that are part of the Tcl system.  The first token on a line is the key (or name
+; of the DLL) and the second token is the virtual base address, in hexidecimal.
+; The third token is the maximum size of the DLL image file, including symbols.
+;
+; Using a specified "prefered load address" should speed loading time by avoiding
+; relocations (NT supported only).  It is assumed extension authors will contribute
+; their modules to this grand-master list.  You can use the dumpbin utility with
+; the /headers option to get the "size of image" data (already in hex).  If the
+; maximum size is too small a linker warning will occur.  Modules can overlap when
+; they're mutually exclusive.  This info is placed in the DLL's PE header by the
+; linker with the `-base:@$(TCLDIR)\win\coffbase.txt,<key>` option.
+
+tcl		0x10000000	0x00200000
+tcldde		0x10200000	0x00010000
+tclreg		0x10210000	0x00010000
+tk		0x10220000	0x00200000
+expect		0x10480000	0x00080000
+itcl		0x10500000	0x00080000
+itk		0x10580000	0x00080000
+bltlite		0x10600000	0x00080000
+blt		0x10680000	0x00080000
+iocpsock	0x10700000	0x00080000
+tls		0x10780000	0x00100000
+winico		0x10880000	0x00010000
+sample		0x108B0000	0x00010000
+tile		0x10900000	0x00080000
+memchan		0x109D0000	0x00010000
+tdom		0x109E0000	0x00080000
+tclvfs		0x10A70000	0x00010000
+tkvideo		0x10B00000	0x00010000
+tclsdl		0x10B20000	0x00080000
+vqtcl		0x10C00000	0x00010000
+tdbc		0x10C40000	0x00010000
+thread		0x10C80000	0x00020000
+;
+; insert new packages here
+;
+snack		0x1E000000	0x00400000
+sound		0x1E400000	0x00400000
+snackogg	0x1E800000	0x00200000
diff --git a/win/makefile.bc b/win/makefile.bc
index 3310b01..6421682 100644
--- a/win/makefile.bc
+++ b/win/makefile.bc
@@ -1,597 +1,597 @@
-#
-# Makefile for Borland C++ 5.5 (or C++ Builder 5), adapted from the makefile
-#   for Visual C++ that came with tcl 8.3.3
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-
-# TIP #59 information.
-#
-# This makefile does not set the following configuration cpp
-# defines. Behind the defines are the makefile variables listed to set
-# to -D... when that feature is enabled.
-#
-# - TCL_CFG_PROFILED		PROFDEFINES
-# - TCL_CFG_OPTIMIZED		OPTDEFINES
-# - TCL_CFG_DO64BIT		SIXFOURDEFINES
-
-# Have a look at the complete description on how to build and test Tcl with
-# the current Borland compilers at www.ratiosoft.com/tcl/borland.
-#
-# Usage:
-#   - Adapt the paths below to match your compiler's location
-#   - Make sure the compiler's bin directory is on your path
-#   - Open a console
-#   - To make a debug version enter
-#       make -fmakefile.bc -DNODEBUG=0 xxx
-#     where 'xxx' is the target you want (e.g. 'all', 'test', ...)
-#     Please note: I omitted the 'd' suffix for debug versions because Tcl
-#     will always call tclpip83.dll and not tclpip83d.dll, causing an error.
-#                                                   ^
-#     Besides, the debug version goes into a separate directory, so there
-#     should be no problem having DLLs and EXEs with the same name.
-#     If you prefer your debug version having the 'd' suffix just uncomment
-#     the line
-#         #DBGX        = d
-#
-#   - To make a 'normal' version enter
-#       make -fmakefile.bc xxx
-#     where 'xxx' is the target you want (e.g. 'all', 'test', ...)
-#
-# DISCLAIMER:
-# This makefile has an experimental status - that is those targets which
-# have been modified do in fact compile and link with Borland's C++
-# Builder 5 and with the free Borland compiler (Borland C++ 5.5).
-# However the author assumes no responsiblity for any effect which the use of
-# this makefile or of the resulting programs might have on your system.
-#
-# Not yet modified:
-#   - The 'plug-in-DLL' and the associated shell.
-#   - The programs to create the windows help files.
-#
-# Suggestions and / or improvements are always welcome.
-#
-# May 2001, H. Giese (hgiese@ratiosoft.com)
-#
-
-# Does not depend on the presence of any environment variables in
-# order to compile tcl; all needed information is derived from
-# location of the compiler directories.
-
-#
-# Project directories
-#
-# ROOT    = top of source tree
-#
-# TOOLS32 = location of Borland development tools.
-#
-# INSTALLDIR = where the install-targets should copy the binaries and
-#     support files
-#
-
-ROOT		= ..
-INSTALLDIR	= c:\program files\tcl
-
-# If you have C++ Builder 5 or the free Borland C++ 5.5 compiler
-# adapt the following paths as appropriate for your system
-TOOLS32		= c:\dev\bcc55
-TOOLS32_rc	= c:\dev\bcc55
-#TOOLS32	= c:\bc55
-#TOOLS32_rc	= c:\bc55
-
-cc32		= "$(TOOLS32)\bin\bcc32.exe"
-link32		= "$(TOOLS32)\bin\ilink32.exe"
-lib32		= "$(TOOLS32)\bin\tlib.exe"
-rc32		= "$(TOOLS32_rc)\bin\brcc32.exe"
-include32	= -I"$(TOOLS32)\include"
-libpath32	= -L"$(TOOLS32)\lib"
-
-# Uncomment the following line to compile with thread support
-#THREADDEFINES	= -DTCL_THREADS=1
-
-# Allow definition of NDEBUG via command line
-# Set NODEBUG to 0 to compile with symbols
-!if !defined(NODEBUG)
-NODEBUG		= 1
-!endif
-
-#	CFG_ENCODING=encoding
-#		name of encoding for configuration information. Defaults
-#		to cp1252
-!if !defined(CFG_ENCODING)
-CFG_ENCODING	= \"cp1252\"
-!endif
-
-# The following defines can be used to control the amount of debugging
-# code that is added to the compilation.
-#
-# -DTCL_MEM_DEBUG   Enables the debugging memory allocator.
-# -DTCL_COMPILE_DEBUG Enables byte compilation logging.
-# -DTCL_COMPILE_STATS Enables byte compilation statistics gathering.
-# -DUSE_TCLALLOC=0  Disables the Tcl memory allocator in favor
-#       of the native malloc implementation.  This is
-#       needed when using Purify.
-#
-#DEBUGDEFINES	= -DTCL_MEM_DEBUG -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS
-#DEBUGDEFINES	= -DUSE_TCLALLOC=0
-
-######################################################################
-# Do not modify below this line
-######################################################################
-
-NAMEPREFIX	= tcl
-STUBPREFIX	= $(NAMEPREFIX)stub
-DOTVERSION	= 8.5
-VERSION		= 85
-
-DDEVERSION = 13
-DDEDOTVERSION = 1.3
-
-REGVERSION = 12
-REGDOTVERSION = 1.2
-
-BINROOT		= ..
-!IF "$(NODEBUG)" == "1"
-TMPDIRNAME	= Release
-DBGX		=
-SYMDEFINES	= -DNDEBUG
-!ELSE
-TMPDIRNAME	= Debug
-#DBGX		= d
-DBGX		=
-SYMDEFINES	= -DTCL_CFG_DEBUG
-!ENDIF
-TMPDIR		= $(BINROOT)\$(TMPDIRNAME)
-OUTDIRNAME	= $(TMPDIRNAME)
-OUTDIR		= $(TMPDIR)
-
-TCLLIB		= $(OUTDIR)\$(NAMEPREFIX)$(VERSION)$(DBGX).lib
-TCLDLLNAME	= $(NAMEPREFIX)$(VERSION)$(DBGX).dll
-TCLDLL		= $(OUTDIR)\$(TCLDLLNAME)
-
-TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION)$(DBGX).lib
-TCLSTUBLIB	= $(OUTDIR)\$(TCLSTUBLIBNAME)
-
-TCLPLUGINLIB	= $(OUTDIR)\$(NAMEPREFIX)$(VERSION)p$(DBGX).lib
-TCLPLUGINDLLNAME	= $(NAMEPREFIX)$(VERSION)p$(DBGX).dll
-TCLPLUGINDLL	= $(OUTDIR)\$(TCLPLUGINDLLNAME)
-TCLSH		= $(OUTDIR)\$(NAMEPREFIX)sh$(VERSION)$(DBGX).exe
-TCLSHP		= $(OUTDIR)\$(NAMEPREFIX)shp$(VERSION)$(DBGX).exe
-TCLPIPEDLLNAME	= $(NAMEPREFIX)pip$(VERSION)$(DBGX).dll
-TCLPIPEDLL	= $(OUTDIR)\$(TCLPIPEDLLNAME)
-TCLREGDLLNAME	= $(NAMEPREFIX)reg$(REGVERSION)$(DBGX).dll
-TCLREGDLL	= $(OUTDIR)\$(TCLREGDLLNAME)
-TCLDDEDLLNAME	= $(NAMEPREFIX)dde$(DDEVERSION)$(DBGX).dll
-TCLDDEDLL	= $(OUTDIR)\$(TCLDDEDLLNAME)
-TCLTEST		= $(OUTDIR)\$(NAMEPREFIX)test.exe
-CAT32		= $(TMPDIR)\cat32.exe
-RMDIR		= .\rmd.bat
-MKDIR		= .\mkd.bat
-RM		= del
-
-LIB_INSTALL_DIR	= $(INSTALLDIR)\lib
-BIN_INSTALL_DIR	= $(INSTALLDIR)\bin
-SCRIPT_INSTALL_DIR	= $(INSTALLDIR)\lib\tcl$(DOTVERSION)
-INCLUDE_INSTALL_DIR	= $(INSTALLDIR)\include
-
-TCLSHOBJS	= \
-	$(TMPDIR)\tclAppInit.obj
-
-TCLTESTOBJS	= \
-	$(TMPDIR)\tclTest.obj \
-	$(TMPDIR)\tclTestObj.obj \
-	$(TMPDIR)\tclTestProcBodyObj.obj \
-	$(TMPDIR)\tclThreadTest.obj \
-	$(TMPDIR)\tclWinTest.obj \
-	$(TMPDIR)\testMain.obj
-
-TCLOBJS	= \
-	$(TMPDIR)\regcomp.obj \
-	$(TMPDIR)\regexec.obj \
-	$(TMPDIR)\regfree.obj \
-	$(TMPDIR)\regerror.obj \
-	$(TMPDIR)\tclAlloc.obj \
-	$(TMPDIR)\tclAsync.obj \
-	$(TMPDIR)\tclBasic.obj \
-	$(TMPDIR)\tclBinary.obj \
-	$(TMPDIR)\tclCkalloc.obj \
-	$(TMPDIR)\tclClock.obj \
-	$(TMPDIR)\tclCmdAH.obj \
-	$(TMPDIR)\tclCmdIL.obj \
-	$(TMPDIR)\tclCmdMZ.obj \
-	$(TMPDIR)\tclCompCmds.obj \
-	$(TMPDIR)\tclCompExpr.obj \
-	$(TMPDIR)\tclCompile.obj \
-	$(TMPDIR)\tclConfig.obj \
-	$(TMPDIR)\tclDate.obj \
-	$(TMPDIR)\tclDictObj.obj \
-	$(TMPDIR)\tclEncoding.obj \
-	$(TMPDIR)\tclEnv.obj \
-	$(TMPDIR)\tclEvent.obj \
-	$(TMPDIR)\tclExecute.obj \
-	$(TMPDIR)\tclFCmd.obj \
-	$(TMPDIR)\tclFileName.obj \
-	$(TMPDIR)\tclGet.obj \
-	$(TMPDIR)\tclHash.obj \
-	$(TMPDIR)\tclHistory.obj \
-	$(TMPDIR)\tclIndexObj.obj \
-	$(TMPDIR)\tclInterp.obj \
-	$(TMPDIR)\tclIO.obj \
-	$(TMPDIR)\tclIOCmd.obj \
-	$(TMPDIR)\tclIOGT.obj \
-	$(TMPDIR)\tclIOSock.obj \
-	$(TMPDIR)\tclIOUtil.obj \
-	$(TMPDIR)\tclLink.obj \
-	$(TMPDIR)\tclLiteral.obj \
-	$(TMPDIR)\tclListObj.obj \
-	$(TMPDIR)\tclLoad.obj \
-	$(TMPDIR)\tclMain.obj \
-	$(TMPDIR)\tclNamesp.obj \
-	$(TMPDIR)\tclNotify.obj \
-	$(TMPDIR)\tclObj.obj \
-	$(TMPDIR)\tclPanic.obj \
-	$(TMPDIR)\tclParse.obj \
-	$(TMPDIR)\tclPipe.obj \
-	$(TMPDIR)\tclPkg.obj \
-	$(TMPDIR)\tclPkgConfig.obj \
-	$(TMPDIR)\tclPosixStr.obj \
-	$(TMPDIR)\tclPreserve.obj \
-	$(TMPDIR)\tclProc.obj \
-	$(TMPDIR)\tclRegexp.obj \
-	$(TMPDIR)\tclResolve.obj \
-	$(TMPDIR)\tclResult.obj \
-	$(TMPDIR)\tclScan.obj \
-	$(TMPDIR)\tclStringObj.obj \
-	$(TMPDIR)\tclStubInit.obj \
-	$(TMPDIR)\tclStubLib.obj \
-	$(TMPDIR)\tclThread.obj \
-	$(TMPDIR)\tclThreadJoin.obj \
-	$(TMPDIR)\tclTimer.obj \
-	$(TMPDIR)\tclTrace.obj \
-	$(TMPDIR)\tclUtf.obj \
-	$(TMPDIR)\tclUtil.obj \
-	$(TMPDIR)\tclVar.obj \
-	$(TMPDIR)\tclWin32Dll.obj \
-	$(TMPDIR)\tclWinChan.obj \
-	$(TMPDIR)\tclWinConsole.obj \
-	$(TMPDIR)\tclWinSerial.obj \
-	$(TMPDIR)\tclWinError.obj \
-	$(TMPDIR)\tclWinFCmd.obj \
-	$(TMPDIR)\tclWinFile.obj \
-	$(TMPDIR)\tclWinInit.obj \
-	$(TMPDIR)\tclWinLoad.obj \
-	$(TMPDIR)\tclWinNotify.obj \
-	$(TMPDIR)\tclWinPipe.obj \
-	$(TMPDIR)\tclWinSock.obj \
-	$(TMPDIR)\tclWinThrd.obj \
-	$(TMPDIR)\tclWinTime.obj
-
-TCLSTUBOBJS	= $(TMPDIR)\tclStubLib.obj
-
-WINDIR		= $(ROOT)\win
-GENERICDIR	= $(ROOT)\generic
-
-TCL_INCLUDES	= -I"$(WINDIR)" -I"$(GENERICDIR)"
-TCL_DEFINES	= $(DEBUGDEFINES) $(THREADDEFINES) $(SYMDEFINES) \
-			$(PROFDEFINES) $(OPTDEFINES) $(SIXFOURDEFINES) \
-			-DTCL_CFGVAL_ENCODING=${CFG_ENCODING}
-
-######################################################################
-# Compiler flags
-######################################################################
-
-!IF "$(NODEBUG)" == "1"
-# these macros cause maximum optimization and no symbols
-cdebug	= -v- -vi- -O2 -D_DEBUG
-!ELSE
-# these macros enable debugging
-cdebug	= -k -Od -r- -v -vi- -y
-!ENDIF
-
-SYSDEFINES	= _MT;NO_STRICT;_NO_VCL
-
-# declarations common to all compiler options
-cbase	= -c -q -3 -a4 -g0 -tWM -Ve -Vx -X-
-WARNINGS	= -w-rch -w-pch -w-par -w-dup -w-pro -w-dpu
-
-ccons	= -tWC
-
-INCLUDEPATH	= $(include32) $(TCL_INCLUDES)
-
-CFLAGS	= $(cdebug) $(cbase) $(INCLUDEPATH) $(WARNINGS) -D$(SYSDEFINES)
-TCL_CFLAGS	= $(CFLAGS) $(TCL_DEFINES)
-CONS_CFLAGS	= $(CFLAGS) $(TCL_DEFINES) $(ccons)
-
-######################################################################
-# Linker flags
-######################################################################
-
-!IF "$(NODEBUG)" == "1"
-ldebug	=
-!ELSE
-ldebug	= -v
-!ENDIF
-
-# declarations common to all linker options
-LNFLAGS	= -D"" -Gn -I$(TMPDIR) -x $(ldebug) $(libpath32)
-# -Gi: create lib file (is -Gl in doc)
-# -aa: Windows app, -ap: Windows console app
-LNFLAGS_DLL	= -ap -Gi -Tpd
-LNFLAGS_CONS	= -ap -Tpe
-
-LNLIBS	= import32 cw32mt
-
-
-######################################################################
-# Project specific targets
-######################################################################
-
-release:	setup $(TCLSH) dlls
-dlls:		setup $(TCLPIPEDLL) $(TCLREGDLL) $(TCLDDEDLL)
-all:		setup $(TCLSH) dlls $(CAT32)
-tcltest:	setup $(TCLTEST) dlls $(CAT32)
-plugin:		setup $(TCLPLUGINDLL) $(TCLSHP)
-install:	install-binaries install-libraries
-
-test:		setup $(TCLTEST) dlls $(CAT32)
-	set TCL_LIBRARY=$(ROOT)/library
-	$(TCLTEST) $(ROOT)/tests/all.tcl
-
-setup:
-	@if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR) &\
-		echo *** Created directory '$(OUT_DIR)'
-	@if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR) &\
-		echo *** Created directory '$(TMP_DIR)'
-
-
-$(TCLLIB): $(TCLDLL)
-
-$(TCLDLL): $(TCLOBJS) $(TMPDIR)\$(NAMEPREFIX).res
-	$(link32) $(ldebug) $(LNFLAGS) $(LNFLAGS_DLL) $(TOOLS32)\lib\c0d32 @&&!
-		$(TCLOBJS), $@, -x, $(LNLIBS),, $(TMPDIR)\$(NAMEPREFIX).res
-!
-
-$(TCLSTUBLIB): $(TCLSTUBOBJS)
-	$(lib32) /u $@ $(TCLSTUBOBJS)
-
-$(TCLPLUGINLIB): $(TCLPLUGINDLL)
-
-$(TCLPLUGINDLL): $(TCLOBJS) $(TMPDIR)\tcl.res
-	$(link32) $(ldebug) $(dlllflags) \
-		-out:$@ $(TMPDIR)\tcl.res $(guilibsdll) @&&!
-$(TCLOBJS)
-!
-
-$(TCLSH): $(TCLSHOBJS) $(TCLLIB) $(TMPDIR)\$(NAMEPREFIX)sh.res
-	$(link32) $(ldebug) -S:2400000 $(LNFLAGS) $(LNFLAGS_CONS) $(TOOLS32)\lib\c0x32 @&&!
-		$(TCLSHOBJS), $@, -x, $(LNLIBS) $(TCLLIB),, $(TMPDIR)\$(NAMEPREFIX)sh.res
-!
-
-$(TCLSHP): $(TCLSHOBJS) $(TCLPLUGINLIB) $(TMPDIR)\tclsh.res
-	$(link32) $(ldebug) $(conlflags) $(TMPDIR)\tclsh.res -stack:2300000 \
-		-out:$@ $(conlibsdll) $(TCLPLUGINLIB) $(TCLSHOBJS)
-
-$(TCLTEST): $(TCLTESTOBJS) $(TCLLIB) $(TMPDIR)\$(NAMEPREFIX)sh.res
-	$(link32) $(ldebug) -S:2400000 $(LNFLAGS) $(LNFLAGS_CONS) $(TOOLS32)\lib\c0x32 @&&!
-		$(TCLTESTOBJS), $@, -x, $(LNLIBS) $(TCLLIB),, $(TMPDIR)\$(NAMEPREFIX)sh.res
-!
-
-$(TCLPIPEDLL): $(WINDIR)\stub16.c
-	$(cc32) $(CFLAGS) -o$(TMPDIR)\stub16.obj $(WINDIR)\stub16.c
-	$(link32) $(ldebug) $(LNFLAGS) $(LNFLAGS_CONS) $(TOOLS32)\lib\c0x32 \
-		$(TMPDIR)\stub16.obj, $@, -x, $(LNLIBS),, $(TMPDIR)\$(NAMEPREFIX).res
-
-$(TCLDDEDLL): $(TMPDIR)\tclWinDde.obj $(TCLSTUBLIB)
-	$(link32) $(ldebug) $(LNFLAGS) $(LNFLAGS_DLL) $(TOOLS32)\lib\c0d32 \
-		$(TMPDIR)\tclWinDde.obj, $@, -x, $(LNLIBS) $(TCLSTUBLIB),, \
-		$(TMPDIR)\$(NAMEPREFIX).res
-
-$(TCLREGDLL): $(TMPDIR)\tclWinReg.obj $(TCLSTUBLIB)
-	$(link32) $(ldebug) $(LNFLAGS) $(LNFLAGS_DLL) $(TOOLS32)\lib\c0d32 \
-		$(TMPDIR)\tclWinReg.obj, $@, -x, $(LNLIBS) $(TCLSTUBLIB),, \
-		$(TMPDIR)\$(NAMEPREFIX).res
-
-$(CAT32): $(WINDIR)\cat.c
-	$(cc32) $(CONS_CFLAGS) -o$(TMPDIR)\cat.obj $?
-	$(link32) $(ldebug) $(LNFLAGS) $(LNFLAGS_CONS) $(TOOLS32)\lib\c0x32 \
-		$(TMPDIR)\cat.obj, $@, -x, $(LNLIBS),,
-
-install-binaries: $(TCLSH)
-	$(MKDIR) "$(BIN_INSTALL_DIR)"
-	$(MKDIR) "$(LIB_INSTALL_DIR)"
-	@echo Installing $(TCLDLLNAME)
-	@copy "$(TCLDLL)" "$(BIN_INSTALL_DIR)"
-	@copy "$(TCLLIB)" "$(LIB_INSTALL_DIR)"
-	@echo Installing "$(TCLSH)"
-	@copy "$(TCLSH)" "$(BIN_INSTALL_DIR)"
-	@echo Installing $(TCLPIPEDLLNAME)
-	@copy "$(TCLPIPEDLL)" "$(BIN_INSTALL_DIR)"
-	@echo Installing $(TCLSTUBLIBNAME)
-	@copy "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)"
-
-install-libraries:
-	-@$(MKDIR) "$(LIB_INSTALL_DIR)"
-	-@$(MKDIR) "$(INCLUDE_INSTALL_DIR)"
-	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)"
-	@echo Installing http1.0
-	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http1.0"
-	-@copy "$(ROOT)\library\http1.0\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http1.0"
-	-@copy "$(ROOT)\library\http1.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http1.0"
-	@echo Installing http2.7
-	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http2.7"
-	-@copy "$(ROOT)\library\http\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http2.7"
-	-@copy "$(ROOT)\library\http\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http2.7"
-	@echo Installing opt0.4
-	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4"
-	-@copy "$(ROOT)\library\opt\optparse.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
-	-@copy "$(ROOT)\library\opt\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
-	@echo Installing msgcat1.5
-	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\msgcat1.5"
-	-@copy "$(ROOT)\library\msgcat\msgcat.tcl"   "$(SCRIPT_INSTALL_DIR)\msgcat1.5"
-	-@copy "$(ROOT)\library\msgcat\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\msgcat1.5"
-	@echo Installing tcltest2.3
-	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\tcltest2.3"
-	-@copy "$(ROOT)\library\tcltest\tcltest.tcl"   "$(SCRIPT_INSTALL_DIR)\tcltest2.3"
-	-@copy "$(ROOT)\library\tcltest\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\tcltest2.3"
-	@echo Installing platform1.0
-	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\platform1.0"
-	-@copy "$(ROOT)\library\platform\platform.tcl" "$(SCRIPT_INSTALL_DIR)\platform1.0"
-	-@copy "$(ROOT)\library\platform\shell.tcl"    "$(SCRIPT_INSTALL_DIR)\platform1.0"
-	-@copy "$(ROOT)\library\platform\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\platform1.0"
-	@echo Installing $(TCLDDEDLLNAME)
-	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\dde1.3"
-	-@copy "$(TCLDDEDLL)" "$(SCRIPT_INSTALL_DIR)\dde1.3"
-	-@copy "$(ROOT)\library\dde\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\dde1.3"
-	@echo Installing $(TCLREGDLLNAME)
-	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\reg1.2"
-	-@copy "$(TCLREGDLL)" "$(SCRIPT_INSTALL_DIR)\reg1.2"
-	-@copy "$(ROOT)\library\reg\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\reg1.2"
-	@echo Installing encoding files
-	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\encoding"
-	-@copy "$(ROOT)\library\encoding\*.enc" "$(SCRIPT_INSTALL_DIR)\encoding"
-	@echo Installing library files
-	-@copy "$(GENERICDIR)\tcl.h"         "$(INCLUDE_INSTALL_DIR)"
-	-@copy "$(GENERICDIR)\tclDecls.h"    "$(INCLUDE_INSTALL_DIR)"
-	-@copy "$(GENERICDIR)\tclPlatDecls.h" "$(INCLUDE_INSTALL_DIR)"
-	-@copy "$(ROOT)\library\history.tcl" "$(SCRIPT_INSTALL_DIR)"
-	-@copy "$(ROOT)\library\init.tcl"    "$(SCRIPT_INSTALL_DIR)"
-	-@copy "$(ROOT)\library\parray.tcl"  "$(SCRIPT_INSTALL_DIR)"
-	-@copy "$(ROOT)\library\safe.tcl"    "$(SCRIPT_INSTALL_DIR)"
-	-@copy "$(ROOT)\library\tclIndex"    "$(SCRIPT_INSTALL_DIR)"
-	-@copy "$(ROOT)\library\package.tcl" "$(SCRIPT_INSTALL_DIR)"
-	-@copy "$(ROOT)\library\word.tcl"    "$(SCRIPT_INSTALL_DIR)"
-	-@copy "$(ROOT)\library\auto.tcl"    "$(SCRIPT_INSTALL_DIR)"
-
-#
-# Regenerate the stubs files.
-#
-
-genstubs:
-	tclsh$(VERSION) $(ROOT)\tools\genStubs.tcl $(GENERICDIR) \
-		$(GENERICDIR)\tcl.decls $(GENERICDIR)\tclInt.decls
-
-#
-# Regenerate the windows help files.
-#
-
-TCLTOOLS	= $(ROOT)/tools
-MAN2TCL		= $(TCLTOOLS)/man2tcl
-TCLRTF		= $(TCLTOOLS)/tcl.rtf
-TCLHPJ		= $(TCLTOOLS)/tcl.hpj
-MAN2HELP	= $(TCLTOOLS)/man2help.tcl
-HCRTF		= $(TOOLS32)/bin/hcrtf.exe
-
-winhelp: $(TCLRTF)
-	cd $(TCLTOOLS)
-	start /wait $(HCRTF) -xn $(TCLHPJ)
-
-$(MAN2TCL).exe: $(MAN2TCL).obj
-	cd $(TCLTOOLS)
-	$(cc32) /nologo /G4 /ML /O2 $(MAN2TCL).c
-
-$(TCLRTF): $(MAN2TCL).exe $(TCLSH)
-	cd $(TCLTOOLS)
-	..\win\$(TCLSH) $(MAN2HELP) $(NAMEPREFIX) $(VERSION) $(ROOT)/doc ../../tk$(DOTVERSION)/doc
-
-#
-# Special case object file targets
-#
-$(TMPDIR)\tclWinInit.obj: $(WINDIR)\tclWinInit.c
-	$(cc32) -DBUILD_tcl $(TCL_CFLAGS) -o$(TMPDIR)\$@ $?
-
-$(TMPDIR)\testMain.obj: $(WINDIR)\tclAppInit.c
-	$(cc32) $(TCL_CFLAGS) -DTCL_TEST -o$(TMPDIR)\testMain.obj $?
-
-$(TMPDIR)\tclTest.obj: $(GENERICDIR)\tclTest.c
-	$(cc32) $(TCL_CFLAGS) -o$(TMPDIR)\$@ $?
-
-$(TMPDIR)\tclTestObj.obj: $(GENERICDIR)\tclTestObj.c
-	$(cc32) $(TCL_CFLAGS) -o$(TMPDIR)\$@ $?
-
-$(TMPDIR)\tclWinTest.obj: $(WINDIR)\tclWinTest.c
-	$(cc32) $(TCL_CFLAGS) -o$(TMPDIR)\$@ $?
-
-$(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c
-	$(cc32) $(TCL_CFLAGS) \
-		-DCFG_INSTALL_EXEC_PREFIX=\"$(INSTALL_EXEC_PREFIX)\"	\
-		-DCFG_INSTALL_PREFIX=\"$(INSTALL_PREFIX)\"		\
-		-DCFG_RUNTIME_EXEC_PREFIX=\"$(RUNTIME_EXEC_PREFIX)\"	\
-		-DCFG_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\"		\
-	 -o$(TMPDIR)\$@ $?
-
-$(TMPDIR)\tclAppInit.obj : $(WINDIR)\tclAppInit.c
-	$(cc32) $(TCL_CFLAGS) -o$(TMPDIR)\$@ $?
-
-# The following objects should be built using the stub interfaces
-
-# tclWinReg: Produces errors in ANSI mode
-$(TMPDIR)\tclWinReg.obj : $(WINDIR)\tclWinReg.c
-	$(cc32) $(TCL_CFLAGS) -DUSE_TCL_STUBS -o$(TMPDIR)\$@ $?
-
-# tclWinDde: Produces errors in ANSI mode
-$(TMPDIR)\tclWinDde.obj : $(WINDIR)\tclWinDde.c
-	$(cc32) $(TCL_CFLAGS) -DUSE_TCL_STUBS -o$(TMPDIR)\$@ $?
-
-
-# The following objects are part of the stub library and should not
-# be built as DLL objects but none of the symbols should be exported
-
-$(TMPDIR)\tclStubLib.obj : $(GENERICDIR)\tclStubLib.c
-	$(cc32) $(TCL_CFLAGS) -DSTATIC_BUILD -o$(TMPDIR)\$@ $?
-
-
-# Dedependency rules
-
-$(GENERICDIR)\regcomp.c: \
-	$(GENERICDIR)\regguts.h \
-	$(GENERICDIR)\regc_lex.c \
-	$(GENERICDIR)\regc_color.c \
-	$(GENERICDIR)\regc_nfa.c \
-	$(GENERICDIR)\regc_cvec.c \
-	$(GENERICDIR)\regc_locale.c
-
-$(GENERICDIR)\regcustom.h: \
-	$(GENERICDIR)\tclInt.h \
-	$(GENERICDIR)\tclPort.h \
-	$(GENERICDIR)\regex.h
-
-$(GENERICDIR)\regexec.c: \
-	$(GENERICDIR)\rege_dfa.c \
-	$(GENERICDIR)\regguts.h
-
-$(GENERICDIR)\regerror.c: $(GENERICDIR)\regguts.h
-$(GENERICDIR)\regfree.c: $(GENERICDIR)\regguts.h
-$(GENERICDIR)\regfronts.c: $(GENERICDIR)\regguts.h
-$(GENERICDIR)\regguts.h: $(GENERICDIR)\regcustom.h
-
-#
-# Implicit rules
-#
-
-{$(WINDIR)}.c{$(TMPDIR)}.obj:
-	$(cc32) -DBUILD_tcl $(TCL_CFLAGS) -o$@ $<
-
-{$(GENERICDIR)}.c{$(TMPDIR)}.obj:
-	$(cc32) -DBUILD_tcl $(TCL_CFLAGS) -o$@ $<
-
-{$(ROOT)\compat}.c{$(TMPDIR)}.obj:
-	$(cc32) -DBUILD_tcl $(TCL_CFLAGS) -o$@ $<
-
-{$(WINDIR)}.rc{$(TMPDIR)}.res:
-	$(rc32) $(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -fo$@ $<
-
-clean:
-	-@$(RM) $(OUTDIR)\*.exp
-	-@$(RM) $(OUTDIR)\*.lib
-	-@$(RM) $(OUTDIR)\*.dll
-	-@$(RM) $(OUTDIR)\*.exe
-	-@$(RM) $(OUTDIR)\*.pdb
-	-@$(RM) $(TMPDIR)\*.pch
-	-@$(RM) $(TMPDIR)\*.obj
-	-@$(RM) $(TMPDIR)\*.res
-	-@$(RM) $(TMPDIR)\*.exe
-	-@$(RMDIR) $(OUTDIR)
-	-@$(RMDIR) $(TMPDIR)
+#
+# Makefile for Borland C++ 5.5 (or C++ Builder 5), adapted from the makefile
+#   for Visual C++ that came with tcl 8.3.3
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# Copyright (c) 1995-1996 Sun Microsystems, Inc.
+# Copyright (c) 1998-1999 by Scriptics Corporation.
+
+# TIP #59 information.
+#
+# This makefile does not set the following configuration cpp
+# defines. Behind the defines are the makefile variables listed to set
+# to -D... when that feature is enabled.
+#
+# - TCL_CFG_PROFILED		PROFDEFINES
+# - TCL_CFG_OPTIMIZED		OPTDEFINES
+# - TCL_CFG_DO64BIT		SIXFOURDEFINES
+
+# Have a look at the complete description on how to build and test Tcl with
+# the current Borland compilers at www.ratiosoft.com/tcl/borland.
+#
+# Usage:
+#   - Adapt the paths below to match your compiler's location
+#   - Make sure the compiler's bin directory is on your path
+#   - Open a console
+#   - To make a debug version enter
+#       make -fmakefile.bc -DNODEBUG=0 xxx
+#     where 'xxx' is the target you want (e.g. 'all', 'test', ...)
+#     Please note: I omitted the 'd' suffix for debug versions because Tcl
+#     will always call tclpip83.dll and not tclpip83d.dll, causing an error.
+#                                                   ^
+#     Besides, the debug version goes into a separate directory, so there
+#     should be no problem having DLLs and EXEs with the same name.
+#     If you prefer your debug version having the 'd' suffix just uncomment
+#     the line
+#         #DBGX        = d
+#
+#   - To make a 'normal' version enter
+#       make -fmakefile.bc xxx
+#     where 'xxx' is the target you want (e.g. 'all', 'test', ...)
+#
+# DISCLAIMER:
+# This makefile has an experimental status - that is those targets which
+# have been modified do in fact compile and link with Borland's C++
+# Builder 5 and with the free Borland compiler (Borland C++ 5.5).
+# However the author assumes no responsiblity for any effect which the use of
+# this makefile or of the resulting programs might have on your system.
+#
+# Not yet modified:
+#   - The 'plug-in-DLL' and the associated shell.
+#   - The programs to create the windows help files.
+#
+# Suggestions and / or improvements are always welcome.
+#
+# May 2001, H. Giese (hgiese@ratiosoft.com)
+#
+
+# Does not depend on the presence of any environment variables in
+# order to compile tcl; all needed information is derived from
+# location of the compiler directories.
+
+#
+# Project directories
+#
+# ROOT    = top of source tree
+#
+# TOOLS32 = location of Borland development tools.
+#
+# INSTALLDIR = where the install-targets should copy the binaries and
+#     support files
+#
+
+ROOT		= ..
+INSTALLDIR	= c:\program files\tcl
+
+# If you have C++ Builder 5 or the free Borland C++ 5.5 compiler
+# adapt the following paths as appropriate for your system
+TOOLS32		= c:\dev\bcc55
+TOOLS32_rc	= c:\dev\bcc55
+#TOOLS32	= c:\bc55
+#TOOLS32_rc	= c:\bc55
+
+cc32		= "$(TOOLS32)\bin\bcc32.exe"
+link32		= "$(TOOLS32)\bin\ilink32.exe"
+lib32		= "$(TOOLS32)\bin\tlib.exe"
+rc32		= "$(TOOLS32_rc)\bin\brcc32.exe"
+include32	= -I"$(TOOLS32)\include"
+libpath32	= -L"$(TOOLS32)\lib"
+
+# Uncomment the following line to compile with thread support
+#THREADDEFINES	= -DTCL_THREADS=1
+
+# Allow definition of NDEBUG via command line
+# Set NODEBUG to 0 to compile with symbols
+!if !defined(NODEBUG)
+NODEBUG		= 1
+!endif
+
+#	CFG_ENCODING=encoding
+#		name of encoding for configuration information. Defaults
+#		to cp1252
+!if !defined(CFG_ENCODING)
+CFG_ENCODING	= \"cp1252\"
+!endif
+
+# The following defines can be used to control the amount of debugging
+# code that is added to the compilation.
+#
+# -DTCL_MEM_DEBUG   Enables the debugging memory allocator.
+# -DTCL_COMPILE_DEBUG Enables byte compilation logging.
+# -DTCL_COMPILE_STATS Enables byte compilation statistics gathering.
+# -DUSE_TCLALLOC=0  Disables the Tcl memory allocator in favor
+#       of the native malloc implementation.  This is
+#       needed when using Purify.
+#
+#DEBUGDEFINES	= -DTCL_MEM_DEBUG -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS
+#DEBUGDEFINES	= -DUSE_TCLALLOC=0
+
+######################################################################
+# Do not modify below this line
+######################################################################
+
+NAMEPREFIX	= tcl
+STUBPREFIX	= $(NAMEPREFIX)stub
+DOTVERSION	= 8.5
+VERSION		= 85
+
+DDEVERSION = 13
+DDEDOTVERSION = 1.3
+
+REGVERSION = 12
+REGDOTVERSION = 1.2
+
+BINROOT		= ..
+!IF "$(NODEBUG)" == "1"
+TMPDIRNAME	= Release
+DBGX		=
+SYMDEFINES	= -DNDEBUG
+!ELSE
+TMPDIRNAME	= Debug
+#DBGX		= d
+DBGX		=
+SYMDEFINES	= -DTCL_CFG_DEBUG
+!ENDIF
+TMPDIR		= $(BINROOT)\$(TMPDIRNAME)
+OUTDIRNAME	= $(TMPDIRNAME)
+OUTDIR		= $(TMPDIR)
+
+TCLLIB		= $(OUTDIR)\$(NAMEPREFIX)$(VERSION)$(DBGX).lib
+TCLDLLNAME	= $(NAMEPREFIX)$(VERSION)$(DBGX).dll
+TCLDLL		= $(OUTDIR)\$(TCLDLLNAME)
+
+TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION)$(DBGX).lib
+TCLSTUBLIB	= $(OUTDIR)\$(TCLSTUBLIBNAME)
+
+TCLPLUGINLIB	= $(OUTDIR)\$(NAMEPREFIX)$(VERSION)p$(DBGX).lib
+TCLPLUGINDLLNAME	= $(NAMEPREFIX)$(VERSION)p$(DBGX).dll
+TCLPLUGINDLL	= $(OUTDIR)\$(TCLPLUGINDLLNAME)
+TCLSH		= $(OUTDIR)\$(NAMEPREFIX)sh$(VERSION)$(DBGX).exe
+TCLSHP		= $(OUTDIR)\$(NAMEPREFIX)shp$(VERSION)$(DBGX).exe
+TCLPIPEDLLNAME	= $(NAMEPREFIX)pip$(VERSION)$(DBGX).dll
+TCLPIPEDLL	= $(OUTDIR)\$(TCLPIPEDLLNAME)
+TCLREGDLLNAME	= $(NAMEPREFIX)reg$(REGVERSION)$(DBGX).dll
+TCLREGDLL	= $(OUTDIR)\$(TCLREGDLLNAME)
+TCLDDEDLLNAME	= $(NAMEPREFIX)dde$(DDEVERSION)$(DBGX).dll
+TCLDDEDLL	= $(OUTDIR)\$(TCLDDEDLLNAME)
+TCLTEST		= $(OUTDIR)\$(NAMEPREFIX)test.exe
+CAT32		= $(TMPDIR)\cat32.exe
+RMDIR		= .\rmd.bat
+MKDIR		= .\mkd.bat
+RM		= del
+
+LIB_INSTALL_DIR	= $(INSTALLDIR)\lib
+BIN_INSTALL_DIR	= $(INSTALLDIR)\bin
+SCRIPT_INSTALL_DIR	= $(INSTALLDIR)\lib\tcl$(DOTVERSION)
+INCLUDE_INSTALL_DIR	= $(INSTALLDIR)\include
+
+TCLSHOBJS	= \
+	$(TMPDIR)\tclAppInit.obj
+
+TCLTESTOBJS	= \
+	$(TMPDIR)\tclTest.obj \
+	$(TMPDIR)\tclTestObj.obj \
+	$(TMPDIR)\tclTestProcBodyObj.obj \
+	$(TMPDIR)\tclThreadTest.obj \
+	$(TMPDIR)\tclWinTest.obj \
+	$(TMPDIR)\testMain.obj
+
+TCLOBJS	= \
+	$(TMPDIR)\regcomp.obj \
+	$(TMPDIR)\regexec.obj \
+	$(TMPDIR)\regfree.obj \
+	$(TMPDIR)\regerror.obj \
+	$(TMPDIR)\tclAlloc.obj \
+	$(TMPDIR)\tclAsync.obj \
+	$(TMPDIR)\tclBasic.obj \
+	$(TMPDIR)\tclBinary.obj \
+	$(TMPDIR)\tclCkalloc.obj \
+	$(TMPDIR)\tclClock.obj \
+	$(TMPDIR)\tclCmdAH.obj \
+	$(TMPDIR)\tclCmdIL.obj \
+	$(TMPDIR)\tclCmdMZ.obj \
+	$(TMPDIR)\tclCompCmds.obj \
+	$(TMPDIR)\tclCompExpr.obj \
+	$(TMPDIR)\tclCompile.obj \
+	$(TMPDIR)\tclConfig.obj \
+	$(TMPDIR)\tclDate.obj \
+	$(TMPDIR)\tclDictObj.obj \
+	$(TMPDIR)\tclEncoding.obj \
+	$(TMPDIR)\tclEnv.obj \
+	$(TMPDIR)\tclEvent.obj \
+	$(TMPDIR)\tclExecute.obj \
+	$(TMPDIR)\tclFCmd.obj \
+	$(TMPDIR)\tclFileName.obj \
+	$(TMPDIR)\tclGet.obj \
+	$(TMPDIR)\tclHash.obj \
+	$(TMPDIR)\tclHistory.obj \
+	$(TMPDIR)\tclIndexObj.obj \
+	$(TMPDIR)\tclInterp.obj \
+	$(TMPDIR)\tclIO.obj \
+	$(TMPDIR)\tclIOCmd.obj \
+	$(TMPDIR)\tclIOGT.obj \
+	$(TMPDIR)\tclIOSock.obj \
+	$(TMPDIR)\tclIOUtil.obj \
+	$(TMPDIR)\tclLink.obj \
+	$(TMPDIR)\tclLiteral.obj \
+	$(TMPDIR)\tclListObj.obj \
+	$(TMPDIR)\tclLoad.obj \
+	$(TMPDIR)\tclMain.obj \
+	$(TMPDIR)\tclNamesp.obj \
+	$(TMPDIR)\tclNotify.obj \
+	$(TMPDIR)\tclObj.obj \
+	$(TMPDIR)\tclPanic.obj \
+	$(TMPDIR)\tclParse.obj \
+	$(TMPDIR)\tclPipe.obj \
+	$(TMPDIR)\tclPkg.obj \
+	$(TMPDIR)\tclPkgConfig.obj \
+	$(TMPDIR)\tclPosixStr.obj \
+	$(TMPDIR)\tclPreserve.obj \
+	$(TMPDIR)\tclProc.obj \
+	$(TMPDIR)\tclRegexp.obj \
+	$(TMPDIR)\tclResolve.obj \
+	$(TMPDIR)\tclResult.obj \
+	$(TMPDIR)\tclScan.obj \
+	$(TMPDIR)\tclStringObj.obj \
+	$(TMPDIR)\tclStubInit.obj \
+	$(TMPDIR)\tclStubLib.obj \
+	$(TMPDIR)\tclThread.obj \
+	$(TMPDIR)\tclThreadJoin.obj \
+	$(TMPDIR)\tclTimer.obj \
+	$(TMPDIR)\tclTrace.obj \
+	$(TMPDIR)\tclUtf.obj \
+	$(TMPDIR)\tclUtil.obj \
+	$(TMPDIR)\tclVar.obj \
+	$(TMPDIR)\tclWin32Dll.obj \
+	$(TMPDIR)\tclWinChan.obj \
+	$(TMPDIR)\tclWinConsole.obj \
+	$(TMPDIR)\tclWinSerial.obj \
+	$(TMPDIR)\tclWinError.obj \
+	$(TMPDIR)\tclWinFCmd.obj \
+	$(TMPDIR)\tclWinFile.obj \
+	$(TMPDIR)\tclWinInit.obj \
+	$(TMPDIR)\tclWinLoad.obj \
+	$(TMPDIR)\tclWinNotify.obj \
+	$(TMPDIR)\tclWinPipe.obj \
+	$(TMPDIR)\tclWinSock.obj \
+	$(TMPDIR)\tclWinThrd.obj \
+	$(TMPDIR)\tclWinTime.obj
+
+TCLSTUBOBJS	= $(TMPDIR)\tclStubLib.obj
+
+WINDIR		= $(ROOT)\win
+GENERICDIR	= $(ROOT)\generic
+
+TCL_INCLUDES	= -I"$(WINDIR)" -I"$(GENERICDIR)"
+TCL_DEFINES	= $(DEBUGDEFINES) $(THREADDEFINES) $(SYMDEFINES) \
+			$(PROFDEFINES) $(OPTDEFINES) $(SIXFOURDEFINES) \
+			-DTCL_CFGVAL_ENCODING=${CFG_ENCODING}
+
+######################################################################
+# Compiler flags
+######################################################################
+
+!IF "$(NODEBUG)" == "1"
+# these macros cause maximum optimization and no symbols
+cdebug	= -v- -vi- -O2 -D_DEBUG
+!ELSE
+# these macros enable debugging
+cdebug	= -k -Od -r- -v -vi- -y
+!ENDIF
+
+SYSDEFINES	= _MT;NO_STRICT;_NO_VCL
+
+# declarations common to all compiler options
+cbase	= -c -q -3 -a4 -g0 -tWM -Ve -Vx -X-
+WARNINGS	= -w-rch -w-pch -w-par -w-dup -w-pro -w-dpu
+
+ccons	= -tWC
+
+INCLUDEPATH	= $(include32) $(TCL_INCLUDES)
+
+CFLAGS	= $(cdebug) $(cbase) $(INCLUDEPATH) $(WARNINGS) -D$(SYSDEFINES)
+TCL_CFLAGS	= $(CFLAGS) $(TCL_DEFINES)
+CONS_CFLAGS	= $(CFLAGS) $(TCL_DEFINES) $(ccons)
+
+######################################################################
+# Linker flags
+######################################################################
+
+!IF "$(NODEBUG)" == "1"
+ldebug	=
+!ELSE
+ldebug	= -v
+!ENDIF
+
+# declarations common to all linker options
+LNFLAGS	= -D"" -Gn -I$(TMPDIR) -x $(ldebug) $(libpath32)
+# -Gi: create lib file (is -Gl in doc)
+# -aa: Windows app, -ap: Windows console app
+LNFLAGS_DLL	= -ap -Gi -Tpd
+LNFLAGS_CONS	= -ap -Tpe
+
+LNLIBS	= import32 cw32mt
+
+
+######################################################################
+# Project specific targets
+######################################################################
+
+release:	setup $(TCLSH) dlls
+dlls:		setup $(TCLPIPEDLL) $(TCLREGDLL) $(TCLDDEDLL)
+all:		setup $(TCLSH) dlls $(CAT32)
+tcltest:	setup $(TCLTEST) dlls $(CAT32)
+plugin:		setup $(TCLPLUGINDLL) $(TCLSHP)
+install:	install-binaries install-libraries
+
+test:		setup $(TCLTEST) dlls $(CAT32)
+	set TCL_LIBRARY=$(ROOT)/library
+	$(TCLTEST) $(ROOT)/tests/all.tcl
+
+setup:
+	@if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR) &\
+		echo *** Created directory '$(OUT_DIR)'
+	@if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR) &\
+		echo *** Created directory '$(TMP_DIR)'
+
+
+$(TCLLIB): $(TCLDLL)
+
+$(TCLDLL): $(TCLOBJS) $(TMPDIR)\$(NAMEPREFIX).res
+	$(link32) $(ldebug) $(LNFLAGS) $(LNFLAGS_DLL) $(TOOLS32)\lib\c0d32 @&&!
+		$(TCLOBJS), $@, -x, $(LNLIBS),, $(TMPDIR)\$(NAMEPREFIX).res
+!
+
+$(TCLSTUBLIB): $(TCLSTUBOBJS)
+	$(lib32) /u $@ $(TCLSTUBOBJS)
+
+$(TCLPLUGINLIB): $(TCLPLUGINDLL)
+
+$(TCLPLUGINDLL): $(TCLOBJS) $(TMPDIR)\tcl.res
+	$(link32) $(ldebug) $(dlllflags) \
+		-out:$@ $(TMPDIR)\tcl.res $(guilibsdll) @&&!
+$(TCLOBJS)
+!
+
+$(TCLSH): $(TCLSHOBJS) $(TCLLIB) $(TMPDIR)\$(NAMEPREFIX)sh.res
+	$(link32) $(ldebug) -S:2400000 $(LNFLAGS) $(LNFLAGS_CONS) $(TOOLS32)\lib\c0x32 @&&!
+		$(TCLSHOBJS), $@, -x, $(LNLIBS) $(TCLLIB),, $(TMPDIR)\$(NAMEPREFIX)sh.res
+!
+
+$(TCLSHP): $(TCLSHOBJS) $(TCLPLUGINLIB) $(TMPDIR)\tclsh.res
+	$(link32) $(ldebug) $(conlflags) $(TMPDIR)\tclsh.res -stack:2300000 \
+		-out:$@ $(conlibsdll) $(TCLPLUGINLIB) $(TCLSHOBJS)
+
+$(TCLTEST): $(TCLTESTOBJS) $(TCLLIB) $(TMPDIR)\$(NAMEPREFIX)sh.res
+	$(link32) $(ldebug) -S:2400000 $(LNFLAGS) $(LNFLAGS_CONS) $(TOOLS32)\lib\c0x32 @&&!
+		$(TCLTESTOBJS), $@, -x, $(LNLIBS) $(TCLLIB),, $(TMPDIR)\$(NAMEPREFIX)sh.res
+!
+
+$(TCLPIPEDLL): $(WINDIR)\stub16.c
+	$(cc32) $(CFLAGS) -o$(TMPDIR)\stub16.obj $(WINDIR)\stub16.c
+	$(link32) $(ldebug) $(LNFLAGS) $(LNFLAGS_CONS) $(TOOLS32)\lib\c0x32 \
+		$(TMPDIR)\stub16.obj, $@, -x, $(LNLIBS),, $(TMPDIR)\$(NAMEPREFIX).res
+
+$(TCLDDEDLL): $(TMPDIR)\tclWinDde.obj $(TCLSTUBLIB)
+	$(link32) $(ldebug) $(LNFLAGS) $(LNFLAGS_DLL) $(TOOLS32)\lib\c0d32 \
+		$(TMPDIR)\tclWinDde.obj, $@, -x, $(LNLIBS) $(TCLSTUBLIB),, \
+		$(TMPDIR)\$(NAMEPREFIX).res
+
+$(TCLREGDLL): $(TMPDIR)\tclWinReg.obj $(TCLSTUBLIB)
+	$(link32) $(ldebug) $(LNFLAGS) $(LNFLAGS_DLL) $(TOOLS32)\lib\c0d32 \
+		$(TMPDIR)\tclWinReg.obj, $@, -x, $(LNLIBS) $(TCLSTUBLIB),, \
+		$(TMPDIR)\$(NAMEPREFIX).res
+
+$(CAT32): $(WINDIR)\cat.c
+	$(cc32) $(CONS_CFLAGS) -o$(TMPDIR)\cat.obj $?
+	$(link32) $(ldebug) $(LNFLAGS) $(LNFLAGS_CONS) $(TOOLS32)\lib\c0x32 \
+		$(TMPDIR)\cat.obj, $@, -x, $(LNLIBS),,
+
+install-binaries: $(TCLSH)
+	$(MKDIR) "$(BIN_INSTALL_DIR)"
+	$(MKDIR) "$(LIB_INSTALL_DIR)"
+	@echo Installing $(TCLDLLNAME)
+	@copy "$(TCLDLL)" "$(BIN_INSTALL_DIR)"
+	@copy "$(TCLLIB)" "$(LIB_INSTALL_DIR)"
+	@echo Installing "$(TCLSH)"
+	@copy "$(TCLSH)" "$(BIN_INSTALL_DIR)"
+	@echo Installing $(TCLPIPEDLLNAME)
+	@copy "$(TCLPIPEDLL)" "$(BIN_INSTALL_DIR)"
+	@echo Installing $(TCLSTUBLIBNAME)
+	@copy "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)"
+
+install-libraries:
+	-@$(MKDIR) "$(LIB_INSTALL_DIR)"
+	-@$(MKDIR) "$(INCLUDE_INSTALL_DIR)"
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)"
+	@echo Installing http1.0
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http1.0"
+	-@copy "$(ROOT)\library\http1.0\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http1.0"
+	-@copy "$(ROOT)\library\http1.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http1.0"
+	@echo Installing http2.7
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http2.7"
+	-@copy "$(ROOT)\library\http\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http2.7"
+	-@copy "$(ROOT)\library\http\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http2.7"
+	@echo Installing opt0.4
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4"
+	-@copy "$(ROOT)\library\opt\optparse.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
+	-@copy "$(ROOT)\library\opt\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
+	@echo Installing msgcat1.5
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\msgcat1.5"
+	-@copy "$(ROOT)\library\msgcat\msgcat.tcl"   "$(SCRIPT_INSTALL_DIR)\msgcat1.5"
+	-@copy "$(ROOT)\library\msgcat\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\msgcat1.5"
+	@echo Installing tcltest2.3
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\tcltest2.3"
+	-@copy "$(ROOT)\library\tcltest\tcltest.tcl"   "$(SCRIPT_INSTALL_DIR)\tcltest2.3"
+	-@copy "$(ROOT)\library\tcltest\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\tcltest2.3"
+	@echo Installing platform1.0
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\platform1.0"
+	-@copy "$(ROOT)\library\platform\platform.tcl" "$(SCRIPT_INSTALL_DIR)\platform1.0"
+	-@copy "$(ROOT)\library\platform\shell.tcl"    "$(SCRIPT_INSTALL_DIR)\platform1.0"
+	-@copy "$(ROOT)\library\platform\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\platform1.0"
+	@echo Installing $(TCLDDEDLLNAME)
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\dde1.3"
+	-@copy "$(TCLDDEDLL)" "$(SCRIPT_INSTALL_DIR)\dde1.3"
+	-@copy "$(ROOT)\library\dde\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\dde1.3"
+	@echo Installing $(TCLREGDLLNAME)
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\reg1.2"
+	-@copy "$(TCLREGDLL)" "$(SCRIPT_INSTALL_DIR)\reg1.2"
+	-@copy "$(ROOT)\library\reg\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\reg1.2"
+	@echo Installing encoding files
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\encoding"
+	-@copy "$(ROOT)\library\encoding\*.enc" "$(SCRIPT_INSTALL_DIR)\encoding"
+	@echo Installing library files
+	-@copy "$(GENERICDIR)\tcl.h"         "$(INCLUDE_INSTALL_DIR)"
+	-@copy "$(GENERICDIR)\tclDecls.h"    "$(INCLUDE_INSTALL_DIR)"
+	-@copy "$(GENERICDIR)\tclPlatDecls.h" "$(INCLUDE_INSTALL_DIR)"
+	-@copy "$(ROOT)\library\history.tcl" "$(SCRIPT_INSTALL_DIR)"
+	-@copy "$(ROOT)\library\init.tcl"    "$(SCRIPT_INSTALL_DIR)"
+	-@copy "$(ROOT)\library\parray.tcl"  "$(SCRIPT_INSTALL_DIR)"
+	-@copy "$(ROOT)\library\safe.tcl"    "$(SCRIPT_INSTALL_DIR)"
+	-@copy "$(ROOT)\library\tclIndex"    "$(SCRIPT_INSTALL_DIR)"
+	-@copy "$(ROOT)\library\package.tcl" "$(SCRIPT_INSTALL_DIR)"
+	-@copy "$(ROOT)\library\word.tcl"    "$(SCRIPT_INSTALL_DIR)"
+	-@copy "$(ROOT)\library\auto.tcl"    "$(SCRIPT_INSTALL_DIR)"
+
+#
+# Regenerate the stubs files.
+#
+
+genstubs:
+	tclsh$(VERSION) $(ROOT)\tools\genStubs.tcl $(GENERICDIR) \
+		$(GENERICDIR)\tcl.decls $(GENERICDIR)\tclInt.decls
+
+#
+# Regenerate the windows help files.
+#
+
+TCLTOOLS	= $(ROOT)/tools
+MAN2TCL		= $(TCLTOOLS)/man2tcl
+TCLRTF		= $(TCLTOOLS)/tcl.rtf
+TCLHPJ		= $(TCLTOOLS)/tcl.hpj
+MAN2HELP	= $(TCLTOOLS)/man2help.tcl
+HCRTF		= $(TOOLS32)/bin/hcrtf.exe
+
+winhelp: $(TCLRTF)
+	cd $(TCLTOOLS)
+	start /wait $(HCRTF) -xn $(TCLHPJ)
+
+$(MAN2TCL).exe: $(MAN2TCL).obj
+	cd $(TCLTOOLS)
+	$(cc32) /nologo /G4 /ML /O2 $(MAN2TCL).c
+
+$(TCLRTF): $(MAN2TCL).exe $(TCLSH)
+	cd $(TCLTOOLS)
+	..\win\$(TCLSH) $(MAN2HELP) $(NAMEPREFIX) $(VERSION) $(ROOT)/doc ../../tk$(DOTVERSION)/doc
+
+#
+# Special case object file targets
+#
+$(TMPDIR)\tclWinInit.obj: $(WINDIR)\tclWinInit.c
+	$(cc32) -DBUILD_tcl $(TCL_CFLAGS) -o$(TMPDIR)\$@ $?
+
+$(TMPDIR)\testMain.obj: $(WINDIR)\tclAppInit.c
+	$(cc32) $(TCL_CFLAGS) -DTCL_TEST -o$(TMPDIR)\testMain.obj $?
+
+$(TMPDIR)\tclTest.obj: $(GENERICDIR)\tclTest.c
+	$(cc32) $(TCL_CFLAGS) -o$(TMPDIR)\$@ $?
+
+$(TMPDIR)\tclTestObj.obj: $(GENERICDIR)\tclTestObj.c
+	$(cc32) $(TCL_CFLAGS) -o$(TMPDIR)\$@ $?
+
+$(TMPDIR)\tclWinTest.obj: $(WINDIR)\tclWinTest.c
+	$(cc32) $(TCL_CFLAGS) -o$(TMPDIR)\$@ $?
+
+$(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c
+	$(cc32) $(TCL_CFLAGS) \
+		-DCFG_INSTALL_EXEC_PREFIX=\"$(INSTALL_EXEC_PREFIX)\"	\
+		-DCFG_INSTALL_PREFIX=\"$(INSTALL_PREFIX)\"		\
+		-DCFG_RUNTIME_EXEC_PREFIX=\"$(RUNTIME_EXEC_PREFIX)\"	\
+		-DCFG_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\"		\
+	 -o$(TMPDIR)\$@ $?
+
+$(TMPDIR)\tclAppInit.obj : $(WINDIR)\tclAppInit.c
+	$(cc32) $(TCL_CFLAGS) -o$(TMPDIR)\$@ $?
+
+# The following objects should be built using the stub interfaces
+
+# tclWinReg: Produces errors in ANSI mode
+$(TMPDIR)\tclWinReg.obj : $(WINDIR)\tclWinReg.c
+	$(cc32) $(TCL_CFLAGS) -DUSE_TCL_STUBS -o$(TMPDIR)\$@ $?
+
+# tclWinDde: Produces errors in ANSI mode
+$(TMPDIR)\tclWinDde.obj : $(WINDIR)\tclWinDde.c
+	$(cc32) $(TCL_CFLAGS) -DUSE_TCL_STUBS -o$(TMPDIR)\$@ $?
+
+
+# The following objects are part of the stub library and should not
+# be built as DLL objects but none of the symbols should be exported
+
+$(TMPDIR)\tclStubLib.obj : $(GENERICDIR)\tclStubLib.c
+	$(cc32) $(TCL_CFLAGS) -DSTATIC_BUILD -o$(TMPDIR)\$@ $?
+
+
+# Dedependency rules
+
+$(GENERICDIR)\regcomp.c: \
+	$(GENERICDIR)\regguts.h \
+	$(GENERICDIR)\regc_lex.c \
+	$(GENERICDIR)\regc_color.c \
+	$(GENERICDIR)\regc_nfa.c \
+	$(GENERICDIR)\regc_cvec.c \
+	$(GENERICDIR)\regc_locale.c
+
+$(GENERICDIR)\regcustom.h: \
+	$(GENERICDIR)\tclInt.h \
+	$(GENERICDIR)\tclPort.h \
+	$(GENERICDIR)\regex.h
+
+$(GENERICDIR)\regexec.c: \
+	$(GENERICDIR)\rege_dfa.c \
+	$(GENERICDIR)\regguts.h
+
+$(GENERICDIR)\regerror.c: $(GENERICDIR)\regguts.h
+$(GENERICDIR)\regfree.c: $(GENERICDIR)\regguts.h
+$(GENERICDIR)\regfronts.c: $(GENERICDIR)\regguts.h
+$(GENERICDIR)\regguts.h: $(GENERICDIR)\regcustom.h
+
+#
+# Implicit rules
+#
+
+{$(WINDIR)}.c{$(TMPDIR)}.obj:
+	$(cc32) -DBUILD_tcl $(TCL_CFLAGS) -o$@ $<
+
+{$(GENERICDIR)}.c{$(TMPDIR)}.obj:
+	$(cc32) -DBUILD_tcl $(TCL_CFLAGS) -o$@ $<
+
+{$(ROOT)\compat}.c{$(TMPDIR)}.obj:
+	$(cc32) -DBUILD_tcl $(TCL_CFLAGS) -o$@ $<
+
+{$(WINDIR)}.rc{$(TMPDIR)}.res:
+	$(rc32) $(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -fo$@ $<
+
+clean:
+	-@$(RM) $(OUTDIR)\*.exp
+	-@$(RM) $(OUTDIR)\*.lib
+	-@$(RM) $(OUTDIR)\*.dll
+	-@$(RM) $(OUTDIR)\*.exe
+	-@$(RM) $(OUTDIR)\*.pdb
+	-@$(RM) $(TMPDIR)\*.pch
+	-@$(RM) $(TMPDIR)\*.obj
+	-@$(RM) $(TMPDIR)\*.res
+	-@$(RM) $(TMPDIR)\*.exe
+	-@$(RMDIR) $(OUTDIR)
+	-@$(RMDIR) $(TMPDIR)
diff --git a/win/makefile.vc b/win/makefile.vc
index 152cc66..1f957ea 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -1,1137 +1,1137 @@
-#------------------------------------------------------------- -*- makefile -*-
-# makefile.vc --
-#
-#	Microsoft Visual C++ makefile for use with nmake.exe v1.62+ (VC++ 5.0+)
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-2000 Ajuba Solutions.
-# Copyright (c) 2001-2005 ActiveState Corporation.
-# Copyright (c) 2001-2004 David Gravereaux.
-# Copyright (c) 2003-2008 Pat Thoyts.
-#------------------------------------------------------------------------------
-
-# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or
-# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir)
-!if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(VCINSTALLDIR) && !defined(MSSDK) && !defined(WINDOWSSDKDIR)
-MSG = ^
-You need to run vcvars32.bat from Developer Studio or setenv.bat from the^
-Platform SDK first to setup the environment.  Jump to this line to read^
-the build instructions.
-!error $(MSG)
-!endif
-
-#------------------------------------------------------------------------------
-# HOW TO USE this makefile:
-#
-# 1)  It is now necessary to have MSVCDir, MSDevDir or MSSDK set in the
-#     environment.  This is used as a check to see if vcvars32.bat had been
-#     run prior to running nmake or during the installation of Microsoft
-#     Visual C++, MSVCDir had been set globally and the PATH adjusted.
-#     Either way is valid.
-#
-#     You'll need to run vcvars32.bat contained in the MsDev's vc(98)/bin
-#     directory to setup the proper environment, if needed, for your
-#     current setup.  This is a needed bootstrap requirement and allows the
-#     swapping of different environments to be easier.
-#
-# 2)  To use the Platform SDK (not expressly needed), run setenv.bat after
-#     vcvars32.bat according to the instructions for it.  This can also
-#     turn on the 64-bit compiler, if your SDK has it.
-#
-# 3)  Targets are:
-#	release  -- Builds the core, the shell and the dlls. (default)
-#	dlls     -- Just builds the windows extensions and the 16-bit DOS
-#		    pipe/thunk helper app.
-#	shell    -- Just builds the shell and the core.
-#	core     -- Only builds the core [tclXX.(dll|lib)].
-#	all      -- Builds everything.
-#	test     -- Builds and runs the test suite.
-#	tcltest  -- Just builds the test shell.
-#	install  -- Installs the built binaries and libraries to $(INSTALLDIR)
-#		    as the root of the install tree.
-#	tidy/clean/hose -- varying levels of cleaning.
-#	genstubs -- Rebuilds the Stubs table and support files (dev only).
-#	depend   -- Generates an accurate set of source dependancies for this
-#		    makefile.  Helpful to avoid problems when the sources are
-#		    refreshed and you rebuild, but can "overbuild" when common
-#		    headers like tclInt.h just get small changes.
-#	htmlhelp -- Builds a Windows .chm help file for Tcl and Tk from the
-#		    troff manual pages found in $(ROOT)\doc. You need to
-#		    have installed the HTML Help Compiler package from Microsoft
-#		    to produce the .chm file.
-#	winhelp  -- Builds the windows .hlp file for Tcl from the troff man
-#		    files found in $(ROOT)\doc.
-#
-# 4)  Macros usable on the commandline:
-#	INSTALLDIR=<path>
-#		Sets where to install Tcl from the built binaries.
-#		C:\Progra~1\Tcl is assumed when not specified.
-#
-#	OPTS=loimpact,msvcrt,static,staticpkg,symbols,threads,profile,unchecked,none
-#		Sets special options for the core.  The default is for none.
-#		Any combination of the above may be used (comma separated).
-#		'none' will over-ride everything to nothing.
-#
-#		loimpact = Adds a flag for how NT treats the heap to keep memory
-#			   in use, low.  This is said to impact alloc performance.
-#		msvcrt   = Affects the static option only to switch it from
-#			   using libcmt(d) as the C runtime [by default] to
-#			   msvcrt(d). This is useful for static embedding
-#			   support.
-#		static   = Builds a static library of the core instead of a
-#			   dll.  The shell will be static (and large), as well.
-#		staticpkg= Affects the static option only to switch
-#			   tclshXX.exe to have the dde and reg extension linked
-#			   inside it.
-#		threads  = Turns on full multithreading support.
-#		thrdalloc = Use the thread allocator (shared global free pool).
-#		thrdstorage = Use the generic thread storage support.
-#		symbols =  Adds symbols for step debugging.
-#		profile =  Adds profiling hooks.  Map file is assumed.
-#		unchecked = Allows a symbols build to not use the debug
-#			   enabled runtime (msvcrt.dll not msvcrtd.dll
-#			   or libcmt.lib not libcmtd.lib).
-#
-#	STATS=compdbg,memdbg,none
-#		Sets optional memory and bytecode compiler debugging code added
-#		to the core.  The default is for none.  Any combination of the
-#		above may be used (comma separated).  'none' will over-ride
-#		everything to nothing.
-#
-#		compdbg  = Enables byte compilation logging.
-#		memdbg   = Enables the debugging memory allocator.
-#
-#	CHECKS=64bit,fullwarn,nodep,none
-#		Sets special macros for checking compatability.
-#
-#		64bit    = Enable 64bit portability warnings (if available)
-#		fullwarn = Builds with full compiler and link warnings enabled.
-#			    Very verbose.
-#		nodep	 = Turns off compatability macros to ensure the core
-#			    isn't being built with deprecated functions.
-#
-#	MACHINE=(ALPHA|AMD64|IA64|IX86)
-#		Set the machine type used for the compiler, linker, and
-#		resource compiler.  This hook is needed to tell the tools
-#		when alternate platforms are requested.  IX86 is the default
-#		when not specified. If the CPU environment variable has been
-#		set (ie: recent Platform SDK) then MACHINE is set from CPU.
-#
-#	TMP_DIR=<path>
-#	OUT_DIR=<path>
-#		Hooks to allow the intermediate and output directories to be
-#		changed.  $(OUT_DIR) is assumed to be
-#		$(BINROOT)\(Release|Debug) based on if symbols are requested.
-#		$(TMP_DIR) will de $(OUT_DIR)\<buildtype> by default.
-#
-#	TESTPAT=<file>
-#		Reads the tests requested to be run from this file.
-#
-#	CFG_ENCODING=encoding
-#		name of encoding for configuration information. Defaults
-#		to cp1252
-#
-# 5)  Examples:
-#
-#	Basic syntax of calling nmake looks like this:
-#	nmake [-nologo] -f makefile.vc [target|macrodef [target|macrodef] [...]]
-#
-#                        Standard (no frills)
-#       c:\tcl_src\win\>c:\progra~1\micros~1\vc98\bin\vcvars32.bat
-#       Setting environment for using Microsoft Visual C++ tools.
-#       c:\tcl_src\win\>nmake -f makefile.vc release
-#       c:\tcl_src\win\>nmake -f makefile.vc install INSTALLDIR=c:\progra~1\tcl
-#
-#                         Building for Win64
-#       c:\tcl_src\win\>c:\progra~1\micros~1\vc98\bin\vcvars32.bat
-#       Setting environment for using Microsoft Visual C++ tools.
-#       c:\tcl_src\win\>c:\progra~1\platfo~1\setenv.bat /pre64 /RETAIL
-#       Targeting Windows pre64 RETAIL
-#       c:\tcl_src\win\>nmake -f makefile.vc MACHINE=IA64
-#
-#------------------------------------------------------------------------------
-#==============================================================================
-###############################################################################
-
-
-#    //==================================================================\\
-#   >>[               -> Do not modify below this line. <-               ]<<
-#   >>[  Please, use the commandline macros to modify how Tcl is built.  ]<<
-#   >>[  If you need more features, send us a patch for more macros.     ]<<
-#    \\==================================================================//
-
-
-###############################################################################
-#==============================================================================
-#------------------------------------------------------------------------------
-
-!if !exist("makefile.vc")
-MSG = ^
-You must run this makefile only from the directory it is in.^
-Please `cd` to its location first.
-!error $(MSG)
-!endif
-
-PROJECT = tcl
-!include "rules.vc"
-
-STUBPREFIX      = $(PROJECT)stub
-DOTVERSION      = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
-VERSION         = $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)
-
-DDEDOTVERSION = 1.3
-DDEVERSION = $(DDEDOTVERSION:.=)
-
-REGDOTVERSION = 1.2
-REGVERSION = $(REGDOTVERSION:.=)
-
-BINROOT		= .
-ROOT		= ..
-
-TCLIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
-TCLLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)
-TCLLIB		= $(OUT_DIR)\$(TCLLIBNAME)
-
-TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib
-TCLSTUBLIB	= $(OUT_DIR)\$(TCLSTUBLIBNAME)
-
-TCLSHNAME	= $(PROJECT)sh$(VERSION)$(SUFX).exe
-TCLSH		= $(OUT_DIR)\$(TCLSHNAME)
-TCLPIPEDLLNAME	= $(PROJECT)pip$(VERSION)$(SUFX:t=).dll
-TCLPIPEDLL	= $(OUT_DIR)\$(TCLPIPEDLLNAME)
-
-TCLREGLIBNAME	= $(PROJECT)reg$(REGVERSION)$(SUFX:t=).$(EXT)
-TCLREGLIB	= $(OUT_DIR)\$(TCLREGLIBNAME)
-
-TCLDDELIBNAME	= $(PROJECT)dde$(DDEVERSION)$(SUFX:t=).$(EXT)
-TCLDDELIB	= $(OUT_DIR)\$(TCLDDELIBNAME)
-
-TCLTEST		= $(OUT_DIR)\$(PROJECT)test.exe
-CAT32		= $(OUT_DIR)\cat32.exe
-
-# Can we run what we build? IX86 runs on all architectures.
-!ifndef TCLSH_NATIVE
-!if "$(MACHINE)" == "IX86" || "$(MACHINE)" == "$(NATIVE_ARCH)"
-TCLSH_NATIVE	= $(TCLSH)
-!else
-!error You must explicitly set TCLSH_NATIVE for cross-compilation
-!endif
-!endif
-
-### Make sure we use backslash only.
-LIB_INSTALL_DIR		= $(_INSTALLDIR)\lib
-BIN_INSTALL_DIR		= $(_INSTALLDIR)\bin
-DOC_INSTALL_DIR		= $(_INSTALLDIR)\doc
-SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\tcl$(DOTVERSION)
-INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\include
-
-TCLSHOBJS = \
-	$(TMP_DIR)\tclAppInit.obj \
-!if $(TCL_USE_STATIC_PACKAGES)
-	$(TMP_DIR)\tclWinReg.obj \
-	$(TMP_DIR)\tclWinDde.obj \
-!endif
-	$(TMP_DIR)\tclsh.res
-
-TCLTESTOBJS = \
-	$(TMP_DIR)\tclTest.obj \
-	$(TMP_DIR)\tclTestObj.obj \
-	$(TMP_DIR)\tclTestProcBodyObj.obj \
-	$(TMP_DIR)\tclThreadTest.obj \
-	$(TMP_DIR)\tclWinTest.obj \
-!if $(TCL_USE_STATIC_PACKAGES)
-	$(TMP_DIR)\tclWinReg.obj \
-	$(TMP_DIR)\tclWinDde.obj \
-!endif
-	$(TMP_DIR)\testMain.obj
-
-TCLOBJS = \
-	$(TMP_DIR)\regcomp.obj \
-	$(TMP_DIR)\regerror.obj \
-	$(TMP_DIR)\regexec.obj \
-	$(TMP_DIR)\regfree.obj \
-	$(TMP_DIR)\tclAlloc.obj \
-	$(TMP_DIR)\tclAsync.obj \
-	$(TMP_DIR)\tclBasic.obj \
-	$(TMP_DIR)\tclBinary.obj \
-	$(TMP_DIR)\tclCkalloc.obj \
-	$(TMP_DIR)\tclClock.obj \
-	$(TMP_DIR)\tclCmdAH.obj \
-	$(TMP_DIR)\tclCmdIL.obj \
-	$(TMP_DIR)\tclCmdMZ.obj \
-	$(TMP_DIR)\tclCompCmds.obj \
-	$(TMP_DIR)\tclCompExpr.obj \
-	$(TMP_DIR)\tclCompile.obj \
-	$(TMP_DIR)\tclConfig.obj \
-	$(TMP_DIR)\tclDate.obj \
-	$(TMP_DIR)\tclDictObj.obj \
-	$(TMP_DIR)\tclEncoding.obj \
-	$(TMP_DIR)\tclEnv.obj \
-	$(TMP_DIR)\tclEvent.obj \
-	$(TMP_DIR)\tclExecute.obj \
-	$(TMP_DIR)\tclFCmd.obj \
-	$(TMP_DIR)\tclFileName.obj \
-	$(TMP_DIR)\tclGet.obj \
-	$(TMP_DIR)\tclHash.obj \
-	$(TMP_DIR)\tclHistory.obj \
-	$(TMP_DIR)\tclIndexObj.obj \
-	$(TMP_DIR)\tclInterp.obj \
-	$(TMP_DIR)\tclIO.obj \
-	$(TMP_DIR)\tclIOCmd.obj \
-	$(TMP_DIR)\tclIOGT.obj \
-	$(TMP_DIR)\tclIOSock.obj \
-	$(TMP_DIR)\tclIOUtil.obj \
-	$(TMP_DIR)\tclIORChan.obj \
-	$(TMP_DIR)\tclLink.obj \
-	$(TMP_DIR)\tclListObj.obj \
-	$(TMP_DIR)\tclLiteral.obj \
-	$(TMP_DIR)\tclLoad.obj \
-	$(TMP_DIR)\tclMain.obj \
-	$(TMP_DIR)\tclNamesp.obj \
-	$(TMP_DIR)\tclNotify.obj \
-	$(TMP_DIR)\tclObj.obj \
-	$(TMP_DIR)\tclPanic.obj \
-	$(TMP_DIR)\tclParse.obj \
-	$(TMP_DIR)\tclPathObj.obj \
-	$(TMP_DIR)\tclPipe.obj \
-	$(TMP_DIR)\tclPkg.obj \
-	$(TMP_DIR)\tclPkgConfig.obj \
-	$(TMP_DIR)\tclPosixStr.obj \
-	$(TMP_DIR)\tclPreserve.obj \
-	$(TMP_DIR)\tclProc.obj \
-	$(TMP_DIR)\tclRegexp.obj \
-	$(TMP_DIR)\tclResolve.obj \
-	$(TMP_DIR)\tclResult.obj \
-	$(TMP_DIR)\tclScan.obj \
-	$(TMP_DIR)\tclStringObj.obj \
-	$(TMP_DIR)\tclStrToD.obj \
-	$(TMP_DIR)\tclStubInit.obj \
-	$(TMP_DIR)\tclStubLib.obj \
-	$(TMP_DIR)\tclThread.obj \
-	$(TMP_DIR)\tclThreadAlloc.obj \
-	$(TMP_DIR)\tclThreadJoin.obj \
-	$(TMP_DIR)\tclThreadStorage.obj \
-	$(TMP_DIR)\tclTimer.obj \
-	$(TMP_DIR)\tclTomMathInterface.obj \
-	$(TMP_DIR)\tclTrace.obj \
-	$(TMP_DIR)\tclUtf.obj \
-	$(TMP_DIR)\tclUtil.obj \
-	$(TMP_DIR)\tclVar.obj \
-	$(TMP_DIR)\tclWin32Dll.obj \
-	$(TMP_DIR)\tclWinChan.obj \
-	$(TMP_DIR)\tclWinConsole.obj \
-	$(TMP_DIR)\tclWinSerial.obj \
-	$(TMP_DIR)\tclWinError.obj \
-	$(TMP_DIR)\tclWinFCmd.obj \
-	$(TMP_DIR)\tclWinFile.obj \
-	$(TMP_DIR)\tclWinInit.obj \
-	$(TMP_DIR)\tclWinLoad.obj \
-	$(TMP_DIR)\tclWinNotify.obj \
-	$(TMP_DIR)\tclWinPipe.obj \
-	$(TMP_DIR)\tclWinSock.obj \
-	$(TMP_DIR)\tclWinThrd.obj \
-	$(TMP_DIR)\tclWinTime.obj \
-	$(TMP_DIR)\bncore.obj \
-	$(TMP_DIR)\bn_reverse.obj \
-	$(TMP_DIR)\bn_fast_s_mp_mul_digs.obj \
-	$(TMP_DIR)\bn_fast_s_mp_sqr.obj \
-	$(TMP_DIR)\bn_mp_add.obj \
-	$(TMP_DIR)\bn_mp_add_d.obj \
-	$(TMP_DIR)\bn_mp_and.obj \
-	$(TMP_DIR)\bn_mp_clamp.obj \
-	$(TMP_DIR)\bn_mp_clear.obj \
-	$(TMP_DIR)\bn_mp_clear_multi.obj \
-	$(TMP_DIR)\bn_mp_cmp.obj \
-	$(TMP_DIR)\bn_mp_cmp_d.obj \
-	$(TMP_DIR)\bn_mp_cmp_mag.obj \
-	$(TMP_DIR)\bn_mp_cnt_lsb.obj \
-	$(TMP_DIR)\bn_mp_copy.obj \
-	$(TMP_DIR)\bn_mp_count_bits.obj \
-	$(TMP_DIR)\bn_mp_div.obj \
-	$(TMP_DIR)\bn_mp_div_d.obj \
-	$(TMP_DIR)\bn_mp_div_2.obj \
-	$(TMP_DIR)\bn_mp_div_2d.obj \
-	$(TMP_DIR)\bn_mp_div_3.obj \
-	$(TMP_DIR)\bn_mp_exch.obj \
-	$(TMP_DIR)\bn_mp_expt_d.obj \
-	$(TMP_DIR)\bn_mp_grow.obj \
-	$(TMP_DIR)\bn_mp_init.obj \
-	$(TMP_DIR)\bn_mp_init_copy.obj \
-	$(TMP_DIR)\bn_mp_init_multi.obj \
-	$(TMP_DIR)\bn_mp_init_set.obj \
-	$(TMP_DIR)\bn_mp_init_set_int.obj \
-	$(TMP_DIR)\bn_mp_init_size.obj \
-	$(TMP_DIR)\bn_mp_karatsuba_mul.obj \
-	$(TMP_DIR)\bn_mp_karatsuba_sqr.obj \
-	$(TMP_DIR)\bn_mp_lshd.obj \
-	$(TMP_DIR)\bn_mp_mod.obj \
-	$(TMP_DIR)\bn_mp_mod_2d.obj \
-	$(TMP_DIR)\bn_mp_mul.obj \
-	$(TMP_DIR)\bn_mp_mul_2.obj \
-	$(TMP_DIR)\bn_mp_mul_2d.obj \
-	$(TMP_DIR)\bn_mp_mul_d.obj \
-	$(TMP_DIR)\bn_mp_neg.obj \
-	$(TMP_DIR)\bn_mp_or.obj \
-	$(TMP_DIR)\bn_mp_radix_size.obj \
-	$(TMP_DIR)\bn_mp_radix_smap.obj \
-	$(TMP_DIR)\bn_mp_read_radix.obj \
-	$(TMP_DIR)\bn_mp_rshd.obj \
-	$(TMP_DIR)\bn_mp_set.obj \
-	$(TMP_DIR)\bn_mp_set_int.obj \
-	$(TMP_DIR)\bn_mp_shrink.obj \
-	$(TMP_DIR)\bn_mp_sqr.obj \
-	$(TMP_DIR)\bn_mp_sqrt.obj \
-	$(TMP_DIR)\bn_mp_sub.obj \
-	$(TMP_DIR)\bn_mp_sub_d.obj \
-	$(TMP_DIR)\bn_mp_to_unsigned_bin.obj \
-	$(TMP_DIR)\bn_mp_to_unsigned_bin_n.obj \
-	$(TMP_DIR)\bn_mp_toom_mul.obj \
-	$(TMP_DIR)\bn_mp_toom_sqr.obj \
-	$(TMP_DIR)\bn_mp_toradix_n.obj \
-	$(TMP_DIR)\bn_mp_unsigned_bin_size.obj \
-	$(TMP_DIR)\bn_mp_xor.obj \
-	$(TMP_DIR)\bn_mp_zero.obj \
-	$(TMP_DIR)\bn_s_mp_add.obj \
-	$(TMP_DIR)\bn_s_mp_mul_digs.obj \
-	$(TMP_DIR)\bn_s_mp_sqr.obj \
-	$(TMP_DIR)\bn_s_mp_sub.obj \
-!if !$(STATIC_BUILD)
-	$(TMP_DIR)\tcl.res
-!endif
-
-TCLSTUBOBJS = \
-	$(TMP_DIR)\tclStubLib.obj
-
-### The following paths CANNOT have spaces in them.
-COMPATDIR	= $(ROOT)\compat
-DOCDIR		= $(ROOT)\doc
-GENERICDIR	= $(ROOT)\generic
-TOMMATHDIR	= $(ROOT)\libtommath
-TOOLSDIR	= $(ROOT)\tools
-WINDIR		= $(ROOT)\win
-
-#---------------------------------------------------------------------
-# Compile flags
-#---------------------------------------------------------------------
-
-!if !$(DEBUG)
-!if $(OPTIMIZING)
-### This cranks the optimization level to maximize speed
-cdebug	= -O2 $(OPTIMIZATIONS)
-!else
-cdebug	=
-!endif
-!if $(SYMBOLS)
-cdebug	= $(cdebug) -Zi
-!endif
-!else if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
-### Warnings are too many, can't support warnings into errors.
-cdebug	= -Zi -Od $(DEBUGFLAGS)
-!else
-cdebug	= -Zi -WX $(DEBUGFLAGS)
-!endif
-
-### Declarations common to all compiler options
-cwarn = $(WARNINGS) -D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE
-cflags = -nologo -c $(COMPILERFLAGS) $(cwarn) -Fp$(TMP_DIR)^\
-
-!if $(MSVCRT)
-!if $(DEBUG) && !$(UNCHECKED)
-crt = -MDd
-!else
-crt = -MD
-!endif
-!else
-!if $(DEBUG) && !$(UNCHECKED)
-crt = -MTd
-!else
-crt = -MT
-!endif
-!endif
-
-TCL_INCLUDES	= -I"$(WINDIR)" -I"$(GENERICDIR)" -I"$(TOMMATHDIR)"
-TCL_DEFINES	= -DTCL_PIPE_DLL=\"$(TCLPIPEDLLNAME)\" -DTCL_TOMMATH -DMP_PREC=4 -Dinline=__inline
-BASE_CFLAGS	= $(cflags) $(cdebug) $(crt) $(TCL_INCLUDES) $(TCL_DEFINES)
-CON_CFLAGS	= $(cflags) $(cdebug) $(crt) -DCONSOLE
-TCL_CFLAGS	= $(BASE_CFLAGS) $(OPTDEFINES)
-STUB_CFLAGS     = $(cflags) $(cdebug) $(OPTDEFINES)
-
-
-#---------------------------------------------------------------------
-# Link flags
-#---------------------------------------------------------------------
-
-!if $(DEBUG)
-ldebug	= -debug -debugtype:cv
-!else
-ldebug	= -release -opt:ref -opt:icf,3
-!if $(SYMBOLS)
-ldebug	= $(ldebug) -debug -debugtype:cv
-!endif
-!endif
-
-### Declarations common to all linker options
-lflags	= -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug)
-
-!if $(PROFILE)
-lflags	= $(lflags) -profile
-!endif
-
-!if $(ALIGN98_HACK) && !$(STATIC_BUILD)
-### Align sections for PE size savings.
-lflags	= $(lflags) -opt:nowin98
-!else if !$(ALIGN98_HACK) && $(STATIC_BUILD)
-### Align sections for speed in loading by choosing the virtual page size.
-lflags	= $(lflags) -align:4096
-!endif
-
-!if $(LOIMPACT)
-lflags	= $(lflags) -ws:aggressive
-!endif
-
-dlllflags = $(lflags) -dll
-conlflags = $(lflags) -subsystem:console
-guilflags = $(lflags) -subsystem:windows
-
-baselibs   = kernel32.lib user32.lib ws2_32.lib
-# Avoid 'unresolved external symbol __security_cookie' errors.
-# c.f. http://support.microsoft.com/?id=894573
-!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
-!if $(VCVERSION) > 1399 && $(VCVERSION) < 1500
-baselibs   = $(baselibs) bufferoverflowU.lib
-!endif
-!endif
-
-#---------------------------------------------------------------------
-# TclTest flags
-#---------------------------------------------------------------------
-
-!if "$(TESTPAT)" != ""
-TESTFLAGS = $(TESTFLAGS) -file $(TESTPAT)
-!endif
-
-
-#---------------------------------------------------------------------
-# Project specific targets
-#---------------------------------------------------------------------
-
-release:    setup $(TCLSH) $(TCLSTUBLIB) dlls
-core:	    setup $(TCLLIB) $(TCLSTUBLIB)
-shell:	    setup $(TCLSH)
-dlls:	    setup $(TCLPIPEDLL) $(TCLREGLIB) $(TCLDDELIB)
-all:	    setup $(TCLSH) $(TCLSTUBLIB) dlls $(CAT32) 
-tcltest:    setup $(TCLTEST) dlls $(CAT32)
-install:    install-binaries install-libraries install-docs
-
-test: test-core
-test-core: setup $(TCLTEST) dlls $(CAT32)
-	set TCL_LIBRARY=$(ROOT:\=/)/library
-!if "$(OS)" == "Windows_NT"  || "$(MSVCDIR)" == "IDE"
-	$(DEBUGGER) $(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile <<
-		package ifneeded dde 1.3.3 [list load "$(TCLDDELIB:\=/)" dde]
-		package ifneeded registry 1.2.2 [list load "$(TCLREGLIB:\=/)" registry]
-<<
-!else
-	@echo Please wait while the tests are collected...
-	$(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile << > tests.log
-		package ifneeded dde 1.3.3 "$(TCLDDELIB:\=/)" dde]
-		package ifneeded registry 1.2.2 "$(TCLREGLIB:\=/)" registry]
-<<
-	type tests.log | more
-!endif
-
-runtest: setup $(TCLTEST) dlls $(CAT32)
-	set TCL_LIBRARY=$(ROOT:\=/)/library
-	$(DEBUGGER) $(TCLTEST) $(SCRIPT)
-
-runshell: setup $(TCLSH) dlls
-	set TCL_LIBRARY=$(ROOT:\=/)/library
-	$(DEBUGGER) $(TCLSH) $(SCRIPT)
-
-setup:
-	@if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR)
-	@if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR)
-
-!if !$(STATIC_BUILD)
-$(TCLIMPLIB): $(TCLLIB)
-!endif
-
-$(TCLLIB): $(TCLOBJS)
-!if $(STATIC_BUILD)
-	$(lib32) -nologo $(LINKERFLAGS) -out:$@ @<<
-$**
-<<
-!else
-	$(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcl -out:$@ \
-		$(baselibs) @<<
-$**
-<<
-	$(_VC_MANIFEST_EMBED_DLL)
-	-@del $*.exp
-!endif
-
-$(TCLSTUBLIB): $(TCLSTUBOBJS)
-	$(lib32) -nologo $(LINKERFLAGS) -nodefaultlib -out:$@ $(TCLSTUBOBJS)
-
-$(TCLSH): $(TCLSHOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)
-	$(link32) $(conlflags) -stack:2300000 -out:$@ $(baselibs) $**
-	$(_VC_MANIFEST_EMBED_EXE)
-
-$(TCLTEST): $(TCLTESTOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)
-	$(link32) $(conlflags) -stack:2300000 -out:$@ $(baselibs) $**
-	$(_VC_MANIFEST_EMBED_EXE)
-
-$(TCLPIPEDLL): $(WINDIR)\stub16.c
-	$(cc32) $(CON_CFLAGS) -Fo$(TMP_DIR)\ $(WINDIR)\stub16.c
-	$(link32) $(conlflags) -out:$@ $(TMP_DIR)\stub16.obj $(baselibs)
-	$(_VC_MANIFEST_EMBED_DLL)
-
-!if $(STATIC_BUILD)
-$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj
-	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $**
-!else
-$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB)
-	$(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcldde -out:$@ \
-		$** $(baselibs)
-	$(_VC_MANIFEST_EMBED_DLL)
-	-@del $*.exp
-	-@del $*.lib
-!endif
-
-!if $(STATIC_BUILD)
-$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj
-	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $**
-!else
-$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB)
-	$(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tclreg -out:$@ \
-		$** $(baselibs)
-	$(_VC_MANIFEST_EMBED_DLL)
-	-@del $*.exp
-	-@del $*.lib
-!endif
-
-$(CAT32): $(WINDIR)\cat.c
-	$(cc32) $(CON_CFLAGS) -Fo$(TMP_DIR)\ $?
-	$(link32) $(conlflags) -out:$@ -stack:16384 $(TMP_DIR)\cat.obj \
-		$(baselibs)
-	$(_VC_MANIFEST_EMBED_EXE)
-
-#---------------------------------------------------------------------
-# Regenerate the stubs files.  [Development use only]
-#---------------------------------------------------------------------
-
-genstubs:
-!if !exist($(TCLSH))
-	@echo Build tclsh first!
-!else
-	$(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
-		$(GENERICDIR:\=/)/tcl.decls $(GENERICDIR:\=/)/tclInt.decls \
-		$(GENERICDIR:\=/)/tclTomMath.decls
-!endif
-
-
-#----------------------------------------------------------------------
-# The following target generates the file generic/tclTomMath.h.
-# It needs to be run (and the results checked) after updating
-# to a new release of libtommath.
-#----------------------------------------------------------------------
-
-gentommath_h:
-!if !exist($(TCLSH))
-	@echo Build tclsh first!
-!else
-	$(TCLSH) "$(TOOLSDIR:\=/)/fix_tommath_h.tcl" \
-		"$(TOMMATHDIR:\=/)/tommath.h" \
-		> "$(GENERICDIR)\tclTomMath.h"
-!endif
-
-#---------------------------------------------------------------------
-# Build the Windows HTML help file.
-#---------------------------------------------------------------------
-
-# NOTE: you can define HHC on the command-line to override this
-!ifndef HHC
-HHC=""%ProgramFiles%\HTML Help Workshop\hhc.exe""
-!endif
-HTMLDIR=$(ROOT)\html
-HTMLBASE=TclTk$(VERSION)
-HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp
-CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
-
-htmlhelp: chmsetup $(CHMFILE)
-
-$(CHMFILE): $(DOCDIR)\*
-	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl
-	@echo Compiling HTML help project
-	@$(HHC) <<$(HHPFILE) >NUL
-[OPTIONS]
-Compatibility=1.1 or later
-Compiled file=$(HTMLBASE).chm
-Display compile progress=no
-Error log file=$(HTMLBASE).log
-Language=0x409 English (United States)
-Title=Tcl/Tk $(DOT_VERSION) Help
-[FILES]
-contents.htm
-docs.css
-Keywords
-TclCmd
-TclLib
-TkCmd
-TkLib
-UserCmd
-<<
-
-chmsetup:
-	@if not exist $(HTMLDIR)\nul mkdir $(HTMLDIR)
-
-#-------------------------------------------------------------------------
-# Build the old-style Windows .hlp file
-#-------------------------------------------------------------------------
-
-TCLHLPBASE	= $(PROJECT)$(VERSION)
-HELPFILE	= $(OUT_DIR)\$(TCLHLPBASE).hlp
-HELPCNT		= $(OUT_DIR)\$(TCLHLPBASE).cnt
-DOCTMP_DIR	= $(OUT_DIR)\$(PROJECT)_docs
-HELPRTF		= $(DOCTMP_DIR)\$(PROJECT).rtf
-MAN2HELP	= $(DOCTMP_DIR)\man2help.tcl
-MAN2HELP2	= $(DOCTMP_DIR)\man2help2.tcl
-INDEX		= $(DOCTMP_DIR)\index.tcl
-BMP		= $(DOCTMP_DIR)\feather.bmp
-BMP_NOPATH	= feather.bmp
-MAN2TCL		= $(DOCTMP_DIR)\man2tcl.exe
-
-winhelp: docsetup $(HELPFILE)
-
-docsetup:
-	@if not exist $(DOCTMP_DIR)\nul mkdir $(DOCTMP_DIR)
-
-$(MAN2HELP) $(MAN2HELP2) $(INDEX) $(BMP): $(TOOLSDIR)\$$(@F)
-	@$(CPY) $(TOOLSDIR)\$(@F) $(@D)
-
-$(HELPFILE): $(HELPRTF) $(BMP)
-	cd $(DOCTMP_DIR)
-	start /wait hcrtf.exe -x <<$(PROJECT).hpj
-[OPTIONS]
-COMPRESS=12 Hall Zeck
-LCID=0x409 0x0 0x0 ; English (United States)
-TITLE=Tcl/Tk Reference Manual
-BMROOT=.
-CNT=$(@B).cnt
-HLP=$(@B).hlp
-
-[FILES]
-$(PROJECT).rtf
-
-[WINDOWS]
-main="Tcl/Tk Reference Manual",,27648,(r15263976),(r65535)
-
-[CONFIG]
-BrowseButtons()
-CreateButton(1, "Web", ExecFile("http://www.tcl.tk"))
-CreateButton(2, "SF", ExecFile("http://sf.net/projects/tcl"))
-CreateButton(3, "Wiki", ExecFile("http://wiki.tcl.tk"))
-CreateButton(4, "FAQ", ExecFile("http://www.purl.org/NET/Tcl-FAQ/"))
-<<
-	cd $(MAKEDIR)
-	@$(CPY) "$(DOCTMP_DIR)\$(@B).hlp" "$(OUT_DIR)"
-	@$(CPY) "$(DOCTMP_DIR)\$(@B).cnt" "$(OUT_DIR)"
-
-$(MAN2TCL): $(TOOLSDIR)\$$(@B).c
-	$(cc32) $(TCL_CFLAGS) -Fo$(@D)\ $(TOOLSDIR)\$(@B).c
-	$(link32) $(conlflags) -out:$@ -stack:16384 $(@D)\man2tcl.obj
-	$(_VC_MANIFEST_EMBED_EXE)
-
-$(HELPRTF): $(MAN2TCL) $(MAN2HELP) $(MAN2HELP2) $(INDEX) $(DOCDIR)\*
-	$(TCLSH) $(MAN2HELP) -bitmap $(BMP_NOPATH) $(PROJECT) $(VERSION) $(DOCDIR:\=/)
-
-install-docs:
-!if exist("$(CHMFILE)")
-	@echo Installing compiled HTML help
-	@$(CPY) "$(CHMFILE)" "$(DOC_INSTALL_DIR)\"
-!endif
-!if exist("$(HELPFILE)")
-	@echo Installing Windows help
-	@$(CPY) "$(HELPFILE)" "$(DOC_INSTALL_DIR)\"
-	@$(CPY) "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"
-!endif
-
-#---------------------------------------------------------------------
-# Build tclConfig.sh for the TEA build system.
-#---------------------------------------------------------------------
-
-tclConfig: $(OUT_DIR)\tclConfig.sh
-
-$(OUT_DIR)\tclConfig.sh: $(WINDIR)\tclConfig.sh.in
-	@echo Creating tclConfig.sh
-        @nmakehlp -s << $** >$@
-@TCL_DLL_FILE@       $(TCLLIBNAME)
-@TCL_VERSION@        $(DOTVERSION)
-@TCL_MAJOR_VERSION@  $(TCL_MAJOR_VERSION)
-@TCL_MINOR_VERSION@  $(TCL_MINOR_VERSION)
-@TCL_PATCH_LEVEL@    $(TCL_PATCH_LEVEL)
-@CC@                 $(CC)
-@DEFS@               $(TCL_CFLAGS)
-@CFLAGS_DEBUG@       -nologo -c -W3 -YX -Fp$(TMP_DIR)\ -MDd
-@CFLAGS_OPTIMIZE@    -nologo -c -W3 -YX -Fp$(TMP_DIR)\ -MD
-@LDFLAGS_DEBUG@      -nologo -machine:$(MACHINE) -debug -debugtype:cv
-@LDFLAGS_OPTIMIZE@   -nologo -machine:$(MACHINE) -release -opt:ref -opt:icf,3
-@TCL_DBGX@           $(SUFX)
-@TCL_LIB_FILE@       $(PROJECT)$(VERSION)$(SUFX).lib
-@TCL_NEEDS_EXP_FILE@
-@LIBS@               $(baselibs)
-@prefix@             $(_INSTALLDIR)
-@exec_prefix@        $(BIN_INSTALL_DIR)
-@SHLIB_CFLAGS@
-@STLIB_CFLAGS@
-@CFLAGS_WARNING@     -W3
-@EXTRA_CFLAGS@       -YX
-@SHLIB_LD@           $(link32) $(dlllflags)
-@STLIB_LD@           $(lib32) -nologo
-@SHLIB_LD_LIBS@      $(baselibs)
-@SHLIB_SUFFIX@       .dll
-@DL_LIBS@
-@LDFLAGS@
-@TCL_LD_SEARCH_FLAGS@
-@LIBOBJS@
-@RANLIB@
-@TCL_LIB_FLAG@
-@TCL_BUILD_LIB_SPEC@
-@TCL_LIB_SPEC@       $(LIB_INSTALL_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
-@TCL_INCLUDE_SPEC@   -I$(INCLUDE_INSTALL_DIR)
-@TCL_LIB_VERSIONS_OK@
-@TCL_SRC_DIR@        $(ROOT)
-@TCL_PACKAGE_PATH@
-@TCL_STUB_LIB_FILE@  $(TCLSTUBLIBNAME)
-@TCL_STUB_LIB_FLAG@  $(TCLSTUBLIBNAME)
-@TCL_STUB_LIB_SPEC@  -L$(LIB_INSTALL_DIR) $(TCLSTUBLIBNAME)
-@TCL_THREADS@        $(TCL_THREADS)
-@TCL_BUILD_STUB_LIB_SPEC@ -L$(OUT_DIR) $(TCLSTUBLIBNAME)
-@TCL_BUILD_STUB_LIB_PATH@ $(TCLSTUBLIB)
-@TCL_STUB_LIB_PATH@  $(LIB_INSTALL_DIR)\$(TCLSTUBLIBNAME)
-@CFG_TCL_EXPORT_FILE_SUFFIX@  $(VERSION)$(SUFX).lib
-@CFG_TCL_SHARED_LIB_SUFFIX@   $(VERSION)$(SUFX).dll
-@CFG_TCL_UNSHARED_LIB_SUFFIX@ $(VERSION)$(SUFX).lib
-!if $(STATIC_BUILD)
-@TCL_SHARED_BUILD@   0
-!else
-@TCL_SHARED_BUILD@   1
-!endif
-<<
-
-
-#---------------------------------------------------------------------
-# The following target generates the file generic/tclDate.c
-# from the yacc grammar found in generic/tclGetDate.y.  This is
-# only run by hand as yacc is not available in all environments.
-# The name of the .c file is different than the name of the .y file
-# so that make doesn't try to automatically regenerate the .c file.
-#---------------------------------------------------------------------
-
-gendate:
-	bison --output-file=$(GENERICDIR)/tclDate.c \
-	--name-prefix=TclDate \
-	$(GENERICDIR)/tclGetDate.y
-
-#---------------------------------------------------------------------
-# Special case object file targets
-#---------------------------------------------------------------------
-
-$(TMP_DIR)\testMain.obj: $(WINDIR)\tclAppInit.c
-	$(cc32) $(TCL_CFLAGS) -DTCL_TEST \
-	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
-	    -Fo$@ $?
-
-$(TMP_DIR)\tclTest.obj: $(GENERICDIR)\tclTest.c
-	$(cc32) $(TCL_CFLAGS) -Fo$@ $?
-
-$(TMP_DIR)\tclTestObj.obj: $(GENERICDIR)\tclTestObj.c
-	$(cc32) $(TCL_CFLAGS) -Fo$@ $?
-
-$(TMP_DIR)\tclWinTest.obj: $(WINDIR)\tclWinTest.c
-	$(cc32) $(TCL_CFLAGS) -Fo$@ $?
-
-$(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c
-	$(cc32) -DBUILD_tcl $(TCL_CFLAGS) \
-	-DCFG_INSTALL_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \
-	-DCFG_INSTALL_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \
-	-DCFG_INSTALL_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \
-	-DCFG_INSTALL_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \
-	-DCFG_INSTALL_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""	\
-	-DCFG_RUNTIME_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \
-	-DCFG_RUNTIME_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \
-	-DCFG_RUNTIME_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \
-	-DCFG_RUNTIME_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \
-	-DCFG_RUNTIME_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""     \
-	-Fo$@ $?
-
-$(TMP_DIR)\tclAppInit.obj: $(WINDIR)\tclAppInit.c
-	$(cc32) $(TCL_CFLAGS) \
-	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
-	    -Fo$@ $?
-
-### The following objects should be built using the stub interfaces
-### *ALL* extensions need to built with -DTCL_THREADS=1
-
-$(TMP_DIR)\tclWinReg.obj: $(WINDIR)\tclWinReg.c
-!if $(STATIC_BUILD)
-	$(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DSTATIC_BUILD -Fo$@ $?
-!else
-	$(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DUSE_TCL_STUBS -Fo$@ $?
-!endif
-
-
-$(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c
-!if $(STATIC_BUILD)
-	$(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DSTATIC_BUILD -Fo$@ $?
-!else
-	$(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DUSE_TCL_STUBS -Fo$@ $?
-!endif
-
-
-### The following objects are part of the stub library and should not
-### be built as DLL objects.  -Zl is used to avoid a dependency on any
-### specific C run-time.
-
-$(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.c
-	$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $?
-
-$(TMP_DIR)\tclsh.exe.manifest: $(WINDIR)\tclsh.exe.manifest.in
-	@nmakehlp -s << $** >$@
-@MACHINE@	  $(MACHINE:IX86=X86)
-@TCL_WIN_VERSION@  $(DOTVERSION).0.0
-<<
-
-#---------------------------------------------------------------------
-# Generate the source dependencies.  Having dependency rules will
-# improve incremental build accuracy without having to resort to a
-# full rebuild just because some non-global header file like
-# tclCompile.h was changed.  These rules aren't needed when building
-# from scratch.
-#---------------------------------------------------------------------
-
-depend:
-!if !exist($(TCLSH))
-	@echo Build tclsh first!
-!else
-	$(TCLSH) $(TOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \
-		-passthru:"-DBUILD_tcl $(TCL_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \
-		$(COMPATDIR),$$(COMPATDIR) $(TOMMATHDIR),$$(TOMMATHDIR) $(WINDIR),$$(WINDIR) @<<
-$(TCLOBJS)
-<<
-!endif
-
-#---------------------------------------------------------------------
-# Dependency rules
-#---------------------------------------------------------------------
-
-!if exist("$(OUT_DIR)\depend.mk")
-!include "$(OUT_DIR)\depend.mk"
-!message *** Dependency rules in use.
-!else
-!message *** Dependency rules are not being used.
-!endif
-
-### add a spacer in the output
-!message
-
-
-#---------------------------------------------------------------------
-# Implicit rules
-#---------------------------------------------------------------------
-
-{$(WINDIR)}.c{$(TMP_DIR)}.obj::
-	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<
-$<
-<<
-
-{$(TOMMATHDIR)}.c{$(TMP_DIR)}.obj::
-	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<
-$<
-<<
-
-{$(GENERICDIR)}.c{$(TMP_DIR)}.obj::
-	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<
-$<
-<<
-
-{$(COMPATDIR)}.c{$(TMP_DIR)}.obj::
-	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<
-$<
-<<
-
-{$(WINDIR)}.rc{$(TMP_DIR)}.res:
-	$(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \
-	    -d DEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \
-	    -d TCL_THREADS=$(TCL_THREADS) \
-	    -d STATIC_BUILD=$(STATIC_BUILD) \
-	    $<
-
-$(TMP_DIR)\tclsh.res: $(TMP_DIR)\tclsh.exe.manifest
-
-.SUFFIXES:
-.SUFFIXES:.c .rc
-
-
-#---------------------------------------------------------------------
-# Installation.
-#---------------------------------------------------------------------
-
-install-binaries:
-	@echo Installing to '$(_INSTALLDIR)'
-	@echo Installing $(TCLLIBNAME)
-!if "$(TCLLIB)" != "$(TCLIMPLIB)"
-	@$(CPY) "$(TCLLIB)" "$(BIN_INSTALL_DIR)\"
-!endif
-	@$(CPY) "$(TCLIMPLIB)" "$(LIB_INSTALL_DIR)\"
-!if exist($(TCLSH))
-	@echo Installing $(TCLSHNAME)
-	@$(CPY) "$(TCLSH)" "$(BIN_INSTALL_DIR)\"
-!endif
-!if exist($(TCLPIPEDLL))
-	@echo Installing $(TCLPIPEDLLNAME)
-	@$(CPY) "$(TCLPIPEDLL)" "$(BIN_INSTALL_DIR)\"
-!endif
-	@echo Installing $(TCLSTUBLIBNAME)
-	@$(CPY) "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)\"
-
-#" emacs fix
-
-install-libraries: tclConfig install-msgs install-tzdata
-	@if not exist "$(SCRIPT_INSTALL_DIR)$(NULL)" \
-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)"
-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8$(NULL)" \
-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8"
-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.2$(NULL)" \
-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.2"
-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.3$(NULL)" \
-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.3"
-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4$(NULL)" \
-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4"
-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform$(NULL)" \
-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform"
-	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5$(NULL)" \
-		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5"
-	@echo Installing header files
-	@$(CPY) "$(GENERICDIR)\tcl.h"             "$(INCLUDE_INSTALL_DIR)\"
-	@$(CPY) "$(GENERICDIR)\tclDecls.h"        "$(INCLUDE_INSTALL_DIR)\"
-	@$(CPY) "$(GENERICDIR)\tclPlatDecls.h"    "$(INCLUDE_INSTALL_DIR)\"
-	@$(CPY) "$(GENERICDIR)\tclTomMath.h"      "$(INCLUDE_INSTALL_DIR)\"
-	@$(CPY) "$(GENERICDIR)\tclTomMathDecls.h" "$(INCLUDE_INSTALL_DIR)\"
-	@$(CPY) "$(TOMMATHDIR)\tommath_class.h"   "$(INCLUDE_INSTALL_DIR)\"
-	@$(CPY) "$(TOMMATHDIR)\tommath_superclass.h" "$(INCLUDE_INSTALL_DIR)\"
-	@echo Installing library files to $(SCRIPT_INSTALL_DIR)
-	@$(CPY) "$(ROOT)\library\history.tcl"     "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\init.tcl"        "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\clock.tcl"       "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\tm.tcl"          "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\parray.tcl"      "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\safe.tcl"        "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\tclIndex"        "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\package.tcl"     "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\word.tcl"        "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(ROOT)\library\auto.tcl"        "$(SCRIPT_INSTALL_DIR)\"
-	@$(CPY) "$(OUT_DIR)\tclConfig.sh"         "$(LIB_INSTALL_DIR)\"
-	@echo Installing library http1.0 directory
-	@$(CPY) "$(ROOT)\library\http1.0\*.tcl" \
-	    "$(SCRIPT_INSTALL_DIR)\http1.0\"
-	@echo Installing library opt0.4 directory
-	@$(CPY) "$(ROOT)\library\opt\*.tcl" \
-	    "$(SCRIPT_INSTALL_DIR)\opt0.4\"
-	@echo Installing package http $(PKG_HTTP_VER) as a Tcl Module
-	@$(COPY) "$(ROOT)\library\http\http.tcl" \
-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\http-$(PKG_HTTP_VER).tm"
-	@echo Installing package msgcat $(PKG_MSGCAT_VER) as a Tcl Module
-	@$(COPY) "$(ROOT)\library\msgcat\msgcat.tcl" \
-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5\msgcat-$(PKG_MSGCAT_VER).tm"
-	@echo Installing package tcltest $(PKG_TCLTEST_VER) as a Tcl Module
-	@$(COPY) "$(ROOT)\library\tcltest\tcltest.tcl" \
-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5\tcltest-$(PKG_TCLTEST_VER).tm"
-	@echo Installing package platform $(PKG_PLATFORM_VER) as a Tcl Module
-	@$(COPY) "$(ROOT)\library\platform\platform.tcl" \
-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform-$(PKG_PLATFORM_VER).tm"
-	@echo Installing package platform::shell $(PKG_SHELL_VER) as a Tcl Module
-	@$(COPY) "$(ROOT)\library\platform\shell.tcl" \
-	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform\shell-$(PKG_SHELL_VER).tm"
-	@echo Installing $(TCLDDELIBNAME)
-!if $(STATIC_BUILD)
-!if !$(TCL_USE_STATIC_PACKAGES)
-	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\"
-!endif
-!else
-	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"
-	@$(CPY) "$(ROOT)\library\dde\pkgIndex.tcl" \
-	    "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"
-!endif
-	@echo Installing $(TCLREGLIBNAME)
-!if $(STATIC_BUILD)
-!if !$(TCL_USE_STATIC_PACKAGES)
-	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\"
-!endif
-!else
-	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\reg$(REGDOTVERSION)\"
-	@$(CPY) "$(ROOT)\library\reg\pkgIndex.tcl" \
-	    "$(LIB_INSTALL_DIR)\reg$(REGDOTVERSION)\"
-!endif
-	@echo Installing encodings
-	@$(CPY) "$(ROOT)\library\encoding\*.enc" \
-		"$(SCRIPT_INSTALL_DIR)\encoding\"
-
-#" emacs fix
-
-install-tzdata:
-	@echo Installing time zone data
-	@set TCL_LIBRARY=$(ROOT:\=/)/library
-	@$(TCLSH_NATIVE) "$(ROOT:\=/)/tools/installData.tcl" \
-	    "$(ROOT:\=/)/library/tzdata" "$(SCRIPT_INSTALL_DIR)/tzdata"
-
-install-msgs:
-	@echo Installing message catalogs
-	@set TCL_LIBRARY=$(ROOT:\=/)/library
-	@$(TCLSH_NATIVE) "$(ROOT:\=/)/tools/installData.tcl" \
-	    "$(ROOT:\=/)/library/msgs" "$(SCRIPT_INSTALL_DIR)/msgs"
-
-#---------------------------------------------------------------------
-# Clean up
-#---------------------------------------------------------------------
-
-tidy:
-!if "$(TCLLIB)" != "$(TCLIMPLIB)"
-	@echo Removing $(TCLLIB) ...
-	@if exist $(TCLLIB) del $(TCLLIB)
-!endif
-	@echo Removing $(TCLIMPLIB) ...
-	@if exist $(TCLIMPLIB) del $(TCLIMPLIB)
-	@echo Removing $(TCLSH) ...
-	@if exist $(TCLSH) del $(TCLSH)
-	@echo Removing $(TCLTEST) ...
-	@if exist $(TCLTEST) del $(TCLTEST)
-	@echo Removing $(TCLDDELIB) ...
-	@if exist $(TCLDDELIB) del $(TCLDDELIB)
-	@echo Removing $(TCLREGLIB) ...
-	@if exist $(TCLREGLIB) del $(TCLREGLIB)
-
-clean:
-	@echo Cleaning $(TMP_DIR)\* ...
-	@if exist $(TMP_DIR)\nul $(RMDIR) $(TMP_DIR)
-	@echo Cleaning $(WINDIR)\nmakehlp.obj ...
-	@if exist $(WINDIR)\nmakehlp.obj del $(WINDIR)\nmakehlp.obj
-	@echo Cleaning $(WINDIR)\nmakehlp.exe ...
-	@if exist $(WINDIR)\nmakehlp.exe del $(WINDIR)\nmakehlp.exe
-	@echo Cleaning $(WINDIR)\_junk.pch ...
-	@if exist $(WINDIR)\_junk.pch del $(WINDIR)\_junk.pch
-	@echo Cleaning $(WINDIR)\vercl.x ...
-	@if exist $(WINDIR)\vercl.x del $(WINDIR)\vercl.x
-	@echo Cleaning $(WINDIR)\vercl.i ...
-	@if exist $(WINDIR)\vercl.i del $(WINDIR)\vercl.i
-	@echo Cleaning $(WINDIR)\versions.vc ...
-	@if exist $(WINDIR)\versions.vc del $(WINDIR)\versions.vc
-
-realclean: hose
-
-hose:
-	@echo Hosing $(OUT_DIR)\* ...
-	@if exist $(OUT_DIR)\nul $(RMDIR) $(OUT_DIR)
+#------------------------------------------------------------- -*- makefile -*-
+# makefile.vc --
+#
+#	Microsoft Visual C++ makefile for use with nmake.exe v1.62+ (VC++ 5.0+)
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# Copyright (c) 1995-1996 Sun Microsystems, Inc.
+# Copyright (c) 1998-2000 Ajuba Solutions.
+# Copyright (c) 2001-2005 ActiveState Corporation.
+# Copyright (c) 2001-2004 David Gravereaux.
+# Copyright (c) 2003-2008 Pat Thoyts.
+#------------------------------------------------------------------------------
+
+# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or
+# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir)
+!if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(VCINSTALLDIR) && !defined(MSSDK) && !defined(WINDOWSSDKDIR)
+MSG = ^
+You need to run vcvars32.bat from Developer Studio or setenv.bat from the^
+Platform SDK first to setup the environment.  Jump to this line to read^
+the build instructions.
+!error $(MSG)
+!endif
+
+#------------------------------------------------------------------------------
+# HOW TO USE this makefile:
+#
+# 1)  It is now necessary to have MSVCDir, MSDevDir or MSSDK set in the
+#     environment.  This is used as a check to see if vcvars32.bat had been
+#     run prior to running nmake or during the installation of Microsoft
+#     Visual C++, MSVCDir had been set globally and the PATH adjusted.
+#     Either way is valid.
+#
+#     You'll need to run vcvars32.bat contained in the MsDev's vc(98)/bin
+#     directory to setup the proper environment, if needed, for your
+#     current setup.  This is a needed bootstrap requirement and allows the
+#     swapping of different environments to be easier.
+#
+# 2)  To use the Platform SDK (not expressly needed), run setenv.bat after
+#     vcvars32.bat according to the instructions for it.  This can also
+#     turn on the 64-bit compiler, if your SDK has it.
+#
+# 3)  Targets are:
+#	release  -- Builds the core, the shell and the dlls. (default)
+#	dlls     -- Just builds the windows extensions and the 16-bit DOS
+#		    pipe/thunk helper app.
+#	shell    -- Just builds the shell and the core.
+#	core     -- Only builds the core [tclXX.(dll|lib)].
+#	all      -- Builds everything.
+#	test     -- Builds and runs the test suite.
+#	tcltest  -- Just builds the test shell.
+#	install  -- Installs the built binaries and libraries to $(INSTALLDIR)
+#		    as the root of the install tree.
+#	tidy/clean/hose -- varying levels of cleaning.
+#	genstubs -- Rebuilds the Stubs table and support files (dev only).
+#	depend   -- Generates an accurate set of source dependancies for this
+#		    makefile.  Helpful to avoid problems when the sources are
+#		    refreshed and you rebuild, but can "overbuild" when common
+#		    headers like tclInt.h just get small changes.
+#	htmlhelp -- Builds a Windows .chm help file for Tcl and Tk from the
+#		    troff manual pages found in $(ROOT)\doc. You need to
+#		    have installed the HTML Help Compiler package from Microsoft
+#		    to produce the .chm file.
+#	winhelp  -- Builds the windows .hlp file for Tcl from the troff man
+#		    files found in $(ROOT)\doc.
+#
+# 4)  Macros usable on the commandline:
+#	INSTALLDIR=<path>
+#		Sets where to install Tcl from the built binaries.
+#		C:\Progra~1\Tcl is assumed when not specified.
+#
+#	OPTS=loimpact,msvcrt,static,staticpkg,symbols,threads,profile,unchecked,none
+#		Sets special options for the core.  The default is for none.
+#		Any combination of the above may be used (comma separated).
+#		'none' will over-ride everything to nothing.
+#
+#		loimpact = Adds a flag for how NT treats the heap to keep memory
+#			   in use, low.  This is said to impact alloc performance.
+#		msvcrt   = Affects the static option only to switch it from
+#			   using libcmt(d) as the C runtime [by default] to
+#			   msvcrt(d). This is useful for static embedding
+#			   support.
+#		static   = Builds a static library of the core instead of a
+#			   dll.  The shell will be static (and large), as well.
+#		staticpkg= Affects the static option only to switch
+#			   tclshXX.exe to have the dde and reg extension linked
+#			   inside it.
+#		threads  = Turns on full multithreading support.
+#		thrdalloc = Use the thread allocator (shared global free pool).
+#		thrdstorage = Use the generic thread storage support.
+#		symbols =  Adds symbols for step debugging.
+#		profile =  Adds profiling hooks.  Map file is assumed.
+#		unchecked = Allows a symbols build to not use the debug
+#			   enabled runtime (msvcrt.dll not msvcrtd.dll
+#			   or libcmt.lib not libcmtd.lib).
+#
+#	STATS=compdbg,memdbg,none
+#		Sets optional memory and bytecode compiler debugging code added
+#		to the core.  The default is for none.  Any combination of the
+#		above may be used (comma separated).  'none' will over-ride
+#		everything to nothing.
+#
+#		compdbg  = Enables byte compilation logging.
+#		memdbg   = Enables the debugging memory allocator.
+#
+#	CHECKS=64bit,fullwarn,nodep,none
+#		Sets special macros for checking compatability.
+#
+#		64bit    = Enable 64bit portability warnings (if available)
+#		fullwarn = Builds with full compiler and link warnings enabled.
+#			    Very verbose.
+#		nodep	 = Turns off compatability macros to ensure the core
+#			    isn't being built with deprecated functions.
+#
+#	MACHINE=(ALPHA|AMD64|IA64|IX86)
+#		Set the machine type used for the compiler, linker, and
+#		resource compiler.  This hook is needed to tell the tools
+#		when alternate platforms are requested.  IX86 is the default
+#		when not specified. If the CPU environment variable has been
+#		set (ie: recent Platform SDK) then MACHINE is set from CPU.
+#
+#	TMP_DIR=<path>
+#	OUT_DIR=<path>
+#		Hooks to allow the intermediate and output directories to be
+#		changed.  $(OUT_DIR) is assumed to be
+#		$(BINROOT)\(Release|Debug) based on if symbols are requested.
+#		$(TMP_DIR) will de $(OUT_DIR)\<buildtype> by default.
+#
+#	TESTPAT=<file>
+#		Reads the tests requested to be run from this file.
+#
+#	CFG_ENCODING=encoding
+#		name of encoding for configuration information. Defaults
+#		to cp1252
+#
+# 5)  Examples:
+#
+#	Basic syntax of calling nmake looks like this:
+#	nmake [-nologo] -f makefile.vc [target|macrodef [target|macrodef] [...]]
+#
+#                        Standard (no frills)
+#       c:\tcl_src\win\>c:\progra~1\micros~1\vc98\bin\vcvars32.bat
+#       Setting environment for using Microsoft Visual C++ tools.
+#       c:\tcl_src\win\>nmake -f makefile.vc release
+#       c:\tcl_src\win\>nmake -f makefile.vc install INSTALLDIR=c:\progra~1\tcl
+#
+#                         Building for Win64
+#       c:\tcl_src\win\>c:\progra~1\micros~1\vc98\bin\vcvars32.bat
+#       Setting environment for using Microsoft Visual C++ tools.
+#       c:\tcl_src\win\>c:\progra~1\platfo~1\setenv.bat /pre64 /RETAIL
+#       Targeting Windows pre64 RETAIL
+#       c:\tcl_src\win\>nmake -f makefile.vc MACHINE=IA64
+#
+#------------------------------------------------------------------------------
+#==============================================================================
+###############################################################################
+
+
+#    //==================================================================\\
+#   >>[               -> Do not modify below this line. <-               ]<<
+#   >>[  Please, use the commandline macros to modify how Tcl is built.  ]<<
+#   >>[  If you need more features, send us a patch for more macros.     ]<<
+#    \\==================================================================//
+
+
+###############################################################################
+#==============================================================================
+#------------------------------------------------------------------------------
+
+!if !exist("makefile.vc")
+MSG = ^
+You must run this makefile only from the directory it is in.^
+Please `cd` to its location first.
+!error $(MSG)
+!endif
+
+PROJECT = tcl
+!include "rules.vc"
+
+STUBPREFIX      = $(PROJECT)stub
+DOTVERSION      = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
+VERSION         = $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)
+
+DDEDOTVERSION = 1.3
+DDEVERSION = $(DDEDOTVERSION:.=)
+
+REGDOTVERSION = 1.2
+REGVERSION = $(REGDOTVERSION:.=)
+
+BINROOT		= .
+ROOT		= ..
+
+TCLIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
+TCLLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)
+TCLLIB		= $(OUT_DIR)\$(TCLLIBNAME)
+
+TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib
+TCLSTUBLIB	= $(OUT_DIR)\$(TCLSTUBLIBNAME)
+
+TCLSHNAME	= $(PROJECT)sh$(VERSION)$(SUFX).exe
+TCLSH		= $(OUT_DIR)\$(TCLSHNAME)
+TCLPIPEDLLNAME	= $(PROJECT)pip$(VERSION)$(SUFX:t=).dll
+TCLPIPEDLL	= $(OUT_DIR)\$(TCLPIPEDLLNAME)
+
+TCLREGLIBNAME	= $(PROJECT)reg$(REGVERSION)$(SUFX:t=).$(EXT)
+TCLREGLIB	= $(OUT_DIR)\$(TCLREGLIBNAME)
+
+TCLDDELIBNAME	= $(PROJECT)dde$(DDEVERSION)$(SUFX:t=).$(EXT)
+TCLDDELIB	= $(OUT_DIR)\$(TCLDDELIBNAME)
+
+TCLTEST		= $(OUT_DIR)\$(PROJECT)test.exe
+CAT32		= $(OUT_DIR)\cat32.exe
+
+# Can we run what we build? IX86 runs on all architectures.
+!ifndef TCLSH_NATIVE
+!if "$(MACHINE)" == "IX86" || "$(MACHINE)" == "$(NATIVE_ARCH)"
+TCLSH_NATIVE	= $(TCLSH)
+!else
+!error You must explicitly set TCLSH_NATIVE for cross-compilation
+!endif
+!endif
+
+### Make sure we use backslash only.
+LIB_INSTALL_DIR		= $(_INSTALLDIR)\lib
+BIN_INSTALL_DIR		= $(_INSTALLDIR)\bin
+DOC_INSTALL_DIR		= $(_INSTALLDIR)\doc
+SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\tcl$(DOTVERSION)
+INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\include
+
+TCLSHOBJS = \
+	$(TMP_DIR)\tclAppInit.obj \
+!if $(TCL_USE_STATIC_PACKAGES)
+	$(TMP_DIR)\tclWinReg.obj \
+	$(TMP_DIR)\tclWinDde.obj \
+!endif
+	$(TMP_DIR)\tclsh.res
+
+TCLTESTOBJS = \
+	$(TMP_DIR)\tclTest.obj \
+	$(TMP_DIR)\tclTestObj.obj \
+	$(TMP_DIR)\tclTestProcBodyObj.obj \
+	$(TMP_DIR)\tclThreadTest.obj \
+	$(TMP_DIR)\tclWinTest.obj \
+!if $(TCL_USE_STATIC_PACKAGES)
+	$(TMP_DIR)\tclWinReg.obj \
+	$(TMP_DIR)\tclWinDde.obj \
+!endif
+	$(TMP_DIR)\testMain.obj
+
+TCLOBJS = \
+	$(TMP_DIR)\regcomp.obj \
+	$(TMP_DIR)\regerror.obj \
+	$(TMP_DIR)\regexec.obj \
+	$(TMP_DIR)\regfree.obj \
+	$(TMP_DIR)\tclAlloc.obj \
+	$(TMP_DIR)\tclAsync.obj \
+	$(TMP_DIR)\tclBasic.obj \
+	$(TMP_DIR)\tclBinary.obj \
+	$(TMP_DIR)\tclCkalloc.obj \
+	$(TMP_DIR)\tclClock.obj \
+	$(TMP_DIR)\tclCmdAH.obj \
+	$(TMP_DIR)\tclCmdIL.obj \
+	$(TMP_DIR)\tclCmdMZ.obj \
+	$(TMP_DIR)\tclCompCmds.obj \
+	$(TMP_DIR)\tclCompExpr.obj \
+	$(TMP_DIR)\tclCompile.obj \
+	$(TMP_DIR)\tclConfig.obj \
+	$(TMP_DIR)\tclDate.obj \
+	$(TMP_DIR)\tclDictObj.obj \
+	$(TMP_DIR)\tclEncoding.obj \
+	$(TMP_DIR)\tclEnv.obj \
+	$(TMP_DIR)\tclEvent.obj \
+	$(TMP_DIR)\tclExecute.obj \
+	$(TMP_DIR)\tclFCmd.obj \
+	$(TMP_DIR)\tclFileName.obj \
+	$(TMP_DIR)\tclGet.obj \
+	$(TMP_DIR)\tclHash.obj \
+	$(TMP_DIR)\tclHistory.obj \
+	$(TMP_DIR)\tclIndexObj.obj \
+	$(TMP_DIR)\tclInterp.obj \
+	$(TMP_DIR)\tclIO.obj \
+	$(TMP_DIR)\tclIOCmd.obj \
+	$(TMP_DIR)\tclIOGT.obj \
+	$(TMP_DIR)\tclIOSock.obj \
+	$(TMP_DIR)\tclIOUtil.obj \
+	$(TMP_DIR)\tclIORChan.obj \
+	$(TMP_DIR)\tclLink.obj \
+	$(TMP_DIR)\tclListObj.obj \
+	$(TMP_DIR)\tclLiteral.obj \
+	$(TMP_DIR)\tclLoad.obj \
+	$(TMP_DIR)\tclMain.obj \
+	$(TMP_DIR)\tclNamesp.obj \
+	$(TMP_DIR)\tclNotify.obj \
+	$(TMP_DIR)\tclObj.obj \
+	$(TMP_DIR)\tclPanic.obj \
+	$(TMP_DIR)\tclParse.obj \
+	$(TMP_DIR)\tclPathObj.obj \
+	$(TMP_DIR)\tclPipe.obj \
+	$(TMP_DIR)\tclPkg.obj \
+	$(TMP_DIR)\tclPkgConfig.obj \
+	$(TMP_DIR)\tclPosixStr.obj \
+	$(TMP_DIR)\tclPreserve.obj \
+	$(TMP_DIR)\tclProc.obj \
+	$(TMP_DIR)\tclRegexp.obj \
+	$(TMP_DIR)\tclResolve.obj \
+	$(TMP_DIR)\tclResult.obj \
+	$(TMP_DIR)\tclScan.obj \
+	$(TMP_DIR)\tclStringObj.obj \
+	$(TMP_DIR)\tclStrToD.obj \
+	$(TMP_DIR)\tclStubInit.obj \
+	$(TMP_DIR)\tclStubLib.obj \
+	$(TMP_DIR)\tclThread.obj \
+	$(TMP_DIR)\tclThreadAlloc.obj \
+	$(TMP_DIR)\tclThreadJoin.obj \
+	$(TMP_DIR)\tclThreadStorage.obj \
+	$(TMP_DIR)\tclTimer.obj \
+	$(TMP_DIR)\tclTomMathInterface.obj \
+	$(TMP_DIR)\tclTrace.obj \
+	$(TMP_DIR)\tclUtf.obj \
+	$(TMP_DIR)\tclUtil.obj \
+	$(TMP_DIR)\tclVar.obj \
+	$(TMP_DIR)\tclWin32Dll.obj \
+	$(TMP_DIR)\tclWinChan.obj \
+	$(TMP_DIR)\tclWinConsole.obj \
+	$(TMP_DIR)\tclWinSerial.obj \
+	$(TMP_DIR)\tclWinError.obj \
+	$(TMP_DIR)\tclWinFCmd.obj \
+	$(TMP_DIR)\tclWinFile.obj \
+	$(TMP_DIR)\tclWinInit.obj \
+	$(TMP_DIR)\tclWinLoad.obj \
+	$(TMP_DIR)\tclWinNotify.obj \
+	$(TMP_DIR)\tclWinPipe.obj \
+	$(TMP_DIR)\tclWinSock.obj \
+	$(TMP_DIR)\tclWinThrd.obj \
+	$(TMP_DIR)\tclWinTime.obj \
+	$(TMP_DIR)\bncore.obj \
+	$(TMP_DIR)\bn_reverse.obj \
+	$(TMP_DIR)\bn_fast_s_mp_mul_digs.obj \
+	$(TMP_DIR)\bn_fast_s_mp_sqr.obj \
+	$(TMP_DIR)\bn_mp_add.obj \
+	$(TMP_DIR)\bn_mp_add_d.obj \
+	$(TMP_DIR)\bn_mp_and.obj \
+	$(TMP_DIR)\bn_mp_clamp.obj \
+	$(TMP_DIR)\bn_mp_clear.obj \
+	$(TMP_DIR)\bn_mp_clear_multi.obj \
+	$(TMP_DIR)\bn_mp_cmp.obj \
+	$(TMP_DIR)\bn_mp_cmp_d.obj \
+	$(TMP_DIR)\bn_mp_cmp_mag.obj \
+	$(TMP_DIR)\bn_mp_cnt_lsb.obj \
+	$(TMP_DIR)\bn_mp_copy.obj \
+	$(TMP_DIR)\bn_mp_count_bits.obj \
+	$(TMP_DIR)\bn_mp_div.obj \
+	$(TMP_DIR)\bn_mp_div_d.obj \
+	$(TMP_DIR)\bn_mp_div_2.obj \
+	$(TMP_DIR)\bn_mp_div_2d.obj \
+	$(TMP_DIR)\bn_mp_div_3.obj \
+	$(TMP_DIR)\bn_mp_exch.obj \
+	$(TMP_DIR)\bn_mp_expt_d.obj \
+	$(TMP_DIR)\bn_mp_grow.obj \
+	$(TMP_DIR)\bn_mp_init.obj \
+	$(TMP_DIR)\bn_mp_init_copy.obj \
+	$(TMP_DIR)\bn_mp_init_multi.obj \
+	$(TMP_DIR)\bn_mp_init_set.obj \
+	$(TMP_DIR)\bn_mp_init_set_int.obj \
+	$(TMP_DIR)\bn_mp_init_size.obj \
+	$(TMP_DIR)\bn_mp_karatsuba_mul.obj \
+	$(TMP_DIR)\bn_mp_karatsuba_sqr.obj \
+	$(TMP_DIR)\bn_mp_lshd.obj \
+	$(TMP_DIR)\bn_mp_mod.obj \
+	$(TMP_DIR)\bn_mp_mod_2d.obj \
+	$(TMP_DIR)\bn_mp_mul.obj \
+	$(TMP_DIR)\bn_mp_mul_2.obj \
+	$(TMP_DIR)\bn_mp_mul_2d.obj \
+	$(TMP_DIR)\bn_mp_mul_d.obj \
+	$(TMP_DIR)\bn_mp_neg.obj \
+	$(TMP_DIR)\bn_mp_or.obj \
+	$(TMP_DIR)\bn_mp_radix_size.obj \
+	$(TMP_DIR)\bn_mp_radix_smap.obj \
+	$(TMP_DIR)\bn_mp_read_radix.obj \
+	$(TMP_DIR)\bn_mp_rshd.obj \
+	$(TMP_DIR)\bn_mp_set.obj \
+	$(TMP_DIR)\bn_mp_set_int.obj \
+	$(TMP_DIR)\bn_mp_shrink.obj \
+	$(TMP_DIR)\bn_mp_sqr.obj \
+	$(TMP_DIR)\bn_mp_sqrt.obj \
+	$(TMP_DIR)\bn_mp_sub.obj \
+	$(TMP_DIR)\bn_mp_sub_d.obj \
+	$(TMP_DIR)\bn_mp_to_unsigned_bin.obj \
+	$(TMP_DIR)\bn_mp_to_unsigned_bin_n.obj \
+	$(TMP_DIR)\bn_mp_toom_mul.obj \
+	$(TMP_DIR)\bn_mp_toom_sqr.obj \
+	$(TMP_DIR)\bn_mp_toradix_n.obj \
+	$(TMP_DIR)\bn_mp_unsigned_bin_size.obj \
+	$(TMP_DIR)\bn_mp_xor.obj \
+	$(TMP_DIR)\bn_mp_zero.obj \
+	$(TMP_DIR)\bn_s_mp_add.obj \
+	$(TMP_DIR)\bn_s_mp_mul_digs.obj \
+	$(TMP_DIR)\bn_s_mp_sqr.obj \
+	$(TMP_DIR)\bn_s_mp_sub.obj \
+!if !$(STATIC_BUILD)
+	$(TMP_DIR)\tcl.res
+!endif
+
+TCLSTUBOBJS = \
+	$(TMP_DIR)\tclStubLib.obj
+
+### The following paths CANNOT have spaces in them.
+COMPATDIR	= $(ROOT)\compat
+DOCDIR		= $(ROOT)\doc
+GENERICDIR	= $(ROOT)\generic
+TOMMATHDIR	= $(ROOT)\libtommath
+TOOLSDIR	= $(ROOT)\tools
+WINDIR		= $(ROOT)\win
+
+#---------------------------------------------------------------------
+# Compile flags
+#---------------------------------------------------------------------
+
+!if !$(DEBUG)
+!if $(OPTIMIZING)
+### This cranks the optimization level to maximize speed
+cdebug	= -O2 $(OPTIMIZATIONS)
+!else
+cdebug	=
+!endif
+!if $(SYMBOLS)
+cdebug	= $(cdebug) -Zi
+!endif
+!else if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
+### Warnings are too many, can't support warnings into errors.
+cdebug	= -Zi -Od $(DEBUGFLAGS)
+!else
+cdebug	= -Zi -WX $(DEBUGFLAGS)
+!endif
+
+### Declarations common to all compiler options
+cwarn = $(WARNINGS) -D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE
+cflags = -nologo -c $(COMPILERFLAGS) $(cwarn) -Fp$(TMP_DIR)^\
+
+!if $(MSVCRT)
+!if $(DEBUG) && !$(UNCHECKED)
+crt = -MDd
+!else
+crt = -MD
+!endif
+!else
+!if $(DEBUG) && !$(UNCHECKED)
+crt = -MTd
+!else
+crt = -MT
+!endif
+!endif
+
+TCL_INCLUDES	= -I"$(WINDIR)" -I"$(GENERICDIR)" -I"$(TOMMATHDIR)"
+TCL_DEFINES	= -DTCL_PIPE_DLL=\"$(TCLPIPEDLLNAME)\" -DTCL_TOMMATH -DMP_PREC=4 -Dinline=__inline
+BASE_CFLAGS	= $(cflags) $(cdebug) $(crt) $(TCL_INCLUDES) $(TCL_DEFINES)
+CON_CFLAGS	= $(cflags) $(cdebug) $(crt) -DCONSOLE
+TCL_CFLAGS	= $(BASE_CFLAGS) $(OPTDEFINES)
+STUB_CFLAGS     = $(cflags) $(cdebug) $(OPTDEFINES)
+
+
+#---------------------------------------------------------------------
+# Link flags
+#---------------------------------------------------------------------
+
+!if $(DEBUG)
+ldebug	= -debug -debugtype:cv
+!else
+ldebug	= -release -opt:ref -opt:icf,3
+!if $(SYMBOLS)
+ldebug	= $(ldebug) -debug -debugtype:cv
+!endif
+!endif
+
+### Declarations common to all linker options
+lflags	= -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug)
+
+!if $(PROFILE)
+lflags	= $(lflags) -profile
+!endif
+
+!if $(ALIGN98_HACK) && !$(STATIC_BUILD)
+### Align sections for PE size savings.
+lflags	= $(lflags) -opt:nowin98
+!else if !$(ALIGN98_HACK) && $(STATIC_BUILD)
+### Align sections for speed in loading by choosing the virtual page size.
+lflags	= $(lflags) -align:4096
+!endif
+
+!if $(LOIMPACT)
+lflags	= $(lflags) -ws:aggressive
+!endif
+
+dlllflags = $(lflags) -dll
+conlflags = $(lflags) -subsystem:console
+guilflags = $(lflags) -subsystem:windows
+
+baselibs   = kernel32.lib user32.lib ws2_32.lib
+# Avoid 'unresolved external symbol __security_cookie' errors.
+# c.f. http://support.microsoft.com/?id=894573
+!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
+!if $(VCVERSION) > 1399 && $(VCVERSION) < 1500
+baselibs   = $(baselibs) bufferoverflowU.lib
+!endif
+!endif
+
+#---------------------------------------------------------------------
+# TclTest flags
+#---------------------------------------------------------------------
+
+!if "$(TESTPAT)" != ""
+TESTFLAGS = $(TESTFLAGS) -file $(TESTPAT)
+!endif
+
+
+#---------------------------------------------------------------------
+# Project specific targets
+#---------------------------------------------------------------------
+
+release:    setup $(TCLSH) $(TCLSTUBLIB) dlls
+core:	    setup $(TCLLIB) $(TCLSTUBLIB)
+shell:	    setup $(TCLSH)
+dlls:	    setup $(TCLPIPEDLL) $(TCLREGLIB) $(TCLDDELIB)
+all:	    setup $(TCLSH) $(TCLSTUBLIB) dlls $(CAT32)
+tcltest:    setup $(TCLTEST) dlls $(CAT32)
+install:    install-binaries install-libraries install-docs
+
+test: test-core
+test-core: setup $(TCLTEST) dlls $(CAT32)
+	set TCL_LIBRARY=$(ROOT:\=/)/library
+!if "$(OS)" == "Windows_NT"  || "$(MSVCDIR)" == "IDE"
+	$(DEBUGGER) $(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile <<
+		package ifneeded dde 1.3.3 [list load "$(TCLDDELIB:\=/)" dde]
+		package ifneeded registry 1.2.2 [list load "$(TCLREGLIB:\=/)" registry]
+<<
+!else
+	@echo Please wait while the tests are collected...
+	$(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile << > tests.log
+		package ifneeded dde 1.3.3 "$(TCLDDELIB:\=/)" dde]
+		package ifneeded registry 1.2.2 "$(TCLREGLIB:\=/)" registry]
+<<
+	type tests.log | more
+!endif
+
+runtest: setup $(TCLTEST) dlls $(CAT32)
+	set TCL_LIBRARY=$(ROOT:\=/)/library
+	$(DEBUGGER) $(TCLTEST) $(SCRIPT)
+
+runshell: setup $(TCLSH) dlls
+	set TCL_LIBRARY=$(ROOT:\=/)/library
+	$(DEBUGGER) $(TCLSH) $(SCRIPT)
+
+setup:
+	@if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR)
+	@if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR)
+
+!if !$(STATIC_BUILD)
+$(TCLIMPLIB): $(TCLLIB)
+!endif
+
+$(TCLLIB): $(TCLOBJS)
+!if $(STATIC_BUILD)
+	$(lib32) -nologo $(LINKERFLAGS) -out:$@ @<<
+$**
+<<
+!else
+	$(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcl -out:$@ \
+		$(baselibs) @<<
+$**
+<<
+	$(_VC_MANIFEST_EMBED_DLL)
+	-@del $*.exp
+!endif
+
+$(TCLSTUBLIB): $(TCLSTUBOBJS)
+	$(lib32) -nologo $(LINKERFLAGS) -nodefaultlib -out:$@ $(TCLSTUBOBJS)
+
+$(TCLSH): $(TCLSHOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)
+	$(link32) $(conlflags) -stack:2300000 -out:$@ $(baselibs) $**
+	$(_VC_MANIFEST_EMBED_EXE)
+
+$(TCLTEST): $(TCLTESTOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)
+	$(link32) $(conlflags) -stack:2300000 -out:$@ $(baselibs) $**
+	$(_VC_MANIFEST_EMBED_EXE)
+
+$(TCLPIPEDLL): $(WINDIR)\stub16.c
+	$(cc32) $(CON_CFLAGS) -Fo$(TMP_DIR)\ $(WINDIR)\stub16.c
+	$(link32) $(conlflags) -out:$@ $(TMP_DIR)\stub16.obj $(baselibs)
+	$(_VC_MANIFEST_EMBED_DLL)
+
+!if $(STATIC_BUILD)
+$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj
+	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $**
+!else
+$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB)
+	$(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcldde -out:$@ \
+		$** $(baselibs)
+	$(_VC_MANIFEST_EMBED_DLL)
+	-@del $*.exp
+	-@del $*.lib
+!endif
+
+!if $(STATIC_BUILD)
+$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj
+	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $**
+!else
+$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB)
+	$(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tclreg -out:$@ \
+		$** $(baselibs)
+	$(_VC_MANIFEST_EMBED_DLL)
+	-@del $*.exp
+	-@del $*.lib
+!endif
+
+$(CAT32): $(WINDIR)\cat.c
+	$(cc32) $(CON_CFLAGS) -Fo$(TMP_DIR)\ $?
+	$(link32) $(conlflags) -out:$@ -stack:16384 $(TMP_DIR)\cat.obj \
+		$(baselibs)
+	$(_VC_MANIFEST_EMBED_EXE)
+
+#---------------------------------------------------------------------
+# Regenerate the stubs files.  [Development use only]
+#---------------------------------------------------------------------
+
+genstubs:
+!if !exist($(TCLSH))
+	@echo Build tclsh first!
+!else
+	$(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
+		$(GENERICDIR:\=/)/tcl.decls $(GENERICDIR:\=/)/tclInt.decls \
+		$(GENERICDIR:\=/)/tclTomMath.decls
+!endif
+
+
+#----------------------------------------------------------------------
+# The following target generates the file generic/tclTomMath.h.
+# It needs to be run (and the results checked) after updating
+# to a new release of libtommath.
+#----------------------------------------------------------------------
+
+gentommath_h:
+!if !exist($(TCLSH))
+	@echo Build tclsh first!
+!else
+	$(TCLSH) "$(TOOLSDIR:\=/)/fix_tommath_h.tcl" \
+		"$(TOMMATHDIR:\=/)/tommath.h" \
+		> "$(GENERICDIR)\tclTomMath.h"
+!endif
+
+#---------------------------------------------------------------------
+# Build the Windows HTML help file.
+#---------------------------------------------------------------------
+
+# NOTE: you can define HHC on the command-line to override this
+!ifndef HHC
+HHC=""%ProgramFiles%\HTML Help Workshop\hhc.exe""
+!endif
+HTMLDIR=$(ROOT)\html
+HTMLBASE=TclTk$(VERSION)
+HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp
+CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
+
+htmlhelp: chmsetup $(CHMFILE)
+
+$(CHMFILE): $(DOCDIR)\*
+	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl
+	@echo Compiling HTML help project
+	@$(HHC) <<$(HHPFILE) >NUL
+[OPTIONS]
+Compatibility=1.1 or later
+Compiled file=$(HTMLBASE).chm
+Display compile progress=no
+Error log file=$(HTMLBASE).log
+Language=0x409 English (United States)
+Title=Tcl/Tk $(DOT_VERSION) Help
+[FILES]
+contents.htm
+docs.css
+Keywords
+TclCmd
+TclLib
+TkCmd
+TkLib
+UserCmd
+<<
+
+chmsetup:
+	@if not exist $(HTMLDIR)\nul mkdir $(HTMLDIR)
+
+#-------------------------------------------------------------------------
+# Build the old-style Windows .hlp file
+#-------------------------------------------------------------------------
+
+TCLHLPBASE	= $(PROJECT)$(VERSION)
+HELPFILE	= $(OUT_DIR)\$(TCLHLPBASE).hlp
+HELPCNT		= $(OUT_DIR)\$(TCLHLPBASE).cnt
+DOCTMP_DIR	= $(OUT_DIR)\$(PROJECT)_docs
+HELPRTF		= $(DOCTMP_DIR)\$(PROJECT).rtf
+MAN2HELP	= $(DOCTMP_DIR)\man2help.tcl
+MAN2HELP2	= $(DOCTMP_DIR)\man2help2.tcl
+INDEX		= $(DOCTMP_DIR)\index.tcl
+BMP		= $(DOCTMP_DIR)\feather.bmp
+BMP_NOPATH	= feather.bmp
+MAN2TCL		= $(DOCTMP_DIR)\man2tcl.exe
+
+winhelp: docsetup $(HELPFILE)
+
+docsetup:
+	@if not exist $(DOCTMP_DIR)\nul mkdir $(DOCTMP_DIR)
+
+$(MAN2HELP) $(MAN2HELP2) $(INDEX) $(BMP): $(TOOLSDIR)\$$(@F)
+	@$(CPY) $(TOOLSDIR)\$(@F) $(@D)
+
+$(HELPFILE): $(HELPRTF) $(BMP)
+	cd $(DOCTMP_DIR)
+	start /wait hcrtf.exe -x <<$(PROJECT).hpj
+[OPTIONS]
+COMPRESS=12 Hall Zeck
+LCID=0x409 0x0 0x0 ; English (United States)
+TITLE=Tcl/Tk Reference Manual
+BMROOT=.
+CNT=$(@B).cnt
+HLP=$(@B).hlp
+
+[FILES]
+$(PROJECT).rtf
+
+[WINDOWS]
+main="Tcl/Tk Reference Manual",,27648,(r15263976),(r65535)
+
+[CONFIG]
+BrowseButtons()
+CreateButton(1, "Web", ExecFile("http://www.tcl.tk"))
+CreateButton(2, "SF", ExecFile("http://sf.net/projects/tcl"))
+CreateButton(3, "Wiki", ExecFile("http://wiki.tcl.tk"))
+CreateButton(4, "FAQ", ExecFile("http://www.purl.org/NET/Tcl-FAQ/"))
+<<
+	cd $(MAKEDIR)
+	@$(CPY) "$(DOCTMP_DIR)\$(@B).hlp" "$(OUT_DIR)"
+	@$(CPY) "$(DOCTMP_DIR)\$(@B).cnt" "$(OUT_DIR)"
+
+$(MAN2TCL): $(TOOLSDIR)\$$(@B).c
+	$(cc32) $(TCL_CFLAGS) -Fo$(@D)\ $(TOOLSDIR)\$(@B).c
+	$(link32) $(conlflags) -out:$@ -stack:16384 $(@D)\man2tcl.obj
+	$(_VC_MANIFEST_EMBED_EXE)
+
+$(HELPRTF): $(MAN2TCL) $(MAN2HELP) $(MAN2HELP2) $(INDEX) $(DOCDIR)\*
+	$(TCLSH) $(MAN2HELP) -bitmap $(BMP_NOPATH) $(PROJECT) $(VERSION) $(DOCDIR:\=/)
+
+install-docs:
+!if exist("$(CHMFILE)")
+	@echo Installing compiled HTML help
+	@$(CPY) "$(CHMFILE)" "$(DOC_INSTALL_DIR)\"
+!endif
+!if exist("$(HELPFILE)")
+	@echo Installing Windows help
+	@$(CPY) "$(HELPFILE)" "$(DOC_INSTALL_DIR)\"
+	@$(CPY) "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"
+!endif
+
+#---------------------------------------------------------------------
+# Build tclConfig.sh for the TEA build system.
+#---------------------------------------------------------------------
+
+tclConfig: $(OUT_DIR)\tclConfig.sh
+
+$(OUT_DIR)\tclConfig.sh: $(WINDIR)\tclConfig.sh.in
+	@echo Creating tclConfig.sh
+        @nmakehlp -s << $** >$@
+@TCL_DLL_FILE@       $(TCLLIBNAME)
+@TCL_VERSION@        $(DOTVERSION)
+@TCL_MAJOR_VERSION@  $(TCL_MAJOR_VERSION)
+@TCL_MINOR_VERSION@  $(TCL_MINOR_VERSION)
+@TCL_PATCH_LEVEL@    $(TCL_PATCH_LEVEL)
+@CC@                 $(CC)
+@DEFS@               $(TCL_CFLAGS)
+@CFLAGS_DEBUG@       -nologo -c -W3 -YX -Fp$(TMP_DIR)\ -MDd
+@CFLAGS_OPTIMIZE@    -nologo -c -W3 -YX -Fp$(TMP_DIR)\ -MD
+@LDFLAGS_DEBUG@      -nologo -machine:$(MACHINE) -debug -debugtype:cv
+@LDFLAGS_OPTIMIZE@   -nologo -machine:$(MACHINE) -release -opt:ref -opt:icf,3
+@TCL_DBGX@           $(SUFX)
+@TCL_LIB_FILE@       $(PROJECT)$(VERSION)$(SUFX).lib
+@TCL_NEEDS_EXP_FILE@
+@LIBS@               $(baselibs)
+@prefix@             $(_INSTALLDIR)
+@exec_prefix@        $(BIN_INSTALL_DIR)
+@SHLIB_CFLAGS@
+@STLIB_CFLAGS@
+@CFLAGS_WARNING@     -W3
+@EXTRA_CFLAGS@       -YX
+@SHLIB_LD@           $(link32) $(dlllflags)
+@STLIB_LD@           $(lib32) -nologo
+@SHLIB_LD_LIBS@      $(baselibs)
+@SHLIB_SUFFIX@       .dll
+@DL_LIBS@
+@LDFLAGS@
+@TCL_LD_SEARCH_FLAGS@
+@LIBOBJS@
+@RANLIB@
+@TCL_LIB_FLAG@
+@TCL_BUILD_LIB_SPEC@
+@TCL_LIB_SPEC@       $(LIB_INSTALL_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
+@TCL_INCLUDE_SPEC@   -I$(INCLUDE_INSTALL_DIR)
+@TCL_LIB_VERSIONS_OK@
+@TCL_SRC_DIR@        $(ROOT)
+@TCL_PACKAGE_PATH@
+@TCL_STUB_LIB_FILE@  $(TCLSTUBLIBNAME)
+@TCL_STUB_LIB_FLAG@  $(TCLSTUBLIBNAME)
+@TCL_STUB_LIB_SPEC@  -L$(LIB_INSTALL_DIR) $(TCLSTUBLIBNAME)
+@TCL_THREADS@        $(TCL_THREADS)
+@TCL_BUILD_STUB_LIB_SPEC@ -L$(OUT_DIR) $(TCLSTUBLIBNAME)
+@TCL_BUILD_STUB_LIB_PATH@ $(TCLSTUBLIB)
+@TCL_STUB_LIB_PATH@  $(LIB_INSTALL_DIR)\$(TCLSTUBLIBNAME)
+@CFG_TCL_EXPORT_FILE_SUFFIX@  $(VERSION)$(SUFX).lib
+@CFG_TCL_SHARED_LIB_SUFFIX@   $(VERSION)$(SUFX).dll
+@CFG_TCL_UNSHARED_LIB_SUFFIX@ $(VERSION)$(SUFX).lib
+!if $(STATIC_BUILD)
+@TCL_SHARED_BUILD@   0
+!else
+@TCL_SHARED_BUILD@   1
+!endif
+<<
+
+
+#---------------------------------------------------------------------
+# The following target generates the file generic/tclDate.c
+# from the yacc grammar found in generic/tclGetDate.y.  This is
+# only run by hand as yacc is not available in all environments.
+# The name of the .c file is different than the name of the .y file
+# so that make doesn't try to automatically regenerate the .c file.
+#---------------------------------------------------------------------
+
+gendate:
+	bison --output-file=$(GENERICDIR)/tclDate.c \
+	--name-prefix=TclDate \
+	$(GENERICDIR)/tclGetDate.y
+
+#---------------------------------------------------------------------
+# Special case object file targets
+#---------------------------------------------------------------------
+
+$(TMP_DIR)\testMain.obj: $(WINDIR)\tclAppInit.c
+	$(cc32) $(TCL_CFLAGS) -DTCL_TEST \
+	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
+	    -Fo$@ $?
+
+$(TMP_DIR)\tclTest.obj: $(GENERICDIR)\tclTest.c
+	$(cc32) $(TCL_CFLAGS) -Fo$@ $?
+
+$(TMP_DIR)\tclTestObj.obj: $(GENERICDIR)\tclTestObj.c
+	$(cc32) $(TCL_CFLAGS) -Fo$@ $?
+
+$(TMP_DIR)\tclWinTest.obj: $(WINDIR)\tclWinTest.c
+	$(cc32) $(TCL_CFLAGS) -Fo$@ $?
+
+$(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c
+	$(cc32) -DBUILD_tcl $(TCL_CFLAGS) \
+	-DCFG_INSTALL_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \
+	-DCFG_INSTALL_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \
+	-DCFG_INSTALL_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \
+	-DCFG_INSTALL_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \
+	-DCFG_INSTALL_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""	\
+	-DCFG_RUNTIME_LIBDIR="\"$(LIB_INSTALL_DIR:\=\\)\"" \
+	-DCFG_RUNTIME_BINDIR="\"$(BIN_INSTALL_DIR:\=\\)\"" \
+	-DCFG_RUNTIME_SCRDIR="\"$(SCRIPT_INSTALL_DIR:\=\\)\"" \
+	-DCFG_RUNTIME_INCDIR="\"$(INCLUDE_INSTALL_DIR:\=\\)\"" \
+	-DCFG_RUNTIME_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""     \
+	-Fo$@ $?
+
+$(TMP_DIR)\tclAppInit.obj: $(WINDIR)\tclAppInit.c
+	$(cc32) $(TCL_CFLAGS) \
+	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
+	    -Fo$@ $?
+
+### The following objects should be built using the stub interfaces
+### *ALL* extensions need to built with -DTCL_THREADS=1
+
+$(TMP_DIR)\tclWinReg.obj: $(WINDIR)\tclWinReg.c
+!if $(STATIC_BUILD)
+	$(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DSTATIC_BUILD -Fo$@ $?
+!else
+	$(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DUSE_TCL_STUBS -Fo$@ $?
+!endif
+
+
+$(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c
+!if $(STATIC_BUILD)
+	$(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DSTATIC_BUILD -Fo$@ $?
+!else
+	$(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DUSE_TCL_STUBS -Fo$@ $?
+!endif
+
+
+### The following objects are part of the stub library and should not
+### be built as DLL objects.  -Zl is used to avoid a dependency on any
+### specific C run-time.
+
+$(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.c
+	$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $?
+
+$(TMP_DIR)\tclsh.exe.manifest: $(WINDIR)\tclsh.exe.manifest.in
+	@nmakehlp -s << $** >$@
+@MACHINE@	  $(MACHINE:IX86=X86)
+@TCL_WIN_VERSION@  $(DOTVERSION).0.0
+<<
+
+#---------------------------------------------------------------------
+# Generate the source dependencies.  Having dependency rules will
+# improve incremental build accuracy without having to resort to a
+# full rebuild just because some non-global header file like
+# tclCompile.h was changed.  These rules aren't needed when building
+# from scratch.
+#---------------------------------------------------------------------
+
+depend:
+!if !exist($(TCLSH))
+	@echo Build tclsh first!
+!else
+	$(TCLSH) $(TOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \
+		-passthru:"-DBUILD_tcl $(TCL_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \
+		$(COMPATDIR),$$(COMPATDIR) $(TOMMATHDIR),$$(TOMMATHDIR) $(WINDIR),$$(WINDIR) @<<
+$(TCLOBJS)
+<<
+!endif
+
+#---------------------------------------------------------------------
+# Dependency rules
+#---------------------------------------------------------------------
+
+!if exist("$(OUT_DIR)\depend.mk")
+!include "$(OUT_DIR)\depend.mk"
+!message *** Dependency rules in use.
+!else
+!message *** Dependency rules are not being used.
+!endif
+
+### add a spacer in the output
+!message
+
+
+#---------------------------------------------------------------------
+# Implicit rules
+#---------------------------------------------------------------------
+
+{$(WINDIR)}.c{$(TMP_DIR)}.obj::
+	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<
+$<
+<<
+
+{$(TOMMATHDIR)}.c{$(TMP_DIR)}.obj::
+	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<
+$<
+<<
+
+{$(GENERICDIR)}.c{$(TMP_DIR)}.obj::
+	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<
+$<
+<<
+
+{$(COMPATDIR)}.c{$(TMP_DIR)}.obj::
+	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<
+$<
+<<
+
+{$(WINDIR)}.rc{$(TMP_DIR)}.res:
+	$(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \
+	    -d DEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \
+	    -d TCL_THREADS=$(TCL_THREADS) \
+	    -d STATIC_BUILD=$(STATIC_BUILD) \
+	    $<
+
+$(TMP_DIR)\tclsh.res: $(TMP_DIR)\tclsh.exe.manifest
+
+.SUFFIXES:
+.SUFFIXES:.c .rc
+
+
+#---------------------------------------------------------------------
+# Installation.
+#---------------------------------------------------------------------
+
+install-binaries:
+	@echo Installing to '$(_INSTALLDIR)'
+	@echo Installing $(TCLLIBNAME)
+!if "$(TCLLIB)" != "$(TCLIMPLIB)"
+	@$(CPY) "$(TCLLIB)" "$(BIN_INSTALL_DIR)\"
+!endif
+	@$(CPY) "$(TCLIMPLIB)" "$(LIB_INSTALL_DIR)\"
+!if exist($(TCLSH))
+	@echo Installing $(TCLSHNAME)
+	@$(CPY) "$(TCLSH)" "$(BIN_INSTALL_DIR)\"
+!endif
+!if exist($(TCLPIPEDLL))
+	@echo Installing $(TCLPIPEDLLNAME)
+	@$(CPY) "$(TCLPIPEDLL)" "$(BIN_INSTALL_DIR)\"
+!endif
+	@echo Installing $(TCLSTUBLIBNAME)
+	@$(CPY) "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)\"
+
+#" emacs fix
+
+install-libraries: tclConfig install-msgs install-tzdata
+	@if not exist "$(SCRIPT_INSTALL_DIR)$(NULL)" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)"
+	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8$(NULL)" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8"
+	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.2$(NULL)" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.2"
+	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.3$(NULL)" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.3"
+	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4$(NULL)" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4"
+	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform$(NULL)" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform"
+	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5$(NULL)" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5"
+	@echo Installing header files
+	@$(CPY) "$(GENERICDIR)\tcl.h"             "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(GENERICDIR)\tclDecls.h"        "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(GENERICDIR)\tclPlatDecls.h"    "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(GENERICDIR)\tclTomMath.h"      "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(GENERICDIR)\tclTomMathDecls.h" "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(TOMMATHDIR)\tommath_class.h"   "$(INCLUDE_INSTALL_DIR)\"
+	@$(CPY) "$(TOMMATHDIR)\tommath_superclass.h" "$(INCLUDE_INSTALL_DIR)\"
+	@echo Installing library files to $(SCRIPT_INSTALL_DIR)
+	@$(CPY) "$(ROOT)\library\history.tcl"     "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\init.tcl"        "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\clock.tcl"       "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\tm.tcl"          "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\parray.tcl"      "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\safe.tcl"        "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\tclIndex"        "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\package.tcl"     "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\word.tcl"        "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(ROOT)\library\auto.tcl"        "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(OUT_DIR)\tclConfig.sh"         "$(LIB_INSTALL_DIR)\"
+	@echo Installing library http1.0 directory
+	@$(CPY) "$(ROOT)\library\http1.0\*.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\http1.0\"
+	@echo Installing library opt0.4 directory
+	@$(CPY) "$(ROOT)\library\opt\*.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\opt0.4\"
+	@echo Installing package http $(PKG_HTTP_VER) as a Tcl Module
+	@$(COPY) "$(ROOT)\library\http\http.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\http-$(PKG_HTTP_VER).tm"
+	@echo Installing package msgcat $(PKG_MSGCAT_VER) as a Tcl Module
+	@$(COPY) "$(ROOT)\library\msgcat\msgcat.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5\msgcat-$(PKG_MSGCAT_VER).tm"
+	@echo Installing package tcltest $(PKG_TCLTEST_VER) as a Tcl Module
+	@$(COPY) "$(ROOT)\library\tcltest\tcltest.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5\tcltest-$(PKG_TCLTEST_VER).tm"
+	@echo Installing package platform $(PKG_PLATFORM_VER) as a Tcl Module
+	@$(COPY) "$(ROOT)\library\platform\platform.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform-$(PKG_PLATFORM_VER).tm"
+	@echo Installing package platform::shell $(PKG_SHELL_VER) as a Tcl Module
+	@$(COPY) "$(ROOT)\library\platform\shell.tcl" \
+	    "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform\shell-$(PKG_SHELL_VER).tm"
+	@echo Installing $(TCLDDELIBNAME)
+!if $(STATIC_BUILD)
+!if !$(TCL_USE_STATIC_PACKAGES)
+	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\"
+!endif
+!else
+	@$(CPY) "$(TCLDDELIB)" "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"
+	@$(CPY) "$(ROOT)\library\dde\pkgIndex.tcl" \
+	    "$(LIB_INSTALL_DIR)\dde$(DDEDOTVERSION)\"
+!endif
+	@echo Installing $(TCLREGLIBNAME)
+!if $(STATIC_BUILD)
+!if !$(TCL_USE_STATIC_PACKAGES)
+	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\"
+!endif
+!else
+	@$(CPY) "$(TCLREGLIB)" "$(LIB_INSTALL_DIR)\reg$(REGDOTVERSION)\"
+	@$(CPY) "$(ROOT)\library\reg\pkgIndex.tcl" \
+	    "$(LIB_INSTALL_DIR)\reg$(REGDOTVERSION)\"
+!endif
+	@echo Installing encodings
+	@$(CPY) "$(ROOT)\library\encoding\*.enc" \
+		"$(SCRIPT_INSTALL_DIR)\encoding\"
+
+#" emacs fix
+
+install-tzdata:
+	@echo Installing time zone data
+	@set TCL_LIBRARY=$(ROOT:\=/)/library
+	@$(TCLSH_NATIVE) "$(ROOT:\=/)/tools/installData.tcl" \
+	    "$(ROOT:\=/)/library/tzdata" "$(SCRIPT_INSTALL_DIR)/tzdata"
+
+install-msgs:
+	@echo Installing message catalogs
+	@set TCL_LIBRARY=$(ROOT:\=/)/library
+	@$(TCLSH_NATIVE) "$(ROOT:\=/)/tools/installData.tcl" \
+	    "$(ROOT:\=/)/library/msgs" "$(SCRIPT_INSTALL_DIR)/msgs"
+
+#---------------------------------------------------------------------
+# Clean up
+#---------------------------------------------------------------------
+
+tidy:
+!if "$(TCLLIB)" != "$(TCLIMPLIB)"
+	@echo Removing $(TCLLIB) ...
+	@if exist $(TCLLIB) del $(TCLLIB)
+!endif
+	@echo Removing $(TCLIMPLIB) ...
+	@if exist $(TCLIMPLIB) del $(TCLIMPLIB)
+	@echo Removing $(TCLSH) ...
+	@if exist $(TCLSH) del $(TCLSH)
+	@echo Removing $(TCLTEST) ...
+	@if exist $(TCLTEST) del $(TCLTEST)
+	@echo Removing $(TCLDDELIB) ...
+	@if exist $(TCLDDELIB) del $(TCLDDELIB)
+	@echo Removing $(TCLREGLIB) ...
+	@if exist $(TCLREGLIB) del $(TCLREGLIB)
+
+clean:
+	@echo Cleaning $(TMP_DIR)\* ...
+	@if exist $(TMP_DIR)\nul $(RMDIR) $(TMP_DIR)
+	@echo Cleaning $(WINDIR)\nmakehlp.obj ...
+	@if exist $(WINDIR)\nmakehlp.obj del $(WINDIR)\nmakehlp.obj
+	@echo Cleaning $(WINDIR)\nmakehlp.exe ...
+	@if exist $(WINDIR)\nmakehlp.exe del $(WINDIR)\nmakehlp.exe
+	@echo Cleaning $(WINDIR)\_junk.pch ...
+	@if exist $(WINDIR)\_junk.pch del $(WINDIR)\_junk.pch
+	@echo Cleaning $(WINDIR)\vercl.x ...
+	@if exist $(WINDIR)\vercl.x del $(WINDIR)\vercl.x
+	@echo Cleaning $(WINDIR)\vercl.i ...
+	@if exist $(WINDIR)\vercl.i del $(WINDIR)\vercl.i
+	@echo Cleaning $(WINDIR)\versions.vc ...
+	@if exist $(WINDIR)\versions.vc del $(WINDIR)\versions.vc
+
+realclean: hose
+
+hose:
+	@echo Hosing $(OUT_DIR)\* ...
+	@if exist $(OUT_DIR)\nul $(RMDIR) $(OUT_DIR)
diff --git a/win/rules.vc b/win/rules.vc
index bbf7485..78a167a 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -1,698 +1,698 @@
-#------------------------------------------------------------------------------
-# rules.vc --
-#
-#	Microsoft Visual C++ makefile include for decoding the commandline
-#	macros.  This file does not need editing to build Tcl.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# Copyright (c) 2001-2003 David Gravereaux.
-# Copyright (c) 2003-2008 Patrick Thoyts
-#------------------------------------------------------------------------------
-
-!ifndef _RULES_VC
-_RULES_VC = 1
-
-cc32		= $(CC)   # built-in default.
-link32		= link
-lib32		= lib
-rc32		= $(RC)   # built-in default.
-
-!ifndef INSTALLDIR
-### Assume the normal default.
-_INSTALLDIR	= C:\Program Files\Tcl
-!else
-### Fix the path separators.
-_INSTALLDIR	= $(INSTALLDIR:/=\)
-!endif
-
-#----------------------------------------------------------
-# Set the proper copy method to avoid overwrite questions
-# to the user when copying files and selecting the right
-# "delete all" method.
-#----------------------------------------------------------
-
-!if "$(OS)" == "Windows_NT"
-RMDIR	= rmdir /S /Q
-ERRNULL  = 2>NUL
-!if ![ver | find "4.0" > nul]
-CPY	= echo y | xcopy /i >NUL
-COPY	= copy >NUL
-!else
-CPY	= xcopy /i /y >NUL
-COPY	= copy /y >NUL
-!endif
-!else # "$(OS)" != "Windows_NT"
-CPY	= xcopy /i >_JUNK.OUT # On Win98 NUL does not work here.
-COPY	= copy >_JUNK.OUT # On Win98 NUL does not work here.
-RMDIR	= deltree /Y
-NULL    = \NUL # Used in testing directory existence
-ERRNULL = >NUL # Win9x shell cannot redirect stderr
-!endif
-MKDIR   = mkdir
-
-#------------------------------------------------------------------------------
-# Determine the host and target architectures and compiler version.
-#------------------------------------------------------------------------------
-
-_HASH=^#
-_VC_MANIFEST_EMBED_EXE=
-_VC_MANIFEST_EMBED_DLL=
-VCVER=0
-!if ![echo VCVERSION=_MSC_VER > vercl.x] \
-    && ![echo $(_HASH)if defined(_M_IX86) >> vercl.x] \
-    && ![echo ARCH=IX86 >> vercl.x] \
-    && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \
-    && ![echo ARCH=AMD64 >> vercl.x] \
-    && ![echo $(_HASH)endif >> vercl.x] \
-    && ![cl -nologo -TC -P vercl.x $(ERRNULL)]
-!include vercl.i
-!if ![echo VCVER= ^\> vercl.vc] \
-    && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc]
-!include vercl.vc
-!endif
-!endif
-!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc]
-!endif
-
-!if ![reg query HKLM\Hardware\Description\System\CentralProcessor\0 /v Identifier | findstr /i x86]
-NATIVE_ARCH=IX86
-!else
-NATIVE_ARCH=AMD64
-!endif
-
-# Since MSVC8 we must deal with manifest resources.
-!if $(VCVERSION) >= 1400
-_VC_MANIFEST_EMBED_EXE=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;1
-_VC_MANIFEST_EMBED_DLL=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2
-!endif
-
-!ifndef MACHINE
-MACHINE=$(ARCH)
-!endif
-
-!ifndef CFG_ENCODING
-CFG_ENCODING	= \"cp1252\"
-!endif
-
-!message ===============================================================================
-
-#----------------------------------------------------------
-# build the helper app we need to overcome nmake's limiting
-# environment.
-#----------------------------------------------------------
-
-!if !exist(nmakehlp.exe)
-!if [$(cc32) -nologo nmakehlp.c -link -subsystem:console > nul]
-!endif
-!endif
-
-#----------------------------------------------------------
-# Test for compiler features
-#----------------------------------------------------------
-
-### test for optimizations
-!if [nmakehlp -c -Ot]
-!message *** Compiler has 'Optimizations'
-OPTIMIZING	= 1
-!else
-!message *** Compiler does not have 'Optimizations'
-OPTIMIZING	= 0
-!endif
-
-OPTIMIZATIONS   =
-
-!if [nmakehlp -c -Ot]
-OPTIMIZATIONS  = $(OPTIMIZATIONS) -Ot
-!endif
-
-!if [nmakehlp -c -Oi]
-OPTIMIZATIONS  = $(OPTIMIZATIONS) -Oi
-!endif
-
-!if [nmakehlp -c -Op]
-OPTIMIZATIONS  = $(OPTIMIZATIONS) -Op
-!endif
-
-!if [nmakehlp -c -fp:strict]
-OPTIMIZATIONS  = $(OPTIMIZATIONS) -fp:strict
-!endif
-
-!if [nmakehlp -c -Gs]
-OPTIMIZATIONS  = $(OPTIMIZATIONS) -Gs
-!endif
-
-!if [nmakehlp -c -GS]
-OPTIMIZATIONS  = $(OPTIMIZATIONS) -GS
-!endif
-
-!if [nmakehlp -c -GL]
-OPTIMIZATIONS  = $(OPTIMIZATIONS) -GL
-!endif
-
-DEBUGFLAGS     =
-
-!if [nmakehlp -c -RTC1]
-DEBUGFLAGS     = $(DEBUGFLAGS) -RTC1
-!elseif [nmakehlp -c -GZ]
-DEBUGFLAGS     = $(DEBUGFLAGS) -GZ
-!endif
-
-COMPILERFLAGS  =-W3
-
-# In v13 -GL and -YX are incompatible.
-!if [nmakehlp -c -YX]
-!if ![nmakehlp -c -GL]
-OPTIMIZATIONS  = $(OPTIMIZATIONS) -YX
-!endif
-!endif
-
-!if "$(MACHINE)" == "IX86"
-### test for pentium errata
-!if [nmakehlp -c -QI0f]
-!message *** Compiler has 'Pentium 0x0f fix'
-COMPILERFLAGS  = $(COMPILERFLAGS) -QI0f
-!else
-!message *** Compiler does not have 'Pentium 0x0f fix'
-!endif
-!endif
-
-!if "$(MACHINE)" == "IA64"
-### test for Itanium errata
-!if [nmakehlp -c -QIA64_Bx]
-!message *** Compiler has 'B-stepping errata workarounds'
-COMPILERFLAGS   = $(COMPILERFLAGS) -QIA64_Bx
-!else
-!message *** Compiler does not have 'B-stepping errata workarounds'
-!endif
-!endif
-
-!if "$(MACHINE)" == "IX86"
-### test for -align:4096, when align:512 will do.
-!if [nmakehlp -l -opt:nowin98]
-!message *** Linker has 'Win98 alignment problem'
-ALIGN98_HACK	= 1
-!else
-!message *** Linker does not have 'Win98 alignment problem'
-ALIGN98_HACK	= 0
-!endif
-!else
-ALIGN98_HACK	= 0
-!endif
-
-LINKERFLAGS     =
-
-!if [nmakehlp -l -ltcg]
-LINKERFLAGS     =-ltcg
-!endif
-
-#----------------------------------------------------------
-# Decode the options requested.
-#----------------------------------------------------------
-
-!if "$(OPTS)" == "" || [nmakehlp -f "$(OPTS)" "none"]
-STATIC_BUILD	= 0
-TCL_THREADS	= 0
-DEBUG		= 0
-SYMBOLS		= 0
-PROFILE		= 0
-PGO		= 0
-MSVCRT		= 1
-LOIMPACT	= 0
-TCL_USE_STATIC_PACKAGES	= 0
-USE_THREAD_ALLOC = 0
-UNCHECKED	= 0
-!else
-!if [nmakehlp -f $(OPTS) "static"]
-!message *** Doing static
-STATIC_BUILD	= 1
-!else
-STATIC_BUILD	= 0
-!endif
-!if [nmakehlp -f $(OPTS) "msvcrt"]
-!message *** Doing msvcrt
-MSVCRT		= 1
-!else
-!if !$(STATIC_BUILD)
-MSVCRT		= 1
-!else
-MSVCRT		= 0
-!endif
-!endif
-!if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)
-!message *** Doing staticpkg
-TCL_USE_STATIC_PACKAGES	= 1
-!else
-TCL_USE_STATIC_PACKAGES	= 0
-!endif
-!if [nmakehlp -f $(OPTS) "threads"]
-!message *** Doing threads
-TCL_THREADS	= 1
-USE_THREAD_ALLOC = 1
-!else
-TCL_THREADS	= 0
-USE_THREAD_ALLOC = 0
-!endif
-!if [nmakehlp -f $(OPTS) "symbols"]
-!message *** Doing symbols
-DEBUG		= 1
-!else
-DEBUG		= 0
-!endif
-!if [nmakehlp -f $(OPTS) "pdbs"]
-!message *** Doing pdbs
-SYMBOLS		= 1
-!else
-SYMBOLS		= 0
-!endif
-!if [nmakehlp -f $(OPTS) "profile"]
-!message *** Doing profile
-PROFILE		= 1
-!else
-PROFILE		= 0
-!endif
-!if [nmakehlp -f $(OPTS) "pgi"]
-!message *** Doing profile guided optimization instrumentation
-PGO		= 1
-!elseif [nmakehlp -f $(OPTS) "pgo"]
-!message *** Doing profile guided optimization
-PGO		= 2
-!else
-PGO		= 0
-!endif
-!if [nmakehlp -f $(OPTS) "loimpact"]
-!message *** Doing loimpact
-LOIMPACT	= 1
-!else
-LOIMPACT	= 0
-!endif
-!if [nmakehlp -f $(OPTS) "thrdalloc"]
-!message *** Doing thrdalloc
-USE_THREAD_ALLOC = 1
-!endif
-!if [nmakehlp -f $(OPTS) "tclalloc"]
-!message *** Doing tclalloc
-USE_THREAD_ALLOC = 0
-!endif
-!if [nmakehlp -f $(OPTS) "unchecked"]
-!message *** Doing unchecked
-UNCHECKED = 1
-!else
-UNCHECKED = 0
-!endif
-!endif
-
-#----------------------------------------------------------
-# Figure-out how to name our intermediate and output directories.
-# We wouldn't want different builds to use the same .obj files
-# by accident.
-#----------------------------------------------------------
-
-#----------------------------------------
-# Naming convention:
-#   t = full thread support.
-#   s = static library (as opposed to an
-#	import library)
-#   g = linked to the debug enabled C
-#	run-time.
-#   x = special static build when it
-#	links to the dynamic C run-time.
-#----------------------------------------
-SUFX	    = tsgx
-
-!if $(DEBUG)
-BUILDDIRTOP = Debug
-!else
-BUILDDIRTOP = Release
-!endif
-
-!if "$(MACHINE)" != "IX86"
-BUILDDIRTOP =$(BUILDDIRTOP)_$(MACHINE)
-!endif
-!if $(VCVER) > 6
-BUILDDIRTOP =$(BUILDDIRTOP)_VC$(VCVER)
-!endif
-
-!if !$(DEBUG) || $(DEBUG) && $(UNCHECKED)
-SUFX	    = $(SUFX:g=)
-!endif
-
-TMP_DIRFULL = .\$(BUILDDIRTOP)\$(PROJECT)_ThreadedDynamicStaticX
-
-!if !$(STATIC_BUILD)
-TMP_DIRFULL = $(TMP_DIRFULL:Static=)
-SUFX	    = $(SUFX:s=)
-EXT	    = dll
-TMP_DIRFULL = $(TMP_DIRFULL:X=)
-SUFX	    = $(SUFX:x=)
-!else
-TMP_DIRFULL = $(TMP_DIRFULL:Dynamic=)
-EXT	    = lib
-!if !$(MSVCRT)
-TMP_DIRFULL = $(TMP_DIRFULL:X=)
-SUFX	    = $(SUFX:x=)
-!endif
-!endif
-
-!if !$(TCL_THREADS)
-TMP_DIRFULL = $(TMP_DIRFULL:Threaded=)
-SUFX	    = $(SUFX:t=)
-!endif
-
-!ifndef TMP_DIR
-TMP_DIR	    = $(TMP_DIRFULL)
-!ifndef OUT_DIR
-OUT_DIR	    = .\$(BUILDDIRTOP)
-!endif
-!else
-!ifndef OUT_DIR
-OUT_DIR	    = $(TMP_DIR)
-!endif
-!endif
-
-
-#----------------------------------------------------------
-# Decode the statistics requested.
-#----------------------------------------------------------
-
-!if "$(STATS)" == "" || [nmakehlp -f "$(STATS)" "none"]
-TCL_MEM_DEBUG	    = 0
-TCL_COMPILE_DEBUG   = 0
-!else
-!if [nmakehlp -f $(STATS) "memdbg"]
-!message *** Doing memdbg
-TCL_MEM_DEBUG	    = 1
-!else
-TCL_MEM_DEBUG	    = 0
-!endif
-!if [nmakehlp -f $(STATS) "compdbg"]
-!message *** Doing compdbg
-TCL_COMPILE_DEBUG   = 1
-!else
-TCL_COMPILE_DEBUG   = 0
-!endif
-!endif
-
-
-#----------------------------------------------------------
-# Decode the checks requested.
-#----------------------------------------------------------
-
-!if "$(CHECKS)" == "" || [nmakehlp -f "$(CHECKS)" "none"]
-TCL_NO_DEPRECATED	    = 0
-WARNINGS		    = -W3
-!else
-!if [nmakehlp -f $(CHECKS) "nodep"]
-!message *** Doing nodep check
-TCL_NO_DEPRECATED	    = 1
-!else
-TCL_NO_DEPRECATED	    = 0
-!endif
-!if [nmakehlp -f $(CHECKS) "fullwarn"]
-!message *** Doing full warnings check
-WARNINGS		    = -W4
-!if [nmakehlp -l -warn:3]
-LINKERFLAGS		    = $(LINKERFLAGS) -warn:3
-!endif
-!else
-WARNINGS		    = -W3
-!endif
-!if [nmakehlp -f $(CHECKS) "64bit"] && [nmakehlp -c -Wp64]
-!message *** Doing 64bit portability warnings
-WARNINGS		    = $(WARNINGS) -Wp64
-!endif
-!endif
-
-!if $(PGO) > 1
-!if [nmakehlp -l -ltcg:pgoptimize]
-LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pgoptimize
-!else
-MSG=^
-This compiler does not support profile guided optimization.
-!error $(MSG)
-!endif
-!elseif $(PGO) > 0
-!if [nmakehlp -l -ltcg:pginstrument]
-LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pginstrument
-!else
-MSG=^
-This compiler does not support profile guided optimization.
-!error $(MSG)
-!endif
-!endif
-
-#----------------------------------------------------------
-# Set our defines now armed with our options.
-#----------------------------------------------------------
-
-OPTDEFINES	= -DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) -DSTDC_HEADERS
-
-!if $(TCL_MEM_DEBUG)
-OPTDEFINES	= $(OPTDEFINES) -DTCL_MEM_DEBUG
-!endif
-!if $(TCL_COMPILE_DEBUG)
-OPTDEFINES	= $(OPTDEFINES) -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS
-!endif
-!if $(TCL_THREADS)
-OPTDEFINES	= $(OPTDEFINES) -DTCL_THREADS=1
-!if $(USE_THREAD_ALLOC)
-OPTDEFINES	= $(OPTDEFINES) -DUSE_THREAD_ALLOC=1
-!endif
-!endif
-!if $(STATIC_BUILD)
-OPTDEFINES	= $(OPTDEFINES) -DSTATIC_BUILD
-!endif
-!if $(TCL_NO_DEPRECATED)
-OPTDEFINES	= $(OPTDEFINES) -DTCL_NO_DEPRECATED
-!endif
-
-!if !$(DEBUG)
-OPTDEFINES	= $(OPTDEFINES) -DNDEBUG
-!if $(OPTIMIZING)
-OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_OPTIMIZED
-!endif
-!endif
-!if $(PROFILE)
-OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_PROFILED
-!endif
-!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
-OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_DO64BIT
-!endif
-!if $(VCVERSION) < 1300
-OPTDEFINES	= $(OPTDEFINES) -DNO_STRTOI64
-!endif
-
-#----------------------------------------------------------
-# Locate the Tcl headers to build against
-#----------------------------------------------------------
-
-!if "$(PROJECT)" == "tcl"
-
-_TCL_H          = ..\generic\tcl.h
-
-!else
-
-# If INSTALLDIR set to tcl root dir then reset to the lib dir.
-!if exist("$(_INSTALLDIR)\include\tcl.h")
-_INSTALLDIR=$(_INSTALLDIR)\lib
-!endif
-
-!if !defined(TCLDIR)
-!if exist("$(_INSTALLDIR)\..\include\tcl.h")
-TCLINSTALL	= 1
-_TCLDIR		= $(_INSTALLDIR)\..
-_TCL_H          = $(_INSTALLDIR)\..\include\tcl.h
-TCLDIR          = $(_INSTALLDIR)\..
-!else
-MSG=^
-Failed to find tcl.h.  Set the TCLDIR macro.
-!error $(MSG)
-!endif
-!else
-_TCLDIR	= $(TCLDIR:/=\)
-!if exist("$(_TCLDIR)\include\tcl.h")
-TCLINSTALL	= 1
-_TCL_H          = $(_TCLDIR)\include\tcl.h
-!elseif exist("$(_TCLDIR)\generic\tcl.h")
-TCLINSTALL	= 0
-_TCL_H          = $(_TCLDIR)\generic\tcl.h
-!else
-MSG =^
-Failed to find tcl.h.  The TCLDIR macro does not appear correct.
-!error $(MSG)
-!endif
-!endif
-!endif
-
-#--------------------------------------------------------------
-# Extract various version numbers from tcl headers
-# The generated file is then included in the makefile.
-#--------------------------------------------------------------
-
-!if [echo REM = This file is generated from rules.vc > versions.vc]
-!endif
-!if [echo TCL_MAJOR_VERSION = \>> versions.vc] \
-   && [nmakehlp -V "$(_TCL_H)" TCL_MAJOR_VERSION >> versions.vc]
-!endif
-!if [echo TCL_MINOR_VERSION = \>> versions.vc] \
-   && [nmakehlp -V "$(_TCL_H)" TCL_MINOR_VERSION >> versions.vc]
-!endif
-!if [echo TCL_PATCH_LEVEL = \>> versions.vc] \
-   && [nmakehlp -V "$(_TCL_H)" TCL_PATCH_LEVEL >> versions.vc]
-!endif
-
-# If building the tcl core then we need additional package versions
-!if "$(PROJECT)" == "tcl"
-!if [echo PKG_HTTP_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\http\pkgIndex.tcl http >> versions.vc]
-!endif
-!if [echo PKG_TCLTEST_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\tcltest\pkgIndex.tcl tcltest >> versions.vc]
-!endif
-!if [echo PKG_MSGCAT_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\msgcat\pkgIndex.tcl msgcat >> versions.vc]
-!endif
-!if [echo PKG_PLATFORM_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform " >> versions.vc]
-!endif
-!if [echo PKG_SHELL_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform::shell" >> versions.vc]
-!endif
-!if [echo PKG_DDE_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\dde\pkgIndex.tcl "dde " >> versions.vc]
-!endif
-!if [echo PKG_REG_VER =\>> versions.vc] \
-   && [nmakehlp -V ..\library\reg\pkgIndex.tcl registry >> versions.vc]
-!endif
-!endif
-
-!include versions.vc
-
-#--------------------------------------------------------------
-# Setup tcl version dependent stuff headers
-#--------------------------------------------------------------
-
-!if "$(PROJECT)" != "tcl"
-
-TCL_VERSION	= $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)
-
-!if $(TCLINSTALL)
-TCLSH		= "$(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX).exe"
-!if !exist($(TCLSH)) && $(TCL_THREADS)
-TCLSH           = "$(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX).exe"
-!endif
-TCLSTUBLIB	= "$(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib"
-TCLIMPLIB	= "$(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX).lib"
-TCL_LIBRARY	= $(_TCLDIR)\lib
-TCLREGLIB	= "$(_TCLDIR)\lib\tclreg12$(SUFX:t=).lib"
-TCLDDELIB	= "$(_TCLDIR)\lib\tcldde13$(SUFX:t=).lib"
-COFFBASE	= \must\have\tcl\sources\to\build\this\target
-TCLTOOLSDIR	= \must\have\tcl\sources\to\build\this\target
-TCL_INCLUDES    = -I"$(_TCLDIR)\include"
-!else
-TCLSH		= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX).exe"
-!if !exist($(TCLSH)) && $(TCL_THREADS)
-TCLSH		= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX).exe"
-!endif
-TCLSTUBLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib"
-TCLIMPLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX).lib"
-TCL_LIBRARY	= $(_TCLDIR)\library
-TCLREGLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg12$(SUFX:t=).lib"
-TCLDDELIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde13$(SUFX:t=).lib"
-COFFBASE	= "$(_TCLDIR)\win\coffbase.txt"
-TCLTOOLSDIR	= $(_TCLDIR)\tools
-TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"
-!endif
-
-!endif
-
-#-------------------------------------------------------------------------
-# Locate the Tk headers to build against
-#-------------------------------------------------------------------------
-
-!if "$(PROJECT)" == "tk"
-_TK_H          = ..\generic\tk.h
-_INSTALLDIR    = $(_INSTALLDIR)\..
-!endif
-
-!ifdef PROJECT_REQUIRES_TK
-!if !defined(TKDIR)
-!if exist("$(_INSTALLDIR)\..\include\tk.h")
-TKINSTALL      = 1
-_TKDIR         = $(_INSTALLDIR)\..
-_TK_H          = $(_TKDIR)\include\tk.h
-TKDIR          = $(_TKDIR)
-!elseif exist("$(_TCLDIR)\include\tk.h")
-TKINSTALL      = 1
-_TKDIR         = $(_TCLDIR)
-_TK_H          = $(_TKDIR)\include\tk.h
-TKDIR          = $(_TKDIR)
-!endif
-!else
-_TKDIR = $(TKDIR:/=\)
-!if exist("$(_TKDIR)\include\tk.h")
-TKINSTALL      = 1
-_TK_H          = $(_TKDIR)\include\tk.h
-!elseif exist("$(_TKDIR)\generic\tk.h")
-TKINSTALL      = 0
-_TK_H          = $(_TKDIR)\generic\tk.h
-!else
-MSG =^
-Failed to find tk.h. The TKDIR macro does not appear correct.
-!error $(MSG)
-!endif
-!endif
-!endif
-
-#-------------------------------------------------------------------------
-# Extract Tk version numbers
-#-------------------------------------------------------------------------
-
-!if defined(PROJECT_REQUIRES_TK) || "$(PROJECT)" == "tk"
-
-!if [echo TK_MAJOR_VERSION = \>> versions.vc] \
-   && [nmakehlp -V $(_TK_H) TK_MAJOR_VERSION >> versions.vc]
-!endif
-!if [echo TK_MINOR_VERSION = \>> versions.vc] \
-   && [nmakehlp -V $(_TK_H) TK_MINOR_VERSION >> versions.vc]
-!endif
-!if [echo TK_PATCH_LEVEL = \>> versions.vc] \
-   && [nmakehlp -V $(_TK_H) TK_PATCH_LEVEL >> versions.vc]
-!endif
-
-!include versions.vc
-
-TK_DOTVERSION	= $(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)
-TK_VERSION	= $(TK_MAJOR_VERSION)$(TK_MINOR_VERSION)
-
-!if "$(PROJECT)" != "tk"
-!if $(TKINSTALL)
-WISH		= "$(_TKDIR)\bin\wish$(TK_VERSION)$(SUFX).exe"
-TKSTUBLIB	= "$(_TKDIR)\lib\tkstub$(TK_VERSION).lib"
-TKIMPLIB	= "$(_TKDIR)\lib\tk$(TK_VERSION)$(SUFX).lib"
-TK_INCLUDES     = -I"$(_TKDIR)\include"
-!else
-WISH		= "$(_TKDIR)\win\$(BUILDDIRTOP)\wish$(TCL_VERSION)$(SUFX).exe"
-TKSTUBLIB	= "$(_TKDIR)\win\$(BUILDDIRTOP)\tkstub$(TCL_VERSION).lib"
-TKIMPLIB	= "$(_TKDIR)\win\$(BUILDDIRTOP)\tk$(TCL_VERSION)$(SUFX).lib"
-TK_INCLUDES     = -I"$(_TKDIR)\generic" -I"$(_TKDIR)\win" -I"$(_TKDIR)\xlib"
-!endif
-!endif
-
-!endif
-
-#----------------------------------------------------------
-# Display stats being used.
-#----------------------------------------------------------
-
-!message *** Intermediate directory will be '$(TMP_DIR)'
-!message *** Output directory will be '$(OUT_DIR)'
-!message *** Suffix for binaries will be '$(SUFX)'
-!message *** Optional defines are '$(OPTDEFINES)'
-!message *** Compiler version $(VCVER). Target machine is $(MACHINE)
-!message *** Host architecture is $(NATIVE_ARCH)
-!message *** Compiler options '$(COMPILERFLAGS) $(OPTIMIZATIONS) $(DEBUGFLAGS) $(WARNINGS)'
-!message *** Link options '$(LINKERFLAGS)'
-
-!endif
+#------------------------------------------------------------------------------
+# rules.vc --
+#
+#	Microsoft Visual C++ makefile include for decoding the commandline
+#	macros.  This file does not need editing to build Tcl.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# Copyright (c) 2001-2003 David Gravereaux.
+# Copyright (c) 2003-2008 Patrick Thoyts
+#------------------------------------------------------------------------------
+
+!ifndef _RULES_VC
+_RULES_VC = 1
+
+cc32		= $(CC)   # built-in default.
+link32		= link
+lib32		= lib
+rc32		= $(RC)   # built-in default.
+
+!ifndef INSTALLDIR
+### Assume the normal default.
+_INSTALLDIR	= C:\Program Files\Tcl
+!else
+### Fix the path separators.
+_INSTALLDIR	= $(INSTALLDIR:/=\)
+!endif
+
+#----------------------------------------------------------
+# Set the proper copy method to avoid overwrite questions
+# to the user when copying files and selecting the right
+# "delete all" method.
+#----------------------------------------------------------
+
+!if "$(OS)" == "Windows_NT"
+RMDIR	= rmdir /S /Q
+ERRNULL  = 2>NUL
+!if ![ver | find "4.0" > nul]
+CPY	= echo y | xcopy /i >NUL
+COPY	= copy >NUL
+!else
+CPY	= xcopy /i /y >NUL
+COPY	= copy /y >NUL
+!endif
+!else # "$(OS)" != "Windows_NT"
+CPY	= xcopy /i >_JUNK.OUT # On Win98 NUL does not work here.
+COPY	= copy >_JUNK.OUT # On Win98 NUL does not work here.
+RMDIR	= deltree /Y
+NULL    = \NUL # Used in testing directory existence
+ERRNULL = >NUL # Win9x shell cannot redirect stderr
+!endif
+MKDIR   = mkdir
+
+#------------------------------------------------------------------------------
+# Determine the host and target architectures and compiler version.
+#------------------------------------------------------------------------------
+
+_HASH=^#
+_VC_MANIFEST_EMBED_EXE=
+_VC_MANIFEST_EMBED_DLL=
+VCVER=0
+!if ![echo VCVERSION=_MSC_VER > vercl.x] \
+    && ![echo $(_HASH)if defined(_M_IX86) >> vercl.x] \
+    && ![echo ARCH=IX86 >> vercl.x] \
+    && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \
+    && ![echo ARCH=AMD64 >> vercl.x] \
+    && ![echo $(_HASH)endif >> vercl.x] \
+    && ![cl -nologo -TC -P vercl.x $(ERRNULL)]
+!include vercl.i
+!if ![echo VCVER= ^\> vercl.vc] \
+    && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc]
+!include vercl.vc
+!endif
+!endif
+!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc]
+!endif
+
+!if ![reg query HKLM\Hardware\Description\System\CentralProcessor\0 /v Identifier | findstr /i x86]
+NATIVE_ARCH=IX86
+!else
+NATIVE_ARCH=AMD64
+!endif
+
+# Since MSVC8 we must deal with manifest resources.
+!if $(VCVERSION) >= 1400
+_VC_MANIFEST_EMBED_EXE=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;1
+_VC_MANIFEST_EMBED_DLL=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2
+!endif
+
+!ifndef MACHINE
+MACHINE=$(ARCH)
+!endif
+
+!ifndef CFG_ENCODING
+CFG_ENCODING	= \"cp1252\"
+!endif
+
+!message ===============================================================================
+
+#----------------------------------------------------------
+# build the helper app we need to overcome nmake's limiting
+# environment.
+#----------------------------------------------------------
+
+!if !exist(nmakehlp.exe)
+!if [$(cc32) -nologo nmakehlp.c -link -subsystem:console > nul]
+!endif
+!endif
+
+#----------------------------------------------------------
+# Test for compiler features
+#----------------------------------------------------------
+
+### test for optimizations
+!if [nmakehlp -c -Ot]
+!message *** Compiler has 'Optimizations'
+OPTIMIZING	= 1
+!else
+!message *** Compiler does not have 'Optimizations'
+OPTIMIZING	= 0
+!endif
+
+OPTIMIZATIONS   =
+
+!if [nmakehlp -c -Ot]
+OPTIMIZATIONS  = $(OPTIMIZATIONS) -Ot
+!endif
+
+!if [nmakehlp -c -Oi]
+OPTIMIZATIONS  = $(OPTIMIZATIONS) -Oi
+!endif
+
+!if [nmakehlp -c -Op]
+OPTIMIZATIONS  = $(OPTIMIZATIONS) -Op
+!endif
+
+!if [nmakehlp -c -fp:strict]
+OPTIMIZATIONS  = $(OPTIMIZATIONS) -fp:strict
+!endif
+
+!if [nmakehlp -c -Gs]
+OPTIMIZATIONS  = $(OPTIMIZATIONS) -Gs
+!endif
+
+!if [nmakehlp -c -GS]
+OPTIMIZATIONS  = $(OPTIMIZATIONS) -GS
+!endif
+
+!if [nmakehlp -c -GL]
+OPTIMIZATIONS  = $(OPTIMIZATIONS) -GL
+!endif
+
+DEBUGFLAGS     =
+
+!if [nmakehlp -c -RTC1]
+DEBUGFLAGS     = $(DEBUGFLAGS) -RTC1
+!elseif [nmakehlp -c -GZ]
+DEBUGFLAGS     = $(DEBUGFLAGS) -GZ
+!endif
+
+COMPILERFLAGS  =-W3
+
+# In v13 -GL and -YX are incompatible.
+!if [nmakehlp -c -YX]
+!if ![nmakehlp -c -GL]
+OPTIMIZATIONS  = $(OPTIMIZATIONS) -YX
+!endif
+!endif
+
+!if "$(MACHINE)" == "IX86"
+### test for pentium errata
+!if [nmakehlp -c -QI0f]
+!message *** Compiler has 'Pentium 0x0f fix'
+COMPILERFLAGS  = $(COMPILERFLAGS) -QI0f
+!else
+!message *** Compiler does not have 'Pentium 0x0f fix'
+!endif
+!endif
+
+!if "$(MACHINE)" == "IA64"
+### test for Itanium errata
+!if [nmakehlp -c -QIA64_Bx]
+!message *** Compiler has 'B-stepping errata workarounds'
+COMPILERFLAGS   = $(COMPILERFLAGS) -QIA64_Bx
+!else
+!message *** Compiler does not have 'B-stepping errata workarounds'
+!endif
+!endif
+
+!if "$(MACHINE)" == "IX86"
+### test for -align:4096, when align:512 will do.
+!if [nmakehlp -l -opt:nowin98]
+!message *** Linker has 'Win98 alignment problem'
+ALIGN98_HACK	= 1
+!else
+!message *** Linker does not have 'Win98 alignment problem'
+ALIGN98_HACK	= 0
+!endif
+!else
+ALIGN98_HACK	= 0
+!endif
+
+LINKERFLAGS     =
+
+!if [nmakehlp -l -ltcg]
+LINKERFLAGS     =-ltcg
+!endif
+
+#----------------------------------------------------------
+# Decode the options requested.
+#----------------------------------------------------------
+
+!if "$(OPTS)" == "" || [nmakehlp -f "$(OPTS)" "none"]
+STATIC_BUILD	= 0
+TCL_THREADS	= 0
+DEBUG		= 0
+SYMBOLS		= 0
+PROFILE		= 0
+PGO		= 0
+MSVCRT		= 1
+LOIMPACT	= 0
+TCL_USE_STATIC_PACKAGES	= 0
+USE_THREAD_ALLOC = 0
+UNCHECKED	= 0
+!else
+!if [nmakehlp -f $(OPTS) "static"]
+!message *** Doing static
+STATIC_BUILD	= 1
+!else
+STATIC_BUILD	= 0
+!endif
+!if [nmakehlp -f $(OPTS) "msvcrt"]
+!message *** Doing msvcrt
+MSVCRT		= 1
+!else
+!if !$(STATIC_BUILD)
+MSVCRT		= 1
+!else
+MSVCRT		= 0
+!endif
+!endif
+!if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)
+!message *** Doing staticpkg
+TCL_USE_STATIC_PACKAGES	= 1
+!else
+TCL_USE_STATIC_PACKAGES	= 0
+!endif
+!if [nmakehlp -f $(OPTS) "threads"]
+!message *** Doing threads
+TCL_THREADS	= 1
+USE_THREAD_ALLOC = 1
+!else
+TCL_THREADS	= 0
+USE_THREAD_ALLOC = 0
+!endif
+!if [nmakehlp -f $(OPTS) "symbols"]
+!message *** Doing symbols
+DEBUG		= 1
+!else
+DEBUG		= 0
+!endif
+!if [nmakehlp -f $(OPTS) "pdbs"]
+!message *** Doing pdbs
+SYMBOLS		= 1
+!else
+SYMBOLS		= 0
+!endif
+!if [nmakehlp -f $(OPTS) "profile"]
+!message *** Doing profile
+PROFILE		= 1
+!else
+PROFILE		= 0
+!endif
+!if [nmakehlp -f $(OPTS) "pgi"]
+!message *** Doing profile guided optimization instrumentation
+PGO		= 1
+!elseif [nmakehlp -f $(OPTS) "pgo"]
+!message *** Doing profile guided optimization
+PGO		= 2
+!else
+PGO		= 0
+!endif
+!if [nmakehlp -f $(OPTS) "loimpact"]
+!message *** Doing loimpact
+LOIMPACT	= 1
+!else
+LOIMPACT	= 0
+!endif
+!if [nmakehlp -f $(OPTS) "thrdalloc"]
+!message *** Doing thrdalloc
+USE_THREAD_ALLOC = 1
+!endif
+!if [nmakehlp -f $(OPTS) "tclalloc"]
+!message *** Doing tclalloc
+USE_THREAD_ALLOC = 0
+!endif
+!if [nmakehlp -f $(OPTS) "unchecked"]
+!message *** Doing unchecked
+UNCHECKED = 1
+!else
+UNCHECKED = 0
+!endif
+!endif
+
+#----------------------------------------------------------
+# Figure-out how to name our intermediate and output directories.
+# We wouldn't want different builds to use the same .obj files
+# by accident.
+#----------------------------------------------------------
+
+#----------------------------------------
+# Naming convention:
+#   t = full thread support.
+#   s = static library (as opposed to an
+#	import library)
+#   g = linked to the debug enabled C
+#	run-time.
+#   x = special static build when it
+#	links to the dynamic C run-time.
+#----------------------------------------
+SUFX	    = tsgx
+
+!if $(DEBUG)
+BUILDDIRTOP = Debug
+!else
+BUILDDIRTOP = Release
+!endif
+
+!if "$(MACHINE)" != "IX86"
+BUILDDIRTOP =$(BUILDDIRTOP)_$(MACHINE)
+!endif
+!if $(VCVER) > 6
+BUILDDIRTOP =$(BUILDDIRTOP)_VC$(VCVER)
+!endif
+
+!if !$(DEBUG) || $(DEBUG) && $(UNCHECKED)
+SUFX	    = $(SUFX:g=)
+!endif
+
+TMP_DIRFULL = .\$(BUILDDIRTOP)\$(PROJECT)_ThreadedDynamicStaticX
+
+!if !$(STATIC_BUILD)
+TMP_DIRFULL = $(TMP_DIRFULL:Static=)
+SUFX	    = $(SUFX:s=)
+EXT	    = dll
+TMP_DIRFULL = $(TMP_DIRFULL:X=)
+SUFX	    = $(SUFX:x=)
+!else
+TMP_DIRFULL = $(TMP_DIRFULL:Dynamic=)
+EXT	    = lib
+!if !$(MSVCRT)
+TMP_DIRFULL = $(TMP_DIRFULL:X=)
+SUFX	    = $(SUFX:x=)
+!endif
+!endif
+
+!if !$(TCL_THREADS)
+TMP_DIRFULL = $(TMP_DIRFULL:Threaded=)
+SUFX	    = $(SUFX:t=)
+!endif
+
+!ifndef TMP_DIR
+TMP_DIR	    = $(TMP_DIRFULL)
+!ifndef OUT_DIR
+OUT_DIR	    = .\$(BUILDDIRTOP)
+!endif
+!else
+!ifndef OUT_DIR
+OUT_DIR	    = $(TMP_DIR)
+!endif
+!endif
+
+
+#----------------------------------------------------------
+# Decode the statistics requested.
+#----------------------------------------------------------
+
+!if "$(STATS)" == "" || [nmakehlp -f "$(STATS)" "none"]
+TCL_MEM_DEBUG	    = 0
+TCL_COMPILE_DEBUG   = 0
+!else
+!if [nmakehlp -f $(STATS) "memdbg"]
+!message *** Doing memdbg
+TCL_MEM_DEBUG	    = 1
+!else
+TCL_MEM_DEBUG	    = 0
+!endif
+!if [nmakehlp -f $(STATS) "compdbg"]
+!message *** Doing compdbg
+TCL_COMPILE_DEBUG   = 1
+!else
+TCL_COMPILE_DEBUG   = 0
+!endif
+!endif
+
+
+#----------------------------------------------------------
+# Decode the checks requested.
+#----------------------------------------------------------
+
+!if "$(CHECKS)" == "" || [nmakehlp -f "$(CHECKS)" "none"]
+TCL_NO_DEPRECATED	    = 0
+WARNINGS		    = -W3
+!else
+!if [nmakehlp -f $(CHECKS) "nodep"]
+!message *** Doing nodep check
+TCL_NO_DEPRECATED	    = 1
+!else
+TCL_NO_DEPRECATED	    = 0
+!endif
+!if [nmakehlp -f $(CHECKS) "fullwarn"]
+!message *** Doing full warnings check
+WARNINGS		    = -W4
+!if [nmakehlp -l -warn:3]
+LINKERFLAGS		    = $(LINKERFLAGS) -warn:3
+!endif
+!else
+WARNINGS		    = -W3
+!endif
+!if [nmakehlp -f $(CHECKS) "64bit"] && [nmakehlp -c -Wp64]
+!message *** Doing 64bit portability warnings
+WARNINGS		    = $(WARNINGS) -Wp64
+!endif
+!endif
+
+!if $(PGO) > 1
+!if [nmakehlp -l -ltcg:pgoptimize]
+LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pgoptimize
+!else
+MSG=^
+This compiler does not support profile guided optimization.
+!error $(MSG)
+!endif
+!elseif $(PGO) > 0
+!if [nmakehlp -l -ltcg:pginstrument]
+LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pginstrument
+!else
+MSG=^
+This compiler does not support profile guided optimization.
+!error $(MSG)
+!endif
+!endif
+
+#----------------------------------------------------------
+# Set our defines now armed with our options.
+#----------------------------------------------------------
+
+OPTDEFINES	= -DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) -DSTDC_HEADERS
+
+!if $(TCL_MEM_DEBUG)
+OPTDEFINES	= $(OPTDEFINES) -DTCL_MEM_DEBUG
+!endif
+!if $(TCL_COMPILE_DEBUG)
+OPTDEFINES	= $(OPTDEFINES) -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS
+!endif
+!if $(TCL_THREADS)
+OPTDEFINES	= $(OPTDEFINES) -DTCL_THREADS=1
+!if $(USE_THREAD_ALLOC)
+OPTDEFINES	= $(OPTDEFINES) -DUSE_THREAD_ALLOC=1
+!endif
+!endif
+!if $(STATIC_BUILD)
+OPTDEFINES	= $(OPTDEFINES) -DSTATIC_BUILD
+!endif
+!if $(TCL_NO_DEPRECATED)
+OPTDEFINES	= $(OPTDEFINES) -DTCL_NO_DEPRECATED
+!endif
+
+!if !$(DEBUG)
+OPTDEFINES	= $(OPTDEFINES) -DNDEBUG
+!if $(OPTIMIZING)
+OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_OPTIMIZED
+!endif
+!endif
+!if $(PROFILE)
+OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_PROFILED
+!endif
+!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
+OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_DO64BIT
+!endif
+!if $(VCVERSION) < 1300
+OPTDEFINES	= $(OPTDEFINES) -DNO_STRTOI64
+!endif
+
+#----------------------------------------------------------
+# Locate the Tcl headers to build against
+#----------------------------------------------------------
+
+!if "$(PROJECT)" == "tcl"
+
+_TCL_H          = ..\generic\tcl.h
+
+!else
+
+# If INSTALLDIR set to tcl root dir then reset to the lib dir.
+!if exist("$(_INSTALLDIR)\include\tcl.h")
+_INSTALLDIR=$(_INSTALLDIR)\lib
+!endif
+
+!if !defined(TCLDIR)
+!if exist("$(_INSTALLDIR)\..\include\tcl.h")
+TCLINSTALL	= 1
+_TCLDIR		= $(_INSTALLDIR)\..
+_TCL_H          = $(_INSTALLDIR)\..\include\tcl.h
+TCLDIR          = $(_INSTALLDIR)\..
+!else
+MSG=^
+Failed to find tcl.h.  Set the TCLDIR macro.
+!error $(MSG)
+!endif
+!else
+_TCLDIR	= $(TCLDIR:/=\)
+!if exist("$(_TCLDIR)\include\tcl.h")
+TCLINSTALL	= 1
+_TCL_H          = $(_TCLDIR)\include\tcl.h
+!elseif exist("$(_TCLDIR)\generic\tcl.h")
+TCLINSTALL	= 0
+_TCL_H          = $(_TCLDIR)\generic\tcl.h
+!else
+MSG =^
+Failed to find tcl.h.  The TCLDIR macro does not appear correct.
+!error $(MSG)
+!endif
+!endif
+!endif
+
+#--------------------------------------------------------------
+# Extract various version numbers from tcl headers
+# The generated file is then included in the makefile.
+#--------------------------------------------------------------
+
+!if [echo REM = This file is generated from rules.vc > versions.vc]
+!endif
+!if [echo TCL_MAJOR_VERSION = \>> versions.vc] \
+   && [nmakehlp -V "$(_TCL_H)" TCL_MAJOR_VERSION >> versions.vc]
+!endif
+!if [echo TCL_MINOR_VERSION = \>> versions.vc] \
+   && [nmakehlp -V "$(_TCL_H)" TCL_MINOR_VERSION >> versions.vc]
+!endif
+!if [echo TCL_PATCH_LEVEL = \>> versions.vc] \
+   && [nmakehlp -V "$(_TCL_H)" TCL_PATCH_LEVEL >> versions.vc]
+!endif
+
+# If building the tcl core then we need additional package versions
+!if "$(PROJECT)" == "tcl"
+!if [echo PKG_HTTP_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\http\pkgIndex.tcl http >> versions.vc]
+!endif
+!if [echo PKG_TCLTEST_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\tcltest\pkgIndex.tcl tcltest >> versions.vc]
+!endif
+!if [echo PKG_MSGCAT_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\msgcat\pkgIndex.tcl msgcat >> versions.vc]
+!endif
+!if [echo PKG_PLATFORM_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform " >> versions.vc]
+!endif
+!if [echo PKG_SHELL_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform::shell" >> versions.vc]
+!endif
+!if [echo PKG_DDE_VER = \>> versions.vc] \
+   && [nmakehlp -V ..\library\dde\pkgIndex.tcl "dde " >> versions.vc]
+!endif
+!if [echo PKG_REG_VER =\>> versions.vc] \
+   && [nmakehlp -V ..\library\reg\pkgIndex.tcl registry >> versions.vc]
+!endif
+!endif
+
+!include versions.vc
+
+#--------------------------------------------------------------
+# Setup tcl version dependent stuff headers
+#--------------------------------------------------------------
+
+!if "$(PROJECT)" != "tcl"
+
+TCL_VERSION	= $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)
+
+!if $(TCLINSTALL)
+TCLSH		= "$(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX).exe"
+!if !exist($(TCLSH)) && $(TCL_THREADS)
+TCLSH           = "$(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX).exe"
+!endif
+TCLSTUBLIB	= "$(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib"
+TCLIMPLIB	= "$(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX).lib"
+TCL_LIBRARY	= $(_TCLDIR)\lib
+TCLREGLIB	= "$(_TCLDIR)\lib\tclreg12$(SUFX:t=).lib"
+TCLDDELIB	= "$(_TCLDIR)\lib\tcldde13$(SUFX:t=).lib"
+COFFBASE	= \must\have\tcl\sources\to\build\this\target
+TCLTOOLSDIR	= \must\have\tcl\sources\to\build\this\target
+TCL_INCLUDES    = -I"$(_TCLDIR)\include"
+!else
+TCLSH		= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX).exe"
+!if !exist($(TCLSH)) && $(TCL_THREADS)
+TCLSH		= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX).exe"
+!endif
+TCLSTUBLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib"
+TCLIMPLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX).lib"
+TCL_LIBRARY	= $(_TCLDIR)\library
+TCLREGLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg12$(SUFX:t=).lib"
+TCLDDELIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde13$(SUFX:t=).lib"
+COFFBASE	= "$(_TCLDIR)\win\coffbase.txt"
+TCLTOOLSDIR	= $(_TCLDIR)\tools
+TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"
+!endif
+
+!endif
+
+#-------------------------------------------------------------------------
+# Locate the Tk headers to build against
+#-------------------------------------------------------------------------
+
+!if "$(PROJECT)" == "tk"
+_TK_H          = ..\generic\tk.h
+_INSTALLDIR    = $(_INSTALLDIR)\..
+!endif
+
+!ifdef PROJECT_REQUIRES_TK
+!if !defined(TKDIR)
+!if exist("$(_INSTALLDIR)\..\include\tk.h")
+TKINSTALL      = 1
+_TKDIR         = $(_INSTALLDIR)\..
+_TK_H          = $(_TKDIR)\include\tk.h
+TKDIR          = $(_TKDIR)
+!elseif exist("$(_TCLDIR)\include\tk.h")
+TKINSTALL      = 1
+_TKDIR         = $(_TCLDIR)
+_TK_H          = $(_TKDIR)\include\tk.h
+TKDIR          = $(_TKDIR)
+!endif
+!else
+_TKDIR = $(TKDIR:/=\)
+!if exist("$(_TKDIR)\include\tk.h")
+TKINSTALL      = 1
+_TK_H          = $(_TKDIR)\include\tk.h
+!elseif exist("$(_TKDIR)\generic\tk.h")
+TKINSTALL      = 0
+_TK_H          = $(_TKDIR)\generic\tk.h
+!else
+MSG =^
+Failed to find tk.h. The TKDIR macro does not appear correct.
+!error $(MSG)
+!endif
+!endif
+!endif
+
+#-------------------------------------------------------------------------
+# Extract Tk version numbers
+#-------------------------------------------------------------------------
+
+!if defined(PROJECT_REQUIRES_TK) || "$(PROJECT)" == "tk"
+
+!if [echo TK_MAJOR_VERSION = \>> versions.vc] \
+   && [nmakehlp -V $(_TK_H) TK_MAJOR_VERSION >> versions.vc]
+!endif
+!if [echo TK_MINOR_VERSION = \>> versions.vc] \
+   && [nmakehlp -V $(_TK_H) TK_MINOR_VERSION >> versions.vc]
+!endif
+!if [echo TK_PATCH_LEVEL = \>> versions.vc] \
+   && [nmakehlp -V $(_TK_H) TK_PATCH_LEVEL >> versions.vc]
+!endif
+
+!include versions.vc
+
+TK_DOTVERSION	= $(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)
+TK_VERSION	= $(TK_MAJOR_VERSION)$(TK_MINOR_VERSION)
+
+!if "$(PROJECT)" != "tk"
+!if $(TKINSTALL)
+WISH		= "$(_TKDIR)\bin\wish$(TK_VERSION)$(SUFX).exe"
+TKSTUBLIB	= "$(_TKDIR)\lib\tkstub$(TK_VERSION).lib"
+TKIMPLIB	= "$(_TKDIR)\lib\tk$(TK_VERSION)$(SUFX).lib"
+TK_INCLUDES     = -I"$(_TKDIR)\include"
+!else
+WISH		= "$(_TKDIR)\win\$(BUILDDIRTOP)\wish$(TCL_VERSION)$(SUFX).exe"
+TKSTUBLIB	= "$(_TKDIR)\win\$(BUILDDIRTOP)\tkstub$(TCL_VERSION).lib"
+TKIMPLIB	= "$(_TKDIR)\win\$(BUILDDIRTOP)\tk$(TCL_VERSION)$(SUFX).lib"
+TK_INCLUDES     = -I"$(_TKDIR)\generic" -I"$(_TKDIR)\win" -I"$(_TKDIR)\xlib"
+!endif
+!endif
+
+!endif
+
+#----------------------------------------------------------
+# Display stats being used.
+#----------------------------------------------------------
+
+!message *** Intermediate directory will be '$(TMP_DIR)'
+!message *** Output directory will be '$(OUT_DIR)'
+!message *** Suffix for binaries will be '$(SUFX)'
+!message *** Optional defines are '$(OPTDEFINES)'
+!message *** Compiler version $(VCVER). Target machine is $(MACHINE)
+!message *** Host architecture is $(NATIVE_ARCH)
+!message *** Compiler options '$(COMPILERFLAGS) $(OPTIMIZATIONS) $(DEBUGFLAGS) $(WARNINGS)'
+!message *** Link options '$(LINKERFLAGS)'
+
+!endif
diff --git a/win/tcl.dsp b/win/tcl.dsp
index b3de0ff..68920ad 100644
--- a/win/tcl.dsp
+++ b/win/tcl.dsp
@@ -1,1567 +1,1567 @@
-# Microsoft Developer Studio Project File - Name="tcl" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) External Target" 0x0106
-
-CFG=tcl - Win32 Debug Static
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "tcl.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "tcl.mak" CFG="tcl - Win32 Debug Static"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "tcl - Win32 Release" (based on "Win32 (x86) External Target")
-!MESSAGE "tcl - Win32 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE "tcl - Win32 Debug Static" (based on "Win32 (x86) External Target")
-!MESSAGE "tcl - Win32 Release Static" (based on "Win32 (x86) External Target")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "tcl - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release\tcl_Dynamic"
-# PROP BASE Cmd_Line "nmake -nologo -f makefile.vc OPTS=none MSVCDIR=IDE"
-# PROP BASE Rebuild_Opt "-a"
-# PROP BASE Target_File "Release\tclsh85.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release\tcl_Dynamic"
-# PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=threads MSVCDIR=IDE"
-# PROP Rebuild_Opt "clean release"
-# PROP Target_File "Release\tclsh85t.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "tcl - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug\tcl_Dynamic"
-# PROP BASE Cmd_Line "nmake -nologo -f makefile.vc OPTS=symbols MSVCDIR=IDE"
-# PROP BASE Rebuild_Opt "-a"
-# PROP BASE Target_File "Debug\tclsh85g.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug\tcl_Dynamic"
-# PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=threads,symbols MSVCDIR=IDE"
-# PROP Rebuild_Opt "clean release"
-# PROP Target_File "Debug\tclsh85tg.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "tcl - Win32 Debug Static"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug\tcl_Static"
-# PROP BASE Cmd_Line "nmake -nologo -f makefile.vc OPTS=symbols,static MSVCDIR=IDE"
-# PROP BASE Rebuild_Opt "-a"
-# PROP BASE Target_File "Debug\tclsh85sg.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug\tcl_Static"
-# PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=symbols,static MSVCDIR=IDE"
-# PROP Rebuild_Opt "-a"
-# PROP Target_File "Debug\tclsh85sg.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "tcl - Win32 Release Static"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release\tcl_Static"
-# PROP BASE Cmd_Line "nmake -nologo -f makefile.vc OPTS=static MSVCDIR=IDE"
-# PROP BASE Rebuild_Opt "-a"
-# PROP BASE Target_File "Release\tclsh85s.exe"
-# PROP BASE Bsc_Name ""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release\tcl_Static"
-# PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=static MSVCDIR=IDE"
-# PROP Rebuild_Opt "-a"
-# PROP Target_File "Release\tclsh85s.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ENDIF 
-
-# Begin Target
-
-# Name "tcl - Win32 Release"
-# Name "tcl - Win32 Debug"
-# Name "tcl - Win32 Debug Static"
-# Name "tcl - Win32 Release Static"
-
-!IF  "$(CFG)" == "tcl - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "tcl - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "tcl - Win32 Debug Static"
-
-!ELSEIF  "$(CFG)" == "tcl - Win32 Release Static"
-
-!ENDIF 
-
-# Begin Group "compat"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\compat\dirent.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\dirent2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\dlfcn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\fixstrtod.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\float.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\gettod.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\limits.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\memcmp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\opendir.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\README
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\stdlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\string.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\strncasecmp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\strstr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\strtod.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\strtol.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\strtoul.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\tclErrno.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\unistd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\waitpid.c
-# End Source File
-# End Group
-# Begin Group "doc"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\doc\Access.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\AddErrInfo.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\after.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Alloc.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\AllowExc.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\append.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\AppInit.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\array.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\AssocData.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Async.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\BackgdErr.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Backslash.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\bgerror.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\binary.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\BoolObj.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\break.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\ByteArrObj.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\CallDel.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\case.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\catch.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\cd.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\ChnlStack.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\clock.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\close.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\CmdCmplt.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Concat.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\concat.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\continue.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\CrtChannel.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\CrtChnlHdlr.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\CrtCloseHdlr.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\CrtCommand.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\CrtFileHdlr.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\CrtInterp.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\CrtMathFnc.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\CrtObjCmd.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\CrtSlave.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\CrtTimerHdlr.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\CrtTrace.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\dde.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\DetachPids.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\DoOneEvent.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\DoubleObj.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\DoWhenIdle.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\DString.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\DumpActiveMemory.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Encoding.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\encoding.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Environment.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\eof.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\error.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Eval.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\eval.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\exec.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Exit.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\exit.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\expr.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\ExprLong.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\ExprLongObj.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\fblocked.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\fconfigure.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\fcopy.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\file.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\fileevent.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\filename.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\FileSystem.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\FindExec.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\flush.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\for.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\foreach.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\format.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\GetCwd.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\GetHostName.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\GetIndex.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\GetInt.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\GetOpnFl.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\gets.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\GetStdChan.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\GetVersion.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\glob.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\global.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Hash.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\history.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\http.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\if.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\incr.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\info.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Init.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\InitStubs.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Interp.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\interp.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\IntObj.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\join.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\lappend.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\library.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\lindex.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\LinkVar.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\linsert.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\list.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\ListObj.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\llength.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\load.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\lrange.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\lreplace.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\lsearch.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\lsort.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\man.macros
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\memory.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\msgcat.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\namespace.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Notifier.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Object.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\ObjectType.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\open.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\OpenFileChnl.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\OpenTcp.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\package.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\packagens.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Panic.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\ParseCmd.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\pid.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\pkgMkIndex.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\PkgRequire.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Preserve.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\PrintDbl.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\proc.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\puts.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\pwd.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\re_syntax.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\read.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\RecEvalObj.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\RecordEval.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\RegExp.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\regexp.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\registry.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\regsub.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\rename.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\return.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\safe.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\SaveResult.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\scan.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\seek.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\set.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\SetErrno.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\SetRecLmt.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\SetResult.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\SetVar.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Signal.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Sleep.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\socket.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\source.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\SourceRCFile.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\split.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\SplitList.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\SplitPath.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\StaticPkg.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\StdChannels.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\string.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\StringObj.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\StrMatch.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\subst.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\SubstObj.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\switch.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Tcl.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Tcl_Main.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\TCL_MEM_DEBUG.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\tclsh.1
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\tcltest.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\tclvars.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\tell.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Thread.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\time.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\ToUpper.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\trace.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\TraceVar.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Translate.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\UniCharIsAlpha.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\unknown.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\unset.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\update.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\uplevel.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\UpVar.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\upvar.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\Utf.3
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\variable.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\vwait.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\while.n
-# End Source File
-# Begin Source File
-
-SOURCE=..\doc\WrongNumArgs.3
-# End Source File
-# End Group
-# Begin Group "generic"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\generic\README
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\regc_color.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\regc_cvec.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\regc_lex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\regc_locale.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\regc_nfa.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\regcomp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\regcustom.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\rege_dfa.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\regerror.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\regerrs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\regex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\regexec.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\regfree.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\regfronts.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\regguts.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tcl.decls
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tcl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclAlloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclAsync.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclBasic.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclBinary.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclCkalloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclClock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclCmdAH.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclCmdIL.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclCmdMZ.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclCompCmds.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclCompExpr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclCompile.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclCompile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclDate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclDecls.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclEncoding.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclEnv.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclEvent.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclExecute.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclFCmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclFileName.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclGet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclGetDate.y
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclHash.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclHistory.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclIndexObj.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclInt.decls
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclInt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclIntDecls.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclInterp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclIntPlatDecls.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclIO.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclIO.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclIOCmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclIOGT.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclIOSock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclIOUtil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclLink.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclListObj.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclLiteral.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclLoad.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclLoadNone.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclMain.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclNamesp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclNotify.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclObj.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclPanic.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclParse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclPipe.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclPkg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclPlatDecls.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclPort.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclPosixStr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclPreserve.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclProc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclRegexp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclRegexp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclResolve.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclResult.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclScan.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclStringObj.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclStubInit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclStubLib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclTest.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclTestObj.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclTestProcBodyObj.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclThread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclThreadJoin.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclThreadTest.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclTimer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclUniData.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclUtf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclUtil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\generic\tclVar.c
-# End Source File
-# End Group
-# Begin Group "library"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\library\auto.tcl
-# End Source File
-# Begin Source File
-
-SOURCE=..\library\history.tcl
-# End Source File
-# Begin Source File
-
-SOURCE=..\library\init.tcl
-# End Source File
-# Begin Source File
-
-SOURCE=..\library\ldAout.tcl
-# End Source File
-# Begin Source File
-
-SOURCE=..\library\package.tcl
-# End Source File
-# Begin Source File
-
-SOURCE=..\library\parray.tcl
-# End Source File
-# Begin Source File
-
-SOURCE=..\library\safe.tcl
-# End Source File
-# Begin Source File
-
-SOURCE=..\library\tclIndex
-# End Source File
-# Begin Source File
-
-SOURCE=..\library\word.tcl
-# End Source File
-# End Group
-# Begin Group "mac"
-
-# PROP Default_Filter ""
-# End Group
-# Begin Group "tests"
-
-# PROP Default_Filter ""
-# End Group
-# Begin Group "tools"
-
-# PROP Default_Filter ""
-# End Group
-# Begin Group "unix"
-
-# PROP Default_Filter ""
-# End Group
-# Begin Group "win"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\aclocal.m4
-# End Source File
-# Begin Source File
-
-SOURCE=.\cat.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\configure
-# End Source File
-# Begin Source File
-
-SOURCE=.\configure.in
-# End Source File
-# Begin Source File
-
-SOURCE=.\makefile.bc
-# End Source File
-# Begin Source File
-
-SOURCE=.\Makefile.in
-# End Source File
-# Begin Source File
-
-SOURCE=.\makefile.vc
-# End Source File
-# Begin Source File
-
-SOURCE=.\mkd.bat
-# End Source File
-# Begin Source File
-
-SOURCE=.\README
-# End Source File
-# Begin Source File
-
-SOURCE=.\README.binary
-# End Source File
-# Begin Source File
-
-SOURCE=.\rmd.bat
-# End Source File
-# Begin Source File
-
-SOURCE=.\rules.vc
-# End Source File
-# Begin Source File
-
-SOURCE=.\stub16.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tcl.hpj.in
-# End Source File
-# Begin Source File
-
-SOURCE=.\tcl.m4
-# End Source File
-# Begin Source File
-
-SOURCE=.\tcl.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclAppInit.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclConfig.sh.in
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclsh.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclsh.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWin32Dll.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinChan.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinConsole.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinDde.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinError.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinFCmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinFile.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinInit.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinInt.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinLoad.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinNotify.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinPipe.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinPort.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinReg.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinSerial.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinSock.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinTest.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinThrd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinThrd.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\tclWinTime.c
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="tcl" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+CFG=tcl - Win32 Debug Static
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "tcl.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "tcl.mak" CFG="tcl - Win32 Debug Static"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "tcl - Win32 Release" (based on "Win32 (x86) External Target")
+!MESSAGE "tcl - Win32 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE "tcl - Win32 Debug Static" (based on "Win32 (x86) External Target")
+!MESSAGE "tcl - Win32 Release Static" (based on "Win32 (x86) External Target")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF  "$(CFG)" == "tcl - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release\tcl_Dynamic"
+# PROP BASE Cmd_Line "nmake -nologo -f makefile.vc OPTS=none MSVCDIR=IDE"
+# PROP BASE Rebuild_Opt "-a"
+# PROP BASE Target_File "Release\tclsh85.exe"
+# PROP BASE Bsc_Name ""
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release\tcl_Dynamic"
+# PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=threads MSVCDIR=IDE"
+# PROP Rebuild_Opt "clean release"
+# PROP Target_File "Release\tclsh85t.exe"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF  "$(CFG)" == "tcl - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug\tcl_Dynamic"
+# PROP BASE Cmd_Line "nmake -nologo -f makefile.vc OPTS=symbols MSVCDIR=IDE"
+# PROP BASE Rebuild_Opt "-a"
+# PROP BASE Target_File "Debug\tclsh85g.exe"
+# PROP BASE Bsc_Name ""
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug\tcl_Dynamic"
+# PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=threads,symbols MSVCDIR=IDE"
+# PROP Rebuild_Opt "clean release"
+# PROP Target_File "Debug\tclsh85tg.exe"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF  "$(CFG)" == "tcl - Win32 Debug Static"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug\tcl_Static"
+# PROP BASE Cmd_Line "nmake -nologo -f makefile.vc OPTS=symbols,static MSVCDIR=IDE"
+# PROP BASE Rebuild_Opt "-a"
+# PROP BASE Target_File "Debug\tclsh85sg.exe"
+# PROP BASE Bsc_Name ""
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug\tcl_Static"
+# PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=symbols,static MSVCDIR=IDE"
+# PROP Rebuild_Opt "-a"
+# PROP Target_File "Debug\tclsh85sg.exe"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF  "$(CFG)" == "tcl - Win32 Release Static"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release\tcl_Static"
+# PROP BASE Cmd_Line "nmake -nologo -f makefile.vc OPTS=static MSVCDIR=IDE"
+# PROP BASE Rebuild_Opt "-a"
+# PROP BASE Target_File "Release\tclsh85s.exe"
+# PROP BASE Bsc_Name ""
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release\tcl_Static"
+# PROP Cmd_Line "nmake -nologo -f makefile.vc OPTS=static MSVCDIR=IDE"
+# PROP Rebuild_Opt "-a"
+# PROP Target_File "Release\tclsh85s.exe"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ENDIF
+
+# Begin Target
+
+# Name "tcl - Win32 Release"
+# Name "tcl - Win32 Debug"
+# Name "tcl - Win32 Debug Static"
+# Name "tcl - Win32 Release Static"
+
+!IF  "$(CFG)" == "tcl - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "tcl - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "tcl - Win32 Debug Static"
+
+!ELSEIF  "$(CFG)" == "tcl - Win32 Release Static"
+
+!ENDIF
+
+# Begin Group "compat"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\compat\dirent.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\dirent2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\dlfcn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\fixstrtod.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\float.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\gettod.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\limits.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\memcmp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\opendir.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\README
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\stdlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\string.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\strncasecmp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\strstr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\strtod.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\strtol.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\strtoul.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\tclErrno.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\unistd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\compat\waitpid.c
+# End Source File
+# End Group
+# Begin Group "doc"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\doc\Access.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\AddErrInfo.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\after.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Alloc.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\AllowExc.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\append.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\AppInit.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\array.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\AssocData.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Async.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\BackgdErr.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Backslash.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\bgerror.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\binary.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\BoolObj.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\break.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\ByteArrObj.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\CallDel.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\case.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\catch.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\cd.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\ChnlStack.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\clock.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\close.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\CmdCmplt.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Concat.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\concat.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\continue.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\CrtChannel.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\CrtChnlHdlr.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\CrtCloseHdlr.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\CrtCommand.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\CrtFileHdlr.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\CrtInterp.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\CrtMathFnc.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\CrtObjCmd.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\CrtSlave.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\CrtTimerHdlr.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\CrtTrace.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\dde.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\DetachPids.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\DoOneEvent.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\DoubleObj.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\DoWhenIdle.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\DString.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\DumpActiveMemory.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Encoding.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\encoding.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Environment.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\eof.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\error.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Eval.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\eval.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\exec.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Exit.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\exit.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\expr.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\ExprLong.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\ExprLongObj.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\fblocked.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\fconfigure.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\fcopy.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\file.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\fileevent.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\filename.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\FileSystem.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\FindExec.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\flush.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\for.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\foreach.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\format.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\GetCwd.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\GetHostName.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\GetIndex.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\GetInt.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\GetOpnFl.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\gets.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\GetStdChan.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\GetVersion.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\glob.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\global.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Hash.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\history.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\http.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\if.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\incr.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\info.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Init.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\InitStubs.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Interp.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\interp.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\IntObj.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\join.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\lappend.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\library.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\lindex.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\LinkVar.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\linsert.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\list.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\ListObj.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\llength.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\load.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\lrange.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\lreplace.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\lsearch.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\lsort.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\man.macros
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\memory.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\msgcat.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\namespace.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Notifier.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Object.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\ObjectType.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\open.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\OpenFileChnl.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\OpenTcp.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\package.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\packagens.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Panic.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\ParseCmd.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\pid.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\pkgMkIndex.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\PkgRequire.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Preserve.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\PrintDbl.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\proc.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\puts.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\pwd.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\re_syntax.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\read.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\RecEvalObj.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\RecordEval.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\RegExp.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\regexp.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\registry.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\regsub.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\rename.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\return.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\safe.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\SaveResult.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\scan.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\seek.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\set.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\SetErrno.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\SetRecLmt.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\SetResult.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\SetVar.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Signal.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Sleep.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\socket.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\source.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\SourceRCFile.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\split.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\SplitList.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\SplitPath.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\StaticPkg.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\StdChannels.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\string.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\StringObj.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\StrMatch.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\subst.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\SubstObj.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\switch.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Tcl.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Tcl_Main.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\TCL_MEM_DEBUG.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\tclsh.1
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\tcltest.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\tclvars.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\tell.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Thread.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\time.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\ToUpper.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\trace.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\TraceVar.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Translate.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\UniCharIsAlpha.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\unknown.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\unset.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\update.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\uplevel.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\UpVar.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\upvar.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\Utf.3
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\variable.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\vwait.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\while.n
+# End Source File
+# Begin Source File
+
+SOURCE=..\doc\WrongNumArgs.3
+# End Source File
+# End Group
+# Begin Group "generic"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\generic\README
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\regc_color.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\regc_cvec.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\regc_lex.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\regc_locale.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\regc_nfa.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\regcomp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\regcustom.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\rege_dfa.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\regerror.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\regerrs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\regex.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\regexec.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\regfree.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\regfronts.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\regguts.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tcl.decls
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tcl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclAlloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclAsync.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclBasic.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclBinary.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclCkalloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclClock.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclCmdAH.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclCmdIL.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclCmdMZ.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclCompCmds.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclCompExpr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclCompile.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclCompile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclDate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclDecls.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclEncoding.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclEnv.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclEvent.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclExecute.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclFCmd.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclFileName.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclGet.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclGetDate.y
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclHash.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclHistory.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclIndexObj.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclInt.decls
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclInt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclIntDecls.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclInterp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclIntPlatDecls.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclIO.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclIO.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclIOCmd.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclIOGT.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclIOSock.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclIOUtil.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclLink.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclListObj.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclLiteral.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclLoad.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclLoadNone.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclMain.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclNamesp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclNotify.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclObj.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclPanic.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclParse.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclPipe.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclPkg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclPlatDecls.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclPort.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclPosixStr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclPreserve.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclProc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclRegexp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclRegexp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclResolve.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclResult.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclScan.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclStringObj.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclStubInit.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclStubLib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclTest.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclTestObj.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclTestProcBodyObj.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclThread.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclThreadJoin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclThreadTest.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclTimer.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclUniData.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclUtf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclUtil.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\generic\tclVar.c
+# End Source File
+# End Group
+# Begin Group "library"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\library\auto.tcl
+# End Source File
+# Begin Source File
+
+SOURCE=..\library\history.tcl
+# End Source File
+# Begin Source File
+
+SOURCE=..\library\init.tcl
+# End Source File
+# Begin Source File
+
+SOURCE=..\library\ldAout.tcl
+# End Source File
+# Begin Source File
+
+SOURCE=..\library\package.tcl
+# End Source File
+# Begin Source File
+
+SOURCE=..\library\parray.tcl
+# End Source File
+# Begin Source File
+
+SOURCE=..\library\safe.tcl
+# End Source File
+# Begin Source File
+
+SOURCE=..\library\tclIndex
+# End Source File
+# Begin Source File
+
+SOURCE=..\library\word.tcl
+# End Source File
+# End Group
+# Begin Group "mac"
+
+# PROP Default_Filter ""
+# End Group
+# Begin Group "tests"
+
+# PROP Default_Filter ""
+# End Group
+# Begin Group "tools"
+
+# PROP Default_Filter ""
+# End Group
+# Begin Group "unix"
+
+# PROP Default_Filter ""
+# End Group
+# Begin Group "win"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\aclocal.m4
+# End Source File
+# Begin Source File
+
+SOURCE=.\cat.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\configure
+# End Source File
+# Begin Source File
+
+SOURCE=.\configure.in
+# End Source File
+# Begin Source File
+
+SOURCE=.\makefile.bc
+# End Source File
+# Begin Source File
+
+SOURCE=.\Makefile.in
+# End Source File
+# Begin Source File
+
+SOURCE=.\makefile.vc
+# End Source File
+# Begin Source File
+
+SOURCE=.\mkd.bat
+# End Source File
+# Begin Source File
+
+SOURCE=.\README
+# End Source File
+# Begin Source File
+
+SOURCE=.\README.binary
+# End Source File
+# Begin Source File
+
+SOURCE=.\rmd.bat
+# End Source File
+# Begin Source File
+
+SOURCE=.\rules.vc
+# End Source File
+# Begin Source File
+
+SOURCE=.\stub16.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tcl.hpj.in
+# End Source File
+# Begin Source File
+
+SOURCE=.\tcl.m4
+# End Source File
+# Begin Source File
+
+SOURCE=.\tcl.rc
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclAppInit.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclConfig.sh.in
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclsh.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclsh.rc
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWin32Dll.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinChan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinConsole.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinDde.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinError.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinFCmd.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinFile.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinInit.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinInt.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinLoad.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinNotify.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinPipe.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinPort.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinReg.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinSerial.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinSock.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinTest.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinThrd.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinThrd.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tclWinTime.c
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/win/tcl.dsw b/win/tcl.dsw
index fa93b00..1c16fad 100644
--- a/win/tcl.dsw
+++ b/win/tcl.dsw
@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "tcl"=.\tcl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "tcl"=.\tcl.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/win/tcl.hpj.in b/win/tcl.hpj.in
index 0d01f35..8efff0b 100644
--- a/win/tcl.hpj.in
+++ b/win/tcl.hpj.in
@@ -1,19 +1,19 @@
-; This file is maintained by HCW. Do not modify this file directly.
-
-[OPTIONS]
-HCW=0
-LCID=0x409 0x0 0x0 ;English (United States)
-REPORT=Yes
-TITLE=Tcl/Tk Reference Manual
-CNT=tcl85.cnt
-COPYRIGHT=Copyright © 2000 Ajuba Solutions
-HLP=tcl85.hlp
-
-[FILES]
-tcl.rtf
-
-[WINDOWS]
-main="Tcl/Tk Reference Manual",,0
-
-[CONFIG]
-BrowseButtons()
+; This file is maintained by HCW. Do not modify this file directly.
+
+[OPTIONS]
+HCW=0
+LCID=0x409 0x0 0x0 ;English (United States)
+REPORT=Yes
+TITLE=Tcl/Tk Reference Manual
+CNT=tcl85.cnt
+COPYRIGHT=Copyright © 2000 Ajuba Solutions
+HLP=tcl85.hlp
+
+[FILES]
+tcl.rtf
+
+[WINDOWS]
+main="Tcl/Tk Reference Manual",,0
+
+[CONFIG]
+BrowseButtons()
diff --git a/win/tcl.rc b/win/tcl.rc
index d88ca0a..be5e0a7 100644
--- a/win/tcl.rc
+++ b/win/tcl.rc
@@ -48,7 +48,7 @@ BEGIN
             VALUE "LegalCopyright", "Copyright \251 2001 by ActiveState Corporation, et al\0"
             VALUE "ProductName", "Tcl " TCL_VERSION " for Windows\0"
             VALUE "ProductVersion", TCL_PATCH_LEVEL
-        END		    
+        END
     END
     BLOCK "VarFileInfo"
     BEGIN
diff --git a/win/tclConfig.sh.in b/win/tclConfig.sh.in
index 00a8790..75324b2 100644
--- a/win/tclConfig.sh.in
+++ b/win/tclConfig.sh.in
@@ -1,5 +1,5 @@
 # tclConfig.sh --
-# 
+#
 # This shell script (for sh) is generated automatically by Tcl's
 # configure script.  It will create shell variables for most of
 # the configuration options discovered by the configure script.
-- 
cgit v0.12


From 2b81ec85d4b4d92d08dfc31172d8d93c731d0674 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 25 Jun 2015 08:05:18 +0000
Subject: revert unintended change of
 .settings/org.eclipse.core.resources.prefs in previous commit

---
 .settings/org.eclipse.core.resources.prefs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 370ae2c..99f26c0 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,2 @@
 eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
+encoding/<project>=UTF-8
-- 
cgit v0.12


From 14476f18e0076e7262045debdb428e64a353ae43 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Fri, 26 Jun 2015 13:41:31 +0000
Subject: Manpage, callback fail calls bgerror, clean catalog on packagelocale
 unset

---
 changes                   |   4 +
 doc/msgcat.n              | 304 +++++++++++++++++++++++++++++++++++++++++++---
 library/msgcat/msgcat.tcl |  35 ++++--
 3 files changed, 317 insertions(+), 26 deletions(-)
 mode change 100644 => 100755 doc/msgcat.n

diff --git a/changes b/changes
index 16609e7..c4177ca 100755
--- a/changes
+++ b/changes
@@ -8530,3 +8530,7 @@ include ::oo::class (fellows)
         *** POTENTIAL INCOMPATIBILITY ***
 
 --- Released 8.6.4, March 12, 2015 --- http://core.tcl.tk/tcl/ for details
+
+2015-06-25 (TIP 412) msgcat dynamic locale change and package private locale
+=> msgcat 1.6.0
+
diff --git a/doc/msgcat.n b/doc/msgcat.n
old mode 100644
new mode 100755
index bae6dbe..7e46528
--- a/doc/msgcat.n
+++ b/doc/msgcat.n
@@ -13,29 +13,43 @@ msgcat \- Tcl message catalog
 .SH SYNOPSIS
 \fBpackage require Tcl 8.5\fR
 .sp
-\fBpackage require msgcat 1.5\fR
+\fBpackage require msgcat 1.6\fR
 .sp
 \fB::msgcat::mc \fIsrc-string\fR ?\fIarg arg ...\fR?
 .sp
 \fB::msgcat::mcmax ?\fIsrc-string src-string ...\fR?
 .sp
+.VS "TIP 412"
+\fB::msgcat::mcexists\fR ?\fB-exactnamespace\fR? ?\fB-exactlocale\fR? \fIsrc-string\fR
+.VE "TIP 412"
+.sp
 \fB::msgcat::mclocale \fR?\fInewLocale\fR?
 .sp
 \fB::msgcat::mcpreferences\fR
 .sp
+.VS "TIP 412"
+\fB::msgcat::mcloadedlocales subcommand\fR ?\fIlocale\fR?
+.VE "TIP 412"
+.sp
 \fB::msgcat::mcload \fIdirname\fR
 .sp
 \fB::msgcat::mcset \fIlocale src-string \fR?\fItranslate-string\fR?
 .sp
 \fB::msgcat::mcmset \fIlocale src-trans-list\fR
 .sp
-.VS "TIP 404"
 \fB::msgcat::mcflset \fIsrc-string \fR?\fItranslate-string\fR?
 .sp
 \fB::msgcat::mcflmset \fIsrc-trans-list\fR
-.VE "TIP 404"
 .sp
 \fB::msgcat::mcunknown \fIlocale src-string\fR ?\fIarg arg ...\fR?
+.sp
+.VS "TIP 412"
+\fB::msgcat::mcpackagelocale subcommand\fR ?\fIlocale\fR?
+.sp
+\fB::msgcat::mcpackageconfig subcommand\fR \fIoption\fR ?\fIvalue\fR?
+.sp
+\fB::msgcat::mcforgetpackage\fR
+.VE "TIP 412"
 .BE
 .SH DESCRIPTION
 .PP
@@ -46,18 +60,23 @@ Text strings are defined in a
 which is independent from the application, and
 which can be edited or localized without modifying
 the application source code.  New languages
-or locales are provided by adding a new file to
+or locales may be provided by adding a new file to
 the message catalog.
 .PP
-Use of the message catalog is optional by any application
-or package, but is encouraged if the application or package
-wishes to be enabled for multi-lingual applications.
+\fBmsgcat\fR distinguises packages by its namespace.
+Each package has its own message catalog and configuration settings in \fBmsgcat\fR.
+.PP
+A \fIlocale\fR is a specification string describing a user language like \fBde_ch\fR for Swiss German.
+In \fBmsgcat\fR, there is a global locale initialized by the system locale of the current system.
+Each package may decide to use the global locale or to use a package specific locale.
+.PP
+The global locale may be changed on demand, for example by a user initiated language change or within a multi user application like a web server.
 .SH COMMANDS
 .TP
 \fB::msgcat::mc \fIsrc-string\fR ?\fIarg arg ...\fR?
 .
 Returns a translation of \fIsrc-string\fR according to the
-user's current locale.  If additional arguments past \fIsrc-string\fR
+current locale.  If additional arguments past \fIsrc-string\fR
 are given, the \fBformat\fR command is used to substitute the
 additional arguments in the translation of \fIsrc-string\fR.
 .RS
@@ -84,6 +103,18 @@ of the longest translated string.  This is useful when designing
 localized GUIs, which may require that all buttons, for example, be a
 fixed width (which will be the width of the widest button).
 .TP
+\fB::msgcat::mcexists\fR ?\fB-exactnamespace\fR? ?\fB-exactlocale\fR? \fIsrc-string\fR
+.
+.VS "TIP 412"
+Return true, if there is a translation for the given \fIsrc-string\fR.
+.PP
+.RS
+The search may be limited by the option \fB\-exactnamespace\fR to only check the current namespace and not any parent namespaces.
+.PP
+It may also be limited by the option \fB\-exactlocale\fR to only check the first prefered locale (e.g. first element returned by \fB::msgcat::mcpreferences\fR if global locale is used).
+.RE
+.VE "TIP 412"
+.TP
 \fB::msgcat::mclocale \fR?\fInewLocale\fR?
 .
 This function sets the locale to \fInewLocale\fR.  If \fInewLocale\fR
@@ -93,6 +124,13 @@ case-insensitive manner, and returns locales in lowercase.
 The initial locale is determined by the locale specified in
 the user's environment.  See \fBLOCALE SPECIFICATION\fR
 below for a description of the locale string format.
+.RS
+.PP
+.VS "TIP 412"
+If the locale is set, the preference list of locales is evaluated.
+Locales in this list are loaded now, if not jet loaded.
+.VE "TIP 412"
+.RE
 .TP
 \fB::msgcat::mcpreferences\fR
 .
@@ -103,13 +141,26 @@ preference.  The list is derived from the current
 locale set in msgcat by \fB::msgcat::mclocale\fR, and
 cannot be set independently.  For example, if the
 current locale is en_US_funky, then \fB::msgcat::mcpreferences\fR
-returns \fB{en_US_funky en_US en {}}\fR.
+returns \fB{en_us_funky en_us en {}}\fR.
+.TP
+\fB::msgcat:mcloadedlocales subcommand\fR ?\fIlocale\fR?
+.
+This group of commands manage the list of loaded locales for packages not setting a package locale.
+.PP
+.RS
+The subcommand \fBget\fR returns the list of currently loaded locales.
+.PP
+The subcommand \fBpresent\fR requires the argument \fIlocale\fR and returns true, if this locale is loaded.
+.PP
+The subcommand \fBclear\fR removes all locales and their data, which are not in the current preference list.
+.RE
 .TP
 \fB::msgcat::mcload \fIdirname\fR
 .
+.VS "TIP 412"
 Searches the specified directory for files that match
-the language specifications returned by \fB::msgcat::mcpreferences\fR
-(note that these are all lowercase), extended by the file extension
+the language specifications returned by \fB::msgcat::mcloadedlocales get\fR
+(or \fBmsgcat::mcpackagelocale preferences\fR if a package locale is set) (note that these are all lowercase), extended by the file extension
 .QW .msg .
 Each matching file is
 read in order, assuming a UTF-8 encoding.  The file contents are
@@ -118,6 +169,11 @@ may be present in the message file either directly in their UTF-8
 encoded form, or by use of the backslash-u quoting recognized by Tcl
 evaluation.  The number of message files which matched the specification
 and were loaded is returned.
+.RS
+.PP
+In addition, the given folder is stored in the \fBmsgcat\fR package configuration option \fImcfolder\fR to eventually load message catalog files required by a locale change.
+.VE "TIP 412"
+.RE
 .TP
 \fB::msgcat::mcset \fIlocale src-string \fR?\fItranslate-string\fR?
 .
@@ -138,16 +194,13 @@ faster than multiple invocations of \fB::msgcat::mcset\fR. The function
 returns the number of translations set.
 .TP
 \fB::msgcat::mcflset \fIsrc-string \fR?\fItranslate-string\fR?
-.VS "TIP 404"
 Sets the translation for \fIsrc-string\fR to \fItranslate-string\fR in the
 current namespace for the locale implied by the name of the message catalog
 being loaded via \fB::msgcat::mcload\fR.  If \fItranslate-string\fR is not
 specified, \fIsrc-string\fR is used for both.  The function returns
 \fItranslate-string\fR.
-.VE "TIP 404"
 .TP
 \fB::msgcat::mcflmset \fIsrc-trans-list\fR
-.VS "TIP 404"
 Sets the translation for multiple source strings in \fIsrc-trans-list\fR in
 the current namespace for the locale implied by the name of the message
 catalog being loaded via \fB::msgcat::mcload\fR. \fIsrc-trans-list\fR must
@@ -155,7 +208,6 @@ have an even number of elements and is in the form {\fIsrc-string
 translate-string\fR ?\fIsrc-string translate-string ...\fR?}
 \fB::msgcat::mcflmset\fR can be significantly faster than multiple invocations
 of \fB::msgcat::mcflset\fR. The function returns the number of translations set.
-.VE "TIP 404"
 .TP
 \fB::msgcat::mcunknown \fIlocale src-string\fR ?\fIarg arg ...\fR?
 .
@@ -168,7 +220,18 @@ application, for example to log error messages for each unknown
 string.  The \fB::msgcat::mcunknown\fR procedure is invoked at the
 same stack context as the call to \fB::msgcat::mc\fR.  The return value
 of \fB::msgcat::mcunknown\fR is used as the return value for the call
-to \fB::msgcat::mc\fR.  
+to \fB::msgcat::mc\fR.
+.VS "TIP 412"
+.RS
+.PP
+Note that this routine is only called if the concerned package did not set a package locale unknown command name.
+.RE
+.TP
+\fB::msgcat::mcforgetpackage\fR
+.
+The calling package clears all its state within the \fBmsgcat\fR package including all settings and translations.
+.VE "TIP 412"
+.PP
 .SH "LOCALE SPECIFICATION"
 .PP
 The locale is specified to \fBmsgcat\fR by a locale string
@@ -217,15 +280,15 @@ When a locale is specified by the user, a
 search is performed during string translation.  For example, if a user
 specifies
 en_GB_Funky, the locales
-.QW en_GB_Funky ,
-.QW en_GB ,
+.QW en_gb_funky ,
+.QW en_gb ,
 .QW en
 and
 .MT
 (the empty string)
 are searched in order until a matching translation
 string is found.  If no translation string is available, then
-\fB::msgcat::mcunknown\fR is called.
+the unknown handler is called.
 .SH "NAMESPACES AND MESSAGE CATALOGS"
 .PP
 Strings stored in the message catalog are stored relative
@@ -373,6 +436,209 @@ formatting substitution is done directly.
 # ... where that key is mapped to one of the
 # human-oriented versions by \fBmsgcat::mcset\fR
 .CE
+.VS "TIP 412"
+.SH Package private locale
+.PP
+A package using \fBmsgcat\fR may choose to use its own package private
+locale and its own set of loaded locales, independent to the global
+locale set by \fB::msgcat::mclocale\fR.
+.PP
+This allows a package to change its locale without causing any locales load or removal in other packages and not to invoke the global locale change callback (see below).
+.PP
+This action is controled by the following ensemble:
+.TP
+\fB::msgcat::mcpackagelocale set\fR ?\fIlocale\fR?
+.
+Set or change a package private locale.
+The package private locale is set to the given \fIlocale\fR if the \fIlocale\fR is given.
+If the option \fIlocale\fR is not given, the package is set to package private locale mode, but no locale is changed (e.g. if the global locale was valid for the package before, it is copied to the package private locale).
+.PP
+.RS
+This command may cause the load of locales.
+.RE
+.TP
+\fB::msgcat::mcpackagelocale get\fR
+.
+Return the package private locale or the global locale, if no package private locale is set.
+.TP
+\fB::msgcat::mcpackagelocale preferences\fR
+.
+Return the package private preferences or the global preferences,
+if no package private locale is set.
+.TP
+\fB::msgcat::mcpackagelocale loaded\fR
+.
+Return the list of locales loaded for this package.
+.TP
+\fB::msgcat::mcpackagelocale isset\fR
+.
+Returns true, if a package private locale is set.
+.TP
+\fB::msgcat::mcpackagelocale unset\fR
+.
+Unset the package private locale and use the globale locale.
+Load and remove locales to adjust the list of loaded locales for the
+package to the global loaded locales list.
+.TP
+\fB::msgcat::mcpackagelocale present\fR \fIlocale\fR
+.
+Returns true, if the given locale is loaded for the package.
+.TP
+\fB::msgcat::mcpackagelocale clear\fR
+.
+Clear any loaded locales of the package not present in the package preferences.
+.PP
+.SH Changing package options
+.PP
+Each package using msgcat has a set of options within \fBmsgcat\fR.
+The package options are described in the next sectionPackage options.
+Each package option may be set or unset individually using the following ensemble:
+.TP
+\fB::msgcat::mcpackageconfig get\fR \fIoption\fR
+.
+Return the current value of the given \fIoption\fR.
+This call returns an error if the option is not set for the package.
+.TP
+\fB::msgcat::mcpackageconfig isset\fR \fIoption\fR
+.
+Returns 1, if the given \fIoption\fR is set for the package, 0 otherwise.
+.TP
+\fB::msgcat::mcpackageconfig set\fR \fIoption\fR \fIvalue\fR
+.
+Set the given \fIoption\fR to the given \fIvalue\fR.
+This may invoke additional actions in dependency of the \fIoption\fR.
+The return value is 0 or the number of loaded packages for the option \fBmcfolder\fR.
+.TP
+\fB::msgcat::mcpackageconfig unset\fR \fIoption\fR
+.
+Unsets the given \fIoption\fR for the package.
+No action is taken if the \fIoption\fR is not set for the package.
+The empty string is returned.
+.SS Package options
+.PP
+The following package options are available for each package:
+.TP
+\fBmcfolder\fR
+.
+This is the message folder of the package. This option is set by mcload and by the subcommand set. Both are identical and both return the number of loaded message catalog files.
+.RS
+.PP
+Setting or changing this value will load all locales contained in the preferences valid for the package. This implies also to invoke any set loadcmd (see below).
+.PP
+Unsetting this value will disable message file load for the package.
+.RE
+.TP
+\fBloadcmd\fR
+.
+This callback is invoked before a set of message catalog files are loaded for the package which has this property set.
+.PP
+.RS
+This callback may be used to do any preparation work for message file load or to get the message data from another source like a data base. In this case, no message files are used (mcfolder is unset).
+.PP
+See section \fBcallback invocation\fR below.
+The parameter list appended to this callback is the list of locales to load.
+.PP
+If this callback is changed, it is called with the preferences valid for the package.
+.RE
+.TP
+\fBchangecmd\fR
+.
+This callback is invoked when a default local change was performed. Its purpose is to allow a package to update any dependency on the default locale like showing the GUI in another language.
+.PP
+.RS
+See the callback invocation section below.
+The parameter list appended to this callback is \fBmcpreferences\fR.
+The registered callbacks are invoked in no particular order.
+.RE
+.TP
+\fBunknowncmd\fR
+.
+Use a package locale mcunknown procedure instead of the standard version supplied by the msgcat package (msgcat::mcunknown).
+.PP
+.RS
+The called procedure must return the formatted message which will finally be returned by msgcat::mc.
+.PP
+A generic unknown handler is used if set to the empty string. This consists in returning the key if no arguments are given. With given arguments, format is used to process the arguments.
+.PP
+See section \fBcallback invocation\fR below.
+The appended arguments are identical to \fB::msgcat::mcunknown\fR.
+.RE
+.SS Callback invocation
+A package may decide to register one or multiple callbacks, as described above.
+.PP
+Callbacks are invoked, if:
+.PP
+1. the callback command is set,
+.PP
+2. the command is not the empty string,
+.PP
+3. the registering namespace exists.
+.PP
+If a called routine fails with an error, the \fBbgerror\fR routine for the interpreter is invoked after command completion.
+Only exception is the callback \fBunknowncmd\fR, where an error causes the invoking \fBmc\fR-command to fail with that error.
+.PP
+.SS Examples
+Packages which display a GUI may update their widgets when the global locale changes.
+To register to a callback, use:
+.CS
+namespace eval gui {
+    msgcat::mcpackageconfig changecmd updateGUI
+
+    proc updateGui args {
+        puts "New locale is '[lindex $args 0]'."
+    }
+}
+% msgcat::mclocale fr
+fr
+% New locale is 'fr'.
+.CE
+.PP
+If locales (or additional locales) are contained in another source like a data base, a package may use the load callback and not mcload:
+.CS
+namespace eval db {
+    msgcat::mcpackageconfig loadcmd loadMessages
+
+    proc loadMessages args {
+        foreach locale $args {
+            if {[LocaleInDB $locale]} {
+                msgcat::mcmset $locale [GetLocaleList $locale]
+            }
+        }
+    }
+}
+.CE
+.PP
+The \fBclock\fR command implementation uses \fBmsgcat\fR with a package locale to implement the command line parameter \fB-locale\fR.
+Here are some sketches of the implementation:
+.PP
+First, a package locale is initialized and the generic unknown function is desactivated:
+.CS
+msgcat::mcpackagelocale set
+msgcat::mcpackageconfig unknowncmd ""
+.CE
+As an example, the user requires the week day in a certain locale as follows:
+.CS
+clock format clock seconds -format %A -locale fr
+.CE
+\fBclock\fR sets the package locale to \fBfr\fR and looks for the day name as follows:
+.CS
+msgcat::mcpackagelocale set $locale
+return [lindex [msgcat::mc DAYS_OF_WEEK_FULL] $day]
+### Returns "mercredi"
+.CE
+Within \fBclock\fR, some message-catalog items are heavy in computation and thus are dynamically cached using:
+.CS
+proc ::tcl::clock::LocalizeFormat { locale format } {
+    set key FORMAT_$format
+    if { [::msgcat::mcexists -exactlocale -exactnamespace $key] } {
+        return [mc $key]
+    }
+    #...expensive computation of format clipped...
+    mcset $locale $key $format
+    return $format
+}
+.CE
+.VE "TIP 412"
 .SH CREDITS
 .PP
 The message catalog code was developed by Mark Harrison.
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index 228ac97..8bef081 100755
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -4,6 +4,7 @@
 #	message catalog facility for Tcl programs.  It should be
 #	loaded with the command "package require msgcat".
 #
+# Copyright (c) 2010-2015 by Harald Oehlmann.
 # Copyright (c) 1998-2000 by Ajuba Solutions.
 # Copyright (c) 1998 by Mark Harrison.
 #
@@ -217,7 +218,7 @@ proc msgcat::mc {src args} {
     }
     # call package local or default unknown command
     set args [linsert $args 0 [lindex $loclist 0] $src]
-    switch -exact -- [Invoke unknowncmd $args $ns result] {
+    switch -exact -- [Invoke unknowncmd $args $ns result 1] {
 	0 { return [uplevel 1 [linsert $args 0 [namespace origin mcunknown]]] }
 	1 { return [DefaultUnknown {*}$args] }
 	default { return $result }
@@ -469,7 +470,7 @@ proc msgcat::mcpackagelocale {subcommand {locale ""}} {
 	loaded { return [PackageLocales $ns] }
 	isset {	return [dict exists $PackageConfig loclist $ns] }
 	set {	# set a package locale or add a package locale
-		
+
 	    # Copy the default locale if no package locale set so far
 	    if {![dict exists $PackageConfig loclist $ns]} {
 		dict set PackageConfig loclist $ns $Loclist
@@ -511,15 +512,24 @@ proc msgcat::mcpackagelocale {subcommand {locale ""}} {
 	    }
 	}
 	unset {	# unset package locale and restore default locales
-	    
+
 	    if { ![dict exists $PackageConfig loclist $ns] } { return }
-	    
+
 	    # unset package locale
 	    set loadLocales [ListComplement\
 		    [dict get $PackageConfig loadedlocales $ns] $LoadedLocales]
 	    dict unset PackageConfig loadedlocales $ns
 	    dict unset PackageConfig loclist $ns
 
+	    # unset keys not in global loaded locales
+	    if {[dict exists $Msgs $ns]} {
+		foreach locale [dict keys [dict get $Msgs $ns]] {
+		    if {$locale ni $LoadedLocales} {
+			dict unset Msgs $ns $locale
+		    }
+		}
+	    }
+
 	    # Add missing locales
 	    Load $ns $loadLocales
 	}
@@ -848,15 +858,17 @@ proc msgcat::Load {ns locales {callbackonly 0}} {
 #			If not given or empty, check all registered packages.
 #	resultname	Variable to save the callback result of the last called
 #			callback to. May be set to "" to discard the result.
+#	failerror (0)	Fail on error if true. Otherwise call bgerror.
 #
 # Results:
 #	Possible values:
 #	- 0: no valid command registered
 #	- 1: registered command was the empty string
 #	- 2: registered command called, resultname is set
+#	- 3: registered command failed
 #	If multiple commands are called, the maximum of all results is returned.
 
-proc msgcat::Invoke {index arglist {ns ""} {resultname ""}} {
+proc msgcat::Invoke {index arglist {ns ""} {resultname ""} {failerror 0}} {
     variable PackageConfig
     variable Config
     if {"" ne $resultname} {
@@ -874,8 +886,17 @@ proc msgcat::Invoke {index arglist {ns ""} {resultname ""}} {
 	    if {"" eq $cmd} {
 		if {$ret == 0} {set ret 1}
 	    } else {
-		set result [namespace inscope $ns $cmd {*}$arglist]
-		set ret 2
+		if {$failerror} {
+		    set result [namespace inscope $ns $cmd {*}$arglist]
+		    set ret 2
+		} elseif {1 == [catch {
+		    set result [namespace inscope $ns $cmd {*}$arglist]
+		    if {$ret < 2} {set ret 2}
+		} err derr]} {
+		    after idle [concat [::interp bgerror ""]\
+			    [list $err $derr]]
+		    set ret 3
+		}
 	    }
 	}
     }
-- 
cgit v0.12


From 52f920ba571f8037fea360dbc653364c054e2138 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Fri, 26 Jun 2015 15:16:34 +0000
Subject: Tests for mcexists and mcloadedlocales

---
 library/msgcat/msgcat.tcl |  2 +-
 tests/msgcat.test         | 95 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index 8bef081..0991f1c 100755
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -248,7 +248,7 @@ proc msgcat::mcexists {args} {
     set ns [uplevel 1 [list ::namespace current]]
     set loclist [PackagePreferences $ns]
 
-    while {[llength $args] > 1} {
+    while {[llength $args] != 1} {
 	set args [lassign $args option]
 	switch -glob -- $option {
 	    -exactnamespace { set exactnamespace 1 }
diff --git a/tests/msgcat.test b/tests/msgcat.test
index 8fd94e1..e7c84a2 100755
--- a/tests/msgcat.test
+++ b/tests/msgcat.test
@@ -32,6 +32,8 @@ namespace eval ::msgcat::test {
 
     # Tests msgcat-0.*: locale initialization
 
+    # Calculate set of all permutations of a list
+    # PowerSet {1 2 3} -> {1 2 3} {2 3} {1 3} 3 {1 2} 2 1 {}
     proc PowerSet {l} {
 	if {[llength $l] == 0} {return [list [list]]}
 	set element [lindex $l 0]
@@ -666,6 +668,99 @@ namespace eval ::msgcat::test {
     removeDirectory msgdir2
     removeDirectory msgdir3
 
+    # Tests msgcat-9.*: [mcexists]
+
+	test msgcat-9.1 {mcexists no parameter} -body {
+	    mcexists
+	} -returnCodes 1\
+	-result {wrong # args: should be "mcexists ?-exactnamespace? ?-exactlocale? src"}
+    
+	test msgcat-9.2 {mcexists unknown option} -body {
+	    mcexists -unknown src 
+	} -returnCodes 1\
+	-result {unknown option "-unknown"}
+    
+	test msgcat-9.3 {mcexists} -setup {
+	    mcforgetpackage
+	    variable locale [mclocale]
+	    mclocale foo
+	    mcset foo k1 v1
+	} -cleanup {
+	    mclocale $locale
+	} -body {
+	    list [mcexists k1] [mcexists k2]
+	} -result {1 0}
+
+	test msgcat-9.4 {mcexists descendent preference} -setup {
+	    mcforgetpackage
+	    variable locale [mclocale]
+	    mclocale foo_bar
+	    mcset foo k1 v1
+	} -cleanup {
+	    mclocale $locale
+	} -body {
+	    list [mcexists k1] [mcexists -exactlocale k1]
+	} -result {1 0}
+    
+	test msgcat-9.5 {mcexists parent namespace} -setup {
+	    mcforgetpackage
+	    variable locale [mclocale]
+	    mclocale foo_bar
+	    mcset foo k1 v1
+	} -cleanup {
+	    mclocale $locale
+	} -body {
+	    namespace eval ::msgcat::test::sub {
+		list [::msgcat::mcexists k1]\
+			[::msgcat::mcexists -exactnamespace k1]
+	    }
+	} -result {1 0}
+    
+    # Tests msgcat-10.*: [mcloadedlocales]
+
+	test msgcat-10.1 {mcloadedlocales no arg} -body {
+	    mcloadedlocales
+	} -returnCodes 1\
+	-result {wrong # args: should be "mcloadedlocales subcommand"}
+    
+	test msgcat-10.2 {mcloadedlocales wrong subcommand} -body {
+	    mcloadedlocales junk
+	} -returnCodes 1\
+	-result {unknown subcommand "junk": must be clear, or loaded}
+    
+	test msgcat-10.3 {mcloadedlocales loaded} -setup {
+	    mcforgetpackage
+	    variable locale [mclocale]
+	    mclocale {}
+	    mcloadedlocales clear
+	} -cleanup {
+	    mclocale $locale
+	} -body {
+	    mclocale foo_bar
+	    set resultlist [mcloadedlocales loaded]
+	    # The result is position independent so check length and existence
+	    list [llength $resultlist] [expr {"" in $resultlist}]\
+		    [expr {"foo" in $resultlist}]\
+		    [expr {"foo_bar" in $resultlist}]
+	} -result {3 1 1 1}
+    
+	test msgcat-10.4 {mcloadedlocales clear} -setup {
+	    mcforgetpackage
+	    variable locale [mclocale]
+	    mclocale {}
+	    mcloadedlocales clear
+	} -cleanup {
+	    mclocale $locale
+	} -body {
+	    mclocale foo
+	    mcset foo k1 v1
+	    set res [mcexists k1]
+	    mclocale ""
+	    mcloadedlocales clear
+	    mclocale foo
+	    lappend res [mcexists k1]
+	} -result {1 0}
+    
     cleanupTests
 }
 namespace delete ::msgcat::test
-- 
cgit v0.12


From b87531a583772da053cd7c702155734a7fae2f9d Mon Sep 17 00:00:00 2001
From: venkat <venkat@comit.com>
Date: Sun, 28 Jun 2015 01:54:06 +0000
Subject: Summary: Update to tzdata2015e from ietf.org

---
 library/tzdata/Africa/Casablanca |  45 +++++-----
 library/tzdata/Africa/El_Aaiun   |  45 +++++-----
 library/tzdata/America/Cayman    | 177 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 216 insertions(+), 51 deletions(-)

diff --git a/library/tzdata/Africa/Casablanca b/library/tzdata/Africa/Casablanca
index 224e5c2..33ad99b 100644
--- a/library/tzdata/Africa/Casablanca
+++ b/library/tzdata/Africa/Casablanca
@@ -42,42 +42,40 @@ set TZData(:Africa/Casablanca) {
     {1406944800 3600 1 WEST}
     {1414288800 0 0 WET}
     {1427594400 3600 1 WEST}
-    {1434160800 0 0 WET}
-    {1437184800 3600 1 WEST}
+    {1434247200 0 0 WET}
+    {1437271200 3600 1 WEST}
     {1445738400 0 0 WET}
     {1459044000 3600 1 WEST}
-    {1465005600 0 0 WET}
-    {1468029600 3600 1 WEST}
+    {1465092000 0 0 WET}
+    {1468116000 3600 1 WEST}
     {1477792800 0 0 WET}
     {1490493600 3600 1 WEST}
-    {1495245600 0 0 WET}
-    {1498874400 3600 1 WEST}
+    {1495332000 0 0 WET}
+    {1498960800 3600 1 WEST}
     {1509242400 0 0 WET}
     {1521943200 3600 1 WEST}
-    {1526090400 0 0 WET}
-    {1529114400 3600 1 WEST}
+    {1526176800 0 0 WET}
+    {1529200800 3600 1 WEST}
     {1540692000 0 0 WET}
     {1553997600 3600 1 WEST}
-    {1556935200 0 0 WET}
-    {1559959200 3600 1 WEST}
+    {1557021600 0 0 WET}
+    {1560045600 3600 1 WEST}
     {1572141600 0 0 WET}
     {1585447200 3600 1 WEST}
-    {1587175200 0 0 WET}
-    {1590804000 3600 1 WEST}
+    {1587261600 0 0 WET}
+    {1590285600 3600 1 WEST}
     {1603591200 0 0 WET}
     {1616896800 3600 1 WEST}
-    {1618020000 0 0 WET}
-    {1621044000 3600 1 WEST}
+    {1618106400 0 0 WET}
+    {1621130400 3600 1 WEST}
     {1635645600 0 0 WET}
-    {1648346400 3600 1 WEST}
-    {1648864800 0 0 WET}
-    {1651888800 3600 1 WEST}
+    {1651975200 3600 1 WEST}
     {1667095200 0 0 WET}
-    {1682128800 3600 1 WEST}
+    {1682215200 3600 1 WEST}
     {1698544800 0 0 WET}
-    {1712973600 3600 1 WEST}
+    {1713060000 3600 1 WEST}
     {1729994400 0 0 WET}
-    {1743818400 3600 1 WEST}
+    {1743904800 3600 1 WEST}
     {1761444000 0 0 WET}
     {1774749600 3600 1 WEST}
     {1792893600 0 0 WET}
@@ -98,13 +96,12 @@ set TZData(:Africa/Casablanca) {
     {2026951200 3600 1 WEST}
     {2045700000 0 0 WET}
     {2058400800 3600 1 WEST}
-    {2077063200 0 0 WET}
-    {2077153200 0 0 WET}
+    {2077149600 0 0 WET}
     {2090455200 3600 1 WEST}
-    {2107908000 0 0 WET}
+    {2107994400 0 0 WET}
     {2108602800 0 0 WET}
     {2121904800 3600 1 WEST}
-    {2138752800 0 0 WET}
+    {2138234400 0 0 WET}
     {2140052400 0 0 WET}
     {2153354400 3600 1 WEST}
     {2172103200 0 0 WET}
diff --git a/library/tzdata/Africa/El_Aaiun b/library/tzdata/Africa/El_Aaiun
index 3a5c934..77e149e 100644
--- a/library/tzdata/Africa/El_Aaiun
+++ b/library/tzdata/Africa/El_Aaiun
@@ -31,42 +31,40 @@ set TZData(:Africa/El_Aaiun) {
     {1406944800 3600 1 WEST}
     {1414288800 0 0 WET}
     {1427594400 3600 1 WEST}
-    {1434160800 0 0 WET}
-    {1437184800 3600 1 WEST}
+    {1434247200 0 0 WET}
+    {1437271200 3600 1 WEST}
     {1445738400 0 0 WET}
     {1459044000 3600 1 WEST}
-    {1465005600 0 0 WET}
-    {1468029600 3600 1 WEST}
+    {1465092000 0 0 WET}
+    {1468116000 3600 1 WEST}
     {1477792800 0 0 WET}
     {1490493600 3600 1 WEST}
-    {1495245600 0 0 WET}
-    {1498874400 3600 1 WEST}
+    {1495332000 0 0 WET}
+    {1498960800 3600 1 WEST}
     {1509242400 0 0 WET}
     {1521943200 3600 1 WEST}
-    {1526090400 0 0 WET}
-    {1529114400 3600 1 WEST}
+    {1526176800 0 0 WET}
+    {1529200800 3600 1 WEST}
     {1540692000 0 0 WET}
     {1553997600 3600 1 WEST}
-    {1556935200 0 0 WET}
-    {1559959200 3600 1 WEST}
+    {1557021600 0 0 WET}
+    {1560045600 3600 1 WEST}
     {1572141600 0 0 WET}
     {1585447200 3600 1 WEST}
-    {1587175200 0 0 WET}
-    {1590804000 3600 1 WEST}
+    {1587261600 0 0 WET}
+    {1590285600 3600 1 WEST}
     {1603591200 0 0 WET}
     {1616896800 3600 1 WEST}
-    {1618020000 0 0 WET}
-    {1621044000 3600 1 WEST}
+    {1618106400 0 0 WET}
+    {1621130400 3600 1 WEST}
     {1635645600 0 0 WET}
-    {1648346400 3600 1 WEST}
-    {1648864800 0 0 WET}
-    {1651888800 3600 1 WEST}
+    {1651975200 3600 1 WEST}
     {1667095200 0 0 WET}
-    {1682128800 3600 1 WEST}
+    {1682215200 3600 1 WEST}
     {1698544800 0 0 WET}
-    {1712973600 3600 1 WEST}
+    {1713060000 3600 1 WEST}
     {1729994400 0 0 WET}
-    {1743818400 3600 1 WEST}
+    {1743904800 3600 1 WEST}
     {1761444000 0 0 WET}
     {1774749600 3600 1 WEST}
     {1792893600 0 0 WET}
@@ -87,13 +85,12 @@ set TZData(:Africa/El_Aaiun) {
     {2026951200 3600 1 WEST}
     {2045700000 0 0 WET}
     {2058400800 3600 1 WEST}
-    {2077063200 0 0 WET}
-    {2077153200 0 0 WET}
+    {2077149600 0 0 WET}
     {2090455200 3600 1 WEST}
-    {2107908000 0 0 WET}
+    {2107994400 0 0 WET}
     {2108602800 0 0 WET}
     {2121904800 3600 1 WEST}
-    {2138752800 0 0 WET}
+    {2138234400 0 0 WET}
     {2140052400 0 0 WET}
     {2153354400 3600 1 WEST}
     {2172103200 0 0 WET}
diff --git a/library/tzdata/America/Cayman b/library/tzdata/America/Cayman
index 92ce5e2..5231ca9 100644
--- a/library/tzdata/America/Cayman
+++ b/library/tzdata/America/Cayman
@@ -1,5 +1,176 @@
 # created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(America/Panama)]} {
-    LoadTimeZoneFile America/Panama
+
+set TZData(:America/Cayman) {
+    {-9223372036854775808 -19532 0 LMT}
+    {-2524502068 -18431 0 KMT}
+    {-1827687169 -18000 0 EST}
+    {1451624400 -18000 0 EST}
+    {1457852400 -14400 1 EDT}
+    {1478412000 -18000 0 EST}
+    {1489302000 -14400 1 EDT}
+    {1509861600 -18000 0 EST}
+    {1520751600 -14400 1 EDT}
+    {1541311200 -18000 0 EST}
+    {1552201200 -14400 1 EDT}
+    {1572760800 -18000 0 EST}
+    {1583650800 -14400 1 EDT}
+    {1604210400 -18000 0 EST}
+    {1615705200 -14400 1 EDT}
+    {1636264800 -18000 0 EST}
+    {1647154800 -14400 1 EDT}
+    {1667714400 -18000 0 EST}
+    {1678604400 -14400 1 EDT}
+    {1699164000 -18000 0 EST}
+    {1710054000 -14400 1 EDT}
+    {1730613600 -18000 0 EST}
+    {1741503600 -14400 1 EDT}
+    {1762063200 -18000 0 EST}
+    {1772953200 -14400 1 EDT}
+    {1793512800 -18000 0 EST}
+    {1805007600 -14400 1 EDT}
+    {1825567200 -18000 0 EST}
+    {1836457200 -14400 1 EDT}
+    {1857016800 -18000 0 EST}
+    {1867906800 -14400 1 EDT}
+    {1888466400 -18000 0 EST}
+    {1899356400 -14400 1 EDT}
+    {1919916000 -18000 0 EST}
+    {1930806000 -14400 1 EDT}
+    {1951365600 -18000 0 EST}
+    {1962860400 -14400 1 EDT}
+    {1983420000 -18000 0 EST}
+    {1994310000 -14400 1 EDT}
+    {2014869600 -18000 0 EST}
+    {2025759600 -14400 1 EDT}
+    {2046319200 -18000 0 EST}
+    {2057209200 -14400 1 EDT}
+    {2077768800 -18000 0 EST}
+    {2088658800 -14400 1 EDT}
+    {2109218400 -18000 0 EST}
+    {2120108400 -14400 1 EDT}
+    {2140668000 -18000 0 EST}
+    {2152162800 -14400 1 EDT}
+    {2172722400 -18000 0 EST}
+    {2183612400 -14400 1 EDT}
+    {2204172000 -18000 0 EST}
+    {2215062000 -14400 1 EDT}
+    {2235621600 -18000 0 EST}
+    {2246511600 -14400 1 EDT}
+    {2267071200 -18000 0 EST}
+    {2277961200 -14400 1 EDT}
+    {2298520800 -18000 0 EST}
+    {2309410800 -14400 1 EDT}
+    {2329970400 -18000 0 EST}
+    {2341465200 -14400 1 EDT}
+    {2362024800 -18000 0 EST}
+    {2372914800 -14400 1 EDT}
+    {2393474400 -18000 0 EST}
+    {2404364400 -14400 1 EDT}
+    {2424924000 -18000 0 EST}
+    {2435814000 -14400 1 EDT}
+    {2456373600 -18000 0 EST}
+    {2467263600 -14400 1 EDT}
+    {2487823200 -18000 0 EST}
+    {2499318000 -14400 1 EDT}
+    {2519877600 -18000 0 EST}
+    {2530767600 -14400 1 EDT}
+    {2551327200 -18000 0 EST}
+    {2562217200 -14400 1 EDT}
+    {2582776800 -18000 0 EST}
+    {2593666800 -14400 1 EDT}
+    {2614226400 -18000 0 EST}
+    {2625116400 -14400 1 EDT}
+    {2645676000 -18000 0 EST}
+    {2656566000 -14400 1 EDT}
+    {2677125600 -18000 0 EST}
+    {2688620400 -14400 1 EDT}
+    {2709180000 -18000 0 EST}
+    {2720070000 -14400 1 EDT}
+    {2740629600 -18000 0 EST}
+    {2751519600 -14400 1 EDT}
+    {2772079200 -18000 0 EST}
+    {2782969200 -14400 1 EDT}
+    {2803528800 -18000 0 EST}
+    {2814418800 -14400 1 EDT}
+    {2834978400 -18000 0 EST}
+    {2846473200 -14400 1 EDT}
+    {2867032800 -18000 0 EST}
+    {2877922800 -14400 1 EDT}
+    {2898482400 -18000 0 EST}
+    {2909372400 -14400 1 EDT}
+    {2929932000 -18000 0 EST}
+    {2940822000 -14400 1 EDT}
+    {2961381600 -18000 0 EST}
+    {2972271600 -14400 1 EDT}
+    {2992831200 -18000 0 EST}
+    {3003721200 -14400 1 EDT}
+    {3024280800 -18000 0 EST}
+    {3035775600 -14400 1 EDT}
+    {3056335200 -18000 0 EST}
+    {3067225200 -14400 1 EDT}
+    {3087784800 -18000 0 EST}
+    {3098674800 -14400 1 EDT}
+    {3119234400 -18000 0 EST}
+    {3130124400 -14400 1 EDT}
+    {3150684000 -18000 0 EST}
+    {3161574000 -14400 1 EDT}
+    {3182133600 -18000 0 EST}
+    {3193023600 -14400 1 EDT}
+    {3213583200 -18000 0 EST}
+    {3225078000 -14400 1 EDT}
+    {3245637600 -18000 0 EST}
+    {3256527600 -14400 1 EDT}
+    {3277087200 -18000 0 EST}
+    {3287977200 -14400 1 EDT}
+    {3308536800 -18000 0 EST}
+    {3319426800 -14400 1 EDT}
+    {3339986400 -18000 0 EST}
+    {3350876400 -14400 1 EDT}
+    {3371436000 -18000 0 EST}
+    {3382930800 -14400 1 EDT}
+    {3403490400 -18000 0 EST}
+    {3414380400 -14400 1 EDT}
+    {3434940000 -18000 0 EST}
+    {3445830000 -14400 1 EDT}
+    {3466389600 -18000 0 EST}
+    {3477279600 -14400 1 EDT}
+    {3497839200 -18000 0 EST}
+    {3508729200 -14400 1 EDT}
+    {3529288800 -18000 0 EST}
+    {3540178800 -14400 1 EDT}
+    {3560738400 -18000 0 EST}
+    {3572233200 -14400 1 EDT}
+    {3592792800 -18000 0 EST}
+    {3603682800 -14400 1 EDT}
+    {3624242400 -18000 0 EST}
+    {3635132400 -14400 1 EDT}
+    {3655692000 -18000 0 EST}
+    {3666582000 -14400 1 EDT}
+    {3687141600 -18000 0 EST}
+    {3698031600 -14400 1 EDT}
+    {3718591200 -18000 0 EST}
+    {3730086000 -14400 1 EDT}
+    {3750645600 -18000 0 EST}
+    {3761535600 -14400 1 EDT}
+    {3782095200 -18000 0 EST}
+    {3792985200 -14400 1 EDT}
+    {3813544800 -18000 0 EST}
+    {3824434800 -14400 1 EDT}
+    {3844994400 -18000 0 EST}
+    {3855884400 -14400 1 EDT}
+    {3876444000 -18000 0 EST}
+    {3887334000 -14400 1 EDT}
+    {3907893600 -18000 0 EST}
+    {3919388400 -14400 1 EDT}
+    {3939948000 -18000 0 EST}
+    {3950838000 -14400 1 EDT}
+    {3971397600 -18000 0 EST}
+    {3982287600 -14400 1 EDT}
+    {4002847200 -18000 0 EST}
+    {4013737200 -14400 1 EDT}
+    {4034296800 -18000 0 EST}
+    {4045186800 -14400 1 EDT}
+    {4065746400 -18000 0 EST}
+    {4076636400 -14400 1 EDT}
+    {4097196000 -18000 0 EST}
 }
-set TZData(:America/Cayman) $TZData(:America/Panama)
-- 
cgit v0.12


From 352740916d2d2dea3a3c684445c25eb3cb190144 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Mon, 29 Jun 2015 21:26:24 +0000
Subject: Added tests for mcforgetpackage, mcpackagelocale and mcpackageconfig

---
 library/msgcat/msgcat.tcl |   7 +-
 tests/msgcat.test         | 329 ++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 323 insertions(+), 13 deletions(-)

diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index 0991f1c..5ed9f3a 100755
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -468,8 +468,9 @@ proc msgcat::mcpackagelocale {subcommand {locale ""}} {
 	get { return [lindex [PackagePreferences $ns] 0] }
 	preferences { return [PackagePreferences $ns] }
 	loaded { return [PackageLocales $ns] }
-	isset {	return [dict exists $PackageConfig loclist $ns] }
-	set {	# set a package locale or add a package locale
+	present { return [expr {$locale in [PackageLocales $ns]} ]}
+	isset { return [dict exists $PackageConfig loclist $ns] }
+	set { # set a package locale or add a package locale
 
 	    # Copy the default locale if no package locale set so far
 	    if {![dict exists $PackageConfig loclist $ns]} {
@@ -667,7 +668,7 @@ proc msgcat::mcpackageconfig {subcommand option {value ""}} {
 	}
 	default {
 	    return -code error "unknown subcommand \"$subcommand\":\
-		    must be get, isset, unset, or set"
+		    must be get, isset, set, or unset"
 	}
     }
     return
diff --git a/tests/msgcat.test b/tests/msgcat.test
index e7c84a2..6b965d1 100755
--- a/tests/msgcat.test
+++ b/tests/msgcat.test
@@ -435,8 +435,8 @@ namespace eval ::msgcat::test {
 	    mclocale foo_BAR_notexist
 	} -cleanup {
 	    mclocale $locale
-	    ::msgcat::mcloadedlocales clear
-	    ::msgcat::mcpackageconfig unset mcfolder 
+	    mcloadedlocales clear
+	    mcpackageconfig unset mcfolder 
 	} -body {
 	    mcload $msgdir
 	} -result 3
@@ -446,8 +446,8 @@ namespace eval ::msgcat::test {
 	    mclocale no_FI_notexist
 	} -cleanup {
 	    mclocale $locale
-	    ::msgcat::mcloadedlocales clear
-	    ::msgcat::mcpackageconfig unset mcfolder 
+	    mcloadedlocales clear
+	    mcpackageconfig unset mcfolder 
 	} -body {
 	    mcload $msgdir
 	} -result 1
@@ -508,6 +508,20 @@ namespace eval ::msgcat::test {
 	    mc def
 	} -result unknown:no_fi_notexist:def
 
+	test msgcat-5.11 {mcpackageconfig mcfolder} -setup {
+	    variable locale [mclocale]
+	    mclocale ""
+	    mcloadedlocales clear
+	    mcpackageconfig unset mcfolder
+	} -cleanup {
+	    mclocale $locale
+	    mcloadedlocales clear
+	    mcpackageconfig unset mcfolder 
+	} -body {
+	    mclocale foo
+	    mcpackageconfig set mcfolder $msgdir
+	} -result 2
+
     foreach loc $locales {
 	if { $loc eq {} } {
 	    set msg ROOT
@@ -737,12 +751,9 @@ namespace eval ::msgcat::test {
 	    mclocale $locale
 	} -body {
 	    mclocale foo_bar
-	    set resultlist [mcloadedlocales loaded]
-	    # The result is position independent so check length and existence
-	    list [llength $resultlist] [expr {"" in $resultlist}]\
-		    [expr {"foo" in $resultlist}]\
-		    [expr {"foo_bar" in $resultlist}]
-	} -result {3 1 1 1}
+	    # The result is position independent so sort
+	    set resultlist [lsort [mcloadedlocales loaded]]
+	} -result {{} foo foo_bar}
     
 	test msgcat-10.4 {mcloadedlocales clear} -setup {
 	    mcforgetpackage
@@ -760,7 +771,305 @@ namespace eval ::msgcat::test {
 	    mclocale foo
 	    lappend res [mcexists k1]
 	} -result {1 0}
+
+    # Tests msgcat-11.*: [mcforgetpackage]
+
+	test msgcat-11.1 {mcforgetpackage translation} -setup {
+	    variable locale [mclocale]
+	} -cleanup {
+	    mclocale $locale
+	} -body {
+	    mclocale foo
+	    mcset foo k1 v1
+	    set res [mcexists k1]
+	    mcforgetpackage
+	    lappend res [mcexists k1]
+	} -result {1 0}
+
+	test msgcat-11.2 {mcforgetpackage locale} -setup {
+	    variable locale [mclocale]
+	} -cleanup {
+	    mclocale $locale
+	} -body {
+	    mclocale foo
+	    mcpackagelocale set bar
+	    set res [mcpackagelocale get]
+	    mcforgetpackage
+	    lappend res [mcpackagelocale get]
+	} -result {bar foo}
+
+	test msgcat-11.3 {mcforgetpackage options} -body {
+	    mcpackageconfig set loadcmd ""
+	    set res [mcpackageconfig isset loadcmd]
+	    mcforgetpackage
+	    lappend res [mcpackageconfig isset loadcmd]
+	} -result {1 0}
+
+    # Tests msgcat-12.*: [mcpackagelocale]
+
+	test msgcat-12.1 {mcpackagelocale no subcommand} -body {
+	    mcpackagelocale
+	} -returnCodes 1\
+	-result {wrong # args: should be "mcpackagelocale subcommand ?locale?"}
+
+	test msgcat-12.2 {mclpackagelocale wrong subcommand} -body {
+	    mcpackagelocale junk
+	} -returnCodes 1\
+	-result {unknown subcommand "junk": must be clear, get, isset, loaded, present, set, or unset}
+
+	test msgcat-12.3 {mcpackagelocale set} -setup {
+	    variable locale [mclocale]
+	} -cleanup {
+	    mclocale $locale
+	    mcforgetpackage
+	} -body {
+	    mclocale foo
+	    mcpackagelocale set bar
+	    list [mcpackagelocale get] [mclocale]
+	} -result {bar foo}
+
+	test msgcat-12.4 {mcpackagelocale get} -setup {
+	    variable locale [mclocale]
+	} -cleanup {
+	    mclocale $locale
+	    mcforgetpackage
+	} -body {
+	    mclocale foo
+	    set res [mcpackagelocale get]
+	    mcpackagelocale set bar
+	    lappend res [mcpackagelocale get]
+	} -result {foo bar}
+
+	test msgcat-12.5 {mcpackagelocale preferences} -setup {
+	    variable locale [mclocale]
+	} -cleanup {
+	    mclocale $locale
+	    mcforgetpackage
+	} -body {
+	    mclocale foo
+	    set res [list [mcpackagelocale preferences]]
+	    mcpackagelocale set bar
+	    lappend res [mcpackagelocale preferences]
+	} -result {{foo {}} {bar {}}}
+
+	test msgcat-12.6 {mcpackagelocale loaded} -setup {
+	    variable locale [mclocale]
+	} -cleanup {
+	    mclocale $locale
+	    mcforgetpackage
+	} -body {
+	    mclocale ""
+	    mcloadedlocales clear
+	    mclocale foo
+	    # The result is position independent so sort
+	    set res [list [lsort [mcpackagelocale loaded]]]
+	    mcpackagelocale set bar
+	    lappend res [lsort [mcpackagelocale loaded]]
+	} -result {{{} foo} {{} bar foo}}
+
+	test msgcat-12.7 {mcpackagelocale isset} -setup {
+	    variable locale [mclocale]
+	} -cleanup {
+	    mclocale $locale
+	    mcforgetpackage
+	} -body {
+	    mclocale foo
+	    set res [mcpackagelocale isset]
+	    mcpackagelocale set bar
+	    lappend res [mcpackagelocale isset]
+	} -result {0 1}
+
+	test msgcat-12.8 {mcpackagelocale unset} -setup {
+	    variable locale [mclocale]
+	} -cleanup {
+	    mclocale $locale
+	    mcforgetpackage
+	} -body {
+	    mcpackagelocale set bar
+	    set res [mcpackagelocale isset]
+	    mcpackagelocale unset
+	    lappend res [mcpackagelocale isset]
+	} -result {1 0}
+
+	test msgcat-12.9 {mcpackagelocale present} -setup {
+	    variable locale [mclocale]
+	} -cleanup {
+	    mclocale $locale
+	    mcforgetpackage
+	} -body {
+	    mclocale ""
+	    mcloadedlocales clear
+	    mclocale foo
+	    set res [mcpackagelocale present foo]
+	    lappend res [mcpackagelocale present bar]
+	    mcpackagelocale set bar
+	    lappend res [mcpackagelocale present foo]\
+		    [mcpackagelocale present bar]
+	} -result {1 0 1 1}
+
+	test msgcat-12.10 {mcpackagelocale clear} -setup {
+	    variable locale [mclocale]
+	} -cleanup {
+	    mclocale $locale
+	    mcforgetpackage
+	} -body {
+	    mclocale ""
+	    mcloadedlocales clear
+	    mclocale foo
+	    mcpackagelocale set bar
+	    mcpackagelocale clear
+	    list [mcpackagelocale present foo] [mcpackagelocale present bar]
+	} -result {0 1}
+
+    # Tests msgcat-13.*: [mcpackageconfig subcmds]
+
+	test msgcat-13.1 {mcpackageconfig no subcommand} -body {
+	    mcpackageconfig
+	} -returnCodes 1\
+	-result {wrong # args: should be "mcpackageconfig subcommand option ?value?"}
+
+	test msgcat-13.2 {mclpackageconfig wrong subcommand} -body {
+	    mcpackageconfig junk mcfolder
+	} -returnCodes 1\
+	-result {unknown subcommand "junk": must be get, isset, set, or unset}
+
+	test msgcat-13.3 {mclpackageconfig wrong option} -body {
+	    mcpackageconfig get junk
+	} -returnCodes 1\
+	-result {bad option "junk": must be mcfolder, loadcmd, changecmd, or unknowncmd}
+
+	test msgcat-13.4 {mcpackageconfig get} -setup {
+	    mcforgetpackage
+	} -cleanup {
+	    mcforgetpackage
+	} -body {
+	    mcpackageconfig set loadcmd ""
+	    mcpackageconfig get loadcmd
+	} -result {}
+
+	test msgcat-13.5 {mcpackageconfig (is/un)set} -setup {
+	    mcforgetpackage
+	} -cleanup {
+	    mcforgetpackage
+	} -body {
+	    set res [mcpackageconfig isset loadcmd]
+	    lappend res [mcpackageconfig set loadcmd ""]
+	    lappend res [mcpackageconfig isset loadcmd]
+	    mcpackageconfig unset loadcmd
+	    lappend res [mcpackageconfig isset loadcmd]
+	} -result {0 0 1 0}
+
+    # option mcfolder is already tested with 5.11
+    
+    # Tests msgcat-14.*: callbacks: loadcmd, changecmd, unknowncmd
+    
+    # This routine is used as bgerror and by direct callback invocation
+    proc callbackproc args {
+	variable resultvariable
+	set resultvariable $args
+    }
+    proc callbackfailproc args {
+	return -code error fail
+    }
+    set bgerrorsaved [interp bgerror {}]
+    interp bgerror {} [namespace code callbackproc]
     
+	test msgcat-14.1 {invokation loadcmd} -setup {
+	    mcforgetpackage
+    	    mclocale $locale
+	    mclocale ""
+	    mcloadedlocales clear
+	    set resultvariable ""
+	} -cleanup {
+	    mcforgetpackage
+	} -body {
+	    mcpackageconfig set loadcmd [namespace code callbackproc]
+	    mclocale foo_bar
+	    lsort $resultvariable
+	} -result {foo foo_bar}
+
+	test msgcat-14.2 {invokation failed in loadcmd} -setup {
+	    mcforgetpackage
+    	    mclocale $locale
+	    mclocale ""
+	    mcloadedlocales clear
+	} -cleanup {
+	    mcforgetpackage
+	} -body {
+	    mcpackageconfig set loadcmd [namespace code callbackfailproc]
+	    mclocale foo_bar
+	    # let the bgerror run
+	    after 100 set [namespace current]::resultvariable timeout
+	    vwait [namespace current]::resultvariable
+	    lassign $resultvariable err errdict
+	    list $err [dict get $errdict -code]
+	} -result {fail 1}
+
+	test msgcat-14.3 {invokation changecmd} -setup {
+	    mcforgetpackage
+    	    mclocale $locale
+	    mclocale ""
+	    set resultvariable ""
+	} -cleanup {
+	    mcforgetpackage
+	} -body {
+	    mcpackageconfig set changecmd [namespace code callbackproc]
+	    mclocale foo_bar
+	    set resultvariable
+	} -result {foo_bar foo {}}
+
+	test msgcat-14.4 {invokation unknowncmd} -setup {
+	    mcforgetpackage
+    	    mclocale $locale
+	    mclocale ""
+	    mcloadedlocales clear
+	    set resultvariable ""
+	} -cleanup {
+	    mcforgetpackage
+	} -body {
+	    mcpackageconfig set unknowncmd [namespace code callbackproc]
+	    mclocale foo_bar
+	    mc k1 p1
+	    set resultvariable
+	} -result {foo_bar k1 p1}
+
+	test msgcat-14.5 {disable global unknowncmd} -setup {
+	    mcforgetpackage
+    	    mclocale $locale
+	    mclocale ""
+	    mcloadedlocales clear
+	    set resultvariable ""
+	    rename ::msgcat::mcunknown SavedMcunknown
+	    proc ::msgcat::mcunknown {dom s} {
+		return unknown:$dom:$s
+	    }
+	} -cleanup {
+	    mcforgetpackage
+	    rename ::msgcat::mcunknown {}
+	    rename SavedMcunknown ::msgcat::mcunknown
+	} -body {
+	    mcpackageconfig set unknowncmd ""
+	    mclocale foo_bar
+	    mc k1%s p1
+	} -result {k1p1}
+
+	test msgcat-14.6 {unknowncmd failing} -setup {
+	    mcforgetpackage
+    	    mclocale $locale
+	    mclocale ""
+	    mcloadedlocales clear
+	    set resultvariable ""
+	} -cleanup {
+	    mcforgetpackage
+	} -body {
+	    mcpackageconfig set unknowncmd [namespace code callbackfailproc]
+	    mclocale foo_bar
+	    mc k1
+	} -returnCodes 1\
+	-result {fail}
+
+    interp bgerror {} $bgerrorsaved
+
     cleanupTests
 }
 namespace delete ::msgcat::test
-- 
cgit v0.12


From 63aa9512546de9e36e832048adb643ce1cbe7bb1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 30 Jun 2015 08:10:15 +0000
Subject: Use twoPtrValue in stead of ptrAndLongRep for implementation of some
 internal Obj types. On most platforms this doesn't make a difference, as
 (void *) and (long) generially have the same size. The only exception where
 it makes a difference is win64, as we can now store 64 bits in this field in
 stead of only 32 bits, exactly what the processor is optimized for.

---
 generic/tcl.h        | 12 ++++++------
 generic/tclCompile.c | 16 +++++++---------
 generic/tclExecute.c | 15 +++++++--------
 generic/tclObj.c     | 31 +++++++++++++++----------------
 generic/tclProc.c    | 25 ++++++++++---------------
 generic/tclVar.c     | 33 ++++++++++++++++-----------------
 6 files changed, 61 insertions(+), 71 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index 93aba96..f0d7c9a 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -818,16 +818,16 @@ typedef struct Tcl_Obj {
 	double doubleValue;	/*   - a double-precision floating value. */
 	void *otherValuePtr;	/*   - another, type-specific value. */
 	Tcl_WideInt wideValue;	/*   - a long long value. */
-	struct {		/*   - internal rep as two pointers. */
+	struct {		/*   - internal rep as two pointers.
+				 *     the main use of which is a bignum's
+				 *     tightly packed fields, where the alloc,
+				 *     used and signum flags are packed into
+				 *     ptr2 with everything else hung off ptr1. */
 	    void *ptr1;
 	    void *ptr2;
 	} twoPtrValue;
 	struct {		/*   - internal rep as a pointer and a long,
-				 *     the main use of which is a bignum's
-				 *     tightly packed fields, where the alloc,
-				 *     used and signum flags are packed into a
-				 *     single word with everything else hung
-				 *     off the pointer. */
+	                       not used internally any more. */
 	    void *ptr;
 	    unsigned long value;
 	} ptrAndLongRep;
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 0f4dfaf..a552f39 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -978,8 +978,7 @@ FreeByteCodeInternalRep(
     register ByteCode *codePtr = objPtr->internalRep.twoPtrValue.ptr1;
 
     objPtr->typePtr = NULL;
-    codePtr->refCount--;
-    if (codePtr->refCount <= 0) {
+    if (codePtr->refCount-- < 2) {
 	TclCleanupByteCode(codePtr);
     }
 }
@@ -1295,8 +1294,8 @@ CompileSubstObj(
     if (objPtr->typePtr == &substCodeType) {
 	Namespace *nsPtr = iPtr->varFramePtr->nsPtr;
 
-	codePtr = objPtr->internalRep.ptrAndLongRep.ptr;
-	if ((unsigned long)flags != objPtr->internalRep.ptrAndLongRep.value
+	codePtr = objPtr->internalRep.twoPtrValue.ptr1;
+	if (flags != PTR2INT(objPtr->internalRep.twoPtrValue.ptr2)
 		|| ((Interp *) *codePtr->interpHandle != iPtr)
 		|| (codePtr->compileEpoch != iPtr->compileEpoch)
 		|| (codePtr->nsPtr != nsPtr)
@@ -1322,8 +1321,8 @@ CompileSubstObj(
 	TclFreeCompileEnv(&compEnv);
 
 	codePtr = objPtr->internalRep.twoPtrValue.ptr1;
-	objPtr->internalRep.ptrAndLongRep.ptr = codePtr;
-	objPtr->internalRep.ptrAndLongRep.value = flags;
+	objPtr->internalRep.twoPtrValue.ptr1 = codePtr;
+	objPtr->internalRep.twoPtrValue.ptr2 = INT2PTR(flags);
 	if (iPtr->varFramePtr->localCachePtr) {
 	    codePtr->localCachePtr = iPtr->varFramePtr->localCachePtr;
 	    codePtr->localCachePtr->refCount++;
@@ -1362,11 +1361,10 @@ static void
 FreeSubstCodeInternalRep(
     register Tcl_Obj *objPtr)	/* Object whose internal rep to free. */
 {
-    register ByteCode *codePtr = objPtr->internalRep.ptrAndLongRep.ptr;
+    register ByteCode *codePtr = objPtr->internalRep.twoPtrValue.ptr1;
 
     objPtr->typePtr = NULL;
-    codePtr->refCount--;
-    if (codePtr->refCount <= 0) {
+    if (codePtr->refCount-- < 2) {
 	TclCleanupByteCode(codePtr);
     }
 }
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 4a6c009..5b053a6 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -198,14 +198,14 @@ typedef struct TEBCdata {
 	if (auxObjList) {					\
 	    objPtr->length += auxObjList->length;		\
 	}							\
-	objPtr->internalRep.ptrAndLongRep.ptr = auxObjList;	\
+	objPtr->internalRep.twoPtrValue.ptr1 = auxObjList;	\
 	auxObjList = objPtr;					\
     } while (0)
 
 #define POP_TAUX_OBJ() \
     do {							\
 	tmpPtr = auxObjList;					\
-	auxObjList = tmpPtr->internalRep.ptrAndLongRep.ptr;	\
+	auxObjList = tmpPtr->internalRep.twoPtrValue.ptr1;	\
 	Tcl_DecrRefCount(tmpPtr);				\
     } while (0)
 
@@ -1649,8 +1649,7 @@ FreeExprCodeInternalRep(
     ByteCode *codePtr = objPtr->internalRep.twoPtrValue.ptr1;
 
     objPtr->typePtr = NULL;
-    codePtr->refCount--;
-    if (codePtr->refCount <= 0) {
+    if (codePtr->refCount-- < 2) {
 	TclCleanupByteCode(codePtr);
     }
 }
@@ -2858,7 +2857,7 @@ TEBCresume(
 	 */
 
 	TclNewObj(objPtr);
-	objPtr->internalRep.ptrAndLongRep.value = CURR_DEPTH;
+	objPtr->internalRep.twoPtrValue.ptr2 = INT2PTR(CURR_DEPTH);
 	objPtr->length = 0;
 	PUSH_TAUX_OBJ(objPtr);
 	TRACE(("=> mark depth as %d\n", (int) CURR_DEPTH));
@@ -2872,7 +2871,7 @@ TEBCresume(
 	 */
 
 	CLANG_ASSERT(auxObjList);
-	objc = CURR_DEPTH - auxObjList->internalRep.ptrAndLongRep.value;
+	objc = CURR_DEPTH - PTR2INT(auxObjList->internalRep.twoPtrValue.ptr2);
 	POP_TAUX_OBJ();
 #ifdef TCL_COMPILE_DEBUG
 	/* Ugly abuse! */
@@ -2973,7 +2972,7 @@ TEBCresume(
 
     case INST_INVOKE_EXPANDED:
 	CLANG_ASSERT(auxObjList);
-	objc = CURR_DEPTH - auxObjList->internalRep.ptrAndLongRep.value;
+	objc = CURR_DEPTH - PTR2INT(auxObjList->internalRep.twoPtrValue.ptr2);
 	POP_TAUX_OBJ();
 	if (objc) {
 	    pcAdjustment = 1;
@@ -8066,7 +8065,7 @@ TEBCresume(
 	while (auxObjList) {
 	    if ((catchTop != initCatchTop)
 		    && (*catchTop > (ptrdiff_t)
-			auxObjList->internalRep.ptrAndLongRep.value)) {
+			auxObjList->internalRep.twoPtrValue.ptr2)) {
 		break;
 	    }
 	    POP_TAUX_OBJ();
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 9caca72..80a3e31 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -180,26 +180,26 @@ static Tcl_ThreadDataKey pendingObjDataKey;
     if ((bignum).used > 0x7fff) {                                       \
 	mp_int *temp = (void *) ckalloc((unsigned) sizeof(mp_int));     \
 	*temp = bignum;                                                 \
-	(objPtr)->internalRep.ptrAndLongRep.ptr = temp;                 \
-	(objPtr)->internalRep.ptrAndLongRep.value = (unsigned long)(-1); \
+	(objPtr)->internalRep.twoPtrValue.ptr1 = temp;                 \
+	(objPtr)->internalRep.twoPtrValue.ptr2 = INT2PTR(-1); \
     } else {                                                            \
 	if ((bignum).alloc > 0x7fff) {                                  \
 	    mp_shrink(&(bignum));                                       \
 	}                                                               \
-	(objPtr)->internalRep.ptrAndLongRep.ptr = (void *) (bignum).dp; \
-	(objPtr)->internalRep.ptrAndLongRep.value = ( ((bignum).sign << 30) \
+	(objPtr)->internalRep.twoPtrValue.ptr1 = (void *) (bignum).dp; \
+	(objPtr)->internalRep.twoPtrValue.ptr2 = INT2PTR( ((bignum).sign << 30) \
 		| ((bignum).alloc << 15) | ((bignum).used));            \
     }
 
 #define UNPACK_BIGNUM(objPtr, bignum) \
-    if ((objPtr)->internalRep.ptrAndLongRep.value == (unsigned long)(-1)) { \
-	(bignum) = *((mp_int *) ((objPtr)->internalRep.ptrAndLongRep.ptr)); \
+    if ((objPtr)->internalRep.twoPtrValue.ptr2 == INT2PTR(-1)) { \
+	(bignum) = *((mp_int *) ((objPtr)->internalRep.twoPtrValue.ptr1)); \
     } else {                                                            \
-	(bignum).dp = (objPtr)->internalRep.ptrAndLongRep.ptr;          \
-	(bignum).sign = (objPtr)->internalRep.ptrAndLongRep.value >> 30; \
+	(bignum).dp = (objPtr)->internalRep.twoPtrValue.ptr1;          \
+	(bignum).sign = PTR2INT((objPtr)->internalRep.twoPtrValue.ptr2) >> 30; \
 	(bignum).alloc =                                                \
-		((objPtr)->internalRep.ptrAndLongRep.value >> 15) & 0x7fff; \
-	(bignum).used = (objPtr)->internalRep.ptrAndLongRep.value & 0x7fff; \
+		(PTR2INT((objPtr)->internalRep.twoPtrValue.ptr2) >> 15) & 0x7fff; \
+	(bignum).used = PTR2INT((objPtr)->internalRep.twoPtrValue.ptr2) & 0x7fff; \
     }
 
 /*
@@ -3181,8 +3181,8 @@ FreeBignum(
 
     UNPACK_BIGNUM(objPtr, toFree);
     mp_clear(&toFree);
-    if ((long) objPtr->internalRep.ptrAndLongRep.value < 0) {
-	ckfree(objPtr->internalRep.ptrAndLongRep.ptr);
+    if (PTR2INT(objPtr->internalRep.twoPtrValue.ptr2) < 0) {
+	ckfree(objPtr->internalRep.twoPtrValue.ptr1);
     }
     objPtr->typePtr = NULL;
 }
@@ -3393,8 +3393,8 @@ GetBignumFromObj(
 		mp_init_copy(bignumValue, &temp);
 	    } else {
 		UNPACK_BIGNUM(objPtr, *bignumValue);
-		objPtr->internalRep.ptrAndLongRep.ptr = NULL;
-		objPtr->internalRep.ptrAndLongRep.value = 0;
+		objPtr->internalRep.twoPtrValue.ptr1 = NULL;
+		objPtr->internalRep.twoPtrValue.ptr2 = NULL;
 		objPtr->typePtr = NULL;
 		if (objPtr->bytes == NULL) {
 		    TclInitStringRep(objPtr, tclEmptyStringRep, 0);
@@ -4288,8 +4288,7 @@ FreeCmdNameInternalRep(
 	 * there are no more uses, free the ResolvedCmdName structure.
 	 */
 
-	resPtr->refCount--;
-	if (resPtr->refCount == 0) {
+	if (resPtr->refCount-- == 1) {
 	    /*
 	     * Now free the cached command, unless it is still in its hash
 	     * table or if there are other references to it from other cmdName
diff --git a/generic/tclProc.c b/generic/tclProc.c
index e0d6ec7..6ffbd90 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -69,9 +69,9 @@ const Tcl_ObjType tclProcBodyType = {
 };
 
 /*
- * The [upvar]/[uplevel] level reference type. Uses the ptrAndLongRep field,
+ * The [upvar]/[uplevel] level reference type. Uses the twoPtrValue field,
  * encoding the type of level reference in ptr and the actual parsed out
- * offset in value.
+ * offset in ptr2.
  *
  * Uses the default behaviour throughout, and never disposes of the string
  * rep; it's just a cache type.
@@ -823,10 +823,10 @@ TclObjGetFrame(
 
     name = TclGetString(objPtr);
     if (objPtr->typePtr == &levelReferenceType) {
-	if (objPtr->internalRep.ptrAndLongRep.ptr != NULL) {
-	    level = curLevel - objPtr->internalRep.ptrAndLongRep.value;
+	if (objPtr->internalRep.twoPtrValue.ptr1) {
+	    level = curLevel - PTR2INT(objPtr->internalRep.twoPtrValue.ptr2);
 	} else {
-	    level = objPtr->internalRep.ptrAndLongRep.value;
+	    level = PTR2INT(objPtr->internalRep.twoPtrValue.ptr2);
 	}
 	if (level < 0) {
 	    goto levelError;
@@ -848,14 +848,12 @@ TclObjGetFrame(
 
 	/*
 	 * Cache for future reference.
-	 *
-	 * TODO: Use the new ptrAndLongRep intrep
 	 */
 
 	TclFreeIntRep(objPtr);
 	objPtr->typePtr = &levelReferenceType;
-	objPtr->internalRep.ptrAndLongRep.ptr = NULL;
-	objPtr->internalRep.ptrAndLongRep.value = level;
+	objPtr->internalRep.twoPtrValue.ptr1 = (void *) 0;
+	objPtr->internalRep.twoPtrValue.ptr2 = INT2PTR(level);
     } else if (isdigit(UCHAR(*name))) { /* INTL: digit */
 	if (Tcl_GetInt(interp, name, &level) != TCL_OK) {
 	    return -1;
@@ -863,14 +861,12 @@ TclObjGetFrame(
 
 	/*
 	 * Cache for future reference.
-	 *
-	 * TODO: Use the new ptrAndLongRep intrep
 	 */
 
 	TclFreeIntRep(objPtr);
 	objPtr->typePtr = &levelReferenceType;
-	objPtr->internalRep.ptrAndLongRep.ptr = (void *) 1; /* non-NULL */
-	objPtr->internalRep.ptrAndLongRep.value = level;
+	objPtr->internalRep.twoPtrValue.ptr1 = (void *) 1;
+	objPtr->internalRep.twoPtrValue.ptr2 = INT2PTR(level);
 	level = curLevel - level;
     } else {
 	/*
@@ -2450,8 +2446,7 @@ FreeLambdaInternalRep(
     Proc *procPtr = objPtr->internalRep.twoPtrValue.ptr1;
     Tcl_Obj *nsObjPtr = objPtr->internalRep.twoPtrValue.ptr2;
 
-    procPtr->refCount--;
-    if (procPtr->refCount == 0) {
+    if (procPtr->refCount-- == 1) {
 	TclProcCleanupProc(procPtr);
     }
     TclDecrRefCount(nsObjPtr);
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 0228a2c..8fb89cd 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -215,9 +215,9 @@ static Tcl_SetFromAnyProc	PanicOnSetVarName;
  * Types of Tcl_Objs used to cache variable lookups.
  *
  * localVarName - INTERNALREP DEFINITION:
- *   ptrAndLongRep.ptr:   pointer to name obj in varFramePtr->localCache
+ *   twoPtrValue.ptr1:   pointer to name obj in varFramePtr->localCache
  *			  or NULL if it is this same obj
- *   ptrAndLongRep.value: index into locals table
+ *   twoPtrValue.ptr2: index into locals table
  *
  * nsVarName - INTERNALREP DEFINITION:
  *   twoPtrValue.ptr1:	pointer to the namespace containing the reference
@@ -579,7 +579,7 @@ TclObjLookupVarEx(
 	int localIndex;
 
     localVarNameTypeHandling:
-	localIndex = (int) part1Ptr->internalRep.ptrAndLongRep.value;
+	localIndex = PTR2INT(part1Ptr->internalRep.twoPtrValue.ptr2);
 	if (HasLocalVars(varFramePtr)
 		&& !(flags & (TCL_GLOBAL_ONLY | TCL_NAMESPACE_ONLY))
 		&& (localIndex < varFramePtr->numCompiledLocals)) {
@@ -587,7 +587,7 @@ TclObjLookupVarEx(
 	     * Use the cached index if the names coincide.
 	     */
 
-	    Tcl_Obj *namePtr = part1Ptr->internalRep.ptrAndLongRep.ptr;
+	    Tcl_Obj *namePtr = part1Ptr->internalRep.twoPtrValue.ptr1;
 	    Tcl_Obj *checkNamePtr = localName(iPtr->varFramePtr, localIndex);
 
 	    if ((!namePtr && (checkNamePtr == part1Ptr)) ||
@@ -774,14 +774,14 @@ TclObjLookupVarEx(
 
 	part1Ptr->typePtr = &localVarNameType;
 	if (part1Ptr != localName(iPtr->varFramePtr, index)) {
-	    part1Ptr->internalRep.ptrAndLongRep.ptr =
+	    part1Ptr->internalRep.twoPtrValue.ptr1 =
 		    localName(iPtr->varFramePtr, index);
 	    Tcl_IncrRefCount((Tcl_Obj *)
-		    part1Ptr->internalRep.ptrAndLongRep.ptr);
+		    part1Ptr->internalRep.twoPtrValue.ptr1);
 	} else {
-	    part1Ptr->internalRep.ptrAndLongRep.ptr = NULL;
+	    part1Ptr->internalRep.twoPtrValue.ptr1 = NULL;
 	}
-	part1Ptr->internalRep.ptrAndLongRep.value = (long) index;
+	part1Ptr->internalRep.twoPtrValue.ptr2 = INT2PTR(index);
 #if ENABLE_NS_VARNAME_CACHING
     } else if (index > -3) {
 	/*
@@ -5663,16 +5663,16 @@ PanicOnSetVarName(
  * localVarName -
  *
  * INTERNALREP DEFINITION:
- *   ptrAndLongRep.ptr:   pointer to name obj in varFramePtr->localCache
+ *   twoPtrValue.ptr1:   pointer to name obj in varFramePtr->localCache
  *			  or NULL if it is this same obj
- *   ptrAndLongRep.value: index into locals table
+ *   twoPtrValue.ptr2: index into locals table
  */
 
 static void
 FreeLocalVarName(
     Tcl_Obj *objPtr)
 {
-    Tcl_Obj *namePtr = objPtr->internalRep.ptrAndLongRep.ptr;
+    Tcl_Obj *namePtr = objPtr->internalRep.twoPtrValue.ptr1;
 
     if (namePtr) {
 	Tcl_DecrRefCount(namePtr);
@@ -5685,16 +5685,16 @@ DupLocalVarName(
     Tcl_Obj *srcPtr,
     Tcl_Obj *dupPtr)
 {
-    Tcl_Obj *namePtr = srcPtr->internalRep.ptrAndLongRep.ptr;
+    Tcl_Obj *namePtr = srcPtr->internalRep.twoPtrValue.ptr1;
 
     if (!namePtr) {
 	namePtr = srcPtr;
     }
-    dupPtr->internalRep.ptrAndLongRep.ptr = namePtr;
+    dupPtr->internalRep.twoPtrValue.ptr1 = namePtr;
     Tcl_IncrRefCount(namePtr);
 
-    dupPtr->internalRep.ptrAndLongRep.value =
-	    srcPtr->internalRep.ptrAndLongRep.value;
+    dupPtr->internalRep.twoPtrValue.ptr2 =
+	    srcPtr->internalRep.twoPtrValue.ptr2;
     dupPtr->typePtr = &localVarNameType;
 }
 
@@ -5714,8 +5714,7 @@ FreeNsVarName(
     register Var *varPtr = objPtr->internalRep.twoPtrValue.ptr2;
 
     if (TclIsVarInHash(varPtr)) {
-	varPtr->refCount--;
-	if (TclIsVarUndefined(varPtr) && (varPtr->refCount == 0)) {
+	if ((varPtr->refCount-- == 1) && TclIsVarUndefined(varPtr)) {
 	    CleanupVar(varPtr, NULL);
 	}
     }
-- 
cgit v0.12


From 502287c9dd30be7317b63174e4ec832a78d52e9b Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Tue, 30 Jun 2015 14:32:12 +0000
Subject: "mcpackagelocale present" is more elegant

---
 library/clock.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 library/clock.tcl

diff --git a/library/clock.tcl b/library/clock.tcl
old mode 100644
new mode 100755
index e995bd1..bfdf832
--- a/library/clock.tcl
+++ b/library/clock.tcl
@@ -2320,7 +2320,7 @@ proc ::tcl::clock::EnterLocale { locale } {
 	    # Control Panel information
 
 	    set locale [mclocale]_windows
-	    if { $locale ni [::msgcat::mcpackagelocale loaded] } {
+	    if { ! [mcpackagelocale present $locale] } {
 		LoadWindowsDateTimeFormats $locale
 	    }
 	}
-- 
cgit v0.12


From f63cfcaea332810df5d6982d910c6337db6847fa Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Tue, 30 Jun 2015 14:36:24 +0000
Subject: Correct handling of dictionaries in the background error processing
 code.

---
 generic/tclEvent.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index d98685a..dec8289 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -259,7 +259,7 @@ HandleBgErrors(
 
 	    if (errChannel != (Tcl_Channel) NULL) {
 		Tcl_Obj *options = Tcl_GetReturnOptions(interp, code);
-		Tcl_Obj *keyPtr, *valuePtr;
+		Tcl_Obj *keyPtr, *valuePtr = NULL;
 
 		TclNewLiteralStringObj(keyPtr, "-errorinfo");
 		Tcl_IncrRefCount(keyPtr);
@@ -311,7 +311,7 @@ TclDefaultBgErrorHandlerObjCmd(
 {
     Tcl_Obj *keyPtr, *valuePtr;
     Tcl_Obj *tempObjv[2];
-    int code, level;
+    int result, code, level;
     Tcl_InterpState saved;
 
     if (objc != 3) {
@@ -325,9 +325,9 @@ TclDefaultBgErrorHandlerObjCmd(
 
     TclNewLiteralStringObj(keyPtr, "-level");
     Tcl_IncrRefCount(keyPtr);
-    Tcl_DictObjGet(NULL, objv[2], keyPtr, &valuePtr);
+    result = Tcl_DictObjGet(NULL, objv[2], keyPtr, &valuePtr);
     Tcl_DecrRefCount(keyPtr);
-    if (valuePtr == NULL) {
+    if (result != TCL_OK || valuePtr == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"missing return option \"-level\"", -1));
 	return TCL_ERROR;
@@ -337,9 +337,9 @@ TclDefaultBgErrorHandlerObjCmd(
     }
     TclNewLiteralStringObj(keyPtr, "-code");
     Tcl_IncrRefCount(keyPtr);
-    Tcl_DictObjGet(NULL, objv[2], keyPtr, &valuePtr);
+    result = Tcl_DictObjGet(NULL, objv[2], keyPtr, &valuePtr);
     Tcl_DecrRefCount(keyPtr);
-    if (valuePtr == NULL) {
+    if (result != TCL_OK || valuePtr == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"missing return option \"-code\"", -1));
 	return TCL_ERROR;
@@ -394,17 +394,17 @@ TclDefaultBgErrorHandlerObjCmd(
 
     TclNewLiteralStringObj(keyPtr, "-errorcode");
     Tcl_IncrRefCount(keyPtr);
-    Tcl_DictObjGet(NULL, objv[2], keyPtr, &valuePtr);
+    result = Tcl_DictObjGet(NULL, objv[2], keyPtr, &valuePtr);
     Tcl_DecrRefCount(keyPtr);
-    if (valuePtr) {
+    if (result == TCL_OK && valuePtr != NULL) {
 	Tcl_SetObjErrorCode(interp, valuePtr);
     }
 
     TclNewLiteralStringObj(keyPtr, "-errorinfo");
     Tcl_IncrRefCount(keyPtr);
-    Tcl_DictObjGet(NULL, objv[2], keyPtr, &valuePtr);
+    result = Tcl_DictObjGet(NULL, objv[2], keyPtr, &valuePtr);
     Tcl_DecrRefCount(keyPtr);
-    if (valuePtr) {
+    if (result == TCL_OK && valuePtr != NULL) {
 	Tcl_AppendObjToErrorInfo(interp, valuePtr);
     }
 
-- 
cgit v0.12


From 73484694b551e1a1332066df5c5e11065e308c21 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 30 Jun 2015 21:41:18 +0000
Subject: Consistancy in refcount management.

---
 generic/tclCompile.c | 4 ++--
 generic/tclExecute.c | 2 +-
 generic/tclObj.c     | 6 +++---
 generic/tclProc.c    | 6 +++---
 generic/tclVar.c     | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index a552f39..98756ea 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -978,7 +978,7 @@ FreeByteCodeInternalRep(
     register ByteCode *codePtr = objPtr->internalRep.twoPtrValue.ptr1;
 
     objPtr->typePtr = NULL;
-    if (codePtr->refCount-- < 2) {
+    if (codePtr->refCount-- <= 1) {
 	TclCleanupByteCode(codePtr);
     }
 }
@@ -1364,7 +1364,7 @@ FreeSubstCodeInternalRep(
     register ByteCode *codePtr = objPtr->internalRep.twoPtrValue.ptr1;
 
     objPtr->typePtr = NULL;
-    if (codePtr->refCount-- < 2) {
+    if (codePtr->refCount-- <= 1) {
 	TclCleanupByteCode(codePtr);
     }
 }
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 5b053a6..6fc6b6b 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -1649,7 +1649,7 @@ FreeExprCodeInternalRep(
     ByteCode *codePtr = objPtr->internalRep.twoPtrValue.ptr1;
 
     objPtr->typePtr = NULL;
-    if (codePtr->refCount-- < 2) {
+    if (codePtr->refCount-- <= 1) {
 	TclCleanupByteCode(codePtr);
     }
 }
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 80a3e31..15d874f 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -3803,7 +3803,7 @@ Tcl_DbDecrRefCount(
 # endif /* TCL_THREADS */
 #endif /* TCL_MEM_DEBUG */
 
-    if (--(objPtr)->refCount <= 0) {
+    if (objPtr->refCount-- <= 1) {
 	TclFreeObj(objPtr);
     }
 }
@@ -4288,7 +4288,7 @@ FreeCmdNameInternalRep(
 	 * there are no more uses, free the ResolvedCmdName structure.
 	 */
 
-	if (resPtr->refCount-- == 1) {
+	if (resPtr->refCount-- <= 1) {
 	    /*
 	     * Now free the cached command, unless it is still in its hash
 	     * table or if there are other references to it from other cmdName
@@ -4404,7 +4404,7 @@ SetCmdNameFromAny(
 
 	    Command *oldCmdPtr = resPtr->cmdPtr;
 
-	    if (--oldCmdPtr->refCount == 0) {
+	    if (oldCmdPtr->refCount-- <= 1) {
 		TclCleanupCommandMacro(oldCmdPtr);
 	    }
 	} else {
diff --git a/generic/tclProc.c b/generic/tclProc.c
index 6ffbd90..2679bf1 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -1842,7 +1842,7 @@ InterpProcNR2(
 	TCL_DTRACE_PROC_RETURN(l < iPtr->varFramePtr->objc ?
 		TclGetString(iPtr->varFramePtr->objv[l]) : NULL, result);
     }
-    if (--procPtr->refCount <= 0) {
+    if (procPtr->refCount-- <= 1) {
 	TclProcCleanupProc(procPtr);
     }
 
@@ -2403,7 +2403,7 @@ ProcBodyFree(
 {
     Proc *procPtr = objPtr->internalRep.twoPtrValue.ptr1;
 
-    if (procPtr->refCount-- < 2) {
+    if (procPtr->refCount-- <= 1) {
 	TclProcCleanupProc(procPtr);
     }
 }
@@ -2446,7 +2446,7 @@ FreeLambdaInternalRep(
     Proc *procPtr = objPtr->internalRep.twoPtrValue.ptr1;
     Tcl_Obj *nsObjPtr = objPtr->internalRep.twoPtrValue.ptr2;
 
-    if (procPtr->refCount-- == 1) {
+    if (procPtr->refCount-- <= 1) {
 	TclProcCleanupProc(procPtr);
     }
     TclDecrRefCount(nsObjPtr);
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 8fb89cd..97aa7ab 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -5713,8 +5713,8 @@ FreeNsVarName(
 {
     register Var *varPtr = objPtr->internalRep.twoPtrValue.ptr2;
 
-    if (TclIsVarInHash(varPtr)) {
-	if ((varPtr->refCount-- == 1) && TclIsVarUndefined(varPtr)) {
+    if (TclIsVarInHash(varPtr) && TclIsVarUndefined(varPtr)) {
+	if ((varPtr->refCount-- <= 1)) {
 	    CleanupVar(varPtr, NULL);
 	}
     }
-- 
cgit v0.12


From fec1116ba715f2d2d4ec6f0c5a8faa26d9156246 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 1 Jul 2015 13:12:57 +0000
Subject: Don't use internalRep.otherValuePtr any more, twoPtrValue.ptr1 is
 always a better idea. A few more consistancies in refcount management.

---
 generic/tcl.h        |  5 +++--
 generic/tclExecute.c | 36 ++++++++++++++++++------------------
 generic/tclInt.h     |  4 ++--
 generic/tclOOInt.h   |  2 +-
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index f0d7c9a..1f7b5cb 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -816,7 +816,8 @@ typedef struct Tcl_Obj {
     union {			/* The internal representation: */
 	long longValue;		/*   - an long integer value. */
 	double doubleValue;	/*   - a double-precision floating value. */
-	void *otherValuePtr;	/*   - another, type-specific value. */
+	void *otherValuePtr;	/*   - another, type-specific value,
+	                       not used internally any more. */
 	Tcl_WideInt wideValue;	/*   - a long long value. */
 	struct {		/*   - internal rep as two pointers.
 				 *     the main use of which is a bignum's
@@ -2509,7 +2510,7 @@ EXTERN void		Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
 #   define Tcl_DecrRefCount(objPtr) \
 	do { \
 	    Tcl_Obj *_objPtr = (objPtr); \
-	    if (--(_objPtr)->refCount <= 0) { \
+	    if ((_objPtr)->refCount-- <= 1) { \
 		TclFreeObj(_objPtr); \
 	    } \
 	} while(0)
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 6fc6b6b..38f11f2 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -1138,7 +1138,7 @@ GrowEvaluationStack(
     }
     needed = growth + moveWords + WALLOCALIGN;
 
-    
+
     /*
      * Check if there is enough room in the next stack (if there is one, it
      * should be both empty and the last one!)
@@ -1176,7 +1176,7 @@ GrowEvaluationStack(
 #else
     newElems = needed;
 #endif
-    
+
     newBytes = sizeof(ExecStack) + (newElems-1) * sizeof(Tcl_Obj *);
 
     oldPtr = esPtr;
@@ -2152,7 +2152,7 @@ TEBCresume(
     const unsigned char *pc = data[1];
                                 /* The current program counter. */
     unsigned char inst;         /* The currently running instruction */
-    
+
     /*
      * Transfer variables - needed only between opcodes, but not while
      * executing an instruction.
@@ -2357,7 +2357,7 @@ TEBCresume(
      */
 
     inst = *pc;
-    
+
     peepholeStart:
 #ifdef TCL_COMPILE_STATS
     iPtr->stats.instructionCount[*pc]++;
@@ -2377,7 +2377,7 @@ TEBCresume(
 #endif /* TCL_COMPILE_DEBUG */
 
     TCL_DTRACE_INST_NEXT();
-    
+
     if (inst == INST_LOAD_SCALAR1) {
 	goto instLoadScalar1;
     } else if (inst == INST_PUSH1) {
@@ -2389,7 +2389,7 @@ TEBCresume(
 	/*
 	 * Peephole: do not run INST_START_CMD, just skip it
 	 */
-	
+
 	iPtr->cmdCount += TclGetUInt4AtPtr(pc+5);
 	if (checkInterp) {
 	    checkInterp = 0;
@@ -2410,7 +2410,7 @@ TEBCresume(
 	}
 	goto peepholeStart;
     }
-    
+
     switch (inst) {
     case INST_SYNTAX:
     case INST_RETURN_IMM: {
@@ -2557,7 +2557,7 @@ TEBCresume(
 	/* TIP #280: Record the last piece of info needed by
 	 * 'TclGetSrcInfoForPc', and push the frame.
 	 */
-	
+
 	bcFramePtr->data.tebc.pc = (char *) pc;
 	iPtr->cmdFramePtr = bcFramePtr;
 
@@ -5763,7 +5763,7 @@ TEBCresume(
 		     * at this point (post Tcl_GetUnicodeFromObj).
 		     */
 
-		    ((int *) objResultPtr->internalRep.otherValuePtr)[1] = 0;
+		    ((int *) objResultPtr->internalRep.twoPtrValue.ptr1)[1] = 0;
 		}
 		Tcl_InvalidateStringRep(objResultPtr);
 		TclDecrRefCount(value3Ptr);
@@ -5790,7 +5790,7 @@ TEBCresume(
 		     * at this point (post Tcl_GetUnicodeFromObj).
 		     */
 
-		    ((int *) objResultPtr->internalRep.otherValuePtr)[1] = 0;
+		    ((int *) objResultPtr->internalRep.twoPtrValue.ptr1)[1] = 0;
 		}
 		Tcl_InvalidateStringRep(valuePtr);
 		TclDecrRefCount(value3Ptr);
@@ -7111,7 +7111,7 @@ TEBCresume(
 	 */
 
 	TclNewObj(tmpPtr);
-	tmpPtr->internalRep.otherValuePtr = infoPtr;
+	tmpPtr->internalRep.twoPtrValue.ptr1 = infoPtr;
 	PUSH_OBJECT(tmpPtr); /* infoPtr object */
 	TRACE_APPEND(("jump to loop step\n"));
 
@@ -7129,7 +7129,7 @@ TEBCresume(
 	 */
 
 	tmpPtr = OBJ_AT_TOS;
-	infoPtr = tmpPtr->internalRep.otherValuePtr;
+	infoPtr = tmpPtr->internalRep.twoPtrValue.ptr1;
 	numLists = infoPtr->numLists;
 	TRACE(("=> "));
 
@@ -7213,7 +7213,7 @@ TEBCresume(
     case INST_FOREACH_END:
 	/* THIS INSTRUCTION IS ONLY CALLED AS A BREAK TARGET */
 	tmpPtr = OBJ_AT_TOS;
-	infoPtr = tmpPtr->internalRep.otherValuePtr;
+	infoPtr = tmpPtr->internalRep.twoPtrValue.ptr1;
 	numLists = infoPtr->numLists;
 	TRACE(("=> loop terminated\n"));
 	NEXT_INST_V(1, numLists+2, 0);
@@ -7230,10 +7230,10 @@ TEBCresume(
 	 */
 
 	tmpPtr = OBJ_AT_DEPTH(1);
-	infoPtr = tmpPtr->internalRep.otherValuePtr;
+	infoPtr = tmpPtr->internalRep.twoPtrValue.ptr1;
 	numLists = infoPtr->numLists;
 	TRACE_APPEND(("=> appending to list at depth %d\n", 3 + numLists));
-	
+
 	objPtr = OBJ_AT_DEPTH(3 + numLists);
 	Tcl_ListObjAppendElement(NULL, objPtr, OBJ_AT_TOS);
 	NEXT_INST_F(1, 1, 0);
@@ -8195,7 +8195,7 @@ TEBCresume(
     }
 
     iPtr->cmdFramePtr = bcFramePtr->nextPtr;
-    if (--codePtr->refCount <= 0) {
+    if (codePtr->refCount-- <= 1) {
 	TclCleanupByteCode(codePtr);
     }
     TclStackFree(interp, TD);	/* free my stack */
@@ -9774,7 +9774,7 @@ ValidatePcAndStackTop(
 		(unsigned) opCode, relativePc);
 	Tcl_Panic("TclNRExecuteByteCode execution failure: bad opcode");
     }
-    if (checkStack && 
+    if (checkStack &&
 	    ((stackTop < 0) || (stackTop > stackUpperBound))) {
 	int numChars;
 	const char *cmd = GetSrcInfoForPc(pc, codePtr, &numChars, NULL, NULL);
@@ -9987,7 +9987,7 @@ GetSrcInfoForPc(
 				 * where the current instruction starts.
 				 * If NULL; no pointer is stored. */
     int *cmdIdxPtr)		/* If non-NULL, the location where the index
-				 * of the command containing the pc should 
+				 * of the command containing the pc should
 				 * be stored. */
 {
     register int pcOffset = (pc - codePtr->codeStart);
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 2537ad8..356d250 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -4039,7 +4039,7 @@ typedef const char *TclDTraceStr;
  */
 
 # define TclDecrRefCount(objPtr) \
-    if (--(objPtr)->refCount > 0) ; else { \
+    if ((objPtr)->refCount-- > 1) ; else { \
 	if (!(objPtr)->typePtr || !(objPtr)->typePtr->freeIntRepProc) { \
 	    TCL_DTRACE_OBJ_FREE(objPtr); \
 	    if ((objPtr)->bytes \
@@ -4679,7 +4679,7 @@ MODULE_SCOPE Tcl_PackageInitProc Procbodytest_SafeInit;
  */
 
 #define TclCleanupCommandMacro(cmdPtr) \
-    if (--(cmdPtr)->refCount <= 0) { \
+    if ((cmdPtr)->refCount-- <= 1) { \
 	ckfree((char *) (cmdPtr));\
     }
 
diff --git a/generic/tclOOInt.h b/generic/tclOOInt.h
index c0e4022..208e32c 100644
--- a/generic/tclOOInt.h
+++ b/generic/tclOOInt.h
@@ -588,7 +588,7 @@ MODULE_SCOPE void	TclOOSetupVariableResolver(Tcl_Namespace *nsPtr);
 
 #define AddRef(ptr) ((ptr)->refCount++)
 #define DelRef(ptr) do {			\
-	if (--(ptr)->refCount < 1) {		\
+	if ((ptr)->refCount-- <= 1) {		\
 	    ckfree((char *) (ptr));		\
 	}					\
     } while(0)
-- 
cgit v0.12


From 0918bf8c7b999500650bd3294ab8d257975247bd Mon Sep 17 00:00:00 2001
From: Miguel Sofer <miguel.sofer@gmail.com>
Date: Thu, 2 Jul 2015 03:15:21 +0000
Subject: remove code that was ifdef'ed out for ages
 (ENABLE_NS_VARNAME_CACHING), has zero hope of being revived and got out of
 sync anyway

---
 generic/tclVar.c | 163 -------------------------------------------------------
 1 file changed, 163 deletions(-)

diff --git a/generic/tclVar.c b/generic/tclVar.c
index 97aa7ab..e897790 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -235,25 +235,6 @@ static const Tcl_ObjType localVarNameType = {
     FreeLocalVarName, DupLocalVarName, PanicOnUpdateVarName, PanicOnSetVarName
 };
 
-/*
- * Caching of namespace variables disabled: no simple way was found to avoid
- * interfering with the resolver's idea of variable existence. A cached
- * varName may keep a variable's name in the namespace's hash table, which is
- * the resolver's criterion for existence (see test namespace-17.10).
- */
-
-#define ENABLE_NS_VARNAME_CACHING 0
-
-#if ENABLE_NS_VARNAME_CACHING
-static Tcl_FreeInternalRepProc FreeNsVarName;
-static Tcl_DupInternalRepProc DupNsVarName;
-
-static const Tcl_ObjType tclNsVarNameType = {
-    "namespaceVarName",
-    FreeNsVarName, DupNsVarName, PanicOnUpdateVarName, PanicOnSetVarName
-};
-#endif
-
 static const Tcl_ObjType tclParsedVarNameType = {
     "parsedVarName",
     FreeParsedVarName, DupParsedVarName, UpdateParsedVarName, PanicOnSetVarName
@@ -554,27 +535,10 @@ TclObjLookupVarEx(
     const Tcl_ObjType *typePtr = part1Ptr->typePtr;
     const char *errMsg = NULL;
     CallFrame *varFramePtr = iPtr->varFramePtr;
-#if ENABLE_NS_VARNAME_CACHING
-    Namespace *nsPtr;
-#endif
     const char *part2 = part2Ptr? TclGetString(part2Ptr):NULL;
     char *newPart2 = NULL;
-
     *arrayPtrPtr = NULL;
 
-#if ENABLE_NS_VARNAME_CACHING
-    if (varFramePtr) {
-	nsPtr = varFramePtr->nsPtr;
-    } else {
-	/*
-	 * Some variables in the global ns have to be initialized before the
-	 * root call frame is in place.
-	 */
-
-	nsPtr = NULL;
-    }
-#endif
-
     if (typePtr == &localVarNameType) {
 	int localIndex;
 
@@ -597,44 +561,6 @@ TclObjLookupVarEx(
 	    }
 	}
 	goto doneParsing;
-#if ENABLE_NS_VARNAME_CACHING
-    } else if (typePtr == &tclNsVarNameType) {
-	int useGlobal, useReference;
-	Namespace *cachedNsPtr = part1Ptr->internalRep.twoPtrValue.ptr1;
-	varPtr = part1Ptr->internalRep.twoPtrValue.ptr2;
-
-	useGlobal = (cachedNsPtr == iPtr->globalNsPtr) && (
-		(flags & TCL_GLOBAL_ONLY) ||
-		(part1[0]==':' && part1[1]==':') ||
-		(!HasLocalVars(varFramePtr) && (nsPtr==iPtr->globalNsPtr)));
-
-	useReference = useGlobal || ((cachedNsPtr == nsPtr) && (
-		(flags & TCL_NAMESPACE_ONLY) ||
-		(!HasLocalVars(varFramePtr) && !(flags & TCL_GLOBAL_ONLY) &&
-		/*
-		 * Careful: an undefined ns variable could be hiding a valid
-		 * global reference.
-		 */
-		!TclIsVarUndefined(varPtr))));
-
-	if (useReference && !TclIsVarDeadHash(varPtr)) {
-	    /*
-	     * A straight global or namespace reference, use it. It isn't so
-	     * simple to deal with 'implicit' namespace references, i.e.,
-	     * those where the reference could be to either a namespace or a
-	     * global variable. Those we lookup again.
-	     *
-	     * If TclIsVarDeadHash(varPtr), this might be a reference to a
-	     * variable in a deleted namespace, kept alive by e.g. part1Ptr.
-	     * We could conceivably be so unlucky that a new namespace was
-	     * created at the same address as the deleted one, so to be safe
-	     * we test for a valid hPtr.
-	     */
-
-	    goto donePart1;
-	}
-	goto doneParsing;
-#endif
     }
 
     /*
@@ -782,20 +708,6 @@ TclObjLookupVarEx(
 	    part1Ptr->internalRep.twoPtrValue.ptr1 = NULL;
 	}
 	part1Ptr->internalRep.twoPtrValue.ptr2 = INT2PTR(index);
-#if ENABLE_NS_VARNAME_CACHING
-    } else if (index > -3) {
-	/*
-	 * A cacheable namespace or global variable.
-	 */
-
-	Namespace *nsPtr;
-
-	nsPtr = ((index == -1) ? iPtr->globalNsPtr : varFramePtr->nsPtr);
-	varPtr->refCount++;
-	part1Ptr->typePtr = &tclNsVarNameType;
-	part1Ptr->internalRep.twoPtrValue.ptr1 = nsPtr;
-	part1Ptr->internalRep.twoPtrValue.ptr2 = varPtr;
-#endif
     } else {
 	/*
 	 * At least mark part1Ptr as already parsed.
@@ -807,18 +719,6 @@ TclObjLookupVarEx(
     }
 
   donePart1:
-#if 0 /* ENABLE_NS_VARNAME_CACHING perhaps? */
-    if (varPtr == NULL) {
-	if (flags & TCL_LEAVE_ERR_MSG) {
-	    part1 = TclGetString(part1Ptr);
-	    TclObjVarErrMsg(interp, part1Ptr, part2Ptr, msg,
-		    "cached variable reference is NULL.", -1);
-	    Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME",
-		    TclGetString(part1Ptr), NULL);
-	}
-	return NULL;
-    }
-#endif
     while (TclIsVarLink(varPtr)) {
 	varPtr = varPtr->value.linkPtr;
     }
@@ -1912,17 +1812,6 @@ TclPtrSetVar(
 	varPtr->value.objPtr = NULL;
     }
     if (flags & (TCL_APPEND_VALUE|TCL_LIST_ELEMENT)) {
-#if 0 /* ENABLE_NS_VARNAME_CACHING perhaps? */
-	/*
-	 * Can't happen now!
-	 */
-
-	if (TclIsVarUndefined(varPtr) && (oldValuePtr != NULL)) {
-	    TclDecrRefCount(oldValuePtr);	/* Discard old value. */
-	    varPtr->value.objPtr = NULL;
-	    oldValuePtr = NULL;
-	}
-#endif
 	if (flags & TCL_LIST_ELEMENT) {		/* Append list element. */
 	    if (oldValuePtr == NULL) {
 		TclNewObj(oldValuePtr);
@@ -2388,18 +2277,6 @@ TclPtrUnsetVar(
 	}
     }
 
-#if ENABLE_NS_VARNAME_CACHING
-    /*
-     * Try to avoid keeping the Var struct allocated due to a tclNsVarNameType
-     * keeping a reference. This removes some additional exteriorisations of
-     * [Bug 736729], but may be a good thing independently of the bug.
-     */
-
-    if (part1Ptr->typePtr == &tclNsVarNameType) {
-	TclFreeIntRep(part1Ptr);
-    }
-#endif
-
     /*
      * Finally, if the variable is truly not in use then free up its Var
      * structure and remove it from its hash table, if any. The ref count of
@@ -5698,46 +5575,6 @@ DupLocalVarName(
     dupPtr->typePtr = &localVarNameType;
 }
 
-#if ENABLE_NS_VARNAME_CACHING
-/*
- * nsVarName -
- *
- * INTERNALREP DEFINITION:
- *   twoPtrValue.ptr1: pointer to the namespace containing the reference.
- *   twoPtrValue.ptr2: pointer to the corresponding Var
- */
-
-static void
-FreeNsVarName(
-    Tcl_Obj *objPtr)
-{
-    register Var *varPtr = objPtr->internalRep.twoPtrValue.ptr2;
-
-    if (TclIsVarInHash(varPtr) && TclIsVarUndefined(varPtr)) {
-	if ((varPtr->refCount-- <= 1)) {
-	    CleanupVar(varPtr, NULL);
-	}
-    }
-    objPtr->typePtr = NULL;
-}
-
-static void
-DupNsVarName(
-    Tcl_Obj *srcPtr,
-    Tcl_Obj *dupPtr)
-{
-    Namespace *nsPtr = srcPtr->internalRep.twoPtrValue.ptr1;
-    register Var *varPtr = srcPtr->internalRep.twoPtrValue.ptr2;
-
-    dupPtr->internalRep.twoPtrValue.ptr1 = nsPtr;
-    dupPtr->internalRep.twoPtrValue.ptr2 = varPtr;
-    if (TclIsVarInHash(varPtr)) {
-	varPtr->refCount++;
-    }
-    dupPtr->typePtr = &tclNsVarNameType;
-}
-#endif
-
 /*
  * parsedVarName -
  *
-- 
cgit v0.12


From 4cd9155ae918a63f1c940a9557bf9ab4afd4a333 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 2 Jul 2015 08:17:50 +0000
Subject: Another round of refCount consistancy improvements.

---
 generic/tclBasic.c    | 30 +++++++++++++--------------
 generic/tclCompile.c  | 12 +++++------
 generic/tclIO.c       | 57 +++++++++++++++++++++++++--------------------------
 generic/tclIOGT.c     |  4 ++--
 generic/tclListObj.c  |  4 ++--
 generic/tclNamesp.c   | 14 ++++++-------
 generic/tclOOCall.c   |  2 +-
 generic/tclOOMethod.c | 12 +++++------
 generic/tclPreserve.c |  5 ++---
 generic/tclProc.c     |  3 +--
 generic/tclRegexp.c   |  6 +++---
 generic/tclTrace.c    | 20 +++++++++---------
 12 files changed, 83 insertions(+), 86 deletions(-)

diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 1220239..c9b37b2 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -2260,7 +2260,7 @@ Tcl_CreateObjCommand(
 	/* Command already exists. */
 
 	/*
-	 * [***] This is wrong.  See Tcl Bug a16752c252.  
+	 * [***] This is wrong.  See Tcl Bug a16752c252.
 	 * However, this buggy behavior is kept under particular
 	 * circumstances to accommodate deployed binaries of the
 	 * "tclcompiler" program. http://sourceforge.net/projects/tclpro/
@@ -3084,7 +3084,7 @@ Tcl_DeleteCommandFromToken(
 	while (tracePtr != NULL) {
 	    CommandTrace *nextPtr = tracePtr->nextPtr;
 
-	    if ((--tracePtr->refCount) <= 0) {
+	    if (tracePtr->refCount-- <= 1) {
 		ckfree(tracePtr);
 	    }
 	    tracePtr = nextPtr;
@@ -3270,7 +3270,7 @@ CallCommandTraces(
 	tracePtr->traceProc(tracePtr->clientData, (Tcl_Interp *) iPtr,
 		oldName, newName, flags);
 	cmdPtr->flags &= ~tracePtr->flags;
-	if ((--tracePtr->refCount) <= 0) {
+	if (tracePtr->refCount-- <= 1) {
 	    ckfree(tracePtr);
 	}
     }
@@ -4144,7 +4144,7 @@ TclNREvalObjv(
      * data[1] stores a marker for use by tailcalls; it will be set to 1 by
      * command redirectors (imports, alias, ensembles) so that tailcall skips
      * this callback (that marks the end of the target command) and goes back
-     * to the end of the source command. 
+     * to the end of the source command.
      */
 
     if (iPtr->deferredCallbacks) {
@@ -4172,7 +4172,7 @@ EvalObjvCore(
     Interp *iPtr = (Interp *) interp;
     Namespace *lookupNsPtr = NULL;
     int enterTracesDone = 0;
-    
+
     /*
      * Push records for task to be done on return, in INVERSE order. First, if
      * needed, the exception handlers (as they should happen last).
@@ -4298,7 +4298,7 @@ EvalObjvCore(
 	    }
 	}
 
-	/* 
+	/*
 	 * Schedule leave traces.  Raise the refCount on the resolved
 	 * cmdPtr, so that when it passes to the leave traces we know
 	 * it's still valid.
@@ -4409,7 +4409,7 @@ NRCommand(
      /*
       * If there is a tailcall, schedule it next
       */
- 
+
     if (data[1] && (data[1] != INT2PTR(1))) {
         TclNRAddCallback(interp, TclNRTailcallEval, data[1], NULL, NULL, NULL);
     }
@@ -5643,10 +5643,10 @@ TclArgumentBCEnter(
      * ensemble dispatch.  Ensemble subcommands that lead to script
      * evaluation are not supposed to get compiled, because a command
      * such as [info level] in the script can expose some of the dispatch
-     * shenanigans.  This means that we don't have to tend to the 
+     * shenanigans.  This means that we don't have to tend to the
      * housekeeping, and can escape now.
      */
-	
+
     if (ePtr->nline != objc) {
         return;
     }
@@ -5910,7 +5910,7 @@ Tcl_GlobalEvalObj(
  *
  *	If the flag TCL_EVAL_DIRECT is passed in, the value of invoker
  *	must be NULL.  Support for non-NULL invokers in that mode has
- *	been removed since it was unused and untested.  Failure to 
+ *	been removed since it was unused and untested.  Failure to
  *	follow this limitation will lead to an assertion panic.
  *
  * Results:
@@ -8192,7 +8192,7 @@ Tcl_NRCmdSwap(
  *     TclSkipTailcall:  if the NEXT command to be pushed tailcalls, execution
  *         should continue after the CURRENT command is fully returned ("skip
  *         the next command: we are redirecting to it, tailcalls should run
- *         after WE return") 
+ *         after WE return")
  *     TclPushTailcallPoint: the search for a tailcalling spot cannot traverse
  *         this point. This is special for OO, as some of the oo constructs
  *         that behave like commands may not push an NRCommand callback.
@@ -8326,7 +8326,7 @@ TclNRTailcallObjCmd(
 
         /* The tailcall data is in a Tcl list: the first element is the
          * namespace, the rest the command to be tailcalled. */
-        
+
         listPtr = Tcl_NewListObj(objc, objv);
 
         nsObjPtr = Tcl_NewStringObj(nsPtr->fullName, -1);
@@ -8335,7 +8335,7 @@ TclNRTailcallObjCmd(
             Tcl_Panic("Tailcall failed to find the proper namespace");
         }
  	TclListObjSetElement(interp, listPtr, 0, nsObjPtr);
-        
+
         iPtr->varFramePtr->tailcallPtr = listPtr;
     }
     return TCL_RETURN;
@@ -8364,9 +8364,9 @@ TclNRTailcallEval(
     int objc;
     Tcl_Obj **objv;
 
-    Tcl_ListObjGetElements(interp, listPtr, &objc, &objv); 
+    Tcl_ListObjGetElements(interp, listPtr, &objc, &objv);
     nsObjPtr = objv[0];
-    
+
     if (result == TCL_OK) {
 	result = TclGetNamespaceFromObj(interp, nsObjPtr, &nsPtr);
     }
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 98756ea..b9aee64 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -1117,7 +1117,7 @@ TclCleanupByteCode(
 	}
     }
 
-    if (codePtr->localCachePtr && (--codePtr->localCachePtr->refCount == 0)) {
+    if (codePtr->localCachePtr && (codePtr->localCachePtr->refCount-- <= 1)) {
 	TclFreeLocalCache(interp, codePtr->localCachePtr);
     }
 
@@ -1624,7 +1624,7 @@ TclFreeCompileEnv(
 	envPtr->localLitTable.buckets = envPtr->localLitTable.staticBuckets;
     }
     if (envPtr->iPtr) {
-	/* 
+	/*
 	 * We never converted to Bytecode, so free the things we would
 	 * have transferred to it.
 	 */
@@ -1856,7 +1856,7 @@ CompileExpanded(
     int wordIdx = 0;
     DefineLineInformation;
     int depth = TclGetStackDepth(envPtr);
-    
+
     StartExpanding(envPtr);
     if (cmdObj) {
 	CompileCmdLiteral(interp, cmdObj, envPtr);
@@ -1905,7 +1905,7 @@ CompileExpanded(
     TclCheckStackDepth(depth+1, envPtr);
 }
 
-static int 
+static int
 CompileCmdCompileProc(
     Tcl_Interp *interp,
     Tcl_Parse *parsePtr,
@@ -2006,7 +2006,7 @@ CompileCommandTokens(
     int cmdIdx = envPtr->numCommands;
     int startCodeOffset = envPtr->codeNext - envPtr->codeStart;
     int depth = TclGetStackDepth(envPtr);
-    
+
     assert (parsePtr->numWords > 0);
 
     /* Pre-Compile */
@@ -4035,7 +4035,7 @@ TclEmitInvoke(
     int arg1, arg2, wordCount = 0, expandCount = 0;
     int loopRange = 0, breakRange = 0, continueRange = 0;
     int cleanup, depth = TclGetStackDepth(envPtr);
-    
+
     /*
      * Parse the arguments.
      */
diff --git a/generic/tclIO.c b/generic/tclIO.c
index b97f57a..eb924d1 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -578,11 +578,11 @@ TclFinalizeIOSubsystem(void)
     int active = 1;		/* Flag == 1 while there's still work to do */
     int doflushnb;
 
-    /* Fetch the pre-TIP#398 compatibility flag */ 
+    /* Fetch the pre-TIP#398 compatibility flag */
     {
         const char *s;
         Tcl_DString ds;
-        
+
         s = TclGetEnv("TCL_FLUSH_NONBLOCKING_ON_EXIT", &ds);
         doflushnb = ((s != NULL) && strcmp(s, "0"));
         if (s != NULL) {
@@ -635,9 +635,9 @@ TclFinalizeIOSubsystem(void)
                     /* Set the channel back into blocking mode to ensure that we wait
                      * for all data to flush out.
                      */
-                
+
                 (void) Tcl_SetChannelOption(NULL, (Tcl_Channel) chanPtr,
-                                            "-blocking", "on");                    
+                                            "-blocking", "on");
             }
 
 	    if ((chanPtr == (Channel *) tsdPtr->stdinChannel) ||
@@ -1022,8 +1022,7 @@ DeleteChannelTable(
 
 	Tcl_DeleteHashEntry(hPtr);
 	SetFlag(statePtr, CHANNEL_TAINTED);
-	statePtr->refCount--;
-	if (statePtr->refCount <= 0) {
+	if (statePtr->refCount-- <= 1) {
 	    if (!GotFlag(statePtr, BG_FLUSH_SCHEDULED)) {
 		(void) Tcl_Close(interp, (Tcl_Channel) chanPtr);
 	    }
@@ -1931,7 +1930,7 @@ TclChannelRelease(
     if (chanPtr->refCount == 0) {
 	Tcl_Panic("Channel released more than preserved");
     }
-    if (--chanPtr->refCount) {
+    if (chanPtr->refCount-- > 1) {
 	return;
     }
     if (chanPtr->typePtr == NULL) {
@@ -2427,7 +2426,7 @@ static void
 ReleaseChannelBuffer(
     ChannelBuffer *bufPtr)
 {
-    if (--bufPtr->refCount) {
+    if (bufPtr->refCount-- > 1) {
 	return;
     }
     ckfree(bufPtr);
@@ -2657,7 +2656,7 @@ FlushChannel(
      * the post-condition that on a successful return to caller we've
      * left space in the current output buffer for more writing (the flush
      * call was to make new room).
-     * If the channel is blocking, then yes, so we guarantee that 
+     * If the channel is blocking, then yes, so we guarantee that
      * blocking flushes actually flush all pending data.
      * Otherwise, no.  Keep the current output buffer where it is so more
      * can be written to it, possibly filling it, to promote more efficient
@@ -2844,7 +2843,7 @@ FlushChannel(
 	    /*
 	     * When we are calledFromAsyncFlush, that means a writable
 	     * state on the channel triggered the call, so we should be
-	     * able to write something.  Either we did write something 
+	     * able to write something.  Either we did write something
 	     * and wroteSome should be set, or there was nothing left to
 	     * write in this call, and we've completed the BG flush.
 	     * These are the two cases above.  If we get here, that means
@@ -4224,7 +4223,7 @@ Write(
 	if (nextNewLine) {
 	    srcLimit = nextNewLine - src;
 	}
-	
+
 	/* Get space to write into */
 	bufPtr = statePtr->curOutPtr;
 	if (bufPtr == NULL) {
@@ -4252,7 +4251,7 @@ Write(
 
 	/* See chan-io-1.[89]. Tcl Bug 506297. */
 	statePtr->outputEncodingFlags &= ~TCL_ENCODING_START;
-	
+
 	if ((result != TCL_OK) && (srcRead + dstWrote == 0)) {
 	    /* We're reading from invalid/incomplete UTF-8 */
 	    ReleaseChannelBuffer(bufPtr);
@@ -4292,7 +4291,7 @@ Write(
 		Tcl_Panic("unknown output translation requested");
 		break;
 	    }
-	
+
 	    result |= Tcl_UtfToExternal(NULL, encoding, nl, nlLen,
 		statePtr->outputEncodingFlags,
 		&statePtr->outputEncodingState, dst,
@@ -5711,7 +5710,7 @@ DoReadChars(
     int factor = UTF_EXPANSION_FACTOR;
 
     binaryMode = (encoding == NULL)
-	    && (statePtr->inputTranslation == TCL_TRANSLATE_LF) 
+	    && (statePtr->inputTranslation == TCL_TRANSLATE_LF)
 	    && (statePtr->inEofChar == '\0');
 
     if (appendFlag == 0) {
@@ -5981,7 +5980,7 @@ ReadChars(
      * expand when converted to UTF-8 chars. This guess comes from analyzing
      * how many characters were produced by the previous pass.
      */
-    
+
     int factor = *factorPtr;
     int dstLimit = TCL_UTF_MAX - 1 + toRead * factor / UTF_EXPANSION_FACTOR;
 
@@ -6014,7 +6013,7 @@ ReadChars(
     while (1) {
 	int dstDecoded, dstRead, dstWrote, srcRead, numChars, code;
 	int flags = statePtr->inputEncodingFlags | TCL_ENCODING_NO_TERMINATE;
-	
+
 	if (charsToRead > 0) {
 	    flags |= TCL_ENCODING_CHAR_LIMIT;
 	    numChars = charsToRead;
@@ -6149,7 +6148,7 @@ ReadChars(
 		char buffer[TCL_UTF_MAX + 1];
 		int read, decoded, count;
 
-		/* 
+		/*
 		 * Didn't get everything the buffer could offer
 		 */
 
@@ -6205,7 +6204,7 @@ ReadChars(
 	    /* FALL THROUGH - get more data (dstWrote == 0) */
 	}
 
-	/* 
+	/*
 	 * The translation transformation can only reduce the number
 	 * of chars when it converts \r\n into \n.  The reduction in
 	 * the number of chars is the difference in bytes read and written.
@@ -6215,7 +6214,7 @@ ReadChars(
 
 	if (charsToRead > 0 && numChars > charsToRead) {
 
-	    /* 
+	    /*
 	     * TODO: This cannot happen anymore.
 	     *
 	     * We read more chars than allowed.  Reset limits to
@@ -6238,7 +6237,7 @@ ReadChars(
 
 	    assert (numChars == 0);
 
-	    /* 
+	    /*
 	     * There is one situation where this is the correct final
 	     * result.  If the src buffer contains only a single \n
 	     * byte, and we are in TCL_TRANSLATE_AUTO mode, and
@@ -6331,7 +6330,7 @@ ReadChars(
  *---------------------------------------------------------------------------
  */
 
-static void 
+static void
 TranslateInputEOL(
     ChannelState *statePtr,	/* Channel being read, for EOL translation and
 				 * EOF character. */
@@ -6537,7 +6536,7 @@ Tcl_Ungets(
     /*
      * Clear the EOF flags, and clear the BLOCKED bit.
      */
- 
+
     if (GotFlag(statePtr, CHANNEL_EOF)) {
 	statePtr->inputEncodingFlags |= TCL_ENCODING_START;
     }
@@ -6694,7 +6693,7 @@ GetInput(
     ChannelState *statePtr = chanPtr->state;
 				/* State info for channel */
 
-    /* 
+    /*
      * Verify that all callers know better than to call us when
      * it's recorded that the next char waiting to be read is the
      * eofchar.
@@ -9206,7 +9205,7 @@ MBEvent(
     }
 }
 
-static int 
+static int
 MBRead(
     CopyState *csPtr)
 {
@@ -9227,7 +9226,7 @@ MBRead(
     }
 }
 
-static int 
+static int
 MBWrite(
     CopyState *csPtr)
 {
@@ -9654,7 +9653,7 @@ CopyData(
  * DoRead --
  *
  *	Stores up to "bytesToRead" bytes in memory pointed to by "dst".
- *	These bytes come from reading the channel "chanPtr" and 
+ *	These bytes come from reading the channel "chanPtr" and
  *	performing the configured translations.  No encoding conversions
  *	are applied to the bytes being read.
  *
@@ -9724,7 +9723,7 @@ DoRead(
     TclChannelPreserve((Tcl_Channel)chanPtr);
     while (bytesToRead) {
 	/*
-	 * Each pass through the loop is intended to process up to 
+	 * Each pass through the loop is intended to process up to
 	 * one channel buffer.
 	 */
 
@@ -9732,13 +9731,13 @@ DoRead(
 	ChannelBuffer *bufPtr = statePtr->inQueueHead;
 
 	/*
-	 * Don't read more data if we have what we need. 
+	 * Don't read more data if we have what we need.
 	 */
 
 	while (!bufPtr ||			/* We got no buffer!   OR */
 		(!IsBufferFull(bufPtr) && 	/* Our buffer has room AND */
 		(BytesLeft(bufPtr) < bytesToRead) ) ) {
-						/* Not enough bytes in it 
+						/* Not enough bytes in it
 						 * yet to fill the dst */
 	    int code;
 
diff --git a/generic/tclIOGT.c b/generic/tclIOGT.c
index 58d1a22..c1ce485 100644
--- a/generic/tclIOGT.c
+++ b/generic/tclIOGT.c
@@ -225,7 +225,7 @@ static void
 ReleaseData(
     TransformChannelData *dataPtr)
 {
-    if (--dataPtr->refCount) {
+    if (dataPtr->refCount-- > 1) {
 	return;
     }
     ResultClear(&dataPtr->result);
@@ -683,7 +683,7 @@ TransformInputProc(
 	     * Already saw EOF from downChan; don't ask again.
 	     * NOTE: Could move this up to avoid the last maxRead
 	     * execution.  Believe this would still be correct behavior,
-	     * but the test suite tests the whole command callback 
+	     * but the test suite tests the whole command callback
 	     * sequence, so leave it unchanged for now.
 	     */
 
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index bd2dbc4..fa67ee6 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -137,7 +137,7 @@ NewListIntRep(
  *	Creates a list internal rep with space for objc elements.  objc
  *	must be > 0.  If objv!=NULL, initializes with the first objc values
  *	in that array.  If objv==NULL, initalize list internal rep to have
- *	0 elements, with space to add objc more.  
+ *	0 elements, with space to add objc more.
  *
  * Results:
  *	A new List struct with refCount 0 is returned. If some failure
@@ -1726,7 +1726,7 @@ FreeListInternalRep(
 {
     List *listRepPtr = ListRepPtr(listPtr);
 
-    if (--listRepPtr->refCount <= 0) {
+    if (listRepPtr->refCount-- <= 1) {
 	Tcl_Obj **elemPtrs = &listRepPtr->elements;
 	int i, numElems = listRepPtr->elemCount;
 
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 8f2f10e..3231ce6 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -343,7 +343,7 @@ Tcl_PushCallFrame(
     framePtr->clientData = NULL;
     framePtr->localCachePtr = NULL;
     framePtr->tailcallPtr = NULL;
-    
+
     /*
      * Push the new call frame onto the interpreter's stack of procedure call
      * frames making it the current frame.
@@ -402,7 +402,7 @@ Tcl_PopCallFrame(
     }
     if (framePtr->numCompiledLocals > 0) {
 	TclDeleteCompiledLocalVars(iPtr, framePtr);
-	if (--framePtr->localCachePtr->refCount == 0) {
+	if (framePtr->localCachePtr->refCount-- <= 1) {
 	    TclFreeLocalCache(interp, framePtr->localCachePtr);
 	}
 	framePtr->localCachePtr = NULL;
@@ -3056,7 +3056,7 @@ NamespaceCodeCmd(
      */
 
     arg = TclGetStringFromObj(objv[1], &length);
-    if (*arg==':' && length > 20 
+    if (*arg==':' && length > 20
 	    && strncmp(arg, "::namespace inscope ", 20) == 0) {
 	Tcl_SetObjResult(interp, objv[1]);
 	return TCL_OK;
@@ -4929,7 +4929,7 @@ TclLogCommandInfo(
 
     if (Tcl_IsShared(iPtr->errorStack)) {
 	Tcl_Obj *newObj;
-	    
+
 	newObj = Tcl_DuplicateObj(iPtr->errorStack);
 	Tcl_DecrRefCount(iPtr->errorStack);
 	Tcl_IncrRefCount(newObj);
@@ -4961,7 +4961,7 @@ TclLogCommandInfo(
 	    Tcl_ListObjAppendElement(NULL, iPtr->errorStack,
 		    Tcl_NewStringObj(command, length));
 	}
-    } 
+    }
 
     if (!iPtr->framePtr->objc) {
 	/*
@@ -5014,7 +5014,7 @@ TclErrorStackResetIf(
 
     if (Tcl_IsShared(iPtr->errorStack)) {
 	Tcl_Obj *newObj;
-	    
+
 	newObj = Tcl_DuplicateObj(iPtr->errorStack);
 	Tcl_DecrRefCount(iPtr->errorStack);
 	Tcl_IncrRefCount(newObj);
@@ -5034,7 +5034,7 @@ TclErrorStackResetIf(
 	Tcl_ListObjAppendElement(NULL, iPtr->errorStack, iPtr->innerLiteral);
 	Tcl_ListObjAppendElement(NULL, iPtr->errorStack,
 		Tcl_NewStringObj(msg, length));
-    } 
+    }
 }
 
 /*
diff --git a/generic/tclOOCall.c b/generic/tclOOCall.c
index 2a81091..facf90d 100644
--- a/generic/tclOOCall.c
+++ b/generic/tclOOCall.c
@@ -156,7 +156,7 @@ void
 TclOODeleteChain(
     CallChain *callPtr)
 {
-    if (callPtr == NULL || --callPtr->refCount >= 1) {
+    if (callPtr == NULL || callPtr->refCount-- > 1) {
 	return;
     }
     if (callPtr->chain != callPtr->staticChain) {
diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c
index f586e8c..e18eeec 100644
--- a/generic/tclOOMethod.c
+++ b/generic/tclOOMethod.c
@@ -272,7 +272,7 @@ void
 TclOODelMethodRef(
     Method *mPtr)
 {
-    if ((mPtr != NULL) && (--mPtr->refCount <= 0)) {
+    if ((mPtr != NULL) && (mPtr->refCount-- <= 1)) {
 	if (mPtr->typePtr != NULL && mPtr->typePtr->deleteProc != NULL) {
 	    mPtr->typePtr->deleteProc(mPtr->clientData);
 	}
@@ -720,7 +720,7 @@ InvokeProcedureMethod(
 
 	    Tcl_PopCallFrame(interp);
 	    TclStackFree(interp, fdPtr->framePtr);
-	    if (--pmPtr->refCount < 1) {
+	    if (pmPtr->refCount-- <= 1) {
 		DeleteProcedureMethodRecord(pmPtr);
 	    }
 	    TclStackFree(interp, fdPtr);
@@ -771,7 +771,7 @@ FinalizePMCall(
      * sensitive when it comes to performance!
      */
 
-    if (--pmPtr->refCount < 1) {
+    if (pmPtr->refCount-- <= 1) {
 	DeleteProcedureMethodRecord(pmPtr);
     }
     TclStackFree(interp, fdPtr);
@@ -961,7 +961,7 @@ ProcedureMethodVarResolver(
 {
     int result;
     Tcl_ResolvedVarInfo *rPtr = NULL;
-    
+
     result = ProcedureMethodCompiledVarResolver(interp, varName,
 	    strlen(varName), contextNs, &rPtr);
 
@@ -1278,7 +1278,7 @@ DeleteProcedureMethod(
 {
     register ProcedureMethod *pmPtr = clientData;
 
-    if (--pmPtr->refCount < 1) {
+    if (pmPtr->refCount-- <= 1) {
 	DeleteProcedureMethodRecord(pmPtr);
     }
 }
@@ -1473,7 +1473,7 @@ FinalizeForwardCall(
     int result)
 {
     Tcl_Obj **argObjs = data[0];
-    
+
     TclStackFree(interp, argObjs);
     return result;
 }
diff --git a/generic/tclPreserve.c b/generic/tclPreserve.c
index 0bd8f93..0b33d22 100644
--- a/generic/tclPreserve.c
+++ b/generic/tclPreserve.c
@@ -195,7 +195,7 @@ Tcl_Release(
 	    continue;
 	}
 
-	if (--refPtr->refCount != 0) {
+	if (refPtr->refCount-- > 1) {
 	    Tcl_MutexUnlock(&preserveMutex);
 	    return;
 	}
@@ -459,8 +459,7 @@ TclHandleRelease(
 		handlePtr, handlePtr->ptr2, handlePtr->ptr);
     }
 #endif
-    handlePtr->refCount--;
-    if ((handlePtr->refCount == 0) && (handlePtr->ptr == NULL)) {
+    if ((handlePtr->refCount-- <= 1) && (handlePtr->ptr == NULL)) {
 	ckfree(handlePtr);
     }
 }
diff --git a/generic/tclProc.c b/generic/tclProc.c
index 2679bf1..a9705eb 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -2147,8 +2147,7 @@ TclProcDeleteProc(
 {
     Proc *procPtr = clientData;
 
-    procPtr->refCount--;
-    if (procPtr->refCount <= 0) {
+    if (procPtr->refCount-- <= 1) {
 	TclProcCleanupProc(procPtr);
     }
 }
diff --git a/generic/tclRegexp.c b/generic/tclRegexp.c
index 5bc3aa2..ea25d4b 100644
--- a/generic/tclRegexp.c
+++ b/generic/tclRegexp.c
@@ -755,7 +755,7 @@ FreeRegexpInternalRep(
      * If this is the last reference to the regexp, free it.
      */
 
-    if (--(regexpRepPtr->refCount) <= 0) {
+    if (regexpRepPtr->refCount-- <= 1) {
 	FreeRegexp(regexpRepPtr);
     }
     objPtr->typePtr = NULL;
@@ -976,7 +976,7 @@ CompileRegexp(
     if (tsdPtr->patterns[NUM_REGEXPS-1] != NULL) {
 	TclRegexp *oldRegexpPtr = tsdPtr->regexps[NUM_REGEXPS-1];
 
-	if (--(oldRegexpPtr->refCount) <= 0) {
+	if (oldRegexpPtr->refCount-- <= 1) {
 	    FreeRegexp(oldRegexpPtr);
 	}
 	ckfree(tsdPtr->patterns[NUM_REGEXPS-1]);
@@ -1050,7 +1050,7 @@ FinalizeRegexp(
 
     for (i = 0; (i < NUM_REGEXPS) && (tsdPtr->patterns[i] != NULL); i++) {
 	regexpPtr = tsdPtr->regexps[i];
-	if (--(regexpPtr->refCount) <= 0) {
+	if (regexpPtr->refCount-- <= 1) {
 	    FreeRegexp(regexpPtr);
 	}
 	ckfree(tsdPtr->patterns[i]);
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index 6184a89..fe52d59 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -544,7 +544,7 @@ TraceExecutionObjCmd(
 
 			tcmdPtr->flags = 0;
 		    }
-		    if ((--tcmdPtr->refCount) <= 0) {
+		    if (tcmdPtr->refCount-- <= 1) {
 			ckfree(tcmdPtr);
 		    }
 		    break;
@@ -748,7 +748,7 @@ TraceCommandObjCmd(
 		    Tcl_UntraceCommand(interp, name, flags | TCL_TRACE_DELETE,
 			    TraceCommandProc, clientData);
 		    tcmdPtr->flags |= TCL_TRACE_DESTROYED;
-		    if ((--tcmdPtr->refCount) <= 0) {
+		    if (tcmdPtr->refCount-- <= 1) {
 			ckfree(tcmdPtr);
 		    }
 		    break;
@@ -1130,7 +1130,7 @@ Tcl_TraceCommand(
 	/*
 	 * Bug 3484621: up the interp's epoch if this is a BC'ed command
 	 */
-	
+
 	if ((cmdPtr->compileProc != NULL) && !(cmdPtr->flags & CMD_HAS_EXEC_TRACES)){
 	    Interp *iPtr = (Interp *) interp;
 	    iPtr->compileEpoch++;
@@ -1138,7 +1138,7 @@ Tcl_TraceCommand(
 	cmdPtr->flags |= CMD_HAS_EXEC_TRACES;
     }
 
-    
+
     return TCL_OK;
 }
 
@@ -1223,7 +1223,7 @@ Tcl_UntraceCommand(
     }
     tracePtr->flags = 0;
 
-    if ((--tracePtr->refCount) <= 0) {
+    if (tracePtr->refCount-- <= 1) {
 	ckfree(tracePtr);
     }
 
@@ -1245,7 +1245,7 @@ Tcl_UntraceCommand(
         /*
 	 * Bug 3484621: up the interp's epoch if this is a BC'ed command
 	 */
-	
+
 	if (cmdPtr->compileProc != NULL) {
 	    Interp *iPtr = (Interp *) interp;
 	    iPtr->compileEpoch++;
@@ -1382,7 +1382,7 @@ TraceCommandProc(
 	Tcl_RestoreInterpState(interp, state);
 	tcmdPtr->refCount--;
     }
-    if ((--tcmdPtr->refCount) <= 0) {
+    if (tcmdPtr->refCount-- <= 1) {
 	ckfree(tcmdPtr);
     }
 }
@@ -1474,7 +1474,7 @@ TclCheckExecutionTraces(
 		}
 		traceCode = TraceExecutionProc(tcmdPtr, interp, curLevel,
 			command, (Tcl_Command) cmdPtr, objc, objv);
-		if ((--tcmdPtr->refCount) <= 0) {
+		if (tcmdPtr->refCount-- <= 1) {
 		    ckfree(tcmdPtr);
 		}
 	    }
@@ -1721,7 +1721,7 @@ CommandObjTraceDeleted(
 {
     TraceCommandInfo *tcmdPtr = clientData;
 
-    if ((--tcmdPtr->refCount) <= 0) {
+    if (tcmdPtr->refCount-- <= 1) {
 	ckfree(tcmdPtr);
     }
 }
@@ -1936,7 +1936,7 @@ TraceExecutionProc(
 	}
     }
     if (call) {
-	if ((--tcmdPtr->refCount) <= 0) {
+	if (tcmdPtr->refCount-- <= 1) {
 	    ckfree(tcmdPtr);
 	}
     }
-- 
cgit v0.12