asciidoctor 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a473039ade836811c48e7fee1ac92e81aaf93a17
-  data.tar.gz: 7139cce18ff72d70e11424a7a4ab846173d93789
+  metadata.gz: 9c5d135474454be23b11dfdcc8b7d24d55e4638f
+  data.tar.gz: 909678f3db8d1468040ee56257e16910093d2f8c
 SHA512:
-  metadata.gz: 8d096aea49af4c010647980e99d8219d25ad3b904bb746e62b3debe42891912f1b4b50426627b777487b058cd45208a6fc61e18c4ba75200a3cc3d1a53b670d9
-  data.tar.gz: 329764ebeb51caaff10af1021fa4316c0590e6dbf45273011d6065846be1430daaea28b93518aea21ede0fd860706150f03b796389488f80b315d394ae4a8d7a
+  metadata.gz: 8c5883d45569bc9d4e5d55ba38abd919d6526f2762bccb28115d75ead73915b7688d75562f20ea65810fe0f2ff8f9d192cc4cbc96874acc857a86d8d704b725a
+  data.tar.gz: 3a8425493fe73e4125d43351e4a7f08df1c7ddbd927977efa36700b28f4665eb9f65dd0416c3d10240a464683a67a2f848e748a2186b6140f77836e1e16c5802

data/CHANGELOG.adoc

@@ -11,6 +11,91 @@ 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 https://github.com/asciidoctor/asciidoctor/commits/master[commit history] on GitHub.
 
