akkartik/lines-polygon-experiment - Change 27DROQW2CHKBMWQCCR7N7VK54P3HE7MESZIJSJ32JTPKEE23WJPAC

Merge upstream into main

Created by Kartik K. Agaram on June 20, 2022

27DROQW2CHKBMWQCCR7N7VK54P3HE7MESZIJSJ32JTPKEE23WJPAC

Dependencies

In channels

main

Change contents

File deletion: main_tests.lua

BF:BFD[25.2] → [26.1125:1163]

BF:BFD[26.1163] → [26.7:7]

B:BD[26.7] → [26.8:751]

∅:D[21.153] → [26.851:1124]

B:BD[26.851] → [26.851:1124]

B:BD[26.751] → [21.77:153]

function test_resize_window()
  io.write('\ntest_resize_window')
  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')
  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
function test_adjust_line_width()
  io.write('\ntest_adjust_line_width')
  Filename = 'foo'
  App.screen.init{width=Margin_left+300, height=300}
  Line_width = 256
  App.draw()  -- initialize button
  -- no change for some time
  App.wait_fake_time(0.01)
  App.update(0)
  check_eq(Line_width, 256, 'F - test_adjust_line_width/early')
  -- after 0.1s the change takes
  App.wait_fake_time(0.1)
  App.update(0)
  check_eq(Line_width, 200, 'F - test_adjust_line_width')
end
  App.run_after_mouse_press(256, Margin_top-3, 1)
  App.mouse_move(200, 37)

Deletion in text_tests.lua at line 189 [27.2]

B:BD[13.7] → [13.7:669]

B:BD[28.1122] → [29.2:7]

function test_edit_after_click_resets_selection()
  io.write('\ntest_edit_after_click_resets_selection')
  -- display a line of text
  App.screen.init{width=80, height=80}
  Lines = load_array{'abc'}
  Line_width = 75
  Cursor1 = {line=1, pos=1}
  Screen_top1 = {line=1, pos=1}
  Screen_bottom1 = {}
  App.draw()
  -- click past the end of it and hit enter
  App.run_after_mouse_click(Margin_left+40,Margin_top+5, 1)
  check(Selection1.line, 'F - test_edit_after_click_resets_selection/baseline')
  App.run_after_keychord('return')
  -- selection is reset since shift key is not pressed
  check_nil(Selection1.line, 'F - test_edit_after_click_resets_selection')
end

Solving an order conflict in text_tests.lua at line 189 [27.2]
[13.7]
[29.7]

Deletion in text.lua at line 17 [30.1]

B:BD[30.141] → [10.3:72]

--?   love.graphics.line(Line_width,0, Line_width,App.screen.height)

Deletion in text.lua at line 117 [30.1]

B:BD[31.910] → [32.3:77]

          local boffset = Text.offset(frag, bpos+1)  -- byte _after_ bpos

Solving an order conflict in text.lua at line 117 [30.1]
[33.77]
[31.1010]

Deletion in text.lua at line 160 [30.1]

B:BD[34.99] → [33.78:151]

  local byte_offset = Text.offset(Lines[Cursor1.line].data, Cursor1.pos)

Deletion in text.lua at line 169 [30.1]
B:BD[35.627] → [13.671:732]
```
--?   print('chord', chord, Selection1.line, Selection1.pos)
```
Deletion in text.lua at line 180 [30.1]
B:BD[36.113] → [37.3:23]
```
    schedule_save()
```
Solving an order conflict in text.lua at line 180 [30.1]
[38.23]
[39.1422]
Deletion in text.lua at line 191 [30.1]
B:BD[40.814] → [37.24:44]
```
    schedule_save()
```
Solving an order conflict in text.lua at line 191 [30.1]
[38.44]
[39.1548]
Deletion in text.lua at line 195 [30.1]
B:BD[41.8453] → [38.45:67]
```
      schedule_save()
```
Deletion in text.lua at line 233 [30.1]
B:BD[42.216] → [37.68:88]
```
    schedule_save()
```
Solving an order conflict in text.lua at line 233 [30.1]
[38.88]
[39.1774]
Deletion in text.lua at line 238 [30.1]
B:BD[41.8533] → [37.89:111]
```
      schedule_save()
```
Solving an order conflict in text.lua at line 238 [30.1]
[38.111]
[41.8533]
Deletion in text.lua at line 268 [30.1]
B:BD[35.3922] → [38.112:132]
```
    schedule_save()
```

Deletion in text.lua at line 354 [30.1]

B:BD[43.223] → [33.174:247]

  local byte_offset = Text.offset(Lines[Cursor1.line].data, Cursor1.pos)

Deletion in text.lua at line 436 [30.1]

B:BD[44.1520] → [33.248:361]

        local screen_line_starting_byte_offset = Text.offset(Lines[Cursor1.line].data, screen_line_starting_pos)

Deletion in text.lua at line 456 [30.1]

B:BD[44.2441] → [32.362:479]

    local new_screen_line_starting_byte_offset = Text.offset(Lines[Cursor1.line].data, new_screen_line_starting_pos)

Solving an order conflict in text.lua at line 456 [30.1]
[33.479]
[45.421]

Deletion in text.lua at line 494 [30.1]

B:BD[44.4338] → [33.480:597]

    local new_screen_line_starting_byte_offset = Text.offset(Lines[Cursor1.line].data, new_screen_line_starting_pos)

Deletion in text.lua at line 512 [30.1]

