asciidoctor 2.0.17 → 2.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c33baadb7f5d28211bbb55b0b2b002159d57d483d35d17fe1b11d72dd4389e53
-  data.tar.gz: db81a673d28035c721612ab1c4f9d23e005a824384ac0ba1b1983e9e817d44e6
+  metadata.gz: c415cde38b385b114b0de056cfc4235c6fbfdc0a0b189a7479c477ec4265e72a
+  data.tar.gz: cf171969c86a19aa9e846751564baf362e1d9fd2ab927c63f8f017c0f8de039e
 SHA512:
-  metadata.gz: a1fae45fddd3696607f9337f35222ecfad106aa295d2f328b54af5c21404ddb0c59baf6424b180bf46e4fed36fa28a6042f2d90310bb8acea01da4790a80ba3f
-  data.tar.gz: 0d65fb85055130df297d9ed12a63d68d03d5876c5b09f84d052396e793dada3a9406217969ac6574a3404b62113fb3afa7da235f6692ef2c1651904ecba00c71
+  metadata.gz: 4a1e07e2a597d176326d8547cebaf2424e43ba861912502f7e544a2ce74fab3567c9b1f9e87061c6586d7bfa1c1dbde764b7c50b7a3746f7b8548426f165c9f5
+  data.tar.gz: fb5b41022b045dd1ad09f09b5ffd98a512958186388ea1182d96c32367723925718ba49abe7dbaea84bf0c051a3121302a33bf0e302f5d1f25ca3068ba210be4

data/CHANGELOG.adoc

@@ -16,6 +16,31 @@ For an even more detailed look at what has changed, refer to the {uri-repo}/comm
 This project utilizes semantic versioning.
 
 // tag::compact[]
