RubyGems - asciidoctor - Versions diffs - 1.5.6.2 → 1.5.7 - Mend

asciidoctor 1.5.6.2 → 1.5.7

Potentially problematic release.

This version of asciidoctor might be problematic. Click here for more details.

Files changed (112) hide show

checksums.yaml +4 -4
data/CHANGELOG.adoc +330 -143
data/README-fr.adoc +441 -0
data/README-jp.adoc +418 -0
data/README-zh_CN.adoc +430 -0
data/README.adoc +454 -0
data/Rakefile +57 -0
data/asciidoctor.gemspec +7 -1
data/data/locale/attributes-ar.adoc +22 -0
data/data/locale/attributes-bg.adoc +22 -0
data/data/locale/attributes-ca.adoc +22 -0
data/data/locale/attributes-cs.adoc +22 -0
data/data/locale/attributes-da.adoc +22 -0
data/data/locale/attributes-de.adoc +22 -0
data/data/locale/attributes-en.adoc +23 -0
data/data/locale/attributes-es.adoc +22 -0
data/data/locale/attributes-fa.adoc +22 -0
data/data/locale/attributes-fi.adoc +22 -0
data/data/locale/attributes-fr.adoc +22 -0
data/data/locale/attributes-hu.adoc +22 -0
data/data/locale/attributes-id.adoc +22 -0
data/data/locale/attributes-it.adoc +22 -0
data/data/locale/attributes-ja.adoc +22 -0
data/data/locale/attributes-kr.adoc +22 -0
data/data/locale/attributes-nb.adoc +22 -0
data/data/locale/attributes-nl.adoc +22 -0
data/data/locale/attributes-nn.adoc +22 -0
data/data/locale/attributes-pl.adoc +22 -0
data/data/locale/attributes-pt.adoc +22 -0
data/data/locale/attributes-pt_BR.adoc +22 -0
data/data/locale/attributes-ro.adoc +22 -0
data/data/locale/attributes-ru.adoc +22 -0
data/data/locale/attributes-sr.adoc +22 -0
data/data/locale/attributes-sr_Latn.adoc +22 -0
data/data/locale/attributes-tr.adoc +22 -0
data/data/locale/attributes-uk.adoc +22 -0
data/data/locale/attributes-zh_CN.adoc +22 -0
data/data/locale/attributes-zh_TW.adoc +22 -0
data/data/locale/attributes.adoc +8 -649
data/data/stylesheets/asciidoctor-default.css +77 -72
data/features/xref.feature +366 -7
data/lib/asciidoctor.rb +107 -93
data/lib/asciidoctor/abstract_block.rb +247 -239
data/lib/asciidoctor/abstract_node.rb +56 -58
data/lib/asciidoctor/block.rb +3 -3
data/lib/asciidoctor/callouts.rb +1 -1
data/lib/asciidoctor/cli/invoker.rb +36 -9
data/lib/asciidoctor/cli/options.rb +63 -25
data/lib/asciidoctor/converter.rb +23 -13
data/lib/asciidoctor/converter/base.rb +4 -0
data/lib/asciidoctor/converter/docbook45.rb +16 -9
data/lib/asciidoctor/converter/docbook5.rb +115 -97
data/lib/asciidoctor/converter/factory.rb +29 -31
data/lib/asciidoctor/converter/html5.rb +229 -192
data/lib/asciidoctor/converter/manpage.rb +72 -50
data/lib/asciidoctor/converter/template.rb +12 -12
data/lib/asciidoctor/core_ext.rb +5 -1
data/lib/asciidoctor/core_ext/1.8.7/base64/strict_encode64.rb +6 -0
data/lib/asciidoctor/document.rb +168 -77
data/lib/asciidoctor/extensions.rb +79 -47
data/lib/asciidoctor/helpers.rb +33 -11
data/lib/asciidoctor/inline.rb +3 -2
data/lib/asciidoctor/list.rb +2 -1
data/lib/asciidoctor/logging.rb +122 -0
data/lib/asciidoctor/parser.rb +406 -382
data/lib/asciidoctor/path_resolver.rb +169 -162
data/lib/asciidoctor/reader.rb +166 -121
data/lib/asciidoctor/section.rb +45 -28
data/lib/asciidoctor/stylesheets.rb +13 -5
data/lib/asciidoctor/substitutors.rb +328 -254
data/lib/asciidoctor/table.rb +105 -48
data/lib/asciidoctor/timings.rb +34 -6
data/lib/asciidoctor/version.rb +1 -1
data/man/asciidoctor.1 +41 -23
data/man/asciidoctor.adoc +14 -8
data/test/api_test.rb +1004 -0
data/test/attributes_test.rb +241 -50
data/test/blocks_test.rb +549 -124
data/test/converter_test.rb +170 -78
data/test/document_test.rb +208 -767
data/test/extensions_test.rb +188 -53
data/test/fixtures/custom-backends/slim/html5/block_paragraph.html.slim +1 -1
data/test/fixtures/custom-backends/slim/html5/block_sidebar.html.slim +1 -1
data/test/fixtures/file-with-missing-include.adoc +1 -0
data/test/fixtures/include-file.jsx +8 -0
data/test/fixtures/lists.adoc +96 -0
data/test/fixtures/other-chapters.adoc +11 -0
data/test/fixtures/outer-include.adoc +5 -0
data/test/fixtures/sample.asciidoc +5 -1
data/test/fixtures/subdir/index.adoc +3 -0
data/test/fixtures/subdir/inner-include.adoc +3 -0
data/test/fixtures/subdir/middle-include.adoc +5 -0
data/test/fixtures/tagged-class-enclosed.rb +0 -1
data/test/fixtures/unclosed-tag.adoc +3 -0
data/test/fixtures/unexpected-end-tag.adoc +4 -0
data/test/invoker_test.rb +101 -40
data/test/links_test.rb +266 -72
data/test/lists_test.rb +243 -45
data/test/logger_test.rb +211 -0
data/test/manpage_test.rb +124 -6
data/test/options_test.rb +46 -1
data/test/paragraphs_test.rb +23 -10
data/test/parser_test.rb +30 -1
data/test/paths_test.rb +115 -33
data/test/preamble_test.rb +1 -1
data/test/reader_test.rb +337 -81
data/test/sections_test.rb +656 -72
data/test/substitutions_test.rb +182 -57
data/test/tables_test.rb +324 -57
data/test/test_helper.rb +77 -32
data/test/text_test.rb +7 -7
metadata +67 -3

