asciidoctor-rhrev 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdb14bf628d2c8dd088c5f7f9a37012305efc17fd2c6f6717a4e6a08d3e9ac18
-  data.tar.gz: b8bbabee8370433715fc06a11259fae8ac7eb80e7821965aa2b348fbcd185bcb
+  metadata.gz: f3babf6364c6012f042c82924f7d71c29636646744da52849b8d713638d09b8a
+  data.tar.gz: 206543f4a07a74b2c4ea3a589037a41605d87d6f066b201fb1280ab9436dd3ef
 SHA512:
-  metadata.gz: a253125687474c408d3d89545d2c66d35f944a5330cb7e99213672bafcdcf199083a4528379b801a035726e0badd9ebd321101ebb27a9b2e3f3bd02e4a2be314
-  data.tar.gz: 8f4e7888fdbf89ba4a70705b97eed4aa4a05bc5b19e0b5ab96bbd4b295db47757b4d73b724b84243c724098ab4578c844cc9ee3564df655d9831c3adb5021e48
+  metadata.gz: 05e9e9583c75900e39aec66ac1004990d49e2b3eb9facb797a72d931dd2747cff34a66c5bd79e3d69c7b120ca4267b43d20b9ca1d34d187e34c2c7dcdea15096
+  data.tar.gz: ec541680bb201d87151e66923e2c635b8d2b67efb48b46ea8e1789ab7d4cc178e9c0d681c1abcea2491f74f9345383575cabfe217a54151972c0d037212cc8a1

data/CHANGELOG.adoc

@@ -1,5 +1,16 @@
 = Changelog
 
+== 1.4.0 (2026-08-14)
+
+* Add the `recursive` block option for PDF change bars: a section marked `[%recursive,rhrevN-M="..."]` draws one continuous bar over the whole section, nested child sections included, matching the HTML backend's whole-section extent. Without the option a marked section's bar still stops at its first child section. A child section marked in the current revision inside a recursive section draws its own bar, overlapping the parent's. The option affects sections only; other tracked blocks already receive a bar over their whole extent
+* Note: this is a PDF-only release; the npm package skips 1.4.0
+
+== 1.3.1 (2026-07-28)
+
+* Fix silent content loss in long revision-history tables (PDF backend): the extent dry-run that reserves space for the table now runs after `prescan_document` populates each tracked node's real `title`/`sectnum`/`reftext`/`caption_number`, so a description cross-reference (`[.rhrevdescription]`) that forward-references its own target no longer measures a humanized-anchor placeholder in the dry-run and the resolved text in the final backfill. When the two lengths differed, the accumulated row heights could shift a row across a reserved page boundary and drop its content from the output; measurement and backfill now agree. The metadata pass is gated on nodes carrying their own `rhrevN-M` attribute, so it adds no full-document walk
+* Fix the `rhrev-table-extra-blank-row` trailing blank row overflowing alone onto a continuation page (PDF backend): when the real entries nearly fill a page, the trailing blank row is now dropped rather than paginated to a page of its own. The check is scoped to the revision-history table's own last row and decided once per row, so no other table's pagination is affected and a multi-column blank row is never half-drawn
+* Note: this is a PDF-only release; the npm package skips 1.3.1
+
 == 1.3.0 (2026-07-16)
 
 * Add HTML change bars: with `:rhrev-change-bars:` set, tracked blocks (section, floating title, example, listing, table, image) marked with the current revision get the `rhrev-changed` CSS class in the HTML backend and the Antora extension; `rhrev-change-bars-color`, `-width`, and `-offset` are emitted as CSS custom properties (`--rhrev-change-bar-*`). The side is always right in HTML (no recto/verso model), and a marked section's bar spans its nested subsections, unlike the PDF backend. Default styling (red right border) ships in the baiyibai UI bundle

data/lib/asciidoctor/rhrev/change_bars.rb

@@ -66,10 +66,13 @@ module Asciidoctor
         # nested child sections/chapters: as soon as a child section begins
         # rendering, close out the bar of every still-open ancestor section
         # right here, at the boundary between the parent's own content and
-        # its first child section.
+        # its first child section. A section carrying the recursive option
+        # keeps its bar open across child boundaries; convert_section closes
+        # it after the whole section, children included, has rendered.
         def enter_change_bar_section node
           return unless @change_bar_attr
           @change_bar_section_stack.each do |ancestor|