+== 2.0.18 (2022-10-15) - @mojavelinux
+
+Improvements::
+
+  * Propagate `:to_dir` option to document of AsciiDoc table cell (#4297)
+  * Force encoding of attribute data passed via CLI to UTF-8 if transcoding fails (#4351) (*@zkaip*)
+  * Add include role to link macro that replaces include directive when include is not enabled
+
+Bug Fixes::
+
+  * Change internal `uriish?` helper to only detect a URI pattern at start of a string; avoids misleading messages (#4357)
+  * Prevent highlight.js warning when no language is set on source block; don't call `highlightBlock` if `data-lang` attribute is absent (#4263)
+  * Don't raise error if `Asciidoctor::Extensions.unregister` is called before groups are initialized (#4270)
+  * If path is included both partially and fully, store it with true value (included fully) in includes table of document catalog
+  * Reset registry if activate is called on it again (#4256)
+  * Format source location in exception message when extension code is malformed
+  * Fix lineno on reader when `skip-front-matter` attribute is set but end of front matter is not found
+  * Fix `Asciidoctor::Cli::Invoker` constructor when first argument is a hash
+  * Update default stylesheet to honor marker on unordered list when marker is defined on ancestor unordered list (#4361)
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.18[git tag] | {url-repo}/compare/v2.0.17\...v2.0.18[source diff]
+// end::compact[]
+
 == 2.0.17 (2022-01-05) - @mojavelinux
 
 Bug Fixes::
@@ -27,12 +52,12 @@ Bug Fixes::
   * Change `AbstractBlock#sections?` to return false when called on block that isn't a Section or Document (PR #3591) *@mogztter*
   * Hide built-in marker on HTML summary element in Safari when using default stylesheet (#4162)
   * Hide outline around HTML summary when activated in Safari (#4162)
-  * Include primary video in value of `playlist` attribute when embeddding YouTube video (#4156)
-  * Honor stripes=none on nested table (#4165)
+  * Include primary video in value of `playlist` attribute when embedding YouTube video (#4156)
+  * Honor `stripes=none` on nested table (#4165)
   * Update default stylesheet to fix spacing around empty list item (#4184)
   * Honor `:header_only` option when parsing document with manpage doctype (#4192)
   * Use numeric character reference for closing square bracket around alt text of icon
-  * Process author or authors document attribute in document header when implicit doctitle is absent (#4206)
+  * Process `author` or `authors` document attribute in document header when implicit doctitle is absent (#4206)
   * Patch open-uri-cached gem to work with Ruby 3.1 (update: drop patch now that open-uri-cached has been fixed) (#4227)
 
 Improvements::
@@ -43,7 +68,7 @@ Improvements::
   * Remove obsolete gist embed styles from default stylesheet
   * Allow `--failure-level` to be set to default value, `FATAL`
   * Sort levels in help for `--failure-level` option in ascending order
-  * Invert FR translations for caution & warning admonition labels (#4212) (*cyChop*)
+  * Invert FR translations for caution & warning admonition labels (#4212) (*@cyChop*)
   * Add tests for open-uri-cached integration that is activated by the `cache-uri` attribute
   * Don't warn if negated tag is not found in include file (#4230)
 
@@ -55,7 +80,6 @@ Documentation::
   * Document how to enable and use the sourcemap (the `:sourcemap` option)
   * Document how to catalog additional assets (the `:catalog_assets` option)
 
-// end::compact[]
 == 2.0.16 (2021-08-03) - @mojavelinux
 
 Bug Fixes::

data/README-de.adoc

@@ -1,6 +1,5 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.17, 2022-01-05
 // settings:
 :idprefix:
 :idseparator: -

data/README-fr.adoc

@@ -1,6 +1,5 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.17, 2022-01-05
 // settings:
 :idprefix:
 :idseparator: -

data/README-jp.adoc

@@ -1,6 +1,5 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.17, 2022-01-05
 // settings:
 :idprefix:
 :idseparator: -

data/README-zh_CN.adoc

@@ -1,6 +1,5 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.17, 2022-01-05
 // settings:
 :page-layout: base
 :idprefix:

data/README.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.17, 2022-01-05
+v2.0.18, 2022-10-15
 // settings:
 :idprefix:
 :idseparator: -

data/asciidoctor.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.metadata = {
     'bug_tracker_uri' => 'https://github.com/asciidoctor/asciidoctor/issues',
     'changelog_uri' => 'https://github.com/asciidoctor/asciidoctor/blob/HEAD/CHANGELOG.adoc',
-    'mailing_list_uri' => 'http://discuss.asciidoctor.org',
+    'mailing_list_uri' => 'https://chat.asciidoctor.org',
     'source_code_uri' => 'https://github.com/asciidoctor/asciidoctor'
   }
 

data/data/stylesheets/asciidoctor-default.css

@@ -74,10 +74,10 @@ code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;
 ul,ol,dl{line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
 ul,ol{margin-left:1.5em}
 ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0}
-ul.square li ul,ul.circle li ul,ul.disc li ul{list-style:inherit}
-ul.square{list-style-type:square}
 ul.circle{list-style-type:circle}
 ul.disc{list-style-type:disc}
+ul.square{list-style-type:square}
+ul.circle ul:not([class]),ul.disc ul:not([class]),ul.square ul:not([class]){list-style:inherit}
 ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
 dl dt{margin-bottom:.3125em;font-weight:bold}
 dl dd{margin-bottom:1.25em}

data/lib/asciidoctor/block.rb

@@ -123,7 +123,7 @@ class Block < AbstractBlock
         result.join LF
       end
     else
-      logger.warn %(Unknown content model '#{@content_model}' for block: #{self}) unless @content_model == :empty
+      logger.warn %(unknown content model '#{@content_model}' for block: #{self}) unless @content_model == :empty
       nil
     end
   end

data/lib/asciidoctor/cli/invoker.rb

@@ -19,7 +19,7 @@ module Asciidoctor
         when Options
           @options = first_option
         when ::Hash
-          @options = Options.new options
+          @options = Options.new first_option
         else
           if ::Integer === (result = Options.parse! options)
             @code = result

data/lib/asciidoctor/cli/options.rb

@@ -85,7 +85,11 @@ module Asciidoctor
               'this attribute takes precedence over the same attribute defined in the source document',
               'unless either the name or value ends in @ (i.e., name@=value or name=value@)') do |attr|
             next if (attr = attr.rstrip).empty? || attr == '='
-            attr = attr.encode UTF_8 unless attr.encoding == UTF_8
+            begin
+              attr = attr.encode UTF_8
+            rescue ::EncodingError
+              attr = attr.force_encoding UTF_8
+            end unless attr.encoding == UTF_8
             name, _, val = attr.partition '='
             self[:attributes][name] = val
           end

data/lib/asciidoctor/document.rb

@@ -257,6 +257,7 @@ class Document < AbstractBlock
       @parent_document = parent_doc
       options[:base_dir] ||= parent_doc.base_dir
       options[:catalog_assets] = true if parent_doc.options[:catalog_assets]
+      options[:to_dir] = parent_doc.options[:to_dir] if parent_doc.options[:to_dir]
       @catalog = parent_doc.catalog.merge footnotes: []
       # QUESTION should we support setting attribute in parent document from nested document?
       @attribute_overrides = attr_overrides = (parent_doc.instance_variable_get :@attribute_overrides).merge parent_doc.attributes

data/lib/asciidoctor/extensions.rb

@@ -513,7 +513,12 @@ module Extensions
   #
   # If the process method returns an instance of Block, the content model of that
   # Block is :compound, and the Block contains at least one line, the parser will
-  # parse those lines into blocks an assigned them to the returned block.
+  # parse those lines into blocks and append them to the returned block.
+  #
+  # If your custom block can be applied to a paragraph or delimited block, and you
+  # want to preserve the content model of the input, check whether the value of
+  # the cloaked-context attribute is :paragraph. If it is, set the content model of
+  # the returned block to :simple. Otherwise, set the content model to :compound.
   #
   # AsciiDoc example:
   #
@@ -716,6 +721,7 @@ module Extensions
 
     def initialize groups = {}
       @groups = groups
+      reset
       @preprocessor_extensions = @tree_processor_extensions = @postprocessor_extensions = @include_processor_extensions = @docinfo_processor_extensions = @block_extensions = @block_macro_extensions = @inline_macro_extensions = nil
       @document = nil
     end
@@ -727,6 +733,7 @@ module Extensions
     #
     # Returns the instance of this [Registry].
     def activate document
+      reset if @document
       @document = document
       unless (ext_groups = Extensions.groups.values + @groups.values).empty?
         ext_groups.each do |group|
@@ -1345,7 +1352,7 @@ module Extensions
           yield processor
         end
         unless processor.process_block_given?
-          raise ::ArgumentError, %(No block specified to process #{kind_name} extension at #{block.source_location})
+          raise ::NoMethodError, %(No block specified to process #{kind_name} extension at #{block.source_location.join ':'})
         end
         processor.freeze
         extension = ProcessorExtension.new kind, processor
@@ -1389,10 +1396,10 @@ module Extensions
           yield processor
         end
         unless (name = as_symbol processor.name)
-          raise ::ArgumentError, %(No name specified for #{kind_name} extension at #{block.source_location})
+          raise ::ArgumentError, %(No name specified for #{kind_name} extension at #{block.source_location.join ':'})
         end
         unless processor.process_block_given?
-          raise ::NoMethodError, %(No block specified to process #{kind_name} extension at #{block.source_location})
+          raise ::NoMethodError, %(No block specified to process #{kind_name} extension at #{block.source_location.join ':'})
         end
         processor.freeze
         kind_store[name] = ProcessorExtension.new kind, processor
@@ -1424,6 +1431,11 @@ module Extensions
       end
     end
 
+    def reset
+      @preprocessor_extensions = @tree_processor_extensions = @postprocessor_extensions = @include_processor_extensions = @docinfo_processor_extensions = @block_extensions = @block_macro_extensions = @inline_macro_extensions = nil
+      @document = nil
+    end
+
     def resolve_args args, expect
       opts = ::Hash === args[-1] ? args.pop : {}
       return opts if expect == 1
@@ -1528,7 +1540,7 @@ module Extensions
     #
     # Returns nothing
     def unregister *names
-      names.each {|group| @groups.delete group.to_sym }
+      names.each_with_object(groups) {|group, catalog| catalog.delete group.to_sym }
       nil
     end
   end

data/lib/asciidoctor/parser.rb

@@ -1052,9 +1052,9 @@ class Parser
       attributes.delete('style')
       if (block = extension.process_method[parent, block_reader || (Reader.new lines), attributes.merge]) && block != parent
         attributes.replace block.attributes
-        # FIXME if the content model is set to compound, but we only have simple in this context, then
-        # forcefully set the content_model to simple to prevent parsing blocks from children
-        # TODO document this behavior!!
+        # NOTE an extension can change the content model from :simple to :compound. It's up to the extension
+        # to decide which one to use. The extension can consult the cloaked-context attribute to determine
+        # if the input is a paragraph or delimited block.
         if block.content_model == :compound && Block === block && !(lines = block.lines).empty?
           content_model = :compound
           block_reader = Reader.new lines

data/lib/asciidoctor/reader.rb

@@ -690,7 +690,7 @@ class PreprocessorReader < Reader
       # only process lines in AsciiDoc files
       if (@process_lines = file.end_with?(*ASCIIDOC_EXTENSIONS.keys))
         # NOTE registering the include with a nil value tracks it while not making it visible to interdocument xrefs
-        @includes[path.slice 0, (path.rindex '.')] = attributes['partial-option'] ? nil : true
+        @includes[path.slice 0, (path.rindex '.')] ||= attributes['partial-option'] ? nil : true
       end
     else
       @dir = '.'
@@ -698,7 +698,7 @@ class PreprocessorReader < Reader
       @process_lines = true
       if (@path = path)
         # NOTE registering the include with a nil value tracks it while not making it visible to interdocument xrefs
-        @includes[Helpers.rootname path] = attributes['partial-option'] ? nil : true
+        @includes[Helpers.rootname path] ||= attributes['partial-option'] ? nil : true
       else
         @path = '<stdin>'
       end
@@ -1035,7 +1035,7 @@ class PreprocessorReader < Reader
     # 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 link macro if we are in a verbatim context
-      replace_next_line %(link:#{expanded_target}[])
+      replace_next_line %(link:#{expanded_target}[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
@@ -1232,7 +1232,7 @@ class PreprocessorReader < Reader
   def resolve_include_path target, attrlist, attributes
     doc = @document
     if (Helpers.uriish? target) || (::String === @dir ? nil : (target = %(#{@dir}/#{target})))
-      return replace_next_line %(link:#{target}[#{attrlist}]) unless doc.attr? 'allow-uri-read'
+      return replace_next_line %(link:#{target}[role=include]) unless doc.attr? 'allow-uri-read'
       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
@@ -1280,27 +1280,22 @@ class PreprocessorReader < Reader
 
   # Private: Ignore front-matter, commonly used in static site generators
   def skip_front_matter! data, increment_linenos = true
-    front_matter = nil
-    if data[0] == '---'
-      original_data = data.drop 0
-      data.shift
-      front_matter = []
+    return unless (delim = data[0]) == '---'
+    original_data = data.drop 0
+    data.shift
+    front_matter = []
+    @lineno += 1 if increment_linenos
+    until (eof = data.empty?) || data[0] == delim
+      front_matter << data.shift
       @lineno += 1 if increment_linenos
-      while !data.empty? && data[0] != '---'
-        front_matter << data.shift
-        @lineno += 1 if increment_linenos
-      end
-
-      if data.empty?
-        data.unshift(*original_data)
-        @lineno = 0 if increment_linenos
-        front_matter = nil
-      else
-        data.shift
-        @lineno += 1 if increment_linenos
-      end
     end
-
+    if eof
+      data.unshift(*original_data)
+      @lineno -= original_data.size if increment_linenos
+      return
+    end
+    data.shift
+    @lineno += 1 if increment_linenos
     front_matter
   end
 

data/lib/asciidoctor/rx.rb

@@ -716,7 +716,11 @@ module Asciidoctor
   #
   #   not c:/sample.adoc or c:\sample.adoc
   #
-  UriSniffRx = %r(^#{CG_ALPHA}[#{CC_ALNUM}.+-]+:/{0,2})
+  if RUBY_ENGINE == 'opal'
+    UriSniffRx = %r(^#{CG_ALPHA}[#{CC_ALNUM}.+-]+:/{0,2})
+  else
+    UriSniffRx = %r(\A#{CG_ALPHA}[#{CC_ALNUM}.+-]+:/{0,2})
+  end
 
   # Detects XML tags
   XmlSanitizeRx = /<[^>]+>/

data/lib/asciidoctor/syntax_highlighter/highlightjs.rb

@@ -25,7 +25,7 @@ class SyntaxHighlighter::HighlightJsAdapter < SyntaxHighlighter::Base
 #{(doc.attr? 'highlightjs-languages') ? ((doc.attr 'highlightjs-languages').split ',').map {|lang| %[<script src="#{base_url}/languages/#{lang.lstrip}.min.js"></script>\n] }.join : ''}<script>
 if (!hljs.initHighlighting.called) {
   hljs.initHighlighting.called = true
-  ;[].slice.call(document.querySelectorAll('pre.highlight > code')).forEach(function (el) { hljs.highlightBlock(el) })
+  ;[].slice.call(document.querySelectorAll('pre.highlight > code[data-lang]')).forEach(function (el) { hljs.highlightBlock(el) })
 }
 </script>)
     end

data/lib/asciidoctor/version.rb

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

data/man/asciidoctor.1

@@ -252,15 +252,15 @@ Jason Porter wrote the first implementation of the CLI interface provided by thi
 \fBProject documentation:\fP \c
 .URL "https://docs.asciidoctor.org" "" ""
 .sp
+\fBCommunity chat:\fP \c
+.URL "https://chat.asciidoctor.org" "" ""
+.sp
 \fBSource repository:\fP \c
 .URL "https://github.com/asciidoctor/asciidoctor" "" ""
 .sp
-\fBCommunity chat:\fP \c
-.URL "https://asciidoctor.zulipchat.com" "" ""
-.sp
-\fBDiscussion list:\fP \c
+\fBMailing list archive:\fP \c
 .URL "https://discuss.asciidoctor.org" "" ""
 .SH "COPYING"
 .sp
 Copyright (C) 2012\-present Dan Allen, Sarah White, Ryan Waldron, and the individual contributors to Asciidoctor.
-Use of this software is granted under the terms of the MIT License.
+Use of this software is granted under the terms of the MIT License.

data/man/asciidoctor.adoc

@@ -46,10 +46,11 @@ If _FILE_ is _-_ then the AsciiDoc source is read from standard input.
 *-a, --attribute*=_ATTRIBUTE_::
   Define, override, or unset a document attribute.
   Command-line attributes take precedence over attributes defined in the source file unless either the name or value ends in _@_.
+  No substitutions are applied to the value.
 +
 _ATTRIBUTE_ is normally formatted as a key-value pair, in the form _NAME=VALUE_.
 Alternate forms are _NAME_ (where the _VALUE_ defaults to an empty string), _NAME!_ (unsets the _NAME_ attribute), and _NAME=VALUE@_ (or _NAME@=VALUE_) (where _VALUE_ does not override the _NAME_ attribute if it's already defined in the source document).
-Values containing spaces should be enclosed in quotes.
+A value containing spaces must be enclosed in quotes, in the form _NAME="VALUE WITH SPACES"_.
 +
 This option may be specified more than once.
 
@@ -190,11 +191,11 @@ Jason Porter wrote the first implementation of the CLI interface provided by thi
 
 *Project documentation:* https://docs.asciidoctor.org
 
-*Source repository:* https://github.com/asciidoctor/asciidoctor
+*Community chat:* https://chat.asciidoctor.org
 
-*Community chat:* https://asciidoctor.zulipchat.com
+*Source repository:* https://github.com/asciidoctor/asciidoctor
 
-*Discussion list:* https://discuss.asciidoctor.org
+*Mailing list archive:* https://discuss.asciidoctor.org
 
 == Copying
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 2.0.17
+  version: 2.0.18
 platform: ruby
 authors:
 - Dan Allen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -254,7 +254,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/asciidoctor/asciidoctor/issues
   changelog_uri: https://github.com/asciidoctor/asciidoctor/blob/HEAD/CHANGELOG.adoc
-  mailing_list_uri: http://discuss.asciidoctor.org
+  mailing_list_uri: https://chat.asciidoctor.org
   source_code_uri: https://github.com/asciidoctor/asciidoctor
 post_install_message: 
 rdoc_options: []
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: An implementation of the AsciiDoc text processor and publishing toolchain