1 files changed, 130 insertions, 76 deletions
diff --git a/notYetAnotherWiki.lua b/notYetAnotherWiki.lua
index 8c9a5c9..dc64fa2 100755
--- a/notYetAnotherWiki.lua
+++ b/notYetAnotherWiki.lua
@@ -64,10 +64,11 @@ local globalData = {
    ['devuanDeepSeaDark']    = '#132f40',    ['devuanDeepSeaLight']   = '#1a4562',
    ['devuanSaphireDark']    = '#004489',    ['devuanSaphireLight']   = '#00509f',
    ['karenPurple']          = '#8800ff',    ['onefangPurple']        = '#cc00ff',
-    favicon = 'nYAW_icon.png', logo = 'nYAW.png', header = '', home = '', --menu = '',
+    favicon = 'nYAW_icon.png', logo = 'nYAW.png',
-    history = '',  footer = 'Powered by <a href="https://sledjhamr.org/cgit/notYetAnotherWiki/about/">notYetAnotherWiki</a> version 0.0. &nbsp;',
+    header = '', home = '', history = '',  footer = 'Powered by <a href="https://sledjhamr.org/cgit/notYetAnotherWiki/about/">notYetAnotherWiki</a> version 0.0. &nbsp;',
+     --menu = '',
 }
-local Sites, Files, Subs = {}, {}, {}
+local Files, Subs = {}, {}
@@ -86,7 +87,7 @@ local derefTable = function(t, strip)
 end
-- String together the bits array into a path string.
+-- String together the bits array into a path string.  Or the other way around.  lol
 local stringBits = function(l)
    local bits = {}
    local last = 1
@@ -102,7 +103,19 @@ 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 == Files[name] then
+        local bits, bit = stringBits(name)
+        local path = ''
+        Files[name] = {}
+        Files[name].bits = bits
+        Files[name].bit = bit
+        for i, d in ipairs(bits) do
+            if '' ~= path then path = path .. '/' end
+            path = path .. d
+        end
+        Files[name].path = path
+--      Files[name].body = ''
+    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
@@ -120,9 +133,15 @@ end
 -- Actually start doing things.
+-- Create the base of everything.md here, so it gets picked up as usual in the file scan.
+local body, h = '', io.open('everything.md', 'w')
+h:write('# All the pages\n')
+h:close()
 -- Scan the subdirectories looking for .md files.
 local directory = arg[1]
-toSub('')  --Subs[''] = {files = {}, subs = {}, bits = {}}
+toSub('')
 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
