rsyntaxtree 1.1.4 → 1.2.0

data/docs/assets/svg/033.svg

@@ -0,0 +1,74 @@
+<?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="623.2" height="1676.8" viewBox="-20, -20, 643.2, 1696.8" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <marker id="arrow" markerUnits="strokeWidth" markerWidth="11.520000000000001" markerHeight="11.520000000000001" viewBox="0 0 11.520000000000001 11.520000000000001" refX="5.760000000000001" refY="0">
+      <polyline fill="none" stroke="black" stroke-width="1" points="0,11.520000000000001,5.760000000000001,0,11.520000000000001,11.520000000000001" />
+    </marker>
+    <marker id="arrowSolid" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="7.2" markerHeight="7.2" orient="auto-start-reverse">
+      <path d="M 0 0 L 10 5 L 0 10 z" stroke="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="-20" y="-20" width="643.2" height="1696.8" stroke="none" fill="white" />"
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; font-size: 64px;' x='252.0' y='132.0'><tspan x='252.0' y='132.0' style="" text-decoration="" font-family="'Noto Sans Mono SemiCondensed', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">ABC</tspan>
+<tspan x='252.0' y='308.0' style="" text-decoration="" font-family="'Noto Sans Mono SemiCondensed', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">abc</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; font-size: 64px;' x='28.80000000000001' y='730.4'><tspan x='28.80000000000001' y='730.4' style="" text-decoration="" font-family="'Noto Sans Mono SemiCondensed', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">DEF</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; font-size: 64px;' x='252.0' y='730.4'><tspan x='252.0' y='730.4' style="" text-decoration="" font-family="'Noto Sans Mono SemiCondensed', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">GHI</tspan>
+<tspan x='252.0' y='906.4' style="" text-decoration="" font-family="'Noto Sans Mono SemiCondensed', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">ghi</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; font-size: 64px;' x='475.20000000000005' y='730.4'><tspan x='475.20000000000005' y='730.4' style="" text-decoration="" font-family="'Noto Sans Mono SemiCondensed', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">JKL</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; font-size: 64px;' x='475.20000000000005' y='1029.6'><tspan x='475.20000000000005' y='1029.6' style="" text-decoration="" font-family="'Noto Sans Mono SemiCondensed', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">MNO</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; font-size: 64px;' x='475.20000000000005' y='1372.8'><tspan x='475.20000000000005' y='1372.8' style="" text-decoration="" font-family="'Noto Sans Mono SemiCondensed', 'Noto Sans JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">XYZ</tspan>
+</text>
+<polyline style='stroke:black; stroke-width:2; fill:none;'
+                            points='82.80000000000001 620.4 82.80000000000001 491.7 306.0 491.7 306.0 363.0' />
+<polyline style='stroke:black; stroke-width:2; fill:none;'
+                            points='306.0 620.4 306.0 491.7 306.0 491.7 306.0 363.0' />
+<polyline style='stroke:black; stroke-width:2; fill:none;'
+                            points='529.2 620.4 529.2 491.7 306.0 491.7 306.0 363.0' />
+<polyline style='stroke:black; stroke-width:2; fill:none;'
+                            points='529.2 919.6 529.2 852.5 529.2 852.5 529.2 785.4' />
+<polyline style='stroke:black; stroke-width:2; fill:none;'
+                            points='529.2 1262.8 529.2 1173.6999999999998 529.2 1173.6999999999998 529.2 1084.6' />
+<line style="stroke:black; stroke-width:2; " x1="252.0" y1="198.0" x2="360.0" y2="198.0"></line>
+<line x1='237.6' y1='33.0' x2='374.4' y2='33.0' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='237.6' y1='33.0' x2='237.6' y2='352.0' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='374.4' y1='33.0' x2='374.4' y2='352.0' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='237.6' y1='352.0' x2='374.4' y2='352.0' style='fill: none; stroke: black; stroke-width:2'  />
+<line style="stroke:black; stroke-width:2; " x1="252.0" y1="796.4" x2="360.0" y2="796.4"></line>
+<line x1='237.6' y1='631.4' x2='374.4' y2='631.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='237.6' y1='631.4' x2='237.6' y2='950.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='374.4' y1='631.4' x2='374.4' y2='950.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='237.6' y1='950.4' x2='374.4' y2='950.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='460.80000000000007' y1='930.6' x2='597.6000000000001' y2='930.6' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='460.80000000000007' y1='930.6' x2='460.80000000000007' y2='1073.6' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='597.6000000000001' y1='930.6' x2='597.6000000000001' y2='1073.6' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='460.80000000000007' y1='1073.6' x2='597.6000000000001' y2='1073.6' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='460.80000000000007' y1='1273.8' x2='597.6000000000001' y2='1273.8' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='460.80000000000007' y1='1273.8' x2='460.80000000000007' y2='1416.8' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='597.6000000000001' y1='1273.8' x2='597.6000000000001' y2='1416.8' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='460.80000000000007' y1='1416.8' x2='597.6000000000001' y2='1416.8' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='306.0' y1='961.4' x2='306.0' y2='1504.8' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='306.0' y1='961.4' x2='306.0' y2='1504.8' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='306.0' y1='1504.8' x2='82.80000000000001' y2='1504.8' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='82.80000000000001' y1='1504.8' x2='82.80000000000001' y2='785.4' style='fill: none; stroke: black; stroke-width:2'  marker-end='url(#arrow)' />
+<line x1='270.0' y1='961.4' x2='270.0' y2='1636.8' style='fill: none; stroke: black; stroke-width:2' stroke-dasharray='8 8' />
+<line x1='270.0' y1='1636.8' x2='529.2' y2='1636.8' style='fill: none; stroke: black; stroke-width:2' stroke-dasharray='8 8' />
+<line x1='529.2' y1='1636.8' x2='529.2' y2='1427.8' style='fill: none; stroke: black; stroke-width:2' stroke-dasharray='8 8' />
+<line x1='306.0' y1='363.0' x2='529.2' y2='919.6' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='306.0' y1='363.0' x2='82.80000000000001' y2='620.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='165.60000000000002' y1='702.9' x2='223.2' y2='702.9' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='306.0' y1='961.4' x2='529.2' y2='1262.8' style='fill: none; stroke: black; stroke-width:2'  /></svg>

