akkartik/sokoban.love - Change VHQCNMARPMNBSIUFLJG7HVK4QGDNPCGNVFLHS3I4IGNVSV5MRLYQC

several more modules

This is probably not ideal; let's see how it goes..

Created by Kartik K. Agaram on May 18, 2022

VHQCNMARPMNBSIUFLJG7HVK4QGDNPCGNVFLHS3I4IGNVSV5MRLYQC

Dependencies

In channels

main

Change contents

Insertion in main.lua at line 3 [11.2]
[9.21]
[10.2]
```
require 'file'
```

Insertion in main.lua at line 7 [11.2]

[7.65]

[9.21]

local geom = require 'geom'
require 'help'
require 'icons'

Replacement in main.lua at line 49 [11.2]

B:BD[12.1241] → [13.115:157]

Current_mode = 'line'
Previous_mode = nil

[12.1241]

[14.3]

Current_drawing_mode = 'line'
Previous_drawing_mode = nil

Deletion in main.lua at line 55 [11.2]
∅:D[15.28] → [14.168:207]
∅:D[13.257] → [14.168:207]
B:BD[14.168] → [14.168:207]
B:BD[14.207] → [13.258:287]
∅:D[13.287] → [14.231:273]
B:BD[14.231] → [14.231:273]
B:BD[14.273] → [13.288:329]
∅:D[13.329] → [14.309:313]
B:BD[14.309] → [14.309:313]
```
function pixels(n)  -- parts to pixels
  return n*Drawing_width/256
end
function coord(n)  -- pixels to parts
  return math.floor(n*256/Drawing_width)
end
```
Replacement in main.lua at line 119 [11.2]
B:BD[10.726] → [14.399:426]
```
      y = y+pixels(line.h)
```
[16.468]
[7.66]
```
      y = y+Drawing.pixels(line.h)
```

Replacement in main.lua at line 133 [11.2]

B:BD[17.60] → [13.1630:1736]

        if y >= drawing.y and y < drawing.y + pixels(drawing.h) and x >= 16 and x < 16+Drawing_width then

[17.60]

[12.1397]

        if y >= drawing.y and y < drawing.y + Drawing.pixels(drawing.h) and x >= 16 and x < 16+Drawing_width then

Replacement in main.lua at line 135 [11.2]

B:BD[12.1450] → [18.351:471]

            table.insert(drawing.pending.points, {x=coord(love.mouse.getX()-16), y=coord(love.mouse.getY()-drawing.y)})

[12.1450]

[19.3]

            table.insert(drawing.pending.points, {x=Drawing.coord(love.mouse.getX()-16), y=Drawing.coord(love.mouse.getY()-drawing.y)})

Replacement in main.lua at line 137 [11.2]

B:BD[19.56] → [19.56:114]

            local mx,my = coord(x-16), coord(y-drawing.y)

[19.56]

[19.114]

            local mx,my = Drawing.coord(x-16), Drawing.coord(y-drawing.y)

Replacement in main.lua at line 144 [11.2]
B:BD[10.1677] → [13.1737:1774]
```
  elseif Current_mode == 'move' then
```
[10.1677]
[20.468]
```
  elseif Current_drawing_mode == 'move' then
```

Replacement in main.lua at line 147 [11.2]

B:BD[21.149] → [13.1775:1877]

∅:D[13.1877] → [21.246:298]

B:BD[21.246] → [21.246:298]

    if y >= drawing.y and y < drawing.y + pixels(drawing.h) and x >= 16 and x < 16+Drawing_width then
      local mx,my = coord(x-16), coord(y-drawing.y)

[21.149]

[21.298]

    if y >= drawing.y and y < drawing.y + Drawing.pixels(drawing.h) and x >= 16 and x < 16+Drawing_width then
      local mx,my = Drawing.coord(x-16), Drawing.coord(y-drawing.y)

Replacement in main.lua at line 168 [11.2]

B:BD[22.132] → [13.2016:2333]

∅:D[13.2333] → [22.444:526]

B:BD[22.444] → [22.444:526]

B:BD[22.526] → [13.2334:2434]

∅:D[13.2434] → [22.626:708]

B:BD[22.626] → [22.626:708]

B:BD[22.708] → [13.2435:2542]

∅:D[13.2542] → [22.815:897]

B:BD[22.815] → [22.815:897]

B:BD[22.897] → [13.2543:2601]

      if y >= drawing.y and y < drawing.y + pixels(drawing.h) and x >= 16 and x < 16+Drawing_width then
        if Current_mode == 'freehand' then
          drawing.pending = {mode=Current_mode, points={{x=coord(x-16), y=coord(y-drawing.y)}}}
        elseif Current_mode == 'line' or Current_mode == 'manhattan' then
          local j = insert_point(drawing.points, coord(x-16), coord(y-drawing.y))
          drawing.pending = {mode=Current_mode, p1=j}
        elseif Current_mode == 'polygon' then
          local j = insert_point(drawing.points, coord(x-16), coord(y-drawing.y))
          drawing.pending = {mode=Current_mode, vertices={j}}
        elseif Current_mode == 'circle' then
          local j = insert_point(drawing.points, coord(x-16), coord(y-drawing.y))
          drawing.pending = {mode=Current_mode, center=j}

[22.132]

[22.955]

      if y >= drawing.y and y < drawing.y + Drawing.pixels(drawing.h) and x >= 16 and x < 16+Drawing_width then
        if Current_drawing_mode == 'freehand' then
          drawing.pending = {mode=Current_drawing_mode, points={{x=Drawing.coord(x-16), y=Drawing.coord(y-drawing.y)}}}
        elseif Current_drawing_mode == 'line' or Current_drawing_mode == 'manhattan' then
          local j = Drawing.insert_point(drawing.points, Drawing.coord(x-16), Drawing.coord(y-drawing.y))
          drawing.pending = {mode=Current_drawing_mode, p1=j}
        elseif Current_drawing_mode == 'polygon' then
          local j = Drawing.insert_point(drawing.points, Drawing.coord(x-16), Drawing.coord(y-drawing.y))
          drawing.pending = {mode=Current_drawing_mode, vertices={j}}
        elseif Current_drawing_mode == 'circle' then
          local j = Drawing.insert_point(drawing.points, Drawing.coord(x-16), Drawing.coord(y-drawing.y))
          drawing.pending = {mode=Current_drawing_mode, center=j}

Replacement in main.lua at line 188 [11.2]

B:BD[12.1626] → [13.2602:2692]

  if Current_mode == 'move' then
    Current_mode = Previous_mode
    Previous_mode = nil

[12.1626]

[20.570]

  if Current_drawing_mode == 'move' then
    Current_drawing_mode = Previous_drawing_mode
    Previous_drawing_mode = nil

Replacement in main.lua at line 197 [11.2]

B:BD[20.809] → [20.809:869]

        local mx,my = coord(x-16), coord(y-Lines.current.y)

[20.809]

[20.869]

        local mx,my = Drawing.coord(x-16), Drawing.coord(y-Lines.current.y)

Replacement in main.lua at line 199 [11.2]

B:BD[20.943] → [20.943:1005]

          local j = insert_point(Lines.current.points, mx,my)

[20.943]

[20.1005]

          local j = Drawing.insert_point(Lines.current.points, mx,my)

Replacement in main.lua at line 205 [11.2]

B:BD[20.1239] → [20.1239:1299]

        local mx,my = coord(x-16), coord(y-Lines.current.y)

[20.1239]

[20.1299]

        local mx,my = Drawing.coord(x-16), Drawing.coord(y-Lines.current.y)

Replacement in main.lua at line 208 [11.2]

B:BD[23.583] → [20.1374:1441]

            local j = insert_point(Lines.current.points, mx, p1.y)

[23.583]

[20.1441]

            local j = Drawing.insert_point(Lines.current.points, mx, p1.y)

Replacement in main.lua at line 211 [11.2]

B:BD[23.706] → [20.1483:1550]

            local j = insert_point(Lines.current.points, p1.x, my)

[23.706]

[20.1550]

            local j = Drawing.insert_point(Lines.current.points, p1.x, my)

Replacement in main.lua at line 215 [11.2]

B:BD[20.1660] → [20.1660:1740]

          love.mouse.setPosition(16+pixels(p2.x), Lines.current.y+pixels(p2.y))

[20.1660]

[20.1740]

          love.mouse.setPosition(16+Drawing.pixels(p2.x), Lines.current.y+Drawing.pixels(p2.y))

Replacement in main.lua at line 219 [11.2]

B:BD[20.1867] → [20.1867:1927]

        local mx,my = coord(x-16), coord(y-Lines.current.y)

[20.1867]

[20.1927]

        local mx,my = Drawing.coord(x-16), Drawing.coord(y-Lines.current.y)

Replacement in main.lua at line 221 [11.2]

B:BD[20.2001] → [20.2001:2063]

          local j = insert_point(Lines.current.points, mx,my)

[20.2001]

[20.2063]

          local j = Drawing.insert_point(Lines.current.points, mx,my)

Replacement in main.lua at line 226 [11.2]

B:BD[20.2255] → [20.2255:2315]

        local mx,my = coord(x-16), coord(y-Lines.current.y)

[20.2255]

[20.2315]

        local mx,my = Drawing.coord(x-16), Drawing.coord(y-Lines.current.y)

Replacement in main.lua at line 233 [11.2]

B:BD[20.2665] → [20.2665:2725]

        local mx,my = coord(x-16), coord(y-Lines.current.y)

[20.2665]

[20.2725]

        local mx,my = Drawing.coord(x-16), Drawing.coord(y-Lines.current.y)

Replacement in main.lua at line 236 [11.2]

B:BD[20.2875] → [20.2875:2994]

          Lines.current.pending.end_angle = angle_with_hint(center.x,center.y, mx,my, Lines.current.pending.end_angle)

[20.2875]

[20.2994]

          Lines.current.pending.end_angle = geom.angle_with_hint(center.x,center.y, mx,my, Lines.current.pending.end_angle)

Deletion in main.lua at line 246 [11.2]

∅:D[13.2746] → [24.55:61]

∅:D[20.3157] → [24.55:61]

B:BD[24.55] → [24.55:61]

∅:D[24.61] → [12.2109:2114]

∅:D[25.190] → [12.2109:2114]

B:BD[12.2109] → [12.2109:2114]

B:BD[26.469] → [27.762:797]

∅:D[28.39] → [27.797:832]

B:BD[27.797] → [27.797:832]

B:BD[27.832] → [29.35:64]

∅:D[29.64] → [27.874:955]

∅:D[28.142] → [27.874:955]

B:BD[27.874] → [27.874:955]

B:BD[27.955] → [29.65:229]

∅:D[29.229] → [27.955:1006]

B:BD[27.955] → [27.955:1006]

∅:D[27.1006] → [12.2424:2688]

B:BD[12.2424] → [12.2424:2688]

B:BD[12.2688] → [30.696:760]

∅:D[30.760] → [27.1007:1182]

B:BD[12.2723] → [27.1007:1182]

B:BD[27.1182] → [31.595:1078]

B:BD[31.1078] → [32.614:798]

