rsyntaxtree 0.8.0 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a93fb86aba069b61d5095d8cd565153b36ea9cdc0bd9903b2ffc656bae5986cb
-  data.tar.gz: a11db6cdb80b0ccdc118761a4f2131915bffd3dc1a13343be4df662e13bb88b3
+  metadata.gz: c06870de3a591df5cdde4b1061529a81455614447d7f6279dc056b06b1631924
+  data.tar.gz: '095426d0a0b46db22be01e8b57e631eea535eec751488ede9aeaaa9bb72bc7ac'
 SHA512:
-  metadata.gz: 8ce0bbb49b1c7207aa5d65958e9185dd2e28c762bf39304077b37d03c8e7a2e32b79f2b490d110a6223d1b1ca7df591f43ec82bbc7532f5f4a6c406107e55d72
-  data.tar.gz: 66849abf7520966907cece66a1f12fc3eb29384911ddda5f518ad23ecdf7249d589edebfec98c42f35f468c1dea7204e285a38ddb37e510610bec08807d6d154
+  metadata.gz: 95ebed8e7a176851b1d7eccc0fdd4a95fd8a8e432efd696e63acc60558fa592e223b2b4e53d0a4f0d7afcd8f5dd858cf40b361eb9b3525176276098772b6d168
+  data.tar.gz: b35881b52f62faf9b6d7a34213b1547ff19f99d7338d15bfd26f81cb1576cf3d642e8c11d4fe2aa66c6d1ef1edeb42c287a5c0033af77833d7a3577e045b4162

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/bin/rsyntaxtree

@@ -27,9 +27,9 @@ EOS
   opt :font, "Path to a ttf font used to generate tree (optional)", :type => String
   opt :fontsize, "Size: 8-26",
       :default => 16
-  opt :margin, "Margin: 0-120",
-      :default => 0
-  opt :vheight, "Connector Height: 0.5-2.0",
+  opt :margin, "Margin: 1-5",
+      :default => 1
+  opt :vheight, "Connector Height: 0.5-5.0",
     :default => 1.0
   opt :color, "Color text and bars: on or off",
       :default => "on"
@@ -48,8 +48,8 @@ Optimist::die :fontsize, "must be in the range of 8-26" unless opts[:fontsize] >
 Optimist::die :color, "must be either on or off" unless /\A(on|off)\z/ =~ opts[:color]
 Optimist::die :symmetrize, "must be either on or off" unless /\A(on|off)\z/ =~ opts[:symmetrize]
 Optimist::die :autosub, "must be either on or off" unless /\A(on|off)\z/ =~ opts[:autosub]
-Optimist::die :margin, "must be in the range of 0-120" if opts[:margin] < 0 || opts[:margin] > 120
-Optimist::die :vheight, "must be in the range of 0.5-2.0" if opts[:vheight] < 0.5 || opts[:vheight] > 2.0
+Optimist::die :margin, "must be in the range of 1-5" if opts[:margin] < 1 || opts[:margin] > 5 
+Optimist::die :vheight, "must be in the range of 0.5-5.0" if opts[:vheight] < 0.5 || opts[:vheight] > 5.0
 
 string_opts = {}
 opts.each do |key, value|

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

@@ -58,7 +58,8 @@ class Graph
 
   def img_get_txt_metrics(text, font, font_size, multiline)
 
-    background = Image.new(500, 250)
+    # background = Image.new(500, 250)
+    background = Image.new(1, 1)
 
     gc = Draw.new
     gc.annotate(background, 0, 0, 0, 0, text) do |gc|
@@ -73,7 +74,6 @@ class Graph
     else
       metrics = gc.get_type_metrics(background, text)
     end
-
     return metrics
   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|
@@ -189,6 +190,7 @@ class Graph
       end
     end
     return true if !@symmetrize
+
     h.times do |i|
       curlevel = h - i - 1
       indent = 0
@@ -238,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)
@@ -272,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
@@ -286,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,18 +18,23 @@ 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
-    @fontstyle  = fontstyle
     @font       = multibyte ? font_cjk : font
     @font_size  = font_size
+    case fontstyle
+    when /(?:sans|cjk)/
+      @fontstyle  = "sans-serif"
+    when /(?:serif|math)/
+      @fontstyle  = "serif"
+    end
 
     super(e_list, metrics, symmetrize, color, leafstyle, multibyte, @font, @font_size)
 
