asciidoctor 1.5.3 → 1.5.4

data/test/sections_test.rb

@@ -264,9 +264,71 @@ preamble
     test "document title with symmetric syntax" do
       assert_xpath "//h1[not(@id)][text() = 'My Title']", render_string("= My Title =")
     end
+
+    test 'should assign id on document title to body' do
+      input = <<-EOS
+[[idname]]
+= Document Title
+
+content
+      EOS
+      output = render_string input
+      assert_css 'body#idname', output, 1
+    end
+
+    test 'should assign id defined using shorthand syntax on document title to body' do
+      input = <<-EOS
+[#idname]
+= Document Title
+
+content
+      EOS
+      output = render_string input
+      assert_css 'body#idname', output, 1
+    end
+
+    test 'should use inline id instead of id defined in block attributes' do
+      input = <<-EOS
+[#idname-block]
+= Document Title [[idname-inline]]
+
+content
+      EOS
+      output = render_string input
+      assert_css 'body#idname-inline', output, 1
+    end
+
+    test 'block id above document title sets id on document' do
+      input = <<-EOS
+[[reference]]
+= Reference Manual
+:css-signature: refguide
+
+preamble
+      EOS
+      doc = document_from_string input
+      assert_equal 'reference', doc.id
+      assert_equal 'refguide', doc.attr('css-signature')
+      output = doc.render
+      assert_css 'body#reference', output, 1
+    end
+
+    test 'should discard style, role and options shorthand attributes defined on document title' do
+      input = <<-EOS
+[style#idname.rolename%optionname]
+= Document Title
+
+content
+      EOS
+      doc = document_from_string input
+      assert doc.blocks[0].attributes.empty?
+      output = doc.convert
+      assert_css 'body#idname', output, 1
+      assert_css '.rolename', output, 0
+    end
   end
 
-  context "level 1" do 
+  context "level 1" do
     test "with multiline syntax" do
       assert_xpath "//h2[@id='_my_section'][text() = 'My Section']", render_string("My Section\n-----------")
     end
@@ -292,7 +354,7 @@ preamble
     test "with XML entity" do
       assert_xpath "//h2[@id='_where_s_the_love'][text() = \"Where#{[8217].pack('U*')}s the love?\"]", render_string("== Where's the love?")
     end
-    
+
     test "with non-word character" do
       assert_xpath "//h2[@id='_where_s_the_love'][text() = \"Where’s the love?\"]", render_string("== Where’s the love?")
     end
@@ -351,7 +413,7 @@ content
     end if ::RUBY_MIN_VERSION_1_9
   end
 
-  context "level 2" do 
+  context "level 2" do
     test "with multiline syntax" do
       assert_xpath "//h3[@id='_my_section'][text() = 'My Section']", render_string(":fragment:\nMy Section\n~~~~~~~~~~~")
     end
@@ -359,9 +421,9 @@ content
     test "with single line syntax" do
       assert_xpath "//h3[@id='_my_title'][text() = 'My Title']", render_string(":fragment:\n=== My Title")
     end
-  end  
+  end
 
-  context "level 3" do 
+  context "level 3" do
     test "with multiline syntax" do
       assert_xpath "//h4[@id='_my_section'][text() = 'My Section']", render_string(":fragment:\nMy Section\n^^^^^^^^^^")
     end
@@ -371,7 +433,7 @@ content
     end
   end
 
-  context "level 4" do 
+  context "level 4" do
     test "with multiline syntax" do
       assert_xpath "//h5[@id='_my_section'][text() = 'My Section']", render_string(":fragment:\nMy Section\n++++++++++")
     end
@@ -381,7 +443,7 @@ content
     end
   end
 
-  context "level 5" do 
+  context "level 5" do
     test "with single line syntax" do
       assert_xpath "//h6[@id='_my_title'][text() = 'My Title']", render_string(":fragment:\n====== My Title")
     end
@@ -636,14 +698,14 @@ text in standalone
 // end simulated include::[]
       EOS
 
-      output, errors = nil
+      output = warnings = nil
       redirect_streams do |out, err|
         output = render_string input
-        errors = err.string
+        warnings = err.string
       end
 
-      assert !errors.empty?
-      assert_match(/only book doctypes can contain level 0 sections/, errors)
+      assert !warnings.empty?
+      assert_match(/only book doctypes can contain level 0 sections/, warnings)
     end
 
     test 'should add level offset to section level' do
@@ -673,16 +735,15 @@ Standalone section text.
 Master section text.
       EOS
 
-      output = nil
-      errors = nil
+      output = warnings = nil
       redirect_streams do |out, err|
         output = render_string input
-        errors = out.string
+        warnings = err.string
       end
 
-      assert errors.empty?
-      assert_match(/Master document written by Doc Writer/, output) 
-      assert_match(/Standalone document written by Junior Writer/, output) 
+      assert warnings.empty?
+      assert_match(/Master document written by Doc Writer/, output)
+      assert_match(/Standalone document written by Junior Writer/, output)
       assert_xpath '//*[@class="sect1"]/h2[text() = "Standalone Document"]', output, 1
       assert_xpath '//*[@class="sect2"]/h3[text() = "Section in Standalone"]', output, 1
       assert_xpath '//*[@class="sect1"]/h2[text() = "Section in Master"]', output, 1
@@ -798,7 +859,7 @@ content
 = Title
 :sectnums:
 
-== Section_1 
+== Section_1
 
 text
 
@@ -822,7 +883,7 @@ text
 
 text
       EOS
-    
+
       output = render_string input
       assert_xpath '//h2[@id="_section_1"][starts-with(text(), "1. ")]', output, 1
       assert_xpath '//h3[@id="_section_1_1"][starts-with(text(), "1.1. ")]', output, 1
@@ -837,7 +898,7 @@ text
 = Title
 :numbered:
 
-== Section_1 
+== Section_1
 
 text
 
@@ -861,7 +922,7 @@ text
 
 text
       EOS
-    
+
       output = render_string input
       assert_xpath '//h2[@id="_section_1"][starts-with(text(), "1. ")]', output, 1
       assert_xpath '//h3[@id="_section_1_1"][starts-with(text(), "1.1. ")]', output, 1
@@ -1647,6 +1708,34 @@ Abstract content
       assert_xpath '/abstract[@id="abstract_title"]', output, 1
       assert_xpath '/abstract[@id="abstract_title"]/title[text()="Abstract Title"]', output, 1
     end
+
+    test 'should allow a special section to be nested at arbitrary depth in DocBook output' do
+      input = <<-EOS
+= Document Title
+:doctype: book
+
+== Glossaries
+
+[glossary]
+=== Glossary A
+
+Glossaries are optional.
+Glossaries entries are an example of a style of AsciiDoc labeled lists.
+
+[glossary]
+A glossary term::
+The corresponding definition.
+
+A second glossary term::
+The corresponding definition.
+      EOS
+
+      output = render_string input, :backend => :docbook
+      assert_xpath '//glossary', output, 1
+      assert_xpath '//chapter/glossary', output, 1
+      assert_xpath '//glossary/title[text()="Glossary A"]', output, 1
+      assert_xpath '//glossary/glossentry', output, 2
+    end
   end
 
   context "heading patterns in blocks" do
@@ -2312,6 +2401,25 @@ That's all she wrote!
       assert_xpath '//*[@id="header"]//*[@id="toc"]/ul/li/ul/li/a[@href="#_interlude"][text()="Interlude"]', output, 1
       assert_xpath '((//*[@id="header"]//*[@id="toc"]/ul)[1]/li)[3]/a[@href="#_section_three"][text()="Section Three"]', output, 1
     end
+
+    test 'should not display a table of contents if document has no sections' do
+      input_src = <<-EOS
+= Document Title
+:toc:
+
+toc::[]
+
+This document has no sections.
+
+It only has content.
+      EOS
+
+      ['', 'left', 'preamble', 'macro'].each do |placement|
+        input = input_src.gsub(':toc:', "\\& #{placement}")
+        output = render_string input
+        assert_css '#toctitle', output, 0
+      end
+    end
   end
 
   context 'article doctype' do
@@ -2474,8 +2582,7 @@ more part intro
 intro
       EOS
 
-      doc = nil
-      warnings = nil
+      doc = warnings = nil
       redirect_streams do |out, err|
         doc = document_from_string input
         warnings = err.string
@@ -2550,6 +2657,10 @@ Preface subsection content
 [partintro]
 Part intro content
 
+== Chapter 1
+
+content
+
 [appendix]
 = Appendix
 
@@ -2560,13 +2671,12 @@ Appendix content
 Appendix subsection content
       EOS
 
-      output = nil
-      errors = nil
+      output = warnings = nil
       redirect_streams do |out, err|
         output = render_string input, :backend => 'docbook'
-        errors = out.string
+        warnings = err.string
       end
-      assert errors.empty?
+      assert warnings.empty?
       assert_xpath '/book/preface', output, 1
       assert_xpath '/book/preface/section', output, 1
       assert_xpath '/book/part', output, 1

data/test/substitutions_test.rb

@@ -12,7 +12,7 @@ context 'Substitutions' do
     test 'apply normal 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.lines) 
+      result = para.apply_normal_subs(para.lines)
       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
@@ -1108,47 +1108,47 @@ EOS
         para = block_from_string('kbd:[F3]', :attributes => {'experimental' => ''})
         assert_equal %q{<kbd>F3</kbd>}, para.sub_macros(para.source)
       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.source)
       end
-  
+
       test 'kbd macro with key combination' do
         para = block_from_string('kbd:[Ctrl+Shift+T]', :attributes => {'experimental' => ''})
         assert_equal %q{<span class="keyseq"><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>T</kbd></span>}, para.sub_macros(para.source)
       end
-  
+
       test 'kbd macro with key combination with spaces' do
         para = block_from_string('kbd:[Ctrl + Shift + T]', :attributes => {'experimental' => ''})
         assert_equal %q{<span class="keyseq"><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>T</kbd></span>}, para.sub_macros(para.source)
       end
-  
+
       test 'kbd macro with key combination delimited by commas' do
         para = block_from_string('kbd:[Ctrl,Shift,T]', :attributes => {'experimental' => ''})
         assert_equal %q{<span class="keyseq"><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>T</kbd></span>}, para.sub_macros(para.source)
       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{<span class="keyseq"><kbd>Ctrl</kbd>+<kbd>+</kbd></span>}, para.sub_macros(para.source)
       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{<span class="keyseq"><kbd>Ctrl</kbd>+<kbd>,</kbd></span>}, para.sub_macros(para.source)
       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{<span class="keyseq"><kbd>Ctrl</kbd>+<kbd>+</kbd></span>}, para.sub_macros(para.source)
       end
-  
+
       test 'kbd macro with key combination containing escaped bracket' do
         para = block_from_string('kbd:[Ctrl + \]]', :attributes => {'experimental' => ''})
         assert_equal %q{<span class="keyseq"><kbd>Ctrl</kbd>+<kbd>]</kbd></span>}, para.sub_macros(para.source)
       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.source)
