asciidoctor 0.1.3 → 0.1.4

data/test/fixtures/basic-docinfo-footer.xml

@@ -0,0 +1,8 @@
+<revhistory>
+<revision>
+<revnumber>{revnumber}</revnumber>
+<date>01 Jan 2013</date>
+<authorinitials>abc</authorinitials>
+<revremark>Unleashed into the wild</revremark>
+</revision>
+</revhistory>

data/test/fixtures/basic-docinfo.xml

@@ -1,4 +1,4 @@
-<copyright>
-  <year>2013</year>
-  <holder>Acme, Inc.</holder>
+<copyright><!-- don't remove the indent! -->
+    <year>2013</year>
+    <holder>Acme, Inc.</holder>
 </copyright>

data/test/fixtures/basic.asciidoc

@@ -1,4 +1,5 @@
 = Document Title
 Doc Writer <doc.writer@asciidoc.org>
+v1.0, 2013-01-01
 
 Body content.

data/test/fixtures/child-include.adoc

@@ -0,0 +1,5 @@
+first line of child
+
+include::grandchild-include.adoc[]
+
+last line of child

data/test/fixtures/custom-backends/haml/docbook45/block_paragraph.xml.haml

@@ -0,0 +1,6 @@
+- if title?
+  %formalpara{:id=>@id, :role=>(attr :role), :xreflabel=>(attr :reftext)}
+    %title=title
+    %para=content
+- else
+  %para{:id=>@id, :role=>(attr :role), :xreflabel=>(attr :reftext)}=content

data/test/fixtures/custom-backends/haml/html5-tweaks/block_paragraph.html.haml

@@ -0,0 +1 @@
+%p=content

data/test/fixtures/custom-backends/haml/html5/block_paragraph.html.haml

@@ -0,0 +1,3 @@
+- if title?
+  .title=title
+%p{:id=>@id, :class=>(attr 'role')}=content

data/test/fixtures/custom-backends/haml/html5/block_sidebar.html.haml

@@ -0,0 +1,5 @@
+%aside{:id=>@id, :class=>(attr 'role')}
+  - if title?
+    %header
+      %h1=title
+  =content.chomp

data/test/fixtures/custom-backends/slim/docbook45/block_paragraph.xml.slim

@@ -0,0 +1,6 @@
+- if title?
+  formalpara id=@id role=(attr :role) xreflabel=(attr :reftext)
+    title=title
+    para=content
+- else
+  para id=@id role=(attr :role) xreflabel=(attr :reftext) =content

data/test/fixtures/custom-backends/slim/html5/block_paragraph.html.slim

@@ -0,0 +1,3 @@
+- if title?
+  .title=title
+p id=@id class=(attr 'role') =content

data/test/fixtures/custom-backends/slim/html5/block_sidebar.html.slim

@@ -0,0 +1,5 @@
+aside id=@id class=(attr 'role')
+  - if title?
+    header
+      h1=title
+  =content

data/test/fixtures/docinfo-footer.html

@@ -0,0 +1 @@
+<a id="top" href="#">Back to top</a>

data/test/fixtures/docinfo-footer.xml

@@ -0,0 +1,9 @@
+<glossary id="_glossary">
+<title>Glossary</title>
+<glossentry>
+<glossterm>term</glossterm>
+<glossdef>
+<simpara>definition</simpara>
+</glossdef>
+</glossentry>
+</glossary>

data/test/fixtures/docinfo.xml

@@ -1,2 +1,3 @@
 <productname>Asciidoctor</productname>
 <productnumber>1.0.0</productnumber>
+<edition>{revnumber}</edition>

data/test/fixtures/grandchild-include.adoc

@@ -0,0 +1,3 @@
+first line of grandchild
+
+last line of grandchild

data/test/fixtures/parent-include-restricted.adoc

@@ -0,0 +1,5 @@
+first line of parent
+
+include::child-include.adoc[depth=1]
+
+last line of parent

data/test/fixtures/parent-include.adoc

@@ -0,0 +1,5 @@
+first line of parent
+
+include::child-include.adoc[]
+
+last line of parent

