kramdown 2.1.0 → 2.4.0

data/test/test_files.rb

@@ -11,6 +11,7 @@ require 'minitest/autorun'
 require 'kramdown'
 require 'yaml'
 require 'tmpdir'
+require 'open3'
 
 begin
   require 'kramdown/converter/syntax_highlighter/rouge'
@@ -20,16 +21,20 @@ begin
   end
 
   # custom formatter for tests
-  class RougeHTMLFormatters < Kramdown::Converter::SyntaxHighlighter::Rouge.formatter_class
+  module Rouge
+    module Formatters
+      class RougeHTMLFormatters < Kramdown::Converter::SyntaxHighlighter::Rouge.formatter_class
 
-    tag 'rouge_html_formatters'
+        tag 'rouge_html_formatters'
 
-    def stream(tokens, &b)
-      yield %(<div class="custom-class">)
-      super
-      yield %(</div>)
-    end
+        def stream(tokens, &b)
+          yield %(<div class="custom-class">)
+          super
+          yield %(</div>)
+        end
 
+      end
+    end
   end
 rescue LoadError, SyntaxError, NameError
 end
@@ -111,14 +116,10 @@ class TestFiles < Minitest::Test
   end
 
   def tidy_output(out)
-    cmd = "tidy -q --doctype omit #{RUBY_VERSION >= '1.9' ? '-utf8' : '-raw'} 2>/dev/null"
-    result = IO.popen(cmd, 'r+') do |io|
-      io.write(out)
-      io.close_write
-      io.read
-    end
-    if $?.exitstatus == 2
-      raise "Problem using tidy"
+    cmd = "tidy -q --doctype omit -utf8"
+    result, error, status = Open3.capture3(cmd, stdin_data: out)
+    if status.exitstatus == 2
+      raise "Problem using tidy: #{error}"
     end
     result
   end
@@ -136,6 +137,7 @@ class TestFiles < Minitest::Test
       'test/testcases/block/06_codeblock/with_lang_in_fenced_block_name_with_dash.text',
       'test/testcases/block/06_codeblock/with_lang_in_fenced_block_any_char.text',
       'test/testcases/block/03_paragraph/standalone_image.text', # bc of standalone image
