asciidoctor 0.0.5 → 0.0.6

data/lib/asciidoctor/renderer.rb

@@ -62,8 +62,8 @@ class Asciidoctor::Renderer
                      if stack_obj.context == :dlist
                        dt_list = stack_obj.buffer.map{|dt,dd| dt.content.strip}.join(', ')
                        "BLOCK :dlist (#{dt_list})"
-                     else
-                       "BLOCK #{stack_obj.context.inspect}"
+                     #else
+                     #  "BLOCK #{stack_obj.context.inspect}"
                      end
                    else stack_obj.class
                    end
@@ -71,7 +71,7 @@ class Asciidoctor::Renderer
         prefix << '  '
       end
       STDERR.puts '-' * 80
-      STDERR.puts ret.inspect
+      #STDERR.puts ret.inspect
       STDERR.puts '=' * 80
       STDERR.puts
     end

data/lib/asciidoctor/section.rb

@@ -24,14 +24,15 @@ class Asciidoctor::Section
   # Public: Set the String section name.
   attr_writer :name
 
-  # Public: Get/Set the String section title.
-  attr_accessor :title
-
   # Public: Get/Set the String section caption.
   attr_accessor :caption
 
   # Public: Get/Set the String section anchor name.
   attr_accessor :anchor
+  alias :id :anchor
+
+  # Public: Get the Hash of attributes for this block
+  attr_accessor :attributes
 
   # Public: Get the Array of section blocks.
   attr_reader :blocks
@@ -41,6 +42,7 @@ class Asciidoctor::Section
   # parent - The parent Asciidoc Object.
   def initialize(parent)
     @parent = parent
+    @attributes = {}
     @blocks = []
   end
 
