asciidoctor-html 2.2.2 → 2.2.4

data/lib/asciidoctor/html/converter.rb

@@ -7,6 +7,7 @@ require_relative "figure"
 require_relative "table"
 require_relative "tabs"
 require_relative "jupyterlite"
+require_relative "live"
 
 module Asciidoctor
   module Html
@@ -17,17 +18,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 +32,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)
@@ -147,7 +141,7 @@ module Asciidoctor
         end
         title = Utils.display_title node
         content = title + pre_open + node.content + pre_close
-        Utils.wrap_live Utils.wrap_node(content, node), node.attr("live")
+        Live.wrap_live Utils.wrap_node(content, node), node.attr("live")
       end
 
       def convert_literal(node)
@@ -181,7 +175,7 @@ module Asciidoctor
       def convert_image(node)
         content = display_figure node
         classes = ["figbox", node.role]
-        Utils.wrap_live(
+        Live.wrap_live(
           Utils.wrap_id_classes(content, node.id, classes.compact.join(" ")),
           node.attr("live")
         )
@@ -243,8 +237,8 @@ module Asciidoctor
           result << "</dd>"
         end
         result << "</dl>\n"
-        Utils.wrap_live(Utils.wrap_id_classes_with_title(result.join("\n"), node, node.id, "dlist-wrapper"),
-                        node.attr("live"))
+        Live.wrap_live(Utils.wrap_id_classes_with_title(result.join("\n"), node, node.id, "dlist-wrapper"),
+                       node.attr("live"))
       end
 
       def convert_inline_anchor(node)
@@ -302,7 +296,7 @@ module Asciidoctor
         end
         result << "#{Table.display_rows(node)}</table>"
         wrap_classes = "table-responsive#{" #{node.role}" if node.role}"
-        Utils.wrap_live Utils.wrap_id_classes(result.join("\n"), nil, wrap_classes), node.attr("live")
+        Live.wrap_live Utils.wrap_id_classes(result.join("\n"), nil, wrap_classes), node.attr("live")
       end
     end
   end

data/lib/asciidoctor/html/list.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative "utils"
+require_relative "live"
+
 module Asciidoctor
   module Html
     # Helper functions for the list conversion
@@ -26,7 +29,7 @@ module Asciidoctor
         end
         result << %(</#{tag_name}> <!-- .level-#{level} -->\n)
         wrap_classes = %(list-wrapper#{" #{node.role}" if node.title? && node.role})
-        Utils.wrap_live Utils.wrap_id_classes_with_title(result.join("\n"), node, node.id, wrap_classes), node.attr("live")
+        Live.wrap_live Utils.wrap_id_classes_with_title(result.join("\n"), node, node.id, wrap_classes), node.attr("live")
       end
 
       def self.display_list_item(item, inside: false)

data/lib/asciidoctor/html/live.rb

@@ -135,6 +135,24 @@ module Asciidoctor
           });
         })();
       JS
+
+      def self.wrap_live(content, live_attr)
+        return content unless live_attr
+
+        /\A(?<default>normal|faded|covered)-(?<live>faded|covered)\Z/ =~ live_attr
+
+        live_class = %(live-#{live || "faded"})
+        default_class = %(live-default-#{default || "normal"})
+        <<~HTML
+          <div class="live #{default_class} #{live_class}" data-reset="#{default_class}">
+          <div class="live-select">
+            <svg xmlns="http://www.w3.org/2000/svg" class="live-icon" transform="scale(-1 1)" viewBox="0 0 512 512">
+              <path d="M403.623 242.703 226.443 8.728c-7.34-9.693-21.153-11.606-30.845-4.258-9.701 7.34-11.607 21.16-4.266 30.861l23.85 31.484c-50.984 22.605-111.261 5.426-111.261 5.426 27.887 45.796 77.341 56.749 92.622 59.093-28.271 33.774-45.388 77.234-45.396 124.674.023 66.872 33.936 125.966 85.396 160.969l-45.211 59.693c-7.341 9.701-5.435 23.52 4.266 30.869 9.692 7.333 23.505 5.427 30.845-4.258v-.008l177.18-233.982c5.942-7.856 5.942-18.74 0-26.588m-207.08 64.681c-9.393 0-17.011-23.013-17.011-51.406 0-28.363 7.618-51.377 17.011-51.377s17.01 23.014 17.01 51.377c0 28.393-7.618 51.406-17.01 51.406m66.587 74.482a152.3 152.3 0 0 1-35.857-33.036c19.5-9.846 34.02-47.632 34.02-92.852 0-45.189-14.52-82.968-34.005-92.822a151.7 151.7 0 0 1 35.842-33.006l95.32 125.858z" fill="currentColor"/>
+            </svg>
+          </div>
+          #{content}</div> <!-- .live -->
+        HTML
+      end
     end
   end
 end

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

@@ -2,6 +2,7 @@
 
 require "asciidoctor"
 require "pathname"
+require_relative "live"
 
 module Asciidoctor
   module Html
@@ -28,7 +29,7 @@ module Asciidoctor
             </nav>
           </div>
         HTML
-        content = Utils.wrap_live content, attrs["live"]
+        content = Live.wrap_live content, attrs["live"]
         create_pass_block parent, content, attrs, subs: nil
       end
     end

data/lib/asciidoctor/html/utils.rb

@@ -86,20 +86,6 @@ module Asciidoctor
         %(<span class="title-mark">#{sectnum}</span>)
       end
 
-      def self.wrap_live(content, live_attr)
-        return content unless live_attr
-
-        /\A(?<default>normal|faded|covered)-(?<live>faded|covered)\Z/ =~ live_attr
-
-        live_class = %(live-#{live || "faded"})
-        default_class = %(live-default-#{default || "normal"})
-        <<~HTML
-          <div class="live #{default_class} #{live_class}" data-reset="#{default_class}">
-          <div class="live-select"><i class="bi bi-eye"></i></div>
-          #{content}</div> <!-- .live -->
-        HTML
-      end
-
       def self.line_number_attr(line_number, live: false)
         live ? %( data-line-number="#{line_number}") : ""
       end
@@ -121,6 +107,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.4"
   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.4
 platform: ruby
 authors:
 - Ravi Rajani
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.7
 specification_version: 4
 summary: An AsciiDoc-to-HTML static site generator based on Asciidoctor.
 test_files: []