rsyntaxtree 0.7.1 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5801173697da7daaf1e8f8741b7af0cf6c296a6a
-  data.tar.gz: 96806aede17441ce30718cfc983a4883166787f7
+SHA256:
+  metadata.gz: b2b0490e0b866d5e82213a7e131af2eb12f4561b5d2132298324e2309303ad65
+  data.tar.gz: aa27a23a4c922af2c2d3f701ca6cc571fab074eecc3cd327c2296fd79b1d42ff
 SHA512:
-  metadata.gz: 50f211f9a4d650270c502d5feafd69abe441becc400aba6df7f38c512ab8f2fb03af37ea983776566a907b5c3d7ffee9074bc24be9b0524c1d5443498212080a
-  data.tar.gz: 5d38af416912e8b362713d771a5a48c484d123b053edd386fdb6f191e2e9d1677228fd51190bf9e312c01f496acef83fdac958db3e55808b8bfb91f143508b51
+  metadata.gz: c2885be41a0cda5efb42ee408f2ec24fc6da741a9460c50a4bb3376a7f70463748960de0be1c7a5f7822592d04c4b79b50f4e90ebe4b1c0964e2d4acffd28be8
+  data.tar.gz: b861f941a2082d9c02119bb404e96dd121b739315df0188d31382adccf6810f85b57289c3675fcb1e07bc287387720a33df8892c1e02a13f6f524f76e0b41d97

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
 gem 'rmagick'
-gem 'trollop'
+gem 'optimist'

data/README.md