+      'test/testcases/cjk-line-break.text', # latex unicode support
     ].compact
     Dir[File.dirname(__FILE__) + '/testcases/**/*.text'].each do |text_file|
       next if EXCLUDE_LATEX_FILES.any? {|f| text_file =~ /#{f}$/ }
@@ -180,6 +182,9 @@ class TestFiles < Minitest::Test
       'test/testcases/block/09_html/xml.text', # bc of tidy
       'test/testcases/span/05_html/xml.text', # bc of tidy
       'test/testcases/block/03_paragraph/standalone_image.text', # bc of standalone image
+      'test/testcases/cjk-line-break.text',
+      'test/testcases/block/09_html/standalone_image_in_div.html', # bc of standalone image
+      'test/testcases/span/abbreviations/abbrev_in_html.text', # bc of invalid abbr tag in SVG
     ].compact
     Dir[File.dirname(__FILE__) + '/testcases/**/*.text'].each do |text_file|
       next if EXCLUDE_TEXT_FILES.any? {|f| text_file =~ /#{f}$/ }
@@ -192,6 +197,9 @@ class TestFiles < Minitest::Test
         kdtext = Kramdown::Document.new(File.read(text_file), options).to_kramdown
         html = Kramdown::Document.new(kdtext, options).to_html
         assert_equal(tidy_output(File.read(html_file)), tidy_output(html))
+        kdtext4 = Kramdown::Document.new(File.read(text_file), options.merge({list_indent: 4})).to_kramdown
+        html = Kramdown::Document.new(kdtext4, options).to_html
+        assert_equal(tidy_output(File.read(html_file)), tidy_output(html))
       end
     end
   end
@@ -222,14 +230,16 @@ class TestFiles < Minitest::Test
       'test/testcases/block/16_toc/toc_exclude.html',      # bc of different attribute ordering
       'test/testcases/span/autolinks/url_links.html',      # bc of quot entity being converted to char
       'test/testcases/block/14_table/empty_tag_in_cell.html', # bc of tidy
-      'test/testcases/block/15_math/mathjax_preview.html', # bc of mathjax preview
-      'test/testcases/block/15_math/mathjax_preview_simple.html', # bc of mathjax preview
-      'test/testcases/block/15_math/mathjax_preview_as_code.html', # bc of mathjax preview
       'test/testcases/span/01_link/link_defs_with_ial.html', # bc of attribute ordering
       'test/testcases/span/05_html/mark_element.html', # bc of tidy
       'test/testcases/block/09_html/xml.html', # bc of tidy
       'test/testcases/span/05_html/xml.html', # bc of tidy
       'test/testcases/block/03_paragraph/standalone_image.html', # bc of standalone image
+      'test/testcases/block/15_math/normal.html', # bc of mathjax and HTML parser
+      'test/testcases/block/15_math/gh_128.html', # bc of mathjax and HTML parser
+      'test/testcases/span/04_footnote/backlink_inline.html', # bc of mathjax
+      'test/testcases/block/09_html/standalone_image_in_div.html', # bc of standalone image
+      'test/testcases/block/09_html/processing_instruction.html', # bc of PI
     ].compact
     Dir[File.dirname(__FILE__) + '/testcases/**/*.html'].each do |html_file|
       next if EXCLUDE_HTML_KD_FILES.any? {|f| html_file =~ /#{f}$/ }

data/test/test_location.rb

@@ -18,7 +18,7 @@ describe 'location' do
   def check_element_for_location(element)
     if (match = /^line-(\d+)/.match(element.attr['class'] || ''))
       expected_line = match[1].to_i
-      element.options[:location].must_equal(expected_line)
+      assert_equal(expected_line, element.options[:location])
     end
     element.children.each do |child|
       check_element_for_location(child)
@@ -187,7 +187,7 @@ describe 'location' do
 *[duplicate]: The second definition
     )
     doc = Kramdown::Document.new(test_string.strip)
-    doc.warnings.must_equal ["Duplicate abbreviation ID 'duplicate' on line 4 - overwriting"]
+    assert_equal(["Duplicate abbreviation ID 'duplicate' on line 4 - overwriting"], doc.warnings)
   end
 
   it 'handles abbreviations' do

data/test/test_string_scanner_kramdown.rb

@@ -21,7 +21,7 @@ describe Kramdown::Utils::StringScanner do
     it "computes the correct current_line_number for example ##{i + 1}" do
       str_sc = Kramdown::Utils::StringScanner.new(test_string)
       scan_regexes.each {|scan_re| str_sc.scan_until(scan_re) }
-      str_sc.current_line_number.must_equal expect
+      assert_equal(expect, str_sc.current_line_number)
     end
   end
 end

data/test/testcases/block/03_paragraph/standalone_image.html

@@ -5,4 +5,9 @@
   <figcaption>standalone image</figcaption>
 </figure>
 
+<figure id="block-id" class="block-class" block-key="block-value">
+  <img src="some.jpg" alt="standalone image" id="id" class="class" key="value" />
+  <figcaption>standalone image</figcaption>
+</figure>
+
 <p>para</p>

data/test/testcases/block/03_paragraph/standalone_image.text

