rsyntaxtree 0.8.6 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b25b4f9bf189bb33a19980c2cd6247a93ae2dd14df820eaa9e991425fa56b0dd
-  data.tar.gz: '0646683a124670135b38f5d93667cac8140a96d74c352d6bb28483cec93e3ee8'
+  metadata.gz: c1d573e0201c4374f3fc497b12eb34856fcedeb3513b7d17e403c3d85dbb4d1c
+  data.tar.gz: 60b26c37bd71b6f89f6a048a8e594945783d2486def18e4b9b170e89a68bf91c
 SHA512:
-  metadata.gz: 0dc8fdc7c0b9c4181ed50372eeebc41d75bccaf4c81db63a79da218918c0c71d70fd0fa9e6df9e8f6e46d52c4153b0934577a76fbdc03d90e23d28bda6a37811
-  data.tar.gz: c65b56bef0deb983be7cd81e914834de1536c07633c3709a642eedf2d3b461344d4a2ddfc0beae0f85ac0a954cf895472459919b2cf317ea2f26b633309a1f1a
+  metadata.gz: f9bc21b39ead52c96d917d799354b84b1c99c1f9d0a7078611e2213086d31d16c3bbb416ce856c874a0563a018b2df8452da1bdaad056348c86905d7a914a40f
+  data.tar.gz: e44c03daee5602becb706539f4035d8272d6096d1a26a7e79b0b0c0e439e579a24b85d04717bc1794704c19df24f47d0f95b6f2f05c66abe955f568ac52b189c

data/bin/rsyntaxtree

@@ -37,6 +37,8 @@ EOS
       :default => "on"
   opt :autosub, "Put subscript numbers to nodes: on or off",
       :default => "off"
+  opt :transparent, "Make background transparent: on or off",
+      :default => "off"
 end
 
 Optimist::die :outdir, "must be an exsting directory path" unless FileTest::directory?(opts[:outdir])
@@ -48,8 +50,9 @@ 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 1-5" if opts[:margin] < 1 || opts[:margin] > 5 
+Optimist::die :margin, "must be in the range of 0-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
+Optimist::die :transparent, "must be either on or off" unless /\A(on|off)\z/ =~ opts[:transparent]
 
 string_opts = {}
 opts.each do |key, value|

data/lib/rsyntaxtree/element.rb

@@ -23,9 +23,9 @@ class Element
       @level = level           # Element level in the tree (0=top etc...)
       @width = 0               # Width of the element in pixels
       @indent = 0              # Drawing offset
-      # content = content.strip
-      if /\A.+\^\z/ =~ content.strip
-        @content = content.gsub("^"){""}.strip # The actual element content
+      content = content.strip
+      if /\A.+\^\z/ =~ content
+        @content = content.gsub("^"){""} # The actual element content
         @triangle = true # draw triangle instead of stright bar when in auto mode
       else
         @content = content.gsub("^"){""}.strip # The actual element content

data/lib/rsyntaxtree/svg_graph.rb

@@ -18,17 +18,20 @@ require 'graph'
 
 class SVGGraph < Graph
 
-  def initialize(e_list, metrics, symmetrize, color, leafstyle, multibyte, fontstyle, font, font_cjk, font_size)
+  def initialize(e_list, metrics, symmetrize, color, leafstyle, multibyte, fontstyle, font, font_cjk, font_size, margin, transparent)
 
     # Store class-specific parameters
     @font       = multibyte ? font_cjk : font
     @font_size  = font_size
+    @transparent = transparent
+
     case fontstyle
     when /(?:sans|cjk)/
       @fontstyle  = "sans-serif"
     when /(?:serif|math)/
       @fontstyle  = "serif"
     end
+    @margin     = margin.to_i
 
     super(e_list, metrics, symmetrize, color, leafstyle, multibyte, @font, @font_size)
 
@@ -38,17 +41,35 @@ class SVGGraph < Graph
     @tree_data  = String.new
   end
 
+  def get_left_most(tree_data)
+    xs = @tree_data.scan(/x1?=['"]([^'"]+)['"]/).map{|m| m.first.to_i}
+    xs.min
+  end
+
   def svg_data
     parse_list
+    lm = get_left_most(@tree_data)
+    width = @width - lm + @margin * 2
+    height = @height + @margin * 2
+
     header =<<EOD
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="#{@width}" height="#{@height}" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="#{width}" height="#{height}" viewBox="#{-@margin + lm}, -#{@margin}, #{@width - lm + @margin * 2}, #{@height + @margin * 2}" version="1.1" xmlns="http://www.w3.org/2000/svg">
+EOD
+
+    rect =<<EOD
+<rect x="#{-@margin + lm}" y="-#{@margin}" width="#{@width - lm + @margin * 2}" height="#{@height + @margin * 2}" stroke="none" fill="white" />"
 EOD
 
     footer = "</svg>"
-    header + @tree_data + footer
+
+    if @transparent
+      header + @tree_data + footer
+    else
+      header + rect + @tree_data + footer
+    end
   end
 
   # Create a temporary file and returns only its filename
@@ -287,19 +308,9 @@ EOD
     main_before = parts[0].strip
     sub = parts[1]
     main = get_txt_only(main_before)
-    # if(main.contains_cjk?)
-    #   main = 'n' * main.strip.size * 2
-    # else
-      # main
-    # end
     main_metrics = img_get_txt_metrics(main, font, font_size, multiline)
     width = main_metrics.width
     if sub
-      # if(sub.contains_cjk?)
-      #   sub = 'n' * sub.strip.size * 2
-      # else
-      #   sub
-      # end
       sub_metrics = img_get_txt_metrics(sub, font, font_size * SUBSCRIPT_CONST, multiline)
       width += sub_metrics.width
     end

