asciidoctor 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9066105e2eb3a4a1eef1b7e03730a3daa81e6b0abcfebef789e5c02e4a070db8
-  data.tar.gz: 902d0e58872adbafcd81a6faa7373b4e207ad5596ec37f3d1a01a6e83fabfac2
+  metadata.gz: 363386e5f0af985125302b3f74565b9d55758b7ed2c6861fbd26e1554ce68cf6
+  data.tar.gz: 50204a323636922a05b26c460ed659bdef48bc7de2a2342ac1f1c40997897d80
 SHA512:
-  metadata.gz: a77b68c94c63ba1f783cc1e2af7ead46415a8f49f85195f7367f94506b12d1ad19310b142249d534cc61513633ba4ba8e931e744922f4a3bfe92e9b0e9e4d97d
-  data.tar.gz: d0a13bb0dfe883cb0a8e6ae949e3f6178de75f57d6d6a35f90ee5954f8b85faa6c76b0c3244a07aca43478daab789a33b3f780faa1e083b27bba5a1eb9f5cf74
+  metadata.gz: d8136e7b02f0cc18e4b2e3e2f906a460e895fa1f3524b5302861354f9cfba49554592ef53bbff71a92f9f08068a685462f4c5f631016065f427e8947a267548c
+  data.tar.gz: 778f9c5f7817a54fc4eeb863da1ee5e829e162f998ca2da2f34fd44a146973ee230201069bf65dedcfda4fd00ee4d75b429094fa612b994bfdb4b475f94940c7

data/CHANGELOG.adoc

@@ -13,6 +13,18 @@ endif::[]
 This document provides a high-level view of the changes introduced in Asciidoctor by release.
 For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
 
+== 2.0.7 (2019-04-13) - @mojavelinux
+
+Bug Fixes::
+
+  * fix crash when resolving ID from text and at least one candidate contains an unresolved xref (#3254)
+  * fix compatibility with Rouge 2.0
+
+Improvements::
+
+  * improve documentation for the `-a` CLI option; explain that `@` modifier can be placed at end of name as alternative to end of value
+  * move source for main API entry points (load, load_file, convert, convert_file) to separate files
+
 == 2.0.6 (2019-04-04) - @mojavelinux
 
 Bug Fixes::

data/README-de.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.6, 2019-04-04
+v2.0.7, 2019-04-13
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.6
+:release-version: 2.0.7
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-fr.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.6, 2019-04-04
+v2.0.7, 2019-04-13
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.6
+:release-version: 2.0.7
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-jp.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.6, 2019-04-04
+v2.0.7, 2019-04-13
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.6
+:release-version: 2.0.7
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-zh_CN.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.6, 2019-04-04
+v2.0.7, 2019-04-13
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.6
+:release-version: 2.0.7
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.6, 2019-04-04
+v2.0.7, 2019-04-13
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.6
+:release-version: 2.0.7
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/asciidoctor.gemspec

@@ -23,15 +23,15 @@ Gem::Specification.new do |s|
   }
 
   # NOTE the logic to build the list of files is designed to produce a usable package even when the git command is not available
-  files = begin
-    (result = `git ls-files -z`.split ?\0).empty? ? Dir['**/*'] : result
+  begin
+    files = (result = `git ls-files -z`.split ?\0).empty? ? Dir['**/*'] : result
   rescue
