asciidoctor 2.0.0.rc.1 → 2.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cbc1a8014e33d81e92970f3af2a9a46ce9b98c2b8d5a477bdc3b2daa590177e
-  data.tar.gz: dcfd774802d6b1bf336baca71bf4987150ff58f88e0734dfe654b710a43f5a73
+  metadata.gz: f340fd25a88b03b8039dc09623ce2d043d30e78a09c84519e9e8ffb59f7f9217
+  data.tar.gz: e7b1550ffe98c8ccf086eb9ce2b41c2a7f32a9946d34ba5b2a647af0d7887248
 SHA512:
-  metadata.gz: bc0c9fdddf2e10aeb3a8f7d5f07d7f961e636793bd00af3349338a56301cfe8fbb323019ac248e1087ac9fe0dd5b5869a7131ff79ac293b87ed6893436c51d53
-  data.tar.gz: 31720b21d218151759127f0a9a044e93534999e2386c5502bb4e34477f09f1f7439602d08ffe4a2d59e5f5d83c07bd1090313da8a512167cd4493e2ce0dc16fe
+  metadata.gz: 0ee1db87cdc03978ab1b20097ec44cc7151df771f6b9b434a2432bb6efc280079c4820164d039a5b04fc24351cb022d376d193628c5f673f5cc458d6e1c83a78
+  data.tar.gz: 696401edc7d556b9e1070ec1bd74cffcda8747b61a896d46b7c5cf521a35b6cf3925ed78809e8032babe293ca62cf281087e44a6ea21a03f5d1d24e32604bfcf

data/CHANGELOG.adoc

@@ -1,5 +1,5 @@
 = Asciidoctor Changelog
-:uri-asciidoctor: http://asciidoctor.org
+:uri-asciidoctor: https://asciidoctor.org
 :uri-asciidoc: {uri-asciidoctor}/docs/what-is-asciidoc
 :uri-repo: https://github.com/asciidoctor/asciidoctor
 :icons: font
@@ -13,7 +13,7 @@ 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.0.rc.1 (2019-03-02) - @mojavelinux
+== 2.0.0.rc.2 (2019-03-12) - @mojavelinux
 
 Enhancements / Compliance::
 
