Merge trunk

1 files changed, 221 insertions, 219 deletions

diff --git a/tests/font.test b/tests/font.test
index efa1d7d..df4046e 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -14,6 +14,8 @@ tcltest::loadTestedCommands
 # Some tests require support for 4-byte UTF-8 sequences
 testConstraint fullutf [expr {[format %c 0x010000] != "\uFFFD"}]
 testConstraint utfcompat [expr {([string length "\U10000"] == 2) && [package vsatisfies [package provide Tcl] 8]}]
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}]
 
 set defaultfontlist [font names]
 
@@ -61,9 +63,9 @@ test font-1.1 {TkFontPkgInit} -setup {
 } -body {
     interp create foo
     foo eval {
-		load {} Tk
-		wm geometry . +0+0
-		update
+	load {} Tk
+	wm geometry . +0+0
+	update
     }
     interp delete foo
 } -result {}
@@ -77,25 +79,25 @@ test font-2.1 {TkFontPkgFree} -setup {
 
     # Makes sure that named font was visible only to child interp.
     foo eval {
-		load {} Tk
-		wm geometry . +0+0
-		button .b -font {times 16} -text "hi"
-		pack .b
-		font create wiggles -family courier -underline 1
-		update
+	load {} Tk
+	wm geometry . +0+0
+	button .b -font {times 16} -text "hi"
+	pack .b
+	font create wiggles -family courier -underline 1
+	update
     }
     lappend x [catch {font configure wiggles} msg; set msg]
 
     # Tests cancelling the idle handler for TheWorldHasChanged,
     # because app goes away before idle serviced.
     foo eval {
-		.b config -font wiggles
-		font config wiggles -size 24
-		destroy .
+	.b config -font wiggles
+	font config wiggles -size 24
+	destroy .
     }
     lappend x [foo eval {catch {font families} msg; set msg}]
 } -cleanup {
-        interp delete foo
+    interp delete foo
 } -result {{named font "wiggles" doesn't exist} {can't invoke "font" command: application has been destroyed}}
 
 
@@ -137,7 +139,7 @@ test font-4.8 {font command: actual: all attributes} -body {
     # not (objc > 3) so objPtr = NULL
     lindex [font actual {-family times}] 0
 } -result {-family}
