rsyntaxtree 0.5.1 → 0.6.5

data/README.md

@@ -27,7 +27,7 @@ For the command-line interface, type `$rsyntaxtree -h` after installation. Here'
     where [options] are:
           --outdir, -o <s>:   Output directory (default: present working directory) (default: ./)
           --format, -f <s>:   Output format: png, pdf, or svg (default: png)
-       --leafstyle, -l <s>:   visual style of tree leaves: triangle, bar, or nothing (default: triangle)
+       --leafstyle, -l <s>:   visual style of tree leaves: auto, triangle, bar, or nothing (default: auto)
        --fontstyle, -n <s>:   Font style: sans-serif, serif, jp-gothic, jp-mincho, cjk (default: cjk)
             --font, -t <s>:   Path to a ttf font used to generate tree
         --fontsize, -s <i>:   Font size: 8-20 (default: 16)
@@ -39,7 +39,9 @@ For the command-line interface, type `$rsyntaxtree -h` after installation. Here'
 
 ### Tips
 
-Every branch or leaf of a tree must belong to a node. To create a node, place a label right next to the opening bracket. Arbitrary number of branches can follow with a preceding space. When a node has one and only one leaf and the leaf contains more than one space characters, the node is treated as a phrase and a triangle (not just a vertical bar) will be between the node label and the leaf).
+Every branch or leaf of a tree must belong to a node. To create a node, place a label right next to the opening bracket. Arbitrary number of branches can follow with a preceding space.
+
+There are several modes in which the shape of connectors between a terminal node and its leaf are drawn differently (auto, triangle, bar, and nothing). In auto mode, a triangle is used if the leaf contains one or more spaces inside (i.e. if it&#8217;s a phrase), but if it contains no spaces (i.e. if it is just a word), a straight bar will be drawn instead (unless the leaf contains a "^" symbol at the end which makes it a single-word phrase).
 
 You can put a subscript to any node by putting the _ character between the main label and the subscript. For example, NP_TOP will be rendered as NP<sub>TOP</sub>. Or you can select the &#8220;Auto subscript&#8221; option so that nodes of the same label will be automatically numbered. (e.g. NP<sub>1</sub>, NP<sub>2</sub>)</p>
 
@@ -47,11 +49,11 @@ You can put a subscript to any node by putting the _ character between the main
 
 Bracket notation (auto-subscript-on):
 
-    [NP [NP [ART a] [N table]] [PP [P near] [NP [ART the] [N door]]]]
+    [S [NP RSyntaxTree^][VP [V generates][NP multilingual syntax trees]]]
 
 Resulting PNG
 
-![a table near the door](http://yohasebe.com/img/rsyntaxtree_example.png)
+![RSyntaxTree generates multilingual syntax trees](http://yohasebe.com/img/rsyntaxtree_example3.png)
 
 ### Development
 

data/bin/rsyntaxtree

@@ -12,7 +12,7 @@ opts = Trollop::options do
 RSyntaxTree, (linguistic) syntax tree generator written in Ruby.
 
 Usage:
-       rsyntaxtree [options] "[NP [N bracket] [NP notation]]]"
+       rsyntaxtree [options] "[VP [VP [V set] [NP bracket notation]] [ADV here]]"
 where [options] are:
 EOS
 
@@ -20,8 +20,8 @@ EOS
       :default => "./"
   opt :format, "Output format: png, pdf, or svg",
       :default => "png"
-  opt :leafstyle, "visual style of tree leaves: triangle, bar, or nothing", 
-      :default => "triangle"
+  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, serif, jp-gothic, jp-mincho, cjk",
       :default => "cjk"
   opt :font, "Path to a ttf font used to generate tree (optional)", :type => String
@@ -37,7 +37,7 @@ end
 
 Trollop::die :outdir, "must be an exsting directory path" unless FileTest::directory?(opts[:outdir])
 Trollop::die :format, "must be png or svg" unless /\A(png|pdf|svg)\z/ =~ opts[:format]
-Trollop::die :leafstyle, "must be triangle, bar, or nothing" unless /\A(triangle|bar|nothing)\z/ =~ opts[:leafstyle]
+Trollop::die :leafstyle, "must be auto, triangle, bar, or nothing" unless /\A(auto|triangle|bar|nothing)\z/ =~ opts[:leafstyle]
 Trollop::die :fontstyle, "must be sans-serif, serif, jp-gothic, jp-mincho, or cjk" unless /\A(sans\-serif|serif|jp\-gothic|jp\-mincho|cjk)\z/ =~ opts[:fontstyle]
 Trollop::die :font, "must be path to an existing ttf font" if opts[:font] && !File::exists?(opts[:font])
 Trollop::die :fontsize, "must be in the range 8-20" unless opts[:fontsize] >= 8 && opts[:fontsize] <= 20

data/lib/rsyntaxtree/element.rb

@@ -33,15 +33,22 @@ ETYPE_LEAF = 2
 
 class Element
 
-    attr_accessor :id, :parent, :type, :content, :level, :width, :indent
-    def initialize(id = 0, parent = 0, content = NULL, level = 0, type = ETYPE_LEAF)
+    attr_accessor :id, :parent, :type, :content, :level, :width, :indent, :triangle
+    def initialize(id = 0, parent = 0, content = "", level = 0, type = ETYPE_LEAF)
       @id = id                 # Unique element id
       @parent = parent         # Parent element id
       @type = type             # Element type
-      @content = content.strip # The actual element content
       @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("^"){""} # The actual element content
+        @triangle = true # draw triangle instead of stright bar when in auto mode
+      else
+        @content = content.gsub("^"){""} # The actual element content
+        @triangle = false # draw triangle instead of stright bar when in auto mode
+      end
     end
     
     # Debug helper function

data/lib/rsyntaxtree/svg_graph.rb

@@ -33,9 +33,10 @@ include Magick
 
 # constant variables are already set in tree_graph.rb
 
-class SVGGraph
 
-  def initialize(e_list, symmetrize = true, color = true, leafstyle = "triangle",
+class SVGGraph
+    
+  def initialize(e_list, symmetrize = true, color = true, leafstyle = "auto",
                  font = "Helvetica", font_size = 10, simple = false)
 
     # Store parameters
@@ -52,7 +53,7 @@ class SVGGraph
     @e_height = @font_size + E_PADD * 2
     h = @e_list.get_level_height
     w = calc_level_width(0)
-    w_px = w + B_SIDE * 2
+    w_px = w + B_SIDE
     h_px = h * @e_height + (h-1) * (V_SPACE + @font_size) + B_TOPBOT * 2
     @height    = h_px
     @width     = w_px
@@ -210,21 +211,25 @@ EOD
   end
 
   # Draw a triangle between child/parent elements
-  def triangle_to_parent(fromX, fromY, fromW, toW, textW)
+  def triangle_to_parent(fromX, fromY, fromW, toW, textW, symmetrize = true)
     if (fromY == 0)
       return
     end
-      
+          
     toX = fromX
-           
-    fromTop  = row2px(fromY)    
-
     fromCenter = (fromX + fromW / 2 + B_SIDE)
-    fromLeft1 = (fromCenter + textW / 2)
-    fromLeft2 = (fromCenter - textW / 2)
-        
+    
+    fromTop  = row2px(fromY).ceil
+    fromLeft1 = (fromCenter + textW / 2).ceil
+    fromLeft2 = (fromCenter - textW / 2).ceil
     toBot    = (row2px(fromY - 1) + @e_height)
-    toLeft   = (toX + toW / 2 + B_SIDE)
+
+    if symmetrize
+      toLeft   = (toX + textW / 2 + B_SIDE)
+    else
+      toLeft   = (toX + textW / 2 + 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)
@@ -233,6 +238,8 @@ EOD
     @tree_data  += polygon_data.sub(/Y3/, toBot.ceil.to_s)
   end
 
+
+
   # If a node element text is wider than the sum of it's
   #   child elements, then the child elements need to
   #   be resized to even out the space. This function
@@ -345,10 +352,17 @@ EOD
             draw_element(x, i, cw, j.content, j.type)
             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 > 1)
+              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, @e_list.get_element_width(j.parent), txt_width)
+                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, @e_list.get_element_width(j.parent), 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
@@ -384,10 +398,17 @@ EOD
               k = @e_list.get_id(child)
               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 && k.indent == j.indent && words.length > 1)
+              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, tw, txt_width)
+                elsif (@leafstyle == "auto" && ETYPE_LEAF == k.type && k.indent == j.indent)
+                  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, tw, 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
@@ -422,10 +443,17 @@ EOD
               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 > 1)
