rsyntaxtree 0.8.3 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c06870de3a591df5cdde4b1061529a81455614447d7f6279dc056b06b1631924
-  data.tar.gz: '095426d0a0b46db22be01e8b57e631eea535eec751488ede9aeaaa9bb72bc7ac'
+  metadata.gz: c1d573e0201c4374f3fc497b12eb34856fcedeb3513b7d17e403c3d85dbb4d1c
+  data.tar.gz: 60b26c37bd71b6f89f6a048a8e594945783d2486def18e4b9b170e89a68bf91c
 SHA512:
-  metadata.gz: 95ebed8e7a176851b1d7eccc0fdd4a95fd8a8e432efd696e63acc60558fa592e223b2b4e53d0a4f0d7afcd8f5dd858cf40b361eb9b3525176276098772b6d168
-  data.tar.gz: b35881b52f62faf9b6d7a34213b1547ff19f99d7338d15bfd26f81cb1576cf3d642e8c11d4fe2aa66c6d1ef1edeb42c287a5c0033af77833d7a3577e045b4162
+  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,12 +23,12 @@ 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.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("^"){""} # The actual element content
+        @content = content.gsub("^"){""}.strip # 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] ] ] ]"

data/lib/rsyntaxtree/graph.rb

@@ -32,8 +32,8 @@ class Graph
     # Calculate image dimensions
     @e_height = font_size + @m[:e_padd] * 2
     h         = @e_list.get_level_height
-    w         = calc_level_width(0)
-    @width    = w + @m[:b_side] * 2
+    w      = calc_level_width(0)
+    @width = w
     @height   = h * @e_height + (h-1) * (@m[:v_space] + font_size) + @m[:b_topbot] * 2
 
     # Initialize the image and colors
@@ -50,7 +50,7 @@ class Graph
       @col_leaf  = "black"
       @col_trace = "black"
     end
-    
+
     @main_height = img_get_txt_height("l", font, font_size)
     @sub_size = (font_size * SUBSCRIPT_CONST)
     @sub_space_width = img_get_txt_width("l", font, @sub_size)
@@ -58,12 +58,11 @@ class Graph
 
   def img_get_txt_metrics(text, font, font_size, multiline)
 
-    # 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'
@@ -110,9 +109,10 @@ class Graph
     e = @e_list.get_first
     while e
       if(e.level == level)
-        w += calc_element_width(e)
+        x = calc_element_width(e)
+        w += x
       end
-        e = @e_list.get_next
+      e = @e_list.get_next
     end
     return w
   end
@@ -168,127 +168,116 @@ class Graph
             if(j.parent != 0 )
               words = j.content.split(" ")
               unless @leafstyle == "nothing" && ETYPE_LEAF == j.type
-                if (@leafstyle == "triangle" && ETYPE_LEAF == j.type && x == parent_indent && words.length > 0)
-                  txt_width = img_get_txt_width(j.content, @font, @font_size)
-                  triangle_to_parent(x, i, cw, txt_width, @symmetrize)
-                elsif (@leafstyle == "auto" && ETYPE_LEAF == j.type && x == parent_indent)
-                   if words.length > 1 || j.triangle
-                     txt_width = img_get_txt_width(j.content, @font, @font_size)
-                     triangle_to_parent(x, i, cw, txt_width, @symmetrize)
-                   else
-                     line_to_parent(x, i, cw, @e_list.get_indent(j.parent), @e_list.get_element_width(j.parent))
-                   end
+                if (@leafstyle == "auto" && ETYPE_LEAF == j.type && x == parent_indent)
+                  if words.length > 1 || j.triangle
+                    txt_width = img_get_txt_width(j.content, @font, @font_size)
+                    triangle_to_parent(x, i, cw, txt_width, @symmetrize)
+                  else
+                    line_to_parent(x, i, cw, @e_list.get_indent(j.parent), @e_list.get_element_width(j.parent))
+                  end
                 else
                   line_to_parent(x, i, cw, @e_list.get_indent(j.parent), @e_list.get_element_width(j.parent))
                 end
               end
             end
           end
-
           x += cw
         end
       end
     end
     return true if !@symmetrize
+    
+    elements_to_draw = {}
+    triangles_to_draw = []
+    lines_to_draw = []
 
+    lmost = {:level => nil, :value => nil, :type => nil}
+    rmost = nil 
     h.times do |i|
       curlevel = h - i - 1
-      indent = 0
       e_arr.each_with_index do |j, idx|
         if (j.level == curlevel)
           # Draw a line to the parent element
           children = @e_list.get_children(j.id)
 
           tw = img_get_txt_width(j.content, @font, @font_size)
-          if children.length > 1
+          if children.length > 0
             left, right = -1, -1
-            children.each do |child|          
+            children.each do |child|
               k = @e_list.get_id(child)
-              kw = img_get_txt_width(k.content, @font, @font_size)              
+              kw = img_get_txt_width(k.content, @font, @font_size)
               left = k.indent + kw / 2 if k.indent + kw / 2 < left or left == -1
               right = k.indent + kw / 2 if k.indent + kw / 2 > right
             end
-            draw_element(left, curlevel, right - left, j.content, j.type)
+
+            elements_to_draw[j.id] = {:left => left, :curlevel => curlevel, :width => right - left, :content => j.content, :type => j.type}
             @e_list.set_indent(j.id, left + (right - left) / 2 -  tw / 2)
 
             children.each do |child|
               k = @e_list.get_id(child)
               words = k.content.split(" ")
               dw = img_get_txt_width(k.content, @font, @font_size)
