rsyntaxtree 0.7.6 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e462e9c9f54ec8ff3c9b909e3c8178f631b49cb6fc9c28634a3ebf9e988d7e82
-  data.tar.gz: 8c5058606220ed95d08c6307f32fe5caf5f00390ac195e150c13358527636aad
+  metadata.gz: 4606912993b73a0aafb6b6be73cbad23109df14ee1509c6c686c61990acff33c
+  data.tar.gz: 073a6ecee37e7ce9aa67c329aee75da916dcac4a2cce101f4389cad85e82ed65
 SHA512:
-  metadata.gz: da9005c4b25d98de2690cb8db7d72d69dff7fbf858ae1fc4410419cf2518d4a75f80a8ad1ce0c216fce8c62c652197b477fb3da32962a0bc7e878a12f927759d
-  data.tar.gz: 2b17215556abcbfef3f270d6f07fdfb10ba7ec8b4b6959c6252ba083f56690b69f1c8612cc9a9fc5c7a5db7d5dfd5e03e592f20e7688fa8bbaa0c1795b99d803
+  metadata.gz: 569d8c208901a62379792019b9cd528e0a4ffff5c237c30c40244b70502a1852f3921d78f69e6b868ac2fa5096cf6ef1d550795dc74bce160951b3d610d30cc9
+  data.tar.gz: d15c6e7481e277621b32003a93356f146e3e22bda6c23730889aac5f08d1192b28e5d0dd92681326aff3249f6470fe3c17a91507a17c01c40e7960554a2b72af

data/README.md

@@ -1,10 +1,10 @@
-# 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/). 
 
 ### Web Interface
 
-Working web interface of is available at <https://yohasebe.com/rsyntaxtree>.
+See updates and a working web interface available at <https://yohasebe.com/rsyntaxtree>.
 
 ### Installation
 
@@ -25,7 +25,7 @@ where [options] are:
       -o, --outdir=<s>        Output directory (default: ./)
       -f, --format=<s>        Output format: png, pdf, or svg (default: png)
       -l, --leafstyle=<s>     visual style of tree leaves: auto, triangle, bar, or nothing (default: auto)
-      -n, --fontstyle=<s>     Font style: sans, serif, cjk (default: sans)
+      -n, --fontstyle=<s>     Font style: sans, serif, cjk, math (default: sans)
       -t, --font=<s>          Path to a ttf font used to generate tree (optional)
       -s, --fontsize=<i>      Size: 8-26 (default: 16)
       -c, --color=<s>         Color text and bars: on or off (default: on)

data/bin/rsyntaxtree

@@ -7,7 +7,7 @@ require 'rsyntaxtree'
 require 'optimist'
 
 opts = Optimist::options do
-  version "RSyntaxTree #{RSyntaxTree::VERSION} (c) 2018 Yoichiro Hasebe"
+  version "RSyntaxTree #{RSyntaxTree::VERSION} (c) 2021 Yoichiro Hasebe"
   banner <<-EOS
 RSyntaxTree, (linguistic) syntax tree generator written in Ruby.
 
@@ -20,36 +20,36 @@ EOS
       :default => "./"
   opt :format, "Output format: png, gif, jpg, pdf, or svg",
       :default => "png"
-  opt :leafstyle, "visual style of tree leaves: auto, triangle, bar, or nothing", 
+  opt :leafstyle, "visual style of tree leaves: auto, triangle, bar, or nothing",
       :default => "auto"
-  opt :fontstyle, "Font style (available when ttf font is specified): sans, serif, cjk",
+  opt :fontstyle, "Font style (available when ttf font is specified): sans, serif, cjk, math",
       :default => "sans"
   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" 
+      :default => "on"
   opt :symmetrize, "Generate symmetrical, balanced tree: on or off",
-      :default => "on" 
+      :default => "on"
   opt :autosub, "Put subscript numbers to nodes: on or off",
