akkartik/carousel.love - Change TOXPJJYYZY7QRCVXJJDGDAM7NBSHEXNPRW5X4THW55FTSIZ3GKVQC

resolve conflicts

Created by akkartik on January 22, 2024

TOXPJJYYZY7QRCVXJJDGDAM7NBSHEXNPRW5X4THW55FTSIZ3GKVQC

Dependencies

In channels

main

Change contents

File deletion: source_text.lua, source_text.lua

BFD:BFD[8.2] → [9.147062:147101]

BFD:BFD[9.147101] → [9.83723:83723]

B:BD[10.153] → [7.1780:1876]

B:BD[11.764] → [7.1877:1975]

B:BD[12.741] → [7.1976:2084]

B:BD[12.1143] → [7.2085:2193]

B:BD[13.537] → [7.2194:2234]

B:BD[11.2472] → [7.2235:2284]

B:BD[11.2815] → [7.2285:2368]

B:BD[11.3180] → [7.2369:2416]

B:BD[11.3993] → [7.2417:2495]

B:BD[11.4555] → [7.2496:2590]

B:BD[14.7881] → [7.2591:2717]

B:BD[9.110929] → [7.2718:2844]

B:BD[14.9229] → [7.2845:2961]

B:BD[9.116648] → [7.2962:3088]

B:BD[15.5140] → [7.3089:3367]

B:BD[9.135976] → [7.3368:3410]

B:BD[9.137622] → [7.3411:3465]

B:BD[9.137737] → [7.3466:3513]

B:BD[9.138077] → [7.3514:3618]

B:BD[9.138708] → [7.3619:3670]

B:BD[9.138835] → [7.3671:3717]

B:BD[9.139009] → [7.3718:3826]

B:BD[9.139394] → [7.3827:3863]

B:BD[9.139549] → [7.3864:3897]

B:BD[9.139655] → [7.3898:3928]

B:BD[9.139754] → [7.3929:3962]

∅:D[7.3962] → [9.139855:139891]

∅:D[7.3928] → [9.139679:139754]

∅:D[7.3897] → [9.139650:139655]

∅:D[7.3863] → [16.91:173]

∅:D[7.3826] → [9.139105:139373]

∅:D[7.3717] → [9.138875:139009]

∅:D[7.3670] → [9.138753:138835]

∅:D[7.3618] → [9.138169:138549]

∅:D[7.3513] → [9.137778:138077]

∅:D[7.3465] → [9.137670:137737]

∅:D[7.3410] → [9.136090:136095]

∅:D[7.3367] → [9.135329:135357]

∅:D[7.3088] → [9.116762:117041]

∅:D[7.2961] → [14.9333:9404]

∅:D[7.2844] → [9.111043:111167]

∅:D[7.2717] → [14.7995:8019]

∅:D[7.2590] → [9.94273:94278]

∅:D[7.2495] → [11.4065:4395]

∅:D[7.2416] → [11.3217:3264]

∅:D[7.2368] → [17.193:385]

∅:D[7.2284] → [11.2511:2815]

∅:D[7.2234] → [9.89029:89039]

∅:D[7.2193] → [9.89003:89029]

∅:D[7.2084] → [12.837:1143]

∅:D[7.1975] → [11.850:869]

∅:D[7.1876] → [10.239:245]

    love.graphics.print(line_index, State.left-Line_number_width*State.font:getWidth('m')+10,y)
        local lo, hi = Text.clip_wikiword_with_screen_line(State.font, line, line_cache, i, s, e)
            Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)
            Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)
        x = x+State.font:getWidth(frag)
    local frag_width = State.font:getWidth(frag)
        local bpos = Text.nearest_pos_less_than(State.font, frag, State.width - x)
        frag_width = State.font:getWidth(frag)