data/test/invoker_test.rb

@@ -58,6 +58,25 @@ context 'Invoker' do
     assert_xpath '/*[@class="paragraph"]/p[text()="content"]', output, 1
   end
 
+  test 'should accept document from stdin and write to output file' do
+    sample_outpath = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'sample-output.html'))
+    begin
+      invoker = invoke_cli(%W(-s -o #{sample_outpath}), '-') { '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')
+      assert_equal sample_outpath, doc.attr('outfile')
+      assert File.exist?(sample_outpath)
+    ensure
+      FileUtils::rm_f(sample_outpath)
+    end
+  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' }
@@ -88,10 +107,10 @@ context 'Invoker' do
     end
   end
 
-  test 'should warn if extra arguments are detected' do
+  test 'should treat extra arguments as files' do
     redirect_streams do |stdout, stderr|
       invoker = invoke_cli %w(-o /dev/null extra arguments sample.asciidoc), nil
-      assert_match(/extra arguments detected/, stderr.string)
+      assert_match(/input file .* missing/, stderr.string)
       assert_equal 1, invoker.code
     end
   end
@@ -144,20 +163,59 @@ context 'Invoker' do
     end
   end
 
-  test 'should copy default css to target directory if copycss is specified' do
+  test 'should copy default css to target directory if linkcss is specified' do
+    sample_outpath = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'sample-output.html'))
+    asciidoctor_stylesheet = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'asciidoctor.css'))
+    coderay_stylesheet = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'asciidoctor-coderay.css'))
+    begin
+      invoker = invoke_cli %W(-o #{sample_outpath} -a linkcss -a source-highlighter=coderay)
+      invoker.document
+      assert File.exist?(sample_outpath)
+      assert File.exist?(asciidoctor_stylesheet)
+      assert File.exist?(coderay_stylesheet)
+    ensure
+      FileUtils::rm_f(sample_outpath)
+      FileUtils::rm_f(asciidoctor_stylesheet)
+      FileUtils::rm_f(coderay_stylesheet)
+    end
+  end
+
+  test 'should not copy default css to target directory if linkcss is set and copycss is unset' do
     sample_outpath = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'sample-output.html'))
     default_stylesheet = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'asciidoctor.css'))
     begin
-      invoker = invoke_cli %W(-o #{sample_outpath} -a copycss)
+      invoker = invoke_cli %W(-o #{sample_outpath} -a linkcss -a copycss!)
       invoker.document
       assert File.exist?(sample_outpath)
-      assert File.exist?(default_stylesheet)
+      assert !File.exist?(default_stylesheet)
+    ensure
+      FileUtils::rm_f(sample_outpath)
+    end
+  end
+
+  test 'should render all passed files' do
+    basic_outpath = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'basic.html'))
+    sample_outpath = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'sample.html'))
+    begin
+      invoke_cli_with_filenames %w(), %w(basic.asciidoc sample.asciidoc)
+      assert File.exist?(basic_outpath)
+      assert File.exist?(sample_outpath)
     ensure
+      FileUtils::rm_f(basic_outpath)
       FileUtils::rm_f(sample_outpath)
-      FileUtils::rm_f(default_stylesheet)
     end
   end
 
+  test 'should render all files that matches a glob expression' do
+    basic_outpath = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'basic.html'))
+    begin
+      invoke_cli_to_buffer %w(), "ba*.asciidoc"
+      assert File.exist?(basic_outpath)
+    ensure
+      FileUtils::rm_f(basic_outpath)
+    end
+  end 
+
   test 'should suppress header footer if specified' do
     invoker = invoke_cli_to_buffer %w(-s -o -)
     output = invoker.read_output
@@ -208,7 +266,7 @@ context 'Invoker' do
     assert_equal 'docbook45', doc.attr('backend')
     assert_equal '.xml', doc.attr('outfilesuffix')
     output = invoker.read_output
-    assert_xpath '/article', output, 1
+    assert_xpath '/xmlns:article', output, 1
   end
 
   test 'should set doctype to article if specified' do
