Fix test-case bind-27.2 on X11 (it worked on win32)bug_38dc27bd1d0ecd68

Merge trunk.

3 files changed, 305 insertions, 458 deletions

diff --git a/tests/bind.test b/tests/bind.test
index 1b1107a..0514499 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -5757,8 +5757,8 @@ test bind-27.1 {button names} -body {
     bind .t <Expose-1> foo
 } -returnCodes error -result {specified button "1" for non-button event}
 test bind-27.2 {button names} -body {
-    bind .t <Button-@> foo
-} -returnCodes error -result {specified keysym "@" for non-key event}
+    bind .t <Button-10> foo
+} -returnCodes error -result {bad event type or keysym "10"}
 test bind-27.3 {button names} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
diff --git a/tests/send.test b/tests/send.test
index f124861..945d4d0 100644
--- a/tests/send.test
+++ b/tests/send.test
@@ -441,7 +441,7 @@ test send-10.8 {SendEventProc procedure, exceptional return} {secureserver tests
 } {
 r
 -s 62
--r
+-r 
 -c 3
 }
 test send-10.9 {SendEventProc procedure, empty return} {secureserver testsend} {
@@ -453,7 +453,7 @@ test send-10.9 {SendEventProc procedure, empty return} {secureserver testsend} {
 } {
 r
 -s 62
--r
+-r 
 }
 test send-10.10 {SendEventProc procedure, asynchronous calls} {secureserver testsend} {
     testsend prop [winfo id .f] Comm {}
diff --git a/tests/textTag.test b/tests/textTag.test
index 08a9455..2df8c5a 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -13,9 +13,6 @@ tcltest::loadTestedCommands
 
 destroy .t
 text .t -width 20 -height 10
-testConstraint haveCourier12 [expr {[catch {
-    .t configure -font {Courier 12}
-}] == 0}]
 
 pack append . .t {top expand fill}
 update
@@ -40,308 +37,290 @@ bOy GIrl .#@? x_yz
 !@#$%
 Line 7"
 
-test textTag-1.1 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.1 {tag configuration options} -body {
     .t tag configure x -background #012345
     .t tag cget x -background
 } -cleanup {
     .t tag configure x -background [lindex [.t tag configure x -background] 3]
 } -result {#012345}
-test textTag-1.2 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.2 {configuration options} -body {
     .t tag configure x -background non-existent
 } -cleanup {
     .t tag configure x -background [lindex [.t tag configure x -background] 3]
 } -returnCodes error -result {unknown color name "non-existent"}
-test textTag-1.3 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.3 {tag configuration options} -body {
     .t tag configure x -bgstipple gray50
     .t tag cget x -bgstipple
 } -cleanup {
     .t tag configure x -bgstipple [lindex [.t tag configure x -bgstipple] 3]
 } -result {gray50}
-test textTag-1.4 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.4 {configuration options} -body {
     .t tag configure x -bgstipple badStipple
 } -cleanup {
     .t tag configure x -bgstipple [lindex [.t tag configure x -bgstipple] 3]
 } -returnCodes error -result {bitmap "badStipple" not defined}
-test textTag-1.5 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.5 {tag configuration options} -body {
     .t tag configure x -borderwidth 2
     .t tag cget x -borderwidth
 } -cleanup {
     .t tag configure x -borderwidth [lindex [.t tag configure x -borderwidth] 3]
 } -result {2}
-test textTag-1.6 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.6 {configuration options} -body {
     .t tag configure x -borderwidth 46q
 } -cleanup {
     .t tag configure x -borderwidth [lindex [.t tag configure x -borderwidth] 3]
 } -returnCodes error -result {bad screen distance "46q"}
-test textTag-1.7 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.7 {tag configuration options} -body {
     .t tag configure x -fgstipple gray25
     .t tag cget x -fgstipple
 } -cleanup {
     .t tag configure x -fgstipple [lindex [.t tag configure x -fgstipple] 3]
 } -result {gray25}
-test textTag-1.8 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.8 {configuration options} -body {
     .t tag configure x -fgstipple bogus
 } -cleanup {
     .t tag configure x -fgstipple [lindex [.t tag configure x -fgstipple] 3]
 } -returnCodes error -result {bitmap "bogus" not defined}
-test textTag-1.9 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.9 {tag configuration options} -body {
     .t tag configure x -font fixed
     .t tag cget x -font
 } -cleanup {
     .t tag configure x -font [lindex [.t tag configure x -font] 3]
 } -result {fixed}
-test textTag-1.10 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.10 {tag configuration options} -body {
     .t tag configure x -foreground #001122
     .t tag cget x -foreground
 } -cleanup {
     .t tag configure x -foreground [lindex [.t tag configure x -foreground] 3]
 } -result {#001122}
-test textTag-1.11 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.11 {configuration options} -body {
     .t tag configure x -foreground {silly color}
 } -cleanup {
     .t tag configure x -foreground [lindex [.t tag configure x -foreground] 3]
 } -returnCodes error -result {unknown color name "silly color"}
-test textTag-1.12 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.12 {tag configuration options} -body {
     .t tag configure x -justify left
     .t tag cget x -justify
 } -cleanup {
     .t tag configure x -justify [lindex [.t tag configure x -justify] 3]
 } -result {left}
-test textTag-1.13 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.13 {configuration options} -body {
     .t tag configure x -justify middle
 } -cleanup {
     .t tag configure x -justify [lindex [.t tag configure x -justify] 3]
 } -returnCodes error -result {bad justification "middle": must be left, right, or center}
-test textTag-1.14 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.14 {tag configuration options} -body {
     .t tag configure x -lmargin1 10
     .t tag cget x -lmargin1
 } -cleanup {
     .t tag configure x -lmargin1 [lindex [.t tag configure x -lmargin1] 3]
 } -result {10}
-test textTag-1.15 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.15 {configuration options} -body {
     .t tag configure x -lmargin1 bad
 } -cleanup {
     .t tag configure x -lmargin1 [lindex [.t tag configure x -lmargin1] 3]
 } -returnCodes error -result {bad screen distance "bad"}
-test textTag-1.16 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.16 {tag configuration options} -body {
     .t tag configure x -lmargin2 10
     .t tag cget x -lmargin2
 } -cleanup {
     .t tag configure x -lmargin2 [lindex [.t tag configure x -lmargin2] 3]
 } -result {10}
-test textTag-1.17 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.17 {configuration options} -body {
     .t tag configure x -lmargin2 bad
 } -cleanup {
     .t tag configure x -lmargin2 [lindex [.t tag configure x -lmargin2] 3]
 } -returnCodes error -result {bad screen distance "bad"}
-test textTag-1.18 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.17a {tag configuration options} -body {
+    .t tag configure x -lmargincolor lightgreen
+    .t tag cget x -lmargincolor
+} -cleanup {
+    .t tag configure x -lmargincolor [lindex [.t tag configure x -lmargincolor] 3]
+} -result {lightgreen}
+test textTag-1.17b {configuration options} -body {
+    .t tag configure x -lmargincolor non-existent
+} -cleanup {
+    .t tag configure x -lmargincolor [lindex [.t tag configure x -lmargincolor] 3]
+} -returnCodes error -result {unknown color name "non-existent"}
+test textTag-1.18 {tag configuration options} -body {
     .t tag configure x -offset 2
     .t tag cget x -offset
 } -cleanup {
     .t tag configure x -offset [lindex [.t tag configure x -offset] 3]
 } -result {2}
-test textTag-1.19 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.19 {configuration options} -body {
     .t tag configure x -offset 100xyz
 } -cleanup {
     .t tag configure x -offset [lindex [.t tag configure x -offset] 3]
 } -returnCodes error -result {bad screen distance "100xyz"}
-test textTag-1.20 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.20 {tag configuration options} -body {
     .t tag configure x -overstrike on
     .t tag cget x -overstrike
 } -cleanup {
     .t tag configure x -overstrike [lindex [.t tag configure x -overstrike] 3]
 } -result {on}
-test textTag-1.21 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.21 {configuration options} -body {
     .t tag configure x -overstrike stupid
 } -cleanup {
     .t tag configure x -overstrike [lindex [.t tag configure x -overstrike] 3]
 } -returnCodes error -result {expected boolean value but got "stupid"}
-test textTag-1.22 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.21a {tag configuration options} -body {
+    .t tag configure x -overstrikefg red
+    .t tag cget x -overstrikefg
+} -cleanup {
+    .t tag configure x -overstrikefg [lindex [.t tag configure x -overstrikefg] 3]
+} -result {red}
+test textTag-1.21b {configuration options} -body {
+    .t tag configure x -overstrikefg stupid
+} -cleanup {
+    .t tag configure x -overstrikefg [lindex [.t tag configure x -overstrikefg] 3]
+} -returnCodes error -result {unknown color name "stupid"}
+test textTag-1.22 {tag configuration options} -body {
     .t tag configure x -relief raised
     .t tag cget x -relief
 } -cleanup {
     .t tag configure x -relief [lindex [.t tag configure x -relief] 3]
 } -result {raised}
-test textTag-1.23 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.23 {configuration options} -body {
     .t tag configure x -relief stupid
 } -cleanup {
     .t tag configure x -relief [lindex [.t tag configure x -relief] 3]
 } -returnCodes error -result {bad relief "stupid": must be flat, groove, raised, ridge, solid, or sunken}
-test textTag-1.24 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.24 {tag configuration options} -body {
     .t tag configure x -rmargin 10
     .t tag cget x -rmargin
 } -cleanup {
     .t tag configure x -rmargin [lindex [.t tag configure x -rmargin] 3]
 } -result {10}
-test textTag-1.25 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.25 {configuration options} -body {
     .t tag configure x -rmargin bad
 } -cleanup {
     .t tag configure x -rmargin [lindex [.t tag configure x -rmargin] 3]
 } -returnCodes error -result {bad screen distance "bad"}
-test textTag-1.26 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.25a {tag configuration options} -body {
+    .t tag configure x -rmargincolor darkblue
+    .t tag cget x -rmargincolor
+} -cleanup {
+    .t tag configure x -rmargincolor [lindex [.t tag configure x -rmargincolor] 3]
+} -result {darkblue}
+test textTag-1.25b {configuration options} -body {
+    .t tag configure x -rmargincolor non-existent
+} -cleanup {
+    .t tag configure x -rmargincolor [lindex [.t tag configure x -rmargincolor] 3]
+} -returnCodes error -result {unknown color name "non-existent"}
+test textTag-1.25c {tag configuration options} -body {
+    .t tag configure x -selectbackground #012345
+    .t tag cget x -selectbackground
+} -cleanup {
+    .t tag configure x -selectbackground [lindex [.t tag configure x -selectbackground] 3]
+} -result {#012345}
+test textTag-1.25d {configuration options} -body {
+    .t tag configure x -selectbackground non-existent
+} -cleanup {
+    .t tag configure x -selectbackground [lindex [.t tag configure x -selectbackground] 3]
+} -returnCodes error -result {unknown color name "non-existent"}
+test textTag-1.25e {tag configuration options} -body {
+    .t tag configure x -selectforeground #012345
+    .t tag cget x -selectforeground
+} -cleanup {
+    .t tag configure x -selectforeground [lindex [.t tag configure x -selectforeground] 3]
+} -result {#012345}
+test textTag-1.25f {configuration options} -body {
+    .t tag configure x -selectforeground non-existent
+} -cleanup {
+    .t tag configure x -selectforeground [lindex [.t tag configure x -selectforeground] 3]
+} -returnCodes error -result {unknown color name "non-existent"}
+test textTag-1.26 {tag configuration options} -body {
     .t tag configure x -spacing1 10
     .t tag cget x -spacing1
 } -cleanup {
     .t tag configure x -spacing1 [lindex [.t tag configure x -spacing1] 3]
 } -result {10}
-test textTag-1.27 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.27 {configuration options} -body {
     .t tag configure x -spacing1 bad
 } -cleanup {
     .t tag configure x -spacing1 [lindex [.t tag configure x -spacing1] 3]
 } -returnCodes error -result {bad screen distance "bad"}
-test textTag-1.28 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.28 {tag configuration options} -body {
     .t tag configure x -spacing2 10
     .t tag cget x -spacing2
 } -cleanup {
     .t tag configure x -spacing2 [lindex [.t tag configure x -spacing2] 3]
 } -result {10}
-test textTag-1.29 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.29 {configuration options} -body {
     .t tag configure x -spacing2 bad
 } -cleanup {
     .t tag configure x -spacing2 [lindex [.t tag configure x -spacing2] 3]
 } -returnCodes error -result {bad screen distance "bad"}
-test textTag-1.30 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.30 {tag configuration options} -body {
     .t tag configure x -spacing3 10
     .t tag cget x -spacing3
 } -cleanup {
     .t tag configure x -spacing3 [lindex [.t tag configure x -spacing3] 3]
 } -result {10}
-test textTag-1.31 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.31 {configuration options} -body {
     .t tag configure x -spacing3 bad
 } -cleanup {
     .t tag configure x -spacing3 [lindex [.t tag configure x -spacing3] 3]
 } -returnCodes error -result {bad screen distance "bad"}
-test textTag-1.32 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.32 {tag configuration options} -body {
     .t tag configure x -tabs {10 20 30}
     .t tag cget x -tabs
 } -cleanup {
     .t tag configure x -tabs [lindex [.t tag configure x -tabs] 3]
 } -result {10 20 30}
-test textTag-1.33 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.33 {configuration options} -body {
     .t tag configure x -tabs {10 fork}
 } -cleanup {
     .t tag configure x -tabs [lindex [.t tag configure x -tabs] 3]
 } -returnCodes error -result {bad tab alignment "fork": must be left, right, center, or numeric}
-test textTag-1.34 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.34 {tag configuration options} -body {
     .t tag configure x -underline no
     .t tag cget x -underline
 } -cleanup {
     .t tag configure x -underline [lindex [.t tag configure x -underline] 3]
 } -result {no}
-test textTag-1.35 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.35 {configuration options} -body {
     .t tag configure x -underline stupid
 } -cleanup {
     .t tag configure x -underline [lindex [.t tag configure x -underline] 3]
 } -returnCodes error -result {expected boolean value but got "stupid"}
+test textTag-1.36 {tag configuration options} -body {
+    .t tag configure x -underlinefg red
+    .t tag cget x -underlinefg
+} -cleanup {
+    .t tag configure x -underlinefg [lindex [.t tag configure x -underlinefg] 3]
+} -result {red}
+test textTag-1.37 {configuration options} -body {
+    .t tag configure x -underlinefg stupid
+} -cleanup {
+    .t tag configure x -underlinefg [lindex [.t tag configure x -underlinefg] 3]
+} -returnCodes error -result {unknown color name "stupid"}
 
 
-test textTag-2.1 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-2.1 {TkTextTagCmd - "add" option} -body {
     .t tag
 } -returnCodes error -result {wrong # args: should be ".t tag option ?arg ...?"}
-test textTag-2.2 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-2.2 {TkTextTagCmd - "add" option} -body {
     .t tag gorp
 } -returnCodes error -result {bad tag option "gorp": must be add, bind, cget, configure, delete, lower, names, nextrange, prevrange, raise, ranges, or remove}
-test textTag-2.3 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-2.3 {TkTextTagCmd - "add" option} -body {
     .t tag add foo
 } -returnCodes error -result {wrong # args: should be ".t tag add tagName index1 ?index2 index1 index2 ...?"}
-test textTag-2.4 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-2.4 {TkTextTagCmd - "add" option} -body {
     .t tag add x gorp
 } -returnCodes error -result {bad text index "gorp"}
-test textTag-2.5 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-2.5 {TkTextTagCmd - "add" option} -body {
     .t tag add x 1.2 gorp
 } -returnCodes error -result {bad text index "gorp"}
-test textTag-2.6 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12
-} -setup {
+test textTag-2.6 {TkTextTagCmd - "add" option} -setup {
     .t tag delete sel
 } -body {
     .t tag add sel 3.2 3.4
     .t tag add sel 3.2 3.0
     .t tag ranges sel
 } -result {3.2 3.4}
-test textTag-2.7 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12
-} -setup {
+test textTag-2.7 {TkTextTagCmd - "add" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 1.0 1.end
@@ -349,9 +328,7 @@ test textTag-2.7 {TkTextTagCmd - "add" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {1.0 1.6}
-test textTag-2.8 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12
-} -setup {
+test textTag-2.8 {TkTextTagCmd - "add" option} -setup {
     .t tag remove x 1.0 end
 } -body {
     .t tag add x 1.2
@@ -359,9 +336,7 @@ test textTag-2.8 {TkTextTagCmd - "add" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {1.2 1.3}
-test textTag-2.9 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12
-} -setup {
+test textTag-2.9 {TkTextTagCmd - "add" option} -setup {
     destroy .t.e
 } -body {
     entry .t.e
@@ -373,9 +348,7 @@ test textTag-2.9 {TkTextTagCmd - "add" option} -constraints {
 } -cleanup {
     destroy .t.e
 } -result 34
-test textTag-2.10 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12
-} -setup {
+test textTag-2.10 {TkTextTagCmd - "add" option} -setup {
     destroy .t.e
 } -body {
     entry .t.e
@@ -388,23 +361,19 @@ test textTag-2.10 {TkTextTagCmd - "add" option} -constraints {
 } -cleanup {
     destroy .t.e
 }  -result {Text}
-test textTag-2.11 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-2.11 {TkTextTagCmd - "add" option} -body {
     .t tag remove sel 1.0 end
     .t tag add sel 1.1 1.5 2.4 3.1 4.2 4.4
     .t tag ranges sel
 } -result {1.1 1.5 2.4 3.1 4.2 4.4}
-test textTag-2.12 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-2.12 {TkTextTagCmd - "add" option} -body {
     .t tag remove sel 1.0 end
     .t tag add sel 1.1 1.5 2.4
     .t tag ranges sel
 } -cleanup {
     .t tag remove sel 1.0 end
 } -result {1.1 1.5 2.4 2.5}
-test textTag-2.14 {tag add before -startline - Bug 1615425} haveCourier12 {
+test textTag-2.14 {tag add before -startline - Bug 1615425} -body {
     text .tt
     for {set i 1} {$i <10} {incr i} {
         .tt insert end "Line $i\n"
@@ -416,44 +385,32 @@ test textTag-2.14 {tag add before -startline - Bug 1615425} haveCourier12 {
     .tt tag add mytag 1.0 1.end
     destroy .ptt .tt
     set res 1
-} {1}
+} -result {1}
 
 
-test textTag-3.1 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-3.1 {TkTextTagCmd - "bind" option} -body {
     .t tag bind
 } -returnCodes error -result {wrong # args: should be ".t tag bind tagName ?sequence? ?command?"}
-test textTag-3.2 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-3.2 {TkTextTagCmd - "bind" option} -body {
     .t tag bind 1 2 3 4
 } -returnCodes error -result {wrong # args: should be ".t tag bind tagName ?sequence? ?command?"}
-test textTag-3.3 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-3.3 {TkTextTagCmd - "bind" option} -body {
     .t tag bind x <Enter> script1
     .t tag bind x <Enter>
 } -cleanup {
     .t tag delete x
 } -result {script1}
-test textTag-3.4 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-3.4 {TkTextTagCmd - "bind" option} -body {
     .t tag bind x <Gorp> script2
 } -returnCodes error -result {bad event type or keysym "Gorp"}
-test textTag-3.5 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-3.5 {TkTextTagCmd - "bind" option} -body {
     .t tag delete x
     .t tag bind x <Enter> script1
     .t tag bind x <FocusIn> script2
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {requested illegal events; only key, button, motion, enter, leave, and virtual events may be used}
-test textTag-3.6 {TkTextTagCmd - "bind" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-3.6 {TkTextTagCmd - "bind" option} -body {
     .t tag delete x
     .t tag bind x <Enter> script1
     catch {.t tag bind x <FocusIn> script2}
@@ -461,9 +418,7 @@ test textTag-3.6 {TkTextTagCmd - "bind" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {<Enter>}
-test textTag-3.7 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-3.7 {TkTextTagCmd - "bind" option} -body {
     .t tag delete x
     .t tag bind x <Enter> script1
     .t tag bind x <Leave> script2
@@ -472,9 +427,7 @@ test textTag-3.7 {TkTextTagCmd - "bind" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {{<Enter> <Leave> a} script1 xyzzy}
-test textTag-3.8 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-3.8 {TkTextTagCmd - "bind" option} -body {
     .t tag delete x
     .t tag bind x <Enter> script1
     .t tag bind x <Enter> +script2
@@ -483,17 +436,13 @@ test textTag-3.8 {TkTextTagCmd - "bind" option} -constraints {
     .t tag delete x
 } -result {script1
 script2}
-test textTag-3.9 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-3.9 {TkTextTagCmd - "bind" option} -body {
     .t tag delete x
     .t tag bind x <Enter>
 } -cleanup {
     .t tag delete x
 } -returnCodes ok -result {}
-test textTag-3.10 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-3.10 {TkTextTagCmd - "bind" option} -body {
     .t tag delete x
     .t tag bind x <
 } -cleanup {
@@ -501,30 +450,20 @@ test textTag-3.10 {TkTextTagCmd - "bind" option} -constraints {
 } -returnCodes error -result {no event type or button # or keysym}
 
 
-test textTag-4.1 {TkTextTagCmd - "cget" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-4.1 {TkTextTagCmd - "cget" option} -body {
     .t tag cget a
 } -returnCodes error -result {wrong # args: should be ".t tag cget tagName option"}
-test textTag-4.2 {TkTextTagCmd - "cget" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-4.2 {TkTextTagCmd - "cget" option} -body {
     .t tag cget a b c
 } -returnCodes error -result {wrong # args: should be ".t tag cget tagName option"}
-test textTag-4.3 {TkTextTagCmd - "cget" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-4.3 {TkTextTagCmd - "cget" option} -body {
     .t tag delete foo
     .t tag cget foo bar
 } -returnCodes error -result {tag "foo" isn't defined in text widget}
-test textTag-4.4 {TkTextTagCmd - "cget" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-4.4 {TkTextTagCmd - "cget" option} -body {
     .t tag cget sel bogus
 } -returnCodes error -result {unknown option "bogus"}
-test textTag-4.5 {TkTextTagCmd - "cget" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-4.5 {TkTextTagCmd - "cget" option} -body {
     .t tag delete x
     .t tag configure x -background red
     .t tag cget x -background
@@ -533,136 +472,133 @@ test textTag-4.5 {TkTextTagCmd - "cget" option} -constraints {
 } -result {red}
 
 
-test textTag-5.1 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-5.1 {TkTextTagCmd - "configure" option} -body {
     .t tag configure
 } -returnCodes error -result {wrong # args: should be ".t tag configure tagName ?-option? ?value? ?-option value ...?"}
-test textTag-5.2 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-5.2 {TkTextTagCmd - "configure" option} -body {
     .t tag configure x -foo
 } -returnCodes error -result {unknown option "-foo"}
-test textTag-5.3 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-5.3 {TkTextTagCmd - "configure" option} -body {
     .t tag configure x -background red -underline
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {value for "-underline" missing}
-test textTag-5.4 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-5.4 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -underline yes
     .t tag configure x -underline
 } -cleanup {
     .t tag delete x
 } -result {-underline {} {} {} yes}
-test textTag-5.5 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-5.4a {TkTextTagCmd - "configure" option} -body {
+    .t tag delete x
+    .t tag configure x -underlinefg lightgreen
+    .t tag configure x -underlinefg
+} -cleanup {
+    .t tag delete x
+} -result {-underlinefg {} {} {} lightgreen}
+test textTag-5.5 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -overstrike on
     .t tag cget x -overstrike
 } -cleanup {
     .t tag delete x
 } -result {on}
-test textTag-5.6 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-5.5a {TkTextTagCmd - "configure" option} -body {
+    .t tag delete x
+    .t tag configure x -overstrikefg lightgreen
+    .t tag configure x -overstrikefg
+} -cleanup {
+    .t tag delete x
+} -result {-overstrikefg {} {} {} lightgreen}
+test textTag-5.6 {TkTextTagCmd - "configure" option} -body {
     .t tag configure x -overstrike foo
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {expected boolean value but got "foo"}
-test textTag-5.7 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-5.7 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -underline stupid
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {expected boolean value but got "stupid"}
-test textTag-5.8 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-5.8 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -justify left
     .t tag configure x -justify
 } -cleanup {
     .t tag delete x
 } -result {-justify {} {} {} left}
-test textTag-5.9 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-5.9 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -justify bogus
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad justification "bogus": must be left, right, or center}
-test textTag-5.10 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12
-} -body {
+test textTag-5.10 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -justify fill
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad justification "fill": must be left, right, or center}
-test textTag-5.11 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-5.11 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -offset 2
     .t tag configure x -offset
 } -cleanup {
     .t tag delete x
 } -result {-offset {} {} {} 2}
-test textTag-5.12 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-5.12 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -offset 1.0q
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad screen distance "1.0q"}
-test textTag-5.13 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-5.13 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
-    .t tag configure x -lmargin1 2 -lmargin2 4 -rmargin 5
+    .t tag configure x -lmargin1 2 -lmargin2 4 -rmargin 5 \
+        -lmargincolor darkblue -rmargincolor lightgreen
     list [.t tag configure x -lmargin1] [.t tag configure x -lmargin2] \
-        [.t tag configure x -rmargin]
+        [.t tag configure x -rmargin] [.t tag configure x -lmargincolor] \
+        [.t tag configure x -rmargincolor]
 } -cleanup {
     .t tag delete x
-} -result {{-lmargin1 {} {} {} 2} {-lmargin2 {} {} {} 4} {-rmargin {} {} {} 5}}
-test textTag-5.14 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12
-} -body {
+} -result [list {-lmargin1 {} {} {} 2} {-lmargin2 {} {} {} 4} \
+                {-rmargin {} {} {} 5} \
+                {-lmargincolor {} {} {} darkblue} {-rmargincolor {} {} {} lightgreen} \
+          ]
+test textTag-5.14 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -lmargin1 2.0x
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad screen distance "2.0x"}
-test textTag-5.15 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-5.15 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -lmargin2 gorp
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad screen distance "gorp"}
-test textTag-5.16 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-5.15a {TkTextTagCmd - "configure" option} -body {
+    .t tag delete x
+    .t tag configure x -lmargincolor rainbow
+} -cleanup {
+    .t tag delete x
+} -returnCodes error -result {unknown color name "rainbow"}
+test textTag-5.16 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -rmargin 140.1.1
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad screen distance "140.1.1"}
+test textTag-5.16a {TkTextTagCmd - "configure" option} -body {
+    .t tag delete x
+    .t tag configure x -rmargincolor rainbow
+} -cleanup {
+    .t tag delete x
+} -returnCodes error -result {unknown color name "rainbow"}
 .t tag delete x
-test textTag-5.17 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-5.17 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -spacing1 2 -spacing2 4 -spacing3 6
     list [.t tag configure x -spacing1] [.t tag configure x -spacing2] \
@@ -670,33 +606,25 @@ test textTag-5.17 {TkTextTagCmd - "configure" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {{-spacing1 {} {} {} 2} {-spacing2 {} {} {} 4} {-spacing3 {} {} {} 6}}
-test textTag-5.18 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-5.18 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -spacing1 2.0x
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad screen distance "2.0x"}
-test textTag-5.19 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-5.19 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -spacing1 lousy
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad screen distance "lousy"}
-test textTag-5.20 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-5.20 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -spacing1 4.2.3
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad screen distance "4.2.3"}
-test textTag-5.21 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-5.21 {TkTextTagCmd - "configure" option} -body {
     .t configure -selectborderwidth 2 -selectforeground blue \
         -selectbackground black
     .t tag configure sel -borderwidth 4 -foreground green -background yellow
@@ -706,28 +634,65 @@ test textTag-5.21 {TkTextTagCmd - "configure" option} -constraints {
     }
     return $x
 } -result {4 green yellow}
-test textTag-5.22 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-5.22 {TkTextTagCmd - "configure" option} -body {
     .t configure -selectborderwidth 20
     .t tag configure sel -borderwidth {}
     .t cget -selectborderwidth
 } -result {}
+test textTag-5.23 {TkTextTagCmd - "configure" option} -body {
+    set x {}
+    # when [.t tag cget sel -selectbackground] == "", mirroring happens between
+    #     the text widget option -selectbackground
+    # and the tag         option -background
+    .t tag configure sel -selectbackground {}
+    .t configure -selectbackground black
+    .t tag configure sel -background yellow
+    lappend x [.t cget -selectbackground]
+    .t tag configure sel -background orange
+    .t configure -selectbackground blue
+    lappend x [.t tag cget sel -background]
+    # when [.t tag cget sel -selectbackground] != "", mirroring happens between
+    #     the text widget option -selectbackground
+    # and the tag         option -selectbackground
+    .t tag configure sel -selectbackground green
+    .t configure -selectbackground red
+    lappend x [.t tag cget sel -selectbackground]
+    .t configure -selectbackground black
+    .t tag configure sel -selectbackground white
+    lappend x [.t cget -selectbackground]
+    return $x
+} -result {yellow blue red white}
+test textTag-5.24 {TkTextTagCmd - "configure" option} -body {
+    set x {}
+    # when [.t tag cget sel -selectforeground] == "", mirroring happens between
+    #     the text widget option -selectforeground
+    # and the tag         option -foreground
+    .t tag configure sel -selectforeground {}
+    .t configure -selectforeground black
+    .t tag configure sel -foreground yellow
+    lappend x [.t cget -selectforeground]
+    .t tag configure sel -foreground orange
+    .t configure -selectforeground blue
+    lappend x [.t tag cget sel -foreground]
+    # when [.t tag cget sel -selectforeground] != "", mirroring happens between
+    #     the text widget option -selectforeground
+    # and the tag         option -selectforeground
+    .t tag configure sel -selectforeground green
+    .t configure -selectforeground red
+    lappend x [.t tag cget sel -selectforeground]
+    .t configure -selectforeground black
+    .t tag configure sel -selectforeground white
+    lappend x [.t cget -selectforeground]
+    return $x
+} -result {yellow blue red white}
 
-
-test textTag-6.1 {TkTextTagCmd - "delete" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-6.1 {TkTextTagCmd - "delete" option} -body {
     .t tag delete
 } -returnCodes error -result {wrong # args: should be ".t tag delete tagName ?tagName ...?"}
-test textTag-6.2 {TkTextTagCmd - "delete" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-6.2 {TkTextTagCmd - "delete" option} -body {
     .t tag delete zork
 } -returnCodes ok -result {}
-test textTag-6.3 {TkTextTagCmd - "delete" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-6.3 {TkTextTagCmd - "delete" option} -setup {
     .t tag delete {*}[.t tag names]
 } -body {
     .t tag config x -background black
@@ -738,9 +703,7 @@ test textTag-6.3 {TkTextTagCmd - "delete" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {sel x}
-test textTag-6.4 {TkTextTagCmd - "delete" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-6.4 {TkTextTagCmd - "delete" option} -setup {
     .t tag delete {*}[.t tag names]
 } -body {
     .t tag config x -background black
@@ -749,9 +712,7 @@ test textTag-6.4 {TkTextTagCmd - "delete" option} -constraints {
     eval .t tag delete [.t tag names]
     .t tag names
 } -result {sel}
-test textTag-6.5 {TkTextTagCmd - "delete" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-6.5 {TkTextTagCmd - "delete" option} -body {
     .t tag bind x <Enter> foo
     .t tag delete x
     .t tag configure x -background black
@@ -761,24 +722,16 @@ test textTag-6.5 {TkTextTagCmd - "delete" option} -constraints {
 } -result {}
 
 
-test textTag-7.1 {TkTextTagCmd - "lower" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-7.1 {TkTextTagCmd - "lower" option} -body {
     .t tag lower
 } -returnCodes error -result {wrong # args: should be ".t tag lower tagName ?belowThis?"}
-test textTag-7.2 {TkTextTagCmd - "lower" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-7.2 {TkTextTagCmd - "lower" option} -body {
     .t tag lower foo
 } -returnCodes error -result {tag "foo" isn't defined in text widget}
-test textTag-7.3 {TkTextTagCmd - "lower" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-7.3 {TkTextTagCmd - "lower" option} -body {
     .t tag lower sel bar
 } -returnCodes error -result {tag "bar" isn't defined in text widget}
-test textTag-7.4 {TkTextTagCmd - "lower" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-7.4 {TkTextTagCmd - "lower" option} -setup {
     .t tag delete {*}[.t tag names]
     .t tag remove sel 1.0 end
     foreach i {a b c d} {
@@ -790,9 +743,7 @@ test textTag-7.4 {TkTextTagCmd - "lower" option} -constraints {
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {c sel a b d}
-test textTag-7.5 {TkTextTagCmd - "lower" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-7.5 {TkTextTagCmd - "lower" option} -setup {
     .t tag delete {*}[.t tag names]
     .t tag remove sel 1.0 end
     foreach i {a b c d} {
@@ -804,9 +755,7 @@ test textTag-7.5 {TkTextTagCmd - "lower" option} -constraints {
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {sel a d b c}
-test textTag-7.6 {TkTextTagCmd - "lower" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-7.6 {TkTextTagCmd - "lower" option} -setup {
     .t tag delete {*}[.t tag names]
     .t tag remove sel 1.0 end
     foreach i {a b c d} {
@@ -820,16 +769,12 @@ test textTag-7.6 {TkTextTagCmd - "lower" option} -constraints {
 } -result {sel b a c d}
 
 
-test textTag-8.1 {TkTextTagCmd - "names" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-8.1 {TkTextTagCmd - "names" option} -body {
     .t tag names a b
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -returnCodes error -result {wrong # args: should be ".t tag names ?index?"}
-test textTag-8.2 {TkTextTagCmd - "names" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-8.2 {TkTextTagCmd - "names" option} -setup {
     .t tag delete {*}[.t tag names]
     .t tag remove sel 1.0 end
     foreach i {a b c d} {
@@ -840,9 +785,7 @@ test textTag-8.2 {TkTextTagCmd - "names" option} -constraints {
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {sel a b c d}
-test textTag-8.3 {TkTextTagCmd - "names" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-8.3 {TkTextTagCmd - "names" option} -setup {
     .t tag delete {*}[.t tag names]
     .t tag remove sel 1.0 end
     foreach i {a b c d} {
@@ -857,24 +800,16 @@ test textTag-8.3 {TkTextTagCmd - "names" option} -constraints {
 } -result {c {a b}}
 
 
-test textTag-9.1 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-9.1 {TkTextTagCmd - "nextrange" option} -body {
     .t tag nextrange x
 } -returnCodes error -result {wrong # args: should be ".t tag nextrange tagName index1 ?index2?"}
-test textTag-9.2 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-9.2 {TkTextTagCmd - "nextrange" option} -body {
     .t tag nextrange x 1 2 3
 } -returnCodes error -result {wrong # args: should be ".t tag nextrange tagName index1 ?index2?"}
-test textTag-9.3 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-9.3 {TkTextTagCmd - "nextrange" option} -body {
     .t tag nextrange foo 1.0
 } -returnCodes ok -result {}
-test textTag-9.4 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-9.4 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -882,9 +817,7 @@ test textTag-9.4 {TkTextTagCmd - "nextrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad text index "foo"}
-test textTag-9.5 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-9.5 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -894,9 +827,7 @@ test textTag-9.5 {TkTextTagCmd - "nextrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad text index "bar"}
-test textTag-9.6 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-9.6 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -906,9 +837,7 @@ test textTag-9.6 {TkTextTagCmd - "nextrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {2.3 2.5}
-test textTag-9.7 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-9.7 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -918,9 +847,7 @@ test textTag-9.7 {TkTextTagCmd - "nextrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {2.3 2.5}
-test textTag-9.8 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-9.8 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -930,9 +857,7 @@ test textTag-9.8 {TkTextTagCmd - "nextrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {2.3 2.5}
-test textTag-9.9 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-9.9 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -942,9 +867,7 @@ test textTag-9.9 {TkTextTagCmd - "nextrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {2.9 3.1}
-test textTag-9.10 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-9.10 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -954,9 +877,7 @@ test textTag-9.10 {TkTextTagCmd - "nextrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {}
-test textTag-9.11 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-9.11 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -966,9 +887,7 @@ test textTag-9.11 {TkTextTagCmd - "nextrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {2.9 3.1}
-test textTag-9.12 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-9.12 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -978,9 +897,7 @@ test textTag-9.12 {TkTextTagCmd - "nextrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {2.9 3.1}
-test textTag-9.13 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-9.13 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -990,9 +907,7 @@ test textTag-9.13 {TkTextTagCmd - "nextrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {7.2 7.3}
-test textTag-9.14 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-9.14 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -1004,28 +919,20 @@ test textTag-9.14 {TkTextTagCmd - "nextrange" option} -constraints {
 } -result {}
 
 
-test textTag-10.1 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-10.1 {TkTextTagCmd - "prevrange" option} -body {
     .t tag prevrange x
 } -returnCodes error -result {wrong # args: should be ".t tag prevrange tagName index1 ?index2?"}
-test textTag-10.2 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-10.2 {TkTextTagCmd - "prevrange" option} -body {
     .t tag prevrange x 1 2 3
 } -returnCodes error -result {wrong # args: should be ".t tag prevrange tagName index1 ?index2?"}
-test textTag-10.3 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-10.3 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag prevrange foo end
 } -cleanup {
     .t tag delete x
 } -returnCodes ok -result {}
-test textTag-10.4 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-10.4 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -1035,9 +942,7 @@ test textTag-10.4 {TkTextTagCmd - "prevrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad text index "foo"}
-test textTag-10.5 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-10.5 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -1047,9 +952,7 @@ test textTag-10.5 {TkTextTagCmd - "prevrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad text index "bar"}
-test textTag-10.6 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-10.6 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -1059,9 +962,7 @@ test textTag-10.6 {TkTextTagCmd - "prevrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {7.2 7.3}
-test textTag-10.7 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-10.7 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -1071,9 +972,7 @@ test textTag-10.7 {TkTextTagCmd - "prevrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {2.3 2.5}
-test textTag-10.8 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-10.8 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -1083,9 +982,7 @@ test textTag-10.8 {TkTextTagCmd - "prevrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {2.3 2.5}
-test textTag-10.9 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-10.9 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -1095,9 +992,7 @@ test textTag-10.9 {TkTextTagCmd - "prevrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {2.3 2.5}
-test textTag-10.10 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-10.10 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -1107,9 +1002,7 @@ test textTag-10.10 {TkTextTagCmd - "prevrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {}
-test textTag-10.11 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-10.11 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -1119,9 +1012,7 @@ test textTag-10.11 {TkTextTagCmd - "prevrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {}
-test textTag-10.12 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-10.12 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -1131,9 +1022,7 @@ test textTag-10.12 {TkTextTagCmd - "prevrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {2.3 2.5}
-test textTag-10.13 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-10.13 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -1143,9 +1032,7 @@ test textTag-10.13 {TkTextTagCmd - "prevrange" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {2.9 3.1}
-test textTag-10.14 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-10.14 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
@@ -1157,24 +1044,16 @@ test textTag-10.14 {TkTextTagCmd - "prevrange" option} -constraints {
 } -result {}
 
 
-test textTag-11.1 {TkTextTagCmd - "raise" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-11.1 {TkTextTagCmd - "raise" option} -body {
     .t tag raise
 } -returnCodes error -result {wrong # args: should be ".t tag raise tagName ?aboveThis?"}
-test textTag-11.2 {TkTextTagCmd - "raise" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-11.2 {TkTextTagCmd - "raise" option} -body {
     .t tag raise foo
 } -returnCodes error -result {tag "foo" isn't defined in text widget}
-test textTag-11.3 {TkTextTagCmd - "raise" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-11.3 {TkTextTagCmd - "raise" option} -body {
     .t tag raise sel bar
 } -returnCodes error -result {tag "bar" isn't defined in text widget}
-test textTag-11.4 {TkTextTagCmd - "raise" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-11.4 {TkTextTagCmd - "raise" option} -setup {
     .t tag delete {*}[.t tag names]
     .t tag remove sel 1.0 end
     foreach i {a b c d} {
@@ -1186,9 +1065,7 @@ test textTag-11.4 {TkTextTagCmd - "raise" option} -constraints {
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {sel a b d c}
-test textTag-11.5 {TkTextTagCmd - "raise" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-11.5 {TkTextTagCmd - "raise" option} -setup {
     .t tag delete {*}[.t tag names]
     .t tag remove sel 1.0 end
     foreach i {a b c d} {
@@ -1200,9 +1077,7 @@ test textTag-11.5 {TkTextTagCmd - "raise" option} -constraints {
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {sel a b d c}
-test textTag-11.6 {TkTextTagCmd - "raise" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-11.6 {TkTextTagCmd - "raise" option} -setup {
     .t tag delete {*}[.t tag names]
     .t tag remove sel 1.0 end
     foreach i {a b c d} {
@@ -1216,20 +1091,14 @@ test textTag-11.6 {TkTextTagCmd - "raise" option} -constraints {
 } -result {sel b c a d}
 
 
-test textTag-12.1 {TkTextTagCmd - "ranges" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-12.1 {TkTextTagCmd - "ranges" option} -body {
     .t tag ranges
 } -returnCodes error -result {wrong # args: should be ".t tag ranges tagName"}
-test textTag-12.2 {TkTextTagCmd - "ranges" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-12.2 {TkTextTagCmd - "ranges" option} -body {
     .t tag delete x
     .t tag ranges x
 } -result {}
-test textTag-12.3 {TkTextTagCmd - "ranges" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-12.3 {TkTextTagCmd - "ranges" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.2
@@ -1239,9 +1108,7 @@ test textTag-12.3 {TkTextTagCmd - "ranges" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {2.2 2.3 2.7 4.6 5.2 5.5}
-test textTag-12.4 {TkTextTagCmd - "ranges" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-12.4 {TkTextTagCmd - "ranges" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 1.0 3.0
@@ -1252,14 +1119,10 @@ test textTag-12.4 {TkTextTagCmd - "ranges" option} -constraints {
 } -result {1.0 3.0 4.0 8.0}
 
 
-test textTag-13.1 {TkTextTagCmd - "remove" option} -constraints {
-    haveCourier12
-} -body {
+test textTag-13.1 {TkTextTagCmd - "remove" option} -body {
     .t tag remove
 } -returnCodes error -result {wrong # args: should be ".t tag remove tagName index1 ?index2 index1 index2 ...?"}
-test textTag-13.2 {TkTextTagCmd - "remove" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-13.2 {TkTextTagCmd - "remove" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.2 2.11
@@ -1268,9 +1131,7 @@ test textTag-13.2 {TkTextTagCmd - "remove" option} -constraints {
 } -cleanup {
     .t tag delete x
 } -result {2.2 2.3 2.7 2.11}
-test textTag-13.3 {TkTextTagCmd - "remove" option} -constraints {
-    haveCourier12
-} -setup {
+test textTag-13.3 {TkTextTagCmd - "remove" option} -setup {
     destroy .t.e
 } -body {
     entry .t.e
@@ -1286,7 +1147,7 @@ test textTag-13.3 {TkTextTagCmd - "remove" option} -constraints {
 } -result {Text}
 
 
-test textTag-14.1 {SortTags} -constraints haveCourier12 -setup {
+test textTag-14.1 {SortTags} -setup {
     .t tag delete a b c d
 } -body {
     foreach i {a b c d} {
@@ -1297,7 +1158,7 @@ test textTag-14.1 {SortTags} -constraints haveCourier12 -setup {
     .t tag delete a b c d
 } -result {a b c d}
 .t tag delete a b c d
-test textTag-14.2 {SortTags} -constraints haveCourier12 -setup {
+test textTag-14.2 {SortTags} -setup {
     .t tag delete a b c d
 } -body {
     foreach i {a b c d} {
@@ -1310,7 +1171,7 @@ test textTag-14.2 {SortTags} -constraints haveCourier12 -setup {
 } -cleanup {
     .t tag delete a b c d
 } -result {a b c d}
-test textTag-14.3 {SortTags} -constraints haveCourier12 -setup {
+test textTag-14.3 {SortTags} -setup {
     .t tag delete {*}[.t tag names]
 } -body {
     for {set i 0} {$i < 30} {incr i} {
@@ -1320,7 +1181,7 @@ test textTag-14.3 {SortTags} -constraints haveCourier12 -setup {
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 x10 x11 x12 x13 x14 x15 x16 x17 x18 x19 x20 x21 x22 x23 x24 x25 x26 x27 x28 x29}
-test textTag-14.4 {SortTags} -constraints haveCourier12 -setup {
+test textTag-14.4 {SortTags} -setup {
     .t tag delete {*}[.t tag names]
 } -body {
     for {set i 0} {$i < 30} {incr i} {
@@ -1346,7 +1207,7 @@ set c [.t bbox 4.3]
 set x3 [expr [lindex $c 0] + [lindex $c 2]/2]
 set y3 [expr [lindex $c 1] + [lindex $c 3]/2]
 
-test textTag-15.1 {TkTextBindProc} -constraints haveCourier12 -setup {
+test textTag-15.1 {TkTextBindProc} -setup {
     .t tag delete x y
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
 } -body {
@@ -1371,7 +1232,7 @@ test textTag-15.1 {TkTextBindProc} -constraints haveCourier12 -setup {
     bind .t <ButtonRelease> {}
 } -result {x-up up up y-up up}
 
-test textTag-15.2 {TkTextBindProc} -constraints haveCourier12 -setup {
+test textTag-15.2 {TkTextBindProc} -setup {
     .t tag delete x y
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
 } -body {
@@ -1399,7 +1260,7 @@ test textTag-15.2 {TkTextBindProc} -constraints haveCourier12 -setup {
     .t tag delete x y
 } -result {x-enter | x-down | | x-up x-leave y-enter}
 
-test textTag-15.3 {TkTextBindProc} -constraints haveCourier12 -setup {
+test textTag-15.3 {TkTextBindProc} -setup {
     .t tag delete x y
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
 } -body {
@@ -1432,9 +1293,7 @@ test textTag-15.3 {TkTextBindProc} -constraints haveCourier12 -setup {
 } -result {x-enter | x-down | | | x-up | x-leave y-enter}
 
 
-test textTag-16.1 {TkTextPickCurrent procedure} -constraints {
-    haveCourier12
-} -setup {
+test textTag-16.1 {TkTextPickCurrent procedure} -setup {
     .t tag delete {*}[.t tag names]
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
 } -body {
@@ -1454,9 +1313,7 @@ test textTag-16.1 {TkTextPickCurrent procedure} -constraints {
     lappend x [.t index current]
 } -result {2.1 3.2 3.2 3.2 3.2 3.2 4.3}
 
-test textTag-16.2 {TkTextPickCurrent procedure} -constraints {
-    haveCourier12
-} -setup {
+test textTag-16.2 {TkTextPickCurrent procedure} -setup {
     .t tag delete {*}[.t tag names]
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
 } -body {
@@ -1471,9 +1328,7 @@ test textTag-16.2 {TkTextPickCurrent procedure} -constraints {
     .t tag delete big
 } -result {3.2 3.1}
 
-test textTag-16.3 {TkTextPickCurrent procedure} -constraints {
-    haveCourier12
-} -setup {
+test textTag-16.3 {TkTextPickCurrent procedure} -setup {
     foreach i {a b c d} {
         .t tag remove $i 1.0 end
     }
@@ -1500,9 +1355,7 @@ test textTag-16.3 {TkTextPickCurrent procedure} -constraints {
     .t tag delete {*}[.t tag names]
 } -result {enter-a enter-b | leave-b enter-c | leave-a leave-c}
 
-test textTag-16.4 {TkTextPickCurrent procedure} -constraints {
-    haveCourier12
-} -setup {
+test textTag-16.4 {TkTextPickCurrent procedure} -setup {
     foreach i {a b c d} {
         .t tag remove $i 1.0 end
     }
@@ -1528,9 +1381,7 @@ test textTag-16.4 {TkTextPickCurrent procedure} -constraints {
     .t tag delete {*}[.t tag names]
 } -result {enter-a enter-b enter-c | leave-c leave-b}
 
-test textTag-16.5 {TkTextPickCurrent procedure} -constraints {
-    haveCourier12
-} -setup {
+test textTag-16.5 {TkTextPickCurrent procedure} -setup {
     foreach i {big a b c d} {
         .t tag remove $i 1.0 end
     }
@@ -1546,9 +1397,7 @@ test textTag-16.5 {TkTextPickCurrent procedure} -constraints {
     .t tag delete a big
 } -result {3.2}
 
-test textTag-16.6 {TkTextPickCurrent procedure} -constraints {
-    haveCourier12
-} -setup {
+test textTag-16.6 {TkTextPickCurrent procedure} -setup {
     foreach i {big a b c d} {
         .t tag remove $i 1.0 end
     }
@@ -1565,9 +1414,7 @@ test textTag-16.6 {TkTextPickCurrent procedure} -constraints {
     .t tag delete a big
 } -result {3.1}
 
-test textTag-16.7 {TkTextPickCurrent procedure} -constraints {
-    haveCourier12
-} -setup {
+test textTag-16.7 {TkTextPickCurrent procedure} -setup {
     foreach i {big a b c d} {
         .t tag remove $i 1.0 end
     }