asciidoctor 1.5.2 → 1.5.3

data/test/attributes_test.rb

@@ -312,6 +312,19 @@ content
       assert_equal 'baz', (node.attr 'foo')
     end
 
+    test 'set_attr should set header attribute in loaded document' do
+      input = <<-EOS
+:uri: http://example.org
+
+{uri}
+      EOS
+
+      doc = Asciidoctor.load input, :attributes => { 'uri' => 'https://github.com' }
+      doc.set_attr 'uri', 'https://google.com'
+      output = doc.convert
+      assert_xpath '//a[@href="https://google.com"]', output, 1
+    end
+
     test 'verify toc attribute matrix' do
       expected_data = <<-EOS
 #attributes                               |toc|toc-position|toc-placement|toc-class
@@ -1054,6 +1067,79 @@ Text
       assert para.attributes.has_key?('option2-option')
     end
 
+    test 'a role can be added using add_role when the node has no roles' do
+        input = <<-EOS
+A normal paragraph        
+        EOS
+      doc = document_from_string(input)
+      para = doc.blocks.first
+      para.add_role 'role1'
+      assert_equal 'role1', para.attributes['role']
+      assert para.has_role? 'role1'
+    end
+
+    test 'a role can be added using add_role when the node already has a role' do
+        input = <<-EOS
+[.role1]
+A normal paragraph        
+        EOS
+      doc = document_from_string(input)
+      para = doc.blocks.first
+      para.add_role 'role2'
+      assert_equal 'role1 role2', para.attributes['role']
+      assert para.has_role? 'role1'
+      assert para.has_role? 'role2'
+    end
+
+    test 'a role is not added using add_role if the node already has that role' do
+        input = <<-EOS
+[.role1]
+A normal paragraph        
+        EOS
+      doc = document_from_string(input)
+      para = doc.blocks.first
+      para.add_role 'role1'
+      assert_equal 'role1', para.attributes['role']
+      assert para.has_role? 'role1'
+    end
+
+    test 'an existing role can be removed using remove_role' do
+        input = <<-EOS
+[.role1.role2]
+A normal paragraph        
+        EOS
+      doc = document_from_string(input)
+      para = doc.blocks.first
+      para.remove_role 'role1'
+      assert_equal 'role2', para.attributes['role']
+      assert para.has_role? 'role2'
+      assert !para.has_role?('role1')
+    end
+
+    test 'roles are not changed when a non-existent role is removed using remove_role' do
+        input = <<-EOS
+[.role1]
+A normal paragraph        
+        EOS
+      doc = document_from_string(input)
+      para = doc.blocks.first
+      para.remove_role 'role2'
+      assert_equal 'role1', para.attributes['role']
+      assert para.has_role? 'role1'
+      assert !para.has_role?('role2')
+    end
+
+    test 'roles are not changed when using remove_role if the node has no roles' do
+        input = <<-EOS
+A normal paragraph        
+        EOS
+      doc = document_from_string(input)
+      para = doc.blocks.first
+      para.remove_role 'role1'
+      assert_equal nil, para.attributes['role']
+      assert !para.has_role?('role1')
+    end
+
     test 'option can be specified in first position of block style using shorthand syntax' do
       input = <<-EOS
 [%interactive]

data/test/blocks_test.rb

@@ -823,6 +823,33 @@ end
       assert_equal expected.chomp, result
     end
 
+    test 'should not remove block indent if indent attribute is -1' do
+      input = <<-EOS
+[indent="-1"]
+----
+    def names
+
+      @names.split ' '
+
+    end
+----
+      EOS
+
+      expected = <<-EOS
+    def names
+
+      @names.split ' '
+
+    end
+      EOS
+
+      output = render_embedded_string input
+      assert_css 'pre', output, 1
+      assert_css '.listingblock pre', output, 1
+      result = xmlnodes_at_xpath('//pre', output, 1).text
+      assert_equal expected.chomp, result
+    end
+
     test 'should set block indent to value specified by indent attribute' do
       input = <<-EOS
 [indent="1"]
@@ -837,9 +864,9 @@ end
 
       expected = <<-EOS
  def names
- 
+
    @names.split ' '
- 
+
  end
       EOS
 
@@ -850,6 +877,64 @@ end
       assert_equal expected.chomp, result
     end
 
