rsyntaxtree 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a93fb86aba069b61d5095d8cd565153b36ea9cdc0bd9903b2ffc656bae5986cb
-  data.tar.gz: a11db6cdb80b0ccdc118761a4f2131915bffd3dc1a13343be4df662e13bb88b3
+  metadata.gz: 6dbad02f72d4b84bdaaf1db6ed5506ed4bb3c447b9b15651dc4878a8e276f3e5
+  data.tar.gz: 3b3c54cc2f174a4be46b827cb42f7f871e6334a28cb2df6099bf4d9521a4fbf6
 SHA512:
-  metadata.gz: 8ce0bbb49b1c7207aa5d65958e9185dd2e28c762bf39304077b37d03c8e7a2e32b79f2b490d110a6223d1b1ca7df591f43ec82bbc7532f5f4a6c406107e55d72
-  data.tar.gz: 66849abf7520966907cece66a1f12fc3eb29384911ddda5f518ad23ecdf7249d589edebfec98c42f35f468c1dea7204e285a38ddb37e510610bec08807d6d154
+  metadata.gz: 8b36dab4e18a88cf7db1874512236e8d049ddec1f06157b92215e329f323587d6055daf7e8011ada31c5533f0e71a901359db872cd367bf86a1d1065c4ab878c
+  data.tar.gz: e68eb7afa8b4714ab1e48861fdf5ce2237669afc0350f28f642626f9f40274fd15d4169a9cf44f418afdcbe42abaea121329503b714625a38d436a375f801f60

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/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|
@@ -286,7 +287,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

@@ -21,15 +21,20 @@ class SVGGraph < Graph
   def initialize(e_list, metrics, symmetrize, color, leafstyle, multibyte, fontstyle, font, 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
@@ -127,7 +123,7 @@ class TreeGraph < Graph
       end
     end
 
-    if /\A\~(.+)\~\z/ =~ main
+    if /\A#(.+)#\z/ =~ main
       main = $1
       main_font = @font_math
     end
@@ -166,7 +162,7 @@ class TreeGraph < Graph
       end
     end
 
-    if /\A~(.+)~\z/ =~ sub
+    if /\A#(.+)#\z/ =~ sub
       sub = $1
       sub_font = @font_math
     end
@@ -231,7 +227,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 +252,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.1"
 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,7 +162,7 @@ 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[:symmetrize], @params[:color], @params[:leafstyle], @params[:multibyte],
       @params[:fontstyle], @params[:font], @params[:fontsize],
     )
     graph.svg_data
@@ -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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Yoichiro Hasebe