+== 1.5.2 (2014-11-27) - @mojavelinux
+
+Enhancements::
+
+  * add docinfo extension (@mogztter) (#1162)
+  * allow docinfo to be in separate directory from content, specified by `docinfodir` attribute (@mogztter) (#511)
+  * enable TeX equation auto-numbering if `eqnums` attribute is set (@jxxcarlson) (#1110)
+
+Improvements::
+
+  * recognize `--` as valid line comment for callout numbers; make line comment configurable (#1068)
+  * upgrade highlight.js to version 8.4 (#1216)
+  * upgrade Font Awesome to version 4.2.0 (@clojens) (#1201)
+  * define JAVASCRIPT_PLATFORM constant to simplify conditional logic in the JavaScript environment (#897)
+  * provide access to destination directory, outfile and outdir via Document object (#1203)
+  * print encoding information in version report produced by `asciidoctor -v` (#1210)
+  * add intrinsic attribute named `cpp` with value `C++` (#1208)
+  * preserve URI targets passed to `stylesheet` and related attributes (#1192)
+  * allow numeric characters in block attribute name (#1103)
+  * support custom YouTube playlists (#1105)
+  * make start number for unique id generation configurable (#1148)
+  * normalize and force UTF-8 encoding of docinfo content (#831)
+  * allow subs and default_subs to be specified in Block constructor (#749)
+  * enhance error message when reading binary input files (@mogztter) (#1158)
+  * add `append` method as alias to `<<` method on AbstractBlock (#1085)
+  * assign value of `preface-title` as title of preface node (#1090)
+  * fix spacing around checkbox in checklist (#1138)
+  * automatically load Slim's include plugin when using slim templates (@jirutka) (#1151)
+  * mixin Slim helpers into execution scope of slim templates (@jirutka) (#1143)
+  * improve DocBook output for manpage doctype (@bk2204) (#1134, #1142)
+
+Compliance::
+
+  * substitute attribute entry value in attributes defined outside of header (#1130)
+  * allow empty cell to appear at end of table row (#1106)
+  * only produce one row for table in CSV or DSV format with a single cell (#1180)
+
+Bug fixes::
+
+  * add explicit to_s call to generate delimiter settings for MathJax config (#1198)
+  * fix includes that reference absolute Windows paths (#1144)
+  * apply DSL to extension block in a way compatible with Opal
+
+Distribution Packages::
+
+  * http://rubygems.org/gems/asciidoctor[RubyGem (asciidoctor)]
+  * https://apps.fedoraproject.org/packages/rubygem-asciidoctor[Fedora (rubygem-asciidoctor)]
+  * http://packages.debian.org/sid/asciidoctor[Debian (asciidoctor)]
+  * http://packages.ubuntu.com/saucy/asciidoctor[Ubuntu (asciidoctor)]
+
+https://github.com/asciidoctor/asciidoctor/issues?q=milestone%3Av1.5.2[issues resolved] |
+https://github.com/asciidoctor/asciidoctor/releases/tag/v1.5.2[git tag] |
+https://github.com/asciidoctor/asciidoctor/compare/v1.5.0...v1.5.2[full diff]
+
+== 1.5.1 (2014-09-29) - @mojavelinux
+
+Bug fixes::
+
+  * recognize tag directives inside comments within XML files for including tagged regions
+  * restore passthroughs inside footnotes when more than one footnote appears on the same line
+  * -S flag in cli recognizes safe mode name as lowercase string
+  * do not match # in character reference when looking for marked text
+  * add namespace to lang attribute in DocBook 5 backend
+  * restore missing space before conum on last line of listing when highlighting with Pygments
+  * place conums on correct lines when line numbers are enabled when highlighting with Pygments
+  * don't expand mailto links in print styles
+
+Improvements::
+
+  * implement File.read in Node (JavaScript) environment
+  * assign sectnumlevels and toclevels values to maxdepth attribute on AsciiDoc processing instructions in DocBook output
+  * add test for usage of image block macro with data URI
+  * use badges from shields.io in README
+
+Distribution Packages::
+
+  * http://rubygems.org/gems/asciidoctor[RubyGem (asciidoctor)]
+  * https://apps.fedoraproject.org/packages/rubygem-asciidoctor[Fedora (rubygem-asciidoctor)]
+  * http://packages.debian.org/sid/asciidoctor[Debian (asciidoctor)]
+  * http://packages.ubuntu.com/saucy/asciidoctor[Ubuntu (asciidoctor)]
+
+https://github.com/asciidoctor/asciidoctor/issues?q=milestone%3Av1.5.1[issues resolved] |
+https://github.com/asciidoctor/asciidoctor/releases/tag/v1.5.1[git tag] |
+https://github.com/asciidoctor/asciidoctor/compare/v1.5.0...v1.5.1[full diff]
+
 == 1.5.0 (2014-08-12) - @mojavelinux
 
 Performance::

data/README.adoc

@@ -42,12 +42,11 @@ endif::[]
 :uri-freesoftware: https://www.gnu.org/philosophy/free-sw.html
 :uri-foundation: http://foundation.zurb.com
 :uri-tilt: https://github.com/rtomayko/tilt
-:uri-ruby: https://ruby-lang.org
 // images:
-:screenshot-img: screenshot.png
+:image-uri-screenshot: https://raw.githubusercontent.com/asciidoctor/asciidoctor/master/screenshot.png
 
 {uri-project}[Asciidoctor] is a _fast_ text processor and publishing toolchain for converting {uri-what-is-asciidoc}[AsciiDoc] content to HTML5, DocBook 5 (or 4.5) and other formats.
-Asciidoctor is written in {uri-ruby}[Ruby], packaged as a RubyGem and published to {uri-rubygem}[RubyGems.org].
+Asciidoctor is written in Ruby, packaged as a RubyGem and published to {uri-rubygem}[RubyGems.org].
 The gem is also included in several Linux distributions, including Fedora, Debian and Ubuntu.
 Asciidoctor is open source, {uri-repo}[hosted on GitHub] and released under the MIT license.
 
@@ -62,8 +61,19 @@ We use http://opalrb.org[Opal] to transcompile the Ruby source to JavaScript to
 Asciidoctor.js is used to power the AsciiDoc preview extensions for Chrome, Atom, Brackets and other web-based tooling.
 ====
 
+.Key documentation
+[square]
+* {uri-docs}/what-is-asciidoc[What is Asciidoc?]
+* {uri-docs}/asciidoc-writers-guide[AsciiDoc Writer's Guide]
+* {uri-docs}/asciidoc-syntax-quick-reference[AsciiDoc Syntax Reference]
+* {uri-docs}/user-manual[Asciidoctor User Manual]
+
 ifdef::env-github[]
-*Project health:* image:http://img.shields.io/travis/asciidoctor/asciidoctor/master.svg[Build Status, link="https://travis-ci.org/asciidoctor/asciidoctor"] image:http://img.shields.io/coveralls/asciidoctor/asciidoctor/master.svg["Coverage Status", link="https://coveralls.io/r/asciidoctor/asciidoctor"]
+.*Project Health*
+image:http://img.shields.io/travis/asciidoctor/asciidoctor/master.svg[Build Status, link=https://travis-ci.org/asciidoctor/asciidoctor] 
+//image:http://img.shields.io/coveralls/asciidoctor/asciidoctor/master.svg[Coverage Status, link=https://coveralls.io/r/asciidoctor/asciidoctor]
+image:https://codeclimate.com/github/asciidoctor/asciidoctor/badges/gpa.svg[Code Climate, link="https://codeclimate.com/github/asciidoctor/asciidoctor"]
+image:http://inch-ci.org/github/asciidoctor/asciidoctor.svg?branch=master[Inline docs, link="http://inch-ci.org/github/asciidoctor/asciidoctor"]
 endif::env-github[]
 
 == The Big Picture
@@ -71,7 +81,7 @@ endif::env-github[]
 Asciidoctor reads content written in plain text, as shown in the panel on the left in the image below, and converts it to HTML5, as shown rendered in the right panel.
 Asciidoctor adds a default stylesheet to the HTML5 document, as shown, to provide a pleasant out-of-the-box experience.
 
-image::{screenshot-img}[Preview of AsciiDoc source and corresponding rendered HTML]
+image::{image-uri-screenshot}[Preview of AsciiDoc source and corresponding rendered HTML]
 
 == AsciiDoc Processing
 
@@ -86,7 +96,7 @@ Asciidoctor also offers a modern, responsive theme based on {uri-foundation}[Fou
 
 == Requirements
 
-Asciidoctor works on Linux, OSX (Mac) and Windows and requires one of the following implementations of {uri-ruby}[Ruby]:
+Asciidoctor works on Linux, OSX (Mac) and Windows and requires one of the following implementations of Ruby:
 
 * MRI (Ruby 1.8.7, 1.9.3, 2.0.0 & 2.1.2)
 * JRuby 1.7 (Ruby 1.8 and 1.9 modes)
@@ -330,6 +340,69 @@ The project was initiated in 2012 by https://github.com/erebor[Ryan Waldron] and
 
 == Changelog
 
+== 1.5.2 (2014-11-27) - @mojavelinux
+
+Enhancements::
+
+  * add docinfo extension (@mogztter) (#1162)
+  * allow docinfo to be in separate directory from content, specified by `docinfodir` attribute (@mogztter) (#511)
+  * enable TeX equation auto-numbering if `eqnums` attribute is set (@jxxcarlson) (#1110)
+
+Improvements::
+
+  * recognize `--` as valid line comment for callout numbers; make line comment configurable (#1068)
+  * upgrade highlight.js to version 8.4 (#1216)
+  * upgrade Font Awesome to version 4.2.0 (@clojens) (#1201)
+  * define JAVASCRIPT_PLATFORM constant to simplify conditional logic in the JavaScript environment (#897)
+  * provide access to destination directory, outfile and outdir via Document object (#1203)
+  * print encoding information in version report produced by `asciidoctor -v` (#1210)
+  * add intrinsic attribute named `cpp` with value `C++` (#1208)
+  * preserve URI targets passed to `stylesheet` and related attributes (#1192)
+  * allow numeric characters in block attribute name (#1103)
+  * support custom YouTube playlists (#1105)
+  * make start number for unique id generation configurable (#1148)
+  * normalize and force UTF-8 encoding of docinfo content (#831)
+  * allow subs and default_subs to be specified in Block constructor (#749)
+  * enhance error message when reading binary input files (@mogztter) (#1158)
+  * add `append` method as alias to `<<` method on AbstractBlock (#1085)
+  * assign value of `preface-title` as title of preface node (#1090)
+  * fix spacing around checkbox in checklist (#1138)
+  * automatically load Slim's include plugin when using slim templates (@jirutka) (#1151)
+  * mixin Slim helpers into execution scope of slim templates (@jirutka) (#1143)
+  * improve DocBook output for manpage doctype (@bk2204) (#1134, #1142)
+
+Compliance::
+
+  * substitute attribute entry value in attributes defined outside of header (#1130)
+  * allow empty cell to appear at end of table row (#1106)
+  * only produce one row for table in CSV or DSV format with a single cell (#1180)
+
+Bug fixes::
+
+  * add explicit to_s call to generate delimiter settings for MathJax config (#1198)
+  * fix includes that reference absolute Windows paths (#1144)
+  * apply DSL to extension block in a way compatible with Opal
+
+== 1.5.1 (2014-09-29) - @mojavelinux
+
+Bug fixes::
+
+  * recognize tag directives inside comments within XML files for including tagged regions
+  * restore passthroughs inside footnotes when more than one footnote appears on the same line
+  * -S flag in cli recognizes safe mode name as lowercase string
+  * do not match # in character reference when looking for marked text
+  * add namespace to lang attribute in DocBook 5 backend
+  * restore missing space before conum on last line of listing when highlighting with Pygments
+  * place conums on correct lines when line numbers are enabled when highlighting with Pygments
+  * don't expand mailto links in print styles
+
+Improvements::
+
+  * implement File.read in Node (JavaScript) environment
+  * assign sectnumlevels and toclevels values to maxdepth attribute on AsciiDoc processing instructions in DocBook output
+  * add test for usage of image block macro with data URI
+  * use badges from shields.io in README
+
 === 1.5.0 (2014-08-12) - @mojavelinux
 
 Performance::

data/Rakefile

@@ -19,7 +19,7 @@ begin
   require 'rake/testtask'
   Rake::TestTask.new(:test) do |test|
     prepare_test_env
-    puts "LANG: #{ENV['LANG']}"
+    puts %(LANG: #{ENV['LANG']}) if ENV.key? 'TRAVIS_BUILD_ID'
     test.libs << 'test'
     test.pattern = 'test/**/*_test.rb'
     test.verbose = true
@@ -52,6 +52,27 @@ begin
 rescue LoadError
 end
 
+def ci_setup_tasks
+  tasks = []
+  begin
+    require 'ci/reporter/rake/minitest'
+    tasks << 'ci:setup:minitest'
+    # FIXME reporter for Cucumber tests not activating
+    #require 'ci/reporter/rake/cucumber'
+    #tasks << 'ci:setup:cucumber'
+  rescue LoadError
+  end if ENV['SHIPPABLE'] && RUBY_VERSION >= '1.9.3'
+  tasks
+end
+
+desc 'Activates coverage and JUnit-style XML reports for tests'
+task :coverage => ci_setup_tasks do
+  # exclude coverage run for Ruby 1.8.7 or (disabled) if running on Travis CI
+  ENV['COVERAGE'] = 'true' if RUBY_VERSION >= '1.9.3' # && (ENV['SHIPPABLE'] || !ENV['TRAVIS_BUILD_ID'])
+  ENV['CI_REPORTS'] = 'shippable/testresults'
+  ENV['COVERAGE_REPORTS'] = 'shippable/codecoverage'
+end
+
 namespace :test do
   desc 'Run unit and feature tests'
   task :all => [:test,:features]

data/benchmark/benchmark.rb

@@ -21,10 +21,12 @@ To get the best results under MRI, tune Ruby using environment variables as foll
  $ RUBY_GC_MALLOC_LIMIT=90000000 RUBY_FREE_MIN=650000 ruby benchmark.rb userguide-loop 10
 
 .Ruby >= 2.1
- $ RUBY_GC_MALLOC_LIMIT=128000000 RUBY_GC_OLDMALLOC_LIMIT=128000000 RUBY_GC_HEAP_INIT_SLOTS=800000 RUBY_GC_HEAP_FREE_SLOTS=800000 RUBY_GC_HEAP_GROWTH_MAX_SLOTS=250000 RUBY_GC_HEAP_GROWTH_FACTOR=1.5 ruby benchmark.rb userguide-loop 10
+ $ RUBY_GC_MALLOC_LIMIT=128000000 RUBY_GC_OLDMALLOC_LIMIT=128000000 RUBY_GC_HEAP_INIT_SLOTS=800000 RUBY_GC_HEAP_FREE_SLOTS=800000 RUBY_GC_HEAP_GROWTH_MAX_SLOTS=250000 RUBY_GC_HEAP_GROWTH_FACTOR=2 ruby benchmark.rb userguide-loop 10
 
 Asciidoctor starts with ~ 12,500 objects, adds ~ 300,000 each run, so tune RUBY_GC_HEAP_* accordingly
 
+See http://globaldev.co.uk/2014/05/ruby-2-1-in-detail/#gc-tuning-environment-variables
+
 Execute Ruby using the `--disable=gems` flag to speed up the initial load time, as shown below:
 
  $ ruby --disable=gems ...

data/compat/asciidoc.conf

@@ -10,15 +10,15 @@ newline=\n
 [attributes]
 # make html5 the default html backend
 backend-alias-html=html5
-apostrophe='
 asterisk=*
 backtick=`
 brvbar=¦
 caret=^
 # plus introduced in AsciiDoc 8.6.9
 plus=+
-space=" "
+blank=
 tilde=~
+cpp=C++
 user-home={eval:os.path.expanduser('~')}
 vbar=|
 # NOTE use -a no-inline-literal to set compat-mode to default when using AsciiDoc Python

data/data/stylesheets/asciidoctor-default.css

@@ -1,6 +1,6 @@
 /* Asciidoctor default stylesheet | MIT License | http://asciidoctor.org */
 /* Remove the comments around the @import statement below when using this as a custom stylesheet */
-/*@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic|Noto+Serif:400,400italic,700,700italic|Droid+Sans+Mono:400";*/
+/*@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400";*/
 article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}
 audio,canvas,video{display:inline-block}
 audio:not([controls]){display:none;height:0}
@@ -264,8 +264,8 @@ dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0}
 ol>li p,ul>li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em}
 ul.unstyled,ol.unnumbered,ul.checklist,ul.none{list-style-type:none}
 ul.unstyled,ol.unnumbered,ul.checklist{margin-left:.625em}
-ul.checklist li>p:first-child>.fa-check-square-o:first-child,ul.checklist li>p:first-child>input[type="checkbox"]:first-child{margin-right:.25em}
-ul.checklist li>p:first-child>input[type="checkbox"]:first-child{position:relative;top:1px}
+ul.checklist li>p:first-child>.fa-square-o:first-child,ul.checklist li>p:first-child>.fa-check-square-o:first-child{width:1em;font-size:.85em}
+ul.checklist li>p:first-child>input[type="checkbox"]:first-child{width:1em;position:relative;top:1px}
 ul.inline{margin:0 auto .625em auto;margin-left:-1.375em;margin-right:0;padding:0;list-style:none;overflow:hidden}
 ul.inline>li{list-style:none;float:left;margin-left:1.375em;display:block}
 ul.inline>li>*{display:block}

data/features/step_definitions.rb

@@ -1,4 +1,15 @@
-require "#{File.dirname __FILE__}/../lib/asciidoctor"
+# encoding: UTF-8
+ASCIIDOCTOR_PROJECT_DIR = File.dirname File.dirname(__FILE__)
+Dir.chdir ASCIIDOCTOR_PROJECT_DIR
+
+if RUBY_VERSION < '1.9'
+  require 'rubygems'
+end
+
+require 'simplecov' if ENV['COVERAGE'] == 'true'
+
+require File.join(ASCIIDOCTOR_PROJECT_DIR, 'lib', 'asciidoctor')
+
 require 'rspec/expectations'
 require 'tilt'
 require 'slim'

data/lib/asciidoctor.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 RUBY_ENGINE = 'unknown' unless defined? RUBY_ENGINE
 RUBY_ENGINE_OPAL = (RUBY_ENGINE == 'opal')
 RUBY_ENGINE_JRUBY = (RUBY_ENGINE == 'jruby')
@@ -98,7 +99,7 @@ module Asciidoctor
 
   # Flags to control compliance with the behavior of AsciiDoc
   module Compliance
-    @keys = [].to_set
+    @keys = ::Set.new
     class << self
       attr :keys
     end
@@ -106,7 +107,7 @@ module Asciidoctor
     # Defines a new compliance key and assigns an initial value.
     def self.define key, value
       if key == :keys || (self.respond_to? key)
-        raise ::ArgumentError, %(Illegal key name: #{key})
+        raise ::ArgumentError, %(illegal key name: #{key})
       end
       instance_variable_set %(@#{key}), value
       class << self; self; end.send :attr_accessor, key
@@ -156,8 +157,14 @@ module Asciidoctor
 
     # Asciidoctor will allow the id, role and options to be set
     # on blocks using a shorthand syntax (e.g., #idname.rolename%optionname)
+    # Compliance value: false
     define :shorthand_property_syntax, true
 
+    # Asciidoctor will start counting at the following number
+    # when creating a unique id when there is a conflict
+    # Compliance value: 2
+    define :unique_id_start_index, 2
+
     # Asciidoctor will recognize commonly-used Markdown syntax
     # to the degree it does not interfere with existing
     # AsciiDoc syntax and behavior.
@@ -651,6 +658,7 @@ module Asciidoctor
     #   * Foo
     #   - Foo
     #
+    # NOTE we know trailing (.*) will match at least one character because we strip trailing spaces
     UnorderedListRx = /^#{CG_BLANK}*(-|\*{1,5})#{CG_BLANK}+(.*)$/
 
     # Matches an ordered list item (explicit numbering or up to 5 consecutive dots).
@@ -666,6 +674,7 @@ module Asciidoctor
     #   I. Foo (upperroman)
     #
     # NOTE leading space match is not always necessary, but is used for list reader
+    # NOTE we know trailing (.*) will match at least one character because we strip trailing spaces
     OrderedListRx = /^#{CG_BLANK}*(\.{1,5}|\d+\.|[a-zA-Z]\.|[IVXivx]+\))#{CG_BLANK}+(.*)$/
 
     # Matches the ordinals for each type of ordered list.
@@ -720,20 +729,24 @@ module Asciidoctor
     #
     #   <1> Foo
     #
+    # NOTE we know trailing (.*) will match at least one character because we strip trailing spaces
     CalloutListRx = /^<?(\d+)>#{CG_BLANK}+(.*)/
 
     # Matches a callout reference inside literal text.
     # 
     # Examples
-    #   <1> (optionally prefixed by //, # or ;; line comment chars)
+    #   <1> (optionally prefixed by //, #, -- or ;; line comment chars)
     #   <1> <2> (multiple callouts on one line)
     #   <!--1--> (for XML-based languages)
     #
-    # NOTE special characters are already be replaced at this point during conversion to an SGML format
-    CalloutConvertRx = /(?:(?:\/\/|#|;;) ?)?(\\)?&lt;!?(--|)(\d+)\2&gt;(?=(?: ?\\?&lt;!?\2\d+\2&gt;)*#{CC_EOL})/
-    # NOTE (con't) ...but not while scanning
+    # NOTE extract regexps are applied line-by-line, so we can use $ as end-of-line char
+    CalloutExtractRx = /(?:(?:\/\/|#|--|;;) ?)?(\\)?<!?(--|)(\d+)\2>(?=(?: ?\\?<!?\2\d+\2>)*$)/
+    CalloutExtractRxt = "(\\\\)?<()(\\d+)>(?=(?: ?\\\\?<\\d+>)*$)"
+    # NOTE special characters have not been replaced when scanning
     CalloutQuickScanRx = /\\?<!?(--|)(\d+)\1>(?=(?: ?\\?<!?\1\d+\1>)*#{CC_EOL})/
-    CalloutScanRx = /(?:(?:\/\/|#|;;) ?)?(\\)?<!?(--|)(\d+)\2>(?=(?: ?\\?<!?\2\d+\2>)*#{CC_EOL})/
+    # NOTE special characters have already been replaced when converting to an SGML format
+    CalloutSourceRx = /(?:(?:\/\/|#|--|;;) ?)?(\\)?&lt;!?(--|)(\d+)\2&gt;(?=(?: ?\\?&lt;!?\2\d+\2&gt;)*#{CC_EOL})/
+    CalloutSourceRxt = "(\\\\)?&lt;()(\\d+)&gt;(?=(?: ?\\\\?&lt;\\d+&gt;)*#{CC_EOL})"
 
     # A Hash of regexps for lists used for dynamic access.
     ListRxMap = {
@@ -1073,9 +1086,12 @@ module Asciidoctor
     # Examples
     #   http://domain
     #   https://domain
+    #   file:///path
     #   data:info
     #
-    UriSniffRx = %r{^#{CG_ALPHA}[#{CC_ALNUM}.+-]*:/{0,2}}
+    #   not c:/sample.adoc or c:\sample.adoc
+    #
+    UriSniffRx = %r{^#{CG_ALPHA}[#{CC_ALNUM}.+-]+:/{0,2}}
 
     # Detects the end of an implicit URI in the text
     #
@@ -1125,12 +1141,11 @@ module Asciidoctor
     'asterisk'   => '*',
     'tilde'      => '~',
     'plus'       => '&#43;',
-    'apostrophe' => '\'',
     'backslash'  => '\\',
     'backtick'   => '`',
+    'blank'      => '',
     'empty'      => '',
     'sp'         => ' ',
-    'space'      => ' ',
     'two-colons' => '::',
     'two-semicolons' => ';;',
     'nbsp'       => '&#160;',
@@ -1144,6 +1159,7 @@ module Asciidoctor
     'rdquo'      => '&#8221;',
     'wj'         => '&#8288;',
     'brvbar'     => '&#166;',
+    'cpp'        => 'C++',
     'amp'        => '&',
     'lt'         => '<',
     'gt'         => '>'
@@ -1269,15 +1285,15 @@ module Asciidoctor
 
     attributes = options[:attributes] = if !(attrs = options[:attributes])
       {}
-    elsif (attrs.is_a? ::Hash) || (::RUBY_ENGINE_JRUBY && (attrs.is_a? ::Java::JavaUtil::Map))
+    elsif ::Hash === attrs || (::RUBY_ENGINE_JRUBY && ::Java::JavaUtil::Map === attrs)
       attrs.dup
-    elsif attrs.is_a? ::Array
+    elsif ::Array === attrs
       attrs.inject({}) do |accum, entry|
         k, v = entry.split '=', 2
         accum[k] = v || ''
         accum
       end
-    elsif attrs.is_a? ::String
+    elsif ::String === attrs
       # convert non-escaped spaces into null character, so we split on the
       # correct spaces chars, and restore escaped spaces
       capture_1 = ::RUBY_ENGINE_OPAL ? '$1' : '\1'
@@ -1301,11 +1317,11 @@ module Asciidoctor
     end
 
     lines = nil
-    if input.is_a? ::File
-      lines = input.readlines
+    if ::File === input
+      # TODO cli checks if input path can be read and is file, but might want to add check to API
+      input_path = ::File.expand_path input.path
       input_mtime = input.mtime
-      input = ::File.new ::File.expand_path input.path
-      input_path = input.path
+      lines = input.readlines
       # hold off on setting infile and indir until we get a better sense of their purpose
       attributes['docfile'] = input_path
       attributes['docdir'] = ::File.dirname input_path
@@ -1321,12 +1337,12 @@ module Asciidoctor
       rescue
       end
       lines = input.readlines
-    elsif input.is_a? ::String
+    elsif ::String === input
       lines = input.lines.entries
-    elsif input.is_a? ::Array
+    elsif ::Array === input
       lines = input.dup
     else
-      raise ::ArgumentError, %(Unsupported input type: #{input.class})
+      raise ::ArgumentError, %(unsupported input type: #{input.class})
     end
 
     if timings
@@ -1334,9 +1350,16 @@ module Asciidoctor
       timings.start :parse
     end
 
-    doc = (options[:parse] == false ? (Document.new lines, options) : (Document.new lines,options).parse)
+    if options[:parse] == false
+      doc = Document.new lines, options
+    else
+      doc = (Document.new lines, options).parse
+    end
+
     timings.record :parse if timings
     doc
+  rescue => e
+    raise e.class, %(asciidoctor: FAILED: #{attributes.fetch 'docfile', '<stdin>'}: Failed to parse source, #{e.message})
   end
 
   # Public: Parse the contents of the AsciiDoc source file into an Asciidoctor::Document
@@ -1393,7 +1416,7 @@ module Asciidoctor
 
     case to_file
     when true, nil
-      write_to_same_dir = !to_dir && (input.is_a? ::File)
+      write_to_same_dir = !to_dir && ::File === input
       stream_output = false
       write_to_target = to_dir
       to_file = nil
@@ -1402,27 +1425,43 @@ module Asciidoctor
       stream_output = false
       write_to_target = false
       to_file = nil
+    when '/dev/null'
+      return self.load input, options
     else
       write_to_same_dir = false
       stream_output = to_file.respond_to? :write
       write_to_target = stream_output ? false : to_file
     end
 
-    if !options.key?(:header_footer) && (write_to_same_dir || write_to_target)
-      options[:header_footer] = true
+    unless options.key? :header_footer
+      options[:header_footer] = true if write_to_same_dir || write_to_target
+    end
+
+    # NOTE at least make intended target directory available, if there is one
+    if write_to_same_dir
+      input_path = ::File.expand_path input.path
+      options[:to_dir] = (outdir = ::File.dirname input_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
+    else
+      options[:to_dir] = nil
     end
 
     doc = self.load input, options
 
-    if to_file == '/dev/null'
-      return doc
-    elsif write_to_same_dir
-      infile = ::File.expand_path input.path
-      outfile = ::File.join ::File.dirname(infile), %(#{doc.attributes['docname']}#{doc.attributes['outfilesuffix']})
-      if outfile == infile
-        raise ::IOError, 'Input file and output file are the same!'
+    if write_to_same_dir
+      outfile = ::File.join outdir, %(#{doc.attributes['docname']}#{doc.attributes['outfilesuffix']})
+      if outfile == input_path
+        raise ::IOError, %(input file and output file cannot be the same: #{outfile})
       end
-      outdir = ::File.dirname outfile
     elsif write_to_target
       working_dir = options.has_key?(:base_dir) ? ::File.expand_path(options[:base_dir]) : ::File.expand_path(::Dir.pwd)
       # QUESTION should the jail be the working_dir or doc.base_dir???
@@ -1456,15 +1495,12 @@ module Asciidoctor
     end
 
     timings.start :convert if timings
-    output = doc.convert
+    opts = outfile && !stream_output ? { 'outfile' => outfile, 'outdir' => outdir } : {}
+    output = doc.convert opts
     timings.record :convert if timings
 
     if outfile
       timings.start :write if timings
-      unless stream_output
-        doc.attributes['outfile'] = outfile
-        doc.attributes['outdir'] = outdir
-      end
       doc.write output, outfile
       timings.record :write if timings
 
@@ -1476,9 +1512,7 @@ module Asciidoctor
         copy_coderay_stylesheet = (doc.attr? 'source-highlighter', 'coderay') && (doc.attr 'coderay-css', 'class') == 'class'
         copy_pygments_stylesheet = (doc.attr? 'source-highlighter', 'pygments') && (doc.attr 'pygments-css', 'class') == 'class'
         if copy_asciidoctor_stylesheet || copy_user_stylesheet || copy_coderay_stylesheet || copy_pygments_stylesheet
-          outdir = doc.attr('outdir')
-          stylesoutdir = doc.normalize_system_path(doc.attr('stylesdir'), outdir,
-              doc.safe >= SafeMode::SAFE ? outdir : nil)
+          stylesoutdir = doc.normalize_system_path(doc.attr('stylesdir'), outdir, doc.safe >= SafeMode::SAFE ? outdir : nil)
           Helpers.mkdir_p stylesoutdir if mkdirs
 
           if copy_asciidoctor_stylesheet
@@ -1534,11 +1568,9 @@ module Asciidoctor
   end
 
   if RUBY_ENGINE == 'opal'
-    require 'asciidoctor/debug'
     require 'asciidoctor/version'
     require 'asciidoctor/timings'
   else
-    autoload :Debug,   'asciidoctor/debug'
     autoload :VERSION, 'asciidoctor/version'
     autoload :Timings, 'asciidoctor/timings'
   end