asciidoctor-html 0.1.9 → 0.1.11

data/lib/asciidoctor/html/book.rb

@@ -8,7 +8,7 @@ require_relative "converter"
 require_relative "ref_tree_processor"
 require_relative "cref_inline_macro"
 require_relative "bi_inline_macro"
-require_relative "sc_inline_macro"
+require_relative "text_inline_macro"
 require_relative "template"
 require_relative "pagination"
 
@@ -23,7 +23,7 @@ module Asciidoctor
       Asciidoctor::Extensions.register do
         tree_processor RefTreeProcessor
         inline_macro CrefInlineMacro
-        inline_macro ScInlineMacro
+        inline_macro TextInlineMacro
         inline_macro BiInlineMacro
       end
 

data/lib/asciidoctor/html/popovers.rb

@@ -39,6 +39,10 @@ module Asciidoctor
               bootstrap.Tooltip.getOrCreateInstance(el);
             });
           });
+          // Enable tooltips on abbreviations
+          document.querySelectorAll('abbr[data-bs-toggle="tooltip"]').forEach(el => {
+            bootstrap.Tooltip.getOrCreateInstance(el);
+          });
         })();
       JS
     end

data/lib/asciidoctor/html/ref_tree_processor.rb

@@ -113,7 +113,14 @@ module Asciidoctor
       end
 
       def offset(list)
-        list.attr?("start") ? (list.attr("start").to_i - 1) : 0
+        return (list.attr("start").to_i - 1) if list.attr?("start")
+        return 0 unless list.attr?("continue")
+
+        id = list.attr "continue"
+        node = list.document.catalog[:refs][id]
+        return node.attr("nflatitems") || node.items.size if node&.context == :olist
+
+        0
       end
 
       def shift(list)
@@ -227,7 +234,7 @@ module Asciidoctor
             elsif olist? block
               if listdepth.zero?
                 flat_style = (block.style == "pseudocode")
-                flat_idx = offset block # rubocop:disable Lint/UselessAssignment
+                flat_idx = offset block
               end
               process_olist! block, listdepth, flat_style:
             elsif olist_item?(block) && flat_style
@@ -245,6 +252,7 @@ module Asciidoctor
             listdepth -= 1 if olist_item?(block) && move == :retreat
             bulletdepth += 1 if ulist?(block) && move == :explore
             bulletdepth -= 1 if ulist_item?(block) && move == :retreat
+            block.set_attr("nflatitems", flat_idx) if olist?(block) && flat_style && move == :retreat
           end
         end
       end

data/lib/asciidoctor/html/text_inline_macro.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "asciidoctor"
+
+module Asciidoctor
+  module Html
+    # Format text according to Bootstrap-compatible inline text elements
+    class TextInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+
+      named :text
+      name_positional_attributes "text"
+
+      def process(parent, target, attrs)
+        text = attrs["text"]
+        content = case target
+                  when "del"
+                    %(<del>#{text}</del>)
+                  when "strike"
+                    %(<s>#{text}</s>)
+                  when "ins"
+                    %(<ins>#{text}</ins>)
+                  when "underline"
+                    %(<u>#{text}</u>)
+                  when "small"
+                    %(<small>#{text}</small>)
+                  when "abbr"
+                    title = %( title="#{attrs["title"]}" data-bs-toggle="tooltip") if attrs.include?("title")
+                    role = %( class="#{attrs["role"]}") if attrs.include?("role")
+                    %(<abbr#{title}#{role}>#{text}</abbr>)
+                  else
+                    %(<span class="text-#{target}">#{text}</span>)
+                  end
+        create_inline_pass parent, content
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-html
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Ravi Rajani
@@ -101,11 +101,11 @@ files:
 - lib/asciidoctor/html/pagination.rb
 - lib/asciidoctor/html/popovers.rb
 - lib/asciidoctor/html/ref_tree_processor.rb
-- lib/asciidoctor/html/sc_inline_macro.rb
 - lib/asciidoctor/html/scroll.rb
 - lib/asciidoctor/html/sidebar.rb
 - lib/asciidoctor/html/table.rb
 - lib/asciidoctor/html/template.rb
+- lib/asciidoctor/html/text_inline_macro.rb
 - lib/asciidoctor/html/tree_walker.rb
 - lib/asciidoctor/html/utils.rb
 - lib/asciidoctor/html/webmanifest.rb

data/lib/asciidoctor/html/sc_inline_macro.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require "asciidoctor"
-
-module Asciidoctor
-  module Html
-    # Convert text to small caps
-    class ScInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
-      use_dsl
-
-      named :sc
-      name_positional_attributes "text"
-      format :short
-
-      def process(parent, target, _attrs)
-        create_inline_pass parent, "[.smallcaps]##{target}#",
-                           attributes: { "subs" => :normal }
-      end
-    end
-  end
-end