rsyntaxtree 0.8.4 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46e87b5eb3718ca486b7db30381bf64d2c276f6e60173bbf686c150c3a40a54e
-  data.tar.gz: 24c796def12932596bd4a4df5b29a758e4a8f633b986cae1d33663bf19e2836c
+  metadata.gz: 69c3a36921d2441f35c9729197aaea3ded204780b7033361a3434605e17e70cb
+  data.tar.gz: 342c7b8e779e2fca098d441f11ea7a458e050e42b49957369a7af3ac9ffd5ce8
 SHA512:
-  metadata.gz: cf98fca2b5ce268499bfdea7a6d745de7f5bf6c0b26bacff1bea79d42df360dad1ec013d9f96b54f9111c951839d74c84a9725d12a81c364d504d39cec2432c2
-  data.tar.gz: 8efcf521ecb186456be69b8060c9a3b6c7724805897fb2aef6716aa5420f0da38fa4639c9798528d32b845498c2484cff56b95bb4e4a1df401972131910a315e
+  metadata.gz: ddffb304231af332a8de21e29a97943570b8297749c7368c536b0f15103a392c4f10f1b6c77c79c0ab8b48a3fbe05ccfcc09da69b20b53c0f5a41692245d5137
+  data.tar.gz: 0c6a91490bdf0a26bcfed5cdad68bc25fdd9252577b86a638a8a6ce72a4c5c297324dda81e9e0f1852bee545d437d16f625ec312141fd8a56868b691d9bd05b6

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/m =~ 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/error_message.rb

@@ -23,7 +23,7 @@ class ErrorMessage
     @filename = filename
     @format = format
 
-    metrics = img_get_txt_metrics(text, font, font_size, true)
+    metrics = img_get_txt_metrics(text, font, font_size, NoDecoration, true)
 
     @im = Image.new(metrics.width, metrics.height)
     @gc = Draw.new

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,15 +58,17 @@ 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'
+      gc.kerning = 0
+      gc.interline_spacing = 0
+      gc.interword_spacing = 0
     end
 
     if multiline
@@ -82,18 +84,19 @@ class Graph
   # for all child elements.
   def calc_element_width(e)
     w = 0
+    content = e.content.gsub("<>", " ")
 
     children = @e_list.get_children(e.id)
 
     if(children.length == 0)
-      w = img_get_txt_width(e.content, @font, @font_size) + @font_size
+      w = img_get_txt_width(content, @font, @font_size) + @font_size
     else
       children.each do |child|
         child_e = @e_list.get_id(child)
         w += calc_element_width(child_e)
       end
 
-      tw = img_get_txt_width(e.content, @font, @font_size) + @font_size
+      tw = img_get_txt_width(content, @font, @font_size) + @font_size
       if(tw > w)
         fix_child_size(e.id, w, tw)
         w = tw
@@ -110,9 +113,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 +172,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
 
@@ -310,8 +303,9 @@ class Graph
     return text
   end
 
-  def img_get_txt_height(text, font, font_size, multiline = false)
+  def img_get_txt_height(text, font, font_size, multiline = true)
     metrics = img_get_txt_metrics(text, font, font_size, multiline)
+    # y = (metrics.bounds.y2 - metrics.bounds.y1).round
     y = metrics.height
     return y
   end

data/lib/rsyntaxtree/string_parser.rb

@@ -171,8 +171,15 @@ class StringParser
         end
       when "\\"
         escape = true
-      when /[\n\r]/
-        gottoken = false # same as do nothing  
+      when "n", " ", "+", "-", "=", "~", "#", "*"
+        if escape
+          token += "\\#{ch}"
+          escape = false
+        else
+          token += ch
+        end
+      # when /[\n\r]/
+      #   gottoken = false # same as do nothing
       else
         token += ch
         escape = false if escape

data/lib/rsyntaxtree/svg_graph.rb