+    test 'should set block indent to value specified by indent document attribute' do
+      input = <<-EOS
+:source-indent: 1
+
+[source,ruby]
+----
+    def names
+
+      @names.split ' '
+
+    end
+----
+      EOS
+
+      expected = <<-EOS
+ def names
+
+   @names.split ' '
+
+ end
+      EOS
+
+      output = render_embedded_string input
+      assert_css 'pre', output, 1
+      assert_css '.listingblock pre', output, 1
+      result = xmlnodes_at_xpath('//pre', output, 1).text
+      assert_equal expected.chomp, result
+    end
+
+    test 'should expand tabs if tabsize attribute is positive' do
+      input = <<-EOS
+:tabsize: 4
+
+[indent=0]
+----
+	def names
+
+		@names.split ' '
+
+	end
+----
+      EOS
+
+      expected = <<-EOS
+def names
+
+    @names.split ' '
+
+end
+      EOS
+
+      output = render_embedded_string input
+      assert_css 'pre', output, 1
+      assert_css '.listingblock pre', output, 1
+      result = xmlnodes_at_xpath('//pre', output, 1).text
+      assert_equal expected.chomp, result
+    end
+
     test 'literal block should honor nowrap option' do
       input = <<-EOS
 [options="nowrap"]
@@ -1200,11 +1285,9 @@ x+b/(2a)<+-sqrt((b^2)/(4a^2)-c/a)
 ++++
       EOS
 
-      expect = <<-'EOS'
-<informalequation>
-<mediaobject><textobject><phrase><![CDATA[x+b/(2a)<+-sqrt((b^2)/(4a^2)-c/a)]]></phrase></textobject></mediaobject>
-</informalequation>
-      EOS
+      expect = %(<informalequation>
+<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mi>x</mml:mi><mml:mo>+</mml:mo><mml:mfrac><mml:mi>b</mml:mi><mml:mrow><mml:mn>2</mml:mn><mml:mi>a</mml:mi></mml:mrow></mml:mfrac><mml:mo>&#x003C;</mml:mo><mml:mo>&#x00B1;</mml:mo><mml:msqrt><mml:mrow><mml:mfrac><mml:msup><mml:mi>b</mml:mi><mml:mn>2</mml:mn></mml:msup><mml:mrow><mml:mn>4</mml:mn><mml:msup><mml:mi>a</mml:mi><mml:mn>2</mml:mn></mml:msup></mml:mrow></mml:mfrac><mml:mo>&#x2212;</mml:mo><mml:mfrac><mml:mi>c</mml:mi><mml:mi>a</mml:mi></mml:mfrac></mml:mrow></mml:msqrt></mml:math>
+</informalequation>)
 
       output = render_embedded_string input, :backend => :docbook
       assert_equal expect.strip, output.strip
@@ -1364,6 +1447,111 @@ image::images/tiger.png[Tiger]
       assert_xpath '/*[@class="imageblock"]//img[@src="images/tiger.png"][@alt="Tiger"]', output, 1
     end
 
