asciidoctor-html 2.2.2 → 2.2.3

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/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.2"
+    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.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Ravi Rajani