asciidoctor-html 2.2.1 → 2.2.3

data/lib/asciidoctor/html/book.rb

@@ -9,7 +9,6 @@ require_relative "cref_inline_macro"
 require_relative "bi_inline_macro"
 require_relative "text_inline_macro"
 require_relative "subnav_block_macro"
-require_relative "reuse_block_macro"
 require_relative "book_template"
 require_relative "pagination"
 require_relative "search"
@@ -28,7 +27,6 @@ module Asciidoctor
         inline_macro TextInlineMacro
         inline_macro BiInlineMacro
         block_macro SubnavBlockMacro
-        block_macro ReuseBlockMacro
       end
 
       DOCATTRS = {

data/lib/asciidoctor/html/converter.rb

@@ -17,17 +17,7 @@ module Asciidoctor
       include Figure
 
       def convert_embedded(node)
-        result = [node.content]
-        if node.footnotes?
-          result << %(<div class="fn-wrapper">)
-          result << %(<div class="footnote-separator"></div><div class="footnotes">)
-          node.footnotes.each do |fn|
-            result << %(<div class="fn-row"><div class="fn-mark">#{fn.index}</div>)
-            result << %(<div class="footnote" id="_footnotedef_#{fn.index}">#{fn.text}</div></div>)
-          end
-          result << %(</div></div>)
-        end
-        result.join("\n")
+        node.content
       end
 
       def convert_preamble(node)
@@ -41,8 +31,11 @@ module Asciidoctor
         classes = "section#{" flip" if level == 1}#{" #{node.role}" if node.role}"
         display_sectnum = Utils.display_sectnum(node, level) if show_sectnum
         title = "#{display_sectnum}#{node.title}"
-        content = "#{Utils.heading node, title}#{node.content}"
-        Utils.wrap_id_classes content, node.id, classes, :section
+        content = node.content
+        result = ["#{Utils.heading node, title}#{content}"]
+        footnotes = Utils.display_footnotes(node, content) if node.level == 1
+        result << footnotes if footnotes
+        Utils.wrap_id_classes result.join("\n"), node.id, classes, :section
       end
 
       def convert_floating_title(node)

data/lib/asciidoctor/html/flip.rb

@@ -92,25 +92,6 @@ module Asciidoctor
             }
           }
 
-          function reuseElements() {
-            focusEl.querySelectorAll(':scope > .flip.d-block .reuse').forEach(target => {
-              const link = target && target.querySelector('a.reuse-link');
-              if(!link) return;
-
-              const source = document.getElementById(link.hash.substring(1));
-              let reuse = source && source.parentElement;
-              if(!reuse) return;
-
-              if(!reuse.classList.contains('reuse')) {
-                reuse = document.createElement('div');
-                reuse.classList.add('reuse');
-                source.replaceWith(reuse);
-              }
-              reuse.replaceChildren(...target.children);
-              target.replaceChildren(source);
-            });
-          }
-
           function flip(e) {
             if(!page.classList.contains('multi')) {
               focusOnLoad();
@@ -147,8 +128,6 @@ module Asciidoctor
               }
             }
 
-            reuseElements();
-
             nav.forEach(el => {
               const a = el.querySelector('a');
               a && a.hash && el.classList.toggle('active', id == a.hash.substring(1));

data/lib/asciidoctor/html/ref_tree_processor.rb

@@ -48,7 +48,8 @@ module Asciidoctor
         context = :image if style == "figlist"
         env = env context, style
         block.set_attr("showcaption", true) unless context == :stem
-        assign_numeral! block, NUMBERED_CONTEXTS[context] unless context == :section
+        counter_name = NUMBERED_CONTEXTS[context]
+        assign_numeral!(block, counter_name) if counter_name
         relative_numeral = relative_numeral block
 
         reftext = if context == :stem

data/lib/asciidoctor/html/utils.rb

@@ -121,6 +121,33 @@ module Asciidoctor
       def self.reftext(node)
         node.reftext || (node.title unless node.inline?) || "[#{node.id}]" if node.id
       end
+
+      # index_filter: Hash(index => bool)
+      def self.display_footnotes(node, content)
+        footnotes = []
+        content.scan(/data-contentid="_footnotedef_(\d)"/) do |matches|
+          index = matches&.first&.to_i
+          fn = node.document.footnotes.select { |fn| fn.index == index }.first
+          next unless fn
+
+          footnotes << <<~HTML
+            <div class="fn-row">
+              <div class="fn-mark">#{fn.index}</div>
+              <div class="footnote" id="_footnotedef_#{fn.index}">#{fn.text}</div>
+            </div>
+          HTML
+        end
+        return if footnotes.empty?
+
+        <<~HTML
+          <div class="fn-wrapper">
+            <div class="footnote-separator"></div>
+            <div class="footnotes">
+              #{footnotes.join "\n"}
+            </div> <!-- .footnotes -->
+          </div> <!-- .fn-wrapper -->
+        HTML
+      end
     end
   end
 end

data/lib/asciidoctor/html/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Html
-    VERSION = "2.2.1"
+    VERSION = "2.2.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-html
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.3
 platform: ruby
 authors:
 - Ravi Rajani
@@ -126,7 +126,6 @@ files:
 - lib/asciidoctor/html/pagination.rb
 - lib/asciidoctor/html/popovers.rb
 - lib/asciidoctor/html/ref_tree_processor.rb
-- lib/asciidoctor/html/reuse_block_macro.rb
 - lib/asciidoctor/html/scroll.rb
 - lib/asciidoctor/html/search.rb
 - lib/asciidoctor/html/sidebar.rb
@@ -161,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: An AsciiDoc-to-HTML static site generator based on Asciidoctor.
 test_files: []

data/lib/asciidoctor/html/reuse_block_macro.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require "asciidoctor"
-require_relative "utils"
-
-module Asciidoctor
-  module Html
-    # Reuse blocks, especially useful in multi mode
-    class ReuseBlockMacro < Asciidoctor::Extensions::BlockMacroProcessor
-      use_dsl
-
-      named :reuse
-      name_positional_attributes "reftext"
-
-      def process(parent, target, attrs)
-        if target.empty?
-          content = Utils.show_error "Missing target."
-        else
-          el = parent.document.catalog[:refs][target]
-          reftext = el && (attrs["reftext"] || Utils.reftext(el))
-          title = %(<div class="block-title">#{parent.apply_subs attrs["title"]}</div>) if attrs.include?("title")
-          content = if reftext
-                      id = %( id="#{attrs["id"]}") if attrs.include?("id")
-                      classes = %( #{attrs["role"]}) if attrs.include?("role")
-                      <<~HTML
-                        <div#{id} class="reuse#{classes}">
-                          #{title}
-                          <p><a class="reuse-link" href="##{target}">#{reftext}</a></p>
-                        </div>
-                      HTML
-                    else
-                      Utils.show_error "Invalid ID."
-                    end
-        end
-        create_pass_block parent, content, attrs, subs: nil
-      end
-    end
-  end
-end