data/lib/rsyntaxtree/tree_graph.rb

@@ -21,18 +21,19 @@ class TreeGraph < Graph
 
   def initialize(e_list, metrics, symmetrize, color, leafstyle, multibyte,
                  fontstyle, font, font_it, font_bd, font_itbd, font_math, font_cjk, font_size,
-                 margin)
+                 margin, transparent)
 
     # Store class-specific parameters
-    @fontstyle  = fontstyle
-    @font       = multibyte ? font_cjk : font
-    @font_size  = font_size
-    @font_it    = font_it
-    @font_bd    = font_bd
-    @font_itbd  = font_itbd
-    @font_math  = font_math
-    @font_cjk   = font_cjk
-    @margin     = margin
+    @fontstyle   = fontstyle
+    @font        = multibyte ? font_cjk : font
+    @font_size   = font_size
+    @font_it     = font_it
+    @font_bd     = font_bd
+    @font_itbd   = font_itbd
+    @font_math   = font_math
+    @font_cjk    = font_cjk
+    @margin      = margin
+    @transparent = transparent
 
     super(e_list, metrics, symmetrize, color, leafstyle, multibyte, @font, @font_size)
 
@@ -49,6 +50,9 @@ class TreeGraph < Graph
   def draw
     parse_list
     @im = Image.new(@width, @height)
+    if @transparent
+      @im.matte_reset!
+    end
     @im.interlace = PlaneInterlace
     @gc.draw(@im)
   end
@@ -63,7 +67,11 @@ class TreeGraph < Graph
   def to_blob(fileformat='PNG')
     draw
     @im.trim!
-    @im.border!(@margin, @margin, "white")
+    if @transparent
+      @im.border!(@margin, @margin, "transparent")
+    else
+      @im.border!(@margin, @margin, "white")
+    end
     @im.format = fileformat
     @im.interlace = PlaneInterlace
     return @im.to_blob
@@ -73,6 +81,7 @@ class TreeGraph < Graph
 
   # Add the element into the tree (draw it)
   def draw_element(x, y, w, string, type)
+    numlines = string.count("\n")
     string = string.sub(/\^\z/){""}
     # Calculate element dimensions and position
     if (type == ETYPE_LEAF) and @leafstyle == "nothing"
@@ -81,7 +90,7 @@ class TreeGraph < Graph
       top   = row2px(y)
     end
     left   = x + @m[:b_side]
-    bottom = top  + @e_height
+    bottom = top  + @e_height * numlines
     right  = left + w
 
     # Split the string into the main part and the
@@ -284,7 +293,7 @@ class TreeGraph < Graph
     end
   end
 
-  def img_get_txt_width(text, font, font_size, multiline = false)
+  def img_get_txt_width(text, font, font_size, multiline = true)
     parts = text.split("_", 2)
     main_before = parts[0].strip
     sub = parts[1]

data/lib/rsyntaxtree/version.rb

@@ -1,4 +1,4 @@
 module RSyntaxTree
-  VERSION = "0.8.6"
+  VERSION = "0.8.8"
 end
 

data/lib/rsyntaxtree.rb

@@ -49,7 +49,7 @@ class RSGenerator
           .gsub('-CABRACKET-', '>')
         new_params[key] = data
         new_params[:multibyte] = data.contains_cjk?
-      when :symmetrize, :color, :autosub
+      when :symmetrize, :color, :autosub, :transparent
         new_params[key] = value && value != "off" ? true : false
       when :fontsize
         new_params[key] = value.to_i * FONT_SCALING
@@ -98,22 +98,23 @@ class RSGenerator
 
     # defaults to the following
     @params = {
-      :symmetrize => true,
-      :color      => true,
-      :autosub    => false,
-      :fontsize   => 18,
-      :format     => "png",
-      :leafstyle  => "auto",
-      :filename   => "syntree",
-      :data       => "",
-      :margin     => 0,
-      :vheight    =>  1.0,
-      :fontstyle  => "sans",
-      :font       => "/NotoSansCJKjp-Regular.otf",
-      :font_it    => "/NotoSans-Italic.ttf",
-      :font_bd    => "/NotoSans-Bold.ttf",
-      :font_bdit  => "/NotoSans-BoldItalic.ttf",
-      :font_math  => "/NotoSansMath-Regular.ttf"
+      :symmetrize  => true,
+      :color       => true,
+      :autosub     => false,
+      :transparent => false,
+      :fontsize    => 18,
+      :format      => "png",
+      :leafstyle   => "auto",
+      :filename    => "syntree",
+      :data        => "",
+      :margin      => 0,
+      :vheight     =>  1.0,
+      :fontstyle   => "sans",
+      :font        => "/NotoSansCJKjp-Regular.otf",
+      :font_it     => "/NotoSans-Italic.ttf",
+      :font_bd     => "/NotoSans-Bold.ttf",
+      :font_bdit   => "/NotoSans-BoldItalic.ttf",
+      :font_math   => "/NotoSansMath-Regular.ttf"
     }
     @metrics = {
       :e_width  => 120,
@@ -163,7 +164,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[:font_cjk], @params[:fontsize],
+      @params[:fontstyle], @params[:font], @params[:font_cjk], @params[:fontsize], @params[:margin], @params[:transparent]
     )
     graph.svg_data
   end
@@ -176,7 +177,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], @params[:transparent]
     )
     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.6
+  version: 0.8.8
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-03 00:00:00.000000000 Z
+date: 2021-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick