asciidoctor 1.5.5 → 1.5.6

data/man/asciidoctor.adoc

@@ -2,7 +2,7 @@
 Dan Allen; Sarah White; Ryan Waldron
 :doctype: manpage
 :man manual: Asciidoctor Manual
-:man source: Asciidoctor 1.5.5
+:man source: Asciidoctor 1.5.6
 :page-layout: base
 
 == NAME
@@ -26,7 +26,7 @@ If _FILE_ is _-_ then the AsciiDoc source is read from standard input.
 *-B, --base-dir*=_DIR_::
   Base directory containing the document and resources.
   Defaults to the directory containing the source file, or the working directory if the source is read from a stream.
-  Can be used as a way to chroot the execution of the program.
+  When combined with the safe mode setting, can be used to chroot the execution of the program.
 
 *-S, --safe-mode*=_SAFE_MODE_::
   Set safe mode level: _unsafe_, _safe_, _server_ or _secure_.
@@ -35,7 +35,7 @@ If _FILE_ is _-_ then the AsciiDoc source is read from standard input.
 
 *--safe*::
   Set safe mode level to _safe_.
-  Enables include macros, but restricts access to ancestor paths of source file.
+  Enables include directives, but prevents access to ancestor paths of source file.
   Provided for compatibility with the asciidoc command.
   If not set, the safe mode level defaults to _unsafe_ when Asciidoctor is invoked using this script.
 
@@ -43,7 +43,7 @@ If _FILE_ is _-_ then the AsciiDoc source is read from standard input.
 
 *-a, --attribute*=_ATTRIBUTE_::
   Define, override or delete a document attribute.
