asciidoctor-rhrev 1.9.0 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e018143599f73eace12e5f22c99a54119721a6358e61abb67d5040b81118712b
-  data.tar.gz: 194a1c032bd7602dfffe37c6bf87e069ff64d19e172244e3f05fab5effdf7947
+  metadata.gz: 1da65b61e67581cc903950852a590dbd89c965414c2abaa40059bb8f445e4c6a
+  data.tar.gz: 2d6fa89231f2724df9152df5346318a05dfdf1465eb64dfd9d29df114ab6e9fa
 SHA512:
-  metadata.gz: f1f9463fa7dc56dbb4f0d521ff547806724927ffb4b4f87289a30262bf2f7aba2812b6c99eb5eb58927d30e346b80740591f16fe0458559e1e1c2341765b2c64
-  data.tar.gz: 69433c330dca726113054335cff0ac2856882f6f18d07eaf31866ecec4f9543f6276a871f9c8409f942e1e2ee784a69b0ae06943c68b222c054c8c57d73677f9
+  metadata.gz: 3eb4539c96fbdfb34d70335963d9312121ef2a5c93af4f049731822d0ee236b9c8d2feaf296c225e5e50b12486a599da539ff98e6c79948ff0e573991535cf41
+  data.tar.gz: 9fe21ece1dd48a8d1c4acc605ad1b4fb9872296ff56a2438f9ccf9689d218c392899ea4c243a879957754b9bc537fd807a8b5e279b967f2d25b77c6aca6372ab

data/CHANGELOG.adoc

@@ -1,5 +1,15 @@
 = Changelog
 
+== 1.9.2 (2026-10-27)
+
+* Change bar table labels stand upright, one character per line, read from top to bottom, with the labels of all columns sharing one bottom line; labels no longer turn 90 degrees. `ink_change_bar_table_label` draws each label (gem)
+* Fix a change bar or change bar table drawn past the page edge when the side margin is narrower than the bar's offset and width. `change_bar_inside_page` moves the bar or table inward until it meets the page edge and logs one warning per document naming the space the change bars need. Zero-margin checks in `tests/regression/third-level.rb` cover a right-side table, a left-side table, and the bar (gem)
+* Fix `include file not found` errors for `partial$` includes on every page after the first in Antora builds. `antora-rhrev-html.js` reused one extension registry for its page scan, and each load kept only the extensions registered in a group block, dropping the no-op include processor after the first page; the processor now registers inside the registry's group block. New regression file `tests/regression/js-include-pages.js` (npm)
+
+== 1.9.1 (2026-10-27)
+
+* Fix an rhrev attribute with an empty change text, such as `[rhrev1-3=""]`, drawing a change bar and adding a stray `*` bullet to its enclosing row. The extension now skips an empty mark, `-all`, or `-cover` attribute as if absent: no change bar, no entry. `ThirdLevel.drop_empty_marks` runs before the mixed-release check in the PDF and HTML backends, `dropEmptyMarks` in both Antora extension files, and the Antora cell-text lift adds no `rhrev-changed` span for an empty mark. New regression files `tests/regression/empty-change-text.rb` and `tests/regression/js-empty-change-text.js` (gem and npm)
+
 == 1.9.0 (2026-10-27)
 
 * Third-level revisions such as `1.3.2`. The `rhrev-third-level` attribute selects `collapse` or `expand`, and `rhrev-third-level-kind` selects `draft`, the default, or `amendment`. With either mode, every mark of the current `x.y` release up to the current third level draws a change bar. `collapse` groups the revision history table by `x.y`, merging change texts and `all` and `cover` entries, with the group header reading `x-y-prevrev` and falling back to the lowest third-level `prevrev`. `expand` keeps one group per revision. `draft` orders `x.y` after its drafts, and a bare `x.y` mark beside its own drafts logs a warning and is ignored everywhere, `all` and `cover` entries included; `amendment` orders `x.y` before its amendments. New `third_level.rb` and `antora-extension/third-level.js`; the Antora extensions parse every page first so a release ignored on one page is ignored on all. Unset, output is unchanged (gem and npm)

data/lib/asciidoctor/rhrev/change_bars.rb

@@ -47,6 +47,7 @@ module Asciidoctor
           @change_bar_starts = {}
           @change_bar_section_stack = []
           @change_bar_grid_labeled_pages = {}
+          @change_bar_margin_warned = false
         end
 
         # Resolved lazily on first ink: the theme (and @media/@folio_placement)
@@ -185,7 +186,32 @@ module Asciidoctor
         # number (honoring pdf-folio-placement inversion), matching prepress
         # physical folio placement.
         def change_bar_x pgnum, settings
