akkartik/lines-polygon-experiment - Change 7CEOB56DPV2VOG6BCO4YRGTDD3KOHVPAXBAUHO22747DRBKR2ZBQC

Merge upstream into main

Created by Kartik K. Agaram on July 13, 2022

7CEOB56DPV2VOG6BCO4YRGTDD3KOHVPAXBAUHO22747DRBKR2ZBQC

Dependencies

In channels

main

Change contents

File deletion: main_tests.lua, main_tests.lua

BFD:BFD[10.2] → [11.1125:1163]

BFD:BFD[11.1163] → [11.7:7]

B:BD[13.234] → [14.85186:85266]

B:BD[14.85266] → [15.167:197]

∅:D[15.197] → [13.306:1001]

B:BD[16.631] → [14.84826:85118]

B:BD[13.99] → [17.17202:17261]

∅:D[17.17261] → [13.152:234]

∅:D[14.85185] → [13.152:234]

∅:D[14.85118] → [13.7:99]

B:BD[11.73] → [14.84560:84592]

B:BD[14.84592] → [17.16989:17141]

B:BD[16.64] → [17.17142:17201]

∅:D[17.17201] → [16.117:631]

∅:D[14.84825] → [16.117:631]

∅:D[17.17141] → [11.232:552]

∅:D[14.84758] → [11.232:552]

  Editor_state.lines = load_array{'abc', 'def'}
  Editor_state.filename = 'foo'
  schedule_save(Editor_state)
  -- now drag a new file bar from the filesystem
  App.filesystem['bar'] = 'abc\ndef\nghi\n'
  local fake_dropped_file = {
    opened = false,
    getFilename = function(self)
                    return 'bar'
                  end,
    open = function(self)
             self.opened = true
           end,
    lines = function(self)
              assert(self.opened)
              return App.filesystem['bar']:gmatch('[^\n]+')
            end,
    close = function(self)
              self.opened = false
            end,
  }
  App.filedropped(fake_dropped_file)
  -- filesystem now contains a file called foo
  check_eq(App.filesystem['foo'], 'abc\ndef\n', 'F - test_drop_file_saves_previous')
  check_eq(#Editor_state.lines, 3, 'F - test_drop_file/#lines')
  check_eq(Editor_state.lines[1].data, 'abc', 'F - test_drop_file/lines:1')
  check_eq(Editor_state.lines[2].data, 'def', 'F - test_drop_file/lines:2')
  check_eq(Editor_state.lines[3].data, 'ghi', 'F - test_drop_file/lines:3')
  App.screen.init{width=Editor_state.left+300, height=300}
  -- initially editing a file called foo that hasn't been saved to filesystem yet
end
function test_drop_file_saves_previous()
  io.write('\ntest_drop_file_saves_previous')
  Editor_state.filename = 'foo'
  App.screen.init{width=Editor_state.left+300, height=300}
  check_eq(App.screen.width, Editor_state.left+300, 'F - test_resize_window/baseline/width')
  App.screen.init{width=Editor_state.left+300, height=300}
  App.filesystem['foo'] = 'abc\ndef\nghi\n'
  local fake_dropped_file = {
    opened = false,
    getFilename = function(self)
                    return 'foo'
                  end,
    open = function(self)
             self.opened = true
           end,
    lines = function(self)
              assert(self.opened)
              return App.filesystem['foo']:gmatch('[^\n]+')
            end,
    close = function(self)
              self.opened = false
            end,
  }
  App.filedropped(fake_dropped_file)
  check_eq(App.screen.height, 300, 'F - test_resize_window/baseline/height')
  App.resize(200, 400)
  check_eq(App.screen.width, 200, 'F - test_resize_window/width')
  check_eq(App.screen.height, 400, 'F - test_resize_window/height')
  -- TODO: how to make assertions about when App.update got past the early exit?
end

Resurrecting zombie bytes in text_tests.lua at line 443 [20.2]
B:B[18.1122] → [19.2:7]
BD:B[18.1122] → [19.2:7]
```
end
```

Insertion in text_tests.lua at line 443 [20.2]

[18.981]

[19.2]

  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

Deletion in text_tests.lua at line 446 [20.2]

B:BD[19.7] → [21.3:3]

B:BD[18.981] → [14.12150:12304]

BD:BD[18.981] → [14.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

Solving an order conflict in text_tests.lua at line 446 [20.2]
[19.7]
[22.7]
Deletion in text_tests.lua at line 453 [20.2]
B:BD[22.335] → [22.335:404]
BD:BD[22.335] → [22.335:404]
B:BD[22.404] → [24.722:769]
BD:BD[22.404] → [24.722:769]
∅:D[24.769] → [22.423:505]
B:BD[22.423] → [22.423:505]
D:D[24.769] → [22.423:505]
BD:BD[22.423] → [22.423:505]
BD:BD[24.769] → [22.423:505]
B:BD[22.505] → [22.505:518]
BD:BD[22.505] → [22.505:518]
BD:BD[22.505] → [22.505:518]
B:BD[22.518] → [22.518:541]
D:D[25.451] → [22.518:541]
BD:BD[22.518] → [22.518:541]
BD:BD[22.518] → [22.518:541]
```
  Lines = load_array{'the quick brown fox jumped over the lazy dog'}
  Margin_right = 0; Margin_width = Margin_left
  Cursor1 = {line=1, pos=1}
  Screen_top1 = {line=1, pos=1}
  Screen_bottom1 = {}
  App.draw()
  local y = Margin_top
```
Resurrecting zombie bytes in text_tests.lua at line 459 [20.2]
∅:∅[17.3934] → [22.541:654]
∅:∅[14.12631] → [22.541:654]
B:B[22.541] → [22.541:654]
BD:B[22.541] → [22.541:654]
BD:B[22.541] → [22.541:654]
```
  App.screen.check(y, 'the quick brown fox ', 'F - test_click_past_end_of_word_wrapping_line/baseline/screen:1')
```
Deletion in text_tests.lua at line 460 [20.2]
B:BD[22.654] → [22.654:676]
BD:BD[22.654] → [22.654:676]
BD:BD[22.654] → [22.654:676]
```
  y = y + Line_height
```
Resurrecting zombie bytes in text_tests.lua at line 460 [20.2]
B:B[22.654] → [14.12632:12667]
BD:B[22.654] → [14.12632:12667]
```
  y = y + Editor_state.line_height
```
Resurrecting zombie bytes in text_tests.lua at line 463 [20.2]
∅:∅[26.301] → [22.803:843]
∅:∅[27.1547] → [22.803:843]
B:B[22.803] → [22.803:843]
BD:B[26.301] → [22.803:843]
BD:B[22.803] → [22.803:843]
BD:B[22.803] → [22.803:843]
```
  -- cursor moves to end of screen line
```
Deletion in text_tests.lua at line 464 [20.2]
B:BD[22.843] → [22.843:927]
BD:BD[22.843] → [22.843:927]
BD:BD[22.843] → [22.843:927]
BD:BD[22.843] → [22.843:927]
```
  check_eq(Cursor1.pos, 20, 'F - test_click_past_end_of_word_wrapping_line/cursor')
```
Resurrecting zombie bytes in text_tests.lua at line 464 [20.2]
B:B[22.927] → [21.4:9]
BD:B[22.927] → [21.4:9]
```
end
```

Insertion in text_tests.lua at line 464 [20.2]

[22.843]

[21.4]

  check_eq(Editor_state.cursor1.pos, 20, 'F - test_click_past_end_of_word_wrapping_line/cursor')

Deletion in text_tests.lua at line 1832 [20.2]
B:BD[22.843] → [14.12668:12765]
BD:BD[22.843] → [14.12668:12765]
BD:BD[22.843] → [14.12668:12765]
```
  check_eq(Editor_state.cursor1.pos, 20, 'F - test_click_past_end_of_word_wrapping_line/cursor')
```
Solving an order conflict in text_tests.lua at line 1832 [20.2]
[20.43800]
Deletion in text.lua at line 170 [31.1]
B:BD[29.113] → [30.3:23]
BD:BD[29.113] → [30.3:23]
B:BD[30.23] → [28.8:8]
BD:BD[30.23] → [28.8:8]
```
    schedule_save()
```
Resurrecting zombie bytes in text.lua at line 170 [31.1]
B:B[29.113] → [15.3:28]
BD:B[29.113] → [15.3:28]
B:B[15.28] → [32.1211:1313]
BD:B[15.28] → [32.1211:1313]
```
    schedule_save(State)
    record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})
```
Deletion in text.lua at line 181 [31.1]
B:BD[33.814] → [30.24:44]
BD:BD[33.814] → [30.24:44]
B:BD[30.44] → [28.10:10]
BD:BD[30.44] → [28.10:10]
```
    schedule_save()
```
Resurrecting zombie bytes in text.lua at line 181 [31.1]
B:B[33.814] → [15.29:54]
BD:B[33.814] → [15.29:54]
B:B[15.54] → [32.1370:1459]
BD:B[15.54] → [32.1370:1459]
```
    schedule_save(State)
    record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
```
Deletion in text.lua at line 220 [31.1]
B:BD[34.216] → [30.68:88]
BD:BD[34.216] → [30.68:88]
B:BD[30.88] → [28.12:12]
BD:BD[30.88] → [28.12:12]
```
    schedule_save()
```
Resurrecting zombie bytes in text.lua at line 220 [31.1]
B:B[35.3000] → [36.2756:2865]
BD:B[35.3000] → [36.2756:2865]
B:B[36.2865] → [15.83:108]
BD:B[36.2865] → [15.83:108]
B:B[15.108] → [32.1586:1675]
BD:B[15.108] → [32.1586:1675]
```
    Text.clear_cache(State.lines[State.cursor1.line])
    assert(Text.le1(State.screen_top1, State.cursor1))
    schedule_save(State)
    record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
```
Deletion in text.lua at line 225 [31.1]
B:BD[37.8503] → [7.3:75]
BD:BD[37.8503] → [7.3:75]
∅:D[7.75] → [30.89:111]
B:BD[37.8533] → [30.89:111]
B:BD[30.111] → [7.77:77]
```
      Text.delete_selection(Margin_left, App.screen.width-Margin_right)
      schedule_save()
```
Resurrecting zombie bytes in text.lua at line 225 [31.1]
B:B[35.3066] → [36.2942:2976]
BD:B[35.3066] → [36.2942:2976]
B:B[36.2976] → [17.15732:15792]
BD:B[36.2976] → [17.15732:15792]
∅:∅[38.339] → [15.109:136]
∅:∅[17.15792] → [15.109:136]
B:B[36.3060] → [15.109:136]
BD:B[36.3060] → [15.109:136]
```
    if State.selection1.line then
      Text.delete_selection(State, State.left, State.right)
      schedule_save(State)
```
Deletion in text.lua at line 447 [31.1]
B:BD[39.2441] → [40.362:479]
BD:BD[39.2441] → [40.362:479]
B:BD[40.479] → [28.16:16]
BD:BD[40.479] → [28.16:16]
```
    local new_screen_line_starting_byte_offset = Text.offset(Lines[Cursor1.line].data, new_screen_line_starting_pos)
```
Deletion in text.lua at line 551 [31.1]
B:BD[39.5383] → [40.669:739]
BD:BD[39.5383] → [40.669:739]
BD:BD[39.5383] → [40.669:739]
B:BD[40.739] → [28.18:18]
BD:BD[40.739] → [28.18:18]
```
    local offset = Text.offset(Lines[Cursor1.line].data, Cursor1.pos)
```

Deletion in text.lua at line 890 [31.1]

B:BD[40.1005] → [40.1005:1095]

    print(Cursor1.line, Cursor1.pos, #Lines[Cursor1.line].data, Lines[Cursor1.line].data)

Deletion in text.lua at line 896 [31.1]
B:BD[34.564] → [43.264:318]
BD:BD[34.564] → [43.264:318]
```
function Text.previous_screen_line(pos2, left, right)
```
Resurrecting zombie bytes in text.lua at line 896 [31.1]
B:B[34.564] → [8.3517:3565]
BD:B[34.564] → [8.3517:3565]
```
function Text.previous_screen_line(State, pos2)
```

Replacement in main_tests.lua at line 3 [45.7]

B:BD[45.73] → [45.73:232]

  Filename = 'foo'
  App.screen.init{width=Margin_left+300, height=300}
  check_eq(App.screen.width, Margin_left+300, 'F - test_resize_window/baseline/width')

[45.73]

[45.232]

  Editor_state.filename = 'foo'
  App.screen.init{width=Editor_state.left+300, height=300}
  check_eq(App.screen.width, Editor_state.left+300, 'F - test_resize_window/baseline/width')

Replacement in main_tests.lua at line 15 [45.7]

B:BD[12.64] → [12.64:117]

  App.screen.init{width=Margin_left+300, height=300}

[12.64]

[12.117]

  App.screen.init{width=Editor_state.left+300, height=300}

Replacement in main_tests.lua at line 34 [45.7]

B:BD[12.631] → [12.631:871]

  check_eq(#Lines, 3, 'F - test_drop_file/#lines')
  check_eq(Lines[1].data, 'abc', 'F - test_drop_file/lines:1')
  check_eq(Lines[2].data, 'def', 'F - test_drop_file/lines:2')
  check_eq(Lines[3].data, 'ghi', 'F - test_drop_file/lines:3')

[12.631]

[12.871]

  check_eq(#Editor_state.lines, 3, 'F - test_drop_file/#lines')
  check_eq(Editor_state.lines[1].data, 'abc', 'F - test_drop_file/lines:1')
  check_eq(Editor_state.lines[2].data, 'def', 'F - test_drop_file/lines:2')
  check_eq(Editor_state.lines[3].data, 'ghi', 'F - test_drop_file/lines:3')

Replacement in main_tests.lua at line 42 [45.7]

B:BD[12.963] → [12.963:1016]

  App.screen.init{width=Margin_left+300, height=300}

[12.963]

[12.1016]

  App.screen.init{width=Editor_state.left+300, height=300}

Replacement in main_tests.lua at line 44 [45.7]

B:BD[12.1098] → [12.1098:1170]

  Lines = load_array{'abc', 'def'}
  Filename = 'foo'
  schedule_save()

[12.1098]

[12.1170]

  Editor_state.lines = load_array{'abc', 'def'}
  Editor_state.filename = 'foo'
  schedule_save(Editor_state)

Deletion in main.lua at line 17 [48.2]
B:BD[46.405] → [47.7:52]
BD:BD[46.405] → [47.7:52]
B:BD[50.41] → [47.53:103]
BD:BD[50.41] → [47.53:103]
B:BD[51.109] → [52.7:37]
BD:BD[51.109] → [52.7:37]
B:BD[53.63] → [30.137:153]
BD:BD[53.63] → [30.137:153]
B:BD[30.153] → [28.31:31]
BD:BD[30.153] → [28.31:31]
```
--    an array vertices for mode 'rectangle'
--    center, p1, num_vertices for mode 'polygon'
Current_drawing_submode = nil
Next_save = nil
```
Deletion in main.lua at line 25 [48.2]
∅:D[49.144] → [54.162:163]
B:BD[55.455] → [54.162:163]
Resurrecting zombie bytes in main.lua at line 25 [48.2]
B:B[56.240] → [57.7:8]
BD:B[56.240] → [57.7:8]
Deletion in main.lua at line 123 [48.2]
B:BD[54.217] → [58.1274:1343]
BD:BD[54.217] → [58.1274:1343]
BD:BD[54.217] → [58.1274:1343]
B:BD[58.1343] → [7.83:163]
BD:BD[58.1343] → [7.83:163]
∅:D[7.163] → [23.8:43]
B:BD[58.1380] → [23.8:43]
BD:BD[7.163] → [23.8:43]
BD:BD[58.1380] → [23.8:43]
```
  Selection1 = {}  -- no support for shift drag while we're resizing
  Text.tweak_screen_top_and_cursor(Margin_left, App.screen.height-Margin_right)
  Last_resize_time = App.getTime()
```
Resurrecting zombie bytes in main.lua at line 123 [48.2]
B:B[59.477] → [44.6094:6126]
BD:B[59.477] → [44.6094:6126]
∅:∅[44.6126] → [14.86117:86199]
B:B[54.217] → [14.86117:86199]
BD:B[54.217] → [14.86117:86199]
B:B[14.86199] → [17.18284:18372]
BD:B[14.86199] → [17.18284:18372]
```
  Text.redraw_all(Editor_state)
  Editor_state.selection1 = {}  -- no support for shift drag while we're resizing
  Text.tweak_screen_top_and_cursor(Editor_state, Editor_state.left, Editor_state.right)
```
Insertion in main.lua at line 126 [48.2]
[17.18372]
[60.440]
```
  Last_resize_time = App.getTime()
```
Deletion in main.lua at line 150 [48.2]
B:BD[57.273] → [57.273:274]
BD:BD[57.273] → [57.273:274]
B:BD[57.274] → [7.165:165]
BD:BD[57.274] → [7.165:165]
∅:D[7.165] → [61.658:692]
B:BD[54.261] → [61.658:692]
BD:BD[54.261] → [61.658:692]
∅:D[62.679] → [63.306:331]
B:BD[64.394] → [63.306:331]
D:D[62.679] → [63.306:331]
BD:BD[64.394] → [63.306:331]
BD:BD[62.679] → [63.306:331]
```
  love.graphics.setColor(0, 0, 0)
                     end
```
Deletion in main.lua at line 165 [48.2]
∅:D[65.24] → [66.3:8]
∅:D[49.178] → [66.3:8]
∅:D[67.444] → [66.3:8]
∅:D[30.444] → [66.3:8]
∅:D[68.2384] → [66.3:8]
B:BD[69.1683] → [66.3:8]
B:BD[66.8] → [30.445:604]
```
end
function schedule_save()
  if Next_save == nil then
    Next_save = App.getTime() + 3  -- short enough that you're likely to still remember what you did
  end
```
Deletion in main.lua at line 168 [48.2]
B:BD[70.66] → [23.47:47]
BD:BD[70.66] → [23.47:47]
∅:D[12.1873] → [71.8:68]
B:BD[72.66] → [71.8:68]
D:D[73.47] → [71.8:68]
BD:BD[72.66] → [71.8:68]
∅:D[23.47] → [73.8:47]
B:BD[72.66] → [73.8:47]
BD:BD[72.66] → [73.8:47]
```
  if Next_save then
    save_to_disk(Lines, Filename)
  end
  -- make sure to save before quitting
```
Resurrecting zombie bytes in main.lua at line 168 [48.2]
B:B[71.68] → [23.48:135]
BD:B[71.68] → [23.48:135]
```
  -- save some important settings
  local x,y,displayindex = love.window.getPosition()
```
Insertion in main.lua at line 168 [48.2]
[70.66]
[23.48]
```
  edit.quit(Editor_state)
```
Deletion in main.lua at line 171 [48.2]
B:BD[23.135] → [4.9:9]
BD:BD[23.135] → [4.9:9]
∅:D[4.9] → [74.8:36]
B:BD[73.135] → [74.8:36]
BD:BD[73.135] → [74.8:36]
```
  local filename = Filename
```
Resurrecting zombie bytes in main.lua at line 171 [48.2]
B:B[73.135] → [14.86892:86933]
BD:B[73.135] → [14.86892:86933]
```
  local filename = Editor_state.filename
```
Solving an order conflict in main.lua at line 171 [48.2]
[23.135]
[14.86892]

Resurrecting zombie bytes in main.lua at line 172 [48.2]

∅:∅[14.86933] → [74.36:181]

B:B[74.36] → [74.36:181]

BD:B[74.36] → [74.36:181]

  if filename:sub(1,1) ~= '/' then
    filename = love.filesystem.getWorkingDirectory()..'/'..filename  -- '/' should work even on Windows
  end

Resurrecting zombie bytes in main.lua at line 175 [48.2]

B:B[74.181] → [4.10:126]

BD:B[74.181] → [4.10:126]

  local settings = {
    x=x, y=y, displayindex=displayindex,
    width=App.screen.width, height=App.screen.height,

Deletion in main.lua at line 178 [48.2]
∅:D[75.9] → [76.8:37]
∅:D[4.126] → [76.8:37]
B:BD[73.251] → [76.8:37]
BD:BD[73.251] → [76.8:37]
```
    font_height=Font_height,
```
Resurrecting zombie bytes in main.lua at line 178 [48.2]
B:B[73.251] → [14.86934:86976]
BD:B[73.251] → [14.86934:86976]
```
    font_height=Editor_state.font_height,
```
Solving an order conflict in main.lua at line 178 [48.2]
[4.126]
[14.86934]
Deletion in main.lua at line 180 [48.2]
∅:D[74.205] → [76.140:184]
B:BD[76.140] → [76.140:184]
D:D[74.205] → [76.140:184]
BD:BD[76.140] → [76.140:184]
```
    screen_top=Screen_top1, cursor=Cursor1}
```
Resurrecting zombie bytes in main.lua at line 180 [48.2]
B:B[76.184] → [75.10:72]
BD:B[76.184] → [75.10:72]
```
  love.filesystem.write('config', json.encode(settings))
end
```

Insertion in main.lua at line 180 [48.2]

[74.205]

[75.10]

    screen_top=Editor_state.screen_top1, cursor=Editor_state.cursor1}

Deletion in main.lua at line 185 [48.2]
B:BD[57.877] → [28.47:47]
BD:BD[57.877] → [28.47:47]
Deletion in main.lua at line 190 [48.2]
B:BD[77.365] → [30.610:630]
BD:BD[77.365] → [30.610:630]
BD:BD[77.365] → [30.610:630]
B:BD[30.630] → [28.51:51]
BD:BD[30.630] → [28.51:51]
```
    schedule_save()
```
Deletion in main.lua at line 195 [48.2]
B:BD[79.354] → [30.631:649]
BD:BD[79.354] → [30.631:649]
B:BD[30.649] → [28.53:53]
```
  schedule_save()
```
Deletion in main.lua at line 200 [48.2]
B:BD[80.3421] → [40.1543:1599]
BD:BD[80.3421] → [40.1543:1599]
B:BD[40.1599] → [28.55:55]
BD:BD[40.1599] → [28.55:55]
B:BD[81.646] → [30.717:737]
BD:BD[81.646] → [30.717:737]
B:BD[30.737] → [28.57:57]
BD:BD[30.737] → [28.57:57]
B:BD[82.189] → [30.738:760]
BD:BD[82.189] → [30.738:760]
B:BD[30.760] → [28.59:59]
BD:BD[30.760] → [28.59:59]
B:BD[35.5055] → [19.868:874]
BD:BD[35.5055] → [19.868:874]
```
      local byte_offset = Text.offset(Search_term, len)
    schedule_save()
      schedule_save()
  end
```
Deletion in main.lua at line 208 [48.2]
B:BD[83.331] → [7.167:167]
B:BD[74.205] → [14.86977:87047]
BD:BD[74.205] → [14.86977:87047]
B:BD[72.66] → [68.2385:2411]
BD:BD[72.66] → [68.2385:2411]
BD:BD[72.66] → [68.2385:2411]
```
    screen_top=Editor_state.screen_top1, cursor=Editor_state.cursor1}
  edit.quit(Editor_state)
```
Solving an order conflict in main.lua at line 208 [48.2]
[83.331]

Deletion in icons.lua at line 3 [51.5323]

B:BD[57.882] → [57.882:1345]

B:BD[57.1345] → [28.64:64]

∅:D[28.64] → [63.881:882]

B:BD[51.5334] → [63.881:882]

function icon.line_width(x, y)
  love.graphics.setColor(0.7,0.7,0.7)
  love.graphics.line(x+0,y+0, x+9,y+0)
  love.graphics.line(x+0,y+1, x+9,y+1)
  love.graphics.line(x+0,y+2, x+9,y+2)
  love.graphics.line(x+0,y+3, x+9,y+3)
  love.graphics.line(x+0,y+4, x+9,y+4)
  love.graphics.line(x+0,y+5, x+9,y+5)
  love.graphics.line(x+1,y+6, x+8,y+6)
  love.graphics.line(x+2,y+7, x+7,y+7)
  love.graphics.line(x+3,y+8, x+6,y+8)
  love.graphics.line(x+4,y+9, x+5,y+9)
end

Replacement in icons.lua at line 36 [51.5323]

B:BD[3.26] → [3.26:65]

  if Current_drawing_submode == 3 then

[3.26]

[3.65]

  if Editor_state.current_drawing_submode == 3 then

Replacement in icons.lua at line 38 [51.5323]

B:BD[3.105] → [3.105:148]

  elseif Current_drawing_submode == 4 then

[3.105]

[3.148]

  elseif Editor_state.current_drawing_submode == 4 then

Replacement in icons.lua at line 40 [51.5323]

B:BD[3.195] → [3.195:238]

  elseif Current_drawing_submode == 5 then

[3.195]

[3.238]

  elseif Editor_state.current_drawing_submode == 5 then

Replacement in icons.lua at line 42 [51.5323]

B:BD[3.295] → [3.295:338]

  elseif Current_drawing_submode == 6 then

[3.295]

[3.338]

  elseif Editor_state.current_drawing_submode == 6 then

Replacement in icons.lua at line 44 [51.5323]

B:BD[3.402] → [3.402:445]

  elseif Current_drawing_submode == 7 then

[3.402]

[3.445]

  elseif Editor_state.current_drawing_submode == 7 then

Replacement in icons.lua at line 47 [51.5323]

B:BD[3.539] → [3.539:582]

  elseif Current_drawing_submode == 8 then

[3.539]

[3.582]

  elseif Editor_state.current_drawing_submode == 8 then

Replacement in icons.lua at line 49 [51.5323]

B:BD[3.663] → [3.663:706]

  elseif Current_drawing_submode == 9 then

[3.663]

[3.706]

  elseif Editor_state.current_drawing_submode == 9 then

Replacement in icons.lua at line 53 [51.5323]

B:BD[3.825] → [3.825:860]

    print(Current_drawing_submode)

[3.825]

[3.860]

    print(Editor_state.current_drawing_submode)

Deletion in help.lua at line 4 [51.6622]
B:BD[51.6732] → [84.11:73]
BD:BD[51.6732] → [84.11:73]
B:BD[84.73] → [28.67:67]
BD:BD[84.73] → [28.67:67]
B:BD[85.5014] → [84.180:296]
BD:BD[85.5014] → [84.180:296]
B:BD[84.296] → [28.69:69]
BD:BD[84.296] → [28.69:69]
B:BD[85.5128] → [84.297:395]
BD:BD[85.5128] → [84.297:395]
B:BD[84.395] → [28.71:71]
BD:BD[84.395] → [28.71:71]
B:BD[85.5445] → [84.511:614]
BD:BD[85.5445] → [84.511:614]
B:BD[84.614] → [28.73:73]
BD:BD[84.614] → [28.73:73]
B:BD[51.7341] → [84.615:715]
BD:BD[51.7341] → [84.615:715]
B:BD[84.715] → [28.75:75]
BD:BD[84.715] → [28.75:75]
```
  love.graphics.print("Things you can do:", Margin_left+30,y)
  love.graphics.print("* Hover on a point and press 'ctrl+u' to pick it up and start moving it,", Margin_left+30,y)
  love.graphics.print("then press the mouse button to drop it", Margin_left+30+bullet_indent(),y)
  love.graphics.print("* Hover on a point or shape and press 'ctrl+d' to delete it", Margin_left+30,y)
    love.graphics.print("* Press 'ctrl+p' to switch to drawing freehand strokes", Margin_left+30,y)
```

Replacement in help.lua at line 5 [51.6622]

∅:D[17.18438] → [86.138:166]

B:BD[86.138] → [86.138:166]

B:BD[86.166] → [17.18439:18548]

∅:D[17.18548] → [86.282:310]

B:BD[86.282] → [86.282:310]

  y = y + State.line_height
  love.graphics.print("* Press the mouse button to start drawing a "..current_shape(State), State.left+30,y)
  y = y + State.line_height

[17.18438]

[17.18549]

  y = y + Line_height
  love.graphics.print("* Press the mouse button to start drawing a "..current_shape(), State.left+30,y)
  y = y + Line_height

Replacement in help.lua at line 9 [51.6622]
∅:D[17.18664] → [86.432:460]
B:BD[86.432] → [86.432:460]
```
  y = y + State.line_height
```
[17.18664]
[17.18665]
```
  y = y + Line_height
```
Replacement in help.lua at line 11 [51.6622]
∅:D[17.18762] → [86.564:592]
B:BD[86.564] → [86.564:592]
```
  y = y + State.line_height
```
[17.18762]
[17.18763]
```
  y = y + Line_height
```
Replacement in help.lua at line 13 [51.6622]
∅:D[17.18876] → [86.712:740]
B:BD[86.712] → [86.712:740]
```
  y = y + State.line_height
```
[17.18876]
[17.18877]
```
  y = y + Line_height
```

Replacement in help.lua at line 15 [51.6622]

∅:D[17.18979] → [86.849:928]

B:BD[86.849] → [86.849:928]

  y = y + State.line_height
  if State.current_drawing_mode ~= 'freehand' then

[17.18979]

[17.18980]

  y = y + Line_height
  if Current_drawing_mode ~= 'freehand' then

Replacement in help.lua at line 18 [51.6622]
∅:D[17.19079] → [86.1034:1064]
B:BD[86.1034] → [86.1034:1064]
```
    y = y + State.line_height
```
[17.19079]
[51.7459]
```
    y = y + Line_height
```

Replacement in help.lua at line 20 [51.6622]

B:BD[51.7506] → [87.11:100]

BD:BD[51.7506] → [87.11:100]

B:BD[87.100] → [28.77:77]

BD:BD[87.100] → [28.77:77]

B:BD[51.7465] → [86.1065:1112]

B:BD[86.1112] → [17.19080:19168]

∅:D[17.19168] → [86.1207:1237]

B:BD[86.1207] → [86.1207:1237]

    love.graphics.print("* Press 'ctrl+2' to switch to drawing lines", Margin_left+30,y)
  if State.current_drawing_mode ~= 'line' then
    love.graphics.print("* Press 'ctrl+l' to switch to drawing lines", State.left+30,y)
    y = y + State.line_height

[51.7465]

[51.7613]

  if Current_drawing_mode ~= 'line' then
    love.graphics.print("* Press 'ctrl+2' to switch to drawing lines", State.left+30,y)
    y = y + Line_height

Replacement in help.lua at line 24 [51.6622]

B:BD[51.7665] → [84.806:915]

BD:BD[51.7665] → [84.806:915]

B:BD[84.915] → [28.79:79]

BD:BD[84.915] → [28.79:79]

B:BD[51.7619] → [86.1238:1290]

    love.graphics.print("* Press 'ctrl+m' to switch to drawing horizontal/vertical lines", Margin_left+30,y)
  if State.current_drawing_mode ~= 'manhattan' then

[51.7619]

[17.19169]

  if Current_drawing_mode ~= 'manhattan' then

Replacement in help.lua at line 26 [51.6622]
∅:D[17.19277] → [86.1405:1435]
B:BD[86.1405] → [86.1405:1435]
```
    y = y + State.line_height
```
[17.19277]
[51.7792]
```
    y = y + Line_height
```

Replacement in help.lua at line 28 [51.6622]

B:BD[51.7798] → [86.1436:1485]

  if State.current_drawing_mode ~= 'circle' then

[51.7798]

[17.19278]

  if Current_drawing_mode ~= 'circle' then

Replacement in help.lua at line 30 [51.6622]
∅:D[17.19373] → [86.1587:1617]
B:BD[86.1587] → [86.1587:1617]
```
    y = y + State.line_height
```
[17.19373]
[51.7955]
```
    y = y + Line_height
```

Replacement in help.lua at line 32 [51.6622]

B:BD[51.8005] → [84.1013:1119]

BD:BD[51.8005] → [84.1013:1119]

B:BD[84.1119] → [28.81:81]

BD:BD[84.1119] → [28.81:81]

B:BD[51.7961] → [86.1618:1668]

B:BD[86.1668] → [17.19374:19465]

∅:D[17.19465] → [86.1766:1796]

B:BD[86.1766] → [86.1766:1796]

    love.graphics.print("* Press 'ctrl+<digit>' to switch to drawing regular polygons", Margin_left+30,y)
  if State.current_drawing_mode ~= 'polygon' then
    love.graphics.print("* Press 'ctrl+g' to switch to drawing polygons", State.left+30,y)
    y = y + State.line_height

[51.7961]

[88.422]

  if Current_drawing_mode ~= 'polygon' then
    love.graphics.print("* Press 'ctrl+<digit>' to switch to drawing regular polygons", State.left+30,y)
    y = y + Line_height

Replacement in help.lua at line 36 [51.6622]
B:BD[88.474] → [84.1120:1214]
BD:BD[88.474] → [84.1120:1214]
B:BD[84.1214] → [28.83:83]
BD:BD[84.1214] → [28.83:83]
B:BD[88.428] → [86.1797:1849]
```
    love.graphics.print("* Press 'ctrl+r' to switch to drawing rectangles", Margin_left+30,y)
  if State.current_drawing_mode ~= 'rectangle' then
```
[88.428]
[17.19466]
```
  if Current_drawing_mode ~= 'rectangle' then
```
Replacement in help.lua at line 38 [51.6622]
∅:D[17.19559] → [86.1949:1979]
B:BD[86.1949] → [86.1949:1979]
```
    y = y + State.line_height
```
[17.19559]
[88.586]
```
    y = y + Line_height
```
Deletion in help.lua at line 40 [51.6622]
B:BD[88.592] → [84.1215:1327]
BD:BD[88.592] → [84.1215:1327]
B:BD[84.1327] → [28.85:85]
BD:BD[84.1327] → [28.85:85]
B:BD[88.592] → [86.1980:2029]
BD:BD[88.592] → [86.1980:2029]
B:BD[86.2029] → [17.19560:19650]
BD:BD[86.2029] → [17.19560:19650]
∅:D[17.19650] → [86.2126:2156]
B:BD[86.2126] → [86.2126:2156]
BD:BD[86.2126] → [86.2126:2156]
```
  love.graphics.print("* Press 'ctrl+=' or 'ctrl+-' to zoom in or out, ctrl+0 to reset zoom", Margin_left+30,y)
  if State.current_drawing_mode ~= 'square' then
    love.graphics.print("* Press 'ctrl+s' to switch to drawing squares", State.left+30,y)
    y = y + State.line_height
```

Resurrecting zombie bytes in help.lua at line 40 [51.6622]

B:B[51.8121] → [17.19651:19762]

BD:B[51.8121] → [17.19651:19762]

B:B[86.2303] → [17.19763:19842]

BD:B[86.2303] → [17.19763:19842]

  love.graphics.print("* Press 'ctrl+=' or 'ctrl+-' to zoom in or out, ctrl+0 to reset zoom", State.left+30,y)
  love.graphics.print("Press 'esc' now to hide this message", State.left+30,y)

Replacement in help.lua at line 41 [51.6622]
∅:D[17.19762] → [86.2275:2303]
B:BD[86.2275] → [86.2275:2303]
BD:BD[86.2275] → [86.2275:2303]
```
  y = y + State.line_height
```
[17.19762]
[17.19763]
```
  y = y + Line_height
```

Replacement in help.lua at line 43 [51.6622]

∅:D[17.19842] → [86.2389:2417]

B:BD[86.2389] → [86.2389:2417]

BD:BD[86.2389] → [86.2389:2417]

∅:D[86.2417] → [90.314:349]

∅:D[14.89653] → [90.314:349]

B:BD[85.6670] → [90.314:349]

B:BD[90.349] → [91.336:467]

  y = y + State.line_height
  App.color(Help_background_color)
  love.graphics.rectangle('fill', State.left,drawing.y, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-drawing.y))

[17.19842]

[51.8578]

  y = y + Line_height
  love.graphics.setColor(0,0.5,0, 0.1)
  love.graphics.rectangle('fill', State.left,drawing.y, State.right, math.max(Drawing.pixels(drawing.h),y-drawing.y))

Deletion in help.lua at line 51 [51.6622]
B:BD[51.8689] → [84.1528:1631]
BD:BD[51.8689] → [84.1528:1631]
B:BD[84.1631] → [28.87:87]
BD:BD[84.1631] → [28.87:87]
B:BD[85.6787] → [84.1632:1698]
BD:BD[85.6787] → [84.1632:1698]
B:BD[84.1698] → [28.89:89]
BD:BD[84.1698] → [28.89:89]
B:BD[51.8935] → [84.1699:1800]
BD:BD[51.8935] → [84.1699:1800]
B:BD[84.1800] → [28.91:91]
BD:BD[84.1800] → [28.91:91]
B:BD[51.9138] → [84.1801:1900]
BD:BD[51.9138] → [84.1801:1900]
B:BD[84.1900] → [28.93:93]
BD:BD[84.1900] → [28.93:93]
```
  love.graphics.print("You're currently drawing a "..current_shape(drawing.pending), Margin_left+30,y)
  love.graphics.print('Things you can do now:', Margin_left+30,y)
    love.graphics.print('* Release the mouse button to finish drawing the stroke', Margin_left+30,y)
    love.graphics.print('* Release the mouse button to finish drawing the line', Margin_left+30,y)
```
Deletion in help.lua at line 63 [51.6622]
B:BD[85.7219] → [84.2005:2096]
BD:BD[85.7219] → [84.2005:2096]
B:BD[84.2096] → [28.95:95]
```
      love.graphics.print("* Press 'a' to draw just an arc of a circle", Margin_left+30,y)
```

Deletion in help.lua at line 67 [51.6622]

B:BD[51.9570] → [84.2097:2197]

B:BD[84.2197] → [28.97:97]

      love.graphics.print('* Release the mouse button to finish drawing the arc', Margin_left+30,y)

Deletion in help.lua at line 69 [51.6622]
B:BD[51.9744] → [84.2198:2308]
BD:BD[51.9744] → [84.2198:2308]
B:BD[84.2308] → [28.99:99]
BD:BD[84.2308] → [28.99:99]
B:BD[51.9678] → [86.3686:3770]
BD:BD[51.9678] → [86.3686:3770]
B:BD[86.3770] → [17.20632:20733]
BD:BD[86.3770] → [17.20632:20733]
∅:D[17.20733] → [86.3878:3908]
B:BD[86.3878] → [86.3878:3908]
BD:BD[86.3878] → [86.3878:3908]
B:BD[86.3908] → [17.20734:20821]
BD:BD[86.3908] → [17.20734:20821]
∅:D[17.20821] → [86.4002:4088]
B:BD[86.4002] → [86.4002:4088]
BD:BD[86.4002] → [86.4002:4088]
```
    love.graphics.print('* Release the mouse button to finish drawing the regular polygon', Margin_left+30,y)
    y = y + State.line_height
  elseif State.current_drawing_mode == 'polygon' then
    love.graphics.print('* Release the mouse button to finish drawing the polygon', State.left+30,y)
    y = y + State.line_height
    love.graphics.print("* Press 'p' to add a vertex to the polygon", State.left+30,y)
    y = y + State.line_height
  elseif State.current_drawing_mode == 'rectangle' then
```
Resurrecting zombie bytes in help.lua at line 69 [51.6622]
B:B[85.7639] → [92.12:104]
BD:B[85.7639] → [92.12:104]
```
  elseif Current_drawing_mode == 'rectangle' then
    if #drawing.pending.vertices < 2 then
```

Insertion in help.lua at line 69 [51.6622]

[51.9678]

[92.12]

    y = y + Line_height
  elseif Current_drawing_mode == 'polygon' then
    love.graphics.print('* Release the mouse button to finish drawing the regular polygon', State.left+30,y)
    y = y + Line_height

Replacement in help.lua at line 75 [51.6622]

B:BD[92.104] → [92.104:222]

BD:BD[92.104] → [92.104:222]

      love.graphics.print("* Press 'p' to add a vertex to the rectangle", Margin_left+30,y)
      y = y + Line_height

[92.104]

[92.222]

      love.graphics.print("* Press 'p' to add a vertex to the rectangle", State.left+30,y)
      y = y + State.line_height

Replacement in help.lua at line 78 [51.6622]

B:BD[92.231] → [92.231:494]

BD:BD[92.231] → [92.231:494]

      love.graphics.print('* Release the mouse button to finish drawing the rectangle', Margin_left+30,y)
      y = y + Line_height
      love.graphics.print("* Press 'p' to replace the second vertex of the rectangle", Margin_left+30,y)
      y = y + Line_height

[92.231]

[92.494]

      love.graphics.print('* Release the mouse button to finish drawing the rectangle', State.left+30,y)
      y = y + State.line_height
      love.graphics.print("* Press 'p' to replace the second vertex of the rectangle", State.left+30,y)
      y = y + State.line_height

Deletion in help.lua at line 84 [51.6622]
B:BD[51.9976] → [84.2309:2424]
BD:BD[51.9976] → [84.2309:2424]
B:BD[84.2424] → [28.103:103]
BD:BD[84.2424] → [28.103:103]
B:BD[51.10164] → [87.101:185]
BD:BD[51.10164] → [87.101:185]
B:BD[87.185] → [28.105:105]
BD:BD[87.185] → [28.105:105]
```
  love.graphics.print("* Press 'esc' then release the mouse button to cancel the current shape", Margin_left+30,y)
    love.graphics.print("* Press '2' to switch to drawing lines", Margin_left+30,y)
```

Replacement in help.lua at line 85 [51.6622]

∅:D[17.21533] → [86.5093:5196]

B:BD[86.5093] → [86.5093:5196]

B:BD[86.5196] → [17.21534:21617]

∅:D[17.21617] → [86.5286:5316]

B:BD[86.5286] → [86.5286:5316]

  y = y + State.line_height
  y = y + State.line_height
  if State.current_drawing_mode ~= 'line' then
    love.graphics.print("* Press 'l' to switch to drawing lines", State.left+30,y)
    y = y + State.line_height

[17.21533]

[51.10266]

  y = y + Line_height
  y = y + Line_height
  if Current_drawing_mode ~= 'line' then
    love.graphics.print("* Press '2' to switch to drawing lines", State.left+30,y)
    y = y + Line_height

Deletion in help.lua at line 91 [51.6622]

B:BD[51.10272] → [87.186:300]

BD:BD[51.10272] → [87.186:300]

  love.graphics.print("* Press other digits to switch to polygons with corresponding vertices", Margin_left+30,y)

Resurrecting zombie bytes in help.lua at line 91 [51.6622]
B:B[87.300] → [87.300:322]
BD:B[87.300] → [87.300:322]
```
  y = y + Line_height
```

Insertion in help.lua at line 91 [51.6622]

[51.10272]

[87.300]

  love.graphics.print("* Press other digits to switch to polygons with corresponding vertices", State.left+30,y)

Deletion in help.lua at line 93 [51.6622]
B:BD[51.10272] → [86.5317:5369]
```
  if State.current_drawing_mode ~= 'manhattan' then
```
Solving an order conflict in help.lua at line 93 [51.6622]
[87.322]
Insertion in help.lua at line 93 [51.6622]
[0.3529]
[17.21618]
```
  if Current_drawing_mode ~= 'manhattan' then
```
Replacement in help.lua at line 95 [51.6622]
∅:D[17.21721] → [86.5479:5509]
B:BD[86.5479] → [86.5479:5509]
```
    y = y + State.line_height
```
[17.21721]
[51.10440]
```
    y = y + Line_height
```
Deletion in help.lua at line 97 [51.6622]
B:BD[51.10489] → [84.2615:2706]
BD:BD[51.10489] → [84.2615:2706]
B:BD[84.2706] → [28.107:107]
BD:BD[84.2706] → [28.107:107]
```
    love.graphics.print("* Press 'o' to switch to drawing circles/arcs", Margin_left+30,y)
```
Deletion in help.lua at line 101 [51.6622]
B:BD[51.10604] → [86.5687:5737]
BD:BD[51.10604] → [86.5687:5737]
B:BD[86.5737] → [17.21813:21899]
BD:BD[86.5737] → [17.21813:21899]
∅:D[17.21899] → [86.5830:5860]
B:BD[86.5830] → [86.5830:5860]
BD:BD[86.5830] → [86.5830:5860]
B:BD[88.751] → [86.5861:5913]
BD:BD[88.751] → [86.5861:5913]
```
  if State.current_drawing_mode ~= 'polygon' then
    love.graphics.print("* Press 'g' to switch to drawing polygons", State.left+30,y)
    y = y + State.line_height
  if State.current_drawing_mode ~= 'rectangle' then
```
Resurrecting zombie bytes in help.lua at line 101 [51.6622]
B:B[86.5913] → [17.21900:21988]
BD:B[86.5913] → [17.21900:21988]
```
    love.graphics.print("* Press 'r' to switch to drawing rectangles", State.left+30,y)
```
Insertion in help.lua at line 101 [51.6622]
[51.10604]
[17.21900]
```
  if Current_drawing_mode ~= 'rectangle' then
```
Replacement in help.lua at line 103 [51.6622]
∅:D[17.21988] → [86.6008:6038]
B:BD[86.6008] → [86.6008:6038]
BD:BD[86.6008] → [86.6008:6038]
```
    y = y + State.line_height
```
[17.21988]
[88.904]
```
    y = y + Line_height
```

Replacement in help.lua at line 105 [51.6622]

B:BD[51.10759] → [90.375:410]

BD:BD[51.10759] → [90.375:410]

B:BD[90.410] → [91.468:599]

BD:BD[90.410] → [91.468:599]

  App.color(Help_background_color)
  love.graphics.rectangle('fill', State.left,drawing.y, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-drawing.y))

[88.910]

[51.10910]

  love.graphics.setColor(0,0.5,0, 0.1)
  love.graphics.rectangle('fill', State.left,drawing.y, State.right, math.max(Drawing.pixels(drawing.h),y-drawing.y))

Deletion in help.lua at line 131 [51.6622]
B:BD[88.910] → [86.6039:6088]
BD:BD[88.910] → [86.6039:6088]
B:BD[86.6088] → [17.21989:22074]
BD:BD[86.6088] → [17.21989:22074]
∅:D[17.22074] → [86.6180:6210]
B:BD[86.6180] → [86.6180:6210]
BD:BD[86.6180] → [86.6180:6210]
B:BD[93.104] → [17.20822:20913]
BD:BD[93.104] → [17.20822:20913]
∅:D[17.20913] → [86.4187:4219]
B:BD[86.4187] → [86.4187:4219]
BD:BD[86.4187] → [86.4187:4219]
B:BD[93.231] → [17.20914:21019]
BD:BD[93.231] → [17.20914:21019]
∅:D[17.21019] → [86.4332:4364]
B:BD[86.4332] → [86.4332:4364]
BD:BD[86.4332] → [86.4332:4364]
B:BD[86.4364] → [17.21020:21124]
BD:BD[86.4364] → [17.21020:21124]
∅:D[17.21124] → [86.4475:4507]
B:BD[86.4475] → [86.4475:4507]
BD:BD[86.4475] → [86.4475:4507]
B:BD[93.503] → [86.4508:4561]
BD:BD[93.503] → [86.4508:4561]
B:BD[93.592] → [17.21125:21213]
BD:BD[93.592] → [17.21125:21213]
∅:D[17.21213] → [86.4657:4689]
B:BD[86.4657] → [86.4657:4689]
BD:BD[86.4657] → [86.4657:4689]
B:BD[93.716] → [17.21214:21316]
BD:BD[93.716] → [17.21214:21316]
∅:D[17.21316] → [86.4799:4831]
B:BD[86.4799] → [86.4799:4831]
BD:BD[86.4799] → [86.4799:4831]
B:BD[86.4831] → [17.21317:21418]
BD:BD[86.4831] → [17.21317:21418]
∅:D[17.21418] → [86.4939:4971]
B:BD[86.4939] → [86.4939:4971]
BD:BD[86.4939] → [86.4939:4971]
```
  if State.current_drawing_mode ~= 'square' then
    love.graphics.print("* Press 's' to switch to drawing squares", State.left+30,y)
    y = y + State.line_height
      love.graphics.print("* Press 'p' to add a vertex to the rectangle", State.left+30,y)
      y = y + State.line_height
      love.graphics.print('* Release the mouse button to finish drawing the rectangle', State.left+30,y)
      y = y + State.line_height
      love.graphics.print("* Press 'p' to replace the second vertex of the rectangle", State.left+30,y)
      y = y + State.line_height
  elseif State.current_drawing_mode == 'square' then
      love.graphics.print("* Press 'p' to add a vertex to the square", State.left+30,y)
      y = y + State.line_height
      love.graphics.print('* Release the mouse button to finish drawing the square', State.left+30,y)
      y = y + State.line_height
      love.graphics.print("* Press 'p' to replace the second vertex of the square", State.left+30,y)
      y = y + State.line_height
```
Solving an order conflict in help.lua at line 131 [51.6622]
[51.11544]
Insertion in geom.lua at line 1 [51.11579]
[51.11579]
[94.213]
```
geom = {}
```
Deletion in geom.lua at line 3 [51.11579]
B:BD[94.214] → [28.110:110]
B:BD[51.11579] → [95.85:95]
BD:BD[51.11579] → [95.85:95]
```
geom = {}
```
Solving an order conflict in geom.lua at line 3 [51.11579]
[94.214]
[51.11597]

Replacement in edit.lua at line 51 [49.413]

B:BD[14.95310] → [14.95310:95380]

    --    an array vertices for mode 'polygon', 'rectangle', 'square'

[14.95310]

[14.95380]

    --    an array vertices for mode 'rectangle'

Insertion in edit.lua at line 54 [49.413]
[14.95456]
[14.95456]
```
    --    center, p1, num_vertices for mode 'polygon'
```
Insertion in edit.lua at line 90 [49.413]
[14.97108]
[14.97108]
```
    current_drawing_submode = nil,
```

Deletion in drawing_tests.lua at line 226 [96.15]

B:BD[52.1415] → [23.406:500]

∅:D[23.500] → [52.1468:1512]

B:BD[52.1468] → [52.1468:1512]

∅:D[97.86] → [52.1571:2612]

B:BD[52.1571] → [52.1571:2612]

B:BD[52.2612] → [97.88:88]

  App.screen.init{width=Margin_width+256, height=300}  -- drawing coordinates 1:1 with pixels
  Lines = load_array{'```lines', '```', ''}
  App.draw()
  check_eq(Current_drawing_mode, 'line', 'F - test_draw_polygon/baseline/drawing_mode')
  check_eq(#Lines, 2, 'F - test_draw_polygon/baseline/#lines')
  check_eq(Lines[1].mode, 'drawing', 'F - test_draw_polygon/baseline/mode')
  check_eq(Lines[1].y, Margin_top+Drawing_padding_top, 'F - test_draw_polygon/baseline/y')
  check_eq(Lines[1].h, 128, 'F - test_draw_polygon/baseline/y')
  check_eq(#Lines[1].shapes, 0, 'F - test_draw_polygon/baseline/#shapes')
  -- start a stroke
  App.run_after_mouse_press(Margin_left+35, Margin_top+Drawing_padding_top+36, 1)
  -- switch to polygon mode
  App.run_after_keychord('5')
  App.run_after_mouse_release(Margin_left+55, Margin_top+Drawing_padding_top+26, 1)
  local drawing = Lines[1]
  check_eq(#drawing.shapes, 1, 'F - test_draw_polygon/#shapes')
  check_eq(#drawing.points, 2, 'F - test_draw_polygon/vertices')
  local shape = drawing.shapes[1]
  check_eq(shape.mode, 'polygon', 'F - test_draw_polygon/shape_mode')
  check_eq(shape.num_vertices, 5, 'F - test_draw_polygon/vertices')

Resurrecting zombie bytes in drawing_tests.lua at line 226 [96.15]

B:B[98.847] → [17.27367:27564]

BD:B[98.847] → [17.27367:27564]

∅:∅[17.27564] → [14.112971:113028]

B:B[14.112971] → [14.112971:113028]

BD:B[14.112971] → [14.112971:113028]

B:B[14.113028] → [68.9860:9886]

BD:B[14.113028] → [68.9860:9886]

∅:∅[68.9886] → [14.113029:113295]

B:B[25.1462] → [14.113029:113295]

BD:B[25.1462] → [14.113029:113295]

B:B[14.113295] → [17.27565:27688]

BD:B[14.113295] → [17.27565:27688]

∅:∅[17.27688] → [14.113425:113589]

B:B[14.113425] → [14.113425:113589]

BD:B[14.113425] → [14.113425:113589]

∅:∅[27.9673] → [14.113941:113981]

∅:∅[17.28028] → [14.113941:113981]

B:B[14.113941] → [14.113941:113981]

BD:B[14.113941] → [14.113941:113981]

  App.screen.init{width=Margin_left+256, height=300}  -- drawing coordinates 1:1 with pixels
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width)  -- zero right margin
  Editor_state.lines = load_array{'```lines', '```', ''}
  edit.draw(Editor_state)
  check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_draw_polygon/baseline/drawing_mode')
  check_eq(#Editor_state.lines, 2, 'F - test_draw_polygon/baseline/#lines')
  check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_polygon/baseline/mode')
  check_eq(Editor_state.lines[1].y, Editor_state.top+Editor_state.drawing_padding_top, 'F - test_draw_polygon/baseline/y')
  check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_polygon/baseline/y')
  check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_polygon/baseline/#shapes')
  local drawing = Editor_state.lines[1]

Solving an order conflict in drawing_tests.lua at line 226 [96.15]
[52.1415]
[17.27367]

Replacement in drawing_tests.lua at line 236 [96.15]

B:BD[98.1489] → [17.27689:27809]

BD:BD[98.1489] → [17.27689:27809]

∅:D[17.27809] → [27.9412:9474]

B:BD[27.9412] → [27.9412:9474]

BD:BD[27.9412] → [27.9412:9474]

B:BD[98.1634] → [17.27810:27903]

BD:BD[98.1634] → [17.27810:27903]

∅:D[17.27903] → [27.9475:9534]

B:BD[14.113817] → [27.9475:9534]

BD:BD[14.113817] → [27.9475:9534]

B:BD[98.1763] → [17.27904:28028]

BD:BD[98.1763] → [17.27904:28028]

  edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Editor_state.drawing_padding_top+6, 1)
  edit.run_after_keychord(Editor_state, 'g')  -- polygon mode
  App.mouse_move(Editor_state.left+65, Editor_state.top+Editor_state.drawing_padding_top+36)
  edit.run_after_keychord(Editor_state, 'p')  -- add point
  edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+26, 1)

[14.113589]

[14.113941]

  -- start a stroke
  edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1)
  -- switch to polygon mode
  edit.run_after_keychord(Editor_state, '5')
  edit.run_after_mouse_release(Editor_state, Editor_state.left+55, Editor_state.top+Editor_state.drawing_padding_top+26, 1)

Insertion in drawing_tests.lua at line 242 [96.15]

[14.113981]

[98.2608]

  check_eq(#drawing.shapes, 1, 'F - test_draw_polygon/#shapes')
  check_eq(#drawing.points, 2, 'F - test_draw_polygon/vertices')
  local shape = drawing.shapes[1]
  check_eq(shape.mode, 'polygon', 'F - test_draw_polygon/shape_mode')
  check_eq(shape.num_vertices, 5, 'F - test_draw_polygon/vertices')

Deletion in drawing_tests.lua at line 329 [96.15]

B:BD[98.7265] → [17.29437:29634]

BD:BD[98.7265] → [17.29437:29634]

∅:D[17.29634] → [14.116524:116581]

B:BD[14.116524] → [14.116524:116581]

BD:BD[14.116524] → [14.116524:116581]

B:BD[14.116581] → [68.9941:9967]

BD:BD[14.116581] → [68.9941:9967]

∅:D[68.9967] → [14.116582:116845]

B:BD[25.1507] → [14.116582:116845]

BD:BD[25.1507] → [14.116582:116845]

B:BD[14.116845] → [17.29635:29757]

BD:BD[14.116845] → [17.29635:29757]

∅:D[17.29757] → [14.116974:117136]

B:BD[14.116974] → [14.116974:117136]

BD:BD[14.116974] → [14.116974:117136]

B:BD[98.7901] → [17.29758:29880]

BD:BD[98.7901] → [17.29758:29880]

∅:D[17.29880] → [27.10535:10596]

B:BD[27.10535] → [27.10535:10596]

BD:BD[27.10535] → [27.10535:10596]

B:BD[98.8058] → [17.29881:29974]

BD:BD[98.8058] → [17.29881:29974]

∅:D[17.29974] → [27.10597:10642]

B:BD[14.117366] → [27.10597:10642]

BD:BD[14.117366] → [27.10597:10642]

B:BD[98.8194] → [17.29975:30068]

BD:BD[98.8194] → [17.29975:30068]

∅:D[17.30068] → [27.10643:10688]

B:BD[14.117474] → [27.10643:10688]

BD:BD[14.117474] → [27.10643:10688]

B:BD[98.8358] → [17.30069:30193]

BD:BD[98.8358] → [17.30069:30193]

∅:D[27.10827] → [14.117598:117638]

∅:D[17.30193] → [14.117598:117638]

B:BD[14.117598] → [14.117598:117638]

BD:BD[14.117598] → [14.117598:117638]

  App.screen.init{width=Margin_left+256, height=300}  -- drawing coordinates 1:1 with pixels
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width)  -- zero right margin
  Editor_state.lines = load_array{'```lines', '```', ''}
  edit.draw(Editor_state)
  check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_draw_square/baseline/drawing_mode')
  check_eq(#Editor_state.lines, 2, 'F - test_draw_square/baseline/#lines')
  check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_square/baseline/mode')
  check_eq(Editor_state.lines[1].y, Editor_state.top+Editor_state.drawing_padding_top, 'F - test_draw_square/baseline/y')
  check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_square/baseline/y')
  check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_square/baseline/#shapes')
  edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1)
  edit.run_after_keychord(Editor_state, 's')  -- square mode
  App.mouse_move(Editor_state.left+42, Editor_state.top+Editor_state.drawing_padding_top+45)
  edit.run_after_keychord(Editor_state, 'p')
  App.mouse_move(Editor_state.left+65, Editor_state.top+Editor_state.drawing_padding_top+66)
  edit.run_after_keychord(Editor_state, 'p')
  edit.run_after_mouse_release(Editor_state, Editor_state.left+15, Editor_state.top+Editor_state.drawing_padding_top+26, 1)
  local drawing = Editor_state.lines[1]

Deletion in drawing_tests.lua at line 507 [96.15]
B:BD[100.2844] → [17.33400:33597]
BD:BD[100.2844] → [17.33400:33597]
∅:D[17.33597] → [14.122477:122579]
B:BD[14.122477] → [14.122477:122579]
BD:BD[14.122477] → [14.122477:122579]
B:BD[14.122579] → [68.10157:10183]
BD:BD[14.122579] → [68.10157:10183]
B:BD[100.3062] → [17.33598:33718]
BD:BD[100.3062] → [17.33598:33718]
∅:D[17.33718] → [27.13350:13412]
B:BD[27.13350] → [27.13350:13412]
BD:BD[27.13350] → [27.13350:13412]
B:BD[100.3207] → [17.33719:33812]
BD:BD[100.3207] → [17.33719:33812]
∅:D[17.33812] → [27.13413:13472]
B:BD[14.122807] → [27.13413:13472]
BD:BD[14.122807] → [27.13413:13472]
B:BD[100.3336] → [17.33813:33906]
BD:BD[100.3336] → [17.33813:33906]
∅:D[17.33906] → [27.13473:13532]
B:BD[14.122915] → [27.13473:13532]
BD:BD[14.122915] → [27.13473:13532]
B:BD[100.3466] → [17.33907:34031]
BD:BD[100.3466] → [17.33907:34031]
∅:D[27.13671] → [14.123039:123079]
∅:D[17.34031] → [14.123039:123079]
B:BD[14.123039] → [14.123039:123079]
BD:BD[14.123039] → [14.123039:123079]
B:BD[100.3893] → [17.34032:34125]
BD:BD[100.3893] → [17.34032:34125]
∅:D[17.34125] → [27.13672:13719]
B:BD[14.123187] → [27.13672:13719]
BD:BD[14.123187] → [27.13672:13719]
B:BD[100.4357] → [17.34126:34323]
BD:BD[100.4357] → [17.34126:34323]
∅:D[17.34323] → [14.123295:123397]
B:BD[14.123295] → [14.123295:123397]
BD:BD[14.123295] → [14.123295:123397]
B:BD[14.123397] → [68.10184:10210]
BD:BD[14.123397] → [68.10184:10210]
B:BD[100.4575] → [17.34324:34444]
BD:BD[100.4575] → [17.34324:34444]
∅:D[17.34444] → [27.13854:13916]
B:BD[27.13854] → [27.13854:13916]
BD:BD[27.13854] → [27.13854:13916]
B:BD[100.4720] → [17.34445:34538]
BD:BD[100.4720] → [17.34445:34538]
∅:D[17.34538] → [27.13917:13976]
B:BD[14.123625] → [27.13917:13976]
BD:BD[14.123625] → [27.13917:13976]
B:BD[100.4849] → [17.34539:34663]
BD:BD[100.4849] → [17.34539:34663]
∅:D[27.14115] → [14.123749:123789]
∅:D[17.34663] → [14.123749:123789]
B:BD[14.123749] → [14.123749:123789]
BD:BD[14.123749] → [14.123749:123789]
B:BD[100.5276] → [17.34664:34757]
BD:BD[100.5276] → [17.34664:34757]
∅:D[17.34757] → [27.14116:14163]
B:BD[14.123897] → [27.14116:14163]
BD:BD[14.123897] → [27.14116:14163]
```
  App.screen.init{width=Margin_left+256, height=300}  -- drawing coordinates 1:1 with pixels
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width)  -- zero right margin
  Editor_state.lines = load_array{'```lines', '```', ''}
  Editor_state.current_drawing_mode = 'line'
  edit.draw(Editor_state)
  edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Editor_state.drawing_padding_top+6, 1)
  edit.run_after_keychord(Editor_state, 'g')  -- polygon mode
  App.mouse_move(Editor_state.left+65, Editor_state.top+Editor_state.drawing_padding_top+36)
  edit.run_after_keychord(Editor_state, 'p')  -- add point
  App.mouse_move(Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+26)
  edit.run_after_keychord(Editor_state, 'p')  -- add point
  edit.run_after_mouse_release(Editor_state, Editor_state.left+14, Editor_state.top+Editor_state.drawing_padding_top+16, 1)
  local drawing = Editor_state.lines[1]
  App.mouse_move(Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+26)
  edit.run_after_keychord(Editor_state, 'C-d')
  App.screen.init{width=Margin_left+256, height=300}  -- drawing coordinates 1:1 with pixels
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width)  -- zero right margin
  Editor_state.lines = load_array{'```lines', '```', ''}
  Editor_state.current_drawing_mode = 'line'
  edit.draw(Editor_state)
  edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Editor_state.drawing_padding_top+6, 1)
  edit.run_after_keychord(Editor_state, 'g')  -- polygon mode
  App.mouse_move(Editor_state.left+65, Editor_state.top+Editor_state.drawing_padding_top+36)
  edit.run_after_keychord(Editor_state, 'p')  -- add point
  edit.run_after_mouse_release(Editor_state, Editor_state.left+14, Editor_state.top+Editor_state.drawing_padding_top+16, 1)
  local drawing = Editor_state.lines[1]
  App.mouse_move(Editor_state.left+65, Editor_state.top+Editor_state.drawing_padding_top+36)
  edit.run_after_keychord(Editor_state, 'C-d')
```

Replacement in drawing.lua at line 69 [101.98]

B:BD[90.1279] → [91.1461:1528]

  Drawing.draw_pending_shape(line, line.y, State.left,State.right)

[90.1279]

[102.10]

  Drawing.draw_pending_shape(State, line, line.y, State.left,State.right)

Resurrecting zombie bytes in drawing.lua at line 85 [101.98]
B:B[102.636] → [99.185:225]
BD:B[102.636] → [99.185:225]
```
  elseif shape.mode == 'rectangle' then
```

Insertion in drawing.lua at line 85 [101.98]

[102.509]

[99.185]

    love.graphics.line(Drawing.pixels(p1.x, width)+left,Drawing.pixels(p1.y, width)+top, Drawing.pixels(p2.x, width)+left,Drawing.pixels(p2.y, width)+top)

Deletion in drawing.lua at line 87 [101.98]

B:BD[102.509] → [91.1788:1943]

BD:BD[102.509] → [91.1788:1943]

    love.graphics.line(Drawing.pixels(p1.x, width)+left,Drawing.pixels(p1.y, width)+top, Drawing.pixels(p2.x, width)+left,Drawing.pixels(p2.y, width)+top)

Solving an order conflict in drawing.lua at line 87 [101.98]
[99.225]
[102.674]
Resurrecting zombie bytes in drawing.lua at line 97 [101.98]
B:B[102.1183] → [52.2614:2700]
BD:B[102.1183] → [52.2614:2700]
```
  elseif shape.mode == 'polygon' then
    local center = drawing.points[shape.center]
```

Insertion in drawing.lua at line 97 [101.98]

[102.1048]

[52.2614]

    love.graphics.line(Drawing.pixels(prev.x, width)+left,Drawing.pixels(prev.y, width)+top, Drawing.pixels(curr.x, width)+left,Drawing.pixels(curr.y, width)+top)

Replacement in drawing.lua at line 100 [101.98]

B:BD[52.2700] → [52.2700:2778]

BD:BD[52.2700] → [52.2700:2778]

    local cx,cy = Drawing.pixels(center.x)+left, Drawing.pixels(center.y)+top

[52.2700]

[52.2778]

    local cx,cy = Drawing.pixels(center.x, width)+left, Drawing.pixels(center.y, width)+top

Replacement in drawing.lua at line 102 [101.98]

B:BD[52.2818] → [52.2818:2886]

BD:BD[52.2818] → [52.2818:2886]

    local x,y = Drawing.pixels(p1.x)+left, Drawing.pixels(p1.y)+top

[52.2818]

[52.2886]

    local x,y = Drawing.pixels(p1.x, width)+left, Drawing.pixels(p1.y, width)+top

Deletion in drawing.lua at line 104 [101.98]

B:BD[102.1048] → [91.2112:2275]

    love.graphics.line(Drawing.pixels(prev.x, width)+left,Drawing.pixels(prev.y, width)+top, Drawing.pixels(curr.x, width)+left,Drawing.pixels(curr.y, width)+top)

Solving an order conflict in drawing.lua at line 104 [101.98]
[52.2943]
[102.1183]

Replacement in drawing.lua at line 119 [101.98]

B:BD[102.1738] → [91.2612:2674]

function Drawing.draw_pending_shape(drawing, top, left,right)

[102.1738]

[91.2674]

function Drawing.draw_pending_shape(State, drawing, top, left,right)

Deletion in drawing.lua at line 146 [101.98]

B:BD[102.3081] → [91.3228:3395]

BD:BD[102.3081] → [91.3228:3395]

B:BD[102.3256] → [91.3396:3518]

BD:BD[102.3256] → [91.3396:3518]

        love.graphics.line(Drawing.pixels(prev.x, width)+left,Drawing.pixels(prev.y, width)+top, Drawing.pixels(curr.x, width)+left,Drawing.pixels(curr.y, width)+top)
    love.graphics.line(Drawing.pixels(prev.x, width)+left,Drawing.pixels(prev.y, width)+top, App.mouse_x(),App.mouse_y())

Resurrecting zombie bytes in drawing.lua at line 156 [101.98]
B:B[88.2936] → [52.2944:3030]
BD:B[88.2936] → [52.2944:3030]
```
  elseif shape.mode == 'polygon' then
    local center = drawing.points[shape.center]
```

Insertion in drawing.lua at line 156 [101.98]

[88.2380]

[52.2944]

    love.graphics.line(Drawing.pixels(first.x, width)+left,Drawing.pixels(first.y, width)+top, Drawing.pixels(second.x, width)+left,Drawing.pixels(second.y, width)+top)
    love.graphics.line(Drawing.pixels(second.x, width)+left,Drawing.pixels(second.y, width)+top, Drawing.pixels(thirdx, width)+left,Drawing.pixels(thirdy, width)+top)
    love.graphics.line(Drawing.pixels(thirdx, width)+left,Drawing.pixels(thirdy, width)+top, Drawing.pixels(fourthx, width)+left,Drawing.pixels(fourthy, width)+top)
    love.graphics.line(Drawing.pixels(fourthx, width)+left,Drawing.pixels(fourthy, width)+top, Drawing.pixels(first.x, width)+left,Drawing.pixels(first.y, width)+top)

Replacement in drawing.lua at line 162 [101.98]

B:BD[52.3030] → [52.3030:3116]

BD:BD[52.3030] → [52.3030:3116]

    local mx,my = Drawing.coord(App.mouse_x()-left), Drawing.coord(App.mouse_y()-top)

[52.3030]

[52.3116]

    local mx,my = Drawing.coord(App.mouse_x()-left, width), Drawing.coord(App.mouse_y()-top, width)

Deletion in drawing.lua at line 166 [101.98]

B:BD[52.3198] → [52.3198:3362]

BD:BD[52.3198] → [52.3198:3362]

B:BD[88.2380] → [91.3626:4294]

BD:BD[88.2380] → [91.3626:4294]

B:BD[88.3115] → [91.4295:4401]

BD:BD[88.3115] → [91.4295:4401]

B:BD[88.3281] → [9.400:480]

BD:BD[88.3281] → [9.400:480]

B:BD[88.3457] → [91.4402:5070]

BD:BD[88.3457] → [91.4402:5070]

    local cx,cy = Drawing.pixels(center.x)+left, Drawing.pixels(center.y)+top
    Drawing.draw_polygon(Current_drawing_submode, cx,cy, App.mouse_x(),App.mouse_y())
    love.graphics.line(Drawing.pixels(first.x, width)+left,Drawing.pixels(first.y, width)+top, Drawing.pixels(second.x, width)+left,Drawing.pixels(second.y, width)+top)
    love.graphics.line(Drawing.pixels(second.x, width)+left,Drawing.pixels(second.y, width)+top, Drawing.pixels(thirdx, width)+left,Drawing.pixels(thirdy, width)+top)
    love.graphics.line(Drawing.pixels(thirdx, width)+left,Drawing.pixels(thirdy, width)+top, Drawing.pixels(fourthx, width)+left,Drawing.pixels(fourthy, width)+top)
    love.graphics.line(Drawing.pixels(fourthx, width)+left,Drawing.pixels(fourthy, width)+top, Drawing.pixels(first.x, width)+left,Drawing.pixels(first.y, width)+top)
      love.graphics.line(Drawing.pixels(first.x, width)+left,Drawing.pixels(first.y, width)+top, pmx,pmy)
    local mx,my = Drawing.coord(pmx-left, width), Drawing.coord(pmy-top, width)
    love.graphics.line(Drawing.pixels(first.x, width)+left,Drawing.pixels(first.y, width)+top, Drawing.pixels(second.x, width)+left,Drawing.pixels(second.y, width)+top)
    love.graphics.line(Drawing.pixels(second.x, width)+left,Drawing.pixels(second.y, width)+top, Drawing.pixels(thirdx, width)+left,Drawing.pixels(thirdy, width)+top)
    love.graphics.line(Drawing.pixels(thirdx, width)+left,Drawing.pixels(thirdy, width)+top, Drawing.pixels(fourthx, width)+left,Drawing.pixels(fourthy, width)+top)
    love.graphics.line(Drawing.pixels(fourthx, width)+left,Drawing.pixels(fourthy, width)+top, Drawing.pixels(first.x, width)+left,Drawing.pixels(first.y, width)+top)

Solving an order conflict in drawing.lua at line 166 [101.98]
[52.3198]

Insertion in drawing.lua at line 166 [101.98]

[0.6053]

[102.3372]

    local cx,cy = Drawing.pixels(center.x, width)+left, Drawing.pixels(center.y, width)+top
    Drawing.draw_polygon(State.current_drawing_submode, cx,cy, App.mouse_x(),App.mouse_y())

Resurrecting zombie bytes in drawing.lua at line 195 [101.98]

B:B[103.646] → [52.3363:3517]

BD:B[103.646] → [52.3363:3517]

function Drawing.draw_polygon(n, cx,cy, x1,y1)
  local r = geom.dist(cx,cy, x1,y1)
  local theta = 2*math.pi/n
  local prevx,prevy = x1,y1
  for i=1,n do

Resurrecting zombie bytes in drawing.lua at line 201 [101.98]
∅:∅[3.1147] → [52.3517:3639]
B:B[52.3517] → [52.3517:3639]
BD:B[52.3517] → [52.3517:3639]
```
    x,y = geom.rotate(cx,cy, prevx,prevy, theta)
    love.graphics.line(prevx,prevy, x,y)
    prevx,prevy = x,y
  end
end
```
Insertion in drawing.lua at line 206 [101.98]
[52.3639]
[91.5380]

Deletion in drawing.lua at line 213 [101.98]

B:BD[103.1252] → [99.239:289]

BD:BD[103.1252] → [99.239:289]

B:BD[103.1464] → [52.3640:3895]

BD:BD[103.1464] → [52.3640:3895]

  elseif Current_drawing_mode == 'rectangle' then
  elseif Current_drawing_mode == 'polygon' then
    local j = Drawing.insert_point(drawing.points, Drawing.coord(x-Margin_left), Drawing.coord(y-drawing.y))
    drawing.pending = {mode=Current_drawing_mode, num_vertices=Current_drawing_submode, center=j}

Replacement in drawing.lua at line 217 [101.98]

B:BD[104.422] → [9.838:993]

    local j = Drawing.find_or_insert_point(drawing.points, Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width), State.width)

[104.422]

[104.537]

    local j = Drawing.insert_point(drawing.points, Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width))

Replacement in drawing.lua at line 219 [101.98]

B:BD[104.599] → [104.599:740]

B:BD[104.740] → [9.994:1149]

  elseif State.current_drawing_mode == 'polygon' or State.current_drawing_mode == 'rectangle' or State.current_drawing_mode == 'square' then
    local j = Drawing.find_or_insert_point(drawing.points, Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width), State.width)

[104.599]

[104.855]

  elseif State.current_drawing_mode == 'rectangle' then
    local j = Drawing.insert_point(drawing.points, Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width))

Insertion in drawing.lua at line 222 [101.98]

[104.925]

  elseif State.current_drawing_mode == 'polygon' then
    local j = Drawing.insert_point(drawing.points, Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width))
    drawing.pending = {mode=State.current_drawing_mode, num_vertices=State.current_drawing_submode, center=j}

