test/links_test.rb in asciidoctor-1.5.7.1 vs test/links_test.rb in asciidoctor-1.5.8

@@ -5,51 +5,60 @@
 end
 
 context 'Links' do
 
   test 'qualified url inline with text' do
-    assert_xpath "//a[@href='http://asciidoc.org'][@class='bare'][text() = 'http://asciidoc.org']", render_string("The AsciiDoc project is located at http://asciidoc.org.")
+    assert_xpath "//a[@href='http://asciidoc.org'][@class='bare'][text() = 'http://asciidoc.org']", convert_string("The AsciiDoc project is located at http://asciidoc.org.")
   end
 
   test 'qualified url with role inline with text' do
-    assert_xpath "//a[@href='http://asciidoc.org'][@class='bare project'][text() = 'http://asciidoc.org']", render_string("The AsciiDoc project is located at http://asciidoc.org[role=project].")
+    assert_xpath "//a[@href='http://asciidoc.org'][@class='bare project'][text() = 'http://asciidoc.org']", convert_string("The AsciiDoc project is located at http://asciidoc.org[role=project].")
   end
 
   test 'qualified http url inline with hide-uri-scheme set' do
-    assert_xpath "//a[@href='http://asciidoc.org'][@class='bare'][text() = 'asciidoc.org']", render_string("The AsciiDoc project is located at http://asciidoc.org.", :attributes => {'hide-uri-scheme' => ''})
+    assert_xpath "//a[@href='http://asciidoc.org'][@class='bare'][text() = 'asciidoc.org']", convert_string("The AsciiDoc project is located at http://asciidoc.org.", :attributes => {'hide-uri-scheme' => ''})
   end
 
   test 'qualified file url inline with label' do
-    assert_xpath "//a[@href='file:///home/user/bookmarks.html'][text() = 'My Bookmarks']", render_embedded_string('file:///home/user/bookmarks.html[My Bookmarks]')
+    assert_xpath "//a[@href='file:///home/user/bookmarks.html'][text() = 'My Bookmarks']", convert_string_to_embedded('file:///home/user/bookmarks.html[My Bookmarks]')
   end
 
   test 'qualified file url inline with hide-uri-scheme set' do
-    assert_xpath "//a[@href='file:///etc/app.conf'][text() = '/etc/app.conf']", render_string('Edit the configuration file link:file:///etc/app.conf[]', :attributes => {'hide-uri-scheme' => ''})
+    assert_xpath "//a[@href='file:///etc/app.conf'][text() = '/etc/app.conf']", convert_string('Edit the configuration file link:file:///etc/app.conf[]', :attributes => {'hide-uri-scheme' => ''})
   end
 
+  test 'should not hide bare URI scheme in implicit text of link macro when hide-uri-scheme is set' do
+    {
+      'link:https://[]' => 'https://',
+      'link:ssh://[]' => 'ssh://'
+    }.each do |input, expected|
+      assert_xpath %(/a[text() = "#{expected}"]), (convert_inline_string input, :attributes => { 'hide-uri-scheme' => '' })
+    end
+  end
+
   test 'qualified url with label' do
-    assert_xpath "//a[@href='http://asciidoc.org'][text() = 'AsciiDoc']", render_string("We're parsing http://asciidoc.org[AsciiDoc] markup")
+    assert_xpath "//a[@href='http://asciidoc.org'][text() = 'AsciiDoc']", convert_string("We're parsing http://asciidoc.org[AsciiDoc] markup")
   end
 
   test 'qualified url with label containing escaped right square bracket' do
-    assert_xpath "//a[@href='http://asciidoc.org'][text() = '[Ascii]Doc']", render_string("We're parsing http://asciidoc.org[[Ascii\\]Doc] markup")
+    assert_xpath "//a[@href='http://asciidoc.org'][text() = '[Ascii]Doc']", convert_string("We're parsing http://asciidoc.org[[Ascii\\]Doc] markup")
   end
 
   test 'qualified url with backslash label' do
-    assert_xpath "//a[@href='https://google.com'][text() = 'Google for \\']", render_string("I advise you to https://google.com[Google for +\\+]")
+    assert_xpath "//a[@href='https://google.com'][text() = 'Google for \\']", convert_string("I advise you to https://google.com[Google for +\\+]")
   end
 
   test 'qualified url with label using link macro' do
-    assert_xpath "//a[@href='http://asciidoc.org'][text() = 'AsciiDoc']", render_string("We're parsing link:http://asciidoc.org[AsciiDoc] markup")
+    assert_xpath "//a[@href='http://asciidoc.org'][text() = 'AsciiDoc']", convert_string("We're parsing link:http://asciidoc.org[AsciiDoc] markup")
   end
 
   test 'qualified url with role using link macro' do
