markdownr 0.6.16 → 0.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae47c745347215a97c8448c31431bde10bf60935740970585d3b01626aab4d49
-  data.tar.gz: 75c279c8578e8ef37e82748431b605dfa38fa786a1a3f162331dbbe5086b91a1
+  metadata.gz: 1a2282422f5341fe474b7b7e34af4387a7d6784b1945501f969ea3098e768377
+  data.tar.gz: 45b589b50541dc8e88999cba5df250047a0a298d00bbc2b54bb5d7dd5868009d
 SHA512:
-  metadata.gz: f4b4af8f7f2b1d175c156b3a93b4f66f6300e715a0cef021d7fd97b222af522fa0b7be26e8a09224db705aec240762766f7b005bdfb1825803396b2e452982bc
-  data.tar.gz: 6e220707c92e1f80fe676b9353514d426c03419b6514fc2d0ed49f9f1d431ed595065c22588aea028369a1edf07c53591bfa851eac4009b8211cf0d4ffa6868a
+  metadata.gz: 56e7530f96dd2622ad883c0fdf9ee83d6731f8ce372476907a2ea7f22979e739e13f630f3ee0b121f39d3d3192f702ca27434de441ae59cd11f3515054f62c8d
+  data.tar.gz: d0831ec05ccd0e1e57dfe07f57dd3ba6ccca5d7d958c7ddf72e578995dbd4ea9ce911eb7af8e6fac96553b32c76221369338e521fab88c67ac5839d8c2d932cb

data/lib/markdown_server/app.rb

@@ -47,6 +47,10 @@ module MarkdownServer
     @@strongs_fetched_at = nil
     DICTIONARY_TTL = 3600 # 1 hour
 
+    # CSS cache for external stylesheets (keyed by absolute URL)
+    @@css_cache = {}
+    CSS_TTL = 3600 # 1 hour
+
     def self.load_plugins!
       Dir[File.join(__dir__, "plugins", "*", "plugin.rb")].sort.each { |f| require f }
       set :plugins, PluginRegistry.load_plugins(settings.root_dir, settings.plugin_overrides)
@@ -568,7 +572,7 @@ module MarkdownServer
 
       def inject_strongs_urls(html)
         return html unless settings.dictionary_url
-        html.gsub(/<span\s+class="subst"([^>]*data-strongs="([^"]+)"[^>]*)>/) do
+        html = html.gsub(/<span\s+class="subst"([^>]*data-strongs="([^"]+)"[^>]*)>/) do
           attrs, strongs = $1, $2
           popup_url = strongs_popup_url(strongs)
           if popup_url && !attrs.include?("data-popup-url")
@@ -577,6 +581,16 @@ module MarkdownServer
             $&
           end
         end