+    test 'renders SVG image using img element by default' do
+      input = <<-EOS
+image::tiger.svg[Tiger]
+      EOS
+
+      output = render_embedded_string input, :safe => Asciidoctor::SafeMode::SERVER
+      assert_xpath '/*[@class="imageblock"]//img[@src="tiger.svg"][@alt="Tiger"]', output, 1
+    end
+
+    test 'renders interactive SVG image with alt text using object element' do
+      input = <<-EOS
+:imagesdir: images
+
+[%interactive]
+image::tiger.svg[Tiger,100]
+      EOS
+
+      output = render_embedded_string input, :safe => Asciidoctor::SafeMode::SERVER
+      assert_xpath '/*[@class="imageblock"]//object[@type="image/svg+xml"][@data="images/tiger.svg"][@width="100"]/span[@class="alt"][text()="Tiger"]', output, 1
+    end
+
+    test 'renders SVG image with alt text using img element when safe mode is secure' do
+      input = <<-EOS
+[%interactive]
+image::images/tiger.svg[Tiger,100]
+      EOS
+
+      output = render_embedded_string input
+      assert_xpath '/*[@class="imageblock"]//img[@src="images/tiger.svg"][@alt="Tiger"]', output, 1
+    end
+
+    test 'inserts fallback image for SVG inside object element using same dimensions' do
+      input = <<-EOS
+:imagesdir: images
+
+[%interactive]
+image::tiger.svg[Tiger,100,fallback=tiger.png]
+      EOS
+
+      output = render_embedded_string input, :safe => Asciidoctor::SafeMode::SERVER
+      assert_xpath '/*[@class="imageblock"]//object[@type="image/svg+xml"][@data="images/tiger.svg"][@width="100"]/img[@src="images/tiger.png"][@width="100"]', output, 1
+    end
+
+    test 'detects SVG image URI that contains a query string' do
+      input = <<-EOS
+:imagesdir: images
+
+[%interactive]
+image::http://example.org/tiger.svg?foo=bar[Tiger,100]
+      EOS
+
+      output = render_embedded_string input, :safe => Asciidoctor::SafeMode::SERVER
+      assert_xpath '/*[@class="imageblock"]//object[@type="image/svg+xml"][@data="http://example.org/tiger.svg?foo=bar"][@width="100"]/span[@class="alt"][text()="Tiger"]', output, 1
+    end
+
+    test 'detects SVG image when format attribute is svg' do
+      input = <<-EOS
+:imagesdir: images
+
+[%interactive]
+image::http://example.org/tiger-svg[Tiger,100,format=svg]
+      EOS
+
+      output = render_embedded_string input, :safe => Asciidoctor::SafeMode::SERVER
+      assert_xpath '/*[@class="imageblock"]//object[@type="image/svg+xml"][@data="http://example.org/tiger-svg"][@width="100"]/span[@class="alt"][text()="Tiger"]', output, 1
+    end
+
+    test 'renders inline SVG image using svg element' do
+      input = <<-EOS
+:imagesdir: fixtures
+
+[%inline]
+image::circle.svg[Tiger,100]
+      EOS
+
+      output = render_embedded_string input, :safe => Asciidoctor::SafeMode::SERVER, :attributes => { 'docdir' => ::File.dirname(__FILE__) }
+      assert_match(/<svg [^>]*width="100px"[^>]*>/, output, 1)
+      refute_match(/<svg [^>]*width="500px"[^>]*>/, output)
+      refute_match(/<svg [^>]*height="500px"[^>]*>/, output)
+      refute_match(/<svg [^>]*style="width:500px;height:500px"[^>]*>/, output)
+    end
+
+    test 'renders inline SVG image using svg element even when data-uri is set' do
+      input = <<-EOS
+:imagesdir: fixtures
+:data-uri:
+
+[%inline]
+image::circle.svg[Tiger,100]
+      EOS
+
+      output = render_embedded_string input, :safe => Asciidoctor::SafeMode::SERVER, :attributes => { 'docdir' => ::File.dirname(__FILE__) }
+      assert_match(/<svg [^>]*width="100px">/, output, 1)
+    end
+
+    test 'renders alt text for inline svg element if svg cannot be read' do
+      input = <<-EOS
+[%inline]
+image::no-such-image.svg[Alt Text]
+      EOS
+
+      output = render_embedded_string input, :safe => Asciidoctor::SafeMode::SERVER
+      assert_xpath '//span[@class="alt"][text()="Alt Text"]', output, 1
+    end
+
     test 'can render block image with alt text defined in macro containing escaped square bracket' do
       input = <<-EOS
 image::images/tiger.png[A [Bengal\\] Tiger]
@@ -1805,7 +1993,7 @@ video::67480300[vimeo, 400, 300, start=60, options=autoplay]
       output = render_embedded_string input
       assert_css 'video', output, 0
       assert_css 'iframe', output, 1
-      assert_css 'iframe[src="//player.vimeo.com/video/67480300#at=60?autoplay=1"]', output, 1
+      assert_css 'iframe[src="https://player.vimeo.com/video/67480300#at=60?autoplay=1"]', output, 1
       assert_css 'iframe[width="400"]', output, 1
       assert_css 'iframe[height="300"]', output, 1
     end
