rsyntaxtree 1.2.4 → 1.2.5

data/docs/assets/svg/045.svg

@@ -0,0 +1,107 @@
+<?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="2578.2" height="3949.4" viewBox="-20, -20, 2598.2, 3969.4" 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="33.6" markerHeight="33.6" orient="auto">
+      <path d="M 0 0 L 10 5 L 0 10" fill="#CC79A7"/>
+    </marker>
+    <marker id="arrowBackward" markerUnits="userSpaceOnUse" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="33.6" markerHeight="33.6" orient="auto">
+      <path d="M 0 0 L 10 5 L 0 10 z" fill="#CC79A7"/>
+    </marker>
+    <marker id="arrowForward" markerUnits="userSpaceOnUse" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="33.6" markerHeight="33.6" orient="auto">
+      <path d="M 10 0 L 0 5 L 10 10 z" fill="#CC79A7"/>
+    </marker>
+    <marker id="arrowBothways" markerUnits="userSpaceOnUse" viewBox="0 0 30 10" refX="15" refY="5" markerWidth="100.80000000000001" markerHeight="33.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="#CC79A7"/>
+    </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="#0072B2" 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="#009E73" stroke-width="4"></line>
+    </pattern>
+  </defs>
+<rect x="-20" y="-20" width="2598.2" height="3969.4" stroke="none" fill="white" />"
+<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; font-size: 64px;' x='620.93125' y='132.0'><tspan x='620.93125' y='132.0' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Nominal</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; font-size: 64px;' x='33.60000000000002' y='477.4'><tspan x='44.10000000000002' y='477.4' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Grounding</tspan>
+<tspan x='33.60000000000002' y='565.4' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Predication</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; font-size: 64px;' x='1133.7624999999998' y='477.4'><tspan x='1133.7624999999998' y='477.4' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Quantified</tspan>
+<tspan x='1167.2624999999998' y='565.4' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Instance</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; font-size: 64px;' x='517.9999999999999' y='987.8'><tspan x='541.9999999999999' y='987.8' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Absolute</tspan>
+<tspan x='517.9999999999999' y='1075.8' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Quantifier</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; font-size: 64px;' x='1711.525' y='987.8'><tspan x='1711.525' y='987.8' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Higher-Order</tspan>
+<tspan x='1732.525' y='1075.8' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Instantiated</tspan>
+<tspan x='1842.525' y='1163.8' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Type</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; font-size: 64px;' x='1221.85' y='1630.1999999999998'><tspan x='1221.85' y='1630.1999999999998' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Higher-Order</tspan>
+<tspan x='1242.85' y='1718.1999999999998' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Instantiated</tspan>
+<tspan x='1352.85' y='1806.1999999999998' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Type</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; font-size: 64px;' x='968.3999999999999' y='2272.6'><tspan x='968.3999999999999' y='2272.6' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Modifier</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #0072B2; font-size: 64px;' x='1569.2999999999997' y='2272.6'><tspan x='1570.2999999999997' y='2272.6' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Head<tspan style='fill:none;'>￭</tspan>Noun</tspan>
+<tspan x='1674.2999999999997' y='2448.6' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Basic</tspan>
+<tspan x='1569.2999999999997' y='2536.6' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Instantiated</tspan>
+<tspan x='1679.2999999999997' y='2624.6' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Type</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; font-size: 64px;' x='1366.7999999999997' y='3179.0'><tspan x='1366.7999999999997' y='3179.0' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Basic<tspan style='fill:none;'>￭</tspan>Type<tspan style='fill:none;'>￭</tspan>Specification</tspan>
+<tspan x='1498.2999999999997' y='3355.0' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Underived<tspan style='fill:none;'>￭</tspan>Stem</tspan>
+<tspan x='1565.2999999999997' y='3443.0' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Plural<tspan style='fill:none;'>￭</tspan>Stem</tspan>
+<tspan x='1537.7999999999997' y='3531.0' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Derived<tspan style='fill:none;'>￭</tspan>Stem</tspan>
+<tspan x='1491.7999999999997' y='3619.0' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Compound<tspan style='fill:none;'>￭</tspan>Stem</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; font-size: 64px;' x='2274.2' y='1630.1999999999998'><tspan x='2274.2' y='1630.1999999999998' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">Modifier</tspan>
+</text>
+<line style='stroke:black; stroke-width:5; stroke-linecap:round;' x1='208.60000000000002' y1='367.4' x2='752.43125' y2='187.0' />
+<line style='stroke:black; stroke-width:5; stroke-linecap:round;' x1='1296.2624999999998' y1='367.4' x2='752.43125' y2='187.0' />
+<line style='stroke:black; stroke-width:5; stroke-linecap:round;' x1='675.9999999999999' y1='877.8' x2='1296.2624999999998' y2='620.4' />
+<line style='stroke:black; stroke-width:5; stroke-linecap:round;' x1='1916.525' y1='877.8' x2='1296.2624999999998' y2='620.4' />
+<line style='stroke:black; stroke-width:5; stroke-linecap:round;' x1='1426.85' y1='1520.1999999999998' x2='1916.525' y2='1218.8' />
+<line style='stroke:black; stroke-width:5; stroke-linecap:round;' x1='2406.2' y1='1520.1999999999998' x2='1916.525' y2='1218.8' />
+<line style='stroke:black; stroke-width:5; stroke-linecap:round;' x1='1100.3999999999999' y1='2162.6' x2='1426.85' y2='1861.1999999999998' />
+<line style='stroke:black; stroke-width:5; stroke-linecap:round;' x1='1753.2999999999997' y1='2162.6' x2='1426.85' y2='1861.1999999999998' />
+<line style='stroke:black; stroke-width:5; stroke-linecap:round;' x1='1753.2999999999997' y1='3069.0' x2='1753.2999999999997' y2='2679.6' />
+<polygon style='stroke:#0072B2; stroke-width:5; fill:none; stroke-linejoin:round;'
+                            points='604.13125,33.0 900.73125,33.0 900.73125,176.0 604.13125,176.0' />
+
+<polygon style='stroke:#009E73; stroke-width:5; fill:none; stroke-linejoin:round;'
+                            points='16.800000000000022,378.4 400.40000000000003,378.4 400.40000000000003,609.4 16.800000000000022,609.4' />
+
+<polygon style='stroke:#0072B2; stroke-width:5; fill:none; stroke-linejoin:round;'
+                            points='1116.9624999999999,378.4 1475.5625,378.4 1475.5625,609.4 1116.9624999999999,609.4' />
+
+<polygon style='stroke:#009E73; stroke-width:5; fill:none; stroke-linejoin:round;'
+                            points='501.1999999999999,888.8 850.8,888.8 850.8,1119.8 501.1999999999999,1119.8' />
+
+<polygon style='stroke:#0072B2; stroke-width:8; fill:none; stroke-linejoin:round;'
+                            points='1694.7250000000001,888.8 2138.3250000000003,888.8 2138.3250000000003,1207.8 1694.7250000000001,1207.8' />
+
+<polygon style='stroke:#0072B2; stroke-width:8; fill:none; stroke-linejoin:round;'
+                            points='1205.05,1531.1999999999998 1648.65,1531.1999999999998 1648.65,1850.1999999999998 1205.05,1850.1999999999998' />
+
+<polygon style='stroke:#009E73; stroke-width:5; fill:none; stroke-linejoin:round;'
+                            points='951.5999999999999,2173.6 1249.1999999999998,2173.6 1249.1999999999998,2316.6 951.5999999999999,2316.6' />
+
+<line style="stroke:#0072B2; stroke-width:5; " x1="1569.2999999999997" y1="2338.6" x2="1937.2999999999997" y2="2338.6"></line>
+<polygon style='stroke:#0072B2; stroke-width:8; fill:none; stroke-linejoin:round;'
+                            points='1552.4999999999998,2173.6 1954.1,2173.6 1954.1,2668.6 1552.4999999999998,2668.6' />
+
+<line style="stroke:#009E73; stroke-width:5; " x1="1366.7999999999997" y1="3245.0" x2="2139.7999999999997" y2="3245.0"></line>
+<polygon style='stroke:#009E73; stroke-width:5; fill:none; stroke-linejoin:round;'
+                            points='1349.9999999999998,3080.0 2156.6,3080.0 2156.6,3663.0 1349.9999999999998,3663.0' />
+
+<polygon style='stroke:#009E73; stroke-width:8; fill:none; stroke-linejoin:round;'
+                            points='2257.3999999999996,1531.1999999999998 2554.9999999999995,1531.1999999999998 2554.9999999999995,1674.1999999999998 2257.3999999999996,1674.1999999999998' />
+
+<path d='M417.20000000000005,493.9 L758.68125,493.9 L1100.1625, 493.9' style='fill: none; stroke: #CC79A7; stroke-width:5; stroke-linecap:round;'  marker-mid='url(#arrowBackward)' />
+<path d='M867.5999999999999,1004.3 L1272.7625,1004.3 L1677.9250000000002, 1004.3' style='fill: none; stroke: #CC79A7; stroke-width:5; stroke-linecap:round;'  marker-mid='url(#arrowBackward)' />
+<path d='M1665.4499999999998,1602.6999999999998 L1953.0249999999999,1602.6999999999998 L2240.6, 1602.6999999999998' style='fill: none; stroke: #CC79A7; stroke-width:5; stroke-linecap:round;'  marker-mid='url(#arrowForward)' />
+<path d='M1265.9999999999998,2245.1 L1400.85,2245.1 L1535.6999999999998, 2245.1' style='fill: none; stroke: #CC79A7; stroke-width:5; stroke-linecap:round;'  marker-mid='url(#arrowBackward)' />
+<path d='M1753.2999999999997,3069.0 L1753.2999999999997,2874.3 L1753.2999999999997, 2679.6' style='fill: none; stroke: #CC79A7; stroke-width:5; stroke-linecap:round;'  marker-mid='url(#arrowBackward)' /></svg>

