Tk Source Code

Check-in [edad03b8]
Login

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

Overview
Comment:Added test textDisp-2.35 testing chunks with both tabs and soft hyphens.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | bug-1096580fff | soft-hyphen
Files: files | file ages | folders
SHA1: edad03b858db5db7a7a1f6b0c5b063229cd7588f
User & Date: fvogel 2016-10-16 19:16:54
Context
2016-10-16
19:44
Added test textDisp-2.36 counting chars and displaychars in presence of soft hyphens. check-in: 5691e299 user: fvogel tags: bug-1096580fff, soft-hyphen
19:16
Added test textDisp-2.35 testing chunks with both tabs and soft hyphens. check-in: edad03b8 user: fvogel tags: bug-1096580fff, soft-hyphen
2016-10-15
13:40
Removed an if case that can never happen. In LayoutDLine(), maxBytes is set such that \t (tab) characters, if present, are always the last character of a chunk. Then in TkTextCharLayoutProc() it is useless to test for p[bytesThatFit] == '\t' in the 'bytesThatFit < maxBytes' case. check-in: 435148d3 user: fvogel tags: bug-1096580fff, soft-hyphen
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to tests/textDisp.test.

550
551
552
553
554
555
556











557
558
559
560
561
562
563
    lappend res [lindex [.t bbox 2.6] 2]
} [list 0 1 0 0 0 1 0]
test textDisp-2.34 {soft hyphen is visible when at display line end} {textfonts} {
    .t delete 1.0 end
    .t insert 1.0 "This is a  -*soft*-  hyphen   test: abc\u00AD123\n"
    set res [expr [lindex [.t bbox 1.39] 2] > 0]
} {1}












test textDisp-3.1 {different character sizes} {textfonts} {
    .t configure -wrap word
    .t delete 1.0 end
    .t insert end "Some sample text, including both large\n"
    .t insert end "characters and\nsmall\n"
    .t insert end "abc\nd\ne\nfghij"







>
>
>
>
>
>
>
>
>
>
>







550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
    lappend res [lindex [.t bbox 2.6] 2]
} [list 0 1 0 0 0 1 0]
test textDisp-2.34 {soft hyphen is visible when at display line end} {textfonts} {
    .t delete 1.0 end
    .t insert 1.0 "This is a  -*soft*-  hyphen   test: abc\u00AD123\n"
    set res [expr [lindex [.t bbox 1.39] 2] > 0]
} {1}
test textDisp-2.35 {LayoutDline, maxBytes calculation for chunk with both soft hyphen and tab} {textfonts} {
    .t delete 1.0 end
    .t insert end "Test\twith soft\u00ADhyphen and\ttabs.\n"
    .t insert end "Test\u00ADwith soft\thyphen and\u00ADtabs.\n"
    set res [expr [lindex [.t bbox 1.4] 2] > 0]
    lappend res [lindex [.t bbox 1.14] 2]
    lappend res [expr [lindex [.t bbox 1.25] 2] > 0]
    lappend res [lindex [.t bbox 2.4] 2]
    lappend res [expr [lindex [.t bbox 2.14] 2] > 0]
    lappend res [lindex [.t bbox 2.25] 2]
} [list 1 0 1 0 1 0]

test textDisp-3.1 {different character sizes} {textfonts} {
    .t configure -wrap word
    .t delete 1.0 end
    .t insert end "Some sample text, including both large\n"
    .t insert end "characters and\nsmall\n"
    .t insert end "abc\nd\ne\nfghij"