asciidoctor-rhrev 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 155f025dbf45d15c912cbb3f624bc9214344472bd3d33e21c8cfb8dcca21f54a
-  data.tar.gz: b6ceffec703149d7b45f2c3007ff32099421532cf9e73f9cff763200706f6b00
+  metadata.gz: d6b54dc5e03efdf90006626cb974c4c4197b27ed97d960e5e0d2ce22231e7010
+  data.tar.gz: a0458dd0638281b54db276cdc03c0a0e3e543f4da8cf8fcae08a2a89a124bd15
 SHA512:
-  metadata.gz: eb676e02167dad226f2ef494bf8de843df79497d8f6fd419d44d815c727e635ea6d62ca9767283540630a515ae27c201695d67875b57d6684158cb1dc15f26e2
-  data.tar.gz: 4369e143e5614067d6f0f28039788e5004a5f772bc5383beacfd56c6f20c3dd7970808515bbcf9b459337d4d7b726e79f3b1d20bbdaa46a689cc26bb639fa6f4
+  metadata.gz: 06edfa5079b4b995ebf98fd709af51396fe4c31aea40f2a55af14ab75112c7eae5f11ffcf9dc3195b0ff1dee2c077f134524a0f89d53c7ce43db2d9205879fee
+  data.tar.gz: 2624c3f6c4d7951def744ec358eec91f49718f6bf96376d9afda2de9e8e8dc59c5298da3997b7d1c79217e1d519582b1d689fb3fc9867149f185b1db5f2cc3e3

data/CHANGELOG.adoc

@@ -1,5 +1,10 @@
 = Changelog
 
+== 1.8.3 (2026-10-22)
+
+* Fix per-item list change bars landing on another revision's items when marks for several revisions stack one per attribute line (PDF backend). Asciidoctor numbers positional entries per attribute line and merges the lines into one hash, so a later line's targets overwrote an earlier line's: `[rhrev1-2="...",2]` followed by `[rhrev1-3="..."]` barred item 2 for revision 1.3 instead of the whole list, and a current mark on the first line took the targets of the line below it. The new `mark_targets.rb` hooks `AttributeList#parse_into`, reads each block attribute line's own memoized parse result, and records which positional entries follow which mark on that line; `Converter#list_item_change_bar_targets` reads the current mark's own record and falls back to every positional entry only for a list built without one. Reported against a real document. Stacked-line checks in `tests/regression/list-item-target-change-bars.rb` cover a current mark with no targets, a current mark on the first line, a later line with fewer targets, a custom `revhistoryprefix`, and a style before the mark, plus a render spy that fails (bars on the wrong items) without the fix
+* Note: gem-only; the Antora extension has no per-item list targets, npm still bumps concurrently per the standing 1.5.1 policy
+
 == 1.8.2 (2026-10-06)
 
 * Change the initial-release table's default text from `Initial Release` to `Initial release` and render it bold (PDF backend), matching the bold `Page` cell beside it; `rhrev-customization-initial-release-text` still overrides the text and is rendered bold too

data/lib/asciidoctor/rhrev/converter.rb

@@ -481,14 +481,24 @@ module Asciidoctor
         # Reuses change_bar? for the marked/not-marked check, the same
         # predicate every other bar-inking decision in this file already
         # uses, so this only ever answers for the current revnumber.
+        #
+        # Only the current mark's own positional attributes count. With
+        # stacked attribute lines the merged hash mixes every line's
+        # positional entries, so the per-line record MarkTargets keeps at
+        # parse time decides; a list built without one (through the
+        # extension API, for instance) falls back to every positional entry.
         def list_item_change_bar_targets node
           return nil unless change_bar? node
           raw = node.instance_variable_get(:@attributes)
