asciidoctor-rhrev 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ff948e637bb99f9d64376d94ad293310988680a558ef3796aa797911210ad48
-  data.tar.gz: f47c7b2ecf6aa55d7e396b44221e8d7af6445c9c6085a71182e8b0a457e09226
+  metadata.gz: e9f44d95401427d9f6c7fd320ebc68b8a998956bd4092ea6225d7f46c89d574c
+  data.tar.gz: 3d1fe74b24dfda792f2e35549bf73cb7823ee227b3a67cf16af38f003c57459e
 SHA512:
-  metadata.gz: a908055a506c6d32629d381a800c2c8911e649e0d4dfcd51ea2b5bb64a7d70e6bd4bb45229541947b9e840df95a9c3335d03179634cfe8efd99d51bedc8a5cb5
-  data.tar.gz: 8f5442540754978416479cf2b90f01d207993659b9e243277cdc1d645475dec294379691b62b88d1b7ad55ef3748f4af318486ea3bc7fc3ee6d6e08e2cf3d74b
+  metadata.gz: 2a839f2d707b970ff7eeb8e284743510500f04cbcef2b28fb803d4ad0ae747cf74fce15608f078493cd35b759c0a7e9064a5f603fa3c33a7c306b9fff0fd930f
+  data.tar.gz: 563a298805ee6f14ff4209d0174ab6c248fb5e360931b8aead2b91fe6a8abc102c314a511b8635fe0e8f7c4766f77154fce8b0ed5493c298a8d31af9ecbccad3

data/CHANGELOG.adoc

@@ -1,5 +1,10 @@
 = Changelog
 
