akkartik/pong.love - Change ZLJYLPOTXIVBVWJ4NTRM2YCQPT2FCSN7446P56MJFEFY45QTB7IAC

Merge lines.love

Created by Kartik K. Agaram on April 2, 2023

ZLJYLPOTXIVBVWJ4NTRM2YCQPT2FCSN7446P56MJFEFY45QTB7IAC

Dependencies

In channels

main

Change contents

File deletion: help.lua

BF:BFD[10.2] → [11.32686:32718]

BF:BFD[11.32718] → [11.25449:25449]

B:BD[11.25449] → [11.25450:32685]

function draw_help_without_mouse_pressed(State, drawing_index)
  local drawing = State.lines[drawing_index]
  local line_cache = State.line_cache[drawing_index]
  App.color(Help_color)
  local y = line_cache.starty+10
  love.graphics.print("Things you can do:", State.left+30,y)
  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
  love.graphics.print("* Hover on a point and press 'ctrl+u' to pick it up and start moving it,", State.left+30,y)
  y = y + State.line_height
  love.graphics.print("then press the mouse button to drop it", State.left+30+bullet_indent(),y)
  y = y + State.line_height
  love.graphics.print("* Hover on a point and press 'ctrl+n', type a name, then press 'enter'", State.left+30,y)
  y = y + State.line_height
  love.graphics.print("* Hover on a point or shape and press 'ctrl+d' to delete it", State.left+30,y)
  y = y + State.line_height
  if State.current_drawing_mode ~= 'freehand' then
    love.graphics.print("* Press 'ctrl+p' to switch to drawing freehand strokes", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'line' then
    love.graphics.print("* Press 'ctrl+l' to switch to drawing lines", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'manhattan' then
    love.graphics.print("* Press 'ctrl+m' to switch to drawing horizontal/vertical lines", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'circle' then
    love.graphics.print("* Press 'ctrl+o' to switch to drawing circles/arcs", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'polygon' then
    love.graphics.print("* Press 'ctrl+g' to switch to drawing polygons", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'rectangle' then
    love.graphics.print("* Press 'ctrl+r' to switch to drawing rectangles", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'square' then
    love.graphics.print("* Press 'ctrl+s' to switch to drawing squares", State.left+30,y)
    y = y + State.line_height
  end
  love.graphics.print("* Press 'ctrl+=' or 'ctrl+-' to zoom in or out, ctrl+0 to reset zoom", State.left+30,y)
  y = y + State.line_height
  love.graphics.print("Press 'esc' now to hide this message", State.left+30,y)
  y = y + State.line_height
  App.color(Help_background_color)
  love.graphics.rectangle('fill', State.left,line_cache.starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-line_cache.starty))
end
function draw_help_with_mouse_pressed(State, drawing_index)
  local drawing = State.lines[drawing_index]
  local line_cache = State.line_cache[drawing_index]
  App.color(Help_color)
  local y = line_cache.starty+10
  love.graphics.print("You're currently drawing a "..current_shape(State, drawing.pending), State.left+30,y)
  y = y + State.line_height
  love.graphics.print('Things you can do now:', State.left+30,y)
  y = y + State.line_height
  if State.current_drawing_mode == 'freehand' then
    love.graphics.print('* Release the mouse button to finish drawing the stroke', State.left+30,y)
    y = y + State.line_height
  elseif State.current_drawing_mode == 'line' or State.current_drawing_mode == 'manhattan' then
    love.graphics.print('* Release the mouse button to finish drawing the line', State.left+30,y)
    y = y + State.line_height
  elseif State.current_drawing_mode == 'circle' then
    if drawing.pending.mode == 'circle' then
      love.graphics.print('* Release the mouse button to finish drawing the circle', State.left+30,y)
      y = y + State.line_height
      love.graphics.print("* Press 'a' to draw just an arc of a circle", State.left+30,y)
    else
      love.graphics.print('* Release the mouse button to finish drawing the arc', State.left+30,y)
    end
    y = y + State.line_height
  elseif State.current_drawing_mode == 'polygon' then
    love.graphics.print('* Release the mouse button to finish drawing the polygon', State.left+30,y)
    y = y + State.line_height
    love.graphics.print("* Press 'p' to add a vertex to the polygon", State.left+30,y)
    y = y + State.line_height
  elseif State.current_drawing_mode == 'rectangle' then
    if #drawing.pending.vertices < 2 then
      love.graphics.print("* Press 'p' to add a vertex to the rectangle", State.left+30,y)
      y = y + State.line_height
    else
      love.graphics.print('* Release the mouse button to finish drawing the rectangle', State.left+30,y)
      y = y + State.line_height
      love.graphics.print("* Press 'p' to replace the second vertex of the rectangle", State.left+30,y)
      y = y + State.line_height
    end
  elseif State.current_drawing_mode == 'square' then
    if #drawing.pending.vertices < 2 then
      love.graphics.print("* Press 'p' to add a vertex to the square", State.left+30,y)
      y = y + State.line_height
    else
      love.graphics.print('* Release the mouse button to finish drawing the square', State.left+30,y)
      y = y + State.line_height
      love.graphics.print("* Press 'p' to replace the second vertex of the square", State.left+30,y)
      y = y + State.line_height
    end
  end
  love.graphics.print("* Press 'esc' then release the mouse button to cancel the current shape", State.left+30,y)
  y = y + State.line_height
  y = y + State.line_height
  if State.current_drawing_mode ~= 'line' then
    love.graphics.print("* Press 'l' to switch to drawing lines", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'manhattan' then
    love.graphics.print("* Press 'm' to switch to drawing horizontal/vertical lines", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'circle' then
    love.graphics.print("* Press 'o' to switch to drawing circles/arcs", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'polygon' then
    love.graphics.print("* Press 'g' to switch to drawing polygons", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'rectangle' then
    love.graphics.print("* Press 'r' to switch to drawing rectangles", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'square' then
    love.graphics.print("* Press 's' to switch to drawing squares", State.left+30,y)
    y = y + State.line_height
  end
  App.color(Help_background_color)
  love.graphics.rectangle('fill', State.left,line_cache.starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-line_cache.starty))
end
function current_shape(State, shape)
  if State.current_drawing_mode == 'freehand' then
    return 'freehand stroke'
  elseif State.current_drawing_mode == 'line' then
    return 'straight line'
  elseif State.current_drawing_mode == 'manhattan' then
    return 'horizontal/vertical line'
  elseif State.current_drawing_mode == 'circle' and shape and shape.start_angle then
    return 'arc'
  else
    return State.current_drawing_mode
  end
end
function bullet_indent()
  return App.width(to_text('* '))
end

File deletion: source_undo.lua, source_undo.lua

BFD:BFD[10.2] → [12.3457:3496]

BFD:BFD[12.3496] → [12.5:5]

B:BD[13.1710] → [7.368:500]

∅:D[7.500] → [13.2200:2260]

B:BD[13.1590] → [7.253:367]

∅:D[14.68] → [13.1671:1710]

∅:D[7.367] → [13.1671:1710]

      table.insert(event.lines, {mode='drawing', h=line.h, points=deepcopy(line.points), shapes=deepcopy(line.shapes), pending={}})
    else
      print(line.mode)
      assert(false)
    end
      table.insert(event.lines, {mode='text', data=line.data})  -- I've forgotten: should we deepcopy(line.data)?
    elseif line.mode == 'drawing' then

File deletion: source_text.lua, source_text.lua

BFD:BFD[10.2] → [12.147062:147101]

BFD:BFD[12.147101] → [12.83723:83723]

B:BD[15.84] → [16.646:731]

B:BD[12.94086] → [16.959:1006]

∅:D[17.952] → [12.94236:94278]

∅:D[16.1006] → [12.94236:94278]

B:BD[12.93792] → [16.908:958]

∅:D[17.897] → [12.93866:93907]

∅:D[16.958] → [12.93866:93907]

B:BD[12.92076] → [16.879:907]

∅:D[17.839] → [12.92137:92199]

∅:D[16.907] → [12.92137:92199]

B:BD[12.91878] → [16.842:878]

∅:D[18.395] → [12.91922:92076]

∅:D[16.878] → [12.91922:92076]

B:BD[12.88889] → [16.764:841]

∅:D[17.805] → [12.88969:89103]

∅:D[16.841] → [12.88969:89103]

B:BD[15.779] → [16.732:763]

∅:D[17.722] → [12.88227:88263]

∅:D[16.763] → [12.88227:88263]

∅:D[17.685] → [15.172:367]

∅:D[16.731] → [15.172:367]

B:BD[12.87793] → [16.607:645]

∅:D[18.353] → [12.87839:88027]

∅:D[16.645] → [12.87839:88027]

B:BD[12.139754] → [18.583:612]

∅:D[18.612] → [12.139855:139891]

B:BD[12.87725] → [16.575:606]

∅:D[17.594] → [12.87759:87793]

∅:D[16.606] → [12.87759:87793]

B:BD[12.139549] → [18.553:582]

∅:D[18.582] → [12.139650:139754]

B:BD[12.135976] → [18.520:552]

∅:D[18.552] → [12.136090:136095]

B:BD[12.93970] → [18.482:519]

∅:D[18.519] → [12.94012:94086]

B:BD[12.87502] → [16.454:574]

∅:D[17.557] → [12.87674:87725]

∅:D[16.574] → [12.87674:87725]

B:BD[12.93610] → [18.436:481]

B:BD[12.92613] → [18.396:435]

B:BD[12.87349] → [19.68:128]

∅:D[19.128] → [12.87393:87502]

B:BD[15.367] → [20.7:125]

∅:D[20.125] → [15.578:779]

      local trimmed_word = rtrim(f)  -- compute_fragments puts whitespace at the end
      table.insert(line_cache.fragments, frag)
    end
    x = x + frag_width
  end
end
        table.insert(line_cache.fragments, frag1)
        frag = string.sub(frag, boffset)
    pos = pos + utf8.len(f)
  end
end
function Text.compute_fragments(State, line_index)
    local frag_width = App.width(f)
    if x + frag_width > State.right then
      x = State.left
      table.insert(line_cache.screen_line_starting_pos, pos)
    end
    x = x + frag_width
            Text.draw_cursor(State, x+Text.x(f, State.cursor1.pos-pos+1), y)
            App.color(Text_color)
          end
        end
      end
      x = x + frag_width
    end
    pos = pos + frag_len
  end
      App.screen.print(f, x,y)
      -- render cursor if necessary
      if starts_with(trimmed_word, '[[') and ends_with(trimmed_word, ']]') then
        local filename = trimmed_word:gsub('^..(.*)..$', '%1')
        if source.link_exists(State, filename) then
      local frag_width = App.width(f)
      if x + frag_width > State.right then
        assert(x > State.left)  -- no overfull lines
        y = y + State.line_height
        if y + State.line_height > App.screen.height then
  return App.width(s_before)
end
function Text.to2(State, loc1)
--?       print('skipping', f)
    else
      -- render fragment
  return App.width(s_before)
end
function Text.x(s, pos)
  local offset = Text.offset(s, pos)
  local s_before = s:sub(1, offset-1)
  return App.width(screen_line)
end
        frag_width = App.width(frag)
      end
      x = State.left  -- new line
    end
    if #frag > 0 then
    select_color(f)
    local frag_len = utf8.len(f)
--?     print('text.draw:', f, 'at', line_index,pos, 'after', x,y)
    if pos < startpos then
      -- render nothing
        local frag1_width = App.width(frag1)
    local frag_width = App.width(frag)
  Text.populate_screen_line_starting_pos(State, line_index)
  local pos = 1
  initialize_color()
  for _, f in ipairs(line_cache.fragments) do
    App.color(Text_color)
          button(State, 'link', {x=x+App.width('[['), y=y, w=App.width(filename), h=State.line_height, color={1,1,1},
            icon = icon.hyperlink_decoration,
            onpress1 = function()
                         source.switch_to_file(filename)
                        end,
          })
        end
      end

File deletion: source_file.lua, source_file.lua
BFD:BFD[10.2] → [12.152399:152438]
BFD:BFD[10.2] → [12.152399:152438]
BFD:BFD[12.152438] → [12.150241:150241]
B:BD[13.15917] → [14.130:158]
∅:D[14.158] → [13.16102:16140]
B:BD[12.151134] → [14.74:129]
∅:D[14.129] → [12.151164:151174]
```
      line_info.data = line
      table.insert(result, line_info)
        table.insert(result, {mode='text', data=line})
      end
```

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[10.2] → [12.165725:165764]

BFD:BFD[12.165764] → [12.152440:152440]

B:BD[12.153575] → [6.11:92]

∅:D[6.92] → [12.153676:154135]

    --   fragments: snippets of the line guaranteed to not straddle screen lines
    --   screen_line_starting_pos: optional array of grapheme indices if it wraps over more than one screen line
    line_cache = {},
    -- Given wrapping, any potential location for the text cursor can be described in two ways:
    -- * schema 1: As a combination of line index and position within a line (in utf8 codepoint units)
    -- * schema 2: As a combination of line index, screen line index within the line, and a position within the screen line.

File deletion: source.lua, source.lua
BFD:BFD[10.2] → [12.177652:177686]
BFD:BFD[10.2] → [12.177652:177686]
BFD:BFD[12.177686] → [12.165766:165766]
B:BD[12.170082] → [18.731:783]
∅:D[18.783] → [12.170188:170283]
```
  source.initialize_window_geometry(App.width('m'))
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right)
```

File deletion: run.lua, run.lua

BFD:BFD[10.2] → [12.184046:184077]

BFD:BFD[12.184077] → [12.178044:178044]

B:BD[12.180430] → [18.965:1014]

∅:D[18.1014] → [12.180533:180726]

B:BD[12.183879] → [20.135:198]

∅:D[20.198] → [12.184041:184045]

  run.initialize_window_geometry(App.width('m'))
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right)
  Editor_state.font_height = font_height
  Editor_state.line_height = math.floor(font_height*1.3)
function width(s)
  return love.graphics.getFont():getWidth(s)
end

File deletion: log_browser.lua, log_browser.lua

BFD:BFD[10.2] → [12.203223:203262]

BFD:BFD[12.203262] → [12.191782:191782]

B:BD[12.198357] → [20.682:826]

∅:D[20.826] → [12.198510:199163]

B:BD[12.197661] → [20.517:681]

∅:D[20.681] → [12.197834:198357]

B:BD[12.196252] → [20.359:516]

∅:D[20.516] → [12.196398:197661]

B:BD[12.195813] → [20.201:358]

∅:D[20.358] → [12.195959:196252]

      love.graphics.print(line.section_stack[i].name, x, App.screen.height-App.width(line.section_stack[i].name)-5, --[[vertically]] math.pi/2)
    end
  end
  return log_browser.right_margin(State, line)
end
function should_show(line)
  -- Show a line if every single section it's in is expanded.
  for i=1,#line.section_stack do
    local section = line.section_stack[i]
    if not section.expanded then
      return false
    end
  end
  return true
end
function log_browser.left_margin(State, line)
  return State.left + #line.section_stack*Section_border_padding_horizontal
end
function log_browser.right_margin(State, line)
  return State.right - #line.section_stack*Section_border_padding_horizontal
end
function log_browser.update(State, dt)
end
function log_browser.quit(State)
end
      love.graphics.print(line.section_stack[i].name, x+State.font_height+5, App.screen.height-App.width(line.section_stack[i].name)-5, --[[vertically]] math.pi/2)
    end
  end
  return log_browser.left_margin(State, line)
end
function render_stack_right_margin(State, line_index, line, y)
  App.color(Section_border_color)
  for i=1,#line.section_stack do
    local x = State.right - (i-1)*Section_border_padding_horizontal
    love.graphics.line(x,y, x,y+log_browser.height(State, line_index))
    if y < 30 then
      love.graphics.print(line.section_stack[i].name, x, y+5, --[[vertically]] math.pi/2)
    end
    if y > App.screen.height-log_browser.height(State, line_index) then
          love.graphics.print(line.section_name, xleft+50,y)
          love.graphics.line(xleft+50+App.width(line.section_name)+2,sectiony, xright,sectiony)
        end
      else
        if type(line.data) == 'string' then
          local old_left, old_right = State.left,State.right
          State.left,State.right = xleft,xright
          y = Text.draw(State, line_index, y, --[[startpos]] 1)
          State.left,State.right = old_left,old_right
        else
          height = log_render[line.data.name](line.data, xleft, y, xright-xleft)
        end
      end
      if App.mouse_x() > Log_browser_state.left and line_index == mouse_line_index then
        App.color(Cursor_line_background_color)
        love.graphics.rectangle('fill', xleft,y, xright-xleft, height)
      end
      y = y + height
    end
  end
end
function render_stack_left_margin(State, line_index, line, y)
  if line.section_stack == nil then
    -- assertion message
    for k,v in pairs(line) do
      print(k)
    end
  end
  App.color(Section_border_color)
  for i=1,#line.section_stack do
    local x = State.left + (i-1)*Section_border_padding_horizontal
    love.graphics.line(x,y, x,y+log_browser.height(State, line_index))
    if y < 30 then
      love.graphics.print(line.section_stack[i].name, x+State.font_height+5, y+5, --[[vertically]] math.pi/2)
    end
    if y > App.screen.height-log_browser.height(State, line_index) then
          love.graphics.print(line.section_name, xleft+50,y)
          love.graphics.line(xleft+50+App.width(line.section_name)+2,sectiony, xright,sectiony)
        else assert(line.section_end)
          local sectiony = y+State.line_height-Section_border_padding_vertical
          love.graphics.line(xleft,y, xleft,sectiony)
          love.graphics.line(xright,y, xright,sectiony)
          love.graphics.line(xleft,sectiony, xleft+50-2,sectiony)

File deletion: commands.lua, commands.lua

BFD:BFD[10.2] → [12.207726:207762]

BFD:BFD[12.207762] → [12.204370:204370]

B:BD[24.1363] → [20.1297:1335]

∅:D[20.1335] → [24.1410:1506]

B:BD[24.863] → [20.1258:1296]

∅:D[20.1296] → [24.910:1363]

B:BD[25.1984] → [20.1202:1257]

∅:D[20.1257] → [25.2043:2101]

B:BD[25.1526] → [20.1169:1201]

∅:D[20.1201] → [25.1607:1984]

B:BD[25.972] → [20.1136:1168]

∅:D[20.1168] → [25.1053:1231]

B:BD[12.207023] → [20.1108:1135]

∅:D[20.1135] → [26.1023:1057]

B:BD[26.808] → [20.1078:1107]

∅:D[20.1107] → [26.809:905]

B:BD[25.404] → [20.1039:1077]

∅:D[20.1077] → [27.76:207]

B:BD[28.227] → [20.933:1038]

∅:D[20.1038] → [26.29:72]

B:BD[12.206145] → [20.895:932]

∅:D[20.932] → [12.206193:206277]

B:BD[12.205905] → [20.865:894]

∅:D[20.894] → [29.29:75]

    local width = App.width(filename)
    if x + width > App.screen.width - 5 then
      y = y + Editor_state.line_height
      x = 5
    local width = App.width(filename)
    if x + width > App.screen.width - 5 then
      y = y + Editor_state.line_height
      x = 5
    end
    if i == index then
    return y, x, width
    end
    x = x + width + 30
  end
end
function file_index(fy, fx, fwidth)
  log_start('file index')
  log(2, ('for %d %d %d'):format(fy, fx, fwidth))
  local y,x = Menu_status_bar_height, 5
  local best_guess, best_guess_x, best_guess_width
  for i,filename in ipairs(File_navigation.candidates) do
      App.screen.print(filename, x + x3-menu_xmin, y3)
    end
    x3 = x3 + width + 30
  end
  --
  return h+20
    width = App.width(filename)
    if x3 + width > App.screen.width - 5 then
      y3 = y3 + Editor_state.line_height
      x3 = 0
    end
    if i == o.index then
      App.color(Menu_highlight_color)
      love.graphics.rectangle('fill', x + x3-menu_xmin - 5, y3-2, width+5*2, Editor_state.line_height+2*2)
    end
    if x3 >= menu_xmin and x3 + width < menu_xmax then
      App.color(Menu_command_color)
    width = App.width(filename)
    if x2 + width > App.screen.width - 5 then
      y2 = y2 + Editor_state.line_height
      x2 = 0
    end
    if i == o.index then
      break
    end
    x2 = x2 + width + 30
  App.screen.print(s, x,y)
  x = x + width + 30
  return x,y
  local width = App.width(s)
  if x + width > App.screen.width - 5 then
    y = y + Editor_state.line_height
    x = 5
  end
    local width = App.width(filename)
    if x + width > App.screen.width - 5 then
      result = result+1
      x = 5 + width
    else
      x = x + width + 30
    end
  App.screen.print(File_navigation.filter, 5, 5)
  draw_cursor(5 + App.width(File_navigation.filter), 5)
  if File_navigation.num_lines == nil then
  App.screen.print(s, Menu_cursor,5)
  Menu_cursor = Menu_cursor + width + 30
end
function source.draw_file_navigator()
  local width = App.width(s)
  if Menu_cursor > App.screen.width - 30 then

Deletion in undo.lua at line 61 [31.1]

B:BD[30.33] → [30.33:81]

B:BD[31.1624] → [7.1:115]

BD:BD[31.1624] → [7.1:115]

B:BD[31.1726] → [7.116:248]

BD:BD[31.1726] → [7.116:248]

    table.insert(event.lines, {data=line.data})
      table.insert(event.lines, {mode='text', data=line.data})  -- I've forgotten: should we deepcopy(line.data)?
      table.insert(event.lines, {mode='drawing', h=line.h, points=deepcopy(line.points), shapes=deepcopy(line.shapes), pending={}})

Solving an order conflict in undo.lua at line 61 [31.1]
[30.33]

Insertion in undo.lua at line 61 [31.1]

[0.2]

[31.2296]

    table.insert(event.lines, {data=line.data})  -- I've forgotten: should we deepcopy(line.data)?

Resurrecting zombie bytes in text.lua at line 37 [34.1]

B:B[33.458] → [30.1743:1893]

BD:B[33.458] → [30.1743:1893]

            if State.lines[State.cursor1.line].data:sub(State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term)-1) == State.search_term then

Resurrecting zombie bytes in text.lua at line 38 [34.1]

B:B[33.608] → [9.741:887]

BD:B[33.608] → [9.741:887]

              local lo_px = Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))

Solving an order conflict in text.lua at line 38 [34.1]
[30.1893]
[9.741]
Resurrecting zombie bytes in text.lua at line 88 [34.1]
B:B[35.124] → [30.1894:1938]
BD:B[35.124] → [30.1894:1938]
```
  for frag in line.data:gmatch('%S*%s*') do
```

Replacement in source_undo.lua at line 64 [36.68]

B:BD[11.140] → [11.140:221]

      table.insert(event.lines, {mode='text', data=line.data, dataB=line.dataB})

[11.140]

[11.221]

      table.insert(event.lines, {mode='text', data=line.data})  -- I've forgotten: should we deepcopy(line.data)?

Replacement in source_undo.lua at line 66 [36.68]

B:BD[11.260] → [11.260:750]

      local points=deepcopy(line.points)
--?       print('copying', line.points, 'with', #line.points, 'points into', points)
      local shapes=deepcopy(line.shapes)
--?       print('copying', line.shapes, 'with', #line.shapes, 'shapes into', shapes)
      table.insert(event.lines, {mode='drawing', h=line.h, points=points, shapes=shapes, pending={}})
--?       table.insert(event.lines, {mode='drawing', h=line.h, points=deepcopy(line.points), shapes=deepcopy(line.shapes), pending={}})

[11.260]

[11.750]

      table.insert(event.lines, {mode='drawing', h=line.h, points=deepcopy(line.points), shapes=deepcopy(line.shapes), pending={}})

Replacement in source_text.lua at line 15 [36.83786]

B:BD[36.87412] → [36.87412:87456]

  Text.compute_fragments(State, line_index)

[36.87412]

[36.87456]

  Text.populate_screen_line_starting_pos(State, line_index)

Replacement in source_text.lua at line 20 [36.83786]

B:BD[36.87565] → [36.87565:87737]

    local frag, frag_text = f.data, f.text
    select_color(frag)
    local frag_len = utf8.len(frag)
--?     print('text.draw:', frag, 'at', line_index,pos, 'after', x,y)

[36.87565]

[36.87737]

    select_color(f)
    local frag_len = utf8.len(f)
--?     print('text.draw:', f, 'at', line_index,pos, 'after', x,y)

Replacement in source_text.lua at line 25 [36.83786]
B:BD[36.87788] → [36.87788:87822]
```
--?       print('skipping', frag)
```
[36.87788]
[36.87822]
```
--?       print('skipping', f)
```
Replacement in source_text.lua at line 28 [36.83786]
B:BD[36.87856] → [36.87856:87902]
```
      local frag_width = App.width(frag_text)
```
[36.87856]
[36.87902]
```
      local frag_width = App.width(f)
```

Replacement in source_text.lua at line 43 [36.83786]

B:BD[37.84] → [37.84:172]

      local trimmed_word = rtrim(frag)  -- compute_fragments puts whitespace at the end

[37.84]

[37.172]

      local trimmed_word = rtrim(f)  -- compute_fragments puts whitespace at the end

Replacement in source_text.lua at line 47 [36.83786]

B:BD[37.367] → [37.367:578]

          local filename_text = App.newText(love.graphics.getFont(), filename)
          button(State, 'link', {x=x+App.width(to_text('[[')), y=y, w=App.width(filename_text), h=State.line_height, color={1,1,1},

[37.367]

[37.578]

          button(State, 'link', {x=x+App.width('[['), y=y, w=App.width(filename), h=State.line_height, color={1,1,1},

Replacement in source_text.lua at line 55 [36.83786]
∅:D[37.779] → [36.88252:88290]
B:BD[36.88252] → [36.88252:88290]
```
      App.screen.draw(frag_text, x,y)
```
[37.779]
[36.88290]
```
      App.screen.print(f, x,y)
```

Replacement in source_text.lua at line 66 [36.83786]

B:BD[36.88952] → [36.88952:89032]

            Text.draw_cursor(State, x+Text.x(frag, State.cursor1.pos-pos+1), y)

[36.88952]

[36.89032]

            Text.draw_cursor(State, x+Text.x(f, State.cursor1.pos-pos+1), y)

Deletion in source_text.lua at line 106 [36.83786]
B:BD[36.91875] → [36.91875:91918]
```
    local frag, frag_text = f.data, f.text
```
Replacement in source_text.lua at line 107 [36.83786]
B:BD[36.91941] → [36.91941:91985]
```
    local frag_width = App.width(frag_text)
```
[36.91941]
[36.91985]
```
    local frag_width = App.width(f)
```
Replacement in source_text.lua at line 113 [36.83786]
B:BD[36.92139] → [36.92139:92200]
```
    local frag_len = utf8.len(frag)
    pos = pos + frag_len
```
[36.92139]
[36.92200]
```
    pos = pos + utf8.len(f)
```
Deletion in source_text.lua at line 118 [36.83786]
B:BD[36.92262] → [36.92262:92343]
```
--?   print('compute_fragments', line_index, 'between', State.left, State.right)
```

Replacement in source_text.lua at line 128 [36.83786]

B:BD[36.92611] → [36.92611:92837]

    local frag_text = App.newText(love.graphics.getFont(), frag)
    local frag_width = App.width(frag_text)
--?     print('x: '..tostring(x)..'; frag_width: '..tostring(frag_width)..'; '..tostring(State.right-x)..'px to go')

[36.92611]

[36.92837]

    local frag_width = App.width(frag)

Deletion in source_text.lua at line 130 [36.83786]

B:BD[36.92879] → [36.92879:93003]

--?       print(('checking whether to split fragment ^%s$ of width %d when rendering from %d'):format(frag, frag_width, x))

Deletion in source_text.lua at line 131 [36.83786]
B:BD[36.93065] → [36.93065:93096]
```
--?         print('splitting')
```
Deletion in source_text.lua at line 134 [36.83786]
B:BD[36.93264] → [36.93264:93296]
```
--?         print('bpos', bpos)
```

Deletion in source_text.lua at line 136 [36.83786]

B:BD[36.93454] → [36.93454:93549]

--?         print('space for '..tostring(bpos)..' graphemes, '..tostring(boffset-1)..' bytes')

Replacement in source_text.lua at line 137 [36.83786]

B:BD[36.93602] → [36.93602:93808]

        local frag1_text = App.newText(love.graphics.getFont(), frag1)
        local frag1_width = App.width(frag1_text)
--?         print('extracting ^'..frag1..'$ of width '..tostring(frag1_width)..'px')

[36.93602]

[36.93808]

        local frag1_width = App.width(frag1)

Replacement in source_text.lua at line 139 [36.83786]

B:BD[36.93855] → [36.93855:93929]

        table.insert(line_cache.fragments, {data=frag1, text=frag1_text})

[36.93855]

[36.93929]

        table.insert(line_cache.fragments, frag1)

Replacement in source_text.lua at line 141 [36.83786]

B:BD[36.93970] → [36.93970:94075]

        frag_text = App.newText(love.graphics.getFont(), frag)
        frag_width = App.width(frag_text)

[36.93970]

[36.94075]

        frag_width = App.width(frag)

Replacement in source_text.lua at line 146 [36.83786]

B:BD[36.94149] → [36.94149:94299]

--?       print('inserting ^'..frag..'$ of width '..tostring(frag_width)..'px')
      table.insert(line_cache.fragments, {data=frag, text=frag_text})

[36.94149]

[36.94996]

      table.insert(line_cache.fragments, frag)

Replacement in source_text.lua at line 764 [36.83786]

B:BD[36.136039] → [36.136039:136153]

  local screen_line_text = App.newText(love.graphics.getFont(), screen_line)
  return App.width(screen_line_text)

[36.136039]

[36.136153]

  return App.width(screen_line)

Replacement in source_text.lua at line 852 [36.83786]

B:BD[36.139612] → [36.139612:139713]

  local text_before = App.newText(love.graphics.getFont(), s_before)
  return App.width(text_before)

[36.139612]

[36.139713]

  return App.width(s_before)

Replacement in source_text.lua at line 858 [36.83786]

B:BD[36.139817] → [36.139817:139918]

  local text_before = App.newText(love.graphics.getFont(), s_before)
  return App.width(text_before)

[36.139817]

[36.139918]

  return App.width(s_before)

Deletion in source_file.lua at line 2 [36.150304]
B:BD[36.150360] → [36.150360:150407]
```
Fold = '\x1e'  -- ASCII RS (record separator)
```

Replacement in source_file.lua at line 29 [36.150304]

B:BD[36.151197] → [11.10664:10939]

        local line_info = {mode='text'}
        if line:find(Fold) then
          _, _, line_info.data, line_info.dataB = line:find('([^'..Fold..']*)'..Fold..'([^'..Fold..']*)')
        else
          line_info.data = line
        end
        table.insert(result, line_info)

[36.151197]

[36.151227]

        table.insert(result, {mode='text', data=line})

Deletion in source_file.lua at line 49 [36.150304]

B:BD[11.11100] → [11.11100:11217]

      if line.dataB and #line.dataB > 0 then
        outfile:write(Fold)
        outfile:write(line.dataB)
      end

Replacement in source_file.lua at line 138 [36.150304]

B:BD[11.14467] → [11.14467:14652]

      if line:find(Fold) then
        _, _, line_info.data, line_info.dataB = line:find('([^'..Fold..']*)'..Fold..'([^'..Fold..']*)')
      else
        line_info.data = line
      end

[11.14467]

[11.14652]

      line_info.data = line

Replacement in source_edit.lua at line 57 [36.152503]

B:BD[36.153638] → [36.153638:153739]

    --   fragments: snippets of rendered love.graphics.Text, guaranteed to not straddle screen lines

[36.153638]

[36.153739]

    --   fragments: snippets of the line guaranteed to not straddle screen lines

Deletion in source_edit.lua at line 91 [36.152503]

B:BD[36.154929] → [36.154929:155017]

    em = App.newText(love.graphics.getFont(), 'm'),  -- widest possible character width

Deletion in source_edit.lua at line 106 [36.152503]
B:BD[36.155271] → [36.155271:155294]
```
    search_text = nil,
```
Deletion in source_edit.lua at line 326 [36.152503]
B:BD[36.158033] → [36.158033:158061]
```
    State.search_text = nil
```
Deletion in source_edit.lua at line 356 [36.152503]
B:BD[36.158297] → [36.158297:158327]
```
      State.search_text = nil
```
Deletion in source_edit.lua at line 362 [36.152503]
B:BD[36.158626] → [36.158626:158656]
```
      State.search_text = nil
```
Deletion in source_edit.lua at line 367 [36.152503]
B:BD[36.158907] → [36.158907:158937]
```
      State.search_text = nil
```
Deletion in source_edit.lua at line 380 [36.152503]
B:BD[36.159515] → [36.159515:159552]
```
    assert(State.search_text == nil)
```
Deletion in source_edit.lua at line 511 [36.152503]
B:BD[36.164178] → [36.164178:164233]
```
  State.em = App.newText(love.graphics.getFont(), 'm')
```

Replacement in source.lua at line 165 [36.165829]

B:BD[36.170145] → [36.170145:170251]

  local em = App.newText(love.graphics.getFont(), 'm')
  source.initialize_window_geometry(App.width(em))

[36.170145]

[36.170251]

  source.initialize_window_geometry(App.width('m'))

Deletion in source.lua at line 170 [36.165829]
B:BD[36.170444] → [36.170444:170467]
```
  Editor_state.em = em
```

Deletion in source.lua at line 417 [36.165829]

∅:D[23.7652] → [36.177537:177681]

B:BD[36.177537] → [36.177537:177681]

  end
end
-- use this sparingly
function to_text(s)
  if Text_cache[s] == nil then
    Text_cache[s] = App.newText(love.graphics.getFont(), s)

Deletion in source.lua at line 418 [36.165829]
B:BD[36.177687] → [36.177687:177710]
```
  return Text_cache[s]
```
Resurrecting zombie bytes in select.lua at line 60 [39.43980]
B:B[38.454] → [30.6213:6273]
BD:B[38.454] → [30.6213:6273]
```
      local before = line.data:sub(pos_offset, lo_offset-1)
```
Resurrecting zombie bytes in select.lua at line 61 [39.43980]
B:B[38.514] → [18.785:817]
BD:B[38.514] → [18.785:817]
```
      lo_px = App.width(before)
```
Solving an order conflict in select.lua at line 61 [39.43980]
[30.6273]
[18.785]
Resurrecting zombie bytes in select.lua at line 64 [39.43980]
B:B[38.706] → [30.6274:6326]
BD:B[38.706] → [30.6274:6326]
```
    local s = line.data:sub(lo_offset, hi_offset-1)
```

Replacement in run.lua at line 74 [36.178107]

B:BD[36.180286] → [36.180286:180389]

  local em = App.newText(love.graphics.getFont(), 'm')
  run.initialize_window_geometry(App.width(em))

[36.180286]

[36.180389]

  run.initialize_window_geometry(App.width('m'))

Deletion in run.lua at line 78 [36.178107]
B:BD[36.180582] → [36.180582:180605]
```
  Editor_state.em = em
```

Replacement in run.lua at line 198 [36.178107]

B:BD[36.183700] → [36.183700:183862]

-- use this sparingly
function to_text(s)
  if Text_cache[s] == nil then
    Text_cache[s] = App.newText(love.graphics.getFont(), s)
  end
  return Text_cache[s]

[36.183700]

[36.183862]

function width(s)
  return love.graphics.getFont():getWidth(s)

Deletion in log_browser.lua at line 101 [36.191243]
B:BD[36.194910] → [36.194910:194966]
```
        local section_text = to_text(line.section_name)
```

Replacement in log_browser.lua at line 106 [36.191243]

B:BD[36.195274] → [36.195274:195420]

          love.graphics.draw(section_text, xleft+50,y)
          love.graphics.line(xleft+50+App.width(section_text)+2,sectiony, xright,sectiony)

[36.195274]

[36.195420]

          love.graphics.print(line.section_name, xleft+50,y)
          love.graphics.line(xleft+50+App.width(line.section_name)+2,sectiony, xright,sectiony)

Replacement in log_browser.lua at line 113 [36.191243]

B:BD[36.195713] → [36.195713:195859]

          love.graphics.draw(section_text, xleft+50,y)
          love.graphics.line(xleft+50+App.width(section_text)+2,sectiony, xright,sectiony)

[36.195713]

[36.195859]

          love.graphics.print(line.section_name, xleft+50,y)
          love.graphics.line(xleft+50+App.width(line.section_name)+2,sectiony, xright,sectiony)

Replacement in log_browser.lua at line 150 [36.191243]

B:BD[36.197122] → [36.197122:197295]

      love.graphics.print(line.section_stack[i].name, x+State.font_height+5, App.screen.height-App.width(to_text(line.section_stack[i].name))-5, --[[vertically]] math.pi/2)

[36.197122]

[36.197295]

      love.graphics.print(line.section_stack[i].name, x+State.font_height+5, App.screen.height-App.width(line.section_stack[i].name)-5, --[[vertically]] math.pi/2)

Replacement in log_browser.lua at line 165 [36.191243]

B:BD[36.197818] → [36.197818:197971]

      love.graphics.print(line.section_stack[i].name, x, App.screen.height-App.width(to_text(line.section_stack[i].name))-5, --[[vertically]] math.pi/2)

[36.197818]

[36.197971]

      love.graphics.print(line.section_stack[i].name, x, App.screen.height-App.width(line.section_stack[i].name)-5, --[[vertically]] math.pi/2)

File un-deletion: help.lua, help.lua
BFD:BF[40.11577] → [40.6622:6622]
BFD:BF[10.2] → [40.11545:11577]
BFD:BF[10.2] → [40.11545:11577]
Resurrecting zombie bytes in help.lua at line 1 [40.6622]
B:B[40.11371] → [20.832:857]
BD:B[40.11371] → [20.832:857]
```
  return App.width('* ')
```

Insertion in help.lua at line 1 [40.6622]

[40.6622]

[20.832]

function draw_help_without_mouse_pressed(State, drawing_index)
  local drawing = State.lines[drawing_index]
  local line_cache = State.line_cache[drawing_index]
  App.color(Help_color)
  local y = line_cache.starty+10
  love.graphics.print("Things you can do:", State.left+30,y)
  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
  love.graphics.print("* Hover on a point and press 'ctrl+u' to pick it up and start moving it,", State.left+30,y)
  y = y + State.line_height
  love.graphics.print("then press the mouse button to drop it", State.left+30+bullet_indent(),y)
  y = y + State.line_height
  love.graphics.print("* Hover on a point and press 'ctrl+n', type a name, then press 'enter'", State.left+30,y)
  y = y + State.line_height
  love.graphics.print("* Hover on a point or shape and press 'ctrl+d' to delete it", State.left+30,y)
  y = y + State.line_height
  if State.current_drawing_mode ~= 'freehand' then
    love.graphics.print("* Press 'ctrl+p' to switch to drawing freehand strokes", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'line' then
    love.graphics.print("* Press 'ctrl+l' to switch to drawing lines", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'manhattan' then
    love.graphics.print("* Press 'ctrl+m' to switch to drawing horizontal/vertical lines", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'circle' then
    love.graphics.print("* Press 'ctrl+o' to switch to drawing circles/arcs", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'polygon' then
    love.graphics.print("* Press 'ctrl+g' to switch to drawing polygons", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'rectangle' then
    love.graphics.print("* Press 'ctrl+r' to switch to drawing rectangles", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'square' then
    love.graphics.print("* Press 'ctrl+s' to switch to drawing squares", State.left+30,y)
    y = y + State.line_height
  end
  love.graphics.print("* Press 'ctrl+=' or 'ctrl+-' to zoom in or out, ctrl+0 to reset zoom", State.left+30,y)
  y = y + State.line_height
  love.graphics.print("Press 'esc' now to hide this message", State.left+30,y)
  y = y + State.line_height
  App.color(Help_background_color)
  love.graphics.rectangle('fill', State.left,line_cache.starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-line_cache.starty))
end
function draw_help_with_mouse_pressed(State, drawing_index)
  local drawing = State.lines[drawing_index]
  local line_cache = State.line_cache[drawing_index]
  App.color(Help_color)
  local y = line_cache.starty+10
  love.graphics.print("You're currently drawing a "..current_shape(State, drawing.pending), State.left+30,y)
  y = y + State.line_height
  love.graphics.print('Things you can do now:', State.left+30,y)
  y = y + State.line_height
  if State.current_drawing_mode == 'freehand' then
    love.graphics.print('* Release the mouse button to finish drawing the stroke', State.left+30,y)
    y = y + State.line_height
  elseif State.current_drawing_mode == 'line' or State.current_drawing_mode == 'manhattan' then
    love.graphics.print('* Release the mouse button to finish drawing the line', State.left+30,y)
    y = y + State.line_height
  elseif State.current_drawing_mode == 'circle' then
    if drawing.pending.mode == 'circle' then
      love.graphics.print('* Release the mouse button to finish drawing the circle', State.left+30,y)
      y = y + State.line_height
      love.graphics.print("* Press 'a' to draw just an arc of a circle", State.left+30,y)
    else
      love.graphics.print('* Release the mouse button to finish drawing the arc', State.left+30,y)
    end
    y = y + State.line_height
  elseif State.current_drawing_mode == 'polygon' then
    love.graphics.print('* Release the mouse button to finish drawing the polygon', State.left+30,y)
    y = y + State.line_height
    love.graphics.print("* Press 'p' to add a vertex to the polygon", State.left+30,y)
    y = y + State.line_height
  elseif State.current_drawing_mode == 'rectangle' then
    if #drawing.pending.vertices < 2 then
      love.graphics.print("* Press 'p' to add a vertex to the rectangle", State.left+30,y)
      y = y + State.line_height
    else
      love.graphics.print('* Release the mouse button to finish drawing the rectangle', State.left+30,y)
      y = y + State.line_height
      love.graphics.print("* Press 'p' to replace the second vertex of the rectangle", State.left+30,y)
      y = y + State.line_height
    end
  elseif State.current_drawing_mode == 'square' then
    if #drawing.pending.vertices < 2 then
      love.graphics.print("* Press 'p' to add a vertex to the square", State.left+30,y)
      y = y + State.line_height
    else
      love.graphics.print('* Release the mouse button to finish drawing the square', State.left+30,y)
      y = y + State.line_height
      love.graphics.print("* Press 'p' to replace the second vertex of the square", State.left+30,y)
      y = y + State.line_height
    end
  end
  love.graphics.print("* Press 'esc' then release the mouse button to cancel the current shape", State.left+30,y)
  y = y + State.line_height
  y = y + State.line_height
  if State.current_drawing_mode ~= 'line' then
    love.graphics.print("* Press 'l' to switch to drawing lines", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'manhattan' then
    love.graphics.print("* Press 'm' to switch to drawing horizontal/vertical lines", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'circle' then
    love.graphics.print("* Press 'o' to switch to drawing circles/arcs", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'polygon' then
    love.graphics.print("* Press 'g' to switch to drawing polygons", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'rectangle' then
    love.graphics.print("* Press 'r' to switch to drawing rectangles", State.left+30,y)
    y = y + State.line_height
  end
  if State.current_drawing_mode ~= 'square' then
    love.graphics.print("* Press 's' to switch to drawing squares", State.left+30,y)
    y = y + State.line_height
  end
  App.color(Help_background_color)
  love.graphics.rectangle('fill', State.left,line_cache.starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-line_cache.starty))
end
function current_shape(State, shape)
  if State.current_drawing_mode == 'freehand' then
    return 'freehand stroke'
  elseif State.current_drawing_mode == 'line' then
    return 'straight line'
  elseif State.current_drawing_mode == 'manhattan' then
    return 'horizontal/vertical line'
  elseif State.current_drawing_mode == 'circle' and shape and shape.start_angle then
    return 'arc'
  else
    return State.current_drawing_mode
  end
end
function bullet_indent()

Insertion in help.lua at line 151 [40.6622]
[20.857]
```
end
```

Replacement in drawing.lua at line 63 [41.98]

B:BD[23.12304] → [23.12304:12393]

          local name_text
          -- TODO: avoid computing name width on every repaint

[23.12304]

[23.12393]

          local name_width

Replacement in drawing.lua at line 65 [41.98]
B:BD[23.12424] → [23.12424:12457]
```
            name_text = State.em
```
[23.12424]
[23.12457]
```
            name_width = App.width('m')
```

Replacement in drawing.lua at line 67 [41.98]

B:BD[23.12472] → [23.12472:12541]

            name_text = App.newText(love.graphics.getFont(), p.name)

[23.12472]

[23.12541]

            name_width = App.width(p.name)

Replacement in drawing.lua at line 69 [41.98]

B:BD[23.12555] → [23.12555:12643]

          love.graphics.rectangle('fill', x,y, App.width(name_text), State.line_height)

[23.12555]

[23.12643]

          love.graphics.rectangle('fill', x,y, name_width, State.line_height)

Deletion in drawing.lua at line 129 [41.98]
B:BD[42.1244] → [18.1027:1054]
BD:BD[42.1244] → [18.1027:1054]
B:BD[43.404] → [18.1055:1095]
BD:BD[43.404] → [18.1055:1095]
B:BD[43.503] → [18.1096:1139]
BD:BD[43.503] → [18.1096:1139]
B:BD[43.596] → [18.1140:1218]
BD:BD[43.596] → [18.1140:1218]
```
          local name_width
            name_width = App.width('m')
            name_width = App.width(p.name)
          love.graphics.rectangle('fill', x,y, name_width, State.line_height)
```
Solving an order conflict in drawing.lua at line 129 [41.98]
[23.14879]
[44.7397]
Replacement in commands.lua at line 46 [36.203826]
B:BD[36.205361] → [45.1061:1123]
```
  local s_text = to_text(s)
  local width = App.width(s_text)
```
[36.205361]
[46.29]
```
  local width = App.width(s)
```
Replacement in commands.lua at line 51 [36.203826]
B:BD[36.205601] → [45.1124:1165]
```
  App.screen.draw(s_text, Menu_cursor,5)
```
[36.205601]
[36.205649]
```
  App.screen.print(s, Menu_cursor,5)
```

Replacement in commands.lua at line 57 [36.203826]

B:BD[45.1198] → [45.1198:1334]

  local filter_text = to_text(File_navigation.filter)
  App.screen.draw(filter_text, 5, 5)
  draw_cursor(5 + App.width(filter_text), 5)

[45.1198]

[45.1334]

  App.screen.print(File_navigation.filter, 5, 5)
  draw_cursor(5 + App.width(File_navigation.filter), 5)

Replacement in commands.lua at line 98 [36.203826]
B:BD[45.2615] → [45.2615:2662]
```
    local width = App.width(to_text(filename))
```
[45.2615]
[45.2662]
```
    local width = App.width(filename)
```
Replacement in commands.lua at line 110 [36.203826]
B:BD[45.2872] → [45.2872:2934]
```
  local s_text = to_text(s)
  local width = App.width(s_text)
```
[45.2872]
[45.2934]
```
  local width = App.width(s)
```
Replacement in commands.lua at line 125 [36.203826]
B:BD[36.206479] → [45.3375:3406]
```
  App.screen.draw(s_text, x,y)
```
[36.206479]
[45.3406]
```
  App.screen.print(s, x,y)
```

Replacement in commands.lua at line 189 [36.203826]

B:BD[45.4726] → [45.4726:4807]

    local filename_text = to_text(filename)
    width = App.width(filename_text)

[45.4726]

[45.4807]

    width = App.width(filename)

Replacement in commands.lua at line 206 [36.203826]

B:BD[45.5285] → [45.5285:5366]

    local filename_text = to_text(filename)
    width = App.width(filename_text)

[45.5285]

[45.5366]

    width = App.width(filename)

Replacement in commands.lua at line 217 [36.203826]

B:BD[45.5743] → [45.5743:5802]

      App.screen.draw(filename_text, x + x3-menu_xmin, y3)

[45.5743]

[45.5802]

      App.screen.print(filename, x + x3-menu_xmin, y3)

Replacement in commands.lua at line 244 [36.203826]
B:BD[45.6414] → [45.6414:6461]
```
    local width = App.width(to_text(filename))
```
[45.6414]
[45.6461]
```
    local width = App.width(filename)
```
Replacement in commands.lua at line 262 [36.203826]
B:BD[45.6914] → [45.6914:6961]
```
    local width = App.width(to_text(filename))
```
[45.6914]
[45.6961]
```
    local width = App.width(filename)
```

Replacement in app.lua at line 140 [48.2]

B:BD[47.35229] → [47.35229:35299]

    error('There were test failures:\n\n'..table.concat(Test_errors))

[47.35229]

[47.35299]

    error(('There were %d test failures:\n\n%s'):format(#Test_errors, table.concat(Test_errors)))

Deletion in app.lua at line 147 [48.2]
B:BD[36.209859] → [47.35307:35307]
B:BD[49.60589] → [8.33:131]
BD:BD[49.60589] → [8.33:131]
```
    error(('There were %d test failures:\n\n%s'):format(#Test_errors, table.concat(Test_errors)))
```
Solving an order conflict in app.lua at line 147 [48.2]
[36.209859]
[50.5849]

Merge lines.love

Dependencies

In channels

Change contents

File deletion: help.lua

File deletion: source_undo.lua, source_undo.lua

File deletion: source_text.lua, source_text.lua

File deletion: source_file.lua, source_file.lua

File deletion: source_edit.lua, source_edit.lua

File deletion: source.lua, source.lua

File deletion: run.lua, run.lua

File deletion: log_browser.lua, log_browser.lua

File deletion: commands.lua, commands.lua

Deletion in undo.lua at line 61 [31.1]

Solving an order conflict in undo.lua at line 61 [31.1]

Insertion in undo.lua at line 61 [31.1]

Resurrecting zombie bytes in text.lua at line 37 [34.1]

Resurrecting zombie bytes in text.lua at line 38 [34.1]

Solving an order conflict in text.lua at line 38 [34.1]

Resurrecting zombie bytes in text.lua at line 88 [34.1]

Replacement in source_undo.lua at line 64 [36.68]

Replacement in source_undo.lua at line 66 [36.68]

Replacement in source_text.lua at line 15 [36.83786]

Replacement in source_text.lua at line 20 [36.83786]

Replacement in source_text.lua at line 25 [36.83786]

Replacement in source_text.lua at line 28 [36.83786]

Replacement in source_text.lua at line 43 [36.83786]

Replacement in source_text.lua at line 47 [36.83786]

Replacement in source_text.lua at line 55 [36.83786]

Replacement in source_text.lua at line 66 [36.83786]

Deletion in source_text.lua at line 106 [36.83786]

Replacement in source_text.lua at line 107 [36.83786]

Replacement in source_text.lua at line 113 [36.83786]

Deletion in source_text.lua at line 118 [36.83786]

Replacement in source_text.lua at line 128 [36.83786]

Deletion in source_text.lua at line 130 [36.83786]

Deletion in source_text.lua at line 131 [36.83786]

Deletion in source_text.lua at line 134 [36.83786]

Deletion in source_text.lua at line 136 [36.83786]

Replacement in source_text.lua at line 137 [36.83786]

Replacement in source_text.lua at line 139 [36.83786]

Replacement in source_text.lua at line 141 [36.83786]

Replacement in source_text.lua at line 146 [36.83786]

Replacement in source_text.lua at line 764 [36.83786]

Replacement in source_text.lua at line 852 [36.83786]

Replacement in source_text.lua at line 858 [36.83786]

Deletion in source_file.lua at line 2 [36.150304]

Replacement in source_file.lua at line 29 [36.150304]

Deletion in source_file.lua at line 49 [36.150304]

Replacement in source_file.lua at line 138 [36.150304]

Replacement in source_edit.lua at line 57 [36.152503]

Deletion in source_edit.lua at line 91 [36.152503]

Deletion in source_edit.lua at line 106 [36.152503]

Deletion in source_edit.lua at line 326 [36.152503]

Deletion in source_edit.lua at line 356 [36.152503]

Deletion in source_edit.lua at line 362 [36.152503]

Deletion in source_edit.lua at line 367 [36.152503]

Deletion in source_edit.lua at line 380 [36.152503]

Deletion in source_edit.lua at line 511 [36.152503]

Replacement in source.lua at line 165 [36.165829]

Deletion in source.lua at line 170 [36.165829]

Deletion in source.lua at line 417 [36.165829]

Deletion in source.lua at line 418 [36.165829]

Resurrecting zombie bytes in select.lua at line 60 [39.43980]

Resurrecting zombie bytes in select.lua at line 61 [39.43980]

Solving an order conflict in select.lua at line 61 [39.43980]

Resurrecting zombie bytes in select.lua at line 64 [39.43980]

Replacement in run.lua at line 74 [36.178107]

Deletion in run.lua at line 78 [36.178107]

Replacement in run.lua at line 198 [36.178107]

Deletion in log_browser.lua at line 101 [36.191243]

Replacement in log_browser.lua at line 106 [36.191243]

Replacement in log_browser.lua at line 113 [36.191243]

Replacement in log_browser.lua at line 150 [36.191243]

Replacement in log_browser.lua at line 165 [36.191243]

File un-deletion: help.lua, help.lua

Resurrecting zombie bytes in help.lua at line 1 [40.6622]

Insertion in help.lua at line 1 [40.6622]

Insertion in help.lua at line 151 [40.6622]

Replacement in drawing.lua at line 63 [41.98]