B:BD[44.5061] → [33.598:668]

    local offset = Text.offset(Lines[Cursor1.line].data, Cursor1.pos)

Deletion in text.lua at line 525 [30.1]

B:BD[44.5383] → [32.669:739]

    local offset = Text.offset(Lines[Cursor1.line].data, Cursor1.pos)

Solving an order conflict in text.lua at line 525 [30.1]
[33.739]
[41.10688]

Deletion in text.lua at line 665 [30.1]

B:BD[46.133] → [32.740:836]

      local screen_line_starting_byte_offset = Text.offset(line.data, screen_line_starting_pos)

Solving an order conflict in text.lua at line 665 [30.1]
[33.836]
[45.910]
Deletion in text.lua at line 770 [30.1]
B:BD[47.360] → [32.837:874]
```
  local offset = Text.offset(s, pos)
```
Solving an order conflict in text.lua at line 770 [30.1]
[33.874]
[47.414]
Solving an order conflict in text.lua at line 834 [30.1]
[33.1157]
[32.875]

Deletion in text.lua at line 836 [30.1]

B:BD[32.880] → [32.880:1157]

∅:D[33.1157] → [42.559:564]

∅:D[32.1157] → [42.559:564]

B:BD[42.559] → [42.559:564]

function Text.offset(s, pos1)
  if pos1 == 1 then return 1 end
  local result = utf8.offset(s, pos1)
  if result == nil then
    print(Cursor1.line, Cursor1.pos, #Lines[Cursor1.line].data, Lines[Cursor1.line].data)
    print(pos1, #s, s)
  end
  assert(result)
  return result
end

Deletion in select.lua at line 58 [27.43980]

B:BD[48.242] → [33.1160:1309]

    local lo_offset = Text.offset(line.data, lo)
    local hi_offset = Text.offset(line.data, hi)
    local pos_offset = Text.offset(line.data, pos)

Deletion in select.lua at line 140 [27.43980]

B:BD[27.47373] → [33.1310:1424]

  local min_offset = Text.offset(Lines[minl].data, minp)
  local max_offset = Text.offset(Lines[maxl].data, maxp)

Deletion in select.lua at line 168 [27.43980]

B:BD[27.48224] → [33.1425:1539]

  local min_offset = Text.offset(Lines[minl].data, minp)
  local max_offset = Text.offset(Lines[maxl].data, maxp)

Deletion in main.lua at line 14 [51.2]
B:BD[49.78] → [50.1165:1187]
```
require 'main_tests'
```
Deletion in main.lua at line 84 [51.2]
B:BD[52.63] → [37.137:153]
```
Next_save = nil
```
Solving an order conflict in main.lua at line 84 [51.2]
[38.153]
[53.1567]
Solving an order conflict in main.lua at line 102 [51.2]
[54.55]
[55.7]
Deletion in main.lua at line 103 [51.2]
B:BD[55.8] → [55.8:55]
∅:D[54.55] → [56.8163:8164]
∅:D[55.55] → [56.8163:8164]
∅:D[57.196] → [56.8163:8164]
∅:D[58.240] → [56.8163:8164]
∅:D[59.455] → [56.8163:8164]
∅:D[28.2017] → [56.8163:8164]
∅:D[60.2680] → [56.8163:8164]
B:BD[56.8163] → [56.8163:8164]
```
-- line-width indicator
Line_width_hover = nil
```
Deletion in main.lua at line 174 [51.2]
B:BD[61.41] → [50.1188:1214]
```
function App.resize(w, h)
```
Deletion in main.lua at line 180 [51.2]
B:BD[57.217] → [37.154:189]
```
  Last_resize_time = App.getTime()
```
Solving an order conflict in main.lua at line 180 [51.2]
[38.189]
[62.690]
Deletion in main.lua at line 219 [51.2]
B:BD[57.324] → [38.190:241]
```
    if App.getTime() - Last_resize_time < 0.1 then
```

Deletion in main.lua at line 225 [51.2]

B:BD[57.447] → [57.447:448]

B:BD[57.448] → [54.56:82]

B:BD[54.82] → [10.155:237]

∅:D[10.237] → [54.176:273]

B:BD[54.176] → [54.176:273]


  -- line-width indicator
  button('line-width', {x=Line_width-4,y=Margin_top-10, w=10,h=10, color={1,1,1},
    icon = icon.line_width,
    onpress1 = function() Line_width_hover = App.getTime() end,
  })

Solving an order conflict in main.lua at line 226 [51.2]
[54.274]
[55.56]
Deletion in main.lua at line 245 [51.2]
B:BD[63.38] → [55.275:305]
```
        -- insert new drawing
```
Solving an order conflict in main.lua at line 245 [51.2]
[54.305]
[64.759]
Deletion in main.lua at line 254 [51.2]
B:BD[64.1148] → [37.242:281]
```
                       schedule_save()
```
Solving an order conflict in main.lua at line 254 [51.2]
[38.281]
[65.284]

Deletion in main.lua at line 255 [51.2]

B:BD[65.394] → [54.306:342]

∅:D[54.342] → [66.7:132]

B:BD[64.1175] → [66.7:132]

BD:BD[64.1175] → [66.7:132]

                     end
        })
        if Search_term == nil then
          if line_index == Cursor1.line then
            Text.draw_cursor(Margin_left, y)

Resurrecting zombie bytes in main.lua at line 255 [51.2]

B:B[65.394] → [55.306:342]

BD:B[65.394] → [55.306:342]

∅:∅[55.342] → [67.7:132]

