rsyntaxtree 1.2.2 → 1.2.3

data/docs/assets/svg/039.svg

@@ -0,0 +1,30 @@
+<?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="115.6" height="211.2" viewBox="-20, -20, 135.6, 231.2" 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="#CC79A7" stroke-width="1" points="0,13.440000000000001,6.720000000000001,0,13.440000000000001,13.440000000000001" />
+    </marker>
+    <marker id="arrowBackward" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="13.440000000000001" markerHeight="13.440000000000001" orient="auto">
+      <path d="M 0 0 L 10 5 L 0 10 z" fill="#D55E00"/>
+    </marker>
+    <marker id="arrowForward" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="13.440000000000001" markerHeight="13.440000000000001" orient="auto">
+      <path d="M 10 0 L 0 5 L 10 10 z" fill="#D55E00"/>
+    </marker>
+    <marker id="arrowBothways" viewBox="0 0 30 10" refX="15" refY="5" markerWidth="40.32" markerHeight="40.32" 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="#D55E00"/>
+    </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="135.6" height="231.2" stroke="none" fill="white" />"
+<text white-space='pre' alignment-baseline='text-top' style='fill: #009E73; font-size: 64px;' x='33.599999999999994' y='132.0'><tspan x='33.599999999999994' y='132.0' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">X</tspan>
+</text>
+</svg>

data/docs/documentation.md

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

data/lib/rsyntaxtree/element.rb

@@ -27,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
                 []
@@ -57,6 +57,7 @@ module RSyntaxTree
     def setup
       total_width = 0
       total_height = 0
+      one_bvm_given = false
       @content.each do |content|
         content_width = 0
         case content[:type]
@@ -88,6 +89,7 @@ module RSyntaxTree
                    end
 
             standard_metrics = FontMetrics.get_metrics('X', @fontset[:normal], fontsize, :normal, :normal)
+
             height = standard_metrics.height
             if /\A[<>]+\z/ =~ text
               width = standard_metrics.width * text.size / 2
@@ -132,17 +134,20 @@ module RSyntaxTree
             end
 
             e[:height] = height
-            elements_height << height + @global[:box_vertical_margin] / 2
+
+            if one_bvm_given
+              elements_height << height
+            else
+              one_bvm_given = true
+              elements_height << height + @global[:box_vertical_margin] / 2
+            end
 
             e[:width] = width
             row_width += width
           end
 
-          total_height += if @parent.zero? && @children.empty?
-                            # tree without parent node
-                            elements_height.max
-                          # elsif @enclosure != :none && @children.empty?
-                          #   elements_height.max
+          total_height += if @parent.zero? && @children.empty? && @enclosure == :none
+                            elements_height.max + @global[:height_connector_to_text] * 2
                           else
                             elements_height.max + @global[:height_connector_to_text]
                           end

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 >> str('>').maybe >> match('\d').repeat(1)).as(:path) }
+  rule(:path) { (str('+') >> str('-').maybe >> (str('>') | 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

@@ -65,12 +65,12 @@ 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="arrowForward" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="#{as2}" markerHeight="#{as2}" orient="auto-start-reverse">
-              <path d="M 0 0 L 10 5 L 0 10 z" fill="#{@col_extra}"/>
-            </marker>
             <marker id="arrowBackward" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="#{as2}" markerHeight="#{as2}" orient="auto">
               <path d="M 0 0 L 10 5 L 0 10 z" fill="#{@col_extra}"/>
             </marker>
+            <marker id="arrowForward" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="#{as2}" markerHeight="#{as2}" orient="auto">
+              <path d="M 10 0 L 0 5 L 10 10 z" fill="#{@col_extra}"/>
+            </marker>
             <marker id="arrowBothways" viewBox="0 0 30 10" refX="15" refY="5" markerWidth="#{as4}" markerHeight="#{as4}" 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="#{@col_extra}"/>
             </marker>
@@ -396,7 +396,7 @@ module RSyntaxTree
         y1 = element.vertical_indent + element.content_height + @global[:height_connector_to_text]
         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]
@@ -405,7 +405,7 @@ module RSyntaxTree
               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
+          elsif /\A(?:>|<)(\d+)\z/ =~ tr
             tr = $1
             if path_pool_target[tr]
               path_pool_target[tr] << [x1, y1]

data/lib/rsyntaxtree/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-02 00:00:00.000000000 Z
+date: 2023-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optimist
@@ -150,6 +150,8 @@ files:
 - docs/_examples/035.md
 - docs/_examples/036.md
 - docs/_examples/037.md
+- docs/_examples/038.md
+- docs/_examples/039.md
 - docs/_includes/box_and_circle_table.html
 - docs/_includes/escape_char_table.html
 - docs/_includes/social_media_links.html
@@ -193,6 +195,8 @@ files:
 - docs/assets/img/035.png
 - docs/assets/img/036.png
 - docs/assets/img/037.png
+- docs/assets/img/038.png
+- docs/assets/img/039.png
 - docs/assets/img/elements/circle.png
 - docs/assets/img/elements/circle_abc.png
 - docs/assets/img/elements/circle_bold.png
@@ -247,6 +251,8 @@ files:
 - docs/assets/svg/035.svg
 - docs/assets/svg/036.svg
 - docs/assets/svg/037.svg
+- docs/assets/svg/038.svg
+- docs/assets/svg/039.svg
 - docs/documentation.md
 - docs/documentation_ja.md
 - docs/examples.html