asciidoctor-epub3 1.5.0.alpha.13 → 1.5.0.alpha.18

data/lib/asciidoctor-epub3.rb

@@ -5,7 +5,6 @@ require 'asciidoctor/extensions'
 require 'gepub'
 require_relative 'asciidoctor-epub3/ext'
 require_relative 'asciidoctor-epub3/converter'
-require_relative 'asciidoctor-epub3/packager'
 
 # We need to be able to write files with unicode names. See https://github.com/asciidoctor/asciidoctor-epub3/issues/217
 ::Zip.unicode_names = true

data/lib/asciidoctor-epub3/converter.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'spine_item_processor'
+require 'mime/types'
+require 'open3'
 require_relative 'font_icon_map'
 
 module Asciidoctor
@@ -14,56 +15,45 @@ module Asciidoctor
 
       register_for 'epub3'
 
-      def initialize backend, opts
-        super
-        basebackend 'html'
-        outfilesuffix '.epub' # dummy outfilesuffix since it may be .mobi
-        htmlsyntax 'xml'
-        @validate = false
-        @extract = false
-        @kindlegen_path = nil
-        @epubcheck_path = nil
-      end
-
-      def convert node, name = nil
-        if (name ||= node.node_name) == 'document'
-          @validate = node.attr? 'ebook-validate'
-          @extract = node.attr? 'ebook-extract'
-          @compress = node.attr 'ebook-compress'
-          @kindlegen_path = node.attr 'ebook-kindlegen-path'
-          @epubcheck_path = node.attr 'ebook-epubcheck-path'
-          spine_items = node.references[:spine_items]
-          if spine_items.nil?
-            logger.error %(#{::File.basename node.document.attr('docfile')}: failed to find spine items, produced file will be invalid)
-            spine_items = []
+      def write output, target
+        epub_file = @format == :kf8 ? %(#{::Asciidoctor::Helpers.rootname target}-kf8.epub) : target
+        output.generate_epub epub_file
+        logger.debug %(Wrote #{@format.upcase} to #{epub_file})
+        if @extract
+          extract_dir = epub_file.sub EpubExtensionRx, ''
+          ::FileUtils.remove_dir extract_dir if ::File.directory? extract_dir
+          ::Dir.mkdir extract_dir
+          ::Dir.chdir extract_dir do
+            ::Zip::File.open epub_file do |entries|
+              entries.each do |entry|
+                next unless entry.file?
+                unless (entry_dir = ::File.dirname entry.name) == '.' || (::File.directory? entry_dir)
+                  ::FileUtils.mkdir_p entry_dir
+                end
+                entry.extract entry.name
+              end
+            end
           end
-          Packager.new node, spine_items, node.attributes['ebook-format'].to_sym
-          # converting an element from the spine document, such as an inline node in the doctitle
-        elsif name.start_with? 'inline_'
-          (@content_converter ||= ::Asciidoctor::Converter::Factory.default.create 'epub3-xhtml5').convert node, name
-        else
-          raise ::ArgumentError, %(Encountered unexpected node in epub3 package converter: #{name})
+          logger.debug %(Extracted #{@format.upcase} to #{extract_dir})
         end
-      end
 
-      # FIXME: we have to package in write because we don't have access to target before this point
-      def write packager, target
-        packager.package validate: @validate, extract: @extract, compress: @compress, kindlegen_path: @kindlegen_path, epubcheck_path: @epubcheck_path, target: target
-        nil
+        if @format == :kf8
+          # QUESTION shouldn't we validate this epub file too?
+          distill_epub_to_mobi epub_file, target, @compress, @kindlegen_path
+        elsif @validate
+          validate_epub epub_file, @epubcheck_path
+        end
       end
-    end
 
-    # Public: The converter for the epub3 backend that converts the individual
-    # content documents in an EPUB3 publication.
-    class ContentConverter
-      include ::Asciidoctor::Converter
-      include ::Asciidoctor::Logging
+      CsvDelimiterRx = /\s*,\s*/
 
-      register_for 'epub3-xhtml5'
+      DATA_DIR = ::File.expand_path ::File.join(__dir__, '..', '..', 'data')
+      ImageMacroRx = /^image::?(.*?)\[(.*?)\]$/
+      ImgSrcScanRx = /<img src="(.+?)"/
+      SvgImgSniffRx = /<img src=".+?\.svg"/
 
       LF = ?\n
       NoBreakSpace = '&#xa0;'
-      ThinNoBreakSpace = '&#x202f;'
       RightAngleQuote = '&#x203a;'
       CalloutStartNum = %(\u2460)
 
@@ -87,13 +77,27 @@ module Asciidoctor
 
       ToHtmlSpecialCharsRx = /[#{ToHtmlSpecialCharsMap.keys.join}]/
 
-      def initialize backend, opts
+      EpubExtensionRx = /\.epub$/i
+      KindlegenCompression = ::Hash['0', '-c0', '1', '-c1', '2', '-c2', 'none', '-c0', 'standard', '-c1', 'huffdic', '-c2']
+
+      (QUOTE_TAGS = {
+        monospaced: ['<code>', '</code>', true],
+        emphasis: ['<em>', '</em>', true],
+        strong: ['<strong>', '</strong>', true],
+        double: ['“', '”'],
+        single: ['‘', '’'],
+        mark: ['<mark>', '</mark>', true],
+        superscript: ['<sup>', '</sup>', true],
+        subscript: ['<sub>', '</sub>', true],
+        asciimath: ['<code>', '</code>', true],
+        latexmath: ['<code>', '</code>', true],
+      }).default = ['', '']
+
+      def initialize backend, opts = {}
         super
         basebackend 'html'
-        outfilesuffix '.xhtml'
+        outfilesuffix '.epub' # dummy outfilesuffix since it may be .mobi
         htmlsyntax 'xml'
-        @xrefs_seen = ::Set.new
-        @icon_names = []
       end
 
       def convert node, name = nil, _opts = {}
@@ -101,37 +105,257 @@ module Asciidoctor
         if respond_to? method_name
           send method_name, node
         else
-          logger.warn %(conversion missing in backend #{@backend} for #{name})
+          logger.warn %(#{::File.basename node.attr('docfile')}: conversion missing in backend #{@backend} for #{name})
+          nil
+        end
+      end
+
+      # See https://asciidoctor.org/docs/user-manual/#book-parts-and-chapters
+      def get_chapter_name node
+        if node.document.doctype != 'book'
+          return Asciidoctor::Document === node ? node.attr('docname') || node.id : nil
+        end
+        return (node.id || 'preamble') if node.context == :preamble && node.level == 0
+        chapter_level = [node.document.attr('epub-chapter-level', 1).to_i, 1].max
+        Asciidoctor::Section === node && node.level <= chapter_level ? node.id : nil
+      end
+
+      def get_numbered_title node
+        doc_attrs = node.document.attributes
+        level = node.level
+        if node.caption
+          title = node.captioned_title
+        elsif node.respond_to?(:numbered) && node.numbered && level <= (doc_attrs['sectnumlevels'] || 3).to_i
+          if level < 2 && node.document.doctype == 'book'
+            if node.sectname == 'chapter'
+              title = %(#{(signifier = doc_attrs['chapter-signifier']) ? "#{signifier} " : ''}#{node.sectnum} #{node.title})
+            elsif node.sectname == 'part'
+              title = %(#{(signifier = doc_attrs['part-signifier']) ? "#{signifier} " : ''}#{node.sectnum nil, ':'} #{node.title})
+            else
+              title = %(#{node.sectnum} #{node.title})
+            end
+          else
+            title = %(#{node.sectnum} #{node.title})
+          end
+        else
+          title = node.title
         end
+        title
       end
 
       def convert_document node
-        docid = node.id
-        pubtype = node.attr 'publication-type', 'book'
+        @format = node.attr('ebook-format').to_sym
+
+        @validate = node.attr? 'ebook-validate'
+        @extract = node.attr? 'ebook-extract'
+        @compress = node.attr 'ebook-compress'
+        @kindlegen_path = node.attr 'ebook-kindlegen-path'
+        @epubcheck_path = node.attr 'ebook-epubcheck-path'
+        @xrefs_seen = ::Set.new
+        @icon_names = []
+        @media_files = []
+        @footnotes = []
+
+        @book = GEPUB::Book.new 'EPUB/package.opf'
+        @book.epub_backward_compat = @format != :kf8
+        @book.language node.attr('lang', 'en'), id: 'pub-language'
+
+        if node.attr? 'uuid'
+          @book.primary_identifier node.attr('uuid'), 'pub-identifier', 'uuid'
+        else
+          @book.primary_identifier node.id, 'pub-identifier', 'uuid'
+        end
+        # replace with next line once the attributes argument is supported
+        #unique_identifier doc.id, 'pub-id', 'uuid', 'scheme' => 'xsd:string'
+
+        # NOTE we must use :plain_text here since gepub reencodes
+        @book.add_title sanitize_doctitle_xml(node, :plain_text), id: 'pub-title'
+
+        # see https://www.w3.org/publishing/epub3/epub-packages.html#sec-opf-dccreator
+        (1..(node.attr 'authorcount', 1).to_i).map do |idx|
+          author = node.attr(idx == 1 ? 'author' : %(author_#{idx}))
+          @book.add_creator author, role: 'aut' unless author.nil_or_empty?
+        end
+
+        publisher = node.attr 'publisher'
+        # NOTE Use producer as both publisher and producer if publisher isn't specified
+        publisher = node.attr 'producer' if publisher.nil_or_empty?
+        @book.publisher = publisher unless publisher.nil_or_empty?
+
+        if node.attr? 'reproducible'
+          # We need to set lastmodified to some fixed value. Otherwise, gepub will set it to current date.
+          @book.lastmodified = (::Time.at 0).utc
+          # Is it correct that we do not populate dc:date when 'reproducible' is set?
+        else
+          if node.attr? 'revdate'
+            begin
+              @book.date = node.attr 'revdate'
+            rescue ArgumentError => e
+              logger.error %(#{::File.basename node.attr('docfile')}: failed to parse revdate: #{e})
+              @book.date = node.attr 'docdatetime'
+            end
+          else
+            @book.date = node.attr 'docdatetime'
+          end
+          @book.lastmodified = node.attr 'localdatetime'
+        end
+
+        @book.description = node.attr 'description' if node.attr? 'description'
+        @book.source = node.attr 'source' if node.attr? 'source'
+        @book.rights = node.attr 'copyright' if node.attr? 'copyright'
+
+        (node.attr 'keywords', '').split(CsvDelimiterRx).each do |s|
+          @book.metadata.add_metadata 'subject', s
+        end
+
+        if node.attr? 'series-name'
+          series_name = node.attr 'series-name'
+          series_volume = node.attr 'series-volume', 1
+          series_id = node.attr 'series-id'
 
-        if (doctitle = node.doctitle partition: true, use_fallback: true).subtitle?
+          series_meta = @book.metadata.add_metadata 'meta', series_name, id: 'pub-collection', group_position: series_volume
+          series_meta['property'] = 'belongs-to-collection'
+          series_meta.refine 'dcterms:identifier', series_id unless series_id.nil?
+          # Calibre only understands 'series'
+          series_meta.refine 'collection-type', 'series'
+        end
+
+        # For list of supported landmark types see
+        # https://idpf.github.io/epub-vocabs/structure/
+        landmarks = []
+
+        cover_page = add_cover_page node
+        landmarks << { type: 'cover', href: cover_page.href, title: 'Cover' } unless cover_page.nil?
+
+        front_matter_page = add_front_matter_page node
+        landmarks << { type: 'frontmatter', href: front_matter_page.href, title: 'Front Matter' } unless front_matter_page.nil?
+
+        nav_item = @book.add_item('nav.xhtml', id: 'nav').nav
+
+        toclevels = [(node.attr 'toclevels', 1).to_i, 0].max
+        outlinelevels = [(node.attr 'outlinelevels', toclevels).to_i, 0].max
+
+        if node.attr? 'toc'
+          toc_item = @book.add_ordered_item 'toc.xhtml', id: 'toc'
+          landmarks << { type: 'toc', href: toc_item.href, title: node.attr('toc-title') }
+        else
+          toc_item = nil
+        end
+
+        if node.doctype == 'book'
+          toc_items = node.sections
+          node.content
+        else
+          toc_items = [node]
+          add_chapter node
+        end
+
+        landmarks << { type: 'bodymatter', href: %(#{get_chapter_name toc_items[0]}.xhtml), title: 'Start of Content' } unless toc_items.empty?
+
+        toc_items.each do |item|
+          landmarks << { type: item.style, href: %(#{get_chapter_name item}.xhtml), title: item.title } if %w(appendix bibliography glossary index preface).include? item.style
+        end
+
+        nav_item.add_content postprocess_xhtml(nav_doc(node, toc_items, landmarks, outlinelevels))
+        # User is not supposed to see landmarks, so pass empty array here
+        toc_item&.add_content postprocess_xhtml(nav_doc(node, toc_items, [], toclevels))
+
+        # NOTE gepub doesn't support building a ncx TOC with depth > 1, so do it ourselves
+        toc_ncx = ncx_doc node, toc_items, outlinelevels
+        @book.add_item 'toc.ncx', content: toc_ncx.to_ios, id: 'ncx'
+
+        docimagesdir = (node.attr 'imagesdir', '.').chomp '/'
+        docimagesdir = (docimagesdir == '.' ? nil : %(#{docimagesdir}/))
+
+        @media_files.each do |file|
+          if file[:name].start_with? %(#{docimagesdir}jacket/cover.)
+            logger.warn %(path is reserved for cover artwork: #{file[:name]}; skipping file found in content)
+          elsif file[:path].nil? || File.readable?(file[:path])
+            mime_types = MIME::Types.type_for file[:name]
+            mime_types.delete_if {|x| x.media_type != file[:media_type] }
+            preferred_mime_type = mime_types.empty? ? nil : mime_types[0].content_type
+            @book.add_item file[:name], content: file[:path], media_type: preferred_mime_type
+          else
+            logger.error %(#{File.basename node.attr('docfile')}: media file not found or not readable: #{file[:path]})
+          end
+        end
+
+        #add_metadata 'ibooks:specified-fonts', true
+
+        add_theme_assets node
+        if node.doctype != 'book'
+          usernames = [node].map {|item| item.attr 'username' }.compact.uniq
+          add_profile_images node, usernames
+        end
+
+        @book
+      end
+
+      # FIXME: move to Asciidoctor::Helpers
+      def sanitize_doctitle_xml doc, content_spec
+        doctitle = doc.doctitle use_fallback: true
+        sanitize_xml doctitle, content_spec
+      end
+
+      # FIXME: move to Asciidoctor::Helpers
+      def sanitize_xml content, content_spec
+        if content_spec != :pcdata && (content.include? '<')
+          if (content = (content.gsub XmlElementRx, '').strip).include? ' '
+            content = content.tr_s ' ', ' '
+          end
+        end
+
+        case content_spec
+        when :attribute_cdata
+          content = content.gsub '"', '&quot;' if content.include? '"'
+        when :cdata, :pcdata
+          # noop
+        when :plain_text
+          if content.include? ';'
+            content = content.gsub(CharEntityRx) { [$1.to_i].pack 'U*' } if content.include? '&#'
+            content = content.gsub FromHtmlSpecialCharsRx, FromHtmlSpecialCharsMap
+          end
+        else
+          raise ::ArgumentError, %(Unknown content spec: #{content_spec})
+        end
+        content
+      end
+
+      def add_chapter node
+        docid = get_chapter_name node
+        return nil if docid.nil?
+
+        chapter_item = @book.add_ordered_item %(#{docid}.xhtml)
+
+        doctitle = node.document.doctitle partition: true, use_fallback: true
+        doctitle_sanitized = sanitize_xml doctitle.combined, :cdata
+
+        if node.context == :document && doctitle.subtitle?
           title = %(#{doctitle.main} )
           subtitle = doctitle.subtitle
-        else
+        elsif node.title
           # HACK: until we get proper handling of title-only in CSS
           title = ''
-          subtitle = doctitle.combined
+          subtitle = get_numbered_title node
+          doctitle_sanitized = sanitize_xml subtitle, :cdata
+        else
+          title = nil
+          subtitle = nil
         end
 
-        doctitle_sanitized = (node.doctitle sanitize: true, use_fallback: true).to_s
-        subtitle_formatted = subtitle.split.map {|w| %(<b>#{w}</b>) } * ' '
-
-        if pubtype == 'book'
+        if node.document.doctype == 'book'
           byline = ''
         else
           author = node.attr 'author'
           username = node.attr 'username', 'default'
-          imagesdir = (node.references[:spine].attr 'imagesdir', '.').chomp '/'
+          imagesdir = (node.document.attr 'imagesdir', '.').chomp '/'
           imagesdir = imagesdir == '.' ? '' : %(#{imagesdir}/)
           byline = %(<p class="byline"><img src="#{imagesdir}avatars/#{username}.jpg"/> <b class="author">#{author}</b></p>#{LF})
         end
 
-        mark_last_paragraph node unless pubtype == 'book'
+        mark_last_paragraph node unless node.document.doctype == 'book'
+
+        @xrefs_seen.clear
         content = node.content
 
         # NOTE must run after content is resolved
@@ -140,7 +364,7 @@ module Asciidoctor
           icon_css_head = ''
         else
           icon_defs = @icon_names.map {|name|
-            %(.i-#{name}::before { content: "#{FontIconMap[name.tr('-', '_').to_sym]}"; })
+            %(.i-#{name}::before { content: "#{FontIconMap.unicode name}"; })
           } * LF
           icon_css_head = %(<style>
 #{icon_defs}
@@ -148,9 +372,19 @@ module Asciidoctor
 )
         end
 
+        header = (title || subtitle) ? %(<header>
+<div class="chapter-header">
+#{byline}<h1 class="chapter-title">#{title}#{subtitle ? %(<small class="subtitle">#{subtitle}</small>) : ''}</h1>
+</div>
+</header>) : ''
+
+        # We want highlighter CSS to be stored in a separate file
+        # in order to avoid style duplication across chapter files
+        linkcss = true
+
         # NOTE kindlegen seems to mangle the <header> element, so we wrap its content in a div
         lines = [%(<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="#{lang = node.attr 'lang', 'en'}" lang="#{lang}">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xmlns:mml="http://www.w3.org/1998/Math/MathML" xml:lang="#{lang = node.document.attr 'lang', 'en'}" lang="#{lang}">
 <head>
 <meta charset="UTF-8"/>
 <title>#{doctitle_sanitized}</title>
@@ -164,23 +398,25 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
   }
   document.body.setAttribute('class', reader.name.toLowerCase().replace(/ /g, '-'));
 });
-]]></script>
-</head>
+]]></script>)]
+
+        syntax_hl = node.document.syntax_highlighter
+        lines << (syntax_hl.docinfo :head, node, linkcss: linkcss, self_closing_tag_slash: '/') if syntax_hl&.docinfo? :head
+
+        lines << %(</head>
 <body>
-<section class="chapter" title="#{doctitle_sanitized.gsub '"', '&quot;'}" epub:type="chapter" id="#{docid}">
-<header>
-<div class="chapter-header">
-#{byline}<h1 class="chapter-title">#{title}#{subtitle ? %(<small class="subtitle">#{subtitle_formatted}</small>) : ''}</h1>
-</div>
-</header>
-#{content})]
+<section class="chapter" title="#{doctitle_sanitized}" epub:type="chapter" id="#{docid}">
+#{header}
+        #{content})
+
+        unless (fns = node.document.footnotes - @footnotes).empty?
+          @footnotes += fns
 
-        if node.footnotes?
           # NOTE kindlegen seems to mangle the <footer> element, so we wrap its content in a div
           lines << '<footer>
 <div class="chapter-footer">
 <div class="footnotes">'
-          node.footnotes.each do |footnote|
+          fns.each do |footnote|
             lines << %(<aside id="note-#{footnote.index}" epub:type="footnote">
 <p><sup class="noteref"><a href="#noteref-#{footnote.index}">#{footnote.index}</a></sup> #{footnote.text}</p>
 </aside>)
@@ -190,44 +426,53 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
 </footer>'
         end
 
-        lines << '</section>
-</body>
+        lines << '</section>'
+
+        lines << (syntax_hl.docinfo :footer, node.document, linkcss: linkcss, self_closing_tag_slash: '/') if syntax_hl&.docinfo? :footer
+
+        lines << '</body>
 </html>'
 
-        lines * LF
-      end
+        chapter_item.add_content postprocess_xhtml lines * LF
+        epub_properties = node.attr 'epub-properties'
+        chapter_item.add_property 'svg' if epub_properties&.include? 'svg'
 
-      # NOTE embedded is used for AsciiDoc table cell content
-      def convert_embedded node
-        node.content
+        # # QUESTION reenable?
+        # #linear 'yes' if i == 0
+
+        chapter_item
       end
 
       def convert_section node
-        hlevel = node.level + 1
-        epub_type_attr = node.special ? %( epub:type="#{node.sectname}") : ''
-        div_classes = [%(sect#{node.level}), node.role].compact
-        title = node.title
-        title_sanitized = xml_sanitize title
-        if node.document.header? || node.level != 1 || node != node.document.first_section
+        if add_chapter(node).nil?
+          hlevel = node.level
+          epub_type_attr = node.special ? %( epub:type="#{node.sectname}") : ''
+          div_classes = [%(sect#{node.level}), node.role].compact
+          title = get_numbered_title node
+          title_sanitized = xml_sanitize title
           %(<section class="#{div_classes * ' '}" title="#{title_sanitized}"#{epub_type_attr}>
 <h#{hlevel} id="#{node.id}">#{title}</h#{hlevel}>#{(content = node.content).empty? ? '' : %(
           #{content})}
 </section>)
-        else
-          # document has no level-0 heading and this heading serves as the document title
-          node.content
         end
       end
 
+      # NOTE embedded is used for AsciiDoc table cell content
+      def convert_embedded node
+        node.content
+      end
+
       # TODO: support use of quote block as abstract
       def convert_preamble node
-        if (first_block = node.blocks[0]) && first_block.style == 'abstract'
-          convert_abstract first_block
-          # REVIEW: should we treat the preamble as an abstract in general?
-        elsif first_block && node.blocks.size == 1
-          convert_abstract first_block
-        else
-          node.content
+        if add_chapter(node).nil?
+          if (first_block = node.blocks[0]) && first_block.style == 'abstract'
+            convert_abstract first_block
+            # REVIEW: should we treat the preamble as an abstract in general?
+          elsif first_block && node.blocks.size == 1
+            convert_abstract first_block
+          else
+            node.content
+          end
         end
       end
 
@@ -250,15 +495,16 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
       end
 
       def convert_paragraph node
+        id_attr = node.id ? %( id="#{node.id}") : ''
         role = node.role
         # stack-head is the alternative to the default, inline-head (where inline means "run-in")
         head_stop = node.attr 'head-stop', (role && (node.has_role? 'stack-head') ? nil : '.')
         head = node.title? ? %(<strong class="head">#{title = node.title}#{head_stop && title !~ TrailingPunctRx ? head_stop : ''}</strong> ) : ''
         if role
           node.set_option 'hardbreaks' if node.has_role? 'signature'
-          %(<p class="#{role}">#{head}#{node.content}</p>)
+          %(<p#{id_attr} class="#{role}">#{head}#{node.content}</p>)
         else
-          %(<p>#{head}#{node.content}</p>)
+          %(<p#{id_attr}>#{head}#{node.content}</p>)
         end
       end
 
@@ -292,6 +538,9 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
                       'note'
                     when 'important', 'warning', 'caution'
                       'warning'
+                    else
+                      logger.warn %(unknown admonition type: #{type})
+                      'note'
                     end
         %(<aside#{id_attr} class="admonition #{type}"#{title_attr} epub:type="#{epub_type}">
 #{title_el}<div class="content">
@@ -318,18 +567,56 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
       end
 
       def convert_listing node
+        nowrap = (node.option? 'nowrap') || !(node.document.attr? 'prewrap')
+        if node.style == 'source'
+          lang = node.attr 'language'
+          syntax_hl = node.document.syntax_highlighter
+          if syntax_hl
+            opts = syntax_hl.highlight? ? {
+              css_mode: ((doc_attrs = node.document.attributes)[%(#{syntax_hl.name}-css)] || :class).to_sym,
+              style: doc_attrs[%(#{syntax_hl.name}-style)],
+            } : {}
+            opts[:nowrap] = nowrap
+          else
+            pre_open = %(<pre class="highlight#{nowrap ? ' nowrap' : ''}"><code#{lang ? %( class="language-#{lang}" data-lang="#{lang}") : ''}>)
+            pre_close = '</code></pre>'
+          end
+        else
+          pre_open = %(<pre#{nowrap ? ' class="nowrap"' : ''}>)
+          pre_close = '</pre>'
+          syntax_hl = nil
+        end
         figure_classes = ['listing']
         figure_classes << 'coalesce' if node.option? 'unbreakable'
-        pre_classes = node.style == 'source' ? ['source', %(language-#{node.attr 'language'})] : ['screen']
-        title_div = node.title? ? %(<figcaption>#{node.captioned_title}</figcaption>
-) : ''
-        # patches conums to fix extra or missing leading space
-        # TODO remove patch once upgrading to Asciidoctor 1.5.6
-        %(<figure class="#{figure_classes * ' '}">
-#{title_div}<pre class="#{pre_classes * ' '}"><code>#{(node.content || '').gsub(/(?<! )<i class="conum"| +<i class="conum"/, ' <i class="conum"')}</code></pre>
+        title_div = node.title? ? %(<figcaption>#{node.captioned_title}</figcaption>) : ''
+        %(<figure class="#{figure_classes * ' '}">#{title_div}
+        #{syntax_hl ? (syntax_hl.format node, lang, opts) : pre_open + (node.content || '') + pre_close}
+</figure>)
+      end
+
+      def convert_stem node
+        return convert_listing node if node.style != 'asciimath' || !asciimath_available?
+
+        id_attr = node.id ? %( id="#{node.id}") : ''
+        title_element = node.title? ? %(<figcaption>#{node.captioned_title}</figcaption>) : ''
+        equation_data = AsciiMath.parse(node.content).to_mathml 'mml:'
+
+        %(<figure#{id_attr} class="#{prepend_space node.role}">
+#{title_element}
+<div class="content">
+#{equation_data}
+</div>
 </figure>)
       end
 
+      def asciimath_available?
+        (@asciimath_status ||= load_asciimath) == :loaded
+      end
+
+      def load_asciimath
+        Helpers.require_library('asciimath', true, :warn).nil? ? :unavailable : :loaded
+      end
+
       # QUESTION should we wrap the <pre> in either <div> or <figure>?
       def convert_literal node
         %(<pre class="screen">#{node.content}</pre>)
@@ -344,7 +631,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
       end
 
       def convert_quote node
-        id_attr = %( id="#{node.id}") if node.id
+        id_attr = node.id ? %( id="#{node.id}") : ''
         class_attr = (role = node.role) ? %( class="blockquote #{role}") : ' class="blockquote"'
 
         footer_content = []
@@ -370,7 +657,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
       end
 
       def convert_verse node
-        id_attr = %( id="#{node.id}") if node.id
+        id_attr = node.id ? %( id="#{node.id}") : ''
         class_attr = (role = node.role) ? %( class="verse #{role}") : ' class="verse"'
 
         footer_content = []
@@ -414,43 +701,38 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
         lines = [%(<div class="table">)]
         lines << %(<div class="content">)
         table_id_attr = node.id ? %( id="#{node.id}") : ''
-        frame_class = {
-          'all' => 'table-framed',
-          'topbot' => 'table-framed-topbot',
-          'sides' => 'table-framed-sides',
-          'none' => '',
-        }
-        grid_class = {
-          'all' => 'table-grid',
-          'rows' => 'table-grid-rows',
-          'cols' => 'table-grid-cols',
-          'none' => '',
-        }
-        table_classes = %W[table #{frame_class[node.attr 'frame'] || frame_class['topbot']} #{grid_class[node.attr 'grid'] || grid_class['rows']}]
+        table_classes = [
+          'table',
+          %(table-framed-#{node.attr 'frame', 'rows', 'table-frame'}),
+          %(table-grid-#{node.attr 'grid', 'rows', 'table-grid'}),
+        ]
         if (role = node.role)
           table_classes << role
         end
-        table_class_attr = %( class="#{table_classes * ' '}")
         table_styles = []
-        table_styles << %(width: #{node.attr 'tablepcwidth'}%) unless (node.option? 'autowidth') && !(node.attr? 'width', nil, false)
+        if (autowidth = node.option? 'autowidth') && !(node.attr? 'width')
+          table_classes << 'fit-content'
+        elsif (tablewidth = node.attr 'tablepcwidth') == 100
+          table_classes << 'stretch'
+        else
+          table_styles << %(width: #{tablewidth}%;)
+        end
+        table_class_attr = %( class="#{table_classes * ' '}")
         table_style_attr = !table_styles.empty? ? %( style="#{table_styles * '; '}") : ''
 
         lines << %(<table#{table_id_attr}#{table_class_attr}#{table_style_attr}>)
         lines << %(<caption>#{node.captioned_title}</caption>) if node.title?
         if (node.attr 'rowcount') > 0
           lines << '<colgroup>'
-          #if node.option? 'autowidth'
-          tag = %(<col/>)
-          node.columns.size.times do
-            lines << tag
-          end
-          #else
-          #  node.columns.each do |col|
-          #    lines << %(<col style="width: #{col.attr 'colpcwidth'}%"/>)
-          #  end
-          #end
+          if autowidth
+            lines += (Array.new node.columns.size, %(<col/>))
+          else
+            node.columns.each do |col|
+              lines << ((col.option? 'autowidth') ? %(<col/>) : %(<col style="width: #{col.attr 'colpcwidth'}%;" />))
+            end
+          end
           lines << '</colgroup>'
-          [:head, :foot, :body].reject {|tsec| node.rows[tsec].empty? }.each do |tsec|
+          [:head, :body, :foot].reject {|tsec| node.rows[tsec].empty? }.each do |tsec|
             lines << %(<t#{tsec}>)
             node.rows[tsec].each do |row|
               lines << '<tr>'
@@ -468,19 +750,16 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
                   else
                     cell_content = ''
                     cell.content.each do |text|
-                      cell_content = %(#{cell_content}<p>#{text}</p>)
+                      cell_content = %(#{cell_content}<p class="tableblock">#{text}</p>)
                     end
                   end
                 end
 
                 cell_tag_name = tsec == :head || cell.style == :header ? 'th' : 'td'
-                cell_classes = []
-                if (halign = cell.attr 'halign') && halign != 'left'
-                  cell_classes << 'halign-left'
-                end
-                if (halign = cell.attr 'valign') && halign != 'top'
-                  cell_classes << 'valign-top'
-                end
+                cell_classes = [
+                  "halign-#{cell.attr 'halign'}",
+                  "valign-#{cell.attr 'valign'}",
+                ]
                 cell_class_attr = !cell_classes.empty? ? %( class="#{cell_classes * ' '}") : ''
                 cell_colspan_attr = cell.colspan ? %( colspan="#{cell.colspan}") : ''
                 cell_rowspan_attr = cell.rowspan ? %( rowspan="#{cell.rowspan}") : ''
@@ -513,16 +792,30 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
       # TODO: add complex class if list has nested blocks
       def convert_dlist node
         lines = []
+        id_attribute = node.id ? %( id="#{node.id}") : ''
+
+        classes = case node.style
+                  when 'horizontal'
+                    ['hdlist', node.role]
+                  when 'itemized', 'ordered'
+                    # QUESTION should we just use itemized-list and ordered-list as the class here? or just list?
+                    ['dlist', %(#{node.style}-list), node.role]
+                  else
+                    ['description-list']
+                  end.compact
+
+        class_attribute = %( class="#{classes.join ' '}")
+
+        lines << %(<div#{id_attribute}#{class_attribute}>)
+        lines << %(<div class="title">#{node.title}</div>) if node.title?
+
         case (style = node.style)
         when 'itemized', 'ordered'
           list_tag_name = style == 'itemized' ? 'ul' : 'ol'
           role = node.role
           subject_stop = node.attr 'subject-stop', (role && (node.has_role? 'stack') ? nil : ':')
-          # QUESTION should we just use itemized-list and ordered-list as the class here? or just list?
-          div_classes = [%(#{style}-list), role].compact
           list_class_attr = (node.option? 'brief') ? ' class="brief"' : ''
-          lines << %(<div class="#{div_classes * ' '}">
-<#{list_tag_name}#{list_class_attr}#{list_tag_name == 'ol' && (node.option? 'reversed') ? ' reversed="reversed"' : ''}>)
+          lines << %(<#{list_tag_name}#{list_class_attr}#{list_tag_name == 'ol' && (node.option? 'reversed') ? ' reversed="reversed"' : ''}>)
           node.items.each do |subjects, dd|
             # consists of one term (a subject) and supporting content
             subject = [*subjects].first.text
@@ -538,11 +831,40 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
             end
             lines << '</li>'
           end
-          lines << %(</#{list_tag_name}>
-</div>)
+          lines << %(</#{list_tag_name}>)
+        when 'horizontal'
+          lines << '<table>'
+          if (node.attr? 'labelwidth') || (node.attr? 'itemwidth')
+            lines << '<colgroup>'
+            col_style_attribute = (node.attr? 'labelwidth') ? %( style="width: #{(node.attr 'labelwidth').chomp '%'}%;") : ''
+            lines << %(<col#{col_style_attribute} />)
+            col_style_attribute = (node.attr? 'itemwidth') ? %( style="width: #{(node.attr 'itemwidth').chomp '%'}%;") : ''
+            lines << %(<col#{col_style_attribute} />)
+            lines << '</colgroup>'
+          end
+          node.items.each do |terms, dd|
+            lines << '<tr>'
+            lines << %(<td class="hdlist1#{(node.option? 'strong') ? ' strong' : ''}">)
+            first_term = true
+            terms.each do |dt|
+              lines << %(<br />) unless first_term
+              lines << '<p>'
+              lines << dt.text
+              lines << '</p>'
+              first_term = nil
+            end
+            lines << '</td>'
+            lines << '<td class="hdlist2">'
+            if dd
+              lines << %(<p>#{dd.text}</p>) if dd.text?
+              lines << dd.content if dd.blocks?
+            end
+            lines << '</td>'
+            lines << '</tr>'
+          end
+          lines << '</table>'
         else
-          lines << '<div class="description-list">
-<dl>'
+          lines << '<dl>'
           node.items.each do |terms, dd|
             [*terms].each do |dt|
               lines << %(<dt>
@@ -559,9 +881,10 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
             end
             lines << '</dd>'
           end
-          lines << '</dl>
-</div>'
+          lines << '</dl>'
         end
+
+        lines << '</div>'
         lines * LF
       end
 
@@ -620,110 +943,200 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
         lines * LF
       end
 
-      def convert_image node
-        target = node.attr 'target'
-        type = (::File.extname target)[1..-1]
-        id_attr = node.id ? %( id="#{node.id}") : ''
-        img_attrs = [%(alt="#{node.attr 'alt'}")]
-        case type
-        when 'svg'
-          img_attrs << %(style="width: #{node.attr 'scaledwidth', '100%'}")
-          # TODO: make this a convenience method on document
-          epub_properties = (node.document.attributes['epub-properties'] ||= [])
+      def doc_option document, key
+        loop do
+          value = document.options[key]
+          return value unless value.nil?
+          document = document.parent_document
+          break if document.nil?
+        end
+        nil
+      end
+
+      def root_document document
+        document = document.parent_document until document.parent_document.nil?
+        document
+      end
+
+      def register_media_file node, target, media_type
+        if target.end_with?('.svg') || target.start_with?('data:image/svg+xml')
+          chapter = get_enclosing_chapter node
+          chapter.set_attr 'epub-properties', [] unless chapter.attr? 'epub-properties'
+          epub_properties = chapter.attr 'epub-properties'
           epub_properties << 'svg' unless epub_properties.include? 'svg'
+        end
+
+        if Asciidoctor::Helpers.uriish? target
+          # We need to add both local and remote media files to manifest
+          fs_path = nil
         else
-          img_attrs << %(style="width: #{node.attr 'scaledwidth'}") if node.attr? 'scaledwidth'
-        end
-=begin
-    # NOTE to set actual width and height, use CSS width and height
-    if type == 'svg'
-      if node.attr? 'scaledwidth'
-        img_attrs << %(width="#{node.attr 'scaledwidth'}")
-      # Kindle
-      #elsif node.attr? 'scaledheight'
-      #  img_attrs << %(width="#{node.attr 'scaledheight'}" height="#{node.attr 'scaledheight'}")
-      # ePub3
-      elsif node.attr? 'scaledheight'
-        img_attrs << %(height="#{node.attr 'scaledheight'}" style="max-height: #{node.attr 'scaledheight'} !important")
-      else
-        # Aldiko doesn't not scale width to 100% by default
-        img_attrs << %(width="100%")
+          out_dir = node.attr('outdir', nil, true) || doc_option(node.document, :to_dir)
+          fs_path = (::File.join out_dir, target)
+          unless ::File.exist? fs_path
+            base_dir = root_document(node.document).base_dir
+            fs_path = ::File.join base_dir, target
+          end
+        end
+        # We need *both* virtual and physical image paths. Unfortunately, references[:images] only has one of them.
+        @media_files << { name: target, path: fs_path, media_type: media_type }
       end
-    end
-=end
+
+      def resolve_image_attrs node
+        img_attrs = []
+        img_attrs << %(alt="#{node.attr 'alt'}") if node.attr? 'alt'
+
+        width = node.attr 'scaledwidth'
+        width = node.attr 'width' if width.nil?
+
+        # Unlike browsers, Calibre/Kindle *do* scale image if only height is specified
+        # So, in order to match browser behavior, we just always omit height
+        img_attrs << %(width="#{width}") unless width.nil?
+
+        img_attrs
+      end
+
+      def convert_audio node
+        id_attr = node.id ? %( id="#{node.id}") : ''
+        target = node.media_uri node.attr 'target'
+        register_media_file node, target, 'audio'
+        title_element = node.title? ? %(\n<figcaption>#{node.captioned_title}</figcaption>) : ''
+
+        autoplay_attr = (node.option? 'autoplay') ? ' autoplay="autoplay"' : ''
+        controls_attr = (node.option? 'nocontrols') ? '' : ' controls="controls"'
+        loop_attr = (node.option? 'loop') ? ' loop="loop"' : ''
+
+        start_t = node.attr 'start'
+        end_t = node.attr 'end'
+        if start_t || end_t
+          time_anchor = %(#t=#{start_t || ''}#{end_t ? ",#{end_t}" : ''})
+        else
+          time_anchor = ''
+        end
+
+        %(<figure#{id_attr} class="audioblock#{prepend_space node.role}">#{title_element}
+<div class="content">
+<audio src="#{target}#{time_anchor}"#{autoplay_attr}#{controls_attr}#{loop_attr}>
+<div>Your Reading System does not support (this) audio.</div>
+</audio>
+</div>
+</figure>)
+      end
+
+      # TODO: Support multiple video files in different formats for a single video
+      def convert_video node
+        id_attr = node.id ? %( id="#{node.id}") : ''
+        target = node.media_uri node.attr 'target'
+        register_media_file node, target, 'video'
+        title_element = node.title? ? %(\n<figcaption>#{node.captioned_title}</figcaption>) : ''
+
+        width_attr = (node.attr? 'width') ? %( width="#{node.attr 'width'}") : ''
+        height_attr = (node.attr? 'height') ? %( height="#{node.attr 'height'}") : ''
+        autoplay_attr = (node.option? 'autoplay') ? ' autoplay="autoplay"' : ''
+        controls_attr = (node.option? 'nocontrols') ? '' : ' controls="controls"'
+        loop_attr = (node.option? 'loop') ? ' loop="loop"' : ''
+
+        start_t = node.attr 'start'
+        end_t = node.attr 'end'
+        if start_t || end_t
+          time_anchor = %(#t=#{start_t || ''}#{end_t ? ",#{end_t}" : ''})
+        else
+          time_anchor = ''
+        end
+
+        if (poster = node.attr 'poster').nil_or_empty?
+          poster_attr = ''
+        else
+          poster = node.media_uri poster
+          register_media_file node, poster, 'image'
+          poster_attr = %( poster="#{poster}")
+        end
+
+        %(<figure#{id_attr} class="video#{prepend_space node.role}">#{title_element}
+<div class="content">
+<video src="#{target}#{time_anchor}"#{width_attr}#{height_attr}#{autoplay_attr}#{poster_attr}#{controls_attr}#{loop_attr}>
+<div>Your Reading System does not support (this) video.</div>
+</video>
+</div>
+</figure>)
+      end
+
+      def convert_image node
+        target = node.image_uri node.attr 'target'
+        register_media_file node, target, 'image'
+        id_attr = node.id ? %( id="#{node.id}") : ''
+        title_element = node.title? ? %(\n<figcaption>#{node.captioned_title}</figcaption>) : ''
+        img_attrs = resolve_image_attrs node
         %(<figure#{id_attr} class="image#{prepend_space node.role}">
 <div class="content">
-<img src="#{node.image_uri node.attr('target')}" #{img_attrs * ' '}/>
-</div>#{node.title? ? %(
-<figcaption>#{node.captioned_title}</figcaption>) : ''}
+<img src="#{target}"#{prepend_space img_attrs * ' '} />
+</div>#{title_element}
 </figure>)
       end
 
+      def get_enclosing_chapter node
+        loop do
+          return nil if node.nil?
+          return node unless get_chapter_name(node).nil?
+          node = node.parent
+        end
+      end
+
       def convert_inline_anchor node
-        target = node.target
         case node.type
-        when :xref # TODO: would be helpful to know what type the target is (e.g., bibref)
-          doc, refid, text, path = node.document, ((node.attr 'refid') || target), node.text, (node.attr 'path')
-          # NOTE if path is non-nil, we have an inter-document xref
-          # QUESTION should we drop the id attribute for an inter-document xref?
-          if path
-            # ex. chapter-id#section-id
-            if node.attr 'fragment'
-              refdoc_id, refdoc_refid = refid.split '#', 2
-              if refdoc_id == refdoc_refid
-                target = target[0...(target.index '#')]
-                id_attr = %( id="xref--#{refdoc_id}")
+        when :xref
+          doc, refid, target, text = node.document, node.attr('refid'), node.target, node.text
+          id_attr = ''
+
+          if (path = node.attributes['path'])
+            # NOTE non-nil path indicates this is an inter-document xref that's not included in current document
+            text = node.text || path
+          elsif refid == '#'
+            logger.warn %(#{::File.basename doc.attr('docfile')}: <<chapter#>> xref syntax isn't supported anymore. Use either <<chapter>> or <<chapter#anchor>>)
+          elsif refid
+            ref = doc.references[:refs][refid]
+            our_chapter = get_enclosing_chapter node
+            ref_chapter = get_enclosing_chapter ref
+            if ref_chapter
+              ref_docname = get_chapter_name ref_chapter
+              if ref_chapter == our_chapter
+                # ref within same chapter file
+                id_attr = %( id="xref-#{refid}")
+                target = %(##{refid})
+              elsif refid == ref_docname
+                # ref to top section of other chapter file
+                id_attr = %( id="xref--#{refid}")
+                target = %(#{refid}.xhtml)
               else
-                id_attr = %( id="xref--#{refdoc_id}--#{refdoc_refid}")
+                # ref to section within other chapter file
+                id_attr = %( id="xref--#{ref_docname}--#{refid}")
+                target = %(#{ref_docname}.xhtml##{refid})
               end
-              # ex. chapter-id#
-            else
-              refdoc_id = refdoc_refid = refid
-              # inflate key to spine item root (e.g., transform chapter-id to chapter-id#chapter-id)
-              refid = %(#{refid}##{refid})
-              id_attr = %( id="xref--#{refdoc_id}")
-            end
-            id_attr = '' unless @xrefs_seen.add? refid
-            refdoc = doc.references[:spine_items].find {|it| refdoc_id == (it.id || (it.attr 'docname')) }
-            if refdoc
-              if (refs = refdoc.references[:refs]) && ::Asciidoctor::AbstractNode === (ref = refs[refdoc_refid])
-                text ||= ::Asciidoctor::Document === ref ? ((ref.attr 'docreftext') || ref.doctitle) : ref.xreftext((@xrefstyle ||= (doc.attr 'xrefstyle')))
-              elsif (xreftext = refdoc.references[:ids][refdoc_refid])
-                text ||= xreftext
-              else
-                logger.warn %(#{::File.basename doc.attr('docfile')}: invalid reference to unknown anchor in #{refdoc_id} chapter: #{refdoc_refid})
-              end
-            else
-              logger.warn %(#{::File.basename doc.attr('docfile')}: invalid reference to anchor in unknown chapter: #{refdoc_id})
-            end
-          else
-            id_attr = (@xrefs_seen.add? refid) ? %( id="xref-#{refid}") : ''
-            if (refs = doc.references[:refs])
-              if ::Asciidoctor::AbstractNode === (ref = refs[refid])
-                xreftext = text || ref.xreftext((@xrefstyle ||= (doc.attr 'xrefstyle')))
-              end
-            else
-              xreftext = doc.references[:ids][refid]
-            end
 
-            if xreftext
-              text ||= xreftext
+              id_attr = '' unless @xrefs_seen.add? refid
+              text ||= (ref.xreftext node.attr('xrefstyle', nil, true))
             else
-              # FIXME: we get false negatives for reference to bibref when using Asciidoctor < 1.5.6
-              logger.warn %(#{::File.basename doc.attr('docfile')}: invalid reference to unknown local anchor (or valid bibref): #{refid})
+              logger.warn %(#{::File.basename doc.attr('docfile')}: invalid reference to unknown anchor: #{refid})
             end
           end
+
           %(<a#{id_attr} href="#{target}" class="xref">#{text || "[#{refid}]"}</a>)
         when :ref
-          %(<a id="#{target}"></a>)
+          # NOTE id is used instead of target starting in Asciidoctor 2.0.0
+          %(<a id="#{node.target || node.id}"></a>)
         when :link
-          %(<a href="#{target}" class="link">#{node.text}</a>)
+          %(<a href="#{node.target}" class="link">#{node.text}</a>)
         when :bibref
-          if @xrefs_seen.include? target
-            %(<a id="#{target}" href="#xref-#{target}">[#{target}]</a>)
+          # NOTE reftext is no longer enclosed in [] starting in Asciidoctor 2.0.0
+          # NOTE id is used instead of target starting in Asciidoctor 2.0.0
+          if (reftext = node.reftext)
+            reftext = %([#{reftext}]) unless reftext.start_with? '['
           else
-            %(<a id="#{target}"></a>[#{target}])
+            reftext = %([#{node.target || node.id}])
           end
+          %(<a id="#{node.target || node.id}"></a>#{reftext})
+        else
+          logger.warn %(unknown anchor type: #{node.type.inspect})
+          nil
         end
       end
 
@@ -761,16 +1174,11 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
           %(<i class="#{i_classes * ' '}"></i>)
         else
           target = node.image_uri node.target
-          img_attrs = [%(alt="#{node.attr 'alt'}"), %(class="inline#{node.role? ? " #{node.role}" : ''}")]
-          if target.end_with? '.svg'
-            img_attrs << %(style="width: #{node.attr 'scaledwidth', '100%'}")
-            # TODO: make this a convenience method on document
-            epub_properties = (node.document.attributes['epub-properties'] ||= [])
-            epub_properties << 'svg' unless epub_properties.include? 'svg'
-          elsif node.attr? 'scaledwidth'
-            img_attrs << %(style="width: #{node.attr 'scaledwidth'}")
-          end
-          %(<img src="#{target}" #{img_attrs * ' '}/>)
+          register_media_file node, target, 'image'
+
+          img_attrs = resolve_image_attrs node
+          img_attrs << %(class="inline#{prepend_space node.role}")
+          %(<img src="#{target}"#{prepend_space img_attrs * ' '}/>)
         end
       end
 
@@ -802,25 +1210,32 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
       end
 
       def convert_inline_quoted node
-        case node.type
-        when :strong
-          %(<strong>#{node.text}</strong>)
-        when :emphasis
-          %(<em>#{node.text}</em>)
-        when :monospaced
-          %(<code class="literal">#{node.text}</code>)
-        when :double
-          #%(&#x201c;#{node.text}&#x201d;)
-          %(“#{node.text}”)
-        when :single
-          #%(&#x2018;#{node.text}&#x2019;)
-          %(‘#{node.text}’)
-        when :superscript
-          %(<sup>#{node.text}</sup>)
-        when :subscript
-          %(<sub>#{node.text}</sub>)
-        else
-          node.text
+        open, close, tag = QUOTE_TAGS[node.type]
+
+        if node.type == :asciimath && asciimath_available?
+          content = AsciiMath.parse(node.text).to_mathml 'mml:'
+        else
+          content = node.text
+        end
+
+        node.add_role 'literal' if [:monospaced, :asciimath, :latexmath].include? node.type
+
+        if node.id
+          class_attr = class_string node
+          if tag
+            %(#{open.chop} id="#{node.id}"#{class_attr}>#{content}#{close})
+          else
+            %(<span id="#{node.id}"#{class_attr}>#{open}#{content}#{close}</span>)
+          end
+        elsif role_valid_class? node.role
+          class_attr = class_string node
+          if tag
+            %(#{open.chop}#{class_attr}>#{content}#{close})
+          else
+            %(<span#{class_attr}>#{open}#{content}#{close}</span>)
+          end
+        else
+          %(#{open}#{content}#{close})
         end
       end
 
@@ -854,6 +1269,481 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
       def prepend_space value
         value ? %( #{value}) : ''
       end
+
+      def add_theme_assets doc
+        format = @format
+        workdir = if doc.attr? 'epub3-stylesdir'
+                    stylesdir = doc.attr 'epub3-stylesdir'
+                    # FIXME: make this work for Windows paths!!
+                    if stylesdir.start_with? '/'
+                      stylesdir
+                    else
+                      docdir = doc.attr 'docdir', '.'
+                      docdir = '.' if docdir.empty?
+                      ::File.join docdir, stylesdir
+                    end
+                  else
+                    ::File.join DATA_DIR, 'styles'
+                  end
+
+        # TODO: improve design/UX of custom theme functionality, including custom fonts
+
+        if format == :kf8
+          # NOTE add layer of indirection so Kindle Direct Publishing (KDP) doesn't strip font-related CSS rules
+          @book.add_item 'styles/epub3.css', content: '@import url("epub3-proxied.css");'.to_ios
+          @book.add_item 'styles/epub3-css3-only.css', content: '@import url("epub3-css3-only-proxied.css");'.to_ios
+          @book.add_item 'styles/epub3-proxied.css', content: (postprocess_css_file ::File.join(workdir, 'epub3.css'), format)
+          @book.add_item 'styles/epub3-css3-only-proxied.css', content: (postprocess_css_file ::File.join(workdir, 'epub3-css3-only.css'), format)
+        else
+          @book.add_item 'styles/epub3.css', content: (postprocess_css_file ::File.join(workdir, 'epub3.css'), format)
+          @book.add_item 'styles/epub3-css3-only.css', content: (postprocess_css_file ::File.join(workdir, 'epub3-css3-only.css'), format)
+        end
+
+        syntax_hl = doc.syntax_highlighter
+        if syntax_hl&.write_stylesheet? doc
+          Dir.mktmpdir do |dir|
+            syntax_hl.write_stylesheet doc, dir
+            Pathname.glob(dir + '/**/*').map do |filename|
+              # Workaround for https://github.com/skoji/gepub/pull/117
+              filename.open do |f|
+                @book.add_item filename.basename.to_s, content: f
+              end if filename.file?
+            end
+          end
+        end
+
+        font_files, font_css = select_fonts ::File.join(DATA_DIR, 'styles/epub3-fonts.css'), (doc.attr 'scripts', 'latin')
+        @book.add_item 'styles/epub3-fonts.css', content: font_css
+        unless font_files.empty?
+          # NOTE metadata property in oepbs package manifest doesn't work; must use proprietary iBooks file instead
+          #(@book.metadata.add_metadata 'meta', 'true')['property'] = 'ibooks:specified-fonts' unless format == :kf8
+          @book.add_optional_file 'META-INF/com.apple.ibooks.display-options.xml', '<?xml version="1.0" encoding="UTF-8"?>
+<display_options>
+<platform name="*">
+<option name="specified-fonts">true</option>
+</platform>
+</display_options>'.to_ios unless format == :kf8
+
+          font_files.each do |font_file|
+            @book.add_item font_file, content: File.join(DATA_DIR, font_file)
+          end
+        end
+        nil
+      end
+
+      def add_cover_page doc
+        return nil if (image_path = doc.attr 'front-cover-image').nil?
+
+        imagesdir = (doc.attr 'imagesdir', '.').chomp '/'
+        imagesdir = (imagesdir == '.' ? '' : %(#{imagesdir}/))
+
+        image_attrs = {}
+        if (image_path.include? ':') && image_path =~ ImageMacroRx
+          logger.warn %(deprecated block macro syntax detected in front-cover-image attribute) if image_path.start_with? 'image::'
+          image_path = %(#{imagesdir}#{$1})
+          (::Asciidoctor::AttributeList.new $2).parse_into image_attrs, %w(alt width height) unless $2.empty?
+        end
+
+        image_href = %(#{imagesdir}jacket/cover#{::File.extname image_path})
+
+        workdir = doc.attr 'docdir'
+        workdir = '.' if workdir.nil_or_empty?
+
+        begin
+          @book.add_item(image_href, content: File.join(workdir, image_path)).cover_image
+        rescue => e
+          logger.error %(#{::File.basename doc.attr('docfile')}: error adding front cover image. Make sure that :front-cover-image: attribute points to a valid image file. #{e})
+          return nil
+        end
+
+        return nil if @format == :kf8
+
+        unless !image_attrs.empty? && (width = image_attrs['width']) && (height = image_attrs['height'])
+          width, height = 1050, 1600
+        end
+
+        # NOTE SVG wrapper maintains aspect ratio and confines image to view box
+        content = %(<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="en" lang="en">
+<head>
+<meta charset="UTF-8"/>
+<title>#{sanitize_doctitle_xml doc, :cdata}</title>
+<style type="text/css">
+@page {
+  margin: 0;
+}
+html {
+  margin: 0 !important;
+  padding: 0 !important;
+}
+body {
+  margin: 0;
+  padding: 0 !important;
+  text-align: center;
+}
+body > svg {
+  /* prevent bleed onto second page (removes descender space) */
+  display: block;
+}
+</style>
+</head>
+<body epub:type="cover"><svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+  width="100%" height="100%" viewBox="0 0 #{width} #{height}" preserveAspectRatio="xMidYMid meet">
+<image width="#{width}" height="#{height}" xlink:href="#{image_href}"/>
+</svg></body>
+</html>).to_ios
+
+        @book.add_ordered_item 'cover.xhtml', content: content, id: 'cover'
+      end
+
+      def get_frontmatter_files doc, workdir
+        if doc.attr? 'epub3-frontmatterdir'
+          fmdir = doc.attr 'epub3-frontmatterdir'
+          fmglob = 'front-matter.*\.html'
+          fm_path = File.join workdir, fmdir
+          unless Dir.exist? fm_path
+            logger.warn %(#{File.basename doc.attr('docfile')}: directory specified by 'epub3-frontmattderdir' doesn't exist! Ignoring ...)
+            return []
+          end
+          fms = Dir.entries(fm_path).delete_if {|x| !x.match fmglob }.sort.map {|y| File.join fm_path, y }
+          if fms && !fms.empty?
+            fms
+          else
+            logger.warn %(#{File.basename doc.attr('docfile')}: directory specified by 'epub3-frontmattderdir' contains no suitable files! Ignoring ...)
+            []
+          end
+        elsif File.exist? File.join workdir, 'front-matter.html'
+          [File.join(workdir, 'front-matter.html')]
+        else
+          []
+        end
+      end
+
+      def add_front_matter_page doc
+        workdir = doc.attr 'docdir'
+        workdir = '.' if workdir.nil_or_empty?
+
+        result = nil
+        get_frontmatter_files(doc, workdir).each do |front_matter|
+          front_matter_content = ::File.read front_matter
+
+          front_matter_file = File.basename front_matter, '.html'
+          item = @book.add_ordered_item "#{front_matter_file}.xhtml", content: (postprocess_xhtml front_matter_content)
+          item.add_property 'svg' if SvgImgSniffRx =~ front_matter_content
+          # Store link to first frontmatter page
+          result = item if result.nil?
+
+          front_matter_content.scan ImgSrcScanRx do
+            @book.add_item $1, content: File.join(File.dirname(front_matter), $1)
+          end
+        end
+
+        result
+      end
+
+      def add_profile_images doc, usernames
+        imagesdir = (doc.attr 'imagesdir', '.').chomp '/'
+        imagesdir = (imagesdir == '.' ? nil : %(#{imagesdir}/))
+
+        @book.add_item %(#{imagesdir}avatars/default.jpg), content: ::File.join(DATA_DIR, 'images/default-avatar.jpg')
+        @book.add_item %(#{imagesdir}headshots/default.jpg), content: ::File.join(DATA_DIR, 'images/default-headshot.jpg')
+
+        workdir = (workdir = doc.attr 'docdir').nil_or_empty? ? '.' : workdir
+
+        usernames.each do |username|
+          avatar = %(#{imagesdir}avatars/#{username}.jpg)
+          if ::File.readable? (resolved_avatar = (::File.join workdir, avatar))
+            @book.add_item avatar, content: resolved_avatar
+          else
+            logger.error %(avatar for #{username} not found or readable: #{avatar}; falling back to default avatar)
+            @book.add_item avatar, content: ::File.join(DATA_DIR, 'images/default-avatar.jpg')
+          end
+
+          headshot = %(#{imagesdir}headshots/#{username}.jpg)
+          if ::File.readable? (resolved_headshot = (::File.join workdir, headshot))
+            @book.add_item headshot, content: resolved_headshot
+          elsif doc.attr? 'builder', 'editions'
+            logger.error %(headshot for #{username} not found or readable: #{headshot}; falling back to default headshot)
+            @book.add_item headshot, content: ::File.join(DATA_DIR, 'images/default-headshot.jpg')
+          end
+        end
+        nil
+      end
+
+      def nav_doc doc, items, landmarks, depth
+        lines = [%(<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="#{lang = doc.attr 'lang', 'en'}" lang="#{lang}">
+<head>
+<meta charset="UTF-8"/>
+<title>#{sanitize_doctitle_xml doc, :cdata}</title>
+<link rel="stylesheet" type="text/css" href="styles/epub3.css"/>
+<link rel="stylesheet" type="text/css" href="styles/epub3-css3-only.css" media="(min-device-width: 0px)"/>
+</head>
+<body>
+<section class="chapter">
+<header>
+<div class="chapter-header"><h1 class="chapter-title"><small class="subtitle">#{doc.attr 'toc-title'}</small></h1></div>
+</header>
+<nav epub:type="toc" id="toc">)]
+        lines << (nav_level items, [depth, 0].max)
+        lines << '</nav>'
+
+        unless landmarks.empty?
+          lines << '
+<nav epub:type="landmarks" id="landmarks" hidden="hidden">
+<ol>'
+          landmarks.each do |landmark|
+            lines << %(<li><a epub:type="#{landmark[:type]}" href="#{landmark[:href]}">#{landmark[:title]}</a></li>)
+          end
+          lines << '
+</ol>
+</nav>'
+        end
+        lines << '
+</section>
+</body>
+</html>'
+        lines * LF
+      end
+
+      def nav_level items, depth, state = {}
+        lines = []
+        lines << '<ol>'
+        items.each do |item|
+          #index = (state[:index] = (state.fetch :index, 0) + 1)
+          if (chapter_name = get_chapter_name item).nil?
+            item_label = sanitize_xml get_numbered_title(item), :pcdata
+            item_href = %(#{state[:content_doc_href]}##{item.id})
+          else
+            # NOTE we sanitize the chapter titles because we use formatting to control layout
+            if item.context == :document
+              item_label = sanitize_doctitle_xml item, :cdata
+            else
+              item_label = sanitize_xml get_numbered_title(item), :cdata
+            end
+            item_href = (state[:content_doc_href] = %(#{chapter_name}.xhtml))
+          end
+          lines << %(<li><a href="#{item_href}">#{item_label}</a>)
+          if depth == 0 || (child_sections = item.sections).empty?
+            lines[-1] = %(#{lines[-1]}</li>)
+          else
+            lines << (nav_level child_sections, depth - 1, state)
+            lines << '</li>'
+          end
+          state.delete :content_doc_href unless chapter_name.nil?
+        end
+        lines << '</ol>'
+        lines * LF
+      end
+
+      def ncx_doc doc, items, depth
+        # TODO: populate docAuthor element based on unique authors in work
+        lines = [%(<?xml version="1.0" encoding="utf-8"?>
+<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1" xml:lang="#{doc.attr 'lang', 'en'}">
+<head>
+<meta name="dtb:uid" content="#{@book.identifier}"/>
+%{depth}
+<meta name="dtb:totalPageCount" content="0"/>
+<meta name="dtb:maxPageNumber" content="0"/>
+</head>
+<docTitle><text>#{sanitize_doctitle_xml doc, :cdata}</text></docTitle>
+<navMap>)]
+        lines << (ncx_level items, depth, state = {})
+        lines[0] = lines[0].sub '%{depth}', %(<meta name="dtb:depth" content="#{state[:max_depth]}"/>)
+        lines << %(</navMap>
+</ncx>)
+        lines * LF
+      end
+
+      def ncx_level items, depth, state = {}
+        lines = []
+        state[:max_depth] = (state.fetch :max_depth, 0) + 1
+        items.each do |item|
+          index = (state[:index] = (state.fetch :index, 0) + 1)
+          item_id = %(nav_#{index})
+          if (chapter_name = get_chapter_name item).nil?
+            item_label = sanitize_xml get_numbered_title(item), :cdata
+            item_href = %(#{state[:content_doc_href]}##{item.id})
+          else
+            if item.context == :document
+              item_label = sanitize_doctitle_xml item, :cdata
+            else
+              item_label = sanitize_xml get_numbered_title(item), :cdata
+            end
+            item_href = (state[:content_doc_href] = %(#{chapter_name}.xhtml))
+          end
+          lines << %(<navPoint id="#{item_id}" playOrder="#{index}">)
+          lines << %(<navLabel><text>#{item_label}</text></navLabel>)
+          lines << %(<content src="#{item_href}"/>)
+          unless depth == 0 || (child_sections = item.sections).empty?
+            lines << (ncx_level child_sections, depth - 1, state)
+          end
+          lines << %(</navPoint>)
+          state.delete :content_doc_href unless chapter_name.nil?
+        end
+        lines * LF
+      end
+
+      # Swap fonts in CSS based on the value of the document attribute 'scripts',
+      # then return the list of fonts as well as the font CSS.
+      def select_fonts filename, scripts = 'latin'
+        font_css = ::File.read filename
+        font_css = font_css.gsub(/(?<=-)latin(?=\.ttf\))/, scripts) unless scripts == 'latin'
+
+        # match CSS font urls in the forms of:
+        # src: url(../fonts/notoserif-regular-latin.ttf);
+        # src: url(../fonts/notoserif-regular-latin.ttf) format("truetype");
+        font_list = font_css.scan(/url\(\.\.\/([^)]+\.ttf)\)/).flatten
+
+        [font_list, font_css.to_ios]
+      end
+
+      def postprocess_css_file filename, format
+        return filename unless format == :kf8
+        postprocess_css ::File.read(filename), format
+      end
+
+      def postprocess_css content, format
+        return content.to_ios unless format == :kf8
+        # TODO: convert regular expressions to constants
+        content
+          .gsub(/^  -webkit-column-break-.*\n/, '')
+          .gsub(/^  max-width: .*\n/, '')
+          .to_ios
+      end
+
+      # NOTE Kindle requires that
+      #      <meta charset="utf-8"/>
+      #      be converted to
+      #      <meta http-equiv="Content-Type" content="application/xml+xhtml; charset=UTF-8"/>
+      def postprocess_xhtml content
+        return content.to_ios unless @format == :kf8
+        # TODO: convert regular expressions to constants
+        content
+          .gsub(/<meta charset="(.+?)"\/>/, '<meta http-equiv="Content-Type" content="application/xml+xhtml; charset=\1"/>')
+          .gsub(/<img([^>]+) style="width: (\d\d)%;"/, '<img\1 style="width: \2%; height: \2%;"')
+          .gsub(/<script type="text\/javascript">.*?<\/script>\n?/m, '')
+          .to_ios
+      end
+
+      def get_kindlegen_command kindlegen_path
+        unless kindlegen_path.nil?
+          logger.debug %(Using ebook-kindlegen-path attribute: #{kindlegen_path})
+          return [kindlegen_path]
+        end
+
+        unless (result = ENV['KINDLEGEN']).nil?
+          logger.debug %(Using KINDLEGEN env variable: #{result})
+          return [result]
+        end
+
+        begin
+          require 'kindlegen' unless defined? ::Kindlegen
+          result = ::Kindlegen.command.to_s
+          logger.debug %(Using KindleGen from gem: #{result})
+          [result]
+        rescue LoadError => e
+          logger.debug %(#{e}; Using KindleGen from PATH)
+          [%(kindlegen#{::Gem.win_platform? ? '.exe' : ''})]
+        end
+      end
+
+      def distill_epub_to_mobi epub_file, target, compress, kindlegen_path
+        mobi_file = ::File.basename target.sub(EpubExtensionRx, '.mobi')
+        compress_flag = KindlegenCompression[compress ? (compress.empty? ? '1' : compress.to_s) : '0']
+
+        argv = get_kindlegen_command(kindlegen_path) + ['-dont_append_source', compress_flag, '-o', mobi_file, epub_file].compact
+        begin
+          # This duplicates Kindlegen.run, but we want to override executable
+          out, err, res = Open3.capture3(*argv) do |r|
+            r.force_encoding 'UTF-8' if ::Gem.win_platform? && r.respond_to?(:force_encoding)
+          end
+        rescue Errno::ENOENT => e
+          raise 'Unable to run KindleGen. Either install the kindlegen gem or place `kindlegen` executable on PATH or set KINDLEGEN environment variable with path to it', cause: e
+        end
+
+        out.each_line do |line|
+          log_line line
+        end
+        err.each_line do |line|
+          log_line line
+        end
+
+        output_file = ::File.join ::File.dirname(epub_file), mobi_file
+        if res.success?
+          logger.debug %(Wrote MOBI to #{output_file})
+        else
+          logger.error %(KindleGen failed to write MOBI to #{output_file})
+        end
+      end
+
+      def get_epubcheck_command epubcheck_path
+        unless epubcheck_path.nil?
+          logger.debug %(Using ebook-epubcheck-path attribute: #{epubcheck_path})
+          return [epubcheck_path]
+        end
+
+        unless (result = ENV['EPUBCHECK']).nil?
+          logger.debug %(Using EPUBCHECK env variable: #{result})
+          return [result]
+        end
+
+        begin
+          result = ::Gem.bin_path 'epubcheck-ruby', 'epubcheck'
+          logger.debug %(Using EPUBCheck from gem: #{result})
+          [::Gem.ruby, result]
+        rescue ::Gem::Exception => e
+          logger.debug %(#{e}; Using EPUBCheck from PATH)
+          ['epubcheck']
+        end
+      end
+
+      def validate_epub epub_file, epubcheck_path
+        argv = get_epubcheck_command(epubcheck_path) + ['-w', epub_file]
+        begin
+          out, err, res = Open3.capture3(*argv)
+        rescue Errno::ENOENT => e
+          raise 'Unable to run EPUBCheck. Either install epubcheck-ruby gem or place `epubcheck` executable on PATH or set EPUBCHECK environment variable with path to it', cause: e
+        end
+
+        out.each_line do |line|
+          logger.info line
+        end
+        err.each_line do |line|
+          log_line line
+        end
+
+        logger.error %(EPUB validation failed: #{epub_file}) unless res.success?
+      end
+
+      def log_line line
+        line = line.strip
+
+        if line =~ /^fatal/i
+          logger.fatal line
+        elsif line =~ /^error/i
+          logger.error line
+        elsif line =~ /^warning/i
+          logger.warn line
+        else
+          logger.info line
+        end
+      end
+
+      private
+
+      def class_string node
+        role = node.role
+
+        return '' unless role_valid_class? role
+
+        %( class="#{role}")
+      end
+
+      # Handles asciidoctor 1.5.6 quirk when role can be parent
+      def role_valid_class? role
+        role.is_a? String
+      end
     end
 
     class DocumentIdGenerator
@@ -866,6 +1756,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
         InvalidIdCharsRx = /[^[:word:]]+/
         LeadingDigitRx = /^[[:digit:]]/
       end
+
       class << self
         def generate_id doc, pre = nil, sep = nil
           synthetic = false
@@ -914,19 +1805,22 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
       end
     end
 
-    require_relative 'packager'
-
     Extensions.register do
       if (document = @document).backend == 'epub3'
-        document.attributes['spine'] = ''
         document.set_attribute 'listing-caption', 'Listing'
-        # pygments.rb hangs on JRuby for Windows, see https://github.com/asciidoctor/asciidoctor-epub3/issues/253
-        if !(::RUBY_ENGINE == 'jruby' && Gem.win_platform?) && (Gem.try_activate 'pygments.rb')
-          if document.set_attribute 'source-highlighter', 'pygments'
-            document.set_attribute 'pygments-css', 'style'
-            document.set_attribute 'pygments-style', 'bw'
-          end
+
+        # TODO: bw theme for CodeRay
+        document.set_attribute 'pygments-style', 'bw' unless document.attr? 'pygments-style'
+        document.set_attribute 'rouge-style', 'bw' unless document.attr? 'rouge-style'
+
+        # Old asciidoctor versions do not have public API for writing highlighter CSS file
+        # So just use inline CSS there.
+        unless Document.supports_syntax_highlighter?
+          document.set_attribute 'coderay-css', 'style'
+          document.set_attribute 'pygments-css', 'style'
+          document.set_attribute 'rouge-css', 'style'
         end
+
         case (ebook_format = document.attributes['ebook-format'])
         when 'epub3', 'kf8'
           # all good
@@ -937,8 +1831,6 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
           ebook_format = document.attributes['ebook-format'] = 'epub3'
         end
         document.attributes[%(ebook-format-#{ebook_format})] = ''
-        # Only fire SpineItemProcessor for top-level include directives
-        include_processor SpineItemProcessor.new(document)
         treeprocessor do
           process do |doc|
             doc.id = DocumentIdGenerator.generate_id doc, (doc.attr 'idprefix'), (doc.attr 'idseparator')