B:B[64.1175] → [67.7:132]

BD:B[64.1175] → [67.7:132]

                     end
        })
        if Search_term == nil then
          if line_index == Cursor1.line then
            Text.draw_cursor(Margin_left, y)

Deletion in main.lua at line 262 [51.2]
B:BD[64.1391] → [67.133:145]
```
        end
```
Solving an order conflict in main.lua at line 262 [51.2]
[66.145]
[68.1209]
Deletion in main.lua at line 291 [51.2]
B:BD[57.512] → [38.282:333]
```
    if App.getTime() - Last_resize_time < 0.1 then
```

Deletion in main.lua at line 295 [51.2]

B:BD[57.621] → [54.343:510]

B:BD[54.510] → [10.238:271]

∅:D[10.271] → [54.557:706]

B:BD[54.557] → [54.557:706]

    end
  end
  -- update Line_width with some hysteresis while the indicator is dragged
  if Line_width_hover then
    if App.getTime() - Line_width_hover > 0.1 then
      Line_width = App.mouse_x()
      Text.redraw_all()
      if App.mouse_down(1) then
        Line_width_hover = App.getTime()
      else
        Line_width_hover = nil
      end

Deletion in main.lua at line 310 [51.2]

B:BD[69.24] → [38.334:444]

  if Next_save and Next_save < App.getTime() then
    save_to_disk(Lines, Filename)
    Next_save = nil
  end

Deletion in main.lua at line 327 [51.2]

B:BD[70.8] → [37.445:609]

B:BD[37.609] → [22.8:103]

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
end
-- make sure to save before quitting
function love.quit()
  save_to_disk(Lines, Filename)
end

Solving an order conflict in main.lua at line 327 [51.2]
[11.103]
[71.1399]

Deletion in main.lua at line 336 [51.2]

B:BD[72.2] → [55.707:877]

  -- we seem to sometimes get phantom clicks if the mouse moves down into text while adjusting line-width
  if Line_width_hover then
    Selection1 = {}
    return
  end

Solving an order conflict in main.lua at line 336 [51.2]
[54.877]
[73.304]
Deletion in main.lua at line 353 [51.2]
B:BD[74.2422] → [75.738:769]
```
--?         print('selection')
```
Solving an order conflict in main.lua at line 353 [51.2]
[13.769]
[76.361]
Deletion in main.lua at line 370 [51.2]
B:BD[77.365] → [37.610:630]
```
    schedule_save()
```
Solving an order conflict in main.lua at line 370 [51.2]
[38.630]
[78.208]
Deletion in main.lua at line 378 [51.2]
B:BD[79.208] → [13.770:809]
```
--?           print('reset selection')
```
Deletion in main.lua at line 412 [51.2]
B:BD[38.649] → [13.810:867]
B:BD[80.354] → [37.631:649]
```
  if not App.shift_down() then
    Selection1 = {}
  end
  schedule_save()
```
Solving an order conflict in main.lua at line 412 [51.2]
[38.649]
[81.3116]
Deletion in main.lua at line 430 [51.2]
B:BD[60.3421] → [32.1543:1599]
```
      local byte_offset = Text.offset(Search_term, len)
```
Solving an order conflict in main.lua at line 430 [51.2]
[33.1599]
[60.3477]
Deletion in main.lua at line 462 [51.2]
B:BD[82.17776] → [38.650:672]
```
      schedule_save()
```
Deletion in main.lua at line 474 [51.2]
B:BD[82.17869] → [38.673:695]
```
      schedule_save()
```
Deletion in main.lua at line 489 [51.2]
B:BD[83.289] → [38.696:716]
```
    schedule_save()
```
Deletion in main.lua at line 510 [51.2]
B:BD[84.646] → [37.717:737]
```
    schedule_save()
```
Solving an order conflict in main.lua at line 510 [51.2]
[38.737]
[83.1877]
Deletion in main.lua at line 520 [51.2]
B:BD[85.189] → [37.738:760]
```
      schedule_save()
```
Solving an order conflict in main.lua at line 520 [51.2]
[38.760]
[85.225]
Deletion in main.lua at line 545 [51.2]
B:BD[80.782] → [33.1600:1655]
```
        local byte_offset = Text.offset(p.name, len-1)
```
Deletion in main.lua at line 550 [51.2]
B:BD[80.907] → [38.761:781]
```
    schedule_save()
```
Deletion in main.lua at line 555 [51.2]
B:BD[13.874] → [13.874:925]
∅:D[24.293] → [86.350:356]
∅:D[13.925] → [86.350:356]
∅:D[75.925] → [86.350:356]
∅:D[35.5055] → [86.350:356]
B:BD[86.350] → [86.350:356]
```
  if not App.shift_down() then
    Selection1 = {}
  end
```
Solving an order conflict in icons.lua at line 16 [49.5323]
[54.1345]
[55.881]

Deletion in icons.lua at line 17 [49.5323]

B:BD[55.882] → [55.882:1345]

∅:D[54.1345] → [49.5334:5335]

∅:D[55.1345] → [49.5334:5335]

B:BD[49.5334] → [49.5334:5335]

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

Deletion in help.lua at line 5 [49.6622]
B:BD[49.6732] → [16.11:73]
```
  love.graphics.print("Things you can do:", Margin_left+30,y)
```
Solving an order conflict in help.lua at line 5 [49.6622]
[87.73]
[88.4874]

Deletion in help.lua at line 6 [49.6622]

B:BD[88.4896] → [87.74:179]

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