function Text.clip_wikiword_with_screen_line(font, line, line_cache, i, s, e)
  return font:getWidth(line.data:sub(soff, loff-1)), font:getWidth(line.data:sub(soff, hoff))
        State.cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, State.cursor_x, State.left) - 1
    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, State.cursor_x, State.left) - 1
          pos = Text.nearest_cursor_pos(State.font, State.lines[new_cursor_line].data, State.cursor_x, State.left),
    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, State.cursor_x, State.left) - 1
--?       print('return', mx, Text.nearest_cursor_pos(State.font, s, mx, State.left), '=>', screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, mx, State.left) - 1)
      return screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, mx, State.left) - 1
  return State.font:getWidth(screen_line)
function Text.nearest_cursor_pos(font, line, x, left)
  local max_x = left+Text.x(font, line, len+1)
    local currxmin = left+Text.x(font, line, curr)
    local currxmax = left+Text.x(font, line, curr+1)
function Text.nearest_pos_less_than(font, line, x)
  local max_x = Text.x_after(font, line, len)
    local currxmin = Text.x_after(font, line, curr+1)
    local currxmax = Text.x_after(font, line, curr+2)
function Text.x_after(font, s, pos)
  return font:getWidth(s_before)
function Text.x(font, s, pos)
  return font:getWidth(s_before)
end
function Text.to2(State, loc1)
  local offset = Text.offset(s, pos)
  local s_before = s:sub(1, offset-1)
end
  local len = utf8.len(s)
  local offset = Text.offset(s, math.min(pos+1, len+1))
--?     print('', x, left, right, curr, currxmin, currxmax)
    if currxmin <= x and x < currxmax then
      return curr
    end
    if left >= right-1 then
      return left
    end
    if currxmin > x then
      right = curr
    else
      left = curr
    end
  end
  if x > max_x then
    return len+1
  end
  local left, right = 0, len+1
  while true do
    local curr = math.floor((left+right)/2)
--?   print('', '-- nearest_pos_less_than', line, x)
  local len = utf8.len(line)
--?     print('nearest', x, leftpos, rightpos, curr, currxmin, currxmax)
    if currxmin <= x and x < currxmax then
      if x-currxmin < currxmax-x then
        return curr
      else
        return curr+1
      end
    end
    if leftpos >= rightpos-1 then
      return rightpos
    end
    if currxmin > x then
      rightpos = curr
    else
      leftpos = curr
    end
  end
  if x > max_x then
    return len+1
  end
  local leftpos, rightpos = 1, len+1
--?   print('-- nearest', x)
  while true do
--?     print('nearest', x, '^'..line..'$', leftpos, rightpos)
    if leftpos == rightpos then
      return leftpos
    end
    local curr = math.floor((leftpos+rightpos)/2)
  if x < left then
    return 1
  end
  local len = utf8.len(line)
end
    end
    y = nexty
  end
--?     print('cursor pos is now', State.cursor1.line, State.cursor1.pos)
    if scroll_down then
--?       print('scroll up preserving cursor')
      Text.snap_cursor_to_bottom_of_screen(State)
--?       print('screen top after:', State.screen_top1.line, State.screen_top1.pos)
        }
--?         print(State.cursor1.pos)
        break
      end
--?     print('cursor pos is now '..tostring(State.cursor1.pos))
  end
  if Text.lt1(State.cursor1, State.screen_top1) then
        break
      end
end
  local spos = line_cache.screen_line_starting_pos[i]
  local soff = Text.offset(line.data, spos)
  if e < soff then
    return
  end
  local eoff
  if i < #line_cache.screen_line_starting_pos then
    local epos = line_cache.screen_line_starting_pos[i+1]
    eoff = Text.offset(line.data, epos)
    if s > eoff then
      return
      end
--?       print('screen line:', pos)
        if x == 0 and bpos == 0 then
          assert(false, ("Infinite loop while line-wrapping. Editor is %dpx wide; window is %dpx wide"):format(State.width, App.screen.width))
        end
--?     print('-- frag:', frag, pos, x, frag_width, State.width)
    while x + frag_width > State.width do
