markdownr 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3218025cb46f3cb61158188eeea5957b3d797abb2c63970a9fa2c873b39da870
-  data.tar.gz: 36df70282be17b496d6e6706e568fc5c585adba12bba091cf534176ea56182a2
+  metadata.gz: a6f6186e83f09bb4239d8ca1fd5cca349fbbe17ccea6565a5579c11920e7ce2e
+  data.tar.gz: 1eb3bc2813a2748ad37b63271e3e6844b4f927dc638f0c0bd1d0a7d65f940e28
 SHA512:
-  metadata.gz: 90edee3edf4003ebcf4605e0488db495e8d460964595944aa478e8be5a72d6b9c7dc0e276b855f0148c4113a2cf9360dc8ab6ea01f823b1061b3718bab76a67c
-  data.tar.gz: ad890bdaa976d1eb179fd9945656b27238103a93974cbf232950567ce08eaa87da2100e910bd33d9cbda0db8e67252275937fe8ff780f4abd0e34f2569e9cb15
+  metadata.gz: c249628b120b2af78fe64e9690362aa2978896cf098fc9aec04f7225f685661203f3d5dd59bde5b8ddf3bb6c959ac92a4c09f5b46483f121a9355bdf7675e68c
+  data.tar.gz: 80774310a8da3df52c41ef1e7ea811040a85392d5b6d02e149e1b3be0d12bc63d1f4bab5b7972f0a173da2a118f44aaf932df4c6e11487a62ffc7fe5fd47b548

data/lib/markdown_server/app.rb

@@ -192,7 +192,27 @@ module MarkdownServer
       def render_frontmatter_value(value)
         case value
         when Array