Deletion in help.lua at line 9 [49.6622]

B:BD[88.5014] → [16.180:296]

  love.graphics.print("* Hover on a point and press 'ctrl+u' to pick it up and start moving it,", Margin_left+30,y)

Solving an order conflict in help.lua at line 9 [49.6622]
[87.296]
[88.5106]

Deletion in help.lua at line 11 [49.6622]

B:BD[88.5128] → [16.297:395]

  love.graphics.print("then press the mouse button to drop it", Margin_left+30+bullet_indent(),y)

Solving an order conflict in help.lua at line 11 [49.6622]
[87.395]
[88.5322]

Deletion in help.lua at line 12 [49.6622]

B:BD[88.5344] → [87.396:510]

  love.graphics.print("* Hover on a point and press 'ctrl+n', type a name, then press 'enter'", Margin_left+30,y)

Deletion in help.lua at line 15 [49.6622]

B:BD[88.5445] → [16.511:614]

  love.graphics.print("* Hover on a point or shape and press 'ctrl+d' to delete it", Margin_left+30,y)

Solving an order conflict in help.lua at line 15 [49.6622]
[87.614]
[88.5539]

Deletion in help.lua at line 18 [49.6622]

B:BD[49.7341] → [16.615:715]

    love.graphics.print("* Press 'ctrl+p' to switch to drawing freehand strokes", Margin_left+30,y)

Solving an order conflict in help.lua at line 18 [49.6622]
[87.715]
[88.5675]

Deletion in help.lua at line 22 [49.6622]

B:BD[49.7506] → [16.716:805]

    love.graphics.print("* Press 'ctrl+l' to switch to drawing lines", Margin_left+30,y)

Solving an order conflict in help.lua at line 22 [49.6622]
[5.100]
[88.5780]

Deletion in help.lua at line 26 [49.6622]

B:BD[49.7665] → [16.806:915]

    love.graphics.print("* Press 'ctrl+m' to switch to drawing horizontal/vertical lines", Margin_left+30,y)

Solving an order conflict in help.lua at line 26 [49.6622]
[87.915]
[88.5905]

Deletion in help.lua at line 29 [49.6622]

B:BD[49.7841] → [87.916:1012]

    love.graphics.print("* Press 'ctrl+o' to switch to drawing circles/arcs", Margin_left+30,y)

Deletion in help.lua at line 34 [49.6622]

B:BD[49.8005] → [16.1013:1105]

    love.graphics.print("* Press 'ctrl+g' to switch to drawing polygons", Margin_left+30,y)

Solving an order conflict in help.lua at line 34 [49.6622]
[87.1119]
[88.6125]

Deletion in help.lua at line 38 [49.6622]

B:BD[89.474] → [16.1106:1200]

    love.graphics.print("* Press 'ctrl+r' to switch to drawing rectangles", Margin_left+30,y)

Solving an order conflict in help.lua at line 38 [49.6622]
[87.1214]
[88.6235]

Deletion in help.lua at line 41 [49.6622]

B:BD[89.635] → [16.1201:1292]

BD:BD[89.635] → [16.1201:1292]

B:BD[49.8121] → [16.1293:1405]

BD:BD[49.8121] → [16.1293:1405]

    love.graphics.print("* Press 'ctrl+s' to switch to drawing squares", Margin_left+30,y)
  love.graphics.print("* Press 'ctrl+=' or 'ctrl+-' to zoom in or out, ctrl+0 to reset zoom", Margin_left+30,y)

Solving an order conflict in help.lua at line 41 [49.6622]
[87.1327]
[88.6557]

Deletion in help.lua at line 42 [49.6622]

B:BD[88.6579] → [87.1328:1408]

  love.graphics.print("Press 'esc' now to hide this message", Margin_left+30,y)

Deletion in help.lua at line 45 [49.6622]

B:BD[49.8466] → [87.1409:1527]

  love.graphics.rectangle('fill', Margin_left,drawing.y, Line_width, math.max(Drawing.pixels(drawing.h),y-drawing.y))

Deletion in help.lua at line 52 [49.6622]

B:BD[49.8689] → [16.1606:1709]

  love.graphics.print("You're currently drawing a "..current_shape(drawing.pending), Margin_left+30,y)

Solving an order conflict in help.lua at line 52 [49.6622]
[87.1631]
[88.6765]
Deletion in help.lua at line 54 [49.6622]
B:BD[88.6787] → [16.1710:1776]
```
  love.graphics.print('Things you can do now:', Margin_left+30,y)
```
Solving an order conflict in help.lua at line 54 [49.6622]
[87.1698]
[88.6844]

Deletion in help.lua at line 57 [49.6622]

B:BD[49.8935] → [16.1777:1878]

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

Solving an order conflict in help.lua at line 57 [49.6622]
[87.1800]
[88.6959]

Deletion in help.lua at line 60 [49.6622]

B:BD[49.9138] → [16.1879:1978]

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

Solving an order conflict in help.lua at line 60 [49.6622]
[87.1900]
[88.7074]

Deletion in help.lua at line 63 [49.6622]

B:BD[49.9347] → [87.1901:2004]

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

Deletion in help.lua at line 66 [49.6622]

B:BD[88.7219] → [16.2083:2174]

      love.graphics.print("* Press 'a' to draw just an arc of a circle", Margin_left+30,y)

Solving an order conflict in help.lua at line 66 [49.6622]
[87.2096]
[49.9561]

Deletion in help.lua at line 68 [49.6622]