Replacement in drawing.lua at line 226 [101.98]

B:BD[104.978] → [9.1150:1305]

    local j = Drawing.find_or_insert_point(drawing.points, Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width), State.width)

[104.978]

[104.1093]

    local j = Drawing.insert_point(drawing.points, Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width))

Resurrecting zombie bytes in drawing.lua at line 264 [101.98]
B:B[105.1864] → [105.1864:1875]
BD:B[105.1864] → [105.1864:1875]
```
  end
end
```

Replacement in drawing.lua at line 337 [101.98]

B:BD[52.3948] → [52.3948:4100]

        local mx,my = Drawing.coord(x-Margin_left), Drawing.coord(y-drawing.y)
        drawing.pending.p1 = Drawing.insert_point(drawing.points, mx,my)

[52.3948]

[52.4100]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width)
        drawing.pending.p1 = Drawing.find_or_insert_point(drawing.points, mx,my, State.width)

Resurrecting zombie bytes in drawing.lua at line 368 [101.98]
B:B[35.5858] → [2.15:64]
BD:B[35.5858] → [2.15:64]
```
  elseif App.mouse_down(1) and chord == '2' then
```
Insertion in drawing.lua at line 368 [101.98]
[107.1665]
[2.15]
```
    State.current_drawing_mode = 'freehand'
```
Replacement in drawing.lua at line 370 [101.98]
∅:D[2.64] → [108.64:98]
B:BD[108.64] → [108.64:98]
```
    Current_drawing_mode = 'line'
```
[2.64]
[108.98]
```
    State.current_drawing_mode = 'line'
```
Replacement in drawing.lua at line 381 [101.98]
∅:D[2.120] → [108.724:758]
B:BD[108.724] → [108.724:758]
```
    Current_drawing_mode = 'line'
```
[2.120]
[108.758]
```
    State.current_drawing_mode = 'line'
```