@@ -18,37 +18,70 @@ 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"
+      @fontstyle = "\"'Noto Sans JP', 'Noto Sans', sans-serif\""
+      @fontcss = "http://fonts.googleapis.com/earlyaccess/notosansjp.css"
+    when /(?:serif)/
+      @fontstyle = "\"'Noto Serif JP', 'Noto Serif', serif\""
+      @fontcss = "https://fonts.googleapis.com/css?family=Noto+Serif+JP"
+    when /(?:math)/
+      @fontstyle = "\"Latin Modern Roman', sans-serif\""
+      @fontcss = "https://cdn.jsdelivr.net/gh/sugina-dev/latin-modern-web@1.0.1/style/latinmodern-roman.css"
     end
 
-    super(e_list, metrics, symmetrize, color, leafstyle, multibyte, @font, @font_size)
+    @margin     = margin.to_i
+
+    super(e_list, metrics, symmetrize, color, leafstyle, multibyte, @fontstyle, @font_size)
 
     @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"
+    @text_styles  = "<text letter-spacing='0' word-spacing='0' kerning='0' style='fill: COLOR; font-size: FONT_SIZE ST WA' x='X_VALUE' y='Y_VALUE' TD font-family=#{@fontstyle}>CONTENT</text>\n"
     @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" 
+<!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">
+<defs>
+<style>
+@import url(#{@fontcss});
+</style>
+</defs>
+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
@@ -68,21 +101,21 @@ EOD
   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 )
@@ -127,11 +160,18 @@ EOD
       main = $1
     end
 
-    # Calculate text size for the main and the 
+    # 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, @font, @font_size)
+    main_width = 0
+    main_height = 0
+    main.split(/\\n/).each do |l|
+      l_width = img_get_txt_width(l, @font, @font_size)
+      main_width = l_width if main_width < l_width
+      main_height += img_get_txt_height(l, @font, @font_size)
+    end
+
 
     if sub != ""
       if /\A\=(.+)\=\z/ =~ sub
@@ -163,9 +203,11 @@ EOD
         sub_style = ""
         sub_weight = ""
       end
+      sub_height = img_get_txt_height(sub, @font, @font_size)
       sub_width  = img_get_txt_width(sub.to_s,  @font, @sub_size)
     else
       sub_width = 0
+      sub_height = 0
     end
 
     if /\A#(.+)#\z/ =~ sub
@@ -173,14 +215,13 @@ EOD
     end
 
     # Center text in the element
-    txt_width = main_width + sub_width
-    txt_pos   = left + (right - left) / 2 - txt_width / 2
+    txt_pos   = left + (right - left) / 2
 
     # Select apropriate color
     if(type == ETYPE_LEAF)
       col = @col_leaf
     else
-      col = @col_node      
+      col = @col_node
     end
 
     if(main[0].chr == "<" && main[-1].chr == ">")
@@ -189,29 +230,47 @@ EOD
 
     # Draw main text
     main_data  = @text_styles.sub(/COLOR/, col)
-    main_data  = main_data.sub(/FONT_SIZE/, @font_size.to_s)
-    main_x = txt_pos
-    main_y = top + @e_height - @m[:e_padd] * 1.5
+    main_data  = main_data.sub(/FONT_SIZE/, @font_size.to_s + "px;")
+    main_x = txt_pos - (main_width + sub_width) / 2
+    main_y = top + @e_height - @m[:e_padd]
     main_data  = main_data.sub(/X_VALUE/, main_x.to_s)
     main_data  = main_data.sub(/Y_VALUE/, main_y.to_s)
-
+    if /\\n/ =~ main
+      lines = main.split(/\\n/)
+      new_main = ""
+      dy = 0
+      lines.each_with_index do |l, idx|
+        if idx == 0
+          dy = 0
+        else
+          dy = 1
+          main_y += img_get_txt_height(l, @font, @font_size)
+        end
+        this_width = img_get_txt_width(l,  @font, @font_size)
+        this_x = txt_pos - (this_width + sub_width) / 2
+        new_main << "<tspan x='#{this_x}' y='#{main_y}'>#{l}</tspan>"
+        @height = main_y if main_y > @height
+      end
+      main = new_main
+    end
     @tree_data += main_data.sub(/TD/, "text-decoration='#{main_decoration}'")
-      .sub(/ST/, main_style)
-      .sub(/WA/, main_weight)
+      .sub(/ST/, main_style + ";")
+      .sub(/WA/, main_weight + ";")
       .sub(/CONTENT/, main)
 
     # Draw subscript text
