asciidoctor-html 0.1.8 → 0.1.10

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
 
@@ -120,7 +120,7 @@ module Asciidoctor
           short_title: @short_title,
           author: @author,
           date: @date,
-          chaptitle: "Search",
+          chapsubheading: "Search",
           langs: []
         )
       end
@@ -244,7 +244,6 @@ module Asciidoctor
           author: @author,
           date: @date,
           description: doc.attr("description"),
-          chaptitle: tdata.chaptitle,
           chapheading: tdata.chapheading,
           chapsubheading: tdata.chapsubheading,
           langs: langs(doc)

data/lib/asciidoctor/html/converter.rb

@@ -235,7 +235,7 @@ module Asciidoctor
         classes << "table-striped" if node.option? "striped"
         classes << "table-bordered" if node.option? "bordered"
         classes << "table-sm" if node.option? "compact"
-        classes << "table-v#{node.attr "valign"}" if node.attr?("valign")
+        classes << "align-#{node.attr "valign"}" if node.attr?("valign")
         classes << "table-h#{node.attr "halign"}" if node.attr?("halign")
         width_attribute = ""
         if (autowidth = node.option? "autowidth") && !(node.attr? "width")

data/lib/asciidoctor/html/list.rb

@@ -14,7 +14,9 @@ module Asciidoctor
           ("level-#{level} pseudocode" if flat),
           node.role
         ].compact
-        classes << "checklist" if node.option?("checklist")
+        classes << "list-checklist" if node.option?("checklist")
+        classes << "list-unmarked" if node.option?("unmarked")
+        classes << "list-roomy" if node.option?("roomy")
         result = [%(<#{tag_name}#{Utils.dyn_id_class_attr_str node, classes.join(" ")}>)]
         node.items.each do |item|
           result << display_list_item(item)
@@ -27,7 +29,8 @@ module Asciidoctor
         result = []
         result << %(<li#{Utils.id_class_attr_str item.id,
                                                  item.role}><div class="li-mark">#{item.attr "mark"}</div>)
-        result << %(<div class="li-content"><p>#{item.text}</p>)
+        result << %(<div class="li-content">)
+        result << %(<p>#{item.text}</p>) unless item.text.empty?
         result << "\n#{item.content}" if item.blocks?
         result << %(</div></li>#{Utils.id_class_sel_comment item.id, item.role})
         result.join "\n"

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/table.rb

@@ -4,7 +4,7 @@ module Asciidoctor
   module Html
     # Helpers for the table conversion
     module Table
-      def self.display_row(node, tsec, row)
+      def self.display_row(tsec, row)
         result = ["<tr>"]
         row.each do |cell|
           cell_content = if tsec == :head
@@ -16,8 +16,8 @@ module Asciidoctor
                          end
           cell_tag_name = (tsec == :head || cell.style == :header ? "th" : "td")
           cell_attrs = []
-          cell_attrs << %(halign-#{cell.attr "halign"}) unless node.attr?("halign")
-          cell_attrs << %(align-#{cell.attr "valign"}) unless node.attr?("valign")
+          cell_attrs << %(halign-#{cell.attr "halign"}) unless cell.attr?("halign", "left")
+          cell_attrs << %(align-#{cell.attr "valign"}) unless cell.attr?("valign", "top")
           cell_class_attribute = %( class="#{cell_attrs.join " "}") unless cell_attrs.empty?
           cell_colspan_attribute = cell.colspan ? %( colspan="#{cell.colspan}") : ""
           cell_rowspan_attribute = cell.rowspan ? %( rowspan="#{cell.rowspan}") : ""
@@ -32,7 +32,7 @@ module Asciidoctor
         node.rows.to_h.map do |tsec, rows|
           next if rows.empty?
 
-          "<t#{tsec}>\n#{rows.map { |row| display_row(node, tsec, row) }.join("\n")}\n</t#{tsec}>"
+          "<t#{tsec}>\n#{rows.map { |row| display_row(tsec, row) }.join("\n")}\n</t#{tsec}>"
         end.join("\n")
       end
     end

data/lib/asciidoctor/html/template.rb

@@ -147,7 +147,7 @@ module Asciidoctor
       # - description: String
       # - date: Date
       # - chapheading: String
-      # - chaptitle: String
+      # - chapsubheading: String
       # - langs: Array[String]
       def self.html(content, nav_items, opts = {})
         nav = (nav_items.size > 1)

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.8
+  version: 0.1.10
 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