-      :default => "off"       
+      :default => "off"
 end
 
 Optimist::die :outdir, "must be an exsting directory path" unless FileTest::directory?(opts[:outdir])
 Optimist::die :format, "must be png, jpg, gif, or svg" unless /\A(png|jpg|gif|pdf|svg)\z/ =~ opts[:format]
 Optimist::die :leafstyle, "must be auto, triangle, bar, or nothing" unless /\A(auto|triangle|bar|nothing)\z/ =~ opts[:leafstyle]
-Optimist::die :fontstyle, "must be sans, serif, cjk" unless /\A(sans|serif|cjk)\z/ =~ opts[:fontstyle]
+Optimist::die :fontstyle, "must be sans, serif, cjk, math" unless /\A(sans|serif|cjk|math)\z/ =~ opts[:fontstyle]
 Optimist::die :font, "must be path to an existing ttf font" if opts[:font] && !File::exists?(opts[:font])
 Optimist::die :fontsize, "must be in the range of 8-26" unless opts[:fontsize] >= 8 && opts[:fontsize] <= 26
 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

@@ -10,7 +10,7 @@
 # This file is part of RSyntaxTree, which is 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>
 
 class Element
@@ -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/elementlist.rb

@@ -10,7 +10,7 @@
 # This file is part of RSyntaxTree, which is 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>
 
 require 'element'

data/lib/rsyntaxtree/error_message.rb

@@ -10,7 +10,7 @@
 # This file is part of RSyntaxTree, which is 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>
 
 class ErrorMessage

data/lib/rsyntaxtree/graph.rb

@@ -10,7 +10,7 @@
 # This file is part of RSyntaxTree, which is 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>
 
 require 'rmagick'
@@ -58,11 +58,12 @@ 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|
-      gc.font = font
+      gc.font = font 
       gc.pointsize = font_size
       gc.gravity = CenterGravity
       gc.stroke = 'none'
@@ -73,7 +74,6 @@ class Graph
     else
       metrics = gc.get_type_metrics(background, text)
     end
-
     return metrics
   end
 
@@ -238,22 +238,7 @@ 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)
@@ -272,7 +257,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.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)             
+                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 +297,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/string_parser.rb

@@ -11,24 +11,24 @@
 # This file is part of RSyntaxTree, which is 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>
 
 require 'elementlist'
 require 'element'
 
-def escape_high_ascii(string)
-  html = ""
-  string.length.times do |i|
-    ch = string[i]
-    if(ch < 127)
-      html += ch.chr
-    else
-      html += sprintf("&#%d;", ch)
-    end
-  end  
-  html
-end
+# def escape_high_ascii(string)
+#   html = ""
+#   string.length.times do |i|
+#     ch = string[i]
+#     if(ch < 127)
+#       html += ch.chr
+#     else
+#       html += sprintf("&#%d;", ch)
+#     end
+#   end  
+#   html
+# end
 
 class StringParser
 

data/lib/rsyntaxtree/svg_graph.rb

@@ -10,7 +10,7 @@
 # This file is part of RSyntaxTree, which is 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>
 
 require "tempfile"
@@ -18,17 +18,23 @@ require 'graph'
 
 class SVGGraph < Graph
 
-  def initialize(e_list, metrics, symmetrize, color, leafstyle, multibyte, fontstyle, font_size)
+  def initialize(e_list, metrics, symmetrize, color, leafstyle, multibyte, fontstyle, font, font_cjk, font_size)
 
     # Store class-specific parameters
-    @font  = fontstyle == "sans" ? "sans-serif" : 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
 
@@ -87,15 +93,12 @@ EOD
       sub  = ""
     end
 
-    if /\A\+(.+)\+\z/ =~ main
+    if /\A\=(.+)\=\z/ =~ main
       main = $1
       main_decoration= "overline"
     elsif /\A\-(.+)\-\z/ =~ main
       main = $1
       main_decoration= "underline"
