asciidoctor-html5s 0.3.0 → 0.4.0

data/data/templates/outline.html.slim

@@ -5,6 +5,6 @@
   ol.toc-list class="level-#{slevel}"
     - sections.each do |sec|
       li
-        a href="##{sec.id}" =section_title sec
+        a href="##{sec.id}" =(section_title sec, drop_anchors: true)
         - if (sec.level < toclevels) && (child_toc = converter.convert sec, 'outline')
           = child_toc

data/data/templates/table.html.slim

@@ -1,7 +1,7 @@
 = block_with_caption :top, :class=>'table-block'
   table [
-      class=["frame-#{attr :frame, 'all'}", "grid-#{attr :grid, 'all'}", spread?]
-      style=style_value(width: ("#{attr :tablepcwidth}%" if !autowidth? && !spread? || (local_attr :width)),
+      class=["frame-#{attr :frame, 'all'}", "grid-#{attr :grid, 'all'}", stretch?, ("stripes-#{attr :stripes}" if attr? :stripes)]
+      style=style_value(width: ("#{attr :tablepcwidth}%" if !autowidth? && !stretch? || (local_attr :width)),
                         float: (attr :float)) ]
     - unless (attr :rowcount).zero?
       colgroup
@@ -10,7 +10,7 @@
             col
         - else
           - columns.each do |col|
-            col style="width: #{col.attr :colpcwidth}%;"
+            col style=style_value(width: ("#{col.attr :colpcwidth}%" if !autowidth? col))
       - [:head, :foot, :body].reject { |tblsec| rows[tblsec].empty? }.each do |tblsec|
         <t#{tblsec}>
           - rows[tblsec].each do |row|
@@ -27,13 +27,11 @@
                     - case cell.style
                     - when :asciidoc
                       =cell.content
-                    - when :verse
-                      .verse: pre =cell.text
                     - when :literal
                       .literal: pre =cell.text
                     - else
-                      - if cell.content.one?
-                        =cell.content.first
+                      - if (content = cell.content).one?
+                        =content.first
                       - else
-                        - cell.content.each do |text|
+                        - content.each do |text|
                           p =text

data/data/templates/ulist.html.slim

@@ -3,9 +3,9 @@
   ul class=(checklist || style)
     - items.each do |item|
       - if checklist && (item.attr? :checkbox)
-        li.task-list-item
+        li.task-list-item id=item.id class=item.role
           input.task-list-item-checkbox type='checkbox' disabled=true checked=(item.attr? :checked)
           =<item.text
       - else
-        li
+        li id=item.id class=item.role
           =(print_item_content item)

data/data/templates/video.html.slim

@@ -13,6 +13,7 @@
         height=(attr :height)
         poster=(media_uri(attr :poster) if attr? :poster)
         autoplay=(option? 'autoplay')
+        muted=(option? 'muted')
         controls=!(option? 'nocontrols')
         loop=(option? 'loop') ]
       | Your browser does not support the video tag.

data/lib/asciidoctor/html5s.rb

@@ -3,6 +3,10 @@ require 'asciidoctor/html5s/converter'
 require 'asciidoctor/html5s/replacements'
 require 'asciidoctor/html5s/attached_colist_treeprocessor'
 
+if defined? Asciidoctor::SyntaxHighlighter
+  require 'asciidoctor/html5s/html_pipeline_highlighter'
+end
+
 unless RUBY_PLATFORM == 'opal'
   require 'asciidoctor/extensions'
 

data/lib/asciidoctor/html5s/attached_colist_treeprocessor.rb

@@ -9,6 +9,8 @@ module Asciidoctor::Html5s
   class AttachedColistTreeprocessor < ::Asciidoctor::Extensions::Treeprocessor
 
     def process(document)
+      return if document.backend != 'html5s'
+
       document.find_by(context: :colist) do |colist|
         blocks = colist.parent.blocks
         colist_idx = blocks.find_index(colist)

data/lib/asciidoctor/html5s/converter.rb

@@ -6,7 +6,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   #------------------------------ Begin of Helpers ------------------------------#
 
   require 'asciidoctor/html5s'
-  require 'asciidoctor/html5s/logger'
   require 'date' unless RUBY_PLATFORM == 'opal'
 
   # Add custom functions to this module that you want to use in your Slim
@@ -15,10 +14,11 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   module Helpers
 
     # URIs of external assets.
-    FONT_AWESOME_URI     = '//cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.min.css'
-    HIGHLIGHTJS_BASE_URI = '//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.12.0/build/'
-    KATEX_CSS_URI        = '//cdn.jsdelivr.net/npm/katex@0.9.0/dist/katex.min.css'
-    KATEX_JS_URI         = '//cdn.jsdelivr.net/npm/katex@0.9.0/dist/katex.min.js'
+    CDN_BASE_URI         = 'https://cdnjs.cloudflare.com/ajax/libs'  # for highlighters in Asciidoctor >=2.0.0
+    FONT_AWESOME_URI     = 'https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.min.css'
+    HIGHLIGHTJS_BASE_URI = 'https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.15.1/build/'
+    KATEX_CSS_URI        = 'https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.css'
+    KATEX_JS_URI         = 'https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.js'
 
     # Defaults
     DEFAULT_HIGHLIGHTJS_THEME = 'github'
@@ -60,7 +60,7 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
 
     # @return [Logger]
     def log
-      @_html5s_logger ||= ::Asciidoctor::Html5s::Logging.default_logger
+      ::Asciidoctor::LoggerManager.logger
     end
 
     ##
@@ -383,15 +383,29 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
     # Returns the captioned section's title, optionally numbered.
     #
     # @param sec [Asciidoctor::Section] the section node (default: self).
+    # @param drop_anchors [Boolean] Remove +<a>+ tags from the title?
     # @return [String]
     #
-    def section_title(sec = self)
-      sectnumlevels = document.attr(:sectnumlevels, DEFAULT_SECTNUMLEVELS).to_i
+    def section_title(sec = self, drop_anchors: false)
+      title =
+        if sec.caption
+          sec.captioned_title
+        elsif sec.numbered && sec.level <= document.attr(:sectnumlevels, DEFAULT_SECTNUMLEVELS).to_i
+          if sec.level < 2 && document.doctype == 'book' && %w[chapter part].include?(sec.sectname)
+            signifier = document.attr("#{sec.sectname}-signifier")
+            sectnum = sec.sectname == 'part' ? sec.sectnum(nil, ':') : sec.sectnum
+            "#{signifier&.+ ' '}#{sectnum} #{sec.title}"
+          else
+            "#{sec.sectnum} #{sec.title}"
+          end
+        else
+          sec.title
+        end
 
-      if sec.numbered && !sec.caption && sec.level <= sectnumlevels
-        [sec.sectnum, sec.captioned_title].join(' ')
+      if drop_anchors && title.include?('<a')
+        title.gsub(/<(?:a[^>+]+|\/a)>/, '')
       else
-        sec.captioned_title
+        title
       end
     end
 
@@ -403,7 +417,12 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
     end
 
     def link_rel
-      'noopener' if option?('noopener') || attr(:window) == '_blank'
+      rel = [
+        ('nofollow' if option?('nofollow')),
+        ('noopener' if option?('noopener') || local_attr(:window) == '_blank')
+      ].compact
+
+      rel.empty? ? nil : rel.join(' ')
     end
 
     #--------------------------------------------------------
@@ -462,15 +481,19 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
     #
 
     ##
-    # @return [String] a canonical name of the source-highlighter to be used as
-    #         a style class.
-    def highlighter
-      @_html5s_highlighter ||=
-        case (highlighter = document.attr('source-highlighter'))
-        when 'coderay'; 'CodeRay'
-        when 'highlight.js'; 'highlightjs'
-        else highlighter
-        end
+    # See {Asciidoctor::SyntaxHighlighter#format}.
+    #
+    # @return [String, nil] a rendered HTML.
+    def formatted_source
+      hl = document.syntax_highlighter or return nil
+
+      opts = { nowrap: nowrap? }
+      if hl.highlight?
+        opts[:css_mode] = document.attr("#{hl.name}-css", :class).to_sym
+        opts[:style] = document.attr("#{hl.name}-style")
+      end
+
+      hl.format(self, source_lang, opts)
     end
 
     ##
@@ -488,6 +511,15 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
       local_attr :language, false
     end
 
+    # This is needed only for Asciidoctor <2.0.0.
+    def source_code_class
+      if document.attr? 'source-highlighter', 'highlightjs'
+        "language-#{source_lang || 'none'} hljs"
+      elsif source_lang
+        "language-#{source_lang}"
+      end
+    end
+
     #--------------------------------------------------------
     # block_open
     #
@@ -509,7 +541,7 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
     def partintro_allowed?
       if result = (level != 0 || parent.context != :section || document.doctype != 'book')
         log.warn "asciidoctor: ERROR: partintro block can only be used when doctype
-  is book and it's a child of a book part. Excluding block content."
+  is book and must be a child of a book part. Excluding block content."
       end
       !result
     end
@@ -518,13 +550,13 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
     # block_table
     #
 
-    def autowidth?
-      option? :autowidth
+    def autowidth?(node = self)
+      node.option? :autowidth
     end
 
-    def spread?
+    def stretch?
       if !autowidth? || local_attr?('width')
-        'spread' if attr? :tablepcwidth, 100
+        'stretch' if attr? :tablepcwidth, 100
       end
     end
 
@@ -542,7 +574,8 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
       when :vimeo
         params = {
           autoplay: (1 if option? 'autoplay'),
-          loop:     (1 if option? 'loop')
+          loop:     (1 if option? 'loop'),
+          muted:    (1 if option? 'muted')
         }
         start_anchor = "#at=#{attr :start}" if attr? :start
         "//player.vimeo.com/video/#{attr :target}#{start_anchor}#{url_query params}"
@@ -556,6 +589,7 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
           list:     (attr :list, list_id),
           autoplay: (1 if option? 'autoplay'),
           loop:     (1 if option? 'loop'),
+          muted:    (1 if option? 'muted'),
           controls: (0 if option? 'nocontrols')
         }
         "//www.youtube.com/embed/#{video_id}#{url_query params}"
@@ -610,10 +644,9 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
       stylesheet = attr :stylesheet
       stylesdir = attr :stylesdir, ''
       default_style = ::Asciidoctor::DEFAULT_STYLESHEET_KEYS.include? stylesheet
-      linkcss = attr?(:linkcss) || safe >= ::Asciidoctor::SafeMode::SECURE
       ss = ::Asciidoctor::Stylesheets.instance
 
-      if linkcss
+      if attr?(:linkcss)
         path = default_style ? ::Asciidoctor::DEFAULT_STYLESHEET_NAME : stylesheet
         styles << { href: [stylesdir, path] }
       elsif default_style
@@ -636,23 +669,15 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
         scripts << { text: KATEX_RENDER_CODE }
       end
 
-      case attr 'source-highlighter'
-      when 'coderay'
-        if attr('coderay-css', 'class') == 'class'
-          if linkcss
-            styles << { href: [stylesdir, ss.coderay_stylesheet_name] }
-          else
-            styles << { text: ss.coderay_stylesheet_data }
-          end
-        end
-
-      when 'highlightjs'
-        hjs_base = attr :highlightjsdir, HIGHLIGHTJS_BASE_URI
-        hjs_theme = attr 'highlightjs-theme', DEFAULT_HIGHLIGHTJS_THEME
+      if !defined?(::Asciidoctor::SyntaxHighlighter)  # Asciidoctor <2.0.0
+        if attr? 'source-highlighter', 'highlightjs'
+          hjs_base = attr :highlightjsdir, HIGHLIGHTJS_BASE_URI
+          hjs_theme = attr 'highlightjs-theme', DEFAULT_HIGHLIGHTJS_THEME
 
-        scripts << { src: [hjs_base, 'highlight.min.js'] }
-        scripts << { text: 'hljs.initHighlightingOnLoad()' }
-        styles  << { href: [hjs_base, "styles/#{hjs_theme}.min.css"] }
+          scripts << { src: [hjs_base, 'highlight.min.js'] }
+          scripts << { text: 'hljs.initHighlightingOnLoad()' }
+          styles  << { href: [hjs_base, "styles/#{hjs_theme}.min.css"] }
+        end
       end
 
       styles.each do |item|
@@ -671,6 +696,15 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
         end
       end
 
+      if defined?(::Asciidoctor::SyntaxHighlighter) && (hl = syntax_highlighter)  # Asciidoctor >=2.0.0
+        # XXX: We don't care about the declared location and put all to head.
+        [:head, :footer].each do |location|
+          if hl.docinfo?(location)
+            tags << hl.docinfo(location, self, cdn_base_url: CDN_BASE_URI, linkcss: attr?(:linkcss))
+          end
+        end
+      end
+
       tags.join("\n")
     end
 
@@ -685,27 +719,21 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
           text
         elsif (path = local_attr :path)
           path
-        elsif document.respond_to? :catalog  # Asciidoctor >=1.5.6
+        else
           ref = document.catalog[:refs][attr :refid]
           if ref.kind_of? Asciidoctor::AbstractNode
-            ref.xreftext((@_html5s_xrefstyle ||= document.attributes['xrefstyle']))
+            ref.xreftext(attr(:xrefstyle, nil, true))
           end
-        else  # Asciidoctor < 1.5.6
-          document.references[:ids][attr :refid || target]
         end
       (str || "[#{attr :refid}]").tr_s("\n", ' ')
     end
 
     # @return [String, nil] text of the bibref anchor, or +nil+ if not found.
     def bibref_text
-      if document.respond_to? :catalog  # Asciidoctor >=1.5.6
-        if ::Asciidoctor::VERSION[0] == '1'
-          text
-        else  # Asciidoctor >= 2.0.0
-          "[#{reftext || id}]"
-        end
-      else
-        "[#{target}]"
+      if ::Asciidoctor::VERSION[0] == '1'
+        text
+      else  # Asciidoctor >= 2.0.0
+        "[#{reftext || id}]"
       end
     end
 
@@ -850,13 +878,17 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
     node.instance_eval do
       _buf = []; _slim_controls1 = block_with_caption :top, :class=>'listing-block' do; _slim_controls2 = []; 
       ; if style == 'source'; 
-      ; if highlighter == 'html-pipeline'; 
+      ; highlighter = document.attr('source-highlighter'); 
+      ; 
+      ; if defined?(::Asciidoctor::SyntaxHighlighter) && document.syntax_highlighter; 
+      ; _slim_controls2 << (formatted_source); 
+      ; 
+      ; elsif highlighter == 'html-pipeline'; 
       ; _slim_controls2 << ("<pre><code"); _slim_codeattributes1 = source_lang; if _slim_codeattributes1; if _slim_codeattributes1 == true; _slim_controls2 << (" data-lang"); else; _slim_controls2 << (" data-lang=\""); _slim_controls2 << (_slim_codeattributes1); _slim_controls2 << ("\""); end; end; _slim_controls2 << (">"); _slim_controls2 << (content); 
       ; _slim_controls2 << ("</code></pre>"); else; 
