rsyntaxtree 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1ba1c70fd18704ea011d4edb62af9cb18b0109852731faf08a0f8a24360acab
-  data.tar.gz: da6e7c971afc3e5b1b1dbea1f9e0955a511a71702c3869673a363106f45d9459
+  metadata.gz: 867e51aad2f9b73b3aeecc016592ed9329a28269266d1caafb2ae42dac9555d0
+  data.tar.gz: 70c17e7f8aeacd3ad398c81152ad924faa23def26768dca1babce71e6ef867a0
 SHA512:
-  metadata.gz: b5f0a68402ced555dd3ab07c1a3540225b6afe880f56385c2e9c419974bddbde31330cc78a9a2c8306c1692e7810a6bf57c1b35812af62135305241083daf011
-  data.tar.gz: 16268685b95ca4e98d566275b0f82d4f265b88c665ac6fee796837bfa8ceee36df45e708ec057e3dc0e62270e6bfcc9f4f599177608e7a9d7c76f314d67b1b08
+  metadata.gz: cf0c02890fcb35834cbb29b4bad13c764e2e3ec005ffe5207fe9c33f432f406a630abcd9bef0ce05d8e5349ee6b7dc5e1f6c78afdd9411c101015cada35bd58f
+  data.tar.gz: 9906029477a7d286b98412f462d323060c6e12a79e7a0fb67e6207673f3db23d8a6f02cf771b6d6dc7ad56d6b5bb2c2903e9ac9cefd203de845129374b942e5a

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [1.6.1] - 2026-06
+
+### Improved
+- Region shade rendering wraps the subtree more cleanly: wider, balanced
+  padding; bracket/rectangle enclosures are kept inside the plane; the incoming
+  parent connector stops just short of the plane (no overlap or touching); and
+  the margin is consistent between root and non-root regions. Works in both
+  top-to-bottom and left-to-right layouts (the connector-facing edge is the top
+  in TTB and the left in LTR, with symmetric padding on the other sides).
+
+### Added
+- Example 065: nested (overlapping) region shades, shown as progressively
+  darker gray.
+
 ## [1.6.0] - 2026-06
 
 ### Added

data/docs/_examples/065.md

@@ -0,0 +1,22 @@
+---
+name: "065"
+caption: "Nested region shades (overlapping domains)"
+category: "Generative Grammar"
+color: "off"
+polyline: "off"
+symmetrization: "off"
+connector: "auto"
+connector_height: "2.0"
+linewidth: "1"
+hide_default_connectors: "off"
+font: "Noto Serif"
+---
+```
+[%S
+  [DP everyone]
+  [%VP
+    [V loves]
+    [%NP Mary]
+  ]
+]
+```

data/docs/assets/svg/064.svg

@@ -25,7 +25,7 @@
     </pattern>
   </defs>
 <rect x="-17.6" y="0" width="761.2000000000002" height="779.625" stroke="none" fill="white" />"
-<rect x='222.2' y='162.2' width='477.4000000000001' height='603.725' rx='8.8' ry='8.8' fill='lightblue' fill-opacity='0.2' stroke='lightblue' stroke-opacity='0.55' stroke-width='2' />
+<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>
 <text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; storoke-width: 0; font-size: 32px;' x='67.6' y='238.5'><tspan x='67.6' y='238.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">DP</tspan>

data/docs/assets/svg/065.svg