-    sub_data  = @text_styles.sub(/COLOR/, col)
-    sub_data  = sub_data.sub(/FONT_SIZE/, @sub_size.to_s)
-    sub_x = main_x + main_width
-    sub_y = top + (@e_height - @m[:e_padd] + @sub_size / 10)
-    if (sub.length > 0 )
-      sub_data   = sub_data.sub(/X_VALUE/, sub_x.ceil.to_s)
-      sub_data   = sub_data.sub(/Y_VALUE/, sub_y.ceil.to_s)
+    if sub && sub != ""
+      sub_data  = @text_styles.sub(/COLOR/, col)
+      sub_data  = sub_data.sub(/FONT_SIZE/, @sub_size.to_s)
+      sub_x  = right - sub_width
+      sub_y = main_y + sub_height / 4
+      sub_data   = sub_data.sub(/X_VALUE/, sub_x.to_s)
+      sub_data   = sub_data.sub(/Y_VALUE/, sub_y.to_s)
       @tree_data += sub_data.sub(/TD/, "text-decoration='#{sub_decoration}'")
         .sub(/ST/, sub_style)
         .sub(/WA/, sub_weight)
-        .sub(/CONTENT/, sub)
+        .sub(/CONTENT/,   sub)
+      @height += sub_height / 4
     end
   end
 
@@ -227,10 +286,10 @@ EOD
     toBot    = (row2px(fromY - 1 ) + @e_height)
     toLeft  = (toX + toW / 2 + @m[:b_side])
 
-    line_data   = @line_styles.sub(/X1/, fromLeft.ceil.to_s)
-    line_data   = line_data.sub(/Y1/, fromTop.ceil.to_s)
-    line_data   = line_data.sub(/X2/, toLeft.ceil.to_s)
-    @tree_data += line_data.sub(/Y2/, toBot.ceil.to_s)
+    line_data   = @line_styles.sub(/X1/, fromLeft.to_s)
+    line_data   = line_data.sub(/Y1/, fromTop.to_s)
+    line_data   = line_data.sub(/X2/, toLeft.to_s)
+    @tree_data += line_data.sub(/Y2/, toBot.to_s)
 
   end
 
@@ -243,9 +302,9 @@ EOD
     toX = fromX
     fromCenter = (fromX + fromW / 2 + @m[:b_side])
 
-    fromTop  = row2px(fromY).ceil
-    fromLeft1 = (fromCenter + textW / 2).ceil
-    fromLeft2 = (fromCenter - textW / 2).ceil
+    fromTop  = row2px(fromY)
+    fromLeft1 = (fromCenter + textW / 2)
+    fromLeft2 = (fromCenter - textW / 2)
     toBot    = (row2px(fromY - 1) + @e_height)
 
     if symmetrize
@@ -254,12 +313,12 @@ EOD
       toLeft   = (toX + textW / 2 + @m[:b_side] * 3)
     end
 
-    polygon_data = @polygon_styles.sub(/X1/, fromLeft1.ceil.to_s)
-    polygon_data = polygon_data.sub(/Y1/, fromTop.ceil.to_s)
-    polygon_data = polygon_data.sub(/X2/, fromLeft2.ceil.to_s)
-    polygon_data = polygon_data.sub(/Y2/, fromTop.ceil.to_s)
-    polygon_data = polygon_data.sub(/X3/, toLeft.ceil.to_s)
-    @tree_data  += polygon_data.sub(/Y3/, toBot.ceil.to_s)
+    polygon_data = @polygon_styles.sub(/X1/, fromLeft1.to_s)
+    polygon_data = polygon_data.sub(/Y1/, fromTop.to_s)
+    polygon_data = polygon_data.sub(/X2/, fromLeft2.to_s)
+    polygon_data = polygon_data.sub(/Y2/, fromTop.to_s)
+    polygon_data = polygon_data.sub(/X3/, toLeft.to_s)
+    @tree_data  += polygon_data.sub(/Y3/, toBot.to_s)
   end
 
   # If a node element text is wider than the sum of it's
@@ -271,9 +330,9 @@ EOD
     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)
