{"header":{"message":"support drawings in the source editor","description":null,"timestamp":"2022-09-05T18:28:03Z","authors":[{"email":"vc@akkartik.com","name":"Kartik K. Agaram"}]},"hash":"OI4FPFINEROK6GNDEMOBTGSPYIULCLRGGT5W3H7VLM7VFH22GMWQC","authors":[],"deps":{"hashes":[["OI4FPFINEROK6GNDEMOBTGSPYIULCLRGGT5W3H7VLM7VFH22GMWQC","support drawings in the source editor"],["AA",null],["UN7L3DNN4Y3BCIA7SM6GYYWQG3OKVCH7ADPKAVF33E6QXY2HEJMQC","avoid some string concatenations"],["UPCIYZEUIFO2UJ3WPAFOD7VLNZEIIYYGJQGEMJOP5TSSE5PM4ZWAC","drop an unnecessary level of indent"],["E4HEHLRTRRIZZV4UMGVPG3LU4KJIPO5WFCBXHK7TG6YDURIEBVJQC","extract a variable"],["KV7GGVERB4IOIWQJUK2RYBZZEUDMLCAUV3DIX7J7JISDCYRIQCGAC","couple of accidental globals"],["KKMFQDR43ZWVCDRHQLWWX3FCWCFA3ZSXYOBRJNPHUQZR2XPKWULAC","editing source code from within the app"],["LSYLEVBDBZBGLSCXTRBW46WT4TUMMSPCH7M6HSNYI5SIH2WNPYEAC","drop some redundant args when clearing the cache"],["KURLAXXIKHKBL7UDFVIR26BI5FDO3ZFLIQASKVGJRDD3RETTOWNQC","clean up some prints"],["VHQCNMARPMNBSIUFLJG7HVK4QGDNPCGNVFLHS3I4IGNVSV5MRLYQC","several more modules"],["SVJZZDC3K6AKAXHGRNAZKRE2ZXEKJANNLG7LSSUZJARFBL5F7C4AC","snapshot - no, that's all wrong"],["2LOQ5ALJYHWSMU7ROSKD66BYGMK3O6HYNUQMGCZVKTRDOLEI75NQC","add args to some functions"],["PV2YA7KSWRCOKDS2WYO45WKE5L3CK56HPYT6DRVQRI3ZIE3B633AC","subsection headings in a long switch"],["EAEGCJV5JOW46KCZKKPBFKZ4Z3SDB3X4R7TLNXFWCIQN5UCNSXFQC","rename"],["ILOA5BYFTQKBSHLFMMZUVPQ2JXBFJD62ERQFBTDK2WSRXUN525VQC","separate data structure for each line's cache data"],["WJBZZQE4A4KLYGS2KA254I6VN2DVXDY4XKCNAE76GTMLLQGYCUOQC","fold together two largely similar cases"],["EGH7XDBKE3R74VXLNTCAP5LJTRBPFUEMPS647MJARDGCMUHJG2QQC","support non-text lines in Text.to2"],["X3F7ECSLGXCH6NBSDIH7LY47I4EG2RR5VFPEMM6ZVDYQIGFID4HQC","add state arg to some functions"],["QYIFOHW3WDDQMK4ATY6IOSQRFHJOQ5QCPDKRC4GVGWLQEH4HGWVQC","first test!"],["SPNMXTYRSNPNQJNBTYDZSHYDZVZRPM4LI5QX7GR2TLTC6SPJX4DAC","have file API operate on state object"],["KOYAJWE4NJ2J4X3SHEAVMRXYZPZGOMTI7OX3PTUQIDIZ2GQI6UKAC","extract a couple more methods"],["MXA3RZYKUI4UF2ISY7JEF6VKX6NOPZMZH5SLLCZHRJKFIXXXDPSAC","deduce left/right from state where possible"],["QCPXQ2E3USF3Z6R6WJ2JKHTRMPKA6QWXFKKRMLXA3MXABJEL543AC","add state arg to a few functions"],["CVSRHMJ2BM4LPVG67ULIVQMP2NW3YY2JC2ZQBEA6EB5KVM4O2L5AC","experiment: slightly adaptive scrolling"],["HOSPP2ANSW654DYRTC6CQUQA2GUKV6T2FI7QBKXD2DZS3R32IMGAC","crisp font rendering"],["LNUHQOGHIOFGJXNGA3DZLYEASLYYDGLN2I3EDZY5ANASQAHCG3YQC","start passing in Editor_state explicitly"],["VSBSWTE4IVQDRXLPQ7VTDIIEBEF7GMGRBHZ2IA73ZR6B2KZWI5JAC","bugfix: where cursor is drawn"],["ZPUQSPQPQFVRUIHGLAWW3IDBYODIWDHO62HAC3WWF5TM3CIJGHNQC","extract a few methods"],["2L5MEZV344TOZLVY3432RHJFIRVXFD6O3GWLL5O4CV66BGAFTURQC","experiment: new edit namespace"],["ODLKHO7BO2AODYO2OEQ6D4NSNBT5GR3CKLUXWMDLRYXL7DJOI7BAC","switch to line index in a function"],["X3CQLBTR7ICDAVFZZRLAWWJZI2SNZAMRUWW7O4R25DIKDUHL75CQC","set window title within each app"],["NDHQN23GI2IFUYGNYSO4BC467L37CQDDYL4C7NYCLD47QHOG6WFQC","done passing left/right margins everywhere"],["KECEMMMRW2VVBZ567HJQPGLC57LTSBKWH7UFP32IW43D23X6WTEQC","extract couple of functions"],["HGC5RGJPK34K5HRPG6FB7VIKOT6VTWVEC3CBYS5QVH5LVKAL6WGQC","switch to line index in a function"],["5USLYLBVMNECPWJHHCFMWMLEJFPWWRXN4XQZRA22XQ752U75GYVAC","duplicate"],["V5MJRFOZRVVDCPOWTLXPHS2HZBZKOOCPPKFMRP6MWZN6N62QLFAAC","bugfix: down arrow doesn't scroll up unnecessarily"],["2RXZ3PGOTTZ6M4R372JXIKPLBQKPVBMAXNPIEO2HZDN4EMYW4GNAC","beginning of a new approach to scroll+wrap"],["WQOSZSUESLH4YRMW3PIWGSEC7RS243324PBROJP2KPRFJ3NFSEZQC","warn on unused commandline args"],["PX3736DXTMOKZHWGZKY446VJQ4URULLXZTG34A3JYZRDWWE5ETKAC","better error message"],["M6TH7VSZQGKDB7SFNN5K52WWAX5VTVNT6GOKNKTXPVZBT6NEYDOQC","rip out notion of Line_width"],["LF7BWEG4DKQI7NMXMZC4LC2BE5PB42HK5PD6OYBNIDMAZBJASOKQC","group all editor globals"],["PFT5Y2ZYGQA6XXOZ5HH75WVUGA4B3KTDRHSFOZRAUKTPSFOPMNRAC","move"],["IMEJA43L3OX7S5KIYLZJ4F3ITACLAA5SZBHSCIJMULCPRSW7LXBAC","snapshot"],["F65ADDGLR2PNXVSM2XBHM3OSLQC2OTRR3GQBI7DJWIKPJCJ5CSOAC","add state arg to a few functions"],["5DOTWNVMOGN75GJMXXB4A56UAJYSNYC5WXPRT7QFMAAV27NWPP3AC","right margin"],["Z5HLXU4PJWWJJDBCK52NBD6PIRIA3TAN2BKZB5HBYFGIDBX4F5HAC","add state arg to a few functions"],["KZ5GAYRPWF2BA5VEIW3A4G2TULATBL7YEDGFJU42GBP5DET7BI3AC","this fixes the immediate regression"],["BULPIBEGL7TMK6CVIE7IS7WGAHGOSUJBGJSFQK542MOWGHP2ADQQC","beginnings of a module for the text editor"],["GNQC72UXBU6KYXW6MXLNRGTLXV2VPQXMVCLYMJT6POTFXSF5ASJAC","generalize a function"],["KOTI3MFGQ4PDS4I75JIJG734LTET6745VGTSMNFYYASVIO6H2KPAC","bugfix in previous commit"],["OTIBCAUJ3KDQJLVDN3A536DLZGNRYMGJLORZVR3WLCGXGO6UGO6AC","love2d scaffold"],["K464QQR4FTXFUMHFWAGOD5DJ6YHUBUKRHLXF2ORE74DVT7TVQ35QC","more defensive resize handling"]],"deps":["UN7L3DNN4Y3BCIA7SM6GYYWQG3OKVCH7ADPKAVF33E6QXY2HEJMQC","UPCIYZEUIFO2UJ3WPAFOD7VLNZEIIYYGJQGEMJOP5TSSE5PM4ZWAC","E4HEHLRTRRIZZV4UMGVPG3LU4KJIPO5WFCBXHK7TG6YDURIEBVJQC","KV7GGVERB4IOIWQJUK2RYBZZEUDMLCAUV3DIX7J7JISDCYRIQCGAC","KKMFQDR43ZWVCDRHQLWWX3FCWCFA3ZSXYOBRJNPHUQZR2XPKWULAC"],"known":["VHQCNMARPMNBSIUFLJG7HVK4QGDNPCGNVFLHS3I4IGNVSV5MRLYQC","PFT5Y2ZYGQA6XXOZ5HH75WVUGA4B3KTDRHSFOZRAUKTPSFOPMNRAC","SVJZZDC3K6AKAXHGRNAZKRE2ZXEKJANNLG7LSSUZJARFBL5F7C4AC","2RXZ3PGOTTZ6M4R372JXIKPLBQKPVBMAXNPIEO2HZDN4EMYW4GNAC","QYIFOHW3WDDQMK4ATY6IOSQRFHJOQ5QCPDKRC4GVGWLQEH4HGWVQC","IMEJA43L3OX7S5KIYLZJ4F3ITACLAA5SZBHSCIJMULCPRSW7LXBAC","V5MJRFOZRVVDCPOWTLXPHS2HZBZKOOCPPKFMRP6MWZN6N62QLFAAC","KECEMMMRW2VVBZ567HJQPGLC57LTSBKWH7UFP32IW43D23X6WTEQC","ZPUQSPQPQFVRUIHGLAWW3IDBYODIWDHO62HAC3WWF5TM3CIJGHNQC","KOYAJWE4NJ2J4X3SHEAVMRXYZPZGOMTI7OX3PTUQIDIZ2GQI6UKAC","EGH7XDBKE3R74VXLNTCAP5LJTRBPFUEMPS647MJARDGCMUHJG2QQC","HOSPP2ANSW654DYRTC6CQUQA2GUKV6T2FI7QBKXD2DZS3R32IMGAC","CVSRHMJ2BM4LPVG67ULIVQMP2NW3YY2JC2ZQBEA6EB5KVM4O2L5AC","WQOSZSUESLH4YRMW3PIWGSEC7RS243324PBROJP2KPRFJ3NFSEZQC","KZ5GAYRPWF2BA5VEIW3A4G2TULATBL7YEDGFJU42GBP5DET7BI3AC","M6TH7VSZQGKDB7SFNN5K52WWAX5VTVNT6GOKNKTXPVZBT6NEYDOQC","5DOTWNVMOGN75GJMXXB4A56UAJYSNYC5WXPRT7QFMAAV27NWPP3AC","PX3736DXTMOKZHWGZKY446VJQ4URULLXZTG34A3JYZRDWWE5ETKAC","2LOQ5ALJYHWSMU7ROSKD66BYGMK3O6HYNUQMGCZVKTRDOLEI75NQC","NDHQN23GI2IFUYGNYSO4BC467L37CQDDYL4C7NYCLD47QHOG6WFQC","2L5MEZV344TOZLVY3432RHJFIRVXFD6O3GWLL5O4CV66BGAFTURQC","LF7BWEG4DKQI7NMXMZC4LC2BE5PB42HK5PD6OYBNIDMAZBJASOKQC","LNUHQOGHIOFGJXNGA3DZLYEASLYYDGLN2I3EDZY5ANASQAHCG3YQC","X3F7ECSLGXCH6NBSDIH7LY47I4EG2RR5VFPEMM6ZVDYQIGFID4HQC","Z5HLXU4PJWWJJDBCK52NBD6PIRIA3TAN2BKZB5HBYFGIDBX4F5HAC","F65ADDGLR2PNXVSM2XBHM3OSLQC2OTRR3GQBI7DJWIKPJCJ5CSOAC","QCPXQ2E3USF3Z6R6WJ2JKHTRMPKA6QWXFKKRMLXA3MXABJEL543AC","MXA3RZYKUI4UF2ISY7JEF6VKX6NOPZMZH5SLLCZHRJKFIXXXDPSAC","WJBZZQE4A4KLYGS2KA254I6VN2DVXDY4XKCNAE76GTMLLQGYCUOQC","LSYLEVBDBZBGLSCXTRBW46WT4TUMMSPCH7M6HSNYI5SIH2WNPYEAC","ODLKHO7BO2AODYO2OEQ6D4NSNBT5GR3CKLUXWMDLRYXL7DJOI7BAC","HGC5RGJPK34K5HRPG6FB7VIKOT6VTWVEC3CBYS5QVH5LVKAL6WGQC","ILOA5BYFTQKBSHLFMMZUVPQ2JXBFJD62ERQFBTDK2WSRXUN525VQC","KURLAXXIKHKBL7UDFVIR26BI5FDO3ZFLIQASKVGJRDD3RETTOWNQC","VSBSWTE4IVQDRXLPQ7VTDIIEBEF7GMGRBHZ2IA73ZR6B2KZWI5JAC","SPNMXTYRSNPNQJNBTYDZSHYDZVZRPM4LI5QX7GR2TLTC6SPJX4DAC","EAEGCJV5JOW46KCZKKPBFKZ4Z3SDB3X4R7TLNXFWCIQN5UCNSXFQC","PV2YA7KSWRCOKDS2WYO45WKE5L3CK56HPYT6DRVQRI3ZIE3B633AC","5USLYLBVMNECPWJHHCFMWMLEJFPWWRXN4XQZRA22XQ752U75GYVAC","X3CQLBTR7ICDAVFZZRLAWWJZI2SNZAMRUWW7O4R25DIKDUHL75CQC"]},"hunks":[{"Replacement":{"inode":{"change":48,"pos":1},"path":"text.lua","line":118,"ins":{"up_context":[{"change":7,"pos":2940}],"down_context":[{"change":3,"pos":3}],"flag":"BLOCK","start":3,"end":120,"inode":{"change":48,"pos":1}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2940},"to":{"change":7,"start":211,"end":288},"introduced_by":7}],"inode":{"change":48,"pos":1}},"ins_contents":[{"Add":"--? print('x: '..tostring(x)..'; frag_width: '..tostring(frag_width)..'; '..tostring(State.right-x)..'px to go')"}],"del_contents":[{"Del":"--? print('x: '..tostring(x)..'; '..tostring(State.right-x)..'px to go')\n"}]}},{"Replacement":{"inode":{"change":48,"pos":1},"path":"text.lua","line":368,"ins":{"up_context":[{"change":7,"pos":242}],"down_context":[{"change":7,"pos":46}],"flag":"BLOCK","start":121,"end":174,"inode":{"change":48,"pos":1}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":302},"to":{"change":7,"start":2495,"end":2563},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2495},"to":{"change":7,"start":2495,"end":2563},"introduced_by":7}],"inode":{"change":48,"pos":1}},"ins_contents":[{"Add":" State.cursor1 = {line=State.cursor1.line+1, pos=1}"}],"del_contents":[{"Del":" State.cursor1.line = State.cursor1.line+1\n State.cursor1.pos = 1\n"}]}},{"Replacement":{"inode":{"change":48,"pos":1},"path":"text.lua","line":388,"ins":{"up_context":[{"change":7,"pos":858}],"down_context":[{"change":7,"pos":537}],"flag":"BLOCK","start":175,"end":250,"inode":{"change":48,"pos":1}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":858},"to":{"change":7,"start":3130,"end":3220},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3130},"to":{"change":7,"start":3130,"end":3220},"introduced_by":7}],"inode":{"change":48,"pos":1}},"ins_contents":[{"Add":" State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}"}],"del_contents":[{"Del":" State.cursor1.line = State.screen_top1.line\n State.cursor1.pos = State.screen_top1.pos\n"}]}},{"Replacement":{"inode":{"change":48,"pos":1},"path":"text.lua","line":407,"ins":{"up_context":[{"change":7,"pos":3234}],"down_context":[{"change":7,"pos":3318}],"flag":"BLOCK","start":251,"end":338,"inode":{"change":48,"pos":1}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3234},"to":{"change":7,"start":3506,"end":3614},"introduced_by":7}],"inode":{"change":48,"pos":1}},"ins_contents":[{"Add":" State.screen_top1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}"}],"del_contents":[{"Del":" State.screen_top1.line = State.screen_bottom1.line\n State.screen_top1.pos = State.screen_bottom1.pos\n"}]}},{"Replacement":{"inode":{"change":48,"pos":1},"path":"text.lua","line":410,"ins":{"up_context":[{"change":7,"pos":3692}],"down_context":[{"change":7,"pos":707}],"flag":"BLOCK","start":339,"end":414,"inode":{"change":48,"pos":1}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3692},"to":{"change":7,"start":3692,"end":3782},"introduced_by":7}],"inode":{"change":48,"pos":1}},"ins_contents":[{"Add":" State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}"}],"del_contents":[{"Del":" State.cursor1.line = State.screen_top1.line\n State.cursor1.pos = State.screen_top1.pos\n"}]}},{"Replacement":{"inode":{"change":48,"pos":1},"path":"text.lua","line":429,"ins":{"up_context":[{"change":7,"pos":657}],"down_context":[{"change":7,"pos":208}],"flag":"BLOCK","start":415,"end":476,"inode":{"change":48,"pos":1}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":657},"to":{"change":7,"start":4137,"end":4182},"introduced_by":7}],"inode":{"change":48,"pos":1}},"ins_contents":[{"Add":" State.cursor1 = {line=State.cursor1.line-1, pos=nil}"}],"del_contents":[{"Del":" State.cursor1.line = new_cursor_line\n"}]}},{"Replacement":{"inode":{"change":48,"pos":1},"path":"text.lua","line":468,"ins":{"up_context":[{"change":7,"pos":6283}],"down_context":[{"change":7,"pos":6440}],"flag":"BLOCK","start":477,"end":651,"inode":{"change":48,"pos":1}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6283},"to":{"change":7,"start":6283,"end":6328},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6328},"to":{"change":7,"start":1332,"end":1450},"introduced_by":7}],"inode":{"change":48,"pos":1}},"ins_contents":[{"Add":" State.cursor1 = {"},{"Add":" line = new_cursor_line,"},{"Add":" pos = Text.nearest_cursor_pos(State.lines[new_cursor_line].data, State.cursor_x, State.left),"},{"Add":" }"}],"del_contents":[{"Del":" State.cursor1.line = new_cursor_line\n"},{"Del":" State.cursor1.pos = Text.nearest_cursor_pos(State.lines[State.cursor1.line].data, State.cursor_x, State.left)\n"}]}},{"Edit":{"inode":{"change":48,"pos":1},"path":"text.lua","line":487,"atom":{"NewVertex":{"up_context":[{"change":49,"pos":224}],"down_context":[{"change":5,"pos":128}],"flag":"BLOCK","start":652,"end":722,"inode":{"change":48,"pos":1}}},"contents":[{"Add":" Text.populate_screen_line_starting_pos(State, State.cursor1.line)"}]}},{"Replacement":{"inode":{"change":48,"pos":1},"path":"text.lua","line":584,"ins":{"up_context":[{"change":7,"pos":428}],"down_context":[{"change":7,"pos":446}],"flag":"BLOCK","start":723,"end":858,"inode":{"change":48,"pos":1}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":428},"to":{"change":7,"start":428,"end":552},"introduced_by":7}],"inode":{"change":48,"pos":1}},"ins_contents":[{"Add":" State.cursor1 = {"},{"Add":" line = new_cursor_line,"},{"Add":" pos = utf8.len(State.lines[new_cursor_line].data) + 1,"},{"Add":" }"}],"del_contents":[{"Del":" State.cursor1.line = new_cursor_line\n State.cursor1.pos = utf8.len(State.lines[State.cursor1.line].data) + 1\n"}]}},{"Replacement":{"inode":{"change":48,"pos":1},"path":"text.lua","line":615,"ins":{"up_context":[{"change":7,"pos":1156}],"down_context":[{"change":7,"pos":984}],"flag":"BLOCK","start":859,"end":913,"inode":{"change":48,"pos":1}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1156},"to":{"change":7,"start":1156,"end":1231},"introduced_by":7}],"inode":{"change":48,"pos":1}},"ins_contents":[{"Add":" State.cursor1 = {line=new_cursor_line, pos=1}"}],"del_contents":[{"Del":" State.cursor1.line = new_cursor_line\n State.cursor1.pos = 1\n"}]}},{"Edit":{"inode":{"change":48,"pos":1},"path":"text.lua","line":666,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":2786}],"down_context":[{"change":7,"pos":2786}],"flag":"BLOCK","start":914,"end":973,"inode":{"change":48,"pos":1}}},"contents":[{"Add":"--? print('to2:', State.cursor1.line, State.cursor1.pos)"}]}},{"Edit":{"inode":{"change":48,"pos":1},"path":"text.lua","line":668,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":2832}],"down_context":[{"change":50,"pos":533}],"flag":"BLOCK","start":974,"end":1078,"inode":{"change":48,"pos":1}}},"contents":[{"Add":"--? print('to2: =>', top2.line, top2.screen_line, top2.screen_pos)"},{"Add":" -- slide to start of screen line"}]}},{"Edit":{"inode":{"change":48,"pos":1},"path":"text.lua","line":671,"atom":{"NewVertex":{"up_context":[{"change":50,"pos":580}],"down_context":[{"change":7,"pos":3087}],"flag":"BLOCK","start":1079,"end":1262,"inode":{"change":48,"pos":1}}},"contents":[{"Add":"--? print('snap', State.screen_top1.line, State.screen_top1.pos, State.screen_top1.posB, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)"}]}},{"Edit":{"inode":{"change":48,"pos":1},"path":"text.lua","line":701,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":3781}],"down_context":[{"change":7,"pos":3781}],"flag":"BLOCK","start":1263,"end":1425,"inode":{"change":48,"pos":1}}},"contents":[{"Add":"--? print('snap =>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)"}]}},{"Replacement":{"inode":{"change":48,"pos":1},"path":"text.lua","line":861,"ins":{"up_context":[{"change":7,"pos":109}],"down_context":[{"change":4,"pos":3}],"flag":"BLOCK","start":1426,"end":1460,"inode":{"change":48,"pos":1}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":109},"to":{"change":7,"start":143,"end":192},"introduced_by":7}],"inode":{"change":48,"pos":1}},"ins_contents":[{"Add":" local result = {line=loc1.line}"}],"del_contents":[{"Del":" local result = {line=loc1.line, screen_line=1}\n"}]}},{"Edit":{"inode":{"change":6,"pos":5},"path":"source_undo.lua","line":53,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":1787}],"down_context":[{"change":6,"pos":1787}],"flag":"BLOCK","start":1463,"end":1557,"inode":{"change":6,"pos":5}}},"contents":[{"Add":" current_drawing_mode=Drawing_mode,"},{"Add":" previous_drawing_mode=State.previous_drawing_mode,"}]}},{"Replacement":{"inode":{"change":6,"pos":5},"path":"source_undo.lua","line":63,"ins":{"up_context":[{"change":6,"pos":2014}],"down_context":[{"change":6,"pos":2080}],"flag":"BLOCK","start":1558,"end":2260,"inode":{"change":6,"pos":5}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2014},"to":{"change":6,"start":2014,"end":2080},"introduced_by":6}],"inode":{"change":6,"pos":5}},"ins_contents":[{"Add":" if line.mode == 'text' then"},{"Add":" table.insert(event.lines, {mode='text', data=line.data, dataB=line.dataB})"},{"Add":" elseif line.mode == 'drawing' then"},{"Add":" local points=deepcopy(line.points)"},{"Add":"--? print('copying', line.points, 'with', #line.points, 'points into', points)"},{"Add":" local shapes=deepcopy(line.shapes)"},{"Add":"--? print('copying', line.shapes, 'with', #line.shapes, 'shapes into', shapes)"},{"Add":" table.insert(event.lines, {mode='drawing', h=line.h, points=points, shapes=shapes, pending={}})"},{"Add":"--? table.insert(event.lines, {mode='drawing', h=line.h, points=deepcopy(line.points), shapes=deepcopy(line.shapes), pending={}})"},{"Add":" else"},{"Add":" print(line.mode)"},{"Add":" assert(false)"},{"Add":" end"}],"del_contents":[{"Del":" table.insert(event.lines, {data=line.data, dataB=line.dataB})\n"}]}},{"Edit":{"inode":{"change":6,"pos":3498},"path":"source_text_tests.lua","line":15,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":4179}],"down_context":[{"change":6,"pos":4179}],"flag":"BLOCK","start":2262,"end":3566,"inode":{"change":6,"pos":3498}}},"contents":[{"Add":"end"},{"Add":""},{"Add":"function test_click_to_create_drawing()"},{"Add":" io.write('\\ntest_click_to_create_drawing')"},{"Add":" App.screen.init{width=120, height=60}"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" edit.draw(Editor_state)"},{"Add":" edit.run_after_mouse_click(Editor_state, 8,Editor_state.top+8, 1)"},{"Add":" -- cursor skips drawing to always remain on text"},{"Add":" check_eq(#Editor_state.lines, 2, 'F - test_click_to_create_drawing/#lines')"},{"Add":" check_eq(Editor_state.cursor1.line, 2, 'F - test_click_to_create_drawing/cursor')"},{"Add":"end"},{"Add":""},{"Add":"function test_backspace_to_delete_drawing()"},{"Add":" io.write('\\ntest_backspace_to_delete_drawing')"},{"Add":" -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)"},{"Add":" App.screen.init{width=120, height=60}"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{'```lines', '```', ''}"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" -- cursor is on text as always (outside tests this will get initialized correctly)"},{"Add":" Editor_state.cursor1.line = 2"},{"Add":" -- backspacing deletes the drawing"},{"Add":" edit.run_after_keychord(Editor_state, 'backspace')"},{"Add":" check_eq(#Editor_state.lines, 1, 'F - test_backspace_to_delete_drawing/#lines')"},{"Add":" check_eq(Editor_state.cursor1.line, 1, 'F - test_backspace_to_delete_drawing/cursor')"}]}},{"Edit":{"inode":{"change":6,"pos":3498},"path":"source_text_tests.lua","line":724,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":34188}],"down_context":[{"change":6,"pos":34188}],"flag":"BLOCK","start":3567,"end":5256,"inode":{"change":6,"pos":3498}}},"contents":[{"Add":"end"},{"Add":""},{"Add":"function test_pagedown_skips_drawings()"},{"Add":" io.write('\\ntest_pagedown_skips_drawings')"},{"Add":" -- some lines of text with a drawing intermixed"},{"Add":" local drawing_width = 50"},{"Add":" App.screen.init{width=Editor_state.left+drawing_width, height=80}"},{"Add":" Editor_state = edit.initialize_test_state()"},{"Add":" Editor_state.lines = load_array{'abc', -- height 15"},{"Add":" '```lines', '```', -- height 25"},{"Add":" 'def', -- height 15"},{"Add":" 'ghi'} -- height 15"},{"Add":" Text.redraw_all(Editor_state)"},{"Add":" check_eq(Editor_state.lines[2].mode, 'drawing', 'F - test_pagedown_skips_drawings/baseline/lines')"},{"Add":" Editor_state.cursor1 = {line=1, pos=1}"},{"Add":" Editor_state.screen_top1 = {line=1, pos=1}"},{"Add":" Editor_state.screen_bottom1 = {}"},{"Add":" local drawing_height = Drawing_padding_height + drawing_width/2 -- default"},{"Add":" -- initially the screen displays the first line and the drawing"},{"Add":" -- 15px margin + 15px line1 + 10px margin + 25px drawing + 10px margin = 75px < screen height 80px"},{"Add":" edit.draw(Editor_state)"},{"Add":" local y = Editor_state.top"},{"Add":" App.screen.check(y, 'abc', 'F - test_pagedown_skips_drawings/baseline/screen:1')"},{"Add":" -- after pagedown the screen draws the drawing up top"},{"Add":" -- 15px margin + 10px margin + 25px drawing + 10px margin + 15px line3 = 75px < screen height 80px"},{"Add":" edit.run_after_keychord(Editor_state, 'pagedown')"},{"Add":" check_eq(Editor_state.screen_top1.line, 2, 'F - test_pagedown_skips_drawings/screen_top')"},{"Add":" check_eq(Editor_state.cursor1.line, 3, 'F - test_pagedown_skips_drawings/cursor')"},{"Add":" y = Editor_state.top + drawing_height"},{"Add":" App.screen.check(y, 'def', 'F - test_pagedown_skips_drawings/screen:1')"}]}},{"Replacement":{"inode":{"change":6,"pos":3498},"path":"source_text_tests.lua","line":1588,"ins":{"up_context":[{"change":6,"pos":80428}],"down_context":[{"change":6,"pos":80490}],"flag":"BLOCK","start":5257,"end":5331,"inode":{"change":6,"pos":3498}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":80428},"to":{"change":6,"start":80428,"end":80490},"introduced_by":6}],"inode":{"change":6,"pos":3498}},"ins_contents":[{"Add":" Editor_state.lines = load_array{'```lines', '```', 'def', 'ghi', 'deg'}"}],"del_contents":[{"Del":" Editor_state.lines = load_array{'abc', 'def', 'ghi', 'deg'}\n"}]}},{"Edit":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":56,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":85853},"to":{"change":6,"start":85853,"end":86007},"introduced_by":6}],"inode":{"change":6,"pos":83723}}},"contents":[{"Del":"--? if Foo then\n--? print('draw:', State.lines[line_index].data, \"=====\", State.lines[line_index].dataB, 'starting from x', x+AB_padding)\n--? end\n"}]}},{"Edit":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":196,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":91485}],"down_context":[{"change":6,"pos":91485}],"flag":"BLOCK","start":5333,"end":5374,"inode":{"change":6,"pos":83723}}},"contents":[{"Add":" if line.mode ~= 'text' then return end"}]}},{"Edit":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":223,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":92319}],"down_context":[{"change":6,"pos":92319}],"flag":"BLOCK","start":5375,"end":5416,"inode":{"change":6,"pos":83723}}},"contents":[{"Add":" if line.mode ~= 'text' then return end"}]}},{"Replacement":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":418,"ins":{"up_context":[{"change":6,"pos":101765}],"down_context":[{"change":6,"pos":102095}],"flag":"BLOCK","start":5417,"end":5961,"inode":{"change":6,"pos":83723}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":101765},"to":{"change":6,"start":101765,"end":102095},"introduced_by":6}],"inode":{"change":6,"pos":83723}},"ins_contents":[{"Add":" if State.lines[State.cursor1.line-1].mode == 'drawing' then"},{"Add":" table.remove(State.lines, State.cursor1.line-1)"},{"Add":" table.remove(State.line_cache, State.cursor1.line-1)"},{"Add":" else"},{"Add":" -- join lines"},{"Add":" State.cursor1.pos = utf8.len(State.lines[State.cursor1.line-1].data)+1"},{"Add":" State.lines[State.cursor1.line-1].data = State.lines[State.cursor1.line-1].data..State.lines[State.cursor1.line].data"},{"Add":" table.remove(State.lines, State.cursor1.line)"},{"Add":" table.remove(State.line_cache, State.cursor1.line)"},{"Add":" end"}],"del_contents":[{"Del":" -- join lines\n State.cursor1.pos = utf8.len(State.lines[State.cursor1.line-1].data)+1\n State.lines[State.cursor1.line-1].data = State.lines[State.cursor1.line-1].data..State.lines[State.cursor1.line].data\n table.remove(State.lines, State.cursor1.line)\n table.remove(State.line_cache, State.cursor1.line)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":478,"ins":{"up_context":[{"change":6,"pos":104895}],"down_context":[{"change":6,"pos":105160}],"flag":"BLOCK","start":5962,"end":6308,"inode":{"change":6,"pos":83723}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":104895},"to":{"change":6,"start":104895,"end":105160},"introduced_by":6}],"inode":{"change":6,"pos":83723}},"ins_contents":[{"Add":" if State.lines[State.cursor1.line+1].mode == 'text' then"},{"Add":" -- join lines"},{"Add":" State.lines[State.cursor1.line].data = State.lines[State.cursor1.line].data..State.lines[State.cursor1.line+1].data"},{"Add":" -- delete side B on first line"},{"Add":" State.lines[State.cursor1.line].dataB = State.lines[State.cursor1.line+1].dataB"},{"Add":" end"}],"del_contents":[{"Del":" -- join lines\n State.lines[State.cursor1.line].data = State.lines[State.cursor1.line].data..State.lines[State.cursor1.line+1].data\n -- delete side B on first line\n State.lines[State.cursor1.line].dataB = State.lines[State.cursor1.line+1].dataB\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":539,"ins":{"up_context":[{"change":6,"pos":106902}],"down_context":[{"change":6,"pos":107069}],"flag":"BLOCK","start":6309,"end":6489,"inode":{"change":6,"pos":83723}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":106902},"to":{"change":6,"start":106902,"end":107069},"introduced_by":6}],"inode":{"change":6,"pos":83723}},"ins_contents":[{"Add":" table.insert(State.lines, State.cursor1.line+1, {mode='text', data=string.sub(State.lines[State.cursor1.line].data, byte_offset), dataB=State.lines[State.cursor1.line].dataB})"}],"del_contents":[{"Del":" table.insert(State.lines, State.cursor1.line+1, {data=string.sub(State.lines[State.cursor1.line].data, byte_offset), dataB=State.lines[State.cursor1.line].dataB})\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":559,"ins":{"up_context":[{"change":6,"pos":107889}],"down_context":[{"change":6,"pos":107919}],"flag":"BLOCK","start":6490,"end":6769,"inode":{"change":6,"pos":83723}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":107889},"to":{"change":6,"start":107889,"end":107919},"introduced_by":6}],"inode":{"change":6,"pos":83723}},"ins_contents":[{"Add":" if State.lines[State.screen_top1.line].mode == 'text' then"},{"Add":" y = y - State.line_height"},{"Add":" elseif State.lines[State.screen_top1.line].mode == 'drawing' then"},{"Add":" y = y - Drawing_padding_height - Drawing.pixels(State.lines[State.screen_top1.line].h, State.width)"},{"Add":" end"}],"del_contents":[{"Del":" y = y - State.line_height\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":580,"ins":{"up_context":[{"change":6,"pos":108572}],"down_context":[{"change":6,"pos":108659}],"flag":"BLOCK","start":6770,"end":6889,"inode":{"change":6,"pos":83723}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":108572},"to":{"change":6,"start":108572,"end":108659},"introduced_by":6}],"inode":{"change":6,"pos":83723}},"ins_contents":[{"Add":" State.screen_top1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos, posB=State.screen_bottom1.posB}"}],"del_contents":[{"Del":" State.screen_top1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}\n"}]}},{"Edit":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":591,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":109127}],"down_context":[{"change":6,"pos":109127}],"flag":"BLOCK","start":6890,"end":6947,"inode":{"change":6,"pos":83723}}},"contents":[{"Add":" assert(State.lines[State.cursor1.line].mode == 'text')"}]}},{"Replacement":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":605,"ins":{"up_context":[{"change":6,"pos":109599}],"down_context":[{"change":6,"pos":110479}],"flag":"BLOCK","start":6948,"end":8019,"inode":{"change":6,"pos":83723}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":109599},"to":{"change":6,"start":109599,"end":110479},"introduced_by":6}],"inode":{"change":6,"pos":83723}},"ins_contents":[{"Add":" local new_cursor_line = State.cursor1.line"},{"Add":" while new_cursor_line > 1 do"},{"Add":" new_cursor_line = new_cursor_line-1"},{"Add":" if State.lines[new_cursor_line].mode == 'text' then"},{"Add":"--? print('found previous text line')"},{"Add":" State.cursor1 = {line=State.cursor1.line-1, pos=nil}"},{"Add":" Text.populate_screen_line_starting_pos(State, State.cursor1.line)"},{"Add":" -- previous text line found, pick its final screen line"},{"Add":"--? print('has multiple screen lines')"},{"Add":" local screen_line_starting_pos = State.line_cache[State.cursor1.line].screen_line_starting_pos"},{"Add":"--? print(#screen_line_starting_pos)"},{"Add":" screen_line_starting_pos = screen_line_starting_pos[#screen_line_starting_pos]"},{"Add":" local screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, screen_line_starting_pos)"},{"Add":" local s = string.sub(State.lines[State.cursor1.line].data, screen_line_starting_byte_offset)"},{"Add":" State.cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1"},{"Add":" break"},{"Add":" end"}],"del_contents":[{"Del":" if State.cursor1.line > 1 then\n--? print('found previous text line')\n State.cursor1 = {line=State.cursor1.line-1, pos=nil}\n Text.populate_screen_line_starting_pos(State, State.cursor1.line)\n -- previous text line found, pick its final screen line\n--? print('has multiple screen lines')\n local screen_line_starting_pos = State.line_cache[State.cursor1.line].screen_line_starting_pos\n--? print(#screen_line_starting_pos)\n screen_line_starting_pos = screen_line_starting_pos[#screen_line_starting_pos]\n local screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, screen_line_starting_pos)\n local s = string.sub(State.lines[State.cursor1.line].data, screen_line_starting_byte_offset)\n State.cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":645,"ins":{"up_context":[{"change":6,"pos":111628}],"down_context":[{"change":6,"pos":112363}],"flag":"BLOCK","start":8020,"end":8919,"inode":{"change":6,"pos":83723}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":111628},"to":{"change":6,"start":111628,"end":112363},"introduced_by":6}],"inode":{"change":6,"pos":83723}},"ins_contents":[{"Add":" local new_cursor_line = State.cursor1.line"},{"Add":" while new_cursor_line > 1 do"},{"Add":" new_cursor_line = new_cursor_line-1"},{"Add":" if State.lines[new_cursor_line].mode == 'text' then"},{"Add":" State.cursor1 = {line=State.cursor1.line-1, posB=nil}"},{"Add":" Text.populate_screen_line_starting_pos(State, State.cursor1.line)"},{"Add":" local prev_line_cache = State.line_cache[State.cursor1.line]"},{"Add":" local prev_screen_line_starting_pos = prev_line_cache.screen_line_starting_pos[#prev_line_cache.screen_line_starting_pos]"},{"Add":" local prev_screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, prev_screen_line_starting_pos)"},{"Add":" local s = string.sub(State.lines[State.cursor1.line].data, prev_screen_line_starting_byte_offset)"},{"Add":" State.cursor1.pos = prev_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1"},{"Add":" break"},{"Add":" end"}],"del_contents":[{"Del":" if State.cursor1.line > 1 then\n State.cursor1.line = State.cursor1.line-1\n State.cursor1.posB = nil\n Text.populate_screen_line_starting_pos(State, State.cursor1.line)\n local prev_line_cache = State.line_cache[State.cursor1.line]\n local prev_screen_line_starting_pos = prev_line_cache.screen_line_starting_pos[#prev_line_cache.screen_line_starting_pos]\n local prev_screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, prev_screen_line_starting_pos)\n local s = string.sub(State.lines[State.cursor1.line].data, prev_screen_line_starting_byte_offset)\n State.cursor1.pos = prev_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1\n"}]}},{"Edit":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":696,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":114836}],"down_context":[{"change":6,"pos":114836}],"flag":"BLOCK","start":8920,"end":8977,"inode":{"change":6,"pos":83723}}},"contents":[{"Add":" assert(State.lines[State.cursor1.line].mode == 'text')"}]}},{"Replacement":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":701,"ins":{"up_context":[{"change":6,"pos":115146}],"down_context":[{"change":6,"pos":115402}],"flag":"BLOCK","start":8978,"end":9404,"inode":{"change":6,"pos":83723}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":115146},"to":{"change":6,"start":115146,"end":115402},"introduced_by":6}],"inode":{"change":6,"pos":83723}},"ins_contents":[{"Add":" local new_cursor_line = State.cursor1.line"},{"Add":" while new_cursor_line < #State.lines do"},{"Add":" new_cursor_line = new_cursor_line+1"},{"Add":" if State.lines[new_cursor_line].mode == 'text' then"},{"Add":" State.cursor1 = {"},{"Add":" line = new_cursor_line,"},{"Add":" pos = Text.nearest_cursor_pos(State.lines[new_cursor_line].data, State.cursor_x, State.left),"},{"Add":" }"},{"Add":"--? print(State.cursor1.pos)"},{"Add":" break"},{"Add":" end"}],"del_contents":[{"Del":" if State.cursor1.line < #State.lines then\n State.cursor1 = {\n line = State.cursor1.line+1,\n pos = Text.nearest_cursor_pos(State.lines[State.cursor1.line+1].data, State.cursor_x, State.left)\n }\n--? print(State.cursor1.pos)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":766,"ins":{"up_context":[{"change":6,"pos":118525}],"down_context":[{"change":6,"pos":118591}],"flag":"BLOCK","start":9405,"end":9512,"inode":{"change":6,"pos":83723}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":118525},"to":{"change":6,"start":118525,"end":118591},"introduced_by":6}],"inode":{"change":6,"pos":83723}},"ins_contents":[{"Add":" State.screen_top1 = {line=State.cursor1.line, pos=State.cursor1.pos, posB=State.cursor1.posB} -- copy"}],"del_contents":[{"Del":" State.screen_top1 = {line=State.cursor1.line, pos=1} -- copy\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":948,"ins":{"up_context":[{"change":6,"pos":122940}],"down_context":[{"change":6,"pos":123106}],"flag":"BLOCK","start":9513,"end":9867,"inode":{"change":6,"pos":83723}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":122940},"to":{"change":6,"start":122940,"end":123106},"introduced_by":6}],"inode":{"change":6,"pos":83723}},"ins_contents":[{"Add":" else"},{"Add":" local new_cursor_line = State.cursor1.line"},{"Add":" while new_cursor_line > 1 do"},{"Add":" new_cursor_line = new_cursor_line-1"},{"Add":" if State.lines[new_cursor_line].mode == 'text' then"},{"Add":" State.cursor1 = {"},{"Add":" line = new_cursor_line,"},{"Add":" pos = utf8.len(State.lines[new_cursor_line].data) + 1,"},{"Add":" }"},{"Add":" break"},{"Add":" end"},{"Add":" end"}],"del_contents":[{"Del":" elseif State.cursor1.line > 1 then\n State.cursor1 = {\n line = State.cursor1.line-1,\n pos = utf8.len(State.lines[State.cursor1.line-1].data) + 1,\n }\n"}]}},{"Edit":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":991,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":123998}],"down_context":[{"change":6,"pos":123998}],"flag":"BLOCK","start":9868,"end":9925,"inode":{"change":6,"pos":83723}}},"contents":[{"Add":" assert(State.lines[State.cursor1.line].mode == 'text')"}]}},{"Replacement":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":1002,"ins":{"up_context":[{"change":6,"pos":124285}],"down_context":[{"change":6,"pos":124391}],"flag":"BLOCK","start":9926,"end":10213,"inode":{"change":6,"pos":83723}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":124285},"to":{"change":6,"start":124285,"end":124391},"introduced_by":6}],"inode":{"change":6,"pos":83723}},"ins_contents":[{"Add":" else"},{"Add":" local new_cursor_line = State.cursor1.line"},{"Add":" while new_cursor_line <= #State.lines-1 do"},{"Add":" new_cursor_line = new_cursor_line+1"},{"Add":" if State.lines[new_cursor_line].mode == 'text' then"},{"Add":" State.cursor1 = {line=new_cursor_line, pos=1}"},{"Add":" break"},{"Add":" end"},{"Add":" end"}],"del_contents":[{"Del":" elseif State.cursor1.line <= #State.lines-1 then\n State.cursor1 = {line=State.cursor1.line+1, pos=1}\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":1017,"ins":{"up_context":[{"change":6,"pos":124571}],"down_context":[{"change":6,"pos":124622}],"flag":"BLOCK","start":10214,"end":10221,"inode":{"change":6,"pos":83723}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":124571},"to":{"change":6,"start":124571,"end":124622},"introduced_by":6}],"inode":{"change":6,"pos":83723}},"ins_contents":[{"Add":" else"}],"del_contents":[{"Del":" elseif State.cursor1.line <= #State.lines-1 then\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":1019,"ins":{"up_context":[{"change":6,"pos":124655}],"down_context":[{"change":6,"pos":124710}],"flag":"BLOCK","start":10222,"end":10502,"inode":{"change":6,"pos":83723}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":124655},"to":{"change":6,"start":124655,"end":124710},"introduced_by":6}],"inode":{"change":6,"pos":83723}},"ins_contents":[{"Add":" local new_cursor_line = State.cursor1.line"},{"Add":" while new_cursor_line <= #State.lines-1 do"},{"Add":" new_cursor_line = new_cursor_line+1"},{"Add":" if State.lines[new_cursor_line].mode == 'text' then"},{"Add":" State.cursor1 = {line=new_cursor_line, pos=1}"},{"Add":" break"},{"Add":" end"},{"Add":" end"}],"del_contents":[{"Del":" State.cursor1 = {line=State.cursor1.line+1, pos=1}\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":1078,"ins":{"up_context":[{"change":6,"pos":126718}],"down_context":[{"change":6,"pos":126778}],"flag":"BLOCK","start":10503,"end":11230,"inode":{"change":6,"pos":83723}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":126718},"to":{"change":6,"start":126718,"end":126778},"introduced_by":6}],"inode":{"change":6,"pos":83723}},"ins_contents":[{"Add":" local y = State.top"},{"Add":" while State.cursor1.line <= #State.lines do"},{"Add":" if State.lines[State.cursor1.line].mode == 'text' then"},{"Add":" break"},{"Add":" end"},{"Add":"--? print('cursor skips', State.cursor1.line)"},{"Add":" y = y + Drawing_padding_height + Drawing.pixels(State.lines[State.cursor1.line].h, State.width)"},{"Add":" State.cursor1.line = State.cursor1.line + 1"},{"Add":" end"},{"Add":" -- hack: insert a text line at bottom of file if necessary"},{"Add":" if State.cursor1.line > #State.lines then"},{"Add":" assert(State.cursor1.line == #State.lines+1)"},{"Add":" table.insert(State.lines, {mode='text', data=''})"},{"Add":" table.insert(State.line_cache, {})"},{"Add":" end"},{"Add":"--? print(y, App.screen.height, App.screen.height-State.line_height)"},{"Add":" if y > App.screen.height - State.line_height then"}],"del_contents":[{"Del":" if State.top > App.screen.height - State.line_height then\n"}]}},{"Replacement":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":1119,"ins":{"up_context":[{"change":6,"pos":127996}],"down_context":[{"change":6,"pos":128070}],"flag":"BLOCK","start":11231,"end":11827,"inode":{"change":6,"pos":83723}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":127996},"to":{"change":6,"start":127996,"end":128070},"introduced_by":6}],"inode":{"change":6,"pos":83723}},"ins_contents":[{"Add":" if top2.screen_line > 1 or State.lines[top2.line-1].mode == 'text' then"},{"Add":" local h = State.line_height"},{"Add":" if y - h < State.top then"},{"Add":" break"},{"Add":" end"},{"Add":" y = y - h"},{"Add":" else"},{"Add":" assert(top2.line > 1)"},{"Add":" assert(State.lines[top2.line-1].mode == 'drawing')"},{"Add":" -- We currently can't draw partial drawings, so either skip it entirely"},{"Add":" -- or not at all."},{"Add":" local h = Drawing_padding_height + Drawing.pixels(State.lines[top2.line-1].h, State.width)"},{"Add":" if y - h < State.top then"},{"Add":" break"},{"Add":" end"},{"Add":"--? print('skipping drawing of height', h)"},{"Add":" y = y - h"}],"del_contents":[{"Del":" local h = State.line_height\n if y - h < State.top then\n break\n"}]}},{"Edit":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":1137,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":128078},"to":{"change":6,"start":128078,"end":128092},"introduced_by":6}],"inode":{"change":6,"pos":83723}}},"contents":[{"Del":" y = y - h\n"}]}},{"Edit":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":1144,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":128669},"to":{"change":6,"start":128669,"end":128682},"introduced_by":6}],"inode":{"change":6,"pos":83723}}},"contents":[{"Del":" Foo = true\n"}]}},{"Edit":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":1417,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":139891}],"down_context":[{"change":6,"pos":139891}],"flag":"BLOCK","start":11828,"end":11942,"inode":{"change":6,"pos":83723}}},"contents":[{"Add":" if State.lines[loc1.line].mode == 'drawing' then"},{"Add":" return {line=loc1.line, screen_line=1, screen_pos=1}"},{"Add":" end"}]}},{"Edit":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":1530,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":142635},"to":{"change":6,"start":142635,"end":142654},"introduced_by":6}],"inode":{"change":6,"pos":83723}}},"contents":[{"Del":"--? print('a')\n"}]}},{"Edit":{"inode":{"change":6,"pos":83723},"path":"source_text.lua","line":1532,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":142757},"to":{"change":6,"start":142757,"end":142776},"introduced_by":6}],"inode":{"change":6,"pos":83723}}},"contents":[{"Del":"--? print('b')\n"}]}},{"Replacement":{"inode":{"change":6,"pos":150241},"path":"source_file.lua","line":28,"ins":{"up_context":[{"change":6,"pos":150962}],"down_context":[{"change":6,"pos":151123}],"flag":"BLOCK","start":11945,"end":12113,"inode":{"change":6,"pos":150241}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":150962},"to":{"change":6,"start":150962,"end":151123},"introduced_by":6}],"inode":{"change":6,"pos":150241}},"ins_contents":[{"Add":" if line == '```lines' then -- inflexible with whitespace since these files are always autogenerated"},{"Add":" table.insert(result, load_drawing(infile_next_line))"}],"del_contents":[{"Del":" local line_info = {}\n if line:find(Fold) then\n _, _, line_info.data, line_info.dataB = line:find('([^'..Fold..']*)'..Fold..'([^'..Fold..']*)')\n"}]}},{"Replacement":{"inode":{"change":6,"pos":150241},"path":"source_file.lua","line":31,"ins":{"up_context":[{"change":6,"pos":151134}],"down_context":[{"change":6,"pos":151164}],"flag":"BLOCK","start":12114,"end":12389,"inode":{"change":6,"pos":150241}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151134},"to":{"change":6,"start":151134,"end":151164},"introduced_by":6}],"inode":{"change":6,"pos":150241}},"ins_contents":[{"Add":" local line_info = {mode='text'}"},{"Add":" if line:find(Fold) then"},{"Add":" _, _, line_info.data, line_info.dataB = line:find('([^'..Fold..']*)'..Fold..'([^'..Fold..']*)')"},{"Add":" else"},{"Add":" line_info.data = line"},{"Add":" end"},{"Add":" table.insert(result, line_info)"}],"del_contents":[{"Del":" line_info.data = line\n"}]}},{"Edit":{"inode":{"change":6,"pos":150241},"path":"source_file.lua","line":39,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151174},"to":{"change":6,"start":151174,"end":151212},"introduced_by":6}],"inode":{"change":6,"pos":150241}}},"contents":[{"Del":" table.insert(result, line_info)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":150241},"path":"source_file.lua","line":42,"ins":{"up_context":[{"change":6,"pos":151249}],"down_context":[{"change":6,"pos":151285}],"flag":"BLOCK","start":12390,"end":12439,"inode":{"change":6,"pos":150241}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151249},"to":{"change":6,"start":151249,"end":151285},"introduced_by":6}],"inode":{"change":6,"pos":150241}},"ins_contents":[{"Add":" table.insert(result, {mode='text', data=''})"}],"del_contents":[{"Del":" table.insert(result, {data=''})\n"}]}},{"Replacement":{"inode":{"change":6,"pos":150241},"path":"source_file.lua","line":53,"ins":{"up_context":[{"change":6,"pos":151521}],"down_context":[{"change":6,"pos":151651}],"flag":"BLOCK","start":12440,"end":12693,"inode":{"change":6,"pos":150241}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151521},"to":{"change":6,"start":151521,"end":151651},"introduced_by":6}],"inode":{"change":6,"pos":150241}},"ins_contents":[{"Add":" if line.mode == 'drawing' then"},{"Add":" store_drawing(outfile, line)"},{"Add":" else"},{"Add":" outfile:write(line.data)"},{"Add":" if line.dataB and #line.dataB > 0 then"},{"Add":" outfile:write(Fold)"},{"Add":" outfile:write(line.dataB)"},{"Add":" end"},{"Add":" outfile:write('\\n')"}],"del_contents":[{"Del":" outfile:write(line.data)\n if line.dataB and #line.dataB > 0 then\n outfile:write(Fold)\n outfile:write(line.dataB)\n"}]}},{"Edit":{"inode":{"change":6,"pos":150241},"path":"source_file.lua","line":63,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151659},"to":{"change":6,"start":151659,"end":151683},"introduced_by":6}],"inode":{"change":6,"pos":150241}}},"contents":[{"Del":" outfile:write('\\n')\n"}]}},{"Edit":{"inode":{"change":6,"pos":150241},"path":"source_file.lua","line":65,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":151707}],"down_context":[{"change":6,"pos":151873}],"flag":"BLOCK","start":12694,"end":15557,"inode":{"change":6,"pos":150241}}},"contents":[{"Add":"end"},{"Add":""},{"Add":"function load_drawing(infile_next_line)"},{"Add":" local drawing = {mode='drawing', h=256/2, points={}, shapes={}, pending={}}"},{"Add":" while true do"},{"Add":" local line = infile_next_line()"},{"Add":" assert(line)"},{"Add":" if line == '```' then break end"},{"Add":" local shape = json.decode(line)"},{"Add":" if shape.mode == 'freehand' then"},{"Add":" -- no changes needed"},{"Add":" elseif shape.mode == 'line' or shape.mode == 'manhattan' then"},{"Add":" local name = shape.p1.name"},{"Add":" shape.p1 = Drawing.find_or_insert_point(drawing.points, shape.p1.x, shape.p1.y, --[[large width to minimize overlap]] 1600)"},{"Add":" drawing.points[shape.p1].name = name"},{"Add":" name = shape.p2.name"},{"Add":" shape.p2 = Drawing.find_or_insert_point(drawing.points, shape.p2.x, shape.p2.y, --[[large width to minimize overlap]] 1600)"},{"Add":" drawing.points[shape.p2].name = name"},{"Add":" elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then"},{"Add":" for i,p in ipairs(shape.vertices) do"},{"Add":" local name = p.name"},{"Add":" shape.vertices[i] = Drawing.find_or_insert_point(drawing.points, p.x,p.y, --[[large width to minimize overlap]] 1600)"},{"Add":" drawing.points[shape.vertices[i]].name = name"},{"Add":" end"},{"Add":" elseif shape.mode == 'circle' or shape.mode == 'arc' then"},{"Add":" local name = shape.center.name"},{"Add":" shape.center = Drawing.find_or_insert_point(drawing.points, shape.center.x,shape.center.y, --[[large width to minimize overlap]] 1600)"},{"Add":" drawing.points[shape.center].name = name"},{"Add":" elseif shape.mode == 'deleted' then"},{"Add":" -- ignore"},{"Add":" else"},{"Add":" print(shape.mode)"},{"Add":" assert(false)"},{"Add":" end"},{"Add":" table.insert(drawing.shapes, shape)"},{"Add":" end"},{"Add":" return drawing"},{"Add":"end"},{"Add":""},{"Add":"function store_drawing(outfile, drawing)"},{"Add":" outfile:write('```lines\\n')"},{"Add":" for _,shape in ipairs(drawing.shapes) do"},{"Add":" if shape.mode == 'freehand' then"},{"Add":" outfile:write(json.encode(shape), '\\n')"},{"Add":" elseif shape.mode == 'line' or shape.mode == 'manhattan' then"},{"Add":" local line = json.encode({mode=shape.mode, p1=drawing.points[shape.p1], p2=drawing.points[shape.p2]})"},{"Add":" outfile:write(line, '\\n')"},{"Add":" elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then"},{"Add":" local obj = {mode=shape.mode, vertices={}}"},{"Add":" for _,p in ipairs(shape.vertices) do"},{"Add":" table.insert(obj.vertices, drawing.points[p])"},{"Add":" end"},{"Add":" local line = json.encode(obj)"},{"Add":" outfile:write(line, '\\n')"},{"Add":" elseif shape.mode == 'circle' then"},{"Add":" outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius}), '\\n')"},{"Add":" elseif shape.mode == 'arc' then"},{"Add":" outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius, start_angle=shape.start_angle, end_angle=shape.end_angle}), '\\n')"},{"Add":" elseif shape.mode == 'deleted' then"},{"Add":" -- ignore"},{"Add":" else"},{"Add":" print(shape.mode)"},{"Add":" assert(false)"},{"Add":" end"},{"Add":" end"},{"Add":" outfile:write('```\\n')"}]}},{"Replacement":{"inode":{"change":6,"pos":150241},"path":"source_file.lua","line":141,"ins":{"up_context":[{"change":6,"pos":152071}],"down_context":[{"change":6,"pos":152226}],"flag":"BLOCK","start":15558,"end":15844,"inode":{"change":6,"pos":150241}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152071},"to":{"change":6,"start":152071,"end":152226},"introduced_by":6}],"inode":{"change":6,"pos":150241}},"ins_contents":[{"Add":"--? print(line)"},{"Add":" if line == '```lines' then -- inflexible with whitespace since these files are always autogenerated"},{"Add":"--? print('inserting drawing')"},{"Add":" i, drawing = load_drawing_from_array(next_line, a, i)"},{"Add":"--? print('i now', i)"},{"Add":" table.insert(result, drawing)"}],"del_contents":[{"Del":" local line_info = {}\n if line:find(Fold) then\n _, _, line_info.data, line_info.dataB = line:find('([^'..Fold..']*)'..Fold..'([^'..Fold..']*)')\n"}]}},{"Replacement":{"inode":{"change":6,"pos":150241},"path":"source_file.lua","line":148,"ins":{"up_context":[{"change":6,"pos":152235}],"down_context":[{"change":6,"pos":152263}],"flag":"BLOCK","start":15845,"end":16140,"inode":{"change":6,"pos":150241}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152235},"to":{"change":6,"start":152235,"end":152263},"introduced_by":6}],"inode":{"change":6,"pos":150241}},"ins_contents":[{"Add":"--? print('inserting text')"},{"Add":" local line_info = {mode='text'}"},{"Add":" if line:find(Fold) then"},{"Add":" _, _, line_info.data, line_info.dataB = line:find('([^'..Fold..']*)'..Fold..'([^'..Fold..']*)')"},{"Add":" else"},{"Add":" line_info.data = line"},{"Add":" end"},{"Add":" table.insert(result, line_info)"}],"del_contents":[{"Del":" line_info.data = line\n"}]}},{"Edit":{"inode":{"change":6,"pos":150241},"path":"source_file.lua","line":157,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152271},"to":{"change":6,"start":152271,"end":152307},"introduced_by":6}],"inode":{"change":6,"pos":150241}}},"contents":[{"Del":" table.insert(result, line_info)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":150241},"path":"source_file.lua","line":159,"ins":{"up_context":[{"change":6,"pos":152336}],"down_context":[{"change":6,"pos":152372}],"flag":"BLOCK","start":16141,"end":16190,"inode":{"change":6,"pos":150241}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152336},"to":{"change":6,"start":152336,"end":152372},"introduced_by":6}],"inode":{"change":6,"pos":150241}},"ins_contents":[{"Add":" table.insert(result, {mode='text', data=''})"}],"del_contents":[{"Del":" table.insert(result, {data=''})\n"}]}},{"Edit":{"inode":{"change":6,"pos":150241},"path":"source_file.lua","line":163,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":152398}],"down_context":[],"flag":"BLOCK","start":16191,"end":17838,"inode":{"change":6,"pos":150241}}},"contents":[{"Add":""},{"Add":"function load_drawing_from_array(iter, a, i)"},{"Add":" local drawing = {mode='drawing', h=256/2, points={}, shapes={}, pending={}}"},{"Add":" local line"},{"Add":" while true do"},{"Add":" i, line = iter(a, i)"},{"Add":" assert(i)"},{"Add":"--? print(i)"},{"Add":" if line == '```' then break end"},{"Add":" local shape = json.decode(line)"},{"Add":" if shape.mode == 'freehand' then"},{"Add":" -- no changes needed"},{"Add":" elseif shape.mode == 'line' or shape.mode == 'manhattan' then"},{"Add":" local name = shape.p1.name"},{"Add":" shape.p1 = Drawing.find_or_insert_point(drawing.points, shape.p1.x, shape.p1.y, --[[large width to minimize overlap]] 1600)"},{"Add":" drawing.points[shape.p1].name = name"},{"Add":" name = shape.p2.name"},{"Add":" shape.p2 = Drawing.find_or_insert_point(drawing.points, shape.p2.x, shape.p2.y, --[[large width to minimize overlap]] 1600)"},{"Add":" drawing.points[shape.p2].name = name"},{"Add":" elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then"},{"Add":" for i,p in ipairs(shape.vertices) do"},{"Add":" local name = p.name"},{"Add":" shape.vertices[i] = Drawing.find_or_insert_point(drawing.points, p.x,p.y, --[[large width to minimize overlap]] 1600)"},{"Add":" drawing.points[shape.vertices[i]].name = name"},{"Add":" end"},{"Add":" elseif shape.mode == 'circle' or shape.mode == 'arc' then"},{"Add":" local name = shape.center.name"},{"Add":" shape.center = Drawing.find_or_insert_point(drawing.points, shape.center.x,shape.center.y, --[[large width to minimize overlap]] 1600)"},{"Add":" drawing.points[shape.center].name = name"},{"Add":" elseif shape.mode == 'deleted' then"},{"Add":" -- ignore"},{"Add":" else"},{"Add":" print(shape.mode)"},{"Add":" assert(false)"},{"Add":" end"},{"Add":" table.insert(drawing.shapes, shape)"},{"Add":" end"},{"Add":" return i, drawing"},{"Add":"end"}]}},{"Edit":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":4,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":152546}],"down_context":[{"change":6,"pos":152546}],"flag":"BLOCK","start":17840,"end":18033,"inode":{"change":6,"pos":152440}}},"contents":[{"Add":"Stroke_color = {r=0, g=0, b=0}"},{"Add":"Current_stroke_color = {r=0.7, g=0.7, b=0.7} -- in process of being drawn"},{"Add":"Current_name_background_color = {r=1, g=0, b=0, a=0.1} -- name currently being edited"}]}},{"Edit":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":9,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":152673}],"down_context":[{"change":6,"pos":152673}],"flag":"BLOCK","start":18034,"end":18192,"inode":{"change":6,"pos":152440}}},"contents":[{"Add":"Icon_color = {r=0.7, g=0.7, b=0.7} -- color of current mode icon in drawings"},{"Add":"Help_color = {r=0, g=0.5, b=0}"},{"Add":"Help_background_color = {r=0, g=0.5, b=0, a=0.1}"}]}},{"Edit":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":18,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":152798}],"down_context":[{"change":6,"pos":152798}],"flag":"BLOCK","start":18193,"end":18317,"inode":{"change":6,"pos":152440}}},"contents":[{"Add":""},{"Add":"Drawing_padding_top = 10"},{"Add":"Drawing_padding_bottom = 10"},{"Add":"Drawing_padding_height = Drawing_padding_top + Drawing_padding_bottom"}]}},{"Edit":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":23,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":152799}],"down_context":[{"change":6,"pos":152799}],"flag":"BLOCK","start":18318,"end":18406,"inode":{"change":6,"pos":152440}}},"contents":[{"Add":"Same_point_distance = 4 -- pixel distance at which two points are considered the same"},{"Add":""}]}},{"Replacement":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":30,"ins":{"up_context":[{"change":6,"pos":152987}],"down_context":[{"change":6,"pos":153197}],"flag":"BLOCK","start":18407,"end":19576,"inode":{"change":6,"pos":152440}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152987},"to":{"change":6,"start":152987,"end":153197},"introduced_by":6}],"inode":{"change":6,"pos":152440}},"ins_contents":[{"Add":" -- a line is either bifold text or a drawing"},{"Add":" -- a line of bifold text consists of an A side and an optional B side"},{"Add":" -- mode = 'text',"},{"Add":" -- string data,"},{"Add":" -- string dataB,"},{"Add":" -- expanded: whether to show B side"},{"Add":" -- a drawing is a table with:"},{"Add":" -- mode = 'drawing'"},{"Add":" -- a (y) coord in pixels (updated while painting screen),"},{"Add":" -- a (h)eight,"},{"Add":" -- an array of points, and"},{"Add":" -- an array of shapes"},{"Add":" -- a shape is a table containing:"},{"Add":" -- a mode"},{"Add":" -- an array points for mode 'freehand' (raw x,y coords; freehand drawings don't pollute the points array of a drawing)"},{"Add":" -- an array vertices for mode 'polygon', 'rectangle', 'square'"},{"Add":" -- p1, p2 for mode 'line'"},{"Add":" -- center, radius for mode 'circle'"},{"Add":" -- center, radius, start_angle, end_angle for mode 'arc'"},{"Add":" -- Unless otherwise specified, coord fields are normalized; a drawing is always 256 units wide"},{"Add":" -- The field names are carefully chosen so that switching modes in midstream"},{"Add":" -- remembers previously entered points where that makes sense."},{"Add":" lines = {{mode='text', data='', dataB=nil, expanded=nil}}, -- array of lines"}],"del_contents":[{"Del":" -- a line of bifold text consists of an A side and an optional B side, each of which is a string\n -- expanded: whether to show B side\n lines = {{data='', dataB=nil, expanded=nil}}, -- array of lines\n"}]}},{"Edit":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":82,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":154804}],"down_context":[{"change":6,"pos":154804}],"flag":"BLOCK","start":19577,"end":19722,"inode":{"change":6,"pos":152440}}},"contents":[{"Add":" current_drawing_mode = 'line',"},{"Add":" previous_drawing_mode = nil, -- extra state for some ephemeral modes like moving/deleting/naming points"},{"Add":""}]}},{"Edit":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":109,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":155350}],"down_context":[{"change":6,"pos":155350}],"flag":"BLOCK","start":19723,"end":19888,"inode":{"change":6,"pos":152440}}},"contents":[{"Add":"function edit.fixup_cursor(State)"},{"Add":" for i,line in ipairs(State.lines) do"},{"Add":" if line.mode == 'text' then"},{"Add":" State.cursor1.line = i"},{"Add":" break"},{"Add":" end"},{"Add":" end"},{"Add":"end"},{"Add":""}]}},{"Replacement":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":132,"ins":{"up_context":[{"change":6,"pos":155884}],"down_context":[{"change":6,"pos":155928}],"flag":"BLOCK","start":19889,"end":19944,"inode":{"change":6,"pos":152440}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":155884},"to":{"change":6,"start":155884,"end":155928},"introduced_by":6}],"inode":{"change":6,"pos":152440}},"ins_contents":[{"Add":"--? print('draw:', y, line_index, line, line.mode)"}],"del_contents":[{"Del":"--? print('draw:', y, line_index, line)\n"}]}},{"Edit":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":135,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":156056}],"down_context":[{"change":6,"pos":156056}],"flag":"BLOCK","start":19945,"end":19977,"inode":{"change":6,"pos":152440}}},"contents":[{"Add":" if line.mode == 'text' then"}]}},{"Replacement":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":137,"ins":{"up_context":[{"change":6,"pos":156098}],"down_context":[{"change":6,"pos":156332}],"flag":"BLOCK","start":19978,"end":21096,"inode":{"change":6,"pos":152440}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":156098},"to":{"change":6,"start":156098,"end":156332},"introduced_by":6}],"inode":{"change":6,"pos":152440}},"ins_contents":[{"Add":" local startpos, startposB = 1, nil"},{"Add":" if line_index == State.screen_top1.line then"},{"Add":" if State.screen_top1.pos then"},{"Add":" startpos = State.screen_top1.pos"},{"Add":" else"},{"Add":" startpos, startposB = nil, State.screen_top1.posB"},{"Add":" end"},{"Add":" end"},{"Add":" if line.data == '' then"},{"Add":" -- button to insert new drawing"},{"Add":" button(State, 'draw', {x=4,y=y+4, w=12,h=12, color={1,1,0},"},{"Add":" icon = icon.insert_drawing,"},{"Add":" onpress1 = function()"},{"Add":" Drawing.before = snapshot(State, line_index-1, line_index)"},{"Add":" table.insert(State.lines, line_index, {mode='drawing', y=y, h=256/2, points={}, shapes={}, pending={}})"},{"Add":" table.insert(State.line_cache, line_index, {})"},{"Add":" if State.cursor1.line >= line_index then"},{"Add":" State.cursor1.line = State.cursor1.line+1"},{"Add":" end"},{"Add":" schedule_save(State)"},{"Add":" record_undo_event(State, {before=Drawing.before, after=snapshot(State, line_index-1, line_index+1)})"},{"Add":" end,"},{"Add":" })"}],"del_contents":[{"Del":" local startpos, startposB = 1, nil\n if line_index == State.screen_top1.line then\n if State.screen_top1.pos then\n startpos = State.screen_top1.pos\n else\n startpos, startposB = nil, State.screen_top1.posB\n"}]}},{"Edit":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":161,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":156342}],"down_context":[{"change":6,"pos":156342}],"flag":"BLOCK","start":21097,"end":21511,"inode":{"change":6,"pos":152440}}},"contents":[{"Add":" y, State.screen_bottom1.pos, State.screen_bottom1.posB = Text.draw(State, line_index, y, startpos, startposB)"},{"Add":" y = y + State.line_height"},{"Add":"--? print('=> y', y)"},{"Add":" elseif line.mode == 'drawing' then"},{"Add":" y = y+Drawing_padding_top"},{"Add":" Drawing.draw(State, line_index, y)"},{"Add":" y = y + Drawing.pixels(line.h, State.width) + Drawing_padding_bottom"},{"Add":" else"},{"Add":" print(line.mode)"},{"Add":" assert(false)"}]}},{"Edit":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":172,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":156350},"to":{"change":6,"start":156350,"end":156519},"introduced_by":6}],"inode":{"change":6,"pos":152440}}},"contents":[{"Del":" y, State.screen_bottom1.pos, State.screen_bottom1.posB = Text.draw(State, line_index, y, startpos, startposB)\n y = y + State.line_height\n--? print('=> y', y)\n"}]}},{"Edit":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":179,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":156628}],"down_context":[{"change":6,"pos":156628}],"flag":"BLOCK","start":21512,"end":21540,"inode":{"change":6,"pos":152440}}},"contents":[{"Add":" Drawing.update(State, dt)"}]}},{"Replacement":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":201,"ins":{"up_context":[{"change":6,"pos":157151}],"down_context":[{"change":6,"pos":157217}],"flag":"BLOCK","start":21541,"end":21562,"inode":{"change":6,"pos":152440}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":157151},"to":{"change":6,"start":157151,"end":157217},"introduced_by":6}],"inode":{"change":6,"pos":152440}},"ins_contents":[{"Add":"--? print('press')"}],"del_contents":[{"Del":"--? print('press', State.selection1.line, State.selection1.pos)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":208,"ins":{"up_context":[{"change":6,"pos":157427}],"down_context":[{"change":6,"pos":157679}],"flag":"BLOCK","start":21563,"end":22284,"inode":{"change":6,"pos":152440}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":157427},"to":{"change":6,"start":157427,"end":157679},"introduced_by":6}],"inode":{"change":6,"pos":152440}},"ins_contents":[{"Add":" if line.mode == 'text' then"},{"Add":" if Text.in_line(State, line_index, x,y) then"},{"Add":" local pos,posB = Text.to_pos_on_line(State, line_index, x, y)"},{"Add":" --? print(x,y, 'setting cursor:', line_index, pos, posB)"},{"Add":" State.cursor1 = {line=line_index, pos=pos, posB=posB}"},{"Add":" break"},{"Add":" end"},{"Add":" elseif line.mode == 'drawing' then"},{"Add":" local line_cache = State.line_cache[line_index]"},{"Add":" if Drawing.in_drawing(line, line_cache, x, y, State.left,State.right) then"},{"Add":" State.lines.current_drawing_index = line_index"},{"Add":" State.lines.current_drawing = line"},{"Add":" Drawing.before = snapshot(State, line_index)"},{"Add":" Drawing.mouse_pressed(State, line_index, x,y, mouse_button)"},{"Add":" break"},{"Add":" end"}],"del_contents":[{"Del":" if Text.in_line(State, line_index, x,y) then\n local pos,posB = Text.to_pos_on_line(State, line_index, x, y)\n--? print(x,y, 'setting cursor:', line_index, pos, posB)\n State.cursor1 = {line=line_index, pos=pos, posB=posB}\n break\n"}]}},{"Edit":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":229,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":157753}],"down_context":[{"change":6,"pos":157753}],"flag":"BLOCK","start":22285,"end":22645,"inode":{"change":6,"pos":152440}}},"contents":[{"Add":" if State.search_term then return end"},{"Add":"--? print('release')"},{"Add":" if State.lines.current_drawing then"},{"Add":" Drawing.mouse_released(State, x,y, mouse_button)"},{"Add":" schedule_save(State)"},{"Add":" if Drawing.before then"},{"Add":" record_undo_event(State, {before=Drawing.before, after=snapshot(State, State.lines.current_drawing_index)})"},{"Add":" Drawing.before = nil"},{"Add":" end"},{"Add":" end"}]}},{"Edit":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":247,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":158026}],"down_context":[{"change":6,"pos":158026}],"flag":"BLOCK","start":22646,"end":23001,"inode":{"change":6,"pos":152440}}},"contents":[{"Add":" elseif State.current_drawing_mode == 'name' then"},{"Add":" local before = snapshot(State, State.lines.current_drawing_index)"},{"Add":" local drawing = State.lines.current_drawing"},{"Add":" local p = drawing.points[drawing.pending.target_point]"},{"Add":" p.name = p.name..t"},{"Add":" record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})"}]}},{"Replacement":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":305,"ins":{"up_context":[{"change":6,"pos":159775}],"down_context":[{"change":6,"pos":159804}],"flag":"BLOCK","start":23002,"end":23031,"inode":{"change":6,"pos":152440}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":159775},"to":{"change":6,"start":159775,"end":159804},"introduced_by":6}],"inode":{"change":6,"pos":152440}},"ins_contents":[{"Add":" elseif chord == 'C-i' then"}],"del_contents":[{"Del":" elseif chord == 'C-d' then\n"}]}},{"Edit":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":340,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":161174}],"down_context":[{"change":6,"pos":161174}],"flag":"BLOCK","start":23032,"end":23121,"inode":{"change":6,"pos":152440}}},"contents":[{"Add":" -- invalidate various cached bits of lines"},{"Add":" State.lines.current_drawing = nil"}]}},{"Edit":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":354,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":161677}],"down_context":[{"change":6,"pos":161677}],"flag":"BLOCK","start":23122,"end":23211,"inode":{"change":6,"pos":152440}}},"contents":[{"Add":" -- invalidate various cached bits of lines"},{"Add":" State.lines.current_drawing = nil"}]}},{"Replacement":{"inode":{"change":6,"pos":152440},"path":"source_edit.lua","line":393,"ins":{"up_context":[{"change":6,"pos":163099}],"down_context":[{"change":6,"pos":163121}],"flag":"BLOCK","start":23212,"end":24756,"inode":{"change":6,"pos":152440}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":163099},"to":{"change":6,"start":163099,"end":163121},"introduced_by":6}],"inode":{"change":6,"pos":152440}},"ins_contents":[{"Add":" -- dispatch to drawing or text"},{"Add":" elseif App.mouse_down(1) or chord:sub(1,2) == 'C-' then"},{"Add":" -- DON'T reset line_cache.starty here"},{"Add":" local drawing_index, drawing = Drawing.current_drawing(State)"},{"Add":" if drawing_index then"},{"Add":" local before = snapshot(State, drawing_index)"},{"Add":" Drawing.keychord_pressed(State, chord)"},{"Add":" record_undo_event(State, {before=before, after=snapshot(State, drawing_index)})"},{"Add":" schedule_save(State)"},{"Add":" end"},{"Add":" elseif chord == 'escape' and not App.mouse_down(1) then"},{"Add":" for _,line in ipairs(State.lines) do"},{"Add":" if line.mode == 'drawing' then"},{"Add":" line.show_help = false"},{"Add":" end"},{"Add":" end"},{"Add":" elseif State.current_drawing_mode == 'name' then"},{"Add":" if chord == 'return' then"},{"Add":" State.current_drawing_mode = State.previous_drawing_mode"},{"Add":" State.previous_drawing_mode = nil"},{"Add":" else"},{"Add":" local before = snapshot(State, State.lines.current_drawing_index)"},{"Add":" local drawing = State.lines.current_drawing"},{"Add":" local p = drawing.points[drawing.pending.target_point]"},{"Add":" if chord == 'escape' then"},{"Add":" p.name = nil"},{"Add":" record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})"},{"Add":" elseif chord == 'backspace' then"},{"Add":" local len = utf8.len(p.name)"},{"Add":" local byte_offset = Text.offset(p.name, len-1)"},{"Add":" if len == 1 then byte_offset = 0 end"},{"Add":" p.name = string.sub(p.name, 1, byte_offset)"},{"Add":" record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})"},{"Add":" end"},{"Add":" end"},{"Add":" schedule_save(State)"}],"del_contents":[{"Del":" -- dispatch to text\n"}]}},{"Replacement":{"inode":{"change":6,"pos":165766},"path":"source.lua","line":280,"ins":{"up_context":[{"change":6,"pos":174838}],"down_context":[{"change":6,"pos":174898}],"flag":"BLOCK","start":24758,"end":24806,"inode":{"change":6,"pos":165766}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":174838},"to":{"change":6,"start":174838,"end":174898},"introduced_by":6}],"inode":{"change":6,"pos":165766}},"ins_contents":[{"Add":" if x < Editor_state.right + Margin_right then"}],"del_contents":[{"Del":" if Editor_state.left <= x and x < Editor_state.right then\n"}]}},{"Edit":{"inode":{"change":51,"pos":2},"path":"main.lua","line":26,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":184859}],"down_context":[{"change":52,"pos":162}],"flag":"BLOCK","start":24812,"end":25117,"inode":{"change":51,"pos":2}}},"contents":[{"Add":""},{"Add":"-- both sides use drawings"},{"Add":"load_file_from_source_or_save_directory('icons.lua')"},{"Add":"load_file_from_source_or_save_directory('drawing.lua')"},{"Add":" load_file_from_source_or_save_directory('geom.lua')"},{"Add":" load_file_from_source_or_save_directory('help.lua')"},{"Add":"load_file_from_source_or_save_directory('drawing_tests.lua')"}]}},{"Edit":{"inode":{"change":51,"pos":2},"path":"main.lua","line":53,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":185525},"to":{"change":6,"start":185525,"end":185584},"introduced_by":6}],"inode":{"change":51,"pos":2}}},"contents":[{"Del":" load_file_from_source_or_save_directory('icons.lua')\n"}]}},{"Edit":{"inode":{"change":51,"pos":2},"path":"main.lua","line":55,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":185709},"to":{"change":6,"start":185709,"end":185949},"introduced_by":6}],"inode":{"change":51,"pos":2}}},"contents":[{"Del":" load_file_from_source_or_save_directory('drawing.lua')\n load_file_from_source_or_save_directory('geom.lua')\n load_file_from_source_or_save_directory('help.lua')\n load_file_from_source_or_save_directory('drawing_tests.lua')\n"}]}},{"Replacement":{"inode":{"change":7,"pos":15083},"path":"file.lua","line":47,"ins":{"up_context":[{"change":7,"pos":16169}],"down_context":[{"change":7,"pos":16206}],"flag":"BLOCK","start":25126,"end":25183,"inode":{"change":7,"pos":15083}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":16169},"to":{"change":2,"start":14,"end":51},"introduced_by":2}],"inode":{"change":7,"pos":15083}},"ins_contents":[{"Add":" outfile:write(line.data)"},{"Add":" outfile:write('\\n')"}],"del_contents":[{"Del":" outfile:write(line.data, '\\n')\n"}]}},{"Replacement":{"inode":{"change":7,"pos":413},"path":"edit.lua","line":137,"ins":{"up_context":[{"change":7,"pos":3095}],"down_context":[{"change":7,"pos":15}],"flag":"BLOCK","start":25185,"end":25239,"inode":{"change":7,"pos":413}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3095},"to":{"change":7,"start":3095,"end":3138},"introduced_by":7}],"inode":{"change":7,"pos":413}},"ins_contents":[{"Add":" State.screen_bottom1 = {line=line_index, pos=nil}"}],"del_contents":[{"Del":" State.screen_bottom1.line = line_index\n"}]}},{"Edit":{"inode":{"change":7,"pos":413},"path":"edit.lua","line":172,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":5923},"to":{"change":7,"start":4061,"end":4191},"introduced_by":7}],"inode":{"change":7,"pos":413}}},"contents":[{"Del":"--? print('screen bottom: '..tostring(State.screen_bottom1.pos)..' in '..tostring(State.lines[State.screen_bottom1.line].data))\n"}]}},{"Replacement":{"inode":{"change":7,"pos":413},"path":"edit.lua","line":333,"ins":{"up_context":[{"change":7,"pos":7565}],"down_context":[{"change":7,"pos":7718}],"flag":"BLOCK","start":25240,"end":25412,"inode":{"change":7,"pos":413}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7565},"to":{"change":7,"start":7565,"end":7718},"introduced_by":7}],"inode":{"change":7,"pos":413}},"ins_contents":[{"Add":" State.search_backup = {"},{"Add":" cursor={line=State.cursor1.line, pos=State.cursor1.pos},"},{"Add":" screen_top={line=State.screen_top1.line, pos=State.screen_top1.pos},"},{"Add":" }"}],"del_contents":[{"Del":" State.search_backup = {cursor={line=State.cursor1.line, pos=State.cursor1.pos}, screen_top={line=State.screen_top1.line, pos=State.screen_top1.pos}}\n"}]}},{"Replacement":{"inode":{"change":6,"pos":204370},"path":"commands.lua","line":31,"ins":{"up_context":[{"change":6,"pos":205424}],"down_context":[{"change":6,"pos":205482}],"flag":"BLOCK","start":25416,"end":25474,"inode":{"change":6,"pos":204370}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":205424},"to":{"change":6,"start":205424,"end":205482},"introduced_by":6}],"inode":{"change":6,"pos":204370}},"ins_contents":[{"Add":" add_hotkey_to_menu('ctrl+i: create/edit debug print')"}],"del_contents":[{"Del":" add_hotkey_to_menu('ctrl+d: create/edit debug print')\n"}]}}],"owner":"akkartik","repo":"sum-grid.love","token":"YjAayBdX7H9GkH4sZPes6b+JEWh1GgaDG8EHuTiGsto=","login":null}

…

Dependencies

Change contents