@@ -227,6 +285,22 @@ context 'Invoker' do
     assert_xpath '/html/body[@class="book"]', output, 1
   end
 
+  test 'should locate custom templates based on template dir, template engine and backend' do
+    custom_backend_root = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'custom-backends'))
+    invoker = invoke_cli_to_buffer %W(-E haml -T #{custom_backend_root} -o -)
+    doc = invoker.document
+    assert doc.renderer.views['block_paragraph'].is_a? Tilt::HamlTemplate
+  end
+
+  test 'should load custom templates from multiple template directories' do
+    custom_backend_1 = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'custom-backends/haml/html5'))
+    custom_backend_2 = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'custom-backends/haml/html5-tweaks'))
+    invoker = invoke_cli_to_buffer %W(-T #{custom_backend_1} -T #{custom_backend_2} -o - -s)
+    output = invoker.read_output
+    assert_css '.paragraph', output, 0
+    assert_css '#preamble > .sectionbody > p', 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
@@ -244,7 +318,7 @@ context 'Invoker' do
   end
 
   test 'should set attribute with quoted value containing a space' do
-	# emulating commandline arguments: --trace -a toc -a note-caption="Note to self:" -o -
+    # emulating commandline arguments: --trace -a toc -a note-caption="Note to self:" -o -
     invoker = invoke_cli_to_buffer %w(--trace -a toc -a note-caption=Note\ to\ self: -o -)
     doc = invoker.document
     assert_equal 'Note to self:', doc.attr('note-caption')

data/test/lexer_test.rb

@@ -7,6 +7,12 @@ context "Lexer" do
     assert Asciidoctor::Lexer.is_section_title?('=== AsciiDoc Home Page')
   end
 
+  test 'sanitize attribute name' do
+    assert_equal 'foobar', Asciidoctor::Lexer.sanitize_attribute_name("Foo Bar")
+    assert_equal 'foo', Asciidoctor::Lexer.sanitize_attribute_name("foo")
+    assert_equal 'foo3-bar', Asciidoctor::Lexer.sanitize_attribute_name("Foo 3^ # - Bar[")
+  end
+
   test "collect unnamed attribute" do
     attributes = {}
     line = 'quote'
@@ -201,15 +207,17 @@ context "Lexer" do
     assert_equal 'style#id.role', attributes[1]
   end
 
-  test 'parse style attribute with style, role and id' do
-    attributes = {1 => 'style.role#id'}
+  test 'parse style attribute with style, role, id and option' do
+    attributes = {1 => 'style.role#id%fragment'}
     style, original_style = Asciidoctor::Lexer.parse_style_attribute(attributes)
     assert_equal 'style', style
     assert_nil original_style
     assert_equal 'style', attributes['style']
     assert_equal 'id', attributes['id']
     assert_equal 'role', attributes['role']
-    assert_equal 'style.role#id', attributes[1]
+    assert_equal '', attributes['fragment-option']
+    assert_equal 'fragment', attributes['options']
+    assert_equal 'style.role#id%fragment', attributes[1]
   end
 
   test 'parse style attribute with style, id and multiple roles' do
@@ -263,6 +271,16 @@ context "Lexer" do
     assert_nil attributes[1]
   end
 
+  test 'parse style attribute with option should preserve existing options' do
+    attributes = {1 => '%header', 'options' => 'footer', 'footer-option' => ''}
+    style, original_style = Asciidoctor::Lexer.parse_style_attribute(attributes)
+    assert_nil style
+    assert_nil original_style
+    assert_equal 'header,footer', attributes['options']
+    assert_equal '', attributes['header-option']
+    assert_equal '', attributes['footer-option']
+  end
+
   test "parse author first" do
     metadata, = parse_header_metadata 'Stuart'
     assert_equal 5, metadata.size

data/test/links_test.rb

@@ -131,12 +131,44 @@ context 'Links' do
     assert_xpath '//a[@href="#tigers"][text() = "About Tigers"]', render_string('<<tigers,"About Tigers">>'), 1
   end
 
+  test 'xref using angled bracket syntax with path sans extension' do
+    doc = document_from_string '<<tigers#>>', :header_footer => false
+    assert_xpath '//a[@href="tigers.html"][text() = "[tigers]"]', doc.render, 1
+  end
+
+  test 'xref using angled bracket syntax with path and extension' do
+    doc = document_from_string '<<tigers.adoc#>>', :header_footer => false
+    assert_xpath '//a[@href="tigers.html"][text() = "[tigers]"]', doc.render, 1
+  end
+
+  test 'xref using angled bracket syntax with path and fragment' do
+    doc = document_from_string '<<tigers#about>>', :header_footer => false
+    assert_xpath '//a[@href="tigers.html#about"][text() = "[tigers#about]"]', doc.render, 1
+  end
+
+  test 'xref using angled bracket syntax with path, fragment and text' do
+    doc = document_from_string '<<tigers#about,About Tigers>>', :header_footer => false
+    assert_xpath '//a[@href="tigers.html#about"][text() = "About Tigers"]', doc.render, 1
+  end
+
+  test 'xref using angled bracket syntax with path which has been included in this document' do
+    doc = document_from_string '<<tigers#about,About Tigers>>', :header_footer => false
+    doc.references[:includes] << 'tigers'
+    assert_xpath '//a[@href="#about"][text() = "About Tigers"]', doc.render, 1
+  end
+
+  test 'xref using angled bracket syntax with nested path which has been included in this document' do
+    doc = document_from_string '<<part1/tigers#about,About Tigers>>', :header_footer => false
+    doc.references[:includes] << 'part1/tigers'
+    assert_xpath '//a[@href="#about"][text() = "About Tigers"]', doc.render, 1
+  end
+
   test 'xref using angled bracket syntax inline with text' do
     assert_xpath '//a[@href="#tigers"][text() = "about tigers"]', render_string('Want to learn <<tigers,about tigers>>?'), 1
   end
 
   test 'xref using angled bracket syntax with multi-line label inline with text' do
-    assert_xpath %{//a[@href="#tigers"][text() = "about\ntigers"]}, render_string("Want to learn <<tigers,about\ntigers>>?"), 1
+    assert_xpath %{//a[@href="#tigers"][normalize-space(text()) = "about tigers"]}, render_string("Want to learn <<tigers,about\ntigers>>?"), 1
   end
 
   test 'xref with escaped text' do
@@ -162,7 +194,7 @@ context 'Links' do
   end
 
   test 'xref using macro syntax with multi-line label inline with text' do
-    assert_xpath %{//a[@href="#tigers"][text() = "about\ntigers"]}, render_string("Want to learn xref:tigers[about\ntigers]?"), 1
+    assert_xpath %{//a[@href="#tigers"][normalize-space(text()) = "about tigers"]}, render_string("Want to learn xref:tigers[about\ntigers]?"), 1
   end
 
   test 'xref using invalid macro syntax does not create link' do

data/test/lists_test.rb

@@ -460,6 +460,20 @@ List
       assert_xpath '//ul/li', output, 3
     end
 
+    test 'should represent block style as style class' do
+      ['disc', 'square', 'circle'].each do |style|
+        input = <<-EOS
+[#{style}]
+* a
+* b
+* c
+        EOS
+        output = render_embedded_string input
+        assert_css ".ulist.#{style}", output, 1
+        assert_css ".ulist.#{style} ul.#{style}", output, 1
+      end
+    end
+
     test "asterisk elements separated by blank lines should merge lists" do
       input = <<-EOS
 List
@@ -1075,7 +1089,7 @@ Lists
       assert_xpath '//ul/li[1]/*', output, 1
     end
 
-    test "consecutive blocks in list continuation attach to list item" do
+    test 'consecutive blocks in list continuation attach to list item' do
       input = <<-EOS
 Lists
 =====
@@ -1092,7 +1106,7 @@ ____
 +
 * Item two
       EOS
-      output = render_string input
+      output = render_embedded_string input
       assert_xpath '//ul', output, 1
       assert_xpath '//ul/li', output, 2
       assert_xpath '//ul/li[1]/p', output, 1
@@ -1453,6 +1467,58 @@ List
       assert_xpath '//ol/li', output, 3
     end
 
+    test 'should represent explicit role attribute as style class' do
+      input = <<-EOS
+[role="dry"]
+. Once
+. Again
+. Refactor!
+      EOS
+
+      output = render_embedded_string input 
+      assert_css '.olist.arabic.dry', output, 1
+      assert_css '.olist ol.arabic', output, 1
+    end
+
+    test 'should represent custom numbering and explicit role attribute as style classes' do
+      input = <<-EOS
+[loweralpha, role="dry"]
+. Once
+. Again
+. Refactor!
+      EOS
+
+      output = render_embedded_string input 
+      assert_css '.olist.loweralpha.dry', output, 1
+      assert_css '.olist ol.loweralpha', output, 1
+    end
+
+    test 'should represent implicit role attribute as style class' do
+      input = <<-EOS
+[.dry]
+. Once
+. Again
+. Refactor!
+      EOS
+
+      output = render_embedded_string input 
+      assert_css '.olist.arabic.dry', output, 1
+      assert_css '.olist ol.arabic', output, 1
+    end
+
+    test 'should represent custom numbering and implicit role attribute as style classes' do
+      input = <<-EOS
+[loweralpha.dry]
+. Once
+. Again
+. Refactor!
+      EOS
+
+      output = render_embedded_string input 
+      assert_css '.olist.loweralpha.dry', output, 1
+      assert_css '.olist ol.loweralpha', output, 1
+    end
+
     test "dot elements separated by blank lines should merge lists" do
       input = <<-EOS
 List
@@ -1682,6 +1748,25 @@ term2::
       assert_xpath '(//dl/dt)[2]/following-sibling::dd/p[text() = "def2"]', output, 1
     end
 
+    test 'multi-line element with paragraph starting with multiple dashes should not be seen as list' do
+      input = <<-EOS
+term1::
+  def1
+  -- and a note
+
+term2::
+  def2
+      EOS
+      output = render_embedded_string input
+      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#{entity 8201}#{entity 8212}#{entity 8201}and a note"]), 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 element with multiple terms" do
       input = <<-EOS
 term1::
@@ -2023,6 +2108,23 @@ A new paragraph.
       assert_xpath '//*[@class="dlist"]/following-sibling::*[@class="paragraph"]', output, 1
       assert_xpath '(//*[@class="dlist"]/following-sibling::*[@class="paragraph"])[1]/p[text() = "A new paragraph."]', output, 1
     end
+
+    test 'should not match comment line that looks like labeled list term' do
+      input = <<-EOS
+* item
+
+//::
+== Section
+
+section text
+      EOS
+
+      output = render_embedded_string input
+      assert_xpath '/*[@class="ulist"]', output, 1
+      assert_xpath '/*[@class="sect1"]', output, 1
+      assert_xpath '/*[@class="sect1"]/h2[text()="Section"]', output, 1
+      assert_xpath '/*[@class="ulist"]/following-sibling::*[@class="sect1"]', output, 1
+    end
   end
 
   context "Nested lists" do
@@ -2284,6 +2386,17 @@ term:: def
       assert_xpath '(//table/colgroup/col)[2][@style="width:75%;"]', output, 1
     end
 
+    test 'should add strong class to label if strong option is set' do
+      input = <<-EOS
+[horizontal, options="strong"]
+term:: def
+      EOS
+
+      output = render_embedded_string input
+      assert_css '.hdlist', output, 1
+      assert_css '.hdlist td.hdlist1.strong', output, 1
+    end
+
     test 'consecutive terms in horizontal list should share same cell' do
       input = <<-EOS
 [horizontal]
@@ -2296,7 +2409,9 @@ last::
       output = render_embedded_string input 
       assert_xpath '//tr', output, 2
       assert_xpath '(//tr)[1]/td[@class="hdlist1"]', output, 1
-      assert_xpath '(//tr)[1]/td[@class="hdlist1"]/br', output, 2
+      # NOTE I'm trimming the trailing <br> in Asciidoctor
+      #assert_xpath '(//tr)[1]/td[@class="hdlist1"]/br', output, 2
+      assert_xpath '(//tr)[1]/td[@class="hdlist1"]/br', output, 1
       assert_xpath '(//tr)[2]/td[@class="hdlist2"]', output, 1
     end
 
@@ -3631,6 +3746,121 @@ require 'asciidoctor' # \\<1>
     assert_xpath '//co', output, 0
   end
 
+  test 'should not recognize callouts in middle of line' do
+    input = <<-EOS
+[source, ruby]
+----
+puts "The syntax <1> at the end of the line makes a code callout"
+----
+    EOS
+    output = render_embedded_string input
+    assert_xpath '//b', output, 0
+  end
+
+  test 'should allow multiple callouts on the same line' do
+    input = <<-EOS
+[source, ruby]
+----
+require 'asciidoctor' <1>
+doc = Asciidoctor.load('Hello, World!') # <2> <3> <4>
+puts doc.render <5><6>
+exit 0
+----
+<1> Require library
+<2> Load document from String
+<3> Uses default backend and doctype
+<4> One more for good luck
+<5> Renders document to String
+<6> Prints output to stdout
+    EOS
+    output = render_embedded_string input
+    assert_xpath '//code/b', output, 6
+    assert_match(/ <b>\(1\)<\/b>$/, output)
+    assert_match(/ <b>\(2\)<\/b> <b>\(3\)<\/b> <b>\(4\)<\/b>$/, output)
+    assert_match(/ <b>\(5\)<\/b><b>\(6\)<\/b>$/, output)
+  end
+
+  test 'should allow XML comment-style callouts' do
+    input = <<-EOS
+[source, xml]
+----
+<section>
+  <title>Section Title</title> <!--1-->
+  <simpara>Just a paragraph</simpara> <!--2-->
+</section>
+----
+<1> The title is required
+<2> The content isn't
+    EOS
+    output = render_embedded_string input
+    assert_xpath '//b', output, 2
+    assert_xpath '//b[text()="(1)"]', output, 1
+    assert_xpath '//b[text()="(2)"]', output, 1
+  end
+
+  test 'should not allow callouts with half an XML comment' do
+    input = <<-EOS
+----
+First line <1-->
+Second line <2-->
+----
+    EOS
+    output = render_embedded_string input
+    assert_xpath '//b', output, 0
+  end
+
+  test 'should not recognize callouts in an indented labeled list paragraph' do
+    input = <<-EOS
+foo::
+  bar <1>
+
+<1> Not pointing to a callout
+    EOS
+    output = render_embedded_string input
+    assert_xpath '//dl//b', output, 0
+    assert_xpath '//dl/dd/p[text()="bar <1>"]', output, 1
+    assert_xpath '//ol/li/p[text()="Not pointing to a callout"]', output, 1
+  end
+
+  test 'should not recognize callouts in an indented outline list paragraph' do
+    input = <<-EOS
+* foo
+  bar <1>
+
+<1> Not pointing to a callout
+    EOS
+    output = render_embedded_string input
+    assert_xpath '//ul//b', output, 0
+    assert_xpath %(//ul/li/p[text()="foo\nbar <1>"]), output, 1
+    assert_xpath '//ol/li/p[text()="Not pointing to a callout"]', output, 1
+  end
+
+  test 'should remove leading line comment chars' do
+    input = <<-EOS
+----
+puts 'Hello, world!' # <1>
+----
+<1> Ruby
+
+----
+println 'Hello, world!' // <1>
+----
+<1> Groovy
+
+----
+(def hello (fn [] "Hello, world!")) ;; <1>
+(hello)
+----
+<1> Clojure
+    EOS
+    output = render_embedded_string input
+    assert_xpath '//b', output, 3
+    nodes = xmlnodes_at_css 'pre', output 
+    assert_equal "puts 'Hello, world!' (1)", nodes[0].text
+    assert_equal "println 'Hello, world!' (1)", nodes[1].text
+    assert_equal %((def hello (fn [] "Hello, world!")) (1)\n(hello)), nodes[2].text
+  end
+
   test 'literal block with callouts' do
     input = <<-EOS
 ....
@@ -3680,8 +3910,8 @@ puts doc.render # <3>
 [source]
 ----
 require 'asciidoctor' # <1>
-doc = Asciidoctor::Document.new('Hello, World!') # <2>
-puts doc.render # <3>
+doc = Asciidoctor::Document.new('Hello, World!') #<2>
+puts doc.render #<3>
 ----
 <1> Describe the first line
 <2> Describe the second line
@@ -3690,11 +3920,78 @@ puts doc.render # <3>
     output = render_embedded_string input, :attributes => {'icons' => 'font'}
     assert_css '.listingblock code > i', output, 3
     (1..3).each do |i|
-      assert_xpath %((/div[@class="listingblock"]//code/i)[#{i}][@class="conum"][text() = "#{i}"]), output, 1
+      assert_xpath %((/div[@class="listingblock"]//code/i)[#{i}]), output, 1
+      assert_xpath %((/div[@class="listingblock"]//code/i)[#{i}][@class="conum"][@data-value="#{i}"]), output, 1
+      assert_xpath %((/div[@class="listingblock"]//code/i)[#{i}]/following-sibling::b[text()="(#{i})"]), output, 1
     end
     assert_css '.colist table td i', output, 3
     (1..3).each do |i|
-      assert_xpath %((/div[@class="colist arabic"]//td/i)[#{i}][@class="conum"][text() = "#{i}"]), output, 1
+      assert_xpath %((/div[@class="colist arabic"]//td/i)[#{i}]), output, 1
+      assert_xpath %((/div[@class="colist arabic"]//td/i)[#{i}][@class="conum"][@data-value = "#{i}"]), output, 1
+      assert_xpath %((/div[@class="colist arabic"]//td/i)[#{i}]/following-sibling::b[text() = "#{i}"]), output, 1
     end
   end
 end
+
+context 'Checklists' do
+  test 'should create checklist if at least one item has checkbox syntax' do
+    input = <<-EOS
+- [ ] todo
+- [x] done
+- plain
+    EOS
+
+    output = render_embedded_string input
+    assert_css '.ulist.checklist', output, 1
+    assert_css '.ulist.checklist li input[type="checkbox"][disabled]', output, 2
+    assert_css '.ulist.checklist li input[type="checkbox"][checked]', output, 1
+    assert_xpath '(/*[@class="ulist checklist"]/ul/li)[3]/p[text()="plain"]', output, 1
+  end
+
+  test 'should create checklist with font icons if at least one item has checkbox syntax and icons attribute is font' do
+    input = <<-EOS
+- [ ] todo
+- [x] done
+- plain
+    EOS
+
+    output = render_embedded_string input, :attributes => {'icons' => 'font'}
+    assert_css '.ulist.checklist', output, 1
+    assert_css '.ulist.checklist li i.icon-check', output, 1
+    assert_css '.ulist.checklist li i.icon-check-empty', output, 1
+    assert_xpath '(/*[@class="ulist checklist"]/ul/li)[3]/p[text()="plain"]', output, 1
+  end
+
+  test 'should create interactive checklist if interactive option is set even with icons attribute is font' do
+    input = <<-EOS
+:icons: font
+
+[options="interactive"]
+- [ ] todo
+- [x] done
+    EOS
+
+    output = render_embedded_string input
+    assert_css '.ulist.checklist', output, 1
+    assert_css '.ulist.checklist li input[type="checkbox"]', output, 2
+    assert_css '.ulist.checklist li input[type="checkbox"][disabled]', output, 0
+    assert_css '.ulist.checklist li input[type="checkbox"][checked]', output, 1
+  end
+end
+
+context 'Lists model' do
+  test 'content should return items in list' do
+    input = <<-EOS
+* one
+* two
+* three
+    EOS
+
+    doc = document_from_string input
+    list = doc.blocks.first
+    assert list.is_a? Asciidoctor::List
+    items = list.items
+    assert_equal 3, items.size
+    assert_equal list.items, list.content
+  end
+end