Replacement in drawing.lua at line 383 [101.98]

B:BD[108.807] → [108.807:900]

    Current_drawing_mode = 'manhattan'
    local drawing = Drawing.select_drawing_at_mouse()

[108.807]

[108.900]

    State.current_drawing_mode = 'manhattan'
    local drawing = Drawing.select_drawing_at_mouse(State)

Replacement in drawing.lua at line 386 [101.98]

B:BD[108.947] → [108.947:1069]

      drawing.pending.p1 = Drawing.insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y)

[108.947]

[108.1069]

      drawing.pending.p1 = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)

Deletion in drawing.lua at line 396 [101.98]
B:BD[109.1550] → [109.1550:1589]
BD:BD[109.1550] → [109.1550:1589]
```
    Current_drawing_mode = 'manhattan'
```
Resurrecting zombie bytes in drawing.lua at line 396 [101.98]
B:B[109.1550] → [110.285:330]
BD:B[109.1550] → [110.285:330]
```
    State.current_drawing_mode = 'manhattan'
```
Deletion in drawing.lua at line 397 [101.98]
B:BD[107.1721] → [110.331:374]
BD:BD[107.1721] → [110.331:374]
B:BD[107.1771] → [110.375:418]
BD:BD[107.1771] → [110.375:418]
B:BD[110.418] → [111.198:251]
BD:BD[110.418] → [111.198:251]
```
    State.current_drawing_mode = 'polygon'
    State.current_drawing_mode = 'polygon'
    local _,drawing = Drawing.current_drawing(State)
```
Deletion in drawing.lua at line 412 [101.98]
B:BD[107.1983] → [110.554:596]
BD:BD[107.1983] → [110.554:596]
```
    State.current_drawing_mode = 'square'
```
Resurrecting zombie bytes in drawing.lua at line 412 [101.98]
B:B[110.596] → [111.306:359]
BD:B[110.596] → [111.306:359]
```
    local _,drawing = Drawing.current_drawing(State)
```