-          value.map { |v| %(<span class="tag">#{h(v)}</span>) }.join(" ")
+          value.map { |v|
+            str = v.to_s
+            if str =~ /\A\[\[([^\]]+)\]\]\z/
+              raw = $1
+              target, display = raw.include?("|") ? raw.split("|", 2) : [raw, nil]
+              label = display || target
+              if target.start_with?("#")
+                anchor = target[1..].downcase.gsub(/\s+/, "-").gsub(/[^\w-]/, "")
+                %(<a class="wiki-link" href="##{h(anchor)}">#{h(label)}</a>)
+              else
+                resolved = resolve_wiki_link(target)
+                if resolved
+                  %(<a class="wiki-link" href="/browse/#{encode_path_component(resolved).gsub('%2F', '/')}">#{h(label)}</a>)
+                else
+                  %(<span class="wiki-link broken">#{h(label)}</span>)
+                end
+              end
+            else
+              %(<span class="tag">#{h(str)}</span>)
+            end
+          }.join(" ")
         when String
           if value =~ /\Ahttps?:\/\//
             %(<a href="#{h(value)}" target="_blank" rel="noopener">#{h(value)}</a>)
@@ -219,7 +239,7 @@ module MarkdownServer
       def extract_toc(html)
         headings = []
         html.scan(/<h([1-6])\s[^>]*id="([^"]*)"[^>]*>(.*?)<\/h\1>/mi) do |level, id, text|
-          clean_text = text.gsub(/<[^>]+>/, "").strip
+          clean_text = text.gsub(/<sup[^>]*id="fnref:[^"]*"[^>]*>.*?<\/sup>/i, "").gsub(/<[^>]+>/, "").strip
           headings << { level: level.to_i, id: id, text: clean_text }
         end
         headings

data/lib/markdown_server/version.rb

@@ -1,3 +1,3 @@
 module MarkdownServer
-  VERSION = "0.3.3"
+  VERSION = "0.3.5"
 end

data/views/layout.erb

@@ -113,14 +113,13 @@
     }
 
     /* Frontmatter */
-    details.frontmatter {
+    div.frontmatter {
       margin-bottom: 1.5rem;
       border: 1px solid #e0d8c8;
       border-radius: 6px;
       background: #fdfcf9;
     }
-    details.frontmatter summary {
-      cursor: pointer;
+    .frontmatter-heading {
       padding: 0.6rem 1rem;
       font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
       font-size: 0.85rem;
@@ -128,9 +127,6 @@
       color: #8b6914;
       background: #f5f0e4;
       border-radius: 6px 6px 0 0;
-      user-select: none;
-    }
-    details.frontmatter[open] summary {
       border-bottom: 1px solid #e0d8c8;
     }
     .meta-table {
@@ -403,40 +399,6 @@
       min-width: 0;
     }
 
-    /* Mobile TOC (replaces sidebar) */
-    .toc-mobile {
-      display: none;
-      margin-bottom: 1rem;
-      border: 1px solid #e0d8c8;
-      border-radius: 6px;
-      background: #fdfcf9;
-      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
-      font-size: 0.82rem;
-    }
-    .toc-mobile summary {
-      cursor: pointer;
-      padding: 0.5rem 0.8rem;
-      font-weight: 600;
-      color: #8b6914;
-      font-size: 0.8rem;
-      user-select: none;
-    }
-    .toc-mobile ul {
-      list-style: none;
-      padding: 0 0.8rem 0.5rem;
-      margin: 0;
-    }
-    .toc-mobile li { margin-bottom: 0.2rem; }
-    .toc-mobile a {
-      color: #666;
-      text-decoration: none;
-      padding: 0.2rem 0;
-      display: block;
-    }
-    .toc-mobile a:hover { color: #8b6914; }
-    .toc-mobile .toc-h3 { padding-left: 0.8rem; }
-    .toc-mobile .toc-h4 { padding-left: 1.4rem; }
-
     /* TOC drawer (swipe-to-reveal on mobile) */
     .toc-overlay {
       display: none;
@@ -731,15 +693,15 @@
       max-width: 350px;
       width: max-content;
       z-index: 150;
-      pointer-events: none;
       box-shadow: 0 2px 8px rgba(0,0,0,0.25);
       margin-bottom: 6px;
     }
+    .footnote-tooltip { cursor: pointer; }
     .footnote-tooltip::after {
       content: '';
       position: absolute;
       top: 100%;
-      left: 50%;
+      left: calc(50% + var(--arrow-offset, 0px));
       transform: translateX(-50%);
       border: 5px solid transparent;
       border-top-color: #2d2d2d;
@@ -768,7 +730,6 @@
 
       .page-with-toc { display: block; }
       .toc-sidebar { display: none; }
-      .toc-mobile { display: block; }
 
       .meta-table th, .meta-table td {
         display: block;
@@ -1093,12 +1054,75 @@
         var tooltip = document.createElement('span');
         tooltip.className = 'footnote-tooltip';
         tooltip.innerHTML = html;
+        var fnHref = link.getAttribute('href');
 
-        sup.addEventListener('mouseenter', function() {
+        function showTooltip() {
           sup.appendChild(tooltip);
-        });
-        sup.addEventListener('mouseleave', function() {
+          // Reset any previous adjustment
+          tooltip.style.left = '50%';
+          tooltip.style.transform = 'translateX(-50%)';
+          tooltip.style.removeProperty('--arrow-offset');
+          // Clamp tooltip to viewport.
+          // document.documentElement.clientWidth is more reliable than window.innerWidth
+          // on Android browsers (e.g. EinkBro) which may return a pre-scaled layout
+          // viewport width for window.innerWidth rather than the CSS viewport width.
+          var viewportWidth = Math.min(window.innerWidth, document.documentElement.clientWidth);
+          var rect = tooltip.getBoundingClientRect();
+          var shift = 0;
+          if (rect.left < 8) {
+            shift = 8 - rect.left;
+          } else if (rect.right > viewportWidth - 8) {
+            shift = (viewportWidth - 8) - rect.right;
+          }
+          if (shift !== 0) {
+            tooltip.style.transform = 'translateX(calc(-50% + ' + shift + 'px))';
+            tooltip.style.setProperty('--arrow-offset', (-shift) + 'px');
+          }
+        }
+
+        function hideTooltip() {
           if (tooltip.parentNode === sup) sup.removeChild(tooltip);
+        }
+
+        // Hover devices: show/hide on mouseenter/mouseleave
+        sup.addEventListener('mouseenter', showTooltip);
+        sup.addEventListener('mouseleave', hideTooltip);
+
+        // Touch: first tap shows tooltip, second tap navigates
+        // Using touchend instead of click so no hover media query check is needed —
+        // touchend only fires on real touch, regardless of what (hover:none) reports.
+        var linkTouchMoved = false;
+        link.addEventListener('touchstart', function() { linkTouchMoved = false; }, { passive: true });
+        link.addEventListener('touchmove', function() { linkTouchMoved = true; }, { passive: true });
+        link.addEventListener('touchend', function(e) {
+          if (linkTouchMoved) return; // scroll, not a tap
+          if (tooltip.parentNode === sup) {
+            // Tooltip already showing — let the link navigate
+            return;
+          }
+          e.preventDefault();
+          // Dismiss any other open tooltip
+          document.querySelectorAll('.footnote-tooltip').forEach(function(t) {
+            if (t.parentNode) t.parentNode.removeChild(t);
+          });
+          showTooltip();
+        });
+
+        var tooltipTouchMoved = false;
+        tooltip.addEventListener('touchstart', function() { tooltipTouchMoved = false; }, { passive: true });
+        tooltip.addEventListener('touchmove', function() { tooltipTouchMoved = true; }, { passive: true });
+        tooltip.addEventListener('touchend', function(e) {
+          if (tooltipTouchMoved) return;
+          e.stopPropagation();
+          hideTooltip();
+          window.location.hash = fnHref;
+        });
+
+        // Dismiss tooltip when tapping elsewhere
+        document.addEventListener('click', function(e) {
+          if (tooltip.parentNode === sup && !sup.contains(e.target)) {
+            hideTooltip();
+          }
         });
       });
     })();

data/views/markdown.erb

@@ -11,17 +11,6 @@
 </div>
 
 <% if @has_toc %>
-  <details class="toc-mobile">
-    <summary>Table of Contents</summary>
-    <ul>
-      <% @toc.each do |entry| %>
-        <li class="toc-h<%= entry[:level] %>">
-          <a href="#<%= h(entry[:id]) %>"><%= h(entry[:text]) %></a>
-        </li>
-      <% end %>
-    </ul>
-  </details>
-
   <button class="toc-fab" id="toc-fab" aria-label="Table of Contents">&#9776;</button>
   <div class="toc-overlay" id="toc-overlay"></div>
   <nav class="toc-drawer" id="toc-drawer">
@@ -55,8 +44,8 @@
 
   <div class="page-main">
     <% if @meta && !@meta.empty? %>
-      <details class="frontmatter" open>
-        <summary>Metadata</summary>
+      <div class="frontmatter">
+        <div class="frontmatter-heading">Frontmatter</div>
         <table class="meta-table">
           <% @meta.each do |key, value| %>
             <tr>
@@ -65,7 +54,7 @@
             </tr>
           <% end %>
         </table>
-      </details>
+      </div>
     <% end %>
 
     <div class="md-content" data-file="<%= h(@title) %>">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markdownr
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Brian Dunn