-    @line_styles  = "<line style='stroke:black; stroke-width:1;' x1='X1' y1='Y1' x2='X2' y2='Y2' />\n"
-    @polygon_styles  = "<polygon style='fill: none; stroke: black; stroke-width:1;' points='X1 Y1 X2 Y2 X3 Y3' />\n"
-    @text_styles  = "<text style='fill: COLOR; font-size: FONT_SIZEpx; ST; WA;' x='X_VALUE' y='Y_VALUE' TD font-family='#{@font}'>CONTENT</text>\n"
+    @line_styles  = "<line style='stroke:black; stroke-width:#{FONT_SCALING};' x1='X1' y1='Y1' x2='X2' y2='Y2' />\n"
+    @polygon_styles  = "<polygon style='fill: none; stroke: black; stroke-width:#{FONT_SCALING};' points='X1 Y1 X2 Y2 X3 Y3' />\n"
+    @text_styles  = "<text style='fill: COLOR; font-size: FONT_SIZEpx; ST; WA;' x='X_VALUE' y='Y_VALUE' TD font-family='#{@fontstyle}'>CONTENT</text>\n"
     @tree_data  = String.new
   end
 
@@ -115,6 +120,10 @@ EOD
       main_weight = ""
     end
 
+    if /\A#(.+)#\z/ =~ main
+      main = $1
+    end
+
     # Calculate text size for the main and the 
     # subscript part of the element
     # symbols for underline/overline removed temporarily
@@ -153,6 +162,10 @@ EOD
       sub_width = 0
     end
 
+    if /\A#(.+)#\z/ =~ sub
+      sub = $1
+    end
+
     # Center text in the element
     txt_width = main_width + sub_width
     txt_pos   = left + (right - left) / 2 - txt_width / 2

data/lib/rsyntaxtree/tree_graph.rb

@@ -63,10 +63,6 @@ class TreeGraph < Graph
   def to_blob(fileformat='PNG')
     draw
     @im.border!(@margin, @margin, "white")
-    # return @im.to_blob do
-    #   self.format = fileformat
-    #   self.interlace = PlaneInterlace
-    # end
     @im.format = fileformat
     @im.interlace = PlaneInterlace
     return @im.to_blob
@@ -104,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
@@ -127,7 +126,7 @@ class TreeGraph < Graph
       end
     end
 
-    if /\A\~(.+)\~\z/ =~ main
+    if /\A#(.+)#\z/ =~ main
       main = $1
       main_font = @font_math
     end
@@ -142,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
@@ -166,7 +167,7 @@ class TreeGraph < Graph
       end
     end
 
-    if /\A~(.+)~\z/ =~ sub
+    if /\A#(.+)#\z/ =~ sub
       sub = $1
       sub_font = @font_math
     end
@@ -231,7 +232,7 @@ class TreeGraph < Graph
 
     @gc.fill("none")
     @gc.stroke @col_line
-    @gc.stroke_width 1
+    @gc.stroke_width 1 * FONT_SCALING
     @gc.line(fromLeft.ceil, fromTop.ceil, toLeft.ceil, toBot.ceil)
   end
 
@@ -256,7 +257,7 @@ class TreeGraph < Graph
 
     @gc.fill("none")
     @gc.stroke @col_line
-    @gc.stroke_width 1
+    @gc.stroke_width 1 * 2
     @gc.line(fromLeft1, fromTop, toLeft, toBot)
     @gc.line(fromLeft2, fromTop, toLeft, toBot)
     @gc.line(fromLeft1, fromTop, fromLeft2, fromTop)

data/lib/rsyntaxtree/version.rb

@@ -1,4 +1,4 @@
 module RSyntaxTree
-  VERSION = "0.8.0"
+  VERSION = "0.8.3"
 end
 

data/lib/rsyntaxtree.rb

@@ -8,9 +8,9 @@
 # Facade of rsyntaxtree library.  When loaded by a driver script, it does all
 # the necessary 'require' to use the library.
 #
-# This file is part of RSyntaxTree, which is a ruby port of Andre Eisenbach's
+# This file is part of RSyntaxTree, which is originally a ruby port of Andre Eisenbach's
 # excellent program phpSyntaxTree.
-# Copyright (c) 2007-2018 Yoichiro Hasebe <yohasebe@gmail.com>
+# Copyright (c) 2007-2021 Yoichiro Hasebe <yohasebe@gmail.com>
 # Copyright (c) 2003-2004 Andre Eisenbach <andre@ironcreek.net>
 
 $LOAD_PATH << File.join( File.dirname(__FILE__), 'rsyntaxtree')