Insertion in drawing.lua at line 412 [101.98]

[88.7207]

[111.306]

  elseif App.mouse_down(1) and chord == 'p' and State.current_drawing_mode == 'rectangle' then

Deletion in drawing.lua at line 414 [101.98]

B:BD[88.7998] → [110.597:690]

BD:BD[88.7998] → [110.597:690]

B:BD[110.690] → [111.360:413]

BD:BD[110.690] → [111.360:413]

B:BD[98.9759] → [47.650:739]

BD:BD[98.9759] → [47.650:739]

B:BD[98.9759] → [110.797:936]

BD:BD[98.9759] → [110.797:936]

B:BD[110.936] → [111.414:467]

BD:BD[110.936] → [111.414:467]

  elseif App.mouse_down(1) and chord == 'p' and State.current_drawing_mode == 'polygon' then
    local _,drawing = Drawing.current_drawing(State)
  elseif App.mouse_down(1) and chord == 'p' and Current_drawing_mode == 'rectangle' then
  elseif App.mouse_down(1) and chord == 'p' and (State.current_drawing_mode == 'rectangle' or State.current_drawing_mode == 'square') then
    local _,drawing = Drawing.current_drawing(State)

Resurrecting zombie bytes in drawing.lua at line 414 [101.98]
B:B[111.467] → [9.2537:2661]
BD:B[111.467] → [9.2537:2661]
∅:∅[9.2661] → [91.7963:8042]
B:B[17.39140] → [91.7963:8042]
BD:B[17.39140] → [91.7963:8042]
```
    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-drawing.y, State.width)
    local j = Drawing.find_or_insert_point(drawing.points, mx,my, State.width)
```