data/docs/documentation.md

@@ -137,8 +137,7 @@ You can draw any number of paths of three different types:
 - Directional (rendered as solid line `----▶`)
 - Bidirectional (rendered as solid line `◀----▶`)
 
-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 or less-than sign is placed between the plus sign and the number (e.g. `+>7` or `+<7`), an arrowhead will appear at the end of the path. Note that it makes no difference whether `+>` or `+<` is used. The arrow is always directed to the element with one of these ID symbols.
-
+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 `>` or less-than `<` symbol is placed between the plus sign and the number (e.g. `+>7` or `+<7`), an arrowhead will appear at the end of the path. Note that it makes no difference whether `+>` or `+<` is used. The arrow is always directed to the element with one of these ID symbols.
 
 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.
 
@@ -150,7 +149,7 @@ You can also add extra connector between nodes in the same fasion as you draw pa
 - 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. Note that it makes no difference whether `+->` or `+-<` is used. The arrow is always directed to the element with one of these ID symbols.
+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 `>` or less-than `<` symbol is placed between the minus sign and the number (e.g. `+->8`), an arrowhead will appear at the end of the connector. Note that it makes no difference whether `+->` or `+-<` is used. The arrow is always directed to the element with one of these ID symbols.
 
 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.
 

data/docs/documentation_ja.md

