Tk Source Code

Check-in [98a7166f]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Enhance previous commit: Without Xft also, check availability of the required font.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | less_tests_constraints
Files: files | file ages | folders
SHA3-256: 98a7166f6df367fcfc6f0ff7d506c3aa7018d61d46fdd894d2f725a5cd3517a8
User & Date: fvogel 2023-11-01 21:46:32.187
Context
2023-11-02
08:50
Restore original behavior with the old font system (i.e. without Xft). check-in: 47412dc2 user: fvogel tags: less_tests_constraints
2023-11-01
21:46
Enhance previous commit: Without Xft also, check availability of the required font. check-in: 98a7166f user: fvogel tags: less_tests_constraints
21:32
Let the constraints for unixFont-2.2, -2.3 and -2.4 be correctly computed with Xft (which lets these tests be skipped instead of failing). This is three less 'failsOnUbuntu' constraints. check-in: ae01655f user: fvogel tags: less_tests_constraints
Changes
Unified Diff Ignore Whitespace Patch
Changes to tests/unixFont.test.
29
30
31
32
33
34
35

36
37
38
39
40
41
42
43
44
45

46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
    }
}
foreach {constraint font} {
    hasArial      arial
    hasCourierNew "courier new"
    hasTimesNew   "times new roman"
} {

    if {([tk windowingsystem] eq "x11") && [llength $fontsystemcmd]} {
	if {$withXft} {
	    # check whether $font is available
	    testConstraint $constraint 0
	    if {[exec $fontsystemcmd $font family] ne ""} {
	        testConstraint $constraint 1
	    }
	} else {
	    # $font is supposed to be available by default
	    testConstraint $constraint 1

	    if {![catch {eval exec $fontsystemcmd [list *-$font-*]} res]
		    && ![string match *unmatched* $res]} {
		# Newer Unix systems have more default fonts installed,
		# so we can't rely on fallbacks for fonts to need to
		# fall back on anything.
		testConstraint $constraint 0
	    }
	}
    } else {
	testConstraint $constraint 0
    }
}

catch {destroy .b}
toplevel .b
wm geom .b +0+0
update idletasks







>


<
<




|
|
>








<
<







29
30
31
32
33
34
35
36
37
38


39
40
41
42
43
44
45
46
47
48
49
50
51
52
53


54
55
56
57
58
59
60
    }
}
foreach {constraint font} {
    hasArial      arial
    hasCourierNew "courier new"
    hasTimesNew   "times new roman"
} {
    testConstraint $constraint 0
    if {([tk windowingsystem] eq "x11") && [llength $fontsystemcmd]} {
	if {$withXft} {


	    if {[exec $fontsystemcmd $font family] ne ""} {
	        testConstraint $constraint 1
	    }
	} else {
	    if {![catch {eval exec $fontsystemcmd [list *-$font-*]} res]} {
	        testConstraint $constraint 1
	    }
	    if {![catch {eval exec $fontsystemcmd [list *-$font-*]} res]
		    && ![string match *unmatched* $res]} {
		# Newer Unix systems have more default fonts installed,
		# so we can't rely on fallbacks for fonts to need to
		# fall back on anything.
		testConstraint $constraint 0
	    }
	}


    }
}

catch {destroy .b}
toplevel .b
wm geom .b +0+0
update idletasks