asciidoctor-html 2.0.3 → 2.1.1

data/lib/asciidoctor/html/ref_tree_processor.rb

@@ -41,7 +41,7 @@ module Asciidoctor
         context = :image if style == "figlist"
         env = env context, style
         block.set_attr("showcaption", true) unless context == :stem
-        assign_numeral! block, document, NUMBERED_CONTEXTS[context]
+        assign_numeral! block, document, NUMBERED_CONTEXTS[context] unless context == :section
         relative_numeral = relative_numeral block, document
 
         reftext = if context == :stem
@@ -69,6 +69,10 @@ module Asciidoctor
           block.style == "figlist"
         when :stem, :listing
           block.option? "numbered"
+        when :table
+          !block.option? "nocaption"
+        when :section
+          block.numbered && block.level == 1
         else
           NUMBERED_CONTEXTS.include? context
         end
@@ -152,7 +156,7 @@ module Asciidoctor
         end
         block.set_attr "list-depth", depth
         if flat_style
-          block.set_attr("flat-style", true)
+          block.set_attr "flat-style", true
         else
           offset = offset block
           style = block.style
@@ -194,8 +198,9 @@ module Asciidoctor
         register_reftext! item, mark
       end
 
-      def process_source_code!(document, lang)
+      def process_source_code!(document, lang, linenums: false)
         document.set_attr("source-langs", {}) unless document.attr?("source-langs")
+        document.set_attr("linenumbering", true) if !document.attr?("linenumbering") && linenums
         langs = document.attr "source-langs"
         langs[lang] = true unless Highlightjs::INCLUDED_LANGS.include?(lang)
       end
@@ -225,29 +230,39 @@ module Asciidoctor
       end
 
       def process(document)
-        listdepth = 0
-        bulletdepth = 0
-        flat_style = false
-        flat_idx = 0 # flat index for (pseudocode) list
+        listdepth = bulletdepth = flat_idx = 0
+        flat_style = live = false
+        line_number = 1
         tw = TreeWalker.new document
         while (block = tw.next_block)
           unless block.attr? "refprocessed"
             process_numbered_block!(block, document) if process_numbered_block?(block)
             if colist? block
               process_colist! block
-            elsif olist? block
-              if listdepth.zero?
+            elsif (is_olist = olist? block) || (is_ulist = ulist? block)
+              if is_olist && listdepth.zero?
                 flat_style = (block.style == "pseudocode")
                 flat_idx = offset block
               end
-              process_olist! block, listdepth, flat_style:
-            elsif olist_item?(block) && flat_style
-              process_flat_item! block, flat_idx
-              flat_idx += 1
+              process_olist!(block, listdepth, flat_style:) if is_olist
+              process_ulist!(block, bulletdepth) if is_ulist
+              if (listdepth + bulletdepth).zero?
+                live = block.attr?("live")
+                document.set_attr "live", true if live && !document.attr?("live")
+                line_number = offset(block) + 1
+              end
+            elsif (is_olist_item = olist_item? block) || ulist_item?(block)
+              if is_olist_item && flat_style
+                process_flat_item! block, flat_idx
+                flat_idx += 1
+              end
+              if live
+                block.set_attr "line-number", line_number
+                line_number += 1
+              end
             elsif source_code? block
-              process_source_code! document, block.attr("language")
-            elsif ulist? block
-              process_ulist! block, bulletdepth
+              linenums = block.option?("linenums") || block.attr?("live")
+              process_source_code! document, block.attr("language"), linenums:
             end
             block.set_attr "refprocessed", true
           end

data/lib/asciidoctor/html/subnav_block_macro.rb

@@ -27,6 +27,7 @@ module Asciidoctor
             </nav>
           </div>
         HTML
+        content = Utils.wrap_live content, attrs["live"]
         create_pass_block parent, content, attrs, subs: nil
       end
     end

data/lib/asciidoctor/html/table.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
+require_relative "utils"
+
 module Asciidoctor
   module Html
     # Helpers for the table conversion
     module Table