-    elsif /\A\=(.+)\=\z/ =~ main
-      main = $1
-      main_decoration= "line-through"
     else
       main_decoration= ""
     end
@@ -117,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
@@ -124,15 +131,12 @@ EOD
     main_width = img_get_txt_width(main, @font, @font_size)
 
     if sub != ""
-      if /\A\+(.+)\+\z/ =~ sub
+      if /\A\=(.+)\=\z/ =~ sub
         sub = $1
         sub_decoration= "overline"
       elsif /\A\-(.+)\-\z/ =~ sub
         sub = $1
         sub_decoration= "underline"
-      elsif /\A\=(.+)\=\z/ =~ sub
-        sub = $1
-        sub_decoration= "line-through"
       else
         sub_decoration= ""
       end
@@ -158,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

@@ -10,7 +10,7 @@
 # This file is part of RSyntaxTree, which is 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>
 
 require 'graph'
@@ -20,7 +20,7 @@ include Magick
 class TreeGraph < Graph
 
   def initialize(e_list, metrics, symmetrize, color, leafstyle, multibyte,
-                 fontstyle, font, font_it, font_bd, font_itbd, font_cjk, font_size,
+                 fontstyle, font, font_it, font_bd, font_itbd, font_math, font_cjk, font_size,
                  margin)
 
     # Store class-specific parameters
@@ -30,6 +30,7 @@ class TreeGraph < Graph
     @font_it    = font_it
     @font_bd    = font_bd
     @font_itbd  = font_itbd
+    @font_math  = font_math
     @font_cjk   = font_cjk
     @margin     = margin
 
@@ -62,28 +63,27 @@ 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
-  end  
+    @im.format = fileformat
+    @im.interlace = PlaneInterlace
+    return @im.to_blob
+  end
 
   :private
 
   # Add the element into the tree (draw it)
   def draw_element(x, y, w, string, type)
-    string = string.sub(/\^\z/){""} 
+    string = string.sub(/\^\z/){""}
     # Calculate element dimensions and position
     if (type == ETYPE_LEAF) and @leafstyle == "nothing"
       top = row2px(y - 1) + (@font_size * 1.5)
-    else 
+    else
       top   = row2px(y)
     end
     left   = x + @m[:b_side]
     bottom = top  + @e_height
     right  = left + w
 
-    # Split the string into the main part and the 
+    # Split the string into the main part and the
     # subscript part of the element (if any)
     parts = string.split("_", 2)
     if(parts.length > 1 )
@@ -94,19 +94,21 @@ class TreeGraph < Graph
       sub  = ""
     end
 
-    if /\A\+(.+)\+\z/ =~ main
+    if /\A\=(.+)\=\z/ =~ main
       main = $1
       main_decoration = OverlineDecoration
     elsif /\A\-(.+)\-\z/ =~ main
       main = $1
       main_decoration = UnderlineDecoration
-    elsif /\A\=(.+)\=\z/ =~ main
+    elsif /\A\~(.+)\~\z/ =~ main
       main = $1
       main_decoration = LineThroughDecoration
     else
       main_decoration = NoDecoration
     end
 
+    main_font = @font
+
     if /\A\*\*\*(.+)\*\*\*\z/ =~ main
       main = $1
       if !@multibyte
@@ -122,24 +124,25 @@ class TreeGraph < Graph
       if !@multibyte
         main_font = @font_it
       end
-    else
-      main_font = @font
     end
 
-    # Calculate text size for the main and the 
+    if /\A#(.+)#\z/ =~ main
+      main = $1
+      main_font = @font_math
+    end
+
+    # Calculate text size for the main and the
     # subscript part of the element
-    # symbols for underline/overline removed temporarily
 
     main_width = img_get_txt_width(main, main_font, @font_size)
 
-    if /\A\+(.+)\+\z/ =~ sub
+    if /\A\=(.+)\=\z/ =~ sub
       sub = $1
       sub_decoration = OverlineDecoration
     elsif /\A\-(.+)\-\z/ =~ sub
       sub = $1