-    Dir['**/*']
+    files = Dir['**/*']
   end
   s.files = files.grep %r/^(?:(?:data|lib|man)\/.+|LICENSE|(?:CHANGELOG|README(?:-\w+)?)\.adoc|\.yardopts|#{s.name}\.gemspec)$/
   s.executables = (files.grep %r/^bin\//).map {|f| File.basename f }
   s.require_paths = ['lib']
-  #s.test_files = files.grep %r/^(?:(?:features|test)\/.+)$/
+  #s.test_files = files.grep %r/^(?:features|test)\/.+$/
 
   # asciimath is needed for testing AsciiMath in DocBook backend
   s.add_development_dependency 'asciimath', '~> 1.0.0'

data/lib/asciidoctor.rb

@@ -1220,310 +1220,6 @@ module Asciidoctor
     [/\\?(&)amp;((?:[a-zA-Z][a-zA-Z]+\d{0,2}|#\d\d\d{0,4}|#x[\da-fA-F][\da-fA-F][\da-fA-F]{0,3});)/, '', :bounding]
   ]
 
-  class << self
-
-  # Public: Parse the AsciiDoc source input into a {Document}
-  #
-  # Accepts input as an IO (or StringIO), String or String Array object. If the
-  # input is a File, the object is expected to be opened for reading and is not
-  # closed afterwards by this method. Information about the file (filename,
-  # directory name, etc) gets assigned to attributes on the Document object.
-  #
-  # input   - the AsciiDoc source as a IO, String or Array.
-  # options - a String, Array or Hash of options to control processing (default: {})
-  #           String and Array values are converted into a Hash.
-  #           See {Document#initialize} for details about these options.
-  #
-  # Returns the Document
-  def load input, options = {}
-    options = options.merge
-
-    if (timings = options[:timings])
-      timings.start :read
-    end
-
-    if (logger = options[:logger]) && logger != LoggerManager.logger
-      LoggerManager.logger = logger
-    end
-
-    if !(attrs = options[:attributes])
-      attrs = {}
-    elsif ::Hash === attrs
-      attrs = attrs.merge
-    elsif (defined? ::Java::JavaUtil::Map) && ::Java::JavaUtil::Map === attrs
-      attrs = attrs.dup
-    elsif ::Array === attrs
-      attrs = {}.tap do |accum|
-        attrs.each do |entry|
-          k, _, v = entry.partition '='
-          accum[k] = v
-        end
-      end
-    elsif ::String === attrs
-      # condense and convert non-escaped spaces to null, unescape escaped spaces, then split on null
-      attrs = {}.tap do |accum|
-        attrs.gsub(SpaceDelimiterRx, '\1' + NULL).gsub(EscapedSpaceRx, '\1').split(NULL).each do |entry|
-          k, _, v = entry.partition '='
-          accum[k] = v
-        end
-      end
-    elsif (attrs.respond_to? :keys) && (attrs.respond_to? :[])
-      # coerce attrs to a real Hash
-      attrs = {}.tap {|accum| attrs.keys.each {|k| accum[k] = attrs[k] } }
-    else
-      raise ::ArgumentError, %(illegal type for attributes option: #{attrs.class.ancestors.join ' < '})
-    end
-
-    if ::File === input
-      options[:input_mtime] = input.mtime
-      # NOTE defer setting infile and indir until we get a better sense of their purpose
-      # TODO cli checks if input path can be read and is file, but might want to add check to API too
-      attrs['docfile'] = input_path = ::File.absolute_path input.path
-      attrs['docdir'] = ::File.dirname input_path
-      attrs['docname'] = Helpers.basename input_path, (attrs['docfilesuffix'] = Helpers.extname input_path)
-      source = input.read
-    elsif input.respond_to? :read
-      # NOTE tty, pipes & sockets can't be rewound, but can't be sniffed easily either
-      # just fail the rewind operation silently to handle all cases
-      input.rewind rescue nil
-      source = input.read
-    elsif ::String === input
-      source = input
-    elsif ::Array === input
-      source = input.drop 0
-    elsif input
-      raise ::ArgumentError, %(unsupported input type: #{input.class})
-    end
-
-    if timings
-      timings.record :read
-      timings.start :parse
-    end
-
-    options[:attributes] = attrs
-    doc = options[:parse] == false ? (Document.new source, options) : (Document.new source, options).parse
-
-    timings.record :parse if timings
-    doc
-  rescue => ex
-    begin
-      context = %(asciidoctor: FAILED: #{attrs['docfile'] || '<stdin>'}: Failed to load AsciiDoc document)
-      if ex.respond_to? :exception
-        # The original message must be explicitly preserved when wrapping a Ruby exception
-        wrapped_ex = ex.exception %(#{context} - #{ex.message})
-        # JRuby automatically sets backtrace; MRI did not until 2.6
-        wrapped_ex.set_backtrace ex.backtrace
-      else
-        # Likely a Java exception class
-        wrapped_ex = ex.class.new context, ex
-        wrapped_ex.stack_trace = ex.stack_trace
-      end
-    rescue
-      wrapped_ex = ex
-    end
-    raise wrapped_ex
-  end
-
-  # Public: Parse the contents of the AsciiDoc source file into an Asciidoctor::Document
-  #
-  # input   - the String AsciiDoc source filename
-  # options - a String, Array or Hash of options to control processing (default: {})
-  #           String and Array values are converted into a Hash.
-  #           See Asciidoctor::Document#initialize for details about options.
-  #
-  # Returns the Asciidoctor::Document
-  def load_file filename, options = {}
-    ::File.open(filename, FILE_READ_MODE) {|file| self.load file, options }
-  end
-
-  # Public: Parse the AsciiDoc source input into an Asciidoctor::Document and
-  # convert it to the specified backend format.
-  #
-  # Accepts input as an IO (or StringIO), String or String Array object. If the
-  # input is a File, the object is expected to be opened for reading and is not
-  # closed afterwards by this method. Information about the file (filename,
-  # directory name, etc) gets assigned to attributes on the Document object.
-  #
-  # If the :to_file option is true, and the input is a File, the output is
-  # written to a file adjacent to the input file, having an extension that
-  # corresponds to the backend format. Otherwise, if the :to_file option is
-  # specified, the file is written to that file. If :to_file is not an absolute
-  # path, it is resolved relative to :to_dir, if given, otherwise the
-  # Document#base_dir. If the target directory does not exist, it will not be
-  # created unless the :mkdirs option is set to true. If the file cannot be
-  # written because the target directory does not exist, or because it falls
-  # outside of the Document#base_dir in safe mode, an IOError is raised.
-  #
-  # If the output is going to be written to a file, the header and footer are
-  # included unless specified otherwise (writing to a file implies creating a
-  # standalone document). Otherwise, the header and footer are not included by
-  # default and the converted result is returned.
-  #
-  # input   - the String AsciiDoc source filename
-  # options - a String, Array or Hash of options to control processing (default: {})
-  #           String and Array values are converted into a Hash.
-  #           See Asciidoctor::Document#initialize for details about options.
-  #
-  # Returns the Document object if the converted String is written to a
-  # file, otherwise the converted String
-  def convert input, options = {}
-    (options = options.merge).delete :parse
-    to_dir = options.delete :to_dir
-    mkdirs = options.delete :mkdirs
-
-    case (to_file = options.delete :to_file)
-    when true, nil
-      unless (write_to_target = to_dir)
-        sibling_path = ::File.absolute_path input.path if ::File === input
-      end
-      to_file = nil
-    when false
-      to_file = nil
-    when '/dev/null'
-      return self.load input, options
-    else
-      options[:to_file] = write_to_target = to_file unless (stream_output = to_file.respond_to? :write)
-    end
-
-    unless options.key? :standalone
-      if sibling_path || write_to_target
-        options[:standalone] = true
-      elsif options.key? :header_footer
-        options[:standalone] = options[:header_footer]
-      end
-    end
-
-    # NOTE outfile may be controlled by document attributes, so resolve outfile after loading
-    if sibling_path
-      options[:to_dir] = outdir = ::File.dirname sibling_path
-    elsif write_to_target
-      if to_dir
-        if to_file
-          options[:to_dir] = ::File.dirname ::File.expand_path ::File.join to_dir, to_file
-        else
-          options[:to_dir] = ::File.expand_path to_dir
-        end
-      elsif to_file
-        options[:to_dir] = ::File.dirname ::File.expand_path to_file
-      end
-    end
-
-    # NOTE :to_dir is always set when outputting to a file
-    # NOTE :to_file option only passed if assigned an explicit path
-    doc = self.load input, options
-
-    if sibling_path # write to file in same directory
-      outfile = ::File.join outdir, %(#{doc.attributes['docname']}#{doc.outfilesuffix})
-      raise ::IOError, %(input file and output file cannot be the same: #{outfile}) if outfile == sibling_path
-    elsif write_to_target # write to explicit file or directory
-      working_dir = (options.key? :base_dir) ? (::File.expand_path options[:base_dir]) : ::Dir.pwd
-      # QUESTION should the jail be the working_dir or doc.base_dir???
-      jail = doc.safe >= SafeMode::SAFE ? working_dir : nil
-      if to_dir
-        outdir = doc.normalize_system_path(to_dir, working_dir, jail, target_name: 'to_dir', recover: false)
-        if to_file
-          outfile = doc.normalize_system_path(to_file, outdir, nil, target_name: 'to_dir', recover: false)
-          # reestablish outdir as the final target directory (in the case to_file had directory segments)
-          outdir = ::File.dirname outfile
-        else
-          outfile = ::File.join outdir, %(#{doc.attributes['docname']}#{doc.outfilesuffix})
-        end
-      elsif to_file
-        outfile = doc.normalize_system_path(to_file, working_dir, jail, target_name: 'to_dir', recover: false)
-        # establish outdir as the final target directory (in the case to_file had directory segments)
-        outdir = ::File.dirname outfile
-      end
-
-      if ::File === input && outfile == (::File.absolute_path input.path)
-        raise ::IOError, %(input file and output file cannot be the same: #{outfile})
-      end
-
-      if mkdirs
-        Helpers.mkdir_p outdir
-      else
-        # NOTE we intentionally refer to the directory as it was passed to the API
-        raise ::IOError, %(target directory does not exist: #{to_dir} (hint: set :mkdirs option)) unless ::File.directory? outdir
-      end
-    else # write to stream
-      outfile = to_file
-      outdir = nil
-    end
-
-    if outfile && !stream_output
-      output = doc.convert 'outfile' => outfile, 'outdir' => outdir
-    else
-      output = doc.convert
-    end
-
-    if outfile
-      doc.write output, outfile
-
-      # NOTE document cannot control this behavior if safe >= SafeMode::SERVER
-      # NOTE skip if stylesdir is a URI
-      if !stream_output && doc.safe < SafeMode::SECURE && (doc.attr? 'linkcss') && (doc.attr? 'copycss') &&
-          (doc.basebackend? 'html') && !((stylesdir = (doc.attr 'stylesdir')) && (Helpers.uriish? stylesdir))
-        if (stylesheet = doc.attr 'stylesheet')
-          if DEFAULT_STYLESHEET_KEYS.include? stylesheet
-            copy_asciidoctor_stylesheet = true
-          elsif !(Helpers.uriish? stylesheet)
-            copy_user_stylesheet = true
-          end
-        end
-        copy_syntax_hl_stylesheet = (syntax_hl = doc.syntax_highlighter) && (syntax_hl.write_stylesheet? doc)
-        if copy_asciidoctor_stylesheet || copy_user_stylesheet || copy_syntax_hl_stylesheet
-          stylesoutdir = doc.normalize_system_path(stylesdir, outdir, doc.safe >= SafeMode::SAFE ? outdir : nil)
-          if mkdirs
-            Helpers.mkdir_p stylesoutdir
-          else
-            raise ::IOError, %(target stylesheet directory does not exist: #{stylesoutdir} (hint: set :mkdirs option)) unless ::File.directory? stylesoutdir
-          end
-
-          if copy_asciidoctor_stylesheet
-            Stylesheets.instance.write_primary_stylesheet stylesoutdir
-          # FIXME should Stylesheets also handle the user stylesheet?
-          elsif copy_user_stylesheet
-            if (stylesheet_src = doc.attr 'copycss').empty?
-              stylesheet_src = doc.normalize_system_path stylesheet
-            else
-              # NOTE in this case, copycss is a source location (but cannot be a URI)
-              stylesheet_src = doc.normalize_system_path stylesheet_src
-            end
-            stylesheet_dest = doc.normalize_system_path stylesheet, stylesoutdir, (doc.safe >= SafeMode::SAFE ? outdir : nil)
-            # NOTE don't warn if src can't be read and dest already exists (see #2323)
-            if stylesheet_src != stylesheet_dest && (stylesheet_data = doc.read_asset stylesheet_src,
-                warn_on_failure: !(::File.file? stylesheet_dest), label: 'stylesheet')
-              ::File.write stylesheet_dest, stylesheet_data, mode: FILE_WRITE_MODE
-            end
-          end
-          syntax_hl.write_stylesheet doc, stylesoutdir if copy_syntax_hl_stylesheet
-        end
-      end
-      doc
-    else
-      output
-    end
-  end
-
-  # Deprecated: Use {Asciidoctor.convert} instead.
-  alias render convert
-
-  # Public: Parse the contents of the AsciiDoc source file into an
-  # Asciidoctor::Document and convert it to the specified backend format.
-  #
-  # input   - the String AsciiDoc source filename
-  # options - a String, Array or Hash of options to control processing (default: {})
-  #           String and Array values are converted into a Hash.
-  #           See Asciidoctor::Document#initialize for details about options.
-  #
-  # Returns the Document object if the converted String is written to a
-  # file, otherwise the converted String
-  def convert_file filename, options = {}
-    ::File.open(filename, FILE_READ_MODE) {|file| self.convert file, options }
-  end
-
-  # Deprecated: Use {Asciidoctor.convert_file} instead.
-  alias render_file convert_file
-
   # Internal: Automatically load the Asciidoctor::Extensions module.
   #
   # Requires the Asciidoctor::Extensions module if the name is :Extensions.
@@ -1534,7 +1230,7 @@ module Asciidoctor
   # defined prior to it being loaded.
   #
   # Returns the resolved constant, if resolved, otherwise nothing.
-  def const_missing name
+  def self.const_missing name
     if name == :Extensions
       require_relative 'asciidoctor/extensions'
       Extensions
@@ -1543,8 +1239,6 @@ module Asciidoctor
     end
   end unless RUBY_ENGINE == 'opal'
 
-  end
-
   unless RUBY_ENGINE == 'opal'
     autoload :SyntaxHighlighter, %(#{LIB_DIR}/asciidoctor/syntax_highlighter)
     autoload :Timings, %(#{LIB_DIR}/asciidoctor/timings)
@@ -1580,6 +1274,10 @@ require_relative 'asciidoctor/stylesheets'
 require_relative 'asciidoctor/table'
 require_relative 'asciidoctor/writer'
 
+# main API entry points
+require_relative 'asciidoctor/load'
+require_relative 'asciidoctor/convert'
+
 if RUBY_ENGINE == 'opal'
   require_relative 'asciidoctor/syntax_highlighter'
   require_relative 'asciidoctor/timings'

data/lib/asciidoctor/cli/options.rb

@@ -80,13 +80,13 @@ module Asciidoctor
                   'specify eRuby implementation to use when rendering custom ERB templates: [erb, erubis] (default: erb)') do |eruby|
             self[:eruby] = eruby
           end
-          opts.on('-a', '--attribute key[=value]', 'a document attribute to set in the form of key, key! or key=value pair',
-                  'unless @ is appended to the value, this attributes takes precedence over attributes',
-                  'defined in the source document') do |attr|
+          opts.on('-a', '--attribute name[=value]', 'a document attribute to set in the form of name, name!, or name=value pair',
+                  'this attribute takes precedence over the same attribute defined in the source document',
+                  'unless either the name or value ends in @ (i.e., name@=value or name=value@)') do |attr|
             next if (attr = attr.rstrip).empty? || attr == '='
             attr = attr.encode UTF_8 unless attr.encoding == UTF_8
-            key, _, val = attr.partition '='
-            self[:attributes][key] = val
+            name, _, val = attr.partition '='
+            self[:attributes][name] = val
           end
           opts.on('-T', '--template-dir DIR', 'a directory containing custom converter templates that override the built-in converter (requires tilt gem)',
                   'may be specified multiple times') do |template_dir|

data/lib/asciidoctor/convert.rb

@@ -0,0 +1,193 @@
+module Asciidoctor
+  module_function
+
+  # Public: Parse the AsciiDoc source input into an Asciidoctor::Document and
+  # convert it to the specified backend format.
+  #
+  # Accepts input as an IO (or StringIO), String or String Array object. If the
+  # input is a File, the object is expected to be opened for reading and is not
+  # closed afterwards by this method. Information about the file (filename,
+  # directory name, etc) gets assigned to attributes on the Document object.
+  #
+  # If the :to_file option is true, and the input is a File, the output is
+  # written to a file adjacent to the input file, having an extension that
+  # corresponds to the backend format. Otherwise, if the :to_file option is
+  # specified, the file is written to that file. If :to_file is not an absolute
+  # path, it is resolved relative to :to_dir, if given, otherwise the
+  # Document#base_dir. If the target directory does not exist, it will not be
+  # created unless the :mkdirs option is set to true. If the file cannot be
+  # written because the target directory does not exist, or because it falls
+  # outside of the Document#base_dir in safe mode, an IOError is raised.
+  #
+  # If the output is going to be written to a file, the header and footer are
+  # included unless specified otherwise (writing to a file implies creating a
+  # standalone document). Otherwise, the header and footer are not included by
+  # default and the converted result is returned.
+  #
+  # input   - the String AsciiDoc source filename
+  # options - a String, Array or Hash of options to control processing (default: {})
+  #           String and Array values are converted into a Hash.
+  #           See Asciidoctor::Document#initialize for details about options.
+  #
+  # Returns the Document object if the converted String is written to a
+  # file, otherwise the converted String
+  def convert input, options = {}
+    (options = options.merge).delete :parse
+    to_dir = options.delete :to_dir
+    mkdirs = options.delete :mkdirs
+
+    case (to_file = options.delete :to_file)
+    when true, nil
+      unless (write_to_target = to_dir)
+        sibling_path = ::File.absolute_path input.path if ::File === input
+      end
+      to_file = nil
+    when false
+      to_file = nil
+    when '/dev/null'
+      return load input, options
+    else
+      options[:to_file] = write_to_target = to_file unless (stream_output = to_file.respond_to? :write)
+    end
+
+    unless options.key? :standalone
+      if sibling_path || write_to_target
+        options[:standalone] = true
+      elsif options.key? :header_footer
+        options[:standalone] = options[:header_footer]
+      end
+    end
+
+    # NOTE outfile may be controlled by document attributes, so resolve outfile after loading
+    if sibling_path
+      options[:to_dir] = outdir = ::File.dirname sibling_path
+    elsif write_to_target
+      if to_dir
+        if to_file
+          options[:to_dir] = ::File.dirname ::File.expand_path ::File.join to_dir, to_file
+        else
+          options[:to_dir] = ::File.expand_path to_dir
+        end
+      elsif to_file
+        options[:to_dir] = ::File.dirname ::File.expand_path to_file
+      end
+    end
+
+    # NOTE :to_dir is always set when outputting to a file
+    # NOTE :to_file option only passed if assigned an explicit path
+    doc = load input, options
+
+    if sibling_path # write to file in same directory
+      outfile = ::File.join outdir, %(#{doc.attributes['docname']}#{doc.outfilesuffix})
+      raise ::IOError, %(input file and output file cannot be the same: #{outfile}) if outfile == sibling_path
+    elsif write_to_target # write to explicit file or directory
+      working_dir = (options.key? :base_dir) ? (::File.expand_path options[:base_dir]) : ::Dir.pwd
+      # QUESTION should the jail be the working_dir or doc.base_dir???
+      jail = doc.safe >= SafeMode::SAFE ? working_dir : nil
+      if to_dir
+        outdir = doc.normalize_system_path(to_dir, working_dir, jail, target_name: 'to_dir', recover: false)
+        if to_file
+          outfile = doc.normalize_system_path(to_file, outdir, nil, target_name: 'to_dir', recover: false)
+          # reestablish outdir as the final target directory (in the case to_file had directory segments)
+          outdir = ::File.dirname outfile
+        else
+          outfile = ::File.join outdir, %(#{doc.attributes['docname']}#{doc.outfilesuffix})
+        end
+      elsif to_file
+        outfile = doc.normalize_system_path(to_file, working_dir, jail, target_name: 'to_dir', recover: false)
+        # establish outdir as the final target directory (in the case to_file had directory segments)
+        outdir = ::File.dirname outfile
+      end
+
+      if ::File === input && outfile == (::File.absolute_path input.path)
+        raise ::IOError, %(input file and output file cannot be the same: #{outfile})
+      end
+
+      if mkdirs
+        Helpers.mkdir_p outdir
+      else
+        # NOTE we intentionally refer to the directory as it was passed to the API
+        raise ::IOError, %(target directory does not exist: #{to_dir} (hint: set :mkdirs option)) unless ::File.directory? outdir
+      end
+    else # write to stream
+      outfile = to_file
+      outdir = nil
+    end
+
+    if outfile && !stream_output
+      output = doc.convert 'outfile' => outfile, 'outdir' => outdir
+    else
+      output = doc.convert
+    end
+
+    if outfile
+      doc.write output, outfile
+
+      # NOTE document cannot control this behavior if safe >= SafeMode::SERVER
+      # NOTE skip if stylesdir is a URI
+      if !stream_output && doc.safe < SafeMode::SECURE && (doc.attr? 'linkcss') && (doc.attr? 'copycss') &&
+          (doc.basebackend? 'html') && !((stylesdir = (doc.attr 'stylesdir')) && (Helpers.uriish? stylesdir))
+        if (stylesheet = doc.attr 'stylesheet')
+          if DEFAULT_STYLESHEET_KEYS.include? stylesheet
+            copy_asciidoctor_stylesheet = true
+          elsif !(Helpers.uriish? stylesheet)
+            copy_user_stylesheet = true
+          end
+        end
+        copy_syntax_hl_stylesheet = (syntax_hl = doc.syntax_highlighter) && (syntax_hl.write_stylesheet? doc)
+        if copy_asciidoctor_stylesheet || copy_user_stylesheet || copy_syntax_hl_stylesheet
+          stylesoutdir = doc.normalize_system_path(stylesdir, outdir, doc.safe >= SafeMode::SAFE ? outdir : nil)
+          if mkdirs
+            Helpers.mkdir_p stylesoutdir
+          else
+            raise ::IOError, %(target stylesheet directory does not exist: #{stylesoutdir} (hint: set :mkdirs option)) unless ::File.directory? stylesoutdir
+          end
+
+          if copy_asciidoctor_stylesheet
+            Stylesheets.instance.write_primary_stylesheet stylesoutdir
+          # FIXME should Stylesheets also handle the user stylesheet?
+          elsif copy_user_stylesheet
+            if (stylesheet_src = doc.attr 'copycss').empty?
+              stylesheet_src = doc.normalize_system_path stylesheet
+            else
+              # NOTE in this case, copycss is a source location (but cannot be a URI)
+              stylesheet_src = doc.normalize_system_path stylesheet_src
+            end
+            stylesheet_dest = doc.normalize_system_path stylesheet, stylesoutdir, (doc.safe >= SafeMode::SAFE ? outdir : nil)
+            # NOTE don't warn if src can't be read and dest already exists (see #2323)
+            if stylesheet_src != stylesheet_dest && (stylesheet_data = doc.read_asset stylesheet_src,
+                warn_on_failure: !(::File.file? stylesheet_dest), label: 'stylesheet')
+              ::File.write stylesheet_dest, stylesheet_data, mode: FILE_WRITE_MODE
+            end
+          end
+          syntax_hl.write_stylesheet doc, stylesoutdir if copy_syntax_hl_stylesheet
+        end
+      end
+      doc
+    else
+      output
+    end
+  end
+
+  # Public: Parse the contents of the AsciiDoc source file into an
+  # Asciidoctor::Document and convert it to the specified backend format.
+  #
+  # input   - the String AsciiDoc source filename
+  # options - a String, Array or Hash of options to control processing (default: {})
+  #           String and Array values are converted into a Hash.
+  #           See Asciidoctor::Document#initialize for details about options.
+  #
+  # Returns the Document object if the converted String is written to a
+  # file, otherwise the converted String
+  def convert_file filename, options = {}
+    ::File.open(filename, FILE_READ_MODE) {|file| convert file, options }
+  end
+
+  # Deprecated: Use {Asciidoctor.convert} instead.
+  alias render convert
+  module_function :render
+
+  # Deprecated: Use {Asciidoctor.convert_file} instead.
+  alias render_file convert_file
+  module_function :render_file
+end

data/lib/asciidoctor/document.rb

@@ -331,8 +331,7 @@ class Document < AbstractBlock
       options[:standalone] = options[:header_footer] if (options.key? :header_footer) && !(options.key? :standalone)
     end
 
-    @parsed = false
-    @header = @header_attributes = nil
+    @parsed = @reftexts = @header = @header_attributes = nil
     @counters = {}
     @attributes_modified = ::Set.new
     @docinfo_processor_extensions = {}
@@ -615,16 +614,25 @@ class Document < AbstractBlock
     end
   end
 
-  # Public: Scan all registered references and return the ID of the reference that matches the specified reference text.
-  #
-  # If multiple references in the document have the same reference text, the first match in document order is used.
+  # Public: Scan registered references and return the ID of the first reference that matches the specified reference text.
   #
   # text - The String reference text to compare to the converted reference text of each registered reference.
   #
   # Returns the String ID of the first reference with matching reference text or nothing if no reference is found.
   def resolve_id text
-    ((@reftexts ||= @parsed ? {}.tap {|accum| @catalog[:refs].each {|id, ref| accum[ref.xreftext] = id } } : nil) ||
-      {}.tap {|accum| @catalog[:refs].find {|id, ref| ref.xreftext == text ? accum[text] = id : nil } })[text]
+    if @reftexts
+      @reftexts[text]
+    elsif @parsed
+      # @reftexts is set eagerly to prevent nested lazy init
+      (@reftexts = {}).tap {|accum| @catalog[:refs].each {|id, ref| accum[ref.xreftext] ||= id } }[text]
+    else
+      # @reftexts is set eagerly to prevent nested lazy init
+      resolved_id = nil
+      # NOTE short-circuit early since we're throwing away this table
+      (@reftexts = {}).tap {|accum| @catalog[:refs].each {|id, ref| (xreftext = ref.xreftext) == text ? (break (resolved_id = id)) : (accum[xreftext] ||= id) } }
+      @reftexts = nil
+      resolved_id
+    end
   end
 
   def footnotes?

data/lib/asciidoctor/load.rb

@@ -0,0 +1,117 @@
+module Asciidoctor
+  module_function
+
+  # Public: Parse the AsciiDoc source input into a {Document}
+  #
+  # Accepts input as an IO (or StringIO), String or String Array object. If the
+  # input is a File, the object is expected to be opened for reading and is not
+  # closed afterwards by this method. Information about the file (filename,
+  # directory name, etc) gets assigned to attributes on the Document object.
+  #
+  # input   - the AsciiDoc source as a IO, String or Array.
+  # options - a String, Array or Hash of options to control processing (default: {})
+  #           String and Array values are converted into a Hash.
+  #           See {Document#initialize} for details about these options.
+  #
+  # Returns the Document
+  def load input, options = {}
+    options = options.merge
+
+    if (timings = options[:timings])
+      timings.start :read
+    end
+
+    if (logger = options[:logger]) && logger != LoggerManager.logger
+      LoggerManager.logger = logger
+    end
+
+    if !(attrs = options[:attributes])
+      attrs = {}
+    elsif ::Hash === attrs
+      attrs = attrs.merge
+    elsif (defined? ::Java::JavaUtil::Map) && ::Java::JavaUtil::Map === attrs
+      attrs = attrs.dup
+    elsif ::Array === attrs
+      attrs = {}.tap do |accum|
+        attrs.each do |entry|
+          k, _, v = entry.partition '='
+          accum[k] = v
+        end
+      end
+    elsif ::String === attrs
+      # condense and convert non-escaped spaces to null, unescape escaped spaces, then split on null
+      attrs = {}.tap do |accum|
+        attrs.gsub(SpaceDelimiterRx, '\1' + NULL).gsub(EscapedSpaceRx, '\1').split(NULL).each do |entry|
+          k, _, v = entry.partition '='
+          accum[k] = v
+        end
+      end
+    elsif (attrs.respond_to? :keys) && (attrs.respond_to? :[])
+      # coerce attrs to a real Hash
+      attrs = {}.tap {|accum| attrs.keys.each {|k| accum[k] = attrs[k] } }
+    else
+      raise ::ArgumentError, %(illegal type for attributes option: #{attrs.class.ancestors.join ' < '})
+    end
+
+    if ::File === input
+      options[:input_mtime] = input.mtime
+      # NOTE defer setting infile and indir until we get a better sense of their purpose
+      # TODO cli checks if input path can be read and is file, but might want to add check to API too
+      attrs['docfile'] = input_path = ::File.absolute_path input.path
+      attrs['docdir'] = ::File.dirname input_path
+      attrs['docname'] = Helpers.basename input_path, (attrs['docfilesuffix'] = Helpers.extname input_path)
+      source = input.read
+    elsif input.respond_to? :read
+      # NOTE tty, pipes & sockets can't be rewound, but can't be sniffed easily either
+      # just fail the rewind operation silently to handle all cases
+      input.rewind rescue nil
+      source = input.read
+    elsif ::String === input
+      source = input
+    elsif ::Array === input
+      source = input.drop 0
+    elsif input
+      raise ::ArgumentError, %(unsupported input type: #{input.class})
+    end
+
+    if timings
+      timings.record :read
+      timings.start :parse
+    end
+
+    options[:attributes] = attrs
+    doc = options[:parse] == false ? (Document.new source, options) : (Document.new source, options).parse
+
+    timings.record :parse if timings
+    doc
+  rescue => ex
+    begin
+      context = %(asciidoctor: FAILED: #{attrs['docfile'] || '<stdin>'}: Failed to load AsciiDoc document)
+      if ex.respond_to? :exception
+        # The original message must be explicitly preserved when wrapping a Ruby exception
+        wrapped_ex = ex.exception %(#{context} - #{ex.message})
+        # JRuby automatically sets backtrace; MRI did not until 2.6
+        wrapped_ex.set_backtrace ex.backtrace
+      else
+        # Likely a Java exception class
+        wrapped_ex = ex.class.new context, ex
+        wrapped_ex.stack_trace = ex.stack_trace
+      end
+    rescue
+      wrapped_ex = ex
+    end
+    raise wrapped_ex
+  end
+
+  # Public: Parse the contents of the AsciiDoc source file into an Asciidoctor::Document
+  #
+  # input   - the String AsciiDoc source filename
+  # options - a String, Array or Hash of options to control processing (default: {})
+  #           String and Array values are converted into a Hash.
+  #           See Asciidoctor::Document#initialize for details about options.
+  #
+  # Returns the Asciidoctor::Document
+  def load_file filename, options = {}
+    ::File.open(filename, FILE_READ_MODE) {|file| load file, options }
+  end
+end

data/lib/asciidoctor/substitutors.rb

@@ -807,7 +807,7 @@ module Substitutors
           refid, target = fragment, %(##{fragment})
         # handles: Node Title or Reference Text
         # do reverse lookup on fragment if not a known ID and resembles reftext (contains a space or uppercase char)
-        elsif (refid = doc.resolve_id fragment) && ((fragment.include? ' ') || fragment.downcase != fragment)
+        elsif ((fragment.include? ' ') || fragment.downcase != fragment) && (refid = doc.resolve_id fragment)
           fragment, target = refid, %(##{refid})
         else
           refid, target = fragment, %(##{fragment})

data/lib/asciidoctor/syntax_highlighter/rouge.rb

@@ -5,8 +5,7 @@ class SyntaxHighlighter::RougeAdapter < SyntaxHighlighter::Base
 
   def initialize *args
     super
-    @requires_stylesheet = nil
-    @style = nil
+    @requires_stylesheet = @style = nil
   end
 
   def highlight?
@@ -19,9 +18,9 @@ class SyntaxHighlighter::RougeAdapter < SyntaxHighlighter::Base
     @style ||= (style = opts[:style]) && (style_available? style) || DEFAULT_STYLE
     if opts[:css_mode] == :class
       @requires_stylesheet = true
-      formatter = ::Rouge::Formatters::HTML.new @style
+      formatter = ::Rouge::Formatters::HTML.new inline_theme: @style
     else
-      formatter = ::Rouge::Formatters::HTMLInline.new @style
+      formatter = ::Rouge::Formatters::HTMLInline.new (::Rouge::Theme.find @style).new
     end
     if (highlight_lines = opts[:highlight_lines])
       formatter = RougeExt::Formatters::HTMLLineHighlighter.new formatter, lines: highlight_lines

data/lib/asciidoctor/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Asciidoctor
-  VERSION = '2.0.6'
+  VERSION = '2.0.7'
 end

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White, Ryan Waldron
-.\" Generator: Asciidoctor 2.0.6
-.\"      Date: 2019-04-04
+.\" Generator: Asciidoctor 2.0.7
+.\"      Date: 2019-04-13
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 2.0.6
+.\"    Source: Asciidoctor 2.0.7
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2019-04-04" "Asciidoctor 2.0.6" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2019-04-13" "Asciidoctor 2.0.7" "Asciidoctor Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -28,13 +28,13 @@
 .  LINKSTYLE blue R < >
 .\}
 .SH "NAME"
-asciidoctor \- converts AsciiDoc source files to HTML, DocBook and other formats
+asciidoctor \- converts AsciiDoc source files to HTML, DocBook, and other formats
 .SH "SYNOPSIS"
 .sp
 \fBasciidoctor\fP [\fIOPTION\fP]... \fIFILE\fP...
 .SH "DESCRIPTION"
 .sp
-The asciidoctor(1) command converts the AsciiDoc source file(s) \fIFILE\fP to HTML5, DocBook 5, man(ual) page and other custom output formats.
+The asciidoctor(1) command converts the AsciiDoc source file(s) \fIFILE\fP to HTML5, DocBook 5, man(ual) page, and other custom output formats.
 .sp
 If \fIFILE\fP is \fI\-\fP then the AsciiDoc source is read from standard input.
 .SH "OPTIONS"
@@ -43,13 +43,13 @@ If \fIFILE\fP is \fI\-\fP then the AsciiDoc source is read from standard input.
 \fB\-B, \-\-base\-dir\fP=\fIDIR\fP
 .RS 4
 Base directory containing the document and resources.
-Defaults to the directory containing the source file, or the working directory if the source is read from a stream.
+Defaults to the directory containing the source file or, if the source is read from a stream, the working directory.
 When combined with the safe mode setting, can be used to chroot the execution of the program.
 .RE
 .sp
 \fB\-S, \-\-safe\-mode\fP=\fISAFE_MODE\fP
 .RS 4
-Set safe mode level: \fIunsafe\fP, \fIsafe\fP, \fIserver\fP or \fIsecure\fP.
+Set safe mode level: \fIunsafe\fP, \fIsafe\fP, \fIserver\fP, or \fIsecure\fP.
 Disables potentially dangerous macros in source files, such as \f(CRinclude::[]\fP.
 If not set, the safe mode level defaults to \fIunsafe\fP when Asciidoctor is invoked using this script.
 .RE
@@ -65,11 +65,11 @@ If not set, the safe mode level defaults to \fIunsafe\fP when Asciidoctor is inv
 .sp
 \fB\-a, \-\-attribute\fP=\fIATTRIBUTE\fP
 .RS 4
-Define, override or delete a document attribute.
-Command\-line attributes take precedence over attributes defined in the source file unless the value ends with \fI@\fP.
+Define, override, or unset a document attribute.
+Command\-line attributes take precedence over attributes defined in the source file unless either the name or value ends in \fI@\fP.
 .sp
 \fIATTRIBUTE\fP is normally formatted as a key\-value pair, in the form \fINAME=VALUE\fP.
-Alternate acceptable forms are \fINAME\fP (where the \fIVALUE\fP defaults to an empty string), \fINAME!\fP (unassigns the \fINAME\fP attribute) and \fINAME=VALUE@\fP (where \fIVALUE\fP does not override value of \fINAME\fP attribute if it\(cqs already defined in the source document).
+Alternate forms are \fINAME\fP (where the \fIVALUE\fP defaults to an empty string), \fINAME!\fP (unsets the \fINAME\fP attribute), and \fINAME=VALUE@\fP (or \fINAME@=VALUE\fP) (where \fIVALUE\fP does not override the \fINAME\fP attribute if it\(cqs already defined in the source document).
 Values containing spaces should be enclosed in quotes.
 .sp
 This option may be specified more than once.
@@ -77,7 +77,7 @@ This option may be specified more than once.
 .sp
 \fB\-b, \-\-backend\fP=\fIBACKEND\fP
 .RS 4
-Backend output file format: \fIhtml5\fP, \fIdocbook5\fP, \fIdocbook45\fP and \fImanpage\fP are supported out of the box.
+Backend output file format: \fIhtml5\fP, \fIdocbook5\fP, \fIdocbook45\fP, and \fImanpage\fP are supported out of the box.
 You can also use the backend alias names \fIhtml\fP (aliased to \fIhtml5\fP) or \fIdocbook\fP (aliased to \fIdocbook5\fP).
 Other values can be passed, but if Asciidoctor cannot resolve the backend to a converter, it will fail.
 Defaults to \fIhtml5\fP.
@@ -85,7 +85,7 @@ Defaults to \fIhtml5\fP.
 .sp
 \fB\-d, \-\-doctype\fP=\fIDOCTYPE\fP
 .RS 4
-Document type: \fIarticle\fP, \fIbook\fP, \fImanpage\fP or \fIinline\fP.
+Document type: \fIarticle\fP, \fIbook\fP, \fImanpage\fP, or \fIinline\fP.
 Sets the root element when using the \fIdocbook\fP backend and the style class on the HTML body element when using the \fIhtml\fP backend.
 The \fIbook\fP document type allows multiple level\-0 section titles in a single document.
 The \fImanpage\fP document type enables parsing of metadata necessary to produce a man page.
@@ -97,7 +97,7 @@ Defaults to \fIarticle\fP.
 \fB\-D, \-\-destination\-dir\fP=\fIDIR\fP
 .RS 4
 Destination output directory.
-Defaults to the directory containing the source file, or the working directory if the source is read from a stream.
+Defaults to the directory containing the source file or, if the source is read from a stream, the working directory.
 If specified, the directory is resolved relative to the working directory.
 .RE
 .sp
@@ -198,7 +198,7 @@ Turn on script warnings (applies to executed code).
 .sp
 \fB\-t, \-\-timings\fP
 .RS 4
-Print timings report to stderr (time to read, parse and convert).
+Print timings report to stderr (time to read, parse, and convert).
 .RE
 .SS "Program Information"
 .sp
@@ -239,7 +239,7 @@ Refer to the \fBAsciidoctor\fP issue tracker at \c
 .URL "https://github.com/asciidoctor/asciidoctor/issues?q=is%3Aopen" "" "."
 .SH "AUTHORS"
 .sp
-\fBAsciidoctor\fP was written by Dan Allen, Ryan Waldron, Jason Porter, Nick Hengeveld and other contributors.
+\fBAsciidoctor\fP was written by Dan Allen, Ryan Waldron, Jason Porter, Nick Hengeveld, and other contributors.
 .sp
 \fBAsciiDoc\fP was written by Stuart Rackham and has received contributions from many other individuals.
 .SH "RESOURCES"
@@ -257,7 +257,7 @@ Refer to the \fBAsciidoctor\fP issue tracker at \c
 .URL "http://discuss.asciidoctor.org" "" ""
 .SH "COPYING"
 .sp
-Copyright (C) 2012\-2019 Dan Allen, Ryan Waldron and the Asciidoctor Project.
+Copyright (C) 2012\-2019 Dan Allen, Ryan Waldron, and the Asciidoctor Project.
 Free use of this software is granted under the terms of the MIT License.
 .SH "AUTHORS"
 .sp

data/man/asciidoctor.adoc

@@ -2,12 +2,12 @@
 Dan Allen; Sarah White; Ryan Waldron
 :doctype: manpage
 :man manual: Asciidoctor Manual
-:man source: Asciidoctor 2.0.6
+:man source: Asciidoctor 2.0.7
 :page-layout: base
 
 == NAME
 
-asciidoctor - converts AsciiDoc source files to HTML, DocBook and other formats
+asciidoctor - converts AsciiDoc source files to HTML, DocBook, and other formats
 
 == SYNOPSIS
 
@@ -15,7 +15,7 @@ asciidoctor - converts AsciiDoc source files to HTML, DocBook and other formats
 
 == DESCRIPTION
 
-The asciidoctor(1) command converts the AsciiDoc source file(s) _FILE_ to HTML5, DocBook 5, man(ual) page and other custom output formats.
+The asciidoctor(1) command converts the AsciiDoc source file(s) _FILE_ to HTML5, DocBook 5, man(ual) page, and other custom output formats.
 
 If _FILE_ is _-_ then the AsciiDoc source is read from standard input.
 
@@ -25,11 +25,11 @@ If _FILE_ is _-_ then the AsciiDoc source is read from standard input.
 
 *-B, --base-dir*=_DIR_::
   Base directory containing the document and resources.
-  Defaults to the directory containing the source file, or the working directory if the source is read from a stream.
+  Defaults to the directory containing the source file or, if the source is read from a stream, the working directory.
   When combined with the safe mode setting, can be used to chroot the execution of the program.
 
 *-S, --safe-mode*=_SAFE_MODE_::
-  Set safe mode level: _unsafe_, _safe_, _server_ or _secure_.
+  Set safe mode level: _unsafe_, _safe_, _server_, or _secure_.
   Disables potentially dangerous macros in source files, such as `include::[]`.
   If not set, the safe mode level defaults to _unsafe_ when Asciidoctor is invoked using this script.
 
@@ -42,23 +42,23 @@ If _FILE_ is _-_ then the AsciiDoc source is read from standard input.
 === Document Settings
 
 *-a, --attribute*=_ATTRIBUTE_::
-  Define, override or delete a document attribute.
-  Command-line attributes take precedence over attributes defined in the source file unless the value ends with _@_.
+  Define, override, or unset a document attribute.
+  Command-line attributes take precedence over attributes defined in the source file unless either the name or value ends in _@_.
 +
 _ATTRIBUTE_ is normally formatted as a key-value pair, in the form _NAME=VALUE_.
-Alternate acceptable forms are _NAME_ (where the _VALUE_ defaults to an empty string), _NAME!_ (unassigns the _NAME_ attribute) and _NAME=VALUE@_ (where _VALUE_ does not override value of _NAME_ attribute if it's already defined in the source document).
+Alternate forms are _NAME_ (where the _VALUE_ defaults to an empty string), _NAME!_ (unsets the _NAME_ attribute), and _NAME=VALUE@_ (or _NAME@=VALUE_) (where _VALUE_ does not override the _NAME_ attribute if it's already defined in the source document).
 Values containing spaces should be enclosed in quotes.
 +
 This option may be specified more than once.
 
 *-b, --backend*=_BACKEND_::
-  Backend output file format: _html5_, _docbook5_, _docbook45_ and _manpage_ are supported out of the box.
+  Backend output file format: _html5_, _docbook5_, _docbook45_, and _manpage_ are supported out of the box.
   You can also use the backend alias names _html_ (aliased to _html5_) or _docbook_ (aliased to _docbook5_).
   Other values can be passed, but if Asciidoctor cannot resolve the backend to a converter, it will fail.
   Defaults to _html5_.
 
 *-d, --doctype*=_DOCTYPE_::
-  Document type: _article_, _book_, _manpage_ or _inline_.
+  Document type: _article_, _book_, _manpage_, or _inline_.
   Sets the root element when using the _docbook_ backend and the style class on the HTML body element when using the _html_ backend.
   The _book_ document type allows multiple level-0 section titles in a single document.
   The _manpage_ document type enables parsing of metadata necessary to produce a man page.
@@ -69,7 +69,7 @@ This option may be specified more than once.
 
 *-D, --destination-dir*=_DIR_::
   Destination output directory.
-  Defaults to the directory containing the source file, or the working directory if the source is read from a stream.
+  Defaults to the directory containing the source file or, if the source is read from a stream, the working directory.
   If specified, the directory is resolved relative to the working directory.
 
 *-E, --template-engine*=_NAME_::
@@ -141,7 +141,7 @@ Matching templates found in subsequent directories override ones previously disc
   Turn on script warnings (applies to executed code).
 
 *-t, --timings*::
-  Print timings report to stderr (time to read, parse and convert).
+  Print timings report to stderr (time to read, parse, and convert).
 
 === Program Information
 
@@ -175,7 +175,7 @@ Refer to the *Asciidoctor* issue tracker at https://github.com/asciidoctor/ascii
 
 == AUTHORS
 
-*Asciidoctor* was written by Dan Allen, Ryan Waldron, Jason Porter, Nick Hengeveld and other contributors.
+*Asciidoctor* was written by Dan Allen, Ryan Waldron, Jason Porter, Nick Hengeveld, and other contributors.
 
 *AsciiDoc* was written by Stuart Rackham and has received contributions from many other individuals.
 
@@ -191,5 +191,5 @@ Refer to the *Asciidoctor* issue tracker at https://github.com/asciidoctor/ascii
 
 == COPYING
 
-Copyright \(C) 2012-2019 Dan Allen, Ryan Waldron and the Asciidoctor Project.
+Copyright \(C) 2012-2019 Dan Allen, Ryan Waldron, and the Asciidoctor Project.
 Free use of this software is granted under the terms of the MIT License.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Dan Allen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -260,6 +260,7 @@ files:
 - lib/asciidoctor/cli.rb
 - lib/asciidoctor/cli/invoker.rb
 - lib/asciidoctor/cli/options.rb
+- lib/asciidoctor/convert.rb
 - lib/asciidoctor/converter.rb
 - lib/asciidoctor/converter/composite.rb
 - lib/asciidoctor/converter/docbook5.rb
@@ -277,6 +278,7 @@ files:
 - lib/asciidoctor/helpers.rb
 - lib/asciidoctor/inline.rb
 - lib/asciidoctor/list.rb
+- lib/asciidoctor/load.rb
 - lib/asciidoctor/logging.rb
 - lib/asciidoctor/parser.rb
 - lib/asciidoctor/path_resolver.rb