5 files changed, 134 insertions, 56 deletions

diff --git a/README.md.md b/README.md.md
index bc85e8c..31ea1e7 100644
--- a/README.md.md
+++ b/README.md.md
@@ -1 +1 @@
-title=notYetAnotherWiki
+title=nYAW
diff --git a/SuckIt b/SuckIt
index 8950850..a544f48 100755
--- a/SuckIt
+++ b/SuckIt
@@ -41,6 +41,7 @@ do
         # Doesn't help with redownloads, coz natch a dynamic site isn't cached.  But I can at least comment out the curl command during testing to save time.
         curl --silent --no-progress-meter ${ogURL}/${base}/${file}?cover=print -o ${ogWiki}/${base}/${file}.HTM
         # Attempt to separate user profiles from user content.  Doesn't work when people turn their profiles into content.
+        dest=""
         if [[ "${base}" ==  "Main" ]]; then
             dest="unsorted"
             mkdir -p `dirname users/${file}`
@@ -48,8 +49,23 @@ do
             if [ -s users/${file}_fos.SED ]; then
                 dest="users"
             fi
-            rm users/${file}_fos.SED
+            rm users/${file}_fos.SED >/dev/null 2>&1
             rm -d `dirname users/${file}` >/dev/null 2>&1
+        fi
+        # "Devuan" is only two pages that get sorted.  "Sandbox" is a mixture of standard examples, stuff that was copied to PmWiki, and other things that should get unsorted.
+        #                                               Skipping anything with "<a href="/Main/UnknownUser">UnknownUser</a></span></div>".
+        if [[ "${base}" ==  "Sandbox" ]]; then
+            dest="unsorted"
+            mkdir -p `dirname users/${file}`
+            sed -i -E ${ogWiki}/${base}/${file}.HTM -e "s%<a href=\"/Main/UnknownUser\">UnknownUser</a></span></div>%%w users/${file}_fos.SED"
+            if [ -s users/${file}_fos.SED ]; then
+                dest=""
+            fi
+            rm users/${file}_fos.SED >/dev/null 2>&1
+            rm -d `dirname users/${file}` >/dev/null 2>&1
+        fi
+
+        if [[ "${dest}" != "" ]]; then
             mkdir -p `dirname ${dest}/${file}`
             realURL=${dest}/${file}
             echo -e "ogWiki=${ogWiki}\nogURL=${ogURL}\nrealURL=${realURL}_fos\nogBase=${base}\nogFile=${file}\ntimestamp=${time}\n" > ${ogWiki}/${base}/${file}.md.md
diff --git a/TODO.md b/TODO.md
index 673e0dc..dfcacdd 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,16 +4,9 @@ Make it perphekd!
 
 ## Do these
 
-Automate symlinks.
-
-- any .md.md file should be linked along with it's matching .md file if it's outside of Foswiki/ and PmWiki/.
-
-Other colour shenanigans.
-
 TOC
 
-- Maybe have it on the left, as the sub menu of the current page's menu item, automatically generated from the $body$ headings.
-- Sub headings get sub menus etc.
+- 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.
 
@@ -35,14 +28,28 @@ Deal with complex directory trees.
 - On the gripping hand, this is where we want empty directories to vanish.
 - SOOOOOOO don't show empty directories, but show their subs that have content, even if that sub is deep, but as per usual stop once we find a sub on that branch.  EEEEW branches.
 
+Fix up linky conversion.  DONE, mostly.
+
+- This is the "page moved" problem, but now it's "page copied" and "page linked", a generic solution might work.
+- Need to deal with real file name versus title.  Also symlink name not matching what it points to.
+- . Hmmm, might it be good policy to have a single canonical context for each page?  The "real URL" .md.md thing?
+- . Loop through the manually placed symlinks, adjusting "real URL" as we go.
+- + What to do about mulitple symlinks pointing to the same page?  Compare timestamps, most recent wins.
+
 FIXTHEM: If there's a single word and period at the beginning of a line, it gets turned into a list, or list item by lunamark at the final Parse stage.
 
+Automate symlinks.
+
+- any .md.md file should be linked along with it's matching .md file if it's outside of Foswiki/ and PmWiki/.
+
 
 ## Some ideas
 
 Mostly from something chomwitt deleted.
 
 - A toolbar is mentioned, which is what I'm half way through creating with those hamburger / sunglasses icons, they are a bar of tools.
+- + "everything" and "unsorted" as toolbar icons.
+- + Maybe "users"?
 - Maybe tabs as well as a toolbar, for the list of sub directories.
 - Syntax highlighting in code blocks.
 - Allow default.template files in sub directories.
@@ -62,6 +69,8 @@ Mostly from something chomwitt deleted.
 
 ## Try out
 