@@ -282,27 +341,23 @@ EOD
     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]
     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)
+      sub_metrics = img_get_txt_metrics(sub.strip, font, font_size * SUBSCRIPT_CONST, multiline)
       width += sub_metrics.width
     end
     return width
   end
+
+  def img_get_txt_height(text, font, font_size)
+    main_metrics = img_get_txt_metrics(text, font, font_size, false)
+    main_metrics.height
+  end
+
 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,12 @@ class TreeGraph < Graph
 
   def draw
     parse_list
+    @im = Image.new(@width, @height)
+    if @transparent
+      @im.matte_reset!
+    end
+    # @im.interlace = PlaneInterlace
+    @im.interlace = LineInterlace
     @gc.draw(@im)
   end
 
@@ -62,7 +67,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
@@ -80,7 +90,6 @@ class TreeGraph < Graph
       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
@@ -134,7 +143,14 @@ class TreeGraph < Graph
     # Calculate text size for the main and the
     # subscript part of the element
 
-    main_width = img_get_txt_width(main, main_font, @font_size)
+
+    main_width = 0
+    main_height = 0
+    main.split(/\\n/).each do |l|
+      l_width = img_get_txt_width(l, main_font, @font_size)
+      main_width = l_width if main_width < l_width
+      main_height += img_get_txt_height(l, @font, @font_size)
+    end
 
     if /\A\=(.+)\=\z/ =~ sub
       sub = $1
@@ -173,15 +189,16 @@ class TreeGraph < Graph
     end
 
     if sub != ""
+      # add a separation of the width of "M"
       sub_width  = img_get_txt_width(sub.to_s, sub_font, @sub_size)
+      sub_height  = img_get_txt_height(sub.to_s, sub_font, @sub_size)
     else
       sub_width = 0
+      sub_height = 0
     end
 
     # Center text in the element
-    txt_width = main_width + sub_width
-
-    txt_pos   = left + (right - left) / 2 - txt_width / 2
+    txt_pos   = left + (right - left) / 2
 
     # Select apropriate color
     if(type == ETYPE_LEAF)
@@ -199,22 +216,33 @@ class TreeGraph < Graph
 
     # Draw main text
     @gc.pointsize(@font_size)
-    main_x = txt_pos
+    @gc.kerning = 0
+    @gc.interline_spacing = 0
+    @gc.interword_spacing = 0
+
+    main_x = txt_pos - sub_width / 2
     main_y = top + @e_height - @m[:e_padd]
 
-    @gc.interline_spacing = -(@main_height / 3)
+    # @gc.interline_spacing = -(@main_height / 3)
     @gc.font(main_font)
     @gc.decorate(main_decoration)
-    @gc.text(main_x.ceil, main_y.ceil, main)
+    numlines = main.count("\\n")
+    if numlines > 1
+      @height = @height + @main_height * numlines
+    end
+    @gc.text_align(CenterAlign)
+    @gc.text(main_x.ceil, main_y.ceil, main.gsub("\\n", "\n"))
 
     # Draw subscript text
-    if (sub.length > 0 )
+    if (sub != "" )
       @gc.pointsize(@sub_size)
-      sub_x = txt_pos + main_width + @sub_space_width
-      sub_y = top + (@e_height - @m[:e_padd] + @sub_size / 2)
+      sub_x = main_x + (main_width / 2) + (sub_width / 2)
+      sub_y = top + main_height + sub_height / 4
+      @height += sub_height / 4
       @gc.font(sub_font)
       @gc.decorate(sub_decoration)
-      @gc.text(sub_x.ceil, sub_y.ceil, sub)
+      @gc.text_align(CenterAlign)
+      @gc.text(sub_x.ceil, sub_y.ceil, " " + sub.gsub("\\n", "\n"))
     end
   end
 
@@ -249,6 +277,7 @@ class TreeGraph < Graph
     fromLeft1 = (fromCenter + textW / 2).ceil
     fromLeft2 = (fromCenter - textW / 2).ceil
     toBot    = (row2px(fromY - 1) + @e_height)
+
     if symmetrize
       toLeft   = (toX + textW / 2 + @m[:b_side])
     else
