rsyntaxtree 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 867e51aad2f9b73b3aeecc016592ed9329a28269266d1caafb2ae42dac9555d0
-  data.tar.gz: 70c17e7f8aeacd3ad398c81152ad924faa23def26768dca1babce71e6ef867a0
+  metadata.gz: f13f7407a77bda563986883ec33eed5c2699305e73428582e0caf2c64c7cdf22
+  data.tar.gz: 329f1d4357b0034709bd842f117c14ea401dad18b7ca72e65b917149fcc794a9
 SHA512:
-  metadata.gz: cf0c02890fcb35834cbb29b4bad13c764e2e3ec005ffe5207fe9c33f432f406a630abcd9bef0ce05d8e5349ee6b7dc5e1f6c78afdd9411c101015cada35bd58f
-  data.tar.gz: 9906029477a7d286b98412f462d323060c6e12a79e7a0fb67e6207673f3db23d8a6f02cf771b6d6dc7ad56d6b5bb2c2903e9ac9cefd203de845129374b942e5a
+  metadata.gz: 4bab8dc69ae2631ae4818e41a2b986136ab9b40e20a6e9bd2e4793b745e605193f35920e5679e48f5e37bc89211c26e2a1f659a432292c2fd3c027fe35063ae1
+  data.tar.gz: 36db33880b172ac48da638dc0de97797481c88ca6af3bddb632cb1e5f7f795d5146ad1cac5d29f242213157bd16a8c44e031c690d55561fd73076be4bb2dde0e

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.6.2] - 2026-06
+
+### Fixed
+- Region shade no longer touches the image edge when its padded bounds reach
+  past the tree's natural extent (e.g. a deep enclosed/multi-line node): the
+  canvas now grows with a margin around the shaded plane.
+
 ## [1.6.1] - 2026-06
 
 ### Improved

data/docs/assets/svg/064.svg

@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-  <svg width="743.6000000000001" height="768.375" viewBox="-17.6, 0, 761.2000000000002, 779.625" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <svg width="743.6000000000001" height="782.075" viewBox="-17.6, 0, 761.2000000000002, 793.325" version="1.1" xmlns="http://www.w3.org/2000/svg">
   <defs>
     <marker id="arrow" markerUnits="userSpaceOnUse" viewBox="0 0 10 10" refX="10" refY="5" markerWidth="17.6" markerHeight="17.6" orient="auto">
       <path d="M 0 0 L 10 5 L 0 10" fill="#CC79A7"/>
@@ -24,7 +24,7 @@
       <line x1="0" y="0" x2="0" y2="10" stroke="#009E73" stroke-width="4"></line>
     </pattern>
   </defs>
-<rect x="-17.6" y="0" width="761.2000000000002" height="779.625" stroke="none" fill="white" />"
+<rect x="-17.6" y="0" width="761.2000000000002" height="793.325" stroke="none" fill="white" />"
 <rect x='213.4' y='193.5' width='495.0000000000001' height='581.225' rx='11.25' ry='11.25' fill='lightblue' fill-opacity='0.2' stroke='lightblue' stroke-opacity='0.55' stroke-width='2' />
 <text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='216.76250000000002' y='67.5'><tspan x='216.76250000000002' y='67.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">TP</tspan>
 </text>

data/docs/assets/svg/065.svg

@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-  <svg width="515.2" height="597.375" viewBox="-17.6, 0, 532.8000000000001, 608.625" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <svg width="516.2" height="611.075" viewBox="-18.60000000000001, 0, 533.8000000000001, 622.325" version="1.1" xmlns="http://www.w3.org/2000/svg">
   <defs>
     <marker id="arrow" markerUnits="userSpaceOnUse" viewBox="0 0 10 10" refX="10" refY="5" markerWidth="17.6" markerHeight="17.6" orient="auto">
       <path d="M 0 0 L 10 5 L 0 10" fill="black"/>
@@ -24,7 +24,7 @@
       <line x1="0" y="0" x2="0" y2="10" stroke="black" stroke-width="4"></line>
     </pattern>
   </defs>