@@ -144,11 +144,11 @@ SVG形式を用いる場合，期待通りの表示を得るためには，ご
 下の3種類の形式でノードからノードへのパスを表示することができます．
 
 - 方向（矢印）のないパス（`- - -`）
-- 方向（矢印）のあるパス（`-----▶`）
-- 両方向の矢印のあるパス（`◀----▶`）
+- 方向（矢印）のあるパス（`----▶`）
+- 両方向の矢印のあるパス（`◀---▶`）
 
 樹形図の中でパスを表示したいとき，パスの両端を数字のIDで指定します．数字をプラス（`+`）記号と共にノードのテキストの最後で指定してください（例：`+7`）．
-プラス記号とID番号の間に `>` 記号を入れると（例：`+>7`），パスの終端に矢印が付きます．その際、`+>` と `+<` のどちらを用いるかで結果は変わりません。矢印の先は常にこれらのいずれかを用いたIDが指定された要素に向けられます。
+プラス記号とID番号の間に `>` 記号または `<` 記号を入れると（例：`+>7`），パスの終端に矢印が付きます．その際、`+>` と `+<` のどちらを用いるかで結果は変わりません。矢印の先は常にこれらのいずれかを用いたIDが指定された要素に向けられます。
 
 IDにはどのような数字を用いても構いませんが，必ず **2箇所** で同じIDを指定することが必要です．同じIDを3箇所以上で指定することはできません．
 
@@ -156,7 +156,7 @@ IDにはどのような数字を用いても構いませんが，必ず **2箇
 
 パスの指定と類似した方式でノードからノードへのコネクターを追加することができます．追加的なコネクターは直線で描画されます（`polyline`にはなりません）．追加的なコネクターを描画する際，デフォルトのコネクターを非表示（透明）にしたいときには `Hide default connectors`オプションをオンにすると良いでしょう．
 