-test font-4.9 {font command: actual} -constraints {unix noExceed} -body {
+test font-4.9 {font command: actual} -constraints {unix noExceed failsOnUbuntu} -body {
     # (objc > 3) so objPtr = objv[3 + skip]
     string tolower [font actual {-family times} -family]
 } -result {times}
@@ -194,7 +196,7 @@ test font-5.4 {font command: configure: get all options} -setup {
     font create xyz -family xyz
     lindex [font configure xyz] 1
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result xyz
 test font-5.5 {font command: configure: get one option} -setup {
     clearnondefaultfonts
@@ -202,9 +204,9 @@ test font-5.5 {font command: configure: get one option} -setup {
     # (objc == 4) so objPtr = objv[3]
     font create xyz -family xyz
     font configure xyz -family
-	getnondefaultfonts
+    getnondefaultfonts
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result xyz
 test font-5.6 {font command: configure: update existing font} -setup {
     catch {font delete xyz}
@@ -215,7 +217,7 @@ test font-5.6 {font command: configure: update existing font} -setup {
     update
     font configure xyz -family
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result xyz
 test font-5.7 {font command: configure: bad option} -setup {
     catch {font delete xyz}
@@ -223,7 +225,7 @@ test font-5.7 {font command: configure: bad option} -setup {
     font create xyz
     font configure xyz -style
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -returnCodes error -result {bad option "-style": must be -family, -size, -weight, -slant, -underline, or -overstrike}
 
 
@@ -243,7 +245,7 @@ test font-6.2 {font command: create: name specified} -setup {
     font create xyz
     getnondefaultfonts
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {xyz}
 test font-6.3 {font command: create: name not really specified} -setup {
     clearnondefaultfonts
@@ -285,7 +287,7 @@ test font-6.7 {font command: create: already exists} -setup {
     font create xyz
     font create xyz
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -returnCodes error -result {named font "xyz" already exists}
 
 test font-7.1 {font command: delete: arguments} -body {
@@ -294,7 +296,7 @@ test font-7.1 {font command: delete: arguments} -body {
 } -returnCodes error -result {wrong # args: should be "font delete fontname ?fontname ...?"}
 test font-7.2 {font command: delete: loop test} -setup {
     clearnondefaultfonts
-	set x {}
+    set x {}
 } -body {
     # for (i = 2; i < objc; i++)
     font create a -underline 1
@@ -310,7 +312,7 @@ test font-7.2 {font command: delete: loop test} -setup {
 } -result {{a b c d e} d}
 test font-7.3 {font command: delete: loop test} -setup {
     clearnondefaultfonts
-	set x {}
+    set x {}
 } -body {
     # (namedHashPtr == NULL) in middle of loop
     font create a -underline 1
@@ -343,7 +345,7 @@ test font-7.5 {font command: delete: mark for later deletion} -setup {
     font actual xyz
     font configure xyz
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
 } -returnCodes error -result {named font "xyz" doesn't exist}
 test font-7.6 {font command: delete: mark for later deletion} -setup {
     destroy .t.f
@@ -357,7 +359,7 @@ test font-7.6 {font command: delete: mark for later deletion} -setup {
     font delete xyz
     font actual xyz
     catch {font configure xyz}
-	.t.f cget -font
+    .t.f cget -font
 } -cleanup {
 	destroy .t.f
 } -result xyz
@@ -383,7 +385,7 @@ test font-8.3 {font command: families: arguments} -body {
     # (objc - skip != 2) when skip == 2
     font families -displayof . xyz
 } -returnCodes error -result {wrong # args: should be "font families ?-displayof window?"}
-test font-8.4 {font command: families} -body {
+test font-8.4 {font command: families} -constraints failsOnUbuntu -body {
     # TkpGetFontFamilies()
     regexp -nocase times [font families]
 } -result 1
@@ -515,7 +517,7 @@ test font-12.1 {UpdateDependantFonts procedure: no users} -setup {
     font create xyz
     font configure xyz -family times
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {}
 test font-12.2 {UpdateDependantFonts procedure: pings the widgets} -setup {
     destroy .t.f
@@ -534,21 +536,21 @@ test font-12.2 {UpdateDependantFonts procedure: pings the widgets} -setup {
     set b2 [winfo reqwidth .t.f]
     expr {$a1==$b1 && $a2==$b2}
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
     font delete xyz
 } -result 1
 
 
 test font-13.1 {CreateNamedFont: new named font} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
     # not (new == 0)
     lappend x [getnondefaultfonts]
     font create xyz
     lappend x [getnondefaultfonts]
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {{} xyz}
 test font-13.2 {CreateNamedFont: named font already exists} -setup {
     catch {font delete xyz}
@@ -557,7 +559,7 @@ test font-13.2 {CreateNamedFont: named font already exists} -setup {
     font create xyz
     font create xyz
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -returnCodes error -result {named font "xyz" already exists}
 test font-13.3 {CreateNamedFont: named font already exists} -setup {
     catch {font delete xyz}
@@ -566,7 +568,7 @@ test font-13.3 {CreateNamedFont: named font already exists} -setup {
     font create xyz
     font create xyz
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -returnCodes error -result {named font "xyz" already exists}
 test font-13.4 {CreateNamedFont: recreate "deleted" font} -setup {
     destroy .t.f
@@ -581,8 +583,8 @@ test font-13.4 {CreateNamedFont: recreate "deleted" font} -setup {
     font create xyz -family courier
     font configure xyz -family
 } -cleanup {
-	font delete xyz
-	destroy .t.f
+    font delete xyz
+    destroy .t.f
 } -result {courier}
 
 
@@ -591,7 +593,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 {
@@ -604,7 +606,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 {}
@@ -619,7 +621,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 {}
@@ -642,7 +644,7 @@ test font-15.4 {Tk_AllocFontFromObj procedure: bump ref count} -setup {
     .t.f config -font {-family fixed}
     lindex [font actual {-family fixed}] 0
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
 } -result {-family}
 test font-15.5 {Tk_AllocFontFromObj procedure: get named font} -setup {
     destroy .t.f
@@ -654,7 +656,7 @@ test font-15.5 {Tk_AllocFontFromObj procedure: get named font} -setup {
     font create xyz
     .t.f config -font xyz
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
     font delete xyz
 } -result {}
 test font-15.6 {Tk_AllocFontFromObj procedure: not a named font} -setup {
@@ -665,7 +667,7 @@ test font-15.6 {Tk_AllocFontFromObj procedure: not a named font} -setup {
     # not (namedHashPtr != NULL)
     .t.f config -font {times 20}
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
 } -result {-family} -result {}
 test font-15.7 {Tk_AllocFontFromObj procedure: get native font} -constraints {
 	unix
@@ -709,7 +711,7 @@ test font-15.11 {Tk_AllocFontFromObj procedure: get attribute font} -body {
     lindex [font actual {plan 9}] 0
 } -result {-family}
 test font-15.12 {Tk_AllocFontFromObj procedure: setup tab width} -setup {
-	destroy .l
+    destroy .l
 } -body {
     # Tk_MeasureChars(fontPtr, "0", ...)
     label .l -bd 0 -padx 0  -highlightthickness 0 -font $fixed -text "a\tb"
@@ -718,7 +720,7 @@ test font-15.12 {Tk_AllocFontFromObj procedure: setup tab width} -setup {
 	set res2 [expr [font measure $fixed "0"]*9]
 	expr {$res1 eq $res2}
 } -cleanup {
-	destroy .l
+    destroy .l
 } -result 1
 test font-15.13 {Tk_AllocFontFromObj procedure: underline position} -setup {
     destroy .t.f
@@ -729,7 +731,7 @@ test font-15.13 {Tk_AllocFontFromObj procedure: underline position} -setup {
     .t.f config -text "underline" -font "times -8 underline"
     update
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
 } -result {}
 
 
@@ -741,7 +743,7 @@ test font-16.1 {Tk_NameOfFont procedure} -setup {
     .t.f config -font -family\ fixed
     .t.f cget -font
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
 } -result {-family fixed}
 
 
@@ -927,7 +929,7 @@ test font-21.5 {Tk_PostscriptFontName procedure: spaces} -constraints {
     }
 } -result {LucidaBright}
 test font-21.6 {Tk_PostscriptFontName procedure: spaces} -constraints {
-	x11
+	x11 failsOnUbuntu
 } -body {
     psfontname "{new century schoolbook} 10"
 } -result {NewCenturySchlbk-Roman}
@@ -1449,20 +1451,20 @@ 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"
-	pack .t.l
-	set ax [winfo reqwidth .t.l]
+    label .t.l -padx 0 -pady 0 -bd 0 -highlightthickness 0 -justify left \
+	    -text "0" -font "Courier -12"
+    pack .t.l
+    set ax [winfo reqwidth .t.l]
     expr {[font measure [.t.l cget -font] "000"] eq $ax*3}
 } -cleanup {
-	destroy .t.l
+    destroy .t.l
 } -result 1
 
 
 test font-23.1 {Tk_UnderlineChars procedure} -setup {
-	destroy .t.t
+    destroy .t.t
 } -body {
     text .t.t
     .t.t insert 1.0 abc\tdefg
@@ -1470,7 +1472,7 @@ test font-23.1 {Tk_UnderlineChars procedure} -setup {
     .t.t tag add sel 1.0 end
     update
 } -cleanup {
-	destroy .t.t
+    destroy .t.t
 } -result {}
 
 
@@ -1487,27 +1489,27 @@ test font-24.1 {Tk_ComputeTextLayout: empty string} -body {
 } -result {}
 test font-24.2 {Tk_ComputeTextLayout: simple string} -body {
     .t.l config -text "000"
-	update
-	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
-		[expr {[winfo reqheight .t.l] eq $ay}]
+    update
+    list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
+	    [expr {[winfo reqheight .t.l] eq $ay}]
 } -result {1 1}
 test font-24.3 {Tk_ComputeTextLayout: find special chars} -body {
     .t.l config -text "000\n000"
-	update
-	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
-		[expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    update
+    list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
+	    [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
 } -result {1 1}
 test font-24.4 {Tk_ComputeTextLayout: calls Tk_MeasureChars} -body {
     .t.l config -text "000\n000"
-	update
-	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
-		[expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    update
+    list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
+	    [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
 } -result {1 1}
 test font-24.5 {Tk_ComputeTextLayout: break line} -body {
     .t.l config -text "000\t00000" -wrap [expr 9 * $ax]
-	update
-	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 8}]}] \
-		[expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    update
+    list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 8}]}] \
+	    [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
 } -cleanup {
     .t.l config -wrap 0
 } -result {1 1}
@@ -1516,26 +1518,26 @@ test font-24.6 {Tk_ComputeTextLayout: normal ended on special char} -body {
 } -result {}
 test font-24.7 {Tk_ComputeTextLayout: special char was \n} -body {
     .t.l config -text "000\n0000"
-	update
-	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}] \
-		[expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    update
+    list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}] \
+	    [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
 } -result {1 1}
 test font-24.8 {Tk_ComputeTextLayout: special char was \t} -body {
     .t.l config -text "000\t00"
-	update
-	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 10}]}] \
-		[expr {[winfo reqheight .t.l] eq $ay}]
+    update
+    list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 10}]}] \
+	    [expr {[winfo reqheight .t.l] eq $ay}]
 } -result {1 1}
 test font-24.9 {Tk_ComputeTextLayout: tab didn't cause break} -body {
     set x {}
     .t.l config -text "000\t000"
-	update
+    update
     lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 11}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq $ay}]
+    lappend x [expr {[winfo reqheight .t.l] eq $ay}]
     .t.l config -text "000\t000" -wrap [expr 100 * $ax]
-	update
+    update
     lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 11}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq $ay}]
+    lappend x [expr {[winfo reqheight .t.l] eq $ay}]
     return $x
 } -cleanup {
     .t.l config -wrap 0
@@ -1543,13 +1545,13 @@ test font-24.9 {Tk_ComputeTextLayout: tab didn't cause break} -body {
 test font-24.10 {Tk_ComputeTextLayout: tab caused break} -body {
     set x {}
     .t.l config -text "000\t"
-	update
+    update
     lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 8}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq $ay}]
+    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 * 8}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    update
+    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 {
     .t.l config -wrap 0
@@ -1557,13 +1559,13 @@ test font-24.10 {Tk_ComputeTextLayout: tab caused break} -body {
 test font-24.11 {Tk_ComputeTextLayout: absorb spaces at eol} -body {
     set x {}
     .t.l config -text "000            000" -wrap [expr {$ax * 5}]
-	update
-	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    update
+    lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}]
+    lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
     .t.l config -text "000            "
-	update
-	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq $ay}]
+    update
+    lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}]
+    lappend x [expr {[winfo reqheight .t.l] eq $ay}]
     return $x
 } -cleanup {
     .t.l config -wrap 0
@@ -1571,44 +1573,44 @@ test font-24.11 {Tk_ComputeTextLayout: absorb spaces at eol} -body {
 test font-24.12 {Tk_ComputeTextLayout: append non-printing spaces to chunk} -body {
     set x {}
     .t.l config -text "000            0000" -wrap [expr {$ax * 5}]
-	update
-	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    update
+    lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
+    lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
     .t.l config -text "000\t00            0000" -wrap [expr {$ax * 12}]
-	update
-	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 10}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    update
+    lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 10}]}]
+    lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
     return $x
 } -cleanup {
     .t.l config -wrap 0
 } -result {1 1 1 1}
 test font-24.13 {Tk_ComputeTextLayout: many lines -> realloc line array} -body {
     .t.l config -text "\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\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\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\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\n\n\n\n\n\n\n\n"
-	update
-	list [expr {[winfo reqwidth .t.l] eq 1}] \
-		[expr {[winfo reqheight .t.l] eq [expr {$ay * 129}]}]
+    update
+    list [expr {[winfo reqwidth .t.l] eq 1}] \
+	    [expr {[winfo reqheight .t.l] eq [expr {$ay * 129}]}]
 } -result {1 1}
 test font-24.14 {Tk_ComputeTextLayout: text ended with \n} -body {
     set x {}
-	.t.l config -text "0000"
-	update
-	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq $ay}]
-	.t.l config -text "0000\n"
-	update
-	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
-    return $x
+    .t.l config -text "0000"
+    update
+    lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
+    lappend x [expr {[winfo reqheight .t.l] eq $ay}]
+    .t.l config -text "0000\n"
+    update
+    lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
+    lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    set x
 } -result {1 1 1 1}
 destroy .t.l
 
 test font-24.15 {Tk_ComputeTextLayout: justification} -setup {
     set x {}
-	destroy .t.c
-	canvas .t.c -closeenough 0
-	.t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
-	pack .t.c
-	update
+    destroy .t.c
+    canvas .t.c -closeenough 0
+    .t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
+    pack .t.c
+    update
 } -body {
     csetup "000\n00000"
     .t.c itemconfig text -just left
@@ -1620,7 +1622,7 @@ test font-24.15 {Tk_ComputeTextLayout: justification} -setup {
     .t.c itemconfig text -just left
     return $x
 } -cleanup {
-	destroy .t.c
+    destroy .t.c
 } -result {2 1 0}
 
 
@@ -1632,7 +1634,7 @@ test font-25.1 {Tk_FreeTextLayout procedure} -setup {
     .t.f config -text foo
     .t.f config -text boo
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
 } -result {}
 
 
@@ -1649,7 +1651,7 @@ test font-26.1 {Tk_DrawTextLayout procedure: auto-detect last char} -setup {
 } -body {
     .t.f config -text foo
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
 } -result {}
 test font-26.2 {Tk_DrawTextLayout procedure: multiple chunks} -body {
     csetup "000\t00\n000"
@@ -1794,110 +1796,110 @@ pack .t.c
 update
 test font-30.1 {Tk_DistanceToTextLayout procedure: loop once} -body {
     csetup "000\n000\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x 0 -y 0
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result 0
 test font-30.2 {Tk_DistanceToTextLayout procedure: loop multiple} -body {
     csetup "000\n000\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x $ax -y $ay
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result 5
 test font-30.3 {Tk_DistanceToTextLayout procedure: loop to end} -body {
     csetup "000\n0\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x [expr $ax*2] -y $ay
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result {}
 test font-30.4 {Tk_DistanceToTextLayout procedure: hit a special char (tab)} -body {
     csetup "000\t000\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x [expr $ax*6] -y 0
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result 3
 test font-30.5 {Tk_DistanceToTextLayout procedure: ignore newline} -body {
     csetup "000\n0\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x [expr $ax*2] -y $ay
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result {}
 test font-30.6 {Tk_DistanceToTextLayout procedure: ignore spaces at eol} -body {
     csetup "000\n000      000000000"
     .t.c itemconfig text -width [expr $ax*10]
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x [expr $ax*5] -y $ay
     .t.c itemconfig text -width 0
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result {}
 .t.c itemconfig text -justify center
 test font-30.7 {Tk_DistanceToTextLayout procedure: on left side} -body {
     csetup "0\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x 0 -y 0
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result {}
 test font-30.8 {Tk_DistanceToTextLayout procedure: on right side} -body {
     csetup "0\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x [expr $ax*2] -y 0
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result {}
 test font-30.9 {Tk_DistanceToTextLayout procedure: inside line} -body {
     csetup "0\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x $ax -y 0
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result 0
 test font-30.10 {Tk_DistanceToTextLayout procedure: above line} -body {
     csetup "0\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x 0 -y 0
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result {}
 test font-30.11 {Tk_DistanceToTextLayout procedure: below line} -body {
     csetup "000\n0"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x 0 -y $ay
@@ -1907,7 +1909,7 @@ test font-30.11 {Tk_DistanceToTextLayout procedure: below line} -body {
 } -result {}
 test font-30.12 {Tk_DistanceToTextLayout procedure: in line} -body {
     csetup "0\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x $ax -y $ay
@@ -1918,13 +1920,13 @@ test font-30.12 {Tk_DistanceToTextLayout procedure: in line} -body {
 .t.c itemconfig text -justify left
 test font-30.13 {Tk_DistanceToTextLayout procedure: exact hit} -body {
     csetup "000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x $ax -y 0
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result 1
 destroy .t.c
 
@@ -1976,11 +1978,11 @@ destroy .t.c
 
 
 test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer doesn't overflow} -setup {
-	destroy .t.c
-	canvas .t.c -closeenough 0
-	.t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
-	pack .t.c
-	update
+    destroy .t.c
+    canvas .t.c -closeenough 0
+    .t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
+    pack .t.c
+    update
 } -body {
     # If there were a whole bunch of returns or tabs in a row, then the
     # temporary buffer could overflow and write on the stack.
@@ -1993,7 +1995,7 @@ test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer doesn't overflow} -setu
     set i [string first "(qwerty" $x]
     string range $x $i [expr {$i + 278}]
 } -cleanup {
-	destroy .t.c
+    destroy .t.c
 } -result {(qwertyuiopasdfghjklzxcvbnm1234qwertyuiopasdfghjklzxcvbnm)]
 [(qwertyuiopasdfghjklzxcvbnm1234qwertyuiopasdfghjklzxcvbnm)]
 [()]
@@ -2051,85 +2053,85 @@ test font-34.2 {ConfigAttributesObj procedure: arguments} -setup {
 
 test font-34.3 {ConfigAttributesObj procedure: family} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -family xyz
-	lappend x [font config xyz -family]
-	font config xyz -family times
-	lappend x [font config xyz -family]
+    font create xyz -family xyz
+    lappend x [font config xyz -family]
+    font config xyz -family times
+    lappend x [font config xyz -family]
 } -cleanup {
 	font delete xyz
 } -result {xyz times}
 test font-34.4 {ConfigAttributesObj procedure: size} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -size 20
-	lappend x [font config xyz -size]
-	font config xyz -size 40
-	lappend x [font config xyz -size]
+    font create xyz -size 20
+    lappend x [font config xyz -size]
+    font config xyz -size 40
+    lappend x [font config xyz -size]
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {20 40}
 test font-34.5 {ConfigAttributesObj procedure: weight} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -weight normal
-	lappend x [font config xyz -weight]
-	font config xyz -weight bold
-	lappend x [font config xyz -weight]
+    font create xyz -weight normal
+    lappend x [font config xyz -weight]
+    font config xyz -weight bold
+    lappend x [font config xyz -weight]
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {normal bold}
 test font-34.6 {ConfigAttributesObj procedure: slant} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -slant roman
-	lappend x [font config xyz -slant]
-	font config xyz -slant italic
-	lappend x [font config xyz -slant]
+    font create xyz -slant roman
+    lappend x [font config xyz -slant]
+    font config xyz -slant italic
+    lappend x [font config xyz -slant]
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {roman italic}
 test font-34.7 {ConfigAttributesObj procedure: underline} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -underline 0
-	lappend x [font config xyz -underline]
-	font config xyz -underline 1
-	lappend x [font config xyz -underline]
+    font create xyz -underline 0
+    lappend x [font config xyz -underline]
+    font config xyz -underline 1
+    lappend x [font config xyz -underline]
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {0 1}
 test font-34.8 {ConfigAttributesObj procedure: overstrike} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -overstrike 0
-	lappend x [font config xyz -overstrike]
-	font config xyz -overstrike 1
-	lappend x [font config xyz -overstrike]
+    font create xyz -overstrike 0
+    lappend x [font config xyz -overstrike]
+    font config xyz -overstrike 1
+    lappend x [font config xyz -overstrike]
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {0 1}
 
 test font-34.9 {ConfigAttributesObj procedure: size} -body {
-	font create xyz -size xyz
+    font create xyz -size xyz
 } -returnCodes error -result {expected integer but got "xyz"}
 test font-34.10 {ConfigAttributesObj procedure: weight} -body {
-	font create xyz -weight xyz
+    font create xyz -weight xyz
 } -returnCodes error -result {bad -weight value "xyz": must be normal, or bold}
 test font-34.11 {ConfigAttributesObj procedure: slant} -body {
-	font create xyz -slant xyz
+    font create xyz -slant xyz
 } -returnCodes error -result {bad -slant value "xyz": must be roman, or italic}
 test font-34.12 {ConfigAttributesObj procedure: underline} -body {
-	font create xyz -underline xyz
+    font create xyz -underline xyz
 } -returnCodes error -result {expected boolean value but got "xyz"}
 test font-34.13 {ConfigAttributesObj procedure: overstrike} -body {
-	font create xyz -overstrike xyz
+    font create xyz -overstrike xyz
 } -returnCodes error -result {expected boolean value but got "xyz"}
 
 
@@ -2140,7 +2142,7 @@ test font-35.1 {GetAttributeInfoObj procedure: one attribute} -setup {
     font create xyz -family xyz
     font config xyz -family
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {xyz}
 
 
@@ -2151,7 +2153,7 @@ test font-36.1 {GetAttributeInfoObj procedure: unknown attribute} -setup {
     font create xyz
     font config xyz -xyz
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -returnCodes {
     error
 } -result {bad option "-xyz": must be -family, -size, -weight, -slant, -underline, or -overstrike}
@@ -2164,60 +2166,60 @@ test font-37.1 {GetAttributeInfoObj procedure: all attributes} -setup {
     font create xyz -family xyz
     font config xyz
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {-family xyz -size 0 -weight normal -slant roman -underline 0 -overstrike 0}
 test font-37.2 {GetAttributeInfo procedure: family} -setup {
     catch {font delete xyz}
 } -body {
-	font create xyz -family xyz
-	font config xyz -family
+    font create xyz -family xyz
+    font config xyz -family
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {xyz}
 test font-37.3 {GetAttributeInfo procedure: size} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -size 20
-	font config xyz -size
+    font create xyz -size 20
+    font config xyz -size
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result 20
 test font-37.4 {GetAttributeInfo procedure: weight} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -weight normal
-	font config xyz -weight
+    font create xyz -weight normal
+    font config xyz -weight
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {normal}
 test font-37.5 {GetAttributeInfo procedure: slant} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -slant italic
-	font config xyz -slant
+    font create xyz -slant italic
+    font config xyz -slant
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {italic}
 test font-37.6 {GetAttributeInfo procedure: underline} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -underline yes
-	font config xyz -underline
+    font create xyz -underline yes
+    font config xyz -underline
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result 1
 test font-37.7 {GetAttributeInfo procedure: overstrike} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -overstrike no
-	font config xyz -overstrike
+    font create xyz -overstrike no
+    font config xyz -overstrike
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result 0
 
 
@@ -2256,7 +2258,7 @@ test font-38.10 {ParseFontNameObj procedure: arguments} -body {
     font actual {times xyz xyz}
 } -returnCodes error -result {expected integer but got "xyz"}
 test font-38.11 {ParseFontNameObj procedure: stylelist loop} -constraints {
-	unixOrWin
+	unixOrWin failsOnUbuntuNoXft
 } -body {
     lrange [font actual {times 12 bold italic overstrike underline}] 4 end
 } -result {-weight bold -slant italic -underline 1 -overstrike 1}
@@ -2338,21 +2340,21 @@ test font-43.1 {FieldSpecified procedure: specified vs. non-specified} -body {
 } -result [font actual {times 0} -family]
 
 
-test font-44.1 {TkFontGetPixels: size < 0} -setup {
-	set oldscale [tk scaling]
+test font-44.1 {TkFontGetPixels: size < 0} -constraints failsOnUbuntuNoXft -setup {
+    set oldscale [tk scaling]
 } -body {
-	tk scaling 0.5
+    tk scaling 0.5
     font actual {times -12} -size
 } -cleanup {
-	tk scaling $oldscale
+    tk scaling $oldscale
 } -result 24
-test font-44.2 {TkFontGetPoints: size >= 0} -constraints noExceed -setup {
-	set oldscale [tk scaling]
+test font-44.2 {TkFontGetPoints: size >= 0} -constraints {noExceed failsOnUbuntuNoXft} -setup {
+    set oldscale [tk scaling]
 } -body {
-	tk scaling 0.5
+    tk scaling 0.5
     font actual {times 12} -size
 } -cleanup {
-	tk scaling $oldscale
+    tk scaling $oldscale
 } -result 12
 
 
@@ -2374,12 +2376,12 @@ test font-45.3 {TkFontGetAliasList: match} -constraints {noExceed} -body {
 
 
 test font-46.1 {font actual, with character, no option, no --} -body {
-	font actual {times 10} a
+    font actual {times 10} a
 } -match glob -result [list -family [font actual {times 10} -family] -size *\
 		 -slant roman -underline 0 -overstrike 0]
 
 test font-46.2 {font actual, with character introduced by --} -body {
-	font actual {times 10} -- -
+    font actual {times 10} -- -
 } -match glob -result [list -family [font actual {times 10} -family] -size *\
 		 -slant roman -underline 0 -overstrike 0]