3 files changed, 24 insertions, 5 deletions

diff --git a/TODO.md b/TODO.md
index 1c87341..dfcacdd 100644
--- a/TODO.md
+++ b/TODO.md
@@ -6,7 +6,6 @@ Make it perphekd!
 
 TOC
 
-- Add anchors, so clicking on them goes to the heading.
 - Lengthy headings need to be tamed.
 
 Check the timestamps on the files, only update if source is newer than destination.  Meh, it's already 600 times faster than the pandoc version.
diff --git a/default.template b/default.template
index 2357782..a23bf89 100644
--- a/default.template
+++ b/default.template
@@ -85,7 +85,7 @@
     <div class="boxWrapper">
       <input type="checkbox" id="modeToggleMenu"/>
       <input type="checkbox" id="modeToggleBody"/>
-      <div class="boxLogo"><header><nav>
+      <div class="boxLogo" id="top"><header><nav>
         <a href="$home$"><img src="$logo$" alt="not (Yet) (Another / A) Wiki."/></a>
       </nav></header></div>
       <div class="boxTools"><header><nav>
diff --git a/notYetAnotherWiki.lua b/notYetAnotherWiki.lua
index 44f311c..974fde6 100755
--- a/notYetAnotherWiki.lua
+++ b/notYetAnotherWiki.lua
@@ -31,6 +31,7 @@ local GlobalMetaData = {
 }
 
 local Files, Subs, xLinks = {}, {}, {}
+local Context = {}                      -- Coz can't otherwise pass context through to the deeper Lunamark functions I'm overriding.
 
 local Template = ''
 local h = io.open("default.template", 'r')
@@ -87,6 +88,7 @@ local toFile = function(name, key, value)
         local bits, bit = stringBits(name)
         local path = ''
         Files[name] = {}
+        Files[name].headers = {}
         Files[name].bits = bits
         Files[name].bit = bit
         for i, d in ipairs(bits) do
@@ -107,6 +109,7 @@ local toFile = function(name, key, value)
         h = io.open(name .. '.md', 'r')
         if nil ~= h then
 --          print('Parsing ' .. name .. '.md')
+            Context = Files[name]
             body = h:read('*a') ; h:close()
             -- Deal with my typical double spaced sentence endings, and other things.
             local result = RE.compile( [=[{~
@@ -123,8 +126,9 @@ local toFile = function(name, key, value)
   {"[" {([^]])+} "]{style='color: " {([^}])+} "}" }  -> "<span style='color: %3;'>%2</span>" /
   {"{#"[A-Za-z_]+"}"}        -> '' /
   {"### [[edit](/bin/edit/Main/" {([^%nl])+} }  -> '' /
+  {"#"+ " " {([^%nl])+} }  -> header /
   .
- )* ~}]=],   { } ):match(body)
+ )* ~}]=],   { header = function(a) table.insert(Context.headers, a); return a end } ):match(body)
             body = result
 --  {"<!--".*"-->"}          -> '' /
 --  {"[$]"}                  -> '$dlr$' /               -- Replace $, coz otherwise it confuses things later.
@@ -646,7 +650,6 @@ local LunamarkOpts = {
 }
 local Writer = Lunamark.writer.html5.new(LunamarkOpts)
 -- Can override the various writer functions, there's something for each of the basic HTML elements.
-local Context = {}                      -- Coz can't otherwise pass context through to the deeper Lunamark functions I'm overriding.
 local lunaLinky = function(url)         -- Fix up the links.
     if ('https://wiki.devuan.org/' ~= url) and ('https://fos.wiki.devuan.org/' ~= url) then
         -- TODO - This might be covering up a bug elsewhere.
@@ -707,6 +710,10 @@ local lunaLinky = function(url)		-- Fix up the links.
     return url
 end
 
+function Writer.header(s, level)
+    local text = Lunamark.util.rope_to_string(s)
+    return '<h' .. level .. ' id="' .. RE.gsub(text, '{[ ]}', '_') .. '">' .. text .. ' <a style="font-size: 0.42em;" href="#top">👆</a></h' .. level .. '>'
+end
 local OgWriterLink = Writer.link        -- So we can call the original from within mine, we are just changing the URL.
 function Writer.link(lab, url, tit)
     return OgWriterLink(lab, lunaLinky(url), tit)
@@ -770,7 +777,20 @@ for name, file in pairs(Files) do
                 url   = Files[file.path .. '/' .. f].metadata.URL
             end
             if nil == title then title = f end
-            if bit == f then            metadata.menu = metadata.menu .. '<p>' .. title .. '</p>'
+            if bit == f then
+                                        metadata.menu = metadata.menu .. '<p>' .. title .. '</p>'
+                for j, g in ipairs(file.headers) do
+                        local beg, en = RE.find(g, [['{']])
+                        if nil ~= beg then
+                            g = string.sub(g, 1, beg - 2)
+                        end
+                    local h = string.sub(RE.gsub(g, '{[#]}', ''), 2)
+                    local l = string.len(g) - string.len(h)
+                    g = h
+                    h = RE.gsub(h, '{[ ]}', '&nbsp;')
+-- FIXME - if it's a linky, strip off the URL part.  The Wiki audit has such things.
+                                        metadata.menu = metadata.menu .. '<p>' .. string.rep('&nbsp;', l) .. '<a style="font-size: 0.80em;" href="#' .. RE.gsub(g, '{[ ]}', '_') .. '">' ..  h .. '</a></p>'
+                end
             else
                 if nil ~= url then      metadata.menu = metadata.menu .. '<p><a href="' .. url .. '">'      .. title .. ' &#9757;</a></p>'
                 else                    metadata.menu = metadata.menu .. '<p><a href="' .. f   .. '.HTML">' .. title .. '</a></p>'