asciidoctor 0.1.2 → 0.1.3

data/lib/asciidoctor/table.rb

@@ -44,12 +44,6 @@ class Table < AbstractBlock
     }
   }
 
-  # Public: A compiled Regexp to match a blank line
-  BLANK_LINE_PATTERN = /\n[[:blank:]]*\n/
-
-  # Public: Get/Set the String caption (unused, necessary for compatibility w/ next_block)
-  attr_accessor :caption
-
   # Public: Get/Set the columns for this table
   attr_accessor :columns
 
@@ -57,23 +51,24 @@ class Table < AbstractBlock
   # and body rows)
   attr_accessor :rows
 
+  # Public: Boolean specifies whether this table has a header row
+  attr_reader :header_option
+
   def initialize(parent, attributes)
     super(parent, :table)
-    # QUESTION since caption is on block, should it go to AbstractBlock?
-    @caption = nil
     @rows = Rows.new([], [], [])
     @columns = []
 
-    unless @attributes.has_key? 'tablepcwidth'
-      # smell like we need a utility method here
-      # to resolve an integer width from potential bogus input
-      pcwidth = attributes['width']
-      pcwidth_intval = pcwidth.to_i.abs
-      if pcwidth_intval == 0 && pcwidth != "0" || pcwidth_intval > 100
-        pcwidth_intval = 100
-      end
-      @attributes['tablepcwidth'] = pcwidth_intval
+    @has_header_option = attributes.has_key? 'header-option'
+
+    # smell like we need a utility method here
+    # to resolve an integer width from potential bogus input
+    pcwidth = attributes['width']
+    pcwidth_intval = pcwidth.to_i.abs
+    if pcwidth_intval == 0 && pcwidth != "0" || pcwidth_intval > 100
+      pcwidth_intval = 100
     end
+    @attributes['tablepcwidth'] = pcwidth_intval
 
     if @document.attributes.has_key? 'pagewidth'
       @attributes['tableabswidth'] ||=
@@ -81,6 +76,12 @@ class Table < AbstractBlock
     end
   end
 
+  # Internal: Returns whether the current row being processed is
+  # the header row
+  def header_row?
+    @has_header_option && @rows.body.size == 0
+  end
+
   # Internal: Creates the Column objects from the column spec
   #
   # returns nothing
@@ -130,9 +131,6 @@ class Table < AbstractBlock
   # rendered and returned as content that can be included in the
   # parent block's template.
   def render
-    Debug.debug { "Now attempting to render for table my own bad #{self}" }
-    Debug.debug { "Parent is #{@parent}" }
-    Debug.debug { "Renderer is #{renderer}" }
     @document.playback_attributes @attributes
     renderer.render('block_table', self) 
   end
@@ -154,6 +152,9 @@ class Table::Column < AbstractNode
     update_attributes(attributes)
   end
 
+  # Public: An alias to the parent block (which is always a Table)
+  alias :table :parent
+
   # Internal: Calculate and assign the widths (percentage and absolute) for this column
   #
   # This method assigns the colpcwidth and colabswidth attributes.
@@ -209,14 +210,19 @@ class Table::Cell < AbstractNode
       end
       update_attributes(attributes)
     end
-    if @attributes['style'] == :asciidoc
+    # only allow AsciiDoc cells in non-header rows
+    if @attributes['style'] == :asciidoc && !column.table.header_row?
+      # FIXME hide doctitle from nested document; temporary workaround to fix
+      # nested document seeing doctitle and assuming it has its own document title
+      parent_doctitle = @document.attributes.delete('doctitle')
       @inner_document = Document.new(@text, :header_footer => false, :parent => @document)
+      @document.attributes['doctitle'] = parent_doctitle unless parent_doctitle.nil?
     end
   end
 
   # Public: Get the text with normal substitutions applied for this cell. Used for cells in the head rows
   def text
-    apply_normal_subs(@text)
+    apply_normal_subs(@text).strip
   end
 
   # Public: Handles the body data (tbody, tfoot), applying styles and partitioning into paragraphs
@@ -225,7 +231,7 @@ class Table::Cell < AbstractNode
     if style == :asciidoc
       @inner_document.render
     else
