asciidoctor-rhrev 1.8.0 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f150c21ea6f2c3fe871bc18d4e91cae846279104ddc72d72e9b7f06e4a009a20
-  data.tar.gz: 5f1ef686a5575db2d83e818577310e9f81060beb891ec800abcad29f19327c2b
+  metadata.gz: 155f025dbf45d15c912cbb3f624bc9214344472bd3d33e21c8cfb8dcca21f54a
+  data.tar.gz: b6ceffec703149d7b45f2c3007ff32099421532cf9e73f9cff763200706f6b00
 SHA512:
-  metadata.gz: f6de41ae3d96fdf56c8eeda288f1bc2650d365019e641ccc5259755107e8f81af2be29715b6ef4a0c9f42e8eb22d53f7db73bfe38e2d447b19e7d1382f3e8047
-  data.tar.gz: 68251c6a35b808bd9e138cc6cfd3996969d052c20fac88e3bb8b17f5efd8b9a388a243a4c9a50471ba1e54fd95e126ca0acab584abd4c627c9a0067c84bf9d89
+  metadata.gz: eb676e02167dad226f2ef494bf8de843df79497d8f6fd419d44d815c727e635ea6d62ca9767283540630a515ae27c201695d67875b57d6684158cb1dc15f26e2
+  data.tar.gz: 4369e143e5614067d6f0f28039788e5004a5f772bc5383beacfd56c6f20c3dd7970808515bbcf9b459337d4d7b726e79f3b1d20bbdaa46a689cc26bb639fa6f4

data/CHANGELOG.adoc

@@ -1,5 +1,15 @@
 = Changelog
 
+== 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
+* Note: gem-only; the Antora extension is unaffected, npm still bumps concurrently per the standing 1.5.1 policy
+
+== 1.8.1 (2026-09-08)
+
+* Fix a table-cell change bar spanning every row of an unmarked rowspanned cell that sits in the same row as the marked cell (PDF backend). `table_cell_change_bar_patch.rb` matched drawn cells to the marked row by row index, so every cell in that row inked a bar with its own height, the spanning cell included. The marked cell is now flagged as itself while Prawn builds the table: a hook on `Prawn::Table#initialize` reads the node `Converter#convert_table` stashes in `@rhrev_table_cell_bar_node`, walks Asciidoctor's rows and asciidoctor-pdf's cell data in step, source order both, and sets `rhrev_marked` on exactly the marked cells, through a new writer on `Prawn::Table::Cell` for a plain cell's option hash or directly on the prebuilt `Prawn::Table::Cell::AsciiDoc` for an `a|` cell; `draw_background` inks only for a flagged cell, with that cell's own height. A marked spanning cell keeps its full-height bar. `Converter#marked_table_cell_bar_rows` and the per-table bar-row stash on `@pagerhref_tables` are removed; `ink_pagerhref_tables` points the hook at its stashed node instead. Reported directly against a real document. Three spy-based checks in `tests/regression/table-cell-change-bar.rb` replace the removed method's unit checks: one marked cell among many rows, an unmarked three-row cell beside the marked cell, and a marked three-row cell; the second fails (two calls) without the fix and passes with it
+* Note: gem-only; the Antora extension is unaffected, npm still bumps concurrently per the standing 1.5.1 policy
+
 == 1.8.0 (2026-09-08)
 
 * Table-cell marks no longer require the AsciiDoc-style cell prefix `a|`: an rhrev attribute list alone on the first line of any cell's content marks the cell, for every style prefix and none, and for cells in a header row, which no earlier release could mark at all. `Asciidoctor::Rhrev::CellTextMarks` reads the attribute list off the cell's raw text, sets the attributes on the cell, and strips the line, before the existing `a|` propagation runs; the PDF prescan, the HTML treeprocessor, and both Antora extension files use it. In Antora output the lift wraps a marked plain or header cell's text in an `rhrev-changed` role span so the existing table post-processor tags the cell's own `<td>`/`<th>`; a literal cell renders verbatim and stays untagged there, its mark still rolls up. Foot rows now join every table-cell walk. New fixture `tests/features/test-change-bars-table-header-cells.adoc` and regression files `tests/regression/table-header-cell-marks.rb`, `html-table-header-cell-marks.rb`, and `js-table-header-cell-marks.js`