--?       print('frag:', frag, pos, x, frag_width, State.width)
      if x < 0.8 * State.width then
        -- long word; chop it at some letter
        -- We're not going to reimplement TeX here.
      end
          end
        end
          elseif pos + frag_len == State.cursor1.pos then
            -- Show cursor at end of line.
            -- This place also catches end of wrapping screen lines. That doesn't seem worth distinguishing.
            -- It seems useful to see a cursor whether your eye is on the left or right margin.
        if lo then
  end

File deletion: source_edit.lua, source_edit.lua
BFD:BFD[8.2] → [9.165725:165764]
BFD:BFD[8.2] → [9.165725:165764]
BFD:BFD[9.165764] → [9.152440:152440]
B:BD[9.155031] → [18.0:26]
∅:D[18.26] → [9.155096:155208]
```
    filename = 'run.lua',
    next_save = nil,
    -- undo
    history = {},
    next_history = 1,
    -- search
    search_term = nil,
```

File deletion: source.lua, source.lua

BFD:BFD[8.2] → [9.177652:177686]

BFD:BFD[9.177686] → [9.165766:165766]

B:BD[9.169468] → [7.4101:4277]

B:BD[19.51] → [7.4278:4460]

∅:D[7.4460] → [20.115:151]

∅:D[7.4277] → [9.169599:169643]

  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*font:getWidth('m'), right, font, settings.font_height, math.floor(settings.font_height*1.3))
  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*font:getWidth('m'), App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))
  Editor_state.filename = 'run.lua'
  Editor_state.filename = settings.filename

File deletion: log_browser.lua, log_browser.lua

BFD:BFD[8.2] → [9.203223:203262]

BFD:BFD[9.203262] → [9.191782:191782]

B:BD[21.262] → [7.4676:4782]

B:BD[21.420] → [7.4783:4889]

B:BD[9.197661] → [7.4890:5064]

B:BD[9.198357] → [7.5065:5219]

∅:D[7.5219] → [9.198510:199163]

∅:D[7.5064] → [9.197834:198357]

∅:D[7.4889] → [9.196398:196574]

∅:D[7.4782] → [22.6565:6683]

          love.graphics.line(xleft+50+State.font:getWidth(line.section_name)+2,sectiony, xright,sectiony)
          love.graphics.line(xleft+50+State.font:getWidth(line.section_name)+2,sectiony, xright,sectiony)
      love.graphics.print(line.section_stack[i].name, x+State.font_height+5, App.screen.height-State.font:getWidth(line.section_stack[i].name)-5, --[[vertically]] math.pi/2)
      love.graphics.print(line.section_stack[i].name, x, App.screen.height-State.font:getWidth(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
    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
        end
      else
        if type(line.data) == 'string' then
          local old_left, old_right = State.left,State.right
          State.left,State.right = xleft,xright
        else assert(line.section_end, "log line has a section name, but it's neither the start nor end of a section")

Resurrecting zombie bytes in text.lua at line 97 [24.1]
B:B[23.168] → [7.222:271]
BD:B[23.168] → [7.222:271]
```
    local frag_width = State.font:getWidth(frag)
```
Solving an order conflict in text.lua at line 97 [24.1]
[26.1938]
[7.222]

Deletion in text.lua at line 404 [24.1]

B:BD[25.4502] → [27.4:4]

B:BD[28.4882] → [7.404:530]

BD:BD[28.4882] → [7.404:530]

        State.cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, State.cursor_x, State.left) - 1

Solving an order conflict in text.lua at line 404 [24.1]
[25.4502]
[26.3974]

Replacement in text.lua at line 406 [24.1]

∅:D[26.4196] → [25.5094:5206]

B:BD[25.5094] → [25.5094:5206]

      State.cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1

[26.4196]

[29.1706]

      State.cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, State.cursor_x, State.left) - 1

Resurrecting zombie bytes in text.lua at line 412 [24.1]

