From 67a78ee0a5c89fcd4f8445a34c2e12fd4e6b2371 Mon Sep 17 00:00:00 2001
From: Mooffie <mooffie@gmail.com>
Date: Thu, 12 Dec 2013 17:26:38 +0200
Subject: [PATCH] Fix minor issues with the "prettify" facility.

---
 ldoc/markup.lua   | 14 +++++++++-----
 ldoc/prettify.lua |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ldoc/markup.lua b/ldoc/markup.lua
index f5694ef..ab0b5f3 100644
--- a/ldoc/markup.lua
+++ b/ldoc/markup.lua
@@ -90,8 +90,8 @@ local function indent_line (line)
    return indent,line
 end
 
-local function non_blank (line)
-   return line:find '%S'
+local function blank (line)
+   return not line:find '%S'
 end
 
 local global_context, local_context
@@ -119,6 +119,8 @@ local function process_multiline_markdown(ldoc, txt, F)
       code = concat(code,'\n')
       if code ~= '' then
          local err
+         -- If we omit the following '\n', a '--' (or '//') comment on the
+         -- last line won't be recognized.
          code, err = prettify.code(lang,filename,code..'\n',L,false)
          append(res,'<pre>')
          append(res, code)
@@ -156,7 +158,7 @@ local function process_multiline_markdown(ldoc, txt, F)
       if indent >= 4 then -- indented code block
          local code = {}
          local plain
-         while indent >= 4 or not non_blank(line) do
+         while indent >= 4 or blank(line) do
             if not start_indent then
                start_indent = indent
                if line:match '^%s*@plain%s*$' then
@@ -165,7 +167,7 @@ local function process_multiline_markdown(ldoc, txt, F)
                end
             end
             if not plain then
-               append(code,line:sub(start_indent))
+               append(code,line:sub(start_indent + 1))
             else
                append(res,line)
             end
@@ -174,7 +176,9 @@ local function process_multiline_markdown(ldoc, txt, F)
             indent, line = indent_line(line)
          end
          start_indent = nil
-         if #code > 1 then table.remove(code) end
+         while #code > 1 and blank(code[#code]) do  -- trim blank lines.
+           table.remove(code)
+         end
          pretty_code (code,'lua')
       else
          local section = F.sections[L]
diff --git a/ldoc/prettify.lua b/ldoc/prettify.lua
index 8013dc5..c3ea3d5 100644
--- a/ldoc/prettify.lua
+++ b/ldoc/prettify.lua
@@ -89,7 +89,7 @@ function prettify.code (lang,fname,code,initial_lineno,pre)
          external = true
       })
       if not pre then
-         code = code:gsub("^<pre*.->(.*)</pre>$", '%1')
+         code = code:gsub("^<pre.->(.-)%s*</pre>$", '%1')
       end
       return code
    end