-      ; unless highlighter == 'CodeRay'; 
-      ; code_class = "language-#{source_lang}" if source_lang; 
-      ; end; _slim_controls2 << ("<pre"); _temple_html_attributeremover1 = []; _slim_codeattributes2 = [highlighter, 'highlight', ('linenums' if attr? :linenums), nowrap?]; if Array === _slim_codeattributes2; _slim_codeattributes2 = _slim_codeattributes2.flatten; _slim_codeattributes2.map!(&:to_s); _slim_codeattributes2.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes2.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes2); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _slim_controls2 << (" class=\""); _slim_controls2 << (_temple_html_attributeremover1); _slim_controls2 << ("\""); end; _slim_controls2 << ("><code"); 
-      ; _temple_html_attributeremover2 = []; _slim_codeattributes3 = code_class; if Array === _slim_codeattributes3; _slim_codeattributes3 = _slim_codeattributes3.flatten; _slim_codeattributes3.map!(&:to_s); _slim_codeattributes3.reject!(&:empty?); _temple_html_attributeremover2 << (_slim_codeattributes3.join(" ")); else; _temple_html_attributeremover2 << (_slim_codeattributes3); end; _temple_html_attributeremover2 = _temple_html_attributeremover2.join(""); if !_temple_html_attributeremover2.empty?; _slim_controls2 << (" class=\""); _slim_controls2 << (_temple_html_attributeremover2); _slim_controls2 << ("\""); end; _slim_codeattributes4 = source_lang; if _slim_codeattributes4; if _slim_codeattributes4 == true; _slim_controls2 << (" data-lang"); else; _slim_controls2 << (" data-lang=\""); _slim_controls2 << (_slim_codeattributes4); _slim_controls2 << ("\""); end; end; _slim_controls2 << (">"); _slim_controls2 << (content); 
+      ; 
+      ; _slim_controls2 << ("<pre"); _temple_html_attributeremover1 = []; _slim_codeattributes2 = [highlighter, 'highlight', ('linenums' if attr? :linenums), nowrap?]; if Array === _slim_codeattributes2; _slim_codeattributes2 = _slim_codeattributes2.flatten; _slim_codeattributes2.map!(&:to_s); _slim_codeattributes2.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes2.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes2); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _slim_controls2 << (" class=\""); _slim_controls2 << (_temple_html_attributeremover1); _slim_controls2 << ("\""); end; _slim_controls2 << ("><code"); 
+      ; _temple_html_attributeremover2 = []; _slim_codeattributes3 = source_code_class; if Array === _slim_codeattributes3; _slim_codeattributes3 = _slim_codeattributes3.flatten; _slim_codeattributes3.map!(&:to_s); _slim_codeattributes3.reject!(&:empty?); _temple_html_attributeremover2 << (_slim_codeattributes3.join(" ")); else; _temple_html_attributeremover2 << (_slim_codeattributes3); end; _temple_html_attributeremover2 = _temple_html_attributeremover2.join(""); if !_temple_html_attributeremover2.empty?; _slim_controls2 << (" class=\""); _slim_controls2 << (_temple_html_attributeremover2); _slim_controls2 << ("\""); end; _slim_codeattributes4 = source_lang; if _slim_codeattributes4; if _slim_codeattributes4 == true; _slim_controls2 << (" data-lang"); else; _slim_controls2 << (" data-lang=\""); _slim_controls2 << (_slim_codeattributes4); _slim_controls2 << ("\""); end; end; _slim_controls2 << (">"); _slim_controls2 << (content); 
       ; _slim_controls2 << ("</code></pre>"); end; else; 
       ; _slim_controls2 << ("<pre"); _temple_html_attributeremover3 = []; _slim_codeattributes5 = nowrap?; if Array === _slim_codeattributes5; _slim_codeattributes5 = _slim_codeattributes5.flatten; _slim_codeattributes5.map!(&:to_s); _slim_codeattributes5.reject!(&:empty?); _temple_html_attributeremover3 << (_slim_codeattributes5.join(" ")); else; _temple_html_attributeremover3 << (_slim_codeattributes5); end; _temple_html_attributeremover3 = _temple_html_attributeremover3.join(""); if !_temple_html_attributeremover3.empty?; _slim_controls2 << (" class=\""); _slim_controls2 << (_temple_html_attributeremover3); _slim_controls2 << ("\""); end; _slim_controls2 << (">"); _slim_controls2 << (content); 
       ; _slim_controls2 << ("</pre>"); 
@@ -920,7 +952,7 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
       _buf = []; _slim_controls1 = block_with_title :class=>['olist', style] do; _slim_controls2 = []; 
       ; _slim_controls2 << ("<ol"); _temple_html_attributeremover1 = []; _slim_codeattributes1 = style; if Array === _slim_codeattributes1; _slim_codeattributes1 = _slim_codeattributes1.flatten; _slim_codeattributes1.map!(&:to_s); _slim_codeattributes1.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes1.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes1); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _slim_controls2 << (" class=\""); _slim_controls2 << (_temple_html_attributeremover1); _slim_controls2 << ("\""); end; _slim_codeattributes2 = (attr :start); if _slim_codeattributes2; if _slim_codeattributes2 == true; _slim_controls2 << (" start"); else; _slim_controls2 << (" start=\""); _slim_controls2 << (_slim_codeattributes2); _slim_controls2 << ("\""); end; end; _slim_codeattributes3 = list_marker_keyword; if _slim_codeattributes3; if _slim_codeattributes3 == true; _slim_controls2 << (" type"); else; _slim_controls2 << (" type=\""); _slim_controls2 << (_slim_codeattributes3); _slim_controls2 << ("\""); end; end; _slim_codeattributes4 = (option? 'reversed'); if _slim_codeattributes4; if _slim_codeattributes4 == true; _slim_controls2 << (" reversed"); else; _slim_controls2 << (" reversed=\""); _slim_controls2 << (_slim_codeattributes4); _slim_controls2 << ("\""); end; end; _slim_controls2 << (">"); 
       ; items.each do |item|; 
-      ; _slim_controls2 << ("<li>"); _slim_controls2 << ((print_item_content item)); 
+      ; _slim_controls2 << ("<li"); _slim_codeattributes5 = item.id; if _slim_codeattributes5; if _slim_codeattributes5 == true; _slim_controls2 << (" id"); else; _slim_controls2 << (" id=\""); _slim_controls2 << (_slim_codeattributes5); _slim_controls2 << ("\""); end; end; _temple_html_attributeremover2 = []; _slim_codeattributes6 = item.role; if Array === _slim_codeattributes6; _slim_codeattributes6 = _slim_codeattributes6.flatten; _slim_codeattributes6.map!(&:to_s); _slim_codeattributes6.reject!(&:empty?); _temple_html_attributeremover2 << (_slim_codeattributes6.join(" ")); else; _temple_html_attributeremover2 << (_slim_codeattributes6); end; _temple_html_attributeremover2 = _temple_html_attributeremover2.join(""); if !_temple_html_attributeremover2.empty?; _slim_controls2 << (" class=\""); _slim_controls2 << (_temple_html_attributeremover2); _slim_controls2 << ("\""); end; _slim_controls2 << (">"); _slim_controls2 << ((print_item_content item)); 
       ; _slim_controls2 << ("</li>"); end; _slim_controls2 << ("</ol>"); _slim_controls2 = _slim_controls2.join(""); end; _buf << (_slim_controls1); _buf = _buf.join("")
     end
   end
@@ -983,7 +1015,7 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
       _buf = []; _slim_controls1 = block_with_caption :top, :class=>'table-block' do; _slim_controls2 = []; 
       ; 
       ; 