∅:∅[30.127] → [26.4197:4427]

B:B[29.2441] → [26.4197:4427]

BD:B[30.127] → [26.4197:4427]

BD:B[29.2441] → [26.4197:4427]

    local new_screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, new_screen_line_starting_pos)
    local s = string.sub(State.lines[State.cursor1.line].data, new_screen_line_starting_byte_offset)

Deletion in text.lua at line 414 [24.1]
B:BD[26.4427] → [31.87:87]
BD:BD[26.4427] → [31.87:87]

Resurrecting zombie bytes in text.lua at line 414 [24.1]

B:B[28.5703] → [7.531:657]

BD:B[28.5703] → [7.531:657]

    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, State.cursor_x, State.left) - 1

Solving an order conflict in text.lua at line 414 [24.1]
[26.4427]
[7.531]

Replacement in text.lua at line 435 [24.1]

B:BD[25.5568] → [26.4428:4544]

      State.cursor1.pos = Text.nearest_cursor_pos(State.lines[State.cursor1.line].data, State.cursor_x, State.left)

[25.5568]

[25.5679]

      State.cursor1.pos = Text.nearest_cursor_pos(State.font, State.lines[State.cursor1.line].data, State.cursor_x, State.left)

Deletion in text.lua at line 437 [24.1]

B:BD[25.5714] → [27.6:6]

B:BD[14.537] → [7.658:774]

BD:BD[14.537] → [7.658:774]

          pos = Text.nearest_cursor_pos(State.font, State.lines[new_cursor_line].data, State.cursor_x, State.left),

Solving an order conflict in text.lua at line 437 [24.1]
[25.5714]
[32.1313]

Resurrecting zombie bytes in text.lua at line 452 [24.1]

B:B[29.4338] → [26.4545:4775]

BD:B[29.4338] → [26.4545:4775]

    local new_screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, new_screen_line_starting_pos)
    local s = string.sub(State.lines[State.cursor1.line].data, new_screen_line_starting_byte_offset)

Resurrecting zombie bytes in text.lua at line 454 [24.1]

B:B[28.7111] → [7.775:901]

BD:B[28.7111] → [7.775:901]

    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, State.cursor_x, State.left) - 1

Solving an order conflict in text.lua at line 454 [24.1]
[26.4775]
[7.775]
Resurrecting zombie bytes in text.lua at line 667 [24.1]
B:B[33.538] → [26.5739:5811]
BD:B[33.538] → [26.5739:5811]
```
      local s = string.sub(line.data, screen_line_starting_byte_offset)
```

Resurrecting zombie bytes in text.lua at line 668 [24.1]

B:B[34.1751] → [7.902:1180]

BD:B[34.1751] → [7.902:1180]

--?       print('return', mx, Text.nearest_cursor_pos(State.font, s, mx, State.left), '=>', screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, mx, State.left) - 1)
      return screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, mx, State.left) - 1

Solving an order conflict in text.lua at line 668 [24.1]
[26.5811]
[7.902]

Replacement in source_text.lua at line 17 [36.83786]

B:BD[35.153] → [35.153:239]

    love.graphics.print(line_index, State.left-Line_number_width*App.width('m')+10,y)

[35.153]

[35.239]

    love.graphics.print(line_index, State.left-Line_number_width*State.font:getWidth('m')+10,y)

Replacement in source_text.lua at line 35 [36.83786]

B:BD[37.764] → [37.764:850]

        local lo, hi = Text.clip_wikiword_with_screen_line(line, line_cache, i, s, e)

[37.764]

[37.850]

        local lo, hi = Text.clip_wikiword_with_screen_line(State.font, line, line_cache, i, s, e)

Replacement in source_text.lua at line 65 [36.83786]

B:BD[38.936] → [38.936:1032]

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

[38.936]

[38.1032]

            Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)

Replacement in source_text.lua at line 70 [36.83786]

