akkartik/carousel.love - Change GL4Q5WCVMOBEKW7SMBKRSL3DRG2NSTXRI7VQFK77OXAWLBDKWTNQC

keep text from overflowing right margin

I've been sloppy about this so far, and outside of tests I can't find any examples where it matters, but it matters in a potential fork where I'm rendering multiple columns of text.

It's unfortunate that my tests have this level of brittleness. What I'd really like to assert in many of these changed lines is that the text stays inside the margins and that more text would overflow margins.

Created by Kartik K. Agaram on July 20, 2022

GL4Q5WCVMOBEKW7SMBKRSL3DRG2NSTXRI7VQFK77OXAWLBDKWTNQC

Dependencies

In channels

main

Change contents

Replacement in text_tests.lua at line 341 [4.2]

∅:D[3.8828] → [4.1010:1079]

B:BD[4.1010] → [4.1010:1079]

  App.screen.check(y, 'def', 'F - test_draw_wrapping_text/screen:2')

[3.8828]

[3.8829]

  App.screen.check(y, 'de', 'F - test_draw_wrapping_text/screen:2')

Replacement in text_tests.lua at line 343 [4.2]

∅:D[3.8864] → [4.1101:1169]

B:BD[4.1101] → [4.1101:1169]

  App.screen.check(y, 'gh', 'F - test_draw_wrapping_text/screen:3')

[3.8864]

[4.1169]

  App.screen.check(y, 'fgh', 'F - test_draw_wrapping_text/screen:3')

Replacement in text_tests.lua at line 417 [4.2]

∅:D[3.9576] → [4.2266:2350]

B:BD[4.2266] → [4.2266:2350]

  App.screen.check(y, 'e fghi', 'F - test_draw_text_wrapping_within_word/screen:2')

[3.9576]

[3.9577]

  App.screen.check(y, 'e fgh', 'F - test_draw_text_wrapping_within_word/screen:2')

Replacement in text_tests.lua at line 419 [4.2]

∅:D[3.9612] → [4.2372:2452]

B:BD[4.2372] → [4.2372:2452]

  App.screen.check(y, 'jk', 'F - test_draw_text_wrapping_within_word/screen:3')

[3.9612]

[5.2]

  App.screen.check(y, 'ijk', 'F - test_draw_text_wrapping_within_word/screen:3')

Replacement in text_tests.lua at line 434 [4.2]

∅:D[2.3259] → [5.440:531]

∅:D[3.9954] → [5.440:531]

B:BD[5.440] → [5.440:531]

  App.screen.check(y, 'mada', 'F - test_draw_wrapping_text_containing_non_ascii/screen:1')

[2.3259]

[3.9955]

  App.screen.check(y, 'mad', 'F - test_draw_wrapping_text_containing_non_ascii/screen:1')

Replacement in text_tests.lua at line 436 [4.2]

∅:D[3.9990] → [5.553:646]

B:BD[5.553] → [5.553:646]

  App.screen.check(y, 'm I’', 'F - test_draw_wrapping_text_containing_non_ascii/screen:2')

[3.9990]

[3.9991]

  App.screen.check(y, 'am ', 'F - test_draw_wrapping_text_containing_non_ascii/screen:2')

Replacement in text_tests.lua at line 438 [4.2]

∅:D[3.10026] → [5.668:759]

B:BD[5.668] → [5.668:759]

  App.screen.check(y, 'm ad', 'F - test_draw_wrapping_text_containing_non_ascii/screen:3')

[3.10026]

[4.2452]

  App.screen.check(y, 'I’m ', 'F - test_draw_wrapping_text_containing_non_ascii/screen:3')

Replacement in text_tests.lua at line 456 [4.2]

∅:D[3.10359] → [6.472:558]

B:BD[6.472] → [6.472:558]

  App.screen.check(y, "I'm ada", 'F - test_click_on_wrapping_line/baseline/screen:2')

[3.10359]

[3.10360]

  App.screen.check(y, "I'm ad", 'F - test_click_on_wrapping_line/baseline/screen:2')

Replacement in text_tests.lua at line 462 [4.2]

B:BD[3.10484] → [3.10484:10571]

  check_eq(Editor_state.cursor1.pos, 13, 'F - test_click_on_wrapping_line/cursor:pos')

[3.10484]

[6.879]

  check_eq(Editor_state.cursor1.pos, 12, 'F - test_click_on_wrapping_line/cursor:pos')

Replacement in text_tests.lua at line 478 [4.2]

∅:D[2.3529] → [7.471:596]

∅:D[3.10868] → [7.471:596]

B:BD[7.471] → [7.471:596]

  App.screen.check(y, "I'm ada", 'F - test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen/baseline/screen:2')

[2.3529]

[3.10869]

  App.screen.check(y, "I'm ad", 'F - test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen/baseline/screen:2')

Replacement in text_tests.lua at line 484 [4.2]

B:BD[3.11032] → [3.11032:11158]

  check_eq(Editor_state.cursor1.pos, 13, 'F - test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen/cursor:pos')

[3.11032]

[7.982]

  check_eq(Editor_state.cursor1.pos, 12, 'F - test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen/cursor:pos')

