asciidoctor 0.1.0 → 0.1.1

data/lib/asciidoctor/abstract_node.rb

@@ -1,9 +1,10 @@
+module Asciidoctor
 # Public: An abstract base class that provides state and methods for managing a
 # node of AsciiDoc content. The state and methods on this class are comment to
 # all content segments in an AsciiDoc document.
-class Asciidoctor::AbstractNode
+class AbstractNode
 
-  include Asciidoctor::Substituters
+  include Substituters
 
   # Public: Get the element which is the parent of this node
   attr_reader :parent
@@ -24,7 +25,7 @@ class Asciidoctor::AbstractNode
     @parent = (context != :document ? parent : nil)
 
     if !parent.nil?
-      @document = parent.is_a?(Asciidoctor::Document) ? parent : parent.document
+      @document = parent.is_a?(Document) ? parent : parent.document
     else
       @document = nil
     end
@@ -34,20 +35,62 @@ class Asciidoctor::AbstractNode
     @passthroughs = []
   end
 
+  # Public: Get the value of the specified attribute
+  #
+  # Get the value for the specified attribute. First look in the attributes on
+  # this node and return the value of the attribute if found. Otherwise, if
+  # this node is a child of the Document node, look in the attributes of the
+  # Document node and return the value of the attribute if found. Otherwise,
+  # return the default value, which defaults to nil.
+  #
+  # name    - the name of the attribute to lookup as a String or Symbol
+  # default - the value to return if the attribute is not found (default: nil)
+  #
+  # return the value of the attribute or the default value if the attribute
+  # is not found in the attributes of this node or the document node
   def attr(name, default = nil)
+    name = name.to_s if name.is_a?(Symbol)
     if self == @document
-      default.nil? ? @attributes[name.to_s] : @attributes.fetch(name.to_s, default)
+      default.nil? ? @attributes[name] : @attributes.fetch(name, default)
     else
-      default.nil? ? @attributes.fetch(name.to_s, @document.attr(name)) :
-          @attributes.fetch(name.to_s, @document.attr(name, default))
+      default.nil? ? @attributes.fetch(name, @document.attr(name)) :
+          @attributes.fetch(name, @document.attr(name, default))
     end
   end
 
-  def attr?(name)
-    if self == @document
-      @attributes.has_key? name.to_s
+  # Public: Check if the attribute is defined, optionally performing a
+  # comparison of its value
+  #
+  # Check if the attribute is defined. First look in the attributes on this
+  # node. If not found, and this node is a child of the Document node, look in
+  # the attributes of the Document node. If the attribute is found and a
+  # comparison value is specified, return whether the two values match.
+  # Otherwise, return whether the attribute was found.
+  #
+  # name   - the name of the attribute to lookup as a String or Symbol
+  # expect - the expected value of the attribute (default: nil)
+  #
+  # return a Boolean indicating whether the attribute exists and, if a
+  # comparison value is specified, whether the value of the attribute matches
+  # the comparison value
+  def attr?(name, expect = nil)
+    name = name.to_s if name.is_a?(Symbol)
+    if expect.nil?
+      if @attributes.has_key? name
+        true
+      elsif self != @document
+        @document.attributes.has_key? name
+      else
+        false
+      end
     else
-      @attributes.has_key?(name.to_s) || @document.attr?(name)
+      if @attributes.has_key? name
+        @attributes[name] == expect
+      elsif self != @document && @document.attributes.has_key?(name)
+        @document.attributes[name] == expect
+      else
+        false
+      end
     end
   end
 
@@ -119,6 +162,8 @@ class Asciidoctor::AbstractNode
 
   # Public: Construct a reference or data URI to the target image.
   #
+  # If the target image is a URI reference, then leave it untouched.
+  #
   # The target image is resolved relative to the directory retrieved from the
   # specified attribute key, if provided.
   #
@@ -135,7 +180,9 @@ class Asciidoctor::AbstractNode
   #
   # Returns A String reference or data URI for the target image
   def image_uri(target_image, asset_dir_key = 'imagesdir')
-    if @document.safe < Asciidoctor::SafeMode::SECURE && @document.attr?('data-uri')
+    if target_image.include?(':') && target_image.match(Asciidoctor::REGEXP[:uri_sniff])
+      target_image
+    elsif @document.safe < Asciidoctor::SafeMode::SECURE && @document.attr?('data-uri')
       generate_data_uri(target_image, asset_dir_key)
     elsif asset_dir_key && attr?(asset_dir_key)
       File.join(@document.attr(asset_dir_key), target_image)