@@ -17,6 +17,15 @@ context 'Substitutions' do
       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
+    test 'apply_subs should not modify string directly' do
+      input = '<html> -- the root of all web'
+      para = block_from_string input
+      para_source = para.source
+      result = para.apply_subs para_source
+      assert_equal '&lt;html&gt;&#8201;&#8212;&#8201;the root of all web', result
+      assert_equal input, para_source
+    end
     test 'should not drop trailing blank lines when performing substitutions' do
       para = block_from_string %([%hardbreaks]\nthis\nis\n-> {program})
       para.lines << ''
@@ -28,15 +37,12 @@ context 'Substitutions' do
       assert_equal %(this<br>\nis<br>\n&#8594; Asciidoctor<br>\n<br>\n), result
     end
-    test 'should expand subs passed to apply_subs when expand argument is set' do
+    test 'should expand subs passe to expand_subs' do
       para = block_from_string %({program}\n*bold*\n2 > 1)
       para.document.attributes['program'] = 'Asciidoctor'
-      result = para.apply_subs para.lines, [:specialchars], true
-      assert_equal ['{program}', '*bold*', '2 &gt; 1'], result
-      result = para.apply_subs para.lines, [:none], true
-      assert_equal ['{program}', '*bold*', '2 > 1'], result
-      result = para.apply_subs para.lines, [:normal], true
-      assert_equal ['Asciidoctor', '<strong>bold</strong>', '2 &gt; 1'], result
+      assert_equal [:specialcharacters], (para.expand_subs [:specialchars])
+      refute para.expand_subs([:none])
+      assert_equal [:specialcharacters, :quotes, :attributes, :replacements, :macros, :post_replacements], (para.expand_subs [:normal])
     end
     test 'apply_subs should allow the subs argument to be nil' do
@@ -53,6 +59,9 @@ context 'Substitutions' do
       para = block_from_string(%q{"`a few quoted words`"})
       assert_equal '&#8220;a few quoted words&#8221;', para.sub_quotes(para.source)
+      para = block_from_string(%q{"`a few quoted words`"}, :backend => 'docbook')
+      assert_equal '<quote>a few quoted words</quote>', para.sub_quotes(para.source)
     end
     test 'escaped single-line double-quoted string' do
@@ -107,6 +116,9 @@ context 'Substitutions' do
       para = block_from_string(%q{'`a few quoted words`'})
       assert_equal '&#8216;a few quoted words&#8217;', para.sub_quotes(para.source)
+      para = block_from_string(%q{'`a few quoted words`'}, :backend => 'docbook')
+      assert_equal '<quote>a few quoted words</quote>', para.sub_quotes(para.source)
     end
     test 'escaped single-line single-quoted string' do
@@ -538,12 +550,12 @@ context 'Substitutions' do
     test 'quoted text with id shorthand' do
       para = block_from_string(%q{[#bond]#007#})
-      assert_equal '<a id="bond"></a>007', para.sub_quotes(para.source)
+      assert_equal '<span id="bond">007</span>', para.sub_quotes(para.source)
     end
     test 'quoted text with id and role shorthand' do
       para = block_from_string(%q{[#bond.white.red-background]#007#})
-      assert_equal '<a id="bond"></a><span class="white red-background">007</span>', para.sub_quotes(para.source)
+      assert_equal '<span id="bond" class="white red-background">007</span>', para.sub_quotes(para.source)
     end
     test 'quoted text with id and role shorthand using docbook backend' do
@@ -593,12 +605,12 @@ context 'Substitutions' do
     end
     test 'a mailto macro with text and subject should be interpreted as a mailto link' do
-      para = block_from_string('mailto:doc.writer@asciidoc.org[Doc Writer, Pull request]', :attributes => {'linkattrs' => ''})
+      para = block_from_string('mailto:doc.writer@asciidoc.org[Doc Writer, Pull request]')
       assert_equal %q{<a href="mailto:doc.writer@asciidoc.org?subject=Pull%20request">Doc Writer</a>}, para.sub_macros(para.source)
     end
     test 'a mailto macro with text, subject and body should be interpreted as a mailto link' do
-      para = block_from_string('mailto:doc.writer@asciidoc.org[Doc Writer, Pull request, Please accept my pull request]', :attributes => {'linkattrs' => ''})
+      para = block_from_string('mailto:doc.writer@asciidoc.org[Doc Writer, Pull request, Please accept my pull request]')
       assert_equal %q{<a href="mailto:doc.writer@asciidoc.org?subject=Pull%20request&amp;body=Please%20accept%20my%20pull%20request">Doc Writer</a>}, para.sub_macros(para.source)
     end
@@ -698,7 +710,7 @@ context 'Substitutions' do
     end
     test 'an image macro with an inline SVG image should be converted to an svg element' do
-      para = block_from_string('image:circle.svg[Tiger,100,opts=inline]', :safe => Asciidoctor::SafeMode::SERVER, :attributes => { 'imagesdir' => 'fixtures', 'docdir' => ::File.dirname(__FILE__) })
+      para = block_from_string('image:circle.svg[Tiger,100,opts=inline]', :safe => Asciidoctor::SafeMode::SERVER, :attributes => { 'imagesdir' => 'fixtures', 'docdir' => testdir })
       result = para.sub_macros(para.source).gsub(/>\s+</, '><')
       assert_match(/<svg\s[^>]*width="100px"[^>]*>/, result)
       refute_match(/<svg\s[^>]*width="500px"[^>]*>/, result)
@@ -707,7 +719,7 @@ context 'Substitutions' do
     end
     test 'an image macro with an inline SVG image should be converted to an svg element even when data-uri is set' do
-      para = block_from_string('image:circle.svg[Tiger,100,opts=inline]', :safe => Asciidoctor::SafeMode::SERVER, :attributes => { 'data-uri' => '', 'imagesdir' => 'fixtures', 'docdir' => ::File.dirname(__FILE__) })
+      para = block_from_string('image:circle.svg[Tiger,100,opts=inline]', :safe => Asciidoctor::SafeMode::SERVER, :attributes => { 'data-uri' => '', 'imagesdir' => 'fixtures', 'docdir' => testdir })
       assert_match(/<svg\s[^>]*width="100px">/, para.sub_macros(para.source).gsub(/>\s+</, '><'))
     end
@@ -751,6 +763,12 @@ context 'Substitutions' do
           para.sub_macros(para.source).gsub(/>\s+</, '><')
     end
+    test 'rel=nofollow should be added to an image with a link when the nofollow option is set' do
+      para = block_from_string 'image:tiger.png[Tiger,link=http://en.wikipedia.org/wiki/Tiger,opts=nofollow]'
+      assert_equal %{<span class="image"><a class="image" href="http://en.wikipedia.org/wiki/Tiger" rel="nofollow"><img src="tiger.png" alt="Tiger"></a></span>},
+          para.sub_macros(para.source).gsub(/>\s+</, '><')
+    end
     test 'a multi-line image macro with text and dimensions should be interpreted as an image with alt text and dimensions' do
       para = block_from_string(%(image:tiger.png[Another\nAwesome\nTiger, 200,\n100]))
       assert_equal %{<span class="image"><img src="tiger.png" alt="Another Awesome Tiger" width="200" height="100"></span>},
@@ -796,7 +814,7 @@ context 'Substitutions' do
     test 'should not match an inline image macro if target contains an endline character' do
       para = block_from_string(%(Fear not. There are no image:big\ncats.png[] around here.))
       result = para.sub_macros(para.source)
-      refute result.include?('<img ')
+      refute_includes result, '<img '
       assert_includes result, %(image:big\ncats.png[])
     end
@@ -804,7 +822,7 @@ context 'Substitutions' do
       ['image: big cats.png[]', 'image:big cats.png []'].each do |input|
         para = block_from_string %(Fear not. There are no #{input} around here.)
         result = para.sub_macros(para.source)
-        refute result.include?('<img ')
+        refute_includes result, '<img '
         assert_includes result, input
       end
     end
@@ -812,8 +830,8 @@ context 'Substitutions' do
     test 'should not detect a block image macro found inline' do
       para = block_from_string(%(Not an inline image macro image::tiger.png[].))
       result = para.sub_macros(para.source)
-      refute result.include?('<img ')
-      assert result.include?('image::tiger.png[]')
+      refute_includes result, '<img '
+      assert_includes result, 'image::tiger.png[]'
     end
     # NOTE this test verifies attributes get substituted eagerly in target of image in title
@@ -822,12 +840,11 @@ context 'Substitutions' do
 == image:{iconsdir}/dot.gif[dot] Title
       EOS
-      sect, warnings = redirect_streams do |_, err|
-        [(block_from_string input, :attributes => { 'data-uri' => '', 'iconsdir' => 'fixtures', 'docdir' => ::File.dirname(__FILE__) }, :safe => :server, :catalog_assets => true), err.string]
+      using_memory_logger do |logger|
+        sect = block_from_string input, :attributes => { 'data-uri' => '', 'iconsdir' => 'fixtures', 'docdir' => testdir }, :safe => :server, :catalog_assets => true
+        assert_includes sect.document.catalog[:images], 'fixtures/dot.gif'
+        assert logger.empty?
       end
-      assert sect.document.catalog[:images].include? 'fixtures/dot.gif'
-      refute_nil warnings
-      assert_empty warnings
     end
     test 'an icon macro should be interpreted as an icon if icons are enabled' do
@@ -862,7 +879,7 @@ context 'Substitutions' do
     test 'a single-line footnote macro should be registered and rendered as a footnote' do
       para = block_from_string('Sentence text footnote:[An example footnote.].')
-      assert_equal %(Sentence text <sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnote_1" title="View footnote.">1</a>]</sup>.), para.sub_macros(para.source)
+      assert_equal %(Sentence text <sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnotedef_1" title="View footnote.">1</a>]</sup>.), para.sub_macros(para.source)
       assert_equal 1, para.document.catalog[:footnotes].size
       footnote = para.document.catalog[:footnotes].first
       assert_equal 1, footnote.index
@@ -872,7 +889,7 @@ context 'Substitutions' do
     test 'a multi-line footnote macro should be registered and rendered as a footnote without endline' do
       para = block_from_string("Sentence text footnote:[An example footnote\nwith wrapped text.].")
-      assert_equal %(Sentence text <sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnote_1" title="View footnote.">1</a>]</sup>.), para.sub_macros(para.source)
+      assert_equal %(Sentence text <sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnotedef_1" title="View footnote.">1</a>]</sup>.), para.sub_macros(para.source)
       assert_equal 1, para.document.catalog[:footnotes].size
       footnote = para.document.catalog[:footnotes].first
       assert_equal 1, footnote.index
@@ -882,7 +899,7 @@ context 'Substitutions' do
     test 'an escaped closing square bracket in a footnote should be unescaped when rendered' do
       para = block_from_string(%(footnote:[a #{BACKSLASH}] b].))
-      assert_equal %(<sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnote_1" title="View footnote.">1</a>]</sup>.), para.sub_macros(para.source)
+      assert_equal %(<sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnotedef_1" title="View footnote.">1</a>]</sup>.), para.sub_macros(para.source)
       assert_equal 1, para.document.catalog[:footnotes].size
       footnote = para.document.catalog[:footnotes].first
       assert_equal "a ] b", footnote.text
@@ -890,7 +907,7 @@ context 'Substitutions' do
     test 'a footnote macro can be directly adjacent to preceding word' do
       para = block_from_string('Sentence textfootnote:[An example footnote.].')
-      assert_equal %(Sentence text<sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnote_1" title="View footnote.">1</a>]</sup>.), para.sub_macros(para.source)
+      assert_equal %(Sentence text<sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnotedef_1" title="View footnote.">1</a>]</sup>.), para.sub_macros(para.source)
     end
     test 'a footnote macro may contain an escaped backslash' do
@@ -907,7 +924,7 @@ context 'Substitutions' do
     test 'a footnote macro may contain a link macro' do
       para = block_from_string('Share your code. footnote:[https://github.com[GitHub]]')
-      assert_equal %(Share your code. <sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnote_1" title="View footnote.">1</a>]</sup>), para.sub_macros(para.source)
+      assert_equal %(Share your code. <sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnotedef_1" title="View footnote.">1</a>]</sup>), para.sub_macros(para.source)
       assert_equal 1, para.document.catalog[:footnotes].size
       footnote1 = para.document.catalog[:footnotes][0]
       assert_equal '<a href="https://github.com">GitHub</a>', footnote1.text
@@ -916,7 +933,7 @@ context 'Substitutions' do
     test 'a footnote macro may contain a plain URL' do
       para = block_from_string %(the JLine footnote:[https://github.com/jline/jline2]\nlibrary.)
       result = para.sub_macros para.source
-      assert_equal %(the JLine <sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnote_1" title="View footnote.">1</a>]</sup>\nlibrary.), result
+      assert_equal %(the JLine <sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnotedef_1" title="View footnote.">1</a>]</sup>\nlibrary.), result
       assert_equal 1, para.document.catalog[:footnotes].size
       fn1 = para.document.catalog[:footnotes].first
       assert_equal '<a href="https://github.com/jline/jline2" class="bare">https://github.com/jline/jline2</a>', fn1.text
@@ -925,7 +942,7 @@ context 'Substitutions' do
     test 'a footnote macro followed by a semi-colon may contain a plain URL' do
       para = block_from_string %(the JLine footnote:[https://github.com/jline/jline2];\nlibrary.)
       result = para.sub_macros para.source
-      assert_equal %(the JLine <sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnote_1" title="View footnote.">1</a>]</sup>;\nlibrary.), result
+      assert_equal %(the JLine <sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnotedef_1" title="View footnote.">1</a>]</sup>;\nlibrary.), result
       assert_equal 1, para.document.catalog[:footnotes].size
       fn1 = para.document.catalog[:footnotes].first
       assert_equal '<a href="https://github.com/jline/jline2" class="bare">https://github.com/jline/jline2</a>', fn1.text
@@ -937,7 +954,7 @@ context 'Substitutions' do
       doc = para.document
       doc.register :refs, ['_install', (Asciidoctor::Inline.new doc, :anchor, 'Install', :type => :ref, :target => '_install'), 'Install']
       catalog = doc.catalog
-      assert_equal %(text <sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnote_1" title="View footnote.">1</a>]</sup>), para.sub_macros(para.source)
+      assert_equal %(text <sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnotedef_1" title="View footnote.">1</a>]</sup>), para.sub_macros(para.source)
       assert_equal 1, catalog[:footnotes].size
       footnote1 = catalog[:footnotes][0]
       assert_equal '<a href="#_install">install</a>', footnote1.text
@@ -945,7 +962,7 @@ context 'Substitutions' do
     test 'a footnote macro may contain an anchor macro' do
       para = block_from_string('text footnote:[a [[b\]\] \[[c\]\] d]')
-      assert_equal %(text <sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnote_1" title="View footnote.">1</a>]</sup>), para.sub_macros(para.source)
+      assert_equal %(text <sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnotedef_1" title="View footnote.">1</a>]</sup>), para.sub_macros(para.source)
       assert_equal 1, para.document.catalog[:footnotes].size
       footnote1 = para.document.catalog[:footnotes][0]
       assert_equal 'a <a id="b"></a> [[c]] d', footnote1.text
@@ -962,7 +979,7 @@ foofootnote:[+http://example.com+]barfootnote:[+http://acme.com+]baz
     test 'should increment index of subsequent footnote macros' do
       para = block_from_string("Sentence text footnote:[An example footnote.]. Sentence text footnote:[Another footnote.].")
-      assert_equal %(Sentence text <sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnote_1" title="View footnote.">1</a>]</sup>. Sentence text <sup class="footnote">[<a id="_footnoteref_2" class="footnote" href="#_footnote_2" title="View footnote.">2</a>]</sup>.), para.sub_macros(para.source)
+      assert_equal %(Sentence text <sup class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnotedef_1" title="View footnote.">1</a>]</sup>. Sentence text <sup class="footnote">[<a id="_footnoteref_2" class="footnote" href="#_footnotedef_2" title="View footnote.">2</a>]</sup>.), para.sub_macros(para.source)
       assert_equal 2, para.document.catalog[:footnotes].size
       footnote1 = para.document.catalog[:footnotes][0]
       assert_equal 1, footnote1.index
@@ -976,7 +993,7 @@ foofootnote:[+http://example.com+]barfootnote:[+http://acme.com+]baz
     test 'a footnoteref macro with id and single-line text should be registered and rendered as a footnote' do
       para = block_from_string('Sentence text footnoteref:[ex1, An example footnote.].')
-      assert_equal %(Sentence text <sup class="footnote" id="_footnote_ex1">[<a id="_footnoteref_1" class="footnote" href="#_footnote_1" title="View footnote.">1</a>]</sup>.), para.sub_macros(para.source)
+      assert_equal %(Sentence text <sup class="footnote" id="_footnote_ex1">[<a id="_footnoteref_1" class="footnote" href="#_footnotedef_1" title="View footnote.">1</a>]</sup>.), para.sub_macros(para.source)
       assert_equal 1, para.document.catalog[:footnotes].size
       footnote = para.document.catalog[:footnotes].first
       assert_equal 1, footnote.index
@@ -986,7 +1003,7 @@ foofootnote:[+http://example.com+]barfootnote:[+http://acme.com+]baz
     test 'a footnoteref macro with id and multi-line text should be registered and rendered as a footnote without endlines' do
       para = block_from_string("Sentence text footnoteref:[ex1, An example footnote\nwith wrapped text.].")
-      assert_equal %(Sentence text <sup class="footnote" id="_footnote_ex1">[<a id="_footnoteref_1" class="footnote" href="#_footnote_1" title="View footnote.">1</a>]</sup>.), para.sub_macros(para.source)
+      assert_equal %(Sentence text <sup class="footnote" id="_footnote_ex1">[<a id="_footnoteref_1" class="footnote" href="#_footnotedef_1" title="View footnote.">1</a>]</sup>.), para.sub_macros(para.source)
       assert_equal 1, para.document.catalog[:footnotes].size
       footnote = para.document.catalog[:footnotes].first
       assert_equal 1, footnote.index
@@ -996,7 +1013,7 @@ foofootnote:[+http://example.com+]barfootnote:[+http://acme.com+]baz
     test 'a footnoteref macro with id should refer to footnoteref with same id' do
       para = block_from_string('Sentence text footnoteref:[ex1, An example footnote.]. Sentence text footnoteref:[ex1].')
-      assert_equal %(Sentence text <sup class="footnote" id="_footnote_ex1">[<a id="_footnoteref_1" class="footnote" href="#_footnote_1" title="View footnote.">1</a>]</sup>. Sentence text <sup class="footnoteref">[<a class="footnote" href="#_footnote_1" title="View footnote.">1</a>]</sup>.), para.sub_macros(para.source)
+      assert_equal %(Sentence text <sup class="footnote" id="_footnote_ex1">[<a id="_footnoteref_1" class="footnote" href="#_footnotedef_1" title="View footnote.">1</a>]</sup>. Sentence text <sup class="footnoteref">[<a class="footnote" href="#_footnotedef_1" title="View footnote.">1</a>]</sup>.), para.sub_macros(para.source)
       assert_equal 1, para.document.catalog[:footnotes].size
       footnote = para.document.catalog[:footnotes].first
       assert_equal 1, footnote.index
@@ -1004,9 +1021,66 @@ foofootnote:[+http://example.com+]barfootnote:[+http://acme.com+]baz
       assert_equal 'An example footnote.', footnote.text
     end
-    test 'an unresolved footnoteref should not crash the processor' do
-      para = block_from_string('Sentence text footnoteref:[ex1].')
-      para.sub_macros para.source
+    test 'an unresolved footnote reference should produce a warning message' do
+      input = 'Sentence text.footnote:ex1[]'
+      using_memory_logger do |logger|
+        para = block_from_string input
+        para.sub_macros para.source
+        assert_message logger, :WARN, 'invalid footnote reference: ex1'
+      end
+    end
+    test 'inline footnote macro can be used to define and reference a footnote reference' do
+      input = <<-EOS
+You can download the software from the product page.footnote:sub[Option only available if you have an active subscription.]
+You can also file a support request.footnote:sub[]
+If all else fails, you can give us a call.footnoteref:[sub]
+      EOS
+      output = render_embedded_string input
+      assert_css '#_footnotedef_1', output, 1
+      assert_css 'p a[href="#_footnotedef_1"]', output, 3
+      assert_css '#footnotes .footnote', output, 1
+    end
+    test 'should parse multiple footnote references in a single line' do
+      input = <<-'EOS'
+notable text.footnote:id[about this [text\]], footnote:id[], footnote:id[]
+      EOS
+      output = render_embedded_string input
+      assert_xpath '(//p)[1]/sup[starts-with(@class,"footnote")]', output, 3
+      assert_xpath '(//p)[1]/sup[@class="footnote"]', output, 1
+      assert_xpath '(//p)[1]/sup[@class="footnoteref"]', output, 2
+      assert_xpath '(//p)[1]/sup[starts-with(@class,"footnote")]/a[@class="footnote"][text()="1"]', output, 3
+      assert_css '#footnotes .footnote', output, 1
+    end
+    test 'should not resolve an inline footnote macro missing both id and text' do
+      input = <<-EOS
+The footnote:[] macro can be used for defining and referencing footnotes.
+The footnoteref:[] macro is now deprecated.
+      EOS
+      output = render_embedded_string input
+      assert_includes output, 'The footnote:[] macro'
+      assert_includes output, 'The footnoteref:[] macro'
+    end
+    test 'inline footnote macro can define a numeric id without conflicting with auto-generated ID' do
+      input = <<-EOS
+You can download the software from the product page.footnote:1[Option only available if you have an active subscription.]
+      EOS
+      output = render_embedded_string input
+      assert_css '#_footnote_1', output, 1
+      assert_css 'p sup#_footnote_1', output, 1
+      assert_css 'p a#_footnoteref_1', output, 1
+      assert_css 'p a[href="#_footnotedef_1"]', output, 1
+      assert_css '#footnotes #_footnotedef_1', output, 1
     end
     test 'a single-line index term macro with a primary term should be registered as an index reference' do
@@ -1057,6 +1131,16 @@ foofootnote:[+http://example.com+]barfootnote:[+http://acme.com+]baz
       end
     end
+    test 'should only escape enclosing brackets if concealed index term is preceded by a backslash' do
+      input = %[National Institute of Science and Technology #{BACKSLASH}(((NIST)))]
+      doc = document_from_string input, :header_footer => false
+      output = doc.convert
+      assert_xpath '//p[text()="National Institute of Science and Technology (NIST)"]', output, 1
+      term = doc.catalog[:indexterms].first
+      assert_equal 1, term.size
+      assert_equal 'NIST', term.first
+    end
     test 'should not split index terms on commas inside of quoted terms' do
       inputs = []
       inputs.push <<-EOS
@@ -1585,18 +1669,34 @@ EOS
         assert_equal '\$a &lt; b\$', para.content
       end
-      # 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 contents of asciimath macro to MathML in DocBook output if asciimath gem is available' do
+        asciimath_available = !(Asciidoctor::Helpers.require_library 'asciimath', true, :ignore).nil?
+        input = 'asciimath:[a < b]'
+        expected = '<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>'
+        using_memory_logger do |logger|
+          para = block_from_string input, :backend => :docbook
+          actual = para.content
+          if asciimath_available
+            assert_equal expected, actual
+            assert_equal :loaded, para.document.converter.instance_variable_get(:@asciimath)
+          else
+            assert_message logger, :WARN, 'optional gem \'asciimath\' is not installed. Functionality disabled.'
+            assert_equal :unavailable, para.document.converter.instance_variable_get(:@asciimath)
+          end
+        end
+      end
-      test 'should convert asciimath macro content to MathML when asciimath gem is available' do
+      test 'should not perform specialcharacters subs on asciimath macro content in Docbook output if asciimath gem not available' do
+        asciimath_available = !(Asciidoctor::Helpers.require_library 'asciimath', true, :ignore).nil?
         input = 'asciimath:[a < b]'
         para = block_from_string input, :backend => :docbook
-        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
+        para.document.converter.instance_variable_set :@asciimath, :unavailable
+        if asciimath_available
+          old_asciimath = ::AsciiMath
+          Object.send :remove_const, 'AsciiMath'
+        end
+        assert_equal '<inlineequation><mathphrase><![CDATA[a < b]]></mathphrase></inlineequation>', para.content
+        ::AsciiMath = old_asciimath if asciimath_available
       end
       test 'should honor explicit subslist on asciimath macro' do
@@ -1649,17 +1749,36 @@ EOS
         assert_equal 'the text <code>asciimath:[x = y]</code> should be passed through as <code>literal</code> text', para.content
       end
+      test 'should not process an escaped passthrough macro inside a monospaced phrase' do
+        input = 'use the `\pass:c[]` macro'
+        para = block_from_string input
+        assert_equal 'use the <code>pass:c[]</code> macro', para.content
+      end
+      test 'should not process an escaped passthrough macro inside a monospaced phrase with attributes' do
+        input = 'use the [syntax]`\pass:c[]` macro'
+        para = block_from_string input
+        assert_equal 'use the <code class="syntax">pass:c[]</code> macro', para.content
+      end
+      test 'should honor an escaped single plus passthrough inside a monospaced phrase' do
+        input = 'use `\+{author}+` to show an attribute reference'
+        para = block_from_string input
+        assert_equal 'use <code>+{author}+</code> to show an attribute reference', para.content
+      end
       test 'should not recognize stem macro with no content' do
         input = 'stem:[]'
         para = block_from_string input
         assert_equal input, para.content
       end
-      test 'should passthrough text in stem macro and surround with AsciiMath delimiters if stem attribute != latexmath' do
+      test 'should passthrough text in stem macro and surround with AsciiMath delimiters if stem attribute is asciimath, empty, or not set' do
         [
           {},
           {'stem' => ''},
-          {'stem' => 'asciimath'}
+          {'stem' => 'asciimath'},
+          {'stem' => 'bogus'}
         ].each do |attributes|
           input = 'stem:[x/x={(1,if x!=0),(text{undefined},if x=0):}]'
           para = block_from_string input, :attributes => attributes
@@ -1667,10 +1786,16 @@ EOS
         end
       end
-      test 'should passthrough text in stem macro and surround with LaTeX math delimiters if stem attribute = latexmath' do
-        input = 'stem:[C = \alpha + \beta Y^{\gamma} + \epsilon]'
-        para = block_from_string input, :attributes => {'stem' => 'latexmath'}
-        assert_equal '\(C = \alpha + \beta Y^{\gamma} + \epsilon\)', para.content
+      test 'should passthrough text in stem macro and surround with LaTeX math delimiters if stem attribute is latexmath, latex, or tex' do
+        [
+          {'stem' => 'latexmath'},
+          {'stem' => 'latex'},
+          {'stem' => 'tex'}
+        ].each do |attributes|
+          input = 'stem:[C = \alpha + \beta Y^{\gamma} + \epsilon]'
+          para = block_from_string input, :attributes => attributes
+          assert_equal '\(C = \alpha + \beta Y^{\gamma} + \epsilon\)', para.content
+        end
       end
       test 'should apply substitutions specified on stem macro' do
@@ -1779,25 +1904,25 @@ foo&#8201;&#8212;&#8201;'
   context 'Post replacements' do
     test 'line break inserted after line with line break character' do
       para = block_from_string("First line +\nSecond line")
-      result = para.apply_subs(para.lines, :post_replacements, true)
+      result = para.apply_subs para.lines, (para.expand_subs :post_replacements)
       assert_equal 'First line<br>', result.first
     end
     test 'line break inserted after line wrap with hardbreaks enabled' do
       para = block_from_string("First line\nSecond line", :attributes => {'hardbreaks' => ''})
-      result = para.apply_subs(para.lines, :post_replacements, true)
+      result = para.apply_subs para.lines, (para.expand_subs :post_replacements)
       assert_equal 'First line<br>', result.first
     end
     test 'line break character stripped from end of line with hardbreaks enabled' do
       para = block_from_string("First line +\nSecond line", :attributes => {'hardbreaks' => ''})
-      result = para.apply_subs(para.lines, :post_replacements, true)
+      result = para.apply_subs para.lines, (para.expand_subs :post_replacements)
       assert_equal 'First line<br>', result.first
     end
     test 'line break not inserted for single line with hardbreaks enabled' do
       para = block_from_string('First line', :attributes => {'hardbreaks' => ''})
-      result = para.apply_subs(para.lines, :post_replacements, true)
+      result = para.apply_subs para.lines, (para.expand_subs :post_replacements)
       assert_equal 'First line', result.first
     end
   end