X-Git-Url: http://nitlanguage.org

diff --git a/src/markdown.nit b/src/markdown.nit
index 344f469..01a054c 100644
--- a/src/markdown.nit
+++ b/src/markdown.nit
@@ -15,9 +15,10 @@
 # Transform Nit verbatim documentation into HTML
 module markdown
 
-import parser
+private import parser
 import html
-import highlight
+private import highlight
+private import parser_util
 
 # The class that does the convertion from a `ADoc` to HTML
 private class Doc2Mdwn
@@ -37,6 +38,9 @@ private class Doc2Mdwn
 		# Indent level of the current line
 		var indent = 0
 
+		# Expected fencing closing tag (if any)
+		var in_fence: nullable String = null
+
 		# The current element (p, li, etc.) if any
 		var n: nullable HTMLTag = null
 
@@ -51,17 +55,37 @@ private class Doc2Mdwn
 			indent = 0
 			while text.length > indent and text.chars[indent] == ' ' do indent += 1
 
+			# In a fence
+			if in_fence != null then
+				# fence closing
+				if text.substring(0,in_fence.length) == in_fence then
+					close_codeblock(n or else root)
+					in_fence = null
+					continue
+				end
+				# else fence content
+				curblock.add(text)
+				continue
+			end
+
 			# Is codeblock? Then just collect them
-			if indent >= 4 then
-				var part = text.substring_from(4)
-				curblock.add(part)
-				curblock.add("\n")
+			if indent >= 3 then
+				# to allows 4 spaces including the one that follows the #
+				curblock.add(text)
 				continue
 			end
 
 			# Was a codblock just before the current line ?
 			close_codeblock(n or else root)
 
+			# fence opening
+			if text.substring(0,3) == "~~~" then
+				var l = 3
+				while l < text.length and text.chars[l] == '~' do l += 1
+				in_fence = text.substring(0, l)
+				continue
+			end
+
 			# Cleanup the string
 			text = text.trim
 
@@ -162,10 +186,27 @@ private class Doc2Mdwn
 	do
 		# Is there a codeblock to manage?
 		if not curblock.is_empty then
+			# determine the smalest indent
+			var minindent = -1
+			for text in curblock do
+				var indent = 0
+				while indent < text.length and text.chars[indent] == ' ' do indent += 1
+				if minindent == -1 or indent < minindent then
+					minindent = indent
+				end
+			end
+
+			# Generate the text
+			var btext = new FlatBuffer
+			for text in curblock do
+				btext.append text.substring_from(minindent)
+				btext.add '\n'
+			end
+
+			# add the node
 			var n = new HTMLTag("pre")
 			root.add(n)
-			var btext = curblock.to_s
-			process_code(n, btext)
+			process_code(n, btext.to_s)
 			curblock.clear
 		end
 	end