rsyntaxtree 0.8.2a → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8467331de91fe3c6cbd77462780d08fe23d540bc0cc25e9d65f3583ac523f882
-  data.tar.gz: 8021b25938b4a1b5a014fc89a4ae2a7f6b8da379e5d1432fb84771c29808a888
+  metadata.gz: 9fb3b6ae45edfeea2b1b280bfc432d7f3c669b235139638fba59c633b8326e70
+  data.tar.gz: 7c7d7e76f03a70eea5514c6d8d9bae87a4d05f78ee4ff9c63785da0058a38b9f
 SHA512:
-  metadata.gz: e4586e403663e95ad871b22b45833a6b956068f8e8f300324b8b67cb96a30b83ac83b47f7a3de76823c1b230a3ceb99f36b3d1a7a38928228d4f8d824eafb172
-  data.tar.gz: 745ea742aa872d4def42bd6ee9bff0b1d7813db20006f6a2c0ac7cbd4fbb657fa91e3bfb85b0dad6eddd452d839feda85623367e9cdfd971b78f48783610d3f5
+  metadata.gz: 8f4754c519c2687b25df411c9a5025cd93363dc9bcb20cf3c7ef3281ac01fe05cf7414d35b0eb565ea00c7b3aac8d83fb4a1bb016428f1ddcb13cde08e197de3
+  data.tar.gz: 9d3c8fa5126ca404f4d32ebc6b8af4d3feac4252d729acca6048501dea39e377ea597c8a7d406f98e46d8bb3fa22b43d3b5243678c8ae70e9fc437bf61cf2601

data/lib/rsyntaxtree/graph.rb

@@ -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)
@@ -63,7 +63,7 @@ class Graph
 
     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'
@@ -191,23 +191,24 @@ class Graph
     end
     return true if !@symmetrize
 
+    @check = []
     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)
             @e_list.set_indent(j.id, left + (right - left) / 2 -  tw / 2)
 
@@ -215,40 +216,11 @@ class Graph
               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)
+              unless @leafstyle == "nothing" && 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)
@@ -259,39 +231,41 @@ class Graph
                   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.size == idx + 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
-                  @e_list.set_indent(l.id, left + (right - left) / 2 -  tw / 2)             
-                  draw_element(left, curlevel, right - left, l.content, l.type) 
-                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
+          process_terminal(elements, j, curlevel, tw)
         end
       end
     end
   end
 
+
+  def process_terminal(elements, j, curlevel, tw)
+    # parent = @e_list.get_id(j.parent)
+    # return unless parent
+    # pw = img_get_txt_width(parent.content, @font, @font_size)
+    # pleft = parent.indent
+    # pright = pleft + pw
+
+    elements.each.with_index do |l, idx|
+      lw = img_get_txt_width(l.content, @font, @font_size)
+      left = l.indent
+      right = left + lw
+      # if pw > tw
+      #   left = pleft
+      #   right = pright
+      # end
+      unless @check.include? l.id
+        draw_element(left, curlevel, right - left, l.content, l.type)
+        @check << l.id
+      end
+    end
+  end
+
   # Calculate top position from row (level)
   def row2px(row)
    @m[:b_topbot] + @e_height * row + (@m[:v_space] + @font_size) * row

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

data/lib/rsyntaxtree/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 0.8.2a
+  version: 0.8.5
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2021-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -106,9 +106,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.32
 signing_key: