rsyntaxtree 0.8.2 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4606912993b73a0aafb6b6be73cbad23109df14ee1509c6c686c61990acff33c
-  data.tar.gz: 073a6ecee37e7ce9aa67c329aee75da916dcac4a2cce101f4389cad85e82ed65
+  metadata.gz: b25b4f9bf189bb33a19980c2cd6247a93ae2dd14df820eaa9e991425fa56b0dd
+  data.tar.gz: '0646683a124670135b38f5d93667cac8140a96d74c352d6bb28483cec93e3ee8'
 SHA512:
-  metadata.gz: 569d8c208901a62379792019b9cd528e0a4ffff5c237c30c40244b70502a1852f3921d78f69e6b868ac2fa5096cf6ef1d550795dc74bce160951b3d610d30cc9
-  data.tar.gz: d15c6e7481e277621b32003a93356f146e3e22bda6c23730889aac5f08d1192b28e5d0dd92681326aff3249f6470fe3c17a91507a17c01c40e7960554a2b72af
+  metadata.gz: 0dc8fdc7c0b9c4181ed50372eeebc41d75bccaf4c81db63a79da218918c0c71d70fd0fa9e6df9e8f6e46d52c4153b0934577a76fbdc03d90e23d28bda6a37811
+  data.tar.gz: c65b56bef0deb983be7cd81e914834de1536c07633c3709a642eedf2d3b461344d4a2ddfc0beae0f85ac0a954cf895472459919b2cf317ea2f26b633309a1f1a

data/lib/rsyntaxtree/element.rb

@@ -25,10 +25,10 @@ class Element
       @indent = 0              # Drawing offset
       # content = content.strip
       if /\A.+\^\z/ =~ content.strip
-        @content = content.gsub("^"){""} # The actual element content
+        @content = content.gsub("^"){""}.strip # The actual element content
         @triangle = true # draw triangle instead of stright bar when in auto mode
       else
-        @content = content.gsub("^"){""} # The actual element content
+        @content = content.gsub("^"){""}.strip # The actual element content
         @triangle = false # draw triangle instead of stright bar when in auto mode
       end
       # workaround to save "[A [B [C] [D] ] [E [F] [G [H] [J] ] ] ]"

data/lib/rsyntaxtree/graph.rb

@@ -32,8 +32,8 @@ class Graph
     # Calculate image dimensions
     @e_height = font_size + @m[:e_padd] * 2
     h         = @e_list.get_level_height
-    w         = calc_level_width(0)
-    @width    = w + @m[:b_side] * 2
+    w      = calc_level_width(0)
+    @width = w
     @height   = h * @e_height + (h-1) * (@m[:v_space] + font_size) + @m[:b_topbot] * 2
 
     # Initialize the image and colors
@@ -50,7 +50,7 @@ class Graph
       @col_leaf  = "black"
       @col_trace = "black"
     end
-    
+
     @main_height = img_get_txt_height("l", font, font_size)
     @sub_size = (font_size * SUBSCRIPT_CONST)
     @sub_space_width = img_get_txt_width("l", font, @sub_size)
@@ -58,12 +58,11 @@ class Graph
 
   def img_get_txt_metrics(text, font, font_size, multiline)
 
-    # background = Image.new(500, 250)
     background = Image.new(1, 1)
 
     gc = Draw.new
     gc.annotate(background, 0, 0, 0, 0, text) do |gc|
-      gc.font = font 
+      gc.font = font
       gc.pointsize = font_size
       gc.gravity = CenterGravity
       gc.stroke = 'none'
@@ -110,9 +109,10 @@ class Graph
     e = @e_list.get_first
     while e
       if(e.level == level)
-        w += calc_element_width(e)
+        x = calc_element_width(e)
+        w += x
       end
-        e = @e_list.get_next
+      e = @e_list.get_next
     end
     return w
   end
@@ -150,6 +150,7 @@ class Graph
     e_arr = @e_list.get_elements
 
     h = @e_list.get_level_height
+
     h.times do |i|
       x = 0
       e_arr.each do |j|
@@ -167,126 +168,116 @@ class Graph
             if(j.parent != 0 )
               words = j.content.split(" ")
               unless @leafstyle == "nothing" && ETYPE_LEAF == j.type
-                if (@leafstyle == "triangle" && ETYPE_LEAF == j.type && x == parent_indent && words.length > 0)
-                  txt_width = img_get_txt_width(j.content, @font, @font_size)
-                  triangle_to_parent(x, i, cw, txt_width, @symmetrize)
-                elsif (@leafstyle == "auto" && ETYPE_LEAF == j.type && x == parent_indent)
-                   if words.length > 1 || j.triangle
-                     txt_width = img_get_txt_width(j.content, @font, @font_size)
-                     triangle_to_parent(x, i, cw, txt_width, @symmetrize)
-                   else
-                     line_to_parent(x, i, cw, @e_list.get_indent(j.parent), @e_list.get_element_width(j.parent))
-                   end
+                if (@leafstyle == "auto" && ETYPE_LEAF == j.type && x == parent_indent)
+                  if words.length > 1 || j.triangle
+                    txt_width = img_get_txt_width(j.content, @font, @font_size)
+                    triangle_to_parent(x, i, cw, txt_width, @symmetrize)
+                  else
+                    line_to_parent(x, i, cw, @e_list.get_indent(j.parent), @e_list.get_element_width(j.parent))
+                  end
                 else
                   line_to_parent(x, i, cw, @e_list.get_indent(j.parent), @e_list.get_element_width(j.parent))
                 end
               end
             end
           end
