Make the TOC actually work.

2 files changed, 12 insertions, 6 deletions

diff --git a/TODO.md b/TODO.md
index 1c87341..acdcfe2 100644
--- a/TODO.md
+++ b/TODO.md
@@ -6,8 +6,8 @@ Make it perphekd!
 
 TOC
 
-- Add anchors, so clicking on them goes to the heading.
 - Lengthy headings need to be tamed.
+- Need a "go to top" linky after each heading now.
 
 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/notYetAnotherWiki.lua b/notYetAnotherWiki.lua
index f124eeb..3590af7 100755
--- a/notYetAnotherWiki.lua
+++ b/notYetAnotherWiki.lua
@@ -710,6 +710,10 @@ local lunaLinky = function(url)		-- Fix up the links.
     return url
 end
 
+function Writer.header(s, level)
+    local text = table.concat(s)
+    return '<h' .. level .. ' id="' .. RE.gsub(text, '{[ ]}', '_') .. '">' .. text .. '</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)
@@ -776,14 +780,16 @@ for name, file in pairs(Files) do
             if bit == f then
                                         metadata.menu = metadata.menu .. '<p>' .. title .. '</p>'
                 for j, g in ipairs(file.headers) do
-                    g = RE.gsub(g, '{[#]}', '&nbsp;&nbsp;')
-                    g = RE.gsub(g, '{[ ]}', '&nbsp;')
-                        local beg, en = RE.find(g, [['{']])
+                    local h = string.sub(RE.gsub(g, '{[#]}', ''), 2)
+                    local l = string.len(g) - string.len(h)
+                    g = h
+                    h = RE.gsub(h, '{[ ]}', '&nbsp;')
+                        local beg, en = RE.find(h, [['{']])
                         if nil ~= beg then
-                            g = string.sub(g, 1, beg - 7)
+                            g = string.sub(h, 1, beg - 7)
                         end
 -- FIXME - if it's a linky, strip off the URL part.  The Wiki audit has such things.
-                                        metadata.menu = metadata.menu .. '<p style="font-size: 0.80em;">' .. g .. '</p>'
+                                        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>'