B:BD[38.1338] → [38.1338:1434]

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

[38.1338]

[38.1434]

            Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)

Replacement in source_text.lua at line 79 [36.83786]
B:BD[39.409] → [39.409:439]
```
        x = x+App.width(frag)
```
[39.409]
[39.439]
```
        x = x+State.font:getWidth(frag)
```
Replacement in source_text.lua at line 123 [36.83786]
B:BD[37.2472] → [37.2472:2511]
```
    local frag_width = App.width(frag)
```
[37.2472]
[37.2511]
```
    local frag_width = State.font:getWidth(frag)
```

Replacement in source_text.lua at line 130 [36.83786]

B:BD[37.2815] → [37.2815:2886]

        local bpos = Text.nearest_pos_less_than(frag, State.width - x)

[37.2815]

[40.8]

        local bpos = Text.nearest_pos_less_than(State.font, frag, State.width - x)

Replacement in source_text.lua at line 140 [36.83786]
B:BD[37.3180] → [37.3180:3217]
```
        frag_width = App.width(frag)
```
[37.3180]
[37.3217]
```
        frag_width = State.font:getWidth(frag)
```

Replacement in source_text.lua at line 175 [36.83786]

B:BD[37.3993] → [37.3993:4065]

function Text.clip_wikiword_with_screen_line(line, line_cache, i, s, e)

[37.3993]

[37.4065]

function Text.clip_wikiword_with_screen_line(font, line, line_cache, i, s, e)

Replacement in source_text.lua at line 197 [36.83786]

B:BD[37.4555] → [41.7:93]

  return App.width(line.data:sub(soff, loff-1)), App.width(line.data:sub(soff, hoff))

[37.4555]

[36.95094]

  return font:getWidth(line.data:sub(soff, loff-1)), font:getWidth(line.data:sub(soff, hoff))

Replacement in source_text.lua at line 484 [36.83786]

B:BD[27.6431] → [27.6431:6545]

        State.cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1

[27.6431]

[27.6545]

        State.cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, State.cursor_x, State.left) - 1

Replacement in source_text.lua at line 494 [36.83786]

B:BD[36.110992] → [36.110992:111106]

    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1

[36.110992]

[36.111106]

    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, State.cursor_x, State.left) - 1

Replacement in source_text.lua at line 519 [36.83786]

B:BD[27.7779] → [27.7779:7883]

          pos = Text.nearest_cursor_pos(State.lines[new_cursor_line].data, State.cursor_x, State.left),

[27.7779]

[27.7883]

          pos = Text.nearest_cursor_pos(State.font, State.lines[new_cursor_line].data, State.cursor_x, State.left),

Replacement in source_text.lua at line 541 [36.83786]

B:BD[36.116711] → [36.116711:116825]

    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1

[36.116711]

[36.116825]

    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, State.cursor_x, State.left) - 1

Replacement in source_text.lua at line 804 [36.83786]

B:BD[42.6668] → [42.6668:6910]

--?       print('return', mx, Text.nearest_cursor_pos(s, mx, State.left), '=>', screen_line_starting_pos + Text.nearest_cursor_pos(s, mx, State.left) - 1)
      return screen_line_starting_pos + Text.nearest_cursor_pos(s, mx, State.left) - 1

[42.6668]

[36.135392]

--?       print('return', mx, Text.nearest_cursor_pos(State.font, s, mx, State.left), '=>', screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, mx, State.left) - 1)
      return screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, mx, State.left) - 1

Replacement in source_text.lua at line 825 [36.83786]
B:BD[36.136039] → [43.1216:1248]
```
  return App.width(screen_line)
```
[36.136039]
[36.136153]
```
  return State.font:getWidth(screen_line)
```
Replacement in source_text.lua at line 839 [36.83786]
B:BD[36.137685] → [36.137685:137733]
```
function Text.nearest_cursor_pos(line, x, left)
```
[36.137685]
[36.137733]
```
function Text.nearest_cursor_pos(font, line, x, left)
```
Replacement in source_text.lua at line 844 [36.83786]
B:BD[36.137800] → [36.137800:137841]
```
  local max_x = left+Text.x(line, len+1)
```
[36.137800]
[36.137841]
```
  local max_x = left+Text.x(font, line, len+1)
```