@@ -31,8 +31,9 @@ ETYPE_UNDEFINED = 0
 ETYPE_NODE = 1
 ETYPE_LEAF = 2
 SUBSCRIPT_CONST = 0.7
+FONT_SCALING = 2
 
-class RSGenerator 
+class RSGenerator
   def initialize(params = {})
     new_params = {}
     params.each do |keystr, value|
@@ -51,9 +52,9 @@ class RSGenerator
       when :symmetrize, :color, :autosub
         new_params[key] = value && value != "off" ? true : false
       when :fontsize
-        new_params[key] = value.to_i
+        new_params[key] = value.to_i * FONT_SCALING
       when :margin
-        new_params[key] = value.to_i
+        new_params[key] = value.to_i * FONT_SCALING * 4
       when :vheight
         new_params[key] = value.to_f
       when :fontstyle
@@ -82,11 +83,11 @@ class RSGenerator
           new_params[:font_cjk] = FONT_DIR + "/wqy-zenhei.ttf"
           new_params[:fontstyle] = "sans"
         elsif value == "modern-math" || value == "math"
-          new_params[:font] = FONT_DIR + "/latinmodern-math.otf" 
-          new_params[:font_it] = FONT_DIR + "/lmroman10-italic.otf" 
-          new_params[:font_bd] = FONT_DIR + "/lmroman10-bold.otf" 
-          new_params[:font_bdit] = FONT_DIR + "/lmroman10-bolditalic.otf" 
-          new_params[:font_math] = FONT_DIR + "/latinmodern-math.otf" 
+          new_params[:font] = FONT_DIR + "/latinmodern-math.otf"
+          new_params[:font_it] = FONT_DIR + "/lmroman10-italic.otf"
+          new_params[:font_bd] = FONT_DIR + "/lmroman10-bold.otf"
+          new_params[:font_bdit] = FONT_DIR + "/lmroman10-bolditalic.otf"
+          new_params[:font_math] = FONT_DIR + "/latinmodern-math.otf"
           new_params[:font_cjk] = FONT_DIR + "/NotoSerifCJKjp-Regular.otf"
           new_params[:fontstyle] = "math"
         end
@@ -112,7 +113,7 @@ class RSGenerator
       :font_it    => "/NotoSans-Italic.ttf",
       :font_bd    => "/NotoSans-Bold.ttf",
       :font_bdit  => "/NotoSans-BoldItalic.ttf",
-      :font_math  => "/NotoSansMath-Regular.ttf" 
+      :font_math  => "/NotoSansMath-Regular.ttf"
     }
     @metrics = {
       :e_width  => 120,
@@ -124,8 +125,8 @@ class RSGenerator
     }
 
     @params.merge! new_params
-    @params[:fontsize]  = @params[:fontsize] * 2
-    @params[:margin]    = @params[:margin] * 2
+    @params[:fontsize]  = @params[:fontsize] * FONT_SCALING
+    @params[:margin]    = @params[:margin] * FONT_SCALING
     @metrics[:v_space] = @metrics[:v_space] * @params[:vheight]
    end
 
@@ -161,8 +162,8 @@ class RSGenerator
     sp.auto_subscript if @params[:autosub]
     elist = sp.get_elementlist
     graph = SVGGraph.new(elist, @metrics,
-      @params[:symmetrize], @params[:color], @params[:leafstyle], @params[:multibyte], 
-      @params[:fontstyle], @params[:font], @params[:fontsize],
+      @params[:symmetrize], @params[:color], @params[:leafstyle], @params[:multibyte],
+      @params[:fontstyle], @params[:font], @params[:font_cjk], @params[:fontsize],
     )
     graph.svg_data
   end
@@ -175,7 +176,7 @@ class RSGenerator
     graph = TreeGraph.new(elist, @metrics,
       @params[:symmetrize], @params[:color], @params[:leafstyle], @params[:multibyte],
       @params[:fontstyle], @params[:font], @params[:font_it], @params[:font_bd], @params[:font_bdit], @params[:font_math],
-      @params[:font_cjk], @params[:fontsize], @params[:margin], 
+      @params[:font_cjk], @params[:fontsize], @params[:margin],
     )
     graph.to_blob(@params[:format])
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.3
 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
@@ -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