+            next if ancestor.option? 'recursive'
             next unless (start_pos = take_change_bar_start ancestor)
             ink_change_bar start_pos, { page: page_number, cursor: cursor }
           end

data/lib/asciidoctor/rhrev/converter.rb

@@ -91,7 +91,9 @@ module Asciidoctor
           end
 
           # Entering a section closes out any still-open ancestor change bars,
-          # so a marked section's bar never bleeds into its child sections
+          # so a marked section's bar never bleeds into its child sections.
+          # Ancestors carrying the recursive option are exempt; their bar is
+          # inked below, after super has rendered every nested child.
           enter_change_bar_section node
           result = super
           exit_change_bar_section node
@@ -279,6 +281,17 @@ module Asciidoctor
           end
         end
         
+        # True when the node carries its own rhrev* attribute in its raw (non-inherited)
+        # attribute set -- the same check collect_revision_entries makes, hoisted out so
+        # prescan_document can gate update_revision_entry_metadata on it.
+        def node_carries_own_rhrev? node
+          return false unless node.respond_to?(:attributes)
+          raw = (node.instance_variable_get(:@attributes) rescue nil)
+          return false if raw.nil? || raw.empty?
+          prefix = @revision_prefix || 'rhrev'
+          raw.keys.any? { |k| k.to_s.start_with?(prefix) }
+        end
+
         def update_revision_entry_metadata node
           return unless node.id
           return unless node.respond_to?(:attributes)
@@ -459,6 +472,13 @@ module Asciidoctor
             [:section, :floating_title, :example, :listing, :table, :image].each do |ctx|
               doc.find_by(context: ctx).each do |node|
                 collect_revision_entries node
+                # Populate the *real* title/sectnum/reftext/caption_number now, from
+                # the parsed AST, so the extent dry-run measures the same content the
+                # deferred backfill will later ink. Gated on the node carrying its own
+                # rhrevN-M attribute: reusing node.attributes here (inherited config keys
+                # like rhrev-table-caption match the prefix) would turn this into a full
+                # per-node document walk.
+                update_revision_entry_metadata node if node_carries_own_rhrev? node
               end
             end
             

data/lib/asciidoctor/rhrev/renderer.rb

@@ -329,15 +329,24 @@ module Asciidoctor
         
         def create_revision_table_properly doc
           asciidoc_table = build_table_via_parsing doc
-          
+
           disable_caption = doc.attr? 'rhrev-disable-caption'
           if disable_caption
             saved_caption = doc.attr 'table-caption'
             doc.set_attr 'table-caption', ''
           end
-          
-          convert_table asciidoc_table
-          
+
+          # Scope the lonely-trailing-blank-row skip (PrawnTableDrawPatch) to just
+          # this table. Both the extent dry-run and the real ink flow through here,
+          # so the skip is applied identically in measurement and draw.
+          had_skip_flag = @_rhrev_skip_lonely_blank_row
+          @_rhrev_skip_lonely_blank_row = true if doc.attr? 'rhrev-table-extra-blank-row'
+          begin
+            convert_table asciidoc_table
+          ensure
+            @_rhrev_skip_lonely_blank_row = had_skip_flag
+          end
+
           if disable_caption
             if saved_caption
               doc.set_attr 'table-caption', saved_caption

data/lib/asciidoctor/rhrev/rhrev_pdf.rb

@@ -5,3 +5,4 @@ require 'asciidoctor/pdf' unless defined? Asciidoctor::PDF
 require_relative 'converter'
 require_relative 'renderer'
 require_relative 'exporter'
+require_relative 'table_draw_patch'