@@ -283,7 +312,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.4"
+  VERSION = "0.9.1"
 end
 

data/lib/rsyntaxtree.rb

@@ -40,7 +40,8 @@ class RSGenerator
       key = keystr.to_sym
       case key
       when :data
-        data = CGI.unescape(value)
+        data = value
+        # data = CGI.unescape(value)
         data  = data.gsub('-AMP-', '&')
           .gsub('-PERCENT-', "%")
           .gsub('-PRIME-', "'")
@@ -49,7 +50,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
@@ -64,7 +65,7 @@ class RSGenerator
           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[:font_cjk] = FONT_DIR + "/NotoSansJP-Regular.otf"
           new_params[:fontstyle] = "sans"
         elsif value == "noto-serif" || value == "serif"
           new_params[:font] = FONT_DIR + "/NotoSerif-Regular.ttf"
@@ -72,7 +73,7 @@ class RSGenerator
           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[:font_cjk] = FONT_DIR + "/NotoSerifJP-Regular.otf"
           new_params[:fontstyle] = "serif"
         elsif value == "cjk zenhei" || value == "cjk"
           new_params[:font] = FONT_DIR + "/wqy-zenhei.ttf"
@@ -88,7 +89,7 @@ class RSGenerator
           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[:font_cjk] = FONT_DIR + "/NotoSerifJP-Regular.otf"
           new_params[:fontstyle] = "math"
         end
       else
@@ -98,30 +99,37 @@ 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        => "/NotoSansJP-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,
-      :e_padd   => 14,
-      :v_space  => 20,
-      :h_space  => 20,
-      :b_side   => 10,
-      :b_topbot => 10
+      :e_width  => 0,
+      :e_padd   => 20,
+      :v_space  => 0,
+      :h_space  => 0,
+      :b_side   => 0,
+      :b_topbot => 0
+      # :e_width  => 120,
+      # :e_padd   => 14,
+      # :v_space  => 20,
+      # :h_space  => 20,
+      # :b_side   => 10,
+      # :b_topbot => 10
     }
 
     @params.merge! new_params
@@ -163,7 +171,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 +184,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.4
+  version: 0.9.1
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -67,13 +67,15 @@ files:
 - fonts/NotoSans-BoldItalic.ttf
 - fonts/NotoSans-Italic.ttf
 - fonts/NotoSans-Regular.ttf
-- fonts/NotoSansCJKjp-Regular.otf
+- fonts/NotoSansJP-Bold.otf
+- fonts/NotoSansJP-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/NotoSerifJP-Bold.otf
+- fonts/NotoSerifJP-Regular.otf
 - fonts/latinmodern-math.otf
 - fonts/lmroman10-bold.otf
 - fonts/lmroman10-bolditalic.otf
@@ -91,7 +93,6 @@ files:
 - lib/rsyntaxtree/utils.rb
 - lib/rsyntaxtree/version.rb
 - rsyntaxtree.gemspec
-- syntree.svg
 homepage: http://github.com/yohasebe/rsyntaxtree
 licenses:
 - MIT

data/syntree.svg