-      def self.display_row(tsec, row)
-        result = ["<tr>"]
+      def self.display_row(tsec, row, line_number, live: false)
+        result = ["<tr#{Utils.line_number_attr line_number, live:}>"]
         row.each do |cell|
           cell_content = if tsec == :head
                            cell.text
@@ -31,10 +33,17 @@ module Asciidoctor
       end
 
       def self.display_rows(node)
+        line_number = 0
+        live = node.attr? "live"
         node.rows.to_h.map do |tsec, rows|
           next if rows.empty?
 
-          "<t#{tsec}>\n#{rows.map { |row| display_row(tsec, row) }.join("\n")}\n</t#{tsec}>"
+          result = rows.map do |row|
+            show_lineno = live && tsec != :head
+            line_number += 1 if show_lineno
+            display_row(tsec, row, line_number, live: show_lineno)
+          end
+          "<t#{tsec}>\n#{result.join "\n"}\n</t#{tsec}>"
         end.join("\n")
       end
     end

data/lib/asciidoctor/html/utils.rb

@@ -85,6 +85,24 @@ module Asciidoctor
         end
         %(<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
     end
   end
 end

data/lib/asciidoctor/html/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Html
-    VERSION = "2.0.3"
+    VERSION = "2.1.1"
   end
 end

data/lib/asciidoctor/html.rb

@@ -8,7 +8,6 @@ module Asciidoctor
     CSS_PATH = "#{ASSETS_PATH}/css".freeze
     IMG_PATH = "#{ASSETS_PATH}/img".freeze
     SEARCH_PAGE = "search.html"
-    SEARCH_INDEX = "search-index.json"
   end
 end
 

data/lib/minitest/html_plugin.rb

@@ -35,7 +35,7 @@ module Minitest
       color = failed ? "danger" : "success"
       id = "test-#{name.tr "_", "-"}"
       title = display_result_title name, failed, color
-      pre = %([source,asciidoc]\n------\n#{adoc}\n------\n)
+      pre = %([live=normal-faded,asciidoc]\n------\n#{adoc}\n------\n)
       fail = failed ? display_failure(@results[key].join("\n")) : ""
       %([##{id}]\n== #{title}\n\n#{pre}#{fail}\n\n#{adoc}\n\n)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-html
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.1
 platform: ruby
 authors:
 - Ravi Rajani
@@ -95,6 +95,7 @@ files:
 - Rakefile
 - assets/css/fonts/bootstrap-icons.woff
 - assets/css/fonts/bootstrap-icons.woff2
+- assets/css/jupyterlite.css
 - assets/css/styles.css
 - assets/favicon/android-chrome-192x192.png
 - assets/favicon/android-chrome-512x512.png
@@ -103,6 +104,13 @@ files:
 - assets/favicon/favicon-32x32.png
 - assets/favicon/favicon.ico
 - exe/adoctohtml
+- jupyterlite/.gitignore
+- jupyterlite/content/data/matplotlib.png
+- jupyterlite/content/pyodide/matplotlib.ipynb
+- jupyterlite/content/python.ipynb
+- jupyterlite/overrides.json
+- jupyterlite/repl/jupyter-lite.json
+- jupyterlite/requirements.txt
 - lib/asciidoctor/html.rb
 - lib/asciidoctor/html/bi_inline_macro.rb
 - lib/asciidoctor/html/book.rb
@@ -113,7 +121,9 @@ files:
 - lib/asciidoctor/html/figure.rb
 - lib/asciidoctor/html/flip.rb
 - lib/asciidoctor/html/highlightjs.rb
+- lib/asciidoctor/html/jupyterlite.rb
 - lib/asciidoctor/html/list.rb
+- lib/asciidoctor/html/live.rb
 - lib/asciidoctor/html/pagination.rb
 - lib/asciidoctor/html/popovers.rb
 - lib/asciidoctor/html/ref_tree_processor.rb