-    assert_xpath "//a[@href='http://asciidoc.org'][@class='bare project'][text() = 'http://asciidoc.org']", render_string("We're parsing link:http://asciidoc.org[role=project] markup")
+    assert_xpath "//a[@href='http://asciidoc.org'][@class='bare project'][text() = 'http://asciidoc.org']", convert_string("We're parsing link:http://asciidoc.org[role=project] markup")
   end
 
   test 'qualified url using macro syntax with multi-line label inline with text' do
-    assert_xpath %{//a[@href='http://asciidoc.org'][text() = 'AsciiDoc\nmarkup']}, render_string("We're parsing link:http://asciidoc.org[AsciiDoc\nmarkup]")
+    assert_xpath %{//a[@href='http://asciidoc.org'][text() = 'AsciiDoc\nmarkup']}, convert_string("We're parsing link:http://asciidoc.org[AsciiDoc\nmarkup]")
   end
 
   test 'qualified url with label containing square brackets using link macro' do
     str = 'http://example.com[[bracket1\]]'
     doc = document_from_string str, :header_footer => false, :doctype => 'inline'
@@ -60,58 +69,58 @@
     assert_match '<ulink url="http://example.com">[bracket1]</ulink>', doc.convert, 1
   end
 
   test 'link macro with empty target' do
     input = 'Link to link:[this page].'
-    output = render_embedded_string input
+    output = convert_string_to_embedded input
     assert_xpath '//a', output, 1
     assert_xpath '//a[@href=""]', output, 1
   end
 
   test 'should not recognize link macro with double colons' do
     input = 'The link::http://example.org[example domain] is reserved for tests and documentation.'
-    output = render_embedded_string input
+    output = convert_string_to_embedded input
     assert_includes output, 'link::http://example.org[example domain]'
   end
 
   test 'qualified url surrounded by angled brackets' do
-    assert_xpath '//a[@href="http://asciidoc.org"][text()="http://asciidoc.org"]', render_string('<http://asciidoc.org> is the project page for AsciiDoc.'), 1
+    assert_xpath '//a[@href="http://asciidoc.org"][text()="http://asciidoc.org"]', convert_string('<http://asciidoc.org> is the project page for AsciiDoc.'), 1
   end
 
   test 'qualified url surrounded by round brackets' do
-    assert_xpath '//a[@href="http://asciidoc.org"][text()="http://asciidoc.org"]', render_string('(http://asciidoc.org) is the project page for AsciiDoc.'), 1
+    assert_xpath '//a[@href="http://asciidoc.org"][text()="http://asciidoc.org"]', convert_string('(http://asciidoc.org) is the project page for AsciiDoc.'), 1
   end
 
   test 'qualified url with trailing round bracket' do
-    assert_xpath '//a[@href="https://asciidoctor.org"][text()="https://asciidoctor.org"]', render_string('Asciidoctor is a Ruby-based AsciiDoc processor (see https://asciidoctor.org)'), 1
+    assert_xpath '//a[@href="https://asciidoctor.org"][text()="https://asciidoctor.org"]', convert_string('Asciidoctor is a Ruby-based AsciiDoc processor (see https://asciidoctor.org)'), 1
   end
 
   test 'qualified url with trailing semi-colon' do
-    assert_xpath '//a[@href="https://asciidoctor.org"][text()="https://asciidoctor.org"]', render_string('https://asciidoctor.org; where text gets parsed'), 1
+    assert_xpath '//a[@href="https://asciidoctor.org"][text()="https://asciidoctor.org"]', convert_string('https://asciidoctor.org; where text gets parsed'), 1
   end
 
   test 'qualified url with trailing colon' do
-    assert_xpath '//a[@href="https://asciidoctor.org"][text()="https://asciidoctor.org"]', render_string('https://asciidoctor.org: where text gets parsed'), 1
+    assert_xpath '//a[@href="https://asciidoctor.org"][text()="https://asciidoctor.org"]', convert_string('https://asciidoctor.org: where text gets parsed'), 1
   end
 
   test 'qualified url in round brackets with trailing colon' do
-    assert_xpath '//a[@href="https://asciidoctor.org"][text()="https://asciidoctor.org"]', render_string('(https://asciidoctor.org): where text gets parsed'), 1
+    assert_xpath '//a[@href="https://asciidoctor.org"][text()="https://asciidoctor.org"]', convert_string('(https://asciidoctor.org): where text gets parsed'), 1
   end
 
   test 'qualified url with trailing round bracket followed by colon' do
-    result = render_embedded_string '(from https://asciidoctor.org): where text gets parsed'
+    result = convert_string_to_embedded '(from https://asciidoctor.org): where text gets parsed'
     assert_xpath '//a[@href="https://asciidoctor.org"][text()="https://asciidoctor.org"]', result, 1
     assert_xpath '//a[@href="https://asciidoctor.org"][text()="https://asciidoctor.org"]/preceding-sibling::text()[.="(from "]', result, 1
     assert_xpath '//a[@href="https://asciidoctor.org"][text()="https://asciidoctor.org"]/following-sibling::text()[.="): where text gets parsed"]', result, 1
   end
 
   test 'qualified url in round brackets with trailing semi-colon' do
-    assert_xpath '//a[@href="https://asciidoctor.org"][text()="https://asciidoctor.org"]', render_string('(https://asciidoctor.org); where text gets parsed'), 1
+    assert_xpath '//a[@href="https://asciidoctor.org"][text()="https://asciidoctor.org"]', convert_string('(https://asciidoctor.org); where text gets parsed'), 1
   end
 
   test 'qualified url with trailing round bracket followed by semi-colon' do
-    result = render_embedded_string '(from https://asciidoctor.org); where text gets parsed'
+    result = convert_string_to_embedded '(from https://asciidoctor.org); where text gets parsed'
     assert_xpath '//a[@href="https://asciidoctor.org"][text()="https://asciidoctor.org"]', result, 1
     assert_xpath '//a[@href="https://asciidoctor.org"][text()="https://asciidoctor.org"]/preceding-sibling::text()[.="(from "]', result, 1
     assert_xpath '//a[@href="https://asciidoctor.org"][text()="https://asciidoctor.org"]/following-sibling::text()[.="); where text gets parsed"]', result, 1
   end
 
@@ -134,137 +143,137 @@
       assert_equal expected_output, actual.content
     end
   end
 
   test 'qualified url containing round brackets' do
-    assert_xpath '//a[@href="http://jruby.org/apidocs/org/jruby/Ruby.html#addModule(org.jruby.RubyModule)"][text()="addModule() adds a Ruby module"]', render_string('http://jruby.org/apidocs/org/jruby/Ruby.html#addModule(org.jruby.RubyModule)[addModule() adds a Ruby module]'), 1
+    assert_xpath '//a[@href="http://jruby.org/apidocs/org/jruby/Ruby.html#addModule(org.jruby.RubyModule)"][text()="addModule() adds a Ruby module"]', convert_string('http://jruby.org/apidocs/org/jruby/Ruby.html#addModule(org.jruby.RubyModule)[addModule() adds a Ruby module]'), 1
   end
 
   test 'qualified url adjacent to text in square brackets' do
-    assert_xpath '//a[@href="http://asciidoc.org"][text()="AsciiDoc"]', render_string(']http://asciidoc.org[AsciiDoc] project page.'), 1
+    assert_xpath '//a[@href="http://asciidoc.org"][text()="AsciiDoc"]', convert_string(']http://asciidoc.org[AsciiDoc] project page.'), 1
   end
 
   test 'qualified url adjacent to text in round brackets' do
-    assert_xpath '//a[@href="http://asciidoc.org"][text()="AsciiDoc"]', render_string(')http://asciidoc.org[AsciiDoc] project page.'), 1
+    assert_xpath '//a[@href="http://asciidoc.org"][text()="AsciiDoc"]', convert_string(')http://asciidoc.org[AsciiDoc] project page.'), 1
   end
 
   test 'qualified url following no-break space' do
-    assert_xpath '//a[@href="http://asciidoc.org"][text()="AsciiDoc"]', render_string(%(#{[0xa0].pack 'U1'}http://asciidoc.org[AsciiDoc] project page.)), 1
+    assert_xpath '//a[@href="http://asciidoc.org"][text()="AsciiDoc"]', convert_string(%(#{[0xa0].pack 'U1'}http://asciidoc.org[AsciiDoc] project page.)), 1
   end if ::RUBY_MIN_VERSION_1_9
 
   test 'qualified url following smart apostrophe' do
-    output = render_embedded_string("l&#8217;http://www.irit.fr[IRIT]")
+    output = convert_string_to_embedded("l&#8217;http://www.irit.fr[IRIT]")
     assert_match(/l&#8217;<a href=/, output)
   end
 
   test 'qualified url using invalid link macro should not create link' do
-    assert_xpath '//a', render_string('link:http://asciidoc.org is the project page for AsciiDoc.'), 0
+    assert_xpath '//a', convert_string('link:http://asciidoc.org is the project page for AsciiDoc.'), 0
   end
 
   test 'escaped inline qualified url should not create link' do
-    assert_xpath '//a', render_string('\http://asciidoc.org is the project page for AsciiDoc.'), 0
+    assert_xpath '//a', convert_string('\http://asciidoc.org is the project page for AsciiDoc.'), 0
   end
 
   test 'url in link macro with at (@) sign should not create mailto link' do
-    assert_xpath '//a[@href="http://xircles.codehaus.org/lists/[e-mail]"][text()="subscribe"]', render_string('http://xircles.codehaus.org/lists/[e-mail][subscribe]')
+    assert_xpath '//a[@href="http://xircles.codehaus.org/lists/[e-mail]"][text()="subscribe"]', convert_string('http://xircles.codehaus.org/lists/[e-mail][subscribe]')
   end
 
   test 'implicit url with at (@) sign should not create mailto link' do
-    assert_xpath '//a[@href="http://xircles.codehaus.org/lists/[e-mail]"][text()="http://xircles.codehaus.org/lists/[e-mail]"]', render_string('http://xircles.codehaus.org/lists/[e-mail]')
+    assert_xpath '//a[@href="http://xircles.codehaus.org/lists/[e-mail]"][text()="http://xircles.codehaus.org/lists/[e-mail]"]', convert_string('http://xircles.codehaus.org/lists/[e-mail]')
   end
 
   test 'escaped inline qualified url using macro syntax should not create link' do
-    assert_xpath '//a', render_string('\http://asciidoc.org[AsciiDoc] is the key to good docs.'), 0
+    assert_xpath '//a', convert_string('\http://asciidoc.org[AsciiDoc] is the key to good docs.'), 0
   end
 
   test 'inline qualified url followed by an endline should not include endline in link' do
-    assert_xpath '//a[@href="https://github.com/asciidoctor"]', render_string("The source code for Asciidoctor can be found at https://github.com/asciidoctor\nwhich is a GitHub organization."), 1
+    assert_xpath '//a[@href="https://github.com/asciidoctor"]', convert_string("The source code for Asciidoctor can be found at https://github.com/asciidoctor\nwhich is a GitHub organization."), 1
   end
 
   test 'qualified url divided by endline using macro syntax should not create link' do
-    assert_xpath '//a', render_string("The source code for Asciidoctor can be found at link:https://github.com/asciidoctor\n[]which is a GitHub organization."), 0
+    assert_xpath '//a', convert_string("The source code for Asciidoctor can be found at link:https://github.com/asciidoctor\n[]which is a GitHub organization."), 0
   end
 
   test 'qualified url containing whitespace using macro syntax should not create link' do
-    assert_xpath '//a', render_string('I often need to refer to the chapter on link:http://asciidoc.org?q=attribute references[Attribute References].'), 0
+    assert_xpath '//a', convert_string('I often need to refer to the chapter on link:http://asciidoc.org?q=attribute references[Attribute References].'), 0
   end
 
   test 'qualified url containing an encoded space using macro syntax should create a link' do
-    assert_xpath '//a', render_string('I often need to refer to the chapter on link:http://asciidoc.org?q=attribute%20references[Attribute References].'), 1
+    assert_xpath '//a', convert_string('I often need to refer to the chapter on link:http://asciidoc.org?q=attribute%20references[Attribute References].'), 1
   end
 
   test 'inline quoted qualified url should not consume surrounding angled brackets' do
-    assert_xpath '//a[@href="https://github.com/asciidoctor"]', render_string('Asciidoctor GitHub organization: <**https://github.com/asciidoctor**>'), 1
+    assert_xpath '//a[@href="https://github.com/asciidoctor"]', convert_string('Asciidoctor GitHub organization: <**https://github.com/asciidoctor**>'), 1
   end
 
   test 'link with quoted text should not be separated into attributes when text contains an equal sign' do
-    assert_xpath '//a[@href="http://search.example.com"][text()="Google, Yahoo, Bing = Search Engines"]', render_embedded_string('http://search.example.com["Google, Yahoo, Bing = Search Engines"]'), 1
+    assert_xpath '//a[@href="http://search.example.com"][text()="Google, Yahoo, Bing = Search Engines"]', convert_string_to_embedded('http://search.example.com["Google, Yahoo, Bing = Search Engines"]'), 1
   end
 
   test 'link with quoted text but no equal sign should carry quotes over to output' do
-    assert_xpath %(//a[@href="http://search.example.com"][text()='"Google, Yahoo, Bing"']), render_embedded_string('http://search.example.com["Google, Yahoo, Bing"]'), 1
+    assert_xpath %(//a[@href="http://search.example.com"][text()='"Google, Yahoo, Bing"']), convert_string_to_embedded('http://search.example.com["Google, Yahoo, Bing"]'), 1
   end
 
   test 'link with comma in text but no equal sign should not be separated into attributes' do
-    assert_xpath '//a[@href="http://search.example.com"][text()="Google, Yahoo, Bing"]', render_embedded_string('http://search.example.com[Google, Yahoo, Bing]'), 1
+    assert_xpath '//a[@href="http://search.example.com"][text()="Google, Yahoo, Bing"]', convert_string_to_embedded('http://search.example.com[Google, Yahoo, Bing]'), 1
   end
 
   test 'role and window attributes on link are processed' do
-    assert_xpath '//a[@href="http://google.com"][@class="external"][@target="_blank"]', render_embedded_string('http://google.com[Google, role=external, window="_blank"]'), 1
+    assert_xpath '//a[@href="http://google.com"][@class="external"][@target="_blank"]', convert_string_to_embedded('http://google.com[Google, role=external, window="_blank"]'), 1
   end
 
   test 'link macro with attributes but no text should use URL as text' do
     url = 'https://fonts.googleapis.com/css?family=Roboto:400,400italic,'
-    assert_xpath %(//a[@href="#{url}"][text()="#{url}"]), render_embedded_string(%(link:#{url}[family=Roboto,weight=400])), 1
+    assert_xpath %(//a[@href="#{url}"][text()="#{url}"]), convert_string_to_embedded(%(link:#{url}[family=Roboto,weight=400])), 1
   end
 
   test 'link macro with attributes but blank text should use URL as text' do
     url = 'https://fonts.googleapis.com/css?family=Roboto:400,400italic,'
-    assert_xpath %(//a[@href="#{url}"][text()="#{url}"]), render_embedded_string(%(link:#{url}[,family=Roboto,weight=400])), 1
+    assert_xpath %(//a[@href="#{url}"][text()="#{url}"]), convert_string_to_embedded(%(link:#{url}[,family=Roboto,weight=400])), 1
   end
 
   test 'link macro with comma but no explicit attributes in text should not parse text' do
     url = 'https://fonts.googleapis.com/css?family=Roboto:400,400italic,'
-    assert_xpath %(//a[@href="#{url}"][text()="Roboto,400"]), render_embedded_string(%(link:#{url}[Roboto,400])), 1
+    assert_xpath %(//a[@href="#{url}"][text()="Roboto,400"]), convert_string_to_embedded(%(link:#{url}[Roboto,400])), 1
   end
 
   test 'link text that ends in ^ should set link window to _blank' do
-    assert_xpath '//a[@href="http://google.com"][@target="_blank"]', render_embedded_string('http://google.com[Google^]'), 1
+    assert_xpath '//a[@href="http://google.com"][@target="_blank"]', convert_string_to_embedded('http://google.com[Google^]'), 1
   end
 
   test 'rel=noopener should be added to a link that targets the _blank window' do
-    assert_xpath '//a[@href="http://google.com"][@target="_blank"][@rel="noopener"]', render_embedded_string('http://google.com[Google^]'), 1
+    assert_xpath '//a[@href="http://google.com"][@target="_blank"][@rel="noopener"]', convert_string_to_embedded('http://google.com[Google^]'), 1
   end
 
   test 'rel=noopener should be added to a link that targets a named window when the noopener option is set' do
-    assert_xpath '//a[@href="http://google.com"][@target="name"][@rel="noopener"]', render_embedded_string('http://google.com[Google,window=name,opts=noopener]'), 1
+    assert_xpath '//a[@href="http://google.com"][@target="name"][@rel="noopener"]', convert_string_to_embedded('http://google.com[Google,window=name,opts=noopener]'), 1
   end
 
   test 'rel=noopener should not be added to a link if it does not target a window' do
-    result = render_embedded_string 'http://google.com[Google,opts=noopener]'
+    result = convert_string_to_embedded 'http://google.com[Google,opts=noopener]'
     assert_xpath '//a[@href="http://google.com"]', result, 1
     assert_xpath '//a[@href="http://google.com"][@rel="noopener"]', result, 0
   end
 
   test 'rel=nofollow should be added to a link when the nofollow option is set' do
-    assert_xpath '//a[@href="http://google.com"][@target="name"][@rel="nofollow noopener"]', render_embedded_string('http://google.com[Google,window=name,opts="nofollow,noopener"]'), 1
+    assert_xpath '//a[@href="http://google.com"][@target="name"][@rel="nofollow noopener"]', convert_string_to_embedded('http://google.com[Google,window=name,opts="nofollow,noopener"]'), 1
   end
 
   test 'id attribute on link is processed' do
-    assert_xpath '//a[@href="http://google.com"][@id="link-1"]', render_embedded_string('http://google.com[Google, id="link-1"]'), 1
+    assert_xpath '//a[@href="http://google.com"][@id="link-1"]', convert_string_to_embedded('http://google.com[Google, id="link-1"]'), 1
   end
 
   test 'title attribute on link is processed' do
-    assert_xpath '//a[@href="http://google.com"][@title="title-1"]', render_embedded_string('http://google.com[Google, title="title-1"]'), 1
+    assert_xpath '//a[@href="http://google.com"][@title="title-1"]', convert_string_to_embedded('http://google.com[Google, title="title-1"]'), 1
   end
 
   test 'inline irc link' do
-    assert_xpath '//a[@href="irc://irc.freenode.net"][text()="irc://irc.freenode.net"]', render_embedded_string('irc://irc.freenode.net'), 1
+    assert_xpath '//a[@href="irc://irc.freenode.net"][text()="irc://irc.freenode.net"]', convert_string_to_embedded('irc://irc.freenode.net'), 1
   end
 
   test 'inline irc link with text' do
-    assert_xpath '//a[@href="irc://irc.freenode.net"][text()="Freenode IRC"]', render_embedded_string('irc://irc.freenode.net[Freenode IRC]'), 1
+    assert_xpath '//a[@href="irc://irc.freenode.net"][text()="Freenode IRC"]', convert_string_to_embedded('irc://irc.freenode.net[Freenode IRC]'), 1
   end
 
   test 'inline ref' do
     variations = %w([[tigers]] anchor:tigers[])
     variations.each do |anchor|
@@ -289,17 +298,17 @@
     end
   end
 
   test 'inline ref can start with colon' do
     input = '[[:idname]] text'
-    output = render_embedded_string input
+    output = convert_string_to_embedded input
     assert_xpath '//a[@id = ":idname"]', output, 1
   end
 
   test 'inline ref cannot start with digit' do
     input = '[[1-install]] text'
-    output = render_embedded_string input
+    output = convert_string_to_embedded input
     assert_includes output, '[[1-install]]'
     assert_xpath '//a[@id = "1-install"]', output, 0
   end
 
   test 'inline ref with reftext' do
@@ -314,11 +323,11 @@
     end
   end
 
   test 'should encode double quotes in reftext of anchor macro in DocBook output' do
     input = 'anchor:uncola[the "un"-cola]'
-    result = render_inline_string input, :backend => :docbook
+    result = convert_inline_string input, :backend => :docbook
     assert_equal '<anchor xml:id="uncola" xreflabel="the &quot;un&quot;-cola"/>', result
   end
 
   test 'should substitute attribute references in reftext when registering inline ref' do
     %w([[tigers,{label-tigers}]] anchor:tigers[{label-tigers}]).each do |anchor|
@@ -347,37 +356,37 @@
     refute doc.catalog[:refs].key?('label')
   end
 
   test 'repeating inline anchor macro with empty reftext' do
     input = 'anchor:one[] anchor:two[] anchor:three[]'
-    result = render_inline_string input
+    result = convert_inline_string input
     assert_equal '<a id="one"></a> <a id="two"></a> <a id="three"></a>', result
   end
 
   test 'mixed inline anchor macro and anchor shorthand with empty reftext' do
     input = 'anchor:one[][[two]]anchor:three[][[four]]anchor:five[]'
-    result = render_inline_string input
+    result = convert_inline_string input
     assert_equal '<a id="one"></a><a id="two"></a><a id="three"></a><a id="four"></a><a id="five"></a>', result
   end
 
   test 'assigns xreflabel value for anchor macro without reftext in DocBook output' do
     input = 'anchor:foo[]'
-    result = render_inline_string input, :backend => :docbook
+    result = convert_inline_string input, :backend => :docbook
     assert_equal '<anchor xml:id="foo" xreflabel="[foo]"/>', result
   end
 
   test 'unescapes square bracket in reftext of anchor macro' do
     input = 'see <<foo>>
 
 anchor:foo[b[a\]r]text'
-    result = render_embedded_string input
+    result = convert_string_to_embedded input
     assert_includes result, 'see <a href="#foo">b[a]r</a>'
   end
 
   test 'unescapes square bracket in reftext of anchor macro in DocBook output' do
     input = 'anchor:foo[b[a\]r]'
-    result = render_inline_string input, :backend => :docbook
+    result = convert_inline_string input, :backend => :docbook
     assert_equal '<anchor xml:id="foo" xreflabel="b[a]r"/>', result
   end
 
   test 'xref using angled bracket syntax' do
     doc = document_from_string '<<tigers>>'
@@ -396,21 +405,21 @@
 <<tigers,About Tigers>>
 
 [#tigers]
 == Tigers
     EOS
-    assert_xpath '//a[@href="#tigers"][text() = "About Tigers"]', render_string(input), 1
+    assert_xpath '//a[@href="#tigers"][text() = "About Tigers"]', convert_string(input), 1
   end
 
   test 'xref using angled bracket syntax with quoted label' do
     input = <<-EOS
 <<tigers,"About Tigers">>
 
 [#tigers]
 == Tigers
     EOS
-    assert_xpath %q(//a[@href="#tigers"][text() = '"About Tigers"']), render_string(input), 1
+    assert_xpath %q(//a[@href="#tigers"][text() = '"About Tigers"']), convert_string(input), 1
   end
 
   test 'should not interpret path sans extension in xref with angled bracket syntax in compat mode' do
     using_memory_logger do |logger|
       doc = document_from_string '<<tigers#>>', :header_footer => false, :attributes => { 'compat-mode' => '' }
@@ -426,17 +435,17 @@
   test 'inter-document xref should not add suffix to path with a non-AsciiDoc extension' do
     {
       'using-.net-web-services' => 'Using .NET web services',
       '../file.pdf' => 'Download the .pdf file'
     }.each do |path, text|
-      result = render_embedded_string %(<<#{path}#,#{text}>>)
+      result = convert_string_to_embedded %(<<#{path}#,#{text}>>)
       assert_xpath %(//a[@href="#{path}"][text() = "#{text}"]), result, 1
     end
   end
 
   test 'inter-document xref should only remove the file extension part if the path contains a period elsewhere' do
-    result = render_embedded_string '<<using-.net-web-services.adoc#,Using .NET web services>>'
+    result = convert_string_to_embedded '<<using-.net-web-services.adoc#,Using .NET web services>>'
     assert_xpath '//a[@href="using-.net-web-services.html"][text() = "Using .NET web services"]', result, 1
   end
 
   test 'xref using angled bracket syntax with path sans extension using docbook backend' do
     doc = document_from_string '<<tigers#>>', :header_footer => false, :backend => 'docbook'
@@ -535,22 +544,22 @@
 Want to learn <<tigers,about tigers>>?
 
 [#tigers]
 == Tigers
     EOS
-    assert_xpath '//a[@href="#tigers"][text() = "about tigers"]', render_string(input), 1
+    assert_xpath '//a[@href="#tigers"][text() = "about tigers"]', convert_string(input), 1
   end
 
   test 'xref using angled bracket syntax with multi-line label inline with text' do
     input = <<-EOS
 Want to learn <<tigers,about
 tigers>>?
 
 [#tigers]
 == Tigers
     EOS
-    assert_xpath %{//a[@href="#tigers"][normalize-space(text()) = "about tigers"]}, render_string(input), 1
+    assert_xpath %{//a[@href="#tigers"][normalize-space(text()) = "about tigers"]}, convert_string(input), 1
   end
 
   test 'xref with escaped text' do
     # when \x0 was used as boundary character for passthrough, it was getting stripped
     # now using unicode marks as boundary characters, which resolves issue
@@ -558,11 +567,11 @@
 See the <<tigers, `+[tigers]+`>> section for details about tigers.
 
 [#tigers]
 == Tigers
     EOS
-    output = render_embedded_string input
+    output = convert_string_to_embedded input
     assert_xpath %(//a[@href="#tigers"]/code[text()="[tigers]"]), output, 1
   end
 
   test 'xref with target that begins with attribute reference in title' do
     ['<<{lessonsdir}/lesson-1#,Lesson 1>>', 'xref:{lessonsdir}/lesson-1#[Lesson 1]'].each do |xref|
@@ -573,11 +582,11 @@
 == #{xref}
 
 A summary of the first lesson.
       EOS
 
-      output = render_embedded_string input
+      output = convert_string_to_embedded input
       assert_xpath '//h2/a[@href="lessons/lesson-1.html"]', output, 1
     end
   end
 
   test 'xref using macro syntax' do
@@ -594,11 +603,11 @@
 == Section A
 
 [#sect-b]
 == Section B
     EOS
-    result = render_embedded_string input
+    result = convert_string_to_embedded input
     assert_xpath '//a[@href="#sect-a"][text() = "Section A"]', result, 1
     assert_xpath '//a[@href="#sect-b"][text() = "Section B"]', result, 1
   end
 
   test 'xref using macro syntax with explicit hash' do
@@ -612,60 +621,60 @@
 xref:tigers[About Tigers]
 
 [#tigers]
 == Tigers
     EOS
-    assert_xpath '//a[@href="#tigers"][text() = "About Tigers"]', render_string(input), 1
+    assert_xpath '//a[@href="#tigers"][text() = "About Tigers"]', convert_string(input), 1
   end
 
   test 'xref using macro syntax inline with text' do
     input = <<-EOS
 Want to learn xref:tigers[about tigers]?
 
 [#tigers]
 == Tigers
     EOS
 
-    assert_xpath '//a[@href="#tigers"][text() = "about tigers"]', render_string(input), 1
+    assert_xpath '//a[@href="#tigers"][text() = "about tigers"]', convert_string(input), 1
   end
 
   test 'xref using macro syntax with multi-line label inline with text' do
     input = <<-EOS
 Want to learn xref:tigers[about
 tigers]?
 
 [#tigers]
 == Tigers
     EOS
-    assert_xpath %{//a[@href="#tigers"][normalize-space(text()) = "about tigers"]}, render_string(input), 1
+    assert_xpath %{//a[@href="#tigers"][normalize-space(text()) = "about tigers"]}, convert_string(input), 1
   end
 
   test 'xref using macro syntax with text that ends with an escaped closing bracket' do
     input = <<-EOS
 xref:tigers[[tigers\\]]
 
 [#tigers]
 == Tigers
     EOS
-    assert_xpath '//a[@href="#tigers"][text() = "[tigers]"]', render_embedded_string(input), 1
+    assert_xpath '//a[@href="#tigers"][text() = "[tigers]"]', convert_string_to_embedded(input), 1
   end
 
   test 'xref using macro syntax with text that contains an escaped closing bracket' do
     input = <<-EOS
 xref:tigers[[tigers\\] are cats]
 
 [#tigers]
 == Tigers
     EOS
-    assert_xpath '//a[@href="#tigers"][text() = "[tigers] are cats"]', render_embedded_string(input), 1
+    assert_xpath '//a[@href="#tigers"][text() = "[tigers] are cats"]', convert_string_to_embedded(input), 1
   end
 
   test 'unescapes square bracket in reftext used by xref' do
     input = 'anchor:foo[b[a\]r]about
 
 see <<foo>>'
-    result = render_embedded_string input
+    result = convert_string_to_embedded input
     assert_xpath '//a[@href="#foo"]', result, 1
     assert_xpath '//a[@href="#foo"][text()="b[a]r"]', result, 1
   end
 
   test 'xref using invalid macro syntax does not create link' do
@@ -683,11 +692,11 @@
 
 See <<foobaz>>.
     EOS
     using_memory_logger do |logger|
       in_verbose_mode do
-        output = render_embedded_string input
+        output = convert_string_to_embedded input
         assert_xpath '//a[@href="#foobaz"][text() = "[foobaz]"]', output, 1
         assert_message logger, :WARN, 'invalid reference: foobaz'
       end
     end
   end
@@ -701,11 +710,11 @@
 
 See <<#foobaz>>.
     EOS
     using_memory_logger do |logger|
       in_verbose_mode do
-        output = render_embedded_string input
+        output = convert_string_to_embedded input
         assert_xpath '//a[@href="#foobaz"][text() = "[foobaz]"]', output, 1
         assert_message logger, :WARN, 'invalid reference: foobaz'
       end
     end
   end
@@ -745,11 +754,11 @@
 Read <<other-chapters.adoc#ch2>> to find out what happens next!
 
 include::other-chapters.adoc[tags=**]
     EOS
 
-    output = render_embedded_string input, :safe => :safe, :base_dir => fixturedir
+    output = convert_string_to_embedded input, :safe => :safe, :base_dir => fixturedir
     assert_xpath '//a[@href="#ch2"][text()="Chapter 2"]', output, 1
   end
 
   test 'should not produce an internal anchor for inter-document xref to file partially included into current file' do
     input = <<-'EOS'
@@ -782,17 +791,32 @@
 
 See <<test.adoc#foobaz>>.
     EOS
     using_memory_logger do |logger|
       in_verbose_mode do
-        output = render_embedded_string input, :attributes => { 'docname' => 'test' }
+        output = convert_string_to_embedded input, :attributes => { 'docname' => 'test' }
         assert_xpath '//a[@href="#foobaz"][text() = "[foobaz]"]', output, 1
         assert_message logger, :WARN, 'invalid reference: foobaz'
       end
     end
   end
 
+  test 'should produce an internal anchor for inter-document xref to file outside of base directory' do
+    input = <<-EOS
+= Document Title
+
+See <<../section-a.adoc#section-a>>.
+
+include::../section-a.adoc[]
+    EOS
+
+    doc = document_from_string input, :safe => :unsafe, :base_dir => (File.join fixturedir, 'subdir')
+    assert_includes doc.catalog[:includes], '../section-a'
+    output = doc.convert :header_footer => false
+    assert_xpath '//a[@href="#section-a"][text()="Section A"]', output, 1
+  end
+
   test 'xref uses title of target as label for forward and backward references in html output' do
     input = <<-EOS
 == Section A
 
 <<_section_b>>
@@ -800,10 +824,10 @@
 == Section B
 
 <<_section_a>>
     EOS
 
-    output = render_embedded_string input
+    output = convert_string_to_embedded input
     assert_xpath '//h2[@id="_section_a"][text()="Section A"]', output, 1
     assert_xpath '//a[@href="#_section_a"][text()="Section A"]', output, 1
     assert_xpath '//h2[@id="_section_b"][text()="Section B"]', output, 1
     assert_xpath '//a[@href="#_section_b"][text()="Section B"]', output, 1
   end