rsyntaxtree 1.2.1 → 1.2.2

data/lib/rsyntaxtree/base_graph.rb

@@ -16,7 +16,19 @@ 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"
@@ -30,7 +42,12 @@ module RSyntaxTree
 
       @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]
@@ -224,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
@@ -250,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

@@ -138,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
-      as4 = @global[:h_gap_between_nodes]
+      as4 = @global[:h_gap_between_nodes] * 1.2
 
       header = <<~HDR
         <?xml version="1.0" standalone="no"?>
@@ -389,7 +393,7 @@ module RSyntaxTree
         x1 = element.horizontal_indent + element.content_width / 2
         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
+        y1 = element.vertical_indent + element.content_height + @global[:height_connector_to_text]
         et = element.path
         et.each do |tr|
           if /\A-(>)?(\d+)\z/ =~ tr
@@ -459,8 +463,8 @@ module RSyntaxTree
 
         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[: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

data/lib/rsyntaxtree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RSyntaxTree
-  VERSION = "1.2.1"
+  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.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-01 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optimist
@@ -148,6 +148,8 @@ files:
 - 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
@@ -189,6 +191,8 @@ files:
 - 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
@@ -241,6 +245,8 @@ files:
 - 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
@@ -298,7 +304,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