Pulling changes from trunkcore_zip_vfs

1 files changed, 100 insertions, 88 deletions

diff --git a/tests/font.test b/tests/font.test
index abe6ebf..7e37698 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -109,7 +109,7 @@ test font-4.1 {font command: actual: arguments} -body {
     font actual xyz -displayof
 } -returnCodes error -result {value for "-displayof" missing}
 test font-4.2 {font command: actual: arguments} -body {
-    # (objc < 3) 
+    # (objc < 3)
     font actual
 } -returnCodes error -result {wrong # args: should be "font actual font ?-displayof window? ?option? ?--? ?char?"}
 test font-4.3 {font command: actual: arguments} -body {
@@ -145,10 +145,22 @@ test font-4.10 {font command: actual} -constraints win -body {
 test font-4.11 {font command: bad option} -body {
     font actual xyz -style
 } -returnCodes error -result {bad option "-style": must be -family, -size, -weight, -slant, -underline, or -overstrike}
+test font-4.12 {font command: actual} -body {
+    font actual {-family times} -- \ud800
+} -match glob -result {*}
+test font-4.13 {font command: actual} -body {
+    font actual {-family times} -- \udc00
+} -match glob -result {*}
+test font-4.14 {font command: actual} -constraints win -body {
+    font actual {-family times} -family -- \ud800\udc00
+} -result {Times New Roman}
+test font-4.15 {font command: actual} -body {
+    font actual {-family times} -- \udc00\ud800
+} -returnCodes 1 -match glob -result {expected a single character but got "*"}
 
 
 test font-5.1 {font command: configure} -body {
-    # (objc < 3) 
+    # (objc < 3)
     font configure
 } -returnCodes error -result {wrong # args: should be "font configure fontname ?-option value ...?"}
 test font-5.2 {font command: configure: non-existent font} -body {
@@ -161,7 +173,7 @@ test font-5.3 {font command: configure: "deleted" font} -setup {
     pack [label .t.f]
     update
 } -body {
-    # (nfPtr->deletePending != 0) 
+    # (nfPtr->deletePending != 0)
     font create xyz
     .t.f configure -font xyz
     font delete xyz
@@ -251,13 +263,13 @@ test font-6.4 {font command: create: generate name} -setup {
 test font-6.5 {font command: create: bad option creating new font} -setup {
     catch {font delete xyz}
 } -body {
-    # name was specified so skip = 3 
+    # name was specified so skip = 3
     font create xyz -xyz times
 } -returnCodes error -result {bad option "-xyz": must be -family, -size, -weight, -slant, -underline, or -overstrike}
 test font-6.6 {font command: create: bad option creating new font} -setup {
     clearnondefaultfonts
 } -body {
-    # name was not specified so skip = 2 
+    # name was not specified so skip = 2
     font create -xyz times
 } -returnCodes error -result {bad option "-xyz": must be -family, -size, -weight, -slant, -underline, or -overstrike}
 test font-6.7 {font command: create: already exists} -setup {
@@ -271,14 +283,14 @@ test font-6.7 {font command: create: already exists} -setup {
 } -returnCodes error -result {named font "xyz" already exists}
 
 test font-7.1 {font command: delete: arguments} -body {
-    # (objc < 3) 
+    # (objc < 3)
     font delete
 } -returnCodes error -result {wrong # args: should be "font delete fontname ?fontname ...?"}
 test font-7.2 {font command: delete: loop test} -setup {
     clearnondefaultfonts
 	set x {}
 } -body {
-    # for (i = 2; i < objc; i++) 
+    # for (i = 2; i < objc; i++)
     font create a -underline 1
     font create b -underline 1
     font create c -underline 1
@@ -309,7 +321,7 @@ test font-7.3 {font command: delete: loop test} -setup {
 test font-7.4 {font command: delete: non-existent} -setup {
     catch {font delete xyz}
 } -body {
-    # (namedHashPtr == NULL) 
+    # (namedHashPtr == NULL)
     font delete xyz
 } -returnCodes error -result {named font "xyz" doesn't exist}
 test font-7.5 {font command: delete: mark for later deletion} -setup {
@@ -376,11 +388,11 @@ test font-9.1 {font command: measure: arguments} -body {
     expr {[font measure xyz -displayof] > 0}
 } -returnCodes ok -result 1
 test font-9.2 {font command: measure: arguments} -body {
-    # (objc - skip != 4) 
+    # (objc - skip != 4)
     font measure
 } -returnCodes error -result {wrong # args: should be "font measure font ?-displayof window? text"}
 test font-9.3 {font command: measure: arguments} -body {
-    # (objc - skip != 4) 
+    # (objc - skip != 4)
     font measure xyz abc def
 } -returnCodes error -result {wrong # args: should be "font measure font ?-displayof window? text"}
 test font-9.4 {font command: measure: arguments} -constraints noExceed -body {
@@ -410,7 +422,7 @@ test font-10.2 {font command: metrics: arguments} -body {
     font metrics xyz -displayof
 } -returnCodes error -result {value for "-displayof" missing}
 test font-10.3 {font command: metrics: arguments} -body {
-    # (objc < 3) 
+    # (objc < 3)
     font metrics
 } -returnCodes error -result {wrong # args: should be "font metrics font ?-displayof window? ?option?"}
 test font-10.4 {font command: metrics: arguments} -body {
@@ -573,7 +585,7 @@ test font-14.1 {Tk_GetFont procedure} -body {
 
 
 test font-15.1 {Tk_AllocFontFromObj - converting internal reps} -constraints {
-	testfont 
+	testfont
 } -setup {
     destroy .b1 .b2
 } -body {
@@ -586,7 +598,7 @@ test font-15.1 {Tk_AllocFontFromObj - converting internal reps} -constraints {
     destroy .b1 .b2
 } -result {{1 0}}
 test font-15.2 {Tk_AllocFontFromObj - discard stale font} -constraints {
-	testfont 
+	testfont
 } -setup {
     destroy .b1 .b2
     set result {}
@@ -601,7 +613,7 @@ test font-15.2 {Tk_AllocFontFromObj - discard stale font} -constraints {
     destroy .b2
 } -result {{} {{1 1}}}
 test font-15.3 {Tk_AllocFontFromObj - reuse existing font} -constraints {
-	testfont 
+	testfont
 } -setup {
     destroy .b1 .b2
     set result {}
@@ -632,9 +644,9 @@ test font-15.5 {Tk_AllocFontFromObj procedure: get named font} -setup {
     pack [label .t.f]
     update
 } -body {
-    # (namedHashPtr != NULL) 
-    font create xyz 
-    .t.f config -font xyz 
+    # (namedHashPtr != NULL)
+    font create xyz
+    .t.f config -font xyz
 } -cleanup {
 	destroy .t.f
     font delete xyz
@@ -650,24 +662,24 @@ test font-15.6 {Tk_AllocFontFromObj procedure: not a named font} -setup {
 	destroy .t.f
 } -result {-family} -result {}
 test font-15.7 {Tk_AllocFontFromObj procedure: get native font} -constraints {
-	unix 
+	unix
 } -setup {
     destroy .t.f
     pack [label .t.f]
     update
 } -body {
-    # not (fontPtr == NULL) 
+    # not (fontPtr == NULL)
     .t.f config -font fixed
 } -result {}
 test font-15.8 {Tk_AllocFontFromObj procedure: get native font} -constraints {
-	win 
+	win
 } -setup {
     destroy .t.f
     clearnondefaultfonts
     pack [label .t.f]
     update
 } -body {
-    # not (fontPtr == NULL) 
+    # not (fontPtr == NULL)
     .t.f config -font oemfixed
 } -cleanup {
 	destroy .t.f
@@ -677,7 +689,7 @@ test font-15.9 {Tk_AllocFontFromObj procedure: get attribute font} -setup {
     pack [label .t.f]
     update
 } -body {
-    # (fontPtr == NULL) 
+    # (fontPtr == NULL)
     .t.f config -font {xxx yyy zzz}
 } -cleanup {
 	destroy .t.f
@@ -712,7 +724,7 @@ test font-15.13 {Tk_AllocFontFromObj procedure: underline position} -setup {
     update
 } -cleanup {
 	destroy .t.f
-} -result {}    
+} -result {}
 
 
 test font-16.1 {Tk_NameOfFont procedure} -setup {
@@ -728,7 +740,7 @@ test font-16.1 {Tk_NameOfFont procedure} -setup {
 
 
 test font-17.1 {Tk_FreeFontFromObj - reference counts} -constraints {
-	testfont 
+	testfont
 } -setup {
     destroy .b1 .b2 .b3
     set result {}
@@ -773,7 +785,7 @@ test font-17.4 {Tk_FreeFont procedure: named font} -setup {
     pack [label .t.f]
     update
 } -body {
-    # (fontPtr->namedHashPtr != NULL) 
+    # (fontPtr->namedHashPtr != NULL)
     font create xyz
     .t.f config -font xyz
     destroy .t.f
@@ -785,7 +797,7 @@ test font-17.5 {Tk_FreeFont procedure: named font} -setup {
     pack [label .t.f]
     update
 } -body {
-    # not (fontPtr->refCount == 0) 
+    # not (fontPtr->refCount == 0)
     font create xyz -underline 1
     .t.f config -font xyz
     font delete xyz
@@ -799,7 +811,7 @@ test font-17.6 {Tk_FreeFont procedure: named font not deleted yet} -setup {
     pack [label .t.f]
     update
 } -body {
-    font create xyz 
+    font create xyz
     .t.f config -font xyz
     button .t.b -font xyz
     font delete xyz
@@ -858,7 +870,7 @@ test font-20.1 {Tk_GetFontMetrics procedure} -setup {
 # Procedure used in 21.* tests
 proc psfontname {name} {
 	destroy .t.c
-	canvas .t.c -closeenough 0 
+	canvas .t.c -closeenough 0
 	.t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
 	pack .t.c
 	update
@@ -884,22 +896,22 @@ test font-21.1 {Tk_PostscriptFontName procedure: native} -constraints {
     }
 } -result {AvantGarde-Book}
 test font-21.2 {Tk_PostscriptFontName procedure: native} -constraints {
-	win 
+	win
 } -body {
     psfontname "arial 10"
 } -result {Helvetica}
 test font-21.3 {Tk_PostscriptFontName procedure: native} -constraints {
-	win 
+	win
 } -body {
     psfontname "{times new roman} 10"
 } -result {Times-Roman}
 test font-21.4 {Tk_PostscriptFontName procedure: native} -constraints {
-	win 
+	win
 } -body {
     psfontname "{courier new} 10"
 } -result {Courier}
 test font-21.5 {Tk_PostscriptFontName procedure: spaces} -constraints {
-	unix 
+	unix
 } -body {
     set x [font actual {{lucida bright} 10} -family]
     if {[string match lucida*bright $x]} {
@@ -909,13 +921,13 @@ test font-21.5 {Tk_PostscriptFontName procedure: spaces} -constraints {
     }
 } -result {LucidaBright}
 test font-21.6 {Tk_PostscriptFontName procedure: spaces} -constraints {
-	unix 
+	unix
 } -body {
     psfontname "{new century schoolbook} 10"
 } -result {NewCenturySchlbk-Roman}
 
 test font-21.7 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {avantgarde 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "avantgarde"} {
@@ -925,7 +937,7 @@ test font-21.7 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {AvantGarde-Book}
 test font-21.8 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {avantgarde 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "avantgarde"} {
@@ -935,7 +947,7 @@ test font-21.8 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {AvantGarde-Demi}
 test font-21.9 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {avantgarde 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "avantgarde"} {
@@ -945,7 +957,7 @@ test font-21.9 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {AvantGarde-BookOblique}
 test font-21.10 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {avantgarde 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "avantgarde"} {
@@ -956,7 +968,7 @@ test font-21.10 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
 } -result {AvantGarde-DemiOblique}
 
 test font-21.11 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {bookman 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "bookman"} {
@@ -966,7 +978,7 @@ test font-21.11 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Bookman-Light}
 test font-21.12 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {bookman 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "bookman"} {
@@ -976,7 +988,7 @@ test font-21.12 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Bookman-Demi}
 test font-21.13 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {bookman 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "bookman"} {
@@ -986,7 +998,7 @@ test font-21.13 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Bookman-LightItalic}
 test font-21.14 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {bookman 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "bookman"} {
@@ -997,7 +1009,7 @@ test font-21.14 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
 } -result {Bookman-DemiItalic}
 
 test font-21.15 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {courier 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "courier"} {
@@ -1007,7 +1019,7 @@ test font-21.15 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Courier}
 test font-21.16 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {courier 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "courier"} {
@@ -1017,7 +1029,7 @@ test font-21.16 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Courier-Bold}
 test font-21.17 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {courier 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "courier"} {
@@ -1027,7 +1039,7 @@ test font-21.17 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Courier-Oblique}
 test font-21.18 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {courier 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "courier"} {
@@ -1038,7 +1050,7 @@ test font-21.18 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
 } -result {Courier-BoldOblique}
 
 test font-21.19 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {helvetica 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "helvetica"} {
@@ -1048,7 +1060,7 @@ test font-21.19 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Helvetica}
 test font-21.20 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {helvetica 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "helvetica"} {
@@ -1058,7 +1070,7 @@ test font-21.20 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Helvetica-Bold}
 test font-21.21 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {helvetica 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "helvetica"} {
@@ -1068,7 +1080,7 @@ test font-21.21 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Helvetica-Oblique}
 test font-21.22 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {helvetica 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "helvetica"} {
@@ -1079,7 +1091,7 @@ test font-21.22 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
 } -result {Helvetica-BoldOblique}
 
 test font-21.23 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {{new century schoolbook} 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "new century schoolbook"} {
@@ -1089,7 +1101,7 @@ test font-21.23 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {NewCenturySchlbk-Roman}
 test font-21.24 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {{new century schoolbook} 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "new century schoolbook"} {
@@ -1099,7 +1111,7 @@ test font-21.24 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {NewCenturySchlbk-Bold}
 test font-21.25 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {{new century schoolbook} 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "new century schoolbook"} {
@@ -1109,7 +1121,7 @@ test font-21.25 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {NewCenturySchlbk-Italic}
 test font-21.26 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {{new century schoolbook} 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "new century schoolbook"} {
@@ -1120,7 +1132,7 @@ test font-21.26 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
 } -result {NewCenturySchlbk-BoldItalic}
 
 test font-21.27 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {palatino 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "palatino"} {
@@ -1130,7 +1142,7 @@ test font-21.27 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Palatino-Roman}
 test font-21.28 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {palatino 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "palatino"} {
@@ -1140,7 +1152,7 @@ test font-21.28 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Palatino-Bold}
 test font-21.29 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {palatino 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "palatino"} {
@@ -1150,7 +1162,7 @@ test font-21.29 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Palatino-Italic}
 test font-21.30 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {palatino 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "palatino"} {
@@ -1161,7 +1173,7 @@ test font-21.30 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
 } -result {Palatino-BoldItalic}
 
 test font-21.31 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {symbol 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "symbol"} {
@@ -1171,7 +1183,7 @@ test font-21.31 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Symbol}
 test font-21.32 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {symbol 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "symbol"} {
@@ -1181,7 +1193,7 @@ test font-21.32 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Symbol}
 test font-21.33 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {symbol 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "symbol"} {
@@ -1191,7 +1203,7 @@ test font-21.33 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Symbol}
 test font-21.34 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {symbol 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "symbol"} {
@@ -1202,7 +1214,7 @@ test font-21.34 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
 } -result {Symbol}
 
 test font-21.35 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {times 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "times"} {
@@ -1212,7 +1224,7 @@ test font-21.35 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Times-Roman}
 test font-21.36 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {times 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "times"} {
@@ -1222,7 +1234,7 @@ test font-21.36 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Times-Bold}
 test font-21.37 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {times 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "times"} {
@@ -1232,7 +1244,7 @@ test font-21.37 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {Times-Italic}
 test font-21.38 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {times 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "times"} {
@@ -1243,7 +1255,7 @@ test font-21.38 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
 } -result {Times-BoldItalic}
 
 test font-21.39 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {zapfchancery 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "zapfchancery"} {
@@ -1253,7 +1265,7 @@ test font-21.39 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {ZapfChancery-MediumItalic}
 test font-21.40 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {zapfchancery 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "zapfchancery"} {
@@ -1263,7 +1275,7 @@ test font-21.40 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {ZapfChancery-MediumItalic}
 test font-21.41 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {zapfchancery 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "zapfchancery"} {
@@ -1273,7 +1285,7 @@ test font-21.41 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {ZapfChancery-MediumItalic}
 test font-21.42 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {zapfchancery 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "zapfchancery"} {
@@ -1284,7 +1296,7 @@ test font-21.42 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
 } -result {ZapfChancery-MediumItalic}
 
 test font-21.43 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {zapfdingbats 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "zapfdingbats"} {
@@ -1294,7 +1306,7 @@ test font-21.43 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {ZapfDingbats}
 test font-21.44 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {zapfdingbats 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "zapfdingbats"} {
@@ -1304,7 +1316,7 @@ test font-21.44 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {ZapfDingbats}
 test font-21.45 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {zapfdingbats 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "zapfdingbats"} {
@@ -1314,7 +1326,7 @@ test font-21.45 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
     }
 } -result {ZapfDingbats}
 test font-21.46 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {zapfdingbats 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "zapfdingbats"} {
@@ -1431,7 +1443,7 @@ test font-21.66 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
 
 
 test font-22.1 {Tk_TextWidth procedure} -setup {
-	destroy .t.l 
+	destroy .t.l
 } -body {
 	label .t.l -padx 0 -pady 0 -bd 0 -highlightthickness 0 -justify left \
 		-text "0" -font "Courier -12"
@@ -1457,7 +1469,7 @@ test font-23.1 {Tk_UnderlineChars procedure} -setup {
 
 
 # Data used in 24.* tests
-destroy .t.l 
+destroy .t.l
 label .t.l -padx 0 -pady 0 -bd 0 -highlightthickness 0 -justify left \
 	-text "0" -font "Courier -12"
 pack .t.l
@@ -1526,11 +1538,11 @@ test font-24.10 {Tk_ComputeTextLayout: tab caused break} -body {
     set x {}
     .t.l config -text "000\t"
 	update
-    lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}]
+    lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 8}]}]
 	lappend x [expr {[winfo reqheight .t.l] eq $ay}]
     .t.l config -text "000\t00" -wrap [expr $ax * 6]
 	update
-	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}]
+	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 8}]}]
 	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
     return $x
 } -cleanup {
@@ -1582,12 +1594,12 @@ test font-24.14 {Tk_ComputeTextLayout: text ended with \n} -body {
 	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
     return $x
 } -result {1 1 1 1}
-destroy .t.l 
+destroy .t.l
 
 test font-24.15 {Tk_ComputeTextLayout: justification} -setup {
     set x {}
 	destroy .t.c
-	canvas .t.c -closeenough 0 
+	canvas .t.c -closeenough 0
 	.t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
 	pack .t.c
 	update
@@ -1616,11 +1628,11 @@ test font-25.1 {Tk_FreeTextLayout procedure} -setup {
 } -cleanup {
 	destroy .t.f
 } -result {}
-    
+
 
 # Canvas created for tests: 26.*
 destroy .t.c
-canvas .t.c -closeenough 0 
+canvas .t.c -closeenough 0
 .t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
 pack .t.c
 update
@@ -1678,7 +1690,7 @@ destroy .t.f
 
 # Canvas created for tests: 28.*
 destroy .t.c
-canvas .t.c -closeenough 0 
+canvas .t.c -closeenough 0
 .t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
 pack .t.c
 update
@@ -1770,7 +1782,7 @@ destroy .t.f
 
 # Canvas created for tests: 30.*
 destroy .t.c
-canvas .t.c -closeenough 0 
+canvas .t.c -closeenough 0
 .t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
 pack .t.c
 update
@@ -1913,7 +1925,7 @@ destroy .t.c
 
 # Canvas created for tests 31.*
 destroy .t.c
-canvas .t.c -closeenough 0 
+canvas .t.c -closeenough 0
 .t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
 pack .t.c
 update
@@ -1949,7 +1961,7 @@ destroy .t.c
 
 test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer doesn't overflow} -setup {
 	destroy .t.c
-	canvas .t.c -closeenough 0 
+	canvas .t.c -closeenough 0
 	.t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
 	pack .t.c
 	update
@@ -1962,7 +1974,7 @@ test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer doesn't overflow} -setu
     .t.c insert text end "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     .t.c insert text end "end"
     set x [.t.c postscript]
-    set i [string first "(qwerty" $x] 
+    set i [string first "(qwerty" $x]
     string range $x $i [expr {$i + 278}]
 } -cleanup {
 	destroy .t.c
@@ -2178,7 +2190,7 @@ test font-37.6 {GetAttributeInfo procedure: underline} -setup {
 	set x {}
 } -body {
 	font create xyz -underline yes
-	font config xyz -underline 
+	font config xyz -underline
 } -cleanup {
 	font delete xyz
 } -result {1}
@@ -2187,7 +2199,7 @@ test font-37.7 {GetAttributeInfo procedure: overstrike} -setup {
 	set x {}
 } -body {
 	font create xyz -overstrike no
-	font config xyz -overstrike 
+	font config xyz -overstrike
 } -cleanup {
 	font delete xyz
 } -result {0}