akkartik/lines-polygon-experiment - Change OEZ4KAX6SM7QGQX2ZTTLG3W3YLTDQGJH7YBQIVJRPHEJLL4XX7AAC

Merge upstream into main

Looks like help.lua was incorrectly merged on Jul 12 in commit 5614eb96a0. Now fixed.

Created by Kartik K. Agaram on July 22, 2022

OEZ4KAX6SM7QGQX2ZTTLG3W3YLTDQGJH7YBQIVJRPHEJLL4XX7AAC

Dependencies

In channels

main

Change contents

Replacement in help.lua at line 7 [5.6622]

B:BD[4.18438] → [2.1562:1710]

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

[4.18438]

[4.18549]

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

Replacement in help.lua at line 11 [5.6622]
B:BD[4.18664] → [2.1711:1733]
```
  y = y + Line_height
```
[4.18664]
[4.18665]
```
  y = y + State.line_height
```
Replacement in help.lua at line 13 [5.6622]
B:BD[4.18762] → [2.1734:1756]
```
  y = y + Line_height
```
[4.18762]
[4.18763]
```
  y = y + State.line_height
```
Replacement in help.lua at line 15 [5.6622]
B:BD[4.18876] → [2.1757:1779]
```
  y = y + Line_height
```
[4.18876]
[4.18877]
```
  y = y + State.line_height
```

Replacement in help.lua at line 17 [5.6622]

B:BD[4.18979] → [2.1780:1847]

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

[4.18979]

[4.18980]

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

Replacement in help.lua at line 20 [5.6622]
B:BD[4.19079] → [2.1848:1872]
```
    y = y + Line_height
```
[4.19079]
[5.7459]
```
    y = y + State.line_height
```

Replacement in help.lua at line 22 [5.6622]

B:BD[5.7465] → [2.1873:1914]

  if Current_drawing_mode ~= 'line' then

[5.7465]

[2.1914]

  if State.current_drawing_mode ~= 'line' then

Replacement in help.lua at line 24 [5.6622]
B:BD[2.2002] → [2.2002:2026]
```
    y = y + Line_height
```
[2.2002]
[5.7613]
```
    y = y + State.line_height
```

Replacement in help.lua at line 26 [5.6622]

B:BD[5.7619] → [2.2027:2073]

  if Current_drawing_mode ~= 'manhattan' then

[5.7619]

[4.19169]

  if State.current_drawing_mode ~= 'manhattan' then

Replacement in help.lua at line 28 [5.6622]
B:BD[4.19277] → [2.2074:2098]
```
    y = y + Line_height
```
[4.19277]
[5.7792]
```
    y = y + State.line_height
```

Replacement in help.lua at line 30 [5.6622]

B:BD[5.7798] → [2.2099:2142]

  if Current_drawing_mode ~= 'circle' then

[5.7798]

[4.19278]

  if State.current_drawing_mode ~= 'circle' then

Replacement in help.lua at line 32 [5.6622]
B:BD[4.19373] → [2.2143:2167]
```
    y = y + Line_height
```
[4.19373]
[5.7955]
```
    y = y + State.line_height
```

Replacement in help.lua at line 34 [5.6622]

B:BD[5.7961] → [2.2168:2212]

  if Current_drawing_mode ~= 'polygon' then

[5.7961]

[2.2212]

  if State.current_drawing_mode ~= 'polygon' then

Replacement in help.lua at line 36 [5.6622]
B:BD[2.2317] → [2.2317:2341]
```
    y = y + Line_height
```
[2.2317]
[6.422]
```
    y = y + State.line_height
```

Replacement in help.lua at line 38 [5.6622]

B:BD[6.428] → [2.2342:2388]

  if Current_drawing_mode ~= 'rectangle' then

[6.428]

[4.19466]

  if State.current_drawing_mode ~= 'rectangle' then

Replacement in help.lua at line 40 [5.6622]
B:BD[4.19559] → [2.2389:2413]
```
    y = y + Line_height
```
[4.19559]
[6.586]
```
    y = y + State.line_height
```
Replacement in help.lua at line 43 [5.6622]
B:BD[4.19762] → [2.2414:2436]
```
  y = y + Line_height
```
[4.19762]
[4.19763]
```
  y = y + State.line_height
```

Deletion in help.lua at line 45 [5.6622]

B:BD[4.19842] → [2.2437:2616]

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

Resurrecting zombie bytes in help.lua at line 45 [5.6622]

B:B[7.349] → [3.208:355]

BD:B[7.349] → [3.208:355]

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