@@ -59,16 +61,22 @@ class Asciidoctor::Section
           gsub( /`([^`]+)`/, '<tt>\1</tt>' )
   end
 
-  # Public: Get the String section id
+  # Public: Get the String section id prefixed with value of idprefix attribute, otherwise an underscore
+  #
+  # Section ID synthesis can be disabled by undefining the sectids attribute.
   #
   # Examples
   #
-  #   section = Section.new
+  #   section = Section.new(parent)
   #   section.name = "Foo"
   #   section.section_id
   #   => "_foo"
   def section_id
-    "_#{name && name.downcase.gsub(/\W+/,'_').gsub(/_+$/, '')}".tr_s('_', '_')
+    if self.document.attributes.has_key? 'sectids'
+      self.document.attributes.fetch('idprefix', '_') + "#{name && name.downcase.gsub(/\W+/,'_').gsub(/_+$/, '')}".tr_s('_', '_')
+    else
+      nil
+    end
   end
 
   # Public: Get the Asciidoctor::Document instance to which this Block belongs
@@ -76,6 +84,19 @@ class Asciidoctor::Section
     @parent.is_a?(Asciidoctor::Document) ? @parent : @parent.document
   end
 
+  def attr(name, default = nil)
+    default.nil? ? @attributes.fetch(name.to_s, self.document.attr(name)) :
+        @attributes.fetch(name.to_s, self.document.attr(name, default))
+  end
+
+  def attr?(name)
+    @attributes.has_key?(name.to_s) || self.document.attr?(name)
+  end
+
+  def update_attributes(attributes)
+    @attributes.update(attributes)
+  end
+
   # Public: Get the Asciidoctor::Renderer instance being used for the ancestor
   # Asciidoctor::Document instance.
   def renderer
@@ -109,6 +130,11 @@ class Asciidoctor::Section
     end.join
   end
 
+  # Public: The title of this section, an alias of the section name
+  def title
+    @name
+  end
+
   # Public: Get the Integer number of blocks in the section.
   #
   # Examples

data/lib/asciidoctor/version.rb

@@ -1,3 +1,3 @@
 module Asciidoctor
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/attributes_test.rb

@@ -3,17 +3,27 @@ require 'test_helper'
 context "Attributes" do
   test "creates an attribute" do
     doc = document_from_string(":frog: Tanglefoot")
-    assert_equal doc.defines['frog'], 'Tanglefoot'
+    assert_equal doc.attributes['frog'], 'Tanglefoot'
+  end
+
+  test "creates an attribute by fusing a multi-line value" do
+    str = <<-EOS
+:description: This is the first +
+              Ruby implementation of +
+              AsciiDoc.
+    EOS
+    doc = document_from_string(str)
+    assert_equal doc.attributes['description'], 'This is the first Ruby implementation of AsciiDoc.'
   end
 
   test "deletes an attribute" do
     doc = document_from_string(":frog: Tanglefoot\n:frog!:")
-    assert_equal nil, doc.defines['frog']
+    assert_equal nil, doc.attributes['frog']
   end
 
   test "doesn't choke when deleting a non-existing attribute" do
     doc = document_from_string(":frog!:")
-    assert_equal nil, doc.defines['frog']
+    assert_equal nil, doc.attributes['frog']
   end
 
   test "render properly with simple names" do
@@ -66,7 +76,8 @@ context "Attributes" do
   test "doesn't disturb attribute-looking things escaped with literals" do
     html = render_string(":foo: bar\nThis is a +++{foo}+++ day.")
     result = Nokogiri::HTML(html)
-    assert_equal 'This is a {foo} day.', result.css('p').first.content.strip
+    #assert_equal 'This is a {foo} day.', result.css('p').first.content.strip
+    pending "Don't yet have inline passthrough working"
   end
 
   test "doesn't substitute attributes inside code blocks" do
@@ -77,6 +88,35 @@ context "Attributes" do
     pending "whut?"
   end
 
+  context "Block attributes" do
+    test "Position attributes assigned to block" do
+      input = <<-EOS
+[quote, Name, Source]
+____
+A famous quote.
+____
+      EOS
+      doc = document_from_string(input)
+      qb = doc.elements.first
+      assert_equal 'quote', qb.attributes['style']
+      assert_equal 'quote', qb.attr(:style)
+      assert_equal 'Name', qb.attributes['attribution']
+      assert_equal 'Source', qb.attributes['citetitle']
+    end
+
+    test "Block attributes are additive" do
+      input = <<-EOS
+[id='foo']
+[role='lead']
+A paragraph.
+      EOS
+      doc = document_from_string(input)
+      para = doc.elements.first
+      assert_equal 'foo', para.id
+      assert_equal 'lead', para.attributes['role']
+    end
+  end
+
   context "intrinsics" do
 
     test "substitute intrinsics" do

data/test/document_test.rb

@@ -7,11 +7,30 @@ class DocumentTest < Test::Unit::TestCase
   end
 
   def test_title
-    assert_equal "AsciiDoc Home Page", @doc.title
+    assert_equal "AsciiDoc Home Page", @doc.doctitle
+    assert_equal 14, @doc.elements.size
+    assert_equal :preamble, @doc.elements[0].context
+    assert @doc.elements[1].is_a? ::Asciidoctor::Section
   end
 
   def test_with_no_title
     d = Asciidoctor::Document.new(["Snorf"])
-    assert_nil d.title
+    assert_nil d.doctitle
+  end
+
+  def test_with_header_footer
+    result = render_string("= Title\n\npreamble")
+    assert_xpath '/html', result, 1
+    assert_xpath '//*[@id="header"]', result, 1
+    assert_xpath '//*[@id="footer"]', result, 1
+    assert_xpath '//*[@id="preamble"]', result, 1
+  end
+
+  def test_with_no_header_footer
+    result = render_string("= Title\n\npreamble", :header_footer => false)
+    assert_xpath '/html', result, 0
+    assert_xpath '/*[@id="header"]', result, 0
+    assert_xpath '/*[@id="footer"]', result, 0
+    assert_xpath '/*[@id="preamble"]', result, 1
   end
 end

data/test/headers_test.rb

@@ -1,55 +1,114 @@
 require 'test_helper'
 
 context "Headers" do
-  test "main header" do
-    assert_xpath "//h1", render_string("My Title\n=======")
+  test "document title with multiline syntax" do
+    title = "My Title"
+    chars = "=" * title.length
+    assert_xpath "//h1[not(@id)][text() = 'My Title']", render_string(title + "\n" + chars)
+    assert_xpath "//h1[not(@id)][text() = 'My Title']", render_string(title + "\n" + chars + "\n")
+  end
+
+  test "document title with multiline syntax, give a char" do
+    title = "My Title"
+    chars = "=" * (title.length + 1)
+    assert_xpath "//h1[not(@id)][text() = 'My Title']", render_string(title + "\n" + chars)
+    assert_xpath "//h1[not(@id)][text() = 'My Title']", render_string(title + "\n" + chars + "\n")
+  end
+
+  test "document title with multiline syntax, take a char" do
+    title = "My Title"
+    chars = "=" * (title.length - 1)
+    assert_xpath "//h1[not(@id)][text() = 'My Title']", render_string(title + "\n" + chars)
+    assert_xpath "//h1[not(@id)][text() = 'My Title']", render_string(title + "\n" + chars + "\n")
+  end
+
+  test "not enough chars for a multiline document title" do
+    title = "My Title"
+    chars = "=" * (title.length - 2)
+    assert_xpath '//h1', render_string(title + "\n" + chars), 0
+    assert_xpath '//h1', render_string(title + "\n" + chars + "\n"), 0
+  end
+
+  test "too many chars for a multiline document title" do
+    title = "My Title"
+    chars = "=" * (title.length + 2)
+    assert_xpath '//h1', render_string(title + "\n" + chars), 0
+    assert_xpath '//h1', render_string(title + "\n" + chars + "\n"), 0
+  end
+
+  test "document title with single-line syntax" do
+    assert_xpath "//h1[not(@id)][text() = 'My Title']", render_string("= My Title")
+  end
+
+  test "document title with symmetric syntax" do
+    assert_xpath "//h1[not(@id)][text() = 'My Title']", render_string("= My Title =")
   end
 
   context "level 1" do 
     test "with multiline syntax" do
-      assert_xpath "//h2[@id='_my_section']", render_string("My Section\n-----------")
+      assert_xpath "//h2[@id='_my_section'][text() = 'My Section']", render_string("My Section\n-----------")
     end
 
-    test "with single line syntax" do
-      assert_xpath "//h2[@id='_my_title']", render_string("== My Title")
+    test "with single-line syntax" do
+      assert_xpath "//h2[@id='_my_title'][text() = 'My Title']", render_string("== My Title")
+    end
+
+    test "with single-line symmetric syntax" do
+      assert_xpath "//h2[@id='_my_title'][text() = 'My Title']", render_string("== My Title ==")
+    end
+
+    test "with single-line non-matching symmetric syntax" do
+      assert_xpath "//h2[@id='_my_title'][text() = 'My Title ===']", render_string("== My Title ===")
     end
 
     test "with non-word character" do
-      assert_xpath "//h2[@id='_where_s_the_love']", render_string("== Where's the love?")
+      assert_xpath "//h2[@id='_where_s_the_love'][text() = \"Where's the love?\"]", render_string("== Where's the love?")
     end
 
     test "with sequential non-word characters" do
-      assert_xpath "//h2[@id='_what_the_is_that']", render_string('== What the #@$ is that')
+      assert_xpath "//h2[@id='_what_the_is_this'][text() = 'What the \#@$ is this?']", render_string('== What the #@$ is this?')
+    end
+
+    test "with trailing whitespace" do
+      assert_xpath "//h2[@id='_my_title'][text() = 'My Title']", render_string("== My Title ")
+    end
+
+    test "with custom blank idprefix" do
+      assert_xpath "//h2[@id='my_title'][text() = 'My Title']", render_string(":idprefix:\n\n== My Title ")
+    end
+
+    test "with custom non-blank idprefix" do
+      assert_xpath "//h2[@id='ref_my_title'][text() = 'My Title']", render_string(":idprefix: ref_\n\n== My Title ")
     end
   end
 
   context "level 2" do 
     test "with multiline syntax" do
-      assert_xpath "//h3", render_string("My Section\n~~~~~~~~~~~")
+      assert_xpath "//h3[@id='_my_section'][text() = 'My Section']", render_string("My Section\n~~~~~~~~~~~")
     end
 
     test "with single line syntax" do
-      assert_xpath "//h3", render_string("=== My Title")
+      assert_xpath "//h3[@id='_my_title'][text() = 'My Title']", render_string("=== My Title")
     end
   end  
 
   context "level 3" do 
     test "with multiline syntax" do
-      assert_xpath "//h4", render_string("My Section\n^^^^^^^^^^")
+      assert_xpath "//h4[@id='_my_section'][text() = 'My Section']", render_string("My Section\n^^^^^^^^^^")
     end
 
     test "with single line syntax" do
-      assert_xpath "//h4", render_string("==== My Title")
+      assert_xpath "//h4[@id='_my_title'][text() = 'My Title']", render_string("==== My Title")
     end
   end
 
   context "level 4" do 
     test "with multiline syntax" do
-      assert_xpath "//h5", render_string("My Section\n++++++++++")
+      assert_xpath "//h5[@id='_my_section'][text() = 'My Section']", render_string("My Section\n++++++++++")
     end
 
     test "with single line syntax" do
-      assert_xpath "//h5", render_string("===== My Title")
+      assert_xpath "//h5[@id='_my_title'][text() = 'My Title']", render_string("===== My Title")
     end
   end  
 end

data/test/lexer_test.rb

@@ -9,4 +9,58 @@ class LexerTest < Test::Unit::TestCase
     assert Asciidoctor::Lexer.is_section_heading?("AsciiDoc Home Page", "==================")
     assert Asciidoctor::Lexer.is_section_heading?("=== AsciiDoc Home Page")
   end
+
+  def test_collect_unnamed_attributes
+    attributes = {}
+    line = "first, second one, third"
+    Asciidoctor::Lexer.collect_attributes(line, attributes)
+    assert_equal 3, attributes.length
+    assert_equal 'first', attributes[0]
+    assert_equal 'second one', attributes[1]
+    assert_equal 'third', attributes[2]
+  end
+
+  def test_collect_named_attributes
+    attributes = {}
+    line = "first='value', second=\"value two\", third=three"
+    Asciidoctor::Lexer.collect_attributes(line, attributes)
+    assert_equal 3, attributes.length
+    assert_equal 'value', attributes['first']
+    assert_equal 'value two', attributes['second']
+    assert_equal 'three', attributes['third']
+  end
+
+  def test_collect_mixed_named_and_unnamed_attributes
+    attributes = {}
+    line = "first, second=\"value two\", third=three"
+    Asciidoctor::Lexer.collect_attributes(line, attributes)
+    assert_equal 3, attributes.length
+    assert_equal 'first', attributes[0]
+    assert_equal 'value two', attributes['second']
+    assert_equal 'three', attributes['third']
+  end
+
+  def test_collect_and_rekey_unnamed_attributes
+    attributes = {}
+    line = "first, second one, third, fourth"
+    Asciidoctor::Lexer.collect_attributes(line, attributes, ['a', 'b', 'c'])
+    assert_equal 7, attributes.length
+    assert_equal 'first', attributes['a']
+    assert_equal 'second one', attributes['b']
+    assert_equal 'third', attributes['c']
+    assert_equal 'first', attributes[0]
+    assert_equal 'second one', attributes[1]
+    assert_equal 'third', attributes[2]
+    assert_equal 'fourth', attributes[3]
+  end
+
+  def test_rekey_positional_attributes
+    attributes = {0 => 'source', 1 => 'java'}
+    Asciidoctor::Lexer.rekey_positional_attributes(attributes, ['style', 'language', 'linenums'])
+    assert_equal 4, attributes.length
+    assert_equal 'source', attributes[0]
+    assert_equal 'java', attributes[1]
+    assert_equal 'source', attributes['style']
+    assert_equal 'java', attributes['language']
+  end
 end

data/test/lists_test.rb

@@ -0,0 +1,406 @@
+require 'test_helper'
+
+context "Bulleted lists (:ulist)" do
+  context "Simple lists" do
+    test "dash elements with no blank lines" do
+      output = render_string("Blah\n====\n- Foo\n- Boo\n- Blech")
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 3
+    end
+
+    test "dash elements with blank lines" do
+      output = render_string("Blah\n====\n- Foo\n\n- Boo\n\n- Blech")
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 3
+    end
+
+    test "asterisk elements with no blank lines" do
+      output = render_string("Blah\n====\n* Foo\n* Boo\n* Blech")
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 3
+    end
+
+    test "asterisk elements with blank lines should merge lists" do
+      output = render_string("Blah\n====\n* Foo\n\n* Boo\n\n* Blech")
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 3
+    end
+
+    test "asterisk elements with blank lines separated by line comment should not merge lists" do
+      output = render_string("Blah\n====\n* Foo\n* Boo\n\n//\n\n* Blech")
+      assert_xpath '//ul', output, 2
+      assert_xpath '(//ul)[1]/li', output, 2
+      assert_xpath '(//ul)[2]/li', output, 1
+    end
+  end
+
+  context "Lists with inline markup" do
+    test "Quoted text" do
+      output = render_string("Blah\n====\n- I am *strong*.\n- I am 'stressed'.\n- I am `inflexible`.")
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 3
+      assert_xpath '(//ul/li)[1]//strong', output, 1
+      assert_xpath '(//ul/li)[2]//em', output, 1
+      assert_xpath '(//ul/li)[3]//tt', output, 1
+    end
+
+    test "Attribute substitutions" do
+      output = render_string("Blah\n====\n:foo: bar\n\n- side a {brvbar} side b\n- Take me to a {foo}.")
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 2
+      assert_xpath '(//ul/li)[1]//p[text() = "side a | side b"]', output, 1
+      assert_xpath '(//ul/li)[2]//p[text() = "Take me to a bar."]', output, 1
+    end
+  end
+
+  context "Nested lists" do
+    test "nested mixed elements (asterisk and dash)" do
+      output = render_string("Blah\n====\n- Foo\n* Boo\n- Blech")
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 3
+    end
+
+    test "nested elements (2) with asterisks" do
+      output = render_string("* Foo\n** Boo\n* Blech")
+      assert_xpath '//ul', output, 2
+      assert_xpath '(//ul)[1]/li', output, 2
+      assert_xpath '(//ul)[1]/li//ul/li', output, 1
+    end
+
+    test "nested elements (3) with asterisks" do
+      output = render_string("Blah\n====\n* Foo\n** Boo\n*** Snoo\n* Blech")
+      assert_xpath '//ul', output, 3
+      assert_xpath '(//ul)[1]/li', output, 2
+      assert_xpath '((//ul)[1]/li//ul)[1]/li', output, 1
+      assert_xpath '(((//ul)[1]/li//ul)[1]/li//ul)[1]/li', output, 1
+    end
+
+    test "nested elements (4) with asterisks" do
+      output = render_string("Blah\n====\n* Foo\n** Boo\n*** Snoo\n**** Froo\n* Blech")
+      assert_xpath '//ul', output, 4
+      assert_xpath '(//ul)[1]/li', output, 2
+      assert_xpath '((//ul)[1]/li//ul)[1]/li', output, 1
+      assert_xpath '(((//ul)[1]/li//ul)[1]/li//ul)[1]/li', output, 1
+      assert_xpath '((((//ul)[1]/li//ul)[1]/li//ul)[1]/li//ul)[1]/li', output, 1
+    end
+
+    test "nested elements (5) with asterisks" do
+      output = render_string("Blah\n====\n* Foo\n** Boo\n*** Snoo\n**** Froo\n***** Groo\n* Blech")
+      assert_xpath '//ul', output, 5
+      assert_xpath '(//ul)[1]/li', output, 2
+      assert_xpath '((//ul)[1]/li//ul)[1]/li', output, 1
+      assert_xpath '(((//ul)[1]/li//ul)[1]/li//ul)[1]/li', output, 1
+      assert_xpath '((((//ul)[1]/li//ul)[1]/li//ul)[1]/li//ul)[1]/li', output, 1
+      assert_xpath '(((((//ul)[1]/li//ul)[1]/li//ul)[1]/li//ul)[1]/li//ul)[1]/li', output, 1
+    end
+  end
+
+  context "List continuations" do
+    test "Adjacent list continuation line attaches following paragraph" do
+      input = <<-EOS
+Lists
+=====
+
+* Item one, paragraph one
++
+Item one, paragraph two
++
+* Item two
+      EOS
+      output = render_string(input)
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 2
+      assert_xpath '//ul/li[1]/p', output, 1
+      assert_xpath '//ul/li[1]//p', output, 2
+      assert_xpath '//ul/li[1]//p[text() = "Item one, paragraph one"]', output, 1
+      assert_xpath '//ul/li[1]//p[text() = "Item one, paragraph two"]', output, 1
+    end
+
+    test "Adjacent list continuation line attaches following block" do
+      input = <<-EOS
+Lists
+=====
+
+* Item one, paragraph one
++
+....
+Item one, literal block
+....
++
+* Item two
+      EOS
+      output = render_string(input)
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 2
+      assert_xpath '//ul/li[1]/p', output, 1
+      assert_xpath '(//ul/li[1]/p/following-sibling::*)[1][@class = "literalblock"]', output, 1
+    end
+
+    test "Consecutive blocks in list continuation attach to list item" do
+      input = <<-EOS
+Lists
+=====
+
+* Item one, paragraph one
++
+....
+Item one, literal block
+....
++
+____
+Item one, quote block
+____
++
+* Item two
+      EOS
+      output = render_string(input)
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 2
+      assert_xpath '//ul/li[1]/p', output, 1
+      assert_xpath '(//ul/li[1]/p/following-sibling::*)[1][@class = "literalblock"]', output, 1
+      assert_xpath '(//ul/li[1]/p/following-sibling::*)[2][@class = "quoteblock"]', output, 1
+    end
+
+    # NOTE this differs from AsciiDoc behavior, but is more logical
+    test "Consecutive list continuation lines are folded" do
+      input = <<-EOS
+Lists
+=====
+
+* Item one, paragraph one
++
++
+Item one, paragraph two
++
++
+* Item two
++
++
+      EOS
+      output = render_string(input)
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 2
+      assert_xpath '//ul/li[1]/p', output, 1
+      assert_xpath '//ul/li[1]//p', output, 2
+      assert_xpath '//ul/li[1]//p[text() = "Item one, paragraph one"]', output, 1
+      assert_xpath '//ul/li[1]//p[text() = "Item one, paragraph two"]', output, 1
+    end
+  end
+end
+
+context "Ordered lists (:olist)" do
+  context "Simple lists" do
+    test "dot elements with no blank lines" do
+      output = render_string("Blah\n====\n\n. Foo\n. Boo\n. Blech")
+      assert_xpath '//ol', output, 1
+      assert_xpath '//ol/li', output, 3
+    end
+  end
+end
+
+context "Labeled lists (:dlist)" do
+  context "Simple lists" do
+    test "single-line adjacent elements" do
+      output = render_string("term1:: def1\nterm2:: def2")
+      assert_xpath '//dl', output, 1
+      assert_xpath '//dl/dt', output, 2
+      assert_xpath '//dl/dt/following-sibling::dd', output, 2
+      assert_xpath '(//dl/dt)[1][normalize-space(text()) = "term1"]', output, 1
+      assert_xpath '(//dl/dt)[1]/following-sibling::dd/p[text() = "def1"]', output, 1
+      assert_xpath '(//dl/dt)[2][normalize-space(text()) = "term2"]', output, 1
+      assert_xpath '(//dl/dt)[2]/following-sibling::dd/p[text() = "def2"]', output, 1
+    end
+
+    test "single-line indented adjacent elements" do
+      output = render_string("term1:: def1\n term2:: def2")
+      assert_xpath '//dl', output, 1
+      assert_xpath '//dl/dt', output, 2
+      assert_xpath '//dl/dt/following-sibling::dd', output, 2
+      assert_xpath '(//dl/dt)[1][normalize-space(text()) = "term1"]', output, 1
+      assert_xpath '(//dl/dt)[1]/following-sibling::dd/p[text() = "def1"]', output, 1
+      assert_xpath '(//dl/dt)[2][normalize-space(text()) = "term2"]', output, 1
+      assert_xpath '(//dl/dt)[2]/following-sibling::dd/p[text() = "def2"]', output, 1
+    end
+
+    test "single-line elements separated by blank line" do
+      output = render_string("term1:: def1\n\nterm2:: def2")
+      assert_xpath '//dl', output, 1
+      assert_xpath '//dl/dt', output, 2
+      assert_xpath '//dl/dt/following-sibling::dd', output, 2
+    end
+
+    test "multi-line elements with paragraph content" do
+      output = render_string("term1::\ndef1\nterm2::\ndef2")
+      assert_xpath '//dl', output, 1
+      assert_xpath '//dl/dt', output, 2
+      assert_xpath '//dl/dt/following-sibling::dd', output, 2
+      assert_xpath '(//dl/dt)[1][normalize-space(text()) = "term1"]', output, 1
+      assert_xpath '(//dl/dt)[1]/following-sibling::dd/p[text() = "def1"]', output, 1
+      assert_xpath '(//dl/dt)[2][normalize-space(text()) = "term2"]', output, 1
+      assert_xpath '(//dl/dt)[2]/following-sibling::dd/p[text() = "def2"]', output, 1
+    end
+
+    test "multi-line elements with indented paragraph content" do
+      output = render_string("term1::\n def1\nterm2::\n  def2")
+      assert_xpath '//dl', output, 1
+      assert_xpath '//dl/dt', output, 2
+      assert_xpath '//dl/dt/following-sibling::dd', output, 2
+      assert_xpath '(//dl/dt)[1][normalize-space(text()) = "term1"]', output, 1
+      assert_xpath '(//dl/dt)[1]/following-sibling::dd/p[text() = "def1"]', output, 1
+      assert_xpath '(//dl/dt)[2][normalize-space(text()) = "term2"]', output, 1
+      assert_xpath '(//dl/dt)[2]/following-sibling::dd/p[text() = "def2"]', output, 1
+    end
+
+    test "multi-line elements with blank line before paragraph content" do
+      output = render_string("term1::\n\ndef1\nterm2::\n\ndef2")
+      assert_xpath '//dl', output, 1
+      assert_xpath '//dl/dt', output, 2
+      assert_xpath '//dl/dt/following-sibling::dd', output, 2
+      assert_xpath '(//dl/dt)[1][normalize-space(text()) = "term1"]', output, 1
+      assert_xpath '(//dl/dt)[1]/following-sibling::dd/p[text() = "def1"]', output, 1
+      assert_xpath '(//dl/dt)[2][normalize-space(text()) = "term2"]', output, 1
+      assert_xpath '(//dl/dt)[2]/following-sibling::dd/p[text() = "def2"]', output, 1
+    end
+
+    test "multi-line elements with paragraph and literal content" do
+      output = render_string("term1::\n  def1\n\n  literal\nterm2::\n  def2")
+      assert_xpath '//dl', output, 1
+      assert_xpath '//dl/dt', output, 2
+      assert_xpath '//dl/dt/following-sibling::dd', output, 2
+      assert_xpath '//dl/dt/following-sibling::dd//pre', output, 1
+      assert_xpath '(//dl/dt)[1][normalize-space(text()) = "term1"]', output, 1
+      assert_xpath '(//dl/dt)[1]/following-sibling::dd/p[text() = "def1"]', output, 1
+      assert_xpath '(//dl/dt)[2][normalize-space(text()) = "term2"]', output, 1
+      assert_xpath '(//dl/dt)[2]/following-sibling::dd/p[text() = "def2"]', output, 1
+    end
+
+    test "mixed single and multi-line adjacent elements" do
+      output = render_string("term1:: def1\nterm2::\ndef2")
+      assert_xpath '//dl', output, 1
+      assert_xpath '//dl/dt', output, 2
+      assert_xpath '//dl/dt/following-sibling::dd', output, 2
+      assert_xpath '(//dl/dt)[1][normalize-space(text()) = "term1"]', output, 1
+      assert_xpath '(//dl/dt)[1]/following-sibling::dd/p[text() = "def1"]', output, 1
+      assert_xpath '(//dl/dt)[2][normalize-space(text()) = "term2"]', output, 1
+      assert_xpath '(//dl/dt)[2]/following-sibling::dd/p[text() = "def2"]', output, 1
+    end
+
+    test "element with anchor" do
+      output = render_string("[[term1]]term1:: def1\n[[term2]]term2:: def2")
+      assert_xpath '//dl', output, 1
+      assert_xpath '//dl/dt', output, 2
+      assert_xpath '(//dl/dt)[1]/a[@id = "term1"]', output, 1
+      assert_xpath '(//dl/dt)[2]/a[@id = "term2"]', output, 1
+    end
+
+    test "missing space before term does not produce labeled list" do
+      output = render_string("term1::def1\nterm2::def2")
+      assert_xpath '//dl', output, 0
+    end
+  end
+
+  context "Nested lists" do
+    test "single-line adjacent nested elements" do
+      output = render_string("term1:: def1\nlabel1::: detail1\nterm2:: def2")
+      assert_xpath '//dl', output, 2
+      assert_xpath '//dl//dl', output, 1
+      assert_xpath '(//dl)[1]/dt[1][normalize-space(text()) = "term1"]', output, 1
+      assert_xpath '(//dl)[1]/dt[1]/following-sibling::dd/p[text() = "def1"]', output, 1
+      assert_xpath '//dl//dl/dt[normalize-space(text()) = "label1"]', output, 1
+      assert_xpath '//dl//dl/dt/following-sibling::dd/p[text() = "detail1"]', output, 1
+      assert_xpath '(//dl)[1]/dt[2][normalize-space(text()) = "term2"]', output, 1
+      assert_xpath '(//dl)[1]/dt[2]/following-sibling::dd/p[text() = "def2"]', output, 1
+    end
+
+    test "single-line adjacent maximum nested elements" do
+      output = render_string("term1:: def1\nlabel1::: detail1\nname1:::: value1\nitem1;; price1\nterm2:: def2")
+      assert_xpath '//dl', output, 4
+      assert_xpath '//dl//dl//dl//dl', output, 1
+    end
+
+    test "single-line nested elements seperated by blank line at top level" do
+      output = render_string("term1:: def1\n\nlabel1::: detail1\n\nterm2:: def2")
+      assert_xpath '//dl', output, 2
+      assert_xpath '//dl//dl', output, 1
+      assert_xpath '(//dl)[1]/dt[1][normalize-space(text()) = "term1"]', output, 1
+      assert_xpath '(//dl)[1]/dt[1]/following-sibling::dd/p[text() = "def1"]', output, 1
+      assert_xpath '//dl//dl/dt[normalize-space(text()) = "label1"]', output, 1
+      assert_xpath '//dl//dl/dt/following-sibling::dd/p[text() = "detail1"]', output, 1
+      assert_xpath '(//dl)[1]/dt[2][normalize-space(text()) = "term2"]', output, 1
+      assert_xpath '(//dl)[1]/dt[2]/following-sibling::dd/p[text() = "def2"]', output, 1
+    end
+
+    # FIXME test pending, haven't fixed lexer to allow blank line at nested level
+    #test "single-line nested elements seperated by blank line at nested level" do
+    #  output = render_string("term1:: def1\nlabel1::: detail1\n\nlabel2::: detail2\nterm2:: def2")
+    #  assert_xpath '//dl', output, 2
+    #  assert_xpath '//dl//dl', output, 1
+    #  assert_xpath '(//dl)[1]/dt[1][normalize-space(text()) = "term1"]', output, 1
+    #  assert_xpath '(//dl)[1]/dt[1]/following-sibling::dd/p[text() = "def1"]', output, 1
+    #  assert_xpath '//dl//dl/dt[normalize-space(text()) = "label1"]', output, 1
+    #  assert_xpath '//dl//dl/dt/following-sibling::dd/p[text() = "detail1"]', output, 1
+    #  assert_xpath '(//dl)[1]/dt[2][normalize-space(text()) = "term2"]', output, 1
+    #  assert_xpath '(//dl)[1]/dt[2]/following-sibling::dd/p[text() = "def2"]', output, 1
+    #end
+
+    test "single-line adjacent nested elements with alternate delimiters" do
+      output = render_string("term1:: def1\nlabel1;; detail1\nterm2:: def2")
+      assert_xpath '//dl', output, 2
+      assert_xpath '//dl//dl', output, 1
+      assert_xpath '(//dl)[1]/dt[1][normalize-space(text()) = "term1"]', output, 1
+      assert_xpath '(//dl)[1]/dt[1]/following-sibling::dd/p[text() = "def1"]', output, 1
+      assert_xpath '//dl//dl/dt[normalize-space(text()) = "label1"]', output, 1
+      assert_xpath '//dl//dl/dt/following-sibling::dd/p[text() = "detail1"]', output, 1
+      assert_xpath '(//dl)[1]/dt[2][normalize-space(text()) = "term2"]', output, 1
+      assert_xpath '(//dl)[1]/dt[2]/following-sibling::dd/p[text() = "def2"]', output, 1
+    end
+
+    test "multi-line adjacent nested elements" do
+      output = render_string("term1::\ndef1\nlabel1:::\ndetail1\nterm2::\ndef2")
+      assert_xpath '//dl', output, 2
+      assert_xpath '//dl//dl', output, 1
+      assert_xpath '(//dl)[1]/dt[1][normalize-space(text()) = "term1"]', output, 1
+      assert_xpath '(//dl)[1]/dt[1]/following-sibling::dd/p[text() = "def1"]', output, 1
+      assert_xpath '//dl//dl/dt[normalize-space(text()) = "label1"]', output, 1
+      assert_xpath '//dl//dl/dt/following-sibling::dd/p[text() = "detail1"]', output, 1
+      assert_xpath '(//dl)[1]/dt[2][normalize-space(text()) = "term2"]', output, 1
+      assert_xpath '(//dl)[1]/dt[2]/following-sibling::dd/p[text() = "def2"]', output, 1
+    end
+
+    # FIXME test pending, haven't fixed lexer to allow blank line at nested level
+    #test "multi-line nested elements seperated by blank line at nested level" do
+    #  output = render_string("term1::\ndef1\nlabel1:::\n\ndetail1\nlabel2:::\ndetail2\n\nterm2:: def2")
+    #  assert_xpath '//dl', output, 2
+    #  assert_xpath '//dl//dl', output, 1
+    #  assert_xpath '(//dl)[1]/dt[1][normalize-space(text()) = "term1"]', output, 1
+    #  assert_xpath '(//dl)[1]/dt[1]/following-sibling::dd/p[text() = "def1"]', output, 1
+    #  assert_xpath '(//dl//dl/dt)[1][normalize-space(text()) = "label1"]', output, 1
+    #  assert_xpath '(//dl//dl/dt)[1]/following-sibling::dd/p[text() = "detail1"]', output, 1
+    #  assert_xpath '(//dl//dl/dt)[2][normalize-space(text()) = "label2"]', output, 1
+    #  assert_xpath '(//dl//dl/dt)[2]/following-sibling::dd/p[text() = "detail2"]', output, 1
+    #end
+
+    test "mixed single and multi-line elements with indented nested elements" do
+      output = render_string("term1:: def1\n  label1:::\n    detail1\nterm2:: def2")
+      assert_xpath '//dl', output, 2
+      assert_xpath '//dl//dl', output, 1
+      assert_xpath '(//dl)[1]/dt[1][normalize-space(text()) = "term1"]', output, 1
+      assert_xpath '(//dl)[1]/dt[1]/following-sibling::dd/p[text() = "def1"]', output, 1
+      assert_xpath '//dl//dl/dt[normalize-space(text()) = "label1"]', output, 1
+      assert_xpath '//dl//dl/dt/following-sibling::dd/p[text() = "detail1"]', output, 1
+      assert_xpath '(//dl)[1]/dt[2][normalize-space(text()) = "term2"]', output, 1
+      assert_xpath '(//dl)[1]/dt[2]/following-sibling::dd/p[text() = "def2"]', output, 1
+    end
+
+    test "multi-line elements with first paragraph folded to text with adjacent nested element" do
+      output = render_string("term1:: def1\ncontinued\nlabel1:::\ndetail1")
+      assert_xpath '//dl', output, 2
+      assert_xpath '//dl//dl', output, 1
+      assert_xpath '(//dl)[1]/dt[1][normalize-space(text()) = "term1"]', output, 1
+      assert_xpath '(//dl)[1]/dt[1]/following-sibling::dd/p[starts-with(text(), "def1")]', output, 1
+      assert_xpath '(//dl)[1]/dt[1]/following-sibling::dd/p[contains(text(), "continued")]', output, 1
+      assert_xpath '//dl//dl/dt[normalize-space(text()) = "label1"]', output, 1
+      assert_xpath '//dl//dl/dt/following-sibling::dd/p[text() = "detail1"]', output, 1
+    end
+  end
+end