rsyntaxtree 1.1.4 → 1.2.1

data/docs/documentation_ja.md

@@ -143,10 +143,22 @@ 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/base_graph.rb

@@ -20,10 +20,12 @@ module RSyntaxTree
         @col_node  = "blue"
         @col_leaf  = "green"
         @col_path = "purple"
+        @col_extra = "red"
       else
         @col_node  = "black"
         @col_leaf  = "black"
         @col_path = "black"
+        @col_extra = "black"
       end
 
       @col_bg   = "none"
@@ -79,13 +81,11 @@ module RSyntaxTree
 
         vertical_indent = if !target.triangle &&
                              (@leafstyle == "nothing" || @leafstyle == "none") &&
-                             ETYPE_LEAF == target.type &&
-                             parent.children.size == 1
+                             ETYPE_LEAF == target.type && parent.children.size == 1
                             parent.vertical_indent + parent.content_height
                           else
                             parent.vertical_indent + parent.content_height + @global[:height_connector]
                           end
-
         target.vertical_indent = vertical_indent
       end
 
@@ -185,8 +185,6 @@ module RSyntaxTree
             triangle_to_parent(parent, child)
           elsif ETYPE_LEAF != child.type
             line_to_parent(parent, child)
-          elsif ETYPE_LEAF == child.type
-            child.vertical_indent = parent.vertical_indent + parent.content_height + @global[:height_connector] / 2
           end
         end
       else
@@ -239,7 +237,6 @@ module RSyntaxTree
       end
 
       offset_l = (top.horizontal_indent - get_leftmost) + @global[:h_gap_between_nodes]
-      # offset_r = top.width / 2 - offset_l - @global[:h_gap_between_nodes:
 
       @element_list.get_elements.each do |e|
         e.horizontal_indent += offset_l

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
                 []
@@ -78,14 +77,6 @@ module RSyntaxTree
             fontsize = decoration.include?(:subscript) || decoration.include?(:superscript) ? fontsize * SUBSCRIPT_CONST : fontsize
             style    = decoration.include?(:italic) || decoration.include?(:bolditalic) ? :italic : :normal
             weight   = decoration.include?(:bold) || decoration.include?(:bolditalic) ? :bold : :normal
-
-            # e[:cjk] = false
-            # if e[:decoration].include?(:math)
-            #   font = @fontset[:math]
-            # elsif text.contains_cjk?
-            #   font = @fontset[:cjk]
-            #   e[:cjk] = true
-            # elsif decoration.include? :bolditalic
             font = if decoration.include? :bolditalic
                      @fontset[:bolditalic]
                    elsif decoration.include? :bold

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
+      as4 = @global[:h_gap_between_nodes]
 
       header = <<~HDR
         <?xml version="1.0" standalone="no"?>
@@ -60,6 +61,15 @@ 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="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>
             <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 +95,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_extra, 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 +126,11 @@ 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
-
       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 +373,54 @@ module RSyntaxTree
     end
 
     def draw_paths
+      paths = []
       path_pool_target = {}
       path_pool_other = {}
       path_pool_source = {}
       path_flags = []
-      # elist = @element_list.get_elements.reverse
+
+      line_pool = {}
+      line_flags = []
+
       elist = @element_list.get_elements
 
       elist.each do |element|
+        x0 = element.horizontal_indent - @global[:h_gap_between_nodes]
         x1 = element.horizontal_indent + element.content_width / 2
-        y1 = element.vertical_indent + element.content_height
-        y1 += @global[:height_connector_to_text] if element.enclosure != :none
+        x2 = element.horizontal_indent + element.content_width + @global[:h_gap_between_nodes]
+        y0 = element.vertical_indent + @global[:height_connector_to_text] / 2
+        y1 = element.vertical_indent + element.content_height + @global[:h_gap_between_nodes] * 1.5
         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 +428,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 +450,54 @@ 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], t[:x2], t[:y2], t[:arrow])
       end
 
