akkartik/pensieve.love - Change QLG4WQX6Q3G4VHT2S5CGBSIQCMYIVLCVPMETRCS4A7UEV6V5PXFAC

resolve conflicts

Created by akkartik on January 22, 2024

QLG4WQX6Q3G4VHT2S5CGBSIQCMYIVLCVPMETRCS4A7UEV6V5PXFAC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 30 [8.1]

B:BD[7.328] → [7.328:414]

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

[7.328]

[7.414]

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

Replacement in text.lua at line 170 [8.1]

B:BD[7.1607] → [7.1607:1679]

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

[7.1607]

[7.1679]

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

Replacement in text.lua at line 192 [8.1]

B:BD[7.2181] → [4.3:89]

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

[7.2181]

[7.2261]

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

Resurrecting zombie bytes in text.lua at line 549 [8.1]
B:B[9.1720] → [10.719:793]
BD:B[9.1720] → [10.719:793]
```
--?     print('cursor pos is now', State.cursor1.line, State.cursor1.pos)
```

Insertion in text.lua at line 549 [8.1]

[11.7111]

[10.719]

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

Deletion in text.lua at line 551 [8.1]

B:BD[11.7111] → [6.775:901]

BD:BD[11.7111] → [6.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 551 [8.1]
[10.793]
[13.130]
Replacement in text.lua at line 863 [8.1]
B:BD[14.608] → [7.2267:2299]
```
  return App.width(screen_line)
```
[14.608]
[15.1644]
```
  return State.font:getWidth(screen_line)
```

Replacement in search.lua at line 17 [17.48846]

B:BD[16.1671] → [7.2834:2911]

  Text.draw_cursor(State, 25+App.width(State.search_term),y-5, force_cursor)

[16.1671]

[18.416]

  Text.draw_cursor(State, 25+State.font:getWidth(State.search_term),y-5, force_cursor)

Deletion in search.lua at line 23 [17.48846]
B:BD[18.528] → [7.2913:2913]
B:BD[16.1671] → [6.4596:4669]
```
  Text.draw_cursor(State, 25+State.font:getWidth(State.search_term),y-5)
```
Solving an order conflict in search.lua at line 23 [17.48846]
[18.528]
[17.49698]
Replacement in run.lua at line 224 [20.178044]
B:BD[19.110] → [5.19:19]
∅:D[5.19] → [21.755:814]
B:BD[20.179375] → [21.755:814]
```
  local font = love.graphics.newFont(Settings.font_height)
```
[19.110]
[22.1186]
```
  Display_settings.font = love.graphics.newFont(Settings.font_height)
```
Replacement in run.lua at line 233 [20.178044]
B:BD[23.9553] → [5.20:50]
```
  love.graphics.setFont(font)
```
[23.9553]
[24.2171]
```
  love.graphics.setFont(Display_settings.font)
```

Replacement in run.lua at line 266 [20.178044]

B:BD[19.154] → [25.146:206]

  love.graphics.setFont(love.graphics.newFont(Font_height))

[19.154]

  Display_settings.font = love.graphics.newFont(Font_height)
  love.graphics.setFont(Display_settings.font)

Replacement in run.lua at line 269 [20.178044]

B:BD[23.10101] → [7.2986:3038]

  Display_settings.column_width = 40*App.width('m')

[19.189]

[5.52]

  Display_settings.column_width = 40*Display_settings.font:getWidth('m')

Replacement in run.lua at line 433 [20.178044]

B:BD[23.16251] → [7.3041:3160]

        pane.left = App.screen.width/2 - 20*App.width('m')
        pane.right = App.screen.width/2 + 20*App.width('m')

[23.16251]

[23.16368]

        pane.left = App.screen.width/2 - 20*pane.font:getWidth('m')
        pane.right = App.screen.width/2 + 20*pane.font:getWidth('m')

Replacement in run.lua at line 534 [20.178044]
B:BD[23.20498] → [23.20498:20537]
```
      draw_link(label, x, pane.bottom)
```
[23.20498]
[23.20537]
```
      draw_link(pane.font, label, x, pane.bottom)
```
Replacement in run.lua at line 536 [20.178044]
B:BD[23.20545] → [7.3242:3281]
```
    x = x + App.width(label) + 10 + 10
```
[23.20545]
[23.20596]
```
    x = x + pane.font:getWidth(label) + 10 + 10
```

Replacement in run.lua at line 541 [20.178044]

B:BD[23.20828] → [23.20828:20866]

B:BD[23.20866] → [7.3282:3322]

      draw_link(link, x, pane.bottom)
      x = x + App.width(link) + 10 + 10

[23.20710]

[23.20918]

      draw_link(pane.font, link, x, pane.bottom)
      x = x + pane.font:getWidth(link) + 10 + 10

Replacement in run.lua at line 548 [20.178044]
B:BD[23.20983] → [23.20983:21014]
```
function draw_link(label, x,y)
```
[23.20983]
[23.21014]
```
function draw_link(font, label, x,y)
```

Replacement in run.lua at line 552 [20.178044]

B:BD[23.21131] → [7.3361:3443]

  love.graphics.rectangle('fill', x-5, y+3, App.width(label)+10, 2+Line_height+2)

[23.21131]

[23.21225]

  love.graphics.rectangle('fill', x-5, y+3, font:getWidth(label)+10, 2+Line_height+2)

Replacement in run.lua at line 957 [20.178044]

B:BD[23.30524] → [7.3444:3521]

  local column_width_in_ems = Display_settings.column_width / App.width('m')

[23.30524]

[23.30600]

  local column_width_in_ems = Display_settings.column_width / Display_settings.font:getWidth('m')

Replacement in run.lua at line 959 [20.178044]

B:BD[23.30628] → [5.222:272]

  local font = love.graphics.newFont(Font_height)

[23.30628]

[23.30688]

  Display_settings.font = love.graphics.newFont(Font_height)

Replacement in run.lua at line 961 [20.178044]

B:BD[23.30732] → [7.3522:3591]

  Display_settings.column_width = column_width_in_ems*App.width('m')

[23.30732]

[23.30849]

  Display_settings.column_width = column_width_in_ems*Display_settings.font:getWidth('m')

Replacement in run.lua at line 964 [20.178044]
B:BD[23.30922] → [5.273:296]
```
      pane.font = font
```
[23.30922]
[23.30922]
```
      pane.font = Display_settings.font
```

Replacement in run.lua at line 1193 [20.178044]

B:BD[23.39591] → [7.3659:3785]

  local vertically_ok = cursor_sx > Display_settings.x and cursor_sx < Display_settings.x + App.screen.width - App.width('m')

[23.39591]

[23.40053]

  local vertically_ok = cursor_sx > Display_settings.x and cursor_sx < Display_settings.x + App.screen.width - pane.font:getWidth('m')

Replacement in errors.lua at line 12 [26.652]

B:BD[26.996] → [7.3864:4015]

  local left = math.max(0, 1/2*(App.screen.width-App.width(Current_error)-10))
  local width = math.min(App.screen.width, App.width(Current_error)+20)

[26.996]

[26.1157]

  local left = math.max(0, 1/2*(App.screen.width-Display_settings.font:getWidth(Current_error)-10))
  local width = math.min(App.screen.width, Display_settings.font:getWidth(Current_error)+20)

Replacement in commands.lua at line 186 [28.39]
B:BD[27.2585] → [7.4125:4154]
```
  local width = App.width(s)
```
[27.2585]
[29.170]
```
  local width = Display_settings.font:getWidth(s)
```

Replacement in commands.lua at line 297 [28.39]

B:BD[30.80] → [2.65:120]

    x = x+App.width(Display_settings.search_all_query)

[30.80]

[31.3021]

    x = x+Display_settings.font:getWidth(Display_settings.search_all_query)

Replacement in commands.lua at line 310 [28.39]
B:BD[32.223] → [7.4256:4285]
```
  local width = App.width(s)
```
[32.223]
[27.4143]
```
  local width = Display_settings.font:getWidth(s)
```

Replacement in commands.lua at line 334 [28.39]

B:BD[7.4406] → [7.4406:4458]

  x = x+App.width(Display_settings.palette_command)

[7.4406]

[28.1853]

  x = x+Display_settings.font:getWidth(Display_settings.palette_command)

Replacement in commands.lua at line 740 [28.39]

B:BD[33.478] → [7.4459:4542]

  Display_settings.column_width = Display_settings.column_width + 5*App.width('m')

[33.478]

[34.397]

  Display_settings.column_width = Display_settings.column_width + 5*Display_settings.font:getWidth('m')

Replacement in commands.lua at line 752 [28.39]

B:BD[33.612] → [7.4543:4626]

  Display_settings.column_width = Display_settings.column_width - 5*App.width('m')

[33.612]

[34.554]

  Display_settings.column_width = Display_settings.column_width - 5*Display_settings.font:getWidth('m')

resolve conflicts

Dependencies

In channels

Change contents

Replacement in text.lua at line 30 [8.1]

Replacement in text.lua at line 170 [8.1]

Replacement in text.lua at line 192 [8.1]

Resurrecting zombie bytes in text.lua at line 549 [8.1]

Insertion in text.lua at line 549 [8.1]

Deletion in text.lua at line 551 [8.1]

Solving an order conflict in text.lua at line 551 [8.1]

Replacement in text.lua at line 863 [8.1]

Replacement in search.lua at line 17 [17.48846]

Deletion in search.lua at line 23 [17.48846]

Solving an order conflict in search.lua at line 23 [17.48846]

Replacement in run.lua at line 224 [20.178044]

Replacement in run.lua at line 233 [20.178044]