asciidoctor 2.0.0.rc.2 → 2.0.0.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f340fd25a88b03b8039dc09623ce2d043d30e78a09c84519e9e8ffb59f7f9217
-  data.tar.gz: e7b1550ffe98c8ccf086eb9ce2b41c2a7f32a9946d34ba5b2a647af0d7887248
+  metadata.gz: 5c6f979786009b69e2cc868e90f1b97a7a62cf7906b6071bba4f7de471230df4
+  data.tar.gz: b117e749de44c5f099b1f40967165cd6c9792e895ca31fa51b654d87c4c7811f
 SHA512:
-  metadata.gz: 0ee1db87cdc03978ab1b20097ec44cc7151df771f6b9b434a2432bb6efc280079c4820164d039a5b04fc24351cb022d376d193628c5f673f5cc458d6e1c83a78
-  data.tar.gz: 696401edc7d556b9e1070ec1bd74cffcda8747b61a896d46b7c5cf521a35b6cf3925ed78809e8032babe293ca62cf281087e44a6ea21a03f5d1d24e32604bfcf
+  metadata.gz: 0a04640a9791301a5007acfcb70c3ed8daaeef605ed1c7e315ee85ba5bca717d7df52dec82870a73aa2d5d84fc6d30d0abe7f9146592b089d2c41bb21e81fe4a
+  data.tar.gz: 7b7ed4a9107ee200c447c69452b371049d6ea12cd36b2c4b29e3bab752ed2e1f1db24ec741971840a2bb4d2463da5802013f073bbd8ebea2a0885d8fe07f4edb

data/CHANGELOG.adoc

@@ -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.2 (2019-03-12) - @mojavelinux
+== 2.0.0.rc.3 (2019-03-21) - @mojavelinux
 
 Enhancements / Compliance::
 