-      ; _slim_controls2 << ("<table"); _temple_html_attributeremover1 = []; _slim_codeattributes1 = ["frame-#{attr :frame, 'all'}", "grid-#{attr :grid, 'all'}", spread?]; if Array === _slim_codeattributes1; _slim_codeattributes1 = _slim_codeattributes1.flatten; _slim_codeattributes1.map!(&:to_s); _slim_codeattributes1.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes1.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes1); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _slim_controls2 << (" class=\""); _slim_controls2 << (_temple_html_attributeremover1); _slim_controls2 << ("\""); end; _slim_codeattributes2 = style_value(width: ("#{attr :tablepcwidth}%" if !autowidth? && !spread? || (local_attr :width)),
+      ; _slim_controls2 << ("<table"); _temple_html_attributeremover1 = []; _slim_codeattributes1 = ["frame-#{attr :frame, 'all'}", "grid-#{attr :grid, 'all'}", stretch?, ("stripes-#{attr :stripes}" if attr? :stripes)]; if Array === _slim_codeattributes1; _slim_codeattributes1 = _slim_codeattributes1.flatten; _slim_codeattributes1.map!(&:to_s); _slim_codeattributes1.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes1.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes1); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _slim_controls2 << (" class=\""); _slim_controls2 << (_temple_html_attributeremover1); _slim_controls2 << ("\""); end; _slim_codeattributes2 = style_value(width: ("#{attr :tablepcwidth}%" if !autowidth? && !stretch? || (local_attr :width)),
       float: (attr :float)); if _slim_codeattributes2; if _slim_codeattributes2 == true; _slim_controls2 << (" style"); else; _slim_controls2 << (" style=\""); _slim_controls2 << (_slim_codeattributes2); _slim_controls2 << ("\""); end; end; _slim_controls2 << (">"); 
       ; unless (attr :rowcount).zero?; 
       ; _slim_controls2 << ("<colgroup>"); 
@@ -992,7 +1024,7 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
       ; _slim_controls2 << ("<col>"); 
       ; end; else; 
       ; columns.each do |col|; 
-      ; _slim_controls2 << ("<col style=\"width: "); _slim_controls2 << (col.attr :colpcwidth); _slim_controls2 << ("%;\">"); 
+      ; _slim_controls2 << ("<col"); _slim_codeattributes3 = style_value(width: ("#{col.attr :colpcwidth}%" if !autowidth? col)); if _slim_codeattributes3; if _slim_codeattributes3 == true; _slim_controls2 << (" style"); else; _slim_controls2 << (" style=\""); _slim_controls2 << (_slim_codeattributes3); _slim_controls2 << ("\""); end; end; _slim_controls2 << (">"); 
       ; end; end; _slim_controls2 << ("</colgroup>"); [:head, :foot, :body].reject { |tblsec| rows[tblsec].empty? }.each do |tblsec|; 
       ; _slim_controls2 << ("<t"); _slim_controls2 << (tblsec); _slim_controls2 << (">"); 
       ; rows[tblsec].each do |row|; 
@@ -1009,15 +1041,13 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
       ; case cell.style; 
       ; when :asciidoc; 
       ; _slim_controls4 << (cell.content); 
-      ; when :verse; 
-      ; _slim_controls4 << ("<div class=\"verse\"><pre>"); _slim_controls4 << (cell.text); 
-      ; _slim_controls4 << ("</pre></div>"); when :literal; 
+      ; when :literal; 
       ; _slim_controls4 << ("<div class=\"literal\"><pre>"); _slim_controls4 << (cell.text); 
       ; _slim_controls4 << ("</pre></div>"); else; 
-      ; if cell.content.one?; 
-      ; _slim_controls4 << (cell.content.first); 
+      ; if (content = cell.content).one?; 
+      ; _slim_controls4 << (content.first); 
       ; else; 
-      ; cell.content.each do |text|; 
+      ; content.each do |text|; 
       ; _slim_controls4 << ("<p>"); _slim_controls4 << (text); 
       ; _slim_controls4 << ("</p>"); end; end; end; end; _slim_controls4 = _slim_controls4.join(""); end; _slim_controls2 << (_slim_controls3); end; _slim_controls2 << ("</tr>"); end; end; end; _slim_controls2 << ("</table>"); _slim_controls2 = _slim_controls2.join(""); end; _buf << (_slim_controls1); _buf = _buf.join("")
     end
@@ -1057,16 +1087,14 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
     node.instance_eval do
       _buf = []; case type; 
       ; when :xref; 
-      ; _buf << ("<a"); _slim_codeattributes1 = target; if _slim_codeattributes1; if _slim_codeattributes1 == true; _buf << (" href"); else; _buf << (" href=\""); _buf << (_slim_codeattributes1); _buf << ("\""); end; end; _buf << (">"); _buf << (xref_text); 
+      ; _buf << ("<a"); _slim_codeattributes1 = target; if _slim_codeattributes1; if _slim_codeattributes1 == true; _buf << (" href"); else; _buf << (" href=\""); _buf << (_slim_codeattributes1); _buf << ("\""); end; end; _temple_html_attributeremover1 = []; _slim_codeattributes2 = role; if Array === _slim_codeattributes2; _slim_codeattributes2 = _slim_codeattributes2.flatten; _slim_codeattributes2.map!(&:to_s); _slim_codeattributes2.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes2.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes2); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover1); _buf << ("\""); end; _buf << (">"); _buf << (xref_text); 
       ; _buf << ("</a>"); when :ref; 
-      ; 
-      ; _buf << ("<a"); _slim_codeattributes2 = (id || target); if _slim_codeattributes2; if _slim_codeattributes2 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes2); _buf << ("\""); end; end; _buf << (" aria-hidden=\"true\"></a>"); 
+      ; _buf << ("<a"); _slim_codeattributes3 = id; if _slim_codeattributes3; if _slim_codeattributes3 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes3); _buf << ("\""); end; end; _buf << (" aria-hidden=\"true\"></a>"); 
       ; when :bibref; 
-      ; 
-      ; _buf << ("<a"); _slim_codeattributes3 = (id || target); if _slim_codeattributes3; if _slim_codeattributes3 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes3); _buf << ("\""); end; end; _buf << (" aria-hidden=\"true\"></a>"); 
+      ; _buf << ("<a"); _slim_codeattributes4 = id; if _slim_codeattributes4; if _slim_codeattributes4 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes4); _buf << ("\""); end; end; _buf << (" aria-hidden=\"true\"></a>"); 
       ; _buf << (bibref_text); 
       ; else; 
-      ; _buf << ("<a"); _slim_codeattributes4 = id; if _slim_codeattributes4; if _slim_codeattributes4 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes4); _buf << ("\""); end; end; _temple_html_attributeremover1 = []; _slim_codeattributes5 = role; if Array === _slim_codeattributes5; _slim_codeattributes5 = _slim_codeattributes5.flatten; _slim_codeattributes5.map!(&:to_s); _slim_codeattributes5.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes5.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes5); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover1); _buf << ("\""); end; _slim_codeattributes6 = target; if _slim_codeattributes6; if _slim_codeattributes6 == true; _buf << (" href"); else; _buf << (" href=\""); _buf << (_slim_codeattributes6); _buf << ("\""); end; end; _slim_codeattributes7 = (attr :window); if _slim_codeattributes7; if _slim_codeattributes7 == true; _buf << (" target"); else; _buf << (" target=\""); _buf << (_slim_codeattributes7); _buf << ("\""); end; end; _slim_codeattributes8 = link_rel; if _slim_codeattributes8; if _slim_codeattributes8 == true; _buf << (" rel"); else; _buf << (" rel=\""); _buf << (_slim_codeattributes8); _buf << ("\""); end; end; _slim_codeattributes9 = (attr :title); if _slim_codeattributes9; if _slim_codeattributes9 == true; _buf << (" title"); else; _buf << (" title=\""); _buf << (_slim_codeattributes9); _buf << ("\""); end; end; _buf << (">"); _buf << (text); 
+      ; _buf << ("<a"); _slim_codeattributes5 = id; if _slim_codeattributes5; if _slim_codeattributes5 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes5); _buf << ("\""); end; end; _temple_html_attributeremover2 = []; _slim_codeattributes6 = role; if Array === _slim_codeattributes6; _slim_codeattributes6 = _slim_codeattributes6.flatten; _slim_codeattributes6.map!(&:to_s); _slim_codeattributes6.reject!(&:empty?); _temple_html_attributeremover2 << (_slim_codeattributes6.join(" ")); else; _temple_html_attributeremover2 << (_slim_codeattributes6); end; _temple_html_attributeremover2 = _temple_html_attributeremover2.join(""); if !_temple_html_attributeremover2.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover2); _buf << ("\""); end; _slim_codeattributes7 = target; if _slim_codeattributes7; if _slim_codeattributes7 == true; _buf << (" href"); else; _buf << (" href=\""); _buf << (_slim_codeattributes7); _buf << ("\""); end; end; _slim_codeattributes8 = (attr :window); if _slim_codeattributes8; if _slim_codeattributes8 == true; _buf << (" target"); else; _buf << (" target=\""); _buf << (_slim_codeattributes8); _buf << ("\""); end; end; _slim_codeattributes9 = link_rel; if _slim_codeattributes9; if _slim_codeattributes9 == true; _buf << (" rel"); else; _buf << (" rel=\""); _buf << (_slim_codeattributes9); _buf << ("\""); end; end; _slim_codeattributes10 = (attr :title); if _slim_codeattributes10; if _slim_codeattributes10 == true; _buf << (" title"); else; _buf << (" title=\""); _buf << (_slim_codeattributes10); _buf << ("\""); end; end; _buf << (">"); _buf << (text); 
       ; _buf << ("</a>"); end; _buf = _buf.join("")
     end
   end