@@ -2,8 +2,6 @@
 
 **RSyntaxTree** is a graphical syntax tree generator written in the Ruby programming language inspired by [phpSyntaxTree](http://ironcreek.net/phpsyntaxtree/). 
 
-- - -
-
 ### Web Interface
 
 Working web interface of is available at <https://yohasebe.com/rsyntaxtree>.
@@ -17,7 +15,7 @@ Working web interface of is available at <https://yohasebe.com/rsyntaxtree>.
 For the web interface, see Usage section of <https://yohasebe.com/rsyntaxtree>.
 
 For the command-line interface, type `$rsyntaxtree -h` after installation. Here's what you get:
-    
+
 ```text
 RSyntaxTree, (linguistic) syntax tree generator written in Ruby.
 
@@ -27,14 +25,15 @@ where [options] are:
       -o, --outdir=<s>        Output directory (default: ./)
       -f, --format=<s>        Output format: png, pdf, or svg (default: png)
       -l, --leafstyle=<s>     visual style of tree leaves: auto, triangle, bar, or nothing (default: auto)
-      -n, --fontstyle=<s>     Font style (available when ttf font is specified): sans, serif, mono, cjk (default: sans)
+      -n, --fontstyle=<s>     Font style: sans, serif, cjk (default: sans)
       -t, --font=<s>          Path to a ttf font used to generate tree (optional)
       -s, --fontsize=<i>      Size: 8-26 (default: 16)
-      -m, --margin=<i>        Margin: 0-120 (default: 0)
       -c, --color=<s>         Color text and bars: on or off (default: on)
       -y, --symmetrize=<s>    Generate symmetrical, balanced tree: on or off (default: on)
       -a, --autosub=<s>       Put subscript numbers to nodes: on or off (default: off)
-      -v, --version           Print version and exit
+      -m, --margin=<i>        Margin: 0-120 (default: 0)
+      -v, --vheight=<f>       Connector Height: 0.5-2.0 (default: 1.0)
+      -e, --version           Print version and exit
       -h, --help              Show this message
 ```
 
@@ -46,17 +45,19 @@ There are several modes in which the connectors between terminal nodes and their
 
 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>
 
+See https://yohasebe.com/rsyntaxtree for more detailed info about the syntax.
+
 ### Example
 
 Bracket notation (auto-subscript-on):
 
 ```text
-[S [NP RSyntaxTree^][VP [V generates][NP multilingual syntax trees]]]
+[S [NP RSyntaxTree^][VP [V generates][NP [Adj multilingual] [NP syntax trees]]]]
 ```
 
 Resulting PNG
 
-![RSyntaxTree generates multilingual syntax trees](https://i.gyazo.com/8d8cbce1e8d8d45c0dda0741009641fd.png)
+![RSyntaxTree generates multilingual syntax trees](https://i.gyazo.com/6bb68b0bdb35d7a10c4a11d5788d484f.png)
 
 ### Development
 

data/bin/rsyntaxtree

@@ -4,10 +4,10 @@
 $LOAD_PATH << File.join( File.dirname(__FILE__), '../lib')
 
 require 'rsyntaxtree'
-require 'trollop'
+require 'optimist'
 
-opts = Trollop::options do
-  version "RSyntaxTree #{RSyntaxTree::VERSION} (c) 2018 Yoichiro Hasebe"
+opts = Optimist::options do
+  version "RSyntaxTree #{RSyntaxTree::VERSION} (c) 2021 Yoichiro Hasebe"
   banner <<-EOS
 RSyntaxTree, (linguistic) syntax tree generator written in Ruby.
 
@@ -18,17 +18,19 @@ EOS
 
   opt :outdir, "Output directory",
       :default => "./"
-  opt :format, "Output format: png, pdf, or svg",
+  opt :format, "Output format: png, gif, jpg, pdf, or svg",
       :default => "png"
   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, mono, cjk",
+  opt :fontstyle, "Font style (available when ttf font is specified): sans, serif, cjk",
       :default => "sans"
   opt :font, "Path to a ttf font used to generate tree (optional)", :type => String
   opt :fontsize, "Size: 8-26",
       :default => 16
   opt :margin, "Margin: 0-120",
       :default => 0
+  opt :vheight, "Connector Height: 0.5-2.0",
+    :default => 1.0
   opt :color, "Color text and bars: on or off",
       :default => "on" 
   opt :symmetrize, "Generate symmetrical, balanced tree: on or off",
@@ -37,16 +39,17 @@ EOS
       :default => "off"       
 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 auto, triangle, bar, or nothing" unless /\A(auto|triangle|bar|nothing)\z/ =~ opts[:leafstyle]
-Trollop::die :fontstyle, "must be sans, serif, mono, cjk" unless /\A(sans|serif|mono|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-26" unless opts[:fontsize] >= 8 && opts[:fontsize] <= 26
-Trollop::die :margin, "must be in the range 0-120" if opts[:margin] < 0 || opts[:margin] > 120
-Trollop::die :color, "must be either on or off" unless /\A(on|off)\z/ =~ opts[:color]
-Trollop::die :symmetrize, "must be either on or off" unless /\A(on|off)\z/ =~ opts[:symmetrize]
-Trollop::die :autosub, "must be either on or off" unless /\A(on|off)\z/ =~ opts[:autosub]
+Optimist::die :outdir, "must be an exsting directory path" unless FileTest::directory?(opts[:outdir])
+Optimist::die :format, "must be png, jpg, gif, or svg" unless /\A(png|jpg|gif|pdf|svg)\z/ =~ opts[:format]
+Optimist::die :leafstyle, "must be auto, triangle, bar, or nothing" unless /\A(auto|triangle|bar|nothing)\z/ =~ opts[:leafstyle]
+Optimist::die :fontstyle, "must be sans, serif, cjk" unless /\A(sans|serif|cjk)\z/ =~ opts[:fontstyle]
+Optimist::die :font, "must be path to an existing ttf font" if opts[:font] && !File::exists?(opts[:font])
+Optimist::die :fontsize, "must be in the range of 8-26" unless opts[:fontsize] >= 8 && opts[:fontsize] <= 26
+Optimist::die :color, "must be either on or off" unless /\A(on|off)\z/ =~ opts[:color]
+Optimist::die :symmetrize, "must be either on or off" unless /\A(on|off)\z/ =~ opts[:symmetrize]
+Optimist::die :autosub, "must be either on or off" unless /\A(on|off)\z/ =~ opts[:autosub]
+Optimist::die :margin, "must be in the range of 0-120" if opts[:margin] < 0 || opts[:margin] > 120
+Optimist::die :vheight, "must be in the range of 0.5-2.0" if opts[:vheight] < 0.5 || opts[:vheight] > 2.0
 
 string_opts = {}
 opts.each do |key, value|
@@ -68,6 +71,10 @@ outfile = File.new(File.expand_path(string_opts[:outdir]) + "/syntree." + ext, "
 case ext
 when "png"
   outfile.write rsg.draw_png
+when "jpg"
+  outfile.write rsg.draw_jpg
+when "gif"
+  outfile.write rsg.draw_gif
 when "pdf"
   outfile.write rsg.draw_pdf
 when "svg"

data/lib/rsyntaxtree.rb

@@ -12,25 +12,11 @@
 # excellent program phpSyntaxTree.
 # Copyright (c) 2007-2018 Yoichiro Hasebe <yohasebe@gmail.com>
 # Copyright (c) 2003-2004 Andre Eisenbach <andre@ironcreek.net>
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 $LOAD_PATH << File.join( File.dirname(__FILE__), 'rsyntaxtree')
 
-require 'uri'
-require 'imgutils'
+require 'cgi'
+require 'utils'
 require 'element'
 require 'elementlist'
 require 'string_parser'
@@ -38,10 +24,14 @@ require 'tree_graph'
 require 'svg_graph'
 require 'error_message'
 require 'version'
-require 'pp'
 
 FONT_DIR = File.expand_path(File.dirname(__FILE__) + "/../fonts")
 
+ETYPE_UNDEFINED = 0
+ETYPE_NODE = 1
+ETYPE_LEAF = 2
+SUBSCRIPT_CONST = 0.7
+
 class RSGenerator 
   def initialize(params = {})
     new_params = {}
@@ -49,7 +39,7 @@ class RSGenerator
       key = keystr.to_sym
       case key
       when :data
-        data = URI.unescape(value)
+        data = CGI.unescape(value)
         data  = data.gsub('-AMP-', '&')
           .gsub('-PERCENT-', "%")
           .gsub('-PRIME-', "'")
@@ -57,31 +47,43 @@ class RSGenerator
           .gsub('-OABRACKET-', '<')
           .gsub('-CABRACKET-', '>')
         new_params[key] = data
+        new_params[:multibyte] = data.contains_cjk?
       when :symmetrize, :color, :autosub
         new_params[key] = value && value != "off" ? true : false
       when :fontsize
         new_params[key] = value.to_i
       when :margin
         new_params[key] = value.to_i
+      when :vheight
+        new_params[key] = value.to_f
       when :fontstyle
         if value == "noto-sans" || value == "sans"
-          new_params[:font] = FONT_DIR + "/NotoSansCJKjp-Regular.otf"
+          new_params[:font] = FONT_DIR + "/NotoSans-Regular.ttf"
+          new_params[:font_it] = FONT_DIR + "/NotoSans-Italic.ttf"
+          new_params[:font_bd] = FONT_DIR + "/NotoSans-Bold.ttf"
+          new_params[:font_bdit] = FONT_DIR + "/NotoSans-BoldItalic.ttf"
+          new_params[:font_cjk] = FONT_DIR + "/NotoSansCJKjp-Regular.otf"
+          new_params[:fontstyle] = "sans"
         elsif value == "noto-serif" || value == "serif"
-          new_params[:font] = FONT_DIR + "/NotoSerifCJKjp-Regular.otf"
-        elsif value == "noto-mono" || value == "mono"
-          new_params[:font] = FONT_DIR + "/NotoSansMonoCJKjp-Regular.otf"
-        elsif value == "western-sans"
-          new_params[:font] = FONT_DIR + "/DroidSans.ttf"
-        elsif value == "western-serif"
-          new_params[:font] = FONT_DIR + "/DroidSerif-Regular.ttf"
+          new_params[:font] = FONT_DIR + "/NotoSerif-Regular.ttf"
+          new_params[:font_it] = FONT_DIR + "/NotoSerif-Italic.ttf"
+          new_params[:font_bd] = FONT_DIR + "/NotoSerif-Bold.ttf"
+          new_params[:font_bdit] = FONT_DIR + "/NotoSerif-BoldItalic.ttf"
+          new_params[:font_cjk] = FONT_DIR + "/NotoSerifCJKjp-Regular.otf"
+          new_params[:fontstyle] = "serif"
         elsif value == "cjk zenhei" || value == "cjk"
           new_params[:font] = FONT_DIR + "/wqy-zenhei.ttf"
+          new_params[:font_it] = FONT_DIR + "/NotoSans-Italic.ttf"
+          new_params[:font_bd] = FONT_DIR + "/NotoSans-Bold.ttf"
+          new_params[:font_bdit] = FONT_DIR + "/NotoSans-BoldItalic.ttf"
+          new_params[:font_cjk] = FONT_DIR + "/wqy-zenhei.ttf"
+          new_params[:fontstyle] = "sans"
         end
       else
         new_params[key] = value
       end
     end
-    
+
     @params = {
       :symmetrize => true,
       :color      => true,
@@ -89,49 +91,80 @@ class RSGenerator
       :fontsize   => 18,
       :format     => "png",
       :leafstyle  => "auto",
-      :font       => FONT_DIR + "/NotoSansCKjp-Regular.otf",
       :filename   => "syntree",
       :data       => "",
-      :margin     => 0
+      :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",
     }
-    
+    @metrics = {
+      :e_width  => 120,
+      :e_padd   => 14,
+      :v_space  => 20,
+      :h_space  => 20,
+      :b_side   => 10,
+      :b_topbot => 10
+    }
+
     @params.merge! new_params
+    @params[:fontsize]  = @params[:fontsize] * 2
+    @params[:margin]    = @params[:margin] * 2
+    @metrics[:v_space] = @metrics[:v_space] * @params[:vheight]
    end
 
   def self.check_data(text)
      sp = StringParser.new(text)
      sp.valid?
   end
-  
+
   def draw_png
     @params[:format] = "png"
     draw_tree
   end
 
+  def draw_jpg
+    @params[:format] = "jpg"
+    draw_tree
+  end
+
+  def draw_gif
+    @params[:format] = "gif"
+    draw_tree
+  end
+
   def draw_pdf
     @params[:format] = "pdf"
     draw_tree
   end
-    
-  def draw_tree
-    sp = StringParser.new(@params[:data])
-    sp.parse
-    sp.auto_subscript if @params[:autosub]
-    elist = sp.get_elementlist
-    graph = TreeGraph.new(elist, 
-      @params[:symmetrize], @params[:color], @params[:leafstyle], @params[:font], @params[:fontsize], @params[:format], @params[:margin])
-    graph.to_blob(@params[:format])
-  end
-  
+
   def draw_svg
     @params[:format] = "svg"
     sp = StringParser.new(@params[:data].gsub('&', '&amp;').gsub('%', '&#37;'))
     sp.parse
     sp.auto_subscript if @params[:autosub]
     elist = sp.get_elementlist
-    graph = SVGGraph.new(elist, 
-      @params[:symmetrize], @params[:color], @params[:leafstyle], @params[:font], @params[:fontsize])
+    graph = SVGGraph.new(elist, @metrics,
+      @params[:symmetrize], @params[:color], @params[:leafstyle], @params[:multibyte], 
+      @params[:fontstyle], @params[:fontsize],
+    )
     graph.svg_data
   end
+
+  def draw_tree
+    sp = StringParser.new(@params[:data])
+    sp.parse
+    sp.auto_subscript if @params[:autosub]
+    elist = sp.get_elementlist
+    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_cjk], @params[:fontsize], @params[:margin], 
+    )
+    graph.to_blob(@params[:format])
+  end
 end
 

data/lib/rsyntaxtree/element.rb

@@ -10,26 +10,8 @@
 # This file is part of RSyntaxTree, which is a ruby port of Andre Eisenbach's
 # excellent program phpSyntaxTree.
 #
-# Copyright (c) 2007-2018 Yoichiro Hasebe <yohasebe@gmail.com>
+# Copyright (c) 2007-2021 Yoichiro Hasebe <yohasebe@gmail.com>
 # Copyright (c) 2003-2004 Andre Eisenbach <andre@ironcreek.net>
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-ETYPE_UNDEFINED = 0
-ETYPE_NODE = 1
-ETYPE_LEAF = 2
 
 class Element
 
@@ -50,7 +32,7 @@ class Element
         @triangle = false # draw triangle instead of stright bar when in auto mode
       end
     end
-    
+
     # Debug helper function
     def dump
       printf( "ID      : %d\n", @id );

data/lib/rsyntaxtree/elementlist.rb

@@ -10,22 +10,8 @@
 # This file is part of RSyntaxTree, which is a ruby port of Andre Eisenbach's
 # excellent program phpSyntaxTree.
 #
-# Copyright (c) 2007-2018 Yoichiro Hasebe <yohasebe@gmail.com>
+# Copyright (c) 2007-2021 Yoichiro Hasebe <yohasebe@gmail.com>
 # Copyright (c) 2003-2004 Andre Eisenbach <andre@ironcreek.net>
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 require 'element'
 
@@ -36,7 +22,7 @@ class ElementList
       @elements = Array.new # The element array
       @iterator = -1 # Iterator index (used for get_first / get_next)
     end
-    
+
     def add(element)
       @elements << element
       if(element.parent != 0)
@@ -132,6 +118,4 @@ class ElementList
       end
       return maxlevel + 1;
     end
-    
 end
-