-<rect x="-17.6" y="0" width="532.8000000000001" height="608.625" stroke="none" fill="white" />"
+<rect x="-18.60000000000001" y="0" width="533.8000000000001" height="622.325" stroke="none" fill="white" />"
 <rect x='-7.105427357601002e-15' y='22.5' width='480.0' height='581.225' rx='11.25' ry='11.25' fill='#888888' fill-opacity='0.2' stroke='#888888' stroke-opacity='0.55' stroke-width='2' />
 <rect x='213.4' y='193.5' width='266.6' height='410.225' rx='11.25' ry='11.25' fill='#888888' fill-opacity='0.2' stroke='#888888' stroke-opacity='0.55' stroke-width='2' />
 <rect x='362.79999999999995' y='364.5' width='117.20000000000005' height='239.22500000000002' rx='11.25' ry='11.25' fill='#888888' fill-opacity='0.2' stroke='#888888' stroke-opacity='0.55' stroke-width='2' />

data/lib/rsyntaxtree/svg_graph.rb

@@ -69,14 +69,17 @@ module RSyntaxTree
       y2 = @height + @global[:height_connector_to_text] / 2
 
       # Grow the canvas so region shades that reach past the tree's own bounds
-      # (e.g. a region on the root node, whose top sits above y=0) are not
-      # clipped. x2/y2 are the viewBox width/height, so right = x1 + x2.
+      # (e.g. a region on the root node, or one whose padded edge extends beyond
+      # the deepest leaf) keep a margin instead of touching the image edge. A
+      # margin is added around the region extents before unioning with the tree
+      # bounds. x2/y2 are the viewBox width/height, so right = x1 + x2.
       if @region_bounds
         rb = @region_bounds
-        left = [x1, rb[:min_x]].min
-        top = [y1, rb[:min_y]].min
-        right = [x1 + x2, rb[:max_x]].max
-        bottom = [y1 + y2, rb[:max_y]].max
+        m = @global[:h_gap_between_nodes]
+        left = [x1, rb[:min_x] - m].min
+        top = [y1, rb[:min_y] - m].min
+        right = [x1 + x2, rb[:max_x] + m].max
+        bottom = [y1 + y2, rb[:max_y] + m].max
         new_x2 = right - left
         new_y2 = bottom - top
         @width += new_x2 - x2

data/lib/rsyntaxtree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RSyntaxTree
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

data/test/node_styling_test.rb

@@ -322,6 +322,27 @@ class NodeStylingTest < Minitest::Test
     assert rx + rw <= minx + vbw + eps, "region right clipped beyond viewBox"
   end
 
+  def test_region_keeps_margin_from_canvas_edge
+    # Regression: when a region's padded bounds extend past the tree's natural
+    # extent (here an enclosed multi-line node deep in the shaded subtree), the
+    # canvas must grow with a margin so the plane does not touch the image edge.
+    opts = @base_opts.merge(color: "modern", data: "[S [A x] [%B [C #\\+one\\ \\+two]]]")
+    svg = RSyntaxTree::RSGenerator.new(opts).draw_svg
+
+    minx, miny, vbw, vbh = svg[/viewBox="([^"]*)"/, 1].split(",").map(&:to_f)
+    shade = svg[/<rect[^>]*fill-opacity[^>]*>/]
+    refute_nil shade
+    rx = shade[/\bx='([\-0-9.]+)'/, 1].to_f
+    ry = shade[/\by='([\-0-9.]+)'/, 1].to_f
+    rw = shade[/width='([\-0-9.]+)'/, 1].to_f
+    rh = shade[/height='([\-0-9.]+)'/, 1].to_f
+
+    bottom_margin = (miny + vbh) - (ry + rh)
+    right_margin = (minx + vbw) - (rx + rw)
+    assert bottom_margin > 8, "Region must keep a bottom margin from the canvas edge (got #{bottom_margin.round(1)})"
+    assert right_margin > 8, "Region must keep a right margin from the canvas edge (got #{right_margin.round(1)})"
+  end
+
   def test_smart_apostrophe_in_label
     # A straight ASCII apostrophe (U+0027) in a label is rendered as a
     # typographic apostrophe (U+2019) for smarter typography (e.g. X-bar "T'").

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Yoichiro Hasebe