-      text.split(Table::BLANK_LINE_PATTERN).map {|p|
+      text.split(BLANK_LINE_PATTERN).map {|p|
         !style || style == :header ? p : Inline.new(parent, :quoted, p, :type => attr('style')).render
       }
     end
@@ -314,7 +320,7 @@ class Table::ParserContext
   #
   # returns the String after the match
   def skip_matched_delimiter(match, escaped = false)
-    @buffer << (escaped ? match.pre_match.chop : match.pre_match) << @delimiter
+    @buffer = %(#@buffer#{escaped ? match.pre_match.chop : match.pre_match}#@delimiter)
     match.post_match
   end
 

data/lib/asciidoctor/version.rb

@@ -1,3 +1,3 @@
 module Asciidoctor
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/man/asciidoctor.1

@@ -2,12 +2,12 @@
 .\"     Title: asciidoctor
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/25/2013
+.\"      Date: 05/30/2013
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "04/25/2013" "\ \&" "\ \&"
+.TH "ASCIIDOCTOR" "1" "05/30/2013" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -71,20 +71,22 @@ when Asciidoctor is invoked using this script\&.
 Define, override or delete a document attribute\&. Command\-line attributes take precedence over attributes defined in the source file\&.
 .sp
 \fIATTRIBUTE\fR
-is formatted as a key\-value pair, in the form
-\fINAME=VALUE\fR\&. Values containing spaces should be enclosed in double\-quote characters\&. Alternate acceptable forms are
+is normally formatted as a key\-value pair, in the form
+\fINAME=VALUE\fR\&. Alternate acceptable forms are
 \fINAME\fR
-(the
+(where the
 \fIVALUE\fR
 defaults to an empty string),
 \fINAME!\fR
-(deletes the
+(unassigns the
 \fINAME\fR
 attribute) and
 \fINAME=VALUE@\fR
-(does not override
+(where
+\fIVALUE\fR
+does not override value of
 \fINAME\fR
-attribute if already defined in the source file)\&.
+attribute if it\(cqs already defined in the source document)\&. Values containing spaces should be enclosed in quotes\&.
 .sp
 This option may be specified more than once\&.
 .RE
@@ -94,28 +96,32 @@ This option may be specified more than once\&.
 Backend output file format:
 \fIdocbook45\fR
 or
-\fIhtml5\fR\&. You can also use the backend alias names
+\fIhtml5\fR
+supported out of the box\&. You can also use the backend alias names
 \fIhtml\fR
 (aliased to
 \fIhtml5\fR) or
 \fIdocbook\fR
 (aliased to
 \fIdocbook45\fR)\&. Defaults to
-\fIhtml5\fR\&.
+\fIhtml5\fR\&. Other options can be passed, but if Asciidoctor cannot find the backend, it will fail during rendering\&.
 .RE
 .PP
 \fB\-d, \-\-doctype\fR=\fIDOCTYPE\fR
 .RS 4
 Document type:
-\fIarticle\fR
+\fIarticle\fR,
+\fIbook\fR
 or
-\fIbook\fR\&. Sets the root element when using the
+\fIinline\fR\&. Sets the root element when using the
 \fIdocbook\fR
 backend and the style class on the HTML body element when using the
 \fIhtml\fR
 backend\&. The
 \fIbook\fR
-document type allows multiple level\-0 section titles in a single document\&. Defaults to
+document type allows multiple level\-0 section titles in a single document\&. The
+\fIinline\fR
+document type allows the content of a single paragraph to be formatted and returned without wrapping it in a containing element\&. Defaults to
 \fIarticle\fR\&.
 .RE
 .SS "Rendering Control"
@@ -164,7 +170,7 @@ Suppress the document header and footer in the output\&.
 .PP
 \fB\-T, \-\-template\-dir\fR=\fIDIR\fR
 .RS 4
-Directory containing custom render templates that override one or more templates from the the built\-in set\&. If there is a folder in the directory that matches the backend, the templates from that folder will be used\&.
+Directory containing custom render templates that override one or more templates from the built\-in set\&. If there is a folder in the directory that matches the backend, the templates from that folder will be used\&.
 .RE
 .SS "Processing Information"
 .PP
@@ -204,7 +210,7 @@ Failure (syntax or usage error; configuration error; document processing failure
 See the \fBAsciidoctor\fR issue tracker: <\fBhttps://github\&.com/asciidoctor/asciidoctor/issues?state=open\fR>
 .SH "AUTHORS"
 .sp
-\fBAsciidoctor\fR was written by Ryan Waldron, Dan Allen and other contributors\&.
+\fBAsciidoctor\fR was written by Dan Allen, Ryan Waldron, Jason Porter, Nick Hengeveld and other contributors\&.
 .sp
 \fBAsciiDoc\fR was written by Stuart Rackham and has received contributions from many other individuals\&.
 .SH "RESOURCES"
@@ -218,4 +224,4 @@ GitHub organization: <\fBhttp://github\&.com/asciidoctor\fR>
 Mailinglist / forum: <\fBhttp://discuss\&.asciidoctor\&.org\fR>
 .SH "COPYING"
 .sp
-Copyright (C) Ryan Waldron and Dan Allen\&. Free use of this software is granted under the terms of the MIT License\&.
+Copyright (C) 2012\-2013 Dan Allen and Ryan Waldron\&. Free use of this software is granted under the terms of the MIT License\&.

data/man/asciidoctor.ad

@@ -1,6 +1,7 @@
 asciidoctor(1)
 ==============
 :doctype: manpage
+:awestruct-layout: base
 
 
 NAME
@@ -52,24 +53,28 @@ Document Settings
     Define, override or delete a document attribute. Command-line attributes
     take precedence over attributes defined in the source file.
 +
-'ATTRIBUTE' is formatted as a key-value pair, in the form 'NAME=VALUE'. Values
-containing spaces should be enclosed in double-quote characters.  Alternate
-acceptable forms are 'NAME' (the 'VALUE' defaults to an empty string), 'NAME!'
-(deletes the 'NAME' attribute) and 'NAME=VALUE@' (does not override 'NAME'
-attribute if already defined in the source file).
+'ATTRIBUTE' is normally formatted as a key-value pair, in the form 'NAME=VALUE'.
+Alternate acceptable forms are 'NAME' (where the 'VALUE' defaults to an empty
+string), 'NAME!' (unassigns the 'NAME' attribute) and 'NAME=VALUE@' (where
+'VALUE' does not override value of 'NAME' attribute if it's already defined in
+the source document). Values containing spaces should be enclosed in quotes.
 +
 This option may be specified more than once. 
 
 *-b, --backend*='BACKEND'::
-    Backend output file format: 'docbook45' or 'html5'.  You can also use the
-    backend alias names 'html' (aliased to 'html5') or 'docbook' (aliased to
-    'docbook45'). Defaults to 'html5'.
+    Backend output file format: 'docbook45' or 'html5' supported out of the box.  
+    You can also use the backend alias names 'html' (aliased to 'html5') or 
+    'docbook' (aliased to 'docbook45'). Defaults to 'html5'. Other options can
+    be passed, but if Asciidoctor cannot find the backend, it will fail during
+    rendering.
 
 *-d, --doctype*='DOCTYPE'::
-    Document type: 'article' or 'book'. Sets the root element when using the
-    'docbook' backend and the style class on the HTML body element when using
-    the 'html' backend. The 'book' document type allows multiple level-0
-    section titles in a single document. Defaults to 'article'.
+    Document type: 'article', 'book' or 'inline'. Sets the root element when
+    using the 'docbook' backend and the style class on the HTML body element
+    when using the 'html' backend. The 'book' document type allows multiple
+    level-0 section titles in a single document. The 'inline' document type
+    allows the content of a single paragraph to be formatted and returned
+    without wrapping it in a containing element. Defaults to 'article'.
 
 Rendering Control
 ~~~~~~~~~~~~~~~~~
@@ -101,7 +106,7 @@ Rendering Control
 
 *-T, --template-dir*='DIR'::
     Directory containing custom render templates that override one or more
-    templates from the the built-in set. If there is a folder in the directory
+    templates from the built-in set. If there is a folder in the directory
     that matches the backend, the templates from that folder will be used.
 
 Processing Information
@@ -141,7 +146,8 @@ See the *Asciidoctor* issue tracker: <**https://github.com/asciidoctor/asciidoct
 
 AUTHORS
 -------
-*Asciidoctor* was written by Ryan Waldron, Dan Allen and other contributors.
+*Asciidoctor* was written by Dan Allen, Ryan Waldron, Jason Porter, Nick
+Hengeveld and other contributors.
 
 *AsciiDoc* was written by Stuart Rackham and has received contributions from
 many other individuals.
@@ -160,5 +166,7 @@ Mailinglist / forum: <**http://discuss.asciidoctor.org**>
 
 COPYING
 -------
-Copyright \(C) Ryan Waldron and Dan Allen. Free use of this software is granted
-under the terms of the MIT License.
+Copyright \(C) 2012-2013 Dan Allen and Ryan Waldron. Free use of this
+software is granted under the terms of the MIT License.
+
+// vim: tw=80

data/test/attributes_test.rb

@@ -332,6 +332,34 @@ of the attribute named foo in your document.
       assert_xpath %(//li[1]/p[text()="docdir: #{docdir}"]), output, 1
       assert_xpath %(//li[2]/p[text()="docfile: #{docfile}"]), output, 1
     end
+
+    test 'assigns attribute defined in attribute reference with set prefix and value' do
+      input = '{set:foo:bar}{foo}' 
+      output = render_embedded_string input 
+      assert_xpath '//p', output, 1
+      assert_xpath '//p[text()="bar"]', output, 1
+    end
+
+    test 'assigns attribute defined in attribute reference with set prefix and no value' do
+      input = "{set:foo}\n{foo}yes"
+      output = render_embedded_string input 
+      assert_xpath '//p', output, 1
+      assert_xpath '//p[normalize-space(text())="yes"]', output, 1
+    end
+
+    test 'assigns attribute defined in attribute reference with set prefix and empty value' do
+      input = "{set:foo:}\n{foo}yes"
+      output = render_embedded_string input 
+      assert_xpath '//p', output, 1
+      assert_xpath '//p[normalize-space(text())="yes"]', output, 1
+    end
+
+    test 'unassigns attribute defined in attribute reference with set prefix' do
+      input = ":foo:\n\n{set:foo!}\n{foo}yes"
+      output = render_embedded_string input
+      assert_xpath '//p', output, 1
+      assert_xpath '//p/child::text()', output, 0
+    end
   end
 
   context "Intrinsic attributes" do
@@ -531,6 +559,28 @@ A paragraph
       assert_equal 'lead', para.attributes['role']
     end
 
+    test 'id and role attributes can be specified on block style using shorthand syntax' do
+      input = <<-EOS
+[normal#first.lead]
+A normal paragraph.
+      EOS
+      doc = document_from_string(input)
+      para = doc.blocks.first
+      assert_equal 'first', para.attributes['id']
+      assert_equal 'lead', para.attributes['role']
+    end
+
+    test 'id and role attributes can be specified on section style using shorthand syntax' do
+      input = <<-EOS
+[dedication#dedication.small]
+== Section
+Content.
+      EOS
+      output = render_embedded_string input
+      assert_xpath '/div[@class="sect1 small"]', output, 1
+      assert_xpath '/div[@class="sect1 small"]/h2[@id="dedication"]', output, 1
+    end
+
     test "Block attributes are additive" do
       input = <<-EOS
 [id='foo']

data/test/blocks_test.rb

@@ -117,6 +117,252 @@ block comment
     end
   end
 
+  context 'Quote and Verse Blocks' do
+    test 'quote block with no attribution' do
+      input = <<-EOS
+____
+A famous quote.
+____
+      EOS
+      output = render_string input
+      assert_css '.quoteblock', output, 1
+      assert_css '.quoteblock > blockquote', output, 1
+      assert_css '.quoteblock > blockquote > .paragraph > p', output, 1
+      assert_css '.quoteblock > .attribution', output, 0
+      assert_xpath '//*[@class = "quoteblock"]//p[text() = "A famous quote."]', output, 1
+    end
+
+    test 'quote block with attribution' do
+      input = <<-EOS
+[quote, Famous Person, Famous Book (1999)]
+____
+A famous quote.
+____
+      EOS
+      output = render_string input
+      assert_css '.quoteblock', output, 1
+      assert_css '.quoteblock > blockquote', output, 1
+      assert_css '.quoteblock > blockquote > .paragraph > p', output, 1
+      assert_css '.quoteblock > .attribution', output, 1
+      assert_css '.quoteblock > .attribution > cite', output, 1
+      assert_css '.quoteblock > .attribution > cite + br', output, 1
+      assert_xpath '//*[@class = "quoteblock"]/*[@class = "attribution"]/cite[text() = "Famous Book (1999)"]', output, 1
+      attribution = xmlnodes_at_xpath '//*[@class = "quoteblock"]/*[@class = "attribution"]', output, 1
+      author = attribution.children.last
+      assert_equal "#{expand_entity 8212} Famous Person", author.text.strip
+    end
+
+    test 'quote block with attribute and id and role shorthand' do
+      input = <<-EOS
+[quote#think.big, Donald Trump]
+____
+As long as your going to be thinking anyway, think big.
+____
+      EOS
+
+      output = render_embedded_string input
+      assert_css '.quoteblock', output, 1
+      assert_css '#think.quoteblock.big', output, 1
+      assert_css '.quoteblock > .attribution', output, 1
+    end
+
+    test 'quote block with complex content' do
+      input = <<-EOS
+____
+A famous quote.
+
+NOTE: _That_ was inspiring.
+____
+      EOS
+      output = render_string input
+      assert_css '.quoteblock', output, 1
+      assert_css '.quoteblock > blockquote', output, 1
+      assert_css '.quoteblock > blockquote > .paragraph', output, 1
+      assert_css '.quoteblock > blockquote > .paragraph + .admonitionblock', output, 1
+    end
+
+    test 'quote block using air quotes with no attribution' do
+      input = <<-EOS
+""
+A famous quote.
+""
+      EOS
+      output = render_string input
+      assert_css '.quoteblock', output, 1
+      assert_css '.quoteblock > blockquote', output, 1
+      assert_css '.quoteblock > blockquote > .paragraph > p', output, 1
+      assert_css '.quoteblock > .attribution', output, 0
+      assert_xpath '//*[@class = "quoteblock"]//p[text() = "A famous quote."]', output, 1
+    end
+
+    test 'markdown-style quote block with single paragraph and no attribution' do
+      input = <<-EOS
+> A famous quote.
+> Some more inspiring words.
+      EOS
+      output = render_string input
+      assert_css '.quoteblock', output, 1
+      assert_css '.quoteblock > blockquote', output, 1
+      assert_css '.quoteblock > blockquote > .paragraph > p', output, 1
+      assert_css '.quoteblock > .attribution', output, 0
+      assert_xpath %(//*[@class = "quoteblock"]//p[text() = "A famous quote.\nSome more inspiring words."]), output, 1
+    end
+
+    test 'lazy markdown-style quote block with single paragraph and no attribution' do
+      input = <<-EOS
+> A famous quote.
+Some more inspiring words.
+      EOS
+      output = render_string input
+      assert_css '.quoteblock', output, 1
+      assert_css '.quoteblock > blockquote', output, 1
+      assert_css '.quoteblock > blockquote > .paragraph > p', output, 1
+      assert_css '.quoteblock > .attribution', output, 0
+      assert_xpath %(//*[@class = "quoteblock"]//p[text() = "A famous quote.\nSome more inspiring words."]), output, 1
+    end
+
+    test 'markdown-style quote block with multiple paragraphs and no attribution' do
+      input = <<-EOS
+> A famous quote.
+>
+> Some more inspiring words.
+      EOS
+      output = render_string input
+      assert_css '.quoteblock', output, 1
+      assert_css '.quoteblock > blockquote', output, 1
+      assert_css '.quoteblock > blockquote > .paragraph > p', output, 2
+      assert_css '.quoteblock > .attribution', output, 0
+      assert_xpath %((//*[@class = "quoteblock"]//p)[1][text() = "A famous quote."]), output, 1
+      assert_xpath %((//*[@class = "quoteblock"]//p)[2][text() = "Some more inspiring words."]), output, 1
+    end
+
+    test 'markdown-style quote block with multiple blocks and no attribution' do
+      input = <<-EOS
+> A famous quote.
+>
+> NOTE: Some more inspiring words.
+      EOS
+      output = render_string input
+      assert_css '.quoteblock', output, 1
+      assert_css '.quoteblock > blockquote', output, 1
+      assert_css '.quoteblock > blockquote > .paragraph > p', output, 1
+      assert_css '.quoteblock > blockquote > .admonitionblock', output, 1
+      assert_css '.quoteblock > .attribution', output, 0
+      assert_xpath %((//*[@class = "quoteblock"]//p)[1][text() = "A famous quote."]), output, 1
+      assert_xpath %((//*[@class = "quoteblock"]//*[@class = "admonitionblock note"]//*[@class="content"])[1][normalize-space(text()) = "Some more inspiring words."]), output, 1
+    end
+
+    test 'markdown-style quote block with single paragraph and attribution' do
+      input = <<-EOS
+> A famous quote.
+> Some more inspiring words.
+> -- Famous Person, Famous Source (1999)
+      EOS
+      output = render_string input
+      assert_css '.quoteblock', output, 1
+      assert_css '.quoteblock > blockquote', output, 1
+      assert_css '.quoteblock > blockquote > .paragraph > p', output, 1
+      assert_xpath %(//*[@class = "quoteblock"]//p[text() = "A famous quote.\nSome more inspiring words."]), output, 1
+      assert_css '.quoteblock > .attribution', output, 1
+      assert_css '.quoteblock > .attribution > cite', output, 1
+      assert_css '.quoteblock > .attribution > cite + br', output, 1
+      assert_xpath '//*[@class = "quoteblock"]/*[@class = "attribution"]/cite[text() = "Famous Source (1999)"]', output, 1
+      attribution = xmlnodes_at_xpath '//*[@class = "quoteblock"]/*[@class = "attribution"]', output, 1
+      author = attribution.children.last
+      assert_equal "#{expand_entity 8212} Famous Person", author.text.strip
+    end
+
+    test 'quoted paragraph-style quote block with attribution' do
+      input = <<-EOS
+"A famous quote.
+Some more inspiring words."
+-- Famous Person, Famous Source (1999)
+      EOS
+      output = render_string input
+      assert_css '.quoteblock', output, 1
+      assert_css '.quoteblock > blockquote', output, 1
+      assert_xpath %(//*[@class = "quoteblock"]/blockquote[normalize-space(text()) = "A famous quote. Some more inspiring words."]), output, 1
+      assert_css '.quoteblock > .attribution', output, 1
+      assert_css '.quoteblock > .attribution > cite', output, 1
+      assert_css '.quoteblock > .attribution > cite + br', output, 1
+      assert_xpath '//*[@class = "quoteblock"]/*[@class = "attribution"]/cite[text() = "Famous Source (1999)"]', output, 1
+      attribution = xmlnodes_at_xpath '//*[@class = "quoteblock"]/*[@class = "attribution"]', output, 1
+      author = attribution.children.last
+      assert_equal "#{expand_entity 8212} Famous Person", author.text.strip
+    end
+
+    test 'single-line verse block without attribution' do
+      input = <<-EOS
+[verse]
+____
+A famous verse.
+____
+      EOS
+      output = render_string input
+      assert_css '.verseblock', output, 1
+      assert_css '.verseblock > pre', output, 1
+      assert_css '.verseblock > .attribution', output, 0
+      assert_css '.verseblock p', output, 0
+      assert_xpath '//*[@class = "verseblock"]/pre[normalize-space(text()) = "A famous verse."]', output, 1
+    end
+
+    test 'single-line verse block with attribution' do
+      input = <<-EOS
+[verse, Famous Poet, Famous Poem]
+____
+A famous verse.
+____
+      EOS
+      output = render_string input
+      assert_css '.verseblock', output, 1
+      assert_css '.verseblock p', output, 0
+      assert_css '.verseblock > pre', output, 1
+      assert_css '.verseblock > .attribution', output, 1
+      assert_css '.verseblock > .attribution > cite', output, 1
+      assert_css '.verseblock > .attribution > cite + br', output, 1
+      assert_xpath '//*[@class = "verseblock"]/*[@class = "attribution"]/cite[text() = "Famous Poem"]', output, 1
+      attribution = xmlnodes_at_xpath '//*[@class = "verseblock"]/*[@class = "attribution"]', output, 1
+      author = attribution.children.last
+      assert_equal "#{expand_entity 8212} Famous Poet", author.text.strip
+    end
+
+    test 'multi-stanza verse block' do
+      input = <<-EOS
+[verse]
+____
+A famous verse.
+
+Stanza two.
+____
+      EOS
+      output = render_string input
+      assert_xpath '//*[@class = "verseblock"]', output, 1
+      assert_xpath '//*[@class = "verseblock"]/pre', output, 1
+      assert_xpath '//*[@class = "verseblock"]//p', output, 0
+      assert_xpath '//*[@class = "verseblock"]/pre[contains(text(), "A famous verse.")]', output, 1
+      assert_xpath '//*[@class = "verseblock"]/pre[contains(text(), "Stanza two.")]', output, 1
+    end
+
+    test 'verse block does not contain block elements' do
+      input = <<-EOS
+[verse]
+____
+A famous verse.
+
+....
+not a literal
+....
+____
+      EOS
+      output = render_string input
+      assert_css '.verseblock', output, 1
+      assert_css '.verseblock > pre', output, 1
+      assert_css '.verseblock p', output, 0
+      assert_css '.verseblock .literalblock', output, 0
+    end
+    
+  end
+
   context "Example Blocks" do
     test "can render example block" do
       input = <<-EOS
@@ -198,6 +444,20 @@ You just write.
       assert !doc.attributes.has_key?('example-number')
     end
 
+    test 'explicit caption is set on block even if block has no title' do
+      input = <<-EOS
+[caption="Look!"]
+====
+Just write.
+====
+      EOS
+
+      doc = document_from_string input
+      assert_equal 'Look!', doc.blocks.first.caption
+      output = doc.render
+      assert_no_match(/Look/, output)
+    end
+
     test 'automatic caption can be turned off and on and modified' do
       input = <<-EOS
 .first example
@@ -400,6 +660,60 @@ source line 2\r
       assert_xpath %(/*[@class="listingblock"]//pre/code[text()="source line 1\nsource line 2"]), output, 1
     end
 
+    test 'should remove block indent if indent attribute is 0' do
+      input = <<-EOS
+[indent="0"]
+----
+    def names
+
+      @names.split ' '
+
+    end
+----
+      EOS
+
+      expected = <<-EOS
+def names
+
+  @names.split ' '
+
+end
+      EOS
+
+      output = render_embedded_string input
+      assert_css 'pre', output, 1
+      assert_css '.listingblock pre', output, 1
+      result = xmlnodes_at_xpath('//pre', output, 1).text
+      assert_equal expected.chomp, result
+    end
+
+    test 'should set block indent to value specified by indent attribute' do
+      input = <<-EOS
+[indent="1"]
+----
+    def names
+
+      @names.split ' '
+
+    end
+----
+      EOS
+
+      expected = <<-EOS
+ def names
+ 
+   @names.split ' '
+ 
+ end
+      EOS
+
+      output = render_embedded_string input
+      assert_css 'pre', output, 1
+      assert_css '.listingblock pre', output, 1
+      result = xmlnodes_at_xpath('//pre', output, 1).text
+      assert_equal expected.chomp, result
+    end
+
     test 'literal block should honor explicit subs list' do
       input = <<-EOS
 [subs="verbatim,quotes"]
@@ -447,6 +761,58 @@ AssertionError
       # so rstrip is necessary
       assert_equal output.rstrip, output2.rstrip
     end
+
+    test 'listing block without title should generate screen element in docbook' do
+      input = <<-EOS
+----
+listing block
+----
+      EOS
+
+      output = render_embedded_string input, :backend => 'docbook'
+      assert_xpath '/screen[text()="listing block"]', output, 1
+    end
+
+    test 'listing block with title should generate screen element inside formalpara element in docbook' do
+      input = <<-EOS
+.title
+----
+listing block
+----
+      EOS
+
+      output = render_embedded_string input, :backend => 'docbook'
+      assert_xpath '/formalpara', output, 1
+      assert_xpath '/formalpara/title[text()="title"]', output, 1
+      assert_xpath '/formalpara/para/screen[text()="listing block"]', output, 1
+    end
+
+    test 'source block with no title or language should generate screen element in docbook' do
+      input = <<-EOS
+[source]
+----
+listing block
+----
+      EOS
+
+      output = render_embedded_string input, :backend => 'docbook'
+      assert_xpath '/screen[text()="listing block"]', output, 1
+    end
+
+    test 'source block with title and no language should generate screen element inside formalpara element in docbook' do
+      input = <<-EOS
+[source]
+.title
+----
+listing block
+----
+      EOS
+
+      output = render_embedded_string input, :backend => 'docbook'
+      assert_xpath '/formalpara', output, 1
+      assert_xpath '/formalpara/title[text()="title"]', output, 1
+      assert_xpath '/formalpara/para/screen[text()="listing block"]', output, 1
+    end
   end
 
   context "Open Blocks" do
@@ -542,15 +908,25 @@ paragraph
       assert_xpath '//*[@class="paragraph"]/p[text() = "paragraph"]', output, 1
     end
 
-    test 'block title above document title gets carried over to preamble' do
+    test 'block title above document title demotes document title to a section title' do
       input = <<-EOS
 .Block title
-= Document Title
-
-preamble
-      EOS
-      output = render_string input
-      assert_xpath '//*[@id="preamble"]//*[@class="paragraph"]/*[@class="title"][text()="Block title"]', output, 1
+= Section Title
+
+section paragraph
+      EOS
+      output, errors = nil
+      redirect_streams do |stdout, stderr|
+        output = render_string input
+        errors = stdout.string
+      end
+      assert_xpath '//*[@id="header"]/*', output, 0
+      assert_xpath '//*[@id="preamble"]/*', output, 0
+      assert_xpath '//*[@id="content"]/h1[text()="Section Title"]', output, 1
+      assert_xpath '//*[@class="paragraph"]', output, 1
+      assert_xpath '//*[@class="paragraph"]/*[@class="title"][text()="Block title"]', output, 1
+      assert !errors.empty?
+      assert_match(/only book doctypes can contain level 0 sections/, errors)
     end
 
     test 'block title above document title gets carried over to first block in first section if no preamble' do
@@ -959,6 +1335,18 @@ You can use icons for admonitions by setting the 'icons' attribute.
       output = render_string input, :safe => Asciidoctor::SafeMode::SAFE, :attributes => {'docdir' => File.dirname(__FILE__)}
       assert_xpath '//*[@class="admonitionblock tip"]//*[@class="icon"]/img[@src="data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="][@alt="Tip"]', output, 1
     end
+
+    test 'can use font-based icons' do
+      input = <<-EOS
+:icons: font
+
+[TIP]
+You can use icons for admonitions by setting the 'icons' attribute.
+      EOS
+
+      output = render_string input, :safe => Asciidoctor::SafeMode::SERVER
+      assert_xpath '//*[@class="admonitionblock tip"]//*[@class="icon"]/i[@class="icon-tip"]', output, 1
+    end
   end
 
   context 'Image paths' do
@@ -1050,7 +1438,7 @@ html = CodeRay.scan("puts 'Hello, world!'", :ruby).div(:line_numbers => :table)
 ----
       EOS
       output = render_string input, :safe => Asciidoctor::SafeMode::SAFE
-      assert_xpath '//pre[@class="highlight CodeRay"]/code[@class="ruby"]//span[@class = "constant"][text() = "CodeRay"]', output, 1
+      assert_xpath '//pre[@class="CodeRay"]/code[@class="ruby language-ruby"]//span[@class = "constant"][text() = "CodeRay"]', output, 1
       assert_match(/\.CodeRay \{/, output)
     end
 
@@ -1067,7 +1455,7 @@ html = CodeRay.scan("puts 'Hello, world!'", :ruby).div(:line_numbers => :table)
 ----
       EOS
       output = render_string input, :safe => Asciidoctor::SafeMode::SAFE
-      assert_xpath '//pre[@class="highlight CodeRay"]/code[@class="ruby"]//span[@style = "color:#036;font-weight:bold"][text() = "CodeRay"]', output, 1
+      assert_xpath '//pre[@class="CodeRay"]/code[@class="ruby language-ruby"]//span[@style = "color:#036;font-weight:bold"][text() = "CodeRay"]', output, 1
       assert_no_match(/\.CodeRay \{/, output)
     end
 
@@ -1097,4 +1485,267 @@ html = CodeRay.scan("puts 'Hello, world!'", :ruby).div(:line_numbers => :table)
     end
   end
 
+  context 'Abstract and Part Intro' do
+    test 'should make abstract on open block without title a quote block for article' do
+      input = <<-EOS
+= Article
+
+[abstract]
+--
+This article is about stuff.
+
+And other stuff.
+--
+      EOS
+
+      output = render_string input
+      assert_css '.quoteblock', output, 1
+      assert_css '.quoteblock.abstract', output, 1
+      assert_css '#preamble .quoteblock', output, 1
+      assert_css '.quoteblock > blockquote', output, 1
+      assert_css '.quoteblock > blockquote > .paragraph', output, 2
+    end
+
+    test 'should make abstract on open block with title a quote block with title for article' do
+      input = <<-EOS
+= Article
+
+.My abstract
+[abstract]
+--
+This article is about stuff.
+--
+      EOS
+
+      output = render_string input
+      assert_css '.quoteblock', output, 1
+      assert_css '.quoteblock.abstract', output, 1
+      assert_css '#preamble .quoteblock', output, 1
+      assert_css '.quoteblock > .title', output, 1
+      assert_css '.quoteblock > .title + blockquote', output, 1
+      assert_css '.quoteblock > .title + blockquote > .paragraph', output, 1
+    end
+
+    test 'should allow abstract in document with title if doctype is book' do
+      input = <<-EOS
+= Book
+:doctype: book
+
+[abstract]
+Abstract for book with title is valid
+      EOS
+
+      output = render_string input
+      assert_css '.abstract', output, 1
+    end
+
+    test 'should not allow abstract as direct child of document if doctype is book' do
+      input = <<-EOS
+:doctype: book
+
+[abstract]
+Abstract for book without title is invalid.
+      EOS
+
+      output = render_string input
+      assert_css '.abstract', output, 0
+    end
+
+    test 'should make abstract on open block without title rendered to DocBook' do
+      input = <<-EOS
+= Article
+
+[abstract]
+--
+This article is about stuff.
+
+And other stuff.
+--
+      EOS
+
+      output = render_string input, :backend => 'docbook'
+      assert_css 'abstract', output, 1
+      assert_css 'abstract > simpara', output, 2
+    end
+
+    test 'should make abstract on open block with title rendered to DocBook' do
+      input = <<-EOS
+= Article
+
+.My abstract
+[abstract]
+--
+This article is about stuff.
+--
+      EOS
+
+      output = render_string input, :backend => 'docbook'
+      assert_css 'abstract', output, 1
+      assert_css 'abstract > title', output, 1
+      assert_css 'abstract > title + simpara', output, 1
+    end
+
+    test 'should allow abstract in document with title if doctype is book rendered to DocBook' do
+      input = <<-EOS
+= Book
+:doctype: book
+
+[abstract]
+Abstract for book with title is valid
+      EOS
+
+      output = render_string input, :backend => 'docbook'
+      assert_css 'abstract', output, 1
+    end
+
+    test 'should not allow abstract as direct child of document if doctype is book rendered to DocBook' do
+      input = <<-EOS
+:doctype: book
+
+[abstract]
+Abstract for book is invalid.
+      EOS
+
+      output = render_string input, :backend => 'docbook'
+      assert_css 'abstract', output, 0
+    end
+
+    # TODO partintro shouldn't be recognized if doctype is not book, should be in proper place
+    test 'should accept partintro on open block without title' do
+      input = <<-EOS
+= Book
+:doctype: book
+
+= Part 1
+
+[partintro]
+--
+This is a part intro.
+
+It can have multiple paragraphs.
+--
+      EOS
+
+      output = render_string input
+      assert_css '.openblock', output, 1
+      assert_css '.openblock.partintro', output, 1
+      assert_css '.openblock .title', output, 0
+      assert_css '.openblock .content', output, 1
+      assert_xpath %(//h1[@id="_part_1"]/following-sibling::*[#{contains_class(:openblock)}]), output, 1
+      assert_xpath %(//*[#{contains_class(:openblock)}]/*[@class="content"]/*[@class="paragraph"]), output, 2
+    end
+
+    test 'should accept partintro on open block with title' do
+      input = <<-EOS
+= Book
+:doctype: book
+
+= Part 1
+
+.Intro title
+[partintro]
+--
+This is a part intro with a title.
+--
+      EOS
+
+      output = render_string input
+      assert_css '.openblock', output, 1
+      assert_css '.openblock.partintro', output, 1
+      assert_css '.openblock .title', output, 1
+      assert_css '.openblock .content', output, 1
+      assert_xpath %(//h1[@id="_part_1"]/following-sibling::*[#{contains_class(:openblock)}]), output, 1
+      assert_xpath %(//*[#{contains_class(:openblock)}]/*[@class="title"][text() = "Intro title"]), output, 1
+      assert_xpath %(//*[#{contains_class(:openblock)}]/*[@class="content"]/*[@class="paragraph"]), output, 1
+    end
+
+    test 'should exclude partintro if not a child of part' do
+      input = <<-EOS
+= Book
+:doctype: book
+
+[partintro]
+part intro paragraph
+      EOS
+
+      output = render_string input
+      assert_css '.partintro', output, 0
+    end
+
+    test 'should not allow partintro unless doctype is book' do
+      input = <<-EOS
+[partintro]
+part intro paragraph
+      EOS
+
+      output = render_string input
+      assert_css '.partintro', output, 0
+    end
+
+    test 'should accept partintro on open block without title rendered to DocBook' do
+      input = <<-EOS
+= Book
+:doctype: book
+
+= Part 1
+
+[partintro]
+--
+This is a part intro.
+
+It can have multiple paragraphs.
+--
+      EOS
+
+      output = render_string input, :backend => 'docbook'
+      assert_css 'partintro', output, 1
+      assert_css 'part#_part_1 > partintro', output, 1
+      assert_css 'partintro > simpara', output, 2
+    end
+
+    test 'should accept partintro on open block with title rendered to DocBook' do
+      input = <<-EOS
+= Book
+:doctype: book
+
+= Part 1
+
+.Intro title
+[partintro]
+--
+This is a part intro with a title.
+--
+      EOS
+
+      output = render_string input, :backend => 'docbook'
+      assert_css 'partintro', output, 1
+      assert_css 'part#_part_1 > partintro', output, 1
+      assert_css 'partintro > title', output, 1
+      assert_css 'partintro > title + simpara', output, 1
+    end
+
+    test 'should exclude partintro if not a child of part rendered to DocBook' do
+      input = <<-EOS
+= Book
+:doctype: book
+
+[partintro]
+part intro paragraph
+      EOS
+
+      output = render_string input, :backend => 'docbook'
+      assert_css 'partintro', output, 0
+    end
+
+    test 'should not allow partintro unless doctype is book rendered to DocBook' do
+      input = <<-EOS
+[partintro]
+part intro paragraph
+      EOS
+
+      output = render_string input, :backend => 'docbook'
+      assert_css 'partintro', output, 0
+    end
+  end
+
 end