asciidoctor 2.0.24 → 2.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b219565eafae2806084f9fee67def534a864eaaebc7891dced5d5f4cd238abb
-  data.tar.gz: 51137dfb8f450991351e82b0da3d15ad923209dad72606ab2a5b868a78c6e1a0
+  metadata.gz: 15bd78ac6106922b76adf86234dbee3e2c477401dbd69f011bea808166cadbca
+  data.tar.gz: 22dc236b8852541f241b8076c7bd0427ed768c4a82acebaff35ebb37c3e47fec
 SHA512:
-  metadata.gz: 141b60fe34a662b4924f873985be200c1e5f9b574e44aa7336ec7febed0d3a4fbe8b8e8619441da2f7fdca51a17a0689155634cbde1fc63478c9dae6fd41d382
-  data.tar.gz: 814788310c10bf2cdda6e7cde44a43fcd83702aea854aa48d9e51b3af77e9ec13c0966dbf73f298eb8d39ff84fe8aa5d01881283016ea49c3609c3bf065a663c
+  metadata.gz: 274206a482d52d7e6fa7be668de7953ed3d137c200a861487d3be3252a868bb780f1eb36345247d706f9bfdbf6644902d5a48a345dc2f6dfc7bfcfd9eb1be851
+  data.tar.gz: aa4831bbfc906f8605757b93e6ec3cdea9919b3d8f15d737962066a9a3356ad268bb67335c4e91866b10a960f03d21aa506d10e8b08a44f2ad1e54cea1e9e3b0

data/CHANGELOG.adoc