+== 1.7.1 (2026-09-02)
+
+* Fix two revision-history entries sharing the same start page sorting in the wrong relative order whenever one of them has body content that spans a page break (PDF backend). `Converter#convert_section` correctly reads a section's own starting page via `pdf-page-start`, set by asciidoctor-pdf's own `convert_section` right before the heading itself is inked, but paired it with a `:dest][:y]` value read from `cursor` after `result = super` returns, once the section's whole body (nested content, a large table, anything that can span several physical pages of its own) had already rendered. For a page-spanning section that cursor belongs to whatever page the body finished on, not the section's own start page `pdf-page-start` names, so the two stopped describing the same physical location at all; two entries sharing that start page are ordered by this `y` value alone (`renderer.rb`'s own `entries.sort_by`), and a wrong one can reverse their true top-to-bottom order. Reported directly, with real captured values from a real document, confirming exactly this: a page-spanning section's own `y` secretly belonging to the next physical page, sorting it ahead of another entry that genuinely was higher on their shared page. `ChangeBars#record_section_heading_position`, called unconditionally, not gated on change bars being enabled at all, from `ink_general_heading`/`ink_chapter_title`/`ink_part_title`, the same moment upstream itself captures `pdf-page-start`, right before the heading is actually inked. `Converter#convert_section` reads it back instead of a live post-super cursor, so `page_num` and `y` always describe the section's own start consistently. New regression file, `tests/regression/section-dest-y-page-mismatch.rb`, forces the page-spanning body with an explicit `<<<` page break rather than tuning paragraph-repeat counts against exact font metrics, deterministic regardless of theme or font; confirmed to fail (reversed order) without the fix and pass with it
+* Note: gem-only; the Antora extension (HTML output, no PDF page/cursor concept) is unaffected, npm still bumps concurrently per the standing 1.5.1 policy
+
 == 1.7.0 (2026-09-02)
 
 * Replace 1.6.0's per-item list change bars with a different design, after real user feedback that the syntax it needed was too heavy: marking one item required a `+` continuation, an attribute line, and a two-line empty open block, four lines to mark a single bullet, far more than every other rhrev-markable construct's own single attribute line. 1.6.0's mechanism (`Converter#propagate_list_item_content_marks`, the attached-continuation-block workaround, `list_item` added to the roll-up contexts) is fully removed, not just superseded

data/lib/asciidoctor/rhrev/change_bars.rb

@@ -62,6 +62,29 @@ module Asciidoctor
           @change_bar_starts&.delete node
         end
 
+        # A section's own cursor position at heading-ink time, before its
+        # body (potentially spanning several pages) renders. Unconditional,
+        # not gated on change bars being enabled at all: Converter#
+        # convert_section's own revision-history dest needs this, pairing
+        # it with pdf-page-start (also captured at this same moment,
+        # upstream's own convert_section, right before the heading ink
+        # call this method wraps) so both fields describe the section's
+        # own start consistently. A page-spanning section's cursor read
+        # after the whole body renders belongs to wherever that body
+        # finished, not the section's own start page; two entries sharing
+        # the same start page then sort by a y value that was never on
+        # that page at all, reversing their true top-to-bottom order,
+        # confirmed directly against a real document.
+        def record_section_heading_position node
+          return unless node.context == :section
+          @section_heading_positions ||= {}
+          @section_heading_positions[node] = cursor
+        end
+
+        def take_section_heading_position node
+          @section_heading_positions&.delete node
+        end
+
         # A section's bar covers only its own directly-owned content, not any
         # nested child sections/chapters: as soon as a child section begins
         # rendering, close out the bar of every still-open ancestor section
@@ -177,11 +200,13 @@ module Asciidoctor
         # have settled the page, so this is the first accurate start position.
         def ink_general_heading node, title, opts = {}
           record_change_bar_start node if @change_bar_attr && !scratch? && (change_bar? node)
+          record_section_heading_position node unless scratch?
           super
         end
 
         def ink_chapter_title node, title, opts = {}
           record_change_bar_start node if @change_bar_attr && !scratch? && (change_bar? node)
+          record_section_heading_position node unless scratch?
           super
         end
 
@@ -189,6 +214,7 @@ module Asciidoctor
         # so it must be overridden separately
         def ink_part_title node, title, opts = {}
           record_change_bar_start node if @change_bar_attr && !scratch? && (change_bar? node)
+          record_section_heading_position node unless scratch?
           super
         end
       end

data/lib/asciidoctor/rhrev/converter.rb

@@ -227,6 +227,27 @@ module Asciidoctor
             # page break. A pre-super page_number would be the page before that
             # break, one page too low for any chapter-starting section.
             page_num = ((node.attr 'pdf-page-start') || page_number).to_i
+
+            # y must describe the same physical location page_num does: the
+            # section's own start, not wherever cursor happens to sit once
+            # this whole call returns. A section's body can span several
+            # pages of its own (nested content, a large table, and so on);
+            # a post-super cursor read then belongs to whatever page that
+            # body finished on, not page_num's page, and the two stop
+            # describing the same point at all. take_section_heading_
+            # position (change_bars.rb) captured cursor at the same moment
+            # upstream captured pdf-page-start, right before the heading
+            # itself was inked, so pairing the two here always describes
+            # the section's own start consistently. Reported directly
+            # against a real document: two entries sharing the same
+            # page_sortable sorted in the wrong relative order, one of
+            # them a page-spanning section whose old post-super y actually
+            # belonged to the page after the one it was paired with.
+            # Falls back to the old post-super cursor only for a section
+            # with no heading ink call at all (a hidden title), no worse
+            # than before for that one remaining case.
+            y_pos = take_section_heading_position(node) || cursor
+
             @anchor_catalog ||= {}
             @anchor_catalog[node.id] ||= {
               title: node.title,
@@ -235,10 +256,10 @@ module Asciidoctor
               context: node.context,
               level: node.level
             }
-            @anchor_catalog[node.id][:dest] = { page: (rhrev_display_page page_num), physical_page: page_num, y: cursor }
+            @anchor_catalog[node.id][:dest] = { page: (rhrev_display_page page_num), physical_page: page_num, y: y_pos }
 
             # Link destination to page for revision history
-            revision_history.link_dest_to_page node.id, page_num, (@rhrev_body_start_page || 1), y: cursor
+            revision_history.link_dest_to_page node.id, page_num, (@rhrev_body_start_page || 1), y: y_pos
           end
 
           # Start position was captured at heading-ink time (after any page advance)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-rhrev
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - 白一百 baiyibai