@@ -3,4 +3,7 @@ para
 
 ![standalone image](some.jpg){:#id .class key="value" standalone}
 
+![standalone image](some.jpg){:#id .class key="value" standalone}
+{:#block-id .block-class block-key="block-value"}
+
 para

data/test/testcases/block/03_paragraph/to_kramdown.kramdown

@@ -0,0 +1,7 @@
+aa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa
+\: No definiion list
+
+a:
+
+*a*:
+

data/test/testcases/block/03_paragraph/to_kramdown.text

@@ -0,0 +1,5 @@
+aa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa : No definiion list
+
+a:
+
+*a*:

data/test/testcases/block/04_header/atx_header.html

@@ -26,6 +26,12 @@
 ### not a header</p>
 </blockquote>
 
+<h1>header</h1>
+
+<h1>header</h1>
+
+<h1>header</h1>
+
 <h1>header #</h1>
 
 <h1>header</h1>

data/test/testcases/block/04_header/atx_header.text

@@ -23,6 +23,12 @@ paragraph
 > blockquote
 ### not a header
 
+# header #
+
+# header#
+
+#header#
+
 # header \#
 
 # header

data/test/testcases/block/06_codeblock/rouge/multiple.html

@@ -6,6 +6,6 @@
 </code></pre>
 </div></div></div>
 
-<div class="language-php highlighter-rouge"><div class="custom-class"><div class="highlight"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nx">Bar</span><span class="p">;</span>
+<div class="language-php highlighter-rouge"><div class="custom-class"><div class="highlight"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Bar</span><span class="p">;</span>
 </code></pre>
 </div></div></div>

data/test/testcases/block/06_codeblock/rouge/simple.html

@@ -5,6 +5,6 @@
 </code></pre>
 </div></div>
 
-<div class="language-php highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nx">Bar</span><span class="p">;</span>
+<div class="language-php highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Bar</span><span class="p">;</span>
 </code></pre>
 </div></div>

data/test/testcases/block/09_html/processing_instruction.html

@@ -1,13 +1,12 @@
-<?xml version="1.0"?>
+<p>&lt;?xml version=”1.0”?&gt;</p>
 
 <p>para</p>
 
-<?  test  ?>
-<p>para</p>
+<p>&lt;?  test  ?&gt; para</p>
 
 <p>other</p>
 
-<?
-multiline *text*
+<p>&lt;?
+multiline <em>text</em>
 is allowed
-?>
+?&gt;</p>

data/test/testcases/block/09_html/standalone_image_in_div.htmlinput

@@ -0,0 +1,7 @@
+<div class="example-1">
+  <img src="src.png" alt="inside" />
+</div>
+
+<div class="example-2">
+  <a href="website.html">text</a>
+</div>

data/test/testcases/block/09_html/standalone_image_in_div.text

@@ -0,0 +1,8 @@
+<div class="example-1" markdown="1">
+![inside](src.png)
+</div>
+
+<div class="example-2" markdown="1">
+[text](website.html)
+</div>
+

data/test/testcases/block/09_html/table.kramdown

@@ -0,0 +1,8 @@
+<table>
+<tr>
+<th>test</th>
+<th></th>
+<td></td>
+</tr>
+</table>
+

data/test/testcases/block/09_html/table.text

@@ -0,0 +1,7 @@
+<table>
+<tr>
+<th>test</th>
+<th></th>
+<td></td>
+</tr>
+</table>

data/test/testcases/block/12_extension/options.html

@@ -10,12 +10,12 @@ some <span>*para*</span>
   <p>some <span><em>para</em></span></p>
 </div>
 
-<p>Some text<sup id="fnref:ab"><a href="#fn:ab" class="footnote">10</a></sup>.</p>
+<p>Some text<sup id="fnref:ab" role="doc-noteref"><a href="#fn:ab" class="footnote" rel="footnote">10</a></sup>.</p>
 
-<div class="footnotes">
+<div class="footnotes" role="doc-endnotes">
   <ol start="10">
-    <li id="fn:ab">
-      <p>Some text. <a href="#fnref:ab" class="reversefootnote">&#8617;</a></p>
+    <li id="fn:ab" role="doc-endnote">
+      <p>Some text. <a href="#fnref:ab" class="reversefootnote" role="doc-backlink">&#8617;</a></p>
     </li>
   </ol>
 </div>

data/test/testcases/block/12_extension/options.text

@@ -19,3 +19,5 @@ some <span>*para*</span>
 Some text[^ab].
 
 [^ab]: Some text.
+
+{::options template="/etc/passwd" /}

data/test/testcases/block/12_extension/options2.html

@@ -1,10 +1,10 @@
 
-<p>Some text<sup id="fnref:ab"><a href="#fn:ab" class="footnote">1</a></sup>.</p>
+<p>Some text<sup id="fnref:ab" role="doc-noteref"><a href="#fn:ab" class="footnote" rel="footnote">1</a></sup>.</p>
 
-<div class="footnotes">
+<div class="footnotes" role="doc-endnotes">
   <ol>
-    <li id="fn:ab">
-      <p>Some text. <a href="#fnref:ab" class="reversefootnote">&#8617;</a></p>
+    <li id="fn:ab" role="doc-endnote">
+      <p>Some text. <a href="#fnref:ab" class="reversefootnote" role="doc-backlink">&#8617;</a></p>
     </li>
   </ol>
 </div>

data/test/testcases/block/14_table/table_with_footnote.html

@@ -1,7 +1,7 @@
 <table>
   <tbody>
     <tr>
-      <td>this is <sup id="fnref:1"><a href="#fn:1" class="footnote">1</a></sup></td>
+      <td>this is <sup id="fnref:1" role="doc-noteref"><a href="#fn:1" class="footnote" rel="footnote">1</a></sup></td>
       <td>a table</td>
     </tr>
     <tr>
@@ -11,15 +11,15 @@
   </tbody>
 </table>
 
-<div class="footnotes">
+<div class="footnotes" role="doc-endnotes">
   <ol>
-    <li id="fn:1">
+    <li id="fn:1" role="doc-endnote">
       <p>Something</p>
 
       <blockquote>
         <p>special here</p>
       </blockquote>
-      <p><a href="#fnref:1" class="reversefootnote">&#8617;</a></p>
+      <p><a href="#fnref:1" class="reversefootnote" role="doc-backlink">&#8617;</a></p>
     </li>
   </ol>
 </div>

data/test/testcases/block/15_math/gh_128.html

@@ -1,2 +1 @@
-<script type="math/tex; mode=display">% <![CDATA[
-alert('a') alert('b<') %]]></script>
+\[&lt;script&gt;alert('a')&lt;/script&gt; &lt;script&gt;alert('b&lt;')&lt;/script&gt;\]

data/test/testcases/block/15_math/normal.html

@@ -1,29 +1,30 @@
 <p>This is a para.
-<script type="math/tex">\text{LaTeX} \lambda_5</script></p>
+\(\text{LaTeX} \lambda_5\)</p>
 
-<script type="math/tex; mode=display">\lambda_5 = \alpha + 4</script>
+\[\lambda_5 = \alpha + 4\]
 
-<p><script type="math/tex">\lambda_\alpha > 5</script>
+<p>\(\lambda_\alpha &gt; 5\)
 This is a para.</p>
 
-<script type="math/tex; mode=display">% <![CDATA[
-\begin{align*}
-&=5 \\
-&=6 \\
-\end{align*} %]]></script>
+\[\begin{align*}
+&amp;=5 \\
+&amp;=6 \\
+\end{align*}\]
 
-<script type="math/tex; mode=display">5+5</script>
+\[5+5\]
 
-<script type="math/tex; mode=display">5+5</script>
+\[5+5\]
 
-<script type="math/tex; mode=display">5+5</script>
+\[5+5\]
 
-<script type="math/tex; mode=display">5+5</script>
+\[5+5\]
 
 <pre><code>$$5+5$$
 </code></pre>
 
-<script type="math/tex; mode=display">5+5</script>
-<script type="math/tex; mode=display">5+5</script>
+<div class="cls">\[5+5\]
+</div>
+<div class="cls">\[5+5\]
+</div>
 
-<script type="math/tex; mode=display">|x| = 5</script>
+\[|x| = 5\]

data/test/testcases/block/16_toc/toc_with_footnotes.html

@@ -2,12 +2,12 @@
   <li><a href="#header1-level-1" id="markdown-toc-header1-level-1">Header level 1</a></li>
 </ul>
 
-<h1 id="header1-level-1">Header<sup id="fnref:1"><a href="#fn:1" class="footnote">1</a></sup> level 1</h1>
+<h1 id="header1-level-1">Header<sup id="fnref:1" role="doc-noteref"><a href="#fn:1" class="footnote" rel="footnote">1</a></sup> level 1</h1>
 
-<div class="footnotes">
+<div class="footnotes" role="doc-endnotes">
   <ol>
-    <li id="fn:1">
-      <p>Some footnote content here <a href="#fnref:1" class="reversefootnote">&#8617;</a></p>
+    <li id="fn:1" role="doc-endnote">
+      <p>Some footnote content here <a href="#fnref:1" class="reversefootnote" role="doc-backlink">&#8617;</a></p>
     </li>
   </ol>
 </div>

data/test/testcases/cjk-line-break.html

@@ -0,0 +1,4 @@
+<p>一二三四五</p>
+
+<p>あいうえお</p>
+

data/test/testcases/cjk-line-break.options

@@ -0,0 +1 @@
+:remove_line_breaks_for_cjk: true

data/test/testcases/cjk-line-break.text

@@ -0,0 +1,12 @@
+一
+二
+三
+四
+五
+
+あ
+い
+う
+え
+お
+

data/test/testcases/man/example.man

@@ -114,7 +114,7 @@ line breaks\.
 .P
 Abbreviations like MD can be used but the abbreviation title is ignored\.
 .P
-Math elements work \fB\el = 5\fP inline and in block form:
+Math elements work \fB\elambda = 5\fP inline and in block form:
 .sp
 .RS 4
 .EX

data/test/testcases/man/example.text

@@ -80,6 +80,6 @@ ignored.
 
 *[MD]: Markdown
 
-Math elements work $$\l = 5$$ inline and in block form:
+Math elements work $$\lambda = 5$$ inline and in block form:
 
 $$\lambda_5 = \alpha + 4$$

data/test/testcases/span/02_emphasis/normal.html

@@ -59,3 +59,7 @@ Or that *<em>that*</em> way</p>
   <li>`<em>test</em>&#8217;</li>
   <li>„<em>test</em>“</li>
 </ul>
+
+<p>it&#8211;by design&#8211;<em>cannot have side-effects</em>.</p>
+
+<p>it&#8212;by design&#8212;<em>cannot have side-effects</em>.</p>

data/test/testcases/span/02_emphasis/normal.text

@@ -57,3 +57,7 @@ Or that \**that\** way
 - “_test_”
 - \`_test_'
 - „_test_“
+
+it--by design--_cannot have side-effects_.
+
+it---by design---_cannot have side-effects_.

data/test/testcases/span/03_codespan/normal.html

@@ -14,3 +14,7 @@ As `are` these!</p>
 <p>No <code>literal backtick</code>.</p>
 
 <p><code>something</code></p>
+
+<p>` `</p>
+
+<p>a ` `</p>

data/test/testcases/span/03_codespan/normal.text

@@ -14,3 +14,7 @@ As \`are\` these!
 No `` literal backtick``.
 
 `something`
+
+` `
+
+a ` `

data/test/testcases/span/04_footnote/backlink_inline.html

@@ -1,30 +1,30 @@
-<p>This is <sup id="fnref:paragraph"><a href="#fn:paragraph" class="footnote">1</a></sup><sup id="fnref:header"><a href="#fn:header" class="footnote">2</a></sup><sup id="fnref:blockquote"><a href="#fn:blockquote" class="footnote">3</a></sup><sup id="fnref:codeblock"><a href="#fn:codeblock" class="footnote">4</a></sup><sup id="fnref:list"><a href="#fn:list" class="footnote">5</a></sup><sup id="fnref:table"><a href="#fn:table" class="footnote">6</a></sup><sup id="fnref:hrule"><a href="#fn:hrule" class="footnote">7</a></sup><sup id="fnref:mathblock"><a href="#fn:mathblock" class="footnote">8</a></sup><sup id="fnref:html"><a href="#fn:html" class="footnote">9</a></sup></p>
+<p>This is <sup id="fnref:paragraph" role="doc-noteref"><a href="#fn:paragraph" class="footnote" rel="footnote">1</a></sup><sup id="fnref:header" role="doc-noteref"><a href="#fn:header" class="footnote" rel="footnote">2</a></sup><sup id="fnref:blockquote" role="doc-noteref"><a href="#fn:blockquote" class="footnote" rel="footnote">3</a></sup><sup id="fnref:codeblock" role="doc-noteref"><a href="#fn:codeblock" class="footnote" rel="footnote">4</a></sup><sup id="fnref:list" role="doc-noteref"><a href="#fn:list" class="footnote" rel="footnote">5</a></sup><sup id="fnref:table" role="doc-noteref"><a href="#fn:table" class="footnote" rel="footnote">6</a></sup><sup id="fnref:hrule" role="doc-noteref"><a href="#fn:hrule" class="footnote" rel="footnote">7</a></sup><sup id="fnref:mathblock" role="doc-noteref"><a href="#fn:mathblock" class="footnote" rel="footnote">8</a></sup><sup id="fnref:html" role="doc-noteref"><a href="#fn:html" class="footnote" rel="footnote">9</a></sup></p>
 
-<div class="footnotes">
+<div class="footnotes" role="doc-endnotes">
   <ol>
-    <li id="fn:paragraph">
+    <li id="fn:paragraph" role="doc-endnote">
 
-      <p>A paragraph <a href="#fnref:paragraph" class="reversefootnote">&#8617;</a></p>
+      <p>A paragraph <a href="#fnref:paragraph" class="reversefootnote" role="doc-backlink">&#8617;</a></p>
     </li>
-    <li id="fn:header">
+    <li id="fn:header" role="doc-endnote">
 
-      <h1 id="a-header">A header <a href="#fnref:header" class="reversefootnote">&#8617;</a></h1>
+      <h1 id="a-header">A header <a href="#fnref:header" class="reversefootnote" role="doc-backlink">&#8617;</a></h1>
     </li>
-    <li id="fn:blockquote">
+    <li id="fn:blockquote" role="doc-endnote">
 
       <blockquote>
         <p>blockquote</p>
 
-        <p>paragraph <a href="#fnref:blockquote" class="reversefootnote">&#8617;</a></p>
+        <p>paragraph <a href="#fnref:blockquote" class="reversefootnote" role="doc-backlink">&#8617;</a></p>
       </blockquote>
     </li>
-    <li id="fn:codeblock">
+    <li id="fn:codeblock" role="doc-endnote">
 
       <pre><code>codeblock
 </code></pre>
-      <p><a href="#fnref:codeblock" class="reversefootnote">&#8617;</a></p>
+      <p><a href="#fnref:codeblock" class="reversefootnote" role="doc-backlink">&#8617;</a></p>
     </li>
-    <li id="fn:list">
+    <li id="fn:list" role="doc-endnote">
 
       <ul>
         <li>item 1</li>
@@ -36,14 +36,14 @@
               <blockquote>
                 <p>blockquote</p>
 
-                <h1 id="header">header <a href="#fnref:list" class="reversefootnote">&#8617;</a></h1>
+                <h1 id="header">header <a href="#fnref:list" class="reversefootnote" role="doc-backlink">&#8617;</a></h1>
               </blockquote>
             </li>
           </ul>
         </li>
       </ul>
     </li>
-    <li id="fn:table">
+    <li id="fn:table" role="doc-endnote">
 
       <table>
         <tbody>
@@ -57,23 +57,23 @@
           </tr>
         </tbody>
       </table>
-      <p><a href="#fnref:table" class="reversefootnote">&#8617;</a></p>
+      <p><a href="#fnref:table" class="reversefootnote" role="doc-backlink">&#8617;</a></p>
     </li>
-    <li id="fn:hrule">
+    <li id="fn:hrule" role="doc-endnote">
 
       <hr />
-      <p><a href="#fnref:hrule" class="reversefootnote">&#8617;</a></p>
+      <p><a href="#fnref:hrule" class="reversefootnote" role="doc-backlink">&#8617;</a></p>
     </li>
-    <li id="fn:mathblock">
+    <li id="fn:mathblock" role="doc-endnote">
 
-      <script type="math/tex; mode=display">x + 2</script>
-      <p><a href="#fnref:mathblock" class="reversefootnote">&#8617;</a></p>
+\[x + 2\]
+      <p><a href="#fnref:mathblock" class="reversefootnote" role="doc-backlink">&#8617;</a></p>
     </li>
-    <li id="fn:html">
+    <li id="fn:html" role="doc-endnote">
 
       <div>test
 </div>
-      <p><a href="#fnref:html" class="reversefootnote">&#8617;</a></p>
+      <p><a href="#fnref:html" class="reversefootnote" role="doc-backlink">&#8617;</a></p>
     </li>
   </ol>
 </div>

data/test/testcases/span/04_footnote/backlink_text.html

@@ -1,9 +1,9 @@
-<p>Some footnote here<sup id="fnref:fn"><a href="#fn:fn" class="footnote">1</a></sup></p>
+<p>Some footnote here<sup id="fnref:fn" role="doc-noteref"><a href="#fn:fn" class="footnote" rel="footnote">1</a></sup></p>
 
-<div class="footnotes">
+<div class="footnotes" role="doc-endnotes">
   <ol>
-    <li id="fn:fn">
-      <p>Some text here <a href="#fnref:fn" class="reversefootnote">text &8617; &lt;img /&gt;</a></p>
+    <li id="fn:fn" role="doc-endnote">
+      <p>Some text here <a href="#fnref:fn" class="reversefootnote" role="doc-backlink">text &8617; &lt;img /&gt;</a></p>
     </li>
   </ol>
 </div>

data/test/testcases/span/04_footnote/footnote_nr.html

@@ -1,12 +1,12 @@
-<p>This is a footnote<sup id="fnref:ab"><a href="#fn:ab" class="footnote">35</a></sup>. And another<sup id="fnref:bc"><a href="#fn:bc" class="footnote">36</a></sup>.</p>
+<p>This is a footnote<sup id="fnref:ab" role="doc-noteref"><a href="#fn:ab" class="footnote" rel="footnote">35</a></sup>. And another<sup id="fnref:bc" role="doc-noteref"><a href="#fn:bc" class="footnote" rel="footnote">36</a></sup>.</p>
 
-<div class="footnotes">
+<div class="footnotes" role="doc-endnotes">
   <ol start="35">
-    <li id="fn:ab">
-      <p>Some text. <a href="#fnref:ab" class="reversefootnote">&#8617;</a></p>
+    <li id="fn:ab" role="doc-endnote">
+      <p>Some text. <a href="#fnref:ab" class="reversefootnote" role="doc-backlink">&#8617;</a></p>
     </li>
-    <li id="fn:bc">
-      <p>Some other text. <a href="#fnref:bc" class="reversefootnote">&#8617;</a></p>
+    <li id="fn:bc" role="doc-endnote">
+      <p>Some other text. <a href="#fnref:bc" class="reversefootnote" role="doc-backlink">&#8617;</a></p>
     </li>
   </ol>
 </div>