Insertion in help.lua at line 45 [5.6622]

[4.19842]

[3.208]

  y = y + State.line_height
  App.color(Help_background_color)

Replacement in help.lua at line 73 [5.6622]

B:BD[5.9678] → [2.2617:2689]

    y = y + Line_height
  elseif Current_drawing_mode == 'polygon' then

[5.9678]

[2.2689]

    y = y + State.line_height
  elseif State.current_drawing_mode == 'polygon' then

Replacement in help.lua at line 76 [5.6622]

B:BD[2.2798] → [2.2798:2822]

∅:D[2.2822] → [8.12:62]

B:BD[9.7639] → [8.12:62]

    y = y + Line_height
  elseif Current_drawing_mode == 'rectangle' then

[2.2798]

[8.62]

    y = y + State.line_height
  elseif State.current_drawing_mode == 'rectangle' then

Replacement in help.lua at line 89 [5.6622]

B:BD[4.21533] → [2.3221:3306]

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

[4.21533]

[2.3306]

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

Replacement in help.lua at line 93 [5.6622]
B:BD[2.3389] → [2.3389:3413]
```
    y = y + Line_height
```
[2.3389]
[5.10266]
```
    y = y + State.line_height
```
Replacement in help.lua at line 96 [5.6622]
∅:D[2.3527] → [10.300:322]
B:BD[10.300] → [10.300:322]
B:BD[10.322] → [2.3529:3529]
B:BD[2.3529] → [2.3530:3576]
```
  y = y + Line_height
  if Current_drawing_mode ~= 'manhattan' then
```
[2.3527]
[4.21618]
```
  y = y + State.line_height
  if State.current_drawing_mode ~= 'manhattan' then
```
Replacement in help.lua at line 99 [5.6622]
B:BD[4.21721] → [2.3577:3601]
```
    y = y + Line_height
```
[4.21721]
[5.10440]
```
    y = y + State.line_height
```

Replacement in help.lua at line 105 [5.6622]

B:BD[5.10604] → [2.3602:3648]

  if Current_drawing_mode ~= 'rectangle' then

[5.10604]

[4.21900]

  if State.current_drawing_mode ~= 'rectangle' then

Replacement in help.lua at line 107 [5.6622]
B:BD[4.21988] → [2.3649:3673]
```
    y = y + Line_height
```
[4.21988]
[6.904]
```
    y = y + State.line_height
```

Deletion in help.lua at line 109 [5.6622]

B:BD[6.910] → [2.3674:3831]

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

Resurrecting zombie bytes in help.lua at line 109 [5.6622]

B:B[7.410] → [3.549:696]

BD:B[7.410] → [3.549:696]

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

Insertion in help.lua at line 109 [5.6622]
[6.910]
[3.549]
```
  App.color(Help_background_color)
```

Merge upstream into main

Dependencies

In channels

Change contents

Replacement in help.lua at line 7 [5.6622]

Replacement in help.lua at line 11 [5.6622]

Replacement in help.lua at line 13 [5.6622]

Replacement in help.lua at line 15 [5.6622]

Replacement in help.lua at line 17 [5.6622]

Replacement in help.lua at line 20 [5.6622]

Replacement in help.lua at line 22 [5.6622]

Replacement in help.lua at line 24 [5.6622]

Replacement in help.lua at line 26 [5.6622]

Replacement in help.lua at line 28 [5.6622]

Replacement in help.lua at line 30 [5.6622]

Replacement in help.lua at line 32 [5.6622]

Replacement in help.lua at line 34 [5.6622]

Replacement in help.lua at line 36 [5.6622]

Replacement in help.lua at line 38 [5.6622]

Replacement in help.lua at line 40 [5.6622]

Replacement in help.lua at line 43 [5.6622]

Deletion in help.lua at line 45 [5.6622]

Resurrecting zombie bytes in help.lua at line 45 [5.6622]

Insertion in help.lua at line 45 [5.6622]

Replacement in help.lua at line 73 [5.6622]

Replacement in help.lua at line 76 [5.6622]

Replacement in help.lua at line 89 [5.6622]

Replacement in help.lua at line 93 [5.6622]

Replacement in help.lua at line 96 [5.6622]

Replacement in help.lua at line 99 [5.6622]

Replacement in help.lua at line 105 [5.6622]

Replacement in help.lua at line 107 [5.6622]

Deletion in help.lua at line 109 [5.6622]

Resurrecting zombie bytes in help.lua at line 109 [5.6622]

Insertion in help.lua at line 109 [5.6622]