asciidoctor 2.0.23 → 2.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b1c9cee03ccdf7fcc1d1aee9e9d934863d55065c673781d6113d93627ba16de
-  data.tar.gz: 582869ca4932e3b58d9ed0c45a7bb2f555a660e0b691090858768f0353be036a
+  metadata.gz: 1b219565eafae2806084f9fee67def534a864eaaebc7891dced5d5f4cd238abb
+  data.tar.gz: 51137dfb8f450991351e82b0da3d15ad923209dad72606ab2a5b868a78c6e1a0
 SHA512:
-  metadata.gz: 0757a8709e9278d7f5a6eaf0fdfd55001a336f110cad837ebdb2bf2918c9288703d9f4073ebb7e88ffd76532f8472c250191c7a81a0a821f055ac55b4d5e5965
-  data.tar.gz: 2ff7be04f59f2431d5d0da01c5fe792d089f1a53c72f6a166c3e6dd274ff17eddebcc39c66d4479047885033da48798c125906d3c7453dd950d60751d04d271f
+  metadata.gz: 141b60fe34a662b4924f873985be200c1e5f9b574e44aa7336ec7febed0d3a4fbe8b8e8619441da2f7fdca51a17a0689155634cbde1fc63478c9dae6fd41d382
+  data.tar.gz: 814788310c10bf2cdda6e7cde44a43fcd83702aea854aa48d9e51b3af77e9ec13c0966dbf73f298eb8d39ff84fe8aa5d01881283016ea49c3609c3bf065a663c

data/CHANGELOG.adoc

@@ -16,6 +16,43 @@ For an even more detailed look at what has changed, refer to the {url-repo}/comm
 This project utilizes semantic versioning.
 
 // tag::compact[]