@@ -1329,7 +1329,7 @@ EOS
 
     test 'complex inline passthrough macro' do
       text_to_escape = %q{[(] <'basic form'> <'logical operator'> <'basic form'> [)]}
-      para = block_from_string %($$#{text_to_escape}$$) 
+      para = block_from_string %($$#{text_to_escape}$$)
       result = para.extract_passthroughs(para.source)
       assert_equal 1, para.passthroughs.size
       assert_equal text_to_escape, para.passthroughs[0][:text]
@@ -1365,10 +1365,18 @@ EOS
         assert_equal '\$a &lt; b\$', para.content
       end
 
-      test 'should not perform specialcharacters subs on asciimath macro content in docbook backend by default' do
+      # NOTE this test doesn't work once AsciiMath has been loaded
+      #test 'should not perform specialcharacters subs on asciimath macro content in docbook backend by default' do
+      #  input = 'asciimath:[a < b]'
+      #  para = block_from_string input, :backend => :docbook
+      #  para.document.converter.instance_variable_set :@asciimath_available, false
+      #  assert_equal '<inlineequation><mathphrase><![CDATA[a < b]]></mathphrase></inlineequation>', para.content
+      #end
+
+      test 'should convert asciimath macro content to MathML when asciimath gem is available' do
         input = 'asciimath:[a < b]'
         para = block_from_string input, :backend => :docbook
-        assert_equal 'a < b', para.content
+        assert_equal '<inlineequation><mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mi>a</mml:mi><mml:mo>&#x003C;</mml:mo><mml:mi>b</mml:mi></mml:math></inlineequation>', para.content
       end
 
       test 'should honor explicit subslist on asciimath macro' do
@@ -1398,7 +1406,7 @@ EOS
       test 'should not perform specialcharacters subs on latexmath macro content in docbook backend by default' do
         input = 'latexmath:[a < b]'
         para = block_from_string input, :backend => :docbook
-        assert para.content.include?('<alt><![CDATA[a < b]]></alt>')
+        assert_equal '<inlineequation><alt><![CDATA[a < b]]></alt><mathphrase><![CDATA[a < b]]></mathphrase></inlineequation>', para.content
       end
 
       test 'should honor explicit subslist on latexmath macro' do
@@ -1465,7 +1473,7 @@ EOS
     end
 
     test 'replaces dashes' do
-      para = block_from_string %(-- foo foo--bar foo\\--bar foo -- bar foo \\-- bar 
+      para = block_from_string %(-- foo foo--bar foo\\--bar foo -- bar foo \\-- bar
 stuff in between
 -- foo
 stuff in between
@@ -1487,7 +1495,7 @@ foo&#8201;&#8212;&#8201;'
     end if ::RUBY_MIN_VERSION_1_9
 
     test 'replaces marks' do
-      para = block_from_string '(C) (R) (TM) \(C) \(R) \(TM)' 
+      para = block_from_string '(C) (R) (TM) \(C) \(R) \(TM)'
       assert_equal '&#169; &#174; &#8482; (C) (R) (TM)', para.sub_replacements(para.source)
     end
 

data/test/tables_test.rb

@@ -16,10 +16,14 @@ context 'Tables' do
 |=======
       EOS
       cells = [%w(A B C), %w(a b c), %w(1 2 3)]
-      output = render_embedded_string input
+      doc = document_from_string input, :header_footer => false
+      table = doc.blocks[0]
+      assert 100, table.columns.map {|col| col.attributes['colpcwidth'] }.reduce(:+)
+      output = doc.convert
       assert_css 'table', output, 1
       assert_css 'table.tableblock.frame-all.grid-all.spread', output, 1
-      assert_css 'table > colgroup > col[style*="width: 33%"]', output, 3
+      assert_css 'table > colgroup > col[style*="width: 33.3333%"]', output, 2
+      assert_css 'table > colgroup > col:last-of-type[style*="width: 33.3334%"]', output, 1
       assert_css 'table tr', output, 3
       assert_css 'table > tbody > tr', output, 3
       assert_css 'table td', output, 9
@@ -257,6 +261,35 @@ A | here| a | there
       assert_css 'table > tbody > tr', output, 3
     end
 
+    test 'cols attribute may include spaces' do
+      input = <<-EOS
+[cols=" 1, 1 "]
+|===
+|one |two |1 |2 |a |b
+|===
+      EOS
+      output = render_embedded_string input
+      assert_css 'table', output, 1
+      assert_css 'table > colgroup > col', output, 2
+      assert_css 'col[style="width: 50%;"]', output, 2
+      assert_css 'table > tbody > tr', output, 3
+    end
+
+    test 'blank cols attribute should be ignored' do
+      input = <<-EOS
+[cols=" "]
+|===
+|one |two
+|1 |2 |a |b
+|===
+      EOS
+      output = render_embedded_string input
+      assert_css 'table', output, 1
+      assert_css 'table > colgroup > col', output, 2
+      assert_css 'col[style="width: 50%;"]', output, 2
+      assert_css 'table > tbody > tr', output, 3
+    end
+
     test 'empty cols attribute should be ignored' do
       input = <<-EOS
 [cols=""]
@@ -277,10 +310,10 @@ A | here| a | there
 [frame="topbot",options="header,footer"]
 |===
 |Item       |Quantity
-|Item 1     |1        
-|Item 2     |2        
-|Item 3     |3        
-|Total      |6        
+|Item 1     |1
+|Item 2     |2
+|Item 3     |3
+|Total      |6
 |===
       EOS
       output = render_embedded_string input
@@ -302,10 +335,10 @@ A | here| a | there
 [frame="topbot",options="header,footer"]
 |===
 |Item       |Quantity
-|Item 1     |1        
-|Item 2     |2        
-|Item 3     |3        
-|Total      |6        
+|Item 1     |1
+|Item 2     |2
+|Item 3     |3
+|Total      |6
 |===
       EOS
       output = render_embedded_string input, :backend => 'docbook'
@@ -489,10 +522,10 @@ I am getting in shape!
       assert_css 'table[style*="width: 80%"]', output, 1
       assert_xpath '/table/caption[@class="title"][text()="Table 1. Horizontal and vertical source data"]', output, 1
       assert_css 'table > colgroup > col', output, 4
-      assert_css 'table > colgroup > col:nth-child(1)[@style*="width: 17%"]', output, 1
-      assert_css 'table > colgroup > col:nth-child(2)[@style*="width: 11%"]', output, 1
-      assert_css 'table > colgroup > col:nth-child(3)[@style*="width: 11%"]', output, 1
-      assert_css 'table > colgroup > col:nth-child(4)[@style*="width: 58%"]', output, 1
+      assert_css 'table > colgroup > col:nth-child(1)[@style*="width: 17.647%"]', output, 1
+      assert_css 'table > colgroup > col:nth-child(2)[@style*="width: 11.7647%"]', output, 1
+      assert_css 'table > colgroup > col:nth-child(3)[@style*="width: 11.7647%"]', output, 1
+      assert_css 'table > colgroup > col:nth-child(4)[@style*="width: 58.8236%"]', output, 1
       assert_css 'table > thead', output, 1
       assert_css 'table > thead > tr', output, 1
       assert_css 'table > thead > tr > th', output, 4
@@ -538,7 +571,7 @@ d|9 2+>|10
       assert_css 'table > tbody > tr:nth-child(2) > td', output, 3
       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 > 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
@@ -564,7 +597,7 @@ d|9 2+>|10
 |AAA |BBB |CCC
 |===
       EOS
-      output = render_embedded_string input 
+      output = render_embedded_string input
       assert_css 'table > tbody > tr:nth-child(1) > td', output, 2
       assert_css 'table > tbody > tr:nth-child(1) > td:nth-child(1)[colspan="2"]', output, 1
       assert_css 'table > tbody > tr:nth-child(1) > td:nth-child(2):not([colspan])', output, 1
@@ -684,10 +717,10 @@ that I can't know enough...
 that I am always hungrily operating on the margins
 of a potentially great harvest of future knowledge and wisdom.
 
-I wouldn't have it any other way. 
+I wouldn't have it any other way.
 |===
       EOS
-      output = render_embedded_string input 
+      output = render_embedded_string input
       assert_css 'table', output, 1
       assert_css 'table > colgroup > col', output, 3
       assert_css 'table > thead', output, 1
@@ -783,7 +816,7 @@ output file name is used.
       table = doc.blocks.first
       assert !table.nil?
       tbody = table.rows.body
-      assert_equal 2, tbody.size  
+      assert_equal 2, tbody.size
       body_cell_1_3 = tbody[0][2]
       assert !body_cell_1_3.inner_document.nil?
       assert body_cell_1_3.inner_document.nested?
@@ -796,7 +829,7 @@ output file name is used.
       assert_css 'table > tbody > tr:nth-child(2) > td:nth-child(3) div.dlist', output, 1
     end
 
-    test 'preprocessor directive on first line of AsciiDoc cell should be processed' do
+    test 'preprocessor directive on first line of an AsciiDoc table cell should be processed' do
       input = <<-EOS
 |===
 a|include::fixtures/include-file.asciidoc[]
@@ -807,7 +840,7 @@ a|include::fixtures/include-file.asciidoc[]
       assert_match(/included content/, output)
     end
 
-    test 'cross reference link in AsciiDoc-style table cell should resolve to reference in main document' do
+    test 'cross reference link in an AsciiDoc table cell should resolve to reference in main document' do
       input = <<-EOS
 == Some
 
@@ -825,7 +858,7 @@ content
       assert_xpath '//a[@href="#_more"][text()="More"]', result, 1
     end
 
-    test 'footnotes should not be shared between AsciiDoc-style table cell and main document' do
+    test 'footnotes should not be shared between an AsciiDoc table cell and the main document' do
       input = <<-EOS
 |===
 a|AsciiDoc footnote:[A lightweight markup language.]
@@ -836,6 +869,54 @@ a|AsciiDoc footnote:[A lightweight markup language.]
       assert_css '#_footnote_1', result, 1
     end
 
+    test 'callout numbers should be globally unique, including AsciiDoc table cells' do
+      input = <<-EOS
+= Document Title
+
+== Section 1
+
+|====
+a|
+[source, yaml]
+----
+key: value <1>
+----
+<1> First callout
+|====
+
+== Section 2
+
+|====
+a|
+[source, yaml]
+----
+key: value <1>
+----
+<1> Second callout
+|====
+
+== Section 3
+
+[source, yaml]
+----
+key: value <1>
+----
+<1> Third callout
+      EOS
+
+      result = render_string input, :backend => 'docbook'
+      conums = xmlnodes_at_xpath '//co', result
+      assert_equal 3, conums.size
+      ['CO1-1', 'CO2-1', 'CO3-1'].each_with_index do |conum, idx|
+        assert_equal conum, conums[idx].attribute('xml:id').value
+      end
+      callouts = xmlnodes_at_xpath '//callout', result
+      assert_equal 3, callouts.size
+      ['CO1-1', 'CO2-1', 'CO3-1'].each_with_index do |callout, idx|
+        assert_equal callout, callouts[idx].attribute('arearefs').value
+      end
+    end
+
     test 'nested table' do
       input = <<-EOS
 [cols="1,2a"]
@@ -856,7 +937,74 @@ a|AsciiDoc footnote:[A lightweight markup language.]
       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
+    test 'toc from parent document should not be included in an AsciiDoc table cell' do
+      input = <<-EOS
+= Document Title
+:toc:
+
+== Section A
+
+|===
+a|AsciiDoc content
+|===
+      EOS
+
+      output = render_string input
+      assert_css '.toc', output, 1
+      assert_css 'table .toc', output, 0
+    end
+
+    test 'should be able to enable toc in an AsciiDoc table cell' do
+      input = <<-EOS
+= Document Title
+
+== Section A
+
+|===
+a|
+= Subdocument Title
+:toc:
+
+== Subdocument Section A
+
+content
+|===
+      EOS
+
+      output = render_string input
+      assert_css '.toc', output, 1
+      assert_css 'table .toc', output, 1
+    end
+
+    test 'should be able to enable toc in both outer document and in an AsciiDoc table cell' do
+      input = <<-EOS
+= Document Title
+:toc:
+
+== Section A
+
+|===
+a|
+= Subdocument Title
+:toc: macro
+
+[#table-cell-toc]
+toc::[]
+
+== Subdocument Section A
+
+content
+|===
+      EOS
+
+      output = render_string input
+      assert_css '.toc', output, 2
+      assert_css '#toc', output, 1
+      assert_css 'table .toc', output, 1
+      assert_css 'table #table-cell-toc', output, 1
+    end
+
+    test 'document in an AsciiDoc table cell should not see doctitle of parent' do
       input = <<-EOS
 = Document Title
 
@@ -908,9 +1056,13 @@ sshd:x:74:74:Privilege-separated SSH:/var/empty/sshd:/sbin/nologin
 nobody:x:99:99:Nobody:/:/sbin/nologin
 |===
       EOS
-      output = render_embedded_string input
+      doc = document_from_string input, :header_footer => false
+      table = doc.blocks[0]
+      assert 100, table.columns.map {|col| col.attributes['colpcwidth'] }.reduce(:+)
+      output = doc.convert
       assert_css 'table', output, 1
-      assert_css 'table > colgroup > col[style*="width: 14%"]', output, 7
+      assert_css 'table > colgroup > col[style*="width: 14.2857"]', output, 6
+      assert_css 'table > colgroup > col:last-of-type[style*="width: 14.2858%"]', output, 1
       assert_css 'table > tbody > tr', output, 6
       assert_xpath '//tr[4]/td[5]/p/text()', output, 0
       assert_xpath '//tr[3]/td[5]/p[text()="MySQL:Server"]', output, 1
@@ -993,7 +1145,7 @@ Year,Make,Model,Description,Price
 air, moon roof, loaded",4799.00
 |===
       EOS
-      output = render_embedded_string input 
+      output = render_embedded_string input
       assert_css 'table', output, 1
       assert_css 'table > colgroup > col[style*="width: 20%"]', output, 5
       assert_css 'table > thead > tr', output, 1
@@ -1034,7 +1186,7 @@ a;b;c
       assert_css 'table > tbody > tr:nth-child(2) > td', output, 3
     end
 
-    test 'custom separator on AsciiDoc table cell' do
+    test 'custom separator for an AsciiDoc table cell' do
       input = <<-EOS
 [cols=2,separator=!]
 |===
@@ -1071,7 +1223,7 @@ single cell
 [options="breakable"]
 |===
 |Item       |Quantity
-|Item 1     |1        
+|Item 1     |1
 |===
       EOS
       output = render_embedded_string input, :backend => 'docbook45'
@@ -1084,7 +1236,7 @@ single cell
 [options="breakable"]
 |===
 |Item       |Quantity
-|Item 1     |1        
+|Item 1     |1
 |===
       EOS
       output = render_embedded_string input, :backend => 'docbook5'
@@ -1097,7 +1249,7 @@ single cell
 [options="unbreakable"]
 |===
 |Item       |Quantity
-|Item 1     |1        
+|Item 1     |1
 |===
       EOS
       output = render_embedded_string input, :backend => 'docbook5'
@@ -1110,7 +1262,7 @@ single cell
 [options="unbreakable"]
 |===
 |Item       |Quantity
-|Item 1     |1        
+|Item 1     |1
 |===
       EOS
       output = render_embedded_string input, :backend => 'docbook45'