rsyntaxtree 1.2.0 → 1.2.2

data/lib/rsyntaxtree/base_graph.rb

@@ -16,19 +16,38 @@ module RSyntaxTree
       @element_list = element_list
       @symmetrize = params[:symmetrize]
 
-      if params[:color]
+      case params[:color]
+      # Okabe-Ito Color
+      when "modern"
+        @col_node  = "#0072B2" # blue
+        @col_leaf  = "#009E73" # bluishgreen
+        @col_path  = "#CC79A7" # reddishpurple
+        @col_extra = "#D55E00" # vermillion
+        # "#000000" black
+        # "#E69F00" orange
+        # "#56B4E9" skyblue
+        # "#F0E442" yellow
+        # "#999999" grey
+      when "traditional"
         @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"
       @col_fg   = "black"
-      @col_line = "black"
+
+      @col_line = if params[:hide_default_connectors]
+                    "none"
+                  else
+                    "black"
+                  end
 
       @leafstyle = params[:leafstyle]
       @fontset = params[:fontset]
@@ -79,13 +98,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 +202,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
@@ -226,11 +241,13 @@ module RSyntaxTree
     end
 
     def parse_list
-      calculate_level
-      calculate_width
-      make_balance if @symmetrize
-      calculate_indent
-      node_centering
+      if @element_list.elements.size > 1
+        calculate_level
+        calculate_width
+        make_balance if @symmetrize
+        calculate_indent
+        node_centering
+      end
 
       top = @element_list.get_id(1)
       diff = top.horizontal_indent
@@ -239,7 +256,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
@@ -253,7 +269,6 @@ module RSyntaxTree
       width = get_rightmost - get_leftmost + @global[:h_gap_between_nodes]
       height = @element_list.get_id(1).height
       height = @height if @height > height
-
       { height: height, width: width }
     end
   end

data/lib/rsyntaxtree/element.rb

@@ -77,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
@@ -146,10 +138,13 @@ module RSyntaxTree
             row_width += width
           end
 
-          total_height += if @enclosure != :none
-                            elements_height.max + @global[:height_connector_to_text]
-                          else
+          total_height += if @parent.zero? && @children.empty?
+                            # tree without parent node
                             elements_height.max
+                          # elsif @enclosure != :none && @children.empty?
+                          #   elements_height.max
+                          else
+                            elements_height.max + @global[:height_connector_to_text]
                           end
           content_width += row_width
         end

data/lib/rsyntaxtree/svg_graph.rb

@@ -16,6 +16,7 @@ module RSyntaxTree
     attr_accessor :width, :height
 
     def initialize(element_list, params, global)
+      super(element_list, params, global)
       @height = 0
       @width  = 0
       @extra_lines = []
@@ -26,8 +27,8 @@ module RSyntaxTree
       @fontstyle = params[:fontstyle]
       @margin = params[:margin].to_i
       @polyline = params[:polyline]
-      @line_styles = "<line style='stroke:black; stroke-width:#{FONT_SCALING};' x1='X1' y1='Y1' x2='X2' y2='Y2' />\n"
-      @polyline_styles = "<polyline style='stroke:black; stroke-width:#{FONT_SCALING}; fill:none;'
+      @line_styles = "<line style='stroke:#{@col_line}; stroke-width:#{FONT_SCALING};' x1='X1' y1='Y1' x2='X2' y2='Y2' />\n"
+      @polyline_styles = "<polyline style='stroke:#{@col_line}; stroke-width:#{FONT_SCALING}; fill:none;'
                             points='CHIX CHIY MIDX1 MIDY1 MIDX2 MIDY2 PARX PARY' />\n"
       @polygon_styles = "<polygon style='fill: none; stroke: black; stroke-width:#{FONT_SCALING};' points='X1 Y1 X2 Y2 X3 Y3' />\n"
       @text_styles = "<text white-space='pre' alignment-baseline='text-top' style='fill: COLOR; font-size: fontsize' x='X_VALUE' y='Y_VALUE'>CONTENT</text>\n"
@@ -35,12 +36,15 @@ module RSyntaxTree
       @visited_x = {}
       @visited_y = {}
       @global = global
-      super(element_list, params, global)
     end
 
     def svg_data
       metrics = parse_list
-      @height = metrics[:height] + @margin * 2
+      @height = if @element_list.elements.size == 1
+                  metrics[:height]
+                else
+                  metrics[:height] + @margin * 2
+                end
       @width = metrics[:width] + @margin * 2
 
       x1 = 0 - @margin
@@ -51,7 +55,7 @@ module RSyntaxTree
 
       as  = @global[:h_gap_between_nodes] / 4 * 0.8
       as2 = @global[:h_gap_between_nodes] / 2 * 0.8
-      as3 = @global[:h_gap_between_nodes] / 2 * 0.5
+      as4 = @global[:h_gap_between_nodes] * 1.2
 
       header = <<~HDR
         <?xml version="1.0" standalone="no"?>