-
           x += cw
         end
       end
     end
     return true if !@symmetrize
+    
+    elements_to_draw = {}
+    triangles_to_draw = []
+    lines_to_draw = []
+
+    lmost = {:level => nil, :value => nil, :type => nil}
+    rmost = nil 
     h.times do |i|
       curlevel = h - i - 1
-      indent = 0
       e_arr.each_with_index do |j, idx|
         if (j.level == curlevel)
           # Draw a line to the parent element
           children = @e_list.get_children(j.id)
 
           tw = img_get_txt_width(j.content, @font, @font_size)
-          if children.length > 1
+          if children.length > 0
             left, right = -1, -1
-            children.each do |child|          
+            children.each do |child|
               k = @e_list.get_id(child)
-              kw = img_get_txt_width(k.content, @font, @font_size)              
+              kw = img_get_txt_width(k.content, @font, @font_size)
               left = k.indent + kw / 2 if k.indent + kw / 2 < left or left == -1
               right = k.indent + kw / 2 if k.indent + kw / 2 > right
             end
-            draw_element(left, curlevel, right - left, j.content, j.type)
+
+            elements_to_draw[j.id] = {:left => left, :curlevel => curlevel, :width => right - left, :content => j.content, :type => j.type}
             @e_list.set_indent(j.id, left + (right - left) / 2 -  tw / 2)
 
             children.each do |child|
               k = @e_list.get_id(child)
               words = k.content.split(" ")
               dw = img_get_txt_width(k.content, @font, @font_size)
-              unless @leafstyle == "nothing" && ETYPE_LEAF == k.type
-                if (@leafstyle == "triangle" && ETYPE_LEAF == k.type && k.indent == j.indent && words.length > 0)
-                  txt_width = img_get_txt_width(k.content, @font, @font_size)
-                  triangle_to_parent(k.indent, curlevel + 1, dw, txt_width)
-                elsif (@leafstyle == "auto" && ETYPE_LEAF == k.type && k.indent == j.indent)
-                  if words.length > 1 || k.triangle
-                    txt_width = img_get_txt_width(k.content, @font, @font_size)
-                    triangle_to_parent(k.indent, curlevel + 1, dw, txt_width)
-                  else
-                    line_to_parent(k.indent, curlevel + 1, dw, j.indent, tw)
-                  end
-                else
-                  line_to_parent(k.indent, curlevel + 1, dw, j.indent, tw)
-                end
-              end
-            end
 
-          else
-            unless children.empty?
-              k = @e_list.get_id(children[0])
-              kw = img_get_txt_width(k.content, @font, @font_size)              
-              left = k.indent
-              right = k.indent + kw
-              draw_element(left, curlevel, right - left, j.content, j.type)
-              @e_list.set_indent(j.id, left + (right - left) / 2 -  tw / 2)
+              children2 = @e_list.get_children(k.id)
 
-              k = @e_list.get_id(children[0])
-              words = k.content.split(" ")
-              dw = img_get_txt_width(k.content, @font, @font_size)
               unless @leafstyle == "nothing" && ETYPE_LEAF == k.type
-                if (@leafstyle == "triangle" && ETYPE_LEAF == k.type && words.length > 0)
-                  txt_width = img_get_txt_width(k.content, @font, @font_size)
-                  triangle_to_parent(k.indent, curlevel + 1, dw, txt_width)
-                elsif (@leafstyle == "auto" && ETYPE_LEAF == k.type)
+                if (@leafstyle == "auto" && ETYPE_LEAF == k.type)
                   if words.length > 1 || k.triangle
                     txt_width = img_get_txt_width(k.content, @font, @font_size)
-                    triangle_to_parent(k.indent, curlevel + 1, dw, txt_width)
+                    triangles_to_draw << {:indent => k.indent, :curlevel => curlevel + 1, :width1 => dw, :width2 => txt_width}
                   else
-                    line_to_parent(k.indent, curlevel + 1, dw, j.indent, tw)
+                    lines_to_draw << {:indent1 => k.indent, :curlevel => curlevel + 1, :width1 => dw, :indent2 => j.indent, :width2 => tw}
                   end
                 else
-                  line_to_parent(k.indent, curlevel + 1, dw, j.indent, tw)
-                end
-              end
-
-            else
-              parent = @e_list.get_id(j.parent)
-              pw = img_get_txt_width(parent.content, @font, @font_size)
-              pleft = parent.indent
-              pright = pleft + pw
-              if curlevel == (h - 1)
-                e_arr.select{|l|l.level == curlevel}.each do |l|
-                  lw = img_get_txt_width(l.content, @font, @font_size)
-                  left = l.indent
-                  right = left + lw
-                  draw_element(left, curlevel, right - left, l.content, l.type) 
-                  @e_list.set_indent(l.id, left + (right - left) / 2 -  tw / 2)             
+                  lines_to_draw << {:indent1 => k.indent, :curlevel => curlevel + 1, :width1 => dw, :indent2 => j.indent, :width2 => tw}
                 end
-                break
-              else
-                left = j.indent
-                right = left + tw
-                if pw > tw
-                  left = pleft
-                  right = pright
-                end
-                draw_element(left, curlevel, right - left, j.content, j.type) 
-                @e_list.set_indent(j.id, left + (right - left) / 2 -  tw / 2)             
               end
             end
 
           end
+          elements = e_arr.select do |l|
+            l.level == curlevel && @e_list.get_children(l.id).empty?
+          end
+
+          elements.each.with_index do |l, idx|
+            lw = img_get_txt_width(l.content, @font, @font_size)
+            left = l.indent
+            right = left + lw
+            unless elements_to_draw.include? l.id
+              elements_to_draw[l.id] = {:left => left, :curlevel => curlevel, :width => right - left, :content => l.content, :type => l.type}
+            end
+          end
         end
       end
+
+      e_arr.each do |e|
+        lpos = e.indent - img_get_txt_width(e.content, @font, @font_size) / 2
+        next if lpos > 0
+        if !lmost[:value] || lmost[:value] > lpos
+          lmost[:level] = e.level
+          lmost[:value] = lpos
+          lmost[:type] = e
+        end
+        rpos = e.indent + e.width
+        rmost =  rpos if !rmost || rmost < rpos
+      end
+    end
+
+    offset = 0
+    if lmost[:level] != h - 1
+      offset = lmost[:value] / -2
+      new_width = rmost
+      @width = new_width + offset
+    end
+
+    elements_to_draw.each do |k, v|
+      draw_element(v[:left] + offset, v[:curlevel], v[:width], v[:content], v[:type])
+    end
+    triangles_to_draw.each do |v|
+      triangle_to_parent(v[:indent] + offset, v[:curlevel], v[:width1], v[:width2])
+    end
+    lines_to_draw.each do |v|
+      line_to_parent(v[:indent1] + offset, v[:curlevel], v[:width1], v[:indent2] + offset, v[:width2])
     end
   end
 

data/lib/rsyntaxtree/svg_graph.rb

@@ -99,6 +99,9 @@ EOD
     elsif /\A\-(.+)\-\z/ =~ main
       main = $1
       main_decoration= "underline"
+    elsif /\A\~(.+)\~\z/ =~ main
+      main = $1
+      main_decoration= "line-through"
     else
       main_decoration= ""
     end
@@ -137,6 +140,9 @@ EOD
       elsif /\A\-(.+)\-\z/ =~ sub
         sub = $1
         sub_decoration= "underline"
+      elsif /\A\~(.+)\~\z/ =~ sub
+        sub = $1
+        sub_decoration= "line-through"
       else
         sub_decoration= ""
       end
@@ -281,19 +287,19 @@ EOD
     main_before = parts[0].strip
     sub = parts[1]
     main = get_txt_only(main_before)
-    if(main.contains_cjk?)
-      main = 'n' * main.strip.size * 2
-    else
-      main
-    end
+    # if(main.contains_cjk?)
+    #   main = 'n' * main.strip.size * 2
+    # else
+      # main
+    # end
     main_metrics = img_get_txt_metrics(main, font, font_size, multiline)
     width = main_metrics.width
     if sub
-      if(sub.contains_cjk?)
-        sub = 'n' * sub.strip.size * 2
-      else
-        sub
-      end
+      # if(sub.contains_cjk?)
+      #   sub = 'n' * sub.strip.size * 2
+      # else
+      #   sub
+      # end
       sub_metrics = img_get_txt_metrics(sub, font, font_size * SUBSCRIPT_CONST, multiline)
       width += sub_metrics.width
     end

data/lib/rsyntaxtree/tree_graph.rb

@@ -37,8 +37,6 @@ class TreeGraph < Graph
     super(e_list, metrics, symmetrize, color, leafstyle, multibyte, @font, @font_size)
 
     # Initialize the image and colors
-    @im           = Image.new(@width, @height)
-    @im.interlace = PlaneInterlace
     @gc           = Draw.new
     @gc.font      = @font
     @gc.pointsize(@font_size)
@@ -50,6 +48,8 @@ class TreeGraph < Graph
 
   def draw
     parse_list
+    @im = Image.new(@width, @height)
+    @im.interlace = PlaneInterlace
     @gc.draw(@im)
   end
 
@@ -62,6 +62,7 @@ class TreeGraph < Graph
   # by Geoffrey Grosenbach
   def to_blob(fileformat='PNG')
     draw
+    @im.trim!
     @im.border!(@margin, @margin, "white")
     @im.format = fileformat
     @im.interlace = PlaneInterlace

data/lib/rsyntaxtree/version.rb

@@ -1,4 +1,4 @@
 module RSyntaxTree
-  VERSION = "0.8.2"
+  VERSION = "0.8.6"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.6
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2021-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: RSyntaxTree is a graphical syntax tree generator written in Ruby