-      @gc.decorate(UnderlineDecoration)
       sub_decoration = UnderlineDecoration
-    elsif /\A\=(.+)\=\z/ =~ sub
+    elsif /\A\~(.+)\~z/ =~ sub
       sub = $1
       sub_decoration = LineThroughDecoration
     else
@@ -147,7 +150,6 @@ class TreeGraph < Graph
     end
 
     sub_font = @font
-
     if /\A\*\*\*(.+)\*\*\*\z/ =~ sub
       sub = $1
       if !@multibyte
@@ -163,8 +165,11 @@ class TreeGraph < Graph
       if !@multibyte
         sub_font = @font_it
       end
-    else
-      sub_font = @font
+    end
+
+    if /\A#(.+)#\z/ =~ sub
+      sub = $1
+      sub_font = @font_math
     end
 
     if sub != ""
@@ -182,7 +187,7 @@ class TreeGraph < Graph
     if(type == ETYPE_LEAF)
       col = @col_leaf
     else
-      col = @col_node      
+      col = @col_node
     end
 
     if(main[0].chr == "<" && main[-1].chr == ">")
@@ -227,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
 
@@ -252,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)
@@ -267,9 +272,9 @@ class TreeGraph < Graph
     children = @e_list.get_children(id)
     @e_list.set_element_width(id, target)
 
-    if(children.length > 0 ) 
+    if(children.length > 0 )
       delta = target - current
-      target_delta = delta / children.length 
+      target_delta = delta / children.length
 
       children.each do |child|
         child_width = @e_list.get_element_width(child)

data/lib/rsyntaxtree/utils.rb

@@ -10,7 +10,7 @@
 # This file is part of RSyntaxTree, which is 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>
 
 class String

data/lib/rsyntaxtree/version.rb

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

data/lib/rsyntaxtree.rb

@@ -8,14 +8,14 @@
 # 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')
 
-require 'uri'
+require 'cgi'
 require 'utils'
 require 'element'
 require 'elementlist'
@@ -31,15 +31,16 @@ 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|
       key = keystr.to_sym
       case key
       when :data
-        data = URI.unescape(value)
+        data = CGI.unescape(value)
         data  = data.gsub('-AMP-', '&')
           .gsub('-PERCENT-', "%")
           .gsub('-PRIME-', "'")
@@ -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
@@ -62,6 +63,7 @@ class RSGenerator
           new_params[:font_it] = FONT_DIR + "/NotoSans-Italic.ttf"
           new_params[:font_bd] = FONT_DIR + "/NotoSans-Bold.ttf"
           new_params[:font_bdit] = FONT_DIR + "/NotoSans-BoldItalic.ttf"
+          new_params[:font_math] = FONT_DIR + "/NotoSansMath-Regular.ttf"
           new_params[:font_cjk] = FONT_DIR + "/NotoSansCJKjp-Regular.otf"
           new_params[:fontstyle] = "sans"
         elsif value == "noto-serif" || value == "serif"
@@ -69,6 +71,7 @@ class RSGenerator
           new_params[:font_it] = FONT_DIR + "/NotoSerif-Italic.ttf"
           new_params[:font_bd] = FONT_DIR + "/NotoSerif-Bold.ttf"
           new_params[:font_bdit] = FONT_DIR + "/NotoSerif-BoldItalic.ttf"
+          new_params[:font_math] = FONT_DIR + "/NotoSansMath-Regular.ttf"
           new_params[:font_cjk] = FONT_DIR + "/NotoSerifCJKjp-Regular.otf"
           new_params[:fontstyle] = "serif"
         elsif value == "cjk zenhei" || value == "cjk"