@@ -62,12 +62,14 @@ Enhancements / Compliance::
   * modify Cell class to extend from AbstractBlock instead of AbstractNode (#2963)
   * implement block? and inline? methods on Column, both which return false (#2963)
   * drop verse table cell style (treat as normal table cell) (#3111)
+  * allow negated subs to be specified on inline pass macro (#2191)
   * log warning if footnoteref macro is found and compat mode is not enabled (#3114)
   * log debug message instead of warning if block style is unknown (#3092)
   * allow backend to delegate to a registered backend using the syntax synthetic:delegate when using custom templates (e.g., slides:html) (#891)
   * AbstractBlock#find_by looks inside AsciiDoc table cells if traverse_documents selector option is true (#3101)
   * AbstractBlock#find_by finds table cells, which can be selected using the :table_cell context in the selector (#2524)
   * allow ampersand to be used in e-mail address (#2553)
+  * propogate ID assigned to inline passthrough (#2912)
 
 Improvements::
 
@@ -98,6 +100,9 @@ Improvements::
   * add clearer exception message when source data is binary or has invalid encoding (#2884)
   * rename context for table cell and table column to :table_cell and :table_column, respectively
   * rename hardbreaks document attribute to hardbreaks-option; retain hardbreaks as a deprecated alias (#3123)
+  * truncate with precision (instead of rounding) when computing absolute width for columns in DocBook output (#3131)
+  * drop legacy LaTeX math delimiters (e.g, `$..$`) if present (#1339)
+  * upgrade MathJax to 2.7.5
 
 Bug Fixes::
 
@@ -120,6 +125,7 @@ Bug Fixes::
   * scope constant lookups (#2764)
   * use byteslice instead of slice to remove BOM from string (#2764)
   * don't fail if value of -a CLI option is empty string or equals sign (#2997)
+  * allow failure level to be set to DEBUG
   * Reader#push_include should not fail if data is nil
   * fix deprecated ERB trim mode that was causing warning (#3006)
   * move time anchor after query string on vimeo video to avoid dropping options
@@ -127,7 +133,7 @@ Bug Fixes::
   * enforce and report relative include depth properly (depth=0 rather than depth=1 disables nested includes)
   * allow outfilesuffix to be soft set from API (#2640)
   * don't split paragraphs in table cell at line that resolves to blank if adjacent to other non-blank lines (#2963)
-  * upgrade MathJax to 2.7.5
+  * initialize the level to WARN when instantiating the NullLogger
 
 Build / Infrastructure::
 
@@ -1454,7 +1460,7 @@ Distribution Packages::
   * https://rubygems.org/gems/asciidoctor[RubyGem (asciidoctor)]
   * https://apps.fedoraproject.org/packages/rubygem-asciidoctor[Fedora (rubygem-asciidoctor)]
 
-http://asciidoctor.org/news/2013/05/31/asciidoctor-0-1-3-released[release notes] |
+https://asciidoctor.org/news/2013/05/31/asciidoctor-0-1-3-released[release notes] |
 https://github.com/asciidoctor/asciidoctor/issues?milestone=4&state=closed[issues resolved] |
 https://github.com/asciidoctor/asciidoctor/releases/tag/v0.1.3[git tag] |
 https://github.com/asciidoctor/asciidoctor/compare/v0.1.2\...v0.1.3[full diff]
@@ -1467,7 +1473,7 @@ Performance::
 
 Enhancements::
 
-  * new website at http://asciidoctor.org
+  * new website at https://asciidoctor.org
   * added a default stylesheet (#76)
   * added viewport meta tag for mobile browsers (#238)
   * set attributes based on safe mode (#244)
@@ -1509,7 +1515,7 @@ Distribution Packages::
 
   * https://rubygems.org/gems/asciidoctor[RubyGem (asciidoctor)]
 
-http://asciidoctor.org/news/2013/04/25/asciidoctor-0-1-2-released[release notes] |
+https://asciidoctor.org/news/2013/04/25/asciidoctor-0-1-2-released[release notes] |
 https://github.com/asciidoctor/asciidoctor/issues?milestone=3&state=closed[issues resolved] |
 https://github.com/asciidoctor/asciidoctor/releases/tag/v0.1.2[git tag] |
 https://github.com/asciidoctor/asciidoctor/compare/v0.1.1\...v0.1.2[full diff]

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.0.rc.1, 2019-03-02
+v2.0.0.rc.2, 2019-03-12
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,13 +17,13 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.0.rc.1
+:release-version: 2.0.0.rc.2
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor
 :uri-asciidoctorj: {uri-org}/asciidoctorj
 :uri-asciidoctorjs: {uri-org}/asciidoctor.js
-:uri-project: http://asciidoctor.org
+:uri-project: https://asciidoctor.org
 ifdef::env-site[:uri-project: link:]
 :uri-docs: {uri-project}/docs
 :uri-news: {uri-project}/news

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.0.rc.1, 2019-03-02
+v2.0.0.rc.2, 2019-03-12
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,13 +17,13 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.0.rc.1
+:release-version: 2.0.0.rc.2
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor
 :uri-asciidoctorj: {uri-org}/asciidoctorj
 :uri-asciidoctorjs: {uri-org}/asciidoctor.js
-:uri-project: http://asciidoctor.org
+:uri-project: https://asciidoctor.org
 ifdef::env-site[:uri-project: link:]
 :uri-docs: {uri-project}/docs
 :uri-news: {uri-project}/news
@@ -53,7 +53,7 @@ endif::[]
 :uri-gitscm-repo: https://github.com/git/git-scm.com
 :uri-prototype: {uri-gitscm-repo}/commits/master/lib/asciidoc.rb
 :uri-freesoftware: https://www.gnu.org/philosophy/free-sw.html
-:uri-foundation: http://foundation.zurb.com
+:uri-foundation: https://foundation.zurb.com
 :uri-tilt: https://github.com/rtomayko/tilt
 :uri-ruby: https://ruby-lang.org
 // images:
@@ -296,7 +296,7 @@ Vous devriez voir les informations concernant la version d'Asciidoctor et celle
 
 [.output,subs=attributes+]
 ....
-Asciidoctor {release-version} [http://asciidoctor.org]
+Asciidoctor {release-version} [https://asciidoctor.org]
 Runtime Environment (ruby 2.4.1p111 [x86_64-linux]) (lc:UTF-8 fs:UTF-8 in:- ex:UTF-8)
 ....
 
@@ -347,7 +347,7 @@ Vous pouvez aussi convertir une chaîne de texte en fragment HTML (pour une inse
 
 [source]
 ----
-content = '_Zen_ in the art of writing http://asciidoctor.org[AsciiDoc].'
+content = '_Zen_ in the art of writing https://asciidoctor.org[AsciiDoc].'
 Asciidoctor.convert content, safe: :safe
 ----
 
@@ -355,7 +355,7 @@ Si vous voulez le document HTML complet, activez l'option `header_footer` comme
 
 [source]
 ----
-content = '_Zen_ in the art of writing http://asciidoctor.org[AsciiDoc].'
+content = '_Zen_ in the art of writing https://asciidoctor.org[AsciiDoc].'
 html = Asciidoctor.convert content, header_footer: true, safe: :safe
 ----
 
@@ -363,7 +363,7 @@ Si vous avez besoin d'accéder au document analysé, vous pouvez séparer la con
 
 [source]
 ----
-content = '_Zen_ in the art of writing http://asciidoctor.org[AsciiDoc].'
+content = '_Zen_ in the art of writing https://asciidoctor.org[AsciiDoc].'
 document = Asciidoctor.load content, header_footer: true, safe: :safe
 puts document.doctitle
 html = document.convert

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.0.rc.1, 2019-03-02
+v2.0.0.rc.2, 2019-03-12
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,13 +18,13 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.0.rc.1
+:release-version: 2.0.0.rc.2
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor
 :uri-asciidoctorj: {uri-org}/asciidoctorj
 :uri-asciidoctorjs: {uri-org}/asciidoctor.js
-:uri-project: http://asciidoctor.org
+:uri-project: https://asciidoctor.org
 ifdef::env-site[:uri-project: link:]
 :uri-docs: {uri-project}/docs
 :uri-news: {uri-project}/news
@@ -54,7 +54,7 @@ endif::[]
 :uri-gitscm-repo: https://github.com/git/git-scm.com
 :uri-prototype: {uri-gitscm-repo}/commits/master/lib/asciidoc.rb
 :uri-freesoftware: https://www.gnu.org/philosophy/free-sw.html
-:uri-foundation: http://foundation.zurb.com
+:uri-foundation: https://foundation.zurb.com
 :uri-tilt: https://github.com/rtomayko/tilt
 :uri-ruby: https://ruby-lang.org
 // images:
@@ -87,7 +87,7 @@ Javaや他のJVM言語からAsciidoctor APIを直接呼び出すには,  {uri-as
 AsciidoctorJに基づいた, AsciidoctorプロセッサをApache Maven, GradleやJavadocに統合するプラグインがあります.
 
 AsciidoctorはJavaScriptでも実行可能です.
-{uri-asciidoctorjs}[Asciidoctor.js], WebブラウザやNode.jsのようなJavaScript環境で動くAsciidoctorの完全機能版, を生成するために, RubyのソースをJavaScriptにトランスパイルするのに http://opalrb.org[Opal]を使います.
+{uri-asciidoctorjs}[Asciidoctor.js], WebブラウザやNode.jsのようなJavaScript環境で動くAsciidoctorの完全機能版, を生成するために, RubyのソースをJavaScriptにトランスパイルするのに https://opalrb.com[Opal]を使います.
 Asciidoctor.jsはChrome, Atom, Brackets や他のウェブベースのツールの拡張機能としてAsciiDocのプレビューのために使われます.
 ****
 
@@ -220,7 +220,7 @@ TIP: お使いのシステムは自動的にdebパッケージをアップデー
 ディストリビューションのリリース毎に, どのバージョンがパッケージされているかはパッケージリポジトリを調べてください.
 
 * https://packages.debian.org/search?keywords=asciidoctor&searchon=names&exact=1&suite=all&section=all[asciidoctor package by Debian release]
-* http://packages.ubuntu.com/search?keywords=asciidoctor&searchon=names&exact=1&suite=all&section=all[asciidoctor package by Ubuntu release]
+* https://packages.ubuntu.com/search?keywords=asciidoctor&searchon=names&exact=1&suite=all&section=all[asciidoctor package by Ubuntu release]
 * https://community.linuxmint.com/software/view/asciidoctor[asciidoctor package by Mint release]
 
 [CAUTION]
@@ -229,7 +229,7 @@ TIP: お使いのシステムは自動的にdebパッケージをアップデー
 そのようなことをするのは, パッケージマネージャがファイル(/usr/local下にインストールされた)を追跡できなくなるためにシステムが不安定な状態にするためです.
 単純に, システムgemはパッケージマネージャによってのみ管理されるべきです.
 
-もし, パッケージマネージャによってインストールされたのより新しいバージョンのAsciidoctorを使いたければ,  http://rvm.io[RVM] や https://github.com/rbenv/rbenv[rbenv]を使ってRubyをホームディレクトリ(すなわち, ユーザースペース)にインストールするべきです.
+もし, パッケージマネージャによってインストールされたのより新しいバージョンのAsciidoctorを使いたければ,  https://rvm.io[RVM] や https://github.com/rbenv/rbenv[rbenv]を使ってRubyをホームディレクトリ(すなわち, ユーザースペース)にインストールするべきです.
 それから, 安心して `gem` コマンドをAsciidoctorのアップデート, インストールのために使うことができます.
 RVMやrbenvを使っているなら, gemはシステムからは孤立した場所にインストールされます.
 ====
@@ -264,7 +264,7 @@ AsciidoctorのバージョンとRuby環境についての情報がターミナ
 
 [.output,subs=attributes+]
 ....
-Asciidoctor {release-version} [http://asciidoctor.org]
+Asciidoctor {release-version} [https://asciidoctor.org]
 Runtime Environment (ruby 2.4.1p111 [x86_64-linux]) (lc:UTF-8 fs:UTF-8 in:- ex:UTF-8)
 ....
 
@@ -315,7 +315,7 @@ AsciiDoc文字列を埋め込みHTML(HTMLページヘの挿入)へ変換する
 
 [source]
 ----
-content = '_Zen_ in the art of writing http://asciidoctor.org[AsciiDoc].'
+content = '_Zen_ in the art of writing https://asciidoctor.org[AsciiDoc].'
 Asciidoctor.convert content, safe: :safe
 ----
 
@@ -323,7 +323,7 @@ Asciidoctor.convert content, safe: :safe
 
 [source]
 ----
-content = '_Zen_ in the art of writing http://asciidoctor.org[AsciiDoc].'
+content = '_Zen_ in the art of writing https://asciidoctor.org[AsciiDoc].'
 html = Asciidoctor.convert content, header_footer: true, safe: :safe
 ----
 
@@ -331,7 +331,7 @@ html = Asciidoctor.convert content, header_footer: true, safe: :safe
 
 [source]
 ----
-content = '_Zen_ in the art of writing http://asciidoctor.org[AsciiDoc].'
+content = '_Zen_ in the art of writing https://asciidoctor.org[AsciiDoc].'
 document = Asciidoctor.load content, header_footer: true, safe: :safe
 puts document.doctitle
 html = document.convert

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.0.rc.1, 2019-03-02
+v2.0.0.rc.2, 2019-03-12
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,13 +18,13 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.0.rc.1
+:release-version: 2.0.0.rc.2
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor
 :uri-asciidoctorj: {uri-org}/asciidoctorj
 :uri-asciidoctorjs: {uri-org}/asciidoctor.js
-:uri-project: http://asciidoctor.org
+:uri-project: https://asciidoctor.org
 ifdef::env-site[:uri-project: link:]
 :uri-docs: {uri-project}/docs
 :uri-news: {uri-project}/news
@@ -54,7 +54,7 @@ endif::[]
 :uri-gitscm-repo: https://github.com/git/git-scm.com
 :uri-prototype: {uri-gitscm-repo}/commits/master/lib/asciidoc.rb
 :uri-freesoftware: https://www.gnu.org/philosophy/free-sw.html
-:uri-foundation: http://foundation.zurb.com
+:uri-foundation: https://foundation.zurb.com
 :uri-tilt: https://github.com/rtomayko/tilt
 :uri-ruby: https://ruby-lang.org
 // images:
@@ -85,7 +85,7 @@ Asciidoctor 是开源的，{uri-repo}[代码]托管在 GitHub，遵从 {uri-lice
 基于 AsciidoctorJ 有好多插件可用，这些插件可以将 Asciidoctor 整合到 Apache Maven，Gradle 或 Javadoc 构建中。
 
 Asciidoctor 也可以运行在 JavaScript 上。
-我们可以使用 http://opalrb.org[Opal] 将 Ruby 源码编译成 JavaScript 生成 {uri-asciidoctorjs}[Asciidoctor.js] 文件，这是一个全功能版的 Asciidoctor，可以运行在任意的 JavaScript 环境中，比如 Web 浏览器 或 Node.js。
+我们可以使用 https://opalrb.com[Opal] 将 Ruby 源码编译成 JavaScript 生成 {uri-asciidoctorjs}[Asciidoctor.js] 文件，这是一个全功能版的 Asciidoctor，可以运行在任意的 JavaScript 环境中，比如 Web 浏览器 或 Node.js。
 Asciidoctor.js 被用于预览 AsciiDoc，支持 Chrome 扩展，Atom，Brackets 或其他基于 Web 的工具。
 ****
 
@@ -231,7 +231,7 @@ TIP: 如果你的 Debian 或 Ubuntu 系统配置的是自动升级包，在这
 请查看发行版的包库，来确定每个发行版是打包的哪个版本。
 
 * https://packages.debian.org/search?keywords=asciidoctor&searchon=names&exact=1&suite=all&section=all[Debian 发行版中的 asciidoctor]
-* http://packages.ubuntu.com/search?keywords=asciidoctor&searchon=names&exact=1&suite=all&section=all[Ubuntu 发行版中的 asciidoctor]
+* https://packages.ubuntu.com/search?keywords=asciidoctor&searchon=names&exact=1&suite=all&section=all[Ubuntu 发行版中的 asciidoctor]
 * https://community.linuxmint.com/software/view/asciidoctor[Mint 发行版中的 asciidoctor]
 
 [CAUTION]
@@ -240,7 +240,7 @@ TIP: 如果你的 Debian 或 Ubuntu 系统配置的是自动升级包，在这
 这样做会使系统进入不一致的状态，包管理工具将不再跟踪相关文件（通常安装在 /usr/local 下。）
 简单地说，系统的 gem 只能由包管理器进行管理。
 
-如果你想使用一个比包管理器安装的更新版本的 Asciidoctor，你应该使用 http://rvm.io[RVM] 在你的用户家目录（比如：用户空间）下安装 Ruby。
+如果你想使用一个比包管理器安装的更新版本的 Asciidoctor，你应该使用 https://rvm.io[RVM] 在你的用户家目录（比如：用户空间）下安装 Ruby。
 然后，你就可以放心地使用 `gem` 命令来安装或者更新 Asciidoctor gem。
 当使用 RVM 时，gem 将被安装到与系统隔离的位置。
 ====
@@ -276,7 +276,7 @@ TIP: 如果你的 Alpine Linux 系统配置的是自动升级包，在这种情
 
 [.output,subs=attributes+]
 ....
-Asciidoctor {release-version} [http://asciidoctor.org]
+Asciidoctor {release-version} [https://asciidoctor.org]
 Runtime Environment (ruby 2.4.1p111 [x86_64-linux]) (lc:UTF-8 fs:UTF-8 in:- ex:UTF-8)
 ....
 
@@ -329,7 +329,7 @@ WARNING: 当你通过 API 使用 Asciidoctor 时，默认的安全模式是 `:se
 
 [source]
 ----
-content = '_Zen_ in the art of writing http://asciidoctor.org[AsciiDoc].'
+content = '_Zen_ in the art of writing https://asciidoctor.org[AsciiDoc].'
 Asciidoctor.convert content, safe: :safe
 ----
 
@@ -337,7 +337,7 @@ Asciidoctor.convert content, safe: :safe
 
 [source]
 ----
-content = '_Zen_ in the art of writing http://asciidoctor.org[AsciiDoc].'
+content = '_Zen_ in the art of writing https://asciidoctor.org[AsciiDoc].'
 html = Asciidoctor.convert content, header_footer: true, safe: :safe
 ----
 
@@ -345,7 +345,7 @@ html = Asciidoctor.convert content, header_footer: true, safe: :safe
 
 [source]
 ----
-content = '_Zen_ in the art of writing http://asciidoctor.org[AsciiDoc].'
+content = '_Zen_ in the art of writing https://asciidoctor.org[AsciiDoc].'
 document = Asciidoctor.load content, header_footer: true, safe: :safe
 puts document.doctitle
 html = document.convert

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.0.rc.1, 2019-03-02
+v2.0.0.rc.2, 2019-03-12
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.0.rc.1
+:release-version: 2.0.0.rc.2
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/lib/asciidoctor.rb

@@ -14,34 +14,37 @@ else
   autoload :URI, 'uri'
 end
 
-# Public: Methods for parsing AsciiDoc input files and converting documents
-# using eRuby templates.
+# Public: The main application interface (API) for Asciidoctor. This API provides methods to parse AsciiDoc content and
+# convert it to various output formats using built-in or third-party converters or Tilt-supported templates.
 #
-# AsciiDoc documents comprise a header followed by zero or more sections.
-# Sections are composed of blocks of content.  For example:
+# An AsciiDoc document can be as simple as a single line of content, though it more commonly starts with a document
+# header that declares the document title and document attribute definitions. The document header is then followed by
+# zero or more section titles, optionally nested, to organize the paragraphs, blocks, lists, etc. of the document.
 #
-#   = Doc Title
+# By default, the processor converts the AsciiDoc document to HTML 5 using a built-in converter. However, this behavior
+# can be changed by specifying a different backend (e.g., +docbook+). A backend is a keyword for an output format (e.g.,
+# DocBook). That keyword, in turn, is used to select a converter, which carries out the request to convert the document
+# to that format.
 #
-#   == Section 1
+# In addition to this API, Asciidoctor also provides a command-line interface (CLI) named +asciidoctor+ for converting
+# AsciiDoc content. See the provided man(ual) page for usage and options.
 #
-#   This is a paragraph block in the first section.
+# Examples
 #
-#   == Section 2
+#   # Convert an AsciiDoc file
+#   Asciidoctor.convert_file 'document.adoc', safe: :safe
 #
-#   This section has a paragraph block and an olist block.
+#   # Convert an AsciiDoc string
+#   puts Asciidoctor.convert "I'm using *Asciidoctor* version {asciidoctor-version}.", safe: :safe
 #
-#   . Item 1
-#   . Item 2
+#   # Convert an AsciiDoc file using Tilt-supported templates
+#   Asciidoctor.convert_file 'document.adoc', safe: :safe, template_dir: '/path/to/templates'
 #
-# Examples:
+#   # Parse an AsciiDoc file into a document object
+#   doc = Asciidoctor.load_file 'document.adoc', safe: :safe
 #
-# Use built-in converter:
-#
-#   Asciidoctor.convert_file 'sample.adoc'
-#
-# Use custom (Tilt-supported) templates:
-#
-#   Asciidoctor.convert_file 'sample.adoc', template_dir: 'path/to/templates'
+#   # Parse an AsciiDoc string into a document object
+#   doc = Asciidoctor.load "= Document Title\n\nfirst paragraph\n\nsecond paragraph", safe: :safe
 #
 module Asciidoctor
   # alias the RUBY_ENGINE constant inside the Asciidoctor namespace and define a precomputed alias for runtime
@@ -499,9 +502,9 @@ module Asciidoctor
     #
     if RUBY_ENGINE == 'opal'
       # NOTE In JavaScript, ^ and $ match the boundaries of the string when the m flag is not set
-      AttributeEntryPassMacroRx = /^pass:([a-z]+(?:,[a-z]+)*)?\[(#{CC_ALL}*)\]$/
+      AttributeEntryPassMacroRx = /^pass:([a-z]+(?:,[a-z-]+)*)?\[(#{CC_ALL}*)\]$/
     else
-      AttributeEntryPassMacroRx = /\Apass:([a-z]+(?:,[a-z]+)*)?\[(.*)\]\Z/m
+      AttributeEntryPassMacroRx = /\Apass:([a-z]+(?:,[a-z-]+)*)?\[(.*)\]\Z/m
     end
 
     # Matches an inline attribute reference.
@@ -886,7 +889,7 @@ module Asciidoctor
     #   link:https://github.com[]
     #
     # FIXME revisit! the main issue is we need different rules for implicit vs explicit
-    InlineLinkRx = %r((^|link:|#{CG_BLANK}|&lt;|[>\(\)\[\];])(\\?(?:https?|file|ftp|irc)://[^\s\[\]<]*[^\s.,\[\]<])(?:\[(|#{CC_ALL}*?[^\\])\])?)m
+    InlineLinkRx = %r((^|link:|#{CG_BLANK}|&lt;|[>\(\)\[\];])(\\?(?:https?|file|ftp|irc)://[^\s\[\]<]*([^\s.,\[\]<]))(?:\[(|#{CC_ALL}*?[^\\])\])?)m
 
     # Match a link or e-mail inline macro.
     #
@@ -910,7 +913,7 @@ module Asciidoctor
     #   asciimath:[x != 0]
     #   latexmath:[\sqrt{4} = 2]
     #
-    InlineStemMacroRx = /\\?(stem|(?:latex|ascii)math):([a-z]+(?:,[a-z]+)*)?\[(#{CC_ALL}*?[^\\])\]/m
+    InlineStemMacroRx = /\\?(stem|(?:latex|ascii)math):([a-z]+(?:,[a-z-]+)*)?\[(#{CC_ALL}*?[^\\])\]/m
 
     # Matches a menu inline macro.
     #
@@ -961,7 +964,7 @@ module Asciidoctor
     #   pass:quotes[text]
     #
     # NOTE we have to support an empty pass:[] for compatibility with AsciiDoc Python
-    InlinePassMacroRx = /(?:(?:(\\?)\[([^\]]+)\])?(\\{0,2})(\+\+\+?|\$\$)(#{CC_ALL}*?)\4|(\\?)pass:([a-z]+(?:,[a-z]+)*)?\[(|#{CC_ALL}*?[^\\])\])/m
+    InlinePassMacroRx = /(?:(?:(\\?)\[([^\]]+)\])?(\\{0,2})(\+\+\+?|\$\$)(#{CC_ALL}*?)\4|(\\?)pass:([a-z]+(?:,[a-z-]+)*)?\[(|#{CC_ALL}*?[^\\])\])/m
 
     # Matches an xref (i.e., cross-reference) inline macro, which may span multiple lines.
     #
@@ -1085,16 +1088,6 @@ module Asciidoctor
     #
     UriSniffRx = %r(^#{CG_ALPHA}[#{CC_ALNUM}.+-]+:/{0,2})
 
-    # Detects the end of an implicit URI in the text
-    #
-    # Examples
-    #
-    #   (http://google.com)
-    #   &gt;http://google.com&lt;
-    #   (See http://google.com):
-    #
-    UriTerminatorRx = /[);:]$/
-
     # Detects XML tags
     XmlSanitizeRx = /<[^>]+>/
   #end
@@ -1132,70 +1125,54 @@ module Asciidoctor
     'gt'         => '>'
   }
 
-  # unconstrained quotes:: can appear anywhere
-  # constrained quotes:: must be bordered by non-word characters
-  # NOTE these substitutions are processed in the order they appear here and
-  # the order in which they are replaced is important
-  quote_subs = [
-    # **strong**
-    [:strong, :unconstrained, /\\?(?:\[([^\]]+)\])?\*\*(#{CC_ALL}+?)\*\*/m],
-
-    # *strong*
-    [:strong, :constrained, /(^|[^#{CC_WORD};:}])(?:\[([^\]]+)\])?\*(\S|\S#{CC_ALL}*?\S)\*(?!#{CG_WORD})/m],
-
-    # "`double-quoted`"
-    [:double, :constrained, /(^|[^#{CC_WORD};:}])(?:\[([^\]]+)\])?"`(\S|\S#{CC_ALL}*?\S)`"(?!#{CG_WORD})/m],
-
-    # '`single-quoted`'
-    [:single, :constrained, /(^|[^#{CC_WORD};:`}])(?:\[([^\]]+)\])?'`(\S|\S#{CC_ALL}*?\S)`'(?!#{CG_WORD})/m],
-
-    # ``monospaced``
-    [:monospaced, :unconstrained, /\\?(?:\[([^\]]+)\])?``(#{CC_ALL}+?)``/m],
-
-    # `monospaced`
-    [:monospaced, :constrained, /(^|[^#{CC_WORD};:"'`}])(?:\[([^\]]+)\])?`(\S|\S#{CC_ALL}*?\S)`(?![#{CC_WORD}"'`])/m],
-
-    # __emphasis__
-    [:emphasis, :unconstrained, /\\?(?:\[([^\]]+)\])?__(#{CC_ALL}+?)__/m],
-
-    # _emphasis_
-    [:emphasis, :constrained, /(^|[^#{CC_WORD};:}])(?:\[([^\]]+)\])?_(\S|\S#{CC_ALL}*?\S)_(?!#{CG_WORD})/m],
-
-    # ##mark## (referred to in AsciiDoc Python as unquoted)
-    [:mark, :unconstrained, /\\?(?:\[([^\]]+)\])?##(#{CC_ALL}+?)##/m],
-
-    # #mark# (referred to in AsciiDoc Python as unquoted)
-    [:mark, :constrained, /(^|[^#{CC_WORD}&;:}])(?:\[([^\]]+)\])?#(\S|\S#{CC_ALL}*?\S)#(?!#{CG_WORD})/m],
-
-    # ^superscript^
-    [:superscript, :unconstrained, /\\?(?:\[([^\]]+)\])?\^(\S+?)\^/],
-
-    # ~subscript~
-    [:subscript, :unconstrained, /\\?(?:\[([^\]]+)\])?~(\S+?)~/]
-  ]
-
-  compat_quote_subs = quote_subs.drop 0
-  # ``quoted''
-  compat_quote_subs[2] = [:double, :constrained, /(^|[^#{CC_WORD};:}])(?:\[([^\]]+)\])?``(\S|\S#{CC_ALL}*?\S)''(?!#{CG_WORD})/m]
-  # `quoted'
-  compat_quote_subs[3] = [:single, :constrained, /(^|[^#{CC_WORD};:}])(?:\[([^\]]+)\])?`(\S|\S#{CC_ALL}*?\S)'(?!#{CG_WORD})/m]
-  # ++monospaced++
-  compat_quote_subs[4] = [:monospaced, :unconstrained, /\\?(?:\[([^\]]+)\])?\+\+(#{CC_ALL}+?)\+\+/m]
-  # +monospaced+
-  compat_quote_subs[5] = [:monospaced, :constrained, /(^|[^#{CC_WORD};:}])(?:\[([^\]]+)\])?\+(\S|\S#{CC_ALL}*?\S)\+(?!#{CG_WORD})/m]
-  # #unquoted#
-  #compat_quote_subs[8] = [:unquoted, *compat_quote_subs[8][1..-1]]
-  # ##unquoted##
-  #compat_quote_subs[9] = [:unquoted, *compat_quote_subs[9][1..-1]]
-  # 'emphasis'
-  compat_quote_subs.insert 3, [:emphasis, :constrained, /(^|[^#{CC_WORD};:}])(?:\[([^\]]+)\])?'(\S|\S#{CC_ALL}*?\S)'(?!#{CG_WORD})/m]
-
-  QUOTE_SUBS = {
-    false => quote_subs,
-    true  => compat_quote_subs
-  }
-  quote_subs = nil
-  compat_quote_subs = nil
+  QUOTE_SUBS = {}.tap do |accum|
+    # unconstrained quotes:: can appear anywhere
+    # constrained quotes:: must be bordered by non-word characters
+    # NOTE these substitutions are processed in the order they appear here and
+    # the order in which they are replaced is important
+    accum[false] = normal = [
+      # **strong**
+      [:strong, :unconstrained, /\\?(?:\[([^\]]+)\])?\*\*(#{CC_ALL}+?)\*\*/m],
+      # *strong*
+      [:strong, :constrained, /(^|[^#{CC_WORD};:}])(?:\[([^\]]+)\])?\*(\S|\S#{CC_ALL}*?\S)\*(?!#{CG_WORD})/m],
+      # "`double-quoted`"
+      [:double, :constrained, /(^|[^#{CC_WORD};:}])(?:\[([^\]]+)\])?"`(\S|\S#{CC_ALL}*?\S)`"(?!#{CG_WORD})/m],
+      # '`single-quoted`'
+      [:single, :constrained, /(^|[^#{CC_WORD};:`}])(?:\[([^\]]+)\])?'`(\S|\S#{CC_ALL}*?\S)`'(?!#{CG_WORD})/m],
+      # ``monospaced``
+      [:monospaced, :unconstrained, /\\?(?:\[([^\]]+)\])?``(#{CC_ALL}+?)``/m],
+      # `monospaced`
+      [:monospaced, :constrained, /(^|[^#{CC_WORD};:"'`}])(?:\[([^\]]+)\])?`(\S|\S#{CC_ALL}*?\S)`(?![#{CC_WORD}"'`])/m],
+      # __emphasis__
+      [:emphasis, :unconstrained, /\\?(?:\[([^\]]+)\])?__(#{CC_ALL}+?)__/m],
+      # _emphasis_
+      [:emphasis, :constrained, /(^|[^#{CC_WORD};:}])(?:\[([^\]]+)\])?_(\S|\S#{CC_ALL}*?\S)_(?!#{CG_WORD})/m],
+      # ##mark## (referred to in AsciiDoc Python as unquoted)
+      [:mark, :unconstrained, /\\?(?:\[([^\]]+)\])?##(#{CC_ALL}+?)##/m],
+      # #mark# (referred to in AsciiDoc Python as unquoted)
+      [:mark, :constrained, /(^|[^#{CC_WORD}&;:}])(?:\[([^\]]+)\])?#(\S|\S#{CC_ALL}*?\S)#(?!#{CG_WORD})/m],
+      # ^superscript^
+      [:superscript, :unconstrained, /\\?(?:\[([^\]]+)\])?\^(\S+?)\^/],
+      # ~subscript~
+      [:subscript, :unconstrained, /\\?(?:\[([^\]]+)\])?~(\S+?)~/]
+    ]
+
+    accum[true] = compat = normal.drop 0
+    # ``quoted''
+    compat[2] = [:double, :constrained, /(^|[^#{CC_WORD};:}])(?:\[([^\]]+)\])?``(\S|\S#{CC_ALL}*?\S)''(?!#{CG_WORD})/m]
+    # `quoted'
+    compat[3] = [:single, :constrained, /(^|[^#{CC_WORD};:}])(?:\[([^\]]+)\])?`(\S|\S#{CC_ALL}*?\S)'(?!#{CG_WORD})/m]
+    # ++monospaced++
+    compat[4] = [:monospaced, :unconstrained, /\\?(?:\[([^\]]+)\])?\+\+(#{CC_ALL}+?)\+\+/m]
+    # +monospaced+
+    compat[5] = [:monospaced, :constrained, /(^|[^#{CC_WORD};:}])(?:\[([^\]]+)\])?\+(\S|\S#{CC_ALL}*?\S)\+(?!#{CG_WORD})/m]
+    # #unquoted#
+    #compat[8] = [:unquoted, *compat[8][1..-1]]
+    # ##unquoted##
+    #compat[9] = [:unquoted, *compat[9][1..-1]]
+    # 'emphasis'
+    compat.insert 3, [:emphasis, :constrained, /(^|[^#{CC_WORD};:}])(?:\[([^\]]+)\])?'(\S|\S#{CC_ALL}*?\S)'(?!#{CG_WORD})/m]
+  end
 
   # NOTE order of replacements is significant
   REPLACEMENTS = [

data/lib/asciidoctor/abstract_block.rb

@@ -18,7 +18,7 @@ class AbstractBlock < AbstractNode
   # Public: Set the Integer level of this {Section} or the level of the Section to which this {AbstractBlock} belongs.
   attr_accessor :level
 
-  # Public: Get/Set the numeral of this block (if section, relative to parent, otherwise absolute).
+  # Public: Get/Set the String numeral of this block (if section, relative to parent, otherwise absolute).
   # Only assigned to section if automatic section numbering is enabled.
   # Only assigned to formal block (block with title) if corresponding caption attribute is present.
   attr_accessor :numeral

data/lib/asciidoctor/block.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Asciidoctor
-# Public: Methods for managing blocks of Asciidoc content in a section.
+# Public: Methods for managing AsciiDoc content blocks.
 #
 # Examples
 #

data/lib/asciidoctor/cli/options.rb

@@ -118,7 +118,7 @@ module Asciidoctor
               'may be specified more than once') do |path|
             (self[:requires] ||= []).concat(path.split ',')
           end
-          opts.on('--failure-level LEVEL', %w(warning WARNING error ERROR), 'set minimum logging level that triggers a non-zero exit code: [WARN, ERROR] (default: FATAL)') do |level|
+          opts.on('--failure-level LEVEL', %w(warning WARNING error ERROR debug DEBUG), 'set minimum logging level that triggers non-zero exit code: [WARN, ERROR, DEBUG] (default: FATAL)') do |level|
             level = 'WARN' if (level = level.upcase) == 'WARNING'
             self[:failure_level] = ::Logger::Severity.const_get level, false
           end

data/lib/asciidoctor/converter.rb

@@ -21,8 +21,8 @@ module Asciidoctor
 #       super
 #       outfilesuffix '.txt'
 #     end
-#     def convert node, transform = nil, opts = nil
-#       case (transform ||= node.node_name)
+#     def convert node, transform = node.node_name, opts = nil
+#       case transform
 #       when 'document', 'section'
 #         [node.title, node.content].join %(\n\n)
 #       when 'paragraph'
@@ -376,10 +376,10 @@ module Converter
     # underscore and mark them as private. Implementations may override this method to provide different behavior.
     #
     # See {Converter#convert} for details about the arguments and return value.
-    def convert node, transform = nil, opts = nil
-      opts ? (send transform || node.node_name, node, opts) : (send transform || node.node_name, node)
+    def convert node, transform = node.node_name, opts = nil
+      opts ? (send transform, node, opts) : (send transform, node)
     rescue
-      raise unless ::NoMethodError === (ex = $!) && ex.receiver == self && ex.name.to_s == (transform || node.node_name)
+      raise unless ::NoMethodError === (ex = $!) && ex.receiver == self && ex.name.to_s == transform
       logger.warn %(missing convert handler for #{ex.name} node in #{@backend} backend (#{self.class}))
       nil
     end

data/lib/asciidoctor/document.rb

@@ -13,7 +13,7 @@ module Asciidoctor
 # :safe (or :unsafe) to enable all of Asciidoctor's features.
 #
 #   Asciidoctor.load '= Hello, AsciiDoc!', safe: :safe
-#   # => Asciidoctor::Document { doctype: "article", doctitle: "Hello, Asciidoc!", blocks: 0 }
+#   # => Asciidoctor::Document { doctype: "article", doctitle: "Hello, AsciiDoc!", blocks: 0 }
 #
 # Instances of this class can be used to extract information from the document
 # or alter its structure. As such, the Document object is most often used in
@@ -613,6 +613,13 @@ 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.
+  #
+  # 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]

data/lib/asciidoctor/logging.rb

@@ -66,7 +66,9 @@ end
 class NullLogger < ::Logger
   attr_reader :max_severity
 
-  def initialize; end
+  def initialize
+    self.level = WARN
+  end
 
   def add severity, message = nil, progname = nil
     if (severity ||= UNKNOWN) > (@max_severity ||= severity)

data/lib/asciidoctor/reader.rb

@@ -957,12 +957,8 @@ class PreprocessorReader < Reader
         lhs = resolve_expr_val $1
         rhs = resolve_expr_val $3
 
-        # regex enforces a restricted set of math-related operations
-        if $2 == '!='
-          skip = lhs.send :==, rhs
-        else
-          skip = !(lhs.send $2.to_sym, rhs)
-        end
+        # regex enforces a restricted set of math-related operations (==, !=, <=, >=, <, >)
+        skip = (lhs.send $2, rhs) ? false : true
       end
     end
 

data/lib/asciidoctor/substitutors.rb

@@ -232,7 +232,7 @@ module Substitutors
       if compat_mode
         old_behavior = true
       else
-        if (old_behavior = (attributes && (attributes.end_with? 'x-')))
+        if (old_behavior = attributes && (attributes.end_with? 'x-'))
           attributes = attributes.slice 0, attributes.length - 2
         end
       end
@@ -282,6 +282,8 @@ module Substitutors
         type = STEM_TYPE_ALIASES[@document.attributes['stem']].to_sym
       end
       content = unescape_brackets $3
+      # NOTE for backwards compatibility with AsciiDoc Python, drop enclosing $ signs around latexmath
+      content = content.slice 1, content.length - 2 if type == :latexmath && (content.start_with? '$') && (content.end_with? '$')
       subs = $2 ? (resolve_pass_subs $2) : ((@document.basebackend? 'html') ? BASIC_SUBS : nil)
       passthrus[passthru_key = passthrus.size] = { text: content, subs: subs, type: type }
       %(#{PASS_START}#{passthru_key}#{PASS_END})
@@ -317,7 +319,10 @@ module Substitutors
       if (pass = passthrus[$1.to_i])
         subbed_text = apply_subs(pass[:text], pass[:subs])
         if (type = pass[:type])
-          subbed_text = Inline.new(self, :quoted, subbed_text, type: type, attributes: pass[:attributes]).convert
+          if (attributes = pass[:attributes])
+            id = attributes.delete 'id'
+          end
+          subbed_text = Inline.new(self, :quoted, subbed_text, type: type, id: id, attributes: attributes).convert
         end
         subbed_text.include?(PASS_START) ? restore_passthroughs(subbed_text) : subbed_text
       else
@@ -672,52 +677,55 @@ module Substitutors
     if found_colon && (text.include? '://')
       # inline urls, target[text] (optionally prefixed with link: and optionally surrounded by <>)
       text = text.gsub InlineLinkRx do
-        target = $2
-        # honor the escape
-        next %(#{$1}#{target.slice 1, target.length}#{$3}) if target.start_with? RS
-
-        # NOTE if text is non-nil, then we've matched a formal macro (i.e., trailing square brackets)
-        captured, prefix, text, suffix = $&, $1, (macro = $3) || '', ''
-        if prefix == 'link:'
-          if macro
-            prefix = ''
-          else
-            # invalid macro syntax (link: prefix w/o trailing square brackets)
-            # we probably shouldn't even get here...our regex is doing too much
-            next captured
-          end
+        if (target = $2).start_with? RS
+          # honor the escape
+          next %(#{$1}#{target.slice 1, target.length}#{$4})
         end
-        unless macro || UriTerminatorRx !~ target
-          case $&
+
+        prefix, suffix = $1, ''
+        # NOTE if $4 is set, then we're looking at a formal macro
+        if $4
+          prefix = '' if prefix == 'link:'
+          text = $4
+        else
+          # invalid macro syntax (link: prefix w/o trailing square brackets)
+          # FIXME we probably shouldn't even get here...our regex is doing too much
+          next $& if prefix == 'link:'
+          text = ''
+          case $3
           when ')'
-            # strip trailing )
+            # move trailing ) out of URL
             target = target.chop
             suffix = ')'
+            # NOTE handle case when modified target is a URI scheme (e.g., http://)
+            next $& if target.end_with? '://'
           when ';'
-            # strip <> around URI
-            if prefix.start_with?('&lt;') && target.end_with?('&gt;')
+            if (prefix.start_with? '&lt;') && (target.end_with? '&gt;')
+              # move surrounding <> out of URL
               prefix = prefix.slice 4, prefix.length
               target = target.slice 0, target.length - 4
-            # strip trailing ;
-            # check for trailing );
-            elsif (target = target.chop).end_with?(')')
+            elsif (target = target.chop).end_with? ')'
+              # move trailing ); out of URL
               target = target.chop
               suffix = ');'
             else
+              # move trailing ; out of URL
               suffix = ';'
             end
+            # NOTE handle case when modified target is a URI scheme (e.g., http://)
+            next $& if target.end_with? '://'
           when ':'
-            # strip trailing :
-            # check for trailing ):
-            if (target = target.chop).end_with?(')')
+            if (target = target.chop).end_with? ')'
+              # move trailing ): out of URL
               target = target.chop
               suffix = '):'
             else
+              # move trailing : out of URL
               suffix = ':'
             end
+            # NOTE handle case when modified target is a URI scheme (e.g., http://)
+            next $& if target.end_with? '://'
           end
-          # NOTE handle case when remaining target is a URI scheme (e.g., http://)
-          return captured if target.end_with? '://'
         end
 
         attrs, link_opts = nil, { type: :link }
@@ -759,7 +767,7 @@ module Substitutors
 
         doc.register :links, (link_opts[:target] = target)
         link_opts[:attributes] = attrs if attrs
-        %(#{prefix}#{Inline.new(self, :anchor, text, link_opts).convert}#{suffix})
+        %(#{prefix}#{(Inline.new self, :anchor, text, link_opts).convert}#{suffix})
       end
     end
 
@@ -1344,32 +1352,7 @@ module Substitutors
     # NOTE the call to highlight? is a defensive check since, normally, we wouldn't arrive here unless it returns true
     return sub_source source, process_callouts unless (syntax_hl = @document.syntax_highlighter) && syntax_hl.highlight?
 
-    if process_callouts
-      callout_marks = {}
-      lineno = 0
-      last_lineno = nil
-      callout_rx = (attr? 'line-comment') ? CalloutExtractRxMap[attr 'line-comment'] : CalloutExtractRx
-      # extract callout marks, indexed by line number
-      source = (source.split LF, -1).map do |line|
-        lineno += 1
-        line.gsub callout_rx do
-          # honor the escape
-          if $2
-            # use sub since it might be behind a line comment
-            $&.sub RS, ''
-          else
-            (callout_marks[lineno] ||= []) << [$1, $4]
-            last_lineno = lineno
-            nil
-          end
-        end
-      end.join LF
-      if last_lineno
-        source = %(#{source}#{LF}) if last_lineno == lineno
-      else
-        callout_marks = nil
-      end
-    end
+    source, callout_marks = extract_callouts source if process_callouts
 
     doc_attrs = @document.attributes
     syntax_hl_name = syntax_hl.name
@@ -1390,31 +1373,61 @@ module Substitutors
     highlighted = highlighted.gsub HighlightedPassSlotRx, %(#{PASS_START}\\1#{PASS_END}) unless @passthroughs.empty?
 
     # NOTE highlight method may have depleted callouts
-    if callout_marks.nil_or_empty?
-      highlighted
-    else
-      if source_offset
-        preamble = highlighted.slice 0, source_offset
-        highlighted = highlighted.slice source_offset, highlighted.length
-      else
-        preamble = ''
-      end
-      autonum = lineno = 0
-      preamble + ((highlighted.split LF, -1).map do |line|
-        if (conums = callout_marks.delete lineno += 1)
-          if conums.size == 1
-            guard, conum = conums[0]
-            %(#{line}#{Inline.new(self, :callout, conum == '.' ? (autonum += 1).to_s : conum, id: @document.callouts.read_next_id, attributes: { 'guard' => guard }).convert})
-          else
-            %(#{line}#{conums.map do |guard_it, conum_it|
-              Inline.new(self, :callout, conum_it == '.' ? (autonum += 1).to_s : conum_it, id: @document.callouts.read_next_id, attributes: { 'guard' => guard_it }).convert
-            end.join ' '})
-          end
+    callout_marks.nil_or_empty? ? highlighted : (restore_callouts highlighted, callout_marks, source_offset)
+  end
+
+  # Internal: Extract the callout numbers from the source to prepare it for syntax highlighting.
+  def extract_callouts source
+    callout_marks = {}
+    lineno = 0
+    last_lineno = nil
+    callout_rx = (attr? 'line-comment') ? CalloutExtractRxMap[attr 'line-comment'] : CalloutExtractRx
+    # extract callout marks, indexed by line number
+    source = (source.split LF, -1).map do |line|
+      lineno += 1
+      line.gsub callout_rx do
+        # honor the escape
+        if $2
+          # use sub since it might be behind a line comment
+          $&.sub RS, ''
         else
-          line
+          (callout_marks[lineno] ||= []) << [$1, $4]
+          last_lineno = lineno
+          ''
         end
-      end.join LF)
+      end
+    end.join LF
+    if last_lineno
+      source = %(#{source}#{LF}) if last_lineno == lineno
+    else
+      callout_marks = nil
     end
+    [source, callout_marks]
+  end
+
+  # Internal: Restore the callout numbers to the highlighted source.
+  def restore_callouts source, callout_marks, source_offset = nil
+    if source_offset
+      preamble = source.slice 0, source_offset
+      source = source.slice source_offset, source.length
+    else
+      preamble = ''
+    end
+    autonum = lineno = 0
+    preamble + ((source.split LF, -1).map do |line|
+      if (conums = callout_marks.delete lineno += 1)
+        if conums.size == 1
+          guard, conum = conums[0]
+          %(#{line}#{Inline.new(self, :callout, conum == '.' ? (autonum += 1).to_s : conum, id: @document.callouts.read_next_id, attributes: { 'guard' => guard }).convert})
+        else
+          %(#{line}#{conums.map do |guard_it, conum_it|
+            Inline.new(self, :callout, conum_it == '.' ? (autonum += 1).to_s : conum_it, id: @document.callouts.read_next_id, attributes: { 'guard' => guard_it }).convert
+          end.join ' '})
+        end
+      else
+        line
+      end
+    end.join LF)
   end
 
   # e.g., highlight="1-5, !2, 10" or highlight=1-5;!2,10

data/lib/asciidoctor/syntax_highlighter/coderay.rb

@@ -15,8 +15,8 @@ class SyntaxHighlighter::CodeRayAdapter < SyntaxHighlighter::Base
 
   def highlight node, source, lang, opts
     @requires_stylesheet = true if (css_mode = opts[:css_mode]) == :class
-    # NOTE CodeRay::Duo gracefully falls back to no highlighting if lang isn't recognized
-    highlighted = ::CodeRay::Duo[lang ? lang.to_sym : :text, :html,
+    lang = lang ? (::CodeRay::Scanners[lang = lang.to_sym] && lang rescue :text) : :text
+    highlighted = ::CodeRay::Duo[lang, :html,
       css: css_mode,
       line_numbers: (line_numbers = opts[:number_lines]),
       line_number_start: opts[:start_line_number],

data/lib/asciidoctor/table.rb

@@ -71,13 +71,11 @@ class Table < AbstractBlock
     end
     @attributes['tablepcwidth'] = pcwidth_intval
 
-    if @document.attributes.key? 'pagewidth'
-      # FIXME calculate more accurately (only used in DocBook output)
-      @attributes['tableabswidth'] ||=
-          ((@attributes['tablepcwidth'].to_f / 100) * @document.attributes['pagewidth']).round
+    if @document.attributes['pagewidth']
+      @attributes['tableabswidth'] = (abswidth_val = (((pcwidth_intval / 100.0) * @document.attributes['pagewidth'].to_f).truncate DEFAULT_PRECISION)) == abswidth_val.to_i ? abswidth_val.to_i : abswidth_val
     end
 
-    attributes['orientation'] = 'landscape' if attributes['rotate-option']
+    @attributes['orientation'] = 'landscape' if attributes['rotate-option']
   end
 
   # Internal: Returns whether the current row being processed is
@@ -206,12 +204,10 @@ class Table::Column < AbstractNode
       col_pcwidth = (@attributes['width'].to_f * 100.0 / width_base).truncate precision
       col_pcwidth = col_pcwidth.to_i if col_pcwidth.to_i == col_pcwidth
     end
-    @attributes['colpcwidth'] = col_pcwidth
-    if parent.attributes.key? 'tableabswidth'
-      # FIXME calculate more accurately (only used in DocBook output)
-      @attributes['colabswidth'] = ((col_pcwidth / 100.0) * parent.attributes['tableabswidth']).round
+    if parent.attributes['tableabswidth']
+      @attributes['colabswidth'] = (col_abswidth = ((col_pcwidth / 100.0) * parent.attributes['tableabswidth']).truncate precision) == col_abswidth.to_i ? col_abswidth.to_i : col_abswidth
     end
-    col_pcwidth
+    @attributes['colpcwidth'] = col_pcwidth
   end
 
   def block?

data/lib/asciidoctor/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Asciidoctor
-  VERSION = '2.0.0.rc.1'
+  VERSION = '2.0.0.rc.2'
 end

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White, Ryan Waldron
-.\" Generator: Asciidoctor 2.0.0.rc.1
-.\"      Date: 2019-03-02
+.\" Generator: Asciidoctor 2.0.0.rc.2
+.\"      Date: 2019-03-12
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 2.0.0.rc.1
+.\"    Source: Asciidoctor 2.0.0.rc.2
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2019-03-02" "Asciidoctor 2.0.0.rc.1" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2019-03-12" "Asciidoctor 2.0.0.rc.2" "Asciidoctor Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0

data/man/asciidoctor.adoc

@@ -2,7 +2,7 @@
 Dan Allen; Sarah White; Ryan Waldron
 :doctype: manpage
 :man manual: Asciidoctor Manual
-:man source: Asciidoctor 2.0.0.rc.1
+:man source: Asciidoctor 2.0.0.rc.2
 :page-layout: base
 
 == NAME

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc.1
+  version: 2.0.0.rc.2
 platform: ruby
 authors:
 - Dan Allen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-02 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -319,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: An implementation of the AsciiDoc text processor and publishing toolchain