-追加のコネクターは数字のIDで指定します，プラスとマイナスを連続させた（`+-`）後にIDを指定してください（例：`+-8`）．マイナス記号とID番号の間に `>` 記号を入れると（例：`+->8`），コネクターの終端に矢印が付きます．その際、`+->` と `+-<` のどちらを用いるかで結果は変わりません。矢印の先は常にこれらのいずれかを用いたIDが指定された要素に向けられます。
+追加のコネクターは数字のIDで指定します，プラスとマイナスを連続させた（`+-`）後にIDを指定してください（例：`+-8`）．マイナス記号とID番号の間に `>` 記号または `<` 記号を入れると（例：`+->8`），コネクターの終端に矢印が付きます．その際、`+->` と `+-<` のどちらを用いるかで結果は変わりません。矢印の先は常にこれらのいずれかを用いたIDが指定された要素に向けられます。
 
 - 方向（矢印）のないコネクター（`-----`）
 - 方向（矢印）のあるコネクター（`--▶--`）

data/lib/rsyntaxtree/element.rb

@@ -139,22 +139,21 @@ module RSyntaxTree
               elements_height << height
             else
               one_bvm_given = true
-              elements_height << height + @global[:box_vertical_margin] / 2
+              elements_height << height + @global[:box_vertical_margin]
             end
 
             e[:width] = width
             row_width += width
           end
 
-          total_height += if @parent.zero? && @children.empty? && @enclosure == :none
-                            elements_height.max + @global[:height_connector_to_text] * 2
-                          elsif @parent.zero? && @children.empty?
-                            elements_height.max + @global[:height_connector_to_text] / 2
-                          else
-                            elements_height.max + @global[:height_connector_to_text]
-                          end
+          total_height += elements_height.max
           content_width += row_width
         end
+        total_height += if @parent.zero? && @children.empty? && @enclosure != :none
+                          @global[:height_connector_to_text] / 4
+                        else
+                          @global[:height_connector_to_text]
+                        end
         total_width = content_width if total_width < content_width
       end
       @content_width = total_width

data/lib/rsyntaxtree/svg_graph.rb

@@ -41,11 +41,7 @@ module RSyntaxTree
 
     def svg_data
       metrics = parse_list
-      @height = if @element_list.elements.size == 1
-                  metrics[:height]
-                else
-                  metrics[:height] + @margin * 2
-                end
+      @height = metrics[:height] + @margin * 2
       @width = metrics[:width] + @margin * 2
 
       x1 = 0 - @margin
@@ -54,10 +50,6 @@ 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
-      # as4 = @global[:h_gap_between_nodes] * 1.2
-
       as2 = @global[:h_gap_between_nodes] * 1.0
       as4 = as2 * 3
 
@@ -305,12 +297,12 @@ module RSyntaxTree
                 @extra_lines << bar
 
                 if e[:decoration].include?(:arrow_to_l)
-                  l_arrowhead = "<polyline stroke-linejoin='round' fill='none' stroke='#{col}' stroke-width='#{stroke_width}' points='#{x1 + ar_hwidth},#{y1 + ar_hwidth / 2} #{x1},#{y1} #{x1 + ar_hwidth},#{y1 - ar_hwidth / 2}' />\n"
+                  l_arrowhead = "<polyline stroke-linejoin='round' stroke-linecap='round' fill='none' stroke='#{col}' stroke-width='#{stroke_width}' points='#{x1 + ar_hwidth},#{y1 + ar_hwidth / 2} #{x1 + stroke_width / 2},#{y1} #{x1 + ar_hwidth},#{y1 - ar_hwidth / 2}' />\n"
                   @extra_lines << l_arrowhead
                 end
 
                 if e[:decoration].include?(:arrow_to_r)
-                  r_arrowhead = "<polyline stroke-linejoin='round' fill='none' stroke='#{col}' stroke-width='#{stroke_width}' points='#{x2 - ar_hwidth},#{y2 - ar_hwidth / 2} #{x2},#{y2} #{x2 - ar_hwidth},#{y2 + ar_hwidth / 2}' />\n"
+                  r_arrowhead = "<polyline stroke-linejoin='round' stroke-linecap='round' fill='none' stroke='#{col}' stroke-width='#{stroke_width}' points='#{x2 - ar_hwidth},#{y2 - ar_hwidth / 2} #{x2 - stroke_width / 2},#{y2} #{x2 - ar_hwidth},#{y2 + ar_hwidth / 2}' />\n"
                   @extra_lines << r_arrowhead
                 end
               end