B:BD[49.9570] → [16.2175:2275]

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

Solving an order conflict in help.lua at line 68 [49.6622]
[87.2197]
[49.9670]

Deletion in help.lua at line 72 [49.6622]

B:BD[49.9744] → [16.2276:2378]

BD:BD[49.9744] → [16.2276:2378]

B:BD[88.7536] → [16.2379:2467]

BD:BD[88.7536] → [16.2379:2467]

    love.graphics.print('* Release the mouse button to finish drawing the polygon', Margin_left+30,y)
    love.graphics.print("* Press 'p' to add a vertex to the polygon", Margin_left+30,y)

Solving an order conflict in help.lua at line 72 [49.6622]
[87.2308]
[88.7615]

Deletion in help.lua at line 83 [49.6622]

B:BD[88.7639] → [91.12:363]

B:BD[91.363] → [23.12:117]

∅:D[23.117] → [91.469:845]

B:BD[91.469] → [91.469:845]

B:BD[91.845] → [23.118:220]

∅:D[23.220] → [91.948:982]

B:BD[91.948] → [91.948:982]

  elseif Current_drawing_mode == 'rectangle' then
    if #drawing.pending.vertices < 2 then
      love.graphics.print("* Press 'p' to add a vertex to the rectangle", Margin_left+30,y)
      y = y + Line_height
    else
      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
    end
  elseif Current_drawing_mode == 'square' then
    if #drawing.pending.vertices < 2 then
      love.graphics.print("* Press 'p' to add a vertex to the square", Margin_left+30,y)
      y = y + Line_height
    else
      love.graphics.print('* Release the mouse button to finish drawing the square', Margin_left+30,y)
      y = y + Line_height
      love.graphics.print("* Press 'p' to replace the second vertex of the square", Margin_left+30,y)
      y = y + Line_height
    end

Solving an order conflict in help.lua at line 83 [49.6622]
[12.502]
[49.9970]

Deletion in help.lua at line 85 [49.6622]

B:BD[49.9976] → [16.2468:2583]

  love.graphics.print("* Press 'esc' then release the mouse button to cancel the current shape", Margin_left+30,y)

Solving an order conflict in help.lua at line 85 [49.6622]
[87.2424]
[88.7746]

Deletion in help.lua at line 89 [49.6622]

B:BD[49.10164] → [16.2584:2668]

    love.graphics.print("* Press 'l' to switch to drawing lines", Margin_left+30,y)

Solving an order conflict in help.lua at line 89 [49.6622]
[5.185]
[88.7866]

Deletion in help.lua at line 94 [49.6622]

B:BD[49.10318] → [87.2510:2614]

    love.graphics.print("* Press 'm' to switch to drawing horizontal/vertical lines", Margin_left+30,y)

Deletion in help.lua at line 99 [49.6622]

B:BD[49.10489] → [16.2774:2865]

    love.graphics.print("* Press 'o' to switch to drawing circles/arcs", Margin_left+30,y)

Solving an order conflict in help.lua at line 99 [49.6622]
[87.2706]
[88.8093]
Deletion in help.lua at line 101 [49.6622]
B:BD[49.10648] → [16.2866:2953]
BD:BD[49.10648] → [16.2866:2953]
```
    love.graphics.print("* Press 'g' to switch to drawing polygons", Margin_left+30,y)
```

Deletion in help.lua at line 102 [49.6622]

B:BD[89.797] → [87.2707:2796]

    love.graphics.print("* Press 'r' to switch to drawing rectangles", Margin_left+30,y)

Deletion in help.lua at line 105 [49.6622]
B:BD[89.953] → [16.3044:3130]
BD:BD[89.953] → [16.3044:3130]
```
    love.graphics.print("* Press 's' to switch to drawing squares", Margin_left+30,y)
```

Deletion in help.lua at line 106 [49.6622]

B:BD[49.10798] → [87.2797:2915]

  love.graphics.rectangle('fill', Margin_left,drawing.y, Line_width, math.max(Drawing.pixels(drawing.h),y-drawing.y))

Deletion in geom.lua at line 3 [49.11579]
B:BD[20.213] → [20.213:214]
BD:BD[20.213] → [20.213:214]
Solving an order conflict in geom.lua at line 3 [49.11579]
[92.214]
[49.11597]
Deletion in geom.lua at line 17 [49.11579]
B:BD[93.240] → [92.215:252]
```
      return y >= y1-2 and y <= y2+2
```
Deletion in geom.lua at line 25 [49.11579]
B:BD[93.438] → [20.253:290]
```
      return x >= x1-2 and x <= x2+2
```
Solving an order conflict in geom.lua at line 25 [49.11579]
[92.290]
[93.510]

Deletion in geom.lua at line 33 [49.11579]

B:BD[49.12094] → [92.291:407]

    local dist = geom.dist(center.x,center.y, x,y)
    return dist > shape.radius*0.95 and dist < shape.radius*1.05

Deletion in geom.lua at line 73 [49.11579]
B:BD[49.13048] → [20.408:441]
```
    if math.abs(p1.x-x) > 2 then
```
Solving an order conflict in geom.lua at line 73 [49.11579]
[92.441]
[49.13081]
Deletion in geom.lua at line 79 [49.11579]
B:BD[49.13184] → [92.442:477]
```
    return y >= y1-2 and y <= y2+2
```
Deletion in geom.lua at line 84 [49.11579]
B:BD[49.13333] → [92.478:509]
```
  if yp < y-2 or yp > y+2 then
```
Deletion in geom.lua at line 89 [49.11579]
B:BD[49.13451] → [92.510:544]
```
  return k > -0.005 and k < 1.005
```