@@ -157,7 +204,7 @@ class Asciidoctor::AbstractNode
   #
   # Returns A String data URI containing the content of the target image
   def generate_data_uri(target_image, asset_dir_key = nil)
-    Asciidoctor.require_library 'base64'
+    Helpers.require_library 'base64'
 
     mimetype = 'image/' + File.extname(target_image)[1..-1]
     if asset_dir_key
@@ -225,7 +272,7 @@ class Asciidoctor::AbstractNode
   # of this method are still doing a File.join to finish the task
   def normalize_asset_path(asset_ref, asset_name = 'path', autocorrect = true)
     # TODO we may use pathname enough to make it a top-level require
-    Asciidoctor.require_library 'pathname'
+    Helpers.require_library 'pathname'
 
     input_path = @document.base_dir
     asset_path = Pathname.new(asset_ref)
@@ -236,11 +283,11 @@ class Asciidoctor::AbstractNode
       asset_path = asset_path.cleanpath.to_s
     end
 
-    if @document.safe >= Asciidoctor::SafeMode::SAFE
+    if @document.safe >= SafeMode::SAFE
       relative_asset_path = Pathname.new(asset_path).relative_path_from(Pathname.new(input_path)).to_s
       if relative_asset_path.start_with?('..')
         if autocorrect
-          puts 'asciidoctor: WARNING: ' + asset_name + ' has illegal reference to ancestor of base directory'
+          puts "asciidoctor: WARNING: #{asset_name} has illegal reference to ancestor of base directory"
         else
           raise SecurityError, "#{asset_name} has reference to path outside of base directory, disallowed in safe mode: #{asset_path}"
         end
@@ -257,3 +304,4 @@ class Asciidoctor::AbstractNode
   end
 
 end
+end

data/lib/asciidoctor/attribute_list.rb

@@ -1,3 +1,4 @@
+module Asciidoctor
 # Public: Handles parsing AsciiDoc attribute lists into a Hash of key/value
 # pairs. By default, attributes must each be separated by a comma and quotes
 # may be used around the value. If a key is not detected, the value is assigned
@@ -19,7 +20,7 @@
 #    attrlist.parse(['style', 'attribution', 'citetitle'])
 #    => {'style' => 'quote', 'attribution' => 'Famous Person', 'citetitle' => 'Famous Book (2001)'} 
 #