@@ -1106,34 +1134,32 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def inline_quoted(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      _buf = []; unless id.nil?; 
-      ; _buf << ("<a"); _slim_codeattributes1 = id; if _slim_codeattributes1; if _slim_codeattributes1 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes1); _buf << ("\""); end; end; _buf << (" aria-hidden=\"true\"></a>"); 
-      ; end; case type; 
+      _buf = []; case type; 
       ; when :emphasis; 
-      ; _buf << ("<em"); _temple_html_attributeremover1 = []; _slim_codeattributes2 = role; if Array === _slim_codeattributes2; _slim_codeattributes2 = _slim_codeattributes2.flatten; _slim_codeattributes2.map!(&:to_s); _slim_codeattributes2.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes2.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes2); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover1); _buf << ("\""); end; _buf << (">"); _buf << (text); 
+      ; _buf << ("<em"); _slim_codeattributes1 = id; if _slim_codeattributes1; if _slim_codeattributes1 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes1); _buf << ("\""); end; end; _temple_html_attributeremover1 = []; _slim_codeattributes2 = role; if Array === _slim_codeattributes2; _slim_codeattributes2 = _slim_codeattributes2.flatten; _slim_codeattributes2.map!(&:to_s); _slim_codeattributes2.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes2.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes2); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover1); _buf << ("\""); end; _buf << (">"); _buf << (text); 
       ; _buf << ("</em>"); when :strong; 
-      ; _buf << ("<strong"); _temple_html_attributeremover2 = []; _slim_codeattributes3 = role; if Array === _slim_codeattributes3; _slim_codeattributes3 = _slim_codeattributes3.flatten; _slim_codeattributes3.map!(&:to_s); _slim_codeattributes3.reject!(&:empty?); _temple_html_attributeremover2 << (_slim_codeattributes3.join(" ")); else; _temple_html_attributeremover2 << (_slim_codeattributes3); end; _temple_html_attributeremover2 = _temple_html_attributeremover2.join(""); if !_temple_html_attributeremover2.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover2); _buf << ("\""); end; _buf << (">"); _buf << (text); 
+      ; _buf << ("<strong"); _slim_codeattributes3 = id; if _slim_codeattributes3; if _slim_codeattributes3 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes3); _buf << ("\""); end; end; _temple_html_attributeremover2 = []; _slim_codeattributes4 = role; if Array === _slim_codeattributes4; _slim_codeattributes4 = _slim_codeattributes4.flatten; _slim_codeattributes4.map!(&:to_s); _slim_codeattributes4.reject!(&:empty?); _temple_html_attributeremover2 << (_slim_codeattributes4.join(" ")); else; _temple_html_attributeremover2 << (_slim_codeattributes4); end; _temple_html_attributeremover2 = _temple_html_attributeremover2.join(""); if !_temple_html_attributeremover2.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover2); _buf << ("\""); end; _buf << (">"); _buf << (text); 
       ; _buf << ("</strong>"); when :monospaced; 
-      ; _buf << ("<code"); _temple_html_attributeremover3 = []; _slim_codeattributes4 = role; if Array === _slim_codeattributes4; _slim_codeattributes4 = _slim_codeattributes4.flatten; _slim_codeattributes4.map!(&:to_s); _slim_codeattributes4.reject!(&:empty?); _temple_html_attributeremover3 << (_slim_codeattributes4.join(" ")); else; _temple_html_attributeremover3 << (_slim_codeattributes4); end; _temple_html_attributeremover3 = _temple_html_attributeremover3.join(""); if !_temple_html_attributeremover3.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover3); _buf << ("\""); end; _buf << (">"); _buf << (text); 
+      ; _buf << ("<code"); _slim_codeattributes5 = id; if _slim_codeattributes5; if _slim_codeattributes5 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes5); _buf << ("\""); end; end; _temple_html_attributeremover3 = []; _slim_codeattributes6 = role; if Array === _slim_codeattributes6; _slim_codeattributes6 = _slim_codeattributes6.flatten; _slim_codeattributes6.map!(&:to_s); _slim_codeattributes6.reject!(&:empty?); _temple_html_attributeremover3 << (_slim_codeattributes6.join(" ")); else; _temple_html_attributeremover3 << (_slim_codeattributes6); end; _temple_html_attributeremover3 = _temple_html_attributeremover3.join(""); if !_temple_html_attributeremover3.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover3); _buf << ("\""); end; _buf << (">"); _buf << (text); 
       ; _buf << ("</code>"); when :superscript; 
-      ; _buf << ("<sup"); _temple_html_attributeremover4 = []; _slim_codeattributes5 = role; if Array === _slim_codeattributes5; _slim_codeattributes5 = _slim_codeattributes5.flatten; _slim_codeattributes5.map!(&:to_s); _slim_codeattributes5.reject!(&:empty?); _temple_html_attributeremover4 << (_slim_codeattributes5.join(" ")); else; _temple_html_attributeremover4 << (_slim_codeattributes5); end; _temple_html_attributeremover4 = _temple_html_attributeremover4.join(""); if !_temple_html_attributeremover4.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover4); _buf << ("\""); end; _buf << (">"); _buf << (text); 
+      ; _buf << ("<sup"); _slim_codeattributes7 = id; if _slim_codeattributes7; if _slim_codeattributes7 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes7); _buf << ("\""); end; end; _temple_html_attributeremover4 = []; _slim_codeattributes8 = role; if Array === _slim_codeattributes8; _slim_codeattributes8 = _slim_codeattributes8.flatten; _slim_codeattributes8.map!(&:to_s); _slim_codeattributes8.reject!(&:empty?); _temple_html_attributeremover4 << (_slim_codeattributes8.join(" ")); else; _temple_html_attributeremover4 << (_slim_codeattributes8); end; _temple_html_attributeremover4 = _temple_html_attributeremover4.join(""); if !_temple_html_attributeremover4.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover4); _buf << ("\""); end; _buf << (">"); _buf << (text); 
       ; _buf << ("</sup>"); when :subscript; 