Replacement in drawing.lua at line 421 [101.98]

B:BD[52.4556] → [52.4556:4625]

    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 3

[52.4556]

[52.4625]

    State.current_drawing_mode = 'polygon'
    State.current_drawing_submode = 3

Replacement in drawing.lua at line 424 [101.98]

B:BD[52.4680] → [52.4680:4749]

    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 4

[52.4680]

[52.4749]

    State.current_drawing_mode = 'polygon'
    State.current_drawing_submode = 4

Replacement in drawing.lua at line 427 [101.98]

B:BD[52.4804] → [52.4804:4873]

    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 5

[52.4804]

[52.4873]

    State.current_drawing_mode = 'polygon'
    State.current_drawing_submode = 5

Replacement in drawing.lua at line 430 [101.98]

B:BD[52.4928] → [52.4928:4997]

    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 6

[52.4928]

[52.4997]

    State.current_drawing_mode = 'polygon'
    State.current_drawing_submode = 6

Replacement in drawing.lua at line 433 [101.98]

B:BD[52.5052] → [52.5052:5121]

    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 7

[52.5052]

[52.5121]

    State.current_drawing_mode = 'polygon'
    State.current_drawing_submode = 7

Replacement in drawing.lua at line 436 [101.98]

B:BD[52.5176] → [52.5176:5245]

    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 8