@@ -0,0 +1,54 @@
+<?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">
+  <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"/>
+    </marker>
+    <marker id="arrowBackward" markerUnits="userSpaceOnUse" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="17.6" markerHeight="17.6" orient="auto">
+      <path d="M 0 0 L 10 5 L 0 10 z" fill="black"/>
+    </marker>
+    <marker id="arrowForward" markerUnits="userSpaceOnUse" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="17.6" markerHeight="17.6" orient="auto">
+      <path d="M 10 0 L 0 5 L 10 10 z" fill="black"/>
+    </marker>
+    <marker id="arrowBothways" markerUnits="userSpaceOnUse" viewBox="0 0 30 10" refX="15" refY="5" markerWidth="52.800000000000004" markerHeight="17.6" orient="auto">
+      <path d="M 0 5 L 10 0 L 10 5 L 20 5 L 20 0 L 30 5 L 20 10 L 20 5 L 10 5 L 10 10 z" fill="black"/>
+    </marker>
+    <pattern id="hatchBlack" x="10" y="10" width="10" height="10" patternUnits="userSpaceOnUse" patternTransform="rotate(45)">
+      <line x1="0" y="0" x2="0" y2="10" stroke="black" stroke-width="4"></line>
+    </pattern>
+    <pattern id="hatchForNode" x="10" y="10" width="10" height="10" patternUnits="userSpaceOnUse" patternTransform="rotate(45)">
+      <line x1="0" y="0" x2="0" y2="10" stroke="black" stroke-width="4"></line>
+    </pattern>
+    <pattern id="hatchForLeaf" x="10" y="10" width="10" height="10" patternUnits="userSpaceOnUse" patternTransform="rotate(45)">
+      <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='-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' />
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; storoke-width: 0; font-size: 32px;' x='208.525' y='67.5'><tspan x='208.525' y='67.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">S</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; storoke-width: 0; font-size: 32px;' x='67.6' y='238.5'><tspan x='67.6' y='238.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">DP</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; storoke-width: 0; font-size: 32px;' x='17.599999999999994' y='409.5'><tspan x='17.599999999999994' y='409.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">everyone</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; storoke-width: 0; font-size: 32px;' x='325.45' y='238.5'><tspan x='325.45' y='238.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">VP</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; storoke-width: 0; font-size: 32px;' x='259.5' y='409.5'><tspan x='259.5' y='409.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">V</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; storoke-width: 0; font-size: 32px;' x='231.0' y='580.5'><tspan x='231.0' y='580.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">loves</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; storoke-width: 0; font-size: 32px;' x='399.4' y='409.5'><tspan x='399.4' y='409.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">NP</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; storoke-width: 0; font-size: 32px;' x='380.4' y='580.5'><tspan x='380.4' y='580.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Mary</tspan>
+</text>
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='89.1' y1='182.25' x2='217.525' y2='95.625' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='345.95' y1='182.25' x2='217.525' y2='95.625' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='89.1' y1='353.25' x2='89.1' y2='266.625' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='270.5' y1='353.25' x2='345.95' y2='266.625' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='421.4' y1='353.25' x2='345.95' y2='266.625' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='270.5' y1='524.25' x2='270.5' y2='437.625' />
+<line style='fill: none; stroke:black; stroke-width:2; stroke-linejoin:round; stroke-linecap:round;' x1='421.4' y1='524.25' x2='421.4' y2='437.625' />
+</svg>

data/lib/rsyntaxtree/base_graph.rb

@@ -236,26 +236,6 @@ module RSyntaxTree
       end
     end
 
-    # Bounding box of the subtree rooted at +id+, expressed in final drawing
-    # coordinates (horizontal_indent / vertical_indent / content_*). Works for
-    # both TTB and LTR because it runs after layout (and finalize_ltr) has
-    # placed every element. Used to draw whole-subtree region shades.
-    def subtree_bounds(id = 1)
-      el = @element_list.get_id(id)
-      left = el.horizontal_indent
-      right = el.horizontal_indent + el.content_width
-      top = el.vertical_indent
-      bottom = el.vertical_indent + el.content_height
-      el.children.each do |c|
-        cb = subtree_bounds(c)
-        left = cb[:left] if cb[:left] < left
-        right = cb[:right] if cb[:right] > right
-        top = cb[:top] if cb[:top] < top
-        bottom = cb[:bottom] if cb[:bottom] > bottom
-      end
-      { left: left, right: right, top: top, bottom: bottom }
-    end
-
     def get_leftmost(id = 1)
       target = @element_list.get_id(id)
       target_indent = target.horizontal_indent

data/lib/rsyntaxtree/svg_graph.rb

@@ -142,21 +142,57 @@ module RSyntaxTree
     # Outer (shallower) regions are emitted first so deeper ones layer on
     # top; with low opacity the overlap reads as a darker nesting.
     def collect_region_shades
-      pad = @global[:h_gap_between_nodes] / 2
+      hctt = @global[:height_connector_to_text]
+      pad = @global[:h_gap_between_nodes]  # generous padding for the non-parent-facing edges
+      pad_parent = hctt / 2.0              # tighter margin on the parent-facing edge of the root
+      radius = hctt / 2.0
       stroke_width = @linewidth + LINE_SCALING
       half = stroke_width / 2.0
       @element_list.get_elements.each do |element|
         next unless element.region
 
-        b = subtree_bounds(element.id)
-        x = b[:left] - pad
-        y = b[:top] - pad
-        w = (b[:right] - b[:left]) + pad * 2
-        h = (b[:bottom] - b[:top]) + pad * 2
+        b = region_subtree_bounds(element.id)
+        left = b[:left] - pad
+        right = b[:right] + pad
+        top = b[:top] - pad
+        bottom = b[:bottom] + pad
+
+        # The edge facing the parent is handled specially so the incoming
+        # connector neither overlaps nor touches the plane. That edge is the
+        # TOP in top-to-bottom layout and the LEFT in left-to-right layout; the
+        # other edges keep the generous padding. For a non-root node the edge
+        # is placed midway between the connector anchor and the content edge
+        # (even gap on both sides); the tree root has no incoming connector, so
+        # it just gets a tighter-but-consistent margin there.
+        is_root = element.parent.zero?
+        if @direction == "ltr"
+          anchor = element.horizontal_indent - hctt
+          left = if is_root
+                   b[:left] - pad_parent
+                 elsif anchor < b[:left]
+                   (b[:left] + anchor) / 2.0
+                 else
+                   left
+                 end
+        else
+          anchor = element.vertical_indent + hctt / 2.0
+          top = if is_root
+                  b[:top] - pad_parent
+                elsif anchor < b[:top]
+                  (b[:top] + anchor) / 2.0
+                else
+                  top
+                end
+        end
+
+        x = left
+        y = top
+        w = right - left
+        h = bottom - top
         # An explicit shade color is always honored (consistent with the
         # @color: node-text color); bare '%' falls back to gray.
         color = element.region_color || REGION_DEFAULT_COLOR
