381 Commits

Author	SHA1	Message	Date
joshvera	e51492b8d5	Remove line range from Info	2015-12-14 15:52:39 -05:00
Rob Rix	aadd8c7f30	Merge branch 'master' into split-rendering-of-fixed-nodes ... # Conflicts: # src/Split.hs	2015-12-11 11:37:20 -05:00
joshvera	691c4bac76	keep two running counts	2015-12-11 00:09:42 -05:00
joshvera	a9291c55a5	unused num	2015-12-10 23:43:25 -05:00
joshvera	bb35606186	Remove column group stuff	2015-12-10 23:43:19 -05:00
joshvera	83925fb6f2	Remove unused RowWithLine	2015-12-10 23:39:05 -05:00
joshvera	6c423dc3b9	Move the explicit annotation to the numberRows function	2015-12-10 23:38:54 -05:00
joshvera	d2595b16cb	just construct a tuple	2015-12-10 21:13:24 -05:00
joshvera	9647c7f25f	Show line numbers in diffs	2015-12-10 18:21:10 -05:00
Rob Rix	c7695b729d	Use the ranges binding.	2015-12-10 17:33:11 -05:00
Rob Rix	32f8b03461	Remove the redundant Control.Monad import.	2015-12-10 17:31:28 -05:00
Rob Rix	6afa81a197	Split rendering of Fixed nodes in Free.	2015-12-10 17:30:48 -05:00
Rob Rix	18b50a05ab	Handle Indexed inside annotatedToRows.	2015-12-10 17:30:18 -05:00
Rob Rix	92d5d9cf4f	Match on syntax inside annotatedToRows.	2015-12-10 17:27:23 -05:00
Rob Rix	00826a1a82	Split rendering of Fixed terms in Patches.	2015-12-10 17:26:16 -05:00
joshvera	984c4615c9	Merge remote-tracking branch 'origin/master' into fall-back-to-line-by-line-diffs	2015-12-10 17:06:08 -05:00
joshvera	340a47bbe2	Merge remote-tracking branch 'origin/master' into abstract-parsers	2015-12-10 17:05:15 -05:00
Rob Rix	7f77b39b78	Don’t make empty text/etc nodes.	2015-12-10 16:46:38 -05:00
Rob Rix	60b9e630a8	More binding.	2015-12-10 16:43:34 -05:00
Rob Rix	674301ce1f	Last returns non-Nothing, so bind instead.	2015-12-10 16:43:31 -05:00
Rob Rix	69307c76d1	Only adjoin the rows once.	2015-12-10 16:23:33 -05:00
Rob Rix	167ad6087b	Only adjoin onto open lines.	2015-12-10 16:11:44 -05:00
Rob Rix	57a3062446	Fold adjoin2Lines over leaves.	2015-12-10 16:11:13 -05:00
Rob Rix	db23e4792d	Compose.	2015-12-10 15:50:35 -05:00
Rob Rix	470777bde9	Fold using adjoin2Lines instead of combining using adjoinLines.	2015-12-10 15:50:32 -05:00
Rob Rix	200037b509	Test whether the last element in a Line is open.	2015-12-10 15:34:11 -05:00
Rob Rix	c2f54ce8d8	Determine whether the last in a list of HTML elements is open or not.	2015-12-10 15:31:53 -05:00
Rob Rix	ed87838de6	Add a trace' function to help trace some bugs.	2015-12-10 15:11:42 -05:00
Rob Rix	e4b5c97db2	Don’t add an empty/empty row when one side or the other is closed.	2015-12-10 14:35:08 -05:00
Rob Rix	14de32f3e9	Don’t adjoin empty/empty rows onto the top.	2015-12-10 14:34:52 -05:00
Rob Rix	d9e9b73fd7	Move the Empty/Empty case up.	2015-12-10 14:25:04 -05:00
Rob Rix	dbe1db5643	termToLines produces elements interspersed with breaks.	2015-12-10 14:20:47 -05:00
Rob Rix	004bedf46a	annotatedToRows produces elements interspersed with breaks.	2015-12-10 14:20:34 -05:00
Rob Rix	6d2a89b55a	textElements calls out to elementAndBreak.	2015-12-10 14:17:51 -05:00
Rob Rix	43a20d00bd	Extract the element/break function.	2015-12-10 14:17:22 -05:00
Rob Rix	e27122a142	Only adjoin when we have open lines above us.	2015-12-10 14:01:06 -05:00
Rob Rix	ed86b344d5	For debugging render Break to <br>	2015-12-10 14:00:02 -05:00
Rob Rix	7f742bc882	Try to only push through empty lines which have open lines above them.	2015-12-10 13:40:07 -05:00
Rob Rix	d57443afd0	Find the most recent open line in a list.	2015-12-10 13:38:57 -05:00
Rob Rix	72fef55675	Adjoin expects breaks at the end of lines.	2015-12-10 13:17:09 -05:00
Rob Rix	d1018576fd	Add breaks to the ends of lines.	2015-12-10 13:16:46 -05:00
Rob Rix	67ec6f897f	maybeLast produces the last element of a list, if any.	2015-12-10 13:16:42 -05:00
Rob Rix	7abe07bd16	actualLines ends lines with their newlines.	2015-12-10 13:15:32 -05:00
joshvera	5b8908ac82	Represent newlines distinct from empty strings	2015-12-10 11:33:02 -05:00
joshvera	6426a57d51	Use Break in adjoin2	2015-12-10 11:13:16 -05:00
joshvera	6b590a840f	Map newlines to Break	2015-12-10 11:11:02 -05:00
Rob Rix	a0253de5bf	Don’t wrap the contents of empty lines.	2015-12-10 11:06:04 -05:00
joshvera	5c9f2762dd	Remove EmptyRow case	2015-12-10 10:59:46 -05:00
Rob Rix	da2c1505f3	Provide a total definition of unLine. ... Fixes #304.	2015-12-10 10:59:07 -05:00
Rob Rix	b5f9536bcb	Split up the definition of Line.	2015-12-10 10:59:07 -05:00