-      ; _buf << ("<sub"); _temple_html_attributeremover5 = []; _slim_codeattributes6 = role; if Array === _slim_codeattributes6; _slim_codeattributes6 = _slim_codeattributes6.flatten; _slim_codeattributes6.map!(&:to_s); _slim_codeattributes6.reject!(&:empty?); _temple_html_attributeremover5 << (_slim_codeattributes6.join(" ")); else; _temple_html_attributeremover5 << (_slim_codeattributes6); end; _temple_html_attributeremover5 = _temple_html_attributeremover5.join(""); if !_temple_html_attributeremover5.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover5); _buf << ("\""); end; _buf << (">"); _buf << (text); 
+      ; _buf << ("<sub"); _slim_codeattributes9 = id; if _slim_codeattributes9; if _slim_codeattributes9 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes9); _buf << ("\""); end; end; _temple_html_attributeremover5 = []; _slim_codeattributes10 = role; if Array === _slim_codeattributes10; _slim_codeattributes10 = _slim_codeattributes10.flatten; _slim_codeattributes10.map!(&:to_s); _slim_codeattributes10.reject!(&:empty?); _temple_html_attributeremover5 << (_slim_codeattributes10.join(" ")); else; _temple_html_attributeremover5 << (_slim_codeattributes10); end; _temple_html_attributeremover5 = _temple_html_attributeremover5.join(""); if !_temple_html_attributeremover5.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover5); _buf << ("\""); end; _buf << (">"); _buf << (text); 
       ; _buf << ("</sub>"); when :mark; 
-      ; _buf << ("<mark"); _temple_html_attributeremover6 = []; _slim_codeattributes7 = role; if Array === _slim_codeattributes7; _slim_codeattributes7 = _slim_codeattributes7.flatten; _slim_codeattributes7.map!(&:to_s); _slim_codeattributes7.reject!(&:empty?); _temple_html_attributeremover6 << (_slim_codeattributes7.join(" ")); else; _temple_html_attributeremover6 << (_slim_codeattributes7); end; _temple_html_attributeremover6 = _temple_html_attributeremover6.join(""); if !_temple_html_attributeremover6.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover6); _buf << ("\""); end; _buf << (">"); _buf << (text); 
+      ; _buf << ("<mark"); _slim_codeattributes11 = id; if _slim_codeattributes11; if _slim_codeattributes11 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes11); _buf << ("\""); end; end; _temple_html_attributeremover6 = []; _slim_codeattributes12 = role; if Array === _slim_codeattributes12; _slim_codeattributes12 = _slim_codeattributes12.flatten; _slim_codeattributes12.map!(&:to_s); _slim_codeattributes12.reject!(&:empty?); _temple_html_attributeremover6 << (_slim_codeattributes12.join(" ")); else; _temple_html_attributeremover6 << (_slim_codeattributes12); end; _temple_html_attributeremover6 = _temple_html_attributeremover6.join(""); if !_temple_html_attributeremover6.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover6); _buf << ("\""); end; _buf << (">"); _buf << (text); 
       ; _buf << ("</mark>"); when :double; 
-      ; _slim_controls1 = html_tag_if role?, :span, :class=>role do; _slim_controls2 = []; 
+      ; _slim_controls1 = html_tag_if role? || id, :span, :id=>id, :class=>role do; _slim_controls2 = []; 
       ; _slim_controls2 << ((double_quoted text)); 
       ; _slim_controls2 = _slim_controls2.join(""); end; _buf << (_slim_controls1); when :single; 
-      ; _slim_controls3 = html_tag_if role?, :span, :class=>role do; _slim_controls4 = []; 
+      ; _slim_controls3 = html_tag_if role? || id, :span, :id=>id, :class=>role do; _slim_controls4 = []; 
       ; _slim_controls4 << ((single_quoted text)); 
       ; _slim_controls4 = _slim_controls4.join(""); end; _buf << (_slim_controls3); when :asciimath, :latexmath; 
-      ; _buf << ("<span class=\"math\""); _slim_codeattributes8 = stem_lang; if _slim_codeattributes8; if _slim_codeattributes8 == true; _buf << (" data-lang"); else; _buf << (" data-lang=\""); _buf << (_slim_codeattributes8); _buf << ("\""); end; end; _buf << (">"); _buf << ((delimit_stem text, type)); 
+      ; _buf << ("<span class=\"math\""); _slim_codeattributes13 = id; if _slim_codeattributes13; if _slim_codeattributes13 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes13); _buf << ("\""); end; end; _slim_codeattributes14 = stem_lang; if _slim_codeattributes14; if _slim_codeattributes14 == true; _buf << (" data-lang"); else; _buf << (" data-lang=\""); _buf << (_slim_codeattributes14); _buf << ("\""); end; end; _buf << (">"); _buf << ((delimit_stem text, type)); 
       ; _buf << ("</span>"); else; 
       ; if role == 'line-through' || role == 'del'; 
-      ; _buf << ("<del>"); _buf << (text); 
+      ; _buf << ("<del"); _slim_codeattributes15 = id; if _slim_codeattributes15; if _slim_codeattributes15 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes15); _buf << ("\""); end; end; _buf << (">"); _buf << (text); 
       ; _buf << ("</del>"); else; 
-      ; _slim_controls5 = html_tag_if role?, :span, :class=>role do; _slim_controls6 = []; 
+      ; _slim_controls5 = html_tag_if role? || id, :span, :id=>id, :class=>role do; _slim_controls6 = []; 
       ; _slim_controls6 << (text); 
       ; _slim_controls6 = _slim_controls6.join(""); end; _buf << (_slim_controls5); end; end; _buf = _buf.join("")
     end
@@ -1199,7 +1225,7 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def embedded(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      _buf = []; if !notitle && has_header?; 
+      _buf = []; if !notitle && header?; 
       ; _buf << ("<h1"); _slim_codeattributes1 = id; if _slim_codeattributes1; if _slim_codeattributes1 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes1); _buf << ("\""); end; end; _buf << (">"); _buf << (header.title); 
       ; _buf << ("</h1>"); end; if node.sections? && (attr? :toc) && (attr 'toc-placement', 'auto') == 'auto'; 
       ; _buf << ("<nav id=\"toc\""); _temple_html_attributeremover1 = []; _slim_codeattributes2 = (document.attr 'toc-class', 'toc'); if Array === _slim_codeattributes2; _slim_codeattributes2 = _slim_codeattributes2.flatten; _slim_codeattributes2.map!(&:to_s); _slim_codeattributes2.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes2.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes2); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover1); _buf << ("\""); end; _buf << (" role=\"doc-toc\"><h2 id=\"toc-title\">"); 
@@ -1229,10 +1255,14 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
     node.extend(Helpers)
     node.instance_eval do
       _buf = []; _buf << ("<!DOCTYPE html><html"); 
-      ; _slim_codeattributes1 = (attr :lang, 'en' unless attr? :nolang); if _slim_codeattributes1; if _slim_codeattributes1 == true; _buf << (" lang"); else; _buf << (" lang=\""); _buf << (_slim_codeattributes1); _buf << ("\""); end; end; _buf << ("><head><meta"); 
+      ; _slim_codeattributes1 = (attr :lang, 'en' unless attr? :nolang); if _slim_codeattributes1; if _slim_codeattributes1 == true; _buf << (" lang"); else; _buf << (" lang=\""); _buf << (_slim_codeattributes1); _buf << ("\""); end; end; _buf << (">"); 
+      ; 
+      ; 
       ; 
-      ; _slim_codeattributes2 = (attr :encoding, 'UTF-8'); if _slim_codeattributes2; if _slim_codeattributes2 == true; _buf << (" charset"); else; _buf << (" charset=\""); _buf << (_slim_codeattributes2); _buf << ("\""); end; end; _buf << ("><!--[if IE]><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\"><![endif]--><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><meta name=\"generator\" content=\"Asciidoctor "); 
       ; 