@@ -341,6 +333,7 @@ module RSyntaxTree
         end
         @height = text_y if text_y > @height
       end
+
       bc[:y] = bc[:y] + @global[:height_connector_to_text] * 3 / 4
       bc[:height] = text_y - bc[:y] + @global[:height_connector_to_text]
       case element.enclosure
@@ -469,7 +462,15 @@ module RSyntaxTree
         elsif a[:y][:bottom] < b[:y][:top]
           generate_connectors(b[:x][:center], b[:y][:top], a[:x][:center], a[:y][:bottom], @col_extra, false, b[:arrow], a[:arrow])
         elsif a[:x][:center] < b[:x][:center]
-          generate_connectors(a[:x][:right], a[:y][:center], b[:x][:left], b[:y][:center], @col_extra, false, a[:arrow], b[:arrow])
+          if a[:y][:top] == b[:y][:top]
+            upper_y = a[:y][:center] < b[:y][:center] ? a[:y][:center] : b[:y][:center]
+            generate_connectors(a[:x][:right], upper_y, b[:x][:left], upper_y, @col_extra, false, a[:arrow], b[:arrow])
+          else
+            generate_connectors(a[:x][:right], a[:y][:center], b[:x][:left], b[:y][:center], @col_extra, false, a[:arrow], b[:arrow])
+          end
+        elsif a[:y][:top] == b[:y][:top]
+          upper_y = a[:y][:center] < b[:y][:center] ? a[:y][:center] : b[:y][:center]
+          generate_connectors(b[:x][:right], upper_y, a[:x][:left], upper_y, @col_extra, false, b[:arrow], a[:arrow])
         else
           generate_connectors(b[:x][:right], b[:y][:center], a[:x][:left], a[:y][:center], @col_extra, false, b[:arrow], a[:arrow])
         end

data/lib/rsyntaxtree/version.rb

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

data/lib/rsyntaxtree.rb

@@ -83,7 +83,7 @@ module RSyntaxTree
             fontset[:bolditalic] = FONT_DIR + "/NotoSansMono_SemiCondensed-Bold.ttf"
             fontset[:math] = FONT_DIR + "/latinmodern-math.otf"
             fontset[:cjk] = FONT_DIR + "/NotoSansJP-Regular.otf"
-            fontset[:emoji] = FONT_DIR + "/OpenMoji-Black.ttf"
+            fontset[:emoji] = FONT_DIR + "/OpenMoji-black-glyf"
             new_params[:fontstyle] = "mono"
           when "noto-sans", "sans"
             fontset[:normal] = FONT_DIR + "/NotoSans-Regular.ttf"
@@ -92,7 +92,7 @@ module RSyntaxTree
             fontset[:bolditalic] = FONT_DIR + "/NotoSans-BoldItalic.ttf"
             fontset[:math] = FONT_DIR + "/NotoSansMath-Regular.ttf"
             fontset[:cjk] = FONT_DIR + "/NotoSansJP-Regular.otf"
-            fontset[:emoji] = FONT_DIR + "/OpenMoji-Black.ttf"
+            fontset[:emoji] = FONT_DIR + "/OpenMoji-black-glyf.ttf"
             new_params[:fontstyle] = "sans"
           when "noto-serif", "serif"
             fontset[:normal] = FONT_DIR + "/NotoSerif-Regular.ttf"
@@ -101,7 +101,7 @@ module RSyntaxTree
             fontset[:bolditalic] = FONT_DIR + "/NotoSerif-BoldItalic.ttf"
             fontset[:math] = FONT_DIR + "/latinmodern-math.otf"
             fontset[:cjk] = FONT_DIR + "/NotoSerifJP-Regular.otf"
-            fontset[:emoji] = FONT_DIR + "/OpenMoji-Black.ttf"
+            fontset[:emoji] = FONT_DIR + "/OpenMoji-black-glyf.ttf"
             new_params[:fontstyle] = "serif"
           when "cjk zenhei", "cjk"
             fontset[:normal] = FONT_DIR + "/wqy-zenhei.ttf"
