asciidoctor 0.0.9 → 0.1.0

data/test/fixtures/encoding.asciidoc

@@ -1 +1,5 @@
 Gregory Romé has written an AsciiDoc plugin for the Redmine project management application.
+
+https://github.com/foo-users/foo
+へと `vicmd` キーマップを足してみている試み、
+アニメーションgifです。

data/test/fixtures/sample.asciidoc

@@ -0,0 +1,26 @@
+Document Title
+==============
+Doc Writer <thedoc@asciidoctor.org>
+:idprefix: id_
+
+Preamble paragraph.
+
+NOTE: This is test, only a test.
+
+== Section A
+
+*Section A* paragraph.
+
+=== Section A Subsection
+
+*Section A* 'subsection' paragraph.
+
+== Section B
+
+*Section B* paragraph.
+
+.Section B list
+* Item 1
+* Item 2
+* Item 3
+

data/test/invoker_test.rb

@@ -0,0 +1,254 @@
+require 'test_helper'
+require 'asciidoctor/cli/options'
+require 'asciidoctor/cli/invoker'
+
+context 'Invoker' do
+  test 'should parse source and render as html5 article by default' do
+    invoker = nil
+    output = nil
+    redirect_streams do |stdout, stderr|
+      invoker = invoke_cli %w(-o -)
+      output = stdout.string
+    end
+    assert !invoker.nil?
+    doc = invoker.document
+    assert !doc.nil?
+    assert_equal 'Document Title', doc.doctitle
+    assert_equal 'Doc Writer', doc.attr('author')
+    assert_equal 'html5', doc.attr('backend')
+    assert_equal '.html', doc.attr('outfilesuffix')
+    assert_equal 'article', doc.attr('doctype')
+    assert doc.blocks?
+    assert_equal :preamble, doc.blocks.first.context
+    assert !output.empty?
+    assert_xpath '/html', output, 1
+    assert_xpath '/html/head', output, 1
+    assert_xpath '/html/body', output, 1
+    assert_xpath '/html/head/title[text() = "Document Title"]', output, 1
+    assert_xpath '/html/body[@class="article"]/*[@id="header"]/h1[text() = "Document Title"]', output, 1
+  end
+
+  test 'should set implicit doc info attributes' do
+    sample_filepath = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'sample.asciidoc'))
+    sample_filedir = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
+    invoker = invoke_cli_to_buffer %w(-o /dev/null), sample_filepath
+    doc = invoker.document
+    assert_equal 'sample', doc.attr('docname')
+    assert_equal sample_filepath, doc.attr('docfile')
+    assert_equal sample_filedir, doc.attr('docdir')
+    assert doc.attr?('docdate')
+    assert doc.attr?('doctime')
+    assert doc.attr?('docdatetime')
+    assert invoker.read_output.empty?
+  end
+
+  test 'should accept document from stdin and write to stdout' do
+    invoker = invoke_cli_to_buffer(%w(-s), '-') { 'content' }
+    doc = invoker.document
+    assert !doc.attr?('docname')
+    assert !doc.attr?('docfile')
+    assert_equal Dir.pwd, doc.attr('docdir')
+    assert_equal doc.attr('docdate'), doc.attr('localdate')
+    assert_equal doc.attr('doctime'), doc.attr('localtime')
+    assert_equal doc.attr('docdatetime'), doc.attr('localdatetime')
+    assert !doc.attr?('outfile')
+    output = invoker.read_output
+    assert !output.empty?
+    assert_xpath '/*[@class="paragraph"]/p[text()="content"]', output, 1
+  end
+
+  test 'should allow docdir to be specified when input is a string' do
+    expected_docdir = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
+    invoker = invoke_cli_to_buffer(%w(-s --base-dir test/fixtures -o /dev/null), '-') { 'content' }
+    doc = invoker.document
+    assert_equal expected_docdir, doc.attr('docdir')
+    assert_equal expected_docdir, doc.base_dir
+  end
+
+  test 'should display version and exit' do
+    redirect_streams do |stdout, stderr|
+      invoke_cli %w(--version)
+      assert_equal "Asciidoctor #{Asciidoctor::VERSION} [http://asciidoctor.org]", stdout.string.chomp
+    end
+  end
+
+  test 'should report usage if no input file given' do
+    redirect_streams do |stdout, stderr|
+      invoke_cli [], nil
+      assert_match(/Usage:/, stderr.string)
+    end
+  end
+
+  test 'should report error if input file does not exist' do
+    redirect_streams do |stdout, stderr|
+      invoker = invoke_cli [], 'missing_file.asciidoc'
+      assert_match(/input file .* missing/, stderr.string)
+      assert_equal 1, invoker.code
+    end
+  end
+
+  test 'should fail with too many arguments if extra arguments are included' do
+    redirect_streams do |stdout, stderr|
+      invoker = invoke_cli %w(-o /dev/null extra arguments sample.asciidoc), nil
+      assert_match(/too many arguments/, stderr.string)
+      assert_equal 1, invoker.code
+    end
+  end
+
+  test 'should output to file name based on input file name' do
+    sample_outpath = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'sample.html'))
+    begin
+      invoker = invoke_cli
+      doc = invoker.document
+      assert_equal sample_outpath, doc.attr('outfile')
+      assert File.exist?(sample_outpath)
+      output = File.read(sample_outpath)
+      assert !output.empty?
+      assert_xpath '/html', output, 1
+      assert_xpath '/html/head', output, 1
+      assert_xpath '/html/body', output, 1
+      assert_xpath '/html/head/title[text() = "Document Title"]', output, 1
+      assert_xpath '/html/body/*[@id="header"]/h1[text() = "Document Title"]', output, 1
+    ensure
+      FileUtils::rm(sample_outpath)
+    end
+  end
+
+  test 'should output to file in destination directory if set' do
+    destination_path = File.expand_path(File.join(File.dirname(__FILE__), 'test_output'))
+    sample_outpath = File.join(destination_path, 'sample.html')
+    begin
+      FileUtils::mkdir_p(destination_path) 
+      invoker = invoke_cli %w(-D test/test_output)
+      doc = invoker.document
+      assert_equal sample_outpath, doc.attr('outfile')
+      assert File.exist?(sample_outpath)
+    ensure
+      FileUtils::rm(sample_outpath)
+      FileUtils::rmdir(destination_path)
+    end
+  end
+
+  test 'should output to file specified' do
+    sample_outpath = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'sample-output.html'))
+    begin
+      invoker = invoke_cli %W(-o #{sample_outpath})
+      doc = invoker.document
+      assert_equal sample_outpath, doc.attr('outfile')
+      assert File.exist?(sample_outpath)
+    ensure
+      FileUtils::rm(sample_outpath)
+    end
+  end
+
+  test 'should suppress header footer if specified' do
+    invoker = invoke_cli_to_buffer %w(-s -o -)
+    output = invoker.read_output
+    assert_xpath '/html', output, 0
+    assert_xpath '/*[@id="preamble"]', output, 1
+  end
+
+  test 'should not compact output by default' do
+    invoker = invoke_cli_to_buffer(%w(-s -o -), '-') { 'content' }
+    output = invoker.read_output
+    assert_match(/\n[[:blank:]]*\n/, output)
+  end
+
+  test 'should compact output if specified' do
+    invoker = invoke_cli_to_buffer(%w(-C -s -o -), '-') { 'content' }
+    output = invoker.read_output
+    assert_no_match(/\n[[:blank:]]*\n/, output)
+  end
+
+  test 'should set backend to html5 if specified' do
+    invoker = invoke_cli_to_buffer %w(-b html5 -o -)
+    doc = invoker.document
+    assert_equal 'html5', doc.attr('backend')
+    assert_equal '.html', doc.attr('outfilesuffix')
+    output = invoker.read_output
+    assert_xpath '/html', output, 1
+  end
+
+  test 'should set backend to docbook45 if specified' do
+    invoker = invoke_cli_to_buffer %w(-b docbook45 -o -)
+    doc = invoker.document
+    assert_equal 'docbook45', doc.attr('backend')
+    assert_equal '.xml', doc.attr('outfilesuffix')
+    output = invoker.read_output
+    assert_xpath '/article', output, 1
+  end
+
+  test 'should set doctype to article if specified' do
+    invoker = invoke_cli_to_buffer %w(-d article -o -)
+    doc = invoker.document
+    assert_equal 'article', doc.attr('doctype')
+    output = invoker.read_output
+    assert_xpath '/html/body[@class="article"]', output, 1
+  end
+
+  test 'should set doctype to book if specified' do
+    invoker = invoke_cli_to_buffer %w(-d book -o -)
+    doc = invoker.document
+    assert_equal 'book', doc.attr('doctype')
+    output = invoker.read_output
+    assert_xpath '/html/body[@class="book"]', output, 1
+  end
+
+  test 'should set attribute with value' do
+    invoker = invoke_cli_to_buffer %w(--trace -a idprefix=id -s -o -)
+    doc = invoker.document
+    assert_equal 'id', doc.attr('idprefix')
+    output = invoker.read_output
+    assert_xpath '//h2[@id="idsection_a"]', output, 1
+  end
+
+  test 'should not set attribute ending in @ if defined in document' do
+    invoker = invoke_cli_to_buffer %w(--trace -a idprefix=id@ -s -o -)
+    doc = invoker.document
+    assert_equal 'id_', doc.attr('idprefix')
+    output = invoker.read_output
+    assert_xpath '//h2[@id="id_section_a"]', output, 1
+  end
+
+  test 'should set attribute with no value' do
+    invoker = invoke_cli_to_buffer %w(-a icons -s -o -)
+    doc = invoker.document
+    assert_equal '', doc.attr('icons')
+    output = invoker.read_output
+    assert_xpath '//*[@class="admonitionblock"]//img[@alt="Note"]', output, 1
+  end
+
+  test 'should unset attribute ending in bang' do
+    invoker = invoke_cli_to_buffer %w(-a sectids! -s -o -)
+    doc = invoker.document
+    assert !doc.attr?('sectids')
+    output = invoker.read_output
+    # leave the count loose in case we add more sections
+    assert_xpath '//h2[not(@id)]', output
+  end
+
+  test 'default mode for cli should be unsafe' do
+    invoker = invoke_cli_to_buffer %w(-o /dev/null)
+    doc = invoker.document
+    assert_equal Asciidoctor::SafeMode::UNSAFE, doc.safe 
+  end
+
+  test 'should set safe mode if specified' do
+    invoker = invoke_cli_to_buffer %w(--safe -o /dev/null)
+    doc = invoker.document
+    assert_equal Asciidoctor::SafeMode::SAFE, doc.safe
+  end
+
+  test 'should set safe mode to specified level if specified' do
+    invoker = invoke_cli_to_buffer %w(-S safe -o /dev/null)
+    doc = invoker.document
+    assert_equal Asciidoctor::SafeMode::SAFE, doc.safe
+  end
+
+  test 'should set eRuby impl if specified' do
+    invoker = invoke_cli_to_buffer %w(--eruby erubis -o /dev/null)
+    doc = invoker.document
+    assert_equal 'erubis', doc.instance_variable_get('@options')[:eruby]
+  end
+
+end

data/test/lexer_test.rb

@@ -23,6 +23,14 @@ context "Lexer" do
     assert_equal expected, attributes
   end
 
+  test "collect empty unnamed attribute double-quoted" do
+    attributes = {}
+    line = '""'
+    expected = {1 => ''}
+    Asciidoctor::AttributeList.new(line).parse_into(attributes)
+    assert_equal expected, attributes
+  end
+
   test "collect unnamed attribute double-quoted containing escaped quote" do
     attributes = {}
     line = '"ba\"zaar"'
@@ -39,6 +47,14 @@ context "Lexer" do
     assert_equal expected, attributes
   end
 
+  test "collect empty unnamed attribute single-quoted" do
+    attributes = {}
+    line = '\'\''
+    expected = {1 => ''}
+    Asciidoctor::AttributeList.new(line).parse_into(attributes)
+    assert_equal expected, attributes
+  end
+
   test "collect unnamed attribute single-quoted containing escaped quote" do
     attributes = {}
     line = '\'ba\\\'zaar\''
@@ -79,6 +95,14 @@ context "Lexer" do
     assert_equal expected, attributes
   end
 
+  test 'collect named attribute with double-quoted empty value' do
+    attributes = {}
+    line = 'height=100,caption="",link="images/octocat.png"'
+    expected = {'height' => '100', 'caption' => '', 'link' => 'images/octocat.png'}
+    Asciidoctor::AttributeList.new(line).parse_into(attributes)
+    assert_equal expected, attributes 
+  end
+
   test "collect named attribute single-quoted" do
     attributes = {}
     line = 'foo=\'bar\''
@@ -87,6 +111,14 @@ context "Lexer" do
     assert_equal expected, attributes
   end
 
+  test 'collect named attribute with single-quoted empty value' do
+    attributes = {}
+    line = "height=100,caption='',link='images/octocat.png'"
+    expected = {'height' => '100', 'caption' => '', 'link' => 'images/octocat.png'}
+    Asciidoctor::AttributeList.new(line).parse_into(attributes)
+    assert_equal expected, attributes 
+  end
+
   test "collect named attributes unquoted" do
     attributes = {}
     line = "first=value, second=two, third=3"
@@ -209,6 +241,27 @@ context "Lexer" do
     assert_equal 'TB', metadata['authorinitials']
   end
 
+  test "test_parse_author_with_single_quote" do
+    metadata, = parse_header_metadata 'Stephen O\'Grady <founder@redmonk.com>'
+    assert_equal 5, metadata.size
+    assert_equal 'Stephen O\'Grady', metadata['author']
+    assert_equal 'Stephen', metadata['firstname']
+    assert_equal 'O\'Grady', metadata['lastname']
+    assert_equal 'founder@redmonk.com', metadata['email']
+    assert_equal 'SO', metadata['authorinitials']
+  end
+
+  test "parse author with dotted initial" do
+    metadata, = parse_header_metadata 'Heiko W. Rupp <hwr@example.de>'
+    assert_equal 6, metadata.size
+    assert_equal 'Heiko W. Rupp', metadata['author']
+    assert_equal 'Heiko', metadata['firstname']
+    assert_equal 'W.', metadata['middlename']
+    assert_equal 'Rupp', metadata['lastname']
+    assert_equal 'hwr@example.de', metadata['email']
+    assert_equal 'HWR', metadata['authorinitials']
+  end
+
   test "test_parse_author_with_underscore" do
     metadata, = parse_header_metadata 'Tim_E Fella'
     assert_equal 4, metadata.size

data/test/links_test.rb

@@ -50,6 +50,14 @@ context 'Links' do
     assert_xpath '//a', render_string('\http://asciidoc.org[AsciiDoc] is the key to good docs.'), 0
   end
 
+  test 'inline qualified url followed by an endline should not include endline in link' do
+    assert_xpath '//a[@href="http://github.com/asciidoctor"]', render_string("The source code for Asciidoctor can be found at http://github.com/asciidoctor\nwhich is a GitHub organization."), 1
+  end
+
+  test 'qualified url divided by endline using macro syntax should not create link' do
+    assert_xpath '//a', render_string("The source code for Asciidoctor can be found at link:http://github.com/asciidoctor\n[]which is a GitHub organization."), 0
+  end
+
   test 'qualified url containing whitespace using macro syntax should not create link' do
     assert_xpath '//a', render_string('I often need to refer to the chapter on link:http://asciidoc.org?q=attribute references[Attribute References].'), 0
   end
@@ -58,6 +66,10 @@ context 'Links' do
     assert_xpath '//a', render_string('I often need to refer to the chapter on link:http://asciidoc.org?q=attribute%20references[Attribute References].'), 1
   end
 
+  test 'inline quoted qualified url should not consume surrounding angled brackets' do
+    assert_xpath '//a[@href="http://github.com/asciidoctor"]', render_string('Asciidoctor GitHub organization: <**http://github.com/asciidoctor**>'), 1
+  end
+
   test 'inline ref' do
     doc = document_from_string 'Here you can read about tigers.[[tigers]]'
     output = doc.render
@@ -132,6 +144,24 @@ context 'Links' do
     assert_xpath '//a[@href="#tigers"][text() = "[tigers]"]', doc.render, 1
   end
 
+  test 'xref shows label from title of target for forward and backward references in html backend' do
+    input = <<-EOS
+== Section A
+
+<\<_section_b>>
+
+== Section B
+
+<\<_section_a>>
+    EOS
+    
+    output = render_embedded_string input
+    assert_xpath '//h2[@id="_section_a"][text()="Section A"]', output, 1
+    assert_xpath '//a[@href="#_section_a"][text()="Section A"]', output, 1
+    assert_xpath '//h2[@id="_section_b"][text()="Section B"]', output, 1
+    assert_xpath '//a[@href="#_section_b"][text()="Section B"]', output, 1
+  end
+
   test 'anchor creates reference' do
     doc = document_from_string "[[tigers]]Tigers roam here."
     assert_equal({'tigers' => '[tigers]'}, doc.references[:ids])

data/test/lists_test.rb

@@ -33,6 +33,25 @@ List
       assert_xpath '//ul/li', output, 3
     end
 
+    test 'dash elements with interspersed line comments should be skipped and not break list' do
+      input = <<-EOS
+== List
+
+- Foo
+// line comment
+// another line comment
+- Boo
+// line comment
+more text
+// another line comment
+- Blech
+      EOS
+      output = render_embedded_string input
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 3
+      assert_xpath %((//ul/li)[2]/p[text()="Boo\nmore text"]), output, 1
+    end
+
     test "dash elements separated by a line comment offset by blank lines should not merge lists" do
       input = <<-EOS
 List
@@ -101,6 +120,26 @@ List
       assert_xpath "//ul/li[1]/p[text() = 'Foo\nwrapped content']", output, 1
     end
 
+    test 'wrapped list item with hanging indent followed by non-indented line' do
+      input = <<-EOS
+== Lists
+
+- list item 1
+  // not line comment
+second wrapped line
+- list item 2
+      EOS
+      output = render_embedded_string input
+      assert_css 'ul', output, 1
+      assert_css 'ul li', output, 2
+      # NOTE for some reason, we're getting an extra line after the indented line
+      lines = xmlnodes_at_xpath('(//ul/li)[1]/p', output, 1).text.gsub(/\n[[:space:]]*\n/, "\n").lines.entries
+      assert_equal 3, lines.size
+      assert_equal 'list item 1', lines[0].chomp
+      assert_equal '  // not line comment', lines[1].chomp
+      assert_equal 'second wrapped line', lines[2].chomp
+    end
+
     test "a literal paragraph offset by blank lines in list content is appended as a literal block" do
       input = <<-EOS
 List
@@ -147,6 +186,24 @@ para
       assert_xpath '(//ul/li)[1]/*[@class="literalblock"]/following-sibling::*[@class="paragraph"]/p[text()="para"]', output, 1
     end
 
+    test 'appends line as paragraph if attached by continuation following line comment' do
+      input = <<-EOS
+- list item 1
+// line comment
++
+paragraph in list item 1
+
+- list item 2
+      EOS
+      output = render_embedded_string input 
+      assert_css 'ul', output, 1
+      assert_css 'ul li', output, 2
+      assert_xpath '(//ul/li)[1]/p[text()="list item 1"]', output, 1
+      assert_xpath '(//ul/li)[1]/p/following-sibling::*[@class="paragraph"]', output, 1
+      assert_xpath '(//ul/li)[1]/p/following-sibling::*[@class="paragraph"]/p[text()="paragraph in list item 1"]', output, 1
+      assert_xpath '(//ul/li)[2]/p[text()="list item 2"]', output, 1
+    end
+
     test "a literal paragraph with a line that appears as a list item that is followed by a continuation should create two blocks" do
       input = <<-EOS
 * Foo
@@ -245,6 +302,25 @@ List
       assert_xpath '//ul/li', output, 3
     end
 
+    test 'asterisk elements with interspersed line comments should be skipped and not break list' do
+      input = <<-EOS
+== List
+
+* Foo
+// line comment
+// another line comment
+* Boo
+// line comment
+more text
+// another line comment
+* Blech
+      EOS
+      output = render_embedded_string input
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 3
+      assert_xpath %((//ul/li)[2]/p[text()="Boo\nmore text"]), output, 1
+    end
+
     test "asterisk elements separated by a line comment offset by blank lines should not merge lists" do
       input = <<-EOS
 List
@@ -569,6 +645,27 @@ List
       assert_xpath '((//ul)[1]/li//ol)[1]/li', output, 1
     end
 
+    test 'three levels of alternating unordered and ordered elements' do
+      input = <<-EOS
+== Lists
+
+* bullet 1
+. numbered 1.1
+** bullet 1.1.1
+* bullet 2
+      EOS
+
+      output = render_embedded_string input
+      assert_css '.ulist', output, 2
+      assert_css '.olist', output, 1
+      assert_css '.ulist > ul > li > p', output, 3
+      assert_css '.ulist > ul > li > p + .olist', output, 1
+      assert_css '.ulist > ul > li > p + .olist > ol > li > p', output, 1
+      assert_css '.ulist > ul > li > p + .olist > ol > li > p + .ulist', output, 1
+      assert_css '.ulist > ul > li > p + .olist > ol > li > p + .ulist > ul > li > p', output, 1
+      assert_css '.ulist > ul > li + li > p', output, 1
+    end
+
     test "lines with alternating markers of unordered and ordered list types separated by blank lines should be nested" do
       input = <<-EOS
 List
@@ -711,6 +808,66 @@ Item one, literal block
       assert_xpath '(//ul/li[1]/p/following-sibling::*)[1][@class = "literalblock"]', output, 1
     end
 
+    test "adjacent list continuation line attaches following block with block attributes" do
+      input = <<-EOS
+Lists
+=====
+
+* Item one, paragraph one
++
+[[beck]]
+.Read the following aloud to yourself
+[source, ruby]
+----
+5.times { print "Odelay!" }
+----
+ 
+* 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][@id="beck"][@class = "listingblock"]', output, 1
+      assert_xpath '(//ul/li[1]/p/following-sibling::*)[1][@id="beck"]/div[@class="title"][starts-with(text(),"Read")]', output, 1
+      assert_xpath '(//ul/li[1]/p/following-sibling::*)[1][@id="beck"]//code[@class="ruby"][starts-with(text(),"5.times")]', output, 1
+    end
+
+    test 'trailing block attribute line attached by continuation should not create block' do
+      input = <<-EOS
+Lists
+=====
+
+* Item one, paragraph one
++
+[source]
+ 
+* Item two
+      EOS
+      output = render_string input
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 2
+      assert_xpath '//ul/li[1]/*', output, 1
+      assert_xpath '//ul/li//*[@class="listingblock"]', output, 0
+    end
+
+    test 'trailing block title line attached by continuation should not create block' do
+      input = <<-EOS
+Lists
+=====
+
+* Item one, paragraph one
++
+.Disappears into the ether
+ 
+* Item two
+      EOS
+      output = render_string input
+      assert_xpath '//ul', output, 1
+      assert_xpath '//ul/li', output, 2
+      assert_xpath '//ul/li[1]/*', output, 1
+    end
+
     test "consecutive blocks in list continuation attach to list item" do
       input = <<-EOS
 Lists
@@ -736,6 +893,291 @@ ____
       assert_xpath '(//ul/li[1]/p/following-sibling::*)[2][@class = "quoteblock"]', output, 1
     end
 
+    test 'list item with hanging indent followed by block attached by list continuation' do
+      input = <<-EOS
+== Lists
+
+. list item 1
+  continued
++
+--
+open block in list item 1
+--
+
+. list item 2
+      EOS
+      output = render_embedded_string input
+      assert_css 'ol', output, 1
+      assert_css 'ol li', output, 2
+      assert_xpath %((//ol/li)[1]/p[text()="list item 1\ncontinued"]), output, 1
+      assert_xpath '(//ol/li)[1]/p/following-sibling::*[@class="openblock"]', output, 1
+      assert_xpath '(//ol/li)[1]/p/following-sibling::*[@class="openblock"]//p[text()="open block in list item 1"]', output, 1
+      assert_xpath %((//ol/li)[2]/p[text()="list item 2"]), output, 1
+    end
+
+    test 'list item paragraph in list item and nested list item' do
+      input = <<-EOS
+== Lists
+
+. list item 1
++
+list item 1 paragraph
+
+* nested list item
++
+nested list item paragraph
+
+. list item 2
+      EOS
+      output = render_embedded_string input
+      assert_css '.olist ol', output, 1
+      assert_css '.olist ol > li', output, 2
+      assert_css '.ulist ul', output, 1
+      assert_css '.ulist ul > li', output, 1
+      assert_xpath '(//ol/li)[1]/*', output, 3
+      assert_xpath '((//ol/li)[1]/*)[1]/self::p', output, 1
+      assert_xpath '((//ol/li)[1]/*)[1]/self::p[text()="list item 1"]', output, 1
+      assert_xpath '((//ol/li)[1]/*)[2]/self::div[@class="paragraph"]', output, 1
+      assert_xpath '((//ol/li)[1]/*)[3]/self::div[@class="ulist"]', output, 1
+      assert_xpath '((//ol/li)[1]/*)[3]/self::div[@class="ulist"]/ul/li', output, 1
+      assert_xpath '((//ol/li)[1]/*)[3]/self::div[@class="ulist"]/ul/li/p[text()="nested list item"]', output, 1
+      assert_xpath '((//ol/li)[1]/*)[3]/self::div[@class="ulist"]/ul/li/p/following-sibling::div[@class="paragraph"]', output, 1
+    end
+
+    test 'trailing list continuations should attach to list items at respective levels' do
+      input = <<-EOS
+== Lists
+
+. list item 1
++
+* nested list item 1
+* nested list item 2
++
+paragraph for nested list item 2
+
++
+paragraph for list item 1
+
+. list item 2
+      EOS
+      output = render_embedded_string input 
+      assert_css '.olist ol', output, 1
+      assert_css '.olist ol > li', output, 2
+      assert_css '.ulist ul', output, 1
+      assert_css '.ulist ul > li', output, 2
+      assert_css '.olist .ulist', output, 1
+      assert_xpath '(//ol/li)[1]/*', output, 3
+      assert_xpath '((//ol/li)[1]/*)[1]/self::p', output, 1
+      assert_xpath '((//ol/li)[1]/*)[1]/self::p[text()="list item 1"]', output, 1
+      assert_xpath '((//ol/li)[1]/*)[2]/self::div[@class="ulist"]', output, 1
+      assert_xpath '((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li', output, 2
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[2]/*', output, 2
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[2]/p', output, 1
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[2]/div[@class="paragraph"]', output, 1
+      assert_xpath '((//ol/li)[1]/*)[3]/self::div[@class="paragraph"]', output, 1
+    end
+
+    test 'trailing list continuations should attach to list items of different types at respective levels' do
+      input = <<-EOS
+== Lists
+
+* bullet 1
+. numbered 1.1
+** bullet 1.1.1
+
++
+numbered 1.1 paragraph
+
++
+bullet 1 paragraph
+
+* bullet 2
+      EOS
+      output = render_embedded_string input 
+
+      assert_xpath '(//ul)[1]/li', output, 2
+
+      assert_xpath '((//ul)[1]/li[1])/*', output, 3
+      assert_xpath '(((//ul)[1]/li[1])/*)[1]/self::p[text()="bullet 1"]', output, 1
+      assert_xpath '(((//ul)[1]/li[1])/*)[2]/ol', output, 1
+      assert_xpath '(((//ul)[1]/li[1])/*)[3]/self::div[@class="paragraph"]/p[text()="bullet 1 paragraph"]', output, 1
+
+      assert_xpath '((//ul)[1]/li)[1]/div/ol/li', output, 1
+      assert_xpath '((//ul)[1]/li)[1]/div/ol/li/*', output, 3
+      assert_xpath '(((//ul)[1]/li)[1]/div/ol/li/*)[1]/self::p[text()="numbered 1.1"]', output, 1
+      assert_xpath '(((//ul)[1]/li)[1]/div/ol/li/*)[2]/self::div[@class="ulist"]', output, 1
+      assert_xpath '(((//ul)[1]/li)[1]/div/ol/li/*)[3]/self::div[@class="paragraph"]/p[text()="numbered 1.1 paragraph"]', output, 1
+
+      assert_xpath '((//ul)[1]/li)[1]/div/ol/li/div[@class="ulist"]/ul/li', output, 1
+      assert_xpath '((//ul)[1]/li)[1]/div/ol/li/div[@class="ulist"]/ul/li/*', output, 1
+      assert_xpath '((//ul)[1]/li)[1]/div/ol/li/div[@class="ulist"]/ul/li/p[text()="bullet 1.1.1"]', output, 1
+    end
+
+    test 'repeated list continuations should attach to list items at respective levels' do
+      input = <<-EOS
+== Lists
+
+. list item 1
+
+* nested list item 1
++
+--
+open block for nested list item 1
+--
++
+* nested list item 2
++
+paragraph for nested list item 2
+
++
+paragraph for list item 1
+
+. list item 2
+      EOS
+      output = render_embedded_string input 
+      assert_css '.olist ol', output, 1
+      assert_css '.olist ol > li', output, 2
+      assert_css '.ulist ul', output, 1
+      assert_css '.ulist ul > li', output, 2
+      assert_css '.olist .ulist', output, 1
+      assert_xpath '(//ol/li)[1]/*', output, 3
+      assert_xpath '((//ol/li)[1]/*)[1]/self::p', output, 1
+      assert_xpath '((//ol/li)[1]/*)[1]/self::p[text()="list item 1"]', output, 1
+      assert_xpath '((//ol/li)[1]/*)[2]/self::div[@class="ulist"]', output, 1
+      assert_xpath '((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li', output, 2
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[1]/*', output, 2
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[1]/p', output, 1
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[1]/div[@class="openblock"]', output, 1
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[2]/*', output, 2
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[2]/p', output, 1
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[2]/div[@class="paragraph"]', output, 1
+      assert_xpath '((//ol/li)[1]/*)[3]/self::div[@class="paragraph"]', output, 1
+    end
+
+    test 'repeated list continuations attached directly to list item should attach to list items at respective levels' do
+      input = <<-EOS
+== Lists
+
+. list item 1
++
+* nested list item 1
++
+--
+open block for nested list item 1
+--
++
+* nested list item 2
++
+paragraph for nested list item 2
+
++
+paragraph for list item 1
+
+. list item 2
+      EOS
+      output = render_embedded_string input 
+      assert_css '.olist ol', output, 1
+      assert_css '.olist ol > li', output, 2
+      assert_css '.ulist ul', output, 1
+      assert_css '.ulist ul > li', output, 2
+      assert_css '.olist .ulist', output, 1
+      assert_xpath '(//ol/li)[1]/*', output, 3
+      assert_xpath '((//ol/li)[1]/*)[1]/self::p', output, 1
+      assert_xpath '((//ol/li)[1]/*)[1]/self::p[text()="list item 1"]', output, 1
+      assert_xpath '((//ol/li)[1]/*)[2]/self::div[@class="ulist"]', output, 1
+      assert_xpath '((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li', output, 2
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[1]/*', output, 2
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[1]/p', output, 1
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[1]/div[@class="openblock"]', output, 1
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[2]/*', output, 2
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[2]/p', output, 1
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[2]/div[@class="paragraph"]', output, 1
+      assert_xpath '((//ol/li)[1]/*)[3]/self::div[@class="paragraph"]', output, 1
+    end
+
+    test 'repeated list continuations should attach to list items at respective levels ignoring blank lines' do
+      input = <<-EOS
+== Lists
+
+. list item 1
++
+* nested list item 1
++
+--
+open block for nested list item 1
+--
++
+* nested list item 2
++
+paragraph for nested list item 2
+
+
++
+paragraph for list item 1
+
+. list item 2
+      EOS
+      output = render_embedded_string input 
+      assert_css '.olist ol', output, 1
+      assert_css '.olist ol > li', output, 2
+      assert_css '.ulist ul', output, 1
+      assert_css '.ulist ul > li', output, 2
+      assert_css '.olist .ulist', output, 1
+      assert_xpath '(//ol/li)[1]/*', output, 3
+      assert_xpath '((//ol/li)[1]/*)[1]/self::p', output, 1
+      assert_xpath '((//ol/li)[1]/*)[1]/self::p[text()="list item 1"]', output, 1
+      assert_xpath '((//ol/li)[1]/*)[2]/self::div[@class="ulist"]', output, 1
+      assert_xpath '((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li', output, 2
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[1]/*', output, 2
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[1]/p', output, 1
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[1]/div[@class="openblock"]', output, 1
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[2]/*', output, 2
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[2]/p', output, 1
+      assert_xpath '(((//ol/li)[1]/*)[2]/self::div[@class="ulist"]/ul/li)[2]/div[@class="paragraph"]', output, 1
+      assert_xpath '((//ol/li)[1]/*)[3]/self::div[@class="paragraph"]', output, 1
+    end
+
+    test 'trailing list continuations should ignore preceding blank lines' do
+      input = <<-EOS
+== Lists
+
+* bullet 1
+** bullet 1.1
+*** bullet 1.1.1
++
+--
+open block
+--
+
+
++
+bullet 1.1 paragraph
+
+
++
+bullet 1 paragraph
+
+* bullet 2
+      EOS
+      output = render_embedded_string input 
+
+      assert_xpath '((//ul)[1]/li[1])/*', output, 3
+      assert_xpath '(((//ul)[1]/li[1])/*)[1]/self::p[text()="bullet 1"]', output, 1
+      assert_xpath '(((//ul)[1]/li[1])/*)[2]/self::div[@class="ulist"]', output, 1
+      assert_xpath '(((//ul)[1]/li[1])/*)[3]/self::div[@class="paragraph"]/p[text()="bullet 1 paragraph"]', output, 1
+
+      assert_xpath '((//ul)[1]/li)[1]/div[@class="ulist"]/ul/li', output, 1
+      assert_xpath '((//ul)[1]/li)[1]/div[@class="ulist"]/ul/li/*', output, 3
+      assert_xpath '(((//ul)[1]/li)[1]/div[@class="ulist"]/ul/li/*)[1]/self::p[text()="bullet 1.1"]', output, 1
+      assert_xpath '(((//ul)[1]/li)[1]/div[@class="ulist"]/ul/li/*)[2]/self::div[@class="ulist"]', output, 1
+      assert_xpath '(((//ul)[1]/li)[1]/div[@class="ulist"]/ul/li/*)[3]/self::div[@class="paragraph"]/p[text()="bullet 1.1 paragraph"]', output, 1
+
+      assert_xpath '((//ul)[1]/li)[1]/div[@class="ulist"]/ul/li/div[@class="ulist"]/ul/li', output, 1
+      assert_xpath '((//ul)[1]/li)[1]/div[@class="ulist"]/ul/li/div[@class="ulist"]/ul/li/*', output, 2
+      assert_xpath '(((//ul)[1]/li)[1]/div[@class="ulist"]/ul/li/div[@class="ulist"]/ul/li/*)[1]/self::p', output, 1
+      assert_xpath '(((//ul)[1]/li)[1]/div[@class="ulist"]/ul/li/div[@class="ulist"]/ul/li/*)[2]/self::div[@class="openblock"]', output, 1
+    end
+
     # NOTE this is not consistent w/ AsciiDoc output, but this is some screwy input anyway
 =begin
     test "consecutive list continuation lines are folded" do
@@ -799,6 +1241,25 @@ List
       assert_xpath '//ol/li', output, 3
     end
 
+    test 'dot elements with interspersed line comments should be skipped and not break list' do
+      input = <<-EOS
+== List
+
+. Foo
+// line comment
+// another line comment
+. Boo
+// line comment
+more text
+// another line comment
+. Blech
+      EOS
+      output = render_embedded_string input
+      assert_xpath '//ol', output, 1
+      assert_xpath '//ol/li', output, 3
+      assert_xpath %((//ol/li)[2]/p[text()="Boo\nmore text"]), output, 1
+    end
+
     test "dot elements separated by line comment offset by blank lines should not merge lists" do
       input = <<-EOS
 List
@@ -1135,30 +1596,36 @@ anotherterm:: def
       assert_xpath '(//dl/dd)[1]//*[@class="openblock"]//p', output, 2
     end
 
-    test "paragraph attached by a list continuation in a labeled list" do
+    test "paragraph attached by a list continuation on either side in a labeled list" do
       input = <<-EOS
-term1:: def
+term1:: def1
 +
 more detail
 +
-term2:: def
+term2:: def2
       EOS
       output = render_string input
+      assert_xpath '(//dl/dt)[1][normalize-space(text())="term1"]', output, 1
+      assert_xpath '(//dl/dt)[2][normalize-space(text())="term2"]', output, 1
       assert_xpath '(//dl/dd)[1]//p', output, 2
+      assert_xpath '((//dl/dd)[1]//p)[1][text()="def1"]', output, 1
       assert_xpath '(//dl/dd)[1]/p/following-sibling::*[@class="paragraph"]/p[text() = "more detail"]', output, 1
     end
 
-    test "paragraph attached by a list continuation to a multi-line element in a labeled list" do
+    test "paragraph attached by a list continuation on either side to a multi-line element in a labeled list" do
       input = <<-EOS
 term1::
-def
+def1
 +
 more detail
 +
-term2:: def
+term2:: def2
       EOS
       output = render_string input
+      assert_xpath '(//dl/dt)[1][normalize-space(text())="term1"]', output, 1
+      assert_xpath '(//dl/dt)[2][normalize-space(text())="term2"]', output, 1
       assert_xpath '(//dl/dd)[1]//p', output, 2
+      assert_xpath '((//dl/dd)[1]//p)[1][text()="def1"]', output, 1
       assert_xpath '(//dl/dd)[1]/p/following-sibling::*[@class="paragraph"]/p[text() = "more detail"]', output, 1
     end
 
@@ -1469,11 +1936,87 @@ detail1
       assert_xpath '//dl//dl/dt/following-sibling::dd/p[text() = "detail1"]', output, 1
     end
   end
+
+  context 'Special lists' do
+    test 'should render glossary list with proper semantics' do
+      input = <<-EOS
+[glossary]
+term 1:: def 1
+term 2:: def 2
+      EOS
+      output = render_embedded_string input
+      assert_css '.dlist.glossary', output, 1
+      assert_css '.dlist dt:not([class])', output, 2
+    end
+
+    test 'should render horizontal list with proper markup' do
+      input = <<-EOS
+[horizontal]
+first term:: definition
++
+more detail
+
+second term:: definition
+      EOS
+      output = render_embedded_string input
+      assert_css '.hdlist', output, 1
+      assert_css '.hdlist table', output, 1
+      assert_css '.hdlist table colgroup col', output, 2
+      assert_css '.hdlist table tr', output, 2
+      assert_xpath '/*[@class="hdlist"]/table/tr[1]/td', output, 2
+      assert_xpath '/*[@class="hdlist"]/table/tr[1]/td[@class="hdlist1"]', output, 1
+      assert_xpath '/*[@class="hdlist"]/table/tr[1]/td[@class="hdlist2"]', output, 1
+      assert_xpath '/*[@class="hdlist"]/table/tr[1]/td[@class="hdlist2"]/p', output, 1
+      assert_xpath '/*[@class="hdlist"]/table/tr[1]/td[@class="hdlist2"]/p/following-sibling::*[@class="paragraph"]', output, 1
+      assert_xpath '((//tr)[1]/td)[1][normalize-space(text())="first term"]', output, 1
+      assert_xpath '((//tr)[1]/td)[2]/p[normalize-space(text())="definition"]', output, 1
+
+      assert_xpath '/*[@class="hdlist"]/table/tr[2]/td', output, 2
+      assert_xpath '((//tr)[2]/td)[1][normalize-space(text())="second term"]', output, 1
+      assert_xpath '((//tr)[2]/td)[2]/p[normalize-space(text())="definition"]', output, 1
+    end
+
+    test 'should render qanda list with proper semantics' do
+      input = <<-EOS
+[qanda]
+Question one::
+        Answer one.
+Question two::
+        Answer two.
+      EOS
+      output = render_embedded_string input
+      assert_css '.qlist.qanda', output, 1
+      assert_css '.qlist ol', output, 1
+      assert_css '.qlist ol li', output, 2
+      assert_css '.qlist ol li:nth-child(1) p em', output, 1
+      assert_css '.qlist ol li:nth-child(1) p', output, 2
+    end
+
+    test 'should render bibliography list with proper semantics' do
+      input = <<-EOS
+[bibliography]
+- [[[taoup]]] Eric Steven Raymond. 'The Art of Unix
+  Programming'. Addison-Wesley. ISBN 0-13-142901-9.
+- [[[walsh-muellner]]] Norman Walsh & Leonard Muellner.
+  'DocBook - The Definitive Guide'. O'Reilly & Associates. 1999.
+  ISBN 1-56592-580-7.
+      EOS
+      output = render_embedded_string input
+      assert_css '.ulist.bibliography', output, 1
+      assert_css '.ulist.bibliography ul', output, 1
+      assert_css '.ulist.bibliography ul li', output, 2
+      assert_css '.ulist.bibliography ul li p', output, 2
+      assert_css '.ulist.bibliography ul li:nth-child(1) p a#taoup', output, 1
+      assert_xpath '//a/*', output, 0
+      text = xmlnodes_at_xpath '(//a)[1]/following-sibling::text()', output, 1
+      assert text.text.start_with?('[taoup] ')
+    end
+  end
 end
 
 context 'Labeled lists redux' do
 
-  context 'Item without text inline' do
+  context 'Label without text on same line' do
 
     test 'folds text from subsequent line' do
       input = <<-EOS
@@ -1520,6 +2063,24 @@ term2:: def2
       assert_xpath '//*[@class="dlist"]//dd', output, 2
       assert_xpath '(//*[@class="dlist"]//dd)[1]/p[text()="def1"]', output, 1
     end
+
+    test 'paragraph offset by blank lines does not break list if label does not have inline text' do
+      input = <<-EOS
+== Lists
+
+term1::
+
+def1
+
+term2:: def2
+      EOS
+  
+      output = render_embedded_string input
+      assert_css 'dl', output, 1
+      assert_css 'dl > dt', output, 2
+      assert_css 'dl > dd', output, 2
+      assert_xpath '(//dl/dd)[1]/p[text()="def1"]', output, 1
+    end
   
     test 'folds text from first line after comment line' do
       input = <<-EOS
@@ -1858,6 +2419,62 @@ term2:: def2
       assert_xpath '(//*[@class="dlist"]//dd)[1]//ul/li', output, 3
       assert_xpath '(//*[@class="dlist"]//dd)[2]/p[text()="def2"]', output, 1
     end
+
+    test 'appends indented list to first term that is adjacent to second term' do
+      input = <<-EOS
+== Lists
+
+label 1::
+  definition 1
+
+  * one
+  * two
+  * three
+label 2::
+  definition 2
+
+paragraph
+      EOS
+      output = render_embedded_string input
+      assert_css '.dlist > dl', output, 1
+      assert_css '.dlist dt', output, 2
+      assert_xpath '(//*[@class="dlist"]//dt)[1][normalize-space(text())="label 1"]', output, 1
+      assert_xpath '(//*[@class="dlist"]//dt)[2][normalize-space(text())="label 2"]', output, 1
+      assert_css '.dlist dd', output, 2
+      assert_xpath '(//*[@class="dlist"]//dd)[1]/p[text()="definition 1"]', output, 1
+      assert_xpath '(//*[@class="dlist"]//dd)[2]/p[text()="definition 2"]', output, 1
+      assert_xpath '(//*[@class="dlist"]//dd)[1]/p/following-sibling::*[@class="ulist"]', output, 1
+      assert_xpath '(//*[@class="dlist"]//dd)[1]/p/following-sibling::*[@class="ulist"]//li', output, 3
+      assert_css '.dlist + .paragraph', output, 1
+    end
+
+    test 'appends indented list to first term that is attached by a continuation and adjacent to second term' do
+      input = <<-EOS
+== Lists
+
+label 1::
+  definition 1
++
+  * one
+  * two
+  * three
+label 2::
+  definition 2
+
+paragraph
+      EOS
+      output = render_embedded_string input
+      assert_css '.dlist > dl', output, 1
+      assert_css '.dlist dt', output, 2
+      assert_xpath '(//*[@class="dlist"]//dt)[1][normalize-space(text())="label 1"]', output, 1
+      assert_xpath '(//*[@class="dlist"]//dt)[2][normalize-space(text())="label 2"]', output, 1
+      assert_css '.dlist dd', output, 2
+      assert_xpath '(//*[@class="dlist"]//dd)[1]/p[text()="definition 1"]', output, 1
+      assert_xpath '(//*[@class="dlist"]//dd)[2]/p[text()="definition 2"]', output, 1
+      assert_xpath '(//*[@class="dlist"]//dd)[1]/p/following-sibling::*[@class="ulist"]', output, 1
+      assert_xpath '(//*[@class="dlist"]//dd)[1]/p/following-sibling::*[@class="ulist"]//li', output, 3
+      assert_css '.dlist + .paragraph', output, 1
+    end
   
     test 'appends list and paragraph block when line following list attached by continuation' do
       input = <<-EOS
@@ -2060,8 +2677,7 @@ continued
       output = render_embedded_string input
       assert_xpath '//*[@class="dlist"]/dl', output, 1
       assert_xpath '//*[@class="dlist"]//dd', output, 1
-      # NOTE the extra endline is added as a result of whitespace in the ERB template
-      assert_xpath %(//*[@class="dlist"]//dd/p[text()="def1\ncontinued\n\ncontinued"]), output, 1
+      assert_xpath %(//*[@class="dlist"]//dd/p[text()="def1\ncontinued\ncontinued"]), output, 1
     end
   
     test 'folds text from inline definition and line following comment line' do
@@ -2581,4 +3197,27 @@ Violets are blue <2>
     assert_xpath '(//literallayout/following-sibling::*[1][self::calloutlist]/callout)[1][@arearefs = "CO1-1"]', output, 1
     assert_xpath '(//literallayout/following-sibling::*[1][self::calloutlist]/callout)[2][@arearefs = "CO1-2"]', output, 1
   end
+
+  test 'callout list with icons enabled' do
+    input = <<-EOS
+[source]
+----
+require 'asciidoctor' # <1>
+doc = Asciidoctor::Document.new('Hello, World!') # <2>
+puts doc.render # <3>
+----
+<1> Describe the first line
+<2> Describe the second line
+<3> Describe the third line
+    EOS
+    output = render_embedded_string input, :attributes => {'icons' => ''}
+    assert_css '.listingblock code > img', output, 3
+    (1..3).each do |i|
+      assert_xpath %((/div[@class="listingblock"]//code/img)[#{i}][@src="images/icons/callouts/#{i}.png"][@alt="#{i}"]), output, 1
+    end
+    assert_css '.colist table td img', output, 3
+    (1..3).each do |i|
+      assert_xpath %((/div[@class="colist arabic"]//td/img)[#{i}][@src="images/icons/callouts/#{i}.png"][@alt="#{i}"]), output, 1
+    end
+  end
 end