+      ; document_content = content; 
+      ; _buf << ("<head><meta"); 
+      ; _slim_codeattributes2 = (attr :encoding, 'UTF-8'); if _slim_codeattributes2; if _slim_codeattributes2 == true; _buf << (" charset"); else; _buf << (" charset=\""); _buf << (_slim_codeattributes2); _buf << ("\""); end; end; _buf << ("><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><meta name=\"generator\" content=\"Asciidoctor "); 
       ; 
       ; 
       ; _buf << (attr 'asciidoctor-version'); _buf << ("\">"); 
@@ -1248,10 +1278,14 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
       ; end; _buf << ("</head><body"); 
       ; 
       ; 
-      ; _slim_codeattributes3 = id; if _slim_codeattributes3; if _slim_codeattributes3 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes3); _buf << ("\""); end; end; _temple_html_attributeremover1 = []; _slim_codeattributes4 = [(attr :doctype), ("#{attr 'toc-class'} toc-#{attr 'toc-position', 'left'}" if (attr? 'toc-class') && (attr? :toc) && (attr? 'toc-placement', 'auto'))]; if Array === _slim_codeattributes4; _slim_codeattributes4 = _slim_codeattributes4.flatten; _slim_codeattributes4.map!(&:to_s); _slim_codeattributes4.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes4.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes4); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover1); _buf << ("\""); end; _slim_codeattributes5 = style_value(max_width: (attr 'max-width')); if _slim_codeattributes5; if _slim_codeattributes5 == true; _buf << (" style"); else; _buf << (" style=\""); _buf << (_slim_codeattributes5); _buf << ("\""); end; end; _buf << (">"); 
-      ; unless noheader; 
+      ; _slim_codeattributes3 = id; if _slim_codeattributes3; if _slim_codeattributes3 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes3); _buf << ("\""); end; end; _temple_html_attributeremover1 = []; _slim_codeattributes4 = [(attr :doctype),
+      ("#{attr 'toc-class'} toc-#{attr 'toc-position', 'left'}" if (attr? 'toc-class') && (attr? :toc) && (attr? 'toc-placement', 'auto')),
+      (attr :docrole) || (attr :role)]; if Array === _slim_codeattributes4; _slim_codeattributes4 = _slim_codeattributes4.flatten; _slim_codeattributes4.map!(&:to_s); _slim_codeattributes4.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes4.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes4); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover1); _buf << ("\""); end; _slim_codeattributes5 = style_value(max_width: (attr 'max-width')); if _slim_codeattributes5; if _slim_codeattributes5 == true; _buf << (" style"); else; _buf << (" style=\""); _buf << (_slim_codeattributes5); _buf << ("\""); end; end; _buf << (">"); 
+      ; unless (docinfo_content = (docinfo :header)).empty?; 
+      ; _buf << (docinfo_content); 
+      ; end; unless noheader; 
       ; _buf << ("<header>"); 
-      ; if has_header?; 
+      ; if header?; 
       ; unless notitle; 
       ; _buf << ("<h1>"); _buf << (header.title); 
       ; _buf << ("</h1>"); end; if [:author, :revnumber, :revdate, :revremark].any? {|a| attr? a }; 
@@ -1283,7 +1317,7 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
       ; _buf << (converter.convert document, 'outline'); 
       ; _buf << ("</nav>"); 
       ; end; 
-      ; _buf << ("</header>"); end; _buf << ("<div id=\"content\">"); _buf << (content); 
+      ; _buf << ("</header>"); end; _buf << ("<div id=\"content\">"); _buf << (document_content); 
       ; _buf << ("</div>"); unless !footnotes? || (attr? :nofootnotes); 
       ; _buf << ("<section class=\"footnotes\" aria-label=\"Footnotes\" role=\"doc-endnotes\"><hr><ol class=\"footnotes\">"); 
       ; 
@@ -1331,7 +1365,8 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
       ; 
       ; 
       ; 
-      ; _slim_controls2 << ("<video"); _slim_codeattributes6 = video_uri; if _slim_codeattributes6; if _slim_codeattributes6 == true; _slim_controls2 << (" src"); else; _slim_controls2 << (" src=\""); _slim_controls2 << (_slim_codeattributes6); _slim_controls2 << ("\""); end; end; _slim_codeattributes7 = (attr :width); if _slim_codeattributes7; if _slim_codeattributes7 == true; _slim_controls2 << (" width"); else; _slim_controls2 << (" width=\""); _slim_controls2 << (_slim_codeattributes7); _slim_controls2 << ("\""); end; end; _slim_codeattributes8 = (attr :height); if _slim_codeattributes8; if _slim_codeattributes8 == true; _slim_controls2 << (" height"); else; _slim_controls2 << (" height=\""); _slim_controls2 << (_slim_codeattributes8); _slim_controls2 << ("\""); end; end; _slim_codeattributes9 = (media_uri(attr :poster) if attr? :poster); if _slim_codeattributes9; if _slim_codeattributes9 == true; _slim_controls2 << (" poster"); else; _slim_controls2 << (" poster=\""); _slim_controls2 << (_slim_codeattributes9); _slim_controls2 << ("\""); end; end; _slim_codeattributes10 = (option? 'autoplay'); if _slim_codeattributes10; if _slim_codeattributes10 == true; _slim_controls2 << (" autoplay"); else; _slim_controls2 << (" autoplay=\""); _slim_controls2 << (_slim_codeattributes10); _slim_controls2 << ("\""); end; end; _slim_codeattributes11 = !(option? 'nocontrols'); if _slim_codeattributes11; if _slim_codeattributes11 == true; _slim_controls2 << (" controls"); else; _slim_controls2 << (" controls=\""); _slim_controls2 << (_slim_codeattributes11); _slim_controls2 << ("\""); end; end; _slim_codeattributes12 = (option? 'loop'); if _slim_codeattributes12; if _slim_codeattributes12 == true; _slim_controls2 << (" loop"); else; _slim_controls2 << (" loop=\""); _slim_controls2 << (_slim_codeattributes12); _slim_controls2 << ("\""); end; end; _slim_controls2 << (">Your browser does not support the video tag.</video>"); 
+      ; 
+      ; _slim_controls2 << ("<video"); _slim_codeattributes6 = video_uri; if _slim_codeattributes6; if _slim_codeattributes6 == true; _slim_controls2 << (" src"); else; _slim_controls2 << (" src=\""); _slim_controls2 << (_slim_codeattributes6); _slim_controls2 << ("\""); end; end; _slim_codeattributes7 = (attr :width); if _slim_codeattributes7; if _slim_codeattributes7 == true; _slim_controls2 << (" width"); else; _slim_controls2 << (" width=\""); _slim_controls2 << (_slim_codeattributes7); _slim_controls2 << ("\""); end; end; _slim_codeattributes8 = (attr :height); if _slim_codeattributes8; if _slim_codeattributes8 == true; _slim_controls2 << (" height"); else; _slim_controls2 << (" height=\""); _slim_controls2 << (_slim_codeattributes8); _slim_controls2 << ("\""); end; end; _slim_codeattributes9 = (media_uri(attr :poster) if attr? :poster); if _slim_codeattributes9; if _slim_codeattributes9 == true; _slim_controls2 << (" poster"); else; _slim_controls2 << (" poster=\""); _slim_controls2 << (_slim_codeattributes9); _slim_controls2 << ("\""); end; end; _slim_codeattributes10 = (option? 'autoplay'); if _slim_codeattributes10; if _slim_codeattributes10 == true; _slim_controls2 << (" autoplay"); else; _slim_controls2 << (" autoplay=\""); _slim_controls2 << (_slim_codeattributes10); _slim_controls2 << ("\""); end; end; _slim_codeattributes11 = (option? 'muted'); if _slim_codeattributes11; if _slim_codeattributes11 == true; _slim_controls2 << (" muted"); else; _slim_controls2 << (" muted=\""); _slim_controls2 << (_slim_codeattributes11); _slim_controls2 << ("\""); end; end; _slim_codeattributes12 = !(option? 'nocontrols'); if _slim_codeattributes12; if _slim_codeattributes12 == true; _slim_controls2 << (" controls"); else; _slim_controls2 << (" controls=\""); _slim_controls2 << (_slim_codeattributes12); _slim_controls2 << ("\""); end; end; _slim_codeattributes13 = (option? 'loop'); if _slim_codeattributes13; if _slim_codeattributes13 == true; _slim_controls2 << (" loop"); else; _slim_controls2 << (" loop=\""); _slim_controls2 << (_slim_codeattributes13); _slim_controls2 << ("\""); end; end; _slim_controls2 << (">Your browser does not support the video tag.</video>"); 
       ; 
       ; end; _slim_controls2 = _slim_controls2.join(""); end; _buf << (_slim_controls1); _buf = _buf.join("")
     end