Replacement in source_text.lua at line 856 [36.83786]

B:BD[36.138140] → [36.138140:138232]

    local currxmin = left+Text.x(line, curr)
    local currxmax = left+Text.x(line, curr+1)

[36.138140]

[36.138232]

    local currxmin = left+Text.x(font, line, curr)
    local currxmax = left+Text.x(font, line, curr+1)

Replacement in source_text.lua at line 881 [36.83786]
B:BD[36.138771] → [36.138771:138816]
```
function Text.nearest_pos_less_than(line, x)
```
[36.138771]
[36.138816]
```
function Text.nearest_pos_less_than(font, line, x)
```
Replacement in source_text.lua at line 884 [36.83786]
B:BD[36.138898] → [36.138898:138938]
```
  local max_x = Text.x_after(line, len)
```
[36.138898]
[36.138938]
```
  local max_x = Text.x_after(font, line, len)
```

Replacement in source_text.lua at line 891 [36.83786]

B:BD[36.139072] → [36.139072:139168]

    local currxmin = Text.x_after(line, curr+1)
    local currxmax = Text.x_after(line, curr+2)

[36.139072]

[36.139168]

    local currxmin = Text.x_after(font, line, curr+1)
    local currxmax = Text.x_after(font, line, curr+2)

Replacement in source_text.lua at line 909 [36.83786]
B:BD[36.139457] → [36.139457:139487]
```
function Text.x_after(s, pos)
```
[36.139457]
[4.8]
```
function Text.x_after(font, s, pos)
```
Replacement in source_text.lua at line 914 [36.83786]
B:BD[36.139612] → [43.1249:1278]
```
  return App.width(s_before)
```
[36.139612]
[36.139713]
```
  return font:getWidth(s_before)
```
Replacement in source_text.lua at line 917 [36.83786]
B:BD[36.139718] → [36.139718:139742]
```
function Text.x(s, pos)
```
[36.139718]
[36.139742]
```
function Text.x(font, s, pos)
```
Replacement in source_text.lua at line 920 [36.83786]
B:BD[36.139817] → [43.1279:1308]
```
  return App.width(s_before)
```
[36.139817]
[36.139918]
```
  return font:getWidth(s_before)
```

Replacement in source_edit.lua at line 97 [36.152503]

B:BD[36.155094] → [44.11:118]

    filename = love.filesystem.getSourceBaseDirectory()..'/lines.txt',  -- '/' should work even on Windows

[36.155094]

[36.155159]

    filename = 'run.lua',

Replacement in source.lua at line 129 [36.165829]

B:BD[36.169531] → [5.387:559]

  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), right, font, settings.font_height, math.floor(settings.font_height*1.3))

[36.169531]

[36.169662]

  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*font:getWidth('m'), right, font, settings.font_height, math.floor(settings.font_height*1.3))

Replacement in source.lua at line 157 [36.165829]

B:BD[45.51] → [5.611:789]

  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))

[45.51]

[46.2008]

  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*font:getWidth('m'), App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))