B:BD[32.798] → [33.467:694]

B:BD[33.694] → [34.341:379]

∅:D[34.379] → [33.694:741]

B:BD[33.694] → [33.694:741]

∅:D[33.741] → [12.2834:2845]

∅:D[32.798] → [12.2834:2845]

∅:D[31.1078] → [12.2834:2845]

∅:D[27.1182] → [12.2834:2845]

B:BD[12.2834] → [12.2834:2845]

B:BD[12.2845] → [27.1183:1262]

∅:D[27.1262] → [12.2890:2925]

B:BD[12.2890] → [12.2890:2925]

B:BD[12.2925] → [27.1263:1304]

∅:D[27.1304] → [12.2957:2992]

B:BD[12.2957] → [12.2957:2992]

B:BD[12.2992] → [27.1305:1345]

B:BD[27.1345] → [23.1045:1300]

∅:D[23.1300] → [30.761:923]

B:BD[27.1441] → [30.761:923]

B:BD[30.923] → [23.1301:1383]

∅:D[23.1383] → [30.923:1180]

B:BD[30.923] → [30.923:1180]

B:BD[30.1180] → [31.1079:1535]

B:BD[31.1535] → [32.799:1205]

B:BD[32.1205] → [33.742:1239]

  end
end
function insert_point(points, x,y)
  for i,point in ipairs(points) do
    if near(point, x,y) then
      return i
    end
  end
  table.insert(points, {x=x, y=y})
  return #points
end
function near(point, x,y)
  local px,py = pixels(x),pixels(y)
  local cx,cy = pixels(point.x), pixels(point.y)
  return (cx-px)*(cx-px) + (cy-py)*(cy-py) < 16
end
function draw_shape(left,top, drawing, shape)
  if shape.mode == 'freehand' then
    local prev = nil
    for _,point in ipairs(shape.points) do
      if prev then
        love.graphics.line(pixels(prev.x)+left,pixels(prev.y)+top, pixels(point.x)+left,pixels(point.y)+top)
      end
      prev = point
    end
  elseif shape.mode == 'line' or shape.mode == 'manhattan' then
    local p1 = drawing.points[shape.p1]
    local p2 = drawing.points[shape.p2]
    love.graphics.line(pixels(p1.x)+left,pixels(p1.y)+top, pixels(p2.x)+left,pixels(p2.y)+top)
  elseif shape.mode == 'polygon' then
    local prev = nil
    for _,point in ipairs(shape.vertices) do
      local curr = drawing.points[point]
      if prev then
        love.graphics.line(pixels(prev.x)+left,pixels(prev.y)+top, pixels(curr.x)+left,pixels(curr.y)+top)
      end
      prev = curr
    end
    -- close the loop
    local curr = drawing.points[shape.vertices[1]]
    love.graphics.line(pixels(prev.x)+left,pixels(prev.y)+top, pixels(curr.x)+left,pixels(curr.y)+top)
  elseif shape.mode == 'circle' then
    local center = drawing.points[shape.center]
    love.graphics.circle('line', pixels(center.x)+left,pixels(center.y)+top, pixels(shape.radius))
  elseif shape.mode == 'arc' then
    local center = drawing.points[shape.center]
    love.graphics.arc('line', 'open', pixels(center.x)+left,pixels(center.y)+top, pixels(shape.radius), shape.start_angle, shape.end_angle, 360)
  elseif shape.mode == 'deleted' then
  else
    print(shape.mode)
    assert(false)
  end
end
function draw_pending_shape(left,top, drawing)
  local shape = drawing.pending
  if shape.mode == 'freehand' then
    draw_shape(left,top, drawing, shape)
  elseif shape.mode == 'line' then
    local p1 = drawing.points[shape.p1]
    local mx,my = coord(love.mouse.getX()-16), coord(love.mouse.getY()-drawing.y)
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end
    love.graphics.line(pixels(p1.x)+left,pixels(p1.y)+top, pixels(mx)+left,pixels(my)+top)
  elseif shape.mode == 'manhattan' then
    local p1 = drawing.points[shape.p1]
    local mx,my = coord(love.mouse.getX()-16), coord(love.mouse.getY()-drawing.y)
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end
    if math.abs(mx-p1.x) > math.abs(my-p1.y) then
      love.graphics.line(pixels(p1.x)+left,pixels(p1.y)+top, pixels(mx)+left,pixels(p1.y)+top)
    else
      love.graphics.line(pixels(p1.x)+left,pixels(p1.y)+top, pixels(p1.x)+left,pixels(my)+top)
    end
  elseif shape.mode == 'polygon' then
    -- don't close the loop on a pending polygon
    local prev = nil
    for _,point in ipairs(shape.vertices) do
      local curr = drawing.points[point]
      if prev then
        love.graphics.line(pixels(prev.x)+left,pixels(prev.y)+top, pixels(curr.x)+left,pixels(curr.y)+top)
      end
      prev = curr
    end
    love.graphics.line(pixels(prev.x)+left,pixels(prev.y)+top, love.mouse.getX(),love.mouse.getY())
  elseif shape.mode == 'circle' then
    local center = drawing.points[shape.center]
    local mx,my = coord(love.mouse.getX()-16), coord(love.mouse.getY()-drawing.y)
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end
    local cx,cy = pixels(center.x)+left, pixels(center.y)+top
    love.graphics.circle('line', cx,cy, math.dist(cx,cy, love.mouse.getX(),love.mouse.getY()))
  elseif shape.mode == 'arc' then
    local center = drawing.points[shape.center]
    local mx,my = coord(love.mouse.getX()-16), coord(love.mouse.getY()-drawing.y)
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end
    shape.end_angle = angle_with_hint(center.x,center.y, mx,my, shape.end_angle)
    local cx,cy = pixels(center.x)+left, pixels(center.y)+top
    love.graphics.arc('line', 'open', cx,cy, pixels(shape.radius), shape.start_angle, shape.end_angle, 360)

Deletion in main.lua at line 249 [11.2]

B:BD[12.3121] → [27.1442:1481]

∅:D[27.1481] → [12.3151:3186]

B:BD[12.3151] → [12.3151:3186]

B:BD[12.3186] → [27.1482:1526]

∅:D[27.1526] → [12.3221:3256]

B:BD[12.3221] → [12.3221:3256]

B:BD[12.3256] → [27.1527:1567]

B:BD[27.1567] → [30.1181:1299]

B:BD[30.1299] → [31.1536:1617]

B:BD[31.1617] → [32.1206:1352]

B:BD[32.1352] → [33.1240:1549]

B:BD[33.1549] → [34.380:418]

∅:D[34.418] → [12.3287:3294]

∅:D[30.1299] → [12.3287:3294]

∅:D[32.1352] → [12.3287:3294]

∅:D[33.1549] → [12.3287:3294]

∅:D[27.1567] → [12.3287:3294]

∅:D[31.1617] → [12.3287:3294]

B:BD[12.3287] → [12.3287:3294]

B:BD[12.3294] → [30.1300:1322]

∅:D[30.1322] → [12.3294:3323]

B:BD[12.3294] → [12.3294:3323]

B:BD[12.3323] → [27.1568:1610]

∅:D[27.1610] → [35.442:455]

B:BD[35.442] → [35.442:455]

B:BD[35.455] → [12.3324:3361]

∅:D[12.3361] → [35.485:502]

B:BD[35.485] → [35.485:502]

B:BD[35.502] → [27.1611:1664]

∅:D[27.1664] → [35.567:644]

B:BD[35.567] → [35.567:644]

B:BD[35.644] → [27.1665:1927]

∅:D[27.1927] → [36.74:101]

B:BD[36.74] → [36.74:101]

B:BD[36.101] → [27.1928:1956]

∅:D[27.1956] → [35.740:760]

B:BD[35.740] → [35.740:760]

B:BD[35.760] → [36.102:122]

∅:D[36.122] → [35.780:864]

B:BD[35.780] → [35.780:864]

B:BD[35.864] → [27.1957:2030]

∅:D[27.2030] → [35.961:1044]

B:BD[35.961] → [35.961:1044]

B:BD[35.1044] → [27.2031:2066]

∅:D[27.2066] → [35.1091:1128]

B:BD[35.1091] → [35.1091:1128]

B:BD[35.1128] → [31.1618:1934]

B:BD[31.1934] → [33.1550:1633]

B:BD[33.1691] → [33.1691:2004]

function on_shape(x,y, drawing, shape)
  if shape.mode == 'freehand' then
    return on_freehand(x,y, drawing, shape)
  elseif shape.mode == 'line' then
    return on_line(x,y, drawing, shape)
  elseif shape.mode == 'manhattan' then
    return x == drawing.points[shape.p1].x or y == drawing.points[shape.p1].y
  elseif shape.mode == 'polygon' then
    return on_polygon(x,y, drawing, shape)
  elseif shape.mode == 'circle' then
    local center = drawing.points[shape.center]
    return math.dist(center.x,center.y, x,y) == shape.radius
  elseif shape.mode == 'arc' then
    local center = drawing.points[shape.center]
    local dist = math.dist(center.x,center.y, x,y)
    if dist < shape.radius*0.95 or dist > shape.radius*1.05 then
      return false
    end
    return angle_between(center.x,center.y, x,y, shape.start_angle,shape.end_angle)
  elseif shape.mode == 'deleted' then
  else
    print(shape.mode)
    assert(false)
  end
end
function on_freehand(x,y, drawing, shape)
  local prev
  for _,p in ipairs(shape.points) do
    if prev then
      if on_line(x,y, drawing, {p1=prev, p2=p}) then
        return true
      end
    end
    prev = p
  end
  return false
end
function on_line(x,y, drawing, shape)
  local p1,p2
  if type(shape.p1) == 'number' then
    p1 = drawing.points[shape.p1]
    p2 = drawing.points[shape.p2]
  else
    p1 = shape.p1
    p2 = shape.p2
  end
  if p1.x == p2.x then
    if math.abs(p1.x-x) > 5 then
      return false
    end
    local y1,y2 = p1.y,p2.y
    if y1 > y2 then
      y1,y2 = y2,y1
    end
    return y >= y1 and y <= y2
  end
  -- has the right slope and intercept
  local m = (p2.y - p1.y) / (p2.x - p1.x)
  local yp = p1.y + m*(x-p1.x)
  if yp < 0.95*y or yp > 1.05*y then
    return false
  end
  -- between endpoints
  local k = (x-p1.x) / (p2.x-p1.x)
  return k > -0.05 and k < 1.05