[52.5176]

[52.5245]

    State.current_drawing_mode = 'polygon'
    State.current_drawing_submode = 8

Replacement in drawing.lua at line 439 [101.98]

B:BD[52.5300] → [52.5300:5369]

    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 9

[52.5300]

[52.5369]

    State.current_drawing_mode = 'polygon'
    State.current_drawing_submode = 9

Replacement in drawing.lua at line 442 [101.98]

B:BD[52.5418] → [52.5418:5543]

    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 3
    Drawing.switch_current_drawing_pending_to_polygon()

[52.5418]

[52.5543]

    State.current_drawing_mode = 'polygon'
    State.current_drawing_submode = 3
    Drawing.switch_current_drawing_pending_to_polygon(State)

Replacement in drawing.lua at line 446 [101.98]

B:BD[52.5592] → [52.5592:5717]

    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 4
    Drawing.switch_current_drawing_pending_to_polygon()

[52.5592]

[52.5717]

    State.current_drawing_mode = 'polygon'
    State.current_drawing_submode = 4
    Drawing.switch_current_drawing_pending_to_polygon(State)

Replacement in drawing.lua at line 450 [101.98]

B:BD[52.5766] → [52.5766:5891]

    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 5
    Drawing.switch_current_drawing_pending_to_polygon()