@@ -1345,11 +1380,11 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
       ; _slim_controls2 << ("<ul"); _temple_html_attributeremover1 = []; _slim_codeattributes1 = (checklist || style); if Array === _slim_codeattributes1; _slim_codeattributes1 = _slim_codeattributes1.flatten; _slim_codeattributes1.map!(&:to_s); _slim_codeattributes1.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes1.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes1); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _slim_controls2 << (" class=\""); _slim_controls2 << (_temple_html_attributeremover1); _slim_controls2 << ("\""); end; _slim_controls2 << (">"); 
       ; items.each do |item|; 
       ; if checklist && (item.attr? :checkbox); 
-      ; _slim_controls2 << ("<li class=\"task-list-item\"><input class=\"task-list-item-checkbox\" type=\"checkbox\" disabled"); 
-      ; _slim_codeattributes2 = (item.attr? :checked); if _slim_codeattributes2; if _slim_codeattributes2 == true; _slim_controls2 << (" checked"); else; _slim_controls2 << (" checked=\""); _slim_controls2 << (_slim_codeattributes2); _slim_controls2 << ("\""); end; end; _slim_controls2 << ("> "); 
+      ; _slim_controls2 << ("<li"); _temple_html_attributeremover2 = []; _temple_html_attributemerger1 = []; _temple_html_attributemerger1[0] = "task-list-item"; _temple_html_attributemerger1[1] = []; _slim_codeattributes2 = item.role; if Array === _slim_codeattributes2; _slim_codeattributes2 = _slim_codeattributes2.flatten; _slim_codeattributes2.map!(&:to_s); _slim_codeattributes2.reject!(&:empty?); _temple_html_attributemerger1[1] << (_slim_codeattributes2.join(" ")); else; _temple_html_attributemerger1[1] << (_slim_codeattributes2); end; _temple_html_attributemerger1[1] = _temple_html_attributemerger1[1].join(""); _temple_html_attributeremover2 << (_temple_html_attributemerger1.reject(&:empty?).join(" ")); _temple_html_attributeremover2 = _temple_html_attributeremover2.join(""); if !_temple_html_attributeremover2.empty?; _slim_controls2 << (" class=\""); _slim_controls2 << (_temple_html_attributeremover2); _slim_controls2 << ("\""); end; _slim_codeattributes3 = item.id; if _slim_codeattributes3; if _slim_codeattributes3 == true; _slim_controls2 << (" id"); else; _slim_controls2 << (" id=\""); _slim_controls2 << (_slim_codeattributes3); _slim_controls2 << ("\""); end; end; _slim_controls2 << ("><input class=\"task-list-item-checkbox\" type=\"checkbox\" disabled"); 
+      ; _slim_codeattributes4 = (item.attr? :checked); if _slim_codeattributes4; if _slim_codeattributes4 == true; _slim_controls2 << (" checked"); else; _slim_controls2 << (" checked=\""); _slim_controls2 << (_slim_codeattributes4); _slim_controls2 << ("\""); end; end; _slim_controls2 << ("> "); 
       ; _slim_controls2 << (item.text); 
       ; _slim_controls2 << ("</li>"); else; 
-      ; _slim_controls2 << ("<li>"); 
+      ; _slim_controls2 << ("<li"); _slim_codeattributes5 = item.id; if _slim_codeattributes5; if _slim_codeattributes5 == true; _slim_controls2 << (" id"); else; _slim_controls2 << (" id=\""); _slim_controls2 << (_slim_codeattributes5); _slim_controls2 << ("\""); end; end; _temple_html_attributeremover3 = []; _slim_codeattributes6 = item.role; if Array === _slim_codeattributes6; _slim_codeattributes6 = _slim_codeattributes6.flatten; _slim_codeattributes6.map!(&:to_s); _slim_codeattributes6.reject!(&:empty?); _temple_html_attributeremover3 << (_slim_codeattributes6.join(" ")); else; _temple_html_attributeremover3 << (_slim_codeattributes6); end; _temple_html_attributeremover3 = _temple_html_attributeremover3.join(""); if !_temple_html_attributeremover3.empty?; _slim_controls2 << (" class=\""); _slim_controls2 << (_temple_html_attributeremover3); _slim_controls2 << ("\""); end; _slim_controls2 << (">"); 
       ; _slim_controls2 << ((print_item_content item)); 
       ; _slim_controls2 << ("</li>"); end; end; _slim_controls2 << ("</ul>"); _slim_controls2 = _slim_controls2.join(""); end; _buf << (_slim_controls1); _buf = _buf.join("")
     end
@@ -1442,7 +1477,7 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
       ; _buf << ("<ol class=\"toc-list level-"); _buf << (slevel); _buf << ("\">"); 
       ; sections.each do |sec|; 
       ; _buf << ("<li><a href=\"#"); 
-      ; _buf << (sec.id); _buf << ("\">"); _buf << (section_title sec); 
+      ; _buf << (sec.id); _buf << ("\">"); _buf << ((section_title sec, drop_anchors: true)); 
       ; _buf << ("</a>"); if (sec.level < toclevels) && (child_toc = converter.convert sec, 'outline'); 
       ; _buf << (child_toc); 
       ; end; _buf << ("</li>"); end; _buf << ("</ol>"); end; _buf = _buf.join("")
@@ -1452,10 +1487,18 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def example(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      _buf = []; _slim_controls1 = block_with_caption :top, :class=>'example-block' do; _slim_controls2 = []; 
+      _buf = []; if option? :collapsible; 
+      ; _buf << ("<details"); _slim_codeattributes1 = id; if _slim_codeattributes1; if _slim_codeattributes1 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes1); _buf << ("\""); end; end; _temple_html_attributeremover1 = []; _slim_codeattributes2 = role; if Array === _slim_codeattributes2; _slim_codeattributes2 = _slim_codeattributes2.flatten; _slim_codeattributes2.map!(&:to_s); _slim_codeattributes2.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes2.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes2); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover1); _buf << ("\""); end; _slim_codeattributes3 = (option? :open); if _slim_codeattributes3; if _slim_codeattributes3 == true; _buf << (" open"); else; _buf << (" open=\""); _buf << (_slim_codeattributes3); _buf << ("\""); end; end; _buf << (">"); 
+      ; if title; 
+      ; _buf << ("<summary>"); 
+      ; _buf << (title); 
+      ; _buf << ("</summary>"); end; _buf << ("<div class=\"content\">"); 
+      ; _buf << (content); 
+      ; _buf << ("</div></details>"); else; 
+      ; _slim_controls1 = block_with_caption :top, :class=>'example-block' do; _slim_controls2 = []; 
       ; _slim_controls2 << ("<div class=\"example\">"); 
       ; _slim_controls2 << (content); 
-      ; _slim_controls2 << ("</div>"); _slim_controls2 = _slim_controls2.join(""); end; _buf << (_slim_controls1); _buf = _buf.join("")
+      ; _slim_controls2 << ("</div>"); _slim_controls2 = _slim_controls2.join(""); end; _buf << (_slim_controls1); end; _buf = _buf.join("")
     end
   end