Merge lines.love

Dependencies

• [2] UVJ6OCOE Merge lines.love
• [3] PTICQ76Q Merge lines.love
• [4] 2CK5QI7W make love event names consistent
• [5] WDMPH4AN drop support for squares
• [6] OWK3U6VD tests for drawing polygons
• [7] S7ZZA3YE ugh, handle absolute as well as relative paths
• [8] PX7DDEMO autosave slightly less aggressively
• [9] JRLBUB6L more intuitive point delete from polygons
• [10] RT6EV6OP delegate update events to drawings
• [11] AVTNUQYR basic test-enabled framework
• [12] LF7BWEG4 group all editor globals
• [13] APYPFFS3 call edit rather than App callbacks in tests
• [14] 4AXV2HG4 all pending manual tests done!
• [15] JCSLDGAH beginnings of support for multiple shapes
• [16] OEUU62GM Merge upstream into main
• [17] 3QQZ7W4E bring couple more globals back to the app level
• [18] KKMFQDR4 editing source code from within the app
• [19] W7JMT5V2 rip out most support for polygons
• [20] APX2PY6G stop tracking wallclock time
• [21] 7DYUAOI6 test: undo moving point
• [22] EQP53UQV autosave slightly less aggressively
• [23] 2L5MEZV3 experiment: new edit namespace
• [24] 7CEOB56D Merge upstream into main
• [25] TGZAJUEF bring back a set of constants
• [26] LXW73CJ3 Merge lines.love
• [27] KVHUFUFV reorg
• [28] KAUD3YIK tests: deleting points/shapes
• [29] 27DROQW2 Merge upstream into main
• [30] OAHNWDYG .
• [31] XX7G2FFJ intermingle freehand line drawings with text
• [32] LNUHQOGH start passing in Editor_state explicitly
• [33] HRWN5V6J Devine's suggestion to try to live with just freehand
• [34] BCRJ6MHL Merge upstream into main
• [35] RZKXJYFK switch a bunch of tests to textinput events
• [36] 7S6CIN7I Merge upstream into main
• [37] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
• [*] OTIBCAUJ love2d scaffold
• [*] K2X6G75Z start writing some tests for drawings

Change contents

• resurrect zombie in main.lua at line 157
  [5.188672]→[5.58:63](∅→∅),[5.188672]→[5.58:63](∅→∅)
  + end

  +
• edit in main.lua at line 159
  [5.63]→[5.188673:188715](∅→∅),[5.8]→[5.188673:188715](∅→∅),[5.8]→[5.188673:188715](∅→∅)
  − function App.keychord_pressed(chord, key)
• resurrect zombie in main.lua at line 159
  [5.8]→[4.4537:4577](∅→∅),[5.8]→[4.4537:4577](∅→∅)
  + function App.keychord_press(chord, key)
• resolve order conflict in main.lua at line 159
  [5.63]

  [4.4537]
• resurrect zombie in main.lua at line 160
  [4.4577]→[5.188715:188787](∅→∅),[5.188715]→[5.188715:188787](∅→∅),[5.188715]→[5.188715:188787](∅→∅)
  + -- ignore events for some time after window in focus (mostly alt-tab)
• resurrect zombie in main.lua at line 162
  [5.619]→[5.188836:189596](∅→∅),[5.188836]→[5.188836:189596](∅→∅),[5.188836]→[5.188836:189596](∅→∅)
  + return

  + end

  + --

  + if chord == 'C-e' then

  + -- carefully save settings

  + if Current_app == 'run' then

  + local source_settings = Settings.source

  + Settings = run.settings()

  + Settings.source = source_settings

  + if run.quit then run.quit() end

  + Current_app = 'source'

  + elseif Current_app == 'source' then

  + Settings.source = source.settings()

  + if source.quit then source.quit() end

  + Current_app = 'run'

  + else

  + assert(false, 'unknown app "'..Current_app..'"')

  + end

  + Settings.current_app = Current_app

  + love.filesystem.write('config', json.encode(Settings))

  + -- reboot

  + load_file_from_source_or_save_directory('main.lua')

  + App.undo_initialize()

  + App.run_tests_and_initialize()

  + return
• replacement in drawing_tests.lua at line 249
  [5.4164]→[3.27:73](∅→∅)
  − edit.run_after_textinput(Editor_state, '5')
  [5.4164]

  [5.127]
  + edit.run_after_text_input(Editor_state, '5')
• edit in drawing_tests.lua at line 670
  [5.2215]→[3.75:75](∅→∅),[5.6915]→[4.7032:7096](∅→∅),[5.6915]→[4.7032:7096](∅→∅),[5.6915]→[4.7032:7096](∅→∅),[5.6996]→[4.7097:7158](∅→∅),[5.6996]→[4.7097:7158](∅→∅),[5.6996]→[4.7097:7158](∅→∅),[5.7077]→[4.7159:7220](∅→∅),[5.7077]→[4.7159:7220](∅→∅),[5.7077]→[4.7159:7220](∅→∅),[5.7378]→[4.7221:7285](∅→∅),[5.7378]→[4.7221:7285](∅→∅),[5.7378]→[4.7221:7285](∅→∅),[5.7459]→[4.7286:7347](∅→∅),[5.7459]→[4.7286:7347](∅→∅),[5.7459]→[4.7286:7347](∅→∅),[5.4564]→[4.6824:6887](∅→∅),[5.4564]→[4.6824:6887](∅→∅),[5.4564]→[4.6824:6887](∅→∅),[5.4645]→[4.6888:6935](∅→∅),[5.4645]→[4.6888:6935](∅→∅),[5.4645]→[4.6888:6935](∅→∅),[5.4726]→[4.6936:6983](∅→∅),[5.4726]→[4.6936:6983](∅→∅),[5.4726]→[4.6936:6983](∅→∅),[5.3256]→[4.6371:6435](∅→∅),[5.3256]→[4.6371:6435](∅→∅),[5.3256]→[4.6371:6435](∅→∅),[5.3337]→[4.6436:6497](∅→∅),[5.3337]→[4.6436:6497](∅→∅),[5.3337]→[4.6436:6497](∅→∅)
  −

  − edit.run_after_text_input(Editor_state, 'g') -- polygon mode

  − edit.run_after_text_input(Editor_state, 'p') -- add point

  − edit.run_after_text_input(Editor_state, 'p') -- add point

  − edit.run_after_text_input(Editor_state, 'g') -- polygon mode

  − edit.run_after_text_input(Editor_state, 'p') -- add point

  − edit.run_after_text_input(Editor_state, 's') -- square mode

  − edit.run_after_text_input(Editor_state, 'p')

  − edit.run_after_text_input(Editor_state, 'p')

  − edit.run_after_text_input(Editor_state, 'g') -- polygon mode

  − edit.run_after_text_input(Editor_state, 'p') -- add point
• resolve order conflict in drawing_tests.lua at line 670
  [5.2215]