Deletion in drawing_tests.lua at line 13 [95.15]

B:BD[94.327] → [38.789:979]

  -- file not immediately saved
  App.update(0.01)
  check_nil(App.filesystem['foo'], 'F - test_creating_drawing_saves/early')
  -- wait until save
  App.wait_fake_time(3.1)
  App.update(0)

Deletion in drawing_tests.lua at line 50 [95.15]
B:BD[95.1529] → [38.980:1043]
```
  -- wait until save
  App.wait_fake_time(3.1)
  App.update(0)
```
Deletion in drawing_tests.lua at line 188 [95.15]
B:BD[96.619] → [2.14:74]
```
  check_eq(#drawing.points, 1, 'F - test_draw_arc/#points')
```
Deletion in drawing_tests.lua at line 339 [95.15]
B:BD[97.1770] → [38.1044:1107]
```
  -- wait until save
  App.wait_fake_time(3.1)
  App.update(0)
```
Deletion in drawing_tests.lua at line 369 [95.15]
B:BD[98.1137] → [38.1108:1171]
BD:BD[98.1137] → [38.1108:1171]
```
  -- wait until save
  App.wait_fake_time(3.1)
  App.update(0)
```
Resurrecting zombie bytes in drawing_tests.lua at line 369 [95.15]
B:B[98.1137] → [37.1108:1171]
BD:B[98.1137] → [37.1108:1171]
```
  -- wait until save
  App.wait_fake_time(3.1)
  App.update(0)
```
Deletion in drawing_tests.lua at line 398 [95.15]
B:BD[98.1938] → [37.1172:1235]
```
  -- wait until save
  App.wait_fake_time(3.1)
  App.update(0)
```
Solving an order conflict in drawing_tests.lua at line 398 [95.15]
[38.1235]
[99.471]

Deletion in drawing_tests.lua at line 403 [95.15]

∅:D[99.680] → [100.14:19]

B:BD[98.1938] → [100.14:19]

B:BD[100.19] → [8.15:1248]

end
function test_move_point_on_manhattan_line()
  io.write('\ntest_move_point_on_manhattan_line')
  -- create a drawing with a manhattan line
  Filename = 'foo'
  App.screen.init{width=Margin_left+300, height=300}
  Lines = load_array{'```lines', '```', ''}
  Line_width = 256  -- drawing coordinates 1:1 with pixels
  Current_drawing_mode = 'manhattan'
  App.draw()
  App.run_after_mouse_press(Margin_left+5, Margin_top+Drawing_padding_top+6, 1)
  App.run_after_mouse_release(Margin_left+35, Margin_top+Drawing_padding_top+46, 1)
  local drawing = Lines[1]
  check_eq(#drawing.shapes, 1, 'F - test_move_point_on_manhattan_line/baseline/#shapes')
  check_eq(#drawing.points, 2, 'F - test_move_point_on_manhattan_line/baseline/#points')
  check_eq(drawing.shapes[1].mode, 'manhattan', 'F - test_move_point_on_manhattan_line/baseline/shape:1')
  App.draw()
  -- enter 'move' mode
  App.run_after_keychord('C-u')
  check_eq(Current_drawing_mode, 'move', 'F - test_move_point_on_manhattan_line/mode:1')
  -- move point
  App.mouse_move(Margin_left+26, Margin_top+Drawing_padding_top+44)
  App.update(0.05)
  -- line is no longer manhattan
  check_eq(drawing.shapes[1].mode, 'line', 'F - test_move_point_on_manhattan_line/baseline/shape:1')

Solving an order conflict in drawing_tests.lua at line 405 [95.15]
[8.1253]
[19.15]
Deletion in drawing_tests.lua at line 456 [95.15]
B:BD[100.1304] → [37.1236:1302]
```
  -- wait for some time
  App.wait_fake_time(3.1)
  App.update(0)
```
Solving an order conflict in drawing_tests.lua at line 456 [95.15]
[38.1302]
[99.701]
Deletion in drawing_tests.lua at line 522 [95.15]
B:BD[101.1995] → [38.1303:1366]
```
  -- wait until save
  App.wait_fake_time(3.1)
  App.update(0)
```
Deletion in drawing_tests.lua at line 574 [95.15]
B:BD[102.1992] → [37.1367:1430]
```
  -- wait until save
  App.wait_fake_time(3.1)
  App.update(0)
```
Solving an order conflict in drawing_tests.lua at line 574 [95.15]
[38.1430]
[103.34]
Deletion in drawing_tests.lua at line 613 [95.15]
B:BD[103.1685] → [37.1431:1494]
```
  -- wait until save
  App.wait_fake_time(3.1)
  App.update(0)
```
Solving an order conflict in drawing_tests.lua at line 613 [95.15]
[38.1494]
[103.1685]

Deletion in drawing.lua at line 249 [104.98]

B:BD[69.772] → [8.1255:1334]

        Drawing.relax_constraints(drawing, drawing.pending.target_point_index)

Deletion in drawing.lua at line 257 [104.98]

B:BD[69.1033] → [8.1335:1412]

      Drawing.relax_constraints(drawing, drawing.pending.target_point_index)

Deletion in drawing.lua at line 261 [104.98]

∅:D[105.300] → [69.1041:1052]

∅:D[89.4301] → [69.1041:1052]

B:BD[69.1041] → [69.1041:1052]

B:BD[69.1052] → [8.1413:1864]

  end
end
function Drawing.relax_constraints(drawing, p)
  for _,shape in ipairs(drawing.shapes) do
    if shape.mode == 'manhattan' then
      if shape.p1 == p then
        shape.mode = 'line'
      elseif shape.p2 == p then
        shape.mode = 'line'
      end
    elseif shape.mode == 'rectangle' or shape.mode == 'square' then
      for _,v in ipairs(shape.vertices) do
        if v == p then
          shape.mode = 'polygon'
        end
      end
    end

Solving an order conflict in drawing.lua at line 264 [104.98]
[8.1875]
[19.1413]

Deletion in drawing.lua at line 299 [104.98]

B:BD[106.365] → [3.15:90]

          drawing.pending.p2 = Drawing.insert_point(drawing.points, mx,my)

Deletion in drawing.lua at line 307 [104.98]

B:BD[107.1191] → [3.91:171]

            drawing.pending.p2 = Drawing.insert_point(drawing.points, mx, p1.y)

Deletion in drawing.lua at line 309 [104.98]

B:BD[107.1322] → [3.172:252]

            drawing.pending.p2 = Drawing.insert_point(drawing.points, p1.x, my)

Deletion in drawing.lua at line 386 [104.98]

∅:D[4.4500] → [108.1398:1589]

B:BD[108.1398] → [108.1398:1589]

B:BD[35.5858] → [15.15:1398]

BD:BD[35.5858] → [15.15:1398]

      drawing.pending.p1 = drawing.pending.center
    end
    drawing.pending.mode = 'manhattan'
  elseif chord == 'C-m' and not App.mouse_down(1) then
    Current_drawing_mode = 'manhattan'
  elseif App.mouse_down(1) and chord == 'l' then
    Current_drawing_mode = 'line'
    local _,drawing = Drawing.current_drawing()
    if drawing.pending.mode == 'freehand' then
      drawing.pending.p1 = Drawing.insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y)
    elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'rectangle' or drawing.pending.mode == 'square' then
      drawing.pending.p1 = drawing.pending.vertices[1]
    elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then
      drawing.pending.p1 = drawing.pending.center
    end
    drawing.pending.mode = 'line'
  elseif chord == 'C-l' and not App.mouse_down(1) then
    Current_drawing_mode = 'line'
  elseif App.mouse_down(1) and chord == 'm' then
    Current_drawing_mode = 'manhattan'
    local drawing = Drawing.select_drawing_at_mouse()
    if drawing.pending.mode == 'freehand' then
      drawing.pending.p1 = Drawing.insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y)
    elseif drawing.pending.mode == 'line' then
      -- do nothing
    elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'rectangle' or drawing.pending.mode == 'square' then
      drawing.pending.p1 = drawing.pending.vertices[1]
    elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then

