about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2022-07-20 07:15:46 -0700
committerKartik K. Agaram <vc@akkartik.com>2022-07-20 07:15:46 -0700
commit9f4b41d82949adbad9df0c89b3c92d8c3ac43630 (patch)
tree02b945d46a1032e21ecf9238d3197640d5cd0738
parenta472d218f21cc0787a9e52c6cb03819b27a247e9 (diff)
downloadtext.love-9f4b41d82949adbad9df0c89b3c92d8c3ac43630.tar.gz
exclude left margin from my word-split heuristic
Gratifying how few tests need changing. Recent commits seem on the right
track.
-rw-r--r--text.lua2
-rw-r--r--text_tests.lua4
2 files changed, 3 insertions, 3 deletions
diff --git a/text.lua b/text.lua
index c83a177..39b73d8 100644
--- a/text.lua
+++ b/text.lua
@@ -98,7 +98,7 @@ function Text.compute_fragments(State, line_index)
 --?     print('x: '..tostring(x)..'; '..tostring(State.right-x)..'px to go')
     while x + frag_width > State.right do
 --?       print(('checking whether to split fragment ^%s$ of width %d when rendering from %d'):format(frag, frag_width, x))
-      if x < 0.8*State.right then
+      if (x-State.left) < 0.8 * (State.right-State.left) then
 --?         print('splitting')
         -- long word; chop it at some letter
         -- We're not going to reimplement TeX here.
diff --git a/text_tests.lua b/text_tests.lua
index 837fe3a..4de3759 100644
--- a/text_tests.lua
+++ b/text_tests.lua
@@ -432,9 +432,9 @@ function test_draw_wrapping_text_containing_non_ascii()
   local y = Editor_state.top
   App.screen.check(y, 'mad', 'F - test_draw_wrapping_text_containing_non_ascii/screen:1')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'am ', 'F - test_draw_wrapping_text_containing_non_ascii/screen:2')
+  App.screen.check(y, 'am I', 'F - test_draw_wrapping_text_containing_non_ascii/screen:2')
   y = y + Editor_state.line_height
-  App.screen.check(y, 'I’m ', 'F - test_draw_wrapping_text_containing_non_ascii/screen:3')
+  App.screen.check(y, '’m a', 'F - test_draw_wrapping_text_containing_non_ascii/screen:3')
 end
 
 function test_click_on_wrapping_line()