markdownr 0.6.3 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 722e15f2df1b9be481803fab089a9cbcd03feca4074066af6e9c1fd32172eb95
-  data.tar.gz: 7a35e644b28724d93e14147688ed34f3a824d8eec1f2e972eb8dd2f599a94b8e
+  metadata.gz: af0a41eadcbe996f7165b92a56174857657a21698308b515a35a67ec81a9a3e0
+  data.tar.gz: 12f87ff3043049997f895f4dc0bde07d6d7e41c0195286b1abe29c91eada81e2
 SHA512:
-  metadata.gz: 689bdd5757bec61a6284b63b3ab6b1a67dfa9e160b7343e63787962f9ed2cbf2c4b2ad677ec482d4e7712c445a17a94e068b80b551392f737eb1ec7546b55754
-  data.tar.gz: 74cfee882d280839673ee560c3dded04c6cc3ca7f605766f037ea531538c5a8a04b697928081a74480a8830cca07192cd5389629949a96cc16b8c6565390eb58
+  metadata.gz: cc617683848f464907a1f8d4e17986a80842e631b9e68dcd6d3eb340bb0b658d080a9849c8f1a6ec952f8ceaa23cb95fda4760e44dc02b36a6620a7b30dcbf53
+  data.tar.gz: 73bbfe99e65f7c50b4c4ffca35b4ab98d9a706f3c8367451b115e61919391ec95d987396cb75f5cbf7890822f4ec4b0456255a47a9872af5745b2dc90737e92b

data/lib/markdown_server/app.rb

@@ -750,7 +750,7 @@ module MarkdownServer
 
       def scrip_html(html)
         # Extract the passage content block
-        content = html[/<div\s+class="passage-text[^"]*"[^>]*>([\s\S]*?)<\/div>\s*(?:<nav|$)/im, 1] || ""
+        content = html[/<div\s+class="passage-text[^"]*"[^>]*>([\s\S]*?)<\/div>\s*(?:<nav|\z)/im, 1] || ""
         return page_html(html) if content.empty?
 
         # Add data-verse attributes to verse spans for popup scrolling.

data/lib/markdown_server/version.rb

@@ -1,3 +1,3 @@
 module MarkdownServer
-  VERSION = "0.6.3"
+  VERSION = "0.6.5"
 end

data/views/layout.erb

@@ -883,6 +883,12 @@
       margin-bottom: 0.5rem;
     }
 
+    /* Verse range highlighting */
+    .verse-selected {
+      background: #e5eefb;
+      border-radius: 2px;
+    }
+
     /* Mermaid diagrams */
     .mermaid { text-align: center; margin: 1.2rem 0; overflow-x: auto; }
     .mermaid svg { max-width: 100%; height: auto; }
@@ -2017,30 +2023,57 @@
         historyStack = [];
       }
 