data/lib/asciidoctor/rhrev/converter.rb

@@ -33,7 +33,7 @@ module Asciidoctor
           @catalog = nil
           @manual_mode = false
           @rhrev_body_start_page = nil
-          @rhrev_table_cell_bar_rows = nil
+          @rhrev_table_cell_bar_node = nil
         end
 
         def revision_history
@@ -269,28 +269,6 @@ module Asciidoctor
           result
         end
         
-        # The 0-indexed row positions (head rows then body rows, one combined
-        # sequence, matching Prawn::Table::Cell#row) that contain at least
-        # one cell carrying the current revision's change-bar attribute, or
-        # nil if none do. Row index only, not (row, column): the bar only
-        # cares which row, see convert_table for the full reasoning
-        # (colspan makes a reliable column index unsafe to compute, source_
-        # location, tried first, turned out to always be nil under normal
-        # CLI usage and matched every cell instead of just the marked one).
-        # Extracted as its own method specifically so it can be tested
-        # directly: that bug was invisible to a real-render/pdftotext check,
-        # the table's own revision-history entry was already correct either
-        # way, only the bar geometry was wrong, and bars are graphical.
-        def marked_table_cell_bar_rows node
-          marked_rows = []
-          (node.rows[:head] + node.rows[:body] + node.rows[:foot]).each_with_index do |row, row_idx|
-            marked_rows << row_idx if row.any? do |cell|
-              cell.respond_to?(:attributes) && cell.attributes && (cell.attributes.key? @change_bar_attr)
-            end
-          end
-          marked_rows.empty? ? nil : marked_rows
-        end
-
         def convert_table node
           has_id = node.id && !node.id.empty? rescue false
           has_rhrev = false
@@ -303,19 +281,14 @@ module Asciidoctor
           has_pagerhref = @manual_mode && !@rendering_deferred_table && table_contains_pagerhref?(node)
 
           # A cell carrying the current revision's attribute gets its own
-          # margin bar at draw time (table_cell_change_bar_patch.rb reads this
-          # ivar back via Prawn::Table::Cell#row), independent of whether the
-          # table itself is marked. See marked_table_cell_bar_rows for why
-          # this matches by row index alone. For a manual-mode pagerhref
-          # table, this value is stashed onto @pagerhref_tables in
-          # allocate_pagerhref_table_extent below and restored by
-          # ink_pagerhref_tables right before that table's real, deferred
-          # render: this ivar itself would otherwise already be nil (or
-          # worse, another table's stale value) by the time that later pass
-          # runs, since every ordinary convert_table call clears it in its
-          # own ensure block below, long before ink_pagerhref_tables ever
-          # starts.
-          @rhrev_table_cell_bar_rows = marked_table_cell_bar_rows(node) if @change_bar_attr && !scratch?
+          # margin bar at draw time, independent of whether the table itself
+          # is marked: table_cell_change_bar_patch.rb reads this node back
+          # while Prawn builds the table and flags exactly the marked cells.
+          # For a manual-mode pagerhref table the real, deferred render
+          # happens in ink_pagerhref_tables, which sets this ivar again from
+          # its own stashed node right before that render: the ensure block
+          # below has long since cleared it by then.
+          @rhrev_table_cell_bar_node = node if @change_bar_attr && !scratch?
 
           if !has_id && !has_rhrev && !has_pagerhref
             return super
@@ -342,7 +315,7 @@ module Asciidoctor
             result
           end
         ensure
-          @rhrev_table_cell_bar_rows = nil
+          @rhrev_table_cell_bar_node = nil
         end
         
         def convert_image node
@@ -1033,15 +1006,9 @@ module Asciidoctor
           move_cursor_to extent.to.cursor
           
           # Store for later re-rendering with actual page numbers.
-          # bar_rows is @rhrev_table_cell_bar_rows as convert_table computed
-          # it for THIS node, a few lines before this method was called;
-          # stashed here since the ivar itself will not survive to
-          # ink_pagerhref_tables's own later pass, see that ivar's own
-          # comment in convert_table for why.
           @pagerhref_tables << {
             node: node,
-            extent: extent,
-            bar_rows: @rhrev_table_cell_bar_rows
+            extent: extent
           }
         end
         
@@ -1063,20 +1030,16 @@ module Asciidoctor
             go_to_page extent.from.page
             move_cursor_to extent.from.cursor
 
-            # Restore THIS table's own bar-row data for
-            # table_cell_change_bar_patch.rb to read during the real render
-            # below, the fix for the gap convert_table's own ivar comment
-            # describes: without this, the ivar is either nil or another
-            # table's stale value by this point, since every ordinary
-            # convert_table call already cleared it right after computing
-            # it, long before this loop ever runs.
-            @rhrev_table_cell_bar_rows = table_info[:bar_rows]
+            # Point table_cell_change_bar_patch.rb at THIS table for the real
+            # render below: convert_table's own ensure block cleared the ivar
+            # long before this loop runs.
+            @rhrev_table_cell_bar_node = node if @change_bar_attr && !scratch?
 
             # Re-render the table with flag set to prevent recursion
             @rendering_deferred_table = true
             super_convert_table node
             @rendering_deferred_table = false
-            @rhrev_table_cell_bar_rows = nil
+            @rhrev_table_cell_bar_node = nil
           end
         end
         

data/lib/asciidoctor/rhrev/renderer.rb

@@ -235,8 +235,8 @@ module Asciidoctor
           table_data = []
 
           page_label = doc.attr 'rhrev-localization-page', 'Page'
-          initial_text = doc.attr 'rhrev-customization-initial-release-text', 'Initial Release'
-          table_data << ["*#{page_label}*", initial_text]
+          initial_text = doc.attr 'rhrev-customization-initial-release-text', 'Initial release'
+          table_data << ["*#{page_label}*", "*#{initial_text}*"]
           
           formatted_widths = column_widths.map { |w| w.to_i.to_s }.join(',')
           markup_lines = []

data/lib/asciidoctor/rhrev/table_cell_change_bar_patch.rb

@@ -1,36 +1,34 @@
 # frozen_string_literal: true
 
 # Inks a change bar in the page margin, at the same cursor height as the
-# row, for a table cell carrying the current revision's rhrev attribute.
+# cell, for a table cell carrying the current revision's rhrev attribute.
 # Change bars always live in the page margin, never inside the cell itself,
 # humans scan the margin to find a change, not the table body. This has to
 # run at cell draw time: Prawn has by then resolved the cell's real position
 # and height, and a wrapped, multi-line cell's row height is not knowable
 # before layout, only after it.
 #
-# Matches a drawn Prawn::Table::Cell back to a marked row by row index
-# alone, not (row, column): the bar only cares which row, it draws in the
-# margin regardless of which column triggered it, so there is no need for a
-# reliable column index (colspan complicates that: an Asciidoctor row's
-# cells are stored in source order, not display-column order, an earlier
-# colspanned cell shifts every later cell's real column right of its source
-# position). Row index does not have that problem, head rows then body rows
-# form one 0-indexed sequence on both the Asciidoctor and the Prawn side,
-# confirmed against table_draw_patch.rb's own use of cell.row as a single
-# global index across the whole table. Converter#convert_table populates
-# @rhrev_table_cell_bar_rows with the marked row indices before calling
-# super, and clears it after, so this stays inert for every table except
-# the one currently being converted, and only for rows that were actually
-# marked.
+# The marked cell is identified as itself, not by its row: Prawn::Table's
+# constructor receives the cell data in the same order asciidoctor-pdf
+# emits it, head rows then body rows then foot rows, each row's cells in
+# source order, which is also the order Asciidoctor stores a row's cells.
+# The hook on that constructor reads the table node the converter stashed
+# in @rhrev_table_cell_bar_node, walks both structures in step, and flags
+# every cell whose Asciidoctor counterpart carries the attribute. A plain
+# cell arrives as a hash of options and takes the flag through the writer
+# added on Prawn::Table::Cell below, the same way asciidoctor-pdf threads
+# its own source_location through (lib/asciidoctor/pdf/ext/prawn-table/
+# cell.rb); an AsciiDoc-style cell arrives as an already-built
+# Prawn::Table::Cell::AsciiDoc inside the hash, which Prawn returns as is,
+# so the flag goes onto that object directly. Prawn's own span dummies are
+# never flagged, so a cell spanning several rows or columns draws one bar.
 #