-  Command-line attributes take precedence over attributes defined in the source file.
+  Command-line attributes take precedence over attributes defined in the source file unless the value ends with _@_.
 +
 _ATTRIBUTE_ is normally formatted as a key-value pair, in the form _NAME=VALUE_.
 Alternate acceptable forms are _NAME_ (where the _VALUE_ defaults to an empty string), _NAME!_ (unassigns the _NAME_ attribute) and _NAME=VALUE@_ (where _VALUE_ does not override value of _NAME_ attribute if it's already defined in the source document).
@@ -54,14 +54,14 @@ This option may be specified more than once.
 *-b, --backend*=_BACKEND_::
   Backend output file format: _html5_, _docbook5_, _docbook45_ and _manpage_ are supported out of the box.
   You can also use the backend alias names _html_ (aliased to _html5_) or _docbook_ (aliased to _docbook5_).
+  Other values can be passed, but if Asciidoctor cannot resolve the backend to a converter, it will fail.
   Defaults to _html5_.
-  Other options can be passed, but if Asciidoctor cannot find the backend, it will fail during conversion.
 
 *-d, --doctype*=_DOCTYPE_::
   Document type: _article_, _book_, _manpage_ or _inline_.
   Sets the root element when using the _docbook_ backend and the style class on the HTML body element when using the _html_ backend.
   The _book_ document type allows multiple level-0 section titles in a single document.
-  The _manpage_ document type enables parsing of metadata necessary to produce a manpage.
+  The _manpage_ document type enables parsing of metadata necessary to produce a man page.
   The _inline_ document type allows the content of a single paragraph to be formatted and returned without wrapping it in a containing element.
   Defaults to _article_.
 
@@ -98,9 +98,9 @@ This option may be specified more than once.
 *-o, --out-file*=_OUT_FILE_::
   Write output to file _OUT_FILE_.
   Defaults to the base name of the input file suffixed with _backend_ extension.
-  If the input is read from standard input, then the output file defaults to stdout.
-  If _OUT_FILE_ is _-_ then the standard output is also used.
-  If specified, the file is resolved relative to the working directory.
+  The file is resolved relative to the working directory.
+  If the input is read from standard input or a named pipe (fifo), then the output file defaults to stdout.
+  If _OUT_FILE_ is _-_, then the output file is written to standard output.
 
 *-r, --require*=_LIBRARY_::
   Require the specified library before executing the processor, using the standard Ruby require.
@@ -136,8 +136,10 @@ Matching templates found in subsequent directories override ones previously disc
 
 === Program Information
 
-*-h, --help*::
-  Show the help message.
+*-h, --help* [_TOPIC_]::
+  Print the help message.
+  Show the command usage if _TOPIC_ is not specified (or not recognized).
+  Dump the Asciidoctor man page (in troff/groff format) if _TOPIC_ is _manpage_.
 
 *-V, --version*::
   Print program version number.
@@ -146,7 +148,7 @@ Matching templates found in subsequent directories override ones previously disc
 
 == ENVIRONMENT
 
-*Asciidoctor* honors the SOURCE_DATE_EPOCH environment variable.
+*Asciidoctor* honors the *SOURCE_DATE_EPOCH* environment variable.
 If this variable is assigned an integer value, that value is used as the epoch of all input documents and as the local date and time.
 See https://reproducible-builds.org/specs/source-date-epoch/ for more information about this environment variable.
 
@@ -180,5 +182,5 @@ Refer to the *Asciidoctor* issue tracker at https://github.com/asciidoctor/ascii
 
 == COPYING
 
-Copyright \(C) 2012-2016 Dan Allen, Ryan Waldron and the Asciidoctor Project.
+Copyright \(C) 2012-2017 Dan Allen, Ryan Waldron and the Asciidoctor Project.
 Free use of this software is granted under the terms of the MIT License.

data/test/attributes_test.rb

@@ -46,6 +46,16 @@ linus.torvalds@example.com
       assert_equal %(Linus Torvalds +\nLinux Hacker +\nlinus.torvalds@example.com), doc.attributes['signature']
     end
 
+    test 'should allow pass macro to surround a multi-line value that contains line breaks' do
+      str = <<-EOS
+:signature: pass:a[{author} + \\
+{title} + \\
+{email}]
+      EOS
+      doc = document_from_string str, :attributes => { 'author' => 'Linus Torvalds', 'title' => 'Linux Hacker', 'email' => 'linus.torvalds@example.com' }
+      assert_equal %(Linus Torvalds +\nLinux Hacker +\nlinus.torvalds@example.com), (doc.attr 'signature')
+    end
+
     test 'should delete an attribute that ends with !' do
       doc = document_from_string(":frog: Tanglefoot\n:frog!:")
       assert_equal nil, doc.attributes['frog']
@@ -86,14 +96,25 @@ linus.torvalds@example.com
       assert_equal 'Asciidoctor 1.0', doc.attributes['release']
     end
 
-    test "assigns attribute to empty string if substitution fails to resolve attribute" do
-      doc = document_from_string ":release: Asciidoctor {version}", :attributes => { 'attribute-missing' => 'drop-line' }
+    test 'assigns attribute to empty string if substitution fails to resolve attribute' do
+      input = ':release: Asciidoctor {version}'
+      doc, warnings = redirect_streams do |_, err|
+        [(document_from_string input, :attributes => { 'attribute-missing' => 'drop-line' }), err.string]
+      end
       assert_equal '', doc.attributes['release']
+      assert_includes warnings, 'dropping line containing reference to missing attribute'
     end
 
-    test "assigns multi-line attribute to empty string if substitution fails to resolve attribute" do
-      doc = document_from_string ":release: Asciidoctor +\n          {version}", :attributes => { 'attribute-missing' => 'drop-line' }
+    test 'assigns multi-line attribute to empty string if substitution fails to resolve attribute' do
+      input = <<-EOS
+:release: Asciidoctor +
+          {version}
+      EOS
+      doc, warnings = redirect_streams do |_, err|
+        [(document_from_string input, :attributes => { 'attribute-missing' => 'drop-line' }), err.string]
+      end
       assert_equal '', doc.attributes['release']
+      assert_includes warnings, 'dropping line containing reference to missing attribute'
     end
 
     test 'resolves attributes inside attribute value within header' do
@@ -213,6 +234,13 @@ EOS
       assert_equal '&lt;&gt;&amp;', doc.attributes['xml-busters']
     end
 
+    test 'should not recognize pass macro with invalid substitution list in attribute value' do
+      [',', '42', 'a,'].each do |subs|
+        doc = document_from_string %(:pass-fail: pass:#{subs}[whale])
+        assert_equal %(pass:#{subs}[whale]), doc.attributes['pass-fail']
+      end
+    end
+
     test "attribute is treated as defined until it's not" do
       input = <<-EOS
 :holygrail:
@@ -350,6 +378,19 @@ content
       assert doc.attributes.has_key? 'basebackend-html'
     end
 
+    test 'set_attr should set value to empty string if no value is specified' do
+      node = Asciidoctor::Block.new nil, :paragraph, :attributes => {}
+      node.set_attr 'foo'
+      assert_equal '', (node.attr 'foo')
+    end
+
+    test 'remove_attr should remove attribute and return previous value' do
+      doc = empty_document
+      node = Asciidoctor::Block.new doc, :paragraph, :attributes => { 'foo' => 'bar' }
+      assert_equal 'bar', (node.remove_attr 'foo')
+      assert_nil node.attr('foo')
+    end
+
     test 'set_attr should not overwrite existing key if overwrite is false' do
       node = Asciidoctor::Block.new nil, :paragraph, :attributes => { 'foo' => 'bar' }
       assert_equal 'bar', (node.attr 'foo')
@@ -377,6 +418,31 @@ content
       assert_xpath '//a[@href="https://google.com"]', output, 1
     end
 
+    test 'set_attribute should set attribute if key is not locked' do
+      doc = empty_document
+      assert !(doc.attr? 'foo')
+      res = doc.set_attribute 'foo', 'baz'
+      assert res
+      assert_equal 'baz', (doc.attr 'foo')
+    end
+
+    test 'set_attribute should not set key if key is locked' do
+      doc = empty_document :attributes => { 'foo' => 'bar' }
+      assert_equal 'bar', (doc.attr 'foo')
+      res = doc.set_attribute 'foo', 'baz'
+      assert !res
+      assert_equal 'bar', (doc.attr 'foo')
+    end
+
+    test 'set_attribute should update backend attributes' do
+      doc = empty_document :attributes => { 'backend' => 'html5@' }
+      assert_equal '', (doc.attr 'backend-html5')
+      res = doc.set_attribute 'backend', 'docbook5'
+      assert res
+      assert !(doc.attr? 'backend-html5')
+      assert_equal '', (doc.attr 'backend-docbook5')
+    end
+
     test 'verify toc attribute matrix' do
       expected_data = <<-EOS
 #attributes                               |toc|toc-position|toc-placement|toc-class
@@ -399,7 +465,7 @@ toc toc-placement!                        |   |content     |macro        |nil
 
       expected.each do |expect|
         raw_attrs, toc, toc_position, toc_placement, toc_class = expect
-        attrs = Hash[*(raw_attrs.split ' ').map {|e| e.include?('=') ? e.split('=') : [e, ''] }.flatten]
+        attrs = Hash[*raw_attrs.split.map {|e| e.include?('=') ? e.split('=', 2) : [e, ''] }.flatten]
         doc = document_from_string '', :attributes => attrs
         toc ? (assert doc.attr?('toc', toc)) : (assert !doc.attr?('toc'))
         toc_position ? (assert doc.attr?('toc-position', toc_position)) : (assert !doc.attr?('toc-position'))
@@ -448,7 +514,7 @@ Yo, {myfrog}!
       assert_xpath '(//p)[1][text()="Yo, Tanglefoot!"]', output, 1
     end
 
-    test "ignores lines with bad attributes if attribute-missing is drop-line" do
+    test 'ignores lines with bad attributes if attribute-missing is drop-line' do
       input = <<-EOS
 :attribute-missing: drop-line
 
@@ -456,9 +522,10 @@ This is
 blah blah {foobarbaz}
 all there is.
       EOS
-      html = render_embedded_string input
-      result = Nokogiri::HTML(html)
-      refute_match(/blah blah/m, result.css("p").first.content.strip)
+      output, warnings = redirect_streams {|_, err| [(render_embedded_string input), err.string] }
+      para = xmlnodes_at_css 'p', output, 1
+      refute_includes 'blah blah', para.content
+      assert_includes warnings, 'dropping line containing reference to missing attribute'
     end
 
     test "attribute value gets interpretted when rendering" do
@@ -476,9 +543,10 @@ Line 1: This line should appear in the output.
 Line 2: Oh no, a {bogus-attribute}! This line should not appear in the output.
       EOS
 
-      output = render_embedded_string input
+      output, warnings = redirect_streams {|_, err| [(render_embedded_string input), err.string] }
       assert_match(/Line 1/, output)
       refute_match(/Line 2/, output)
+      assert_includes warnings, 'dropping line containing reference to missing attribute'
     end
 
     test 'should not drop line with reference to missing attribute by default' do
@@ -512,7 +580,7 @@ Line 2: {set:a!}This line should not appear in the output.
 :a:
 
 Line 1: This line should appear in the output.
-Line 2: {set:a!}This line should not appear in the output.
+Line 2: {set:a!}This line should appear in the output.
       EOS
 
       output = render_embedded_string input
@@ -748,7 +816,7 @@ of the attribute named foo in your document.
 {set:foo!}
 {foo}yes
       EOS
-      output = render_embedded_string input
+      output = redirect_streams { render_embedded_string input }
       assert_xpath '//p', output, 1
       assert_xpath '//p/child::text()', output, 0
     end
@@ -878,6 +946,34 @@ after: {counter:mycounter}
       assert_xpath '//p[text()="before: 1 2 3"]', output, 1
       assert_xpath '//p[text()="after: 1"]', output, 1
     end
+
+    test 'nested document should use counter from parent document' do
+      input = <<-EOS
+.Title for Foo
+image::foo.jpg[]
+
+[cols="2*a"]
+|===
+|
+.Title for Bar
+image::bar.jpg[]
+
+|
+.Title for Baz
+image::baz.jpg[]
+|===
+
+.Title for Qux
+image::qux.jpg[]
+      EOS
+
+      output = render_embedded_string input
+      assert_xpath '//div[@class="title"]', output, 4
+      assert_xpath '//div[@class="title"][text() = "Figure 1. Title for Foo"]', output, 1
+      assert_xpath '//div[@class="title"][text() = "Figure 2. Title for Bar"]', output, 1
+      assert_xpath '//div[@class="title"][text() = "Figure 3. Title for Baz"]', output, 1
+      assert_xpath '//div[@class="title"][text() = "Figure 4. Title for Qux"]', output, 1
+    end
   end
 
   context 'Block attributes' do
@@ -952,7 +1048,7 @@ content
       assert_xpath '//*[@class="title"]/strong[text()="title"]', output, 1
     end
 
-    test 'attribute list may begin with space' do
+    test 'attribute list may not begin with space' do
       input = <<-EOS
 [ quote]
 ____
@@ -961,8 +1057,8 @@ ____
       EOS
 
       doc = document_from_string input
-      qb = doc.blocks.first
-      assert_equal 'quote', qb.style
+      b1 = doc.blocks.first
+      assert_equal ['[ quote]'], b1.lines
     end
 
     test 'attribute list may begin with comma' do
@@ -1125,7 +1221,8 @@ A normal paragraph
         EOS
       doc = document_from_string(input)
       para = doc.blocks.first
-      para.add_role 'role1'
+      res = para.add_role 'role1'
+      assert res
       assert_equal 'role1', para.attributes['role']
       assert para.has_role? 'role1'
     end
@@ -1137,7 +1234,8 @@ A normal paragraph
         EOS
       doc = document_from_string(input)
       para = doc.blocks.first
-      para.add_role 'role2'
+      res = para.add_role 'role2'
+      assert res
       assert_equal 'role1 role2', para.attributes['role']
       assert para.has_role? 'role1'
       assert para.has_role? 'role2'
@@ -1150,7 +1248,8 @@ A normal paragraph
         EOS
       doc = document_from_string(input)
       para = doc.blocks.first
-      para.add_role 'role1'
+      res = para.add_role 'role1'
+      refute res
       assert_equal 'role1', para.attributes['role']
       assert para.has_role? 'role1'
     end
@@ -1162,12 +1261,27 @@ A normal paragraph
         EOS
       doc = document_from_string(input)
       para = doc.blocks.first
-      para.remove_role 'role1'
+      res = para.remove_role 'role1'
+      assert res
       assert_equal 'role2', para.attributes['role']
       assert para.has_role? 'role2'
       assert !para.has_role?('role1')
     end
 
+    test 'roles are removed when last role is removed using remove_role' do
+        input = <<-EOS
+[.role1]
+A normal paragraph
+        EOS
+      doc = document_from_string(input)
+      para = doc.blocks.first
+      res = para.remove_role 'role1'
+      assert res
+      refute para.role?
+      assert_equal nil, para.attributes['role']
+      refute para.has_role? 'role1'
+    end
+
     test 'roles are not changed when a non-existent role is removed using remove_role' do
         input = <<-EOS
 [.role1]
@@ -1175,7 +1289,8 @@ A normal paragraph
         EOS
       doc = document_from_string(input)
       para = doc.blocks.first
-      para.remove_role 'role2'
+      res = para.remove_role 'role2'
+      refute res
       assert_equal 'role1', para.attributes['role']
       assert para.has_role? 'role1'
       assert !para.has_role?('role2')
@@ -1187,7 +1302,8 @@ A normal paragraph
         EOS
       doc = document_from_string(input)
       para = doc.blocks.first
-      para.remove_role 'role1'
+      res = para.remove_role 'role1'
+      refute res
       assert_equal nil, para.attributes['role']
       assert !para.has_role?('role1')
     end
@@ -1265,7 +1381,7 @@ paragraph
       assert_equal 'coolio', subsec.id
     end
 
-    test "trailing block attributes tranfer to the following section" do
+    test "trailing block attributes transfer to the following section" do
       input = <<-EOS
 [[one]]
 

data/test/blocks_test.rb

@@ -5,22 +5,39 @@ unless defined? ASCIIDOCTOR_PROJECT_DIR
 end
 
 context "Blocks" do
-  context 'Line Breaks' do
-    test "ruler" do
-      output = render_string("'''")
-      assert_xpath '//*[@id="content"]/hr', output, 1
-      assert_xpath '//*[@id="content"]/*', output, 1
+  context 'Layout Breaks' do
+    test 'horizontal rule' do
+      %w(''' '''' '''''').each do |line|
+        output = render_embedded_string line
+        assert_includes output, '<hr>'
+      end
+    end
+
+    test '< 3 chars does not make horizontal rule' do
+      %w(' '').each do |line|
+        output = render_embedded_string line
+        refute_includes output, '<hr>'
+        assert_includes output, %(<p>#{line}</p>)
+      end
+    end
+
+    test 'mixed chars does not make horizontal rule' do
+      [%q(''<), %q('''<), %q(' ' ')].each do |line|
+        output = render_embedded_string line
+        refute_includes output, '<hr>'
+        assert_includes output, %(<p>#{line.sub '<', '&lt;'}</p>)
+      end
     end
 
-    test "ruler between blocks" do
-      output = render_string("Block above\n\n'''\n\nBlock below")
-      assert_xpath '//*[@id="content"]/hr', output, 1
-      assert_xpath '//*[@id="content"]/hr/preceding-sibling::*', output, 1
-      assert_xpath '//*[@id="content"]/hr/following-sibling::*', output, 1
+    test 'horizontal rule between blocks' do
+      output = render_embedded_string %(Block above\n\n'''\n\nBlock below)
+      assert_xpath '/hr', output, 1
+      assert_xpath '/hr/preceding-sibling::*', output, 1
+      assert_xpath '/hr/following-sibling::*', output, 1
     end
 
-    test "page break" do
-      output = render_embedded_string("page 1\n\n<<<\n\npage 2")
+    test 'page break' do
+      output = render_embedded_string %(page 1\n\n<<<\n\npage 2)
       assert_xpath '/*[translate(@style, ";", "")="page-break-after: always"]', output, 1
       assert_xpath '/*[translate(@style, ";", "")="page-break-after: always"]/preceding-sibling::div/p[text()="page 1"]', output, 1
       assert_xpath '/*[translate(@style, ";", "")="page-break-after: always"]/following-sibling::div/p[text()="page 2"]', output, 1
@@ -254,7 +271,7 @@ ____
       assert_xpath '//*[@class = "quoteblock"]/*[@class = "attribution"]/cite[text() = "Famous Book (1999)"]', output, 1
       attribution = xmlnodes_at_xpath '//*[@class = "quoteblock"]/*[@class = "attribution"]', output, 1
       author = attribution.children.first
-      assert_equal "#{expand_entity 8212} Famous Person", author.text.strip
+      assert_equal "#{decode_char 8212} Famous Person", author.text.strip
     end
 
     test 'quote block with attribute and id and role shorthand' do
@@ -374,7 +391,7 @@ Some more inspiring words.
       assert_xpath '//*[@class = "quoteblock"]/*[@class = "attribution"]/cite[text() = "Famous Source, Volume 1 (1999)"]', output, 1
       attribution = xmlnodes_at_xpath '//*[@class = "quoteblock"]/*[@class = "attribution"]', output, 1
       author = attribution.children.first
-      assert_equal "#{expand_entity 8212} Famous Person", author.text.strip
+      assert_equal "#{decode_char 8212} Famous Person", author.text.strip
     end
 
     test 'quoted paragraph-style quote block with attribution' do
@@ -393,7 +410,7 @@ Some more inspiring words."
       assert_xpath '//*[@class = "quoteblock"]/*[@class = "attribution"]/cite[text() = "Famous Source, Volume 1 (1999)"]', output, 1
       attribution = xmlnodes_at_xpath '//*[@class = "quoteblock"]/*[@class = "attribution"]', output, 1
       author = attribution.children.first
-      assert_equal "#{expand_entity 8212} Famous Person", author.text.strip
+      assert_equal "#{decode_char 8212} Famous Person", author.text.strip
     end
 
     test 'single-line verse block without attribution' do
@@ -428,7 +445,7 @@ ____
       assert_xpath '//*[@class = "verseblock"]/*[@class = "attribution"]/cite[text() = "Famous Poem"]', output, 1
       attribution = xmlnodes_at_xpath '//*[@class = "verseblock"]/*[@class = "attribution"]', output, 1
       author = attribution.children.first
-      assert_equal "#{expand_entity 8212} Famous Poet", author.text.strip
+      assert_equal "#{decode_char 8212} Famous Poet", author.text.strip
     end
 
     test 'multi-stanza verse block' do
@@ -475,7 +492,7 @@ ____
       EOS
 
       verse = block_from_string input
-      assert_equal Asciidoctor::Substitutors::SUBS[:normal], verse.subs
+      assert_equal Asciidoctor::Substitutors::NORMAL_SUBS, verse.subs
     end
 
     test 'should not recognize callouts in a verse' do
@@ -487,8 +504,9 @@ ____
 <1> Not pointing to a callout
       EOS
 
-      output = render_embedded_string input
+      output, warnings = redirect_streams {|_, err| [(render_embedded_string input), err.string] }
       assert_xpath '//pre[text()="La la la <1>"]', output, 1
+      assert_includes warnings, 'line 5: no callouts refer to list item 1'
     end
 
     test 'should perform normal subs on a verse block' do
@@ -536,6 +554,8 @@ You futz with XML.
       EOS
 
       doc = document_from_string input
+      assert_equal 1, doc.blocks[0].number
+      assert_equal 2, doc.blocks[1].number
       output = doc.render
       assert_xpath '(//*[@class="exampleblock"])[1]/*[@class="title"][text()="Example 1. Writing Docs with AsciiDoc"]', output, 1
       assert_xpath '(//*[@class="exampleblock"])[2]/*[@class="title"][text()="Example 2. Writing Docs with DocBook"]', output, 1
@@ -562,6 +582,8 @@ You futz with XML.
       EOS
 
       doc = document_from_string input
+      assert_equal 'A', doc.blocks[0].number
+      assert_equal 'B', doc.blocks[1].number
       output = doc.render
       assert_xpath '(//*[@class="exampleblock"])[1]/*[@class="title"][text()="Example A. Writing Docs with AsciiDoc"]', output, 1
       assert_xpath '(//*[@class="exampleblock"])[2]/*[@class="title"][text()="Example B. Writing Docs with DocBook"]', output, 1
@@ -580,25 +602,12 @@ You just write.
       EOS
 
       doc = document_from_string input
+      assert_nil doc.blocks[0].number
       output = doc.render
       assert_xpath '(//*[@class="exampleblock"])[1]/*[@class="title"][text()="Look! Writing Docs with AsciiDoc"]', output, 1
       assert !doc.attributes.has_key?('example-number')
     end
 
-    test 'explicit caption is set on block even if block has no title' do
-      input = <<-EOS
-[caption="Look!"]
-====
-Just write.
-====
-      EOS
-
-      doc = document_from_string input
-      assert_equal 'Look!', doc.blocks.first.caption
-      output = doc.render
-      refute_match(/Look/, output)
-    end
-
     test 'automatic caption can be turned off and on and modified' do
       input = <<-EOS
 .first example
@@ -802,7 +811,7 @@ source line 2\r
 ----
     def names
 
-      @names.split ' '
+      @names.split
 
     end
 ----
@@ -811,7 +820,7 @@ source line 2\r
       expected = <<-EOS
 def names
 
-  @names.split ' '
+  @names.split
 
 end
       EOS
@@ -829,7 +838,7 @@ end
 ----
     def names
 
-      @names.split ' '
+      @names.split
 
     end
 ----
@@ -838,7 +847,7 @@ end
       expected = <<-EOS
     def names
 
-      @names.split ' '
+      @names.split
 
     end
       EOS
@@ -856,7 +865,7 @@ end
 ----
     def names
 
-      @names.split ' '
+      @names.split
 
     end
 ----
@@ -865,7 +874,7 @@ end
       expected = <<-EOS
  def names
 
-   @names.split ' '
+   @names.split
 
  end
       EOS
@@ -885,7 +894,7 @@ end
 ----
     def names
 
-      @names.split ' '
+      @names.split
 
     end
 ----
@@ -894,7 +903,7 @@ end
       expected = <<-EOS
  def names
 
-   @names.split ' '
+   @names.split
 
  end
       EOS
@@ -914,7 +923,7 @@ end
 ----
 	def names
 
-		@names.split ' '
+		@names.split
 
 	end
 ----
@@ -923,7 +932,7 @@ end
       expected = <<-EOS
 def names
 
-    @names.split ' '
+    @names.split
 
 end
       EOS
@@ -1212,7 +1221,7 @@ line below
 
       output = render_embedded_string input
       assert_css '.stemblock', output, 1
-      nodes = xmlnodes_at_xpath '//*[@class="content"]/child::text()', output, 1
+      nodes = xmlnodes_at_xpath '//*[@class="content"]/child::text()', output
       assert_equal '\[\sqrt{3x-1}+(1+x)^2 &lt; y\]', nodes.first.to_s.strip
     end
 
@@ -1226,7 +1235,7 @@ line below
 
       output = render_embedded_string input
       assert_css '.stemblock', output, 1
-      nodes = xmlnodes_at_xpath '//*[@class="content"]/child::text()', output, 1
+      nodes = xmlnodes_at_xpath '//*[@class="content"]/child::text()', output
       assert_equal '\[\sqrt{3x-1}+(1+x)^2 &lt; y\]', nodes.first.to_s.strip
     end
 
@@ -1259,7 +1268,7 @@ sqrt(3x-1)+(1+x)^2 < y
 
       output = render_embedded_string input
       assert_css '.stemblock', output, 1
-      nodes = xmlnodes_at_xpath '//*[@class="content"]/child::text()', output, 1
+      nodes = xmlnodes_at_xpath '//*[@class="content"]/child::text()', output
       assert_equal '\$sqrt(3x-1)+(1+x)^2 &lt; y\$', nodes.first.to_s.strip
     end
 
@@ -1273,7 +1282,7 @@ sqrt(3x-1)+(1+x)^2 < y
 
       output = render_embedded_string input
       assert_css '.stemblock', output, 1
-      nodes = xmlnodes_at_xpath '//*[@class="content"]/child::text()', output, 1
+      nodes = xmlnodes_at_xpath '//*[@class="content"]/child::text()', output
       assert_equal '\$sqrt(3x-1)+(1+x)^2 &lt; y\$', nodes.first.to_s.strip
     end
 
@@ -1342,7 +1351,7 @@ sqrt(3x-1)+(1+x)^2 < y
       ].each do |attributes|
         output = render_embedded_string input, :attributes => attributes
         assert_css '.stemblock', output, 1
-        nodes = xmlnodes_at_xpath '//*[@class="content"]/child::text()', output, 1
+        nodes = xmlnodes_at_xpath '//*[@class="content"]/child::text()', output
         assert_equal '\$sqrt(3x-1)+(1+x)^2 &lt; y\$', nodes.first.to_s.strip
       end
     end
@@ -1357,7 +1366,7 @@ sqrt(3x-1)+(1+x)^2 < y
 
       output = render_embedded_string input, :attributes => {'stem' => 'latexmath'}
       assert_css '.stemblock', output, 1
-      nodes = xmlnodes_at_xpath '//*[@class="content"]/child::text()', output, 1
+      nodes = xmlnodes_at_xpath '//*[@class="content"]/child::text()', output
       assert_equal '\[\sqrt{3x-1}+(1+x)^2 &lt; y\]', nodes.first.to_s.strip
     end
   end
@@ -1399,6 +1408,7 @@ section paragraph
 
     test 'block title above document title gets carried over to first block in first section if no preamble' do
       input = <<-EOS
+:doctype: book
 .Block title
 = Document Title
 
@@ -1406,7 +1416,10 @@ section paragraph
 
 paragraph
       EOS
-      output = render_string input
+      doc = document_from_string input
+      # NOTE block title demotes document title to level-0 section
+      refute doc.header?
+      output = doc.convert
       assert_xpath '//*[@class="sect1"]//*[@class="paragraph"]/*[@class="title"][text() = "Block title"]', output, 1
     end
 
@@ -1548,18 +1561,39 @@ image::circle.svg[Tiger,100]
 image::no-such-image.svg[Alt Text]
       EOS
 
-      output = render_embedded_string input, :safe => Asciidoctor::SafeMode::SERVER
+      output, warnings = redirect_streams {|_, err| [(render_embedded_string input, :safe => Asciidoctor::SafeMode::SERVER), err.string] }
       assert_xpath '//span[@class="alt"][text()="Alt Text"]', output, 1
+      assert_includes warnings, 'SVG does not exist or cannot be read'
     end
 
-    test 'can render block image with alt text defined in macro containing escaped square bracket' do
+    test 'can render block image with alt text defined in macro containing square bracket' do
       input = <<-EOS
-image::images/tiger.png[A [Bengal\\] Tiger]
+image::images/tiger.png[A [Bengal] Tiger]
       EOS
 
       output = render_string input
       img = xmlnodes_at_xpath '//img', output, 1
-      assert_equal 'A [Bengal] Tiger', img.attr('alt').value
+      assert_equal 'A [Bengal] Tiger', img.attr('alt')
+    end
+
+    test 'can render block image with target containing spaces' do
+      input = <<-EOS
+image::images/big tiger.png[A Big Tiger]
+      EOS
+
+      output = render_string input
+      img = xmlnodes_at_xpath '//img', output, 1
+      assert_equal 'images/big%20tiger.png', img.attr('src')
+      assert_equal 'A Big Tiger', img.attr('alt')
+    end
+
+    test 'should not recognize block image if target has leading or trailing spaces' do
+      [' tiger.png', 'tiger.png '].each do |target|
+        input = %(image::#{target}[Tiger])
+
+        output = render_embedded_string input
+        assert_xpath '//img', output, 0
+      end
     end
 
     test 'can render block image with alt text defined in block attribute above macro' do
@@ -1582,31 +1616,52 @@ image::images/tiger.png[Tiger]
       assert_xpath '/*[@class="imageblock"]//img[@src="images/tiger.png"][@alt="Tiger"]', output, 1
     end
 
-    test 'alt text is escaped in HTML backend' do
+    test 'should substitute attribute references in alt text defined in image block macro' do
       input = <<-EOS
-image::images/open.png[File > Open]
-      EOS
+:alt-text: Tiger
 
+image::images/tiger.png[{alt-text}]
+      EOS
       output = render_embedded_string input
-      assert_match(/File &gt; Open/, output)
+      assert_xpath '/*[@class="imageblock"]//img[@src="images/tiger.png"][@alt="Tiger"]', output, 1
     end
 
-    test 'alt text is escaped in DocBook backend' do
+    test 'style attribute is dropped from image macro' do
       input = <<-EOS
-image::images/open.png[File > Open]
+[style=value]
+image::images/tiger.png[Tiger]
       EOS
 
-      output = render_embedded_string input, :backend => :docbook
-      assert_match(/File &gt; Open/, output)
+      doc = document_from_string input
+      img = doc.blocks[0]
+      refute(img.attributes.key? 'style')
+      assert_nil img.style
+    end
+
+    test 'should apply specialcharacters and replacement substitutions to alt text' do
+      input = 'A tiger\'s "roar" is < a bear\'s "growl"'
+      expected = 'A tiger&#8217;s &quot;roar&quot; is &lt; a bear&#8217;s &quot;growl&quot;'
+      result = render_embedded_string %(image::images/tiger-roar.png[#{input}])
+      assert_includes result, %(alt="#{expected}")
     end
 
-    test "can render block image with auto-generated alt text" do
+    test 'should not encode double quotes in alt text when converting to DocBook' do
+      input = 'Select "File > Open"'
+      expected = 'Select "File &gt; Open"'
+      result = render_embedded_string %(image::images/open.png[#{input}]), :backend => :docbook
+      assert_includes result, %(<phrase>#{expected}</phrase>)
+    end
+
+    test 'should auto-generate alt text for block image if alt text is not specified' do
       input = <<-EOS
-image::images/tiger.png[]
+image::images/lions-and-tigers.png[]
       EOS
 
-      output = render_embedded_string input
-      assert_xpath '/*[@class="imageblock"]//img[@src="images/tiger.png"][@alt="tiger"]', output, 1
+      image = block_from_string input
+      assert_equal 'lions and tigers', (image.attr 'alt')
+      assert_equal 'lions and tigers', (image.attr 'default-alt')
+      output = image.convert
+      assert_xpath '/*[@class="imageblock"]//img[@src="images/lions-and-tigers.png"][@alt="lions and tigers"]', output, 1
     end
 
     test "can render block image with alt text and height and width" do
@@ -1627,13 +1682,32 @@ image::images/tiger.png[Tiger, link='http://en.wikipedia.org/wiki/Tiger']
       assert_xpath '/*[@class="imageblock"]//a[@class="image"][@href="http://en.wikipedia.org/wiki/Tiger"]/img[@src="images/tiger.png"][@alt="Tiger"]', output, 1
     end
 
-    test "can render block image with caption" do
+    test 'adds rel=noopener attribute to block image with link that targets _blank window' do
+      input = <<-EOS
+image::images/tiger.png[Tiger,link=http://en.wikipedia.org/wiki/Tiger,window=_blank]
+      EOS
+
+      output = render_embedded_string input
+      assert_xpath '/*[@class="imageblock"]//a[@class="image"][@href="http://en.wikipedia.org/wiki/Tiger"][@target="_blank"][@rel="noopener"]/img[@src="images/tiger.png"][@alt="Tiger"]', output, 1
+    end
+
+    test 'adds rel=noopener attribute to block image with link that targets name window when the noopener option is set' do
+      input = <<-EOS
+image::images/tiger.png[Tiger,link=http://en.wikipedia.org/wiki/Tiger,window=name,opts=noopener]
+      EOS
+
+      output = render_embedded_string input
+      assert_xpath '/*[@class="imageblock"]//a[@class="image"][@href="http://en.wikipedia.org/wiki/Tiger"][@target="name"][@rel="noopener"]/img[@src="images/tiger.png"][@alt="Tiger"]', output, 1
+    end
+
+    test 'can render block image with caption' do
       input = <<-EOS
 .The AsciiDoc Tiger
 image::images/tiger.png[Tiger]
       EOS
 
       doc = document_from_string input
+      assert_equal 1, doc.blocks[0].number
       output = doc.render
       assert_xpath '//*[@class="imageblock"]//img[@src="images/tiger.png"][@alt="Tiger"]', output, 1
       assert_xpath '//*[@class="imageblock"]/*[@class="title"][text() = "Figure 1. The AsciiDoc Tiger"]', output, 1
@@ -1648,6 +1722,7 @@ image::images/tiger.png[Tiger]
       EOS
 
       doc = document_from_string input
+      assert_nil doc.blocks[0].number
       output = doc.render
       assert_xpath '//*[@class="imageblock"]//img[@src="images/tiger.png"][@alt="Tiger"]', output, 1
       assert_xpath '//*[@class="imageblock"]/*[@class="title"][text() = "Voila! The AsciiDoc Tiger"]', output, 1
@@ -1656,7 +1731,7 @@ image::images/tiger.png[Tiger]
 
     test 'can align image in DocBook backend' do
       input = <<-EOS
-image::images/sunset.jpg[Sunset, align="right"]
+image::images/sunset.jpg[Sunset,align=right]
       EOS
 
       output = render_embedded_string input, :backend => :docbook
@@ -1664,36 +1739,54 @@ image::images/sunset.jpg[Sunset, align="right"]
       assert_xpath '//imagedata[@align="right"]', output, 1
     end
 
+    test 'should set content width and depth in DocBook backend if no scaling' do
+      input = <<-EOS
+image::images/sunset.jpg[Sunset,500,332]
+      EOS
+
+      output = render_embedded_string input, :backend => :docbook
+      assert_xpath '//imagedata', output, 1
+      assert_xpath '//imagedata[@contentwidth="500"]', output, 1
+      assert_xpath '//imagedata[@contentdepth="332"]', output, 1
+      assert_xpath '//imagedata[@width]', output, 0
+      assert_xpath '//imagedata[@depth]', output, 0
+    end
+
     test 'can scale image in DocBook backend' do
       input = <<-EOS
-image::images/sunset.jpg[Sunset, scale="200"]
+image::images/sunset.jpg[Sunset,500,332,scale=200]
       EOS
 
       output = render_embedded_string input, :backend => :docbook
       assert_xpath '//imagedata', output, 1
       assert_xpath '//imagedata[@scale="200"]', output, 1
+      assert_xpath '//imagedata[@width]', output, 0
+      assert_xpath '//imagedata[@depth]', output, 0
+      assert_xpath '//imagedata[@contentwidth]', output, 0
+      assert_xpath '//imagedata[@contentdepth]', output, 0
     end
 
-    test 'can scale image width in DocBook backend' do
+    test 'scale image width in DocBook backend' do
       input = <<-EOS
-image::images/sunset.jpg[Sunset, scaledwidth="25%"]
+image::images/sunset.jpg[Sunset,500,332,scaledwidth=25%]
       EOS
 
       output = render_embedded_string input, :backend => :docbook
       assert_xpath '//imagedata', output, 1
       assert_xpath '//imagedata[@width="25%"]', output, 1
-      assert_xpath '//imagedata[@scalefit="1"]', output, 1
+      assert_xpath '//imagedata[@depth]', output, 0
+      assert_xpath '//imagedata[@contentwidth]', output, 0
+      assert_xpath '//imagedata[@contentdepth]', output, 0
     end
 
     test 'adds % to scaled width if no units given in DocBook backend ' do
       input = <<-EOS
-image::images/sunset.jpg[Sunset, scaledwidth="25"]
+image::images/sunset.jpg[Sunset,scaledwidth=25]
       EOS
 
       output = render_embedded_string input, :backend => :docbook
       assert_xpath '//imagedata', output, 1
       assert_xpath '//imagedata[@width="25%"]', output, 1
-      assert_xpath '//imagedata[@scalefit="1"]', output, 1
     end
 
     test 'keeps line unprocessed if image target is missing attribute reference and attribute-missing is skip' do
@@ -1703,8 +1796,9 @@ image::images/sunset.jpg[Sunset, scaledwidth="25"]
 image::{bogus}[]
       EOS
 
-      output = render_embedded_string input
+      output, warnings = redirect_streams {|_, err| [(render_embedded_string input), err.string] }
       assert output.include?('image::{bogus}[]')
+      assert_includes warnings, 'dropping line containing reference to missing attribute'
     end
 
     test 'drops line if image target is missing attribute reference and attribute-missing is drop' do
@@ -1714,8 +1808,9 @@ image::{bogus}[]
 image::{bogus}[]
       EOS
 
-      output = render_embedded_string input
+      output, warnings = redirect_streams {|_, err| [(render_embedded_string input), err.string] }
       assert output.strip.empty?
+      assert_includes warnings, 'dropping line containing reference to missing attribute'
     end
 
     test 'drops line if image target is missing attribute reference and attribute-missing is drop-line' do
@@ -1725,8 +1820,9 @@ image::{bogus}[]
 image::{bogus}[]
       EOS
 
-      output = render_embedded_string input
+      output, warnings = redirect_streams {|_, err| [(render_embedded_string input), err.string] }
       assert output.strip.empty?
+      assert_includes warnings, 'dropping line containing reference to missing attribute'
     end
 
     test 'dropped image does not break processing of following section and attribute-missing is drop-line' do
@@ -1738,10 +1834,11 @@ image::{bogus}[]
 == Section Title
       EOS
 
-      output = render_embedded_string input
+      output, warnings = redirect_streams {|_, err| [(render_embedded_string input), err.string] }
       assert_css 'img', output, 0
       assert_css 'h2', output, 1
       assert !output.include?('== Section Title')
+      assert_includes warnings, 'dropping line containing reference to missing attribute'
     end
 
     test 'should pass through image that references uri' do
@@ -1755,6 +1852,15 @@ image::http://asciidoc.org/images/tiger.png[Tiger]
       assert_xpath '/*[@class="imageblock"]//img[@src="http://asciidoc.org/images/tiger.png"][@alt="Tiger"]', output, 1
     end
 
+    test 'should encode spaces in image target if value is a URI' do
+      input = <<-EOS
+image::http://example.org/svg?digraph=digraph G { a -> b; }[diagram]
+      EOS
+
+      output = render_embedded_string input
+      assert_xpath %(/*[@class="imageblock"]//img[@src="http://example.org/svg?digraph=digraph%20G%20{%20a%20-#{decode_char 62}%20b;%20}"]), output, 1
+    end
+
     test 'can resolve image relative to imagesdir' do
       input = <<-EOS
 :imagesdir: images
@@ -1780,6 +1886,21 @@ image::dot.gif[Dot]
       assert_xpath '//img[@src="data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="][@alt="Dot"]', output, 1
     end
 
+    test 'embeds empty base64-encoded data uri for unreadable image when data-uri attribute is set' do
+      input = <<-EOS
+:data-uri:
+:imagesdir: fixtures
+
+image::unreadable.gif[Dot]
+      EOS
+
+      doc = document_from_string input, :safe => Asciidoctor::SafeMode::SAFE, :attributes => {'docdir' => File.dirname(__FILE__)}
+      assert_equal 'fixtures', doc.attributes['imagesdir']
+      output, warnings = redirect_streams {|_, err| [doc.render, err.string] }
+      assert_xpath '//img[@src="data:image/gif;base64,"]', output, 1
+      assert_includes warnings, 'image to embed not found or not readable'
+    end
+
     test 'embeds base64-encoded data uri for remote image when data-uri attribute is set' do
       input = <<-EOS
 :data-uri:
@@ -1817,11 +1938,16 @@ image::dot.gif[Dot]
 image::#{image_uri}[Missing image]
       EOS
 
-      output = using_test_webserver do
-        render_embedded_string input, :safe => :safe, :attributes => {'allow-uri-read' => ''}
+      output = warnings = nil
+      redirect_streams do |_, err|
+        output = using_test_webserver do
+          render_embedded_string input, :safe => :safe, :attributes => {'allow-uri-read' => ''}
+        end
+        warnings = err.string
       end
 
       assert_xpath %(/*[@class="imageblock"]//img[@src="#{image_uri}"][@alt="Missing image"]), output, 1
+      assert_includes warnings, 'could not retrieve image data from URI'
     end
 
     test 'uses remote image uri when data-uri attribute is set and allow-uri-read is not set' do
@@ -1859,7 +1985,6 @@ image::data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs=[Do
       assert_xpath '//img[@src="data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="][@alt="Dot"]', output, 1
     end
 
-    # this test will cause a warning to be printed to the console (until we have a message facility)
     test 'cleans reference to ancestor directories in imagesdir before reading image if safe mode level is at least SAFE' do
       input = <<-EOS
 :data-uri:
@@ -1870,10 +1995,11 @@ image::dot.gif[Dot]
 
       doc = document_from_string input, :safe => Asciidoctor::SafeMode::SAFE, :attributes => {'docdir' => File.dirname(__FILE__)}
       assert_equal '../..//fixtures/./../../fixtures', doc.attributes['imagesdir']
-      output = doc.render
+      output, warnings = redirect_streams {|_, err| [doc.render, err.string] }
       # image target resolves to fixtures/dot.gif relative to docdir (which is explicitly set to the directory of this file)
       # the reference cannot fall outside of the document directory in safe mode
       assert_xpath '//img[@src="data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="][@alt="Dot"]', output, 1
+      assert_includes warnings, 'image has illegal reference to ancestor of jail'
     end
 
     test 'cleans reference to ancestor directories in target before reading image if safe mode level is at least SAFE' do
@@ -1886,10 +2012,11 @@ image::../..//fixtures/./../../fixtures/dot.gif[Dot]
 
       doc = document_from_string input, :safe => Asciidoctor::SafeMode::SAFE, :attributes => {'docdir' => File.dirname(__FILE__)}
       assert_equal './', doc.attributes['imagesdir']
-      output = doc.render
+      output, warnings = redirect_streams {|_, err| [doc.render, err.string] }
       # image target resolves to fixtures/dot.gif relative to docdir (which is explicitly set to the directory of this file)
       # the reference cannot fall outside of the document directory in safe mode
       assert_xpath '//img[@src="data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="][@alt="Dot"]', output, 1
+      assert_includes warnings, 'image has illegal reference to ancestor of jail'
     end
   end
 
@@ -1919,7 +2046,7 @@ video::cats-vs-dogs.avi[cats-and-dogs.png, 200, 300]
 
     test 'video macro should honor all options' do
       input = <<-EOS
-video::cats-vs-dogs.avi[options="autoplay,nocontrols,loop"]
+video::cats-vs-dogs.avi[options="autoplay,nocontrols,loop",preload="metadata"]
       EOS
 
       output = render_embedded_string input
@@ -1927,6 +2054,7 @@ video::cats-vs-dogs.avi[options="autoplay,nocontrols,loop"]
       assert_css 'video[autoplay]', output, 1
       assert_css 'video:not([controls])', output, 1
       assert_css 'video[loop]', output, 1
+      assert_css 'video[preload=metadata]', output, 1
     end
 
     test 'video macro should add time range anchor with start time if start attribute is set' do
@@ -2067,6 +2195,17 @@ audio::podcast.mp3[options="autoplay,nocontrols,loop"]
       assert_css 'audio:not([controls])', output, 1
       assert_css 'audio[loop]', output, 1
     end
+
+    test 'audio macro should support start and end time' do
+      input = <<-EOS
+audio::podcast.mp3[start=1,end=2]
+      EOS
+
+      output = render_embedded_string input
+      assert_css 'audio', output, 1
+      assert_css 'audio[controls]', output, 1
+      assert_css 'audio[src="podcast.mp3#t=1,2"]', output, 1
+    end
   end
 
   context 'Admonition icons' do
@@ -2149,8 +2288,11 @@ You can use icons for admonitions by setting the 'icons' attribute.
 You can use icons for admonitions by setting the 'icons' attribute.
       EOS
 
-      output = render_string input, :safe => Asciidoctor::SafeMode::SAFE, :attributes => {'docdir' => File.dirname(__FILE__)}
+      output, warnings = redirect_streams do |_, err|
+        [(render_string input, :safe => Asciidoctor::SafeMode::SAFE, :attributes => {'docdir' => File.dirname(__FILE__)}), err.string]
+      end
       assert_xpath '//*[@class="admonitionblock tip"]//*[@class="icon"]/img[@src="data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="][@alt="Tip"]', output, 1
+      assert_includes warnings, 'image has illegal reference to ancestor of jail'
     end
 
     test 'should import Font Awesome and use font-based icons when value of icons attribute is font' do
@@ -2194,7 +2336,7 @@ puts "AsciiDoc, FTW!"
 
       output = render_string input, :safe => Asciidoctor::SafeMode::SAFE
       assert_css 'html > head > link[rel="stylesheet"][href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css"]', output, 1
-      assert_css 'html > body > script[src="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/highlight.min.js"]', output, 1
+      assert_css 'html > body > script[src="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"]', output, 1
     end
 
     test 'should use no uri scheme for assets when asset-uri-scheme is blank' do
@@ -2211,7 +2353,7 @@ puts "AsciiDoc, FTW!"
 
       output = render_string input, :safe => Asciidoctor::SafeMode::SAFE
       assert_css 'html > head > link[rel="stylesheet"][href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css"]', output, 1
-      assert_css 'html > body > script[src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/highlight.min.js"]', output, 1
+      assert_css 'html > body > script[src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"]', output, 1
     end
   end
 
@@ -2227,8 +2369,8 @@ image::asciidoctor.png[Asciidoctor]
       assert doc.safe >= Asciidoctor::SafeMode::SAFE
 
       assert_equal File.join(basedir, 'images'), block.normalize_asset_path('images')
-      assert_equal File.join(basedir, 'etc/images'), block.normalize_asset_path("#{disk_root}etc/images")
-      assert_equal File.join(basedir, 'images'), block.normalize_asset_path('../../images')
+      assert_equal File.join(basedir, 'etc/images'), redirect_streams { block.normalize_asset_path("#{disk_root}etc/images") }
+      assert_equal File.join(basedir, 'images'), redirect_streams { block.normalize_asset_path('../../images') }
     end
 
     test 'does not restrict access to ancestor directories when safe mode is disabled' do
@@ -2327,6 +2469,46 @@ html = CodeRay.scan("puts 'Hello, world!'", :ruby).div(:line_numbers => :table)
       assert_match(/\.CodeRay *\{/, output)
     end
 
+    test 'should number lines if third positional attribute is set' do
+      input = <<-EOS
+:source-highlighter: coderay
+
+[source,ruby,linenums]
+----
+puts 'Hello, World!'
+----
+      EOS
+      output = render_embedded_string input, :safe => Asciidoctor::SafeMode::SAFE
+      assert_xpath '//td[@class="line-numbers"]', output, 1
+    end
+
+    test 'should number lines if linenums option is set on source block' do
+      input = <<-EOS
+:source-highlighter: coderay
+
+[source%linenums,ruby]
+----
+puts 'Hello, World!'
+----
+      EOS
+      output = render_embedded_string input, :safe => Asciidoctor::SafeMode::SAFE
+      assert_xpath '//td[@class="line-numbers"]', output, 1
+    end
+
+    test 'should number lines of source block if source-linenums-option document attribute is set' do
+      input = <<-EOS
+:source-highlighter: coderay
+:source-linenums-option:
+
+[source,ruby]
+----
+puts 'Hello, World!'
+----
+      EOS
+      output = render_embedded_string input, :safe => Asciidoctor::SafeMode::SAFE
+      assert_xpath '//td[@class="line-numbers"]', output, 1
+    end
+
     test 'should read source language from source-language document attribute if not specified on source block' do
       input = <<-EOS
 :source-highlighter: coderay
@@ -2414,6 +2596,43 @@ exit 0 # <5><6>
       assert_match(/exit.* <b class="conum">\(5\)<\/b> <b class="conum">\(6\)<\/b><\/pre>/, output)
     end
 
+    test 'should preserve space before callout on final line' do
+      inputs = []
+
+      inputs << <<-EOS
+[source,yaml]
+----
+a: 'a'
+key: 'value' #<1>
+----
+<1> key-value pair
+      EOS
+
+      inputs << <<-EOS
+[source,ruby]
+----
+puts 'hi'
+puts 'value' #<1>
+----
+<1> print to stdout
+      EOS
+
+      inputs << <<-EOS
+[source,python]
+----
+print 'hi'
+print 'value' #<1>
+----
+<1> print to stdout
+      EOS
+
+      inputs.each do |input|
+        output = render_embedded_string input, :safe => Asciidoctor::SafeMode::SAFE, :attributes => { 'source-highlighter' => 'coderay' }
+        output = output.gsub(/<\/?span.*?>/, '')
+        assert_includes output, '\'value\' <b class="conum">(1)</b>'
+      end
+    end
+
     test 'should preserve passthrough placeholders when highlighting source using coderay' do
       input = <<-EOS
 :source-highlighter: coderay
@@ -2741,8 +2960,9 @@ content
 part intro paragraph
       EOS
 
-      output = render_string input
+      output, warnings = redirect_streams {|_, err| [(render_string input), err.string] }
       assert_css '.partintro', output, 0
+      assert_includes warnings, 'partintro block can only be used when doctype is book and it\'s a child of a book part'
     end
 
     test 'should not allow partintro unless doctype is book' do
@@ -2751,8 +2971,9 @@ part intro paragraph
 part intro paragraph
       EOS
 
-      output = render_string input
+      output, warnings = redirect_streams {|_, err| [(render_string input), err.string] }
       assert_css '.partintro', output, 0
+      assert_includes warnings, 'partintro block can only be used when doctype is book and it\'s a child of a book part'
     end
 
     test 'should accept partintro on open block without title rendered to DocBook' do
@@ -2814,8 +3035,9 @@ content
 part intro paragraph
       EOS
 
-      output = render_string input, :backend => 'docbook'
+      output, warnings = redirect_streams {|_, err| [(render_string input, :backend => 'docbook'), err.string] }
       assert_css 'partintro', output, 0
+      assert_includes warnings, 'partintro block can only be used when doctype is book and it\'s a child of a part section'
     end
 
     test 'should not allow partintro unless doctype is book rendered to DocBook' do
@@ -2824,12 +3046,26 @@ part intro paragraph
 part intro paragraph
       EOS
 
-      output = render_string input, :backend => 'docbook'
+      output, warnings = redirect_streams {|_, err| [(render_string input, :backend => 'docbook'), err.string] }
       assert_css 'partintro', output, 0
+      assert_includes warnings, 'partintro block can only be used when doctype is book and it\'s a child of a part section'
     end
   end
 
   context 'Substitutions' do
+    test 'processor should not crash if subs are empty' do
+      input = <<-EOS
+[subs=","]
+....
+content
+....
+      EOS
+
+      doc = document_from_string input
+      block = doc.blocks.first
+      assert_equal [], block.subs
+    end
+
     test 'should be able to append subs to default block substitution list' do
       input = <<-EOS
 :application: Asciidoctor
@@ -2915,7 +3151,32 @@ content
       block = doc.blocks.first
       assert_nil block.id
       assert_nil(block.attr 'reftext')
-      assert !doc.references[:ids].has_key?('illegal$id')
+      assert !doc.catalog[:ids].has_key?('illegal$id')
+    end
+
+    test 'should not recognize block anchor that starts with digit' do
+      input = <<-EOS
+[[3-blind-mice]]
+--
+see how they run
+--
+      EOS
+
+      output = render_embedded_string input
+      assert_includes output, '[[3-blind-mice]]'
+      assert_xpath '/*[@id = ":3-blind-mice"]', output, 0
+    end
+
+    test 'should recognize block anchor that starts with colon' do
+      input = <<-EOS
+[[:idname]]
+--
+content
+--
+      EOS
+
+      output = render_embedded_string input
+      assert_xpath '/*[@id = ":idname"]', output, 1
     end
 
     test 'should use specified id and reftext when registering block reference' do
@@ -2928,7 +3189,7 @@ $ apt-get install asciidoctor
       EOS
 
       doc = document_from_string input
-      reftext = doc.references[:ids]['debian']
+      reftext = doc.catalog[:ids]['debian']
       refute_nil reftext
       assert_equal 'Debian Install', reftext
     end
@@ -2943,7 +3204,7 @@ $ apt-get install asciidoctor
       EOS
 
       doc = document_from_string input
-      reftext = doc.references[:ids]['debian']
+      reftext = doc.catalog[:ids]['debian']
       refute_nil reftext
       assert_equal '[Debian] Install', reftext
     end
@@ -2958,11 +3219,30 @@ $ apt-get install asciidoctor
       EOS
 
       doc = document_from_string input
-      reftext = doc.references[:ids]['debian']
+      reftext = doc.catalog[:ids]['debian']
       refute_nil reftext
       assert_equal 'Debian, Ubuntu', reftext
     end
 
+    test 'should substitute attribute references in reftext when registering block reference' do
+      input = <<-EOS
+:label-tiger: Tiger
+
+[[tiger-evolution,Evolution of the {label-tiger}]]
+****
+Information about the evolution of the tiger.
+****
+      EOS
+
+      doc = document_from_string input
+      reftext = doc.catalog[:ids]['tiger-evolution']
+      refute_nil reftext
+      assert_equal 'Evolution of the Tiger', reftext
+      ref = doc.catalog[:refs]['tiger-evolution']
+      refute_nil ref
+      assert_equal 'Evolution of the Tiger', ref.attributes['reftext']
+    end
+
     test 'should use specified reftext when registering block reference' do
       input = <<-EOS
 [[debian]]
@@ -2974,7 +3254,7 @@ $ apt-get install asciidoctor
       EOS
 
       doc = document_from_string input
-      reftext = doc.references[:ids]['debian']
+      reftext = doc.catalog[:ids]['debian']
       refute_nil reftext
       assert_equal 'Debian Install', reftext
     end