+https://inclusive-components.design/tooltips-toggletips/ has some ideas about the "tooltip" HTML attribute, and what to do about it.  A rabbit hole that ends in javascript, but might be useful up to that point.
+
 htmx
 
 cgit has Lua
diff --git a/default.template b/default.template
index b49b4d6..a23bf89 100644
--- a/default.template
+++ b/default.template
@@ -17,24 +17,23 @@
       menu {list-style-type: none;}
       pre {
         background-image: linear-gradient(to right, $PinkFloyd$, $onefangPurple$);
-        overflow-x: auto;
-        width: 99%;
-        margin: 2px;
-        border: 2px solid grey;
+        width: fit-content; max-width: 99%; overflow-x: auto;
+        margin: 2px; border: 2px solid grey;
       }
       table, td, th {border-collapse: collapse; border: 2px solid grey;}
 
-      .toolTip {background: darkcyan;}
+      .toolTip {background: darkcyan; font-size: 1.42em;}
 
       .boxWrapper {
         height: 100%; width: 100%;
         margin: 0; padding: 0; border: none;
         display: grid;
 //        grid-template-areas:
-//          "logo trail"
-//          "logo head"
-//          "menu body"
-//          "history foot";
+//          "logo    tools"
+//          "logo    head"
+//          "menu    body"
+//          "history foot"
+//          "nyaw    .";
         grid-template-columns: auto 1fr auto auto;
         grid-template-rows:    auto auto 1fr auto auto;
 //        grid-auto-columns: minmax(auto, auto);
@@ -42,7 +41,7 @@
         overflow-x: auto; overflow-y: auto;
       }
       .boxLogo    {grid-area: logo;    grid-column: 1 / 1; grid-row: 1 / 2; height: min-content;}
-      .boxTrail   {grid-area: trail;   grid-column: 2 / 4; grid-row: 1 / 1; height: min-content;}
+      .boxTools   {grid-area: tools;   grid-column: 2 / 4; grid-row: 1 / 1; height: min-content;}
       .boxHead    {grid-area: head;    grid-column: 2 / 4; grid-row: 2 / 2; height: min-content; text-align: right;}
 
       .boxMenu    {grid-area: menu;    grid-column: 1 / 1; grid-row: 3 / 3; height: min-content; width: min-content; vertical-align: top; padding: 4px;}
@@ -57,18 +56,18 @@
 
       .boxHistory {grid-area: history; grid-column: 1 / 1; grid-row: 4 / 4; height: min-content;}
       .boxFoot    {grid-area: foot;    grid-column: 2 / 4; grid-row: 4 / 4; height: min-content; text-align: right;}
-      .boxnyaw    {grid-area: foot;    grid-column: 1 / 4; grid-row: 5 / 5; height: min-content; text-align: right; font-size: 0.55em;}
+      .boxnyaw    {grid-area: nyaw;    grid-column: 1 / 4; grid-row: 5 / 5; height: min-content; text-align: right; font-size: 0.55em;}
 
       #modeToggleBody {display: none;}
       #modeToggleMenu {display: none;}
       #modeBtn {color: white; display: inline-block;}
-      #modeToggleBody:checked ~ body background-image: linear-gradient($karenPurple$, $onefangPurple$);{}
-      #modeToggleBody:checked ~ pre {background-image: linear-gradient(to right, $onefangPurple$, $PinkFloyd$);}
       #modeToggleBody:checked ~ .modeBtn  {color: black;}
+//      #modeToggleBody:checked ~ body background-image: linear-gradient($karenPurple$, $onefangPurple$);{}
+//      #modeToggleBody:checked ~ pre {background-image: linear-gradient(to right, $onefangPurple$, $PinkFloyd$);}
 
       #modeToggleMenu:checked ~ .boxLogo  {display: none;}
       #modeToggleMenu:checked ~ .boxHead  {display: none;}
-//      #modeToggleMenu:checked ~ .boxTrail  {display: none;}
+//      #modeToggleMenu:checked ~ .boxTools  {display: none;}
 
       #modeToggleMenu:checked ~ .boxMenu  {display: none;}
       #modeToggleBody:checked ~ .boxBody  {background: white; color: black;}
@@ -86,20 +85,20 @@
     <div class="boxWrapper">
       <input type="checkbox" id="modeToggleMenu"/>
       <input type="checkbox" id="modeToggleBody"/>
-      <div class="boxLogo"><header><nav>
-        <a href="$home$"><img src="$logo$" alt="Not (Yet) (Another / A) Wiki." title="Not (Yet) (Another / A) Wiki."/></a>
+      <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="boxTrail"><header><nav>
-        <b class="toolTip" title="🍔 hides or shows non content.
+      <div class="boxTools"><header><nav>
+        &nbsp; <b class="toolTip" title="🍔 hides / shows non content, reverse hamburger menu.
 🕶 switches between dark and light themes.
 🪵 will be for logging in, when I have written that bit.
 🔍 will be the search, when I have written that bit.
 👣 is a trail of the steps to get here.">❓</b>