-# An earlier version matched on source_location instead (following
-# asciidoctor-pdf's own precedent for threading a custom attribute through
-# to a Prawn::Table::Cell, see lib/asciidoctor/pdf/ext/prawn-table/cell.rb).
-# That was wrong: source_location is nil unless the document was parsed
-# with sourcemap: true, which asciidoctor-pdf's CLI does not set, so it was
-# nil for every cell and matched all of them, not just the marked one.
-# Found only by testing a table where that could not go unnoticed (one
-# marked cell among many unmarked ones).
+# An earlier version matched by row index: every cell drawn in a marked
+# row fired the hook with its own height, so an unmarked cell spanning
+# several rows in the same row as the marked cell drew a bar over all the
+# rows it spanned. Before that, matching on source_location was tried,
+# which is nil for every cell unless the document was parsed with
+# sourcemap: true, so it matched all of them.
 #
 # Hooks draw_background, not draw_borders: draw_borders is already
 # overridden by asciidoctor-pdf itself (transparent border color support),
@@ -50,10 +48,10 @@ if defined? ::Prawn::Table
     module PDF
       module Rhrev
         module TableCellChangeBarPatch
+          attr_accessor :rhrev_marked
+
           def draw_background pt
-            if @pdf.respond_to?(:ink_change_bar) && @pdf.respond_to?(:instance_variable_get) &&
-                (rows = @pdf.instance_variable_get(:@rhrev_table_cell_bar_rows)) &&
-                (rows.include? row)
+            if @rhrev_marked && @pdf.respond_to?(:ink_change_bar)
               x, y = pt
               page = @pdf.page_number
               @pdf.ink_change_bar({ page: page, cursor: y }, { page: page, cursor: y - height })
@@ -63,6 +61,36 @@ if defined? ::Prawn::Table
         end
 
         ::Prawn::Table::Cell.prepend TableCellChangeBarPatch
+
+        # Flags the marked cells while the table is being built from
+        # asciidoctor-pdf's cell data, before any cell object exists for a
+        # plain cell. Prawn extends every document instance with its table
+        # interface at construction, so the constructor is the reliable
+        # hook; a module prepended on the converter never sees the `table`
+        # call.
+        module TableCellChangeBarFlagging
+          def initialize data, document, options = {}, &block
+            node = document.instance_variable_get :@rhrev_table_cell_bar_node
+            change_attr = document.instance_variable_get :@change_bar_attr
+            if node && change_attr && data.is_a?(::Array)
+              rows = node.rows
+              (rows[:head] + rows[:body] + rows[:foot]).each_with_index do |row, r|
+                row.each_with_index do |cell, c|
+                  next unless cell.respond_to?(:attributes) && cell.attributes && (cell.attributes.key? change_attr)
+                  next unless (cell_data = data[r] && data[r][c]).is_a?(::Hash)
+                  if (content = cell_data[:content]).is_a? ::Prawn::Table::Cell
+                    content.rhrev_marked = true
+                  else
+                    cell_data[:rhrev_marked] = true
+                  end
+                end
+              end
+            end
+            super
+          end
+        end
+
+        ::Prawn::Table.prepend TableCellChangeBarFlagging
       end
     end
   end

metadata

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