-          (change_bar_on_right? pgnum, settings) ? bounds.right + settings[:offset] : bounds.left - settings[:offset] - settings[:width]
+          on_right = change_bar_on_right? pgnum, settings
+          x = on_right ? bounds.right + settings[:offset] : bounds.left - settings[:offset] - settings[:width]
+          change_bar_inside_page x, settings[:width], 0, on_right, settings
+        end
+
+        # Keeps a bar or table of width at x inside the page. When its outer
+        # edge, plus inset for a border stroke, crosses the page edge, it
+        # moves inward until that edge meets the page edge, and the first
+        # move in the document warns with the space it needs between the
+        # text and the page edge.
+        def change_bar_inside_page x, width, inset, on_right, settings
+          if on_right
+            edge = page.dimensions[2] - bounds.absolute_left
+            return x if x + width + inset <= edge
+            moved = edge - width - inset
+          else
+            edge = -bounds.absolute_left
+            return x if x - inset >= edge
+            moved = edge + inset
+          end
+          unless @change_bar_margin_warned
+            @change_bar_margin_warned = true
+            needed = settings[:offset] + width + inset
+            logger.warn %(rhrev change bars need #{needed.round 2}pt between the text and the page edge; drawing them inside the page edge instead)
+          end
+          moved
         end
 
         def change_bar_on_right? pgnum, settings
@@ -234,6 +260,7 @@ module Asciidoctor
           column_of = change_bar_table_columns @change_bar_lane_index.size, settings[:table_max_columns]
           count = column_of.last + 1
           left = on_right ? bounds.right + settings[:offset] : bounds.left - settings[:offset] - count * width
+          left = change_bar_inside_page left, count * width, settings[:table_border_width] / 2.0, on_right, settings
           column_x = ->(column) { on_right ? left + column * width : left + (count - 1 - column) * width }
           lanes.map {|lane| column_of[lane] }.uniq.each do |column|
             ink_change_bar_fill (column_x.call column), top, bottom, width, settings[:color]
@@ -256,9 +283,10 @@ module Asciidoctor
         # Labels each column at the top of the page body with the
         # third-level number of the newest lane it holds, 0 for the x.y
         # release itself. The labels sit above every box on the page,
-        # whichever box inks first. When any label is wider than a column,
-        # every label reads upward, turned 90 degrees and centered on its
-        # column. A label font size of 0 omits the labels.
+        # whichever box inks first. Each label stands one character per
+        # line, its last character resting on the label baseline, so the
+        # labels of all columns share one bottom line whatever their
+        # length. A label font size of 0 omits the labels.
         def ink_change_bar_table_labels pgnum, column_of, column_x, settings
           @change_bar_grid_labeled_pages[pgnum] = true
           return unless (size = settings[:table_label_font_size]) > 0
@@ -270,24 +298,22 @@ module Asciidoctor
             font (settings[:table_label_font_family] || font.family), style: settings[:table_label_font_style] do
               font_size size do
                 width = settings[:table_column_width]
-                labels = newest.map {|column, lane| [column, (revisions[lane] || 0).to_s] }
-                if labels.any? {|_, label| (width_of label) > width }
-                  # Turned text extends from its baseline toward lower x, so
-                  # the baseline sits half a digit height past the center.
-                  shift = (font.ascender - font.descender) * 0.35
-                  labels.each do |column, label|
-                    draw_text label, at: [(column_x.call column) + width / 2.0 + shift, bounds.top + 2], rotate: 90
-                  end
-                else
-                  labels.each do |column, label|
-                    draw_text label, at: [(column_x.call column) + (width - (width_of label)) / 2.0, bounds.top + 2], rotate: 0
-                  end
+                newest.each do |column, lane|
+                  ink_change_bar_table_label (revisions[lane] || 0).to_s, (column_x.call column), width
                 end
               end
             end
           end
         end
 
+        # Stacks the characters of label upward from the label baseline,
+        # each centered on the column at left.
+        def ink_change_bar_table_label label, left, width
+          label.chars.reverse.each_with_index do |char, line|
+            draw_text char, at: [left + (width - (width_of char)) / 2.0, bounds.top + 2 + line * font.ascender]
+          end
+        end
+
         # Paints the bar page by page; from/to are { page:, cursor: }, and
         # from[:lanes] lists the table columns to fill, the first when absent.
         # Called immediately after the block is rendered, so all spanned pages exist.

data/lib/asciidoctor/rhrev/converter.rb

@@ -164,6 +164,7 @@ module Asciidoctor
           # Lifting cell text marks first lets the mixed-release check see
           # them; prescan_document lifts again, which finds nothing left.
           ::Asciidoctor::Rhrev::CellTextMarks.lift node, @revision_prefix
+          ::Asciidoctor::Rhrev::ThirdLevel.drop_empty_marks node, @revision_prefix
           ::Asciidoctor::Rhrev::ThirdLevel.drop_mixed_release_marks node, @revision_prefix
           init_change_bars node
 

data/lib/asciidoctor/rhrev/rhrev_html.rb

@@ -42,6 +42,7 @@ module Asciidoctor
         prefix = document.attr 'revhistoryprefix', 'rhrev'
 
         ::Asciidoctor::Rhrev::CellTextMarks.lift document, prefix
+        ::Asciidoctor::Rhrev::ThirdLevel.drop_empty_marks document, prefix
         ::Asciidoctor::Rhrev::ThirdLevel.drop_mixed_release_marks document, prefix
 
         document.find_by(context: :table).each do |table|

data/lib/asciidoctor/rhrev/third_level.rb

@@ -96,6 +96,18 @@ module Asciidoctor
         revision_of key.to_s.sub(/-(?:all|cover)\z/, ''), prefix
       end
 
+      # Removes every mark, -all, and -cover entry with an empty value, so
+      # an empty mark draws no change bar and adds no entry anywhere. Runs
+      # once per document, after CellTextMarks.lift and before
+      # drop_mixed_release_marks.
+      def self.drop_empty_marks doc, prefix
+        return if doc.instance_variable_get :@rhrev_empty_marks_dropped
+        doc.instance_variable_set :@rhrev_empty_marks_dropped, true
+        each_marked_attributes(doc) do |attributes|
+          attributes.delete_if {|key, value| (marked_revision_of key, prefix) && value.to_s.strip.empty? }
+        end
+      end
+
       # In a draft-kind document, removes every mark, -all, and -cover
       # entry of an x-y release that the document also marks drafts of,
       # warning once per release, so no backend shows a release beside its

metadata

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