Replacement in text_tests.lua at line 502 [4.2]

∅:D[3.11491] → [6.1381:1476]

B:BD[6.1381] → [6.1381:1476]

  App.screen.check(y, "I'm ada", 'F - test_click_past_end_of_wrapping_line/baseline/screen:2')

[3.11491]

[3.11492]

  App.screen.check(y, "I'm ad", 'F - test_click_past_end_of_wrapping_line/baseline/screen:2')

Replacement in text_tests.lua at line 504 [4.2]

∅:D[3.11527] → [6.1498:1587]

B:BD[6.1498] → [6.1498:1587]

  App.screen.check(y, 'm', 'F - test_click_past_end_of_wrapping_line/baseline/screen:3')

[3.11527]

[3.11528]

  App.screen.check(y, 'am', 'F - test_click_past_end_of_wrapping_line/baseline/screen:3')

Replacement in text_tests.lua at line 512 [4.2]

∅:D[6.1874] → [8.2:127]

B:BD[4.2457] → [8.2:127]

function test_click_on_wrapping_line_containing_non_ascii()
  io.write('\ntest_click_on_wrapping_line_containing_non_ascii')

[6.1874]

[8.127]

function test_click_past_end_of_wrapping_line_containing_non_ascii()
  io.write('\ntest_click_past_end_of_wrapping_line_containing_non_ascii')

Replacement in text_tests.lua at line 525 [4.2]

∅:D[2.3799] → [8.466:572]

∅:D[3.12041] → [8.466:572]

B:BD[8.466] → [8.466:572]

  App.screen.check(y, 'madam ', 'F - test_click_on_wrapping_line_containing_non_ascii/baseline/screen:1')

[2.3799]