@@ -76,14 +79,24 @@ class RSGenerator
           new_params[:font_it] = FONT_DIR + "/NotoSans-Italic.ttf"
           new_params[:font_bd] = FONT_DIR + "/NotoSans-Bold.ttf"
           new_params[:font_bdit] = FONT_DIR + "/NotoSans-BoldItalic.ttf"
+          new_params[:font_math] = FONT_DIR + "/NotoSansMath-Regular.ttf"
           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_cjk] = FONT_DIR + "/NotoSerifCJKjp-Regular.otf"
+          new_params[:fontstyle] = "math"
         end
       else
         new_params[key] = value
       end
     end
 
+    # defaults to the following
     @params = {
       :symmetrize => true,
       :color      => true,
@@ -100,6 +113,7 @@ class RSGenerator
       :font_it    => "/NotoSans-Italic.ttf",
       :font_bd    => "/NotoSans-Bold.ttf",
       :font_bdit  => "/NotoSans-BoldItalic.ttf",
+      :font_math  => "/NotoSansMath-Regular.ttf"
     }
     @metrics = {
       :e_width  => 120,
@@ -111,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
 
@@ -148,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[:fontsize],
+      @params[:symmetrize], @params[:color], @params[:leafstyle], @params[:multibyte],
+      @params[:fontstyle], @params[:font], @params[:font_cjk], @params[:fontsize],
     )
     graph.svg_data
   end
@@ -161,8 +175,8 @@ class RSGenerator
     elist = sp.get_elementlist
     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_cjk], @params[:fontsize], @params[:margin], 
+      @params[:fontstyle], @params[:font], @params[:font_it], @params[:font_bd], @params[:font_bdit], @params[:font_math],
+      @params[:font_cjk], @params[:fontsize], @params[:margin],
     )
     graph.to_blob(@params[:format])
   end

data/rsyntaxtree.gemspec

@@ -12,14 +12,11 @@ Gem::Specification.new do |s|
   s.summary     = %q{RSyntaxTree is a graphical syntax tree generator written in Ruby}
   s.description = %q{Yet another syntax tree generator made with Ruby and RMagick}
   s.licenses    = ["MIT"]
-
-  s.rubyforge_project = "rsyntaxtree"
-
   s.files         = `git ls-files`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_runtime_dependency("rmagick", '>= 2.16.0')
-  s.add_runtime_dependency("optimist")
+  s.add_runtime_dependency 'rmagick', '~> 4.2', '>= 4.2.3'
+  s.add_runtime_dependency 'optimist', '~> 3.0', '>= 3.0.1'
 end

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.2
 platform: ruby
 authors:
 - Yoichiro Hasebe
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-13 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 4.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 4.2.3
 - !ruby/object:Gem::Dependency
   name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
 description: Yet another syntax tree generator made with Ruby and RMagick
 email:
 - yohasebe@gmail.com
@@ -56,11 +68,17 @@ files:
 - fonts/NotoSans-Italic.ttf
 - fonts/NotoSans-Regular.ttf
 - fonts/NotoSansCJKjp-Regular.otf
+- fonts/NotoSansMath-Regular.ttf
 - fonts/NotoSerif-Bold.ttf
 - fonts/NotoSerif-BoldItalic.ttf
 - fonts/NotoSerif-Italic.ttf
 - fonts/NotoSerif-Regular.ttf
 - fonts/NotoSerifCJKjp-Regular.otf
+- fonts/latinmodern-math.otf
+- fonts/lmroman10-bold.otf
+- fonts/lmroman10-bolditalic.otf
+- fonts/lmroman10-italic.otf
+- fonts/lmroman10-regular.otf
 - fonts/wqy-zenhei.ttf
 - lib/rsyntaxtree.rb
 - lib/rsyntaxtree/element.rb
@@ -77,7 +95,7 @@ homepage: http://github.com/yohasebe/rsyntaxtree
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -92,8 +110,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.2.11
+signing_key:
 specification_version: 4
 summary: RSyntaxTree is a graphical syntax tree generator written in Ruby
 test_files: []