akkartik/pothi.love - Change IBXNUZM7R2OUGL5TDRF7OUFYY53GTZMEFQ5VJRFQF47P3VWDVDJAC

Merge luaML.love

This one was hard until I realized I'm relying more on editor.width, and have to remember to keep it up to date.

Created by Kartik K. Agaram on April 2, 2023

IBXNUZM7R2OUGL5TDRF7OUFYY53GTZMEFQ5VJRFQF47P3VWDVDJAC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in text.lua at line 17 [8.1]
B:B[6.47] → [7.3:34]
BD:B[6.47] → [7.3:34]
BD:B[6.47] → [7.3:34]
```
  App.color(Line_number_color)
```

Insertion in text.lua at line 17 [8.1]

[11.1768]

[7.3]

  local final_screen_line_starting_pos = startpos  -- track value to return
  Text.populate_screen_line_starting_pos(State, line_index)

Deletion in text.lua at line 20 [8.1]

B:BD[7.34] → [12.3:92]

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

Resurrecting zombie bytes in text.lua at line 20 [8.1]
∅:∅[13.72] → [14.3:52]
∅:∅[12.92] → [14.3:52]
B:B[7.83] → [14.3:52]
BD:B[13.72] → [14.3:52]
BD:B[7.83] → [14.3:52]
BD:B[12.92] → [14.3:52]
```
  if fg == nil then
    initialize_color()
  end
```

Insertion in text.lua at line 20 [8.1]

[7.34]

[14.3]

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

Deletion in text.lua at line 24 [8.1]

B:BD[11.1984] → [14.53:130]

BD:BD[11.1984] → [14.53:130]

B:BD[11.1768] → [9.85:161]

∅:D[9.161] → [10.3:63]

B:BD[16.47] → [10.3:63]

    if fg then
      App.color(fg)
    else
      select_color(frag)
    end
  local final_screen_line_starting_pos = startpos  -- track value to return
  Text.populate_screen_line_starting_pos(State, line_index)

Solving an order conflict in text.lua at line 24 [8.1]
[14.52]
[9.162]
Deletion in text.lua at line 27 [8.1]
B:BD[9.319] → [4.7:25]
```
    App.color(fg)
```

Insertion in text.lua at line 39 [8.1]

[9.589]

[17.1056]

      end
      if fg then
        App.color(fg)
      else
        select_color(f)

Deletion in text.lua at line 45 [8.1]
B:BD[17.1066] → [9.590:618]
```
      App.color(Text_color)
```

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

B:B[18.1893] → [4.26:172]

BD:B[18.1893] → [4.26:172]

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

Deletion in text.lua at line 52 [8.1]
∅:D[4.172] → [19.3604:3632]
B:BD[20.1566] → [19.3604:3632]
BD:BD[20.1566] → [19.3604:3632]
B:BD[19.3632] → [4.174:174]
BD:BD[19.3632] → [4.174:174]
∅:D[4.174] → [9.888:961]
B:BD[21.774] → [9.888:961]
```
              App.color(fg)
              love.graphics.print(State.search_term, State.left+lo_px,y)
```
Resurrecting zombie bytes in text.lua at line 52 [8.1]
B:B[20.1566] → [14.131:173]
BD:B[20.1566] → [14.131:173]
```
              App.color(fg or Text_color)
```
Solving an order conflict in text.lua at line 52 [8.1]
[4.172]
[14.131]

Insertion in text.lua at line 53 [8.1]

[14.173]

[21.838]

              love.graphics.print(State.search_term, State.left+lo_px,y)

Replacement in text.lua at line 56 [8.1]

B:BD[19.3671] → [14.174:286]

B:BD[19.3671] → [4.176:176]

B:BD[4.176] → [4.177:281]

            Text.draw_cursor(State, x+Text.x(frag, State.cursor1.pos-pos+1), y, Cursor_color, fg or Text_color)
            Text.draw_cursor(State, State.left+Text.x(f, State.cursor1.pos-pos+1), y, Cursor_color, fg)

[19.3671]

[22.530]

            Text.draw_cursor(State, State.left+Text.x(f, State.cursor1.pos-pos+1), y, Cursor_color, fg or Text_color)

Deletion in text.lua at line 66 [8.1]
B:BD[23.1351] → [14.287:355]
BD:BD[23.1351] → [14.287:355]
```
      Text.draw_cursor(State, x, y, Cursor_color, fg or Text_color)
```
Replacement in main.lua at line 219 [25.2]
B:BD[24.697] → [24.697:746]
B:BD[24.697] → [24.697:746]
```
    HUD_text_cache[s] = App.newText(HUD_font, s)
```
[24.697]
[24.746]
```
    HUD_text_cache[s] = love.graphics.newText(HUD_font, s)
```
Deletion in main.lua at line 223 [25.2]
B:BD[24.783] → [24.783:806]
B:BD[24.783] → [24.783:806]
B:BD[24.806] → [26.178:178]
BD:BD[24.806] → [26.178:178]
B:BD[27.378] → [28.156:156]
∅:D[28.156] → [29.336:340]
B:BD[29.336] → [29.336:340]
```
-- use this sparingly
end
```

Replacement in 0711-update_editor_box at line 16 [2.1781]

B:BD[2.2396] → [2.2396:2485]

	node.editor.left = math.floor(vx(node.x)) + Line_number_width*App.width(node.editor.em)

[2.2396]

[2.2485]

	node.editor.left = math.floor(vx(node.x)) + Line_number_width*App.width('m')

Replacement in 0711-update_editor_box at line 18 [2.1781]
B:BD[2.2535] → [2.2535:2538]
```
end
```
[2.2535]
```
  node.editor.width = node.editor.right - node.editor.left
end
```
Deletion in 0680-box_height at line 11 [30.5323]
B:BD[30.5704] → [30.5704:5745]
```
		Text.compute_fragments(node.editor, i)
```
Replacement in 0680-box_height at line 16 [30.5323]
B:BD[30.5933] → [30.5933:5936]
```
end
```
[30.5933]
```
end
```

Replacement in 0678-initialize_editor at line 8 [31.1592]

B:BD[31.1982] → [31.1982:2063]

		obj.editor.left = obj.editor.left + Line_number_width*App.width(obj.editor.em)

[31.1982]

[31.2063]

		obj.editor.left = obj.editor.left + Line_number_width*App.width('m')
    obj.editor.width = obj.editor.right - obj.editor.left

Replacement in 0678-initialize_editor at line 13 [31.1592]
B:BD[31.2140] → [31.2140:2143]
```
end
```
[31.2140]
```
end
```
Replacement in 0677-draw_manifest_navigator at line 5 [32.1592]
B:BD[32.1757] → [32.1757:1801]
```
	draw_cursor(5 + App.width(filter_text), 5)
```
[32.1757]
[32.1948]
```
	draw_cursor(5 + filter_text:getWidth(), 5)
```
Replacement in 0676-num_lines_for_manifest_navigator at line 5 [32.2498]
B:BD[32.2622] → [32.2622:2666]
```
		local width = App.width(to_hud_text(def))
```
[32.2622]
[32.2666]
```
		local width = to_hud_text(def):getWidth()
```
Replacement in 0676-num_lines_for_manifest_navigator at line 13 [32.2498]
B:BD[32.2786] → [32.2786:2789]
```
end
```
[32.2786]
```
end
```
Replacement in 0640-add_def_to_menu at line 3 [33.8452]
B:BD[33.8537] → [33.8537:8570]
```
	local width = App.width(s_text)
```
[33.8537]
[33.8570]
```
	local width = s_text:getWidth()
```
Replacement in 0640-add_def_to_menu at line 21 [33.8452]
B:BD[33.9024] → [33.9024:9027]
```
end
```
[33.9024]
```
end
```
Replacement in 0637-manifest_index at line 5 [33.12626]
B:BD[33.12813] → [33.12813:12864]
```
		local width = App.width(to_hud_text(definition))
```
[33.12813]
[33.12864]
```
		local width = to_hud_text(definition):getWidth()
```
Replacement in 0637-manifest_index at line 24 [33.12626]
B:BD[33.13307] → [33.13307:13310]
```
end
```
[33.13307]
```
end
```
Replacement in 0636-manifest_coord at line 4 [33.14806]
B:BD[33.14934] → [33.14934:14985]
```
		local width = App.width(to_hud_text(definition))
```
[33.14934]
[33.14985]
```
		local width = to_hud_text(definition):getWidth()
```
Replacement in 0636-manifest_coord at line 14 [33.14806]
B:BD[33.15145] → [33.15145:15148]
```
end
```
[33.15145]
```
end
```
Replacement in 0616-add_hotkey_to_menu at line 3 [33.48625]
B:BD[33.48690] → [33.48690:48723]
```
	local width = App.width(s_text)
```
[33.48690]
[33.48723]
```
	local width = s_text:getWidth()
```
Replacement in 0616-add_hotkey_to_menu at line 10 [33.48625]
B:BD[33.48893] → [33.48893:48896]
```
end
```
[33.48893]
```
end
```

Merge luaML.love

Dependencies

In channels

Change contents

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

Insertion in text.lua at line 17 [8.1]

Deletion in text.lua at line 20 [8.1]

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

Insertion in text.lua at line 20 [8.1]

Deletion in text.lua at line 24 [8.1]

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

Deletion in text.lua at line 27 [8.1]

Insertion in text.lua at line 39 [8.1]

Deletion in text.lua at line 45 [8.1]

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

Deletion in text.lua at line 52 [8.1]

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

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

Insertion in text.lua at line 53 [8.1]

Replacement in text.lua at line 56 [8.1]

Deletion in text.lua at line 66 [8.1]

Replacement in main.lua at line 219 [25.2]

Deletion in main.lua at line 223 [25.2]

Replacement in 0711-update_editor_box at line 16 [2.1781]

Replacement in 0711-update_editor_box at line 18 [2.1781]

Deletion in 0680-box_height at line 11 [30.5323]

Replacement in 0680-box_height at line 16 [30.5323]

Replacement in 0678-initialize_editor at line 8 [31.1592]

Replacement in 0678-initialize_editor at line 13 [31.1592]

Replacement in 0677-draw_manifest_navigator at line 5 [32.1592]

Replacement in 0676-num_lines_for_manifest_navigator at line 5 [32.2498]

Replacement in 0676-num_lines_for_manifest_navigator at line 13 [32.2498]

Replacement in 0640-add_def_to_menu at line 3 [33.8452]

Replacement in 0640-add_def_to_menu at line 21 [33.8452]

Replacement in 0637-manifest_index at line 5 [33.12626]

Replacement in 0637-manifest_index at line 24 [33.12626]

Replacement in 0636-manifest_coord at line 4 [33.14806]

Replacement in 0636-manifest_coord at line 14 [33.14806]

Replacement in 0616-add_hotkey_to_menu at line 3 [33.48625]

Replacement in 0616-add_hotkey_to_menu at line 10 [33.48625]