@@ -110,7 +110,7 @@ module RSyntaxTree
             fontset[:bolditalic] = FONT_DIR + "/NotoSans-BoldItalic.ttf"
             fontset[:math] = FONT_DIR + "/NotoSansMath-Regular.ttf"
             fontset[:cjk] = FONT_DIR + "/wqy-zenhei.ttf"
-            fontset[:emoji] = FONT_DIR + "/OpenMoji-Black.ttf"
+            fontset[:emoji] = FONT_DIR + "/OpenMoji-black-glyf.ttf"
             new_params[:fontstyle] = "cjk"
           end
         else
@@ -145,7 +145,7 @@ module RSyntaxTree
       @global[:height_connector_to_text] = single_x_metrics.height / 2.0
       @global[:single_line_height] = single_x_metrics.height * 2.0
       @global[:width_half_x] = single_x_metrics.width / 2.0
-      @global[:height_connector] = single_x_metrics.height * 1.0 * @params[:vheight]
+      @global[:height_connector] = single_x_metrics.height * @params[:vheight]
       @global[:h_gap_between_nodes] = single_x_metrics.width * 0.8
       @global[:box_vertical_margin] = single_x_metrics.height * 0.8
     end

data/test/example_verify_test.rb

@@ -49,6 +49,8 @@ class ExampleParserTest < Minitest::Test
         opts[:polyline] = value
       when "hide_default_connectors"
         opts[:hide_default_connectors] = value
+      when "connector_height"
+        opts[:vheight] = value
       when "symmetrization"
         opts[:symmetrize] = value
       when "connector"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-04 00:00:00.000000000 Z
+date: 2023-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optimist
@@ -108,6 +108,7 @@ files:
 - README.md
 - Rakefile
 - bin/rsyntaxtree
+- devel/generate_examples.rb
 - docs/.gitignore
 - docs/404.html
 - docs/Gemfile
@@ -154,6 +155,10 @@ files:
 - docs/_examples/039.md
 - docs/_examples/040.md
 - docs/_examples/041.md
+- docs/_examples/042.md
+- docs/_examples/043.md
+- docs/_examples/044.md
+- docs/_examples/045.md
 - docs/_includes/box_and_circle_table.html
 - docs/_includes/escape_char_table.html
 - docs/_includes/social_media_links.html
@@ -174,6 +179,7 @@ files:
 - docs/assets/img/012.png
 - docs/assets/img/013.png
 - docs/assets/img/014.png
+- docs/assets/img/014_.png
 - docs/assets/img/015.png
 - docs/assets/img/016.png
 - docs/assets/img/017.png
@@ -201,6 +207,10 @@ files:
 - docs/assets/img/039.png
 - docs/assets/img/040.png
 - docs/assets/img/041.png
+- docs/assets/img/042.png
+- docs/assets/img/043.png
+- docs/assets/img/044.png
+- docs/assets/img/045.png
 - docs/assets/img/elements/circle.png
 - docs/assets/img/elements/circle_abc.png
 - docs/assets/img/elements/circle_bold.png
@@ -259,10 +269,16 @@ files:
 - docs/assets/svg/039.svg
 - docs/assets/svg/040.svg
 - docs/assets/svg/041.svg
+- docs/assets/svg/042.svg
+- docs/assets/svg/043.svg
+- docs/assets/svg/044.svg
+- docs/assets/svg/045.svg
 - docs/documentation.md
 - docs/documentation_ja.md
 - docs/examples.html
 - docs/index.html
+- fonts/NotoEmoji-Bold.ttf
+- fonts/NotoEmoji-Regular.ttf
 - fonts/NotoSans-Bold.ttf
 - fonts/NotoSans-BoldItalic.ttf
 - fonts/NotoSans-Italic.ttf
@@ -278,8 +294,7 @@ files:
 - fonts/NotoSerif-Regular.ttf
 - fonts/NotoSerifJP-Bold.otf
 - fonts/NotoSerifJP-Regular.otf
-- fonts/OpenMoji-Black.ttf
-- fonts/OpenMoji-Color.ttf
+- fonts/OpenMoji-black-glyf.ttf
 - fonts/wqy-zenhei.ttf
 - img/rsyntaxtree-web-screenshot.png
 - img/rsyntaxtree.png
@@ -316,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.2
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: RSyntaxTree is a graphical syntax tree generator written in Ruby