end
function on_polygon(x,y, drawing, shape)
  local prev
  for _,p in ipairs(shape.vertices) do
    if prev then
      if on_line(x,y, drawing, {p1=prev, p2=p}) then
        return true
      end
    end
    prev = p
  end
  return on_line(x,y, drawing, {p1=shape.vertices[1], p2=shape.vertices[#shape.vertices]})
end
function angle_between(x1,y1, x2,y2, s,e)
  local angle = math.angle(x1,y1, x2,y2)
  if s > e then
    s,e = e,s
  end
  -- I'm not sure this is right or ideal..
  angle = angle-math.pi*2
  if s <= angle and angle <= e then
    return true
  end
  angle = angle+math.pi*2
  if s <= angle and angle <= e then
    return true
  end
  angle = angle+math.pi*2
  return s <= angle and angle <= e
end

Replacement in main.lua at line 359 [11.2]

B:BD[37.61] → [37.61:99]

    local drawing = current_drawing()

[37.61]

[37.99]

    local drawing = Drawing.current_drawing()

Replacement in main.lua at line 362 [11.2]
B:BD[21.559] → [13.5548:5578]
```
    Current_mode = 'freehand'
```
[21.559]
[21.560]
```
    Current_drawing_mode = 'freehand'
```
Replacement in main.lua at line 364 [11.2]
B:BD[21.620] → [13.5579:5608]
```
    Current_mode = 'polygon'
```
[21.620]
[38.32]
```
    Current_drawing_mode = 'polygon'
```

Replacement in main.lua at line 366 [11.2]

B:BD[38.86] → [13.5609:5638]

∅:D[13.5638] → [38.87:125]

B:BD[31.1993] → [38.87:125]

    Current_mode = 'polygon'
    local drawing = current_drawing()

[38.86]

[4.2]

    Current_drawing_mode = 'polygon'
    local drawing = Drawing.current_drawing()

Replacement in main.lua at line 369 [11.2]

B:BD[4.49] → [4.49:171]

      drawing.pending.vertices = {insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y)}

[4.49]

[4.171]

      drawing.pending.vertices = {Drawing.insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y)}

Replacement in main.lua at line 378 [11.2]

B:BD[38.407] → [13.5639:5723]

∅:D[13.5723] → [31.2077:2247]

B:BD[31.2077] → [31.2077:2247]

  elseif love.mouse.isDown('1') and chord == 'p' and Current_mode == 'polygon' then
    local drawing = current_drawing()
    local mx,my = coord(love.mouse.getX()-16), coord(love.mouse.getY()-drawing.y)
    local j = insert_point(drawing.points, mx,my)

[38.407]

[31.2247]

  elseif love.mouse.isDown('1') and chord == 'p' and Current_drawing_mode == 'polygon' then
    local drawing = Drawing.current_drawing()
    local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)
    local j = Drawing.insert_point(drawing.points, mx,my)

Replacement in main.lua at line 384 [11.2]

B:BD[21.681] → [13.5724:5835]

∅:D[13.5835] → [33.2088:2126]

B:BD[33.2088] → [33.2088:2126]

    Current_mode = 'circle'
  elseif love.mouse.isDown('1') and chord == 'a' and Current_mode == 'circle' then
    local drawing = current_drawing()

[21.681]

[33.2126]

    Current_drawing_mode = 'circle'
  elseif love.mouse.isDown('1') and chord == 'a' and Current_drawing_mode == 'circle' then
    local drawing = Drawing.current_drawing()

Replacement in main.lua at line 388 [11.2]

B:BD[33.2159] → [33.2159:2291]

    local mx,my = coord(love.mouse.getX()-16), coord(love.mouse.getY()-drawing.y)
    local j = insert_point(drawing.points, mx,my)

[33.2159]

[33.2291]

    local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)
    local j = Drawing.insert_point(drawing.points, mx,my)

Replacement in main.lua at line 392 [11.2]

B:BD[33.2414] → [33.2414:2485]

    drawing.pending.start_angle = math.angle(center.x,center.y, mx,my)

[33.2414]

[38.408]

    drawing.pending.start_angle = geom.angle(center.x,center.y, mx,my)

Replacement in main.lua at line 394 [11.2]

B:BD[38.462] → [13.5836:5864]

∅:D[13.5864] → [38.490:528]

B:BD[38.490] → [38.490:528]

    Current_mode = 'circle'
    local drawing = current_drawing()

[38.462]

[4.370]

    Current_drawing_mode = 'circle'
    local drawing = Drawing.current_drawing()

Replacement in main.lua at line 397 [11.2]

B:BD[4.417] → [4.417:535]

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

[4.417]

[4.535]

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

Replacement in main.lua at line 405 [11.2]

B:BD[39.195] → [13.5865:5891]

∅:D[13.5891] → [39.221:259]

B:BD[39.221] → [39.221:259]

    Current_mode = 'line'
    local drawing = current_drawing()

[39.195]

[38.775]

    Current_drawing_mode = 'line'
    local drawing = Drawing.current_drawing()

Replacement in main.lua at line 408 [11.2]

B:BD[38.822] → [38.822:936]

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

[38.822]

[38.936]

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

Replacement in main.lua at line 416 [11.2]

B:BD[40.906] → [13.5892:5918]

B:BD[13.5918] → [8.381:433]

    Current_mode = 'line'
    local drawing,_,shape = select_shape_at_mouse()

[40.906]

[40.958]

    Current_drawing_mode = 'line'
    local drawing,_,shape = Drawing.select_shape_at_mouse()

Replacement in main.lua at line 422 [11.2]

B:BD[30.1377] → [13.5919:5950]

∅:D[13.5950] → [30.1408:1454]

B:BD[30.1408] → [30.1408:1454]

    Current_mode = 'manhattan'
    local drawing = select_drawing_at_mouse()

[30.1377]

[4.728]

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

Replacement in main.lua at line 425 [11.2]

B:BD[4.775] → [4.775:889]

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

[4.775]

[4.889]

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

Replacement in main.lua at line 435 [11.2]

B:BD[21.742] → [13.5951:5982]

B:BD[13.5982] → [8.434:486]

    Current_mode = 'manhattan'
    local drawing,_,shape = select_shape_at_mouse()

[21.742]

[41.92]

    Current_drawing_mode = 'manhattan'
    local drawing,_,shape = Drawing.select_shape_at_mouse()

Replacement in main.lua at line 441 [11.2]

B:BD[21.803] → [8.487:539]

    local drawing,_,shape = select_shape_at_mouse()

[21.803]

[42.84]

    local drawing,_,shape = Drawing.select_shape_at_mouse()

Replacement in main.lua at line 446 [11.2]

B:BD[21.864] → [34.449:497]

    local drawing,_,p = select_point_at_mouse()

[21.864]

[21.910]

    local drawing,_,p = Drawing.select_point_at_mouse()

Replacement in main.lua at line 448 [11.2]

B:BD[21.930] → [13.5983:6106]

      Previous_mode = Current_mode
      Current_mode = 'move'
      drawing.pending = {mode=Current_mode, target_point=p}

[21.930]

[20.5279]

      Previous_drawing_mode = Current_drawing_mode
      Current_drawing_mode = 'move'
      drawing.pending = {mode=Current_drawing_mode, target_point=p}

Replacement in main.lua at line 454 [11.2]

B:BD[19.471] → [34.498:546]

    local drawing,_,p = select_point_at_mouse()

[19.471]

[19.517]

    local drawing,_,p = Drawing.select_point_at_mouse()

Replacement in main.lua at line 456 [11.2]

B:BD[19.537] → [13.6107:6230]

      Previous_mode = Current_mode
      Current_mode = 'move'
      drawing.pending = {mode=Current_mode, target_point=p}

[19.537]

[20.5310]

      Previous_drawing_mode = Current_drawing_mode
      Current_drawing_mode = 'move'
      drawing.pending = {mode=Current_drawing_mode, target_point=p}

Replacement in main.lua at line 462 [11.2]

B:BD[34.615] → [34.615:663]

    local drawing,i,p = select_point_at_mouse()

[34.615]

[34.663]

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

Replacement in main.lua at line 465 [11.2]

B:BD[34.730] → [34.730:771]

        if contains_point(shape, i) then

[34.730]

[2.3]

        if Drawing.contains_point(shape, i) then

Replacement in main.lua at line 480 [11.2]

B:BD[34.873] → [8.540:592]

    local drawing,_,shape = select_shape_at_mouse()

[34.873]

[34.925]

    local drawing,_,shape = Drawing.select_shape_at_mouse()

Replacement in main.lua at line 485 [11.2]

B:BD[43.317] → [43.317:363]

    local drawing = select_drawing_at_mouse()

[43.317]

[43.363]

    local drawing = Drawing.select_drawing_at_mouse()

Deletion in main.lua at line 493 [11.2]
B:BD[44.146] → [44.146:156]
∅:D[44.156] → [45.533:552]
B:BD[43.576] → [45.533:552]
B:BD[39.803] → [39.803:882]
B:BD[39.882] → [20.5377:5413]
∅:D[20.5413] → [16.3056:3094]
B:BD[39.918] → [16.3056:3094]
B:BD[16.3094] → [13.6279:6383]
∅:D[18.994] → [39.1054:1087]
∅:D[13.6383] → [39.1054:1087]
B:BD[39.1054] → [39.1054:1087]
∅:D[39.1087] → [42.126:134]
B:BD[42.126] → [42.126:134]
∅:D[42.134] → [46.119:125]
B:BD[46.119] → [46.119:125]
B:BD[46.125] → [39.1088:1101]
∅:D[39.1101] → [46.125:163]
B:BD[46.125] → [46.125:163]
B:BD[46.163] → [20.5414:5450]
∅:D[20.5450] → [16.3095:3133]
B:BD[46.199] → [16.3095:3133]
∅:D[16.3133] → [46.236:292]
B:BD[46.236] → [46.236:292]
B:BD[46.292] → [13.6384:6488]
∅:D[13.6488] → [18.1094:1180]
B:BD[18.1094] → [18.1094:1180]
∅:D[18.1180] → [46.384:433]
∅:D[14.1354] → [46.384:433]
B:BD[46.384] → [46.384:433]
B:BD[46.433] → [23.1384:1408]
B:BD[23.1408] → [34.975:1025]
∅:D[47.766] → [46.507:542]
∅:D[34.1025] → [46.507:542]
∅:D[40.1067] → [46.507:542]
∅:D[14.1399] → [46.507:542]
∅:D[12.3460] → [46.507:542]
B:BD[46.507] → [46.507:542]
B:BD[46.542] → [21.1073:1161]
B:BD[21.1161] → [20.5451:5487]
∅:D[20.5487] → [16.3134:3172]
B:BD[21.1197] → [16.3134:3172]
∅:D[16.3172] → [21.1234:1290]
B:BD[21.1234] → [21.1234:1290]
B:BD[21.1290] → [13.6489:6593]
∅:D[13.6593] → [21.1389:1475]
B:BD[21.1389] → [21.1389:1475]
B:BD[21.1475] → [34.1026:1075]
∅:D[34.1075] → [21.1524:1585]
B:BD[21.1524] → [21.1524:1585]
B:BD[21.1585] → [34.1076:1111]
∅:D[46.542] → [48.448:492]
∅:D[34.1111] → [48.448:492]
∅:D[21.1618] → [48.448:492]
B:BD[48.448] → [48.448:492]
∅:D[49.185] → [11.601:607]
∅:D[9.324] → [11.601:607]
∅:D[48.492] → [11.601:607]
∅:D[50.1135] → [11.601:607]
B:BD[11.601] → [11.601:607]
B:BD[11.607] → [40.1068:1073]
B:BD[40.1073] → [30.1526:1561]
B:BD[30.1561] → [20.5488:5524]
∅:D[20.5524] → [16.3173:3211]
B:BD[30.1597] → [16.3173:3211]
∅:D[16.3211] → [30.1634:1690]
B:BD[30.1634] → [30.1634:1690]
B:BD[30.1690] → [13.6594:6698]
∅:D[13.6698] → [30.1789:1812]
B:BD[30.1789] → [30.1789:1812]
```
      end
    end
  end
end
function current_drawing()
  local x, y = love.mouse.getX(), love.mouse.getY()
  for _,drawing in ipairs(Lines) do
    if drawing.mode == 'drawing' then
      if y >= drawing.y and y < drawing.y + pixels(drawing.h) and x >= 16 and x < 16+Drawing_width then
        return drawing
      end
    end
  end
  return nil
end
function select_shape_at_mouse()
  for _,drawing in ipairs(Lines) do
    if drawing.mode == 'drawing' then
      local x, y = love.mouse.getX(), love.mouse.getY()
      if y >= drawing.y and y < drawing.y + pixels(drawing.h) and x >= 16 and x < 16+Drawing_width then
        local mx,my = coord(love.mouse.getX()-16), coord(love.mouse.getY()-drawing.y)
        for i,shape in ipairs(drawing.shapes) do
          assert(shape)
          if on_shape(mx,my, drawing, shape) then
            return drawing,i,shape
          end
        end
      end
    end
  end
end
function select_point_at_mouse()
  for _,drawing in ipairs(Lines) do
    if drawing.mode == 'drawing' then
      local x, y = love.mouse.getX(), love.mouse.getY()
      if y >= drawing.y and y < drawing.y + pixels(drawing.h) and x >= 16 and x < 16+Drawing_width then
        local mx,my = coord(love.mouse.getX()-16), coord(love.mouse.getY()-drawing.y)
        for i,point in ipairs(drawing.points) do
          assert(point)
          if near(point, mx,my) then
            return drawing,i,point
          end
        end
      end
    end
  end
end
function select_drawing_at_mouse()
  for _,drawing in ipairs(Lines) do
    if drawing.mode == 'drawing' then
      local x, y = love.mouse.getX(), love.mouse.getY()
      if y >= drawing.y and y < drawing.y + pixels(drawing.h) and x >= 16 and x < 16+Drawing_width then
        return drawing
```