Resurrecting zombie bytes in drawing.lua at line 386 [104.98]

B:B[15.1398] → [15.1398:1589]

BD:B[15.1398] → [15.1398:1589]

      drawing.pending.p1 = drawing.pending.center
    end
    drawing.pending.mode = 'manhattan'
  elseif chord == 'C-m' and not App.mouse_down(1) then
    Current_drawing_mode = 'manhattan'

Solving an order conflict in drawing.lua at line 386 [104.98]
[4.4500]
[15.1398]
Deletion in drawing.lua at line 391 [104.98]
B:BD[35.6467] → [110.15:103]
BD:BD[35.6467] → [110.15:103]
```
    elseif drawing.pending.mode == 'rectangle' or drawing.pending.mode == 'square' then
```

Deletion in drawing.lua at line 403 [104.98]

B:BD[89.7020] → [110.104:229]

BD:BD[89.7020] → [110.104:229]

    elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'square' then
      -- reuse existing (1-2) vertices

Solving an order conflict in drawing.lua at line 403 [104.98]
[109.426]
[89.7102]

Deletion in drawing.lua at line 406 [104.98]

B:BD[111.380] → [110.230:461]

BD:BD[111.380] → [110.230:461]

    elseif drawing.pending.mode == 'rectangle' then
      -- reuse existing (1-2) vertices
    elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then
      drawing.pending.vertices = {drawing.pending.center}

Deletion in drawing.lua at line 486 [104.98]

B:BD[113.2665] → [8.1876:1946]

    local drawing_index,drawing,i,p = Drawing.select_point_at_mouse()

Deletion in drawing.lua at line 492 [104.98]

B:BD[35.10259] → [8.1947:2037]

      drawing.pending = {mode=Current_drawing_mode, target_point=p, target_point_index=i}

Deletion in app.lua at line 168 [114.2]

B:BD[71.6426] → [37.1498:1618]

App.time = 1
function App.getTime()
  return App.time
end
function App.wait_fake_time(t)
  App.time = App.time + t
end

Solving an order conflict in app.lua at line 168 [114.2]
[38.1619]
[71.6426]
Deletion in app.lua at line 346 [114.2]
B:BD[53.2680] → [37.1619:1636]
```
  App.time = nil
```
Solving an order conflict in app.lua at line 346 [114.2]
[38.1637]
[71.7911]

Deletion in app.lua at line 350 [114.2]

B:BD[115.2236] → [38.1638:1742]

  App.run_after_mouse_click = nil
  App.run_after_mouse_press = nil
  App.run_after_mouse_release = nil

Deletion in app.lua at line 366 [114.2]
B:BD[53.2791] → [38.1743:1778]
```
  App.getTime = love.timer.getTime
```