+                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, 
                                      @e_list.get_element_width(k.parent), 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, tw, 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

data/lib/rsyntaxtree/tree_graph.rb

@@ -42,7 +42,7 @@ B_TOPBOT =   5
 
 class TreeGraph
 
-  def initialize(e_list, symmetrize = true, color = true, terminal = "triangle",
+  def initialize(e_list, symmetrize = true, color = true, terminal = "auto",
                  font = "Helvetica", font_size = 10, simple = false)
 
     # Store parameters
@@ -113,7 +113,7 @@ class TreeGraph
  
   # Add the element into the tree (draw it)
   def draw_element(x, y, w, string, type)
- 
+    string = string.sub(/\^\z/){""} 
     # Calculate element dimensions and position
     if (type == ETYPE_LEAF) and @terminal == "nothing"
       top = row2px(y - 1) + (@font_size * 1.5)
@@ -201,7 +201,7 @@ class TreeGraph
   end
 
   # Draw a triangle between child/parent elements
-  def triangle_to_parent(fromX, fromY, fromW, toX, textW)
+  def triangle_to_parent(fromX, fromY, fromW, toX, textW, symmetrize = true)
     if (fromY == 0)
       return
     end
@@ -213,8 +213,12 @@ class TreeGraph
     fromLeft1 = (fromCenter + textW / 2).ceil
     fromLeft2 = (fromCenter - textW / 2).ceil
     toBot    = (row2px(fromY - 1) + @e_height)
-    toLeft   = (toX + textW / 2 + B_SIDE * 2)
-  
+    if symmetrize
+      toLeft   = (toX + textW / 2 + B_SIDE)
+    else
+      toLeft   = (toX + textW / 2 + B_SIDE * 3)
+    end
+        
     @gc.fill("none")
     @gc.stroke @col_line
     @gc.stroke_width 1    
@@ -334,9 +338,16 @@ class TreeGraph
             if(j.parent != 0 )
               words = j.content.split(" ")
               unless @terminal == "nothing" && ETYPE_LEAF == j.type
-                if (@terminal == "triangle" && ETYPE_LEAF == j.type && x == parent_indent && words.length > 1)
+                if (@terminal == "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, @e_list.get_element_width(j.parent), txt_width)
+                elsif (@terminal == "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, @e_list.get_element_width(j.parent), 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
@@ -374,9 +385,16 @@ class TreeGraph
               words = k.content.split(" ")
               dw = img_get_txt_width(k.content, @font, @font_size)
               unless @terminal == "nothing" && ETYPE_LEAF == k.type
-                if (@terminal == "triangle" && ETYPE_LEAF == k.type && k.indent == j.indent && words.length > 1)
+                if (@terminal == "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, tw, txt_width)
+                elsif (@terminal == "auto" && ETYPE_LEAF == k.type && k.indent == j.indent)
+                  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, tw, 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
@@ -411,10 +429,17 @@ class TreeGraph
               words = k.content.split(" ")
               dw = img_get_txt_width(k.content, @font, @font_size)
               unless @terminal == "nothing" && ETYPE_LEAF == k.type
-                if (@terminal == "triangle" && ETYPE_LEAF == k.type && words.length > 1)
+                if (@terminal == "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, 
                                      @e_list.get_element_width(k.parent), txt_width)
+                elsif (@terminal == "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, @e_list.get_element_width(k.parent), 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

data/lib/rsyntaxtree/version.rb

@@ -1,4 +1,4 @@
 module RSyntaxTree
-  VERSION = "0.5.1"
+  VERSION = "0.6.5"
 end
 

data/lib/rsyntaxtree.rb

@@ -68,6 +68,10 @@ class RSGenerator
           new_params["font"] = FONT_DIR + "/ipamp.ttf"
         elsif value == "cjk"
           new_params["font"] = FONT_DIR + "/wqy-zenhei.ttf"
+        elsif value == "aru"
+          new_params["font"] = FONT_DIR + "/ArialUnicode.ttf"
+        elsif value == "tnr"
+          new_params["font"] = FONT_DIR + "/TimesNewRoman.ttf"
         end
       else
         new_params[key] = value
@@ -81,7 +85,7 @@ class RSGenerator
       "autosub"    => false,
       "fontsize"   => 18,
       "format"     => "png",
-      "leafstyle"   => "triangle",
+      "leafstyle"   => "auto",
       "font"        => FONT_DIR + "/ipagp.ttf",
       "filename"   => "syntree",
       "data"       => "",

data/public/js/rsyntaxtree.js

@@ -17,13 +17,14 @@ $(function(){
   }
   
   function draw_graph(data){
-    $("#result").html("<img id='tree_image'>");
 	$.ajax({
 	    url: 'draw_png',
 	    type: 'POST',
 	    data: make_params(data),
-	    success: function (png) {
-	      $('#tree_image').attr('src', 'data:image/png;base64, ' + png);
+	    success: function (raw_data) {
+	      var png_img = 'data:image/png;base64, ' + raw_data;
+        $("#result").html("<img id='tree_image'>");
+	      $('#tree_image').attr('src', png_img);
 	    }
     });
   }

data/views/footer.haml

@@ -1,3 +1,3 @@
 .footer
   %p
-    © Yoichiro Hasebe 2012
+    © Yoichiro Hasebe 2013

data/views/index.haml

@@ -11,11 +11,12 @@
       #alert{:style => "height:20px;"}
     .span12
       %textarea.span12{:id => "data", :cols => 100, :style => "font-size: 11pt; height: 4em;line-height: 140%;"}
-        [S [NP RSyntaxTree][VP [V generates][NP multilingual syntax trees]]]
+        [S [NP RSyntaxTree^][VP [V generates][NP multilingual syntax trees]]]
   .row
     .span2
       %h4 Leaf-style
       %select{:name => "leafstyle", :style => "width:110px;"}
+        %option{:value => "auto"}Auto
         %option{:value => "triangle"}Triangle
         %option{:value => "bar"}Bar
         %option{:value => "nothing"}Nothing
@@ -27,6 +28,9 @@
         %option{:value => "jp-gothic"}JP-Gothic
         %option{:value => "jp-mincho"}JP-Mincho
         %option{:value => "cjk"}CJK
+        %option{:value => "cjk"}CJK
+        %option{:value => "aru"}ARU
+        %option{:value => "tnr"}TNR
     .span2
       %h4 Font-size 
       %select{:name => "fontsize", :style => "width:60px;"}
@@ -107,8 +111,14 @@
       %p
         Every branch or leaf of a tree must belong to a node. To create a node, place a label 
         right next to the opening bracket. Arbitrary number of branches can follow with a 
-        preceding space. When a node has one and only one leaf and the leaf contains more than 
-        one space characters (i.e. when it’s a phrase).
+        preceding space.
+
+      %p
+        There are several modes in which the shape of connectors between a terminal node and its leaf are 
+        drawn differently (auto, triangle, bar, and nothing). In auto mode, a triangle is used if the leaf
+        contains one or more spaces inside (i.e. if it’s a phrase), but if it contains no spaces (i.e. if
+        it is just a word), a straight bar will be drawn instead (unless the leaf contains a "^" symbol at the end
+        which makes it a single-word phrase).
 
       %p
         You can put a subscript to any node by putting the _ character between the main label and 

data/views/navbar.haml

@@ -5,4 +5,4 @@
         %span.icon-bar
         %span.icon-bar
         %span.icon-bar
-      %a.brand{:href => '/'}RSyntaxTree
+      %a.brand{:href => 'https://github.com/yohasebe/rsyntaxtree'}RSyntaxTree 0.6.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &70171855522580 !ruby/object:Gem::Requirement
+  requirement: &70313691199800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70171855522580
+  version_requirements: *70313691199800
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70171855521840 !ruby/object:Gem::Requirement
+  requirement: &70313691199380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70171855521840
+  version_requirements: *70313691199380
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70171855521120 !ruby/object:Gem::Requirement
+  requirement: &70313681798040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70171855521120
+  version_requirements: *70313681798040
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &70171855520620 !ruby/object:Gem::Requirement
+  requirement: &70313691228640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70171855520620
+  version_requirements: *70313691228640
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70171855520160 !ruby/object:Gem::Requirement
+  requirement: &70313691228220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70171855520160
+  version_requirements: *70313691228220
 description: Yet another syntax tree generator made with Ruby and RMagick
 email:
 - yohasebe@gmail.com
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rsyntaxtree
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: RSyntaxTree is a graphical syntax tree generator written in Ruby