Deletion in main.lua at line 494 [11.2]

B:BD[30.1822] → [30.1822:1841]

B:BD[30.1841] → [34.1112:1202]

B:BD[34.1202] → [5.2:66]

∅:D[5.66] → [34.1270:1619]

B:BD[34.1270] → [34.1270:1619]

B:BD[34.1619] → [5.67:89]

∅:D[5.89] → [34.1619:1648]

B:BD[34.1619] → [34.1619:1648]

∅:D[34.1648] → [27.2255:2293]

∅:D[30.1841] → [27.2255:2293]

B:BD[40.1073] → [27.2255:2293]

∅:D[27.2293] → [40.1114:1353]

∅:D[12.3490] → [40.1114:1353]

B:BD[40.1114] → [40.1114:1353]

B:BD[40.1353] → [12.3491:3548]

B:BD[12.3548] → [27.2294:2480]

∅:D[40.1401] → [41.152:157]

∅:D[27.2480] → [41.152:157]

∅:D[12.3696] → [41.152:157]

B:BD[48.826] → [41.152:157]

B:BD[41.157] → [12.3697:3742]

B:BD[12.3742] → [27.2481:2522]

∅:D[27.2522] → [12.3774:3870]

B:BD[12.3774] → [12.3774:3870]

B:BD[12.3870] → [27.2523:2667]

∅:D[47.859] → [41.445:452]

∅:D[40.1587] → [41.445:452]

∅:D[27.2667] → [41.445:452]

∅:D[12.3962] → [41.445:452]

B:BD[41.445] → [41.445:452]

B:BD[41.452] → [27.2668:2684]

∅:D[47.884] → [41.505:511]

∅:D[40.1641] → [41.505:511]

∅:D[27.2684] → [41.505:511]

∅:D[12.3987] → [41.505:511]

B:BD[41.505] → [41.505:511]

∅:D[41.511] → [9.325:330]

∅:D[48.826] → [9.325:330]

B:BD[11.607] → [9.325:330]

B:BD[9.330] → [42.135:160]

B:BD[42.160] → [12.3988:4023]

∅:D[12.4023] → [42.160:175]

B:BD[42.160] → [42.160:175]

B:BD[42.175] → [12.4024:4155]

∅:D[12.4155] → [42.278:342]

B:BD[42.278] → [42.278:342]

    end
  end
end
function contains_point(shape, p)
  if shape.mode == 'freehand' then
    -- not supported
  elseif shape.mode == 'line' or shape.mode == 'manhattan' then
    return shape.p1 == p or shape.p2 == p
  elseif shape.mode == 'polygon' then
    return table.find(shape.vertices, p)
  elseif shape.mode == 'circle' then
    return shape.center == p
  elseif shape.mode == 'arc' then
    return shape.center == p
    -- ugh, how to support angles
  elseif shape.mode == 'deleted' then
    -- already done
  else
    print(shape.mode)
    assert(false)
  end
end
function convert_line(drawing, shape)
  -- Perhaps we should do a more sophisticated "simple linear regression"
  -- here:
  --   https://en.wikipedia.org/wiki/Linear_regression#Simple_and_multiple_linear_regression
  -- But this works well enough for close-to-linear strokes.
  assert(shape.mode == 'freehand')
  shape.mode = 'line'
  shape.p1 = insert_point(drawing.points, shape.points[1].x, shape.points[1].y)
  local n = #shape.points
  shape.p2 = insert_point(drawing.points, shape.points[n].x, shape.points[n].y)
end
-- turn a line either horizontal or vertical
function convert_horvert(drawing, shape)
  if shape.mode == 'freehand' then
    convert_line(shape)
  end
  assert(shape.mode == 'line')
  local p1 = drawing.points[shape.p1]
  local p2 = drawing.points[shape.p2]
  if math.abs(p1.x-p2.x) > math.abs(p1.y-p2.y) then
    p2.y = p1.y
  else
    p2.x = p1.x
  end
end
function smoothen(shape)
  assert(shape.mode == 'freehand')
  for _=1,7 do
    for i=2,#shape.points-1 do
      local a = shape.points[i-1]
      local b = shape.points[i]
      local c = shape.points[i+1]
      b.x = (a.x + b.x + c.x)/3
      b.y = (a.y + b.y + c.y)/3

Deletion in main.lua at line 505 [11.2]

B:BD[2.417] → [2.417:431]

∅:D[2.431] → [33.2486:3164]

B:BD[9.371] → [33.2486:3164]

∅:D[51.116] → [9.460:464]

∅:D[10.2055] → [9.460:464]

∅:D[33.3164] → [9.460:464]

B:BD[9.460] → [9.460:464]

B:BD[9.464] → [32.1411:1482]

B:BD[32.1482] → [25.191:226]

B:BD[25.226] → [52.120:155]

B:BD[52.155] → [53.17:57]

B:BD[53.57] → [54.68:104]

∅:D[54.104] → [52.223:276]

B:BD[52.223] → [52.223:276]

∅:D[52.276] → [25.226:246]

B:BD[25.226] → [25.226:246]

B:BD[25.281] → [25.281:298]

B:BD[25.298] → [52.277:402]

∅:D[52.402] → [25.298:316]

B:BD[25.298] → [25.298:316]

B:BD[25.316] → [52.403:441]

∅:D[52.441] → [25.349:492]

B:BD[25.349] → [25.349:492]

B:BD[25.492] → [52.442:503]

∅:D[52.503] → [25.543:554]

B:BD[25.543] → [25.543:554]

B:BD[25.554] → [16.3212:3267]

∅:D[16.3267] → [25.589:613]

B:BD[25.589] → [25.589:613]

B:BD[25.613] → [54.105:128]

B:BD[54.128] → [16.3268:3317]

∅:D[16.3317] → [54.157:163]

B:BD[54.157] → [54.157:163]

∅:D[54.163] → [25.613:747]

B:BD[25.613] → [25.613:747]

B:BD[25.747] → [16.3318:3353]

∅:D[16.3353] → [25.781:825]

B:BD[25.781] → [25.781:825]

B:BD[25.825] → [16.3354:3391]

    end
  end
end
function angle_with_hint(x1, y1, x2, y2, hint)
  local result = math.angle(x1,y1, x2,y2)
  if hint then
    -- Smooth the discontinuity where angle goes from positive to negative.
    -- The hint is a memory of which way we drew it last time.
    while result > hint+math.pi/10 do
      result = result-math.pi*2
    end
    while result < hint-math.pi/10 do
      result = result+math.pi*2
    end
  end
  return result
end
-- result is from -π/2 to 3π/2, approximately adding math.atan2 from Lua 5.3
-- (LÖVE is Lua 5.1)
function math.angle(x1,y1, x2,y2)
  local result = math.atan((y2-y1)/(x2-x1))
  if x2 < x1 then
    result = result+math.pi
  end
  return result
end
function math.dist(x1,y1, x2,y2) return ((x2-x1)^2+(y2-y1)^2)^0.5 end
function load_from_disk(filename)
  local infile = io.open(filename)
  local result = load_from_file(infile)
  if infile then infile:close() end
  return result
