asciidoctor-epub3 1.5.0.alpha.9 → 1.5.0.alpha.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8c660366a3ffa12ff1f0b2638413c240da220d07949a69493f4743c42287f5c
-  data.tar.gz: 229d4a8ea185962d0c9fb7563423905fad27c62a6a20a126e44aabb935da0c98
+  metadata.gz: db1c0f666f96e3a7506d02d7b2254b457f53357d8aec827e181260f34074cf4d
+  data.tar.gz: 39f647ab1aaa940bb0f71c7666e04d38ac6b239bc5e1c263149146d5b8b6dd68
 SHA512:
-  metadata.gz: 3c2c23900d2e5d2c08b16ccb2d0e80e62f3f3da8623a3cc84dae1d65620fd4ff64675124d8a08be2aa4da2c6043d7399e131e1a2a6b582b8d23ada23c4c598ad
-  data.tar.gz: 6097d5e1f9a1942bd8933b23c94b26cff099025345cf030296584d848ebbbaade4669c14bcf369ab07fd65a8ecba736d9bfded24cc2d62930501c0883ada6d7a
+  metadata.gz: 84708935a105312bf101367e9261460f19e827c3c5a5ea7ecfad8cad1dbd60554bc6e0772dfa6bef29ed9d40fc17ceafd718a32dab7d7b3e44a89f8cbccb4597
+  data.tar.gz: fe86150318b86702dda3a94da387f3f860e87b298629e85e9b953d17fd6ee969e6b48644b20d722e3fabe0af275e7e4460ed343d1d5e1628821e951f07c9ed11

data/.yardopts

@@ -1,12 +1,12 @@
 --charset UTF-8
 --readme README.adoc
+--no-private
 --hide-api private
---plugin tomdoc
---title "Asciidoctor EPUB3 API Documentation"
---output-dir rdoc
+--title "Asciidoctor EPUB3 API Docs"
+--output-dir apidoc
+--exclude /core_ext(?:\.rb$|/)
 lib/**/*.rb
 -
 CHANGELOG.adoc
-CONTRIBUTING.adoc
 LICENSE.adoc
 NOTICE.adoc

data/CHANGELOG.adoc

@@ -5,6 +5,19 @@
 This document provides a high-level view of the changes to the {project-name} by release.
 For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
 