@@ -1817,7 +2005,7 @@ video::U8GBXvdmHT4/PLg7s6cbtAD15Das5LK9mXt_g59DLWxKUe[youtube, 640, 360, start=6
       output = render_embedded_string input
       assert_css 'video', output, 0
       assert_css 'iframe', output, 1
-      assert_css 'iframe[src="//www.youtube.com/embed/U8GBXvdmHT4?rel=0&start=60&autoplay=1&list=PLg7s6cbtAD15Das5LK9mXt_g59DLWxKUe&modestbranding=1&theme=light"]', output, 1
+      assert_css 'iframe[src="https://www.youtube.com/embed/U8GBXvdmHT4?rel=0&start=60&autoplay=1&list=PLg7s6cbtAD15Das5LK9mXt_g59DLWxKUe&modestbranding=1&theme=light"]', output, 1
       assert_css 'iframe[width="640"]', output, 1
       assert_css 'iframe[height="360"]', output, 1
     end
@@ -1829,7 +2017,7 @@ video::SCZF6I-Rc4I,AsKGOeonbIs,HwrPhOp6-aM[youtube, 640, 360, start=60, options=
       output = render_embedded_string input
       assert_css 'video', output, 0
       assert_css 'iframe', output, 1
-      assert_css 'iframe[src="//www.youtube.com/embed/SCZF6I-Rc4I?rel=0&start=60&autoplay=1&playlist=AsKGOeonbIs,HwrPhOp6-aM"]', output, 1
+      assert_css 'iframe[src="https://www.youtube.com/embed/SCZF6I-Rc4I?rel=0&start=60&autoplay=1&playlist=AsKGOeonbIs,HwrPhOp6-aM"]', output, 1
       assert_css 'iframe[width="640"]', output, 1
       assert_css 'iframe[height="360"]', output, 1
     end
@@ -1961,7 +2149,7 @@ You can use icons for admonitions by setting the 'icons' attribute.
       EOS
 
       output = render_string input, :safe => Asciidoctor::SafeMode::SERVER
-      assert_css 'html > head > link[rel="stylesheet"][href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.min.css"]', output, 1
+      assert_css 'html > head > link[rel="stylesheet"][href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css"]', output, 1
       assert_xpath '//*[@class="admonitionblock tip"]//*[@class="icon"]/i[@class="fa icon-tip"]', output, 1
     end
 
@@ -1978,8 +2166,8 @@ puts "AsciiDoc, FTW!"
       EOS
 
       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.2.0/css/font-awesome.min.css"]', output, 1
-      assert_css 'html > head > script[src="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/highlight.min.js"]', output, 1
+      assert_css 'html > head > link[rel="stylesheet"][href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/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
     end
 
     test 'should use no uri scheme for assets when asset-uri-scheme is blank' do
@@ -1995,8 +2183,8 @@ puts "AsciiDoc, FTW!"
       EOS
 
       output = render_string input, :safe => Asciidoctor::SafeMode::SAFE
-      assert_css 'html > head > link[rel="stylesheet"][href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.min.css"]', output, 1
-      assert_css 'html > head > script[src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/highlight.min.js"]', output, 1
+      assert_css 'html > head > link[rel="stylesheet"][href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/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
     end
   end
 

data/test/converter_test.rb

@@ -26,13 +26,13 @@ context 'Converter' do
       assert_equal :xhtml, selected.templates['paragraph'].options[:format]
     end
 
-    test 'should set Slim format to html5 for html5 backend' do
+    test 'should set Slim format to html for html5 backend' do
       doc = Asciidoctor::Document.new [], :template_dir => File.join(File.dirname(__FILE__), 'fixtures', 'custom-backends', 'slim'), :template_cache => false
       assert doc.converter.is_a?(Asciidoctor::Converter::CompositeConverter)
       selected = doc.converter.find_converter('paragraph')
       assert selected.is_a? Asciidoctor::Converter::TemplateConverter
       assert selected.templates['paragraph'].is_a? Slim::Template
-      assert_equal :html5, selected.templates['paragraph'].options[:format]
+      assert_equal :html, selected.templates['paragraph'].options[:format]
     end
 
     test 'should set Slim format to nil for docbook backend' do
@@ -44,6 +44,19 @@ context 'Converter' do
       assert_nil selected.templates['paragraph'].options[:format]
     end
 
+    test 'should set safe mode of Slim AsciiDoc engine to match document safe mode when Slim >= 3' do
+      doc = Asciidoctor::Document.new [], :template_dir => File.join(File.dirname(__FILE__), 'fixtures', 'custom-backends', 'slim'), :template_cache => false, :safe => :unsafe
+      assert doc.converter.is_a?(Asciidoctor::Converter::CompositeConverter)
+      selected = doc.converter.find_converter('paragraph')
+      assert selected.is_a? Asciidoctor::Converter::TemplateConverter
+      slim_asciidoc_opts = selected.instance_variable_get(:@engine_options)[:slim][:asciidoc]
+      if ::Slim::VERSION >= '3.0'
+        assert_equal({ :safe => Asciidoctor::SafeMode::UNSAFE }, slim_asciidoc_opts)
+      else
+        assert_nil slim_asciidoc_opts
+      end
+    end
+
     test 'should support custom template engine options for known engine' do
       doc = Asciidoctor::Document.new [], :template_dir => File.join(File.dirname(__FILE__), 'fixtures', 'custom-backends', 'slim'), :template_cache => false, :template_engine_options => { :slim => { :pretty => true } }
       assert doc.converter.is_a?(Asciidoctor::Converter::CompositeConverter)

data/test/document_test.rb

@@ -138,7 +138,9 @@ context 'Document' do
       exception = assert_raises ArgumentError do
         Asciidoctor.load_file(sample_input_path, :safe => Asciidoctor::SafeMode::SAFE)
       end
-      assert_match(/Failed to parse source/, exception.message)
+      assert_match(/Failed to load AsciiDoc document/, exception.message)
+      # verify we have the correct backtrace (should be in at least first 5 lines)
+      assert_match((RUBY_ENGINE == 'rbx' ? /parser\.rb/ : /helpers\.rb/), exception.backtrace[0..4].join("\n"))
     end if RUBY_MIN_VERSION_1_9
 
     test 'should load input IO' do
@@ -317,7 +319,7 @@ preamble
       assert_equal 1, section_1.lineno
     end
 
-    test 'find_by should return Array of blocks that match criteria' do
+    test 'find_by should return Array of blocks anywhere in document tree that match criteria' do
       input = <<-EOS
 = Document Title
 
@@ -334,7 +336,7 @@ Exhibit A::
 image::tiger.png[Tiger]
 --
 
-image::cat.png[Cat]
+image::shoe.png[Shoe]
 
 == Section B
 
@@ -347,7 +349,124 @@ paragraph
       assert_equal :image, result[0].context
       assert_equal 'tiger.png', result[0].attr('target')
       assert_equal :image, result[1].context
-      assert_equal 'cat.png', result[1].attr('target')
+      assert_equal 'shoe.png', result[1].attr('target')
+    end
+
+    test 'find_by should return an empty Array if no matches are found' do
+      input = <<-EOS
+paragraph
+      EOS
+      doc = Asciidoctor.load input
+      result = doc.find_by :context => :section
+      refute_nil result
+      assert_equal 0, result.size
+    end
+
+    test 'find_by should return Array of blocks that match style criteria' do
+      input = <<-EOS
+[square]
+* one
+* two
+* three
+
+---
+
+* apples
+* bananas
+* pears
+      EOS
+
+      doc = Asciidoctor.load input
+      result = doc.find_by :context => :ulist, :style => 'square'
+      assert_equal 1, result.size
+      assert_equal :ulist, result[0].context
+    end
+
+    test 'find_by should return Array of blocks that match role criteria' do
+      input = <<-EOS
+[#tiger.animal]
+image::tiger.png[Tiger]
+
+image::shoe.png[Shoe]
+      EOS
+
+      doc = Asciidoctor.load input
+      result = doc.find_by :context => :image, :role => 'animal'
+      assert_equal 1, result.size
+      assert_equal :image, result[0].context
+      assert_equal 'tiger.png', result[0].attr('target')
+    end
+
+    test 'find_by should return the document title section if context selector is :section' do
+      input = <<-EOS
+= Document Title
+
+preamble
+
+== Section One
+
+content
+      EOS
+      doc = Asciidoctor.load input
+      result = doc.find_by :context => :section
+      refute_nil result
+      assert_equal 2, result.size
+      assert_equal :section, result[0].context
+      assert_equal 'Document Title', result[0].title
+    end
+
+    test 'find_by should only return results for which the block argument yields true' do
+      input = <<-EOS
+== Section
+
+content
+
+=== Subsection
+
+content
+      EOS
+      doc = Asciidoctor.load input
+      result = doc.find_by(:context => :section) {|sect| sect.level == 1 }
+      refute_nil result
+      assert_equal 1, result.size
+      assert_equal :section, result[0].context
+      assert_equal 'Section', result[0].title
+    end
+
+    test 'find_by should only return one result when matching by id' do
+      input = <<-EOS
+== Section
+
+content
+
+[#subsection]
+=== Subsection
+
+content
+      EOS
+      doc = Asciidoctor.load input
+      result = doc.find_by(:context => :section, :id => 'subsection')
+      refute_nil result
+      assert_equal 1, result.size
+      assert_equal :section, result[0].context
+      assert_equal 'Subsection', result[0].title
+    end
+
+    test 'find_by should return an empty Array if the id criteria matches but the block argument yields false' do
+      input = <<-EOS
+== Section
+
+content
+
+[#subsection]
+=== Subsection
+
+content
+      EOS
+      doc = Asciidoctor.load input
+      result = doc.find_by(:context => :section, :id => 'subsection') {|sect| false }
+      refute_nil result
+      assert_equal 0, result.size
     end
   end
 
@@ -634,23 +753,38 @@ text
     test 'should include docinfo files for html backend' do
       sample_input_path = fixture_path('basic.asciidoc')
 
-      output = Asciidoctor.convert_file sample_input_path, :to_file => false,
-          :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo' => ''}
-      assert !output.empty?
-      assert_css 'script[src="modernizr.js"]', output, 1
-      assert_css 'meta[http-equiv="imagetoolbar"]', output, 0
+      cases = {
+        'docinfo'                => { :head_script => 1, :meta => 0, :top_link => 0, :footer_script => 1 },
+        'docinfo=private'        => { :head_script => 1, :meta => 0, :top_link => 0, :footer_script => 1 },
+        'docinfo1'               => { :head_script => 0, :meta => 1, :top_link => 1, :footer_script => 0 },
+        'docinfo=shared'         => { :head_script => 0, :meta => 1, :top_link => 1, :footer_script => 0 },
+        'docinfo2'               => { :head_script => 1, :meta => 1, :top_link => 1, :footer_script => 1 },
+        'docinfo docinfo2'       => { :head_script => 1, :meta => 1, :top_link => 1, :footer_script => 1 },
+        'docinfo=private,shared' => { :head_script => 1, :meta => 1, :top_link => 1, :footer_script => 1 },
+        'docinfo=private-head'   => { :head_script => 1, :meta => 0, :top_link => 0, :footer_script => 0 },
+        'docinfo=shared-head'    => { :head_script => 0, :meta => 1, :top_link => 0, :footer_script => 0 },
+        'docinfo=private-footer' => { :head_script => 0, :meta => 0, :top_link => 0, :footer_script => 1 },
+        'docinfo=shared-footer'  => { :head_script => 0, :meta => 0, :top_link => 1, :footer_script => 0 },
+        'docinfo=private-head\ ,\ shared-footer' => { :head_script => 1, :meta => 0, :top_link => 1, :footer_script => 0 }
+      }
 
-      output = Asciidoctor.convert_file sample_input_path, :to_file => false,
-          :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo1' => ''}
-      assert !output.empty?
-      assert_css 'script[src="modernizr.js"]', output, 0
-      assert_css 'meta[http-equiv="imagetoolbar"]', output, 1
+      cases.each do |attr_val, markup|
+        output = Asciidoctor.convert_file sample_input_path, :to_file => false,
+            :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => %(linkcss copycss! #{attr_val})
+        assert !output.empty?
+        assert_css 'script[src="modernizr.js"]', output, markup[:head_script]
+        assert_css 'meta[http-equiv="imagetoolbar"]', output, markup[:meta]
+        assert_css 'body > a#top', output, markup[:top_link]
+        assert_css 'body > script', output, markup[:footer_script]
+      end
+    end
 
+    test 'should include docinfo footer even if nofooter attribute is set' do
+      sample_input_path = fixture_path('basic.asciidoc')
       output = Asciidoctor.convert_file sample_input_path, :to_file => false,
-          :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo2' => ''}
+          :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo1' => '', 'nofooter' => ''}
       assert !output.empty?
-      assert_css 'script[src="modernizr.js"]', output, 1
-      assert_css 'meta[http-equiv="imagetoolbar"]', output, 1
+      assert_css 'body > a#top', output, 1
     end
 
     test 'should include docinfo files for html backend with custom docinfodir' do
@@ -817,12 +951,25 @@ text
       assert_css 'productname', output, 0
       assert_css 'copyright', output, 0
     end
+
+    test 'should apply explicit substitutions to docinfo files' do
+      sample_input_path = fixture_path('subs.adoc')
+
+      output = Asciidoctor.convert_file sample_input_path, :to_file => false,
+                                        :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo' => '', 'docinfosubs' => 'attributes,replacements', 'linkcss' => ''}
+      assert !output.empty?
+      assert_css 'script[src="bootstrap.3.2.0.min.js"]', output, 1
+      assert_xpath %(//meta[@name="copyright"][@content="#{entity 169} OpenDevise"]), output, 1
+    end
   end
 
   context 'MathJax' do
     test 'should add MathJax script to HTML head if stem attribute is set' do
       output = render_string '', :attributes => {'stem' => ''}
       assert_match('<script type="text/x-mathjax-config">', output)
+      assert_match('inlineMath: [["\\\\(", "\\\\)"]]', output)
+      assert_match('displayMath: [["\\\\[", "\\\\]"]]', output)
+      assert_match('delimiters: [["\\\\$", "\\\\$"]]', output)
     end
   end
 
@@ -878,11 +1025,40 @@ text
       assert_nil doc.header
     end
 
+    test 'title partition API with default separator' do
+      title = Asciidoctor::Document::Title.new 'Main Title: And More: Subtitle'
+      assert_equal 'Main Title: And More', title.main
+      assert_equal 'Subtitle', title.subtitle
+    end
+
+    test 'title partition API with custom separator' do
+      title = Asciidoctor::Document::Title.new 'Main Title:: And More:: Subtitle', :separator => '::'
+      assert_equal 'Main Title:: And More', title.main
+      assert_equal 'Subtitle', title.subtitle
+    end
+
     test 'document with subtitle' do
       input = <<-EOS
 = Main Title: *Subtitle*
 Author Name
 
+content
+      EOS
+
+      doc = document_from_string input
+      title = doc.doctitle :partition => true, :sanitize => true
+      assert title.subtitle?
+      assert title.sanitized?
+      assert_equal 'Main Title', title.main
+      assert_equal 'Subtitle', title.subtitle
+    end
+
+    test 'document with subtitle and custom separator' do
+      input = <<-EOS
+[separator=::]
+= Main Title:: *Subtitle*
+Author Name
+
 content
       EOS
 
@@ -1003,7 +1179,7 @@ text
 
     test 'should sanitize contents of HTML title element' do
       input = <<-EOS
-= *Document* image:logo.png[] _Title_ image:another-logo.png[]
+= *Document* image:logo.png[] _Title_ image:another-logo.png[another logo]
 
 content
       EOS
@@ -1012,7 +1188,7 @@ content
       assert_xpath '/html/head/title[text()="Document Title"]', output, 1
       nodes = xmlnodes_at_xpath('//*[@id="header"]/h1', output, 1)
       assert_equal 1, nodes.size
-      assert_match(/<h1><strong>Document<\/strong> <span class="image"><img src="logo.png" alt="logo"><\/span> <em>Title<\/em> <span class="image"><img src="another-logo.png" alt="another-logo"><\/span><\/h1>/, output)
+      assert_match('<h1><strong>Document</strong> <span class="image"><img src="logo.png" alt="logo"></span> <em>Title</em> <span class="image"><img src="another-logo.png" alt="another logo"></span></h1>', output)
     end
      
     test 'should not choke on empty source' do
@@ -1231,6 +1407,17 @@ content
       assert_xpath '//*[@id="content"]', result, 1
     end
 
+    test 'does not render footer if nofooter is set' do
+      input = <<-EOS
+:nofooter:
+
+content
+      EOS
+
+      result = render_string input
+      assert_xpath '//*[@id="footer"]', result, 0
+    end
+
     test 'can disable last updated in footer' do
       doc = document_from_string "= Document Title\n\npreamble", :attributes => {'last-update-label!' => ''}
       result = doc.render
@@ -1327,6 +1514,11 @@ Text that has supporting information{empty}footnote:[An example footnote.].
 
       output = render_embedded_string input
       assert_css '#footnotes', output, 1
+      assert_css '#footnotes .footnote', output, 1
+      assert_css '#footnotes .footnote#_footnote_1', output, 1
+      assert_xpath '/div[@id="footnotes"]/div[@id="_footnote_1"]/a[@href="#_footnoteref_1"][text()="1"]', output, 1
+      text = xmlnodes_at_xpath '/div[@id="footnotes"]/div[@id="_footnote_1"]/text()', output, 1
+      assert_equal '. An example footnote.', text.text.strip
     end
 
     test 'does not render footnotes block in embedded document if nofootnotes attribute is set' do
@@ -1374,6 +1566,42 @@ content
       assert_equal 'xml', (doc.attr 'htmlsyntax')
     end
 
+    test 'honor htmlsyntax attribute passed via API if backend is html' do
+      input = <<-EOS
+---
+      EOS
+      doc = document_from_string input, :safe => :safe, :attributes => { 'htmlsyntax' => 'xml' }
+      assert_equal 'html5', doc.backend
+      assert_equal 'xml', (doc.attr 'htmlsyntax')
+      result = doc.convert :header_footer => false
+      assert_equal '<hr/>', result
+    end
+
+    test 'honor htmlsyntax attribute in document header if followed by backend attribute' do
+      input = <<-EOS
+:htmlsyntax: xml
+:backend: html5
+
+---
+      EOS
+      doc = document_from_string input, :safe => :safe
+      assert_equal 'html5', doc.backend
+      assert_equal 'xml', (doc.attr 'htmlsyntax')
+      result = doc.convert :header_footer => false
+      assert_equal '<hr/>', result
+    end
+
+    test 'does not honor htmlsyntax attribute in document header if not followed by backend attribute' do
+      input = <<-EOS
+:backend: html5
+:htmlsyntax: xml
+
+---
+      EOS
+      result = render_embedded_string input, :safe => :safe
+      assert_equal '<hr>', result
+    end
+
     test 'should close all short tags when htmlsyntax is xml' do
       input = <<-EOS
 = Document Title
@@ -1428,23 +1656,6 @@ two
       rescue => e
         flunk "xhtml5 backend did not generate well-formed XML: #{e.message}\n#{result}"
       end
-      #refute_match(/<meta [^>]+[^\/]>/, result)
-      #refute_match(/<link [^>]+[^\/]>/, result)
-      #refute_match(/<img [^>]+[^\/]>/, result)
-      #refute_match(/<input [^>]+[^\/]>/, result)
-      #assert_match(/<input [^>]+checked="checked"/, result)
-      #assert_match(/<input [^>]+disabled="disabled"/, result)
-      #refute_match(/<col [^>]+[^\/]>/, result)
-      #refute_match(/<[bh]r>/, result)
-      #assert_match(/video [^>]+loop="loop"/, result)
-      #assert_match(/video [^>]+autoplay="autoplay"/, result)
-      #assert_match(/video [^>]+controls="controls"/, result)
-      #assert_match(/audio [^>]+loop="loop"/, result)
-      #assert_match(/audio [^>]+autoplay="autoplay"/, result)
-      #assert_match(/audio [^>]+controls="controls"/, result)
-      #assert_match(/iframe [^>]+webkitallowfullscreen="webkitallowfullscreen"/i, result)
-      #assert_match(/iframe [^>]+mozallowfullscreen="mozallowfullscreen"/i, result)
-      #assert_match(/iframe [^>]+allowfullscreen="allowfullscreen"/i, result)
     end
 
     test 'xhtml backend should emit elements in proper namespace' do
@@ -1823,6 +2034,28 @@ asciidoctor - converts AsciiDoc source files to HTML, DocBook and other formats
       assert_xpath '//h2[text()="NAME"]/following-sibling::*[@class="sectionbody"]/p[text()="asciidoctor - converts AsciiDoc source files to HTML, DocBook and other formats"]', output, 1
       assert_xpath '//*[@id="content"]/*[@class="sect1"]/h2[text()="SYNOPSIS"]', output, 1
     end
+
+    test 'should output special header block in embeddable HTML for manpage doctype' do
+      input = <<-EOS
+= asciidoctor(1)
+:doctype: manpage
+:showtitle:
+
+== NAME
+
+asciidoctor - converts AsciiDoc source files to HTML, DocBook and other formats
+
+== SYNOPSIS
+
+*asciidoctor* ['OPTION']... 'FILE'..
+      EOS
+
+      output = render_string input, :header_footer => false
+      assert_xpath '/h1[text()="asciidoctor(1) Manual Page"]', output, 1
+      assert_xpath '/h1/following-sibling::h2[text()="NAME"]', output, 1
+      assert_xpath '/h2[text()="NAME"]/following-sibling::*[@class="sectionbody"]', output, 1
+      assert_xpath '/h2[text()="NAME"]/following-sibling::*[@class="sectionbody"]/p[text()="asciidoctor - converts AsciiDoc source files to HTML, DocBook and other formats"]', output, 1
+    end
   end
 
   context 'Secure Asset Path' do
@@ -1859,4 +2092,25 @@ text
       assert_match(/missing converter for backend 'unknownBackend'/, exception.message)
     end
   end
+
+  context 'Timing report' do
+    test 'print_report does not lose precision' do
+      timings = Asciidoctor::Timings.new
+      log = timings.instance_variable_get(:@log)
+      log[:read] = 0.00001
+      log[:parse] = 0.00003
+      log[:convert] = 0.00005
+      timings.print_report(sink = StringIO.new)
+      expect = ['0.00004', '0.00005', '0.00009']
+      result = sink.string.split("\n").map {|l| l.sub(/.*:\s*([\d.]+)/, '\1') }
+      assert_equal expect, result
+    end
+
+    test 'print_report should print 0 for untimed phases' do
+      Asciidoctor::Timings.new.print_report(sink = StringIO.new)
+      expect = [].fill('0.00000', 0..2)
+      result = sink.string.split("\n").map {|l| l.sub(/.*:\s*([\d.]+)/, '\1') }
+      assert_equal expect, result
+    end
+  end
 end