-class Asciidoctor::AttributeList
+class AttributeList
 
   # Public: Regular expressions for detecting the boundary of a value
   BOUNDARY_PATTERNS = {
@@ -215,3 +216,4 @@ class Asciidoctor::AttributeList
   end
 
 end
+end

data/lib/asciidoctor/backends/base_template.rb

@@ -1,10 +1,11 @@
+module Asciidoctor
 # An abstract base class that provides methods for definining and rendering the
 # backend templates. Concrete subclasses must implement the template method.
 #
 # NOTE we must use double quotes for attribute values in the HTML/XML output to
 # prevent quote processing. This requirement seems hackish, but AsciiDoc has
 # this same issue.
-class Asciidoctor::BaseTemplate
+class BaseTemplate
 
   attr_reader :view
   attr_reader :eruby
@@ -38,11 +39,19 @@ class Asciidoctor::BaseTemplate
   # node   - The concrete instance of AsciiDoctor::AbstractNode to render
   # locals - A Hash of additional variables. Not currently in use.
   def render(node = Object.new, locals = {})
-    # this is hot code, so we inline both calls rather than capture output to a local variable
-    if node.renderer.compact && (@view == 'document' || @view == 'embedded')
-      compact(template.result(node.get_binding(self)))
+    tmpl = template
+    if tmpl.equal? :content
+      result = node.content
+    #elsif tmpl.is_a?(String)
+    #  result = tmpl
     else
-      template.result(node.get_binding(self))
+      result = tmpl.result(node.get_binding(self))
+    end
+
+    if (@view == 'document' || @view == 'embedded') && node.renderer.compact
+      compact result
+    else
+      result
     end
   end
 
@@ -54,7 +63,7 @@ class Asciidoctor::BaseTemplate
   # returns the text with blank lines removed and HTML line feed entities
   # converted to an endline character.
   def compact(str)
-    str.gsub(Asciidoctor::BLANK_LINES_PATTERN, '').gsub(Asciidoctor::LINE_FEED_ENTITY, "\n")
+    str.gsub(BLANK_LINES_PATTERN, '').gsub(LINE_FEED_ENTITY, "\n")
   end
 
   # Public: Preserve endlines by replacing them with the HTML line feed entity.
@@ -65,7 +74,7 @@ class Asciidoctor::BaseTemplate
   # text  - the String to process
   # node  - the concrete instance of Asciidoctor::AbstractNode being rendered
   def preserve_endlines(str, node)
-    node.renderer.compact ? str.gsub("\n", Asciidoctor::LINE_FEED_ENTITY) : str
+    node.renderer.compact ? str.gsub("\n", LINE_FEED_ENTITY) : str
   end
 
   def template
@@ -96,3 +105,4 @@ class Asciidoctor::BaseTemplate
     attribute('id', '@id')
   end
 end
+end

data/lib/asciidoctor/backends/docbook45.rb

@@ -1,35 +1,40 @@
-class Asciidoctor::BaseTemplate
-  def role
-    attribute('role', :role)
-  end
+module Asciidoctor
+  class BaseTemplate
+    def tag(name, key)
+      type = key.is_a?(Symbol) ? :attr : :var
+      key = key.to_s
+      if type == :attr
+        # example: <% if attr? 'foo' %><bar><%= attr 'foo' %></bar><% end %>
+        %(<% if attr? '#{key}' %><#{name}><%= attr '#{key}' %></#{name}><% end %>)
+      else
+        # example: <% unless foo.to_s.empty? %><bar><%= foo %></bar><% end %>
+        %(<% unless #{key}.to_s.empty? %><#{name}><%= #{key} %></#{name}><% end %>)
+      end
+    end
 
-  def xreflabel
-    attribute('xreflabel', :reftext)
-  end
+    def title_tag(optional = true)
+      if optional
+        %q{<%= title? ? "<title>#{title}</title>" : '' %>}
+      else
+        %q{<title><%= title %></title>}
+      end
+    end
 
-  def title
-    tag('title', 'title')
-  end
+    def common_attrs(id, role, reftext)
+      %(#{id && " id=\"#{id}\""}#{role && " role=\"#{role}\""}#{reftext && " xreflabel=\"#{reftext}\""})
+    end
 
-  def tag(name, key)
-    type = key.is_a?(Symbol) ? :attr : :var
-    key = key.to_s
-    if type == :attr
-      # example: <% if attr? 'foo' %><bar><%= attr 'foo' %></bar><% end %>
-      %(<% if attr? '#{key}' %><#{name}><%= attr '#{key}' %></#{name}><% end %>)
-    else
-      # example: <% unless foo.to_s.empty? %><bar><%= foo %></bar><% end %>
-      %(<% unless #{key}.to_s.empty? %><#{name}><%= #{key} %></#{name}><% end %>)
+    def common_attrs_erb
+      %q{<%= template.common_attrs(@id, (attr 'role'), (attr 'reftext')) %>}
     end
   end
-end
 
-module Asciidoctor::DocBook45
-class DocumentTemplate < ::Asciidoctor::BaseTemplate
+module DocBook45
+class DocumentTemplate < BaseTemplate
   def docinfo
     <<-EOF
     <% if has_header? && !notitle %>
-    #{tag 'title', '@header.name'}
+    #{tag 'title', '@header.title'}
     <% end %>
     <% if attr? :revdate %>
     <date><%= attr :revdate %></date>
@@ -65,14 +70,14 @@ class DocumentTemplate < ::Asciidoctor::BaseTemplate
 <% if attr? :toc %><?asciidoc-toc?><% end %>
 <% if attr? :numbered %><?asciidoc-numbered?><% end %>
 <% if doctype == 'book' %>
-<book lang="en">
+<book<% unless attr? :nolang %> lang="<%= attr :lang, 'en' %>"<% end %>>
   <bookinfo>
 #{docinfo}
   </bookinfo>
 <%= content %>
 </book>
 <% else %>
-<article lang="en">
+<article<% unless attr? :nolang %> lang="<%= attr :lang, 'en' %>"<% end %>>
   <articleinfo>
 #{docinfo}
   </articleinfo>
@@ -83,19 +88,17 @@ class DocumentTemplate < ::Asciidoctor::BaseTemplate
   end
 end
 
-class EmbeddedTemplate < ::Asciidoctor::BaseTemplate
+class EmbeddedTemplate < BaseTemplate
   def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><%= content %>
-  EOS
+    :content
   end
 end
 
-class BlockPreambleTemplate < ::Asciidoctor::BaseTemplate
+class BlockPreambleTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><% if document.doctype == 'book' %>
-<preface#{id}#{role}#{xreflabel}>
+<%#encoding:UTF-8%><% if @document.doctype == 'book' %>
+<preface#{common_attrs_erb}>
   <title><%= title %></title>
 <%= content %>
 </preface>
@@ -106,46 +109,62 @@ class BlockPreambleTemplate < ::Asciidoctor::BaseTemplate
   end
 end
 
-class SectionTemplate < ::Asciidoctor::BaseTemplate
+class SectionTemplate < BaseTemplate
+  def section(sec)
+    if sec.special
+      tag = sec.level <= 1 ? sec.sectname : 'section'
+    else
+      tag = sec.document.doctype == 'book' && sec.level <= 1 ? 'chapter' : 'section'
+    end
+    %(<#{tag}#{common_attrs(sec.id, (sec.attr 'role'), (sec.attr 'reftext'))}>
+  #{sec.title? ? "<title>#{sec.title}</title>" : nil}
+  #{sec.content}
+</#{tag}>)
+  end
+
   def template
+    # hot piece of code, optimized for speed
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><<%= @special ? @sectname : (document.doctype == 'book' && @level <= 1 ? 'chapter' : 'section') %>#{id}#{role}#{xreflabel}>
-  #{title}
-<%= content %>
-</<%= @special ? @sectname : (document.doctype == 'book' && @level <= 1 ? 'chapter' : 'section') %>>
+<%#encoding:UTF-8%><%= template.section(self) %>
     EOF
   end
 end
 
-class BlockFloatingTitleTemplate < ::Asciidoctor::BaseTemplate
+class BlockFloatingTitleTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><bridgehead#{id}#{role}#{xreflabel} renderas="sect<%= @level %>"><%= title %></bridgehead>
+<%#encoding:UTF-8%><bridgehead#{common_attrs_erb} renderas="sect<%= @level %>"><%= title %></bridgehead>
     EOS
   end
 end
 
 
-class BlockParagraphTemplate < ::Asciidoctor::BaseTemplate
+class BlockParagraphTemplate < BaseTemplate
+
+  def paragraph(id, role, reftext, title, content)
+    if title
+      %(<formalpara#{common_attrs(id, role, reftext)}>
+  <title>#{title}</title>
+  <para>#{content}</para>
+</formalpara>)
+    else
+      %(<simpara#{common_attrs(id, role, reftext)}>#{content}</simpara>)
+    end
+  end
+
   def template
+    # very hot piece of code, optimized for speed
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><% if !title? %>
-<simpara#{id}#{role}#{xreflabel}><%= content %></simpara>
-<% else %>
-<formalpara#{id}#{role}#{xreflabel}>
-  <title><%= title %></title>
-  <para><%= content %></para>
-</formalpara>
-<% end %>
+<%#encoding:UTF-8%><%= template.paragraph(@id, (attr 'role'), (attr 'reftext'), title? ? title : nil, content) %>
     EOF
   end
 end
 
-class BlockAdmonitionTemplate < ::Asciidoctor::BaseTemplate
+class BlockAdmonitionTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><<%= attr :name %>#{id}#{role}#{xreflabel}>
-  #{title}
+<%#encoding:UTF-8%><<%= attr :name %>#{common_attrs_erb}>
+  #{title_tag}
   <% if blocks? %>
 <%= content %>
   <% else %>
@@ -156,12 +175,12 @@ class BlockAdmonitionTemplate < ::Asciidoctor::BaseTemplate
   end
 end
 
-class BlockUlistTemplate < ::Asciidoctor::BaseTemplate
+class BlockUlistTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><% if (attr :style) == 'bibliography' %>
-<bibliodiv#{id}#{role}#{xreflabel}>
-  #{title}
+<%#encoding:UTF-8%><% if attr? :style, 'bibliography' %>
+<bibliodiv#{common_attrs_erb}>
+  #{title_tag}
   <% content.each do |li| %>
     <bibliomixed>
       <bibliomisc><%= li.text %></bibliomisc>
@@ -172,8 +191,8 @@ class BlockUlistTemplate < ::Asciidoctor::BaseTemplate
   <% end %>
 </bibliodiv>
 <% else %>
-<itemizedlist#{id}#{role}#{xreflabel}>
-  #{title}
+<itemizedlist#{common_attrs_erb}>
+  #{title_tag}
   <% content.each do |li| %>
     <listitem>
       <simpara><%= li.text %></simpara>
@@ -188,11 +207,11 @@ class BlockUlistTemplate < ::Asciidoctor::BaseTemplate
   end
 end
 
-class BlockOlistTemplate < ::Asciidoctor::BaseTemplate
+class BlockOlistTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><orderedlist#{id}#{role}#{xreflabel}#{attribute('numeration', :style)}>
-  #{title}
+<%#encoding:UTF-8%><orderedlist#{common_attrs_erb}#{attribute('numeration', :style)}>
+  #{title_tag}
   <% content.each do |li| %>
     <listitem>
       <simpara><%= li.text %></simpara>
@@ -206,25 +225,25 @@ class BlockOlistTemplate < ::Asciidoctor::BaseTemplate
   end
 end
 
-class BlockColistTemplate < ::Asciidoctor::BaseTemplate
+class BlockColistTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><calloutlist#{id}#{role}#{xreflabel}>
-  #{title}
+<%#encoding:UTF-8%><calloutlist#{common_attrs_erb}>
+  #{title_tag}
   <% content.each do |li| %>
-    <callout arearefs="<%= li.attr :coids %>">
-      <para><%= li.text %></para>
-      <% if li.blocks? %>
+  <callout arearefs="<%= li.attr :coids %>">
+    <para><%= li.text %></para>
+    <% if li.blocks? %>
 <%= li.content %>
-      <% end %>
-    </callout>
+    <% end %>
+  </callout>
   <% end %>
 </calloutlist>
     EOF
   end
 end
 
-class BlockDlistTemplate < ::Asciidoctor::BaseTemplate
+class BlockDlistTemplate < BaseTemplate
   LIST_TAGS = {
     'labeled' => {
       :list => 'variablelist',
@@ -249,8 +268,8 @@ class BlockDlistTemplate < ::Asciidoctor::BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
 <%#encoding:UTF-8%><% tags = (template.class::LIST_TAGS[attr :style] || template.class::LIST_TAGS['labeled']) %>
-<% if tags[:list] %><<%= tags[:list] %>#{id}#{role}#{xreflabel}><% end %>
-  #{title}
+<% if tags[:list] %><<%= tags[:list] %>#{common_attrs_erb}><% end %>
+  #{title_tag}
   <% content.each do |dt, dd| %>
   <<%= tags[:entry] %>>
     <<%= tags[:term] %>>
@@ -273,28 +292,26 @@ class BlockDlistTemplate < ::Asciidoctor::BaseTemplate
   end
 end
 
-class BlockOpenTemplate < ::Asciidoctor::BaseTemplate
+class BlockOpenTemplate < BaseTemplate
   def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><%= content %>
-    EOS
+    :content
   end
 end
 
-class BlockListingTemplate < ::Asciidoctor::BaseTemplate
+class BlockListingTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
 <%#encoding:UTF-8%><% if !title? %>
-<% if (attr :style) == 'source' %>
-<programlisting#{id}#{role}#{xreflabel}#{attribute('language', :language)} linenumbering="<%= (attr? :linenums) ? 'numbered' : 'unnumbered' %>"><%= template.preserve_endlines(content, self) %></programlisting>
+<% if attr? :style, 'source' %>
+<programlisting#{common_attrs_erb}#{attribute('language', :language)} linenumbering="<%= (attr? :linenums) ? 'numbered' : 'unnumbered' %>"><%= template.preserve_endlines(content, self) %></programlisting>
 <% else %>
-<screen#{id}#{role}#{xreflabel}><%= template.preserve_endlines(content, self) %></screen>
+<screen#{common_attrs_erb}><%= template.preserve_endlines(content, self) %></screen>
 <% end %>
 <% else %>
-<formalpara#{id}#{role}#{xreflabel}>
-  <title><%= title %></title>
+<formalpara#{common_attrs_erb}>
+  #{title_tag false}
   <para>
-    <% if (attr :style) == 'source' %>
+    <% if attr :style, 'source' %>
     <programlisting language="<%= attr :language %>" linenumbering="<%= (attr? :linenums) ? 'numbered' : 'unnumbered' %>"><%= template.preserve_endlines(content, self) %></programlisting>
     <% else %>
     <screen><%= template.preserve_endlines(content, self) %></screen>
@@ -306,14 +323,14 @@ class BlockListingTemplate < ::Asciidoctor::BaseTemplate
   end
 end
 
-class BlockLiteralTemplate < ::Asciidoctor::BaseTemplate
+class BlockLiteralTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
 <%#encoding:UTF-8%><% if !title? %>
-<literallayout#{id}#{role}#{xreflabel} class="monospaced"><%= template.preserve_endlines(content, self) %></literallayout>
+<literallayout#{common_attrs_erb} class="monospaced"><%= template.preserve_endlines(content, self) %></literallayout>
 <% else %>
-<formalpara#{id}#{role}#{xreflabel}>
-  <title><%= title %></title>
+<formalpara#{common_attrs_erb}>
+  #{title_tag false}
   <para>
     <literallayout class="monospaced"><%= template.preserve_endlines(content, self) %></literallayout>
   </para>
@@ -323,33 +340,33 @@ class BlockLiteralTemplate < ::Asciidoctor::BaseTemplate
   end
 end
 
-class BlockExampleTemplate < ::Asciidoctor::BaseTemplate
+class BlockExampleTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><example#{id}#{role}#{xreflabel}>
-  #{title}
+<%#encoding:UTF-8%><example#{common_attrs_erb}>
+  #{title_tag}
 <%= content %>
 </example>
     EOF
   end
 end
 
-class BlockSidebarTemplate < ::Asciidoctor::BaseTemplate
+class BlockSidebarTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><sidebar#{id}#{role}#{xreflabel}>
-  #{title}
+<%#encoding:UTF-8%><sidebar#{common_attrs_erb}>
+  #{title_tag}
 <%= content %>
 </sidebar>
     EOF
   end
 end
 
-class BlockQuoteTemplate < ::Asciidoctor::BaseTemplate
+class BlockQuoteTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><blockquote#{id}#{role}#{xreflabel}>
-  #{title}
+<%#encoding:UTF-8%><blockquote#{common_attrs_erb}>
+  #{title_tag}
   <% if (attr? :attribution) || (attr? :citetitle) %>
   <attribution>
     <% if attr? :attribution %>
@@ -358,7 +375,7 @@ class BlockQuoteTemplate < ::Asciidoctor::BaseTemplate
     #{tag 'citetitle', :citetitle}
   </attribution>
   <% end %>
-<% if !buffer.nil? %>
+<% if !@buffer.nil? %>
 <simpara><%= content %></simpara>
 <% else %>
 <%= content %>
@@ -368,11 +385,11 @@ class BlockQuoteTemplate < ::Asciidoctor::BaseTemplate
   end
 end
 
-class BlockVerseTemplate < ::Asciidoctor::BaseTemplate
+class BlockVerseTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><blockquote#{id}#{role}#{xreflabel}>
-  #{title}
+<%#encoding:UTF-8%><blockquote#{common_attrs_erb}>
+  #{title_tag}
   <% if (attr? :attribution) || (attr? :citetitle) %>
   <attribution>
     <% if attr? :attribution %>
@@ -387,20 +404,18 @@ class BlockVerseTemplate < ::Asciidoctor::BaseTemplate
   end
 end
 
-class BlockPassTemplate < ::Asciidoctor::BaseTemplate
+class BlockPassTemplate < BaseTemplate
   def template
-    @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><%= content %>
-    EOS
+    :content
   end
 end
 
-class BlockTableTemplate < ::Asciidoctor::BaseTemplate
+class BlockTableTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><<%= title? ? 'table' : 'informaltable'%>#{id}#{role}#{xreflabel} frame="<%= attr :frame, 'all'%>"
+<%#encoding:UTF-8%><<%= title? ? 'table' : 'informaltable'%>#{common_attrs_erb} frame="<%= attr :frame, 'all'%>"
     rowsep="<%= ['none', 'cols'].include?(attr :grid) ? 0 : 1 %>" colsep="<%= ['none', 'rows'].include?(attr :grid) ? 0 : 1 %>">
-  #{title}
+  #{title_tag}
   <% if attr? :width %>
   <?dbhtml table-width="<%= attr :width %>"?>
   <?dbfo table-width="<%= attr :width %>"?>
@@ -410,15 +425,15 @@ class BlockTableTemplate < ::Asciidoctor::BaseTemplate
     <% @columns.each do |col| %>
     <colspec colname="col_<%= col.attr :colnumber %>" colwidth="<%= col.attr((attr? :width) ? :colabswidth : :colpcwidth) %>*"/>
     <% end %>
-    <% [:head, :foot, :body].select {|tsec| !rows[tsec].empty? }.each do |tsec| %>
-    <t<%= tsec %>>
-      <% @rows[tsec].each do |row| %>
+    <% [:head, :foot, :body].select {|tblsec| !rows[tblsec].empty? }.each do |tblsec| %>
+    <t<%= tblsec %>>
+      <% @rows[tblsec].each do |row| %>
       <row>
         <% row.each do |cell| %>
         <entry#{attribute('align', 'cell.attr :halign')}#{attribute('valign', 'cell.attr :valign')}<%
         if cell.colspan %> namest="col_<%= cell.column.attr :colnumber %>" nameend="col_<%= (cell.column.attr :colnumber) + cell.colspan - 1 %>"<%
         end %><% if cell.rowspan %> morerows="<%= cell.rowspan - 1 %>"<% end %>><%
-        if tsec == :head %><%= cell.text %><%
+        if tblsec == :head %><%= cell.text %><%
         else %><%
         case cell.attr(:style)
           when :asciidoc %><%= cell.content %><%
@@ -430,7 +445,7 @@ class BlockTableTemplate < ::Asciidoctor::BaseTemplate
         <% end %>
       </row>
       <% end %>
-    </t<%= tsec %>>
+    </t<%= tblsec %>>
     <% end %>
   </tgroup>
 </<%= title? ? 'table' : 'informaltable'%>>
@@ -438,11 +453,11 @@ class BlockTableTemplate < ::Asciidoctor::BaseTemplate
   end
 end
 
-class BlockImageTemplate < ::Asciidoctor::BaseTemplate
+class BlockImageTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><%#encoding:UTF-8%><figure#{id}#{role}#{xreflabel}>
-  #{title}
+<%#encoding:UTF-8%><%#encoding:UTF-8%><figure#{common_attrs_erb}>
+  #{title_tag}
   <mediaobject>
     <imageobject>
       <imagedata fileref="<%= image_uri(attr :target) %>"#{attribute('contentwidth', :width)}#{attribute('contentdepth', :height)}/>
@@ -454,7 +469,7 @@ class BlockImageTemplate < ::Asciidoctor::BaseTemplate
   end
 end
 
-class BlockRulerTemplate < ::Asciidoctor::BaseTemplate
+class BlockRulerTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
 <%#encoding:UTF-8%><simpara><?asciidoc-hr?></simpara>
@@ -462,59 +477,74 @@ class BlockRulerTemplate < ::Asciidoctor::BaseTemplate
   end
 end
 
-class InlineBreakTemplate < ::Asciidoctor::BaseTemplate
+class BlockPageBreakTemplate < BaseTemplate
+  def template
+    @template ||= @eruby.new <<-EOF
+<%#encoding:UTF-8%><simpara><?asciidoc-pagebreak?></simpara>
+    EOF
+  end
+end
+
+class InlineBreakTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><%= text %><?asciidoc-br?>
+<%#encoding:UTF-8%><%= @text %><?asciidoc-br?>
     EOF
   end
 end
 
-class InlineQuotedTemplate < ::Asciidoctor::BaseTemplate
+class InlineQuotedTemplate < BaseTemplate
   QUOTED_TAGS = {
     :emphasis => ['<emphasis>', '</emphasis>'],
     :strong => ['<emphasis role="strong">', '</emphasis>'],
     :monospaced => ['<literal>', '</literal>'],
     :superscript => ['<superscript>', '</superscript>'],
     :subscript => ['<subscript>', '</subscript>'],
-    :double => [Asciidoctor::INTRINSICS['ldquo'], Asciidoctor::INTRINSICS['rdquo']],
-    :single => [Asciidoctor::INTRINSICS['lsquo'], Asciidoctor::INTRINSICS['rsquo']],
-    :none => ['', '']
+    :double => ['&#8220;', '&#8221;'],
+    :single => ['&#8216;', '&#8217;']
+    #:none => ['', '']
   }
 
+  def quote(text, type, role)
+    start_tag, end_tag = QUOTED_TAGS[type] || ['', '']
+    if role
+      "#{start_tag}<phrase role=\"#{role}\">#{text}</phrase>#{end_tag}"
+    else
+      "#{start_tag}#{text}#{end_tag}"
+    end
+  end
+
   def template
+    # very hot piece of code, optimized for speed
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><% tags = template.class::QUOTED_TAGS[@type] %><%= tags.first %><%
-if attr? :role %><phrase#{role}><%
-end %><%= @text %><%
-if attr? :role %></phrase><%
-end %><%= tags.last %>
+<%#encoding:UTF-8%><%= template.quote(@text, @type, attr('role')) %>
     EOF
   end
 end
 
-class InlineAnchorTemplate < ::Asciidoctor::BaseTemplate
+class InlineAnchorTemplate < BaseTemplate
+  def anchor(target, text, type)
+    case type
+    when :ref
+      %(<anchor id="#{target}" xreflabel="#{text}"/>)
+    when :xref
+      text.nil? ? %(<xref linkend="#{target}"/>) : %(<link linkend="#{target}">#{text}</link>)
+    when :link
+      %(<ulink url="#{target}">#{text}</ulink>)
+    when :bibref
+      %(<anchor id="#{target}" xreflabel="[#{target}]"/>[#{target}])
+    end
+  end
+
   def template
-    @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><% if @type == :xref
-%><%
-  if @text.nil?
-%><xref linkend="<%= @target %>"/><%
-  else
-%><link linkend="<%= @target %>"><%= @text %></link><%
-  end %><%
-elsif @type == :ref
-%><anchor id="<%= @target %>" xreflabel="<%= @text %>"/><%
-elsif @type == :bibref
-%><anchor id="<%= @target %>" xreflabel="[<%= @target %>]"/>[<%= @target %>]<%
-else
-%><ulink url="<%= @target %>"><%= @text %></ulink><%
-end %>
-    EOF
+    # hot piece of code, optimized for speed
+    @template ||= @eruby.new <<-EOS
+<%#encoding:UTF-8%><%= template.anchor(@target, @text, @type) %>
+    EOS
   end
 end
 
-class InlineImageTemplate < ::Asciidoctor::BaseTemplate
+class InlineImageTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
 <%#encoding:UTF-8%><inlinemediaobject>
@@ -527,11 +557,11 @@ class InlineImageTemplate < ::Asciidoctor::BaseTemplate
   end
 end
 
-class InlineFootnoteTemplate < ::Asciidoctor::BaseTemplate
+class InlineFootnoteTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOS
 <%#encoding:UTF-8%><%
-if type == :xref
+if @type == :xref
 %><footnoteref linkend="<%= @target %>"/><%
 else
 %><footnote#{id}><simpara><%= @text %></simpara></footnote><%
@@ -540,7 +570,7 @@ end %>
   end
 end
 
-class InlineCalloutTemplate < ::Asciidoctor::BaseTemplate
+class InlineCalloutTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
 <%#encoding:UTF-8%><co#{id}/>
@@ -548,10 +578,10 @@ class InlineCalloutTemplate < ::Asciidoctor::BaseTemplate
   end
 end
 
-class InlineIndextermTemplate < ::Asciidoctor::BaseTemplate
+class InlineIndextermTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><% if type == :visible %><indexterm><primary><%= @text %></primary></indexterm><%= @text %><%
+<%#encoding:UTF-8%><% if @type == :visible %><indexterm><primary><%= @text %></primary></indexterm><%= @text %><%
 else %><% terms = (attr :terms); numterms = terms.size %><%
 if numterms > 2 %><indexterm>
   <primary><%= terms[0] %></primary><secondary><%= terms[1] %></secondary><tertiary><%= terms[2] %></tertiary>
@@ -566,4 +596,6 @@ if numterms > 1 %><indexterm>
     EOS
   end
 end
-end
+
+end # module DocBook45
+end # module Asciidoctor