end
function load_from_file(infile)
  local result = {}
  if infile then
    local infile_next_line = infile:lines()  -- works with both Lua files and LÖVE Files (https://www.love2d.org/wiki/File)
    while true do
      local line = infile_next_line()
      if line == nil then break end
      if line == '```lines' then  -- inflexible with whitespace since these files are always autogenerated
        table.insert(result, load_drawing(infile_next_line))
      else
        table.insert(result, {mode='text', data=line})
      end
    end
  end
  if #result == 0 then
    table.insert(result, {mode='text', data=''})
  end
  return result
end
function save_to_disk(lines, filename)
  local outfile = io.open(filename, 'w')
  for _,line in ipairs(lines) do
    if line.mode == 'drawing' then
      store_drawing(outfile, line)
    else
      outfile:write(line.data..'\n')

Deletion in main.lua at line 507 [11.2]
B:BD[25.871] → [55.100:118]
```
  outfile:close()
```

Deletion in main.lua at line 508 [11.2]

B:BD[25.875] → [25.875:898]

B:BD[25.898] → [52.504:544]

B:BD[52.544] → [16.3392:3470]

∅:D[16.3470] → [25.990:1006]

B:BD[25.990] → [25.990:1006]

B:BD[25.1006] → [52.545:581]

∅:D[52.581] → [25.1037:1126]

B:BD[25.1037] → [25.1037:1126]

B:BD[25.1126] → [3.3:65]

∅:D[3.65] → [25.1159:1299]

B:BD[25.1159] → [25.1159:1299]

B:BD[25.1299] → [3.66:368]

∅:D[3.368] → [25.1299:1489]

B:BD[25.1299] → [25.1299:1489]

B:BD[25.1489] → [55.119:156]

B:BD[55.489] → [55.489:535]

B:BD[55.535] → [3.369:435]

∅:D[3.435] → [25.1522:1630]

∅:D[55.572] → [25.1522:1630]

B:BD[25.1522] → [25.1522:1630]

B:BD[25.1630] → [3.436:700]

∅:D[3.700] → [25.1630:1662]

B:BD[25.1630] → [25.1630:1662]

B:BD[25.1662] → [55.573:612]

B:BD[55.612] → [3.701:1027]

∅:D[55.612] → [25.1662:1701]

∅:D[3.1027] → [25.1662:1701]

B:BD[25.1662] → [25.1662:1701]

B:BD[25.1701] → [56.56:71]

B:BD[56.71] → [6.38:268]

∅:D[6.268] → [56.71:501]

B:BD[56.71] → [56.71:501]

∅:D[56.501] → [25.1701:1705]

B:BD[25.1701] → [25.1701:1705]

B:BD[25.1705] → [56.502:1086]

B:BD[56.1086] → [43.585:674]

B:BD[43.750] → [43.750:775]

B:BD[43.775] → [13.6699:7418]

∅:D[57.693] → [43.1414:1420]

∅:D[13.7418] → [43.1414:1420]

B:BD[43.1414] → [43.1414:1420]

B:BD[43.1420] → [13.7419:7559]

∅:D[57.801] → [43.1546:1552]

∅:D[13.7559] → [43.1546:1552]

B:BD[43.1546] → [43.1546:1552]

B:BD[43.1552] → [13.7560:7725]

∅:D[57.929] → [43.1703:1709]

∅:D[13.7725] → [43.1703:1709]

B:BD[43.1703] → [43.1703:1709]

B:BD[43.1709] → [13.7726:7875]

∅:D[57.1044] → [43.1844:1850]

∅:D[13.7875] → [43.1844:1850]

B:BD[43.1844] → [43.1844:1850]

B:BD[43.1850] → [13.7876:8022]

∅:D[57.1155] → [43.1982:1988]

∅:D[13.8022] → [43.1982:1988]

B:BD[43.1982] → [43.1982:1988]

B:BD[43.1988] → [13.8023:8329]

∅:D[13.8329] → [58.107:146]

B:BD[57.1372] → [58.107:146]

B:BD[58.146] → [13.8330:8434]

∅:D[58.245] → [43.1988:2074]

∅:D[44.256] → [43.1988:2074]

∅:D[59.376] → [43.1988:2074]

∅:D[57.1372] → [43.1988:2074]

∅:D[13.8434] → [43.1988:2074]

B:BD[43.1988] → [43.1988:2074]

B:BD[43.2150] → [43.2150:2175]

B:BD[43.2175] → [13.8435:9016]

∅:D[13.9016] → [43.2699:2744]

B:BD[43.2699] → [43.2699:2744]

B:BD[43.2744] → [13.9017:9231]

∅:D[57.2029] → [43.2938:2947]

∅:D[13.9231] → [43.2938:2947]

B:BD[43.2938] → [43.2938:2947]

B:BD[43.2947] → [13.9232:9332]

∅:D[58.756] → [43.3037:3045]

∅:D[57.2129] → [43.3037:3045]

∅:D[13.9332] → [43.3037:3045]

B:BD[43.3037] → [43.3037:3045]

B:BD[43.3045] → [13.9333:9617]

∅:D[57.2373] → [43.3294:3300]

∅:D[13.9617] → [43.3294:3300]

B:BD[43.3294] → [43.3294:3300]

B:BD[43.3300] → [13.9618:9900]

∅:D[57.2624] → [43.3432:3438]

∅:D[13.9900] → [43.3432:3438]

B:BD[43.3432] → [43.3432:3438]

B:BD[43.3438] → [13.9901:10061]

∅:D[57.2747] → [43.3584:3590]

∅:D[13.10061] → [43.3584:3590]

B:BD[43.3584] → [43.3584:3590]

B:BD[43.3590] → [13.10062:10206]

∅:D[57.2857] → [43.3720:3726]

∅:D[13.10206] → [43.3720:3726]

B:BD[43.3720] → [43.3720:3726]

B:BD[43.3726] → [13.10207:10348]

∅:D[57.2963] → [43.3853:3859]

∅:D[13.10348] → [43.3853:3859]

B:BD[43.3853] → [43.3853:3859]

B:BD[43.3859] → [58.860:899]

B:BD[58.899] → [13.10349:10453]

∅:D[58.998] → [43.3859:3864]

∅:D[13.10453] → [43.3859:3864]

B:BD[43.3859] → [43.3859:3864]

B:BD[43.3864] → [58.999:1029]

B:BD[58.1029] → [13.10454:10491]

∅:D[13.10491] → [43.3935:3964]

B:BD[43.3935] → [43.3935:3964]

B:BD[43.3964] → [13.10492:10529]

∅:D[13.10529] → [43.4001:4028]

B:BD[43.4001] → [43.4001:4028]

B:BD[43.4028] → [13.10530:10572]

∅:D[13.10572] → [43.4070:4108]

B:BD[43.4070] → [43.4070:4108]

B:BD[43.4108] → [13.10573:10644]

∅:D[13.10644] → [58.1101:1118]

B:BD[58.1101] → [58.1101:1118]

∅:D[58.1118] → [43.4108:4115]

B:BD[43.4108] → [43.4108:4115]

B:BD[43.4115] → [13.10645:10669]

∅:D[13.10669] → [43.4139:4150]

B:BD[43.4139] → [43.4139:4150]

B:BD[43.4230] → [43.4230:4445]

∅:D[43.4445] → [56.1086:1090]

B:BD[56.1086] → [56.1086:1090]


json = require 'json'
function load_drawing(infile_next_line)
  local drawing = {mode='drawing', h=256/2, points={}, shapes={}, pending={}}
  while true do
    local line = infile_next_line()
    assert(line)
    if line == '```' then break end
    local shape = json.decode(line)
    if shape.mode == 'line' or shape.mode == 'manhattan' then
      shape.p1 = insert_point(drawing.points, shape.p1.x, shape.p1.y)
      shape.p2 = insert_point(drawing.points, shape.p2.x, shape.p2.y)
    elseif shape.mode == 'polygon' then
      for i,p in ipairs(shape.vertices) do
        shape.vertices[i] = insert_point(drawing.points, p.x,p.y)
      end
    elseif shape.mode == 'circle' or shape.mode == 'arc' then
      shape.center = insert_point(drawing.points, shape.center.x,shape.center.y)
    end
    table.insert(drawing.shapes, shape)
  end
  return drawing
end
function store_drawing(outfile, drawing)
  outfile:write('```lines\n')
  for _,shape in ipairs(drawing.shapes) do
    if shape.mode == 'freehand' then
      outfile:write(json.encode(shape)..'\n')
    elseif shape.mode == 'line' or shape.mode == 'manhattan' then
      local line = json.encode({mode=shape.mode, p1=drawing.points[shape.p1], p2=drawing.points[shape.p2]})
      outfile:write(line..'\n')
    elseif shape.mode == 'polygon' then
      local obj = {mode=shape.mode, vertices={}}
      for _,p in ipairs(shape.vertices) do
        table.insert(obj.vertices, drawing.points[p])
      end
      local line = json.encode(obj)
      outfile:write(line..'\n')
    elseif shape.mode == 'circle' then
      outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius})..'\n')
    elseif shape.mode == 'arc' then
      outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius, start_angle=shape.start_angle, end_angle=shape.end_angle})..'\n')
    end
  end
  outfile:write('```\n')
end
icon = {}
function icon.insert_drawing(x, y)
  love.graphics.setColor(0.7,0.7,0.7)
  love.graphics.rectangle('line', x,y, 12,12)
  love.graphics.line(4,y+6, 16,y+6)
  love.graphics.line(10,y, 10,y+12)
  love.graphics.setColor(0, 0, 0)
end
function icon.freehand(x, y)
  love.graphics.line(x+4,y+7,x+5,y+5)
  love.graphics.line(x+5,y+5,x+7,y+4)
  love.graphics.line(x+7,y+4,x+9,y+3)
  love.graphics.line(x+9,y+3,x+10,y+5)
  love.graphics.line(x+10,y+5,x+12,y+6)
  love.graphics.line(x+12,y+6,x+13,y+8)
  love.graphics.line(x+13,y+8,x+13,y+10)
  love.graphics.line(x+13,y+10,x+14,y+12)
  love.graphics.line(x+14,y+12,x+15,y+14)
  love.graphics.line(x+15,y+14,x+15,y+16)
end
function icon.line(x, y)
  love.graphics.line(x+4,y+2, x+16,y+18)
end
function icon.manhattan(x, y)
  love.graphics.line(x+4,y+20, x+4,y+2)
  love.graphics.line(x+4,y+2, x+10,y+2)
  love.graphics.line(x+10,y+2, x+10,y+10)
  love.graphics.line(x+10,y+10, x+18,y+10)
end
function icon.polygon(x, y)
  love.graphics.line(x+8,y+2, x+14,y+2)
  love.graphics.line(x+14,y+2, x+18,y+10)
  love.graphics.line(x+18,y+10, x+10,y+18)
  love.graphics.line(x+10,y+18, x+4,y+12)
  love.graphics.line(x+4,y+12, x+8,y+2)
end
function icon.circle(x, y)
  love.graphics.circle('line', x+10,y+10, 8)