+
+              children2 = @e_list.get_children(k.id)
+
               unless @leafstyle == "nothing" && ETYPE_LEAF == k.type
-                if (@leafstyle == "triangle" && ETYPE_LEAF == k.type && k.indent == j.indent && words.length > 0)
-                  txt_width = img_get_txt_width(k.content, @font, @font_size)
-                  triangle_to_parent(k.indent, curlevel + 1, dw, txt_width)
-                elsif (@leafstyle == "auto" && ETYPE_LEAF == k.type && k.indent == j.indent)
+                if (@leafstyle == "auto" && ETYPE_LEAF == k.type)
                   if words.length > 1 || k.triangle
                     txt_width = img_get_txt_width(k.content, @font, @font_size)
-                    triangle_to_parent(k.indent, curlevel + 1, dw, txt_width)
+                    triangles_to_draw << {:indent => k.indent, :curlevel => curlevel + 1, :width1 => dw, :width2 => txt_width}
                   else
-                    line_to_parent(k.indent, curlevel + 1, dw, j.indent, tw)
+                    lines_to_draw << {:indent1 => k.indent, :curlevel => curlevel + 1, :width1 => dw, :indent2 => j.indent, :width2 => tw}
                   end
                 else
-                  line_to_parent(k.indent, curlevel + 1, dw, j.indent, tw)
+                  lines_to_draw << {:indent1 => k.indent, :curlevel => curlevel + 1, :width1 => dw, :indent2 => j.indent, :width2 => tw}
                 end
               end
             end
 
-          else
-            unless children.empty?
-              k = @e_list.get_id(children[0])
-              kw = img_get_txt_width(k.content, @font, @font_size)              
-              left = k.indent
-              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)
-
-              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)
-                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)
-                elsif (@leafstyle == "auto" && ETYPE_LEAF == k.type)
-                  if words.length > 1 || k.triangle
-                    txt_width = img_get_txt_width(k.content, @font, @font_size)
-                    triangle_to_parent(k.indent, curlevel + 1, dw, txt_width)
-                  else
-                    line_to_parent(k.indent, curlevel + 1, dw, j.indent, tw)
-                  end
-                else
-                  line_to_parent(k.indent, curlevel + 1, dw, j.indent, tw)
-                end
-              end
+          end
+          elements = e_arr.select do |l|
+            l.level == curlevel && @e_list.get_children(l.id).empty?
+          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
+          elements.each.with_index do |l, idx|
+            lw = img_get_txt_width(l.content, @font, @font_size)
+            left = l.indent
+            right = left + lw
+            unless elements_to_draw.include? l.id
+              elements_to_draw[l.id] = {:left => left, :curlevel => curlevel, :width => right - left, :content => l.content, :type => l.type}
             end
-
           end
         end
       end
+
+      e_arr.each do |e|
+        lpos = e.indent - img_get_txt_width(e.content, @font, @font_size) / 2
+        next if lpos > 0
+        if !lmost[:value] || lmost[:value] > lpos
+          lmost[:level] = e.level
+          lmost[:value] = lpos
+          lmost[:type] = e
+        end
+        rpos = e.indent + e.width
+        rmost =  rpos if !rmost || rmost < rpos
+      end
+    end
+
+    offset = 0
+    if lmost[:level] != h - 1
+      offset = lmost[:value] / -2
+      new_width = rmost
+      @width = new_width + offset
+    end
+
+    elements_to_draw.each do |k, v|
+      draw_element(v[:left] + offset, v[:curlevel], v[:width], v[:content], v[:type])
+    end
+    triangles_to_draw.each do |v|
+      triangle_to_parent(v[:indent] + offset, v[:curlevel], v[:width1], v[:width2])
+    end
+    lines_to_draw.each do |v|
+      line_to_parent(v[:indent1] + offset, v[:curlevel], v[:width1], v[:indent2] + offset, v[:width2])
     end
   end
 

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
@@ -99,6 +120,9 @@ EOD
     elsif /\A\-(.+)\-\z/ =~ main
       main = $1
       main_decoration= "underline"
+    elsif /\A\~(.+)\~\z/ =~ main
+      main = $1
+      main_decoration= "line-through"
     else
       main_decoration= ""
     end
@@ -137,6 +161,9 @@ EOD
       elsif /\A\-(.+)\-\z/ =~ sub
         sub = $1
         sub_decoration= "underline"
+      elsif /\A\~(.+)\~\z/ =~ sub
+        sub = $1
+        sub_decoration= "line-through"
       else
         sub_decoration= ""
       end
@@ -281,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,24 +21,23 @@ 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)
 
     # Initialize the image and colors
-    @im           = Image.new(@width, @height)
-    @im.interlace = PlaneInterlace
     @gc           = Draw.new
     @gc.font      = @font
     @gc.pointsize(@font_size)
@@ -50,6 +49,11 @@ 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
 
@@ -62,7 +66,12 @@ class TreeGraph < Graph
   # by Geoffrey Grosenbach
   def to_blob(fileformat='PNG')
     draw
-    @im.border!(@margin, @margin, "white")
+    @im.trim!
+    if @transparent
+      @im.border!(@margin, @margin, "transparent")
+    else
+      @im.border!(@margin, @margin, "white")
+    end
     @im.format = fileformat
     @im.interlace = PlaneInterlace
     return @im.to_blob
@@ -72,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"
@@ -80,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
@@ -283,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.3"
+  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.3
+  version: 0.8.8
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2021-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick