Merge 8.6

21 files changed, 48 insertions, 36 deletions

diff --git a/tools/checkLibraryDoc.tcl b/tools/checkLibraryDoc.tcl
index 6d147ac..5674243 100755
--- a/tools/checkLibraryDoc.tcl
+++ b/tools/checkLibraryDoc.tcl
@@ -3,7 +3,7 @@
 # This script attempts to determine what APIs exist in the source base that
 # have not been documented.  By grepping through all of the doc/*.3 man
 # pages, looking for "Pkg_*" (e.g., Tcl_ or Tk_), and comparing this list
-# against the list of Pkg_ APIs found in the source (e.g., tcl8.2/*/*.[ch])
+# against the list of Pkg_ APIs found in the source (e.g., tcl8.6/*/*.[ch])
 # we create six lists:
 #      1) APIs in Source not in Docs.
 #      2) APIs in Docs not in Source.
@@ -69,6 +69,7 @@ set StructList {
     Tk_GeomMgr \
     Tk_Image \
     Tk_ImageMaster \
+    Tk_ImageModel \
     Tk_ImageType \
     Tk_Item \
     Tk_ItemType \
@@ -106,7 +107,6 @@ proc main {} {
     if {($len != 2) && ($len != 3)} {
 	puts "usage: $argv0 pkgName pkgDir \[outFile\]"
 	puts "   pkgName == Tcl,Tk"
-	puts "   pkgDir  == /home/surles/cvs/tcl8.2"
 	exit 1
     }
 
diff --git a/tools/encoding/Makefile b/tools/encoding/Makefile
index 4c10673..361239e 100644
--- a/tools/encoding/Makefile
+++ b/tools/encoding/Makefile
@@ -1,5 +1,5 @@
 #
-# This file is a Makefile to compile all the encoding files.  
+# This file is a Makefile to compile all the encoding files.
 #
 # Run "make" to compile all the encoding files (*.txt,*.esc) into the
 # format that Tcl can use (*.enc).  It is your responsibility to move the
@@ -26,16 +26,16 @@
 # specifically excludes the right to re-distribute this file directly
 # to third parties or other organizations whether for profit or not.
 #
-# In other words:  Don't put this file on the Internet.  People who want to 
+# In other words:  Don't put this file on the Internet.  People who want to
 # get it over the Internet should do so directly from ftp://unicode.org.  They
 # can therefore be assured of getting the most recent and accurate version.
 #
 #----------------------------------------------------------------------------
 #
 # The txt2enc program built by this makefile is used to compile individual
-# .txt files into .enc files, the format that Tcl understands for encoding 
+# .txt files into .enc files, the format that Tcl understands for encoding
 # files.  This compilation to a different format is allowed by the above
-# restriction. 
+# restriction.
 #
 # The files shiftjis.txt and jis0208.txt were modified from the original
 # ones provided on the Unicode CD.  The double-width backslash character
@@ -53,7 +53,7 @@
 # SCCS: @(#) Makefile 1.1 98/01/28 11:41:36
 #
 
-EUC_ENCODINGS = euc-cn.txt euc-kr.txt euc-jp.txt 
+EUC_ENCODINGS = euc-cn.txt euc-kr.txt euc-jp.txt
 
 encodings: clean txt2enc $(EUC_ENCODINGS)
 	@echo Compiling encoding files.
@@ -69,7 +69,7 @@ encodings: clean txt2enc $(EUC_ENCODINGS)
 	    echo $$enc; \
 	    ./txt2enc -e 0 -u 1 $$p > $$enc; \
 	done
-	@echo 
+	@echo
 	@echo Compiling special versions of encoding files.
 	@for p in ascii.txt; do \
 	    enc=`echo $$p | sed 's/\..*$$/\.enc/'`; \
diff --git a/tools/encoding/big5.txt b/tools/encoding/big5.txt
index 5cc9e81..f21484a 100644
--- a/tools/encoding/big5.txt
+++ b/tools/encoding/big5.txt
@@ -41,7 +41,7 @@
 #       BIG5 characters map into Unicode.
 #
 #	WARNING!  It is currently impossible to provide round-trip compatibility
-#		between BIG5 and Unicode.  
+#		between BIG5 and Unicode.
 #
 #	A number of characters are not currently mapped because
 #		of conflicts with other mappings.  They are as follows:
@@ -58,8 +58,8 @@
 #
 #	We currently map all of these characters to U+FFFD REPLACEMENT CHARACTER.
 #		It is also possible to map these characters to their duplicates, or to
-#		the user zone.  
-#	
+#		the user zone.
+#
 #	Notes:
 #
 #	1. In addition to the above, there is some uncertainty about the
@@ -72,13 +72,13 @@
 #		0xA3BC.  This character occurs within the Big Five block of tone marks
 #		for bopomofo and is intended to be the tone mark for the first tone in
 #		Mandarin Chinese.  We have selected the mapping U+02C9 MODIFIER LETTER
-#		MACRON (Mandarin Chinese first tone) to reflect this semantic.  
+#		MACRON (Mandarin Chinese first tone) to reflect this semantic.
 #		However, because bopomofo uses the absense of a tone mark to indicate
 #		the first Mandarin tone, most implementations of Big Five represent
 #		this character with a blank space, and so a mapping such as U+2003 EM SPACE
-#		might be preferred.  
-#		
-#			
+#		might be preferred.
+#
+#
 #
 #	Format:  Three tab-separated columns
 #		 Column #1 is the BIG5 code (in hex as 0xXXXX)
diff --git a/tools/encoding/jis0212.txt b/tools/encoding/jis0212.txt
index b6d4cb2..316d28e 100644
--- a/tools/encoding/jis0212.txt
+++ b/tools/encoding/jis0212.txt
@@ -61,7 +61,7 @@
 #
 #	1. JIS X 0212 apparently unified the following two symbols
 #	   into a single character at 0x2922:
-#	
+#
 #	   LATIN CAPITAL LETTER D WITH STROKE
 #	   LATIN CAPITAL LETTER ETH
 #
@@ -71,7 +71,7 @@
 #	   0x2922 and 0x2942 are intended to be a capital/small pair.
 #	   Consequently, in the Unicode mapping, 0x2922 is treated as
 #	   LATIN CAPITAL LETTER D WITH STROKE.
-#	  
+#
 0x222F	0x02D8	# BREVE
 0x2230	0x02C7	# CARON (Mandarin Chinese third tone)
 0x2231	0x00B8	# CEDILLA
diff --git a/tools/encoding/ksc5601.txt b/tools/encoding/ksc5601.txt
index 5c6e7dc..c5a6dd1 100644
--- a/tools/encoding/ksc5601.txt
+++ b/tools/encoding/ksc5601.txt
@@ -5,7 +5,7 @@
 # BUT the mapping table between UHC(Microsoft Unified Hangul Code)
 # and Unicode 2.0. Hence, in this pacakge, I renamed it as UHC.TXT
 #
-# The Unix command  used is 
+# The Unix command  used is
 # egrep '^0x' < KSC5601.TXT |   \
 # egrep -v '^0x([8-9]...|A0..|..[4-9].|..A0)' | perl tab.pl
 #
@@ -26,8 +26,8 @@
 # Column #3 : the Unicode name (following a comment sign, '#')
 # The number of characters enumerated in this table is 8824, the
 # as listed in KS C 5601-987
-# 
-# 
+#
+#
 # The entries are in KS C 5601-1987 order
 # You can use the following algorithms to convert the hex form
 # of KS C 5601 to other forms
diff --git a/tools/encoding/macCentEuro.txt b/tools/encoding/macCentEuro.txt
index e6507d6..bf424c1 100644
--- a/tools/encoding/macCentEuro.txt
+++ b/tools/encoding/macCentEuro.txt
@@ -34,7 +34,7 @@
 #   Apple makes no warranty or representation, either express or
 #   implied, with respect to these tables, their quality, accuracy, or
 #   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages 
+#   for direct, indirect, special, incidental, or consequential damages
 #   resulting from any defect or inaccuracy in this document or the
 #   accompanying tables.
 #
diff --git a/tools/encoding/macCroatian.txt b/tools/encoding/macCroatian.txt
index 2d66b6d..538eda3 100644
--- a/tools/encoding/macCroatian.txt
+++ b/tools/encoding/macCroatian.txt
@@ -36,7 +36,7 @@
 #   Apple makes no warranty or representation, either express or
 #   implied, with respect to these tables, their quality, accuracy, or
 #   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages 
+#   for direct, indirect, special, incidental, or consequential damages
 #   resulting from any defect or inaccuracy in this document or the
 #   accompanying tables.
 #
diff --git a/tools/encoding/macCyrillic.txt b/tools/encoding/macCyrillic.txt
index b58bb83..695dade 100644
--- a/tools/encoding/macCyrillic.txt
+++ b/tools/encoding/macCyrillic.txt
@@ -37,7 +37,7 @@
 #   Apple makes no warranty or representation, either express or
 #   implied, with respect to these tables, their quality, accuracy, or
 #   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages 
+#   for direct, indirect, special, incidental, or consequential damages
 #   resulting from any defect or inaccuracy in this document or the
 #   accompanying tables.
 #
diff --git a/tools/encoding/macGreek.txt b/tools/encoding/macGreek.txt
index 28b6ea8..9783259 100644
--- a/tools/encoding/macGreek.txt
+++ b/tools/encoding/macGreek.txt
@@ -35,7 +35,7 @@
 #   Apple makes no warranty or representation, either express or
 #   implied, with respect to these tables, their quality, accuracy, or
 #   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages 
+#   for direct, indirect, special, incidental, or consequential damages
 #   resulting from any defect or inaccuracy in this document or the
 #   accompanying tables.
 #
diff --git a/tools/encoding/macIceland.txt b/tools/encoding/macIceland.txt
index d28bd9d..0a0b27b 100644
--- a/tools/encoding/macIceland.txt
+++ b/tools/encoding/macIceland.txt
@@ -37,7 +37,7 @@
 #   Apple makes no warranty or representation, either express or
 #   implied, with respect to these tables, their quality, accuracy, or
 #   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages 
+#   for direct, indirect, special, incidental, or consequential damages
 #   resulting from any defect or inaccuracy in this document or the
 #   accompanying tables.
 #
diff --git a/tools/encoding/macRoman.txt b/tools/encoding/macRoman.txt
index 8821f3b..7ddcf8d 100644
--- a/tools/encoding/macRoman.txt
+++ b/tools/encoding/macRoman.txt
@@ -41,7 +41,7 @@
 #   Apple makes no warranty or representation, either express or
 #   implied, with respect to these tables, their quality, accuracy, or
 #   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages 
+#   for direct, indirect, special, incidental, or consequential damages
 #   resulting from any defect or inaccuracy in this document or the
 #   accompanying tables.
 #
diff --git a/tools/encoding/macTurkish.txt b/tools/encoding/macTurkish.txt
index 7b143e0..4a1ddab 100644
--- a/tools/encoding/macTurkish.txt
+++ b/tools/encoding/macTurkish.txt
@@ -34,7 +34,7 @@
 #   Apple makes no warranty or representation, either express or
 #   implied, with respect to these tables, their quality, accuracy, or
 #   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages 
+#   for direct, indirect, special, incidental, or consequential damages
 #   resulting from any defect or inaccuracy in this document or the
 #   accompanying tables.
 #
diff --git a/tools/encoding/shiftjis.txt b/tools/encoding/shiftjis.txt
index 7db99ab..b616f85 100644
--- a/tools/encoding/shiftjis.txt
+++ b/tools/encoding/shiftjis.txt
@@ -47,7 +47,7 @@
 #	There is an alternative order some people might be preferred,
 #		where all the entries are in order of the top (or only) byte.
 #		This alternate order can be generated from the one given here
-#		by a simple sort.  
+#		by a simple sort.
 #
 #   The kanji mappings are a normative part of ISO/IEC 10646.  The
 #       non-kanji mappings are provisional, pending definition of
diff --git a/tools/encoding/tis-620.txt b/tools/encoding/tis-620.txt
index d3656c5..8243d81 100644
--- a/tools/encoding/tis-620.txt
+++ b/tools/encoding/tis-620.txt
@@ -176,7 +176,7 @@
 0xA8	0x0E08 #THAI CHARACTER CHO CHAN
 0xA9	0x0E09 #THAI CHARACTER CHO CHING
 0xAA	0x0E0A #THAI CHARACTER CHO CHANG
-0xAB	0x0E0B #THAI CHARACTER SO SO 
+0xAB	0x0E0B #THAI CHARACTER SO SO
 0xAC	0x0E0C #THAI CHARACTER CHO CHOE
 0xAD	0x0E0D #THAI CHARACTER YO YING
 0xAE	0x0E0E #THAI CHARACTER DO CHADA
diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl
index 4516010..a4a73ba 100644
--- a/tools/genStubs.tcl
+++ b/tools/genStubs.tcl
@@ -479,6 +479,8 @@ proc genStubs::makeDecl {name decl index} {
     if {[info exists stubs($name,deprecated,$index)]} {
 	append text "[string toupper $libraryName]_DEPRECATED(\"$stubs($name,deprecated,$index)\")\n"
 	set line "$rtype"
+    } elseif {[string range $rtype end-5 end] eq "MP_WUR"} {
+	set line "$scspec [string trim [string range $rtype 0 end-6]]"
     } else {
 	set line "$scspec $rtype"
     }
@@ -550,6 +552,9 @@ proc genStubs::makeDecl {name decl index} {
 	    append line ")"
 	}
     }
+    if {[string range $rtype end-5 end] eq "MP_WUR"} {
+	append line " MP_WUR"
+    }
     return "$text$line;\n"
 }
 
@@ -613,6 +618,8 @@ proc genStubs::makeSlot {name decl index} {
 	append text [string trim [string range $rtype 0 end-9]] " (__stdcall *" $lfname ") "
     } elseif {[string range $rtype 0 11] eq "TCL_NORETURN"} {
 	append text "TCL_NORETURN1 " [string trim [string range $rtype 12 end]] " (*" $lfname ") "
+    } elseif {[string range $rtype end-5 end] eq "MP_WUR"} {
+	append text [string trim [string range $rtype 0 end-6]] " (*" $lfname ") "
     } else {
 	append text $rtype " (*" $lfname ") "
     }
@@ -650,6 +657,9 @@ proc genStubs::makeSlot {name decl index} {
 	}
     }
 