-      paths.size
+      line_pool.each do |_k, v|
+        a = v[0]
+        b = v[1]
+
+        if a[:y][:top] > b[:y][:bottom]
+          draw_direct_line(a[:x][:center], a[:y][:top], b[:x][:center], b[:y][:bottom], a[:arrow], b[:arrow])
+        elsif b[:y][:top] > a[:y][:bottom]
+          draw_direct_line(a[:x][:center], a[:y][:bottom], b[:x][:center], b[:y][:top], a[:arrow], b[:arrow])
+        elsif a[:x][:center] < b[:x][:center]
+          draw_direct_line(a[:x][:right], a[:y][:center], b[:x][:left], b[:y][:center], a[:arrow], b[:arrow])
+        else
+          draw_direct_line(b[:x][:right], b[:y][:center], a[:x][:left], a[:y][:center], b[:arrow], a[: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 = if s_arrow && t_arrow
+                 "marker-mid='url(#arrowBothways)' "
+               elsif s_arrow
+                 "marker-mid='url(#arrowForward)' "
+               elsif t_arrow
+                 "marker-mid='url(#arrowBackward)' "
+               else
+                 ""
+               end
+      dasharray = dashed ? "stroke-dasharray='8 8'" : ""
+      swidth = FONT_SCALING * stroke_width
+
+      if s_arrow || t_arrow
+        x_mid = if x2 > x1
+                  x1 + (x2 - x1) / 2
+                else
+                  x1 - (x1 - x2) / 2
+                end
+        y_mid = if y2 > y1
+                  y1 + (y2 - y1) / 2
+                else
+                  y1 - (y1 - y2) / 2
+                end
+        "<path d='M#{x1},#{y1} L#{x_mid},#{y_mid} L#{x2}, #{y2}' style='fill: none; stroke: #{col}; stroke-width:#{swidth}' #{dasharray} #{string}/>"
+      else
+        "<line x1='#{x1}' y1='#{y1}' x2='#{x2}' y2='#{y2}' style='fill: none; stroke: #{col}; stroke-width:#{swidth}' #{dasharray} #{string}/>"
+      end
     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.1"
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.1
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-29 00:00:00.000000000 Z
+date: 2023-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optimist
@@ -141,6 +141,13 @@ files:
 - docs/_examples/026.md
 - docs/_examples/027.md
 - docs/_examples/028.md
+- docs/_examples/029.md
+- docs/_examples/030.md
+- docs/_examples/031.md
+- docs/_examples/032.md
+- docs/_examples/033.md
+- docs/_examples/034.md
+- docs/_examples/035.md
 - docs/_includes/box_and_circle_table.html
 - docs/_includes/escape_char_table.html
 - docs/_includes/social_media_links.html
@@ -175,6 +182,13 @@ files:
 - docs/assets/img/026.png
 - docs/assets/img/027.png
 - docs/assets/img/028.png
+- docs/assets/img/029.png
+- docs/assets/img/030.png
+- docs/assets/img/031.png
+- docs/assets/img/032.png
+- docs/assets/img/033.png
+- docs/assets/img/034.png
+- docs/assets/img/035.png
 - docs/assets/img/elements/circle.png
 - docs/assets/img/elements/circle_abc.png
 - docs/assets/img/elements/circle_bold.png
@@ -220,6 +234,13 @@ files:
 - docs/assets/svg/026.svg
 - docs/assets/svg/027.svg
 - docs/assets/svg/028.svg
+- docs/assets/svg/029.svg
+- docs/assets/svg/030.svg
+- docs/assets/svg/031.svg
+- docs/assets/svg/032.svg
+- docs/assets/svg/033.svg
+- docs/assets/svg/034.svg
+- docs/assets/svg/035.svg
 - docs/documentation.md
 - docs/documentation_ja.md
 - docs/examples.html