-        @region_shades << "<rect x='#{x}' y='#{y}' width='#{w}' height='#{h}' rx='#{pad}' ry='#{pad}' " \
+        @region_shades << "<rect x='#{x}' y='#{y}' width='#{w}' height='#{h}' rx='#{radius}' ry='#{radius}' " \
                           "fill='#{color}' fill-opacity='#{REGION_FILL_OPACITY}' " \
                           "stroke='#{color}' stroke-opacity='#{REGION_STROKE_OPACITY}' stroke-width='#{stroke_width}' />\n"
 
@@ -170,6 +206,49 @@ module RSyntaxTree
       end
     end
 
+    # Visual bounding box of a single element as actually drawn: the label /
+    # enclosure box (which starts hctt*3/4 below vertical_indent, i.e. below the
+    # connector gap) widened to include any enclosure bracket/rectangle that is
+    # painted beyond the content width.
+    def element_visual_box(el)
+      hctt = @global[:height_connector_to_text]
+      box_top = el.vertical_indent + hctt * 3 / 4 # bc[:y]: line-height / enclosure box top
+      box_bottom = box_top + el.content_height
+      left = el.horizontal_indent
+      right = el.horizontal_indent + el.content_width
+      if [:brackets, :rectangle, :brectangle].include?(el.enclosure)
+        ext = @global[:h_gap_between_nodes] / 2 + (@linewidth + BLINE_SCALING)
+        left -= ext
+        right += ext
+        sw = @linewidth + BLINE_SCALING
+        top = box_top - sw
+        bottom = box_bottom + sw
+      else
+        # No enclosure box is painted, so hug the actual glyphs rather than the
+        # taller line-height box: the line box carries ~hctt*3/4 of leading both
+        # above the cap top and below the baseline, which would otherwise leave
+        # too much empty space above and below a plain label.
+        top = el.vertical_indent + hctt * 3 / 2
+        bottom = box_bottom - hctt * 3 / 4
+      end
+      { left: left, top: top, right: right, bottom: bottom }
+    end
+
+    # Union of element_visual_box over the subtree rooted at +id+, in final
+    # drawing coordinates. Used to size region shades so the whole subtree
+    # (labels, enclosures, brackets) sits inside the plane.
+    def region_subtree_bounds(id)
+      b = element_visual_box(@element_list.get_id(id))
+      @element_list.get_id(id).children.each do |c|
+        cb = region_subtree_bounds(c)
+        b[:left] = cb[:left] if cb[:left] < b[:left]
+        b[:right] = cb[:right] if cb[:right] > b[:right]
+        b[:top] = cb[:top] if cb[:top] < b[:top]
+        b[:bottom] = cb[:bottom] if cb[:bottom] > b[:bottom]
+      end
+      b
+    end
+
     def draw_a_path(s_x, s_y, t_x, t_y, target_arrow = :none)
       spacing = @global[:h_gap_between_nodes] * 1.25
       min_bulge = @global[:height_connector_to_text]

data/lib/rsyntaxtree/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Yoichiro Hasebe
@@ -210,6 +210,7 @@ files:
 - docs/_examples/062.md
 - docs/_examples/063.md
 - docs/_examples/064.md
+- docs/_examples/065.md
 - docs/_includes/box_and_circle_table.html
 - docs/_includes/escape_char_table.html
 - docs/_includes/social_media_links.html
@@ -280,6 +281,7 @@ files:
 - docs/assets/img/062.png
 - docs/assets/img/063.png
 - docs/assets/img/064.png
+- docs/assets/img/065.png
 - docs/assets/img/elements/arrow_both.png
 - docs/assets/img/elements/arrow_both_bold.png
 - docs/assets/img/elements/arrow_left.png
@@ -367,6 +369,7 @@ files:
 - docs/assets/svg/062.svg
 - docs/assets/svg/063.svg
 - docs/assets/svg/064.svg
+- docs/assets/svg/065.svg
 - docs/documentation.md
 - docs/documentation_ja.md
 - docs/examples.html