data/lib/asciidoctor/rhrev/table_draw_patch.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+# Scoped override of prawn-table's Table#draw.
+#
+# When the rhrev revision-history table is drawn with rhrev-table-extra-blank-row
+# set, build_table_via_parsing appends a trailing blank (NBSP) row. prawn-table
+# treats that row like any other: if the real entries nearly fill a page, the blank
+# row alone overflows onto a fresh continuation page whose only content is the
+# "(continued)" caption and an invisible row.
+#
+# This patch is INERT for every table except the rhrev revision-history one: draw
+# returns super unless the converter has set @_rhrev_skip_lonely_blank_row on the
+# document around that table's conversion. Only then do we reimplement the 0.2.2 draw
+# loop (verified against prawn-table 0.2.2) with a single added rule: if the table's
+# last row would land alone at the top of a fresh page, drop it instead of paginating
+# to it. The decision is made once, from the row's first cell, and applied to every
+# cell of the row -- prawn-table evaluates pagination per cell, so re-deciding per cell
+# could ink one cell of the row and drop the other, leaving a half-drawn blank row.
+
+begin
+  require 'prawn/table' unless defined? ::Prawn::Table
+rescue LoadError
+  # prawn-table not present; nothing to patch
+end
+
+if defined? ::Prawn::Table
+  module Asciidoctor
+    module PDF
+      module Rhrev
+        module PrawnTableDrawPatch
+          def draw
+            unless @pdf.respond_to?(:instance_variable_get) &&
+                   @pdf.instance_variable_get(:@_rhrev_skip_lonely_blank_row)
+              return super
+            end
+
+            # Defensive: only take the reimplemented path when the prawn-table
+            # internals we rely on are exactly the shape we reimplement against
+            # (0.2.2). On any drift, fall back to stock behavior.
+            internals = %i[initial_row_on_initial_page start_new_page?
+                           ink_and_draw_cells_and_start_new_page set_background_color
+                           ink_and_draw_cells header_rows with_position]
+            unless internals.all? { |m| respond_to?(m, true) } &&
+                   @pdf.respond_to?(:reference_bounds)
+              return super
+            end
+
+            with_position do
+              ref_bounds = @pdf.reference_bounds
+              started_new_page_at_row = initial_row_on_initial_page
+              offset = @pdf.y
+              @header_row = header_rows if @header
+
+              cells_this_page = []
+              last_drawn_cell = nil
+
+              last_row_index = @cells.map(&:row).max
+              blank_row_decided = false
+              skip_blank_row = false
+
+              @cells.each do |cell|
+                if cell.row == last_row_index && rhrev_blank_cell?(cell)
+                  # Decide once, from the first (column 0) cell of the last row, and
+                  # apply the same answer to every cell of that row.
+                  unless blank_row_decided
+                    skip_blank_row = start_new_page?(cell, offset, ref_bounds)
+                    blank_row_decided = true
+                  end
+                  next if skip_blank_row
+                end
+
+                if start_new_page?(cell, offset, ref_bounds)
+                  cells_this_page, offset = ink_and_draw_cells_and_start_new_page(cells_this_page, cell)
+                  started_new_page_at_row = cell.row
+                end
+
+                cell = set_background_color(cell, started_new_page_at_row)
+                cells_this_page << [cell, [cell.relative_x, cell.relative_y(offset)]]
+                last_drawn_cell = cell
+              end
+
+              ink_and_draw_cells(cells_this_page)
+
+              # @cells.last may now be a dropped blank cell; anchor the final cursor
+              # to the last cell we actually inked.
+              if last_drawn_cell
+                @pdf.move_cursor_to(last_drawn_cell.relative_y(offset) - last_drawn_cell.height)
+              end
+            end
+          end
+
+          # The trailing row appended for rhrev-table-extra-blank-row is a pair of
+          # non-breaking-space cells. Treat a last-row cell as blank when its content
+          # is empty once NBSP/whitespace is stripped; when the content can't be read,
+          # rely on the caller's flag + last-row guarantee and treat it as blank.
+          def rhrev_blank_cell? cell
+            content = (cell.content.to_s rescue nil)
+            return true if content.nil?
+            content.gsub(/[ \s]|&#160;|&nbsp;/, '').empty?
+          end
+        end
+
+        ::Prawn::Table.prepend PrawnTableDrawPatch
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-rhrev
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - 白一百 baiyibai
@@ -46,6 +46,7 @@ files:
 - lib/asciidoctor/rhrev/renderer.rb
 - lib/asciidoctor/rhrev/rhrev_html.rb
 - lib/asciidoctor/rhrev/rhrev_pdf.rb
+- lib/asciidoctor/rhrev/table_draw_patch.rb
 homepage: https://gitlab.com/baiyibai/rhrev-asciidoctor-automatic-revision-history
 licenses:
 - CC0-1.0