data/docs/assets/svg/034.svg

@@ -0,0 +1,91 @@
+<?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="2715.2" height="1236.8" viewBox="-20, -20, 2735.2, 1256.8" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <marker id="arrow" markerUnits="strokeWidth" markerWidth="13.440000000000001" markerHeight="13.440000000000001" viewBox="0 0 13.440000000000001 13.440000000000001" refX="6.720000000000001" refY="0">
+      <polyline fill="none" stroke="black" stroke-width="1" points="0,13.440000000000001,6.720000000000001,0,13.440000000000001,13.440000000000001" />
+    </marker>
+    <marker id="arrowSolid" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="8.4" markerHeight="8.4" orient="auto-start-reverse">
+      <path d="M 0 0 L 10 5 L 0 10 z" stroke="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="-20" y="-20" width="2735.2" height="1256.8" stroke="none" fill="white" />"
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; font-size: 64px;' x='1080.2875' y='132.0'><tspan x='1080.2875' y='132.0' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Clause</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; font-size: 64px;' x='173.79999999999995' y='475.20000000000005'><tspan x='173.79999999999995' y='475.20000000000005' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Sbj<tspan style='fill:none;'>￭</tspan>IntrVerb</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; font-size: 64px;' x='33.59999999999991' y='818.4'><tspan x='33.59999999999991' y='818.4' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Sbj<tspan style='fill:none;'>￭</tspan></tspan>
+<tspan x='164.5999999999999' y='818.4' style="font-style: italic; " text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">sleep</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; font-size: 64px;' x='448.9999999999998' y='818.4'><tspan x='448.9999999999998' y='818.4' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Sbj<tspan style='fill:none;'>￭</tspan></tspan>
+<tspan x='579.9999999999998' y='818.4' style="font-style: italic; " text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">run</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; font-size: 64px;' x='1744.2749999999996' y='475.20000000000005'><tspan x='1744.2749999999996' y='475.20000000000005' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Sbj<tspan style='fill:none;'>￭</tspan>TrVerb<tspan style='fill:none;'>￭</tspan>Obj</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; font-size: 64px;' x='1297.3499999999997' y='818.4'><tspan x='1297.3499999999997' y='818.4' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Sbj<tspan style='fill:none;'>￭</tspan></tspan>
+<tspan x='1428.3499999999997' y='818.4' style="font-style: italic; " text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">kick</tspan>
+<tspan x='1553.3499999999997' y='818.4' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif"><tspan style='fill:none;'>￭</tspan>Obj</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; font-size: 64px;' x='820.3999999999999' y='1161.6'><tspan x='820.3999999999999' y='1161.6' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Sbj<tspan style='fill:none;'>￭</tspan></tspan>
+<tspan x='951.3999999999999' y='1161.6' style="font-style: italic; " text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">kick<tspan style='fill:none;'>￭</tspan>the<tspan style='fill:none;'>￭</tspan>bucket</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; font-size: 64px;' x='1574.7999999999997' y='1161.6'><tspan x='1574.7999999999997' y='1161.6' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Sbj<tspan style='fill:none;'>￭</tspan></tspan>
+<tspan x='1705.7999999999997' y='1161.6' style="font-style: italic; " text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">kick<tspan style='fill:none;'>￭</tspan>the<tspan style='fill:none;'>￭</tspan>habit</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; font-size: 64px;' x='2286.2' y='818.4'><tspan x='2286.2' y='818.4' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Sbj<tspan style='fill:none;'>￭</tspan></tspan>
+<tspan x='2417.2' y='818.4' style="font-style: italic; " text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">kiss</tspan>
+<tspan x='2532.2' y='818.4' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif"><tspan style='fill:none;'>￭</tspan>Obj</tspan>
+</text>
+<line style='stroke:black; stroke-width:2;' x1='370.79999999999995' y1='365.2' x2='1179.7875' y2='187.0' />
+<line style='stroke:black; stroke-width:2;' x1='1988.7749999999999' y1='365.2' x2='1179.7875' y2='187.0' />
+<line style='stroke:black; stroke-width:2;' x1='174.0999999999999' y1='708.4' x2='370.79999999999995' y2='530.2' />
+<line style='stroke:black; stroke-width:2;' x1='567.4999999999998' y1='708.4' x2='370.79999999999995' y2='530.2' />
+<line style='stroke:black; stroke-width:2;' x1='1496.8499999999997' y1='708.4' x2='1988.7749999999999' y2='530.2' />
+<line style='stroke:black; stroke-width:2;' x1='2480.7' y1='708.4' x2='1988.7749999999999' y2='530.2' />
+<line style='stroke:black; stroke-width:2;' x1='1130.3999999999999' y1='1051.6' x2='1496.8499999999997' y2='873.4' />
+<line style='stroke:black; stroke-width:2;' x1='1863.2999999999997' y1='1051.6' x2='1496.8499999999997' y2='873.4' />
+<line x1='1063.4875' y1='33.0' x2='1296.0874999999999' y2='33.0' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='1063.4875' y1='33.0' x2='1063.4875' y2='176.0' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='1296.0874999999999' y1='33.0' x2='1296.0874999999999' y2='176.0' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='1063.4875' y1='176.0' x2='1296.0874999999999' y2='176.0' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='156.99999999999994' y1='376.2' x2='584.5999999999999' y2='376.2' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='156.99999999999994' y1='376.2' x2='156.99999999999994' y2='519.2' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='584.5999999999999' y1='376.2' x2='584.5999999999999' y2='519.2' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='156.99999999999994' y1='519.2' x2='584.5999999999999' y2='519.2' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='16.79999999999991' y1='719.4' x2='331.3999999999999' y2='719.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='16.79999999999991' y1='719.4' x2='16.79999999999991' y2='862.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='331.3999999999999' y1='719.4' x2='331.3999999999999' y2='862.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='16.79999999999991' y1='862.4' x2='331.3999999999999' y2='862.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='432.19999999999976' y1='719.4' x2='702.7999999999997' y2='719.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='432.19999999999976' y1='719.4' x2='432.19999999999976' y2='862.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='702.7999999999997' y1='719.4' x2='702.7999999999997' y2='862.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='432.19999999999976' y1='862.4' x2='702.7999999999997' y2='862.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='1727.4749999999997' y1='376.2' x2='2250.075' y2='376.2' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='1727.4749999999997' y1='376.2' x2='1727.4749999999997' y2='519.2' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='2250.075' y1='376.2' x2='2250.075' y2='519.2' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='1727.4749999999997' y1='519.2' x2='2250.075' y2='519.2' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='1280.5499999999997' y1='719.4' x2='1713.1499999999996' y2='719.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='1280.5499999999997' y1='719.4' x2='1280.5499999999997' y2='862.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='1713.1499999999996' y1='719.4' x2='1713.1499999999996' y2='862.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='1280.5499999999997' y1='862.4' x2='1713.1499999999996' y2='862.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='803.5999999999999' y1='1062.6' x2='1457.1999999999998' y2='1062.6' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='803.5999999999999' y1='1062.6' x2='803.5999999999999' y2='1205.6' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='1457.1999999999998' y1='1062.6' x2='1457.1999999999998' y2='1205.6' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='803.5999999999999' y1='1205.6' x2='1457.1999999999998' y2='1205.6' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='1557.9999999999998' y1='1062.6' x2='2168.6' y2='1062.6' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='1557.9999999999998' y1='1062.6' x2='1557.9999999999998' y2='1205.6' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='2168.6' y1='1062.6' x2='2168.6' y2='1205.6' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='1557.9999999999998' y1='1205.6' x2='2168.6' y2='1205.6' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='2269.3999999999996' y1='719.4' x2='2691.9999999999995' y2='719.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='2269.3999999999996' y1='719.4' x2='2269.3999999999996' y2='862.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='2691.9999999999995' y1='719.4' x2='2691.9999999999995' y2='862.4' style='fill: none; stroke: black; stroke-width:2'  />
+<line x1='2269.3999999999996' y1='862.4' x2='2691.9999999999995' y2='862.4' style='fill: none; stroke: black; stroke-width:2'  /></svg>