@@ -61,8 +65,14 @@ 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 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>
@@ -90,7 +100,7 @@ module RSyntaxTree
     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)
+      @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)
@@ -120,10 +130,6 @@ 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
@@ -380,24 +386,14 @@ module RSyntaxTree
       line_pool = {}
       line_flags = []
 
-      # elist = @element_list.get_elements.reverse
       elist = @element_list.get_elements
 
-      elist.each_with_index do |element, i|
+      elist.each do |element|
         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
-        if i == elist.size - 1 && /nothing|none/ =~ @leafstyle
-          y1 -= @global[:height_connector_to_text] / 2
-        else
-          y1 += @global[:height_connector_to_text]
-        end
+        y0 = element.vertical_indent + @global[:height_connector_to_text] / 2
+        y1 = element.vertical_indent + element.content_height + @global[:height_connector_to_text]
         et = element.path
         et.each do |tr|
           if /\A-(>)?(\d+)\z/ =~ tr
@@ -458,7 +454,6 @@ module RSyntaxTree
       end
 
       paths.each do |t|
-        # 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
 
@@ -466,35 +461,47 @@ module RSyntaxTree
         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
+        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 a[:y][:bottom] < b[:y][:top]
+          draw_direct_line(b[:x][:center], b[:y][:top], a[:x][:center], a[:y][:bottom], b[:arrow], a[: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 = +""
-      string << "marker-start='url(#arrowSolid)' " if s_arrow
-      string << "marker-end='url(#arrowSolid)' " if t_arrow
+      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
 
-      "<line x1='#{x1}' y1='#{y1}' x2='#{x2}' y2='#{y2}' style='fill: none; stroke: #{col}; stroke-width:#{swidth}' #{dasharray} #{string}/>"
+      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.2.0"
+  VERSION = "1.2.2"
 end

data/lib/rsyntaxtree.rb

@@ -53,8 +53,17 @@ module RSyntaxTree
                      .gsub(/(?<!\\)¥/, "\\")
           new_params[key] = data
 
-        when :symmetrize, :color, :transparent, :polyline
+        when :symmetrize, :transparent, :polyline, :hide_default_connectors
           new_params[key] = value && (value != "off" && value != "false") ? true : false
+        when :color
+          new_params[key] = case value
+                            when "modern", "on", "true"
+                              "modern"
+                            when "traditional"
+                              "traditional"
+                            else
+                              "off"
+                            end
         when :fontsize
           new_params[key] = value.to_i * FONT_SCALING
         when :margin
@@ -108,7 +117,7 @@ module RSyntaxTree
       # defaults to the following
       @params = {
         symmetrize: true,
-        color: true,
+        color: "modern",
         transparent: false,
         fontsize: 16,
         format: "png",
@@ -117,7 +126,8 @@ module RSyntaxTree
         data: "",
         margin: 0,
         vheight: 1.0,
-        polyline: false
+        polyline: false,
+        hide_default_connectors: false
       }
 
       @params.merge! new_params

data/test/example_verify_test.rb

@@ -25,7 +25,8 @@ class ExampleParserTest < Minitest::Test
       color: "on",
       symmetrize: "on",
       transparent: "off",
-      polyline: "off"
+      polyline: "off",
+      hide_default_connectors: "off"
     }
     name = nil
     config.each do |key, value|
@@ -34,10 +35,19 @@ class ExampleParserTest < Minitest::Test
       case key
       when "name"
         name = value
-      when "colorization"
-        opts[:color] = value
+      when "color"
+        opts[:color] = case value
+                       when "modern", "on", "true"
+                         "modern"
+                       when "traditional"
+                         "traditional"
+                       else
+                         "off"
+                       end
       when "polyline"
         opts[:polyline] = value
+      when "hide_default_connectors"
+        opts[:hide_default_connectors] = 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.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optimist
@@ -147,6 +147,9 @@ files:
 - docs/_examples/032.md
 - docs/_examples/033.md
 - docs/_examples/034.md
+- docs/_examples/035.md
+- docs/_examples/036.md
+- docs/_examples/037.md
 - docs/_includes/box_and_circle_table.html
 - docs/_includes/escape_char_table.html
 - docs/_includes/social_media_links.html
@@ -187,6 +190,9 @@ files:
 - docs/assets/img/032.png
 - docs/assets/img/033.png
 - docs/assets/img/034.png
+- docs/assets/img/035.png
+- docs/assets/img/036.png
+- docs/assets/img/037.png
 - docs/assets/img/elements/circle.png
 - docs/assets/img/elements/circle_abc.png
 - docs/assets/img/elements/circle_bold.png
@@ -238,6 +244,9 @@ files:
 - docs/assets/svg/032.svg
 - docs/assets/svg/033.svg
 - docs/assets/svg/034.svg
+- docs/assets/svg/035.svg
+- docs/assets/svg/036.svg
+- docs/assets/svg/037.svg
 - docs/documentation.md
 - docs/documentation_ja.md
 - docs/examples.html
@@ -295,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: RSyntaxTree is a graphical syntax tree generator written in Ruby