asciidoctor 0.1.3 → 0.1.4

data/lib/asciidoctor/backends/docbook5.rb

@@ -0,0 +1,103 @@
+require 'asciidoctor/backends/docbook45'
+# NOTE once we decide to make DocBook 5 the default, we'll load the files the other way around
+
+module Asciidoctor
+
+module DocBook5
+class DocumentTemplate < DocBook45::DocumentTemplate
+  def author indexed = false
+    <<-EOF
+<author>
+<personname>
+#{tag 'firstname', indexed ? :"firstname_\#{idx}" : :firstname, indexed}
+#{tag 'othername', indexed ? :"middlename_\#{idx}" : :middlename, indexed}
+#{tag 'surname', indexed ? :"lastname_\#{idx}" : :lastname, indexed}
+</personname>
+#{tag 'email', indexed ? :"email_\#{idx}" : :email, indexed}
+</author>
+    EOF
+  end
+
+  def template
+    @template ||= @eruby.new <<-EOF
+<%#encoding:UTF-8%><?xml version="1.0" encoding="UTF-8"?><%
+if attr? :toc %>
+<?asciidoc-toc?><%
+end
+if attr? :numbered %>
+<?asciidoc-numbered?><%
+end
+if doctype == 'book' %>
+<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"<% unless attr? :nolang %> xml:lang="<%= attr :lang, 'en' %>"<% end %>>
+<info>
+#{docinfo}
+</info>
+<%= content.chomp %>
+</book><%
+else %>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"<% unless attr? :nolang %> xml:lang="<%= attr :lang, 'en' %>"<% end %>>
+<info>
+#{docinfo}
+</info>
+<%= content.chomp %>
+</article><%
+end %>
+    EOF
+  end
+end
+class EmbeddedTemplate < DocBook45::EmbeddedTemplate; end
+class BlockTocTemplate < DocBook45::BlockTocTemplate; end
+class BlockPreambleTemplate < DocBook45::BlockPreambleTemplate; end
+class SectionTemplate < DocBook45::SectionTemplate; end
+class BlockFloatingTitleTemplate < DocBook45::BlockFloatingTitleTemplate; end
+class BlockParagraphTemplate < DocBook45::BlockParagraphTemplate; end
+class BlockAdmonitionTemplate < DocBook45::BlockAdmonitionTemplate; end
+class BlockUlistTemplate < DocBook45::BlockUlistTemplate; end
+class BlockOlistTemplate < DocBook45::BlockOlistTemplate; end
+class BlockColistTemplate < DocBook45::BlockColistTemplate; end
+class BlockDlistTemplate < DocBook45::BlockDlistTemplate; end
+class BlockOpenTemplate < DocBook45::BlockOpenTemplate; end
+class BlockListingTemplate < DocBook45::BlockListingTemplate; end
+class BlockLiteralTemplate < DocBook45::BlockLiteralTemplate; end
+class BlockExampleTemplate < DocBook45::BlockExampleTemplate; end
+class BlockSidebarTemplate < DocBook45::BlockSidebarTemplate; end
+class BlockQuoteTemplate < DocBook45::BlockQuoteTemplate; end
+class BlockVerseTemplate < DocBook45::BlockVerseTemplate; end
+class BlockPassTemplate < DocBook45::BlockPassTemplate; end
+class BlockTableTemplate < DocBook45::BlockTableTemplate; end
+class BlockImageTemplate < DocBook45::BlockImageTemplate; end
+class BlockAudioTemplate < DocBook45::BlockAudioTemplate; end
+class BlockVideoTemplate < DocBook45::BlockVideoTemplate; end
+class BlockRulerTemplate < DocBook45::BlockRulerTemplate; end
+class BlockPageBreakTemplate < DocBook45::BlockPageBreakTemplate; end
+class InlineBreakTemplate < DocBook45::InlineBreakTemplate; end
+class InlineQuotedTemplate < DocBook45::InlineQuotedTemplate; end
+class InlineButtonTemplate < DocBook45::InlineButtonTemplate; end
+class InlineKbdTemplate < DocBook45::InlineKbdTemplate; end
+class InlineMenuTemplate < DocBook45::InlineMenuTemplate; end
+class InlineAnchorTemplate < DocBook45::InlineAnchorTemplate
+  def anchor(target, text, type, node)
+    case type
+    when :ref
+      %(<anchor#{common_attrs target, nil, text}/>)
+    when :xref
+      if node.attr? 'path', nil
+        linkend = (node.attr 'fragment') || target
+        text.nil? ? %(<xref linkend="#{linkend}"/>) : %(<link linkend="#{linkend}">#{text}</link>)
+      else
+        text = text || (node.attr 'path')
+        %(<link xlink:href="#{target}">#{text}</link>)
+      end
+    when :link
+      %(<link xlink:href="#{target}">#{text}</link>)
+    when :bibref
+      %(<anchor#{common_attrs target, nil, "[#{target}]"}/>[#{target}])
+    end
+  end
+end
+class InlineImageTemplate < DocBook45::InlineImageTemplate; end
+class InlineFootnoteTemplate < DocBook45::InlineFootnoteTemplate; end
+class InlineCalloutTemplate < DocBook45::InlineCalloutTemplate; end
+class InlineIndextermTemplate < DocBook45::InlineIndextermTemplate; end
+end # module DocBook5
+end # module Asciidoctor

data/lib/asciidoctor/backends/html5.rb

@@ -1,32 +1,11 @@
 require 'asciidoctor/backends/_stylesheets'
 
 module Asciidoctor
-class BaseTemplate
-
-  # create template matter to insert a style class from the role attribute if specified
-  def role_class
-    attrvalue('role')
-  end
-
-  # create template matter to insert a style class from the style attribute if specified
-  def style_class(sibling = true)
-    attrvalue('style', sibling, false)
-  end
-
-  def title_div(opts = {})
-    if opts.has_key? :caption
-      %q(<% if title? %><div class="title"><%= @caption %><%= title %></div><% end %>)
-    else
-      %q(<% if title? %><div class="title"><%= title %></div><% end %>)
-    end
-  end
-end
-
 module HTML5
 
 class DocumentTemplate < BaseTemplate
   def self.outline(node, to_depth = 2)
-    toc_level = nil
+    toc_level_buffer = []
     sections = node.sections
     unless sections.empty?
       # FIXME the level for special sections should be set correctly in the model
@@ -35,31 +14,25 @@ class DocumentTemplate < BaseTemplate
       if sec_level == 0 && sections.first.special
         sec_level = 1
       end
-      toc_level = %(<ol type="none" class="sectlevel#{sec_level}">\n)
-      numbered = node.document.attr? 'numbered'
+      toc_level_buffer << %(<ul class="sectlevel#{sec_level}">)
       sections.each do |section|
-        # need to check playback attributes for change in numbered setting
-        # FIXME encapsulate me
-        if section.attributes.has_key? :attribute_entries
-          if (numbered_override = section.attributes[:attribute_entries].find {|entry| entry.name == 'numbered'})
-            numbered = numbered_override.negate ? false : true
-          end
-        end
-        section_num = numbered && !section.special && section.level > 0 && section.level < 4 ? %(#{section.sectnum} ) : nil
-        toc_level = %(#{toc_level}<li><a href=\"##{section.id}\">#{section_num}#{section.caption}#{section.title}</a></li>\n)
-        if section.level < to_depth && (child_toc_level = outline(section, to_depth))
-          toc_level = %(#{toc_level}<li>\n#{child_toc_level}\n</li>\n)
+        section_num = section.numbered ? %(#{section.sectnum} ) : nil
+        toc_level_buffer << %(<li><a href=\"##{section.id}\">#{section_num}#{section.captioned_title}</a></li>)
+        if section.level < to_depth && (child_toc_level = outline(section, to_depth)) != ''
+          toc_level_buffer << '<li>'
+          toc_level_buffer << child_toc_level
+          toc_level_buffer << '</li>'
         end
       end
-      toc_level = %(#{toc_level}</ol>)
+      toc_level_buffer << '</ul>'
     end
-    toc_level
+    toc_level_buffer * EOL
   end
 
   def template
     @template ||= @eruby.new <<-EOS
 <%#encoding:UTF-8%><!DOCTYPE html>
-<html<%= !(attr? 'nolang') ? %( lang="\#{attr 'lang', 'en'}") : nil %>>
+<html<%= (attr? 'nolang') ? nil : %( lang="\#{attr 'lang', 'en'}") %>>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<%= attr :encoding %>">
 <meta name="generator" content="Asciidoctor <%= attr 'asciidoctor-version' %>">
@@ -70,17 +43,17 @@ end
 if attr? :keywords %>
 <meta name="keywords" content="<%= attr :keywords %>"><%
 end %>
-<title><%= doctitle %></title><%
+<title><%= doctitle(:sanitize => true) || (attr 'untitled-label') %></title><%
 if DEFAULT_STYLESHEET_KEYS.include?(attr 'stylesheet')
   if @safe >= SafeMode::SECURE || (attr? 'linkcss') %>
 <link rel="stylesheet" href="<%= normalize_web_path(DEFAULT_STYLESHEET_NAME, (attr :stylesdir, '')) %>"><%
   else %>
 <style>
-<%= ::Asciidoctor::HTML5.default_asciidoctor_stylesheet %>
+<%= HTML5.default_asciidoctor_stylesheet %>
 </style><%
   end
 elsif attr? :stylesheet
-  if attr? 'linkcss' %>
+  if @safe >= SafeMode::SECURE || (attr? 'linkcss') %>
 <link rel="stylesheet" href="<%= normalize_web_path((attr :stylesheet), (attr :stylesdir, '')) %>"><%
   else %>
 <style>
@@ -90,17 +63,31 @@ elsif attr? :stylesheet
 end
 if attr? 'icons', 'font'
   if !(attr 'iconfont-remote', '').nil? %>
-<link rel="stylesheet" href="<%= attr 'iconfont-cdn', 'http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css' %>/<%= attr 'iconfont-name', 'font-awesome' %>.min.css"><%
+<link rel="stylesheet" href="<%= attr 'iconfont-cdn', 'http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.1/css/font-awesome.min.css' %>"><%
   else %>
 <link rel="stylesheet" href="<%= normalize_web_path(%(\#{attr 'iconfont-name', 'font-awesome'}.css), (attr 'stylesdir', '')) %>"><%
   end
 end
 case attr 'source-highlighter'
 when 'coderay'
-  if (attr 'coderay-css', 'class') == 'class' %>
+  if (attr 'coderay-css', 'class') == 'class'
+    if @safe >= SafeMode::SECURE || (attr? 'linkcss') %>
+<link rel="stylesheet" href="<%= normalize_web_path('asciidoctor-coderay.css', (attr :stylesdir, '')) %>"><%
+    else %>
+<style>
+<%= HTML5.default_coderay_stylesheet %>
+</style><%
+    end
+  end
+when 'pygments'
+  if (attr 'pygments-css', 'class') == 'class'
+    if @safe >= SafeMode::SECURE || (attr? 'linkcss') %>
+<link rel="stylesheet" href="<%= normalize_web_path('asciidoctor-pygments.css', (attr :stylesdir, '')) %>"><%
+    else %>
 <style>
-<%= ::Asciidoctor::HTML5.default_coderay_stylesheet %>
+<%= HTML5.pygments_stylesheet(attr 'pygments-style') %>
 </style><%
+    end
   end
 when 'highlightjs', 'highlight.js' %>
 <link rel="stylesheet" href="<%= attr :highlightjsdir, 'http://cdnjs.cloudflare.com/ajax/libs/highlight.js/7.3' %>/styles/<%= attr 'highlightjs-theme', 'default' %>.min.css">
@@ -113,34 +100,55 @@ when 'prettify' %>
 end %><%= (docinfo_content = docinfo).empty? ? nil : %(
 \#{docinfo_content}) %>
 </head>
-<body#{id} class="<%= doctype %><%= (attr? 'toc-class') && (attr? 'toc') && (attr? 'toc-placement', 'auto') ? %( \#{attr 'toc-class'}) : nil %>"<%= (attr? 'max-width') ? %( style="max-width: \#{attr 'max-width'};") : nil %>><%
+<body<%= @id ? %( id="\#{@id}") : nil %> class="<%= doctype %><%= (attr? 'toc-class') && (attr? 'toc') && (attr? 'toc-placement', 'auto') ? %( \#{attr 'toc-class'} toc-\#{attr 'toc-position', 'left'}) : nil %>"<%= (attr? 'max-width') ? %( style="max-width: \#{attr 'max-width'};") : nil %>><%
 unless noheader %>
 <div id="header"><%
-  if has_header?
-    unless notitle %>
+  if doctype == 'manpage' %>
+<h1><%= doctitle %> Manual Page</h1><%
+    if (attr? :toc) && (attr? 'toc-placement', 'auto') %>
+<div id="toc" class="<%= attr 'toc-class', 'toc' %>">
+<div id="toctitle"><%= attr 'toc-title' %></div>
+<%= template.class.outline(self, (attr :toclevels, 2).to_i) %>
+</div><%
+    end %>
+<h2><%= attr 'manname-title' %></h2>
+<div class="sectionbody">
+<p><%= %(\#{attr 'manname'} - \#{attr 'manpurpose'}) %></p>
+</div><%
+  else
+    if has_header?
+      unless notitle %>
 <h1><%= @header.title %></h1><%
-    end %><%
-    if attr? :author %>
-<span id="author"><%= attr :author %></span><br><%
-      if attr? :email %>
-<span id="email"><%= sub_macros(attr :email) %></span><br><%
+      end %><%
+      if attr? :author %>
+<span id="author" class="author"><%= attr :author %></span><br><%
+        if attr? :email %>
+<span id="email" class="email"><%= sub_macros(attr :email) %></span><br><%
+        end
+        if (authorcount = (attr :authorcount).to_i) > 1
+          (2..authorcount).each do |idx| %><span id="author<%= idx %>" class="author"><%= attr "author_\#{idx}" %></span><br><%
+            if attr? "email_\#{idx}" %>
+<span id="email<%= idx %>" class="email"><%= sub_macros(attr "email_\#{idx}") %></span><br><%
+            end
+          end
+        end
       end
-    end
-    if attr? :revnumber %>
-<span id="revnumber">version <%= attr :revnumber %><%= (attr? :revdate) ? ',' : '' %></span><%
-    end
-    if attr? :revdate %>
+      if attr? :revnumber %>
+<span id="revnumber"><%= ((attr 'version-label') || '').downcase %> <%= attr :revnumber %><%= (attr? :revdate) ? ',' : '' %></span><%
+      end
+      if attr? :revdate %>
 <span id="revdate"><%= attr :revdate %></span><%
-    end
-    if attr? :revremark %>
+      end
+      if attr? :revremark %>
 <br><span id="revremark"><%= attr :revremark %></span><%
+      end
     end
-  end
-  if (attr? :toc) && (attr? 'toc-placement', 'auto') %>
+    if (attr? :toc) && (attr? 'toc-placement', 'auto') %>
 <div id="toc" class="<%= attr 'toc-class', 'toc' %>">
 <div id="toctitle"><%= attr 'toc-title' %></div>
 <%= template.class.outline(self, (attr :toclevels, 2).to_i) %>
 </div><%
+    end
   end %>
 </div><%
 end %>
@@ -160,10 +168,13 @@ end %>
 <div id="footer">
 <div id="footer-text"><%
 if attr? :revnumber %>
-Version <%= attr :revnumber %><br><%
+<%= %(\#{attr 'version-label'} \#{attr :revnumber}) %><br><%
+end
+if attr? 'last-update-label' %>
+<%= %(\#{attr 'last-update-label'} \#{attr :docdatetime}) %><%
 end %>
-Last updated <%= attr :docdatetime %>
-</div>
+</div><%= (docinfo_content = docinfo :footer).empty? ? nil : %(
+\#{docinfo_content}) %>
 </div>
 </body>
 </html>
@@ -172,19 +183,32 @@ Last updated <%= attr :docdatetime %>
 end
 
 class EmbeddedTemplate < BaseTemplate
+  def result(node)
+    result_buffer = []
+    if !node.notitle && node.has_header?
+      id_attr = node.id ? %( id="#{node.id}") : nil
+      result_buffer << %(<h1#{id_attr}>#{node.header.title}</h1>)
+    end
+
+    result_buffer << node.content
+
+    if node.footnotes? && !(node.attr? 'nofootnotes')
+      result_buffer << '<div id="footnotes">'
+      result_buffer << '<hr>'
+      node.footnotes.each do |footnote|
+        result_buffer << %(<div class="footnote" id="_footnote_#{footnote.index}">
+<a href="#_footnoteref_#{footnote.index}">#{footnote.index}</a> #{footnote.text}
+</div>)
+      end
+
+      result_buffer << '</div>'
+    end
+
+    result_buffer * EOL
+  end
+
   def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><% unless notitle || !has_header? %><h1#{id}><%= header.title %></h1>
-<% end %><%= content %>
-<% unless !footnotes? || (attr? :nofootnotes) %><div id="footnotes">
-  <hr>
-  <% footnotes.each do |fn| %>
-  <div class="footnote" id="_footnote_<%= fn.index %>">
-    <a href="#_footnoteref_<%= fn.index %>"><%= fn.index %></a>. <%= fn.text %>
-  </div>
-  <% end %>
-</div><% end %>
-    EOS
+    :invoke_result
   end
 end
 
@@ -206,7 +230,7 @@ class BlockTocTemplate < BaseTemplate
     end
     title = node.title? ? node.title : (doc.attr 'toc-title')
     levels = (node.attr? 'levels') ? (node.attr 'levels').to_i : (doc.attr 'toclevels', 2).to_i
-    role = (node.attr? 'role') ? (node.attr 'role') : (doc.attr 'toc-class', 'toc')
+    role = node.role? ? node.role : (doc.attr 'toc-class', 'toc')
 
     %(<div#{id_attr} class="#{role}">
 <div#{title_id_attr} class="title">#{title}</div>
@@ -231,14 +255,16 @@ class BlockPreambleTemplate < BaseTemplate
     end
   end
 
-  def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><div id="preamble">
+  def result(node)
+    %(<div id="preamble">
 <div class="sectionbody">
-<%= content %>
-</div><%= template.toc(self) %>
-</div>
-    EOS
+#{node.content}
+</div>#{toc node}
+</div>)
+  end
+
+  def template
+    :invoke_result
   end
 end
 
@@ -267,10 +293,10 @@ class SectionTemplate < BaseTemplate
 
     if slevel == 0
       %(<h1#{id} class="sect0">#{anchor}#{link_start}#{sec.title}#{link_end}</h1>
-#{sec.content}\n)
+#{sec.content})
     else
-      role = (sec.attr? 'role') ? " #{sec.attr 'role'}" : nil
-      if !sec.special && (sec.document.attr? 'numbered') && slevel < 4
+      role = sec.role? ? " #{sec.role}" : nil
+      if sec.numbered
         sectnum = "#{sec.sectnum} "
       else
         sectnum = nil
@@ -284,9 +310,9 @@ class SectionTemplate < BaseTemplate
         content = sec.content
       end
       %(<div class="sect#{slevel}#{role}">
-<#{htag}#{id}>#{anchor}#{link_start}#{sectnum}#{sec.caption}#{sec.title}#{link_end}</#{htag}>
+<#{htag}#{id}>#{anchor}#{link_start}#{sectnum}#{sec.captioned_title}#{link_end}</#{htag}>
 #{content}
-</div>\n)
+</div>)
     end
   end
 
@@ -296,200 +322,210 @@ class SectionTemplate < BaseTemplate
 end
 
 class BlockFloatingTitleTemplate < BaseTemplate
+  def result(node)
+    tag_name = "h#{node.level + 1}"
+    id_attribute = node.id ? %( id="#{node.id}") : nil
+    classes = [node.style, node.role].compact
+    %(<#{tag_name}#{id_attribute} class="#{classes * ' '}">#{node.title}</#{tag_name}>)
+  end
+
   def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><h<%= @level + 1 %>#{id} class="#{style_class false}#{role_class}"><%= title %></h<%= @level + 1 %>>
-    EOS
+    :invoke_result
   end
 end
 
 class BlockDlistTemplate < BaseTemplate
-  def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><%
-continuing = false
-entries = content
-last_index = entries.length - 1
-if attr? 'style', 'qanda', false
-%><div#{id} class="qlist#{style_class}#{role_class}"><%
-if title? %>
-<div class="title"><%= title %></div><%
-end %>
-<ol><%
-  entries.each_with_index do |(dt, dd), index|
-    last = (index == last_index)
-    unless continuing %>
-<li><%
-    end %>
-<p><em><%= dt.text %></em></p><%
-    if !last && dd.nil?
-      continuing = true
-      next
+  def result(node)
+    result_buffer = []
+    id_attribute = node.id ? %( id="#{node.id}") : nil
+
+    case node.style
+    when 'qanda'
+      classes = ['qlist', node.style, node.role].compact
+    when 'horizontal'
+      classes = ['hdlist', node.role].compact
     else
-      continuing = false
+      classes = ['dlist', node.style, node.role].compact
     end
-    unless dd.nil?
-      if dd.text? %>
-<p><%= dd.text %></p><%
+
+    class_attribute = %( class="#{classes * ' '}")
+
+    result_buffer << %(<div#{id_attribute}#{class_attribute}>)
+    result_buffer << %(<div class="title">#{node.title}</div>) if node.title?
+    case node.style
+    when 'qanda'
+      result_buffer << '<ol>'
+      node.items.each do |terms, dd|
+        result_buffer << '<li>'
+        [*terms].each do |dt|
+          result_buffer << %(<p><em>#{dt.text}</em></p>)
+        end
+        unless dd.nil?
+          result_buffer << %(<p>#{dd.text}</p>) if dd.text?
+          result_buffer << dd.content if dd.blocks?
+        end
+        result_buffer << '</li>'
       end
-      if dd.blocks? %>
-<%= dd.content %><%
+      result_buffer << '</ol>'
+    when 'horizontal'
+      result_buffer << '<table>'
+      if (node.attr? 'labelwidth') || (node.attr? 'itemwidth')
+        result_buffer << '<colgroup>'
+        col_style_attribute = (node.attr? 'labelwidth') ? %( style="width:#{(node.attr 'labelwidth').chomp '%'}%;") : nil
+        result_buffer << %(<col#{col_style_attribute}>)
+        col_style_attribute = (node.attr? 'itemwidth') ? %( style="width:#{(node.attr 'itemwidth').chomp '%'}%;") : nil
+        result_buffer << %(<col#{col_style_attribute}>)
+        result_buffer << '</colgroup>'
       end
-    end %>
-</li><%
-  end %>
-</ol>
-</div><%
-elsif attr? 'style', 'horizontal', false
-%><div#{id} class="hdlist#{role_class}"><%
-if title? %>
-<div class="title"><%= title %></div><%
-end %>
-<table><%
-if (attr? :labelwidth) || (attr? :itemwidth) %>
-<colgroup>
-<col<% if attr? :labelwidth %> style="width:<%= (attr :labelwidth).chomp('%') %>%;"<% end %>>
-<col<% if attr? :itemwidth %> style="width:<%= (attr :itemwidth).chomp('%') %>%;"<% end %>>
-</colgroup><%
-end %><%
-  entries.each_with_index do |(dt, dd), index|
-    last = (index == last_index)
-    unless continuing %>
-<tr>
-<td class="hdlist1<%= (attr? 'strong-option') ? 'strong' : nil %>"><%
-    end %>
-<%= dt.text %>
-<br><%
-    if !last && dd.nil?
-      continuing = true
-      next
-    else
-      continuing = false
-    end %>
-</td>
-<td class="hdlist2"><%
-    unless dd.nil?
-      if dd.text? %>
-<p><%= dd.text %></p><%
+      node.items.each do |terms, dd|
+        result_buffer << '<tr>'
+        result_buffer << %(<td class="hdlist1#{(node.option? 'strong') ? ' strong' : nil}">)
+        terms_array = [*terms]
+        last_term = terms_array.last
+        terms_array.each do |dt|
+          result_buffer << dt.text
+          result_buffer << '<br>' if dt != last_term
+        end
+        result_buffer << '</td>'
+        result_buffer << '<td class="hdlist2">'
+        unless dd.nil?
+          result_buffer << %(<p>#{dd.text}</p>) if dd.text?
+          result_buffer << dd.content if dd.blocks?
+        end
+        result_buffer << '</td>'
+        result_buffer << '</tr>'
       end
-      if dd.blocks? %>
-<%= dd.content %><%
+      result_buffer << '</table>'
+    else
+      result_buffer << '<dl>'
+      dt_style_attribute = node.style.nil? ? ' class="hdlist1"' : nil
+      node.items.each do |terms, dd|
+        [*terms].each do |dt|
+          result_buffer << %(<dt#{dt_style_attribute}>#{dt.text}</dt>)
+        end
+        unless dd.nil?
+          result_buffer << '<dd>'
+          result_buffer << %(<p>#{dd.text}</p>) if dd.text?
+          result_buffer << dd.content if dd.blocks?
+          result_buffer << '</dd>'
+        end
       end
-    end %>
-</td>
-</tr><%
-  end %>
-</table>
-</div><%
-else
-%><div#{id} class="dlist#{style_class}#{role_class}"><%
-if title? %>
-<div class="title"><%= title %></div><%
-end %>
-<dl><%
-  entries.each_with_index do |(dt, dd), index|
-    last = (index == last_index) %>
-<dt<%= !(attr? 'style', nil, false) ? %( class="hdlist1") : nil %>><%= dt.text %></dt><%
-    unless dd.nil? %>
-<dd><%
-      if dd.text? %>
-<p><%= dd.text %></p><%
-      end %><%
-      if dd.blocks? %>
-<%= dd.content %><%
-      end %>
-</dd><%
+      result_buffer << '</dl>'
     end
-  end %>
-</dl>
-</div><%
-end %>
-    EOS
+
+    result_buffer << '</div>'
+    result_buffer * EOL
+  end
+
+  def template
+    :invoke_result
   end
 end
 
 class BlockListingTemplate < BaseTemplate
-  def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><div#{id} class="listingblock#{role_class}">
-#{title_div :caption => true}
-<div class="content monospaced"><%
-if attr? 'style', 'source', false
-  language = (language = (attr 'language')) ? %(\#{language} language-\#{language}) : nil
-  case attr 'source-highlighter'
-  when 'coderay'
-    pre_class = ' class="CodeRay"'
-    code_class = language ? %( class="\#{language}") : nil
-  when 'highlightjs', 'highlight.js'
-    pre_class = ' class="highlight"'
-    code_class = language ? %( class="\#{language}") : nil
-  when 'prettify'
-    pre_class = %( class="prettyprint\#{(attr? 'linenums') ? ' linenums' : nil})
-    pre_class = language ? %(\#{pre_class} \#{language}") : %(\#{pre_class}")
-    code_class = nil
-  else
-    pre_class = ' class="highlight"'
-    code_class = language ? %( class="\#{language}") : nil
-  end %>
-<pre<%= pre_class %>><code<%= code_class %>><%= template.preserve_endlines(content, self) %></code></pre><%
-else %>
-<pre><%= template.preserve_endlines(content, self) %></pre><%
-end %>
-</div>
+  def result(node)
+    nowrap = (!node.document.attr? 'prewrap') || (node.option? 'nowrap')
+    if node.style == 'source'
+      language = node.attr 'language'
+      language_classes = language ? %(#{language} language-#{language}) : nil
+      case node.attr 'source-highlighter'
+      when 'coderay'
+        pre_class = nowrap ? ' class="CodeRay nowrap"' : ' class="CodeRay"'
+        code_class = language ? %( class="#{language_classes}") : nil
+      when 'pygments'
+        pre_class = nowrap ? ' class="pygments highlight nowrap"' : ' class="pygments highlight"'
+        code_class = language ? %( class="#{language_classes}") : nil
+      when 'highlightjs', 'highlight.js'
+        pre_class = nowrap ? ' class="highlight nowrap"' : ' class="highlight"'
+        code_class = language ? %( class="#{language_classes}") : nil
+      when 'prettify'
+        pre_class = %( class="prettyprint#{nowrap ? ' nowrap' : nil}#{(node.attr? 'linenums') ? ' linenums' : nil})
+        pre_class = language ? %(#{pre_class} #{language_classes}") : %(#{pre_class}")
+        code_class = nil
+      when 'html-pipeline'
+        pre_class = language ? %( lang="#{language}") : nil
+        code_class = nil
+      else
+        pre_class = nowrap ? ' class="highlight nowrap"' : ' class="highlight"'
+        code_class = language ? %( class="#{language_classes}") : nil
+      end
+      pre = %(<pre#{pre_class}><code#{code_class}>#{preserve_endlines(node.content, node)}</code></pre>)
+    else
+      pre = %(<pre#{nowrap ? ' class="nowrap"' : nil}>#{preserve_endlines(node.content, node)}</pre>)
+    end
+
+    %(<div#{node.id && " id=\"#{node.id}\""} class="listingblock#{node.role && " #{node.role}"}">#{node.title? ? "
+<div class=\"title\">#{node.captioned_title}</div>" : nil}
+<div class="content">
+#{pre}
 </div>
-    EOS
+</div>)
+  end
+
+  def template
+    :invoke_result
   end
 end
 
 class BlockLiteralTemplate < BaseTemplate
-  def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><div#{id} class="literalblock#{role_class}">
-#{title_div}
-<div class="content monospaced">
-<pre><%= template.preserve_endlines(content, self) %></pre>
-</div>
+  def result(node)
+    nowrap = (!node.document.attr? 'prewrap') || (node.option? 'nowrap')
+    %(<div#{node.id && " id=\"#{node.id}\""} class="literalblock#{node.role && " #{node.role}"}">#{node.title? ? "
+<div class=\"title\">#{node.title}</div>" : nil}
+<div class="content">
+<pre#{nowrap ? ' class="nowrap"' : nil}>#{preserve_endlines(node.content, node)}</pre>
 </div>
-    EOS
+</div>)
+  end
+
+  def template
+    :invoke_result
   end
 end
 
 class BlockAdmonitionTemplate < BaseTemplate
-  def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><div#{id} class="admonitionblock <%= attr :name %>#{role_class}">
+  def result(node)
+    id = node.id
+    name = node.attr 'name'
+    role = node.role
+    title = node.title? ? node.title : nil
+    if node.document.attr? 'icons'
+      if node.document.attr? 'icons', 'font'
+        caption = %(<i class="icon-#{name}" title="#{node.caption}"></i>)
+      else
+        caption = %(<img src="#{node.icon_uri(name)}" alt="#{node.caption}">)
+      end
+    else
+      caption = %(<div class="title">#{node.caption}</div>)
+    end
+    %(<div#{id && " id=\"#{id}\""} class="admonitionblock #{name}#{role && " #{role}"}">
 <table>
 <tr>
-<td class="icon"><%
-if attr? 'icons', 'font' %>
-<i class="icon-<%= attr :name %>" title="<%= @caption %>"></i><%
-elsif attr? 'icons' %>
-<img src="<%= icon_uri(attr :name) %>" alt="<%= @caption %>"><%
-else %>
-<div class="title"><%= @caption %></div><%
-end %>
+<td class="icon">
+#{caption}
 </td>
-<td class="content">
-#{title_div}
-<%= content %>
+<td class="content">#{title ? "
+<div class=\"title\">#{title}</div>" : nil}
+#{node.content}
 </td>
 </tr>
 </table>
-</div>
-    EOS
+</div>)
   end
-end
 
-class BlockParagraphTemplate < BaseTemplate
-  def paragraph(id, role, title, content)
-    %(<div#{id && " id=\"#{id}\""} class="paragraph#{role && " #{role}"}">#{title && "
-<div class=\"title\">#{title}</div>"}
-<p>#{content}</p>
-</div>\n)
+  def template
+    :invoke_result
   end
+end
 
+class BlockParagraphTemplate < BaseTemplate
   def result(node)
-    paragraph(node.id, (node.attr 'role'), (node.title? ? node.title : nil), node.content)
+    id_attribute = node.id ? %( id="#{node.id}") : nil
+    title_element = node.title? ? %(<div class="title">#{node.title}</div>\n) : nil
+
+    %(<div#{id_attribute} class="#{!node.role? ? 'paragraph' : ['paragraph', node.role] * ' '}">
+#{title_element}<p>#{node.content}</p>
+</div>)
   end
 
   def template
@@ -498,40 +534,48 @@ class BlockParagraphTemplate < BaseTemplate
 end
 
 class BlockSidebarTemplate < BaseTemplate
-  def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><div#{id} class="sidebarblock#{role_class}">
+  def result(node)
+    id_attribute = node.id ? %( id="#{node.id}") : nil
+    title_element = node.title? ? %(<div class="title">#{node.title}</div>\n) : nil
+
+    %(<div#{id_attribute} class="#{!node.role? ? 'sidebarblock' : ['sidebarblock', node.role] * ' '}">
 <div class="content">
-#{title_div}
-<%= content %>
-</div>
+#{title_element}#{node.content}
 </div>
-    EOS
+</div>)
+  end
+
+  def template
+    :invoke_result
   end
 end
 
 class BlockExampleTemplate < BaseTemplate
-  def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><div#{id} class="exampleblock#{role_class}">
-#{title_div :caption => true}
-<div class="content">
-<%= content %>
-</div>
+  def result(node)
+    id_attribute = node.id ? %( id="#{node.id}") : nil
+    title_element = node.title? ? %(<div class="title">#{node.captioned_title}</div>\n) : nil
+
+    %(<div#{id_attribute} class="#{!node.role? ? 'exampleblock' : ['exampleblock', node.role] * ' '}">
+#{title_element}<div class="content">
+#{node.content}
 </div>
-    EOS
+</div>)
+  end
+
+  def template
+    :invoke_result
   end
 end
 
 class BlockOpenTemplate < BaseTemplate
   def result(node)
-    open_block(node, node.id, (node.attr 'style', nil, false), (node.attr 'role'), node.title? ? node.title : nil, node.content)
+    open_block(node, node.id, node.style, node.role, node.title? ? node.title : nil, node.content)
   end
 
   def open_block(node, id, style, role, title, content)
     if style == 'abstract'
-      if node.parent == node.document && node.document.attr?('doctype', 'book')
-        puts 'asciidoctor: WARNING: abstract block cannot be used in a document without a title when doctype is book. Excluding block content.'
+      if node.parent == node.document && node.document.doctype == 'book'
+        warn 'asciidoctor: WARNING: abstract block cannot be used in a document without a title when doctype is book. Excluding block content.'
         ''
       else
         %(<div#{id && " id=\"#{id}\""} class="quoteblock abstract#{role && " #{role}"}">#{title &&
@@ -539,10 +583,10 @@ class BlockOpenTemplate < BaseTemplate
 <blockquote>
 #{content}
 </blockquote>
-</div>\n)
+</div>)
       end
-    elsif style == 'partintro' && (!node.document.attr?('doctype', 'book') || !node.parent.is_a?(Asciidoctor::Section) || node.level != 0)
-      puts 'asciidoctor: ERROR: partintro block can only be used when doctype is book and it\'s a child of a book part. Excluding block content.'
+    elsif style == 'partintro' && (node.level != 0 || node.parent.context != :section || node.document.doctype != 'book')
+      warn 'asciidoctor: ERROR: partintro block can only be used when doctype is book and it\'s a child of a book part. Excluding block content.'
       ''
     else
       %(<div#{id && " id=\"#{id}\""} class="openblock#{style != 'open' ? " #{style}" : ''}#{role && " #{role}"}">#{title &&
@@ -550,7 +594,7 @@ class BlockOpenTemplate < BaseTemplate
 <div class="content">
 #{content}
 </div>
-</div>\n)
+</div>)
     end
   end
 
@@ -566,139 +610,204 @@ class BlockPassTemplate < BaseTemplate
 end
 
 class BlockQuoteTemplate < BaseTemplate
-  def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><div#{id} class="quoteblock#{role_class}">
-#{title_div}
+  def result(node)
+    id_attribute = node.id ? %( id="#{node.id}") : nil
+    classes = ['quoteblock', node.role].compact
+    class_attribute = %( class="#{classes * ' '}")
+    title_element = node.title? ? %(\n<div class="title">#{node.title}</div>) : nil
+    attribution = (node.attr? 'attribution') ? (node.attr 'attribution') : nil
+    citetitle = (node.attr? 'citetitle') ? (node.attr 'citetitle') : nil
+    if attribution || citetitle
+      cite_element = citetitle ? %(<cite>#{citetitle}</cite>) : nil
+      attribution_text = attribution ? %(#{citetitle ? "<br>\n" : nil}&#8212; #{attribution}) : nil
+      attribution_element = %(\n<div class="attribution">\n#{cite_element}#{attribution_text}\n</div>)
+    else
+      attribution_element = nil
+    end
+
+    %(<div#{id_attribute}#{class_attribute}>#{title_element}
 <blockquote>
-<%= content %>
-</blockquote><%
-if (attr? :attribution) || (attr? :citetitle) %>
-<div class="attribution"><%
-  if attr? :citetitle %>
-<cite><%= attr :citetitle %></cite><%
-  end
-  if attr? :attribution
-    if attr? :citetitle %>
-<br><%
-    end %>
-<%= "&#8212; \#{attr :attribution}" %><%
-  end %>
-</div><%
-end %>
-</div>
-    EOS
+#{node.content}
+</blockquote>#{attribution_element}
+</div>)
+  end
+
+  def template
+    :invoke_result
   end
 end
 
 class BlockVerseTemplate < BaseTemplate
+  def result(node)
+    id_attribute = node.id ? %( id="#{node.id}") : nil
+    classes = ['verseblock', node.role].compact
+    class_attribute = %( class="#{classes * ' '}")
+    title_element = node.title? ? %(\n<div class="title">#{node.title}</div>) : nil
+    attribution = (node.attr? 'attribution') ? (node.attr 'attribution') : nil
+    citetitle = (node.attr? 'citetitle') ? (node.attr 'citetitle') : nil
+    if attribution || citetitle
+      cite_element = citetitle ? %(<cite>#{citetitle}</cite>) : nil
+      attribution_text = attribution ? %(#{citetitle ? "<br>\n" : nil}&#8212; #{attribution}) : nil
+      attribution_element = %(\n<div class="attribution">\n#{cite_element}#{attribution_text}\n</div>)
+    else
+      attribution_element = nil
+    end
+
+    %(<div#{id_attribute}#{class_attribute}>#{title_element}
+<pre class="content">#{preserve_endlines node.content, node}</pre>#{attribution_element}
+</div>)
+  end
+
   def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><div#{id} class="verseblock#{role_class}">
-#{title_div}
-<pre class="content"><%= template.preserve_endlines(content, self) %></pre><%
-if (attr? :attribution) || (attr? :citetitle) %>
-<div class="attribution"><%
-  if attr? :citetitle %>
-<cite><%= attr :citetitle %></cite><%
-  end
-  if attr? :attribution
-    if attr? :citetitle %>
-<br><%
-    end %>
-<%= "&#8212; \#{attr :attribution}" %><%
-  end %>
-  </div><%
-end %>
-</div>
-    EOS
+    :invoke_result
   end
 end
 
 class BlockUlistTemplate < BaseTemplate
+  def result(node)
+    result_buffer = []
+    id_attribute = node.id ? %( id="#{node.id}") : nil
+    div_classes = ['ulist', node.style, node.role].compact
+    marker_checked = nil
+    marker_unchecked = nil
+    if (checklist = (node.option? 'checklist'))
+      div_classes.insert(1, 'checklist')
+      ul_class_attribute = ' class="checklist"'
+      if node.option? 'interactive'
+        marker_checked = %(<input type="checkbox" data-item-complete="1" checked> )
+        marker_unchecked = %(<input type="checkbox" data-item-complete="0"> )
+      else
+        if node.document.attr? 'icons', 'font'
+          marker_checked = '<i class="icon-check"></i> '
+          marker_unchecked = '<i class="icon-check-empty"></i> '
+        else
+          # could use &#9745 (checked ballot) and &#9744 (ballot) w/o font instead
+          marker_checked = %(<input type="checkbox" data-item-complete="1" checked disabled> )
+          marker_unchecked = %(<input type="checkbox" data-item-complete="0" disabled> )
+        end
+      end
+    elsif !node.style.nil?
+      ul_class_attribute = %( class="#{node.style}")
+    else
+      ul_class_attribute = nil
+    end
+    div_class_attribute = %( class="#{div_classes * ' '}")
+    result_buffer << %(<div#{id_attribute}#{div_class_attribute}>)
+    result_buffer << %(<div class="title">#{node.title}</div>) if node.title?
+    result_buffer << %(<ul#{ul_class_attribute}>)
+
+    node.items.each do |item|
+      if checklist && (item.attr? 'checkbox')
+        marker = (item.attr? 'checked') ? marker_checked : marker_unchecked
+      else
+        marker = nil
+      end
+      result_buffer << '<li>'
+      result_buffer << %(<p>#{marker}#{item.text}</p>)
+      result_buffer << item.content if item.blocks?
+      result_buffer << '</li>'
+    end
+
+    result_buffer << '</ul>'
+    result_buffer << '</div>'
+
+    result_buffer * EOL
+  end
+
   def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><div#{id} class="ulist#{style_class}#{role_class}">
-#{title_div}
-<ul><%
-content.each do |item| %>
-<li>
-<p><%= item.text %></p><%
-  if item.blocks? %>
-<%= item.content %><%
-  end %>
-</li><%
-end %>
-</ul>
-</div>
-    EOS
+    :invoke_result
   end
 end
 
 class BlockOlistTemplate < BaseTemplate
+  def result(node)
+    result_buffer = []
+    id_attribute = node.id ? %( id="#{node.id}") : nil
+    classes = ['olist', node.style, node.role].compact
+    class_attribute = %( class="#{classes * ' '}")
+
+    result_buffer << %(<div#{id_attribute}#{class_attribute}>)
+    result_buffer << %(<div class="title">#{node.title}</div>) if node.title?
+
+    type_attribute = (keyword = node.list_marker_keyword) ? %( type="#{keyword}") : nil
+    start_attribute = (node.attr? 'start') ? %( start="#{node.attr 'start'}") : nil
+    result_buffer << %(<ol class="#{node.style}"#{type_attribute}#{start_attribute}>)
+
+    node.items.each do |item|
+      result_buffer << '<li>'
+      result_buffer << %(<p>#{item.text}</p>)
+      result_buffer << item.content if item.blocks?
+      result_buffer << '</li>'
+    end
+
+    result_buffer << '</ol>'
+    result_buffer << '</div>'
+
+    result_buffer * EOL
+  end
 
   def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><% style = attr 'style', nil, false %><div#{id} class="olist#{style_class}#{role_class}">
-#{title_div}
-<ol class="<%= style %>"<%= (type = ::Asciidoctor::ORDERED_LIST_KEYWORDS[style]) ? %( type="\#{type}") : nil %>#{attribute('start', :start)}><%
-content.each do |item| %>
-<li>
-<p><%= item.text %></p><%
-  if item.blocks? %>
-<%= item.content %><%
-  end %>
-</li><%
-end %>
-</ol>
-</div>
-    EOS
+    :invoke_result
   end
 end
 
 class BlockColistTemplate < BaseTemplate
+  def result(node)
+    result_buffer = []
+    id_attribute = node.id ? %( id="#{node.id}") : nil
+    classes = ['colist', node.style, node.role].compact
+    class_attribute = %( class="#{classes * ' '}")
+
+    result_buffer << %(<div#{id_attribute}#{class_attribute}>)
+    result_buffer << %(<div class="title">#{node.title}</div>) if node.title?
+
+    if node.document.attr? 'icons'
+      result_buffer << '<table>'
+
+      font_icons = node.document.attr? 'icons', 'font'
+      node.items.each_with_index do |item, i|
+        num = i + 1
+        num_element = font_icons ?
+            %(<i class="conum" data-value="#{num}"></i><b>#{num}</b>) :
+            %(<img src="#{node.icon_uri "callouts/#{num}"}" alt="#{num}">)
+        result_buffer << %(<tr>
+<td>#{num_element}</td>
+<td>#{item.text}</td>
+</tr>)
+      end
+
+      result_buffer << '</table>'
+    else
+      result_buffer << '<ol>'
+      node.items.each do |item|
+        result_buffer << %(<li>
+<p>#{item.text}</p>
+</li>)
+      end
+      result_buffer << '</ol>'
+    end
+
+    result_buffer << '</div>'
+    result_buffer * EOL
+  end
+
   def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><div#{id} class="colist#{style_class}#{role_class}">
-#{title_div}<%
-if attr? :icons %>
-<table><%
-  content.each_with_index do |item, i| %>
-<tr>
-<td><%
-    if attr? :icons, 'font' %><i class="conum"><%= i + 1 %></i><%
-    else %><img src="<%= icon_uri("callouts/\#{i + 1}") %>" alt="<%= i + 1 %>"><%
-    end %></td>
-<td><%= item.text %></td>
-</tr><%
-  end %>
-</table><%
-else %>
-<ol><%
-  content.each do |item| %>
-<li>
-<p><%= item.text %></p>
-</li><%
-  end %>
-</ol><%
-end %>
-</div>
-    EOS
+    :invoke_result
   end
 end
 
 class BlockTableTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><table#{id} class="tableblock frame-<%= attr :frame, 'all' %> grid-<%= attr :grid, 'all'%>#{role_class}" style="<%
-if !(attr? 'autowidth-option') %>width:<%= attr :tablepcwidth %>%; <% end %><%
+<%#encoding:UTF-8%><table<%= @id ? %( id="\#{@id}") : nil %> class="tableblock frame-<%= attr :frame, 'all' %> grid-<%= attr :grid, 'all'%><%= role? ? " \#{role}" : nil %>" style="<%
+if !(option? 'autowidth') %>width:<%= attr :tablepcwidth %>%; <% end %><%
 if attr? :float %>float: <%= attr :float %>; <% end %>"><%
 if title? %>
-<caption class="title"><% unless @caption.nil? %><%= @caption %><% end %><%= title %></caption><%
+<caption class="title"><%= captioned_title %></caption><%
 end
 if (attr :rowcount) >= 0 %>
 <colgroup><%
-  if attr? 'autowidth-option'
+  if option? 'autowidth'
     @columns.each do %>
 <col><%
     end
@@ -718,13 +827,13 @@ if (attr :rowcount) >= 0 %>
         if tsec == :head
           cell_content = cell.text
         else
-          case (cell.attr 'style', nil, false)
+          case cell.style
           when :asciidoc
             cell_content = %(<div>\#{cell.content}</div>)
           when :verse
             cell_content = %(<div class="verse">\#{template.preserve_endlines(cell.text, self)}</div>)
           when :literal
-            cell_content = %(<div class="literal monospaced"><pre>\#{template.preserve_endlines(cell.text, self)}</pre></div>)
+            cell_content = %(<div class="literal"><pre>\#{template.preserve_endlines(cell.text, self)}</pre></div>)
           when :header
             cell.content.each do |text|
               cell_content = %(\#{cell_content}<p class="tableblock header">\#{text}</p>)
@@ -748,59 +857,109 @@ end %>
 end
 
 class BlockImageTemplate < BaseTemplate
+  def image(target, alt, title, link, node)
+    align = (node.attr? 'align') ? (node.attr 'align') : nil
+    float = (node.attr? 'float') ? (node.attr 'float') : nil 
+    if align || float
+      styles = [align ? %(text-align: #{align}) : nil, float ? %(float: #{float}) : nil].compact
+      style_attribute = %( style="#{styles * ';'}")
+    else
+      style_attribute = nil
+    end
+
+    width_attribute = (node.attr? 'width') ? %( width="#{node.attr 'width'}") : nil
+    height_attribute = (node.attr? 'height') ? %( height="#{node.attr 'height'}") : nil
+
+    img_element = %(<img src="#{node.image_uri target}" alt="#{alt}"#{width_attribute}#{height_attribute}>)
+    if link
+      img_element = %(<a class="image" href="#{link}">#{img_element}</a>)
+    end
+    id_attribute = node.id ? %( id="#{node.id}") : nil
+    classes = ['imageblock', node.style, node.role].compact
+    class_attribute = %( class="#{classes * ' '}")
+    title_element = title ? %(\n<div class="title">#{title}</div>) : nil
+
+    %(<div#{id_attribute}#{class_attribute}#{style_attribute}>
+<div class="content">
+#{img_element}
+</div>#{title_element}
+</div>)
+  end
+
+  def result(node)
+    image(node.attr('target'), node.attr('alt'), node.title? ? node.captioned_title : nil, node.attr('link'), node)
+  end
+
   def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><div#{id} class="imageblock#{style_class}#{role_class}"<%
-if (attr? :align) || (attr? :float) %> style="<%
-  if attr? :align %>text-align: <%= attr :align %><% if attr? :float %>; <% end %><% end %><% if attr? :float %>float: <%= attr :float %><% end %>"<%
-end %>>
-<div class="content"><%
-if attr? :link %>
-<a class="image" href="<%= attr :link %>"><img src="<%= image_uri(attr :target) %>" alt="<%= attr :alt %>"#{attribute('width', :width)}#{attribute('height', :height)}></a><%
-else %>
-<img src="<%= image_uri(attr :target) %>" alt="<%= attr :alt %>"#{attribute('width', :width)}#{attribute('height', :height)}><%
-end %>
-</div>
-#{title_div :caption => true}
-</div>
-    EOS
+    :invoke_result
   end
 end
 
 class BlockAudioTemplate < BaseTemplate
-  def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><div#{id} class="audioblock#{style_class}#{role_class}">
-#{title_div :caption => true}
+  def result(node)
+    id_attribute = node.id ? %( id="#{node.id}") : nil
+    classes = ['audioblock', node.style, node.role].compact
+    class_attribute = %( class="#{classes * ' '}")
+    title_element = node.title? ? %(\n<div class="title">#{node.captioned_title}</div>) : nil
+    %(<div#{id_attribute}#{class_attribute}>#{title_element}
 <div class="content">
-<audio src="<%= media_uri(attr :target) %>"<%
-if attr? 'autoplay-option' %> autoplay<% end %><%
-unless attr? 'nocontrols-option' %> controls<% end %><%
-if attr? 'loop-option' %> loop<% end %>>
+<audio src="#{node.media_uri(node.attr 'target')}"#{(node.option? 'autoplay') ? ' autoplay' : nil}#{(node.option? 'nocontrols') ? nil : ' controls'}#{(node.option? 'loop') ? ' loop' : nil}>
 Your browser does not support the audio tag.
 </audio>
 </div>
-</div>
-    EOS
+</div>)
+  end
+
+  def template
+    :invoke_result
   end
 end
 
 class BlockVideoTemplate < BaseTemplate
-  def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><div#{id} class="videoblock#{style_class}#{role_class}">
-#{title_div :caption => true}
+  def result(node)
+    id_attribute = node.id ? %( id="#{node.id}") : nil
+    classes = ['videoblock', node.style, node.role].compact
+    class_attribute = %( class="#{classes * ' '}")
+    title_element = node.title? ? %(\n<div class="title">#{node.captioned_title}</div>) : nil
+    width_attribute = (node.attr? 'width') ? %( width="#{node.attr 'width'}") : nil
+    height_attribute = (node.attr? 'height') ? %( height="#{node.attr 'height'}") : nil
+    case node.attr 'poster'
+    when 'vimeo'
+      start_anchor = (node.attr? 'start') ? "#at=#{node.attr 'start'}" : nil
+      delimiter = '?'
+      autoplay_param = (node.option? 'autoplay') ? "#{delimiter}autoplay=1" : nil
+      delimiter = '&amp;' if autoplay_param
+      loop_param = (node.option? 'loop') ? "#{delimiter}loop=1" : nil
+      %(<div#{id_attribute}#{class_attribute}>#{title_element}
+<div class="content">
+<iframe#{width_attribute}#{height_attribute} src="//player.vimeo.com/video/#{node.attr 'target'}#{start_anchor}#{autoplay_param}#{loop_param}" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
+</div>
+</div>)
+    when 'youtube'
+      start_param = (node.attr? 'start') ? "&amp;start=#{node.attr 'start'}" : nil
+      end_param = (node.attr? 'end') ? "&amp;end=#{node.attr 'end'}" : nil
+      autoplay_param = (node.option? 'autoplay') ? '&amp;autoplay=1' : nil
+      loop_param = (node.option? 'loop') ? '&amp;loop=1' : nil
+      controls_param = (node.option? 'nocontrols') ? '&amp;controls=0' : nil
+      %(<div#{id_attribute}#{class_attribute}>#{title_element}
+<div class="content">
+<iframe#{width_attribute}#{height_attribute} src="//www.youtube.com/embed/#{node.attr 'target'}?rel=0#{start_param}#{end_param}#{autoplay_param}#{loop_param}#{controls_param}" frameborder="0"#{(node.option? 'nofullscreen') ? nil : ' allowfullscreen'}></iframe>
+</div>
+</div>)
+    else 
+      poster_attribute = (node.attr? 'poster') ? %( poster="#{node.media_uri(node.attr 'poster')}") : nil
+      %(<div#{id_attribute}#{class_attribute}>#{title_element}
 <div class="content">
-<video src="<%= media_uri(attr :target) %>"#{attribute('width', :width)}#{attribute('height', :height)}<%
-if attr? 'poster' %> poster="<%= media_uri(attr :poster) %>"<% end %><%
-if attr? 'autoplay-option' %> autoplay<% end %><%
-unless attr? 'nocontrols-option' %> controls<% end %><%
-if attr? 'loop-option' %> loop<% end %>>
+<video src="#{node.media_uri(node.attr 'target')}"#{width_attribute}#{height_attribute}#{poster_attribute}#{(node.option? 'autoplay') ? ' autoplay' : nil}#{(node.option? 'nocontrols') ? nil : ' controls'}#{(node.option? 'loop') ? ' loop' : nil}>
 Your browser does not support the video tag.
 </video>
 </div>
-</div>
-    EOS
+</div>)
+    end
+  end
+
+  def template
+    :invoke_result
   end
 end
 
@@ -816,7 +975,7 @@ end
 
 class BlockPageBreakTemplate < BaseTemplate
   def result(node)
-    %(<div style="page-break-after: always;"></div>\n)
+    %(<div style="page-break-after: always;"></div>)
   end
 
   def template
@@ -836,13 +995,13 @@ end
 
 class InlineCalloutTemplate < BaseTemplate
   def result(node)
-    if node.attr? 'icons', 'font'
-      %(<i class="conum">#{node.text}</i>)
-    elsif node.attr? 'icons'
+    if node.document.attr? 'icons', 'font'
+      %(<i class="conum" data-value="#{node.text}"></i><b>(#{node.text})</b>)
+    elsif node.document.attr? 'icons'
       src = node.icon_uri("callouts/#{node.text}")
       %(<img src="#{src}" alt="#{node.text}">)
     else
-      "<b>&lt;#{node.text}&gt;</b>"
+      "<b>(#{node.text})</b>"
     end
   end
 
@@ -852,33 +1011,38 @@ class InlineCalloutTemplate < BaseTemplate
 end
 
 class InlineQuotedTemplate < BaseTemplate
-  NO_TAGS = ['', '']
+  NO_TAGS = [nil, nil, nil]
 
   QUOTE_TAGS = {
-    :emphasis => ['<em>', '</em>'],
-    :strong => ['<strong>', '</strong>'],
-    :monospaced => ['<code>', '</code>'],
-    :superscript => ['<sup>', '</sup>'],
-    :subscript => ['<sub>', '</sub>'],
-    :double => ['&#8220;', '&#8221;'],
-    :single => ['&#8216;', '&#8217;']
+    :emphasis => ['<em>', '</em>', true],
+    :strong => ['<strong>', '</strong>', true],
+    :monospaced => ['<code>', '</code>', true],
+    :superscript => ['<sup>', '</sup>', true],
+    :subscript => ['<sub>', '</sub>', true],
+    :double => ['&#8220;', '&#8221;', false],
+    :single => ['&#8216;', '&#8217;', false]
   }
 
-  def quote_text(text, type, role)
-    start_tag, end_tag = QUOTE_TAGS[type] || NO_TAGS
+  def quote_text(text, type, id, role)
+    open, close, is_tag = QUOTE_TAGS[type] || NO_TAGS
+    anchor = id.nil? ? nil : %(<a id="#{id}"></a>)
     if role
-      if start_tag.start_with? '<'
-        %(#{start_tag.chop} class="#{role}">#{text}#{end_tag})
+      if is_tag
+        quoted_text = %(#{open.chop} class="#{role}">#{text}#{close})
       else
-        %(#{start_tag}<span class="#{role}">#{text}</span>#{end_tag})
+        quoted_text = %(<span class="#{role}">#{open}#{text}#{close}</span>)
       end
+    elsif open.nil?
+      quoted_text = text
     else
-      "#{start_tag}#{text}#{end_tag}"
+      quoted_text = %(#{open}#{text}#{close})
     end
+
+    anchor.nil? ? quoted_text : %(#{anchor}#{quoted_text})
   end
 
   def result(node)
-    quote_text(node.text, node.type, (node.attr 'role'))
+    quote_text(node.text, node.type, node.id, node.role)
   end
 
   def template
@@ -937,12 +1101,16 @@ class InlineAnchorTemplate < BaseTemplate
   def anchor(target, text, type, document, node)
     case type
     when :xref
-      text = document.references[:ids].fetch(target, "[#{target}]") if text.nil?
-      %(<a href="##{target}">#{text}</a>)
+      refid = (node.attr 'refid') || target
+      if text.nil?
+        # FIXME this seems like it should be prepared already
+        text = document.references[:ids].fetch(refid, "[#{refid}]") if text.nil?
+      end
+      %(<a href="#{target}">#{text}</a>)
     when :ref
       %(<a id="#{target}"></a>)
     when :link
-      %(<a href="#{target}"#{(node.attr? 'role') ? " class=\"#{node.attr 'role'}\"" : nil}#{(node.attr? 'window') ? " target=\"#{node.attr 'window'}\"" : nil}>#{text}</a>)
+      %(<a href="#{target}"#{node.role? ? " class=\"#{node.role}\"" : nil}#{(node.attr? 'window') ? " target=\"#{node.attr 'window'}\"" : nil}>#{text}</a>)
     when :bibref
       %(<a id="#{target}"></a>[#{target}])
     end
@@ -958,28 +1126,77 @@ class InlineAnchorTemplate < BaseTemplate
 end
 
 class InlineImageTemplate < BaseTemplate
+  def image(target, type, node)
+    if type == 'icon' && (node.document.attr? 'icons', 'font') 
+      style_class = "icon-#{target}"
+      if node.attr? 'size'
+        style_class = "#{style_class} icon-#{node.attr 'size'}"
+      end
+      if node.attr? 'rotate'
+        style_class = "#{style_class} icon-rotate-#{node.attr 'rotate'}"
+      end
+      if node.attr? 'flip'
+        style_class = "#{style_class} icon-flip-#{node.attr 'flip'}"
+      end
+      title_attribute = (node.attr? 'title') ? %( title="#{node.attr 'title'}") : nil
+      img = %(<i class="#{style_class}"#{title_attribute}></i>)
+    elsif type == 'icon' && !(node.document.attr? 'icons')
+      img = "[#{node.attr 'alt'}]"
+    else
+      if type == 'icon'
+        resolved_target = node.icon_uri target
+      else
+        resolved_target = node.image_uri target
+      end
+
+      attrs = ['alt', 'width', 'height', 'title'].map {|name|
+        if node.attr? name
+          %( #{name}="#{node.attr name}")
+        else
+          nil
+        end
+      }.join
+
+      img = %(<img src="#{resolved_target}"#{attrs}>)
+    end
+
+    if node.attr? 'link'
+      img = %(<a class="image" href="#{node.attr 'link'}"#{(node.attr? 'window') ? " target=\"#{node.attr 'window'}\"" : nil}>#{img}</a>)
+    end
+
+    if node.role?
+      style_classes = %(#{type} #{node.role})
+    else
+      style_classes = type
+    end
+
+    style_attr = (node.attr? 'float') ? %( style="float: #{node.attr 'float'}") : nil
+
+    %(<span class="#{style_classes}"#{style_attr}>#{img}</span>)
+  end
+
+  def result(node)
+    image(node.target, node.type, node)
+  end
+
   def template
-    # care is taken here to avoid a space inside the optional <a> tag
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><span class="image#{role_class}"><%
-if attr? :link %><a class="image" href="<%= attr :link %>"><%
-end %><img src="<%= image_uri(@target) %>" alt="<%= attr :alt %>"#{attribute('width', :width)}#{attribute('height', :height)}#{attribute('title', :title)}><%
-if attr? :link%></a><% end
-%></span>
-    EOS
+    :invoke_result
   end
 end
 
 class InlineFootnoteTemplate < BaseTemplate
+  def result(node)
+    index = node.attr :index
+    if node.type == :xref
+      %(<span class="footnoteref">[<a class="footnote" href="#_footnote_#{index}" title="View footnote.">#{index}</a>]</span>)
+    else
+      id_attribute = node.id ? %( id="_footnote_#{node.id}") : nil
+      %(<span class="footnote"#{id_attribute}>[<a id="_footnoteref_#{index}" class="footnote" href="#_footnote_#{index}" title="View footnote.">#{index}</a>]</span>)
+    end
+  end
+
   def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><%
-if @type == :xref
-%><span class="footnoteref">[<a class="footnote" href="#_footnote_<%= attr :index %>" title="View footnote."><%= attr :index %></a>]</span><%
-else
-%><span class="footnote"<% if @id %> id="_footnote_<%= @id %>"<% end %>>[<a id="_footnoteref_<%= attr :index %>" class="footnote" href="#_footnote_<%= attr :index %>" title="View footnote."><%= attr :index %></a>]</span><%
-end %>
-    EOS
+    :invoke_result
   end
 end