Deletion in select.lua at line 60 [47.43980]
B:BD[26.6273] → [43.1536:1536]
BD:BD[26.6273] → [43.1536:1536]
∅:D[43.1536] → [48.785:817]
B:BD[49.514] → [48.785:817]
BD:BD[49.514] → [48.785:817]
```
      lo_px = App.width(before)
```
Resurrecting zombie bytes in select.lua at line 60 [47.43980]
B:B[49.514] → [7.4462:4504]
BD:B[49.514] → [7.4462:4504]
```
      lo_px = State.font:getWidth(before)
```
Solving an order conflict in select.lua at line 60 [47.43980]
[26.6273]
[7.4462]
Deletion in main.lua at line 328 [51.2]
B:BD[36.190711] → [50.995:995]
B:BD[9.191282] → [6.20:67]
BD:BD[9.191282] → [6.20:67]
BD:BD[9.191282] → [6.20:67]
```
  if Disable_all_quit_handlers then return end
```
Solving an order conflict in main.lua at line 328 [51.2]
[36.190711]
[53.235]
Insertion in main.lua at line 332 [51.2]
[36.190738]
[3.1368]
```
  if Disable_all_quit_handlers then return end
```

Replacement in log_browser.lua at line 97 [36.191243]

B:BD[43.1717] → [43.1717:1813]

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

[43.1717]

[31.3529]

          love.graphics.line(xleft+50+State.font:getWidth(line.section_name)+2,sectiony, xright,sectiony)

Replacement in log_browser.lua at line 104 [36.191243]

B:BD[43.1875] → [43.1875:1971]

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

[43.1875]

[36.195859]

          love.graphics.line(xleft+50+State.font:getWidth(line.section_name)+2,sectiony, xright,sectiony)

Replacement in log_browser.lua at line 140 [36.191243]

B:BD[36.197122] → [43.1972:2136]

      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)

[36.197122]

[36.197295]

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

Replacement in log_browser.lua at line 155 [36.191243]