[3.12042]

  App.screen.check(y, 'madam ', 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/baseline/screen:1')

Replacement in text_tests.lua at line 527 [4.2]

∅:D[3.12077] → [8.594:703]

B:BD[8.594] → [8.594:703]

  App.screen.check(y, 'I’m ada', 'F - test_click_on_wrapping_line_containing_non_ascii/baseline/screen:2')

[3.12077]

[3.12078]

  App.screen.check(y, 'I’m ad', 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/baseline/screen:2')

Replacement in text_tests.lua at line 529 [4.2]

∅:D[3.12113] → [8.725:826]

B:BD[8.725] → [8.725:826]

  App.screen.check(y, 'm', 'F - test_click_on_wrapping_line_containing_non_ascii/baseline/screen:3')

[3.12113]

[3.12114]

  App.screen.check(y, 'am', 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/baseline/screen:3')

Replacement in text_tests.lua at line 534 [4.2]

B:BD[8.981] → [3.12150:12304]

  check_eq(Editor_state.cursor1.pos, 15, 'F - test_click_on_wrapping_line_containing_non_ascii/cursor')  -- one more than the number of UTF-8 code-points

[8.981]

[9.2]

  check_eq(Editor_state.cursor1.pos, 15, 'F - test_click_past_end_of_wrapping_line_containing_non_ascii/cursor')  -- one more than the number of UTF-8 code-points

Deletion in text_tests.lua at line 738 [4.2]

B:BD[10.1941] → [10.1941:2079]

  edit.run_after_textinput(Editor_state, 'h')
  edit.run_after_textinput(Editor_state, 'i')
  edit.run_after_textinput(Editor_state, 'j')

Replacement in text_tests.lua at line 741 [4.2]

∅:D[3.16764] → [4.3027:3096]

B:BD[4.3027] → [4.3027:3096]

  App.screen.check(y, 'def', 'F - test_edit_wrapping_text/screen:2')

[3.16764]

[3.16765]

  App.screen.check(y, 'de', 'F - test_edit_wrapping_text/screen:2')

Replacement in text_tests.lua at line 743 [4.2]

∅:D[3.16800] → [4.3118:3188]

B:BD[4.3118] → [4.3118:3188]

  App.screen.check(y, 'ghij', 'F - test_edit_wrapping_text/screen:3')

[3.16800]

[4.3188]

  App.screen.check(y, 'fg', 'F - test_edit_wrapping_text/screen:3')

Replacement in text_tests.lua at line 1158 [4.2]

∅:D[3.29573] → [4.15046:15178]

B:BD[4.15046] → [4.15046:15178]

  App.screen.check(y, 'ghijk', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/baseline/screen:3')

[3.29573]

[4.15178]

  App.screen.check(y, 'ghij', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/baseline/screen:3')

Replacement in text_tests.lua at line 1163 [4.2]

B:BD[3.29849] → [3.29849:29983]

  check_eq(Editor_state.cursor1.pos, 6, 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/cursor:pos')

[3.29849]

[2.8866]

  check_eq(Editor_state.cursor1.pos, 5, 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/cursor:pos')

Replacement in text_tests.lua at line 1167 [4.2]

∅:D[3.30049] → [4.15811:15934]

B:BD[4.15811] → [4.15811:15934]

  App.screen.check(y, 'ghijk', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/screen:2')

[3.30049]

[3.30050]

  App.screen.check(y, 'ghij', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/screen:2')

Replacement in text_tests.lua at line 1169 [4.2]

∅:D[3.30085] → [4.15956:16075]

B:BD[4.15956] → [4.15956:16075]

  App.screen.check(y, 'l', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/screen:3')

[3.30085]

[4.16075]

  App.screen.check(y, 'kl', 'F - test_down_arrow_scrolls_down_by_one_screen_line_after_splitting_within_word/screen:3')

Replacement in text_tests.lua at line 1187 [4.2]

∅:D[3.30531] → [4.16759:16879]

B:BD[4.16759] → [4.16759:16879]

  App.screen.check(y, 'ghijk', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:3')

[3.30531]

[4.16879]

  App.screen.check(y, 'ghij', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/baseline/screen:3')

Replacement in text_tests.lua at line 1197 [4.2]

B:BD[3.31187] → [3.31187:31309]

  check_eq(Editor_state.cursor1.pos, 6, 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/cursor:pos')

[3.31187]

[2.9082]

  check_eq(Editor_state.cursor1.pos, 5, 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/cursor:pos')

Replacement in text_tests.lua at line 1199 [4.2]

∅:D[2.9105] → [4.17842:17953]

∅:D[3.31339] → [4.17842:17953]

B:BD[4.17842] → [4.17842:17953]

  App.screen.check(y, 'ghijk', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/screen:1')

[2.9105]

[3.31340]

  App.screen.check(y, 'ghij', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/screen:1')

Replacement in text_tests.lua at line 1201 [4.2]

∅:D[3.31375] → [4.17975:18082]

B:BD[4.17975] → [4.17975:18082]

  App.screen.check(y, 'l', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/screen:2')

[3.31375]

[3.31376]

  App.screen.check(y, 'kl', 'F - test_page_down_followed_by_down_arrow_does_not_scroll_screen_up/screen:2')

Replacement in text_tests.lua at line 1538 [4.2]

∅:D[3.40880] → [11.1292:1379]

B:BD[11.1292] → [11.1292:1379]

  App.screen.check(y, 'ghijk', 'F - test_typing_on_bottom_line_scrolls_down/screen:2')

[3.40880]

[3.40881]

  App.screen.check(y, 'ghij', 'F - test_typing_on_bottom_line_scrolls_down/screen:2')

Replacement in text_tests.lua at line 1540 [4.2]

∅:D[3.40916] → [11.1401:1484]

B:BD[11.1401] → [11.1401:1484]

  App.screen.check(y, 'l', 'F - test_typing_on_bottom_line_scrolls_down/screen:3')

[3.40916]

[12.2]

  App.screen.check(y, 'kl', 'F - test_typing_on_bottom_line_scrolls_down/screen:3')

Replacement in text_tests.lua at line 1747 [4.2]

∅:D[2.13063] → [4.35264:35352]

∅:D[3.46441] → [4.35264:35352]

B:BD[4.35264] → [4.35264:35352]

  App.screen.check(y, 'ghijk', 'F - test_backspace_can_scroll_up_screen_line/screen:1')

[2.13063]

[3.46442]

  App.screen.check(y, 'ghij', 'F - test_backspace_can_scroll_up_screen_line/screen:1')

Replacement in text_tests.lua at line 1749 [4.2]

∅:D[3.46477] → [4.35374:35458]

B:BD[4.35374] → [4.35374:35458]

  App.screen.check(y, 'l', 'F - test_backspace_can_scroll_up_screen_line/screen:2')

[3.46477]

[3.46478]

  App.screen.check(y, 'kl', 'F - test_backspace_can_scroll_up_screen_line/screen:2')

Replacement in text.lua at line 810 [13.1]

B:BD[13.1184] → [14.7155:7235]

function Text.nearest_pos_less_than(line, x)  -- x DOES NOT include left margin

[13.1184]

[14.7235]

-- return the nearest index of line (in utf8 code points) which lies entirely
-- within x pixels of the left margin
function Text.nearest_pos_less_than(line, x)
--?   print('-- nearest_pos_less_than', line, x)

Replacement in text.lua at line 818 [13.1]
B:BD[14.7300] → [15.214:250]
```
  local max_x = Text.x(line, len+1)
```
[14.7300]
[14.7344]
```
  local max_x = Text.x_after(line, len)
```
Deletion in text.lua at line 823 [13.1]
B:BD[14.7418] → [14.7418:7436]
```
--?   print('--')
```

Replacement in text.lua at line 825 [13.1]

B:BD[14.7496] → [15.251:335]

    local currxmin = Text.x(line, curr+1)
    local currxmax = Text.x(line, curr+2)

[14.7496]

[14.7596]

    local currxmin = Text.x_after(line, curr+1)
    local currxmax = Text.x_after(line, curr+2)

Insertion in text.lua at line 841 [13.1]

[14.7876]

end
function Text.x_after(s, pos)
  local offset = Text.offset(s, math.min(pos+1, #s+1))
  local s_before = s:sub(1, offset-1)
--?   print('^'..s_before..'$')
  local text_before = App.newText(love.graphics.getFont(), s_before)
  return App.width(text_before)