@@ -16,6 +16,23 @@ 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.25 (2025-10-16) - @mojavelinux
+
+Improvements::
+
+  * Don't freeze processor instance of extension to allow use of instance variables (#4782)
+
+Bug Fixes::
+
+  * Fix false positive when looking for custom block macro, leading to superfluous debug message (#4785)
+  * Start sectlink after any supplemental anchors on section title when sectlinks is set (#2934)
+  * Remove trailing space after reftext in inline anchor shorthand (to accomodate trailing `]` in reftext) (#4789)
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.25[git tag] | {url-repo}/compare/v2.0.24\...v2.0.25[full diff]
+// end::compact[]
+
 == 2.0.24 (2025-10-13) - @mojavelinux
 
 Compliance::
@@ -35,9 +52,10 @@ Improvements::
 Bug Fixes::
 
   * Consider `convert_` prefix when looking for missing convert method in converter (#4669) (*@eugoka*)
+  * Pass kwargs to Logger superclass and only assign defaults when kwarg is not specified (#4773)
+  * Set logdev to $stderr if no arguments are passed to Logger constructor (#4250)
   * 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::
@@ -51,7 +69,6 @@ Build / Infrastructure::
 === 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
 

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.24, 2025-10-13
+v2.0.25, 2025-10-16
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.24
+:release-version: 2.0.25
 // 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.24, 2025-10-13
+v2.0.25, 2025-10-16
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.24
+:release-version: 2.0.25
 // 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.24, 2025-10-13
+v2.0.25, 2025-10-16
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.24
+:release-version: 2.0.25
 // 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.24, 2025-10-13
+v2.0.25, 2025-10-16
 // settings:
 :page-layout: base
 :idprefix:
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.24
+:release-version: 2.0.25
 // 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.24, 2025-10-13
+v2.0.25, 2025-10-16
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.24
+:release-version: 2.0.25
 // URLs:
 :url-org: https://github.com/asciidoctor
 :url-repo: {url-org}/asciidoctor

data/lib/asciidoctor/converter/html5.rb

@@ -22,6 +22,7 @@ class Converter::Html5Converter < Converter::Base
   }).default = ['', '']
 
   DropAnchorRx = %r(<(?:a\b[^>]*|/a)>)
+  LeadingAnchorsRx = %r(^(?:<a id="[^"]+"></a>)+)
   StemBreakRx = / *\\\n(?:\\?\n)*|\n\n+/
   if RUBY_ENGINE == 'opal'
     # NOTE In JavaScript, ^ matches the start of the string when the m flag is not set
@@ -402,7 +403,11 @@ MathJax.Hub.Register.StartupHook("AsciiMath Jax Ready", function () {
     if node.id
       id_attr = %( id="#{id = node.id}")
       if doc_attrs['sectlinks']
-        title = %(<a class="link" href="##{id}">#{title}</a>)
+        if (title.start_with? '<a ') && LeadingAnchorsRx =~ title
+          title = %(#{$&}<a class="link" href="##{id}">#{title.slice $&.length, title.length}</a>)
+        else
+          title = %(<a class="link" href="##{id}">#{title}</a>)
+        end
       end
       if doc_attrs['sectanchors']
         # QUESTION should we add a font-based icon in anchor if icons=font?

data/lib/asciidoctor/extensions.rb

@@ -1375,8 +1375,7 @@ module Extensions
         unless processor.process_block_given?
           raise ::NoMethodError, %(No block specified to process #{kind_name} extension at #{block.source_location.join ':'})
         end
-        processor.freeze
-        extension = ProcessorExtension.new kind, processor
+        processor_instance = processor
       else
         processor, config = resolve_args args, 2
         # style 2: specified as Class or String class name
@@ -1385,18 +1384,15 @@ module Extensions
             raise ::ArgumentError, %(Invalid type for #{kind_name} extension: #{processor})
           end
           processor_instance = processor_class.new config
-          processor_instance.freeze
-          extension = ProcessorExtension.new kind, processor_instance
         # style 3: specified as instance
         elsif kind_class === processor || (kind_java_class && kind_java_class === processor)
           processor.update_config config
-          processor.freeze
-          extension = ProcessorExtension.new kind, processor
+          processor_instance = processor
         else
           raise ::ArgumentError, %(Invalid arguments specified for registering #{kind_name} extension: #{args})
         end
       end
-
+      extension = ProcessorExtension.new kind, processor_instance
       extension.config[:position] == :>> ? (kind_store.unshift extension) : (kind_store << extension)
       extension
     end
@@ -1422,8 +1418,7 @@ module Extensions
         unless processor.process_block_given?
           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
+        processor_instance = processor
       else
         processor, name, config = resolve_args args, 3
         # style 2: specified as Class or String class name
@@ -1435,8 +1430,6 @@ module Extensions
           unless (name = as_symbol processor_instance.name)
             raise ::ArgumentError, %(No name specified for #{kind_name} extension: #{processor})
           end
-          processor_instance.freeze
-          kind_store[name] = ProcessorExtension.new kind, processor_instance
         # style 3: specified as instance
         elsif kind_class === processor || (kind_java_class && kind_java_class === processor)
           processor.update_config config
@@ -1444,12 +1437,12 @@ module Extensions
           unless (name = name ? (processor.name = as_symbol name) : (as_symbol processor.name))
             raise ::ArgumentError, %(No name specified for #{kind_name} extension: #{processor})
           end
-          processor.freeze
-          kind_store[name] = ProcessorExtension.new kind, processor
+          processor_instance = processor
         else
           raise ::ArgumentError, %(Invalid arguments specified for registering #{kind_name} extension: #{args})
         end
       end
+      kind_store[name] = ProcessorExtension.new kind, processor_instance
     end
 
     def reset

data/lib/asciidoctor/parser.rb

@@ -644,8 +644,8 @@ class Parser
               block.parse_attributes $1, [], into: attributes if $1
               break
 
-            elsif block_macro_extensions ? (CustomBlockMacroRx =~ this_line &&
-                (extension = extensions.registered_for_block_macro? $1) || (report_unknown_block_macro = logger.debug?)) :
+            elsif block_macro_extensions ? CustomBlockMacroRx =~ this_line &&
+                ((extension = extensions.registered_for_block_macro? $1) || (report_unknown_block_macro = logger.debug?)) :
                 (logger.debug? && (report_unknown_block_macro = CustomBlockMacroRx =~ this_line))
               if report_unknown_block_macro
                 logger.debug message_with_context %(unknown name for block macro: #{$1}), source_location: reader.cursor_at_mark

data/lib/asciidoctor/rx.rb

@@ -440,10 +440,10 @@ module Asciidoctor
   #   anchor:idname[]
   #   anchor:idname[Reference Text]
   #
-  InlineAnchorRx = /(\\)?(?:\[\[([#{CC_ALPHA}_:][#{CC_WORD}\-:.]*)(?:, *(#{CC_ANY}+?))?\]\]|anchor:([#{CC_ALPHA}_:][#{CC_WORD}\-:.]*)\[(?:\]|(#{CC_ANY}*?[^\\])\]))/
+  InlineAnchorRx = /(\\)?(?:\[\[([#{CC_ALPHA}_:][#{CC_WORD}\-:.]*)(?:, *(#{CC_ANY}+?))? ?\]\]|anchor:([#{CC_ALPHA}_:][#{CC_WORD}\-:.]*)\[(?:\]|(#{CC_ANY}*?[^\\])\]))/
 
   # Scans for a non-escaped anchor (i.e., id + optional reference text) in the flow of text.
-  InlineAnchorScanRx = /(?:^|[^\\\[])\[\[([#{CC_ALPHA}_:][#{CC_WORD}\-:.]*)(?:, *(#{CC_ANY}+?))?\]\]|(?:^|[^\\])anchor:([#{CC_ALPHA}_:][#{CC_WORD}\-:.]*)\[(?:\]|(#{CC_ANY}*?[^\\])\])/
+  InlineAnchorScanRx = /(?:^|[^\\\[])\[\[([#{CC_ALPHA}_:][#{CC_WORD}\-:.]*)(?:, *(#{CC_ANY}+?))? ?\]\]|(?:^|[^\\])anchor:([#{CC_ALPHA}_:][#{CC_WORD}\-:.]*)\[(?:\]|(#{CC_ANY}*?[^\\])\])/
 
   # Scans for a leading, non-escaped anchor (i.e., id + optional reference text).
   LeadingInlineAnchorRx = /^\[\[([#{CC_ALPHA}_:][#{CC_WORD}\-:.]*)(?:, *(#{CC_ANY}+?))?\]\]/

data/lib/asciidoctor/version.rb

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

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White
-.\" Generator: Asciidoctor 2.0.23
+.\" Generator: Asciidoctor 2.0.24
 .\"      Date: 2018-03-20
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 2.0.24
+.\"    Source: Asciidoctor 2.0.25
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2018-03-20" "Asciidoctor 2.0.24" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2018-03-20" "Asciidoctor 2.0.25" "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.24
+:release-version: 2.0.25
 :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.24
+  version: 2.0.25
 platform: ruby
 authors:
 - Dan Allen