-        <b class="toolTip"><label for="modeToggleMenu" class='modeBtn'>&#127828;</label></b>
-        <b class="toolTip"><label for="modeToggleBody" class='modeBtn'>&#x1F576;</label></b>
-        <b class="toolTip">&#129717;</b>
-        <b class="toolTip">&#128269;</b>
-        <b> &nbsp; &#x1f463; &nbsp; $trail$ </b>
+        &nbsp; <b class="toolTip"><label for="modeToggleMenu" class='modeBtn'>&#127828;</label></b>
+        &nbsp; <b class="toolTip"><label for="modeToggleBody" class='modeBtn'>&#x1F576;</label></b>
+        &nbsp; <b class="toolTip">&#129717;</b>
+        &nbsp; <b class="toolTip">&#128269;</b>
+        <b> &nbsp; &#x1f463; $trail$ </b>
       </nav></header></div>
       <div class="boxHead"><header><nav><b>$header$</b> &nbsp; </nav></header></div>
 
@@ -109,7 +108,7 @@
       <div class="boxHistory"><footer>$history$</footer></div>
       <div class="boxFoot"><footer>$footer$</footer></div>
       <div class="boxnyaw"><footer>
-        <p>Powered&nbsp;by&nbsp;<a href="https://sledjhamr.org/cgit/notYetAnotherWiki/about/">notYetAnotherWiki</a>&nbsp;v&nbsp;0.0 &nbsp; No cookies or scripts where harmed in the making of this web site. &nbsp; May contain low fat CSS.</p>
+        <p>Powered&nbsp;by&nbsp;<a href="https://sledjhamr.org/notYetAnotherWiki/">notYetAnotherWiki</a>&nbsp;v&nbsp;0.0 &nbsp; No cookies or scripts where harmed in the making of this web site. &nbsp; May contain low fat CSS.</p>
       </footer></div>
     </div>
   </body>