+== 1.5.0.alpha.10 (2020-01-20) - @slonopotamus
+
+* fix deep xrefs between chapters when using Asciidoctor 2 (#210)
+* switch from epubcheck to epubcheck-ruby (#224)
+* set up a test suite (#11)
+* set up rubocop to enforce a consistent code style (#223)
+* use GitHub Actions for CI and release process (#218)
+* fix JS causing malformed XML that prevented footnotes from being displayed in Calibre (#207)
+* fix installing on Windows (#213, #216)
+* upgrade pygments.rb to 1.2.1 (#216)
+* gepub dependency is no longer locked to 1.0.2 and will use latest 1.0.x version
+* fix `-a ebook-validate` not working on Windows (#232)
+
 == 1.5.0.alpha.9 (2019-04-04) - @mojavelinux
 
 * allow converter to be used with Asciidoctor 2 (#185)

data/Gemfile

@@ -1,15 +1,18 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Look in asciidoctor-epub3.gemspec for runtime and development dependencies.
 gemspec
 
+gem 'asciidoctor', ENV['ASCIIDOCTOR_VERSION'], require: false if ENV.key? 'ASCIIDOCTOR_VERSION'
+
 group :optional do
-  gem 'epubcheck', '3.0.1'
-  if (ruby_version = Gem::Version.new RUBY_VERSION) < (Gem::Version.new '2.0.0')
-    gem 'kindlegen', '2.9.4'
-    gem 'pygments.rb', '0.6.3'
-  else
-    gem 'kindlegen', '3.0.3'
-    gem 'pygments.rb', '1.1.2'
-  end
+  gem 'epubcheck-ruby', '4.1.1.0'
+  gem 'kindlegen', (Gem::Version.new RUBY_VERSION) < (Gem::Version.new '2.4.0') ? '3.0.3' : '3.0.5'
+  gem 'pygments.rb', '1.2.1'
+end
+
+group :docs do
+  gem 'yard', require: false
 end

data/README.adoc

@@ -1,6 +1,6 @@
 = {project-name}: A _native_ EPUB3 converter for AsciiDoc
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v1.5.0.alpha.9, 2019-04-04
+v1.5.0.alpha.10, 2020-01-20
 // Settings:
 :experimental:
 :idprefix:
@@ -30,6 +30,7 @@ endif::[]
 :uri-gem: http://rubygems.org/gems/asciidoctor-epub3
 :uri-repo: {uri-project}
 :uri-issues: {uri-repo}/issues
+:uri-ci: {uri-repo}/actions?query=workflow%3ACI
 :uri-discuss: http://discuss.asciidoctor.org
 :uri-rvm: https://rvm.io
 :uri-asciidoctor: http://asciidoctor.org
@@ -50,6 +51,7 @@ endif::[]
 ifdef::status[]
 image:https://img.shields.io/gem/v/asciidoctor-epub3.svg[Latest Release,link={uri-gem}]
 image:https://img.shields.io/badge/license-MIT-blue.svg[MIT License,link=#copyright]
+image:{uri-repo}/workflows/CI/badge.svg[GitHub Actions,link={uri-ci}]
 endif::[]
 
 {project-name} is a set of Asciidoctor extensions for converting AsciiDoc documents directly to the EPUB3 and KF8/MOBI e-book formats.
@@ -249,7 +251,7 @@ However, for the time being, the include directive fills this role.
 
 == Prerequisites
 
-All that's needed to use {project-name} is Ruby (1.9.3 or above; 2.2.x recommended) and a few Ruby gems, which we'll explain how to install in the next section.
+All that's needed to use {project-name} is Ruby 2.3 or newer and a few Ruby gems, which we'll explain how to install in the next section.
 
 To check if you have Ruby available, use the `ruby` command to query the installed version:
 
@@ -467,10 +469,10 @@ Next, let's validate the EPUB3 archive to ensure it built correctly.
 .Validation success
 [.output]
 ....
-Epubcheck Version 3.0.1
-
-Validating against EPUB version 3.0
+Validating using EPUB version 3.0.1 rules.
 No errors or warnings detected.
+Messages: 0 fatal / 0 errors / 0 warnings / 0 info
+EPUBCheck completed
 ....
 
 If the EPUB3 archive contains any errors, they will be output in your terminal.
@@ -546,7 +548,7 @@ For more information about this attribute and other related attributes, see {uri
   Specifies the ebook format to generate (epub3 or kf8, default: epub3)
 
 *-a ebook-validate* ::
-  Runs Epubcheck 3.0.1 to validate output file against the EPUB3 specification
+  Runs {uri-epubcheck}[EpubCheck] to validate output file against the EPUB3 specification
 
 *-a ebook-compress=<0|1|2|none|standard|huffdic>* ::
   Controls the compression type used by kindlegen (0=none [default if unset], 1=standard [default if empty], 2=huffdic)

data/Rakefile

@@ -1,81 +1,5 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path '../lib/asciidoctor-epub3/version', __FILE__
+# frozen_string_literal: true
 
-require 'rake/clean'
-
-default_tasks = []
-
-begin
-  require 'bundler/gem_tasks'
-  default_tasks << :build
-
-  # Enhance the release task to create an explicit commit for the release
-  #Rake::Task[:release].enhance [:commit_release]
-
-  # NOTE you don't need to push after updating version and committing locally
-  # WARNING no longer works; it's now necessary to get master in a state ready for tagging
-  task :commit_release do
-    Bundler::GemHelper.new.send :guard_clean
-    sh %(git commit --allow-empty -a -m 'Release #{Asciidoctor::Epub3::VERSION}')
-  end
-rescue LoadError
-end
-
-begin
-  require 'rdoc/task'
-  Rake::RDocTask.new do |t|
-    t.rdoc_dir = 'rdoc'
-    t.title = %(Asciidoctor EPUB3 #{Asciidoctor::Epub3::VERSION})
-    t.main = %(README.adoc)
-    t.rdoc_files.include 'README.adoc', 'LICENSE.adoc', 'NOTICE.adoc', 'lib/**/*.rb', 'bin/**/*'
-  end
-rescue LoadError
-end
-
-=begin NOT CURRENTLY IN USE
-begin
-  require 'rake/testtask'
-  Rake::TestTask.new do |t|
-    t.libs << 'test'
-    t.pattern = 'test/**/*_test.rb'
-    t.verbose = true
-    t.warning = true
-    if RUBY_VERSION >= '2'
-      t.options = '--tty=no'
-    end
-  end
-  default_tasks << :test
-rescue LoadError
-end
-
-begin
-  require 'cucumber'
-  require 'cucumber/rake/task'
-  CUKE_RESULTS_FILE = 'feature-results.html'
-  ARUBA_TMP_DIR = 'tmp'
-  CLEAN << CUKE_RESULTS_FILE if File.file? CUKE_RESULTS_FILE
-  CLEAN << ARUBA_TMP_DIR if File.directory? ARUBA_TMP_DIR
-  desc 'Run features'
-  Cucumber::Rake::Task.new :features do |t|
-    opts = %(features --format html -o #{CUKE_RESULTS_FILE} --format progress -x --tags ~@pending)
-    opts = %(#{opts} --tags #{ENV['TAGS']}) if ENV['TAGS']
-    t.cucumber_opts = opts
-    t.fork = false
-  end
-
-  desc 'Run features tagged as work-in-progress (@wip)'
-  Cucumber::Rake::Task.new 'features:wip'  do |t|
-    #t.cucumber_opts = %(features --format html -o #{CUKE_RESULTS_FILE} --format pretty -x -s --tags @wip)
-    t.cucumber_opts = %(features --format html -o #{CUKE_RESULTS_FILE} --format progress -x --tags @wip)
-    t.fork = false
-  end
-
-  default_tasks << :features
-  task :cucumber => :features
-  task 'cucumber:wip' => 'features:wip'
-  task :wip => 'features:wip'
-rescue LoadError
-end
-=end
-
-task :default => default_tasks unless default_tasks.empty?
+$default_tasks = [] # rubocop:disable Style/GlobalVars
+Dir.glob('tasks/*.rake').each {|file| load file }
+task default: $default_tasks unless $default_tasks.empty? # rubocop:disable Style/GlobalVars

data/asciidoctor-epub3.gemspec

@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 require File.expand_path('lib/asciidoctor-epub3/version', File.dirname(__FILE__))
 require 'open3' unless defined? Open3
 
@@ -30,10 +31,13 @@ An extension for Asciidoctor that converts AsciiDoc documents to EPUB3 and KF8/M
 
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'rake', '~> 12.3.2'
+  s.add_development_dependency 'rake', '~> 12.3.0'
+  s.add_development_dependency 'rspec', '~> 3.9.0'
+  s.add_development_dependency 'rubocop', '~> 0.78.0'
+  s.add_development_dependency 'rubocop-rspec', '~> 1.37.0'
 
   s.add_runtime_dependency 'asciidoctor', '>= 1.5.0', '< 3.0.0'
-  s.add_runtime_dependency 'gepub', '~> 1.0.2'
-  s.add_runtime_dependency 'thread_safe', '~> 0.3.6'
-  s.add_runtime_dependency 'concurrent-ruby', '~> 1.1.5'
+  s.add_runtime_dependency 'concurrent-ruby', '~> 1.1.0'
+  s.add_runtime_dependency 'gepub', '~> 1.0.0'
+  s.add_runtime_dependency 'thread_safe', '~> 0.3.0'
 end

data/bin/adb-push-ebook

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 ADB = ENV['ADB'] || 'adb'
 TARGETS = {
   '.epub' => '/sdcard/',
-  '.mobi' => '/sdcard/Android/data/com.amazon.kindle/files/'
+  '.mobi' => '/sdcard/Android/data/com.amazon.kindle/files/',
 }
 
 unless ::File.executable? ADB
@@ -20,7 +21,7 @@ if (payload_file_ext = File.extname payload_file).empty?
   transfers = TARGETS.map do |(ext, target_dir)|
     {
       src: %(#{payload_file}#{ext}),
-      dest: target_dir
+      dest: target_dir,
     }
   end
 else
@@ -28,7 +29,7 @@ else
 end
 
 transfers.each do |transfer|
-  Open3.popen2e(Shellwords.join [ADB, 'push', transfer[:src], transfer[:dest]]) do |input, output, wait_thr|
+  Open3.popen2e Shellwords.join([ADB, 'push', transfer[:src], transfer[:dest]]) do |_input, output, _wait_thr|
     output.each {|line| puts line }
   end if File.file? transfer[:src]
 end

data/bin/asciidoctor-epub3

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-if File.exist?(asciidoctor_epub3 = (File.expand_path '../../lib/asciidoctor-epub3', __FILE__))
+if File.exist? asciidoctor_epub3 = (File.expand_path '../lib/asciidoctor-epub3', __dir__)
   require asciidoctor_epub3
 else
   require 'asciidoctor-epub3'
@@ -9,7 +10,7 @@ require 'asciidoctor/cli'
 
 options = Asciidoctor::Cli::Options.new backend: 'epub3'
 
-# FIXME provide an API in Asciidoctor for sub-components to print version information
+# FIXME: provide an API in Asciidoctor for sub-components to print version information
 unless ARGV != ['-v'] && (ARGV & ['-V', '--version']).empty?
   require_relative '../lib/asciidoctor-epub3/version'
   $stdout.write %(Asciidoctor EPUB3 #{Asciidoctor::Epub3::VERSION} using )
@@ -22,7 +23,7 @@ unless ARGV != ['-v'] && (ARGV & ['-V', '--version']).empty?
   exit 0
 end
 
-# FIXME This is a really bizarre API. Please make me simpler.
+# FIXME: This is a really bizarre API. Please make me simpler.
 case (result = options.parse! ARGV)
 when Integer
   exit result

data/lib/asciidoctor-epub3.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'asciidoctor'
 require 'asciidoctor/extensions'
 require 'gepub'

data/lib/asciidoctor-epub3/converter.rb

@@ -1,158 +1,158 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require_relative 'spine_item_processor'
 require_relative 'font_icon_map'
 
 module Asciidoctor
-module Epub3
-
-# Public: The main converter for the epub3 backend that handles packaging the
-# EPUB3 or KF8 publication file.
-class Converter
-  include ::Asciidoctor::Converter
-  include ::Asciidoctor::Writer
-
-  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
-  end
+  module Epub3
+    # Public: The main converter for the epub3 backend that handles packaging the
+    # EPUB3 or KF8 publication file.
+    class Converter
+      include ::Asciidoctor::Converter
+      include ::Asciidoctor::Writer
+
+      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
+      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'
-      Packager.new node, (node.references[:spine_items] || [node]), 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})
+      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'
+          Packager.new node, (node.references[:spine_items] || [node]), 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})
+        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, target: target
+        nil
+      end
     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, target: target
-    nil
-  end
-end
+    # Public: The converter for the epub3 backend that converts the individual
+    # content documents in an EPUB3 publication.
+    class ContentConverter
+      include ::Asciidoctor::Converter
 
-# Public: The converter for the epub3 backend that converts the individual
-# content documents in an EPUB3 publication.
-class ContentConverter
-  include ::Asciidoctor::Converter
+      register_for 'epub3-xhtml5'
 
-  register_for 'epub3-xhtml5'
+      LF = ?\n
+      NoBreakSpace = ' '
+      ThinNoBreakSpace = ' '
+      RightAngleQuote = '›'
+      CalloutStartNum = %(\u2460)
 
-  LF = ?\n
-  NoBreakSpace = ' '
-  ThinNoBreakSpace = ' '
-  RightAngleQuote = '›'
-  CalloutStartNum = %(\u2460)
+      CharEntityRx = /&#(\d{2,6});/
+      XmlElementRx = /<\/?.+?>/
+      TrailingPunctRx = /[[:punct:]]$/
 
-  CharEntityRx = /&#(\d{2,6});/
-  XmlElementRx = /<\/?.+?>/
-  TrailingPunctRx = /[[:punct:]]$/
+      FromHtmlSpecialCharsMap = {
+        '&lt;' => '<',
+        '&gt;' => '>',
+        '&amp;' => '&',
+      }
 
-  FromHtmlSpecialCharsMap = {
-    '&lt;' => '<',
-    '&gt;' => '>',
-    '&amp;' => '&'
-  }
+      FromHtmlSpecialCharsRx = /(?:#{FromHtmlSpecialCharsMap.keys * '|'})/
 
-  FromHtmlSpecialCharsRx = /(?:#{FromHtmlSpecialCharsMap.keys * '|'})/
+      ToHtmlSpecialCharsMap = {
+        '&' => '&amp;',
+        '<' => '&lt;',
+        '>' => '&gt;',
+      }
 
-  ToHtmlSpecialCharsMap = {
-    '&' => '&amp;',
-    '<' => '&lt;',
-    '>' => '&gt;'
-  }
+      ToHtmlSpecialCharsRx = /[#{ToHtmlSpecialCharsMap.keys.join}]/
 
-  ToHtmlSpecialCharsRx = /[#{ToHtmlSpecialCharsMap.keys.join}]/
+      OpenParagraphTagRx = /^<p>/
+      CloseParagraphTagRx = /<\/p>$/
 
-  OpenParagraphTagRx = /^<p>/
-  CloseParagraphTagRx = /<\/p>$/
+      def initialize backend, opts
+        super
+        basebackend 'html'
+        outfilesuffix '.xhtml'
+        htmlsyntax 'xml'
+        @xrefs_seen = ::Set.new
+        @icon_names = []
+      end
 
-  def initialize backend, opts
-    super
-    basebackend 'html'
-    outfilesuffix '.xhtml'
-    htmlsyntax 'xml'
-    @xrefs_seen = ::Set.new
-    @icon_names = []
-  end
+      def convert node, name = nil
+        if respond_to? name ||= node.node_name
+          send name, node
+        else
+          warn %(asciidoctor: WARNING: conversion missing in epub3 backend for #{name})
+        end
+      end
 
-  def convert node, name = nil
-    if respond_to?(name ||= node.node_name)
-      send name, node
-    else
-      warn %(asciidoctor: WARNING: conversion missing in epub3 backend for #{name})
-    end
-  end
+      def document node
+        docid = node.id
+        pubtype = node.attr 'publication-type', 'book'
 
-  def document node
-    docid = node.id
-    pubtype = node.attr 'publication-type', 'book'
-
-    if (doctitle = node.doctitle partition: true, use_fallback: true).subtitle?
-      title = %(#{doctitle.main} )
-      subtitle = doctitle.subtitle
-    else
-      # HACK until we get proper handling of title-only in CSS
-      title = ''
-      subtitle = doctitle.combined
-    end
+        if (doctitle = node.doctitle partition: true, use_fallback: true).subtitle?
+          title = %(#{doctitle.main} )
+          subtitle = doctitle.subtitle
+        else
+          # HACK: until we get proper handling of title-only in CSS
+          title = ''
+          subtitle = doctitle.combined
+        end
 
-    doctitle_sanitized = (node.doctitle sanitize: true, use_fallback: true).to_s
-    subtitle_formatted = subtitle.split.map {|w| %(<b>#{w}</b>) } * ' '
-
-    if pubtype == 'book'
-      byline = ''
-    else
-      author = node.attr 'author'
-      username = node.attr 'username', 'default'
-      imagesdir = (node.references[:spine].attr 'imagesdir', '.').chomp '/'
-      imagesdir = imagesdir == '.' ? '' : %(#{imagesdir}/)
-      byline = %(<p class="byline"><img src="#{imagesdir}avatars/#{username}.jpg"/> <b class="author">#{author}</b></p>#{LF})
-    end
+        doctitle_sanitized = (node.doctitle sanitize: true, use_fallback: true).to_s
+        subtitle_formatted = subtitle.split.map {|w| %(<b>#{w}</b>) } * ' '
 
-    mark_last_paragraph node unless pubtype == 'book'
-    content = node.content
-
-    # NOTE must run after content is resolved
-    # TODO perhaps create dynamic CSS file?
-    if @icon_names.empty?
-      icon_css_head = icon_css_scoped = ''
-    else
-      icon_defs = @icon_names.map {|name|
-        %(.i-#{name}::before { content: "#{FontIconMap[name.tr('-', '_').to_sym]}"; })
-      } * LF
-      icon_css_head = %(<style>
+        if pubtype == 'book'
+          byline = ''
+        else
+          author = node.attr 'author'
+          username = node.attr 'username', 'default'
+          imagesdir = (node.references[:spine].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'
+        content = node.content
+
+        # NOTE must run after content is resolved
+        # TODO perhaps create dynamic CSS file?
+        if @icon_names.empty?
+          icon_css_head = icon_css_scoped = ''
+        else
+          icon_defs = @icon_names.map {|name|
+            %(.i-#{name}::before { content: "#{FontIconMap[name.tr('-', '_').to_sym]}"; })
+          } * LF
+          icon_css_head = %(<style>
 #{icon_defs}
 </style>
 )
-      # NOTE Namo Pubtree requires icon CSS to be repeated inside <body> (or in a linked stylesheet); wrap in div to hide from Aldiko
-      icon_css_scoped = (node.attr? 'ebook-format', 'kf8') ? '' : %(<div style="display: none" aria-hidden="true"><style scoped="scoped">
+          # NOTE Namo Pubtree requires icon CSS to be repeated inside <body> (or in a linked stylesheet); wrap in div to hide from Aldiko
+          icon_css_scoped = (node.attr? 'ebook-format', 'kf8') ? '' : %(<div style="display: none" aria-hidden="true"><style scoped="scoped">
 #{icon_defs}
 </style></div>
 )
-    end
+        end
 
-    # 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}">
+        # 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}">
 <head>
 <meta charset="UTF-8"/>
 <title>#{doctitle_sanitized}</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)"/>
-#{icon_css_head}<script type="text/javascript">
+#{icon_css_head}<script type="text/javascript"><![CDATA[
 document.addEventListener('DOMContentLoaded', function(event, reader) {
   if (!(reader = navigator.epubReadingSystem)) {
     if (navigator.userAgent.indexOf(' calibre/') >= 0) reader = { name: 'calibre-desktop' };
@@ -160,485 +160,476 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
   }
   document.body.setAttribute('class', reader.name.toLowerCase().replace(/ /g, '-'));
 });
-</script>
+]]></script>
 </head>
 <body>
 <section class="chapter" title="#{doctitle_sanitized.gsub '"', '&quot;'}" epub:type="chapter" id="#{docid}">
 #{icon_css_scoped}<header>
 <div class="chapter-header">
-#{byline}<h1 class="chapter-title">#{title}#{subtitle ? %[<small class="subtitle">#{subtitle_formatted}</small>] : ''}</h1>
+#{byline}<h1 class="chapter-title">#{title}#{subtitle ? %(<small class="subtitle">#{subtitle_formatted}</small>) : ''}</h1>
 </div>
 </header>
 #{content})]
 
-    if node.footnotes?
-      # NOTE kindlegen seems to mangle the <footer> element, so we wrap its content in a div
-      lines << '<footer>
+        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|
-        lines << %(<aside id="note-#{footnote.index}" epub:type="footnote">
+          node.footnotes.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>)
-      end
-      lines << '</div>
+          end
+          lines << '</div>
 </div>
 </footer>'
-    end
+        end
 
-    lines << '</section>
+        lines << '</section>
 </body>
 </html>'
 
-    lines * LF
-  end
+        lines * LF
+      end
 
-  # NOTE embedded is used for AsciiDoc table cell content
-  def embedded node
-    node.content
-  end
+      # NOTE embedded is used for AsciiDoc table cell content
+      def embedded node
+        node.content
+      end
 
-  def 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
-      %(<section class="#{div_classes * ' '}" title="#{title_sanitized}"#{epub_type_attr}>
-<h#{hlevel} id="#{node.id}">#{title}</h#{hlevel}>#{(content = node.content).empty? ? '' : %[
-#{content}]}
+      def 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
+          %(<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
+        else
+          # document has no level-0 heading and this heading serves as the document title
+          node.content
+        end
+      end
 
-  # TODO support use of quote block as abstract
-  def preamble node
-    if (first_block = node.blocks[0]) && first_block.style == 'abstract'
-      abstract first_block
-    # REVIEW should we treat the preamble as an abstract in general?
-    elsif first_block && node.blocks.size == 1
-      abstract first_block
-    else
-      node.content
-    end
-  end
+      # TODO: support use of quote block as abstract
+      def preamble node
+        if (first_block = node.blocks[0]) && first_block.style == 'abstract'
+          abstract first_block
+          # REVIEW: should we treat the preamble as an abstract in general?
+        elsif first_block && node.blocks.size == 1
+          abstract first_block
+        else
+          node.content
+        end
+      end
 
-  def open node
-    id_attr = node.id ? %( id="#{node.id}") : nil
-    class_attr = node.role ? %( class="#{node.role}") : nil
-    if id_attr || class_attr
-      %(<div#{id_attr}#{class_attr}>
+      def open node
+        id_attr = node.id ? %( id="#{node.id}") : nil
+        class_attr = node.role ? %( class="#{node.role}") : nil
+        if id_attr || class_attr
+          %(<div#{id_attr}#{class_attr}>
 #{convert_content node}
 </div>)
-    else
-      convert_content node
-    end
-  end
+        else
+          convert_content node
+        end
+      end
 
-  def abstract node
-    %(<div class="abstract" epub:type="preamble">
+      def abstract node
+        %(<div class="abstract" epub:type="preamble">
 #{convert_content node}
 </div>)
-  end
+      end
 
-  def paragraph node
-    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>)
-    else
-      %(<p>#{head}#{node.content}</p>)
-    end
-  end
+      def paragraph node
+        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>)
+        else
+          %(<p>#{head}#{node.content}</p>)
+        end
+      end
 
-  def pass node
-    content = node.content
-    if content == '<?hard-pagebreak?>'
-      '<hr epub:type="pagebreak" class="pagebreak"/>'
-    else
-      content
-    end
-  end
+      def pass node
+        content = node.content
+        if content == '<?hard-pagebreak?>'
+          '<hr epub:type="pagebreak" class="pagebreak"/>'
+        else
+          content
+        end
+      end
 
-  def admonition node
-    id_attr = node.id ? %( id="#{node.id}") : ''
-    if node.title?
-      title = node.title
-      title_sanitized = xml_sanitize title
-      title_attr = %( title="#{node.caption}: #{title_sanitized}")
-      title_el = %(<h2>#{title}</h2>
+      def admonition node
+        id_attr = node.id ? %( id="#{node.id}") : ''
+        if node.title?
+          title = node.title
+          title_sanitized = xml_sanitize title
+          title_attr = %( title="#{node.caption}: #{title_sanitized}")
+          title_el = %(<h2>#{title}</h2>
 )
-    else
-      title_attr = %( title="#{node.caption}")
-      title_el = ''
-    end
+        else
+          title_attr = %( title="#{node.caption}")
+          title_el = ''
+        end
 
-    type = node.attr 'name'
-    epub_type = case type
-    when 'tip'
-      'help'
-    when 'note'
-      'note'
-    when 'important', 'warning', 'caution'
-      'warning'
-    end
-    %(<aside#{id_attr} class="admonition #{type}"#{title_attr} epub:type="#{epub_type}">
+        type = node.attr 'name'
+        epub_type = case type
+                    when 'tip'
+                      'help'
+                    when 'note'
+                      'note'
+                    when 'important', 'warning', 'caution'
+                      'warning'
+                    end
+        %(<aside#{id_attr} class="admonition #{type}"#{title_attr} epub:type="#{epub_type}">
 #{title_el}<div class="content">
 #{convert_content node}
 </div>
 </aside>)
-  end
+      end
 
-  def example node
-    id_attr = node.id ? %( id="#{node.id}") : ''
-    title_div = node.title? ? %(<div class="example-title">#{node.title}</div>
+      def example node
+        id_attr = node.id ? %( id="#{node.id}") : ''
+        title_div = node.title? ? %(<div class="example-title">#{node.title}</div>
 ) : ''
-    %(<div#{id_attr} class="example">
+        %(<div#{id_attr} class="example">
 #{title_div}<div class="example-content">
 #{convert_content node}
 </div>
 </div>)
-  end
+      end
 
-  def floating_title node
-    tag_name = %(h#{node.level + 1})
-    id_attribute = node.id ? %( id="#{node.id}") : ''
-    %(<#{tag_name}#{id_attribute} class="#{['discrete', node.role].compact * ' '}">#{node.title}</#{tag_name}>)
-  end
+      def floating_title node
+        tag_name = %(h#{node.level + 1})
+        id_attribute = node.id ? %( id="#{node.id}") : ''
+        %(<#{tag_name}#{id_attribute} class="#{['discrete', node.role].compact * ' '}">#{node.title}</#{tag_name}>)
+      end
 
-  def listing node
-    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>
+      def listing node
+        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 * ' '}">
+        # 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>
 </figure>)
-  end
+      end
 
-  # QUESTION should we wrap the <pre> in either <div> or <figure>?
-  def literal node
-    %(<pre class="screen">#{node.content}</pre>)
-  end
+      # QUESTION should we wrap the <pre> in either <div> or <figure>?
+      def literal node
+        %(<pre class="screen">#{node.content}</pre>)
+      end
 
-  def page_break node
-    '<hr epub:type="pagebreak" class="pagebreak"/>'
-  end
+      def page_break _node
+        '<hr epub:type="pagebreak" class="pagebreak"/>'
+      end
 
-  def thematic_break node
-    '<hr class="thematicbreak"/>'
-  end
+      def thematic_break _node
+        '<hr class="thematicbreak"/>'
+      end
 
-  def quote node
-    id_attr = %( id="#{node.id}") if node.id
-    class_attr = (role = node.role) ? %( class="blockquote #{role}") : ' class="blockquote"'
+      def quote node
+        id_attr = %( id="#{node.id}") if node.id
+        class_attr = (role = node.role) ? %( class="blockquote #{role}") : ' class="blockquote"'
 
-    footer_content = []
-    if (attribution = node.attr 'attribution')
-      footer_content << attribution
-    end
+        footer_content = []
+        if (attribution = node.attr 'attribution')
+          footer_content << attribution
+        end
 
-    if (citetitle = node.attr 'citetitle')
-      citetitle_sanitized = xml_sanitize citetitle
-      footer_content << %(<cite title="#{citetitle_sanitized}">#{citetitle}</cite>)
-    end
+        if (citetitle = node.attr 'citetitle')
+          citetitle_sanitized = xml_sanitize citetitle
+          footer_content << %(<cite title="#{citetitle_sanitized}">#{citetitle}</cite>)
+        end
 
-    if node.title?
-      footer_content << %(<span class="context">#{node.title}</span>)
-    end
+        footer_content << %(<span class="context">#{node.title}</span>) if node.title?
 
-    footer_tag = footer_content.empty? ? '' : %(
+        footer_tag = footer_content.empty? ? '' : %(
 <footer>~ #{footer_content * ' '}</footer>)
-    content = (convert_content node).strip.
-      sub(OpenParagraphTagRx, '<p><span class="open-quote">“</span>').
-      sub(CloseParagraphTagRx, '<span class="close-quote">”</span></p>')
-    %(<div#{id_attr}#{class_attr}>
+        content = ((convert_content node).strip.sub OpenParagraphTagRx, '<p><span class="open-quote">“</span>').sub CloseParagraphTagRx, '<span class="close-quote">”</span></p>'
+        %(<div#{id_attr}#{class_attr}>
 <blockquote>
 #{content}#{footer_tag}
 </blockquote>
 </div>)
-  end
+      end
 
-  def verse node
-    id_attr = %( id="#{node.id}") if node.id
-    class_attr = (role = node.role) ? %( class="verse #{role}") : ' class="verse"'
+      def verse node
+        id_attr = %( id="#{node.id}") if node.id
+        class_attr = (role = node.role) ? %( class="verse #{role}") : ' class="verse"'
 
-    footer_content = []
-    if (attribution = node.attr 'attribution')
-      footer_content << attribution
-    end
+        footer_content = []
+        if (attribution = node.attr 'attribution')
+          footer_content << attribution
+        end
 
-    if (citetitle = node.attr 'citetitle')
-      citetitle_sanitized = xml_sanitize citetitle
-      footer_content << %(<cite title="#{citetitle_sanitized}">#{citetitle}</cite>)
-    end
+        if (citetitle = node.attr 'citetitle')
+          citetitle_sanitized = xml_sanitize citetitle
+          footer_content << %(<cite title="#{citetitle_sanitized}">#{citetitle}</cite>)
+        end
 
-    footer_tag = footer_content.size > 0 ? %(
+        footer_tag = !footer_content.empty? ? %(
 <span class="attribution">~ #{footer_content * ', '}</span>) : ''
-    %(<div#{id_attr}#{class_attr}>
+        %(<div#{id_attr}#{class_attr}>
 <pre>#{node.content}#{footer_tag}</pre>
 </div>)
-  end
+      end
 
-  def sidebar node
-    classes = ['sidebar']
-    if node.title?
-      classes << 'titled'
-      title = node.title
-      title_sanitized = xml_sanitize title
-      title_attr = %( title="#{title_sanitized}")
-      title_el = %(<h2>#{title}</h2>
+      def sidebar node
+        classes = ['sidebar']
+        if node.title?
+          classes << 'titled'
+          title = node.title
+          title_sanitized = xml_sanitize title
+          title_attr = %( title="#{title_sanitized}")
+          title_el = %(<h2>#{title}</h2>
 )
-    else
-      title_attr = title_el = ''
-    end
+        else
+          title_attr = title_el = ''
+        end
 
-    %(<aside class="#{classes * ' '}"#{title_attr} epub:type="sidebar">
+        %(<aside class="#{classes * ' '}"#{title_attr} epub:type="sidebar">
 #{title_el}<div class="content">
 #{convert_content node}
 </div>
 </aside>)
-  end
+      end
 
-  def table node
-    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']})
-    if (role = node.role)
-      table_classes << role
-    end
-    table_class_attr = %( class="#{table_classes * ' '}")
-    table_styles = []
-    unless (node.option? 'autowidth') && !(node.attr? 'width', nil, false)
-      table_styles << %(width: #{node.attr 'tablepcwidth'}%)
-    end
-    table_style_attr = table_styles.size > 0 ? %( 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
-      lines << '</colgroup>'
-      [:head, :foot, :body].select {|tsec| !node.rows[tsec].empty? }.each do |tsec|
-        lines << %(<t#{tsec}>)
-        node.rows[tsec].each do |row|
-          lines << '<tr>'
-          row.each do |cell|
-            if tsec == :head
-              cell_content = cell.text
-            else
-              case cell.style
-              when :asciidoc
-                cell_content = %(<div class="embed">#{cell.content}</div>)
-              when :verse
-                cell_content = %(<div class="verse">#{cell.text}</div>)
-              when :literal
-                cell_content = %(<div class="literal"><pre>#{cell.text}</pre></div>)
-              else
-                cell_content = ''
-                cell.content.each do |text|
-                  cell_content = %(#{cell_content}<p>#{text}</p>)
+      def table node
+        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']}]
+        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)
+        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
+          lines << '</colgroup>'
+          [:head, :foot, :body].reject {|tsec| node.rows[tsec].empty? }.each do |tsec|
+            lines << %(<t#{tsec}>)
+            node.rows[tsec].each do |row|
+              lines << '<tr>'
+              row.each do |cell|
+                if tsec == :head
+                  cell_content = cell.text
+                else
+                  case cell.style
+                  when :asciidoc
+                    cell_content = %(<div class="embed">#{cell.content}</div>)
+                  when :verse
+                    cell_content = %(<div class="verse">#{cell.text}</div>)
+                  when :literal
+                    cell_content = %(<div class="literal"><pre>#{cell.text}</pre></div>)
+                  else
+                    cell_content = ''
+                    cell.content.each do |text|
+                      cell_content = %(#{cell_content}<p>#{text}</p>)
+                    end
+                  end
                 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'
+                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_class_attr = !cell_classes.empty? ? %( class="#{cell_classes * ' '}") : ''
+                cell_colspan_attr = cell.colspan ? %( colspan="#{cell.colspan}") : ''
+                cell_rowspan_attr = cell.rowspan ? %( rowspan="#{cell.rowspan}") : ''
+                cell_style_attr = (node.document.attr? 'cellbgcolor') ? %( style="background-color: #{node.document.attr 'cellbgcolor'}") : ''
+                lines << %(<#{cell_tag_name}#{cell_class_attr}#{cell_colspan_attr}#{cell_rowspan_attr}#{cell_style_attr}>#{cell_content}</#{cell_tag_name}>)
+              end
+              lines << '</tr>'
             end
-            cell_class_attr = cell_classes.size > 0 ? %( class="#{cell_classes * ' '}") : ''
-            cell_colspan_attr = cell.colspan ? %( colspan="#{cell.colspan}") : ''
-            cell_rowspan_attr = cell.rowspan ? %( rowspan="#{cell.rowspan}") : ''
-            cell_style_attr = (node.document.attr? 'cellbgcolor') ? %( style="background-color: #{node.document.attr 'cellbgcolor'}") : ''
-            lines << %(<#{cell_tag_name}#{cell_class_attr}#{cell_colspan_attr}#{cell_rowspan_attr}#{cell_style_attr}>#{cell_content}</#{cell_tag_name}>)
+            lines << %(</t#{tsec}>)
           end
-          lines << '</tr>'
         end
-        lines << %(</t#{tsec}>)
-      end
-    end
-    lines << '</table>
+        lines << '</table>
 </div>
 </div>'
-    lines * LF
-  end
+        lines * LF
+      end
 
-  def colist node
-    lines = ['<div class="callout-list">
+      def colist node
+        lines = ['<div class="callout-list">
 <ol>']
-    num = CalloutStartNum
-    node.items.each_with_index do |item, i|
-      lines << %(<li><i class="conum" data-value="#{i + 1}">#{num}</i> #{item.text}</li>)
-      num = num.next
-    end
-    lines << '</ol>
+        num = CalloutStartNum
+        node.items.each_with_index do |item, i|
+          lines << %(<li><i class="conum" data-value="#{i + 1}">#{num}</i> #{item.text}</li>)
+          num = num.next
+        end
+        lines << '</ol>
 </div>'
-  end
+      end
 
-  # TODO add complex class if list has nested blocks
-  def dlist node
-    lines = []
-    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 * ' '}">
+      # TODO: add complex class if list has nested blocks
+      def dlist node
+        lines = []
+        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"' : ''}>)
-      node.items.each do |subjects, dd|
-        # consists of one term (a subject) and supporting content
-        subject = [*subjects].first.text
-        subject_plain = xml_sanitize subject, :plain
-        subject_element = %(<strong class="subject">#{subject}#{subject_stop && subject_plain !~ TrailingPunctRx ? subject_stop : ''}</strong>)
-        lines << '<li>'
-        if dd
-          # NOTE: must wrap remaining text in a span to help webkit justify the text properly
-          lines << %(<span class="principal">#{subject_element}#{dd.text? ? %[ <span class="supporting">#{dd.text}</span>] : ''}</span>)
-          lines << dd.content if dd.blocks?
-        else
-          lines << %(<span class="principal">#{subject_element}</span>)
-        end
-        lines << '</li>'
-      end
-      lines << %(</#{list_tag_name}>
+          node.items.each do |subjects, dd|
+            # consists of one term (a subject) and supporting content
+            subject = [*subjects].first.text
+            subject_plain = xml_sanitize subject, :plain
+            subject_element = %(<strong class="subject">#{subject}#{subject_stop && subject_plain !~ TrailingPunctRx ? subject_stop : ''}</strong>)
+            lines << '<li>'
+            if dd
+              # NOTE: must wrap remaining text in a span to help webkit justify the text properly
+              lines << %(<span class="principal">#{subject_element}#{dd.text? ? %( <span class="supporting">#{dd.text}</span>) : ''}</span>)
+              lines << dd.content if dd.blocks?
+            else
+              lines << %(<span class="principal">#{subject_element}</span>)
+            end
+            lines << '</li>'
+          end
+          lines << %(</#{list_tag_name}>
 </div>)
-    else
-      lines << '<div class="description-list">
+        else
+          lines << '<div class="description-list">
 <dl>'
-      node.items.each do |terms, dd|
-        [*terms].each do |dt|
-          lines << %(<dt>
+          node.items.each do |terms, dd|
+            [*terms].each do |dt|
+              lines << %(<dt>
 <span class="term">#{dt.text}</span>
 </dt>)
-        end
-        if dd
-          lines << '<dd>'
-          if dd.blocks?
-            lines << %(<span class="principal">#{dd.text}</span>) if dd.text?
-            lines << dd.content
-          else
-            lines << %(<span class="principal">#{dd.text}</span>)
+            end
+            next unless dd
+            lines << '<dd>'
+            if dd.blocks?
+              lines << %(<span class="principal">#{dd.text}</span>) if dd.text?
+              lines << dd.content
+            else
+              lines << %(<span class="principal">#{dd.text}</span>)
+            end
+            lines << '</dd>'
           end
-          lines << '</dd>'
+          lines << '</dl>
+</div>'
         end
+        lines * LF
       end
-      lines << '</dl>
-</div>'
-    end
-    lines * LF
-  end
 
-  def olist node
-    complex = false
-    div_classes = ['ordered-list', node.style, node.role].compact
-    ol_classes = [node.style, ((node.option? 'brief') ? 'brief' : nil)].compact
-    ol_class_attr = ol_classes.empty? ? '' : %( class="#{ol_classes * ' '}")
-    ol_start_attr = (node.attr? 'start') ? %( start="#{node.attr 'start'}") : ''
-    id_attribute = node.id ? %( id="#{node.id}") : ''
-    lines = [%(<div#{id_attribute} class="#{div_classes * ' '}">)]
-    lines << %(<h3 class="list-heading">#{node.title}</h3>) if node.title?
-    lines << %(<ol#{ol_class_attr}#{ol_start_attr}#{(node.option? 'reversed') ? ' reversed="reversed"' : ''}>)
-    node.items.each do |item|
-      lines << %(<li>
+      def olist node
+        complex = false
+        div_classes = ['ordered-list', node.style, node.role].compact
+        ol_classes = [node.style, ((node.option? 'brief') ? 'brief' : nil)].compact
+        ol_class_attr = ol_classes.empty? ? '' : %( class="#{ol_classes * ' '}")
+        ol_start_attr = (node.attr? 'start') ? %( start="#{node.attr 'start'}") : ''
+        id_attribute = node.id ? %( id="#{node.id}") : ''
+        lines = [%(<div#{id_attribute} class="#{div_classes * ' '}">)]
+        lines << %(<h3 class="list-heading">#{node.title}</h3>) if node.title?
+        lines << %(<ol#{ol_class_attr}#{ol_start_attr}#{(node.option? 'reversed') ? ' reversed="reversed"' : ''}>)
+        node.items.each do |item|
+          lines << %(<li>
 <span class="principal">#{item.text}</span>)
-      if item.blocks?
-        lines << item.content
-        complex = true unless item.blocks.size == 1 && ::Asciidoctor::List === item.blocks[0]
-      end
-      lines << '</li>'
-    end
-    if complex
-      div_classes << 'complex'
-      lines[0] = %(<div class="#{div_classes * ' '}">)
-    end
-    lines << '</ol>
+          if item.blocks?
+            lines << item.content
+            complex = true unless item.blocks.size == 1 && ::Asciidoctor::List === item.blocks[0]
+          end
+          lines << '</li>'
+        end
+        if complex
+          div_classes << 'complex'
+          lines[0] = %(<div class="#{div_classes * ' '}">)
+        end
+        lines << '</ol>
 </div>'
-    lines * LF
-  end
+        lines * LF
+      end
 
-  def ulist node
-    complex = false
-    div_classes = ['itemized-list', node.style, node.role].compact
-    ul_classes = [node.style, ((node.option? 'brief') ? 'brief' : nil)].compact
-    ul_class_attr = ul_classes.empty? ? '' : %( class="#{ul_classes * ' '}")
-    id_attribute = node.id ? %( id="#{node.id}") : ''
-    lines = [%(<div#{id_attribute} class="#{div_classes * ' '}">)]
-    lines << %(<h3 class="list-heading">#{node.title}</h3>) if node.title?
-    lines << %(<ul#{ul_class_attr}>)
-    node.items.each do |item|
-      lines << %(<li>
+      def ulist node
+        complex = false
+        div_classes = ['itemized-list', node.style, node.role].compact
+        ul_classes = [node.style, ((node.option? 'brief') ? 'brief' : nil)].compact
+        ul_class_attr = ul_classes.empty? ? '' : %( class="#{ul_classes * ' '}")
+        id_attribute = node.id ? %( id="#{node.id}") : ''
+        lines = [%(<div#{id_attribute} class="#{div_classes * ' '}">)]
+        lines << %(<h3 class="list-heading">#{node.title}</h3>) if node.title?
+        lines << %(<ul#{ul_class_attr}>)
+        node.items.each do |item|
+          lines << %(<li>
 <span class="principal">#{item.text}</span>)
-      if item.blocks?
-        lines << item.content
-        complex = true unless item.blocks.size == 1 && ::Asciidoctor::List === item.blocks[0]
-      end
-      lines << '</li>'
-    end
-    if complex
-      div_classes << 'complex'
-      lines[0] = %(<div class="#{div_classes * ' '}">)
-    end
-    lines << '</ul>
+          if item.blocks?
+            lines << item.content
+            complex = true unless item.blocks.size == 1 && ::Asciidoctor::List === item.blocks[0]
+          end
+          lines << '</li>'
+        end
+        if complex
+          div_classes << 'complex'
+          lines[0] = %(<div class="#{div_classes * ' '}">)
+        end
+        lines << '</ul>
 </div>'
-    lines * LF
-  end
-
-  def 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'] ||= [])
-      epub_properties << 'svg' unless epub_properties.include? 'svg'
-    else
-      if node.attr? 'scaledwidth'
-        img_attrs << %(style="width: #{node.attr 'scaledwidth'}")
+        lines * LF
       end
-    end
+
+      def 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'] ||= [])
+          epub_properties << 'svg' unless epub_properties.include? 'svg'
+        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'
@@ -656,303 +647,300 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
       end
     end
 =end
-    %(<figure#{id_attr} class="image#{prepend_space node.role}">
+        %(<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>] : ''}
+</div>#{node.title? ? %(
+<figcaption>#{node.captioned_title}</figcaption>) : ''}
 </figure>)
-  end
+      end
 
-  def 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}")
+      def 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}")
+              else
+                id_attr = %( id="xref--#{refdoc_id}--#{refdoc_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
+                warn %(asciidoctor: WARNING: #{::File.basename doc.attr('docfile')}: invalid reference to unknown anchor in #{refdoc_id} chapter: #{refdoc_refid})
+              end
+            else
+              warn %(asciidoctor: WARNING: #{::File.basename doc.attr('docfile')}: invalid reference to anchor in unknown chapter: #{refdoc_id})
+            end
           else
-            id_attr = %( id="xref--#{refdoc_id}--#{refdoc_refid}")
+            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
+            else
+              # FIXME: we get false negatives for reference to bibref when using Asciidoctor < 1.5.6
+              warn %(asciidoctor: WARNING: #{::File.basename doc.attr('docfile')}: invalid reference to unknown local anchor (or valid bibref): #{refid})
+            end
           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
-          # QUESTION should we invoke xreftext for references in other documents?
-          if (refs = refdoc.references[:refs]) && ::Asciidoctor::Document === (ref = refs[refdoc_refid])
-            text ||= (ref.attr 'docreftext') || ref.doctitle
-          elsif (xreftext = refdoc.references[:ids][refdoc_refid])
-            text ||= xreftext
+          %(<a#{id_attr} href="#{target}" class="xref">#{text || "[#{refid}]"}</a>)
+        when :ref
+          %(<a id="#{target}"></a>)
+        when :link
+          %(<a href="#{target}" class="link">#{node.text}</a>)
+        when :bibref
+          if @xrefs_seen.include? target
+            %(<a id="#{target}" href="#xref-#{target}">[#{target}]</a>)
           else
-            warn %(asciidoctor: WARNING: #{::File.basename(doc.attr 'docfile')}: invalid reference to unknown anchor in #{refdoc_id} chapter: #{refdoc_refid})
-          end
-        else
-          warn %(asciidoctor: WARNING: #{::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')))
+            %(<a id="#{target}"></a>[#{target}])
           end
-        else
-          xreftext = doc.references[:ids][refid]
         end
+      end
 
-        if xreftext
-          text ||= xreftext
-        else
-          # FIXME we get false negatives for reference to bibref when using Asciidoctor < 1.5.6
-          warn %(asciidoctor: WARNING: #{::File.basename(doc.attr 'docfile')}: invalid reference to unknown local anchor (or valid bibref): #{refid})
-        end
-      end
-      %(<a#{id_attr} href="#{target}" class="xref">#{text || "[#{refid}]"}</a>)
-    when :ref
-      %(<a id="#{target}"></a>)
-    when :link
-      %(<a href="#{target}" class="link">#{node.text}</a>)
-    when :bibref
-      if @xrefs_seen.include? target
-        %(<a id="#{target}" href="#xref-#{target}">[#{target}]</a>)
-      else
-        %(<a id="#{target}"></a>[#{target}])
+      def inline_break node
+        %(#{node.text}<br/>)
       end
-    end
-  end
 
-  def inline_break node
-    %(#{node.text}<br/>)
-  end
+      def inline_button node
+        %(<b class="button">[<span class="label">#{node.text}</span>]</b>)
+      end
 
-  def inline_button node
-    %(<b class="button">[<span class="label">#{node.text}</span>]</b>)
-  end
+      def inline_callout node
+        num = CalloutStartNum
+        int_num = node.text.to_i
+        (int_num - 1).times { num = num.next }
+        %(<i class="conum" data-value="#{int_num}">#{num}</i>)
+      end
 
-  def inline_callout node
-    num = CalloutStartNum
-    int_num = node.text.to_i
-    (int_num - 1).times { num = num.next }
-    %(<i class="conum" data-value="#{int_num}">#{num}</i>)
-  end
+      def inline_footnote node
+        if (index = node.attr 'index')
+          %(<sup class="noteref">[<a id="noteref-#{index}" href="#note-#{index}" epub:type="noteref">#{index}</a>]</sup>)
+        elsif node.type == :xref
+          %(<mark class="noteref" title="Unresolved note reference">#{node.text}</mark>)
+        end
+      end
 
-  def inline_footnote node
-    if (index = node.attr 'index')
-      %(<sup class="noteref">[<a id="noteref-#{index}" href="#note-#{index}" epub:type="noteref">#{index}</a>]</sup>)
-    elsif node.type == :xref
-      %(<mark class="noteref" title="Unresolved note reference">#{node.text}</mark>)
-    end
-  end
+      def inline_image node
+        if node.type == 'icon'
+          @icon_names << (icon_name = node.target)
+          i_classes = ['icon', %(i-#{icon_name})]
+          i_classes << %(icon-#{node.attr 'size'}) if node.attr? 'size'
+          i_classes << %(icon-flip-#{(node.attr 'flip')[0]}) if node.attr? 'flip'
+          i_classes << %(icon-rotate-#{node.attr 'rotate'}) if node.attr? 'rotate'
+          i_classes << node.role if node.role?
+          %(<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 * ' '}/>)
+        end
+      end
 
-  def inline_image node
-    if node.type == 'icon'
-      @icon_names << (icon_name = node.target)
-      i_classes = ['icon', %(i-#{icon_name})]
-      i_classes << %(icon-#{node.attr 'size'}) if node.attr? 'size'
-      i_classes << %(icon-flip-#{(node.attr 'flip')[0]}) if node.attr? 'flip'
-      i_classes << %(icon-rotate-#{node.attr 'rotate'}) if node.attr? 'rotate'
-      i_classes << node.role if node.role?
-      %(<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 * ' '}/>)
-    end
-  end
+      def inline_indexterm node
+        node.type == :visible ? node.text : ''
+      end
 
-  def inline_indexterm node
-    node.type == :visible ? node.text : ''
-  end
+      def inline_kbd node
+        if (keys = node.attr 'keys').size == 1
+          %(<kbd>#{keys[0]}</kbd>)
+        else
+          key_combo = keys.map {|key| %(<kbd>#{key}</kbd>) }.join '+'
+          %(<span class="keyseq">#{key_combo}</span>)
+        end
+      end
 
-  def inline_kbd node
-    if (keys = node.attr 'keys').size == 1
-      %(<kbd>#{keys[0]}</kbd>)
-    else
-      key_combo = keys.map {|key| %(<kbd>#{key}</kbd>) }.join '+'
-      %(<span class="keyseq">#{key_combo}</span>)
-    end
-  end
+      def inline_menu node
+        menu = node.attr 'menu'
+        # NOTE we swap right angle quote with chevron right from FontAwesome using CSS
+        caret = %(#{NoBreakSpace}<span class="caret">#{RightAngleQuote}</span> )
+        if !(submenus = node.attr 'submenus').empty?
+          submenu_path = submenus.map {|submenu| %(<span class="submenu">#{submenu}</span>#{caret}) }.join.chop
+          %(<span class="menuseq"><span class="menu">#{menu}</span>#{caret}#{submenu_path} <span class="menuitem">#{node.attr 'menuitem'}</span></span>)
+        elsif (menuitem = node.attr 'menuitem')
+          %(<span class="menuseq"><span class="menu">#{menu}</span>#{caret}<span class="menuitem">#{menuitem}</span></span>)
+        else
+          %(<span class="menu">#{menu}</span>)
+        end
+      end
 
-  def inline_menu node
-    menu = node.attr 'menu'
-    # NOTE we swap right angle quote with chevron right from FontAwesome using CSS
-    caret = %(#{NoBreakSpace}<span class="caret">#{RightAngleQuote}</span> )
-    if !(submenus = node.attr 'submenus').empty?
-      submenu_path = submenus.map {|submenu| %(<span class="submenu">#{submenu}</span>#{caret}) }.join.chop
-      %(<span class="menuseq"><span class="menu">#{menu}</span>#{caret}#{submenu_path} <span class="menuitem">#{node.attr 'menuitem'}</span></span>)
-    elsif (menuitem = node.attr 'menuitem')
-      %(<span class="menuseq"><span class="menu">#{menu}</span>#{caret}<span class="menuitem">#{menuitem}</span></span>)
-    else
-      %(<span class="menu">#{menu}</span>)
-    end
-  end
+      def 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
+        end
+      end
 
-  def 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
-    end
-  end
+      def convert_content node
+        node.content_model == :simple ? %(<p>#{node.content}</p>) : node.content
+      end
 
-  def convert_content node
-    node.content_model == :simple ? %(<p>#{node.content}</p>) : node.content
-  end
+      # FIXME: merge into with xml_sanitize helper
+      def xml_sanitize value, target = :attribute
+        sanitized = (value.include? '<') ? value.gsub(XmlElementRx, '').strip.tr_s(' ', ' ') : value
+        if target == :plain && (sanitized.include? ';')
+          sanitized = sanitized.gsub(CharEntityRx) { [$1.to_i].pack 'U*' } if sanitized.include? '&#'
+          sanitized = sanitized.gsub FromHtmlSpecialCharsRx, FromHtmlSpecialCharsMap
+        elsif target == :attribute
+          sanitized = sanitized.gsub '"', '&quot;' if sanitized.include? '"'
+        end
+        sanitized
+      end
 
-  # FIXME merge into with xml_sanitize helper
-  def xml_sanitize value, target = :attribute
-    sanitized = (value.include? '<') ? value.gsub(XmlElementRx, '').strip.tr_s(' ', ' ') : value
-    if target == :plain && (sanitized.include? ';')
-      sanitized = sanitized.gsub(CharEntityRx) { [$1.to_i].pack 'U*' } if sanitized.include? '&#'
-      sanitized = sanitized.gsub(FromHtmlSpecialCharsRx, FromHtmlSpecialCharsMap)
-    elsif target == :attribute
-      sanitized = sanitized.gsub '"', '&quot;' if sanitized.include? '"'
-    end
-    sanitized
-  end
+      # TODO: make check for last content paragraph a feature of Asciidoctor
+      def mark_last_paragraph root
+        return unless (last_block = root.blocks[-1])
+        last_block = last_block.blocks[-1] while last_block.context == :section && last_block.blocks?
+        if last_block.context == :paragraph
+          last_block.attributes['role'] = last_block.role? ? %(#{last_block.role} last) : 'last'
+        end
+        nil
+      end
 
-  # TODO make check for last content paragraph a feature of Asciidoctor
-  def mark_last_paragraph root
-    return unless (last_block = root.blocks[-1])
-    while last_block.context == :section && last_block.blocks?
-      last_block = last_block.blocks[-1]
-    end
-    if last_block.context == :paragraph
-      last_block.attributes['role'] = last_block.role? ? %(#{last_block.role} last) : 'last'
+      # Prepend a space to the value if it's non-nil, otherwise return empty string.
+      def prepend_space value
+        value ? %( #{value}) : ''
+      end
     end
-    nil
-  end
 
-  # Prepend a space to the value if it's non-nil, otherwise return empty string.
-  def prepend_space value
-    value ? %( #{value}) : ''
-  end
-end
-
-class DocumentIdGenerator
-  ReservedIds = %w(cover nav ncx)
-  CharRefRx = /&(?:([a-zA-Z][a-zA-Z]+\d{0,2})|#(\d\d\d{0,4})|#x([\da-fA-F][\da-fA-F][\da-fA-F]{0,3}));/
-  if defined? __dir__
-    InvalidIdCharsRx = /[^\p{Word}]+/
-    LeadingDigitRx = /^\p{Nd}/
-  else
-    InvalidIdCharsRx = /[^[:word:]]+/
-    LeadingDigitRx = /^[[:digit:]]/
-  end
-  class << self
-    def generate_id doc, pre = nil, sep = nil
-      synthetic = false
-      unless (id = doc.id)
-        # NOTE we assume pre is a valid ID prefix and that pre and sep only contain valid ID chars
-        pre ||= '_'
-        sep = sep ? sep.chr : '_'
-        if doc.header?
-          id = doc.doctitle sanitize: true
-          id = id.gsub CharRefRx do
-            $1 ? ($1 == 'amp' ? 'and' : sep) : ((d = $2 ? $2.to_i : $3.hex) == 8217 ? '' : ([d].pack 'U*'))
-          end if id.include? '&'
-          id = id.downcase.gsub InvalidIdCharsRx, sep
-          if id.empty?
-            id, synthetic = nil, true
-          else
-            unless sep.empty?
-              if (id = id.tr_s sep, sep).end_with? sep
-                if id == sep
-                  id, synthetic = nil, true
-                else
-                  id = (id.start_with? sep) ? id[1..-2] : id.chop
+    class DocumentIdGenerator
+      ReservedIds = %w(cover nav ncx)
+      CharRefRx = /&(?:([a-zA-Z][a-zA-Z]+\d{0,2})|#(\d\d\d{0,4})|#x([\da-fA-F][\da-fA-F][\da-fA-F]{0,3}));/
+      if defined? __dir__
+        InvalidIdCharsRx = /[^\p{Word}]+/
+        LeadingDigitRx = /^\p{Nd}/
+      else
+        InvalidIdCharsRx = /[^[:word:]]+/
+        LeadingDigitRx = /^[[:digit:]]/
+      end
+      class << self
+        def generate_id doc, pre = nil, sep = nil
+          synthetic = false
+          unless (id = doc.id)
+            # NOTE we assume pre is a valid ID prefix and that pre and sep only contain valid ID chars
+            pre ||= '_'
+            sep = sep ? sep.chr : '_'
+            if doc.header?
+              id = doc.doctitle sanitize: true
+              id = id.gsub CharRefRx do
+                $1 ? ($1 == 'amp' ? 'and' : sep) : ((d = $2 ? $2.to_i : $3.hex) == 8217 ? '' : ([d].pack 'U*'))
+              end if id.include? '&'
+              id = id.downcase.gsub InvalidIdCharsRx, sep
+              if id.empty?
+                id, synthetic = nil, true
+              else
+                unless sep.empty?
+                  if (id = id.tr_s sep, sep).end_with? sep
+                    if id == sep
+                      id, synthetic = nil, true
+                    else
+                      id = (id.start_with? sep) ? id[1..-2] : id.chop
+                    end
+                  elsif id.start_with? sep
+                    id = id[1..-1]
+                  end
+                end
+                unless synthetic
+                  if pre.empty?
+                    id = %(_#{id}) if LeadingDigitRx =~ id
+                  elsif !(id.start_with? pre)
+                    id = %(#{pre}#{id})
+                  end
                 end
-              elsif id.start_with? sep
-                id = id[1..-1]
-              end
-            end
-            unless synthetic
-              if pre.empty?
-                id = %(_#{id}) if LeadingDigitRx =~ id
-              elsif !(id.start_with? pre)
-                id = %(#{pre}#{id})
               end
+            elsif (first_section = doc.first_section)
+              id = first_section.id
+            else
+              synthetic = true
             end
+            id = %(#{pre}document#{sep}#{doc.object_id}) if synthetic
           end
-        elsif (first_section = doc.first_section)
-          id = first_section.id
-        else
-          synthetic = true
+          warn %(asciidoctor: ERROR: chapter uses a reserved ID: #{id}) if !synthetic && (ReservedIds.include? id)
+          id
         end
-        id = %(#{pre}document#{sep}#{doc.object_id}) if synthetic
       end
-      warn %(asciidoctor: ERROR: chapter uses a reserved ID: #{id}) if !synthetic && (ReservedIds.include? id)
-      id
     end
-  end
-end
 
-require_relative 'packager'
+    require_relative 'packager'
 
-Extensions.register do
-  if (document = @document).backend == 'epub3'
-    document.attributes['spine'] = ''
-    document.set_attribute 'listing-caption', 'Listing'
-    if !(defined? ::AsciidoctorJ) && (::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
-    end
-    case (ebook_format = document.attributes['ebook-format'])
-    when 'epub3', 'kf8'
-      # all good
-    when 'mobi'
-      ebook_format = document.attributes['ebook-format'] = 'kf8'
-    else
-      # QUESTION should we display a warning?
-      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')
-        nil
+    Extensions.register do
+      if (document = @document).backend == 'epub3'
+        document.attributes['spine'] = ''
+        document.set_attribute 'listing-caption', 'Listing'
+        if !(defined? ::AsciidoctorJ) && (::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
+        end
+        case (ebook_format = document.attributes['ebook-format'])
+        when 'epub3', 'kf8'
+          # all good
+        when 'mobi'
+          ebook_format = document.attributes['ebook-format'] = 'kf8'
+        else
+          # QUESTION should we display a warning?
+          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')
+            nil
+          end
+        end
       end
     end
   end
 end
-end
-end