end
function draw_help_without_mouse_pressed(drawing)
  love.graphics.setColor(0,0.5,0)
  local y = drawing.y+10
  love.graphics.print("Things you can do:", 16+30,y, 0, Zoom)
  y = y+15*Zoom
  love.graphics.print("* Press the mouse button to start drawing a "..current_shape(), 16+30,y, 0, Zoom)
  y = y+15*Zoom
  love.graphics.print("* Hover on a point and press 'ctrl+v' to start moving it,", 16+30,y, 0, Zoom)
  y = y+15*Zoom
  love.graphics.print("then press the mouse button to finish", 16+30+bullet_indent(),y, 0, Zoom)
  y = y+15*Zoom
  love.graphics.print("* Hover on a point or shape and press 'ctrl+d' to delete it", 16+30,y, 0, Zoom)
  y = y+15*Zoom
  y = y+15*Zoom
  if Current_mode ~= 'freehand' then
    love.graphics.print("* Press 'ctrl+f' to switch to drawing freehand strokes", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  if Current_mode ~= 'line' then
    love.graphics.print("* Press 'ctrl+l' to switch to drawing lines", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  if Current_mode ~= 'manhattan' then
    love.graphics.print("* Press 'ctrl+m' to switch to drawing horizontal/vertical lines", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  if Current_mode ~= 'circle' then
    love.graphics.print("* Press 'ctrl+c' to switch to drawing circles/arcs", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  if Current_mode ~= 'polygon' then
    love.graphics.print("* Press 'ctrl+g' to switch to drawing polygons", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  love.graphics.print("* Press 'ctrl+=' or 'ctrl+-' to Zoom in or out", 16+30,y, 0, Zoom)
  y = y+15*Zoom
  love.graphics.print("* Press 'ctrl+0' to reset Zoom", 16+30,y, 0, Zoom)
  y = y+15*Zoom
  y = y+15*Zoom
  love.graphics.print("Hit 'esc' now to hide this message", 16+30,y, 0, Zoom)
  y = y+15*Zoom
  love.graphics.setColor(0,0.5,0, 0.1)
  love.graphics.rectangle('fill', 16,drawing.y, Drawing_width, math.max(pixels(drawing.h),y-drawing.y))
end
function draw_help_with_mouse_pressed(drawing)
  love.graphics.setColor(0,0.5,0)
  local y = drawing.y+10
  love.graphics.print("You're currently drawing a "..current_shape(drawing.pending), 16+30,y, 0, Zoom)
  y = y+15*Zoom
  love.graphics.print('Things you can do now:', 16+30,y, 0, Zoom)
  y = y+15*Zoom
  if Current_mode == 'freehand' then
    love.graphics.print('* Release the mouse button to finish drawing the stroke', 16+30,y, 0, Zoom)
    y = y+15*Zoom
  elseif Current_mode == 'line' or Current_mode == 'manhattan' then
    love.graphics.print('* Release the mouse button to finish drawing the line', 16+30,y, 0, Zoom)
    y = y+15*Zoom
  elseif Current_mode == 'circle' then
    if drawing.pending.mode == 'circle' then
      love.graphics.print('* Release the mouse button to finish drawing the circle', 16+30,y, 0, Zoom)
      y = y+15*Zoom
      love.graphics.print("* Press 'a' to draw just an arc of a circle", 16+30,y, 0, Zoom)
    else
      love.graphics.print('* Release the mouse button to finish drawing the arc', 16+30,y, 0, Zoom)
    end
    y = y+15*Zoom
  elseif Current_mode == 'polygon' then
    love.graphics.print('* Release the mouse button to finish drawing the polygon', 16+30,y, 0, Zoom)
    y = y+15*Zoom
    love.graphics.print("* Press 'p' to add a vertex to the polygon", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  love.graphics.print("* Press 'esc' then release the mouse button to cancel the current shape", 16+30,y, 0, Zoom)
  y = y+15*Zoom
  y = y+15*Zoom
  if Current_mode ~= 'line' then
    love.graphics.print("* Press 'l' to switch to drawing lines", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  if Current_mode ~= 'manhattan' then
    love.graphics.print("* Press 'm' to switch to drawing horizontal/vertical lines", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  if Current_mode ~= 'circle' then
    love.graphics.print("* Press 'c' to switch to drawing circles/arcs", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  if Current_mode ~= 'polygon' then
    love.graphics.print("* Press 'g' to switch to drawing polygons", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  love.graphics.setColor(0,0.5,0, 0.1)
  love.graphics.rectangle('fill', 16,drawing.y, Drawing_width, math.max(pixels(drawing.h),y-drawing.y))
end
function current_shape(shape)
  if Current_mode == 'freehand' then
    return 'freehand stroke'
  elseif Current_mode == 'line' then
    return 'straight line'
  elseif Current_mode == 'manhattan' then
    return 'horizontal/vertical line'
  elseif Current_mode == 'circle' and shape and shape.start_angle then
    return 'arc'
  else
    return Current_mode
  end
end
_bullet_indent = nil
function bullet_indent()
  if _bullet_indent == nil then
    local text = love.graphics.newText(love.graphics.getFont(), '* ')
    _bullet_indent = text:getWidth()
  end
  return _bullet_indent
end

File addition: icons.lua (----------)

[60.2]

icon = {}
function icon.insert_drawing(x, y)
  love.graphics.setColor(0.7,0.7,0.7)
  love.graphics.rectangle('line', x,y, 12,12)
  love.graphics.line(4,y+6, 16,y+6)
  love.graphics.line(10,y, 10,y+12)
  love.graphics.setColor(0, 0, 0)
end
function icon.freehand(x, y)
  love.graphics.line(x+4,y+7,x+5,y+5)
  love.graphics.line(x+5,y+5,x+7,y+4)
  love.graphics.line(x+7,y+4,x+9,y+3)
  love.graphics.line(x+9,y+3,x+10,y+5)
  love.graphics.line(x+10,y+5,x+12,y+6)
  love.graphics.line(x+12,y+6,x+13,y+8)
  love.graphics.line(x+13,y+8,x+13,y+10)
  love.graphics.line(x+13,y+10,x+14,y+12)
  love.graphics.line(x+14,y+12,x+15,y+14)
  love.graphics.line(x+15,y+14,x+15,y+16)
end
function icon.line(x, y)
  love.graphics.line(x+4,y+2, x+16,y+18)
end
function icon.manhattan(x, y)
  love.graphics.line(x+4,y+20, x+4,y+2)
  love.graphics.line(x+4,y+2, x+10,y+2)
  love.graphics.line(x+10,y+2, x+10,y+10)
  love.graphics.line(x+10,y+10, x+18,y+10)
end
function icon.polygon(x, y)
  love.graphics.line(x+8,y+2, x+14,y+2)
  love.graphics.line(x+14,y+2, x+18,y+10)
  love.graphics.line(x+18,y+10, x+10,y+18)
  love.graphics.line(x+10,y+18, x+4,y+12)
  love.graphics.line(x+4,y+12, x+8,y+2)
end
function icon.circle(x, y)
  love.graphics.circle('line', x+10,y+10, 8)
end

File addition: help.lua (----------)

[60.2]

function draw_help_without_mouse_pressed(drawing)
  love.graphics.setColor(0,0.5,0)
  local y = drawing.y+10
  love.graphics.print("Things you can do:", 16+30,y, 0, Zoom)
  y = y+15*Zoom
  love.graphics.print("* Press the mouse button to start drawing a "..current_shape(), 16+30,y, 0, Zoom)
  y = y+15*Zoom
  love.graphics.print("* Hover on a point and press 'ctrl+v' to start moving it,", 16+30,y, 0, Zoom)
  y = y+15*Zoom
  love.graphics.print("then press the mouse button to finish", 16+30+bullet_indent(),y, 0, Zoom)
  y = y+15*Zoom
  love.graphics.print("* Hover on a point or shape and press 'ctrl+d' to delete it", 16+30,y, 0, Zoom)
  y = y+15*Zoom
  y = y+15*Zoom
  if Current_drawing_mode ~= 'freehand' then
    love.graphics.print("* Press 'ctrl+f' to switch to drawing freehand strokes", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  if Current_drawing_mode ~= 'line' then
    love.graphics.print("* Press 'ctrl+l' to switch to drawing lines", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  if Current_drawing_mode ~= 'manhattan' then
    love.graphics.print("* Press 'ctrl+m' to switch to drawing horizontal/vertical lines", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  if Current_drawing_mode ~= 'circle' then
    love.graphics.print("* Press 'ctrl+c' to switch to drawing circles/arcs", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  if Current_drawing_mode ~= 'polygon' then
    love.graphics.print("* Press 'ctrl+g' to switch to drawing polygons", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  love.graphics.print("* Press 'ctrl+=' or 'ctrl+-' to Zoom in or out", 16+30,y, 0, Zoom)
  y = y+15*Zoom
  love.graphics.print("* Press 'ctrl+0' to reset Zoom", 16+30,y, 0, Zoom)
  y = y+15*Zoom
  y = y+15*Zoom
  love.graphics.print("Hit 'esc' now to hide this message", 16+30,y, 0, Zoom)
  y = y+15*Zoom
  love.graphics.setColor(0,0.5,0, 0.1)
  love.graphics.rectangle('fill', 16,drawing.y, Drawing_width, math.max(Drawing.pixels(drawing.h),y-drawing.y))
end
function draw_help_with_mouse_pressed(drawing)
  love.graphics.setColor(0,0.5,0)
  local y = drawing.y+10
  love.graphics.print("You're currently drawing a "..current_shape(drawing.pending), 16+30,y, 0, Zoom)
  y = y+15*Zoom
  love.graphics.print('Things you can do now:', 16+30,y, 0, Zoom)
  y = y+15*Zoom
  if Current_drawing_mode == 'freehand' then
    love.graphics.print('* Release the mouse button to finish drawing the stroke', 16+30,y, 0, Zoom)
    y = y+15*Zoom
  elseif Current_drawing_mode == 'line' or Current_drawing_mode == 'manhattan' then
    love.graphics.print('* Release the mouse button to finish drawing the line', 16+30,y, 0, Zoom)
    y = y+15*Zoom
  elseif Current_drawing_mode == 'circle' then
    if drawing.pending.mode == 'circle' then
      love.graphics.print('* Release the mouse button to finish drawing the circle', 16+30,y, 0, Zoom)
      y = y+15*Zoom
      love.graphics.print("* Press 'a' to draw just an arc of a circle", 16+30,y, 0, Zoom)
    else
      love.graphics.print('* Release the mouse button to finish drawing the arc', 16+30,y, 0, Zoom)
    end
    y = y+15*Zoom
  elseif Current_drawing_mode == 'polygon' then
    love.graphics.print('* Release the mouse button to finish drawing the polygon', 16+30,y, 0, Zoom)
    y = y+15*Zoom
    love.graphics.print("* Press 'p' to add a vertex to the polygon", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  love.graphics.print("* Press 'esc' then release the mouse button to cancel the current shape", 16+30,y, 0, Zoom)
  y = y+15*Zoom
  y = y+15*Zoom
  if Current_drawing_mode ~= 'line' then
    love.graphics.print("* Press 'l' to switch to drawing lines", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  if Current_drawing_mode ~= 'manhattan' then
    love.graphics.print("* Press 'm' to switch to drawing horizontal/vertical lines", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  if Current_drawing_mode ~= 'circle' then
    love.graphics.print("* Press 'c' to switch to drawing circles/arcs", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  if Current_drawing_mode ~= 'polygon' then
    love.graphics.print("* Press 'g' to switch to drawing polygons", 16+30,y, 0, Zoom)
    y = y+15*Zoom
  end
  love.graphics.setColor(0,0.5,0, 0.1)
  love.graphics.rectangle('fill', 16,drawing.y, Drawing_width, math.max(Drawing.pixels(drawing.h),y-drawing.y))
end
function current_shape(shape)
  if Current_drawing_mode == 'freehand' then
    return 'freehand stroke'
  elseif Current_drawing_mode == 'line' then
    return 'straight line'
  elseif Current_drawing_mode == 'manhattan' then
    return 'horizontal/vertical line'
  elseif Current_drawing_mode == 'circle' and shape and shape.start_angle then
    return 'arc'
  else
    return Current_drawing_mode
  end
end
_bullet_indent = nil
function bullet_indent()
  if _bullet_indent == nil then
    local text = love.graphics.newText(love.graphics.getFont(), '* ')
    _bullet_indent = text:getWidth()
  end
  return _bullet_indent
end

File addition: geom.lua (----------)

[60.2]

local geom = {}
function geom.on_shape(x,y, drawing, shape)
  if shape.mode == 'freehand' then
    return geom.on_freehand(x,y, drawing, shape)
  elseif shape.mode == 'line' then
    return geom.on_line(x,y, drawing, shape)
  elseif shape.mode == 'manhattan' then
    return x == drawing.points[shape.p1].x or y == drawing.points[shape.p1].y
  elseif shape.mode == 'polygon' then
    return geom.on_polygon(x,y, drawing, shape)
  elseif shape.mode == 'circle' then
    local center = drawing.points[shape.center]
    return math.dist(center.x,center.y, x,y) == shape.radius
  elseif shape.mode == 'arc' then
    local center = drawing.points[shape.center]
    local dist = math.dist(center.x,center.y, x,y)
    if dist < shape.radius*0.95 or dist > shape.radius*1.05 then
      return false
    end
    return geom.angle_between(center.x,center.y, x,y, shape.start_angle,shape.end_angle)
  elseif shape.mode == 'deleted' then
  else
    print(shape.mode)
    assert(false)
  end
end
function geom.on_freehand(x,y, drawing, shape)
  local prev
  for _,p in ipairs(shape.points) do
    if prev then
      if geom.on_line(x,y, drawing, {p1=prev, p2=p}) then
        return true
      end
    end
    prev = p
  end
  return false
end
function geom.on_line(x,y, drawing, shape)
  local p1,p2
  if type(shape.p1) == 'number' then
    p1 = drawing.points[shape.p1]
    p2 = drawing.points[shape.p2]
  else
    p1 = shape.p1
    p2 = shape.p2
  end
  if p1.x == p2.x then
    if math.abs(p1.x-x) > 5 then
      return false
    end
    local y1,y2 = p1.y,p2.y
    if y1 > y2 then
      y1,y2 = y2,y1
    end
    return y >= y1 and y <= y2
  end
  -- has the right slope and intercept
  local m = (p2.y - p1.y) / (p2.x - p1.x)
  local yp = p1.y + m*(x-p1.x)
  if yp < 0.95*y or yp > 1.05*y then
    return false
  end
  -- between endpoints
  local k = (x-p1.x) / (p2.x-p1.x)
  return k > -0.05 and k < 1.05
end
function geom.on_polygon(x,y, drawing, shape)
  local prev
  for _,p in ipairs(shape.vertices) do
    if prev then
      if geom.on_line(x,y, drawing, {p1=prev, p2=p}) then
        return true
      end
    end
    prev = p
  end
  return geom.on_line(x,y, drawing, {p1=shape.vertices[1], p2=shape.vertices[#shape.vertices]})
end
function geom.angle_with_hint(x1, y1, x2, y2, hint)
  local result = geom.angle(x1,y1, x2,y2)
  if hint then
    -- Smooth the discontinuity where angle goes from positive to negative.
    -- The hint is a memory of which way we drew it last time.
    while result > hint+math.pi/10 do
      result = result-math.pi*2
    end
    while result < hint-math.pi/10 do
      result = result+math.pi*2
    end
  end
  return result
end
-- result is from -π/2 to 3π/2, approximately adding math.atan2 from Lua 5.3
-- (LÖVE is Lua 5.1)
function geom.angle(x1,y1, x2,y2)
  local result = math.atan((y2-y1)/(x2-x1))
  if x2 < x1 then
    result = result+math.pi
  end
  return result
end
-- is the line between x,y and cx,cy at an angle between s and e?
function geom.angle_between(ox,oy, x,y, s,e)
  local angle = math.angle(ox,oy, x,y)
  if s > e then
    s,e = e,s
  end
  -- I'm not sure this is right or ideal..
  angle = angle-math.pi*2
  if s <= angle and angle <= e then
    return true
  end
  angle = angle+math.pi*2
  if s <= angle and angle <= e then
    return true
  end
  angle = angle+math.pi*2
  return s <= angle and angle <= e
end
function geom.dist(x1,y1, x2,y2) return ((x2-x1)^2+(y2-y1)^2)^0.5 end
return geom

File addition: file.lua (----------)

[60.2]

-- primitives for saving to file and loading from file
Drawing = require 'drawing'
function load_from_disk(filename)
  local infile = io.open(filename)
  local result = load_from_file(infile)
  if infile then infile:close() end
  return result
end
function load_from_file(infile)
  local result = {}
  if infile then
    local infile_next_line = infile:lines()  -- works with both Lua files and LÖVE Files (https://www.love2d.org/wiki/File)
    while true do
      local line = infile_next_line()
      if line == nil then break end
      if line == '```lines' then  -- inflexible with whitespace since these files are always autogenerated
        table.insert(result, load_drawing(infile_next_line))
      else
        table.insert(result, {mode='text', data=line})
      end
    end
  end
  if #result == 0 then
    table.insert(result, {mode='text', data=''})
  end
  return result
end
function save_to_disk(lines, filename)
  local outfile = io.open(filename, 'w')
  for _,line in ipairs(lines) do
    if line.mode == 'drawing' then
      store_drawing(outfile, line)
    else
      outfile:write(line.data..'\n')
    end
  end
  outfile:close()
end
json = require 'json'
function load_drawing(infile_next_line)
  local drawing = {mode='drawing', h=256/2, points={}, shapes={}, pending={}}
  while true do
    local line = infile_next_line()
    assert(line)
    if line == '```' then break end
    local shape = json.decode(line)
    if shape.mode == 'line' or shape.mode == 'manhattan' then
      shape.p1 = Drawing.insert_point(drawing.points, shape.p1.x, shape.p1.y)
      shape.p2 = Drawing.insert_point(drawing.points, shape.p2.x, shape.p2.y)
    elseif shape.mode == 'polygon' then
      for i,p in ipairs(shape.vertices) do
        shape.vertices[i] = Drawing.insert_point(drawing.points, p.x,p.y)
      end
    elseif shape.mode == 'circle' or shape.mode == 'arc' then
      shape.center = Drawing.insert_point(drawing.points, shape.center.x,shape.center.y)
    end
    table.insert(drawing.shapes, shape)
  end
  return drawing
end
function store_drawing(outfile, drawing)
  outfile:write('```lines\n')
  for _,shape in ipairs(drawing.shapes) do
    if shape.mode == 'freehand' then
      outfile:write(json.encode(shape)..'\n')
    elseif shape.mode == 'line' or shape.mode == 'manhattan' then
      local line = json.encode({mode=shape.mode, p1=drawing.points[shape.p1], p2=drawing.points[shape.p2]})
      outfile:write(line..'\n')
    elseif shape.mode == 'polygon' then
      local obj = {mode=shape.mode, vertices={}}
      for _,p in ipairs(shape.vertices) do
        table.insert(obj.vertices, drawing.points[p])
      end
      local line = json.encode(obj)
      outfile:write(line..'\n')
    elseif shape.mode == 'circle' then
      outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius})..'\n')
    elseif shape.mode == 'arc' then
      outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius, start_angle=shape.start_angle, end_angle=shape.end_angle})..'\n')
    end
  end
  outfile:write('```\n')
end

Insertion in drawing.lua at line 3 [7.98]
[7.147]
[7.147]
```
geom = require 'geom'
```

Replacement in drawing.lua at line 7 [7.98]

B:BD[7.234] → [7.234:316]

  if pmx < 16+Drawing_width and pmy > line.y and pmy < line.y+pixels(line.h) then

[7.234]

[7.316]

  if pmx < 16+Drawing_width and pmy > line.y and pmy < line.y+Drawing.pixels(line.h) then

Replacement in drawing.lua at line 9 [7.98]

B:BD[7.359] → [7.359:523]

    love.graphics.rectangle('line', 16,line.y, Drawing_width,pixels(line.h))
    if icon[Current_mode] then
      icon[Current_mode](16+Drawing_width-20, line.y+4)

[7.359]

[7.523]

    love.graphics.rectangle('line', 16,line.y, Drawing_width,Drawing.pixels(line.h))
    if icon[Current_drawing_mode] then
      icon[Current_drawing_mode](16+Drawing_width-20, line.y+4)

Replacement in drawing.lua at line 13 [7.98]

B:BD[7.532] → [7.532:589]

      icon[Previous_mode](16+Drawing_width-20, line.y+4)

[7.532]

[7.589]

      icon[Previous_drawing_mode](16+Drawing_width-20, line.y+4)

Replacement in drawing.lua at line 27 [7.98]

B:BD[7.817] → [7.817:894]

  local mx,my = coord(love.mouse.getX()-16), coord(love.mouse.getY()-line.y)

[7.817]

[7.894]

  local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-line.y)

Replacement in drawing.lua at line 31 [7.98]

B:BD[7.953] → [7.953:994]

    if on_shape(mx,my, line, shape) then

[7.953]

[7.994]

    if geom.on_shape(mx,my, line, shape) then

Replacement in drawing.lua at line 36 [7.98]

B:BD[7.1083] → [7.1083:1122]

    draw_shape(16,line.y, line, shape)

[7.1083]

[7.1122]

    Drawing.draw_shape(16,line.y, line, shape)

Replacement in drawing.lua at line 40 [7.98]
B:BD[7.1193] → [7.1193:1222]
```
      if near(p, mx,my) then
```
[7.1193]
[7.1222]
```
      if Drawing.near(p, mx,my) then
```

Replacement in drawing.lua at line 42 [7.98]

B:BD[7.1260] → [7.1260:1335]

        love.graphics.circle('line', pixels(p.x)+16,pixels(p.y)+line.y, 4)

[7.1260]

[7.1335]

        love.graphics.circle('line', Drawing.pixels(p.x)+16,Drawing.pixels(p.y)+line.y, 4)

Replacement in drawing.lua at line 45 [7.98]

B:BD[7.1384] → [7.1384:1459]

        love.graphics.circle('fill', pixels(p.x)+16,pixels(p.y)+line.y, 2)

[7.1384]

[7.1459]

        love.graphics.circle('fill', Drawing.pixels(p.x)+16,Drawing.pixels(p.y)+line.y, 2)

Replacement in drawing.lua at line 49 [7.98]

B:BD[7.1483] → [7.1483:1521]

  draw_pending_shape(16,line.y, line)

[7.1483]

[7.1521]

  Drawing.draw_pending_shape(16,line.y, line)
end
function Drawing.current_drawing()
  local x, y = love.mouse.getX(), love.mouse.getY()
  for _,drawing in ipairs(Lines) do
    if drawing.mode == 'drawing' then
      if y >= drawing.y and y < drawing.y + Drawing.pixels(drawing.h) and x >= 16 and x < 16+Drawing_width then
        return drawing
      end
    end
  end
  return nil
end
function Drawing.select_shape_at_mouse()
  for _,drawing in ipairs(Lines) do
    if drawing.mode == 'drawing' then
      local x, y = love.mouse.getX(), love.mouse.getY()
      if y >= drawing.y and y < drawing.y + Drawing.pixels(drawing.h) and x >= 16 and x < 16+Drawing_width then
        local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)
        for i,shape in ipairs(drawing.shapes) do
          assert(shape)
          if geom.on_shape(mx,my, drawing, shape) then
            return drawing,i,shape
          end
        end
      end
    end
  end
end
function Drawing.select_point_at_mouse()
  for _,drawing in ipairs(Lines) do
    if drawing.mode == 'drawing' then
      local x, y = love.mouse.getX(), love.mouse.getY()
      if y >= drawing.y and y < drawing.y + Drawing.pixels(drawing.h) and x >= 16 and x < 16+Drawing_width then
        local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)
        for i,point in ipairs(drawing.points) do
          assert(point)
          if Drawing.near(point, mx,my) then
            return drawing,i,point
          end
        end
      end
    end
  end
end
function Drawing.select_drawing_at_mouse()
  for _,drawing in ipairs(Lines) do
    if drawing.mode == 'drawing' then
      local x, y = love.mouse.getX(), love.mouse.getY()
      if y >= drawing.y and y < drawing.y + Drawing.pixels(drawing.h) and x >= 16 and x < 16+Drawing_width then
        return drawing
      end
    end
  end
end
function Drawing.contains_point(shape, p)
  if shape.mode == 'freehand' then
    -- not supported
  elseif shape.mode == 'line' or shape.mode == 'manhattan' then
    return shape.p1 == p or shape.p2 == p
  elseif shape.mode == 'polygon' then
    return table.find(shape.vertices, p)
  elseif shape.mode == 'circle' then
    return shape.center == p
  elseif shape.mode == 'arc' then
    return shape.center == p
    -- ugh, how to support angles
  elseif shape.mode == 'deleted' then
    -- already done
  else
    print(shape.mode)
    assert(false)
  end
end
function Drawing.convert_line(drawing, shape)
  -- Perhaps we should do a more sophisticated "simple linear regression"
  -- here:
  --   https://en.wikipedia.org/wiki/Linear_regression#Simple_and_multiple_linear_regression
  -- But this works well enough for close-to-linear strokes.
  assert(shape.mode == 'freehand')
  shape.mode = 'line'
  shape.p1 = insert_point(drawing.points, shape.points[1].x, shape.points[1].y)
  local n = #shape.points
  shape.p2 = insert_point(drawing.points, shape.points[n].x, shape.points[n].y)
end
-- turn a line either horizontal or vertical
function Drawing.convert_horvert(drawing, shape)
  if shape.mode == 'freehand' then
    convert_line(shape)
  end
  assert(shape.mode == 'line')
  local p1 = drawing.points[shape.p1]
  local p2 = drawing.points[shape.p2]
  if math.abs(p1.x-p2.x) > math.abs(p1.y-p2.y) then
    p2.y = p1.y
  else
    p2.x = p1.x
  end
end
function Drawing.smoothen(shape)
  assert(shape.mode == 'freehand')
  for _=1,7 do
    for i=2,#shape.points-1 do
      local a = shape.points[i-1]
      local b = shape.points[i]
      local c = shape.points[i+1]
      b.x = (a.x + b.x + c.x)/3
      b.y = (a.y + b.y + c.y)/3
    end
  end
end
function Drawing.insert_point(points, x,y)
  for i,point in ipairs(points) do
    if Drawing.near(point, x,y) then
      return i
    end
  end
  table.insert(points, {x=x, y=y})
  return #points
end
function Drawing.near(point, x,y)
  local px,py = Drawing.pixels(x),Drawing.pixels(y)
  local cx,cy = Drawing.pixels(point.x), Drawing.pixels(point.y)
  return (cx-px)*(cx-px) + (cy-py)*(cy-py) < 16
end
function Drawing.draw_shape(left,top, drawing, shape)
  if shape.mode == 'freehand' then
    local prev = nil
    for _,point in ipairs(shape.points) do
      if prev then
        love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, Drawing.pixels(point.x)+left,Drawing.pixels(point.y)+top)
      end
      prev = point
    end
  elseif shape.mode == 'line' or shape.mode == 'manhattan' then
    local p1 = drawing.points[shape.p1]
    local p2 = drawing.points[shape.p2]
    love.graphics.line(Drawing.pixels(p1.x)+left,Drawing.pixels(p1.y)+top, Drawing.pixels(p2.x)+left,Drawing.pixels(p2.y)+top)
  elseif shape.mode == 'polygon' then
    local prev = nil
    for _,point in ipairs(shape.vertices) do
      local curr = drawing.points[point]
      if prev then
        love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, Drawing.pixels(curr.x)+left,Drawing.pixels(curr.y)+top)
      end
      prev = curr
    end
    -- close the loop
    local curr = drawing.points[shape.vertices[1]]
    love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, Drawing.pixels(curr.x)+left,Drawing.pixels(curr.y)+top)
  elseif shape.mode == 'circle' then
    local center = drawing.points[shape.center]
    love.graphics.circle('line', Drawing.pixels(center.x)+left,Drawing.pixels(center.y)+top, Drawing.pixels(shape.radius))
  elseif shape.mode == 'arc' then
    local center = drawing.points[shape.center]
    love.graphics.arc('line', 'open', Drawing.pixels(center.x)+left,Drawing.pixels(center.y)+top, Drawing.pixels(shape.radius), shape.start_angle, shape.end_angle, 360)
  elseif shape.mode == 'deleted' then
  else
    print(shape.mode)
    assert(false)
  end
end
function Drawing.draw_pending_shape(left,top, drawing)
  local shape = drawing.pending
  if shape.mode == 'freehand' then
    draw_shape(left,top, drawing, shape)
  elseif shape.mode == 'line' then
    local p1 = drawing.points[shape.p1]
    local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end
    love.graphics.line(Drawing.pixels(p1.x)+left,Drawing.pixels(p1.y)+top, Drawing.pixels(mx)+left,Drawing.pixels(my)+top)
  elseif shape.mode == 'manhattan' then
    local p1 = drawing.points[shape.p1]
    local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end
    if math.abs(mx-p1.x) > math.abs(my-p1.y) then
      love.graphics.line(Drawing.pixels(p1.x)+left,Drawing.pixels(p1.y)+top, Drawing.pixels(mx)+left,Drawing.pixels(p1.y)+top)
    else
      love.graphics.line(Drawing.pixels(p1.x)+left,Drawing.pixels(p1.y)+top, Drawing.pixels(p1.x)+left,Drawing.pixels(my)+top)
    end
  elseif shape.mode == 'polygon' then
    -- don't close the loop on a pending polygon
    local prev = nil
    for _,point in ipairs(shape.vertices) do
      local curr = drawing.points[point]
      if prev then
        love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, Drawing.pixels(curr.x)+left,Drawing.pixels(curr.y)+top)
      end
      prev = curr
    end
    love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, love.mouse.getX(),love.mouse.getY())
  elseif shape.mode == 'circle' then
    local center = drawing.points[shape.center]
    local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end
    local cx,cy = Drawing.pixels(center.x)+left, Drawing.pixels(center.y)+top
    love.graphics.circle('line', cx,cy, math.dist(cx,cy, love.mouse.getX(),love.mouse.getY()))
  elseif shape.mode == 'arc' then
    local center = drawing.points[shape.center]
    local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end
    shape.end_angle = geom.angle_with_hint(center.x,center.y, mx,my, shape.end_angle)
    local cx,cy = Drawing.pixels(center.x)+left, Drawing.pixels(center.y)+top
    love.graphics.arc('line', 'open', cx,cy, Drawing.pixels(shape.radius), shape.start_angle, shape.end_angle, 360)
  end
end
function Drawing.pixels(n)  -- parts to pixels
  return n*Drawing_width/256
end
function Drawing.coord(n)  -- pixels to parts
  return math.floor(n*256/Drawing_width)

several more modules

Dependencies

In channels

Change contents

Insertion in main.lua at line 3 [11.2]

Insertion in main.lua at line 7 [11.2]

Replacement in main.lua at line 49 [11.2]

Deletion in main.lua at line 55 [11.2]

Replacement in main.lua at line 119 [11.2]

Replacement in main.lua at line 133 [11.2]

Replacement in main.lua at line 135 [11.2]

Replacement in main.lua at line 137 [11.2]

Replacement in main.lua at line 144 [11.2]

Replacement in main.lua at line 147 [11.2]

Replacement in main.lua at line 168 [11.2]

Replacement in main.lua at line 188 [11.2]

Replacement in main.lua at line 197 [11.2]

Replacement in main.lua at line 199 [11.2]

Replacement in main.lua at line 205 [11.2]

Replacement in main.lua at line 208 [11.2]

Replacement in main.lua at line 211 [11.2]

Replacement in main.lua at line 215 [11.2]

Replacement in main.lua at line 219 [11.2]

Replacement in main.lua at line 221 [11.2]

Replacement in main.lua at line 226 [11.2]

Replacement in main.lua at line 233 [11.2]

Replacement in main.lua at line 236 [11.2]

Deletion in main.lua at line 246 [11.2]

Deletion in main.lua at line 249 [11.2]

Replacement in main.lua at line 359 [11.2]

Replacement in main.lua at line 362 [11.2]

Replacement in main.lua at line 364 [11.2]

Replacement in main.lua at line 366 [11.2]

Replacement in main.lua at line 369 [11.2]

Replacement in main.lua at line 378 [11.2]

Replacement in main.lua at line 384 [11.2]

Replacement in main.lua at line 388 [11.2]

Replacement in main.lua at line 392 [11.2]

Replacement in main.lua at line 394 [11.2]

Replacement in main.lua at line 397 [11.2]

Replacement in main.lua at line 405 [11.2]

Replacement in main.lua at line 408 [11.2]

Replacement in main.lua at line 416 [11.2]

Replacement in main.lua at line 422 [11.2]

Replacement in main.lua at line 425 [11.2]

Replacement in main.lua at line 435 [11.2]

Replacement in main.lua at line 441 [11.2]

Replacement in main.lua at line 446 [11.2]

Replacement in main.lua at line 448 [11.2]

Replacement in main.lua at line 454 [11.2]

Replacement in main.lua at line 456 [11.2]

Replacement in main.lua at line 462 [11.2]

Replacement in main.lua at line 465 [11.2]

Replacement in main.lua at line 480 [11.2]

Replacement in main.lua at line 485 [11.2]

Deletion in main.lua at line 493 [11.2]

Deletion in main.lua at line 494 [11.2]

Deletion in main.lua at line 505 [11.2]

Deletion in main.lua at line 507 [11.2]

Deletion in main.lua at line 508 [11.2]

File addition: icons.lua (----------)

File addition: help.lua (----------)

File addition: geom.lua (----------)

File addition: file.lua (----------)

Insertion in drawing.lua at line 3 [7.98]

Replacement in drawing.lua at line 7 [7.98]

Replacement in drawing.lua at line 9 [7.98]

Replacement in drawing.lua at line 13 [7.98]

Replacement in drawing.lua at line 27 [7.98]

Replacement in drawing.lua at line 31 [7.98]

Replacement in drawing.lua at line 36 [7.98]

Replacement in drawing.lua at line 40 [7.98]

Replacement in drawing.lua at line 42 [7.98]

Replacement in drawing.lua at line 45 [7.98]

Replacement in drawing.lua at line 49 [7.98]