@@ -135,39 +154,60 @@ for l in io.popen('find ' .. directory .. ' -name "*.md" -type f,l -printf "%P\n
    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.
+-- Gotta figure out all the files and subs first.  File and sub metadata comes along for the ride, coz we need them later.
+local newMeta = {}
 for name, file in pairs(Files) do
    local bitter, path = '', ''
-    local bits, bit = stringBits(name)
+    local bits, bit = file.bits, file.bit
    local ln = #bits
    local body, metadata = '', {}
    -- Go through our bits, construct Subs with bits.
-    Files[name].bits = bits
-    Files[name].bit = bit
    if ln > 0 then bitter = bits[1] end
    if '' ~= bitter then Subs[''].subs[bitter] = bitter end     -- "bitter end" was entirely by accident, I'm keeping it.  B-)
    for i, d in ipairs(bits) do
        if '' ~= path then path = path .. '/' end
        path = path .. d
        toSub(path, 'bits', derefiTable(bits, true))
-        if i < ln               then Subs[path].subs[bits[i + 1]] = bits[i + 1] end
+        if i < ln               then
-        if i < ln               then table.remove(Subs[path].bits, #bits) end
+            Subs[path].subs[bits[i + 1]] = bits[i + 1]
+            table.remove(Subs[path].bits, #bits)
+        end
    end
    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
+            for k, v in string.gmatch(l, "(%w+)%s*=%s*(.+)") do 
+                if nil == v then
+                    print(name .. ' ' .. k)
+                else
+                    metadata[k] = v
+                end
+            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)
+--      else                                           toFile(string.sub(name, 1, -4), 'metadata', metadata)
+        else                                            newMeta[string.sub(name, 1, -4)] = metadata
        end
        Files[name] = nil
-    else
+    end
+end
-    -- Start the file parsing here, coz we need it's metadata.
+-- FIXTHEM - Lua doesn't like modifying the thing you are pair()ing, like we want to do in the last loop.
+for name, file in pairs(newMeta) do
+    if nil == Files[name] then toFile(name) end
+    if nil == Files[name].metadata then Files[name].metadata = {} end
+    for k, v in pairs(file) do
+        if nil == Files[name].metadata[k] then Files[name].metadata[k] = v end
+    end
+end
+-- Open the files and do the iniital cleanups.
+for name, file in pairs(Files) do
+    if '.md' ~= string.sub(name, -3, -1) then
 --      print('Parsing ' .. name .. '.md')
        h = io.open(name .. '.md', 'r')
        if nil ~= h then
@@ -201,13 +241,31 @@ for name, file in pairs(Files) do
                end
            until fail == f0
            result = result .. string.sub(body, start)
+            body = result
+        end
+        Files[name].body = body
+        table.insert(Subs[Files[name].path].files, Files[name].bit)
+    end
+end
-            body = parse(result)
+-- Create an "everything" page, for URL links to every file.HTML.
+-- TODO - sort the list of pages.
+local bdy, h = Files['everything'].body, io.open('everything.md', 'a+')
+bdy = bdy .. '\n\n| page | converted | Foswiki | PmWiki | \n| ---- | --------- | ------- | ------ | '
+for name, file in pairs(Files) do
+    local metadata = derefTable(Files[name].metadata, true)
+    if 'everything' ~= name then
+        local ln, fw, pw = 'DUNNO', '', ''
+        if 'PmWiki'  == metadata.ogWiki then pw = '[' .. metadata.ogURL .. '](' .. metadata.ogURL .. ')' end
+        if 'Foswiki' == metadata.ogWiki then fw = '[' .. metadata.ogURL .. '](' .. metadata.ogURL .. ')' end
+        if nil ~= file.bit   then ln = file.bit
        end
-        toFile(name, 'body', body)
+        bdy = bdy .. '\n| ' .. name .. ' | [' .. ln .. '](<' .. name .. '.HTML>) | ' .. fw .. ' | ' .. pw .. ' |'
-        table.insert(Subs[path].files, bit)
    end
 end
+h:write(bdy)
+h:close()
+toFile('everything', 'body', parse(bdy))
@@ -252,16 +310,20 @@ local linkFrom = function(source, dest)
                break
            end
        end
-        depth = #(Subs[source].bits) - depth
-        depth = depth + 1
+        if #(Subs[dest].bits) >= #(Subs[source].bits) then
-        link = string.rep('../', depth)
+            depth = #(Subs[source].bits)
-        if (0 == depth) or (depth > #(Subs[dest].bits)) then
            for i, v in ipairs(Subs[dest].bits) do
-                if i >= depth then
+                if i > depth then
                    if '' ~= link then link = link .. '/' end
                    link = link .. Subs[dest].bits[i]
                end
            end
+            if '' ~= link then link = link .. '/' end
+        else
+            depth = #(Subs[source].bits) - depth
+            depth = depth + 1
+            link = string.rep('../', depth)
        end
    end
    return link
@@ -269,12 +331,28 @@ end
-- TODO - loop through Subs, doing whichPage and inheritance.
 -- More of this actually doing things nonsense.
+-- Loop through Subs, doing whichPage and inheritance.
+for name, sub in pairs(Subs) do
+    sub.whichPage = whichPage(name)
+    local metadata = sub.metadata
+    for i, s in pairs(sub.subs) do
+        local nm = i
+        if '' ~= name then nm = name .. '/' .. i end
+        ss = Subs[nm]
+        for k, v in pairs(metadata) do
+            if nil == ss.metadata[k] then
+                if ('favicon' == k) or ('logo' == k) then
+                    ss.metadata[k] = linkFrom(nm, name) .. v
+                else
+                    ss.metadata[k] = v
+                end
+            end
+        end
+    end
+end
 -- Loop through the files we found and actually create their HTML files.
 for name, file in pairs(Files) do
    local path, result = '', ''
@@ -285,42 +363,31 @@ for name, file in pairs(Files) do
    path = table.concat(bits, '/', 1, ln)
    if '' ~= body then
-        -- Copy any metadata found in parent directories.
+        -- Inherit stuff from sub and global.
-        local pth = ''
+        local mdata = Subs[path].metadata
-        for i, d in ipairs(bits) do
+        for k, v in pairs(mdata) do
-            if '' ~= pth then pth = pth .. '/' end
+            if nil == file.metadata[k] then
-            pth = pth .. d
+                file.metadata[k] = v
-            if nil ~= Subs[pth] then
-                if nil ~= Subs[pth].metadata then
-                    for m, x in pairs(Subs[pth].metadata) do
-                        if nil == metadata[m] then
-                            metadata[m] = x
-                        end
-                    end
-                end
            end
        end
-        -- Root directory needs to be handled separately, for now.
+        Files[name].metadata = file.metadata
-        if nil ~= Subs[''].metadata then
+        metadata = derefTable(Files[name].metadata, true)
-            for m, x in pairs(Subs[''].metadata)        do if nil == metadata[m] then metadata[m] = x end end
-        end
        for             m, x in pairs(globalData)               do if nil == metadata[m] then metadata[m] = x end end
-        -- Inherit these images from most recent parent directory that defines them.
+        if nil ~= metadata.ogURL then
-        for n, y in ipairs{'favicon', 'logo'} do
+            body = body .. '\n\n---\n\n[Original page](' .. metadata.ogURL .. '), maybe you can edit it.\n'
-            local pith = ''
+        end
-            if nil ~= metadata[y] then
-                local pth, found = '', false
+        -- Figure out this pages trail links.
-                if (nil ~= Subs[''].metadata) and (nil ~= Subs[''].metadata[y]) then pith = '' ; found = true end
+        metadata.home = linkFrom(path, '') .. Subs[''].whichPage
-                for m, x in ipairs(bits) do
+        metadata.trail = ''
-                    if '' ~= pth then pth = pth .. '/' end
+        for i, b in ipairs(bits) do
-                    pth = pth .. x
+            local p = table.concat(bits, '/', 1, i)
-                    if (nil ~= Subs[pth].metadata) and (nil ~= Subs[pth].metadata[y]) then pith = pth ; found = true end
+            if i < #bits then
-                end
+                metadata.trail = metadata.trail .. '<a href="' .. linkFrom(path, p) .. Subs[p].whichPage .. '">' .. b .. '</a> &#x1f463; &nbsp; '
-                if found then           metadata[y] = linkFrom(path, pith) .. metadata[y]
+                linkFrom(path, table.concat(bits, '/', 1, i))
-                else                    metadata[y] = linkFrom(path, pith) .. globalData[y]
+            else
-                end
+                metadata.trail = metadata.trail ..  b .. ' &nbsp; '
            end
        end
@@ -334,8 +401,7 @@ for name, file in pairs(Files) do
        for i, f in ipairs(subs) do
            local pth = path
            if '' ~= path then pth = path .. '/' end
-            local fl = whichPage(pth .. f)
+            metadata.header = metadata.header .. '<a href="' .. f .. '/' .. whichPage(pth .. f) .. '">' .. f .. '</a> &nbsp; '
-            metadata.header = metadata.header .. '<a href="' .. f .. '/' .. fl .. '">' .. f .. '</a> &nbsp; '
        end
        -- Figure out this pages menu links.
@@ -360,18 +426,6 @@ for name, file in pairs(Files) do
            end
        end
-        -- Figure out this pages trail links.
-        metadata.home = linkFrom(path, '') .. whichPage('')
-        metadata.trail = ''
-        for i, b in ipairs(bits) do
-            if i < #bits then
-                metadata.trail = metadata.trail .. '<a href="' .. linkFrom(path, table.concat(bits, '/', 1, i)) .. whichPage(b) .. '">' .. b .. '</a> &#x1f463; &nbsp; '
-                linkFrom(path, table.concat(bits, '/', 1, i))
-            else
-                metadata.trail = metadata.trail ..  b .. ' &nbsp; '
-            end
-        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
        if nil ~= metadata.sourcecode   then metadata.footer = '<a href="' .. metadata.sourcecode       .. '">source code</a> &nbsp; &nbsp; ' .. metadata.footer    end
@@ -382,12 +436,12 @@ for name, file in pairs(Files) do
        -- 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)
+            -- NOTE - this is where we actually parse the markup into HTML.
+            temp = string.sub(temp, 1, f0 - 1) .. parse(body) .. string.sub(temp, f1 + 1)
        end
        -- The actual metadata replacement scan.
        result = ''

diff --git a/notYetAnotherWiki.lua b/notYetAnotherWiki.lua index 8c9a5c9..dc64fa2 100755 --- a/notYetAnotherWiki.lua +++ b/notYetAnotherWiki.lua
@@ -64,10 +64,11 @@ local globalData = {
64	['devuanDeepSeaDark'] = '#132f40', ['devuanDeepSeaLight'] = '#1a4562',	64	['devuanDeepSeaDark'] = '#132f40', ['devuanDeepSeaLight'] = '#1a4562',
65	['devuanSaphireDark'] = '#004489', ['devuanSaphireLight'] = '#00509f',	65	['devuanSaphireDark'] = '#004489', ['devuanSaphireLight'] = '#00509f',
66	['karenPurple'] = '#8800ff', ['onefangPurple'] = '#cc00ff',	66	['karenPurple'] = '#8800ff', ['onefangPurple'] = '#cc00ff',
67	favicon = 'nYAW_icon.png', logo = 'nYAW.png', header = '', home = '', --menu = '',	67	favicon = 'nYAW_icon.png', logo = 'nYAW.png',
68	history = '', footer = 'Powered by <a href="https://sledjhamr.org/cgit/notYetAnotherWiki/about/">notYetAnotherWiki</a> version 0.0.  ',	68	header = '', home = '', history = '', footer = 'Powered by <a href="https://sledjhamr.org/cgit/notYetAnotherWiki/about/">notYetAnotherWiki</a> version 0.0.  ',
		69	--menu = '',
69	}	70	}
70	local Sites, Files, Subs = {}, {}, {}	71	local Files, Subs = {}, {}
71		72
72		73
73		74
@@ -86,7 +87,7 @@ local derefTable = function(t, strip)
86	end	87	end
87		88
88		89
89	-- String together the bits array into a path string.	90	-- String together the bits array into a path string. Or the other way around. lol
90	local stringBits = function(l)	91	local stringBits = function(l)
91	local bits = {}	92	local bits = {}
92	local last = 1	93	local last = 1
@@ -102,7 +103,19 @@ end
102		103
103	-- Put a value into the Files or Subs table, creating things if needed.	104	-- Put a value into the Files or Subs table, creating things if needed.
104	local toFile = function(name, key, value)	105	local toFile = function(name, key, value)
105	if nil == Files[name] then Files[name] = {} end	106	if nil == Files[name] then
		107	local bits, bit = stringBits(name)
		108	local path = ''
		109	Files[name] = {}
		110	Files[name].bits = bits
		111	Files[name].bit = bit
		112	for i, d in ipairs(bits) do
		113	if '' ~= path then path = path .. '/' end
		114	path = path .. d
		115	end
		116	Files[name].path = path
		117	-- Files[name].body = ''
		118	end
106	if nil ~= key then Files[name][key] = value end	119	if nil ~= key then Files[name][key] = value end
107	for i, v in ipairs{'metadata', 'bits', } do	120	for i, v in ipairs{'metadata', 'bits', } do
108	if nil == Files[name][v] then Files[name][v] = {} end	121	if nil == Files[name][v] then Files[name][v] = {} end
@@ -120,9 +133,15 @@ end
120		133
121	-- Actually start doing things.	134	-- Actually start doing things.
122		135
		136	-- Create the base of everything.md here, so it gets picked up as usual in the file scan.
		137	local body, h = '', io.open('everything.md', 'w')
		138	h:write('# All the pages\n')
		139	h:close()
		140
		141
123	-- Scan the subdirectories looking for .md files.	142	-- Scan the subdirectories looking for .md files.
124	local directory = arg[1]	143	local directory = arg[1]
125	toSub('') --Subs[''] = {files = {}, subs = {}, bits = {}}	144	toSub('')
126	if nil == directory then directory = '.' end	145	if nil == directory then directory = '.' end
127	if '.' ~= directory then	146	if '.' ~= directory then
128	for l in io.popen('find . -name "*.md" -type f,l -printf "%P\n"'):lines() do	147	for l in io.popen('find . -name "*.md" -type f,l -printf "%P\n"'):lines() do
@@ -135,39 +154,60 @@ for l in io.popen('find ' .. directory .. ' -name "*.md" -type f,l -printf "%P\n
135	if nil == Files[n] then toFile(n) end	154	if nil == Files[n] then toFile(n) end
136	end	155	end
137		156
138	-- Gotta figure out all the files and subs first. File and sub metadata comes along for the ride.	157
		158	-- Gotta figure out all the files and subs first. File and sub metadata comes along for the ride, coz we need them later.
		159	local newMeta = {}
139	for name, file in pairs(Files) do	160	for name, file in pairs(Files) do
140	local bitter, path = '', ''	161	local bitter, path = '', ''
141	local bits, bit = stringBits(name)	162	local bits, bit = file.bits, file.bit
142	local ln = #bits	163	local ln = #bits
143	local body, metadata = '', {}	164	local body, metadata = '', {}
144		165
145	-- Go through our bits, construct Subs with bits.	166	-- Go through our bits, construct Subs with bits.
146	Files[name].bits = bits
147	Files[name].bit = bit
148	if ln > 0 then bitter = bits[1] end	167	if ln > 0 then bitter = bits[1] end
149	if '' ~= bitter then Subs[''].subs[bitter] = bitter end -- "bitter end" was entirely by accident, I'm keeping it. B-)	168	if '' ~= bitter then Subs[''].subs[bitter] = bitter end -- "bitter end" was entirely by accident, I'm keeping it. B-)
150	for i, d in ipairs(bits) do	169	for i, d in ipairs(bits) do
151	if '' ~= path then path = path .. '/' end	170	if '' ~= path then path = path .. '/' end
152	path = path .. d	171	path = path .. d
153	toSub(path, 'bits', derefiTable(bits, true))	172	toSub(path, 'bits', derefiTable(bits, true))
154	if i < ln then Subs[path].subs[bits[i + 1]] = bits[i + 1] end	173	if i < ln then
155	if i < ln then table.remove(Subs[path].bits, #bits) end	174	Subs[path].subs[bits[i + 1]] = bits[i + 1]
		175	table.remove(Subs[path].bits, #bits)
		176	end
156	end	177	end
157		178
158	if '.md' == string.sub(name, -3, -1) then	179	if '.md' == string.sub(name, -3, -1) then
159	-- This is a metadata only file, no content, stash the matadata.	180	-- This is a metadata only file, no content, stash the matadata.
160	for l in io.open(name .. '.md'):lines() do	181	for l in io.open(name .. '.md'):lines() do
161	for k, v in string.gmatch(l, "(%w+)%s=%s(.+)") do metadata[k] = v end	182	for k, v in string.gmatch(l, "(%w+)%s=%s(.+)") do
		183	if nil == v then
		184	print(name .. ' ' .. k)
		185	else
		186	metadata[k] = v
		187	end
		188	end
162	end	189	end
163	if '.md' == name then toSub(path, 'metadata', metadata)	190	if '.md' == name then toSub(path, 'metadata', metadata)
164	elseif '/.md' == string.sub(name, -4, -1) then toSub(path, 'metadata', metadata)	191	elseif '/.md' == string.sub(name, -4, -1) then toSub(path, 'metadata', metadata)
165	else toFile(string.sub(name, 1, -4), 'metadata', metadata)	192	-- else toFile(string.sub(name, 1, -4), 'metadata', metadata)
		193	else newMeta[string.sub(name, 1, -4)] = metadata
166	end	194	end
167	Files[name] = nil	195	Files[name] = nil
168	else	196	end
		197	end
169		198
170	-- Start the file parsing here, coz we need it's metadata.	199	-- FIXTHEM - Lua doesn't like modifying the thing you are pair()ing, like we want to do in the last loop.
		200	for name, file in pairs(newMeta) do
		201	if nil == Files[name] then toFile(name) end
		202	if nil == Files[name].metadata then Files[name].metadata = {} end
		203	for k, v in pairs(file) do
		204	if nil == Files[name].metadata[k] then Files[name].metadata[k] = v end
		205	end
		206	end
		207
		208	-- Open the files and do the iniital cleanups.
		209	for name, file in pairs(Files) do
		210	if '.md' ~= string.sub(name, -3, -1) then
171	-- print('Parsing ' .. name .. '.md')	211	-- print('Parsing ' .. name .. '.md')
172	h = io.open(name .. '.md', 'r')	212	h = io.open(name .. '.md', 'r')
173	if nil ~= h then	213	if nil ~= h then
@@ -201,13 +241,31 @@ for name, file in pairs(Files) do
201	end	241	end
202	until fail == f0	242	until fail == f0
203	result = result .. string.sub(body, start)	243	result = result .. string.sub(body, start)
		244	body = result
		245	end
		246	Files[name].body = body
		247	table.insert(Subs[Files[name].path].files, Files[name].bit)
		248	end
		249	end
204		250
205	body = parse(result)	251	-- Create an "everything" page, for URL links to every file.HTML.
		252	-- TODO - sort the list of pages.
		253	local bdy, h = Files['everything'].body, io.open('everything.md', 'a+')
		254	bdy = bdy .. '\n\n\| page \| converted \| Foswiki \| PmWiki \| \n\| ---- \| --------- \| ------- \| ------ \| '
		255	for name, file in pairs(Files) do
		256	local metadata = derefTable(Files[name].metadata, true)
		257	if 'everything' ~= name then
		258	local ln, fw, pw = 'DUNNO', '', ''
		259	if 'PmWiki' == metadata.ogWiki then pw = '[' .. metadata.ogURL .. '](' .. metadata.ogURL .. ')' end
		260	if 'Foswiki' == metadata.ogWiki then fw = '[' .. metadata.ogURL .. '](' .. metadata.ogURL .. ')' end
		261	if nil ~= file.bit then ln = file.bit
206	end	262	end
207	toFile(name, 'body', body)	263	bdy = bdy .. '\n\| ' .. name .. ' \| [' .. ln .. '](<' .. name .. '.HTML>) \| ' .. fw .. ' \| ' .. pw .. ' \|'
208	table.insert(Subs[path].files, bit)
209	end	264	end
210	end	265	end
		266	h:write(bdy)
		267	h:close()
		268	toFile('everything', 'body', parse(bdy))
211		269
212		270
213		271
@@ -252,16 +310,20 @@ local linkFrom = function(source, dest)
252	break	310	break
253	end	311	end
254	end	312	end
255	depth = #(Subs[source].bits) - depth	313
256	depth = depth + 1	314	if #(Subs[dest].bits) >= #(Subs[source].bits) then
257	link = string.rep('../', depth)	315	depth = #(Subs[source].bits)
258	if (0 == depth) or (depth > #(Subs[dest].bits)) then
259	for i, v in ipairs(Subs[dest].bits) do	316	for i, v in ipairs(Subs[dest].bits) do
260	if i >= depth then	317	if i > depth then
261	if '' ~= link then link = link .. '/' end	318	if '' ~= link then link = link .. '/' end
262	link = link .. Subs[dest].bits[i]	319	link = link .. Subs[dest].bits[i]
263	end	320	end
264	end	321	end
		322	if '' ~= link then link = link .. '/' end
		323	else
		324	depth = #(Subs[source].bits) - depth
		325	depth = depth + 1
		326	link = string.rep('../', depth)
265	end	327	end
266	end	328	end
267	return link	329	return link
@@ -269,12 +331,28 @@ end
269		331
270		332
271		333
272	-- TODO - loop through Subs, doing whichPage and inheritance.
273
274
275
276	-- More of this actually doing things nonsense.	334	-- More of this actually doing things nonsense.
277		335
		336	-- Loop through Subs, doing whichPage and inheritance.
		337	for name, sub in pairs(Subs) do
		338	sub.whichPage = whichPage(name)
		339	local metadata = sub.metadata
		340	for i, s in pairs(sub.subs) do
		341	local nm = i
		342	if '' ~= name then nm = name .. '/' .. i end
		343	ss = Subs[nm]
		344	for k, v in pairs(metadata) do
		345	if nil == ss.metadata[k] then
		346	if ('favicon' == k) or ('logo' == k) then
		347	ss.metadata[k] = linkFrom(nm, name) .. v
		348	else
		349	ss.metadata[k] = v
		350	end
		351	end
		352	end
		353	end
		354	end
		355
278	-- Loop through the files we found and actually create their HTML files.	356	-- Loop through the files we found and actually create their HTML files.
279	for name, file in pairs(Files) do	357	for name, file in pairs(Files) do
280	local path, result = '', ''	358	local path, result = '', ''
@@ -285,42 +363,31 @@ for name, file in pairs(Files) do
285	path = table.concat(bits, '/', 1, ln)	363	path = table.concat(bits, '/', 1, ln)
286		364
287	if '' ~= body then	365	if '' ~= body then
288	-- Copy any metadata found in parent directories.	366	-- Inherit stuff from sub and global.
289	local pth = ''	367	local mdata = Subs[path].metadata
290	for i, d in ipairs(bits) do	368	for k, v in pairs(mdata) do
291	if '' ~= pth then pth = pth .. '/' end	369	if nil == file.metadata[k] then
292	pth = pth .. d	370	file.metadata[k] = v
293	if nil ~= Subs[pth] then
294	if nil ~= Subs[pth].metadata then
295	for m, x in pairs(Subs[pth].metadata) do
296	if nil == metadata[m] then
297	metadata[m] = x
298	end
299	end
300	end
301	end	371	end
302	end	372	end
303	-- Root directory needs to be handled separately, for now.	373	Files[name].metadata = file.metadata
304	if nil ~= Subs[''].metadata then	374	metadata = derefTable(Files[name].metadata, true)
305	for m, x in pairs(Subs[''].metadata) do if nil == metadata[m] then metadata[m] = x end end
306	end
307
308	for m, x in pairs(globalData) do if nil == metadata[m] then metadata[m] = x end end	375	for m, x in pairs(globalData) do if nil == metadata[m] then metadata[m] = x end end
309		376
310	-- Inherit these images from most recent parent directory that defines them.	377	if nil ~= metadata.ogURL then
311	for n, y in ipairs{'favicon', 'logo'} do	378	body = body .. '\n\n---\n\n[Original page](' .. metadata.ogURL .. '), maybe you can edit it.\n'
312	local pith = ''	379	end
313	if nil ~= metadata[y] then	380
314	local pth, found = '', false	381	-- Figure out this pages trail links.
315	if (nil ~= Subs[''].metadata) and (nil ~= Subs[''].metadata[y]) then pith = '' ; found = true end	382	metadata.home = linkFrom(path, '') .. Subs[''].whichPage
316	for m, x in ipairs(bits) do	383	metadata.trail = ''
317	if '' ~= pth then pth = pth .. '/' end	384	for i, b in ipairs(bits) do
318	pth = pth .. x	385	local p = table.concat(bits, '/', 1, i)
319	if (nil ~= Subs[pth].metadata) and (nil ~= Subs[pth].metadata[y]) then pith = pth ; found = true end	386	if i < #bits then
320	end	387	metadata.trail = metadata.trail .. '<a href="' .. linkFrom(path, p) .. Subs[p].whichPage .. '">' .. b .. '</a> 👣   '
321	if found then metadata[y] = linkFrom(path, pith) .. metadata[y]	388	linkFrom(path, table.concat(bits, '/', 1, i))
322	else metadata[y] = linkFrom(path, pith) .. globalData[y]	389	else
323	end	390	metadata.trail = metadata.trail .. b .. '   '
324	end	391	end
325	end	392	end
326		393
@@ -334,8 +401,7 @@ for name, file in pairs(Files) do
334	for i, f in ipairs(subs) do	401	for i, f in ipairs(subs) do
335	local pth = path	402	local pth = path
336	if '' ~= path then pth = path .. '/' end	403	if '' ~= path then pth = path .. '/' end
337	local fl = whichPage(pth .. f)	404	metadata.header = metadata.header .. '<a href="' .. f .. '/' .. whichPage(pth .. f) .. '">' .. f .. '</a>   '
338	metadata.header = metadata.header .. '<a href="' .. f .. '/' .. fl .. '">' .. f .. '</a>   '
339	end	405	end
340		406
341	-- Figure out this pages menu links.	407	-- Figure out this pages menu links.
@@ -360,18 +426,6 @@ for name, file in pairs(Files) do
360	end	426	end
361	end	427	end
362		428
363	-- Figure out this pages trail links.
364	metadata.home = linkFrom(path, '') .. whichPage('')
365	metadata.trail = ''
366	for i, b in ipairs(bits) do
367	if i < #bits then
368	metadata.trail = metadata.trail .. '<a href="' .. linkFrom(path, table.concat(bits, '/', 1, i)) .. whichPage(b) .. '">' .. b .. '</a> 👣   '
369	linkFrom(path, table.concat(bits, '/', 1, i))
370	else
371	metadata.trail = metadata.trail .. b .. '   '
372	end
373	end
374
375	-- Figure out this pages footer links.	429	-- Figure out this pages footer links.
376	if nil ~= metadata.pagehistory then metadata.history = '<p>Page <a href="' .. metadata.pagehistory .. '/' .. name .. '.md">history</a></p>' end	430	if nil ~= metadata.pagehistory then metadata.history = '<p>Page <a href="' .. metadata.pagehistory .. '/' .. name .. '.md">history</a></p>' end
377	if nil ~= metadata.sourcecode then metadata.footer = '<a href="' .. metadata.sourcecode .. '">source code</a>     ' .. metadata.footer end	431	if nil ~= metadata.sourcecode then metadata.footer = '<a href="' .. metadata.sourcecode .. '">source code</a>     ' .. metadata.footer end
@@ -382,12 +436,12 @@ for name, file in pairs(Files) do
382	-- Do our own metadata replacement, it's simple and works better.	436	-- Do our own metadata replacement, it's simple and works better.
383	local temp = template	437	local temp = template
384	local start = 1	438	local start = 1
385	metadata.body = nil
386	local f0, f1, token	439	local f0, f1, token
387	-- Toss the body in first, so the scan can deal with it to.	440	-- Toss the body in first, so the scan can deal with it to.
388	f0, f1, token = string.find(temp, '%$(body)%$')	441	f0, f1, token = string.find(temp, '%$(body)%$')
389	if fail ~= f0 then	442	if fail ~= f0 then
390	temp = string.sub(temp, 1, f0 - 1) .. body .. string.sub(temp, f1 + 1)	443	-- NOTE - this is where we actually parse the markup into HTML.
		444	temp = string.sub(temp, 1, f0 - 1) .. parse(body) .. string.sub(temp, f1 + 1)
391	end	445	end
392	-- The actual metadata replacement scan.	446	-- The actual metadata replacement scan.
393	result = ''	447	result = ''