1 files changed, 119 insertions, 7 deletions
diff --git a/tests/text.test b/tests/text.test
index e75f38a..2ca5d54 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -714,22 +714,23 @@ test text-9.2.45 {TextWidgetCmd procedure, "count" option} -setup {
 } -result {0}
 test text-9.2.46 {TextWidgetCmd procedure, "count" option} -setup {
     toplevel .mytop
-    pack [text .mytop.t]
-    wm geometry .mytop 100x300+0+0
+    pack [text .mytop.t -font TkFixedFont -bd 0 -padx 0 -wrap char]
+    set spec [font measure TkFixedFont "Line 1+++Line 1---Li"]  ; # 20 chars
+    append spec x300+0+0
+    wm geometry .mytop $spec
     .mytop.t delete 1.0 end
     update
     set res {}
 } -body {
     for {set i 1} {$i < 5} {incr i} {
-      #              0          1          2          3          4
-      #              012345 678901234 567890123 456789012 34567890123456789
+      #                    0          1          2          3          4
+      #                    012345 678901234 567890123 456789012 34567890123456789
       .mytop.t insert end "Line $i+++Line $i---Line $i///Line $i - This is Line [format %c [expr 64+$i]]\n"
     }
     .mytop.t tag configure hidden -elide true
-    .mytop.t tag add hidden 2.15 3.10
-    .mytop.t configure -wrap char
+    .mytop.t tag add hidden 2.30 3.10
     lappend res [.mytop.t count -displaylines 2.0 3.0]
-    lappend res [.mytop.t count -displaylines 2.0 3.40]
+    lappend res [.mytop.t count -displaylines 2.0 3.50]
 } -cleanup {
     destroy .mytop
 } -result {1 3}
@@ -744,6 +745,10 @@ test text-9.2.47 {TextWidgetCmd procedure, "count" option} -setup {
     .t tag configure hidden -elide true
     .t tag add hidden 5.7 11.0
     update
+    # next line to be fully sure that asynchronous line heights calculation is
+    # up-to-date otherwise this test may fail (depending on the computer
+    # performance), especially when the . toplevel has small height
+    .t count -update -ypixels 1.0 end
     set y1 [lindex [.t yview] 1]
     .t count -displaylines 5.0 11.0
     set y2 [lindex [.t yview] 1]
@@ -2780,6 +2785,24 @@ test text-20.185 {TextSearchCmd, elide up to match} {
     lappend res [.t2 search -regexp bc 1.0]
     lappend res [.t2 search -regexp c 1.0]
 } {{} {} 1.0 2.1 2.0 3.1 2.0 3.0}
+test text-20.185.1 {TextSearchCmd, elide up to match, with UTF-8 chars before the match} {
+    deleteWindows
+    pack [text .t2]
+    .t2 tag configure e -elide 0
+    .t2 insert end A {} xyz e bb\n
+    .t2 insert end \u00c4 {} xyz e bb
+    set res {}
+    lappend res [.t2 search bb 1.0 "1.0 lineend"]
+    lappend res [.t2 search bb 2.0 "2.0 lineend"]
+    lappend res [.t2 search -regexp bb 1.0 "1.0 lineend"]
+    lappend res [.t2 search -regexp bb 2.0 "2.0 lineend"]
+    .t2 tag configure e -elide 1
+    lappend res [.t2 search bb 1.0 "1.0 lineend"]
+    lappend res [.t2 search bb 2.0 "2.0 lineend"]
+    lappend res [.t2 search -regexp bb 1.0 "1.0 lineend"]
+    lappend res [.t2 search -regexp -elide bb 2.0 "2.0 lineend"]
+    lappend res [.t2 search -regexp bb 2.0 "2.0 lineend"]
+} {1.4 2.4 1.4 2.4 1.4 2.4 1.4 2.4 2.4}
 test text-20.186 {TextSearchCmd, strict limits} {
     deleteWindows
     pack [text .t2]
@@ -3204,6 +3227,95 @@ test text-25.18 {patch 1469210 - inserting after undo} -setup {
 } -cleanup {
     destroy .t
 } -result 1
+test text-25.19 {patch 1669632 (i) - undo after <Control-1>} -setup {
+    destroy .t
+} -body {
+    text .t -undo 1
+    .t insert end foo\nbar
+    .t edit reset
+    .t insert 2.2 WORLD
+    event generate .t <Control-1> -x 1 -y 1
+    .t insert insert HELLO
+    .t edit undo
+    .t get 2.2 2.7
+} -cleanup {
+    destroy .t
+} -result WORLD
+test text-25.20 {patch 1669632 (iv) - undo after <Control-backslash>} -setup {
+    destroy .t
+} -body {
+    toplevel .top
+    pack [text .top.t -undo 1]
+    .top.t insert end "This is an example text"
+    .top.t edit reset
+    .top.t mark set insert 1.5
+    .top.t insert 1.5 HELLO
+    .top.t tag add sel 1.10 1.12
+    update
+    focus -force .top.t
+    event generate .top.t <Control-backslash>
+    .top.t insert insert " WORLD "
+    .top.t edit undo
+    .top.t get 1.5 1.10
+} -cleanup {
+    destroy .top.t .top
+} -result HELLO
+test text-25.21 {patch 1669632 (vii) - <<Undo>> shall not remove separators} -setup {
+    destroy .t
+} -body {
+    text .t -undo 1
+    .t insert end "This is an example text"
+    .t edit reset
+    .t insert 1.5 "WORLD "
+    event generate .t <Control-1> -x 1 -y 1
+    .t insert insert HELLO
+    event generate .t <<Undo>>
+    .t insert insert E
+    event generate .t <<Undo>>
+    .t get 1.0 "1.0 lineend"
+} -cleanup {
+    destroy .t
+} -result "This WORLD is an example text"
+test text-25.22 {patch 1669632 (v) - <<Clear>> is atomic} -setup {
+    destroy .t
+} -body {
+    toplevel .top
+    pack [text .top.t -undo 1]
+    .top.t insert end "This is an example text"
+    .top.t edit reset
+    .top.t mark set insert 1.5
+    .top.t insert 1.5 "A"
+    update
+    focus -force .top.t
+    event generate .top.t <Delete>
+    event generate .top.t <Shift-Right>
+    event generate .top.t <<Clear>>
+    event generate .top.t <Delete>
+    event generate .top.t <<Undo>>
+    .top.t get 1.0 "1.0 lineend"
+} -cleanup {
+    destroy .top.t .top
+} -result "This A an example text"
+ test text-25.23 {patch 1669632 (v) - <<Cut>> is atomic} -setup {
+    destroy .t
+} -body {
+    toplevel .top
+    pack [text .top.t -undo 1]
+    .top.t insert end "This is an example text"
+    .top.t edit reset
+    .top.t mark set insert 1.5
+    .top.t insert 1.5 "A"
+    update
+    focus -force .top.t
+    event generate .top.t <Delete>
+    event generate .top.t <Shift-Right>
+    event generate .top.t <<Cut>>
+    event generate .top.t <Delete>
+    event generate .top.t <<Undo>>
+    .top.t get 1.0 "1.0 lineend"
+} -cleanup {
+    destroy .top.t .top
+} -result "This A an example text"
 
 test text-26.1 {bug fix - 624372, ControlUtfProc long lines} {
     destroy .t