@@ -1,44 +0,0 @@
-<?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="1847.0" height="992.0" version="1.1" xmlns="http://www.w3.org/2000/svg">
-<text style='fill: green; font-size: 64px; ; ;' x='536.0' y='961.0' text-decoration='' font-family='sans-serif'>the</text>
-<text style='fill: green; font-size: 64px; ; ;' x='699.0' y='961.0' text-decoration='' font-family='sans-serif'>president</text>
-<text style='fill: green; font-size: 64px; ; ;' x='408.0' y='785.0' text-decoration='' font-family='sans-serif'>of</text>
-<text style='fill: blue; font-size: 64px; ; ;' x='562.0' y='785.0' text-decoration='' font-family='sans-serif'>D</text>
-<line style='stroke:black; stroke-width:2;' x1='586' y1='890' x2='586' y2='806' />
-<text style='fill: blue; font-size: 64px; ; ;' x='818.0' y='785.0' text-decoration='' font-family='sans-serif'>N</text>
-<line style='stroke:black; stroke-width:2;' x1='843' y1='890' x2='843' y2='806' />
-<text style='fill: green; font-size: 64px; ; ;' x='1243.0' y='785.0' text-decoration='' font-family='sans-serif'>blame</text>
-<text style='fill: green; font-size: 64px; ; ;' x='1495.0' y='785.0' text-decoration='' font-family='sans-serif'>* himself</text>
-<text style='fill: green; font-size: 64px; ; ;' x='10.0' y='609.0' text-decoration='line-through' font-family='sans-serif'>Supporters</text>
-<text style='fill: blue; font-size: 64px; ; ;' x='420.5' y='609.0' text-decoration='' font-family='sans-serif'>P</text>
-<line style='stroke:black; stroke-width:2;' x1='440' y1='714' x2='440' y2='630' />
-<text style='fill: blue; font-size: 64px; ; ;' x='671.0' y='609.0' text-decoration='' font-family='sans-serif'>DP</text>
-<line style='stroke:black; stroke-width:2;' x1='586' y1='714' x2='714' y2='630' />
-<line style='stroke:black; stroke-width:2;' x1='843' y1='714' x2='714' y2='630' />
-<text style='fill: green; font-size: 64px; ; ;' x='1050.0' y='609.0' text-decoration='' font-family='sans-serif'>may</text>
-<text style='fill: blue; font-size: 64px; ; ;' x='1317.5' y='609.0' text-decoration='' font-family='sans-serif'>V</text>
-<line style='stroke:black; stroke-width:2;' x1='1337' y1='714' x2='1337' y2='630' />
-<text style='fill: blue; font-size: 64px; ; ;' x='1570.0' y='609.0' text-decoration='' font-family='sans-serif'>PRN</text>
-<polygon style='fill: none; stroke: black; stroke-width:2;' points='1773 714 1495 714 1634 630' />
-<text style='fill: blue; font-size: 64px; ; ;' x='152.5' y='433.0' text-decoration='' font-family='sans-serif'>N</text>
-<line style='stroke:black; stroke-width:2;' x1='177' y1='538' x2='177' y2='454' />
-<text style='fill: blue; font-size: 64px; ; ;' x='538.0' y='433.0' text-decoration='' font-family='sans-serif'>PP</text>
-<line style='stroke:black; stroke-width:2;' x1='440' y1='538' x2='577' y2='454' />
-<line style='stroke:black; stroke-width:2;' x1='714' y1='538' x2='577' y2='454' />
-<text style='fill: blue; font-size: 64px; ; ;' x='1096.5' y='433.0' text-decoration='' font-family='sans-serif'>T</text>
-<line style='stroke:black; stroke-width:2;' x1='1115' y1='538' x2='1115' y2='454' />
-<text style='fill: blue; font-size: 64px; ; ;' x='1447.0' y='433.0' text-decoration='' font-family='sans-serif'>VP</text>
-<line style='stroke:black; stroke-width:2;' x1='1337' y1='538' x2='1486' y2='454' />
-<line style='stroke:black; stroke-width:2;' x1='1634' y1='538' x2='1486' y2='454' />
-<text style='fill: blue; font-size: 64px; ; ;' x='333.0' y='257.0' text-decoration='' font-family='sans-serif'>NP</text>
-<line style='stroke:black; stroke-width:2;' x1='177' y1='362' x2='377' y2='278' />
-<line style='stroke:black; stroke-width:2;' x1='577' y1='362' x2='377' y2='278' />
-<text style='fill: blue; font-size: 64px; ; ;' x='1275.0' y='257.0' text-decoration='' font-family='sans-serif'>T'</text>
-<line style='stroke:black; stroke-width:2;' x1='1115' y1='362' x2='1300' y2='278' />
-<line style='stroke:black; stroke-width:2;' x1='1486' y1='362' x2='1300' y2='278' />
-<text style='fill: blue; font-size: 64px; ; ;' x='801.0' y='81.0' text-decoration='' font-family='sans-serif'>TP</text>
-<line style='stroke:black; stroke-width:2;' x1='377' y1='186' x2='839' y2='102' />
-<line style='stroke:black; stroke-width:2;' x1='1300' y1='186' x2='839' y2='102' />
-</svg>