rsyntaxtree 0.8.1 → 0.8.2a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dbad02f72d4b84bdaaf1db6ed5506ed4bb3c447b9b15651dc4878a8e276f3e5
-  data.tar.gz: 3b3c54cc2f174a4be46b827cb42f7f871e6334a28cb2df6099bf4d9521a4fbf6
+  metadata.gz: 8467331de91fe3c6cbd77462780d08fe23d540bc0cc25e9d65f3583ac523f882
+  data.tar.gz: 8021b25938b4a1b5a014fc89a4ae2a7f6b8da379e5d1432fb84771c29808a888
 SHA512:
-  metadata.gz: 8b36dab4e18a88cf7db1874512236e8d049ddec1f06157b92215e329f323587d6055daf7e8011ada31c5533f0e71a901359db872cd367bf86a1d1065c4ab878c
-  data.tar.gz: e68eb7afa8b4714ab1e48861fdf5ce2237669afc0350f28f642626f9f40274fd15d4169a9cf44f418afdcbe42abaea121329503b714625a38d436a375f801f60
+  metadata.gz: e4586e403663e95ad871b22b45833a6b956068f8e8f300324b8b67cb96a30b83ac83b47f7a3de76823c1b230a3ceb99f36b3d1a7a38928228d4f8d824eafb172
+  data.tar.gz: 745ea742aa872d4def42bd6ee9bff0b1d7813db20006f6a2c0ac7cbd4fbb657fa91e3bfb85b0dad6eddd452d839feda85623367e9cdfd971b78f48783610d3f5

data/README.md

@@ -1,4 +1,4 @@
-# RSyntaxTree: yet another syntax tree generator in Ruby
+# 🌲 RSyntaxTree: yet another syntax tree generator in Ruby
 
 **RSyntaxTree** is a graphical syntax tree generator written in the Ruby programming language inspired by [phpSyntaxTree](http://ironcreek.net/phpsyntaxtree/). 
 

data/lib/rsyntaxtree/element.rb

@@ -31,6 +31,7 @@ class Element
         @content = content.gsub("^"){""} # 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] ] ] ]"
     end
 
     # Debug helper function

data/lib/rsyntaxtree/graph.rb

@@ -74,7 +74,6 @@ class Graph
     else
       metrics = gc.get_type_metrics(background, text)
     end
-
     return metrics
   end
 
@@ -151,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|
@@ -190,6 +190,7 @@ class Graph
       end
     end
     return true if !@symmetrize
+
     h.times do |i|
       curlevel = h - i - 1
       indent = 0
@@ -239,26 +240,11 @@ class Graph
               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)
-            else
-             parent = @e_list.get_id(j.parent)
-             pw = img_get_txt_width(parent.content, @font, @font_size)
-             pleft = parent.indent
-             pright = pleft + pw
-             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
 
-            unless children.empty?
               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
+              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)
@@ -273,7 +259,33 @@ 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
         end
       end
@@ -287,7 +299,7 @@ class Graph
 
   def get_txt_only(text)
     text = text.strip
-    if /\A([\+\-\=\*\#]+).+/ =~ text
+    if /\A([\+\-\=\*\#\~]+).+/ =~ text
       prefix = $1
       prefix_l = Regexp.escape(prefix)
       prefix_r = Regexp.escape(prefix.reverse)

data/lib/rsyntaxtree/svg_graph.rb

@@ -18,7 +18,7 @@ require 'graph'
 
 class SVGGraph < Graph
 
-  def initialize(e_list, metrics, symmetrize, color, leafstyle, multibyte, fontstyle, font, font_size)
+  def initialize(e_list, metrics, symmetrize, color, leafstyle, multibyte, fontstyle, font, font_cjk, font_size)
 
     # Store class-specific parameters
     @font       = multibyte ? font_cjk : font

data/lib/rsyntaxtree/tree_graph.rb

@@ -100,6 +100,9 @@ class TreeGraph < Graph
     elsif /\A\-(.+)\-\z/ =~ main
       main = $1
       main_decoration = UnderlineDecoration
+    elsif /\A\~(.+)\~\z/ =~ main
+      main = $1
+      main_decoration = LineThroughDecoration
     else
       main_decoration = NoDecoration
     end
@@ -138,8 +141,10 @@ class TreeGraph < Graph
       sub_decoration = OverlineDecoration
     elsif /\A\-(.+)\-\z/ =~ sub
       sub = $1
-      @gc.decorate(UnderlineDecoration)
       sub_decoration = UnderlineDecoration
+    elsif /\A\~(.+)\~z/ =~ sub
+      sub = $1
+      sub_decoration = LineThroughDecoration
     else
       sub_decoration = NoDecoration
     end

data/lib/rsyntaxtree/version.rb

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

data/lib/rsyntaxtree.rb

@@ -163,7 +163,7 @@ class RSGenerator
     elist = sp.get_elementlist
     graph = SVGGraph.new(elist, @metrics,
       @params[:symmetrize], @params[:color], @params[:leafstyle], @params[:multibyte],
-      @params[:fontstyle], @params[:font], @params[:fontsize],
+      @params[:fontstyle], @params[:font], @params[:font_cjk], @params[:fontsize],
     )
     graph.svg_data
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2a
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -106,11 +106,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 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