Merge upstream into main

Dependencies

• [2] UVIDOW6Z Merge upstream into main
• [3] ERQKFTPV extract method
• [4] ZLEPKWDJ fork: capture frontend for a note-taking system
• [5] LF7BWEG4 group all editor globals
• [6] MSDHRXWU Merge upstream into main
• [7] R6GUSTBY default font size and line-height
• [8] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
• [9] YGCT2D2O start loading settings as applicable
• [10] ILOA5BYF separate data structure for each line's cache data
• [11] WQOSZSUE warn on unused commandline args
• [*] OTIBCAUJ love2d scaffold

Change contents

• edit in main.lua at line 44
  [4.197]→[2.42:42](∅→∅),[4.85498]→[3.8:44](∅→∅),[4.85498]→[3.8:44](∅→∅),[4.85498]→[3.8:44](∅→∅),[4.7698]→[3.45:81](∅→∅),[4.7698]→[3.45:81](∅→∅),[4.7698]→[3.45:81](∅→∅)
  −

  − edit.fixup_cursor(Editor_state)

  − edit.fixup_cursor(Editor_state)
• resolve order conflict in main.lua at line 44
  [4.197]

  [4.8]