diff --git a/notYetAnotherWiki.lua b/notYetAnotherWiki.lua
index 8be3850..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( [=[{~
@@ -119,10 +122,13 @@ local toFile = function(name, key, value)
   {":::"}                    -> '' /
   {"-noComment-"}            -> ' -- ' /
   {"| bgcolor=#" {([^ ])+} " " }  -> "| <span style='background: #%2;'> bgcolor=#%2 </span> " /         -- Deal with debdog's color table.
+  {"[" {([^]])+} ']{style="color: ' {([^}])+} "}" }  -> "<span style='color: %3;'>%2</span>" /
+  {"[" {([^]])+} "]{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.
@@ -215,7 +221,7 @@ toSub('')
 if nil == Directory then Directory = '.' end
 
 -- Sort out realURL for symlinked .md.md files.
-for l in io.popen('find -L ' .. Directory .. ' -name "*.md.md" -xtype l -printf "%P\n"'):lines() do
+for l in io.popen('find -L ' .. Directory .. ' -name unsorted -prune -o -name "*.md.md" -xtype l -printf "%P\n"'):lines() do
     local metadata = readMdMd(string.sub(l, 1, -4), {})
 -- FIXME - if this already exists, compare the timestamps, most recent wins.
     metadata.realURL = string.sub(l, 1, -7)
@@ -228,6 +234,24 @@ for l in io.popen('find -L ' .. Directory .. ' -name "*.md.md" -xtype l -printf
     end
 end
 
+-- Clean up unsorted.
+for l in io.popen('find -L ' .. Directory .. ' -name unsorted -prune -o -name "*.md" -a -not -name "*.md.md" -xtype l -printf "%P\n"'):lines() do
+    local tp = '_fos'
+    local metadata = readMdMd(l, {})
+    if nil ~= metadata then
+        if "PmWiki" == metadata.ogWiki then tp = '_pm' end
+        if nil ~= metadata.ogFile then
+            local unsort = 'unsorted/' .. metadata.ogFile
+            local a, e = io.open(unsort .. tp .. '.md' , 'r')
+            if nil ~= a then
+                a:close()
+                os.execute('rm ' .. unsort .. tp .. '.*')
+            end
+        end
+    end
+end
+
+-- Look for copied pages from the other wikis.
 for l in io.popen('find -L ' .. Directory .. ' -name "*.HTM" -type f,l -printf "%P\n"'):lines() do
 --    print('pandoc converting '  .. l .. ' -> ' .. string.sub(l, 1, -4) .. 'md')
     -- Open the HTM files and do the initial cleanups, then pandoc them.
@@ -626,9 +650,20 @@ 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.
+        if '/Main/' == string.sub(url, 1, 6) then
+            local link = linkFrom(Context.path, 'Foswiki/Main')
+            if '' == link then
+                url =                string.sub(url, 7) .. '.HTML'
+            else
+                url = link .. '/' .. string.sub(url, 7) .. '.HTML'
+            end
+        end
+        if '/System/' == string.sub(url, 1, 8) then
+            url = 'https://fos.wiki.devuan.org' .. url
+        end
         for i, p in ipairs{'https://wiki.devuan.org/?n=', 'https://wiki.devuan.org?n=', 'PmWiki/uploads/', 'Foswiki/pub/', 'https://fos.wiki.devuan.org/'} do
             if p == string.sub(url, 1, #p) then
                 local ur = string.sub(url, #p + 1)
@@ -646,26 +681,28 @@ local lunaLinky = function(url)		-- Fix up the links.
                 end
                 if (nil ~= md) and (nil ~= md.realURL) then     url = md.realURL end
 
-                local xlnk = xLinks[string.gsub(ur, '%..*', '', 1)]
-                if nil == Context.path then
-                    url = string.gsub(ur, '%.', '/', 1)
-                else
-                    if nil == xlnk then xlnk = string.gsub(string.gsub(ur, '%..*', '', 1), '/.*', '', 1) end
-                    if '' ~= Context.path then xlnk = linkFrom(Context.path, xlnk) end
-                    if '/' == string.sub(xlnk, 1, 1) then xlnk = string.sub(xlnk, 2) end
-                    if ('' ~= xlnk) and ('/' ~= string.sub(xlnk, -1)) then xlnk = xlnk .. '/' end
-                    if 'DUNNO/' == xlnk then print('OOPS! page not found - @' .. Context.path .. ' / ' .. Context.bit .. '\t' .. url .. ' -> ' .. xlnk .. ' ' .. string.gsub(ur, '.*%.', '', 1) .. '.HTML') end
-                end
+                if ('https://fos.wiki.devuan.org/bin/' ~= string.sub(url, 1, 32)) and ('https://fos.wiki.devuan.org/System/' ~= string.sub(url, 1, 35)) then
+                    local xlnk = xLinks[string.gsub(ur, '%..*', '', 1)]
+                    if nil == Context.path then
+                        url = string.gsub(ur, '%.', '/', 1)
+                    else
+                        if nil == xlnk then xlnk = string.gsub(string.gsub(ur, '%..*', '', 1), '/.*', '', 1) end
+                        if '' ~= Context.path then xlnk = linkFrom(Context.path, xlnk) end
+                        if '/' == string.sub(xlnk, 1, 1) then xlnk = string.sub(xlnk, 2) end
+                        if ('' ~= xlnk) and ('/' ~= string.sub(xlnk, -1)) then xlnk = xlnk .. '/' end
+                        if 'DUNNO/' == xlnk then print('OOPS! page not found - @' .. Context.path .. ' / ' .. Context.bit .. '\t' .. url .. ' -> ' .. xlnk .. ' ' .. string.gsub(ur, '.*%.', '', 1) .. '.HTML') end
+                    end
 --              if (nil ~= md) and (nil ~= md.realURL) then     url = md.realURL
 --              else
                                                                 url = xlnk .. string.gsub(ur, '.*%.', '', 1)
 --              end
-                if 'PmWiki/uploads/' == p then
-                    url = '../' .. p .. string.gsub(ur, '%.', '.', 1)
-                elseif 'Foswiki/pub/' == p then
-                    url = '../' .. p .. ur
-                else
-                    url = url .. '.HTML'
+                    if 'PmWiki/uploads/' == p then
+                        url = '../' .. p .. string.gsub(ur, '%.', '.', 1)
+                    elseif 'Foswiki/pub/' == p then
+                        url = '../' .. p .. ur
+                    else
+                        url = url .. '.HTML'
+                    end
                 end
             end
         end
@@ -673,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)
@@ -700,10 +741,10 @@ for name, file in pairs(Files) do
         for i, b in ipairs(bits) do
             local p = table.concat(bits, '/', 1, i)
             if i < #bits then
-                metadata.trail = metadata.trail .. '<a href="' .. linkFrom(file.path, p) .. Subs[p].whichPage .. '">' .. b .. '</a> &#x1f463; &nbsp; '
+                metadata.trail = metadata.trail .. '<a href="' .. linkFrom(file.path, p) .. Subs[p].whichPage .. '">' .. b .. '</a> &nbsp; &#x1f463; '
                 linkFrom(file.path, table.concat(bits, '/', 1, i))
             else
-                metadata.trail = metadata.trail ..  b .. ' &nbsp; '
+                metadata.trail = metadata.trail .. ' ' .. b
             end
         end
 
@@ -736,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>'