[52.5766]

[52.5891]

    State.current_drawing_mode = 'polygon'
    State.current_drawing_submode = 5
    Drawing.switch_current_drawing_pending_to_polygon(State)

Replacement in drawing.lua at line 454 [101.98]

B:BD[52.5940] → [52.5940:6065]

    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 6
    Drawing.switch_current_drawing_pending_to_polygon()

[52.5940]

[52.6065]

    State.current_drawing_mode = 'polygon'
    State.current_drawing_submode = 6
    Drawing.switch_current_drawing_pending_to_polygon(State)

Replacement in drawing.lua at line 458 [101.98]

B:BD[52.6114] → [52.6114:6239]

    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 7
    Drawing.switch_current_drawing_pending_to_polygon()

[52.6114]

[52.6239]

    State.current_drawing_mode = 'polygon'
    State.current_drawing_submode = 7
    Drawing.switch_current_drawing_pending_to_polygon(State)

Replacement in drawing.lua at line 462 [101.98]

B:BD[52.6288] → [52.6288:6413]

    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 8
    Drawing.switch_current_drawing_pending_to_polygon()

[52.6288]

[52.6413]

    State.current_drawing_mode = 'polygon'
    State.current_drawing_submode = 8
    Drawing.switch_current_drawing_pending_to_polygon(State)