Deletion in README.md at line 79 [117.6]

B:BD[116.884] → [18.18:91]

* `alt+right`/`alt+left` to jump to the next/previous word, respectively

Solving an order conflict in README.md at line 79 [117.6]
[7.93]
[116.884]

Deletion in README.md at line 112 [117.6]

B:BD[118.21] → [119.18:135]

BD:BD[118.21] → [119.18:135]

* No clipping yet for drawings. In particular, circles/squares/rectangles and
  point labels can overflow a drawing.

Solving an order conflict in README.md at line 112 [117.6]
[121.137]
[118.203]

Deletion in README.md at line 129 [117.6]

B:BD[116.1609] → [17.18:197]

BD:BD[116.1609] → [17.18:197]


* https://github.com/akkartik/lines-polygon-experiment -- an experiment that
  uses separate shortcuts for regular polygons. `ctrl+3` for triangles,
  `ctrl+4` for squares, etc.

Solving an order conflict in README.md at line 129 [117.6]
[6.269]
[116.1609]

Deletion in Manual_tests.md at line 11 [123.1]

B:BD[122.379] → [14.24:190]

  byte offsets with the suffix `_offset`, and character positions as `_pos`.
  For example, `string.sub` should never use a `_pos` to substring, only an
  `_offset`.

Merge upstream into main

Dependencies

In channels

Change contents

File deletion: main_tests.lua

Deletion in text_tests.lua at line 189 [27.2]

Solving an order conflict in text_tests.lua at line 189 [27.2]

Deletion in text.lua at line 17 [30.1]

Deletion in text.lua at line 117 [30.1]

Solving an order conflict in text.lua at line 117 [30.1]

Deletion in text.lua at line 160 [30.1]

Deletion in text.lua at line 169 [30.1]

Deletion in text.lua at line 180 [30.1]

Solving an order conflict in text.lua at line 180 [30.1]

Deletion in text.lua at line 191 [30.1]

Solving an order conflict in text.lua at line 191 [30.1]

Deletion in text.lua at line 195 [30.1]

Deletion in text.lua at line 233 [30.1]

Solving an order conflict in text.lua at line 233 [30.1]

Deletion in text.lua at line 238 [30.1]

Solving an order conflict in text.lua at line 238 [30.1]

Deletion in text.lua at line 268 [30.1]

Deletion in text.lua at line 354 [30.1]

Deletion in text.lua at line 436 [30.1]

Deletion in text.lua at line 456 [30.1]

Solving an order conflict in text.lua at line 456 [30.1]

Deletion in text.lua at line 494 [30.1]

Deletion in text.lua at line 512 [30.1]

Deletion in text.lua at line 525 [30.1]

Solving an order conflict in text.lua at line 525 [30.1]

Deletion in text.lua at line 665 [30.1]

Solving an order conflict in text.lua at line 665 [30.1]

Deletion in text.lua at line 770 [30.1]

Solving an order conflict in text.lua at line 770 [30.1]

Solving an order conflict in text.lua at line 834 [30.1]

Deletion in text.lua at line 836 [30.1]

Deletion in select.lua at line 58 [27.43980]

Deletion in select.lua at line 140 [27.43980]

Deletion in select.lua at line 168 [27.43980]

Deletion in main.lua at line 14 [51.2]

Deletion in main.lua at line 84 [51.2]

Solving an order conflict in main.lua at line 84 [51.2]

Solving an order conflict in main.lua at line 102 [51.2]

Deletion in main.lua at line 103 [51.2]

Deletion in main.lua at line 174 [51.2]

Deletion in main.lua at line 180 [51.2]

Solving an order conflict in main.lua at line 180 [51.2]

Deletion in main.lua at line 219 [51.2]

Deletion in main.lua at line 225 [51.2]

Solving an order conflict in main.lua at line 226 [51.2]

Deletion in main.lua at line 245 [51.2]

Solving an order conflict in main.lua at line 245 [51.2]

Deletion in main.lua at line 254 [51.2]

Solving an order conflict in main.lua at line 254 [51.2]

Deletion in main.lua at line 255 [51.2]

Resurrecting zombie bytes in main.lua at line 255 [51.2]

Deletion in main.lua at line 262 [51.2]

Solving an order conflict in main.lua at line 262 [51.2]

Deletion in main.lua at line 291 [51.2]

Deletion in main.lua at line 295 [51.2]

Deletion in main.lua at line 310 [51.2]

Deletion in main.lua at line 327 [51.2]

Solving an order conflict in main.lua at line 327 [51.2]

Deletion in main.lua at line 336 [51.2]

Solving an order conflict in main.lua at line 336 [51.2]

Deletion in main.lua at line 353 [51.2]

Solving an order conflict in main.lua at line 353 [51.2]

Deletion in main.lua at line 370 [51.2]

Solving an order conflict in main.lua at line 370 [51.2]

Deletion in main.lua at line 378 [51.2]

Deletion in main.lua at line 412 [51.2]

Solving an order conflict in main.lua at line 412 [51.2]

Deletion in main.lua at line 430 [51.2]

Solving an order conflict in main.lua at line 430 [51.2]

Deletion in main.lua at line 462 [51.2]

Deletion in main.lua at line 474 [51.2]

Deletion in main.lua at line 489 [51.2]

Deletion in main.lua at line 510 [51.2]

Solving an order conflict in main.lua at line 510 [51.2]

Deletion in main.lua at line 520 [51.2]