src: cleanup importations

[nit.git] / src / markdown.nit

diff --git a/src/markdown.nit b/src/markdown.nit
index ed73ead..01a054c 100644 (file)
--- 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
@@ -64,15 +65,13 @@ private class Doc2Mdwn
                                end
                                # else fence content
                                curblock.add(text)
-                               curblock.add("\n")
                                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
 
@@ -187,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