@@ -47,7 +47,8 @@ Enhancements / Compliance::
   * remove the 2-character (i.e., `""`) quote block syntax
   * don't allow block role to inherit from document attribute; only look for role in block attributes (#1944)
   * split out functionality of -w CLI flag (script warnings) from -v CLI flag (verbose logging) (#3030)
-  * log possible invalid references at debug level (#3030)
+  * log possible invalid references at info level (#3030)
+  * log dropped lines at info level when attribute-missing=drop-line (#2861)
   * use the third argument of AbstractNode#attr / AbstractNode#attr? to set the name of a fallback attribute to look for on the document (#1934)
   * change default value of third argument to Abstractnode#attr / AbstractNode#attr? to nil so attribute doesn't inherit by default (#3059)
   * look for table-frame, table-grid, and table-stripes attributes on document as fallback for frame, grid, and stripes attributes on table (#3059)
@@ -64,16 +65,31 @@ Enhancements / Compliance::
   * 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 info message if inline macro processor returns a String value (#3176)
+  * apply subs to Inline node returned by inline macro processor if subs attribute is specified (#3178)
+  * add create_inline_pass helper method to base extension processor class (#3178)
   * 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)
+  * rename control keywords in find_by to better align with the standard NodeFilter terminology
+  * stop find_by iteration if filter block returns :stop directive
+  * rename header_footer option to standalone (while still honoring header_footer for backwards compatibility) (#1444)
+  * replace anchors and xrefs before footnotes (replace footnotes last in macros substitution group)
+  * apply substitution for custom inline macro before all other macros
+  * drop indexterms table from document catalog (in preparation for solution to #450 in a 2.x release)
+  * load additional languages for highlight.js as defined in the comma-separated highlightjs-languages attribute (#3036)
+  * log warning if conditional expression in ifeval directive is invalid (#3161)
+  * drop lines that contain an invalid preprocessor directive (#3161)
+  * rename AbstractBlock#find_by directives; use :prune in place of :skip_children and :reject in place of :skip
+  * convert example block into details/summary tag set if collapsible option is set; open by default if open option is set (#1699)
 
 Improvements::
 
   * propagate document ID to DocBook output (#3011)
+  * always store section numeral as string; compute roman numeral for part at assignment time (@vmj)
   * refactor code to use modern Hash syntax
   * define LIB_DIR constant; rename *_PATH constants to *_DIR constants to be consistent with RubyGems terminology (#2764)
   * only define ROOT_DIR if not already defined (for compatibility with Asciidoctor.js)
@@ -84,12 +100,15 @@ Improvements::
   * ensure linenos class is added to linenos column when source highlighter is pygments and pygments-css=style
   * rename CSS class of Pygments line numbering table to linenotable (to align with Rouge) (#1040)
   * remove unused Converter#convert_with_options method (#2891)
+  * add -e, --embedded CLI flag as alias for -s, --no-header-footer (require long option to specify eRuby impl) (#1444)
   * don't store the options attribute on the block once the options are parsed (#3051)
   * add an options method on AbstractNode to retrieve the set of option names (#3051)
   * pass :input_mtime option to Document constructor; let Document constructor assign docdate/time/year attributes (#3029)
   * never mutate strings; add a `frozen_string_literal: true` magic comment to top of all Ruby source files (#3054)
   * always use docdate and doctime to compute docyear and docdatetime (#3064)
   * rename PreprocessorReader#exceeded_max_depth? to PreprocessorReader#exceeds_max_depth? and return nil if includes are disabled
+  * log warning when include directive is not resolved due to missing attribute or blank target; always include warning in output (#2868)
+  * honor attribute-missing setting when processing include directives and block macros (#2855)
   * stop populating :ids table in document catalog (#3084)
   * always use :refs table in document catalog to look for registered IDs (#3084)
   * don't compute and store reference text in document catalog (#3084)
@@ -100,13 +119,17 @@ 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)
+  * extend TLD for implicit e-mail addresses to 5 characters (#3154)
   * 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)
+  * use proper terminology in warning message about mismatched preprocessor directive (#3165)
   * upgrade MathJax to 2.7.5
 
 Bug Fixes::
 
   * fix crash caused by inline passthrough macro with the macros sub clearing the remaining passthrough placeholders (#3089)
+  * fix crash if ifeval directive is missing expression (#3164)
+  * prevent relative leveloffset from making section level negative and causing hang (#3152)
   * don't fail to parse Markdown-style quote block that only contains attribution line (#2989)
   * enforce rule that Setext section title must have at least one alphanumeric character; fixes problem w/ block nested inside quote block (#3060)
   * apply header subs to doctitle value when assigning it back to the doctitle document attribute (#3106)
@@ -125,7 +148,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
+  * allow failure level of CLI to be set to info
   * 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
@@ -134,6 +157,10 @@ Bug Fixes::
   * 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)
   * initialize the level to WARN when instantiating the NullLogger
+  * next_adjacent_block should not fail when called on dlist item (#3133)
+  * don't suppress browser styles for summary tag; add pointer cursor and panel margin bottom (#3155)
+  * only consider TLDs in e-mail address that have ASCII alpha characters
+  * allow underscore in domain of e-mail address
 
 Build / Infrastructure::
 
@@ -142,6 +169,7 @@ Build / Infrastructure::
   * add Ruby 2.6.0 to build matrix
   * stop running CI job on unsupported versions of Ruby
   * exclude test suite, build script, and Gemfile from gem (#3044)
+  * split build tasks out into individual files
 
 // tag::compact[]
 == 1.5.8 (2018-10-28) - @mojavelinux

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.2, 2019-03-12
+v2.0.0.rc.3, 2019-03-21
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.0.rc.2
+:release-version: 2.0.0.rc.3
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor
@@ -97,12 +97,6 @@ endif::[]
 
 Wir möchten unseren großzügigen Sponsoren danken, ohne deren Unterstützung Asciidoctor nicht möglich wäre.
 Vielen Dank an die Sponsoren für ihr Engagement zur Verbesserung der technischen Dokumentation!
-
-image:https://www.okta.com/sites/all/themes/Okta/images/blog/Logos/Okta_Logo_BrightBlue_Medium.png[Okta,280,link=https://developer.okta.com/signup?utm_source=asciidoctor&utm_medium=logo&utm_campaign=sponsor,title="Add User Auth to Your Apps in Minutes with Okta"]
-&nbsp; &nbsp; &nbsp;
-image:https://secure.gravatar.com/avatar/823717a797dbd78ceff7b26aa397f383.png?size=200[OpenDevise,100,link=https://opendevise.com,title="Let the Creators of Asciidoctor and Antora Help You to Accelerate Your Docs"]
-
-Unsere Change Makers, https://developer.okta.com/signup?utm_source=asciidoctor&utm_medium=text-link&utm_campaign=sponsor[Okta] und https://opendevise.com[OpenDevise], sowie unsere Strategiesponsoren https://www.khronos.org/[Khronos Group] und Linda Roberts finanzieren Asciidoctor maßgeblich.
 Zusätzliche Mittel werden von unseren https://asciidoctor.org/supporters[Community Backers] zur Verfügung gestellt.
 
 Sie können dieses Projekt unterstützen, indem Sie Sponsor bei https://opencollective.com/asciidoctor[OpenCollective] werden.

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.2, 2019-03-12
+v2.0.0.rc.3, 2019-03-21
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.0.rc.2
+:release-version: 2.0.0.rc.3
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor
@@ -94,12 +94,6 @@ endif::[]
 
 Nous souhaitons exprimer toute notre reconnaissance à nos généreux sponsors, sans qui Asciidoctor ne pourrait pas exister.
 Merci à vous pour votre engagement dans l'amélioration de la documentation technique !
-
-image:https://www.okta.com/sites/all/themes/Okta/images/blog/Logos/Okta_Logo_BrightBlue_Medium.png[Okta,280,link=https://developer.okta.com/signup?utm_source=asciidoctor&utm_medium=logo&utm_campaign=sponsor,title="Add User Auth to Your Apps in Minutes with Okta"]
-&nbsp; &nbsp; &nbsp;
-image:https://secure.gravatar.com/avatar/823717a797dbd78ceff7b26aa397f383.png?size=200[OpenDevise,100,link=https://opendevise.com,title="Let the Creators of Asciidoctor and Antora Help You to Accelerate Your Docs"]
-
-Asciidoctor est financé majoritairement par nos *Change Makers*, https://developer.okta.com/signup?utm_source=asciidoctor&utm_medium=text-link&utm_campaign=sponsor[Okta] et https://opendevise.com[OpenDevise], ainsi que par nos *Strategy Sponsors*, https://www.khronos.org/[Khronos Group] et Linda Roberts.
 Un apport financier supplémentaire est assuré par https://asciidoctor.org/supporters[la communauté].
 
 Vous pouvez aider ce projet en devant un sponsor sur https://opencollective.com/asciidoctor[OpenCollective].

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.2, 2019-03-12
+v2.0.0.rc.3, 2019-03-21
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.0.rc.2
+:release-version: 2.0.0.rc.3
 // 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.0.rc.2, 2019-03-12
+v2.0.0.rc.3, 2019-03-21
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.0.rc.2
+:release-version: 2.0.0.rc.3
 // 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.0.rc.2, 2019-03-12
+v2.0.0.rc.3, 2019-03-21
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.0.rc.2
+:release-version: 2.0.0.rc.3
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor
@@ -101,11 +101,7 @@ endif::[]
 We want to recognize our generous sponsors, without whose support Asciidoctor would not be possible.
 Thank you sponsors for your dedication to improving the state of technical documentation!
 
-image:https://www.okta.com/sites/all/themes/Okta/images/blog/Logos/Okta_Logo_BrightBlue_Medium.png[Okta,280,link=https://developer.okta.com/signup?utm_source=asciidoctor&utm_medium=logo&utm_campaign=sponsor,title="Add User Auth to Your Apps in Minutes with Okta"]
-&nbsp; &nbsp; &nbsp;
-image:https://secure.gravatar.com/avatar/823717a797dbd78ceff7b26aa397f383.png?size=200[OpenDevise,100,link=https://opendevise.com,title="Let the Creators of Asciidoctor and Antora Help You to Accelerate Your Docs"]
-
-Major funding for Asciidoctor is provided by our *Change Makers*, https://developer.okta.com/signup?utm_source=asciidoctor&utm_medium=text-link&utm_campaign=sponsor[Okta] and https://opendevise.com[OpenDevise], and our *Strategy Sponsors*, https://www.khronos.org/[Khronos Group] and Linda Roberts.
+Major funding for Asciidoctor is provided by our *Change Maker*, https://opendevise.com[OpenDevise], our *Strategy Sponsors*, https://www.khronos.org/[Khronos Group] and Linda Roberts, and our *Pull Request Backers*, Brian Dominick, Guillaume Grossetie, and Abel Salgado Romero.
 Additional funding is provided by our https://asciidoctor.org/supporters[Community Backers].
 
 You can support this project by becoming a sponsor on https://opencollective.com/asciidoctor[OpenCollective].

data/data/locale/attributes-fr.adoc

@@ -2,7 +2,7 @@
 :appendix-caption: Annexe
 :appendix-refsig: {appendix-caption}
 :caution-caption: Avertissement
-//:chapter-label: ???
+//:chapter-label: Chapitre
 //:chapter-refsig: {chapter-label}
 :example-caption: Exemple
 :figure-caption: Figure

data/data/stylesheets/asciidoctor-default.css

@@ -1,7 +1,7 @@
 /* Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */
 /* Uncomment @import statement when using as custom stylesheet */
 /*@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,700";*/
-article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}
+article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}
 audio,canvas,video{display:inline-block}
 audio:not([controls]){display:none;height:0}
 script{display:none!important}
@@ -186,7 +186,8 @@ body.toc2.toc-right{padding-left:0;padding-right:20em}}
 #content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible}
 #content h1>a.link,h2>a.link,h3>a.link,#toctitle>a.link,.sidebarblock>.content>.title>a.link,h4>a.link,h5>a.link,h6>a.link{color:#ba3925;text-decoration:none}
 #content h1>a.link:hover,h2>a.link:hover,h3>a.link:hover,#toctitle>a.link:hover,.sidebarblock>.content>.title>a.link:hover,h4>a.link:hover,h5>a.link:hover,h6>a.link:hover{color:#a53221}
-.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
+details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
+details>summary:first-of-type{cursor:pointer;display:list-item;outline:none;margin-bottom:.75em}
 .admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic}
 table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
 .paragraph.lead>p,#preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:1.21875em;line-height:1.6;color:rgba(0,0,0,.85)}

data/lib/asciidoctor.rb

@@ -831,7 +831,7 @@ module Asciidoctor
     #
     #   doc.writer@example.com
     #
-    InlineEmailRx = %r(([\\>:/])?#{CG_WORD}(?:&|[#{CC_WORD}.%+-])*@#{CG_ALNUM}[#{CC_ALNUM}.-]*\.#{CG_ALPHA}{2,4}\b)
+    InlineEmailRx = %r(([\\>:/])?#{CG_WORD}(?:&|[#{CC_WORD}.%+-])*@#{CG_ALNUM}[#{CC_ALNUM}_.-]*\.[a-zA-Z]{2,5}\b)
 
     # Matches an inline footnote macro, which is allowed to span multiple lines.
     #
@@ -1188,7 +1188,7 @@ module Asciidoctor
     # foo--bar
     [/(#{CG_WORD})\\?--(?=#{CG_WORD})/, '—​', :leading],
     # ellipsis
-    [/\\?\.\.\./, '…​', :leading],
+    [/\\?\.\.\./, '…​', :none],
     # right single quote
     [/\\?`'/, '’', :none],
     # apostrophe (inside a word)
@@ -1221,7 +1221,7 @@ module Asciidoctor
   #
   # Returns the Document
   def load input, options = {}
-    options = options.dup
+    options = options.merge
 
     if (timings = options[:timings])
       timings.start :read
@@ -1233,7 +1233,9 @@ module Asciidoctor
 
     if !(attrs = options[:attributes])
       attrs = {}
-    elsif ::Hash === attrs || ((defined? ::Java::JavaUtil::Map) && ::Java::JavaUtil::Map === 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|
@@ -1351,7 +1353,7 @@ module Asciidoctor
   # Returns the Document object if the converted String is written to a
   # file, otherwise the converted String
   def convert input, options = {}
-    options = options.dup
+    options = options.merge
     options.delete(:parse)
     to_file = options.delete(:to_file)
     to_dir = options.delete(:to_dir)
@@ -1375,8 +1377,12 @@ module Asciidoctor
       write_to_target = (stream_output = to_file.respond_to? :write) ? false : (options[:to_file] = to_file)
     end
 
-    unless options.key? :header_footer
-      options[:header_footer] = true if write_to_same_dir || write_to_target
+    unless options.key? :standalone
+      if write_to_same_dir || 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

data/lib/asciidoctor/abstract_block.rb

@@ -23,10 +23,6 @@ class AbstractBlock < AbstractNode
   # Only assigned to formal block (block with title) if corresponding caption attribute is present.
   attr_accessor :numeral
 
-  # Deprecated: Legacy property to get/set the numeral of this block.
-  alias number numeral
-  alias number= numeral=
-
   # Public: Gets/Sets the location in the AsciiDoc source where this block begins.
   attr_accessor :source_location
 
@@ -142,16 +138,19 @@ class AbstractBlock < AbstractNode
     @next_section_index > 0
   end
 
-  # Public: Walk the document tree and find all block-level nodes that match
-  # the specified selector (context, style, id, role, and/or custom filter).
+  # Deprecated: Legacy property to get the String or Integer numeral of this section.
+  def number
+    (Integer @numeral) rescue @numeral
+  end
+
+  # Public: Walk the document tree and find all block-level nodes that match the specified selector (context, style, id,
+  # role, and/or custom filter).
   #
-  # If a Ruby block is given, it's treated as an supplemental filter. If the
-  # filter returns true, the node is accepted and traversal continues. If the
-  # filter returns false, the node is rejected, but traversal continues. If the
-  # filter returns :skip, the node and all its descendants are rejected. If the
-  # filter returns :skip_children, the node is accepted, but its descendants
-  # are rejected. If no selector or filter block is supplied, all block-level
-  # nodes in the tree are returned.
+  # If a Ruby block is given, it's applied as a supplemental filter. If the filter returns true (which implies :accept),
+  # the node is accepted and node traversal continues. If the filter returns false (which implies :skip), the node is
+  # skipped, but its children are still visited. If the filter returns :reject, the node and all its descendants are
+  # rejected. If the filter returns :prune, the node is accepted, but its descendants are rejected. If no selector
+  # or filter block is supplied, all block-level nodes in the tree are returned.
   #
   # Examples
   #
@@ -179,7 +178,13 @@ class AbstractBlock < AbstractNode
   # Move to the next adjacent block in document order. If the current block is the last
   # item in a list, this method will return the following sibling of the list block.
   def next_adjacent_block
-    (sib = (p = parent).blocks[(p.blocks.find_index self) + 1]) ? sib : p.next_adjacent_block unless @context == :document
+    unless @context == :document
+      if (p = @parent).context == :dlist && @context == :list_item
+        (sib = p.items[(p.items.find_index {|terms, desc| (terms.include? self) || desc == self }) + 1]) ? sib : p.next_adjacent_block
+      else
+        (sib = p.blocks[(p.blocks.find_index self) + 1]) ? sib : p.next_adjacent_block
+      end
+    end
   end
 
   # Public: Get the Array of child Section objects
@@ -397,16 +402,12 @@ class AbstractBlock < AbstractNode
     if (like = section.numbered)
       if (sectname = section.sectname) == 'appendix'
         section.numeral = @document.counter 'appendix-number', 'A'
-        if (caption = @document.attributes['appendix-caption'])
-          section.caption = %(#{caption} #{section.numeral}: )
-        else
-          section.caption = %(#{section.numeral}. )
-        end
+        section.caption = (caption = @document.attributes['appendix-caption']) ? %(#{caption} #{section.numeral}: ) : %(#{section.numeral}. )
       # NOTE currently chapters in a book doctype are sequential even for multi-part books (see #979)
       elsif sectname == 'chapter' || like == :chapter
-        section.numeral = @document.counter 'chapter-number', 1
+        section.numeral = (@document.counter 'chapter-number', 1).to_s
       else
-        section.numeral = @next_section_ordinal
+        section.numeral = sectname == 'part' ? (Helpers.int_to_roman @next_section_ordinal) : @next_section_ordinal.to_s
         @next_section_ordinal += 1
       end
     end
@@ -440,23 +441,28 @@ class AbstractBlock < AbstractNode
         (!(style_selector = selector[:style]) || style_selector == @style) &&
         (!(role_selector = selector[:role]) || (has_role? role_selector)) &&
         (!(id_selector = selector[:id]) || id_selector == @id)
-      if id_selector
-        block_given? && !(yield self) ? result.clear : (result.replace [self])
-        raise ::StopIteration
-      elsif block_given?
+      if block_given?
         if (verdict = yield self)
           case verdict
-          when :skip_children
+          when :prune
             result << self
+            raise ::StopIteration if id_selector
             return result
-          when :skip
+          when :reject
+            raise ::StopIteration if id_selector
             return result
+          when :stop
+            raise ::StopIteration
           else
             result << self
+            raise ::StopIteration if id_selector
           end
+        elsif id_selector
+          raise ::StopIteration
         end
       else
         result << self
+        raise ::StopIteration if id_selector
       end
     end
     case @context

data/lib/asciidoctor/abstract_node.rb

@@ -25,19 +25,15 @@ class AbstractNode
   attr_reader :parent
 
   def initialize parent, context, opts = {}
+    # document is a special case, should refer to itself
     if context == :document
-      # document is a special case, should refer to itself
-      @document, @parent = self, nil
-    else
-      if parent
-        @document, @parent = parent.document, parent
-      else
-        @document = @parent = nil
-      end
+      @document = self
+    elsif parent
+      @document = (@parent = parent).document
     end
     @node_name = (@context = context).to_s
-    # QUESTION are we correct in duplicating the attributes (seems to be just as fast)
-    @attributes = (opts.key? :attributes) ? opts[:attributes].dup : {}
+    # NOTE the value of the :attributes option may be nil on an Inline node
+    @attributes = (attrs = opts[:attributes]) ? attrs.merge : {}
     @passthroughs = []
   end