1 files changed, 33 insertions, 21 deletions

diff --git a/notYetAnotherWiki.lua b/notYetAnotherWiki.lua
index d592d06..c7b205d 100755
--- a/notYetAnotherWiki.lua
+++ b/notYetAnotherWiki.lua
@@ -24,11 +24,16 @@ 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.
-local copyTable = function(t, strip)
+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
     return argh
 end
+local derefTable = function(t, strip)
+    local argh = {}
+    for l, y in pairs(t) do     argh[l] = y end
+    return argh
+end
 
 
 -- String together the bits array into a path string.
@@ -79,7 +84,7 @@ for name, file in pairs(Files) do
         path = path .. d
         if nil == Subs[path]    then Subs[path] = {files = {}, subs = {}} end
         if i < ln               then Subs[path].subs[bits[i + 1]] = bits[i + 1] end
-        Subs[path].bits = copyTable(bits, true)
+        Subs[path].bits = derefiTable(bits, true)
         if i < ln               then table.remove(Subs[path].bits, #bits) end
     end
 
@@ -97,10 +102,14 @@ for name, file in pairs(Files) do
         Files[name] = nil
     else
         -- Ordinary md file, stash it's metadata and parsed body.
-        h = io.open(name  .. '.body', 'r')
+        -- I need cmark-gfm, coz lcmark doesn't support tables and stuff, it only does basic cmark.
+        -- 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
-        file.metadata = metadata
-        file.body = body
+        Files[name].metadata = metadata
+        Files[name].body = body
         table.insert(Subs[path].files, bit)
     end
 end
@@ -113,23 +122,26 @@ end
 -- NOTE - only looking for the .md files we scanned for before, any stray HTML, html, HTM, and htm files will get ignored.
 local whichPage = function(f)
     local fl = ''
-    if (nil ~= Subs[f]) and (nil ~= Subs[f].files) then
-        if 1 == #(Subs[f].files) then   fl = Subs[f].files[1] else
-            -- Standard files to search for.
-            for i, v in ipairs{'about', 'readme', 'index', 'homepage', 'mainpage', 'webhome'} do
-                for j, w in ipairs(Subs[f].files) do
-                    if v == string.lower(w) then
-                        fl = w
-                        break
+    if nil ~= Subs[f] then
+        if nil ~= Subs[f].whichPage then return Subs[f].whichPage end
+        if nil ~= Subs[f].files then
+            if 1 == #(Subs[f].files) then       fl = Subs[f].files[1] else
+                -- Standard files to search for.
+                for i, v in ipairs{'about', 'readme', 'index', 'homepage', 'mainpage', 'webhome'} do
+                    for j, w in ipairs(Subs[f].files) do
+                        if v == string.lower(w) then
+                            fl = w
+                            break
+                        end
                     end
+                    if '' ~= fl then break end
                 end
-                if '' ~= fl then break end
+                -- If nothing else, just grab the first one.
+                if ('' == fl) and (nil ~= Subs[f].files[1]) then fl = Subs[f].files[1] end
             end
-            -- If nothing else, just grab the first one.
-            if ('' == fl) and (nil ~= Subs[f].files[1]) then fl = Subs[f].files[1] end
         end
     end
-    if '' ~= fl then fl = fl .. '.HTML' end
+    if '' ~= fl then fl = fl .. '.HTML' ; Subs[f].whichPage = fl end
     return fl
 end
 
@@ -167,7 +179,7 @@ end
 -- Loop through the files we found and actually create their HTML files.
 for name, file in pairs(Files) do
     local path, result = '', ''
-    local body, metadata = Files[name].body, Files[name].metadata
+    local body, metadata = Files[name].body, derefTable(Files[name].metadata, true)
     local bits, bit = Files[name].bits, Files[name].bit
     local ln = #bits
 
@@ -237,7 +249,6 @@ for name, file in pairs(Files) do
 
         -- Figure out this pages menu links.
         metadata.menu = ''
-        if nil == metadata.title then metadata.title = metadata.pagetitle end
         if nil == metadata.title then metadata.title = bit end
         if nil ~= Subs[path].files then table.sort(Subs[path].files, function(a, b) return (string.lower(a) < string.lower(b))  end)  end
         for i, f in ipairs(Subs[path].files) do
@@ -298,6 +309,7 @@ for name, file in pairs(Files) do
                 result = lcmark.apply_template(template, metadata)
             end
         else
+            print('No template for ' .. name)
             result = body
         end
 
@@ -312,8 +324,8 @@ for name, file in pairs(Files) do
             end
         end
 
-    else
-        print('')
+--    else
+--      print('')
     end
 end