+      function findVerseSpans(root, verseNum) {
+        var num = String(verseNum);
+        // Prefer .verse spans (full verse text) with exact verse number match
+        var all = root.querySelectorAll('.verse[data-verse]');
+        var matches = [];
+        for (var i = 0; i < all.length; i++) {
+          var dv = all[i].getAttribute('data-verse');
+          var after = dv.split(':').pop();
+          if (after === num) matches.push(all[i]);
+        }
+        if (matches.length) return matches;
+        // Fallback: bare data-verse="N" (e.g. sup elements from scrip_html)
+        var span = root.querySelector('[data-verse="' + num + '"]');
+        return span ? [span] : [];
+      }
+
       function applyPopupAnchor(hash) {
         if (!hash || !popup) return;
         var id = hash.replace(/^#/, '');
         try {
-          var eid = id.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
-          var target = popup.querySelector('[id="' + eid + '"]');
-          // For scrip verse anchors like #v15, find by data-verse attribute
-          if (!target) {
-            var vm = id.match(/^v(\d+)$/);
-            if (vm) {
-              target = popup.querySelector('[data-verse="' + vm[1] + '"]');
-              // Also match "Book Ch:Verse" format like data-verse="Acts 17:25"
-              if (!target) target = popup.querySelector('[data-verse$=":' + vm[1] + '"]');
+          var body = popup.querySelector('.link-ctx-popup-body');
+          if (!body) return;
+
+          // Verse range: #vN or #vN-M
+          var vm = id.match(/^v(\d+)(?:-(\d+))?$/);
+          if (vm) {
+            var start = parseInt(vm[1], 10);
+            var end = vm[2] ? parseInt(vm[2], 10) : start;
+            var first = null;
+            for (var v = start; v <= end; v++) {
+              var spans = findVerseSpans(body, v);
+              for (var i = 0; i < spans.length; i++) {
+                spans[i].classList.add('verse-selected');
+                if (!first) first = spans[i];
+              }
+            }
+            if (first) {
+              var bodyTop = body.getBoundingClientRect().top;
+              var targetTop = first.getBoundingClientRect().top;
+              body.scrollTop += targetTop - bodyTop - 8;
             }
+            return;
           }
+
+          // Standard anchor by ID
+          var eid = id.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+          var target = popup.querySelector('[id="' + eid + '"]');
           if (!target) return;
-          // Scroll the body container (which has overflow-y:auto) to the target,
-          // accounting for the sticky header so the heading lands just below it
-          var body = popup.querySelector('.link-ctx-popup-body');
-          if (!body) return;
           var bodyTop = body.getBoundingClientRect().top;
           var targetTop = target.getBoundingClientRect().top;
           body.scrollTop += targetTop - bodyTop - 8;
-          // Append section heading text to the popup title
           if (/^H[1-6]$/.test(target.tagName)) {
             var titleEl = popup.querySelector('.link-ctx-popup-title span');
             if (titleEl) titleEl.textContent = titleEl.textContent + ' \u203a ' + target.textContent;

data/views/popup_assets.erb

@@ -142,6 +142,12 @@
     margin-bottom: 0.5rem;
   }
 
+  /* Verse range highlighting */
+  .verse-selected {
+    background: #e5eefb;
+    border-radius: 2px;
+  }
+
   /* Shared popup content styles */
   .link-ctx-popup-body {
     font-family: Georgia, "Times New Roman", serif;
@@ -589,24 +595,54 @@
       historyStack = [];
     }
 
+    function findVerseSpans(root, verseNum) {
+      var num = String(verseNum);
+      // Prefer .verse spans (full verse text) with exact verse number match
+      var all = root.querySelectorAll('.verse[data-verse]');
+      var matches = [];
+      for (var i = 0; i < all.length; i++) {
+        var dv = all[i].getAttribute('data-verse');
+        var after = dv.split(':').pop();
+        if (after === num) matches.push(all[i]);
+      }
+      if (matches.length) return matches;
+      // Fallback: bare data-verse="N" (e.g. sup elements from scrip_html)
+      var span = root.querySelector('[data-verse="' + num + '"]');
+      return span ? [span] : [];
+    }
+
     function applyPopupAnchor(hash) {
       if (!hash || !popup) return;
       var id = hash.replace(/^#/, '');
       try {
-        var eid = id.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
-        var target = popup.querySelector('[id="' + eid + '"]');
-        // For scrip verse anchors like #v15, find by data-verse attribute
-        if (!target) {
-          var vm = id.match(/^v(\d+)$/);
-          if (vm) {
-            target = popup.querySelector('[data-verse="' + vm[1] + '"]');
-            // Also match "Book Ch:Verse" format like data-verse="Acts 17:25"
-            if (!target) target = popup.querySelector('[data-verse$=":' + vm[1] + '"]');
+        var body = popup.querySelector('.link-ctx-popup-body');
+        if (!body) return;
+
+        // Verse range: #vN or #vN-M
+        var vm = id.match(/^v(\d+)(?:-(\d+))?$/);
+        if (vm) {
+          var start = parseInt(vm[1], 10);
+          var end = vm[2] ? parseInt(vm[2], 10) : start;
+          var first = null;
+          for (var v = start; v <= end; v++) {
+            var spans = findVerseSpans(body, v);
+            for (var i = 0; i < spans.length; i++) {
+              spans[i].classList.add('verse-selected');
+              if (!first) first = spans[i];
+            }
+          }
+          if (first) {
+            var bodyTop = body.getBoundingClientRect().top;
+            var targetTop = first.getBoundingClientRect().top;
+            body.scrollTop += targetTop - bodyTop - 8;
           }
+          return;
         }
+
+        // Standard anchor by ID
+        var eid = id.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+        var target = popup.querySelector('[id="' + eid + '"]');
         if (!target) return;
-        var body = popup.querySelector('.link-ctx-popup-body');
-        if (!body) return;
         var bodyTop = body.getBoundingClientRect().top;
         var targetTop = target.getBoundingClientRect().top;
         body.scrollTop += targetTop - bodyTop - 8;
@@ -847,4 +883,39 @@
     })();
 
   })();
+
+  // Full-page verse highlighting from URL hash (#vN or #vN-M)
+  (function() {
+    var m = window.location.hash.match(/^#v(\d+)(?:-(\d+))?$/);
+    if (!m) return;
+    var start = parseInt(m[1], 10);
+    var end = m[2] ? parseInt(m[2], 10) : start;
+    var bookMeta = document.querySelector('meta[name="book"]');
+    var chMeta = document.querySelector('meta[name="chapter"]');
+    var book = bookMeta && bookMeta.content;
+    var ch = chMeta && chMeta.content;
+    var first = null;
+    for (var v = start; v <= end; v++) {
+      var spans;
+      if (book && ch) {
+        spans = document.querySelectorAll('.verse[data-verse="' + book + ' ' + ch + ':' + v + '"]');
+      } else {
+        // No meta tags — filter all .verse spans by exact verse number
+        var all = document.querySelectorAll('.verse[data-verse]');
+        spans = [];
+        for (var i = 0; i < all.length; i++) {
+          if (all[i].getAttribute('data-verse').split(':').pop() === String(v)) spans.push(all[i]);
+        }
+      }
+      for (var j = 0; j < spans.length; j++) {
+        spans[j].classList.add('verse-selected');
+        if (!first) first = spans[j];
+      }
+    }
+    if (!first) return;
+    var top = first.getBoundingClientRect().top + window.pageYOffset;
+    var toolbar = document.querySelector('.toolbar');
+    if (toolbar) top -= toolbar.offsetHeight + 4;
+    window.scrollTo({ top: top, behavior: 'instant' });
+  })();
 </script>

metadata

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