+        # Interlinear .word spans: inject data-popup-url when Strong's is in dictionary
+        html.gsub(/<span\s+class="word"([^>]*data-strongs="([^"]+)"[^>]*)>/) do
+          attrs, strongs = $1, $2
+          dict_url = strongs_map[strongs.strip.upcase]
+          if dict_url && !attrs.include?("data-popup-url")
+            %(<span class="word" data-popup-url="#{h(dict_url)}"#{attrs}>)
+          else
+            $&
+          end
+        end
       end
 
       # Tags kept as-is (attributes stripped)
@@ -590,6 +604,26 @@ module MarkdownServer
       STRIP_FULL   = %w[script style nav header footer form input
                         button select textarea svg iframe noscript].to_set
 
+      def fetch_css(url_str)
+        cached = @@css_cache[url_str]
+        return cached[:body] if cached && (Time.now - cached[:at]) < CSS_TTL
+
+        uri = URI.parse(url_str)
+        return nil unless uri.is_a?(URI::HTTP) || uri.is_a?(URI::HTTPS)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = (uri.scheme == "https")
+        http.open_timeout = FETCH_TIMEOUT
+        http.read_timeout = FETCH_TIMEOUT
+        req = Net::HTTP::Get.new(uri.request_uri)
+        req["Accept"] = "text/css"
+        resp = http.request(req)
+        body = resp.is_a?(Net::HTTPSuccess) ? resp.body.to_s.encode("utf-8", invalid: :replace, undef: :replace) : nil
+        @@css_cache[url_str] = { body: body, at: Time.now } if body
+        body
+      rescue
+        @@css_cache.dig(url_str, :body)
+      end
+
       def fetch_external_page(url_str)
         uri = URI.parse(url_str)
         return nil unless uri.is_a?(URI::HTTP) || uri.is_a?(URI::HTTPS)
@@ -865,10 +899,10 @@ module MarkdownServer
         info_html + infl_html + usage_html + conc_html
       end
 
-      def scrip_html(html)
+      def scrip_html(html, source_url = nil)
         # Extract the passage content block
         content = html[/<div\s+class="passage-text[^"]*"[^>]*>([\s\S]*)<\/div>\s*(?:<nav|<script|<style|\z)/im, 1] || ""
-        return page_html(html) if content.empty?
+        return page_html(html, source_url) if content.empty?
 
         # Add data-verse attributes to verse spans for popup scrolling.
         # Verse numbers live in <sup class="verse-number">N </sup> inside verse spans.
@@ -876,39 +910,30 @@ module MarkdownServer
           %(<sup class="verse-number" data-verse="#{$1}">#{$1} </sup>)
         end
 
-        # Inline the essential substitution CSS (show replacement mode by default)
-        css = <<~CSS
-          <style>
-          .subst { cursor: pointer; border-radius: 2px; background: #f0ebff; position: relative; }
-          .subst:hover { background: #e0d4ff; outline: 1px solid #a78bfa; }
-          .subst-t, .subst-o, .subst-x, .subst-s { display: none; }
-          .subst-r { display: inline; color: #7c3aed; font-style: italic; }
-          .section-heading { font-size: 1rem; font-weight: bold; margin: 1.5rem 0 0.25rem; color: #444; }
-          .verse-block { margin: 0.5rem 0; text-indent: 1.5em; }
-          .verse-block.chapter-opening { margin-top: 0; text-indent: 0; }
-          .verse-block.no-first-indent { text-indent: 0; }
-          .verse-number { font-size: 0.65em; font-weight: bold; color: #888; vertical-align: super; margin-right: 0.1em; line-height: 0; }
-          .chapter-number { font-size: 1.5em; font-weight: bold; vertical-align: 0.1em; margin-right: 0.15em; }
-          .divine-name { font-variant: small-caps; }
-          .footnotes, .crossrefs { border-top: 1px solid #ddd; margin-top: 2rem; padding-top: 0.75rem; font-size: 0.85rem; color: #555; }
-          .footnotes ol { padding-left: 1.5rem; margin: 0.5rem 0 0; list-style-type: lower-alpha; }
-          .crossrefs ol { padding-left: 2.5rem; margin: 0.5rem 0 0; }
-          .footnote-marker, .crossref-marker { cursor: pointer; font-size: 0.75em; line-height: 0; vertical-align: super; text-decoration: none; }
-          .footnote-marker { color: #2563eb; }
-          .crossref-marker { color: #16a34a; }
-          .words-of-jesus { color: #8b0000; }
-          .poetry-stanza { margin: 0 0 0 3rem; }
-          .poetry-stanza.stanza-break { margin-top: 0.75rem; }
-          .poetry-line { margin: 0; padding: 0; line-height: 1.5; }
-          .poetry-line.indent-1 { padding-left: 2em; }
-          .poetry-line.indent-2 { padding-left: 4em; }
-          .verse-selected { background: #e5eefb; border-radius: 2px; }
-          .subst-tip { display: none; }
-          </style>
-        CSS
+        # Fetch referenced stylesheets from the source page and inline them
+        css_blocks = ""
+        if source_url
+          base_uri = URI.parse(source_url) rescue nil
+          html.scan(/<link[^>]+rel=["']stylesheet["'][^>]*>/i).each do |tag|
+            href = tag[/href=["']([^"']+)["']/i, 1]
+            next unless href
+            abs = (base_uri ? (URI.join(base_uri, href).to_s rescue nil) : nil)
+            next unless abs
+            css_body = fetch_css(abs)
+            # Resolve @import within the CSS (one level deep)
+            if css_body
+              css_dir = abs.sub(%r{/[^/]*\z}, "/")
+              css_body = css_body.gsub(/@import\s+url\(["']?([^"')]+)["']?\)\s*;/) do
+                import_url = (URI.join(css_dir, $1).to_s rescue nil)
+                import_url ? (fetch_css(import_url) || "") : ""
+              end
+              css_blocks += "<style>#{css_body}</style>\n"
+            end
+          end
+        end
 
         content = inject_strongs_urls(content)
-        css + '<div style="font-family:Georgia,serif;line-height:1.7">' + content + "</div>"
+        css_blocks + '<div style="font-family:Georgia,serif;line-height:1.7">' + content + "</div>"
       end
 
       def inline_directory_html(dir_path, relative_dir)
@@ -1315,7 +1340,7 @@ btn._loading=false;btn.style.opacity='1';});})(this)">&#128266;</button>)
         JSON.dump({ title: title, html: markdownr_html(html) })
       elsif url.match?(/scrip\.risensavior\.com/i)
         title = page_title(html).sub(/ [-–] .*/, "").strip
-        JSON.dump({ title: title, html: scrip_html(html) })
+        JSON.dump({ title: title, html: scrip_html(html, url) })
       else
         title = page_title(html).sub(/ [-–] .*/, "").strip
         JSON.dump({ title: title, html: page_html(html, url) })

data/lib/markdown_server/version.rb

@@ -1,3 +1,3 @@
 module MarkdownServer
-  VERSION = "0.6.16"
+  VERSION = "0.6.17"
 end

data/views/layout.erb

@@ -2175,6 +2175,12 @@
         if (!m) return false;
         var audioUrl = 'https://www.studylight.org/multi-media/audio/lexicons/eng/' + m[1] + '.html?n=' + m[2];
         if (!anchor._slAudio) anchor._slAudio = new Audio(audioUrl);
+        var wordEl = anchor.closest('.word');
+        if (wordEl) {
+          wordEl.classList.add('audio-playing');
+          anchor._slAudio.onended = function() { wordEl.classList.remove('audio-playing'); };
+          anchor._slAudio.onerror = function() { wordEl.classList.remove('audio-playing'); };
+        }
         anchor._slAudio.currentTime = 0;
         anchor._slAudio.play();
         return true;

data/views/popup_assets.erb

@@ -1,4 +1,22 @@
 <style>
+  /* Word highlight during verse audio playback */
+  .word.audio-playing {
+    background: #fef08a;
+    border-radius: 3px;
+    transition: background 0.15s ease;
+  }
+
+  /* Interlinear translit-link with dictionary definition available */
+  .word[data-popup-url] .translit-link {
+    color: #7b3fa0;
+    text-decoration: underline dotted #b07fd4 1px;
+    text-underline-offset: 2px;
+  }
+  .word[data-popup-url] .translit-link:hover {
+    color: #5a2c78;
+    text-decoration: underline solid #5a2c78 1px;
+  }
+
   /* Bible Gateway citation links */
   a[href*="biblegateway.com"],
   a[href*="scrip.risensavior.com"] {
@@ -197,6 +215,26 @@
   .link-ctx-popup-body th, .link-ctx-popup-body td { border: 1px solid #ddd; padding: 0.3rem 0.5rem; }
   .link-ctx-popup-body th { background: #f5f0e4; }
 
+  /*
+   * Reset interlinear .verse flex layout back to inline for passage popups.
+   * Interlinear pages define .verse { display: flex; border-bottom: ... } which
+   * would break inline passage content rendered inside a popup.
+   */
+  .link-ctx-popup-body .verse { display: inline; flex-wrap: initial; align-items: initial; gap: initial; margin: 0; padding: 0; border-bottom: none; }
+
+  /*
+   * Substitution mode for popups: force translation-only.
+   * The source CSS uses body.show-t / body.show-l / etc. to toggle modes, but
+   * those body classes leak into popup content. Override with !important to
+   * ensure only the translation span is visible inside popups.
+   */
+  .link-ctx-popup-body .subst-x { display: inline !important; color: #1a5276; font-style: italic; }
+  .link-ctx-popup-body .subst-t,
+  .link-ctx-popup-body .subst-l,
+  .link-ctx-popup-body .subst-o,
+  .link-ctx-popup-body .subst-p,
+  .link-ctx-popup-body .subst-s { display: none !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; }
@@ -739,6 +777,12 @@
       if (!m) return false;
       var audioUrl = 'https://www.studylight.org/multi-media/audio/lexicons/eng/' + m[1] + '.html?n=' + m[2];
       if (!anchor._slAudio) anchor._slAudio = new Audio(audioUrl);
+      var wordEl = anchor.closest('.word');
+      if (wordEl) {
+        wordEl.classList.add('audio-playing');
+        anchor._slAudio.onended = function() { wordEl.classList.remove('audio-playing'); };
+        anchor._slAudio.onerror = function() { wordEl.classList.remove('audio-playing'); };
+      }
       anchor._slAudio.currentTime = 0;
       anchor._slAudio.play();
       return true;
@@ -1005,6 +1049,15 @@
       });
     })();
 
+    // Rewrite translit-link hrefs for words with dictionary definitions
+    // so the existing popup system uses the dictionary URL instead of BLB
+    (function() {
+      document.querySelectorAll('.word[data-popup-url]').forEach(function(word) {
+        var link = word.querySelector('.translit-link');
+        if (link) link.setAttribute('href', word.dataset.popupUrl);
+      });
+    })();
+
   })();
 
   // Full-page verse highlighting from URL hash (#vN or #vN-M)
@@ -1063,14 +1116,14 @@
       var words = verse.querySelectorAll('.word');
       if (!words.length) return;
 
-      // Collect audio URLs for all words in this verse
-      var urls = [];
+      // Collect audio URLs paired with their word elements
+      var items = [];
       words.forEach(function(w) {
         var link = w.querySelector('.pronunc-link');
         var url = audioUrlFromLink(link);
-        if (url) urls.push(url);
+        if (url) items.push({ word: w, url: url });
       });
-      if (!urls.length) return;
+      if (!items.length) return;
 
       // Create a column-flex container to replace the bare verse-num,
       // with the number at top (row 1) and speaker icon at row 5
@@ -1093,16 +1146,15 @@
       btn.style.cssText = 'background:none;border:none;cursor:pointer;padding:0;font-size:1em;line-height:1;opacity:0.6;';
       btn.addEventListener('mouseleave', function() { if (!btn._playing) btn.style.opacity = '0.6'; });
 
-      var audioCache = [];
       var preloaded = false;
       function preloadAll() {
         if (preloaded) return;
         preloaded = true;
-        urls.forEach(function(u) {
-          var a = new Audio(u);
+        items.forEach(function(item) {
+          var a = new Audio(item.url);
           a.preload = 'auto';
           a.load();
-          audioCache.push(a);
+          item.audio = a;
         });
       }
       // Start preloading on hover so audio is ready before click
@@ -1119,16 +1171,21 @@
 
         var i = 0;
         function playNext() {
-          if (i >= audioCache.length) {
+          if (i >= items.length) {
             btn._playing = false;
             btn.style.opacity = '0.6';
             return;
           }
-          var audio = audioCache[i];
-          audio.currentTime = 0;
-          audio.onended = function() { i++; playNext(); };
-          audio.onerror = function() { i++; playNext(); };
-          audio.play().catch(function() { i++; playNext(); });
+          var item = items[i];
+          item.word.classList.add('audio-playing');
+          item.audio.currentTime = 0;
+          var advance = function() {
+            item.word.classList.remove('audio-playing');
+            i++; playNext();
+          };
+          item.audio.onended = advance;
+          item.audio.onerror = advance;
+          item.audio.play().catch(advance);
         }
         playNext();
       });

metadata

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