B:BD[36.197818] → [43.2137:2281]

      love.graphics.print(line.section_stack[i].name, x, App.screen.height-App.width(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-State.font:getWidth(line.section_stack[i].name)-5, --[[vertically]] math.pi/2)

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

B:B[54.6622] → [43.2287:2874]

BD:B[54.6622] → [43.2287:2874]

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

Replacement in help.lua at line 12 [54.6622]

B:BD[43.2874] → [43.2874:2971]

BD:BD[43.2874] → [43.2874:2971]

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

[43.2874]

[43.2971]

  love.graphics.print("then press the mouse button to drop it", State.left+30+State.font:getWidth('* '),y)

Deletion in help.lua at line 147 [54.6622]
B:BD[43.9454] → [43.9454:9484]
BD:BD[43.9454] → [43.9454:9484]
B:BD[55.460] → [7.5225:5332]
BD:BD[55.460] → [7.5225:5332]
∅:D[43.9484] → [21.832:857]
B:BD[54.11371] → [21.832:857]
BD:BD[54.11371] → [21.832:857]
```
end
function bullet_indent()
  love.graphics.print("then press the mouse button to drop it", State.left+30+State.font:getWidth('* '),y)
  return App.width('* ')
```
Resurrecting zombie bytes in help.lua at line 147 [54.6622]
B:B[21.857] → [43.9485:9489]
BD:B[21.857] → [43.9485:9489]
```
end
```
Solving an order conflict in help.lua at line 147 [54.6622]
[43.9454]
[43.9485]

Replacement in drawing.lua at line 64 [57.98]

B:BD[56.12424] → [43.9523:9563]

            name_width = App.width('m')

[56.12424]

[56.12457]

            name_width = State.font:getWidth('m')

Replacement in drawing.lua at line 66 [57.98]

B:BD[56.12472] → [43.9564:9607]

            name_width = App.width(p.name)

[56.12472]

[56.12541]

            name_width = State.font:getWidth(p.name)

Deletion in drawing.lua at line 744 [57.98]
B:BD[56.42200] → [31.9582:9582]
B:BD[58.404] → [7.5338:5388]
BD:BD[58.404] → [7.5338:5388]
B:BD[58.503] → [7.5389:5442]
BD:BD[58.503] → [7.5389:5442]
```
            name_width = State.font:getWidth('m')
            name_width = State.font:getWidth(p.name)
```
Solving an order conflict in drawing.lua at line 744 [57.98]
[56.42200]

resolve conflicts

Dependencies

In channels

Change contents

File deletion: source_text.lua, source_text.lua

File deletion: source_edit.lua, source_edit.lua

File deletion: source.lua, source.lua

File deletion: log_browser.lua, log_browser.lua

Resurrecting zombie bytes in text.lua at line 97 [24.1]

Solving an order conflict in text.lua at line 97 [24.1]

Deletion in text.lua at line 404 [24.1]

Solving an order conflict in text.lua at line 404 [24.1]

Replacement in text.lua at line 406 [24.1]

Resurrecting zombie bytes in text.lua at line 412 [24.1]

Deletion in text.lua at line 414 [24.1]

Resurrecting zombie bytes in text.lua at line 414 [24.1]

Solving an order conflict in text.lua at line 414 [24.1]

Replacement in text.lua at line 435 [24.1]

Deletion in text.lua at line 437 [24.1]

Solving an order conflict in text.lua at line 437 [24.1]

Resurrecting zombie bytes in text.lua at line 452 [24.1]

Resurrecting zombie bytes in text.lua at line 454 [24.1]

Solving an order conflict in text.lua at line 454 [24.1]

Resurrecting zombie bytes in text.lua at line 667 [24.1]

Resurrecting zombie bytes in text.lua at line 668 [24.1]

Solving an order conflict in text.lua at line 668 [24.1]

Replacement in source_text.lua at line 17 [36.83786]

Replacement in source_text.lua at line 35 [36.83786]

Replacement in source_text.lua at line 65 [36.83786]

Replacement in source_text.lua at line 70 [36.83786]

Replacement in source_text.lua at line 79 [36.83786]

Replacement in source_text.lua at line 123 [36.83786]

Replacement in source_text.lua at line 130 [36.83786]

Replacement in source_text.lua at line 140 [36.83786]

Replacement in source_text.lua at line 175 [36.83786]

Replacement in source_text.lua at line 197 [36.83786]

Replacement in source_text.lua at line 484 [36.83786]

Replacement in source_text.lua at line 494 [36.83786]

Replacement in source_text.lua at line 519 [36.83786]

Replacement in source_text.lua at line 541 [36.83786]

Replacement in source_text.lua at line 804 [36.83786]

Replacement in source_text.lua at line 825 [36.83786]

Replacement in source_text.lua at line 839 [36.83786]

Replacement in source_text.lua at line 844 [36.83786]

Replacement in source_text.lua at line 856 [36.83786]

Replacement in source_text.lua at line 881 [36.83786]

Replacement in source_text.lua at line 884 [36.83786]

Replacement in source_text.lua at line 891 [36.83786]

Replacement in source_text.lua at line 909 [36.83786]

Replacement in source_text.lua at line 914 [36.83786]

Replacement in source_text.lua at line 917 [36.83786]

Replacement in source_text.lua at line 920 [36.83786]

Replacement in source_edit.lua at line 97 [36.152503]

Replacement in source.lua at line 129 [36.165829]

Replacement in source.lua at line 157 [36.165829]

Deletion in select.lua at line 60 [47.43980]

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

Solving an order conflict in select.lua at line 60 [47.43980]

Deletion in main.lua at line 328 [51.2]

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

Insertion in main.lua at line 332 [51.2]

Replacement in log_browser.lua at line 97 [36.191243]

Replacement in log_browser.lua at line 104 [36.191243]

Replacement in log_browser.lua at line 140 [36.191243]

Replacement in log_browser.lua at line 155 [36.191243]

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

Replacement in help.lua at line 12 [54.6622]

Deletion in help.lua at line 147 [54.6622]

Resurrecting zombie bytes in help.lua at line 147 [54.6622]

Solving an order conflict in help.lua at line 147 [54.6622]

Replacement in drawing.lua at line 64 [57.98]

Replacement in drawing.lua at line 66 [57.98]

Deletion in drawing.lua at line 744 [57.98]

Solving an order conflict in drawing.lua at line 744 [57.98]