1 files changed, 145 insertions, 68 deletions

diff --git a/notYetAnotherWiki.lua b/notYetAnotherWiki.lua
index 7268170..8c9a5c9 100755
--- a/notYetAnotherWiki.lua
+++ b/notYetAnotherWiki.lua
@@ -2,13 +2,63 @@
 
 -- Read the README file for what this is all about.  If there is no README or similar, then you can find the link to the source below.
 
-local lcmark = require("lcmark")        -- https://github.com/jgm/lcmark
+local lunamark = require("lunamark")    -- https://github.com/jgm/lunamark
+
+local opts = {
+    layout='compact',
+-- This list is copied from the lunamark source code, until I discover a way to discover it.  The descriptions are useful to.
+    containers=false,            -- Put sections in containers (e.g. div or section tags)
+    slides=false,                -- Like containers, but do not nest them
+    startnum=true,               -- Start number of an ordered list is significant
+    smart=false,                 -- Smart typography (quotes, dashes, ellipses)
+    preserve_tabs=true,          -- Don't expand tabs to spaces
+    notes=true,                  -- Footnotes
+    inline_notes=true,           -- Inline footnotes
+    definition_lists=true,       -- Definition lists
+    citations=true,              -- Citations
+    citation_nbsps=true,         -- Turn spacing into non-breaking spaces in citations
+    fenced_code_blocks=true,     -- Fenced code blocks
+    lua_metadata=true,           -- Lua metadata
+    pandoc_title_blocks=true,    -- Pandoc style title blocks
+    hash_enumerators=true,       -- may be used as ordered list enumerator
+    require_blank_before_blockquote=false,
+    require_blank_before_header=false,
+    require_blank_before_fenced_code_block=false,
+    fancy_lists=true,            -- Pandoc style fancy lists
+    task_list=true,              -- GitHub-Flavored Markdown task list
+    strikeout=true,              -- Strike-through with double tildes
+    mark=true,                   -- Highlight with double equals
+    subscript=true,              -- Subscripted text between tildes
+    superscript=true,            -- Superscripted text between circumflexes
+    bracketed_spans=true,        -- Spans with attributes
+    fenced_divs=true,            -- Divs with attributes
+    raw_attribute=true,          -- Raw pass-through on code elements
+    fenced_code_attributes=true, -- Fenced code block attributes
+    link_attributes=true,        -- Link attributes
+    pipe_tables=true,            -- PHP Markdown Extra pipe table support
+    table_captions=true,         -- Table caption syntax extension
+    header_attributes=true,      -- Header attributes
+    line_blocks=true,            -- Line blocks
+    escaped_line_breaks=true,    -- Pandoc-style escaped hard line breaks
+}
+local writer = lunamark.writer.html5.new(opts)
+local template = ''
+local h = io.open("default.template", 'r')
+if nil ~= h then
+    template = h:read('*a')
+    h:close()
+else
+    print('oops! No such file ' .. 'default.template')
+end
+-- Can override the various writer functions, there's something for each of the basic HTML elements.
+--    Override anything that's generic.
+local parse = lunamark.reader.markdown.new(writer, opts)
 
 
 
 -- Some global data.
 local globalData = {
-    ['_'] = ' ', ['dlr'] = '$',
+    ['s'] = ' ', ['_'] = ' ', ['dlr'] = '$',
     ['devuanCinnabarDark']   = '#310202',    ['devuanCinnabarLight']  = '#510505',
     ['devuanDarkPurpyDark']  = '#33313b',    ['devuanDarkPurpyLight'] = '#3c3a45',
     ['devuanDeepSeaDark']    = '#132f40',    ['devuanDeepSeaLight']   = '#1a4562',
@@ -23,7 +73,7 @@ local Sites, Files, Subs = {}, {}, {}
 
 -- Useful functions, part 0.
 
--- A simple table.subtable = subtable wont work, you end up with a reference so that changes to the later get applaid to the former.
+-- A simple table.subtable = subtable wont work, you end up with a reference so that changes to the later get applied to the former.
 local derefiTable = function(t, strip)
     local argh = {}
     for l, y in ipairs(t) do    if (l ~= y.name) and strip then table.insert(argh, y) end       end
@@ -50,29 +100,47 @@ local stringBits = function(l)
 end
 
 
+-- Put a value into the Files or Subs table, creating things if needed.
+local toFile = function(name, key, value)
+    if nil == Files[name] then Files[name] = {} end
+    if nil ~= key         then Files[name][key] = value end
+    for i, v in ipairs{'metadata', 'bits', } do
+        if nil == Files[name][v] then Files[name][v] = {} end
+    end
+end
+local toSub = function(name, key, value)
+    if nil == Subs[name] then Subs[name] = {} end
+    if nil ~= key        then Subs[name][key] = value end
+    for i, v in ipairs{'metadata', 'bits', 'files', 'subs'} do
+        if nil == Subs[name][v] then Subs[name][v] = {} end
+    end
+end
+
+
 
 -- Actually start doing things.
 
 -- Scan the subdirectories looking for .md files.
 local directory = arg[1]
+toSub('')  --Subs[''] = {files = {}, subs = {}, bits = {}}
 if nil == directory then directory = '.' end
 if '.' ~= directory then
     for l in io.popen('find . -name "*.md" -type f,l -printf "%P\n"'):lines() do
-        Files[string.gsub(l, '%.md$', '')] = {}
+        toFile(string.gsub(l, '%.md$', ''))
     end
 end
 -- Can add in a distant directory to, for putting it's results in the current directory.
 for l in io.popen('find ' .. directory .. ' -name "*.md" -type f,l -printf "%P\n"'):lines() do
     local n = string.gsub(l, '%.md$', '')
-    if nil == Files[n] then Files[n] = {} end
+    if nil == Files[n] then toFile(n) end
 end
 
 -- Gotta figure out all the files and subs first.  File and sub metadata comes along for the ride.
-Subs[''] = {files = {}, subs = {}, bits = {}}
 for name, file in pairs(Files) do
     local bitter, path = '', ''
     local bits, bit = stringBits(name)
     local ln = #bits
+    local body, metadata = '', {}
 
     -- Go through our bits, construct Subs with bits.
     Files[name].bits = bits
@@ -82,41 +150,61 @@ for name, file in pairs(Files) do
     for i, d in ipairs(bits) do
         if '' ~= path then path = path .. '/' end
         path = path .. d
-        if nil == Subs[path]    then Subs[path] = {files = {}, subs = {}} end
+        toSub(path, 'bits', derefiTable(bits, true))
         if i < ln               then Subs[path].subs[bits[i + 1]] = bits[i + 1] end
-        Subs[path].bits = derefiTable(bits, true)
         if i < ln               then table.remove(Subs[path].bits, #bits) end
     end
 
-    -- Start the file parsing here, coz we need it's metadata.
---    print('Parsing ' .. name .. '.md')
-    local h = io.open(name  .. '.md', 'r')
--- TODO - should bail here on error?
-    if nil ~= h then file.cm = h:read('*a') ; h:close() else print('oops! No such name ' .. name) end
-    -- Convert the CommonMark to HTML, including the metadata.
-    local body, metadata, err = lcmark.convert(file.cm, "html", {smart = true, yaml_metadata = true, columns = 0})
-    if    nil == body then print('oops! ' .. err)
-    elseif '' == body then
-        -- This is a metadata only file, no content, stash the matadata in it's directory.
-        Subs[path].metadata = metadata
+    if '.md' == string.sub(name, -3, -1) then
+        -- This is a metadata only file, no content, stash the matadata.
+        for l in io.open(name .. '.md'):lines() do
+            for k, v in string.gmatch(l, "(%w+)%s*=%s*(.+)") do metadata[k] = v end
+        end
+        if '.md' == name                          then toSub(path, 'metadata', metadata)
+        elseif '/.md' == string.sub(name, -4, -1) then toSub(path, 'metadata', metadata)
+        else                                           toFile(string.sub(name, 1, -4), 'metadata', metadata)
+        end
         Files[name] = nil
     else
-        -- Ordinary md file, stash it's metadata and parsed body.
-        -- I need cmark-gfm, coz lcmark doesn't support tables and stuff, it only does basic cmark.
-        local out = ''
-        h = io.popen('if which cmark-gfm ; then echo "found" ; fi | tail -n 1')
-        if nil ~= h then out = h:read('*a') ; h:close() end
-        if 'found\n' == out then
-            -- Have to strip out the metadata first, coz cmark-gfm doesn't grok that.
-            h = io.popen('cp "' .. name .. '.md" "' .. name .. '02" ;   csplit -ksz -f  "' .. name .. '"   "' .. name .. '.md" "/^---$/+1" "{1}" 2>/dev/null ; rm "' .. name .. '00" ; rm "' .. name .. '01" 2>/dev/null')
-            if nil ~= h then h:close() end
-            h = io.popen('cmark-gfm -t html -e footnotes -e table -e strikethrough -e autolink -e tagfilter -e tasklist "' .. name .. '02" ; rm "' .. name .. '02"')
-            if nil ~= h then body = h:read('*a') ; h:close() end
-        else
-            print('cmark-gfm not found')
+
+    -- Start the file parsing here, coz we need it's metadata.
+--      print('Parsing ' .. name .. '.md')
+        h = io.open(name .. '.md', 'r')
+        if nil ~= h then
+            body = h:read('*a') ; h:close()
+            local f0, f1, token
+            -- Deal with my typical double spaced sentence endings.
+            local result = ''
+            local start = 1
+            repeat
+                f0, f1, token = string.find(body, '([%.%?%!] )', start)
+                if fail ~= f0 then
+                    result = result .. string.sub(body, start, f0)
+                    if ' ' == string.sub(body, f1 + 1, f1 + 1) then
+                        result = result .. '$s$ '       -- '&nbsp;' gets turned into hex 0xA0 by parse().  So feed it another metadata token that gets translated to &nbsp;.
+                    else
+                        result = result .. ' '
+                    end
+                    start = f1 + 1
+                end
+            until fail == f0
+            result = result .. string.sub(body, start)
+            -- Do the same for fixing the \' \" \| etc mess pandoc left that sed can't fix.
+            body = result
+            result = ''
+            start = 1
+            repeat
+                f0, f1, token = string.find(body, '(%\\[%"%\'%|%$])', start)
+                if fail ~= f0 then
+                    result = result .. string.sub(body, start, f0 - 1)
+                    start = f1
+                end
+            until fail == f0
+            result = result .. string.sub(body, start)
+
+            body = parse(result)
         end
-        Files[name].metadata = metadata
-        Files[name].body = body
+        toFile(name, 'body', body)
         table.insert(Subs[path].files, bit)
     end
 end
@@ -181,6 +269,10 @@ end
 
 
 
+-- TODO - loop through Subs, doing whichPage and inheritance.
+
+
+
 -- More of this actually doing things nonsense.
 
 -- Loop through the files we found and actually create their HTML files.
@@ -193,14 +285,6 @@ for name, file in pairs(Files) do
     path = table.concat(bits, '/', 1, ln)
 
     if '' ~= body then
-    -- Continue the parsing and conversion.  Start by turning our parsed body into something the lcmark template system can grock.
-        local bod, err = lcmark.compile_template(body)
-        if nil == bod then print('oops! ' .. err) else
-            local templateFile = metadata.template
-            if nil == templateFile then templateFile = 'default' end
-            file.template = templateFile .. '.template'
-        end
-
         -- Copy any metadata found in parent directories.
         local pth = ''
         for i, d in ipairs(bits) do
@@ -287,7 +371,6 @@ for name, file in pairs(Files) do
                 metadata.trail = metadata.trail ..  b .. ' &nbsp; '
             end
         end
---      if '' == metadata.trail then metadata.trail = '<a href="' .. string.rep('../', ln) .. '/' .. whichPage('') .. '">home</a> &nbsp; ' end
 
         -- Figure out this pages footer links.
         if nil ~= metadata.pagehistory then metadata.history = '<p>Page&nbsp;<a href="' .. metadata.pagehistory .. '/' .. name .. '.md">history</a></p>' end
@@ -296,29 +379,26 @@ for name, file in pairs(Files) do
         if metadata.footer ~= globalData.footer then metadata.footer = 'Web site ' .. metadata.footer end
         metadata.footer = '<p>' .. metadata.footer .. '</p>'
 
-        -- Apply the template to the body.
-        metadata.body = lcmark.apply_template(bod, metadata)
-
-        -- Put it all in the template.
-        local tm = ''
-        if nil ~= file.template then
-            local h = io.open(file.template, 'r')
-            if nil ~= h then
-                tm = tm .. h:read('*a')
-                h:close()
-            else
-                print('oops! No such file ' .. file.template)
-            end
-
--- TODO - Um not sure why this is here AND at the top of the loop.  Here makes more sense.
-            local template, err = lcmark.compile_template(tm)
-            if nil == template then print('oops! ' .. err) else
-                result = lcmark.apply_template(template, metadata)
-            end
-        else
-            print('No template for ' .. name)
-            result = body
+        -- Do our own metadata replacement, it's simple and works better.
+        local temp = template
+        local start = 1
+        metadata.body = nil
+        local f0, f1, token
+        -- Toss the body in first, so the scan can deal with it to.
+        f0, f1, token = string.find(temp, '%$(body)%$')
+        if fail ~= f0 then
+            temp = string.sub(temp, 1, f0 - 1) .. body .. string.sub(temp, f1 + 1)
         end
+        -- The actual metadata replacement scan.
+        result = ''
+        repeat
+            f0, f1, token = string.find(temp, '%$([%w_]+)%$', start)
+            if fail ~= f0 then
+                if nil ~= metadata[token] then result = result .. string.sub(temp, start, f0 - 1) .. metadata[token] end
+                start = f1 + 1
+            end
+        until fail == f0
+        result = result .. string.sub(temp, start)
 
         -- Write the file.
         if '' ~= result then
@@ -330,9 +410,6 @@ for name, file in pairs(Files) do
                 a:close()
             end
         end
-
---    else
---      print('')
     end
 end