asciidoctor 0.1.2 → 0.1.3

data/test/substitutions_test.rb

@@ -9,7 +9,7 @@ context 'Substitutions' do
       para = block_from_string("[blue]'http://asciidoc.org[AsciiDoc]' & [red]*Ruby*\n&#167; Making +++<u>documentation</u>+++ together +\nsince (C) {inception_year}.")
       para.document.attributes['inception_year'] = '2012'
       result = para.apply_normal_subs(para.buffer) 
-      assert_equal %{<em><span class="blue"><a href="http://asciidoc.org">AsciiDoc</a></span></em> &amp; <strong><span class="red">Ruby</span></strong>\n&#167; Making <u>documentation</u> together<br>\nsince &#169; 2012.}, result
+      assert_equal %{<em class="blue"><a href="http://asciidoc.org">AsciiDoc</a></em> &amp; <strong class="red">Ruby</strong>\n&#167; Making <u>documentation</u> together<br>\nsince &#169; 2012.}, result
     end
   end
 
@@ -195,7 +195,7 @@ context 'Substitutions' do
 
     test 'unconstrained strong chars with role' do
       para = block_from_string(%q{Git[blue]**Hub**})
-      assert_equal %q{Git<strong><span class="blue">Hub</span></strong>}, para.sub_quotes(para.buffer.join)
+      assert_equal %q{Git<strong class="blue">Hub</strong>}, para.sub_quotes(para.buffer.join)
     end
 
     # TODO this is not the same result as AsciiDoc, though I don't understand why AsciiDoc gets what it gets
@@ -221,7 +221,7 @@ context 'Substitutions' do
 
     test 'unconstrained emphasis chars with role' do
       para = block_from_string(%q{[gray]__Git__Hub})
-      assert_equal %q{<em><span class="gray">Git</span></em>Hub}, para.sub_quotes(para.buffer.join)
+      assert_equal %q{<em class="gray">Git</em>Hub}, para.sub_quotes(para.buffer.join)
     end
 
     test 'escaped unconstrained emphasis chars with role' do
@@ -614,13 +614,129 @@ context 'Substitutions' do
       assert_equal ['Big cats', 'Tigers'], terms[0]
       assert_equal ['panthera tigris'], terms[1]
     end
+
+    context 'Button macro' do
+      test 'btn macro' do
+        para = block_from_string('btn:[Save]', :attributes => {'experimental' => ''})
+        assert_equal %q{<b class="button">Save</b>}, para.sub_macros(para.buffer.join)
+      end
+
+      test 'btn macro for docbook backend' do
+        para = block_from_string('btn:[Save]', :backend => 'docbook', :attributes => {'experimental' => ''})
+        assert_equal %q{<guibutton>Save</guibutton>}, para.sub_macros(para.buffer.join)
+      end
+    end
+
+    context 'Keyboard macro' do
+      test 'kbd macro with single key' do
+        para = block_from_string('kbd:[F3]', :attributes => {'experimental' => ''})
+        assert_equal %q{<kbd>F3</kbd>}, para.sub_macros(para.buffer.join)
+      end
+  
+      test 'kbd macro with single key, docbook backend' do
+        para = block_from_string('kbd:[F3]', :backend => 'docbook', :attributes => {'experimental' => ''})
+        assert_equal %q{<keycap>F3</keycap>}, para.sub_macros(para.buffer.join)
+      end
+  
+      test 'kbd macro with key combination' do
+        para = block_from_string('kbd:[Ctrl+Shift+T]', :attributes => {'experimental' => ''})
+        assert_equal %q{<kbd class="keyseq"><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>T</kbd></kbd>}, para.sub_macros(para.buffer.join)
+      end
+  
+      test 'kbd macro with key combination with spaces' do
+        para = block_from_string('kbd:[Ctrl + Shift + T]', :attributes => {'experimental' => ''})
+        assert_equal %q{<kbd class="keyseq"><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>T</kbd></kbd>}, para.sub_macros(para.buffer.join)
+      end
+  
+      test 'kbd macro with key combination delimited by commas' do
+        para = block_from_string('kbd:[Ctrl,Shift,T]', :attributes => {'experimental' => ''})
+        assert_equal %q{<kbd class="keyseq"><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>T</kbd></kbd>}, para.sub_macros(para.buffer.join)
+      end
+  
+      test 'kbd macro with key combination containing a plus key no spaces' do
+        para = block_from_string('kbd:[Ctrl++]', :attributes => {'experimental' => ''})
+        assert_equal %q{<kbd class="keyseq"><kbd>Ctrl</kbd>+<kbd>+</kbd></kbd>}, para.sub_macros(para.buffer.join)
+      end
+  
+      test 'kbd macro with key combination delimited by commands containing a comma key' do
+        para = block_from_string('kbd:[Ctrl,,]', :attributes => {'experimental' => ''})
+        assert_equal %q{<kbd class="keyseq"><kbd>Ctrl</kbd>+<kbd>,</kbd></kbd>}, para.sub_macros(para.buffer.join)
+      end
+  
+      test 'kbd macro with key combination containing a plus key with spaces' do
+        para = block_from_string('kbd:[Ctrl + +]', :attributes => {'experimental' => ''})
+        assert_equal %q{<kbd class="keyseq"><kbd>Ctrl</kbd>+<kbd>+</kbd></kbd>}, para.sub_macros(para.buffer.join)
+      end
+  
+      test 'kbd macro with key combination containing escaped bracket' do
+        para = block_from_string('kbd:[Ctrl + \]]', :attributes => {'experimental' => ''})
+        assert_equal %q{<kbd class="keyseq"><kbd>Ctrl</kbd>+<kbd>]</kbd></kbd>}, para.sub_macros(para.buffer.join)
+      end
+  
+      test 'kbd macro with key combination, docbook backend' do
+        para = block_from_string('kbd:[Ctrl+Shift+T]', :backend => 'docbook', :attributes => {'experimental' => ''})
+        assert_equal %q{<keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap><keycap>T</keycap></keycombo>}, para.sub_macros(para.buffer.join)
+      end
+    end
+
+    context 'Menu macro' do
+      test 'should process menu using macro sytnax' do
+        para = block_from_string('menu:File[]', :attributes => {'experimental' => ''})
+        assert_equal %q{<span class="menu">File</span>}, para.sub_macros(para.buffer.join)
+      end
+
+      test 'should process menu for docbook backend' do
+        para = block_from_string('menu:File[]', :backend => 'docbook', :attributes => {'experimental' => ''})
+        assert_equal %q{<guimenu>File</guimenu>}, para.sub_macros(para.buffer.join)
+      end
+
+      test 'should process menu with menu item using macro syntax' do
+        para = block_from_string('menu:File[Save As&#8230;]', :attributes => {'experimental' => ''})
+        assert_equal %q{<span class="menuseq"><span class="menu">File</span>&#160;&#9656; <span class="menuitem">Save As&#8230;</span></span>}, para.sub_macros(para.buffer.join)
+      end
+
+      test 'should process menu with menu item for docbook backend' do
+        para = block_from_string('menu:File[Save As&#8230;]', :backend => 'docbook', :attributes => {'experimental' => ''})
+        assert_equal %q{<menuchoice><guimenu>File</guimenu> <guimenuitem>Save As&#8230;</guimenuitem></menuchoice>}, para.sub_macros(para.buffer.join)
+      end
+
+      test 'should process menu with menu item in submenu using macro syntax' do
+        para = block_from_string('menu:Tools[Project &gt; Build]', :attributes => {'experimental' => ''})
+        assert_equal %q{<span class="menuseq"><span class="menu">Tools</span>&#160;&#9656; <span class="submenu">Project</span>&#160;&#9656; <span class="menuitem">Build</span></span>}, para.sub_macros(para.buffer.join)
+      end
+
+      test 'should process menu with menu item in submenu for docbook backend' do
+        para = block_from_string('menu:Tools[Project &gt; Build]', :backend => 'docbook', :attributes => {'experimental' => ''})
+        assert_equal %q{<menuchoice><guimenu>Tools</guimenu> <guisubmenu>Project</guisubmenu> <guimenuitem>Build</guimenuitem></menuchoice>}, para.sub_macros(para.buffer.join)
+      end
+
+      test 'should process menu with menu item in submenu using macro syntax and comma delimiter' do
+        para = block_from_string('menu:Tools[Project, Build]', :attributes => {'experimental' => ''})
+        assert_equal %q{<span class="menuseq"><span class="menu">Tools</span>&#160;&#9656; <span class="submenu">Project</span>&#160;&#9656; <span class="menuitem">Build</span></span>}, para.sub_macros(para.buffer.join)
+      end
+
+      test 'should process menu with menu item using inline syntax' do
+        para = block_from_string('"File &gt; Save As&#8230;"', :attributes => {'experimental' => ''})
+        assert_equal %q{<span class="menuseq"><span class="menu">File</span>&#160;&#9656; <span class="menuitem">Save As&#8230;</span></span>}, para.sub_macros(para.buffer.join)
+      end
+
+      test 'should process menu with menu item in submenu using inline syntax' do
+        para = block_from_string('"Tools &gt; Project &gt; Build"', :attributes => {'experimental' => ''})
+        assert_equal %q{<span class="menuseq"><span class="menu">Tools</span>&#160;&#9656; <span class="submenu">Project</span>&#160;&#9656; <span class="menuitem">Build</span></span>}, para.sub_macros(para.buffer.join)
+      end
+
+      test 'inline syntax should not closing quote of XML attribute' do
+        para = block_from_string('<span class="xmltag">&lt;node&gt;</span><span class="classname">r</span>', :attributes => {'experimental' => ''})
+        assert_equal %q{<span class="xmltag">&lt;node&gt;</span><span class="classname">r</span>}, para.sub_macros(para.buffer.join)
+      end
+    end
   end
 
   context 'Passthroughs' do
     test 'collect inline triple plus passthroughs' do
       para = block_from_string('+++<code>inline code</code>+++')
       result = para.extract_passthroughs(para.buffer.join)
-      assert_equal "\x0" + '0' + "\x0", result
+      assert_equal "\e" + '0' + "\e", result
       assert_equal 1, para.passthroughs.size
       assert_equal '<code>inline code</code>', para.passthroughs.first[:text]
       assert para.passthroughs.first[:subs].empty?
@@ -629,7 +745,7 @@ context 'Substitutions' do
     test 'collect multi-line inline triple plus passthroughs' do
       para = block_from_string("+++<code>inline\ncode</code>+++")
       result = para.extract_passthroughs(para.buffer.join)
-      assert_equal "\x0" + '0' + "\x0", result
+      assert_equal "\e" + '0' + "\e", result
       assert_equal 1, para.passthroughs.size
       assert_equal "<code>inline\ncode</code>", para.passthroughs.first[:text]
       assert para.passthroughs.first[:subs].empty?
@@ -638,7 +754,7 @@ context 'Substitutions' do
     test 'collect inline double dollar passthroughs' do
       para = block_from_string('$$<code>{code}</code>$$')
       result = para.extract_passthroughs(para.buffer.join)
-      assert_equal "\x0" + '0' + "\x0", result
+      assert_equal "\e" + '0' + "\e", result
       assert_equal 1, para.passthroughs.size
       assert_equal '<code>{code}</code>', para.passthroughs.first[:text]
       assert_equal [:specialcharacters], para.passthroughs.first[:subs]
@@ -647,7 +763,7 @@ context 'Substitutions' do
     test 'collect multi-line inline double dollar passthroughs' do
       para = block_from_string("$$<code>\n{code}\n</code>$$")
       result = para.extract_passthroughs(para.buffer.join)
-      assert_equal "\x0" + '0' + "\x0", result
+      assert_equal "\e" + '0' + "\e", result
       assert_equal 1, para.passthroughs.size
       assert_equal "<code>\n{code}\n</code>", para.passthroughs.first[:text]
       assert_equal [:specialcharacters], para.passthroughs.first[:subs]
@@ -656,7 +772,7 @@ context 'Substitutions' do
     test 'collect passthroughs from inline pass macro' do
       para = block_from_string(%Q{pass:specialcharacters,quotes[<code>['code'\\]</code>]})
       result = para.extract_passthroughs(para.buffer.join)
-      assert_equal "\x0" + '0' + "\x0", result
+      assert_equal "\e" + '0' + "\e", result
       assert_equal 1, para.passthroughs.size
       assert_equal %q{<code>['code']</code>}, para.passthroughs.first[:text]
       assert_equal [:specialcharacters, :quotes], para.passthroughs.first[:subs]
@@ -665,7 +781,7 @@ context 'Substitutions' do
     test 'collect multi-line passthroughs from inline pass macro' do
       para = block_from_string(%Q{pass:specialcharacters,quotes[<code>['more\ncode'\\]</code>]})
       result = para.extract_passthroughs(para.buffer.join)
-      assert_equal "\x0" + '0' + "\x0", result
+      assert_equal "\e" + '0' + "\e", result
       assert_equal 1, para.passthroughs.size
       assert_equal %Q{<code>['more\ncode']</code>}, para.passthroughs.first[:text]
       assert_equal [:specialcharacters, :quotes], para.passthroughs.first[:subs]
@@ -673,7 +789,7 @@ context 'Substitutions' do
 
     # NOTE placeholder is surrounded by text to prevent reader from stripping trailing boundary char (unique to test scenario)
     test 'restore inline passthroughs without subs' do
-      para = block_from_string("some \x0" + '0' + "\x0 to study")
+      para = block_from_string("some \e" + '0' + "\e to study")
       para.passthroughs << {:text => '<code>inline code</code>', :subs => []}
       result = para.restore_passthroughs(para.buffer.join)
       assert_equal "some <code>inline code</code> to study", result
@@ -681,7 +797,7 @@ context 'Substitutions' do
 
     # NOTE placeholder is surrounded by text to prevent reader from stripping trailing boundary char (unique to test scenario)
     test 'restore inline passthroughs with subs' do
-      para = block_from_string("some \x0" + '0' + "\x0 to study in the \x0" + '1' + "\x0 programming language")
+      para = block_from_string("some \e" + '0' + "\e to study in the \e" + '1' + "\e programming language")
       para.passthroughs << {:text => '<code>{code}</code>', :subs => [:specialcharacters]}
       para.passthroughs << {:text => '{language}', :subs => [:specialcharacters]}
       result = para.restore_passthroughs(para.buffer.join)

data/test/tables_test.rb

@@ -21,8 +21,8 @@ context 'Tables' do
       assert_css 'table td', output, 9
       assert_css 'table > tbody > tr > td.tableblock.halign-left.valign-top > p.tableblock', output, 9
       cells.each_with_index {|row, rowi|
-        assert_css "table tr:nth-child(#{rowi + 1}) > td", output, row.size
-        assert_css "table tr:nth-child(#{rowi + 1}) > td > p", output, row.size
+        assert_css "table > tbody > tr:nth-child(#{rowi + 1}) > td", output, row.size
+        assert_css "table > tbody > tr:nth-child(#{rowi + 1}) > td > p", output, row.size
         row.each_with_index {|cell, celli|
           assert_xpath "(//tr)[#{rowi + 1}]/td[#{celli + 1}]/p[text()='#{cell}']", output, 1
         }
@@ -312,21 +312,21 @@ d|9 2+>|10
       assert_css 'table > tbody > tr:nth-child(3) > td', output, 1
       assert_css 'table > tbody > tr:nth-child(4) > td', output, 2
       
-      assert_css 'table tr:nth-child(1) > td:nth-child(1).halign-left.valign-top p em', output, 1
-      assert_css 'table tr:nth-child(1) > td:nth-child(2).halign-right.valign-top p strong', output, 1
-      assert_css 'table tr:nth-child(1) > td:nth-child(3).halign-center.valign-top p', output, 1
-      assert_css 'table tr:nth-child(1) > td:nth-child(3).halign-center.valign-top p *', output, 0
-      assert_css 'table tr:nth-child(1) > td:nth-child(4).halign-right.valign-top p strong', output, 1
+      assert_css 'table > tbody > tr:nth-child(1) > td:nth-child(1).halign-left.valign-top p em', output, 1
+      assert_css 'table > tbody > tr:nth-child(1) > td:nth-child(2).halign-right.valign-top p strong', output, 1
+      assert_css 'table > tbody > tr:nth-child(1) > td:nth-child(3).halign-center.valign-top p', output, 1
+      assert_css 'table > tbody > tr:nth-child(1) > td:nth-child(3).halign-center.valign-top p *', output, 0
+      assert_css 'table > tbody > tr:nth-child(1) > td:nth-child(4).halign-right.valign-top p strong', output, 1
 
-      assert_css 'table tr:nth-child(2) > td:nth-child(1).halign-center.valign-top p em', output, 1
-      assert_css 'table tr:nth-child(2) > td:nth-child(2).halign-center.valign-middle[colspan="2"][rowspan="2"] p code', output, 1
-      assert_css 'table tr:nth-child(2) > td:nth-child(3).halign-left.valign-bottom[rowspan="3"] p code', output, 1
+      assert_css 'table > tbody > tr:nth-child(2) > td:nth-child(1).halign-center.valign-top p em', output, 1
+      assert_css 'table > tbody > tr:nth-child(2) > td:nth-child(2).halign-center.valign-middle[colspan="2"][rowspan="2"] p code', output, 1
+      assert_css 'table > tbody > tr:nth-child(2) > td:nth-child(3).halign-left.valign-bottom[rowspan="3"] p code', output, 1
 
-      assert_css 'table tr:nth-child(3) > td:nth-child(1).halign-center.valign-top p em', output, 1
+      assert_css 'table > tbody > tr:nth-child(3) > td:nth-child(1).halign-center.valign-top p em', output, 1
 
-      assert_css 'table tr:nth-child(4) > td:nth-child(1).halign-left.valign-top p', output, 1
-      assert_css 'table tr:nth-child(4) > td:nth-child(1).halign-left.valign-top p em', output, 0
-      assert_css 'table tr:nth-child(4) > td:nth-child(2).halign-right.valign-top[colspan="2"] p code', output, 1
+      assert_css 'table > tbody > tr:nth-child(4) > td:nth-child(1).halign-left.valign-top p', output, 1
+      assert_css 'table > tbody > tr:nth-child(4) > td:nth-child(1).halign-left.valign-top p em', output, 0
+      assert_css 'table > tbody > tr:nth-child(4) > td:nth-child(2).halign-right.valign-top[colspan="2"] p code', output, 1
     end
 
     test 'supports repeating cells' do
@@ -474,6 +474,43 @@ output file name is used.
       assert_css 'table > tbody > tr > td:nth-child(2) table', output, 1
       assert_css 'table > tbody > tr > td:nth-child(2) table > tbody > tr > td', output, 2
     end
+
+    test 'nested document in AsciiDoc cell should not see doctitle of parent' do
+      input = <<-EOS
+= Document Title
+
+[cols="1a"]
+|===
+|AsciiDoc content
+|===
+      EOS
+
+      output = render_string input
+      assert_css 'table', output, 1
+      assert_css 'table > tbody > tr > td', output, 1
+      assert_css 'table > tbody > tr > td #preamble', output, 0
+      assert_css 'table > tbody > tr > td .paragraph', output, 1
+    end
+
+    test 'cell background color' do
+      input = <<-EOS
+[cols="1e,1", options="header"]
+|===
+|{set:cellbgcolor:green}green
+|{set:cellbgcolor!}
+plain
+|{set:cellbgcolor:red}red
+|{set:cellbgcolor!}
+plain
+|===
+      EOS
+
+      output = render_embedded_string input
+      assert_xpath '(/table/thead/tr/th)[1][@style="background-color:green;"]', output, 1
+      assert_xpath '(/table/thead/tr/th)[2][@style="background-color:green;"]', output, 0
+      assert_xpath '(/table/tbody/tr/td)[1][@style="background-color:red;"]', output, 1
+      assert_xpath '(/table/tbody/tr/td)[2][@style="background-color:green;"]', output, 0
+    end
   end
 
   context 'DSV' do
@@ -497,6 +534,21 @@ nobody:x:99:99:Nobody:/:/sbin/nologin
       assert_xpath '//tr[4]/td[5]/p/text()', output, 0
       assert_xpath '//tr[3]/td[5]/p[text()="MySQL:Server"]', output, 1
     end
+
+    test 'dsv format shorthand' do
+      input = <<-EOS
+:===
+a:b:c
+1:2:3
+:===
+      EOS
+      output = render_embedded_string input
+      assert_css 'table', output, 1
+      assert_css 'table > colgroup > col', output, 3
+      assert_css 'table > tbody > tr', output, 2
+      assert_css 'table > tbody > tr:nth-child(1) > td', output, 3
+      assert_css 'table > tbody > tr:nth-child(2) > td', output, 3
+    end
   end
 
   context 'CSV' do
@@ -523,6 +575,21 @@ air, moon roof, loaded",4799.00
       assert_xpath '((//tbody/tr)[4]/td)[4]/p[text()="MUST SELL! air, moon roof, loaded"]', output, 1
     end
 
+    test 'csv format shorthand' do
+      input = <<-EOS
+,===
+a,b,c
+1,2,3
+,===
+      EOS
+      output = render_embedded_string input
+      assert_css 'table', output, 1
+      assert_css 'table > colgroup > col', output, 3
+      assert_css 'table > tbody > tr', output, 2
+      assert_css 'table > tbody > tr:nth-child(1) > td', output, 3
+      assert_css 'table > tbody > tr:nth-child(2) > td', output, 3
+    end
+
     test 'custom separator' do
       input = <<-EOS
 [format="csv", separator=";"]

data/test/test_helper.rb

@@ -4,12 +4,6 @@ require 'test/unit'
 
 require "#{File.expand_path(File.dirname(__FILE__))}/../lib/asciidoctor.rb"
 
-begin
-  require 'mocha/setup'
-rescue LoadError
-  require 'mocha'
-end
-require 'htmlentities'
 require 'nokogiri'
 require 'pending'
 
@@ -82,6 +76,11 @@ class Test::Unit::TestCase
     count == 1 ? results.first : results
   end
 
+  # Generate an xpath attribute matcher that matches a name in the class attribute
+  def contains_class(name)
+    %(contains(concat(' ', normalize-space(@class), ' '), ' #{name} '))
+  end
+
   def assert_css(css, content, count = nil)
     assert_path(:css, css, content, count)
   end
@@ -100,7 +99,13 @@ class Test::Unit::TestCase
 
     results = xmlnodes_at_path type, path, content
 
-    if (count && results.length != count)
+    if (count == true || count == false)
+      if (count != results)
+        flunk "#{type_name} #{path} yielded #{results} rather than #{count} for:\n#{content}"
+      else
+        assert true
+      end
+    elsif (count && results.length != count)
       flunk "#{type_name} #{path} yielded #{results.length} elements rather than #{count} for:\n#{content}"
     elsif (count.nil? && results.empty?)
       flunk "#{type_name} #{path} not found in:\n#{content}"
@@ -145,6 +150,12 @@ class Test::Unit::TestCase
     [Asciidoctor::Lexer.parse_header_metadata(reader), reader]
   end
 
+  # Expand the character for an entity such as — so
+  # it can be used to match in an XPath expression
+  def expand_entity(number)
+    [number].pack('U*')
+  end
+
   def invoke_cli_to_buffer(argv = [], filename = 'sample.asciidoc', &block)
     invoke_cli(argv, filename, [StringIO.new, StringIO.new], &block)
   end

data/test/text_test.rb

@@ -1,27 +1,28 @@
+# encoding: UTF-8
 require 'test_helper'
 
 context "Text" do
   test "proper encoding to handle utf8 characters in document using html backend" do
     output = example_document(:encoding).render
-    assert_xpath '//p', output, 2
+    assert_xpath '//p', output, 4
     assert_xpath '//a', output, 1
   end
 
   test "proper encoding to handle utf8 characters in embedded document using html backend" do
     output = example_document(:encoding, :header_footer => false).render
-    assert_xpath '//p', output, 2
+    assert_xpath '//p', output, 4
     assert_xpath '//a', output, 1
   end
 
   test "proper encoding to handle utf8 characters in document using docbook backend" do
     output = example_document(:encoding, :attributes => {'backend' => 'docbook'}).render
-    assert_xpath '//simpara', output, 2
+    assert_xpath '//simpara', output, 4
     assert_xpath '//ulink', output, 1
   end
 
   test "proper encoding to handle utf8 characters in embedded document using docbook backend" do
     output = example_document(:encoding, :header_footer => false, :attributes => {'backend' => 'docbook'}).render
-    assert_xpath '//simpara', output, 2
+    assert_xpath '//simpara', output, 4
     assert_xpath '//ulink', output, 1
   end
 
@@ -31,11 +32,22 @@ context "Text" do
     input << "[verse]\n"
     input.concat(File.readlines(sample_doc_path(:encoding)))
     doc = Asciidoctor::Document.new
-    reader = Asciidoctor::Reader.new input
+    reader = Asciidoctor::Reader.new(input, doc, true)
     block = Asciidoctor::Lexer.next_block(reader, doc)
     assert_xpath '//pre', block.render.gsub(/^\s*\n/, ''), 1
   end
 
+  test "proper encoding to handle utf8 characters from included file" do
+    input = <<-EOS
+include::fixtures/encoding.asciidoc[tags=romé]
+    EOS
+    doc = Asciidoctor::Document.new [], :safe => Asciidoctor::SafeMode::SAFE, :base_dir => File.expand_path(File.dirname(__FILE__))
+    reader = Asciidoctor::Reader.new(input, doc, true)
+    block = Asciidoctor::Lexer.next_block(reader, doc)
+    output = block.render
+    assert_css '.paragraph', output, 1
+  end
+
   test 'escaped text markup' do
     assert_match(/All your &lt;em&gt;inline&lt;\/em&gt; markup belongs to &lt;strong&gt;us&lt;\/strong&gt;!/,
         render_string('All your <em>inline</em> markup belongs to <strong>us</strong>!'))