asciidoctor-html 2.1.2 → 2.1.3

data/lib/asciidoctor/html/book.rb

@@ -38,7 +38,8 @@ module Asciidoctor
         "imagesdir" => IMG_PATH,
         "dollar" => "$",
         "parskip" => %(<span class="parskip"></span><br>),
-        "notitle" => %(<span class="notitle">&nbsp;</span>)
+        "notitle" => %(<span class="notitle">&nbsp;</span>),
+        "br" => "<br>"
       }.freeze
 
       DEFAULT_OPTS = {

data/lib/asciidoctor/html/book_template.rb

@@ -111,8 +111,6 @@ module Asciidoctor
           </div>
           #{opts[:content]}
           </div>
-          #{opts[:paginator]}
-          #{footer opts[:authors]}
           </main>
         HTML
       end
@@ -243,6 +241,8 @@ module Asciidoctor
           #{MENU_BTN if nav}
           #{header opts[:title], opts[:short_title], opts[:chapheading], opts[:has_subnav]}
           #{main content:, **opts}
+          #{opts[:paginator]}
+          #{footer opts[:authors]}
           </div> <!-- .page -->
           <script>document.getElementById("cr-year").textContent = (new Date()).getFullYear();</script>
           <script type="module">

data/lib/asciidoctor/html/converter.rb

@@ -165,24 +165,31 @@ module Asciidoctor
       end
 
       def convert_example(node)
-        Utils.wrap_node_with_title node.content, node
+        Utils.wrap_node(Utils.display_title(node) + node.content, node)
       end
 
       def convert_image(node)
         content = display_figure node
-        Utils.wrap_id_classes content, node.id, ["figbox", node.role].compact.join(" ")
+        classes = ["figbox", node.role]
+        Utils.wrap_live(
+          Utils.wrap_id_classes(content, node.id, classes.compact.join(" ")),
+          node.attr("live")
+        )
       end
 
       def convert_inline_image(node)
         target = node.target
         return read_svg_contents(node, target) if node.option?("inline")
 
-        mark = node.parent.attr "mark"
+        parent = node.parent
+        mark = parent.attr "mark"
         title_attr = node.attr? "title"
         if mark # The image is part of a figlist
           title = node.attr("title") if title_attr
-          %(    #{display_image node, target}
-          <figcaption><span class="li-mark">#{mark}</span>#{title}</figcaption>).gsub(/^      /, "")
+          caption = if title_attr || parent.context == :olist
+                      %(\n    <figcaption><span class="li-mark">#{mark}</span>#{title}</figcaption>)
+                    end
+          %(    #{display_image node, target}#{caption})
         else
           display_image node, target, title_attr:
         end
@@ -199,6 +206,8 @@ module Asciidoctor
       end
 
       def convert_ulist(node)
+        return convert_figlist(node) if node.style == "figlist"
+
         List.convert node, :ul
       end
 
@@ -264,7 +273,7 @@ module Asciidoctor
           width_attribute = %( width="#{tablewidth}%")
         end
         result = [%(<table#{Utils.id_class_attr_str node.id, classes.join(" ")}#{width_attribute}>)]
-        unless node.option? "nocaption"
+        if Utils.show_title? node
           result << %(<caption class="table-title">#{Utils.display_title_prefix node}#{node.title}</caption>)
         end
         if node.attr("rowcount").positive? && node.attr?("cols")

data/lib/asciidoctor/html/figure.rb

@@ -23,18 +23,21 @@ module Asciidoctor
 
       def display_figure(node)
         target = node.attr "target"
-        title = node.title? ? node.title : ""
+        title = node.title if node.title?
         image = display_image node, target
-        caption = %(    <figcaption>#{Utils.display_title_prefix node}#{title}</figcaption>)
-        %(<figure>\n    #{image}\n#{caption}\n</figure>)
+        caption = %(    <figcaption>#{Utils.display_title_prefix node}#{title}</figcaption>\n) if Utils.show_title?(node)
+        %(<figure>\n    #{image}\n#{caption}</figure>)
       end
 
       def convert_figlist(node)
+        tagname = node.context == :olist ? :ol : :ul
         result = node.items.map do |item|
           %(<li#{Utils.id_class_attr_str item.id, item.role}><figure>\n#{item.text}\n</figure></li>)
         end
-        content = Utils.wrap_id_classes result.join("\n"), nil, "figlist", :ol
-        title = %(<div class="figlist-title">#{Utils.display_title_prefix(node)}#{node.title}</div>)
+        content = Utils.wrap_id_classes result.join("\n"), nil, "figlist", tagname
+        title = if Utils.show_title?(node)
+                  %(<div class="figlist-title">#{Utils.display_title_prefix(node)}#{node.title}</div>)
+                end
         classes = ["figlist-wrapper", node.role].compact.join(" ")
         Utils.wrap_id_classes %(#{content}#{title}), node.id, classes
       end

data/lib/asciidoctor/html/flip.rb

@@ -16,6 +16,7 @@ module Asciidoctor
           const sectsById = { "page": []};
 
           const page = document.getElementById('page');
+          const main = document.getElementById('main');
           const focusEl = document.getElementById('content-container');
           const searchForm = document.getElementById('search-form');
           const chapheading = page.querySelector('.chapheading');
@@ -45,7 +46,7 @@ module Asciidoctor
           function focusOnLoad() {
             if(searchForm) return;
 
-            focusEl.focus({preventScroll: !page.classList.contains('presentation')});
+            focusEl.focus({preventScroll: true});
           }
 
           function updatePaginator(prev, next) {
@@ -86,7 +87,6 @@ module Asciidoctor
             } else if(chapPagination.prevChap) {
               prevPage.replaceWith(chapPagination.prevChap)
             }
-            paginator.classList.toggle('visible', paginator.querySelector('a'));
           }
 
           function flip(e) {
@@ -132,14 +132,15 @@ module Asciidoctor
 
             ADHT.nudgeMenuBtn();
 
+            const scrollEl = page.classList.contains('presentation') ? main : page;
             if(target == section) {
-              page.scrollTo({
+              scrollEl.scrollTo({
                 top: 0,
                 left: 0
               });
             } else {
               const rect = target.getBoundingClientRect()
-              page.scrollTo({
+              scrollEl.scrollTo({
                 top: rect.top + page.scrollTop,
                 left: 0
               });
@@ -148,6 +149,7 @@ module Asciidoctor
             focusOnLoad();
             if(isPresentation) focusEl.dataset.flip = id;
           }
+
           flip();
 
           const dropdownItems = document.querySelectorAll('#viewmode-actions .dropdown-item');
@@ -192,6 +194,14 @@ module Asciidoctor
           }));
 
           page.classList.add('loaded');
+
+          // Chrome does not calculate viewport height correctly in standalone mode.
+          if(matchMedia('(display-mode: standalone)').matches &&
+            typeof visualViewport !== 'undefined'
+          ) {
+            page.style.height = visualViewport.height + 'px';
+          }
+
           ADHT.move = move;
         })();
       JS

data/lib/asciidoctor/html/highlightjs.rb

@@ -64,7 +64,7 @@ module Asciidoctor
 
               const overlay = document.createElement('div');
               overlay.classList.add('copy-button');
-              overlay.textContent = result.language.toUpperCase() + ' ';
+              // overlay.textContent = result.language.toUpperCase() + ' ';
 
               const copyButton = document.createElement('button');
               copyButton.classList.add('btn');

data/lib/asciidoctor/html/ref_tree_processor.rb

@@ -22,27 +22,28 @@ module Asciidoctor
         listing: "ltg-number"
       }.freeze
 
-      def assign_numeral!(node, document, counter_name)
+      def assign_numeral!(node, counter_name)
+        document = node.document
         document.counters[counter_name] ||= 0
         node.numeral = (document.counters[counter_name] += 1)
       end
 
-      def relative_numeral(node, document)
+      def relative_numeral(node)
         return "" unless node.numeral
 
-        chapnum = document.attr "chapnum"
+        chapnum = node.document.attr "chapnum"
         has_prefix = chapnum && !chapnum.empty? && chapnum != "0"
         has_prefix ? "#{chapnum}.#{node.numeral}" : node.numeral.to_s
       end
 
-      def process_numbered_block!(block, document)
+      def process_numbered_block!(block)
         context = block.context
         style = block.style
         context = :image if style == "figlist"
         env = env context, style
         block.set_attr("showcaption", true) unless context == :stem
-        assign_numeral! block, document, NUMBERED_CONTEXTS[context] unless context == :section
-        relative_numeral = relative_numeral block, document
+        assign_numeral! block, NUMBERED_CONTEXTS[context] unless context == :section
+        relative_numeral = relative_numeral block
 
         reftext = if context == :stem
                     "(#{relative_numeral})"
@@ -53,6 +54,19 @@ module Asciidoctor
         block.set_attr "title-prefix", reftext
       end
 
+      def process_unnumbered_block!(block)
+        reftext = block.title? ? block.title : "[#{block.id}]"
+        block.set_attr "reftext", reftext
+      end
+
+      def process_block!(block)
+        if block.option? "unnumbered"
+          process_unnumbered_block! block
+        elsif process_numbered_block? block
+          process_numbered_block! block
+        end
+      end
+
       def env(context, style)
         case context
         when :image then "figure"
@@ -69,8 +83,6 @@ module Asciidoctor
           block.style == "figlist"
         when :stem, :listing
           block.option? "numbered"
-        when :table
-          !block.option? "nocaption"
         when :section
           block.numbered && block.level == 1
         else
@@ -236,7 +248,7 @@ module Asciidoctor
         tw = TreeWalker.new document
         while (block = tw.next_block)
           unless block.attr? "refprocessed"
-            process_numbered_block!(block, document) if process_numbered_block?(block)
+            process_block! block
             if colist? block
               process_colist! block
             elsif (is_olist = olist? block) || (is_ulist = ulist? block)

data/lib/asciidoctor/html/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Html
-    VERSION = "2.1.2"
+    VERSION = "2.1.3"
   end
 end

data/lib/minitest/html_plugin.rb

@@ -37,7 +37,7 @@ module Minitest
       title = display_result_title name, failed, color
       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)
+      %([##{id}.flex-grow-1]\n== #{title}\n\n#{pre}#{fail}\n\n#{adoc}\n\n)
     end
 
     def report_files(results, dirname)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-html
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Ravi Rajani