+    if {[string range $rtype end-5 end] eq "MP_WUR"} {
+	append text " MP_WUR"
+    }
     append text "; /* $index */\n"
     return $text
 }
diff --git a/tools/loadICU.tcl b/tools/loadICU.tcl
index 021ced3..506b6e4 100755
--- a/tools/loadICU.tcl
+++ b/tools/loadICU.tcl
@@ -588,7 +588,7 @@ proc backslashify { string } {
     set retval {}
     foreach char [split $string {}] {
 	scan $char %c ccode
-	if { $ccode >= 0x0020 && $ccode < 0x007F && $char ne "\""
+	if { $ccode >= 0x20 && $ccode < 0x7F && $char ne "\""
 	     && $char ne "\{" && $char ne "\}" && $char ne "\["
 	     && $char ne "\]" && $char ne "\\" && $char ne "\$" } {
 	    append retval $char
diff --git a/tools/man2help2.tcl b/tools/man2help2.tcl
index 4f3b7e5..91c81be 100644
--- a/tools/man2help2.tcl
+++ b/tools/man2help2.tcl
@@ -157,7 +157,7 @@ proc text {string} {
 	    "\t"	{\tab } \
 	    ''		"\\rdblquote " \
 	    ``		"\\ldblquote " \
-	    "\u00b7"	"\\bullet " \
+	    "\xB7"	"\\bullet " \
 	    ] $string]
 
     # Check if this is the beginning of an international character string.
@@ -824,7 +824,7 @@ proc IPmacro {argList} {
 	set indent 5
     }
     if {$text == {\(bu}} {
-	set text "\u00b7"
+	set text "\xB7"
     }
 
     set tab [expr {$indent * 0.1}]i
diff --git a/tools/mkdepend.tcl b/tools/mkdepend.tcl
index 3d96a5e..b1ad076 100644
--- a/tools/mkdepend.tcl
+++ b/tools/mkdepend.tcl
@@ -88,7 +88,7 @@ proc readDepends {chan} {
     set line ""
     array set depends {}
 
-    while {[gets $chan line] != -1} {
+    while {[gets $chan line] >= 0} {
         if {[regexp {^#line [0-9]+ \"(.*)\"$} $line dummy fname] != 0} {
 	    set fname [file normalize $fname]
             if {![info exists target]} {
diff --git a/tools/tclZIC.tcl b/tools/tclZIC.tcl
index 85c9ba9..6282111 100755
--- a/tools/tclZIC.tcl
+++ b/tools/tclZIC.tcl
@@ -36,7 +36,7 @@
 set olsonFiles {
     africa antarctica asia australasia
     backward etcetera europe northamerica
-    pacificnew southamerica systemv
+    southamerica
 }
 
 # Define the year at which the DST information will stop.
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index d607905..a9327b8 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -557,6 +557,7 @@ array set remap_link_target {
     Tk_Font	Tk_GetFont
     Tk_Image	Tk_GetImage
     Tk_ImageMaster Tk_GetImage
+    Tk_ImageModel Tk_GetImage
     Tk_ItemType Tk_CreateItemType
     Tk_Justify	Tk_GetJustify
     Ttk_Theme	Ttk_GetTheme
@@ -586,6 +587,7 @@ array set exclude_refs_map {
     scrollbar.n		{set}
     selection.n		{string}
     tcltest.n		{error}
+    text.n		{bind image lower raise}
     tkvars.n		{tk}
     tkwait.n		{variable}
     tm.n		{exec}
diff --git a/tools/uniParse.tcl b/tools/uniParse.tcl
index a451096..545afc4 100644
--- a/tools/uniParse.tcl
+++ b/tools/uniParse.tcl
@@ -68,7 +68,7 @@ proc uni::getGroup {value} {
     variable groups
 
     set gIndex [lsearch -exact $groups $value]
-    if {$gIndex == -1} {
+    if {$gIndex < 0} {
 	set gIndex [llength $groups]
 	lappend groups $value
     }
@@ -81,7 +81,7 @@ proc uni::addPage {info} {
     variable shift
 
     set pIndex [lsearch -exact $pages $info]
-    if {$pIndex == -1} {
+    if {$pIndex < 0} {
 	set pIndex [llength $pages]
 	lappend pages $info
     }