+== 2.0.24 (2025-10-13) - @mojavelinux
+
+Compliance::
+
+  * Support link attribute on inline image macro when converting to DocBook (#4385)
+  * Add magic comment `backticks_javascript: true` to achieve compatibility with Opal 2.0 (#4775) (*@janbiedermann*)
+  * Extract the require logic of the OpenURI library for Asciidoctor.js compatibility (#4244) (*@ggrossetie*)
+
+Improvements::
+
+  * Suppress warning about loading logger from stdlib when using Ruby 3.4 (#4769)
+  * Log error if unterminated preprocessor conditional directive is detected (#3545)
+  * Coerce names passed to the `positional_attrs` directive on an extension to strings (#4674)
+  * Ignore `SOURCE_DATE_EPOCH` environment variable if value is empty instead of exiting with non-zero exit code (#4631)
+  * Change Brazilian Portuguese translation for toc-title (#4653) (*@giflw*)
+
+Bug Fixes::
+
+  * Consider `convert_` prefix when looking for missing convert method in converter (#4669) (*@eugoka*)
+  * Don't push conditional onto stack if conditional preprocessor directive is invalid when skipping lines (#4603)
+  * Only style code tag as block element when inside pre in listing block; not inside verse block (#4610)
+  * Pass kwargs to Logger superclass and only assign defaults when kwarg is not specified (#4773)
+  * Don't add role=include to link macro that replaces include directive when running in compat mode (#4608)
+
+Documentation::
+
+  * Rewrite documentation for how to create a custom converter from scratch and make examples more thorough (#4699)
+
+Build / Infrastructure::
+
+  * Fix classification of several substitution tests (#4691) (*@scouten*)
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.24[git tag] | {url-repo}/compare/v2.0.23\...v2.0.24[full diff]
+// end::compact[]
+
 == 2.0.23 (2024-05-17) - @mojavelinux
 
 Compliance::
@@ -38,7 +75,6 @@ Bug Fixes::
 === Details
 
 {url-repo}/releases/tag/v2.0.23[git tag] | {url-repo}/compare/v2.0.22\...v2.0.23[full diff]
-// end::compact[]
 
 == 2.0.22 (2024-03-08) - @mojavelinux
 

data/README-de.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.23, 2024-05-17
+v2.0.24, 2025-10-13
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.23
+:release-version: 2.0.24
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-fr.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.23, 2024-05-17
+v2.0.24, 2025-10-13
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.23
+:release-version: 2.0.24
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-jp.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.23, 2024-05-17
+v2.0.24, 2025-10-13
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.23
+:release-version: 2.0.24
 // 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]>
-v2.0.23, 2024-05-17
+v2.0.24, 2025-10-13
 // settings:
 :page-layout: base
 :idprefix:
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.23
+:release-version: 2.0.24
 // 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]>
-v2.0.23, 2024-05-17
+v2.0.24, 2025-10-13
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.23
+:release-version: 2.0.24
 // URLs:
 :url-org: https://github.com/asciidoctor
 :url-repo: {url-org}/asciidoctor

data/asciidoctor.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
     'bug_tracker_uri' => 'https://github.com/asciidoctor/asciidoctor/issues',
     'changelog_uri' => 'https://github.com/asciidoctor/asciidoctor/blob/HEAD/CHANGELOG.adoc',
     'mailing_list_uri' => 'https://chat.asciidoctor.org',
-    'source_code_uri' => 'https://github.com/asciidoctor/asciidoctor'
+    'source_code_uri' => 'https://github.com/asciidoctor/asciidoctor',
+    'funding_uri' => 'https://opencollective.com/asciidoctor'
   }
 
   # NOTE the logic to build the list of files is designed to produce a usable package even when the git command is not available
@@ -38,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'cucumber', '~> 3.1.0'
   # erubi is needed for testing alternate eRuby impls
   s.add_development_dependency 'erubi', '~> 1.10.0'
-  s.add_development_dependency 'haml', '~> 6.1.0'
+  s.add_development_dependency 'haml', '~> 6.3.0'
   s.add_development_dependency 'minitest', '~> 5.22.0'
   s.add_development_dependency 'nokogiri', '~> 1.13.0'
   s.add_development_dependency 'rake', '~> 12.3.0'

data/data/locale/attributes-pt_BR.adoc

@@ -17,7 +17,7 @@ ifdef::preface-title[:preface-title: Prefácio]
 :section-refsig: Seção
 :table-caption: Tabela
 :tip-caption: Dica
-:toc-title: Índice
+:toc-title: Sumário
 :untitled-label: Sem título
 :version-label: Versão
 :warning-caption: Aviso

data/data/stylesheets/asciidoctor-default.css

@@ -106,7 +106,6 @@ h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title str
 :not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed}
 pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
 pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
-pre>code{display:block}
 pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal}
 em em{font-style:normal}
 strong strong{font-weight:400}
@@ -209,6 +208,7 @@ table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
 .literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class=highlight],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
 .literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)}
 .listingblock>.content{position:relative}
+.listingblock pre>code{display:block}
 .listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:inherit;opacity:.5}
 .listingblock:hover code[data-lang]::before{display:block}
 .listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5}

data/lib/asciidoctor/abstract_node.rb

@@ -399,15 +399,7 @@ class AbstractNode
   # Returns A data URI string built from Base64 encoded data read from the URI
   # and the mime type specified in the Content Type header.
   def generate_data_uri_from_uri image_uri, cache_uri = false
-    if cache_uri
-      # caching requires the open-uri-cached gem to be installed
-      # processing will be automatically aborted if these libraries can't be opened
-      Helpers.require_library 'open-uri/cached', 'open-uri-cached'
-    elsif !RUBY_ENGINE_OPAL
-      # autoload open-uri
-      ::OpenURI
-    end
-
+    Helpers.require_open_uri cache_uri
     begin
       mimetype, bindata = ::OpenURI.open_uri(image_uri, URI_READ_MODE) {|f| [f.content_type, f.read] }
       # NOTE pack 'm0' is equivalent to Base64.strict_encode64

data/lib/asciidoctor/callouts.rb

@@ -59,7 +59,7 @@ class Callouts
   #
   # Returns A space-separated String of callout ids associated with the specified list item
   def callout_ids li_ordinal
-    current_list.map {|it| it[:ordinal] == li_ordinal ? %(#{it[:id]} ) : '' }.join.chop
+    current_list.map {|item| item[:ordinal] == li_ordinal ? %(#{item[:id]} ) : '' }.join.chop
   end
 
   # Public: The current list for which callouts are being collected

data/lib/asciidoctor/cli/options.rb

@@ -94,7 +94,7 @@ module Asciidoctor
             self[:attributes][name] = val
           end
           opts.on('-T', '--template-dir DIR', 'a directory containing custom converter templates that override the built-in converter (requires tilt gem)',
-              'may be specified multiple times') do |template_dir|
+              'may be specified more than once') do |template_dir|
             if self[:template_dirs].nil?
               self[:template_dirs] = [template_dir]
             elsif ::Array === self[:template_dirs]

data/lib/asciidoctor/converter/docbook5.rb

@@ -535,12 +535,15 @@ class Converter::DocBook5Converter < Converter::Base
   end
 
   def convert_inline_image node
-    %(<inlinemediaobject#{common_attributes nil, node.role}>
+    img = %(<inlinemediaobject#{common_attributes nil, node.role}>
 <imageobject>
-<imagedata fileref="#{node.type == 'icon' ? (node.icon_uri node.target) : (node.image_uri node.target)}"#{image_size_attributes node.attributes}/>
+<imagedata fileref="#{node.type == 'icon' ? (node.icon_uri node.target) : (fileref = node.image_uri node.target)}"#{image_size_attributes node.attributes}/>
 </imageobject>
 <textobject><phrase>#{node.alt}</phrase></textobject>
 </inlinemediaobject>)
+    fileref && (node.attr? 'link') && (link_href = node.attr 'link') ?
+      %(<link xl:href="#{link_href}">#{img}</link>) :
+      img
   end
 
   def convert_inline_indexterm node

data/lib/asciidoctor/converter.rb

@@ -390,8 +390,8 @@ module Converter
     def convert node, transform = node.node_name, opts = nil
       opts ? (send 'convert_' + transform, node, opts) : (send 'convert_' + transform, node)
     rescue
-      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}))
+      raise unless ::NoMethodError === (ex = $!) && ex.receiver == self && ex.name.to_s == 'convert_' + transform
+      logger.warn %(missing convert handler for #{transform} node in #{@backend} backend (#{self.class}))
       nil
     end
 

data/lib/asciidoctor/document.rb

@@ -1038,7 +1038,7 @@ class Document < AbstractBlock
           docinfo = docinfo ? ['private'] : nil
         end
       else
-        docinfo = docinfo.split(',').map {|it| it.strip }
+        docinfo = docinfo.split(',').map {|keyword| keyword.strip }
       end
 
       if docinfo
@@ -1256,7 +1256,7 @@ class Document < AbstractBlock
   # localdatetime, docdate, docyear, doctime, and docdatetime. Honor the SOURCE_DATE_EPOCH environment variable, if set.
   def fill_datetime_attributes attrs, input_mtime
     # See https://reproducible-builds.org/specs/source-date-epoch/
-    now = (::ENV.key? 'SOURCE_DATE_EPOCH') ? (source_date_epoch = (::Time.at Integer ::ENV['SOURCE_DATE_EPOCH']).utc) : ::Time.now
+    now = ::ENV['SOURCE_DATE_EPOCH'].nil_or_empty? ? ::Time.now : (source_date_epoch = (::Time.at Integer ::ENV['SOURCE_DATE_EPOCH']).utc)
     if (localdate = attrs['localdate'])
       attrs['localyear'] ||= (localdate.index '-') == 4 ? (localdate.slice 0, 4) : nil
     else

data/lib/asciidoctor/extensions.rb

@@ -309,7 +309,7 @@ module Extensions
     alias parse_content_as content_model
 
     def positional_attributes *value
-      option :positional_attrs, value.flatten
+      option :positional_attrs, (value.flatten.map {|name| name.to_s })
     end
     alias name_positional_attributes positional_attributes
     # NOTE positional_attrs alias is deprecated
@@ -485,7 +485,7 @@ module Extensions
   # to add content to the header.
   class DocinfoProcessor < Processor
     def initialize config = {}
-      super config
+      super
       @config[:location] ||= :head
     end
 
@@ -1359,7 +1359,7 @@ module Extensions
 
     def add_document_processor kind, args, &block
       kind_name = kind.to_s.tr '_', ' '
-      kind_class_symbol = kind_name.split.map {|it| it.capitalize }.join.to_sym
+      kind_class_symbol = kind_name.split.map {|segment| segment.capitalize }.join.to_sym
       kind_class = Extensions.const_get kind_class_symbol, false
       kind_java_class = (defined? ::AsciidoctorJ) ? (::AsciidoctorJ::Extensions.const_get kind_class_symbol, false) : nil
       kind_store = instance_variable_get(%(@#{kind}_extensions).to_sym) || instance_variable_set(%(@#{kind}_extensions).to_sym, [])
@@ -1403,7 +1403,7 @@ module Extensions
 
     def add_syntax_processor kind, args, &block
       kind_name = kind.to_s.tr '_', ' '
-      kind_class_symbol = (kind_name.split.map {|it| it.capitalize } << 'Processor').join.to_sym
+      kind_class_symbol = (kind_name.split.map {|segment| segment.capitalize } << 'Processor').join.to_sym
       kind_class = Extensions.const_get kind_class_symbol, false
       kind_java_class = (defined? ::AsciidoctorJ) ? (::AsciidoctorJ::Extensions.const_get kind_class_symbol, false) : nil
       kind_store = instance_variable_get(%(@#{kind}_extensions).to_sym) || instance_variable_set(%(@#{kind}_extensions).to_sym, {})

data/lib/asciidoctor/helpers.rb

@@ -1,3 +1,4 @@
+# backtick_javascript: true
 # frozen_string_literal: true
 module Asciidoctor
 # Internal: Except where noted, a module that contains internal helper functions.
@@ -48,6 +49,25 @@ module Helpers
     nil
   end
 
+  # Internal: Require the OpenURI library.
+  #
+  # Attempts to load `open-uri-cached` if the cache argument is true otherwise autoload `open-uri`.
+  #
+  # cache - A Boolean flag indicating whether to activate content cache URI
+  #
+  # Returns nothing
+  def require_open_uri cache = false
+    if cache
+      # caching requires the open-uri-cached gem to be installed
+      # processing will be automatically aborted if these libraries can't be opened
+      require_library 'open-uri/cached', 'open-uri-cached' unless defined? ::OpenURI::Cache
+    else
+      # autoload open-uri
+      ::OpenURI
+    end
+    nil
+  end
+
   # Internal: Prepare the source data Array for parsing.
   #
   # Encodes the data to UTF-8, if necessary, and removes any trailing

data/lib/asciidoctor/logging.rb

@@ -1,15 +1,26 @@
 # frozen_string_literal: true
-require 'logger'
+
+proc do
+  old_verbose, $VERBOSE = $VERBOSE, nil
+  require 'logger' # suppress warning in Ruby 3.4 about loading logger from stdlib
+  $VERBOSE = old_verbose
+end.call
 
 module Asciidoctor
 class Logger < ::Logger
   attr_reader :max_severity
 
-  def initialize *args
+  def initialize *args, **opts
+    opts[:progname] = 'asciidoctor'
+    opts[:formatter] = BasicFormatter.new unless opts.key? :formatter
+    opts[:level] = WARN unless opts.key? :level
+    args = [$stderr] if args.empty?
     super
-    self.progname = 'asciidoctor'
-    self.formatter = BasicFormatter.new
-    self.level = WARN
+    if @progname.nil? && (method __method__).super_method.parameters.size == 3
+      @progname = opts[:progname]
+      @formatter = opts[:formatter]
+      @level = opts[:level]
+    end
   end
 
   def add severity, message = nil, progname = nil

data/lib/asciidoctor/parser.rb

@@ -1898,7 +1898,7 @@ class Parser
               implicit_author_metadata[%(firstname_#{name_idx = idx + 1})],
               implicit_author_metadata[%(middlename_#{name_idx})],
               implicit_author_metadata[%(lastname_#{name_idx})]
-            ].compact.map {|it| it.tr ' ', '_' }.join ' '
+            ].compact.map {|name| name.tr ' ', '_' }.join ' '
           end if sparse
           # process as names only
           author_metadata = process_authors authors, true, false

data/lib/asciidoctor/reader.rb

@@ -467,7 +467,7 @@ class Reader
       if lines_to_restore.respond_to? :reverse
         @lines.push(*lines_to_restore.reverse)
       else
-        lines_to_restore.reverse_each {|it| @lines.push it }
+        lines_to_restore.reverse_each {|l| @lines.push l }
       end
       nil
     end
@@ -619,7 +619,7 @@ class PreprocessorReader < Reader
 
   # Public: Initialize the PreprocessorReader object
   def initialize document, data = nil, cursor = nil, opts = {}
-    @document = document
+    @sourcemap = (@document = document).sourcemap
     super data, cursor, opts
     if (default_include_depth = (document.attributes['max-include-depth'] || 64).to_i) > 0
       # track absolute max depth, current max depth for comparing to include stack size, and relative max depth for reporting
@@ -657,6 +657,11 @@ class PreprocessorReader < Reader
     if (line = super)
       line
     elsif @include_stack.empty?
+      end_cursor = nil
+      @conditional_stack.delete_if do |conditional|
+        logger.error message_with_context %(detected unterminated preprocessor conditional directive: #{conditional[:name]}::#{conditional[:target] || ''}[#{conditional[:expr] || ''}]), source_location: conditional[:source_location] || (end_cursor ||= cursor_at_prev_line)
+        true
+      end
       nil
     else
       pop_include
@@ -890,7 +895,7 @@ class PreprocessorReader < Reader
   # preprocessing recursively until the next line of available content is
   # found.
   #
-  # keyword   - The conditional inclusion directive (ifdef, ifndef, ifeval, endif)
+  # name      - The name of the conditional inclusion directive (ifdef, ifndef, ifeval, endif)
   # target    - The target, which is the name of one or more attributes that are
   #             used in the condition (blank in the case of the ifeval directive)
   # delimiter - The conditional delimiter for multiple attributes ('+' means all
@@ -901,27 +906,32 @@ class PreprocessorReader < Reader
   #             ifndef directives, and for the conditional expression for the ifeval directive.
   #
   # Returns a Boolean indicating whether the cursor should be advanced
-  def preprocess_conditional_directive keyword, target, delimiter, text
+  def preprocess_conditional_directive name, target, delimiter, text
     # attributes are case insensitive
     target = target.downcase unless (no_target = target.empty?)
 
-    if keyword == 'endif'
+    if name == 'endif'
       if text
         logger.error message_with_context %(malformed preprocessor directive - text not permitted: endif::#{target}[#{text}]), source_location: cursor
       elsif @conditional_stack.empty?
         logger.error message_with_context %(unmatched preprocessor directive: endif::#{target}[]), source_location: cursor
-      elsif no_target || target == (pair = @conditional_stack[-1])[:target]
+      elsif no_target || target == @conditional_stack[-1][:target]
         @conditional_stack.pop
         @skipping = @conditional_stack.empty? ? false : @conditional_stack[-1][:skipping]
       else
-        logger.error message_with_context %(mismatched preprocessor directive: endif::#{target}[], expected endif::#{pair[:target]}[]), source_location: cursor
+        logger.error message_with_context %(mismatched preprocessor directive: endif::#{target}[], expected endif::#{@conditional_stack[-1][:target] || ''}[]), source_location: cursor
       end
       return true
     elsif @skipping
+      if name === 'ifeval'
+        return true unless no_target && text && (EvalExpressionRx.match? text.strip)
+      elsif no_target
+        return true
+      end
       skip = false
     else
       # QUESTION any way to wrap ifdef & ifndef logic up together?
-      case keyword
+      case name
       when 'ifdef'
         if no_target
           logger.error message_with_context %(malformed preprocessor directive - missing target: ifdef::[#{text}]), source_location: cursor
@@ -930,10 +940,10 @@ class PreprocessorReader < Reader
         case delimiter
         when ','
           # skip if no attribute is defined
-          skip = target.split(',', -1).none? {|name| @document.attributes.key? name }
+          skip = target.split(',', -1).none? {|attr_name| @document.attributes.key? attr_name }
         when '+'
           # skip if any attribute is undefined
-          skip = target.split('+', -1).any? {|name| !@document.attributes.key? name }
+          skip = target.split('+', -1).any? {|attr_name| !@document.attributes.key? attr_name }
         else
           # if the attribute is undefined, then skip
           skip = !@document.attributes.key?(target)
@@ -946,10 +956,10 @@ class PreprocessorReader < Reader
         case delimiter
         when ','
           # skip if any attribute is defined
-          skip = target.split(',', -1).any? {|name| @document.attributes.key? name }
+          skip = target.split(',', -1).any? {|attr_name| @document.attributes.key? attr_name }
         when '+'
           # skip if all attributes are defined
-          skip = target.split('+', -1).all? {|name| @document.attributes.key? name }
+          skip = target.split('+', -1).all? {|attr_name| @document.attributes.key? attr_name }
         else
           # if the attribute is defined, then skip
           skip = @document.attributes.key?(target)
@@ -976,11 +986,11 @@ class PreprocessorReader < Reader
     end
 
     # conditional inclusion block
-    if keyword == 'ifeval' || !text
+    if name == 'ifeval'
       @skipping = true if skip
-      @conditional_stack << { target: target, skip: skip, skipping: @skipping }
+      @conditional_stack << { name: name, expr: text, skip: skip, skipping: @skipping, source_location: @sourcemap ? cursor : nil }
     # single line conditional inclusion
-    else
+    elsif text
       unless @skipping || skip
         replace_next_line text.rstrip
         # HACK push dummy line to stand in for the opening conditional directive that's subsequently dropped
@@ -989,6 +999,10 @@ class PreprocessorReader < Reader
         # QUESTION should we just call preprocess_include_directive here?
         @look_ahead -= 1 if text.start_with? 'include::'
       end
+    # conditional inclusion block
+    else
+      @skipping = true if skip
+      @conditional_stack << { name: name, target: target, skip: skip, skipping: @skipping, source_location: @sourcemap ? cursor : nil }
     end
 
     true
@@ -1043,9 +1057,9 @@ class PreprocessorReader < Reader
     # if running in SafeMode::SECURE or greater, don't process this directive
     # however, be friendly and at least make it a link to the source document
     elsif doc.safe >= SafeMode::SECURE
+      # FIXME we don't want to use a passthrough or link macro if we're in a verbatim context
       expanded_target = %(pass:c[#{expanded_target}]) if expanded_target.include? ' '
-      # FIXME we don't want to use a link macro if we are in a verbatim context
-      replace_next_line %(link:#{expanded_target}[role=include])
+      replace_next_line %(link:#{expanded_target}[#{(doc.attr? 'compat-mode') ? '' : 'role=include'}])
     elsif @maxdepth
       if @include_stack.size >= @maxdepth[:curr]
         logger.error message_with_context %(maximum include depth of #{@maxdepth[:rel]} exceeded), source_location: cursor
@@ -1244,17 +1258,11 @@ class PreprocessorReader < Reader
     doc = @document
     if (Helpers.uriish? target) || (::String === @dir ? nil : (target = %(#{@dir}/#{target})))
       unless doc.attr? 'allow-uri-read'
+       # FIXME we don't want to use a passthrough or link macro if we're in a verbatim context
         target = %(pass:c[#{target}]) if target.include? ' '
-        return replace_next_line %(link:#{target}[role=include])
-      end
-      if doc.attr? 'cache-uri'
-        # caching requires the open-uri-cached gem to be installed
-        # processing will be automatically aborted if these libraries can't be opened
-        Helpers.require_library 'open-uri/cached', 'open-uri-cached' unless defined? ::OpenURI::Cache
-      elsif !RUBY_ENGINE_OPAL
-        # autoload open-uri
-        ::OpenURI
+        return replace_next_line %(link:#{target}[#{(doc.attr? 'compat-mode') ? '' : 'role=include'}])
       end
+      Helpers.require_open_uri doc.attr? 'cache-uri'
       [(::URI.parse target), :uri, target]
     else
       # include file is resolved relative to dir of current include, or base_dir if within original docfile

data/lib/asciidoctor/substitutors.rb

@@ -384,7 +384,7 @@ module Substitutors
           if (items = $2)
             items = items.gsub ESC_R_SB, R_SB if items.include? R_SB
             if (delim = items.include?('>') ? '>' : (items.include?(',') ? ',' : nil))
-              submenus = items.split(delim).map {|it| it.strip }
+              submenus = items.split(delim).map {|item| item.strip }
               menuitem = submenus.pop
             else
               submenus, menuitem = [], items.rstrip
@@ -402,7 +402,7 @@ module Substitutors
           # honor the escape
           next $&.slice 1, $&.length if $&.start_with? RS
 
-          menu, *submenus = $1.split('>').map {|it| it.strip }
+          menu, *submenus = $1.split('>').map {|item| item.strip }
           menuitem = submenus.pop
           Inline.new(self, :menu, nil, attributes: { 'menu' => menu, 'submenus' => submenus, 'menuitem' => menuitem }).convert
         end
@@ -454,7 +454,7 @@ module Substitutors
               end
               attrs['terms'] = terms
               if (see_also = attrs['see-also'])
-                attrs['see-also'] = (see_also.include? ',') ? (see_also.split ',').map {|it| it.lstrip } : [see_also]
+                attrs['see-also'] = (see_also.include? ',') ? (see_also.split ',').map {|item| item.lstrip } : [see_also]
               end
             else
               attrs = { 'terms' => attrlist }
@@ -471,7 +471,7 @@ module Substitutors
           if (term = normalize_text $2, true, true).include? '='
             term = (attrs = (AttributeList.new term, self).parse)[1] || (attrs = nil) || term
             if attrs && (see_also = attrs['see-also'])
-              attrs['see-also'] = (see_also.include? ',') ? (see_also.split ',').map {|it| it.lstrip } : [see_also]
+              attrs['see-also'] = (see_also.include? ',') ? (see_also.split ',').map {|item| item.lstrip } : [see_also]
             end
           end
           (Inline.new self, :indexterm, term, attributes: attrs, type: :visible).convert
@@ -1005,7 +1005,7 @@ module Substitutors
     end
     # If the start attribute is defined, then the lines to highlight specified by the provided spec should be relative to the start value.
     unless (shift = start ? start - 1 : 0) == 0
-      lines = lines.map {|it| it - shift }
+      lines = lines.map {|n| n - shift }
     end
     lines.sort
   end
@@ -1541,7 +1541,7 @@ module Substitutors
       end
       values << accum.strip
     else
-      str.split(',').map {|it| it.strip }
+      str.split(',').map {|item| item.strip }
     end
   end
 end

data/lib/asciidoctor/syntax_highlighter/coderay.rb

@@ -16,14 +16,15 @@ class SyntaxHighlighter::CodeRayAdapter < SyntaxHighlighter::Base
   def highlight node, source, lang, opts
     @requires_stylesheet = true if (css_mode = opts[:css_mode]) == :class
     lang = lang ? (::CodeRay::Scanners[lang = lang.to_sym] && lang rescue :text) : :text
-    highlighted = ::CodeRay::Duo[lang, :html,
+    highlighter_opts = {
       css: css_mode,
       line_numbers: (line_numbers = opts[:number_lines]),
       line_number_start: opts[:start_line_number],
       line_number_anchors: false,
       highlight_lines: opts[:highlight_lines],
       bold_every: false,
-    ].highlight source
+    }
+    highlighted = ::CodeRay::Duo[lang, :html, highlighter_opts].highlight source
     if line_numbers == :table && opts[:callouts]
       [highlighted, (idx = highlighted.index CodeCellStartTagCs) ? idx + CodeCellStartTagCs.length : nil]
     else

data/lib/asciidoctor/version.rb

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

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White
-.\" Generator: Asciidoctor 2.0.22
+.\" Generator: Asciidoctor 2.0.23
 .\"      Date: 2018-03-20
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 2.0.23
+.\"    Source: Asciidoctor 2.0.24
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2018-03-20" "Asciidoctor 2.0.23" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2018-03-20" "Asciidoctor 2.0.24" "Asciidoctor Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0

data/man/asciidoctor.adoc

@@ -1,7 +1,7 @@
 = asciidoctor(1)
 Dan Allen; Sarah White
 :doctype: manpage
-:release-version: 2.0.23
+:release-version: 2.0.24
 :man manual: Asciidoctor Manual
 :man source: Asciidoctor {release-version}
 ifdef::backend-manpage[:!author:]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 2.0.23
+  version: 2.0.24
 platform: ruby
 authors:
 - Dan Allen
@@ -10,7 +10,7 @@ authors:
 - Jason Porter
 - Nick Hengeveld
 - Jeremy McAnally
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2018-03-20 00:00:00.000000000 Z
@@ -63,14 +63,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.3.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -257,7 +257,8 @@ metadata:
   changelog_uri: https://github.com/asciidoctor/asciidoctor/blob/HEAD/CHANGELOG.adoc
   mailing_list_uri: https://chat.asciidoctor.org
   source_code_uri: https://github.com/asciidoctor/asciidoctor
-post_install_message: 
+  funding_uri: https://opencollective.com/asciidoctor
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -272,8 +273,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: An implementation of the AsciiDoc text processor and publishing toolchain
 test_files: []