Replacement in drawing.lua at line 466 [101.98]

B:BD[52.6462] → [52.6462:6587]

    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 9
    Drawing.switch_current_drawing_pending_to_polygon()

[52.6462]

[107.2149]

    State.current_drawing_mode = 'polygon'
    State.current_drawing_submode = 9
    Drawing.switch_current_drawing_pending_to_polygon(State)

Replacement in drawing.lua at line 540 [101.98]

B:BD[88.8179] → [52.6588:6695]

function Drawing.switch_current_drawing_pending_to_polygon()
  local _,drawing = Drawing.current_drawing()

[88.8179]

[52.6695]

function Drawing.switch_current_drawing_pending_to_polygon(State)
  local _,drawing = Drawing.current_drawing(State)

Replacement in drawing.lua at line 543 [101.98]

B:BD[52.6740] → [52.6740:6864]

    drawing.pending.center = Drawing.insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y)

[52.6740]

[52.6864]

    drawing.pending.center = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)

Replacement in drawing.lua at line 552 [101.98]

B:BD[52.7281] → [52.7281:7338]

  drawing.pending.num_vertices = Current_drawing_submode

[52.7281]

[52.7338]

  drawing.pending.num_vertices = State.current_drawing_submode

Deletion in drawing.lua at line 714 [101.98]

B:BD[111.413] → [9.2412:2536]

BD:BD[111.413] → [9.2412:2536]

∅:D[9.2536] → [91.7883:7962]

B:BD[17.39041] → [91.7883:7962]

BD:BD[17.39041] → [91.7883:7962]

B:BD[88.7486] → [91.7731:7882]

BD:BD[88.7486] → [91.7731:7882]

B:BD[35.6139] → [91.7427:7578]

BD:BD[35.6139] → [91.7427:7578]

B:BD[107.1665] → [110.112:156]

BD:BD[107.1665] → [110.112:156]

B:BD[109.64] → [110.157:197]

BD:BD[109.64] → [110.157:197]

B:BD[110.197] → [111.84:137]

BD:BD[110.197] → [111.84:137]

B:BD[109.724] → [110.198:238]

BD:BD[109.724] → [110.198:238]

B:BD[109.807] → [110.239:284]

BD:BD[109.807] → [110.239:284]

B:BD[110.284] → [111.138:197]

BD:BD[110.284] → [111.138:197]

B:BD[109.193] → [91.7139:7282]

BD:BD[109.193] → [91.7139:7282]

B:BD[109.947] → [91.7283:7426]

BD:BD[109.947] → [91.7283:7426]

B:BD[88.6000] → [91.6886:7138]

BD:BD[88.6000] → [91.6886:7138]

B:BD[112.2366] → [9.2095:2201]

BD:BD[112.2366] → [9.2095:2201]

B:BD[112.1369] → [91.6517:6632]

BD:BD[112.1369] → [91.6517:6632]

B:BD[112.1231] → [9.1883:1987]

BD:BD[112.1231] → [9.1883:1987]

    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-drawing.y, State.width)
    local j = Drawing.find_or_insert_point(drawing.points, mx,my, State.width)
      drawing.pending.vertices = {Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)}
      drawing.pending.vertices = {Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)}
    State.current_drawing_mode = 'freehand'
    State.current_drawing_mode = 'line'
    local _,drawing = Drawing.current_drawing(State)
    State.current_drawing_mode = 'line'
    State.current_drawing_mode = 'manhattan'
    local drawing = Drawing.select_drawing_at_mouse(State)
      drawing.pending.p1 = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)
      drawing.pending.p1 = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)
            table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, thirdx,thirdy, State.width))
            table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, fourthx,fourthy, State.width))
          local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width)
          table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, mx,my, State.width))
        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width)

Solving an order conflict in drawing.lua at line 714 [101.98]
[101.1525]

Merge upstream into main

Dependencies

In channels

Change contents

File deletion: main_tests.lua, main_tests.lua

Resurrecting zombie bytes in text_tests.lua at line 443 [20.2]

Insertion in text_tests.lua at line 443 [20.2]

Deletion in text_tests.lua at line 446 [20.2]

Solving an order conflict in text_tests.lua at line 446 [20.2]

Deletion in text_tests.lua at line 453 [20.2]

Resurrecting zombie bytes in text_tests.lua at line 459 [20.2]

Deletion in text_tests.lua at line 460 [20.2]

Resurrecting zombie bytes in text_tests.lua at line 460 [20.2]

Resurrecting zombie bytes in text_tests.lua at line 463 [20.2]

Deletion in text_tests.lua at line 464 [20.2]

Resurrecting zombie bytes in text_tests.lua at line 464 [20.2]

Insertion in text_tests.lua at line 464 [20.2]

Deletion in text_tests.lua at line 1832 [20.2]

Solving an order conflict in text_tests.lua at line 1832 [20.2]

Deletion in text.lua at line 170 [31.1]

Resurrecting zombie bytes in text.lua at line 170 [31.1]

Deletion in text.lua at line 181 [31.1]

Resurrecting zombie bytes in text.lua at line 181 [31.1]

Deletion in text.lua at line 220 [31.1]

Resurrecting zombie bytes in text.lua at line 220 [31.1]

Deletion in text.lua at line 225 [31.1]

Resurrecting zombie bytes in text.lua at line 225 [31.1]

Deletion in text.lua at line 447 [31.1]

Deletion in text.lua at line 551 [31.1]

Deletion in text.lua at line 890 [31.1]

Deletion in text.lua at line 896 [31.1]

Resurrecting zombie bytes in text.lua at line 896 [31.1]

Replacement in main_tests.lua at line 3 [45.7]

Replacement in main_tests.lua at line 15 [45.7]

Replacement in main_tests.lua at line 34 [45.7]

Replacement in main_tests.lua at line 42 [45.7]

Replacement in main_tests.lua at line 44 [45.7]

Deletion in main.lua at line 17 [48.2]

Deletion in main.lua at line 25 [48.2]

Resurrecting zombie bytes in main.lua at line 25 [48.2]

Deletion in main.lua at line 123 [48.2]

Resurrecting zombie bytes in main.lua at line 123 [48.2]

Insertion in main.lua at line 126 [48.2]

Deletion in main.lua at line 150 [48.2]

Deletion in main.lua at line 165 [48.2]

Deletion in main.lua at line 168 [48.2]

Resurrecting zombie bytes in main.lua at line 168 [48.2]

Insertion in main.lua at line 168 [48.2]

Deletion in main.lua at line 171 [48.2]

Resurrecting zombie bytes in main.lua at line 171 [48.2]

Solving an order conflict in main.lua at line 171 [48.2]

Resurrecting zombie bytes in main.lua at line 172 [48.2]

Resurrecting zombie bytes in main.lua at line 175 [48.2]

Deletion in main.lua at line 178 [48.2]

Resurrecting zombie bytes in main.lua at line 178 [48.2]

Solving an order conflict in main.lua at line 178 [48.2]

Deletion in main.lua at line 180 [48.2]

Resurrecting zombie bytes in main.lua at line 180 [48.2]

Insertion in main.lua at line 180 [48.2]

Deletion in main.lua at line 185 [48.2]

Deletion in main.lua at line 190 [48.2]

Deletion in main.lua at line 195 [48.2]

Deletion in main.lua at line 200 [48.2]

Deletion in main.lua at line 208 [48.2]

Solving an order conflict in main.lua at line 208 [48.2]