{"header":{"message":"resolve conflicts","description":null,"timestamp":"2023-11-18T20:51:04.395703338Z","authors":[{}]},"hash":"VLTU33KW2BVZFSNENNEGWMFZNWSWSTOXS6NHG7NWW43N3NDCNLTAC","authors":[{"login":"akkartik","key":"ENKXrH63fceoGVoHiWDvj3iee63Bj7mkbzUE6uh6YAsS"}],"deps":{"hashes":[["VLTU33KW2BVZFSNENNEGWMFZNWSWSTOXS6NHG7NWW43N3NDCNLTAC","resolve conflicts"],["AA",null],["RO35V4H43CW3DC6W5UBL7BXSY5ATSO2FOBJUVUC72I6DTCRLINDQC","Merge text.love"],["NUJMQXN64UTFVNRFCJFNVJ7J4G5NVCQA4MFIFNBS626TRHCTESMQC","Merge text.love"],["CAG7PP5YB4GZLDUIYLOESJIY5D5NMMGDQ5SCY6HQ7VF2TCK3JLQQC","Merge text.love"],["KKQKPGCIHAG2JESQAWEMCBTAKBDC5AVIQ6LCZ2ORQM2AUCFQYLSQC","resolve conflicts"],["JIK7ZRYIWGJRXEHVI2O3HF2P7IZGJTWE6E2J5YHQQTMI72MFXNTAC","bugfix: imprecision in drawing"],["REAIVN7WJ3JMUKLX4BIACO2VMNHVTWLP3DMXPYD7PHVSYFFSV64QC","Merge lines.love"],["34BZ5ZKNAB4XQGXOPVBZHBDYD5D3X4V6T72XZSR5LJXF4UIVSWQAC","Merge lines.love"],["D2TYFYG2SQ5FH2ET3WXJ3HFJARQLN5WCMAYZVDTB4DLFRAP3YTSQC","Merge text.love"],["VHUNJHXB4BQISKAXTMVB66C4QKF2NUZQRPRB37Z7OADC7PW5IMRAC","Merge lines.love"],["DRFE3B3ZKRG4RY2R5Q3SDFD3LH4EXUX3CZCDFBNAXVI2SLDS57PAC","mouse buttons are integers, not strings"],["5SM6DRHKPLFWQPCZDTVM4ENVENWBYBQ3Q2KYKSWLWYUTOSEPCRLAC","port inscript's bugfix to source editor"],["ONHKBLLCD5NDO3HSSUMAMGJ7HDT53JYVV56DI42AEYI3W63GKACQC","Merge lines.love"],["R5QXEHUIZLELJGGCZAE7ATNS3CLRJ7JFRENMGH4XXH24C5WABZDQC","somebody stop me"],["SGMA5JLEDZ6KXLU7VBC3OSK4BSEZEPXUUERYWGAYB6ZCD2537I2AC","save the list of tests in repo"],["NFI42KGXEHTNACH2CATBLJIAXJYNV2C3QBPR2ORPJZKOVEREVM7QC","more correct absolute path detection"],["2CK5QI7WA7M4IVSACFGOJYAIDKRUTZVMMPSFWEJTUNMWTN7AX4NAC","make love event names consistent"],["MGJZHZC4XRDNP5U75XQRVUPKWLZYQOB3JLTSGTCMORBIII2HKHXQC","Merge lines.love"],["ATQO62TFDZ7J4RCOSB3K2QCCB5R6PNYQIIGNXTLZMEFG5UG5PUJQC","Merge lines.love"],["LXTTOB33N2HCUZFIUDRQGGBVHK2HODRG4NBLH6RXRQZDCHF27BSAC","extract a couple of files"],["2CFLXLIERFBJDB6WXTNPKWRSJBAFYY2C4VRMWXFKGGA3DCJQIJWAC","Merge text.love"],["C3NYQP57XGSNOG2R6MT2OIJWHVFW53VUTHOW7RVYP66OEBE6GVBQC","Merge lines.love"],["RIAFJLMZD4DCRT5J3YIRP4OTNZJTQR4Q7VWKYHDZY65MIFQ5RF3QC","Merge text.love"],["IGBTDA6YWCM6SRQCH5JL4GJLQDKI5JCG2QA7GF7WR24SLWSCSXEAC","Merge text.love"],["ZLJYLPOTXIVBVWJ4NTRM2YCQPT2FCSN7446P56MJFEFY45QTB7IAC","Merge lines.love"],["BULPIBEGL7TMK6CVIE7IS7WGAHGOSUJBGJSFQK542MOWGHP2ADQQC","beginnings of a module for the text editor"],["VXRYVZ742W7BR5G4USU3WISFUN4Y3P5OI5GWY32JECDI55R6B5XAC","Merge text.love"],["RU4HIK436ZRQJEPZXFS4FQTYVRL7BK5NWKYFGHFHZQOEOBF7M5SQC","Merge lines.love"],["KMSL74GAMFNTAKGDKZFP2AMQXUMOC3XH373BO4IABZWBEP3YAXKAC","support selections in the source editor"],["ED4Z6ORCADLWJPSZNKQVUF63NBKLQVE7UFMBTQAQA5O47X4NLFIAC","cleaner API for file-system access"],["36Z442IVPXHZ7D2QI26YLN3TDDEMDRQ2GKBYQAD6NUHQZVCCY4VAC","back to commit 8123959e52f without code editing"],["3OTESDW65UJ2W5RIXA6FNKRSD7TBCZTCCCEAYOQMEVGYZ6RCU34QC","move drawing.starty into line cache"],["MD3W5IRAC6UQALQE4LJC52VQNDO3I3HXF3XE2XHDABXBYJBUVAXQC","new fork: rip out drawing support"],["6LJZN727CRPYR34LV75CQF55YZI3E7MGESYZSFSYAE73SNEZE3FAC","handle chords"],["HYEAFRZ2UEKDYTAE2GDQLHEJBPQASP2NDLMXB7F6MTVK2BKOXKEAC","split mouse_pressed events between Text and Drawing"],["TLOAPLBJPPBAROMWGXUK6JIFEIR222YAB4JOYCARGAYDIOZDXSBQC","add a license"],["3QNOKBFMKBGXBVJIRHR2444JRRMBTABHE4674NR3DT67RRM2X6GAC","beginnings of a test harness"],["BLWAYPKV3MLDZ4ALXLUJ25AIR6PCIL4RFYNRYLB26GFVC2KQBYBAC","extract a module"],["N2NUGNN4E37TNLC6JZE4H4HKJZPNVBV4VYTLXW57AP5BOU4ZK7LQC","include a brief reference enabling many useful apps"],["4CTZOJPCTWYUSHLIZZJ2M5W7S4JZFZVT5MUU5XNSOIBS5L4UY5UQC","stop pretending globals are local"],["AVTNUQYRBW7IX2YQ3KDLVQ23RGW3BAKTAE7P73ASBYNKOHMQMH5AC","basic test-enabled framework"],["FM5LDKGT3WB343RD2HV7NTE4CGTMC77BTQNAQ5OSDPXD2PEWKWBAC","Merge text.love"],["LYN3L74WRXZI4KNNIMNLPRFQ36RAGPWNE2O5AMB42H3CSTI6QM6QC","correct commit f3abc2cbf2"],["K2X6G75Z6XBC4DVIRWC5HC7XA3A2SKOM3MWSQTCFEYWIJL7LME2QC","start writing some tests for drawings"],["2L5MEZV344TOZLVY3432RHJFIRVXFD6O3GWLL5O4CV66BGAFTURQC","experiment: new edit namespace"],["X43ZIKR3WHHUHTIBN76H25FLACL7SMKXXHFX7GDD552UF3V2UDPAC","Merge text.love"],["6VJTQKW7YJ7E3WRNSTFYULUDHHTYAE4JELX4J55LO75X4FDM3JZAC","start supporting LÖVE v12"],["ORKN6EOBUFVAD2TXYW5OIKSL55RU24LOFDTTTXHDZUZ57QRDCY7QC","Merge lines.love"],["3PSFWAILGRA4OYXWS2DX7VF332AIBPYBXHEA4GIQY2XEJVD65UMAC","Merge lines.love"],["BJ5X5O4ACBBJ56LRBBSTCW6IBQP4HAEOOOPNH3SKTA4F66YTOIDAC","let's prevent the text cursor from ever getting on a drawing"],["4SR3Z4Y3GAXFND3TENHV66Q4WD4KODNYL6PAVLSAEQ3WHLOX37HQC","document the version of LÖVE I've been using"],["4YDBYBA4H77LGAJHWRKVQSUGSYFNXKINO3VHFSQLU2XE36EIGO5AC","clean up memory leak experiments"],["C3GUE45IQNZNGKQVSINNGVVFEBWVWDT6Z4WVOEV5SQLGFUNPZXUQC","Merge text.love"],["JDZVBFEIBB5JVB7PJJMKFO4Z52NCEKFFFQ4B4QECCBRPEJ4EPGDQC","Merge lines.love"],["4HR3G5ZDDSRHUV4JQKUWGRP3PHIGGZIMDGEDB6TEZCNK3URVRBUQC","Merge text.love"],["PJ5PQAQEEWQDDEPKP3RURCFDX7SSUIH4GZJCDZ6E6UU6G55KB7KAC","record support for multiple versions"],["YF2ATH2QIIIMWNOH6IDNADNLUW3XUIYAMEUSTVM4EWMK2YWQ2OBAC","Merge lines.love"],["TBTRYEBPU7OOMGLGMFM6KF7CXXKH5R6YGAOOPGRLCJGRO7NN44VAC","Merge lines.love"],["G3DLS5OUO77V4MC6754KTETRCTVUBYBHMGR7MTV52IYYM7QA3ROQC","audit all asserts"],["RSZD5A7GI5MISRTDFFJ63VUSFUFF3R7SXA66J64CBHWHNEUBMICQC","forgot to add json.lua"],["XNFTJHC4QSHNSIWNN7K6QZEZ37GTQYKHS4EPNSVPQCUSWREROGIQC","split keyboard handling between Text and Drawing"],["OGUV4HSA7XGSQLUVWBAE3AE263Z7Z6G3BZOB4CN2AOYD2DEJMOZAC","remove some memory leaks from rendered fragments"],["D4B52CQ2QKG2HQKFUQOO5S2ME325DTW3PH2D7SBXCW4BPQFYG7CAC","Merge lines.love"],["QD4LOFQRYRXS5GCJLR4EKQPQBFYZA5CGRVJYVFT2U7GXZDAIUJNQC","Merge text.love"],["VBU5YHLRO5ZSKFWBJRX7DWQGWPEHEWZMRRVV2WMWDJ54PKUNYCNQC","Merge lines.love"],["VHQCNMARPMNBSIUFLJG7HVK4QGDNPCGNVFLHS3I4IGNVSV5MRLYQC","several more modules"],["A4STVUZI2VJL2XRTERNBUQBOFWZJK5VHMNYFWYZJD7KETR6UZAOQC","fix support for absolute paths in Windows"],["OTIBCAUJ3KDQJLVDN3A536DLZGNRYMGJLORZVR3WLCGXGO6UGO6AC","love2d scaffold"],["73OCE2MCBJJZZMN2KYPJTBOUCKBZAOQ2QIAMTGCNOOJ2AJAXFT2AC","after much struggle, a brute-force undo"],["AYX33NBCPCBFWEZI5KZXHP3Y2Q62GYVT4WHYJUYRIPYV67KPSYZAC","Merge lines.love"],["JOPVPUSAMMU6RFVDQR4NJC4GNNUFB7GPKVH7OS5FKCYS5QZ53VLQC","editing source code from within the app"],["EIPRCZQCZZ2LNF4V34R6CRVDUYNFGSUO2WZXYM3C5YNAWKSJQBLAC","Merge text.love"],["QXVD2RIFQPTO3H6J3IJHRHRDRBW6C6MLUWMCEDQ6Z75SW2TMRBIQC","add state arg to Drawing.mouse_released"],["VXORMHME4X64HL6AC7BVYMSYEAYASG6RENGUZ7PEIZ4YQJ7ZHBIQC","delete experimental REPL"],["2TQUKHBC2EB3WDBD5UL62DQYV7CV6B7OJYK7CHOEDNOZENSOG42AC","Merge lines.love"],["VP5KC4XZBKD536KCBFO47UKH74RNONENDCFJAHUMVUTPVPGJWD4AC","Merge lines.love"],["2CTN2IEF4ZCVZQORAEBXAUDANF6NYZA24GQ5PXK2WUDWYU5UV25QC","Merge lines.love"],["TVCPXAAU4P3K5MFYINH2MWDK3KGTQ2GE74TUNERYOONG2G5EYKMQC","rename"],["XX7G2FFJ4QCGQGD4REAW5QFHVYAKCFUPGZCK7L6DFGS5ISVBYBQQC","intermingle freehand line drawings with text"],["FS2ITYYHBLFT66YUC3ENPFYI2HOYHOVEPQIN7NQR6KF5MEK4NKZAC","record a known issue"],["3G723RV5YPWQQQ52OMKDQAQ2OXV6NGLFXLPNB7YXH5WZIYC7PQXQC","Merge text.love"],["KYNGDE2CKNOKUC2XMAS5MEU6YT2C3IW5SIZLOJE64G3ERT7BSWFAC","consistent names in a few more places"],["WPW3AVFS3WQVHNSCYVKX7ABWTQUUGVO4SXYCJZT2WOL6TOITX7EQC","more precise shape selection"],["M5JXTW56XOOHCPAXPRERPQHHJUNTLGYTDIKTRGQZVW2HVIBKSI5QC","Merge text.love"],["LWPFEZBIUTRAZGDLG44NUYAW7WXWUEW4C3VI57WDHEMGVKFZZ6VQC","Merge lines.love"],["2344TV56YERMZVRV4NPBVJSJWDPNUF43FFQAZ22EYUAZDUQU3JAQC","Merge lines.love"],["CE4LZV4TNXJT54CVGM3QANCBP42TMLMZWF2DBSMUYKAHILXIZEMQC","drop last couple of manual tests"],["66X36NZNEHWWURKSZ6G3XSC4CKQ7NTR4HYGDJGLHAUELMUAQC34AC","a little more prose describing manual_tests"],["T4FRZSYLUWDA4K3URU4MI33EGD4XWSM7FPSIRNMAEYQAFEDFGPZAC","delete an ancient, unused file"],["D2GCFTTT2RNUBFB243YTA4F2H5ZXFTFHBSKHLZ2CX4JSKRZFTUUQC","clean up repl functionality"],["KKMFQDR43ZWVCDRHQLWWX3FCWCFA3ZSXYOBRJNPHUQZR2XPKWULAC","editing source code from within the app"],["Q6RXCILQD7PV6XI44VJSLQZD3DHWOXTNIU5BFTEHHLBWDRQI4CVAC","Merge text.love"],["ISOFHXB2DX6IRN4HVBYWLADZM7QXQKRNAAS577G542KS4L6G5H3QC","App.width can no longer take a Text"],["KWIVKQQ7AANRG6R4ZRB5TDBZ2TZTXAXIR2P6JNT362KIAJ7JQ4VQC","Merge lines.love"],["MXSAHZN4AGTGEXFTMREVVYJLR2KY7X2Z4SUYKEPO2TGSVYR6N5MQC","Merge lines.love"],["JCXL74WVQ23V53EOCKA2NXQIYA5NNOXGN5WYC7ZW42EI2I6D5IJAC","bring back everything from commit a68647ae22"]],"deps":["RO35V4H43CW3DC6W5UBL7BXSY5ATSO2FOBJUVUC72I6DTCRLINDQC","NUJMQXN64UTFVNRFCJFNVJ7J4G5NVCQA4MFIFNBS626TRHCTESMQC","CAG7PP5YB4GZLDUIYLOESJIY5D5NMMGDQ5SCY6HQ7VF2TCK3JLQQC","KKQKPGCIHAG2JESQAWEMCBTAKBDC5AVIQ6LCZ2ORQM2AUCFQYLSQC"],"known":["R5QXEHUIZLELJGGCZAE7ATNS3CLRJ7JFRENMGH4XXH24C5WABZDQC","OTIBCAUJ3KDQJLVDN3A536DLZGNRYMGJLORZVR3WLCGXGO6UGO6AC","6LJZN727CRPYR34LV75CQF55YZI3E7MGESYZSFSYAE73SNEZE3FAC","XX7G2FFJ4QCGQGD4REAW5QFHVYAKCFUPGZCK7L6DFGS5ISVBYBQQC","D2GCFTTT2RNUBFB243YTA4F2H5ZXFTFHBSKHLZ2CX4JSKRZFTUUQC","RSZD5A7GI5MISRTDFFJ63VUSFUFF3R7SXA66J64CBHWHNEUBMICQC","T4FRZSYLUWDA4K3URU4MI33EGD4XWSM7FPSIRNMAEYQAFEDFGPZAC","VXORMHME4X64HL6AC7BVYMSYEAYASG6RENGUZ7PEIZ4YQJ7ZHBIQC","TLOAPLBJPPBAROMWGXUK6JIFEIR222YAB4JOYCARGAYDIOZDXSBQC","BJ5X5O4ACBBJ56LRBBSTCW6IBQP4HAEOOOPNH3SKTA4F66YTOIDAC","FS2ITYYHBLFT66YUC3ENPFYI2HOYHOVEPQIN7NQR6KF5MEK4NKZAC","BLWAYPKV3MLDZ4ALXLUJ25AIR6PCIL4RFYNRYLB26GFVC2KQBYBAC","BULPIBEGL7TMK6CVIE7IS7WGAHGOSUJBGJSFQK542MOWGHP2ADQQC","VHQCNMARPMNBSIUFLJG7HVK4QGDNPCGNVFLHS3I4IGNVSV5MRLYQC","XNFTJHC4QSHNSIWNN7K6QZEZ37GTQYKHS4EPNSVPQCUSWREROGIQC","HYEAFRZ2UEKDYTAE2GDQLHEJBPQASP2NDLMXB7F6MTVK2BKOXKEAC","3QNOKBFMKBGXBVJIRHR2444JRRMBTABHE4674NR3DT67RRM2X6GAC","TVCPXAAU4P3K5MFYINH2MWDK3KGTQ2GE74TUNERYOONG2G5EYKMQC","AVTNUQYRBW7IX2YQ3KDLVQ23RGW3BAKTAE7P73ASBYNKOHMQMH5AC","73OCE2MCBJJZZMN2KYPJTBOUCKBZAOQ2QIAMTGCNOOJ2AJAXFT2AC","LXTTOB33N2HCUZFIUDRQGGBVHK2HODRG4NBLH6RXRQZDCHF27BSAC","OGUV4HSA7XGSQLUVWBAE3AE263Z7Z6G3BZOB4CN2AOYD2DEJMOZAC","4YDBYBA4H77LGAJHWRKVQSUGSYFNXKINO3VHFSQLU2XE36EIGO5AC","DRFE3B3ZKRG4RY2R5Q3SDFD3LH4EXUX3CZCDFBNAXVI2SLDS57PAC","K2X6G75Z6XBC4DVIRWC5HC7XA3A2SKOM3MWSQTCFEYWIJL7LME2QC","66X36NZNEHWWURKSZ6G3XSC4CKQ7NTR4HYGDJGLHAUELMUAQC34AC","CE4LZV4TNXJT54CVGM3QANCBP42TMLMZWF2DBSMUYKAHILXIZEMQC","LYN3L74WRXZI4KNNIMNLPRFQ36RAGPWNE2O5AMB42H3CSTI6QM6QC","WPW3AVFS3WQVHNSCYVKX7ABWTQUUGVO4SXYCJZT2WOL6TOITX7EQC","4CTZOJPCTWYUSHLIZZJ2M5W7S4JZFZVT5MUU5XNSOIBS5L4UY5UQC","2L5MEZV344TOZLVY3432RHJFIRVXFD6O3GWLL5O4CV66BGAFTURQC","QXVD2RIFQPTO3H6J3IJHRHRDRBW6C6MLUWMCEDQ6Z75SW2TMRBIQC","3OTESDW65UJ2W5RIXA6FNKRSD7TBCZTCCCEAYOQMEVGYZ6RCU34QC","JIK7ZRYIWGJRXEHVI2O3HF2P7IZGJTWE6E2J5YHQQTMI72MFXNTAC","MD3W5IRAC6UQALQE4LJC52VQNDO3I3HXF3XE2XHDABXBYJBUVAXQC","JOPVPUSAMMU6RFVDQR4NJC4GNNUFB7GPKVH7OS5FKCYS5QZ53VLQC","KKMFQDR43ZWVCDRHQLWWX3FCWCFA3ZSXYOBRJNPHUQZR2XPKWULAC","2CTN2IEF4ZCVZQORAEBXAUDANF6NYZA24GQ5PXK2WUDWYU5UV25QC","3PSFWAILGRA4OYXWS2DX7VF332AIBPYBXHEA4GIQY2XEJVD65UMAC","VHUNJHXB4BQISKAXTMVB66C4QKF2NUZQRPRB37Z7OADC7PW5IMRAC","KMSL74GAMFNTAKGDKZFP2AMQXUMOC3XH373BO4IABZWBEP3YAXKAC","D4B52CQ2QKG2HQKFUQOO5S2ME325DTW3PH2D7SBXCW4BPQFYG7CAC","NFI42KGXEHTNACH2CATBLJIAXJYNV2C3QBPR2ORPJZKOVEREVM7QC","C3NYQP57XGSNOG2R6MT2OIJWHVFW53VUTHOW7RVYP66OEBE6GVBQC","AYX33NBCPCBFWEZI5KZXHP3Y2Q62GYVT4WHYJUYRIPYV67KPSYZAC","VBU5YHLRO5ZSKFWBJRX7DWQGWPEHEWZMRRVV2WMWDJ54PKUNYCNQC","ATQO62TFDZ7J4RCOSB3K2QCCB5R6PNYQIIGNXTLZMEFG5UG5PUJQC","A4STVUZI2VJL2XRTERNBUQBOFWZJK5VHMNYFWYZJD7KETR6UZAOQC","36Z442IVPXHZ7D2QI26YLN3TDDEMDRQ2GKBYQAD6NUHQZVCCY4VAC","VP5KC4XZBKD536KCBFO47UKH74RNONENDCFJAHUMVUTPVPGJWD4AC","2CK5QI7WA7M4IVSACFGOJYAIDKRUTZVMMPSFWEJTUNMWTN7AX4NAC","KYNGDE2CKNOKUC2XMAS5MEU6YT2C3IW5SIZLOJE64G3ERT7BSWFAC","ORKN6EOBUFVAD2TXYW5OIKSL55RU24LOFDTTTXHDZUZ57QRDCY7QC","C3GUE45IQNZNGKQVSINNGVVFEBWVWDT6Z4WVOEV5SQLGFUNPZXUQC","4SR3Z4Y3GAXFND3TENHV66Q4WD4KODNYL6PAVLSAEQ3WHLOX37HQC","2TQUKHBC2EB3WDBD5UL62DQYV7CV6B7OJYK7CHOEDNOZENSOG42AC","3G723RV5YPWQQQ52OMKDQAQ2OXV6NGLFXLPNB7YXH5WZIYC7PQXQC","REAIVN7WJ3JMUKLX4BIACO2VMNHVTWLP3DMXPYD7PHVSYFFSV64QC","Q6RXCILQD7PV6XI44VJSLQZD3DHWOXTNIU5BFTEHHLBWDRQI4CVAC","ISOFHXB2DX6IRN4HVBYWLADZM7QXQKRNAAS577G542KS4L6G5H3QC","ZLJYLPOTXIVBVWJ4NTRM2YCQPT2FCSN7446P56MJFEFY45QTB7IAC","QD4LOFQRYRXS5GCJLR4EKQPQBFYZA5CGRVJYVFT2U7GXZDAIUJNQC","KWIVKQQ7AANRG6R4ZRB5TDBZ2TZTXAXIR2P6JNT362KIAJ7JQ4VQC","2CFLXLIERFBJDB6WXTNPKWRSJBAFYY2C4VRMWXFKGGA3DCJQIJWAC","N2NUGNN4E37TNLC6JZE4H4HKJZPNVBV4VYTLXW57AP5BOU4ZK7LQC","PJ5PQAQEEWQDDEPKP3RURCFDX7SSUIH4GZJCDZ6E6UU6G55KB7KAC","MXSAHZN4AGTGEXFTMREVVYJLR2KY7X2Z4SUYKEPO2TGSVYR6N5MQC","EIPRCZQCZZ2LNF4V34R6CRVDUYNFGSUO2WZXYM3C5YNAWKSJQBLAC","2344TV56YERMZVRV4NPBVJSJWDPNUF43FFQAZ22EYUAZDUQU3JAQC","IGBTDA6YWCM6SRQCH5JL4GJLQDKI5JCG2QA7GF7WR24SLWSCSXEAC","JDZVBFEIBB5JVB7PJJMKFO4Z52NCEKFFFQ4B4QECCBRPEJ4EPGDQC","4HR3G5ZDDSRHUV4JQKUWGRP3PHIGGZIMDGEDB6TEZCNK3URVRBUQC","SGMA5JLEDZ6KXLU7VBC3OSK4BSEZEPXUUERYWGAYB6ZCD2537I2AC","5SM6DRHKPLFWQPCZDTVM4ENVENWBYBQ3Q2KYKSWLWYUTOSEPCRLAC","ONHKBLLCD5NDO3HSSUMAMGJ7HDT53JYVV56DI42AEYI3W63GKACQC","X43ZIKR3WHHUHTIBN76H25FLACL7SMKXXHFX7GDD552UF3V2UDPAC","LWPFEZBIUTRAZGDLG44NUYAW7WXWUEW4C3VI57WDHEMGVKFZZ6VQC","VXRYVZ742W7BR5G4USU3WISFUN4Y3P5OI5GWY32JECDI55R6B5XAC","RU4HIK436ZRQJEPZXFS4FQTYVRL7BK5NWKYFGHFHZQOEOBF7M5SQC","FM5LDKGT3WB343RD2HV7NTE4CGTMC77BTQNAQ5OSDPXD2PEWKWBAC","ED4Z6ORCADLWJPSZNKQVUF63NBKLQVE7UFMBTQAQA5O47X4NLFIAC","MGJZHZC4XRDNP5U75XQRVUPKWLZYQOB3JLTSGTCMORBIII2HKHXQC","RIAFJLMZD4DCRT5J3YIRP4OTNZJTQR4Q7VWKYHDZY65MIFQ5RF3QC","34BZ5ZKNAB4XQGXOPVBZHBDYD5D3X4V6T72XZSR5LJXF4UIVSWQAC","M5JXTW56XOOHCPAXPRERPQHHJUNTLGYTDIKTRGQZVW2HVIBKSI5QC","6VJTQKW7YJ7E3WRNSTFYULUDHHTYAE4JELX4J55LO75X4FDM3JZAC","YF2ATH2QIIIMWNOH6IDNADNLUW3XUIYAMEUSTVM4EWMK2YWQ2OBAC","D2TYFYG2SQ5FH2ET3WXJ3HFJARQLN5WCMAYZVDTB4DLFRAP3YTSQC","TBTRYEBPU7OOMGLGMFM6KF7CXXKH5R6YGAOOPGRLCJGRO7NN44VAC","G3DLS5OUO77V4MC6754KTETRCTVUBYBHMGR7MTV52IYYM7QA3ROQC"]},"hunks":[{"FileDel":{"deleted_names":[{"basename":"geom.lua","metadata":0},{"basename":"geom.lua","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":15049,"end":15081},"introduced_by":5},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":15081},"to":{"change":6,"start":11579,"end":11579},"introduced_by":5},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":15049,"end":15081},"introduced_by":5}],"inode":{"change":6,"pos":11579}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":11579},"to":{"change":5,"start":3654,"end":5082},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":5082},"to":{"change":6,"start":6684,"end":6750},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":12514},"to":{"change":6,"start":6684,"end":6750},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6750},"to":{"change":5,"start":5083,"end":8079},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":6,"pos":6750},"to":{"change":6,"start":12554,"end":13048},"introduced_by":6}],"inode":{"change":6,"pos":11579}},"content":[{"Del":"geom = {}\n\nfunction geom.on_shape(x,y, drawing, shape)\n if shape.mode == 'freehand' then\n return geom.on_freehand(x,y, drawing, shape)\n elseif shape.mode == 'line' then\n return geom.on_line(x,y, drawing, shape)\n elseif shape.mode == 'manhattan' then\n local p1 = drawing.points[shape.p1]\n local p2 = drawing.points[shape.p2]\n if p1.x == p2.x then\n if x ~= p1.x then return false end\n local y1,y2 = p1.y, p2.y\n if y1 > y2 then\n y1,y2 = y2,y1\n end\n return y >= y1-2 and y <= y2+2\n elseif p1.y == p2.y then\n if y ~= p1.y then return false end\n local x1,x2 = p1.x, p2.x\n if x1 > x2 then\n x1,x2 = x2,x1\n end\n return x >= x1-2 and x <= x2+2\n end\n elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then\n return geom.on_polygon(x,y, drawing, shape)\n elseif shape.mode == 'circle' then\n local center = drawing.points[shape.center]\n local dist = geom.dist(center.x,center.y, x,y)\n return dist > shape.radius*0.95 and dist < shape.radius*1.05\n elseif shape.mode == 'arc' then\n local center = drawing.points[shape.center]\n local dist = geom.dist(center.x,center.y, x,y)\n if dist < shape.radius*0.95 or dist > shape.radius*1.05 then\n return false\n end\n return geom.angle_between(center.x,center.y, x,y, shape.start_angle,shape.end_angle)\n elseif shape.mode == 'deleted' then\n else\n"},{"Del":" assert(false, ('unknown drawing mode %s'):format(shape.mode))\n"},{"Del":" end\nend\n\nfunction geom.on_freehand(x,y, drawing, shape)\n local prev\n for _,p in ipairs(shape.points) do\n if prev then\n if geom.on_line(x,y, drawing, {p1=prev, p2=p}) then\n return true\n end\n end\n prev = p\n end\n return false\nend\n\nfunction geom.on_line(x,y, drawing, shape)\n local p1,p2\n if type(shape.p1) == 'number' then\n p1 = drawing.points[shape.p1]\n p2 = drawing.points[shape.p2]\n else\n p1 = shape.p1\n p2 = shape.p2\n end\n if p1.x == p2.x then\n if math.abs(p1.x-x) > 2 then\n return false\n end\n local y1,y2 = p1.y,p2.y\n if y1 > y2 then\n y1,y2 = y2,y1\n end\n return y >= y1-2 and y <= y2+2\n end\n -- has the right slope and intercept\n local m = (p2.y - p1.y) / (p2.x - p1.x)\n local yp = p1.y + m*(x-p1.x)\n if yp < y-2 or yp > y+2 then\n return false\n end\n -- between endpoints\n local k = (x-p1.x) / (p2.x-p1.x)\n return k > -0.005 and k < 1.005\nend\n\nfunction geom.on_polygon(x,y, drawing, shape)\n local prev\n for _,p in ipairs(shape.vertices) do\n if prev then\n if geom.on_line(x,y, drawing, {p1=prev, p2=p}) then\n return true\n end\n end\n prev = p\n end\n return geom.on_line(x,y, drawing, {p1=shape.vertices[1], p2=shape.vertices[#shape.vertices]})\nend\n\n-- are (x3,y3) and (x4,y4) on the same side of the line between (x1,y1) and (x2,y2)\nfunction geom.same_side(x1,y1, x2,y2, x3,y3, x4,y4)\n if x1 == x2 then\n return math.sign(x3-x1) == math.sign(x4-x1)\n end\n if y1 == y2 then\n return math.sign(y3-y1) == math.sign(y4-y1)\n end\n local m = (y2-y1)/(x2-x1)\n return math.sign(m*(x3-x1) + y1-y3) == math.sign(m*(x4-x1) + y1-y4)\nend\n\nfunction math.sign(x)\n if x > 0 then\n return 1\n elseif x == 0 then\n return 0\n elseif x < 0 then\n return -1\n end\nend\n\nfunction geom.angle_with_hint(x1, y1, x2, y2, hint)\n local result = geom.angle(x1,y1, x2,y2)\n if hint then\n -- Smooth the discontinuity where angle goes from positive to negative.\n -- The hint is a memory of which way we drew it last time.\n while result > hint+math.pi/10 do\n result = result-math.pi*2\n end\n while result < hint-math.pi/10 do\n result = result+math.pi*2\n end\n end\n return result\nend\n\n-- result is from -π/2 to 3π/2, approximately adding math.atan2 from Lua 5.3\n-- (LÖVE is Lua 5.1)\nfunction geom.angle(x1,y1, x2,y2)\n local result = math.atan((y2-y1)/(x2-x1))\n if x2 < x1 then\n result = result+math.pi\n end\n return result\nend\n\n-- is the line between x,y and cx,cy at an angle between s and e?\nfunction geom.angle_between(ox,oy, x,y, s,e)\n local angle = geom.angle(ox,oy, x,y)\n if s > e then\n s,e = e,s\n end\n -- I'm not sure this is right or ideal..\n angle = angle-math.pi*2\n if s <= angle and angle <= e then\n return true\n end\n angle = angle+math.pi*2\n if s <= angle and angle <= e then\n return true\n end\n angle = angle+math.pi*2\n return s <= angle and angle <= e\nend\n\nfunction geom.dist(x1,y1, x2,y2) return ((x2-x1)^2+(y2-y1)^2)^0.5 end\n"},{"Del":" end\nend\n\nfunction geom.on_freehand(x,y, drawing, shape)\n local prev\n for _,p in ipairs(shape.points) do\n if prev then\n if geom.on_line(x,y, drawing, {p1=prev, p2=p}) then\n return true\n end\n end\n prev = p\n end\n return false\nend\n\nfunction geom.on_line(x,y, drawing, shape)\n local p1,p2\n if type(shape.p1) == 'number' then\n p1 = drawing.points[shape.p1]\n p2 = drawing.points[shape.p2]\n else\n p1 = shape.p1\n p2 = shape.p2\n end\n if p1.x == p2.x then\n"}]}},{"FileDel":{"deleted_names":[{"basename":"drawing.lua","metadata":0},{"basename":"drawing.lua","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":1542,"end":1577},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":1542,"end":1577},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":1577},"to":{"change":6,"start":98,"end":98},"introduced_by":6}],"inode":{"change":6,"pos":98}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":14400},"to":{"change":5,"start":8769,"end":8835},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":14879},"to":{"change":5,"start":8837,"end":8837},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":18327},"to":{"change":5,"start":8838,"end":8904},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":18674},"to":{"change":5,"start":8906,"end":8906},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":19871},"to":{"change":5,"start":8907,"end":8989},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1656},"to":{"change":5,"start":8990,"end":9067},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":21692},"to":{"change":5,"start":9069,"end":9069},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":24131},"to":{"change":5,"start":9070,"end":9183},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":25113},"to":{"change":5,"start":9184,"end":9294},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":26978},"to":{"change":5,"start":9295,"end":9375},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":27152},"to":{"change":5,"start":9377,"end":9377},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":35589},"to":{"change":5,"start":9378,"end":9440},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":40949},"to":{"change":5,"start":9441,"end":9507},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":41033},"to":{"change":5,"start":9508,"end":9580},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":42200},"to":{"change":5,"start":9582,"end":9582},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9580},"to":{"change":6,"start":41068,"end":42200},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9507},"to":{"change":6,"start":40989,"end":41033},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9440},"to":{"change":6,"start":35613,"end":39139},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9377},"to":{"change":6,"start":7524,"end":7570},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9375},"to":{"change":6,"start":27036,"end":27152},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9294},"to":{"change":6,"start":25160,"end":26978},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9183},"to":{"change":6,"start":24178,"end":25113},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9069},"to":{"change":6,"start":7466,"end":7523},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9067},"to":{"change":6,"start":20266,"end":21692},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":8989},"to":{"change":6,"start":19927,"end":20230},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":8906},"to":{"change":6,"start":883,"end":953},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":8904},"to":{"change":6,"start":18367,"end":18674},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":8837},"to":{"change":6,"start":7397,"end":7422},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":8835},"to":{"change":6,"start":14440,"end":14879},"introduced_by":5}],"inode":{"change":6,"pos":98}},"content":[{"Del":" assert(false, ('unknown drawing mode %s'):format(shape.mode))\n"},{"Del":""},{"Del":" assert(false, ('unknown drawing mode %s'):format(shape.mode))\n"},{"Del":""},{"Del":" assert(false, ('unknown drawing mode %s'):format(State.current_drawing_mode))\n"},{"Del":" assert(drawing.mode == 'drawing', 'Drawing.update: line is not a drawing')\n"},{"Del":""},{"Del":" assert(#drawing.pending.vertices <= 2, 'Drawing.mouse_release: rectangle has too many pending vertices')\n"},{"Del":" assert(#drawing.pending.vertices <= 2, 'Drawing.mouse_release: square has too many pending vertices')\n"},{"Del":" assert(false, ('unknown drawing mode %s'):format(drawing.pending.mode))\n"},{"Del":""},{"Del":" assert(idx, 'point to delete is not in vertices')\n"},{"Del":" assert(false, ('unknown drawing mode %s'):format(shape.mode))\n"},{"Del":" assert(shape.mode == 'freehand', 'can only smoothen freehand shapes')\n"},{"Del":""},{"Del":" for _=1,7 do\n for i=2,#shape.points-1 do\n local a = shape.points[i-1]\n local b = shape.points[i]\n local c = shape.points[i+1]\n b.x = round((a.x + b.x + c.x)/3)\n b.y = round((a.y + b.y + c.y)/3)\n end\n end\nend\n\nfunction round(num)\n return math.floor(num+.5)\nend\n\nfunction Drawing.find_or_insert_point(points, x,y, width)\n -- check if UI would snap the two points together\n for i,point in ipairs(points) do\n if Drawing.near(point, x,y, width) then\n return i\n end\n end\n table.insert(points, {x=x, y=y})\n return #points\nend\n\nfunction Drawing.near(point, x,y, width)\n local px,py = Drawing.pixels(x, width),Drawing.pixels(y, width)\n local cx,cy = Drawing.pixels(point.x, width), Drawing.pixels(point.y, width)\n return (cx-px)*(cx-px) + (cy-py)*(cy-py) < Same_point_distance*Same_point_distance\nend\n\nfunction Drawing.pixels(n, width) -- parts to pixels\n return math.floor(n*width/256)\nend\nfunction Drawing.coord(n, width) -- pixels to parts\n return math.floor(n*256/width)\nend\n\nfunction table.find(h, x)\n for k,v in pairs(h) do\n if v == x then\n return k\n end\n end\nend\n"},{"Del":" end\nend\n\nfunction Drawing.smoothen(shape)\n"},{"Del":" table.remove(shape.vertices, idx)\n if #shape.vertices < 3 then\n shape.mode = 'deleted'\n end\n else\n shape.mode = 'deleted'\n end\n end\n end\n drawing.points[i].deleted = true\n end\n local drawing,_,_,shape = Drawing.select_shape_at_mouse(State)\n if drawing then\n shape.mode = 'deleted'\n end\n elseif chord == 'C-h' and not App.mouse_down(1) then\n local drawing = Drawing.select_drawing_at_mouse(State)\n if drawing then\n drawing.show_help = true\n end\n elseif chord == 'escape' and App.mouse_down(1) then\n local _,drawing = Drawing.current_drawing(State)\n drawing.pending = {}\n end\nend\n\nfunction Drawing.complete_rectangle(firstx,firsty, secondx,secondy, x,y)\n if firstx == secondx then\n return x,secondy, x,firsty\n end\n if firsty == secondy then\n return secondx,y, firstx,y\n end\n local first_slope = (secondy-firsty)/(secondx-firstx)\n -- slope of second edge:\n -- -1/first_slope\n -- equation of line containing the second edge:\n -- y-secondy = -1/first_slope*(x-secondx)\n -- => 1/first_slope*x + y + (- secondy - secondx/first_slope) = 0\n -- now we want to find the point on this line that's closest to the mouse pointer.\n -- https://en.wikipedia.org/wiki/Distance_from_a_point_to_a_line#Line_defined_by_an_equation\n local a = 1/first_slope\n local c = -secondy - secondx/first_slope\n local thirdx = round(((x-a*y) - a*c) / (a*a + 1))\n local thirdy = round((a*(-x + a*y) - c) / (a*a + 1))\n -- slope of third edge = first_slope\n -- equation of line containing third edge:\n -- y - thirdy = first_slope*(x-thirdx)\n -- => -first_slope*x + y + (-thirdy + thirdx*first_slope) = 0\n -- now we want to find the point on this line that's closest to the first point\n local a = -first_slope\n local c = -thirdy + thirdx*first_slope\n local fourthx = round(((firstx-a*firsty) - a*c) / (a*a + 1))\n local fourthy = round((a*(-firstx + a*firsty) - c) / (a*a + 1))\n return thirdx,thirdy, fourthx,fourthy\nend\n\nfunction Drawing.complete_square(firstx,firsty, secondx,secondy, x,y)\n -- use x,y only to decide which side of the first edge to complete the square on\n local deltax = secondx-firstx\n local deltay = secondy-firsty\n local thirdx = secondx+deltay\n local thirdy = secondy-deltax\n if not geom.same_side(firstx,firsty, secondx,secondy, thirdx,thirdy, x,y) then\n deltax = -deltax\n deltay = -deltay\n thirdx = secondx+deltay\n thirdy = secondy-deltax\n end\n local fourthx = firstx+deltay\n local fourthy = firsty-deltax\n return thirdx,thirdy, fourthx,fourthy\nend\n\nfunction Drawing.current_drawing(State)\n local x, y = App.mouse_x(), App.mouse_y()\n for drawing_index,drawing in ipairs(State.lines) do\n if drawing.mode == 'drawing' then\n local line_cache = State.line_cache[drawing_index]\n if Drawing.in_drawing(drawing, line_cache, x,y, State.left,State.right) then\n return drawing_index,drawing,line_cache\n end\n end\n end\n return nil\nend\n\nfunction Drawing.select_shape_at_mouse(State)\n for drawing_index,drawing in ipairs(State.lines) do\n if drawing.mode == 'drawing' then\n local x, y = App.mouse_x(), App.mouse_y()\n local line_cache = State.line_cache[drawing_index]\n if Drawing.in_drawing(drawing, line_cache, x,y, State.left,State.right) then\n local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)\n for i,shape in ipairs(drawing.shapes) do\n"},{"Del":"function Drawing.keychord_press(State, chord)\n"},{"Del":" end\n State.lines.current_drawing.pending = {}\n State.lines.current_drawing = nil\n end\n end\nend\n\n"},{"Del":" if #drawing.pending.vertices == 2 then\n local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)\n if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then\n local first = drawing.points[drawing.pending.vertices[1]]\n local second = drawing.points[drawing.pending.vertices[2]]\n local thirdx,thirdy, fourthx,fourthy = Drawing.complete_square(first.x,first.y, second.x,second.y, mx,my)\n table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, thirdx,thirdy, State.width))\n table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, fourthx,fourthy, State.width))\n table.insert(drawing.shapes, drawing.pending)\n end\n end\n elseif drawing.pending.mode == 'circle' then\n local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)\n if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then\n local center = drawing.points[drawing.pending.center]\n drawing.pending.radius = round(geom.dist(center.x,center.y, mx,my))\n table.insert(drawing.shapes, drawing.pending)\n end\n elseif drawing.pending.mode == 'arc' then\n local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)\n if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then\n local center = drawing.points[drawing.pending.center]\n drawing.pending.end_angle = geom.angle_with_hint(center.x,center.y, mx,my, drawing.pending.end_angle)\n table.insert(drawing.shapes, drawing.pending)\n end\n elseif drawing.pending.mode == 'name' then\n -- drop it\n else\n"},{"Del":" if #drawing.pending.vertices == 2 then\n local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)\n if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then\n local first = drawing.points[drawing.pending.vertices[1]]\n local second = drawing.points[drawing.pending.vertices[2]]\n local thirdx,thirdy, fourthx,fourthy = Drawing.complete_rectangle(first.x,first.y, second.x,second.y, mx,my)\n table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, thirdx,thirdy, State.width))\n table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, fourthx,fourthy, State.width))\n table.insert(drawing.shapes, drawing.pending)\n end\n else\n -- too few points; draw nothing\n end\n elseif drawing.pending.mode == 'square' then\n"},{"Del":"function Drawing.mouse_release(State, x,y, mouse_button)\n"},{"Del":" local pmx, pmy = App.mouse_x(), App.mouse_y()\n local mx = Drawing.coord(pmx-State.left, State.width)\n local my = Drawing.coord(pmy-line_cache.starty, State.width)\n if App.mouse_down(1) then\n if Drawing.in_drawing(drawing, line_cache, pmx,pmy, State.left,State.right) then\n if drawing.pending.mode == 'freehand' then\n table.insert(drawing.pending.points, {x=mx, y=my})\n elseif drawing.pending.mode == 'move' then\n drawing.pending.target_point.x = mx\n drawing.pending.target_point.y = my\n Drawing.relax_constraints(drawing, drawing.pending.target_point_index)\n end\n end\n elseif State.current_drawing_mode == 'move' then\n if Drawing.in_drawing(drawing, line_cache, pmx, pmy, State.left,State.right) then\n drawing.pending.target_point.x = mx\n drawing.pending.target_point.y = my\n Drawing.relax_constraints(drawing, drawing.pending.target_point_index)\n end\n else\n -- do nothing\n end\nend\n\nfunction Drawing.relax_constraints(drawing, p)\n for _,shape in ipairs(drawing.shapes) do\n if shape.mode == 'manhattan' then\n if shape.p1 == p then\n shape.mode = 'line'\n elseif shape.p2 == p then\n shape.mode = 'line'\n end\n elseif shape.mode == 'rectangle' or shape.mode == 'square' then\n for _,v in ipairs(shape.vertices) do\n if v == p then\n shape.mode = 'polygon'\n end\n end\n end\n end\nend\n\n"},{"Del":" end\nend\n\n-- a couple of operations on drawings need to constantly check the state of the mouse\nfunction Drawing.update(State)\n if State.lines.current_drawing == nil then return end\n local drawing = State.lines.current_drawing\n local line_cache = State.line_cache[State.lines.current_drawing_index]\n"},{"Del":"function Drawing.mouse_press(State, drawing_index, x,y, mouse_button)\n"},{"Del":" end\nend\n\nfunction Drawing.in_drawing(drawing, line_cache, x,y, left,right)\n if line_cache.starty == nil then return false end -- outside current page\n local width = right-left\n return y >= line_cache.starty and y < line_cache.starty + Drawing.pixels(drawing.h, width) and x >= left and x < right\nend\n\n"},{"Del":" -- after mouse_release\n"},{"Del":" end\nend\n\nfunction Drawing.draw_pending_shape(drawing, top, left,right)\n local width = right-left\n local pmx,pmy = App.mouse_x(), App.mouse_y()\n local function px(x) return Drawing.pixels(x, width)+left end\n local function py(y) return Drawing.pixels(y, width)+top end\n local mx = Drawing.coord(pmx-left, width)\n local my = Drawing.coord(pmy-top, width)\n -- recreate pixels from coords to precisely mimic how the drawing will look\n"}]}},{"FileDel":{"deleted_names":[{"basename":"source_undo.lua","metadata":0},{"basename":"source_undo.lua","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":3520,"end":3559},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":3520,"end":3559},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":3559},"to":{"change":6,"start":68,"end":68},"introduced_by":6}],"inode":{"change":6,"pos":68}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1447},"to":{"change":5,"start":170,"end":231},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1494},"to":{"change":5,"start":232,"end":308},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":759},"to":{"change":5,"start":309,"end":373},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2464},"to":{"change":5,"start":374,"end":451},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2584},"to":{"change":5,"start":452,"end":537},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2775},"to":{"change":5,"start":538,"end":615},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2900},"to":{"change":5,"start":616,"end":701},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":701},"to":{"change":6,"start":2951,"end":3519},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":615},"to":{"change":6,"start":2818,"end":2900},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":537},"to":{"change":6,"start":2635,"end":2775},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":451},"to":{"change":6,"start":2507,"end":2584},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":373},"to":{"change":6,"start":802,"end":810},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":308},"to":{"change":6,"start":1521,"end":1850},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":231},"to":{"change":6,"start":1459,"end":1494},"introduced_by":5}],"inode":{"change":6,"pos":68}},"content":[{"Del":" assert(s, 'failed to snapshot operation for undo history')\n"},{"Del":" assert(#State.lines > 0, 'failed to snapshot operation for undo history')\n"},{"Del":" assert(false, ('unknown line mode %s'):format(line.mode))\n"},{"Del":" assert(from.start_line == to.start_line, 'failed to patch undo operation')\n"},{"Del":" assert(#to.lines == to.end_line-to.start_line+1, 'failed to patch undo operation')\n"},{"Del":" assert(from.start_line == to.start_line, 'failed to patch undo operation')\n"},{"Del":" assert(#to.lines == to.end_line-to.start_line+1, 'failed to patch undo operation')\n"},{"Del":" for i=1,#to.lines do\n table.insert(line_cache, to.start_line+i-1, {})\n end\nend\n\n-- https://stackoverflow.com/questions/640642/how-do-you-copy-a-lua-table-by-value/26367080#26367080\nfunction deepcopy(obj, seen)\n if type(obj) ~= 'table' then return obj end\n if seen and seen[obj] then return seen[obj] end\n local s = seen or {}\n local result = setmetatable({}, getmetatable(obj))\n s[obj] = result\n for k,v in pairs(obj) do\n result[deepcopy(k, s)] = deepcopy(v, s)\n end\n return result\nend\n\nfunction minmax(a, b)\n return math.min(a,b), math.max(a,b)\nend\n"},{"Del":" for i=from.end_line,from.start_line,-1 do\n table.remove(line_cache, i)\n end\n"},{"Del":" for i=1,#to.lines do\n table.insert(lines, to.start_line+i-1, to.lines[i])\n end\nend\n\nfunction patch_placeholders(line_cache, from, to)\n"},{"Del":" for i=from.end_line,from.start_line,-1 do\n table.remove(lines, i)\n end\n"},{"Del":" end\n"},{"Del":" if s < 1 then s = 1 end\n if s > #State.lines then s = #State.lines end\n if e < 1 then e = 1 end\n if e > #State.lines then e = #State.lines end\n -- compare with App.initialize_globals\n local event = {\n screen_top=deepcopy(State.screen_top1),\n selection=deepcopy(State.selection1),\n cursor=deepcopy(State.cursor1),\n"},{"Del":" if e == nil then\n e = s\n end\n"}]}},{"FileDel":{"deleted_names":[{"basename":"source_select.lua","metadata":0},{"basename":"source_select.lua","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":30050,"end":30091},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":30050,"end":30091},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":30091},"to":{"change":6,"start":23288,"end":23288},"introduced_by":6}],"inode":{"change":6,"pos":23288}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":25073},"to":{"change":6,"start":4636,"end":4732},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":25144},"to":{"change":6,"start":4733,"end":4829},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":25203},"to":{"change":6,"start":4830,"end":4967},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":28832},"to":{"change":6,"start":4968,"end":5036},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":29732},"to":{"change":6,"start":5037,"end":5105},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":5105},"to":{"change":6,"start":29754,"end":30049},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":5036},"to":{"change":6,"start":28854,"end":29732},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4967},"to":{"change":6,"start":25251,"end":25854},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4829},"to":{"change":6,"start":25175,"end":25203},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4732},"to":{"change":6,"start":25104,"end":25144},"introduced_by":6}],"inode":{"change":6,"pos":23288}},"content":[{"Del":" assert(maxl == line_index, ('maxl %d not equal to line_index %d'):format(maxl, line_index))\n"},{"Del":" assert(minl == line_index, ('minl %d not equal to line_index %d'):format(minl, line_index))\n"},{"Del":" assert(minl == maxl and minl == line_index, ('minl %d, maxl %d and line_index %d are not all equal'):format(minl, maxl, line_index))\n"},{"Del":" assert(minl < maxl, ('minl %d not < maxl %d'):format(minl, maxl))\n"},{"Del":" assert(minl < maxl, ('minl %d not < maxl %d'):format(minl, maxl))\n"},{"Del":" local result = {State.lines[minl].data:sub(min_offset)}\n for i=minl+1,maxl-1 do\n if State.lines[i].mode == 'text' then\n table.insert(result, State.lines[i].data)\n end\n end\n table.insert(result, State.lines[maxl].data:sub(1, max_offset-1))\n return table.concat(result, '\\n')\nend\n"},{"Del":" local rhs = State.lines[maxl].data:sub(max_offset)\n for i=maxl,minl+1,-1 do\n table.remove(State.lines, i)\n table.remove(State.line_cache, i)\n end\n State.lines[minl].data = State.lines[minl].data:sub(1, min_offset-1)..rhs\nend\n\nfunction Text.selection(State)\n if State.selection1.line == nil then return end\n -- min,max = sorted(State.selection1,State.cursor1)\n local minl,minp = State.selection1.line,State.selection1.pos\n local maxl,maxp = State.cursor1.line,State.cursor1.pos\n if minl > maxl then\n minl,maxl = maxl,minl\n minp,maxp = maxp,minp\n elseif minl == maxl then\n if minp > maxp then\n minp,maxp = maxp,minp\n end\n end\n local min_offset = Text.offset(State.lines[minl].data, minp)\n local max_offset = Text.offset(State.lines[maxl].data, maxp)\n if minl == maxl then\n return State.lines[minl].data:sub(min_offset, max_offset-1)\n end\n"},{"Del":" return minp,maxp\n end\nend\n\n-- draw highlight for line corresponding to (lo,hi) given an approximate x,y and pos on the same screen line\n-- Creates text objects every time, so use this sparingly.\n-- Returns some intermediate computation useful elsewhere.\nfunction Text.draw_highlight(State, line, x,y, pos, lo,hi)\n if lo then\n local lo_offset = Text.offset(line.data, lo)\n local hi_offset = Text.offset(line.data, hi)\n local pos_offset = Text.offset(line.data, pos)\n local lo_px\n if pos == lo then\n lo_px = 0\n else\n local before = line.data:sub(pos_offset, lo_offset-1)\n"},{"Del":" return minp,bpos\n else\n"},{"Del":" return apos,maxp\n elseif b_lt then\n"}]}},{"FileDel":{"deleted_names":[{"basename":"source_text.lua","metadata":0},{"basename":"source_text.lua","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":147125,"end":147164},"introduced_by":3},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":147125,"end":147164},"introduced_by":3},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":147164},"to":{"change":6,"start":83786,"end":83786},"introduced_by":3}],"inode":{"change":6,"pos":83786}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":87493},"to":{"change":5,"start":704,"end":795},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":97898},"to":{"change":5,"start":796,"end":873},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":102919},"to":{"change":5,"start":874,"end":1088},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":109190},"to":{"change":5,"start":1089,"end":1166},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":110604},"to":{"change":5,"start":1167,"end":1246},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":114899},"to":{"change":5,"start":1247,"end":1324},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":115058},"to":{"change":5,"start":1325,"end":1374},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":120443},"to":{"change":5,"start":1375,"end":1444},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":122669},"to":{"change":5,"start":1445,"end":1555},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":122810},"to":{"change":5,"start":1556,"end":1633},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":124061},"to":{"change":5,"start":1634,"end":1711},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":125663},"to":{"change":5,"start":1712,"end":1765},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4230},"to":{"change":5,"start":1766,"end":1819},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":9509},"to":{"change":5,"start":1820,"end":1928},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":9972},"to":{"change":5,"start":1929,"end":2104},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":130948},"to":{"change":5,"start":2105,"end":2172},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":135420},"to":{"change":5,"start":2173,"end":2222},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":138612},"to":{"change":5,"start":2223,"end":2271},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":139436},"to":{"change":5,"start":2272,"end":2320},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":140472},"to":{"change":5,"start":2321,"end":2402},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":142386},"to":{"change":5,"start":2403,"end":2489},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2489},"to":{"change":6,"start":142403,"end":142472},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2402},"to":{"change":6,"start":141153,"end":141205},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2320},"to":{"change":6,"start":139452,"end":139612},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2271},"to":{"change":6,"start":138628,"end":139436},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2222},"to":{"change":6,"start":135436,"end":136039},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2172},"to":{"change":6,"start":130982,"end":131053},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2104},"to":{"change":6,"start":10057,"end":10377},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1928},"to":{"change":6,"start":9558,"end":9780},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1819},"to":{"change":6,"start":4246,"end":4251},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1765},"to":{"change":6,"start":125679,"end":125684},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1711},"to":{"change":6,"start":124226,"end":124348},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1633},"to":{"change":6,"start":122927,"end":123003},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1555},"to":{"change":6,"start":122705,"end":122810},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1444},"to":{"change":6,"start":120477,"end":120565},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1374},"to":{"change":6,"start":115058,"end":115209},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1324},"to":{"change":6,"start":114899,"end":115058},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1246},"to":{"change":6,"start":110638,"end":111230},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1166},"to":{"change":6,"start":109301,"end":109662},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1088},"to":{"change":6,"start":102974,"end":103120},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":873},"to":{"change":6,"start":1487,"end":1852},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":795},"to":{"change":6,"start":307,"end":412},"introduced_by":5}],"inode":{"change":6,"pos":83786}},"content":[{"Del":" assert(#line_cache.screen_line_starting_pos >= 1, 'line cache missing screen line info')\n"},{"Del":" assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')\n"},{"Del":" assert(Text.le1(State.screen_top1, State.cursor1), ('screen_top (line=%d,pos=%d) is below cursor (line=%d,pos=%d)'):format(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos))\n"},{"Del":" assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')\n"},{"Del":" assert(screen_line_index > 1, 'bumped up against top screen line in line')\n"},{"Del":" assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')\n"},{"Del":" assert(State.cursor1.pos, 'cursor has no pos')\n"},{"Del":" assert(State.cursor1.pos > 1, 'bumped up against start of line')\n"},{"Del":" assert(end_offset > start_offset, ('end_offset %d not > start_offset %d'):format(end_offset, start_offset))\n"},{"Del":" assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')\n"},{"Del":" assert(State.lines[State.cursor1.line].mode == 'text', 'line is not text')\n"},{"Del":" assert(false, ('invalid pos %d'):format(loc1.pos))\n"},{"Del":" assert(false, ('invalid pos %d'):format(loc1.pos))\n"},{"Del":" assert(State.cursor1.line == #State.lines+1, 'tried to ensure bottom line of file is text, but failed')\n"},{"Del":" assert(top2.line > 1, 'tried to snap cursor to buttom of screen but failed')\n assert(State.lines[top2.line-1].mode == 'drawing', \"expected a drawing but it's not\")\n"},{"Del":" assert(my >= line_cache.starty, 'failed to map y pixel to line')\n"},{"Del":" assert(false, 'failed to map y pixel to line')\n"},{"Del":" assert(false, 'failed to map x pixel to pos')\n"},{"Del":" assert(false, 'failed to map x pixel to pos')\n"},{"Del":" assert(result.screen_pos, 'failed to convert schema-1 coordinate to schema-2')\n"},{"Del":" assert(result, \"Text.offset returned nil; this is likely a failure to handle utf8\")\n"},{"Del":" return result\nend\n\nfunction Text.previous_screen_line(State, loc2)\n"},{"Del":" return result\nend\n\nfunction Text.to1(State, loc2)\n"},{"Del":"end\n\nfunction Text.x_after(s, pos)\n local offset = Text.offset(s, math.min(pos+1, #s+1))\n local s_before = s:sub(1, offset-1)\n--? print('^'..s_before..'$')\n"},{"Del":"end\n\n-- return the nearest index of line (in utf8 code points) which lies entirely\n-- within x pixels of the left margin\n-- result: 0 to len+1\nfunction Text.nearest_pos_less_than(line, x)\n--? print('', '-- nearest_pos_less_than', line, x)\n local len = utf8.len(line)\n local max_x = Text.x_after(line, len)\n if x > max_x then\n return len+1\n end\n local left, right = 0, len+1\n while true do\n local curr = math.floor((left+right)/2)\n local currxmin = Text.x_after(line, curr+1)\n local currxmax = Text.x_after(line, curr+2)\n--? print('', x, left, right, curr, currxmin, currxmax)\n if currxmin <= x and x < currxmax then\n return curr\n end\n if left >= right-1 then\n return left\n end\n if currxmin > x then\n right = curr\n else\n left = curr\n end\n end\n"},{"Del":"end\n\nfunction Text.screen_line_width(State, line_index, i)\n local line = State.lines[line_index]\n local line_cache = State.line_cache[line_index]\n local start_pos = line_cache.screen_line_starting_pos[i]\n local start_offset = Text.offset(line.data, start_pos)\n local screen_line\n if i < #line_cache.screen_line_starting_pos then\n local past_end_pos = line_cache.screen_line_starting_pos[i+1]\n local past_end_offset = Text.offset(line.data, past_end_pos)\n screen_line = string.sub(line.data, start_offset, past_end_offset-1)\n else\n screen_line = string.sub(line.data, start_pos)\n end\n"},{"Del":" -- duplicate some logic from Text.draw\n local y = line_cache.starty\n"},{"Del":" -- We currently can't draw partial drawings, so either skip it entirely\n -- or not at all.\n local h = Drawing_padding_height + Drawing.pixels(State.lines[top2.line-1].h, State.width)\n if y - h < State.top then\n break\n end\n--? print('skipping drawing of height', h)\n y = y - h\n"},{"Del":" table.insert(State.lines, {mode='text', data=''})\n table.insert(State.line_cache, {})\n end\n--? print(y, App.screen.height, App.screen.height-State.line_height)\n if y > App.screen.height - State.line_height then\n"},{"Del":"end\n\n"},{"Del":"end\n\n"},{"Del":" if State.cursor1.pos <= utf8.len(State.lines[State.cursor1.line].data) then\n State.cursor1.pos = State.cursor1.pos+1\n"},{"Del":" if State.cursor1.pos > 1 then\n State.cursor1.pos = State.cursor1.pos-1\n"},{"Del":" local curr = s:sub(start_offset, end_offset-1)\n return curr:match(pat)\nend\n\nfunction Text.left(State)\n"},{"Del":" if Text.match(State.lines[State.cursor1.line].data, State.cursor1.pos-1, '%s') then\n"},{"Del":" if Text.cursor_at_final_screen_line(State) then\n -- line is done, skip to next text line\n--? print('cursor at final screen line of its line')\n"},{"Del":"--? print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)\n"},{"Del":" local new_screen_line_starting_pos = State.line_cache[State.cursor1.line].screen_line_starting_pos[screen_line_index-1]\n local new_screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, new_screen_line_starting_pos)\n local s = string.sub(State.lines[State.cursor1.line].data, new_screen_line_starting_byte_offset)\n State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1\n--? print('cursor pos is now '..tostring(State.cursor1.pos))\n end\n if Text.lt1(State.cursor1, State.screen_top1) then\n"},{"Del":"--? print('up', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)\n local screen_line_starting_pos, screen_line_index = Text.pos_at_start_of_screen_line(State, State.cursor1)\n if screen_line_starting_pos == 1 then\n--? print('cursor is at first screen line of its line')\n -- line is done; skip to previous text line\n"},{"Del":" schedule_save(State)\n record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})\n elseif chord == 'delete' then\n"},{"Del":" local byte_offset = Text.offset(State.lines[State.cursor1.line].data, State.cursor1.pos)\n State.lines[State.cursor1.line].data = string.sub(State.lines[State.cursor1.line].data, 1, byte_offset-1)..t..string.sub(State.lines[State.cursor1.line].data, byte_offset)\n Text.clear_screen_line_cache(State, State.cursor1.line)\n State.cursor1.pos = State.cursor1.pos+1\n"},{"Del":" for i=1,#line_cache.screen_line_starting_pos do\n local pos = line_cache.screen_line_starting_pos[i]\n"}]}},{"FileDel":{"deleted_names":[{"basename":"source_file.lua","metadata":0},{"basename":"source_file.lua","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":152462,"end":152501},"introduced_by":2},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":152462,"end":152501},"introduced_by":2},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":152501},"to":{"change":6,"start":150304,"end":150304},"introduced_by":2}],"inode":{"change":6,"pos":150304}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":11419},"to":{"change":5,"start":2493,"end":2543},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":12752},"to":{"change":5,"start":2544,"end":2612},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":14024},"to":{"change":5,"start":2613,"end":2681},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":14919},"to":{"change":5,"start":2682,"end":2730},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":16266},"to":{"change":5,"start":2731,"end":2799},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2799},"to":{"change":6,"start":16310,"end":16388},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2730},"to":{"change":6,"start":14933,"end":16266},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2681},"to":{"change":6,"start":14068,"end":14107},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2612},"to":{"change":6,"start":12796,"end":13023},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2543},"to":{"change":6,"start":11436,"end":12752},"introduced_by":5}],"inode":{"change":6,"pos":150304}},"content":[{"Del":" assert(line, 'drawing in file is incomplete')\n"},{"Del":" assert(false, ('unknown drawing mode %s'):format(shape.mode))\n"},{"Del":" assert(false, ('unknown drawing mode %s'):format(shape.mode))\n"},{"Del":" assert(i, 'drawing in array is incomplete')\n"},{"Del":" assert(false, ('unknown drawing mode %s'):format(shape.mode))\n"},{"Del":" end\n table.insert(drawing.shapes, shape)\n end\n return i, drawing\nend\n"},{"Del":"--? print(i)\n if line == '```' then break end\n local shape = json.decode(line)\n if shape.mode == 'freehand' then\n -- no changes needed\n elseif shape.mode == 'line' or shape.mode == 'manhattan' then\n local name = shape.p1.name\n shape.p1 = Drawing.find_or_insert_point(drawing.points, shape.p1.x, shape.p1.y, --[[large width to minimize overlap]] 1600)\n drawing.points[shape.p1].name = name\n name = shape.p2.name\n shape.p2 = Drawing.find_or_insert_point(drawing.points, shape.p2.x, shape.p2.y, --[[large width to minimize overlap]] 1600)\n drawing.points[shape.p2].name = name\n elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then\n for i,p in ipairs(shape.vertices) do\n local name = p.name\n shape.vertices[i] = Drawing.find_or_insert_point(drawing.points, p.x,p.y, --[[large width to minimize overlap]] 1600)\n drawing.points[shape.vertices[i]].name = name\n end\n elseif shape.mode == 'circle' or shape.mode == 'arc' then\n local name = shape.center.name\n shape.center = Drawing.find_or_insert_point(drawing.points, shape.center.x,shape.center.y, --[[large width to minimize overlap]] 1600)\n drawing.points[shape.center].name = name\n elseif shape.mode == 'deleted' then\n -- ignore\n else\n"},{"Del":" end\n end\n outfile:write('```\\n')\n"},{"Del":" end\n table.insert(drawing.shapes, shape)\n end\n return drawing\nend\n\nfunction store_drawing(outfile, drawing)\n outfile:write('```lines\\n')\n for _,shape in ipairs(drawing.shapes) do\n if shape.mode == 'freehand' then\n"},{"Del":" if line == '```' then break end\n local shape = json.decode(line)\n if shape.mode == 'freehand' then\n -- no changes needed\n elseif shape.mode == 'line' or shape.mode == 'manhattan' then\n local name = shape.p1.name\n shape.p1 = Drawing.find_or_insert_point(drawing.points, shape.p1.x, shape.p1.y, --[[large width to minimize overlap]] 1600)\n drawing.points[shape.p1].name = name\n name = shape.p2.name\n shape.p2 = Drawing.find_or_insert_point(drawing.points, shape.p2.x, shape.p2.y, --[[large width to minimize overlap]] 1600)\n drawing.points[shape.p2].name = name\n elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then\n for i,p in ipairs(shape.vertices) do\n local name = p.name\n shape.vertices[i] = Drawing.find_or_insert_point(drawing.points, p.x,p.y, --[[large width to minimize overlap]] 1600)\n drawing.points[shape.vertices[i]].name = name\n end\n elseif shape.mode == 'circle' or shape.mode == 'arc' then\n local name = shape.center.name\n shape.center = Drawing.find_or_insert_point(drawing.points, shape.center.x,shape.center.y, --[[large width to minimize overlap]] 1600)\n drawing.points[shape.center].name = name\n elseif shape.mode == 'deleted' then\n -- ignore\n else\n"}]}},{"FileDel":{"deleted_names":[{"basename":"source_edit.lua","metadata":0},{"basename":"source_edit.lua","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":165788,"end":165827},"introduced_by":3},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":165788,"end":165827},"introduced_by":3},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":165827},"to":{"change":6,"start":152503,"end":152503},"introduced_by":3}],"inode":{"change":6,"pos":152503}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":155492},"to":{"change":5,"start":2801,"end":3162},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":20018},"to":{"change":5,"start":3163,"end":3227},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":3227},"to":{"change":6,"start":156405,"end":156413},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":3162},"to":{"change":6,"start":155757,"end":155825},"introduced_by":5}],"inode":{"change":6,"pos":152503}},"content":[{"Del":" assert(#State.lines == #State.line_cache, ('line_cache is out of date; %d elements when it should be %d'):format(#State.line_cache, #State.lines))\n assert(Text.le1(State.screen_top1, State.cursor1), ('screen_top (line=%d,pos=%d) is below cursor (line=%d,pos=%d)'):format(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos))\n"},{"Del":" assert(false, ('unknown line mode %s'):format(line.mode))\n"},{"Del":" end\n"},{"Del":" State.cursor_x = nil\n State.cursor_y = nil\n local y = State.top\n"}]}},{"FileDel":{"deleted_names":[{"basename":"log_browser.lua","metadata":0},{"basename":"log_browser.lua","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":202684,"end":202723},"introduced_by":4},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":202684,"end":202723},"introduced_by":4},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":202723},"to":{"change":6,"start":191243,"end":191243},"introduced_by":4}],"inode":{"change":6,"pos":191243}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":177},"to":{"change":5,"start":3379,"end":3528},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1813},"to":{"change":5,"start":3529,"end":3647},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":3647},"to":{"change":6,"start":195458,"end":195713},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":3528},"to":{"change":6,"start":194325,"end":194910},"introduced_by":5}],"inode":{"change":6,"pos":191243}},"content":[{"Del":" assert(#State.lines == #State.line_cache, ('line_cache is out of date; %d elements when it should be %d'):format(#State.line_cache, #State.lines))\n"},{"Del":" else assert(line.section_end, \"log line has a section name, but it's neither the start nor end of a section\")\n"},{"Del":" local sectiony = y+State.line_height-Section_border_padding_vertical\n love.graphics.line(xleft,y, xleft,sectiony)\n love.graphics.line(xright,y, xright,sectiony)\n love.graphics.line(xleft,sectiony, xleft+50-2,sectiony)\n"},{"Del":" local mouse_line_index = log_browser.line_index(State, App.mouse_x(), App.mouse_y())\n local y = State.top\n for line_index = State.screen_top1.line,#State.lines do\n App.color(Text_color)\n local line = State.lines[line_index]\n if y + State.line_height > App.screen.height then break end\n local height = State.line_height\n if should_show(line) then\n local xleft = render_stack_left_margin(State, line_index, line, y)\n local xright = render_stack_right_margin(State, line_index, line, y)\n if line.section_name then\n App.color(Section_border_color)\n"}]}},{"FileDel":{"deleted_names":[{"basename":"commands.lua","metadata":0},{"basename":"commands.lua","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":207182,"end":207218},"introduced_by":3},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":2},"to":{"change":6,"start":207182,"end":207218},"introduced_by":3},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":207218},"to":{"change":6,"start":203826,"end":203826},"introduced_by":3}],"inode":{"change":6,"pos":203826}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3209},"to":{"change":5,"start":9584,"end":9630},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9630},"to":{"change":6,"start":3225,"end":3524},"introduced_by":5}],"inode":{"change":6,"pos":203826}},"content":[{"Del":" assert(index, 'file missing from manifest')\n"},{"Del":" table.remove(File_navigation.all_candidates, index)\n table.insert(File_navigation.all_candidates, 1, s)\nend\n\nfunction reset_file_navigator()\n Show_file_navigator = false\n File_navigation.index = 1\n File_navigation.filter = ''\n File_navigation.candidates = File_navigation.all_candidates\nend\n\n"}]}},{"Edit":{"inode":{"change":6,"pos":15083},"path":"file.lua","line":79,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1296},"to":{"change":5,"start":8401,"end":8401},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":1296},"to":{"change":5,"start":8401,"end":8401},"introduced_by":6}],"inode":{"change":6,"pos":15083}}},"contents":[{"Del":""}]}},{"SolveOrderConflict":{"inode":{"change":6,"pos":15083},"path":"file.lua","line":79,"atom":{"NewVertex":{"up_context":[{"change":97,"pos":3530}],"down_context":[],"flag":"","start":15,"end":15,"inode":{"change":6,"pos":15083}}},"contents":[]}}],"owner":"akkartik","repo":"sum-grid.love","token":"sqNixQGFVAwInJvVOodaByVQS4DK2X4kzrJxo44JXRQ=","login":null}

…

Dependencies

Change contents