markdownr 0.7.2 → 0.8.1

data/views/layout.erb

@@ -206,15 +206,15 @@
       line-height: 1.8;
     }
     .md-content > :first-child { margin-top: 0; }
-    .md-content h1 { font-size: 1.5rem; margin: 1.5rem 0 0.8rem; color: #3a3a3a; }
+    .md-content h1 { font-size: 2rem; margin: 1.8rem 0 0.9rem; color: #2a2a2a; }
     .md-content h2 {
-      font-size: 1.25rem;
+      font-size: 1.35rem;
       margin: 1.8rem 0 0.6rem;
       color: #3a3a3a;
-      border-bottom: 1px solid #e0d8c8;
-      padding-bottom: 0.3rem;
+      border-bottom: 1px solid #b5a78f;
+      padding-bottom: 0.1rem;
     }
-    .md-content h3 { font-size: 1.1rem; margin: 1.4rem 0 0.5rem; color: #555; }
+    .md-content h3 { font-size: 1.1rem; margin: 1.4rem 0 0.5rem 1rem; color: #3a3a3a; }
 
     .md-content blockquote {
       border-left: 4px solid #d4b96a;
@@ -229,6 +229,38 @@
       margin: 0;
     }
 
+    .md-content .callout {
+      border-left: 4px solid var(--callout-color, #888);
+      background: color-mix(in srgb, var(--callout-color, #888) 8%, transparent);
+      border-radius: 4px;
+      margin: 1rem 0;
+      padding: 0.6rem 0.9rem;
+      color: #2a2a2a;
+      font-style: normal;
+    }
+    .md-content .callout .callout-title {
+      display: flex;
+      align-items: center;
+      gap: 0.4rem;
+      font-weight: 600;
+      color: var(--callout-color, #444);
+      cursor: default;
+    }
+    .md-content .callout details > summary.callout-title { cursor: pointer; list-style: none; }
+    .md-content .callout details > summary.callout-title::-webkit-details-marker { display: none; }
+    .md-content .callout details > summary.callout-title::after {
+      content: "▸";
+      margin-left: auto;
+      font-size: 0.7rem;
+      transition: transform 0.15s;
+    }
+    .md-content .callout details[open] > summary.callout-title::after { transform: rotate(90deg); }
+    .md-content .callout .callout-icon { flex-shrink: 0; }
+    .md-content .callout .callout-content { margin-top: 0.4rem; }
+    .md-content .callout .callout-content > :first-child { margin-top: 0; }
+    .md-content .callout .callout-content > :last-child { margin-bottom: 0; }
+    .md-content .callout .callout-content p { white-space: normal; margin: 0.5rem 0; }
+
     .md-content a {
       color: #8b6914;
       text-decoration: none;
@@ -251,6 +283,7 @@
       overflow-x: auto;
       font-size: 0.85rem;
       line-height: 1.5;
+      position: relative;
     }
     .md-content pre code {
       background: none;
@@ -258,6 +291,34 @@
       color: inherit;
     }
 
+    /* Copy-to-clipboard button on <pre> blocks */
+    .copy-btn {
+      position: absolute;
+      top: 6px;
+      right: 6px;
+      background: rgba(255, 255, 255, 0.08);
+      color: #ddd;
+      border: 1px solid rgba(255, 255, 255, 0.18);
+      border-radius: 4px;
+      padding: 3px 6px;
+      cursor: pointer;
+      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
+      line-height: 0;
+      opacity: 0;
+      transition: opacity 0.15s ease, background 0.15s ease, color 0.15s ease;
+      z-index: 1;
+    }
+    .copy-btn svg { display: block; }
+    pre:hover > .copy-btn,
+    .copy-btn:focus { opacity: 1; }
+    .copy-btn:hover { background: rgba(255, 255, 255, 0.18); color: #fff; }
+    .copy-btn.copied {
+      background: #2e7d32;
+      color: #fff;
+      border-color: #2e7d32;
+      opacity: 1;
+    }
+
     .md-content hr {
       border: none;
       border-top: 1px solid #e0d8c8;
@@ -355,7 +416,9 @@
       font-family: "SF Mono", Menlo, Consolas, monospace;
       font-size: 0.85rem;
       line-height: 1.5;
+      position: relative;
     }
+    .raw-view > pre { position: static; }
 
     /* Download link */
     .toolbar {
@@ -403,21 +466,8 @@
     }
     .sort-arrow { font-size: 0.6rem; }
 
-    /* Rouge syntax highlighting (Monokai-inspired) */
-    .highlight .k, .highlight .kd, .highlight .kn, .highlight .kp,
-    .highlight .kr, .highlight .kt { color: #66d9ef; }
-    .highlight .s, .highlight .s1, .highlight .s2, .highlight .sb,
-    .highlight .sc, .highlight .sd, .highlight .sh, .highlight .sx { color: #e6db74; }
-    .highlight .c, .highlight .c1, .highlight .cm, .highlight .cs { color: #75715e; font-style: italic; }
-    .highlight .na { color: #a6e22e; }
-    .highlight .nf, .highlight .nb { color: #a6e22e; }
-    .highlight .nn, .highlight .nc { color: #66d9ef; }
-    .highlight .no { color: #ae81ff; }
-    .highlight .mi, .highlight .mf, .highlight .mh, .highlight .mo { color: #ae81ff; }
-    .highlight .o, .highlight .ow { color: #f92672; }
-    .highlight .p { color: #f0f0f0; }
-    .highlight .gi { color: #a6e22e; }
-    .highlight .gd { color: #f92672; }
+    /* Rouge Monokai syntax highlighting */
+    <%= Rouge::Themes::Monokai.render(scope: '.highlight').gsub(/^\.highlight \{\n.*?background-color:.*?\n\}$/m, '') %>
 
     /* TOC sidebar */
     .page-with-toc {
@@ -1167,6 +1217,60 @@
       });
     })();
 
+    // Add copy-to-clipboard buttons to <pre> code blocks
+    var COPY_ICON_SVG = '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="9" width="13" height="13" rx="2"></rect><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path></svg>';
+    var CHECK_ICON_SVG = '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><polyline points="20 6 9 17 4 12"></polyline></svg>';
+
+    function _legacyCopy(text) {
+      var ta = document.createElement('textarea');
+      ta.value = text;
+      ta.style.position = 'fixed';
+      ta.style.left = '-9999px';
+      document.body.appendChild(ta);
+      ta.select();
+      try { document.execCommand('copy'); } catch (e) {}
+      document.body.removeChild(ta);
+    }
+
+    function _addCopyButtons(root) {
+      var scope = root || document;
+      var pres = scope.querySelectorAll('.md-content pre, .raw-view pre');
+      pres.forEach(function(pre) {
+        if (pre.querySelector(':scope > .copy-btn')) return;
+        var btn = document.createElement('button');
+        btn.type = 'button';
+        btn.className = 'copy-btn';
+        btn.title = 'Copy';
+        btn.setAttribute('aria-label', 'Copy code');
+        btn.innerHTML = COPY_ICON_SVG;
+        btn.addEventListener('click', function(e) {
+          e.stopPropagation();
+          e.preventDefault();
+          var clone = pre.cloneNode(true);
+          var existing = clone.querySelector('.copy-btn');
+          if (existing) existing.remove();
+          var codeEl = clone.querySelector('code');
+          var text = (codeEl || clone).textContent;
+          var done = function() {
+            btn.classList.add('copied');
+            btn.innerHTML = CHECK_ICON_SVG;
+            setTimeout(function() {
+              btn.classList.remove('copied');
+              btn.innerHTML = COPY_ICON_SVG;
+            }, 1500);
+          };
+          if (navigator.clipboard && navigator.clipboard.writeText) {
+            navigator.clipboard.writeText(text).then(done, function() { _legacyCopy(text); done(); });
+          } else {
+            _legacyCopy(text);
+            done();
+          }
+        });
+        pre.appendChild(btn);
+      });
+    }
+    _addCopyButtons();
+
     // Wrap tables in scrollable containers + add expand buttons
     var _tableItems = [];
     document.querySelectorAll('.md-content table').forEach(function(table) {

data/views/popup_assets.erb

@@ -235,6 +235,21 @@
   .link-ctx-popup-body .subst-p,
   .link-ctx-popup-body .subst-s { display: none !important; }
 
+  /*
+   * Scrip's CSS gates display of verse numbers, footnotes, headings, etc. on
+   * body classes (e.g. `body:not(.show-verse-numbers) .verse-number { display: none }`).
+   * Inside a popup the host page's <body> has none of those classes, so the
+   * passage content disappears. Restore visibility for popup contexts.
+   */
+  .link-ctx-popup-body .verse-number,
+  .link-ctx-popup-body .footnote-marker,
+  .link-ctx-popup-body .crossref-marker { display: inline !important; }
+  .link-ctx-popup-body .section-heading,
+  .link-ctx-popup-body .section-footnote,
+  .link-ctx-popup-body .footnotes,
+  .link-ctx-popup-body .crossrefs { display: block !important; }
+  .link-ctx-popup-body .section-summary { display: inline !important; }
+
   /* Blue Letter Bible popup tables */
   .blb-table { width: 100%; border-collapse: collapse; font-size: 0.85rem; margin-bottom: 0.6rem; }
   .blb-table th, .blb-table td { padding: 3px 7px; border: 1px solid #ddd; }
@@ -262,6 +277,10 @@
     var popupDragging = false;
     var currentPopupPos = { x: 0, y: 0 };
     var mouseLeaveTimer = null;
+    // Filled in below by the .subst IIFE so the popup body click handler can
+    // route .subst clicks (which never reach document-level handlers because
+    // popup.click stops propagation) to the Strong's-definition fetcher.
+    var substHandlers = null;
 
     function escHtml(s) {
       return String(s).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;');
@@ -368,14 +387,8 @@
       popup.addEventListener('click', function(e) { e.stopPropagation(); });
 
       var body = popup.querySelector('.link-ctx-popup-body');
-      body.addEventListener('click', function(e) {
-        var anchor = findLink(e.target);
-        if (!anchor) return;
-        var linkHref = anchor.getAttribute('href');
-        if (!linkHref || isAnchorOnly(linkHref)) return;
-        e.stopPropagation();
-        e.preventDefault();
-        if (thisPopup.dataset.pinned) { handleLink(anchor, e.clientX, e.clientY, false); return; }
+
+      function pushHistoryAndChain(navigate, x, y) {
         var savedPos = { x: currentPopupPos.x, y: currentPopupPos.y, linkRect: currentPopupPos.linkRect };
         var titleEl = thisPopup.querySelector('.link-ctx-popup-title');
         historyStack.push({
@@ -385,27 +398,36 @@
           href: titleEl ? (titleEl.getAttribute('href') || '') : '',
           scrollTop: thisPopup.scrollTop
         });
-        handleLink(anchor, savedPos.x, savedPos.y, true);
-      });
-      body.addEventListener('touchend', function(e) {
-        if (touchMoved) return;
+        navigate(savedPos.x, savedPos.y);
+      }
+
+      function handleBodyActivation(e, x, y) {
+        var subst = substHandlers && substHandlers.find(e.target);
+        if (subst) {
+          e.stopPropagation();
+          e.preventDefault();
+          if (thisPopup.dataset.pinned) { substHandlers.handle(subst, x, y); return true; }
+          pushHistoryAndChain(function(sx, sy) { substHandlers.handle(subst, sx, sy); }, x, y);
+          return true;
+        }
         var anchor = findLink(e.target);
-        if (!anchor) return;
+        if (!anchor) return false;
         var linkHref = anchor.getAttribute('href');
-        if (!linkHref || isAnchorOnly(linkHref)) return;
+        if (!linkHref || isAnchorOnly(linkHref)) return false;
         e.stopPropagation();
         e.preventDefault();
-        if (thisPopup.dataset.pinned) { handleLink(anchor, e.clientX, e.clientY, false); return; }
-        var savedPos = { x: currentPopupPos.x, y: currentPopupPos.y, linkRect: currentPopupPos.linkRect };
-        var titleEl = thisPopup.querySelector('.link-ctx-popup-title');
-        historyStack.push({
-          x: savedPos.x, y: savedPos.y, linkRect: savedPos.linkRect,
-          title: titleEl ? titleEl.querySelector('span').textContent : '',
-          bodyHtml: body.innerHTML,
-          href: titleEl ? (titleEl.getAttribute('href') || '') : '',
-          scrollTop: thisPopup.scrollTop
-        });
-        handleLink(anchor, savedPos.x, savedPos.y, true);
+        if (thisPopup.dataset.pinned) { handleLink(anchor, x, y, false); return true; }
+        pushHistoryAndChain(function(sx, sy) { handleLink(anchor, sx, sy, true); }, x, y);
+        return true;
+      }
+
+      body.addEventListener('click', function(e) {
+        handleBodyActivation(e, e.clientX, e.clientY);
+      });
+      body.addEventListener('touchend', function(e) {
+        if (touchMoved) return;
+        var touch = e.changedTouches[0];
+        handleBodyActivation(e, touch ? touch.clientX : 0, touch ? touch.clientY : 0);
       }, { passive: false });
 
       popup.addEventListener('touchstart', function(e) { e.stopPropagation(); }, { passive: true });
@@ -945,7 +967,6 @@
     // Substitution span popups — use server-injected data-popup-url
     (function() {
       var substEls = document.querySelectorAll('.subst[data-strongs]');
-      if (!substEls.length) return;
 
       function blbFallbackUrl(strongs) {
         var s = strongs.toLowerCase();
@@ -1011,6 +1032,11 @@
         return null;
       }
 
+      // Expose for the popup body click handler — popup-internal .subst
+      // clicks never reach the document-level click handler below because the
+      // popup stops propagation.
+      substHandlers = { find: findSubst, handle: handleSubst };
+
       // Click
       document.addEventListener('click', function(e) {
         var el = findSubst(e.target);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markdownr
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.1
 platform: ruby
 authors:
 - Brian Dunn
@@ -93,6 +93,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: json_schemer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Serve markdown files from any directory with a clean web interface, syntax
   highlighting, YAML frontmatter support, and wiki-link resolution.
 executables:
@@ -103,20 +131,30 @@ files:
 - bin/Dockerfile.markdownr
 - bin/build-and-push-to-docker
 - bin/markdownr
+- bin/markdownr-servers.yaml
+- bin/start-claude
 - lib/markdown_server.rb
 - lib/markdown_server/app.rb
+- lib/markdown_server/assets/editor-loader.js
+- lib/markdown_server/csv_browser/addon_registry.rb
+- lib/markdown_server/csv_browser/config_loader.rb
+- lib/markdown_server/csv_browser/row_context.rb
+- lib/markdown_server/csv_browser/table_reader.rb
 - lib/markdown_server/helpers/admin_helpers.rb
 - lib/markdown_server/helpers/fetch_helpers.rb
 - lib/markdown_server/helpers/formatting_helpers.rb
 - lib/markdown_server/helpers/markdown_helpers.rb
 - lib/markdown_server/helpers/path_helpers.rb
 - lib/markdown_server/helpers/search_helpers.rb
+- lib/markdown_server/permitted_bases.rb
 - lib/markdown_server/plugin.rb
 - lib/markdown_server/plugins/bible_citations/citations.rb
 - lib/markdown_server/plugins/bible_citations/helpers.rb
 - lib/markdown_server/plugins/bible_citations/plugin.rb
+- lib/markdown_server/unhide.rb
 - lib/markdown_server/version.rb
 - views/admin_login.erb
+- views/browser.erb
 - views/directory.erb
 - views/layout.erb
 - views/markdown.erb
@@ -144,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: A local markdown file server with directory browsing
 test_files: []