data/docs/documentation.md

@@ -129,12 +129,25 @@ The backslash character `\` must be used to print certain characters used in the
 
 You can draw any number of paths of three different types:
 
-- Non-directional (rendered `- - -`)
-- Directional (rendered `----->`)
-- Bidirectional (rendered `<----->`)
+- Non-directional (rendered as dashed line `- - -`)
+- Directional (rendered as solid line `----->`)
+- Bidirectional (rendered as solid line `<----->`)
 
-Each path is distinguished by a path ID number. The path ID is specified by putting a plus sign and a number (e.g. `+7`) at the end of the node text. If a greater-than sign is placed between the plus sign and the number (e.g. `+>7`), an arrowhead will appear at the end of the path.
-A node can have any number of path IDs. The same path ID must appear in the text of the *two* nodes between which the path is rendered. The same ID number cannot appear in more than two places.
+Each path is distinguished by a unique ID number. The ID is specified by putting a plus sign and a number (e.g. `+7`) at the end of the node text. If a greater-than sign is placed between the plus sign and the number (e.g. `+>7`), an arrowhead will appear at the end of the path.
+
+A node can have any number of IDs. The same ID must appear in the text of the *two* nodes between which the path is rendered. The same ID number cannot appear in more than two places.
+
+### Draw Extra Connectors between Nodes (experimental)
+
+You can also add extra connector between nodes in the same fasion as you draw paths between nodes. Extra connectors are drawn as straigt lines (not as `polyline`s).
+
+- Non-directional (rendered as solid line `-----`)
+- Directional (rendered as solid line `----->`)
+- Bidirectional (rendered as solid line `<----->`)
+
+Each additional connectors is distinguished by an ID number. The ID is specified by putting a a number after a sequence of a plus and a minus symbols (e.g. `+-8`) at the end of the node text. If a greater-than sign is placed between the minus sign and the number (e.g. `+->8`), an arrowhead will appear at the end of the connector.
+
+A node can have any number of IDs. The same ID must appear in the text of the *two* nodes between which the additional connector is rendered. The same ID number cannot appear in more than two places.
 
 <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.0/dist/jquery.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/lightbox2@2.11.3/src/js/lightbox.js"></script>

data/docs/documentation_ja.md

@@ -143,10 +143,18 @@ SVG形式を用いる場合，期待通りの表示を得るためには，ご
 - 方向（矢印）のあるパス（`----->`）
 - 両方向の矢印のあるパス（`<----->`）
 
-樹形図の中でパスを表示したいとき，パスの両端をIDで指定します．パスIDをプラス（`+`）記号と共にノードのテキストの最後で指定してください（例：`+7`）．
-プラス記号とパスIDの間に `>` 記号を入れると（例：`+>7`），パスの終端に矢印が付きます．
+樹形図の中でパスを表示したいとき，パスの両端を数字のIDで指定します。数字をプラス（`+`）記号と共にノードのテキストの最後で指定してください（例：`+7`）．
+プラス記号とID番号の間に `>` 記号を入れると（例：`+>7`），パスの終端に矢印が付きます．
 
-パスIDにはどのような数字を用いても構いませんが，必ず **2箇所** で同じIDを指定することが必要です．同じIDを2箇所以上で指定することはできません．
+IDにはどのような数字を用いても構いませんが，必ず **2箇所** で同じIDを指定することが必要です．同じIDを3箇所以上で指定することはできません．
+
+### ノードからノードへの追加的なコネクターの描画（試験的機能）
+
+パスの指定と類似した方式でノードからノードへのコネクターを追加することができます。追加的なコネクターは直線で描画されます（`polyline`にはなりません）。
+
+追加のコネクターは数字のIDで指定します，プラスとマイナスを連続させた（`+-`）後にIDを指定してください（例：`+-8`）．マイナス記号とID番号の間に `>` 記号を入れると（例：`+->8`），コネクターの終端に矢印が付きます．
+
+IDにはどのような数字を用いても構いませんが，必ず **2箇所** で同じIDを指定することが必要です．同じIDを3箇所以上で指定することはできません．
 
 <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.0/dist/jquery.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/lightbox2@2.11.3/src/js/lightbox.js"></script>

data/docs/examples.html

@@ -8,55 +8,58 @@ layout: default
 {% assign categories =  all_examples | map: 'category' | join: ','  | split: ','  | group_by: category %}
 <ul>
   {%- for category in categories -%}
-  <li><a href="#category-{{ category.name | slugify }}">{{ category.name }}</a> [{{category.size}}]</li>
+    {%- if category.name != "Test" -%}
+      <li><a href="#category-{{ category.name | slugify }}">{{ category.name }}</a> [{{category.size}}]</li>
+    {%- endif -%}
   {%- endfor -%}
 </ul>
 
 {%- for category in categories -%}
-<hr />
-<h2 id="category-{{category.name | slugify }}"><b>{{ category.name }}</b></h2>
-{%- for example in all_examples -%}
-{% if example.category contains category.name %}
-<h3>{{ example.caption }}</h3>
-<div style='text-align:left;'>
-  <button onclick="copyToClipBoard('text-{{ example.name }}')" style='margin: 20px 0; font-size: 0.85em;'>
-    Copy to Clipboard
-  </button>
-</div>
-<div class='grid'>
-  <div style='margin-top: 0; margin-bottom: auto;'>
-    <div id="text-{{example.name}}" style='max-height: 600px; overflow-y: auto; margin-bottom: 20px;'>
-      {{ example.content | markdownify }}
-    </div>
-    <table style='line-height: 110%; font-size: 0.85em; margin-bottom: 20px;'>
-      <thead></thead>
-      <tbody>
-        <tr><td>Category</td><td>{{ example.category}}</td></tr>
-        <tr><td>Connector</td><td>{{ example.connector }}</td></tr>
-        <tr><td>Polyline</td><td>{{ example.polyline }}</td></tr>
-        <tr><td>Colorization</td><td>{{ example.colorization }}</td></tr>
-        <tr><td>Radical Symmetirization</td><td>{{ example.symmetrization }}</td></tr>
-        <tr><td>Font</td><td>{{ example.font }}</td></tr>
-        {% if example.reference %}
-          <tr><td>Reference</td><td>{{ example.reference }}</td></tr>
-        {% endif %}
-      </tbody>
-    </table>
-  </div>
-  <div style='margin-top: 0; margin-bottom: auto;'>
-    <a href='assets/img/{{ example.name }}.png' data-lightbox='{{ example.name }}'>
-      <img src='assets/img/{{ example.name}}.png'/>
-    </a>
-  </div>
-</div>
-<div><a href="#examples">🔝</a></div>
-{% endif %}
-{%- endfor -%}
+  {%- if category.name != "Test" -%}
+    <hr />
+    <h2 id="category-{{category.name | slugify }}"><b>{{ category.name }}</b></h2>
+    {%- for example in all_examples -%}
+      {%- if example.category contains category.name -%}
+        <h3>{{ example.caption }}</h3>
+        <div style='text-align:left;'>
+          <button onclick="copyToClipBoard('text-{{ example.name }}')" style='margin: 20px 0; font-size: 0.85em;'>
+            Copy to Clipboard
+          </button>
+        </div>
+        <div class='grid'>
+          <div style='margin-top: 0; margin-bottom: auto;'>
+            <div id="text-{{example.name}}" style='max-height: 600px; overflow-y: auto; margin-bottom: 20px;'>
+              {{ example.content | markdownify }}
+            </div>
+            <table style='line-height: 110%; font-size: 0.85em; margin-bottom: 20px;'>
+              <thead></thead>
+              <tbody>
+                <tr><td>Category</td><td>{{ example.category}}</td></tr>
+                <tr><td>Connector</td><td>{{ example.connector }}</td></tr>
+                <tr><td>Polyline</td><td>{{ example.polyline }}</td></tr>
+                <tr><td>Colorization</td><td>{{ example.colorization }}</td></tr>
+                <tr><td>Radical Symmetirization</td><td>{{ example.symmetrization }}</td></tr>
+                <tr><td>Font</td><td>{{ example.font }}</td></tr>
+                {% if example.reference %}
+                  <tr><td>Reference</td><td>{{ example.reference }}</td></tr>
+                {% endif %}
+              </tbody>
+            </table>
+          </div>
+          <div style='margin-top: 0; margin-bottom: auto;'>
+            <a href='assets/img/{{ example.name }}.png' data-lightbox='{{ example.name }}'>
+              <img src='assets/img/{{ example.name}}.png'/>
+            </a>
+          </div>
+        </div>
+        <div><a href="#examples">🔝</a></div>
+      {%- endif -%}
+    {%- endfor -%}
+  {%- endif -%}
 {%- endfor -%}
 
 <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.0/dist/jquery.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/lightbox2@2.11.3/src/js/lightbox.js"></script>
-
 <script>
   function copyToClipBoard(id){
       var copyText =  document.getElementById(id).innerText;

data/lib/rsyntaxtree/element.rb

@@ -20,7 +20,6 @@ module RSyntaxTree
       @id = id                 # Unique element id
       @parent = parent         # Parent element id
       @children = []           # Child element ids
-      @type = type             # Element type
       @level = level           # Element level in the tree (0=top etc...)
       @width = 0               # Width of the part of the tree including itself and it governs
       @content_width = 0       # Width of the content
@@ -28,7 +27,7 @@ module RSyntaxTree
       @vertical_indent = 0     # Drawing offset
       content = content.strip
 
-      @path = if /.+?\^?((?:\+>?\d+)+)\^?\z/m =~ content
+      @path = if /.+?\^?((?:\+-?>?\d+)+)\^?\z/m =~ content
                 $1.sub(/\A\+/, "").split("+")
               else
                 []

data/lib/rsyntaxtree/markup_parser.rb

@@ -13,7 +13,7 @@ class MarkupParser < Parslet::Parser
   rule(:brackets) { str('#') }
   rule(:triangle) { str('^') }
 
-  rule(:path) { (str('+') >> str('>').maybe >> match('\d').repeat(1)).as(:path) }
+  rule(:path) { (str('+') >> str('-').maybe >> str('>').maybe >> match('\d').repeat(1)).as(:path) }
   rule(:escaped) { str('\\') >> match('[#<>{}\\^+*_=~\|\n\-]').as(:chr) }
   rule(:non_escaped) { ((match('[#<>{}\\^+*_=~\|\-]') | str('\\n')).absent? >> any).as(:chr) }
   rule(:text) { (escaped | non_escaped).repeat(1).as(:text) }

data/lib/rsyntaxtree/svg_graph.rb

@@ -49,8 +49,9 @@ module RSyntaxTree
       y2 = @height + @margin
       extra_lines = @extra_lines.join("\n")
 
+      as  = @global[:h_gap_between_nodes] / 4 * 0.8
       as2 = @global[:h_gap_between_nodes] / 2 * 0.8
-      as = as2 / 2
+      as3 = @global[:h_gap_between_nodes] / 2 * 0.5
 
       header = <<~HDR
         <?xml version="1.0" standalone="no"?>
@@ -60,6 +61,9 @@ module RSyntaxTree
             <marker id="arrow" markerUnits="strokeWidth" markerWidth="#{as2}" markerHeight="#{as2}" viewBox="0 0 #{as2} #{as2}" refX="#{as}" refY="0">
               <polyline fill="none" stroke="#{@col_path}" stroke-width="1" points="0,#{as2},#{as},0,#{as2},#{as2}" />
             </marker>
+            <marker id="arrowSolid" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="#{as3}" markerHeight="#{as3}" orient="auto-start-reverse">
+              <path d="M 0 0 L 10 5 L 0 10 z" stroke="#{@col_line}"/>
+            </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>
@@ -85,9 +89,13 @@ module RSyntaxTree
       end
     end
 
+    def draw_direct_line(s_x, s_y, t_x, t_y, s_arrow = false, t_arrow = false)
+      @extra_lines << generate_connector(s_x, s_y, t_x, t_y, @col_line, false, s_arrow, t_arrow)
+    end
+
     def draw_a_path(s_x, s_y, t_x, t_y, target_arrow = :none)
       x_spacing = @global[:h_gap_between_nodes] * 1.25
-      y_spacing = @global[:height_connector] * 0.65
+      y_spacing = @global[:height_connector] * 0.75
 
       ymax = [s_y, t_y].max
       new_y = if ymax < @height
@@ -112,14 +120,15 @@ module RSyntaxTree
         @visited_x[t_x] = 1
       end
 
-      s_y += @global[:h_gap_between_nodes] / 2
-      t_y += @global[:h_gap_between_nodes] / 2
-      new_y += @global[:h_gap_between_nodes] / 2
+      # s_y += @global[:h_gap_between_nodes] / 2
+      # t_y += @global[:h_gap_between_nodes] / 2
+      # new_y += @global[:h_gap_between_nodes] / 2
 
       dashed = true if target_arrow == :none
 
       case target_arrow
       when :single
+        @extra_lines << generate_line(new_s_x, s_y, new_s_x, new_y, @col_path, dashed)
         @extra_lines << generate_line(new_s_x, s_y, new_s_x, new_y, @col_path, dashed)
         @extra_lines << generate_line(new_s_x, new_y, new_t_x, new_y, @col_path, dashed)
         @extra_lines << generate_line(new_t_x, new_y, new_t_x, t_y, @col_path, dashed, true)
@@ -362,37 +371,64 @@ module RSyntaxTree
     end
 
     def draw_paths
+      paths = []
       path_pool_target = {}
       path_pool_other = {}
       path_pool_source = {}
       path_flags = []
+
+      line_pool = {}
+      line_flags = []
+
       # elist = @element_list.get_elements.reverse
       elist = @element_list.get_elements
 
-      elist.each do |element|
+      elist.each_with_index do |element, i|
+        x0 = element.horizontal_indent - @global[:h_gap_between_nodes]
         x1 = element.horizontal_indent + element.content_width / 2
+        x2 = element.horizontal_indent + element.content_width + @global[:h_gap_between_nodes]
+        y0 = if /nothing|none/ =~ @leafstyle && element.type == ETYPE_LEAF && element.enclosure != :none
+               element.vertical_indent - @global[:height_connector_to_text]
+             else
+               element.vertical_indent + @global[:height_connector_to_text] / 2
+             end
         y1 = element.vertical_indent + element.content_height
-        y1 += @global[:height_connector_to_text] if element.enclosure != :none
+        if i == elist.size - 1 && /nothing|none/ =~ @leafstyle
+          y1 -= @global[:height_connector_to_text] / 2
+        else
+          y1 += @global[:height_connector_to_text]
+        end
         et = element.path
         et.each do |tr|
-          if /\A>(\d+)\z/ =~ tr
+          if /\A-(>)?(\d+)\z/ =~ tr
+            arrow = $1
+            tr = $2
+            if line_pool[tr]
+              line_pool[tr] << { x: { left: x0, center: x1, right: x2 }, y: { top: y0, center: y0 + (y1 - y0) / 2, bottom: y1 }, arrow: arrow }
+            else
+              line_pool[tr] = [{ x: { left: x0, center: x1, right: x2 }, y: { top: y0, center: y0 + (y1 - y0) / 2, bottom: y1 }, arrow: arrow }]
+            end
+            line_flags << tr
+          elsif /\A>(\d+)\z/ =~ tr
             tr = $1
             if path_pool_target[tr]
               path_pool_target[tr] << [x1, y1]
             else
               path_pool_target[tr] = [[x1, y1]]
             end
+            path_flags << tr
           elsif path_pool_source[tr]
             if path_pool_other[tr]
               path_pool_other[tr] << [x1, y1]
             else
               path_pool_other[tr] = [[x1, y1]]
             end
+            path_flags << tr
           else
             path_pool_source[tr] = [x1, y1]
+            path_flags << tr
           end
-          path_flags << tr
-          raise RSTError, "Error: input text contains a path having more than two ends:\n > #{tr}" if path_flags.tally.any? { |_k, v| v > 2 }
+          raise RSTError, "Error: input text contains a path having more than two ends:\n > #{tr}" if path_flags.tally.any? { |_k, v| v > 2 } || line_flags.tally.any? { |_k, v| v > 2 }
         end
       end
 
@@ -400,7 +436,6 @@ module RSyntaxTree
         raise RSTError, "Error: input text contains a path having only one end:\n > #{k}" if v == 1
       end
 
-      paths = []
       path_pool_source.each do |k, v|
         path_flags.delete(k)
         if (targets = path_pool_target[k])
@@ -423,12 +458,43 @@ module RSyntaxTree
       end
 
       paths.each do |t|
-        draw_a_path(t[:x1], t[:y1] + @global[:height_connector_to_text] / 2,
-                    t[:x2], t[:y2] + @global[:height_connector_to_text] / 2,
-                    t[:arrow])
+        # draw_a_path(t[:x1], t[:y1] - @global[:height_connector_to_text], t[:x2], t[:y2] - @global[:height_connector_to_text], t[:arrow])
+        draw_a_path(t[:x1], t[:y1], t[:x2], t[:y2], t[:arrow])
+      end
+
+      line_pool.each do |_k, v|
+        a = v[0]
+        b = v[1]
+
+        if (a[:y][:bottom] > b[:y][:top] && a[:y][:top] < b[:y][:bottom]) || (b[:y][:bottom] > a[:y][:top] && b[:y][:top] < a[:y][:bottom])
+          y_top = [a[:y][:top], b[:y][:top]].max
+          y_bottom = [a[:y][:bottom], b[:y][:bottom]].min
+          y_center = y_top + (y_top - y_bottom).abs / 2
+          if a[:x][:center] < b[:x][:center]
+            draw_direct_line(a[:x][:right], y_center, b[:x][:left], y_center, a[:arrow], b[:arrow])
+          else
+            draw_direct_line(b[:x][:right], y_center, a[:x][:left], y_center, b[:arrow], a[:arrow])
+          end
+          next
+        end
+
+        if a[:y][:bottom] < b[:y][:bottom]
+          draw_direct_line(a[:x][:center], a[:y][:bottom], b[:x][:center], b[:y][:top], a[:arrow], b[:arrow])
+        else
+          draw_direct_line(a[:x][:center], a[:y][:top], b[:x][:center], b[:y][:bottom], a[:arrow], b[:arrow])
+        end
       end
+      paths.size + line_pool.keys.size
+    end
+
+    def generate_connector(x1, y1, x2, y2, col, dashed = false, s_arrow = false, t_arrow = false, stroke_width = 1)
+      string = +""
+      string << "marker-start='url(#arrowSolid)' " if s_arrow
+      string << "marker-end='url(#arrowSolid)' " if t_arrow
+      dasharray = dashed ? "stroke-dasharray='8 8'" : ""
+      swidth = FONT_SCALING * stroke_width
 
-      paths.size
+      "<line x1='#{x1}' y1='#{y1}' x2='#{x2}' y2='#{y2}' style='fill: none; stroke: #{col}; stroke-width:#{swidth}' #{dasharray} #{string}/>"
     end
 
     def generate_line(x1, y1, x2, y2, col, dashed = false, arrow = false, stroke_width = 1)

data/lib/rsyntaxtree/version.rb

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

data/test/markup_parser_test.rb

@@ -29,6 +29,8 @@ class MarkupParserTest < Minitest::Test
     # {:path=>"+12"@0}
     @parser.path.parse('+>34')
     # {:path=>"+>34"@0}d
+    @parser.path.parse('+-87')
+    # {:path=>"+-87"@0}d
   end
 
   def test_rule_escaped