-          positional_keys = raw.keys.select {|k| ::Integer === k }.sort
-          return :all if positional_keys.empty?
+          tokens = if (by_mark = raw[::Asciidoctor::Rhrev::MarkTargets::KEY]) && (by_mark.key? @change_bar_attr)
+            by_mark[@change_bar_attr]
+          else
+            raw.keys.select {|k| ::Integer === k }.sort.map {|k| raw[k] }
+          end
+          return :all if tokens.empty?
           targets = ::Set.new
-          positional_keys.each do |key|
-            token = raw[key].to_s
+          tokens.each do |token|
+            token = token.to_s
             if (m = /\A(\d+)-(\d+)\z/.match token)
               (m[1].to_i..m[2].to_i).each {|i| targets << i }
             elsif /\A\d+\z/.match? token

data/lib/asciidoctor/rhrev/mark_targets.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Asciidoctor
+  module Rhrev
+    # Records which positional list-item targets belong to which rhrev mark,
+    # one block attribute line at a time.
+    #
+    # Stacked attribute lines merge into one attribute hash, and Asciidoctor
+    # numbers positional entries per line, so a later line's positional
+    # entries overwrite an earlier line's at the same index:
+    #
+    #   [rhrev1-2="old",2]
+    #   [rhrev1-3="new"]
+    #
+    # leaves {"rhrev1-2"=>"old", 2=>"2", "rhrev1-3"=>"new"}, and the merged
+    # hash no longer says whether target 2 belongs to rhrev1-2 or rhrev1-3.
+    # Each line is still parsed on its own, through AttributeList#parse_into,
+    # whose per-line result is memoized, so reading it here costs no second
+    # parse. Every positional entry on a line belongs to the nearest mark
+    # before it on that same line; a mark with no positional entry after it
+    # targets the whole list.
+    #
+    # The record is stored on the block's own attribute hash under KEY, as a
+    # Hash of mark name => Array of raw target tokens. KEY never starts with
+    # an attribute name character, so it collides with no AsciiDoc attribute
+    # and is never mistaken for an rhrev mark by any prefix scan.
+    module MarkTargets
+      KEY = '@rhrev-mark-targets'
+
+      def self.record attributes, line, prefix
+        by_mark = current = nil
+        line.each do |key, value|
+          if ::String === key
+            next unless key.start_with? prefix
+            (by_mark ||= (attributes[KEY] ||= {}))[current = key] = []
+          elsif current && ::Integer === key
+            by_mark[current] << value
+          end
+        end
+      end
+
+      # Only a block attribute line passes the document itself as the block
+      # (Parser.parse_block_metadata_line, sub_result: true); every other
+      # caller, such as a block macro's attribute list, passes none.
+      module AttributeListHook
+        def parse_into attributes, positional_attrs = []
+          if ::Asciidoctor::Document === @block
+            MarkTargets.record attributes, (parse positional_attrs), (@block.attr 'revhistoryprefix', 'rhrev')
+          end
+          super
+        end
+      end
+    end
+  end
+end
+
+::Asciidoctor::AttributeList.prepend ::Asciidoctor::Rhrev::MarkTargets::AttributeListHook

data/lib/asciidoctor/rhrev.rb

@@ -7,6 +7,7 @@ require 'asciidoctor' unless defined? Asciidoctor
 require_relative 'rhrev/processors'
 require_relative 'rhrev/helpers'
 require_relative 'rhrev/cell_text_marks'
+require_relative 'rhrev/mark_targets'
 require_relative 'rhrev/catalog'
 
 # Try to load the PDF converter support if asciidoctor-pdf is available

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-rhrev
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - 白一百 baiyibai
@@ -43,6 +43,7 @@ files:
 - lib/asciidoctor/rhrev/converter.rb
 - lib/asciidoctor/rhrev/exporter.rb
 - lib/asciidoctor/rhrev/helpers.rb
+- lib/asciidoctor/rhrev/mark_targets.rb
 - lib/asciidoctor/rhrev/processors.rb
 - lib/asciidoctor/rhrev/renderer.rb
 - lib/asciidoctor/rhrev/rhrev_html.rb