rsyntaxtree 0.7.7 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2b0490e0b866d5e82213a7e131af2eb12f4561b5d2132298324e2309303ad65
-  data.tar.gz: aa27a23a4c922af2c2d3f701ca6cc571fab074eecc3cd327c2296fd79b1d42ff
+  metadata.gz: a93fb86aba069b61d5095d8cd565153b36ea9cdc0bd9903b2ffc656bae5986cb
+  data.tar.gz: a11db6cdb80b0ccdc118761a4f2131915bffd3dc1a13343be4df662e13bb88b3
 SHA512:
-  metadata.gz: c2885be41a0cda5efb42ee408f2ec24fc6da741a9460c50a4bb3376a7f70463748960de0be1c7a5f7822592d04c4b79b50f4e90ebe4b1c0964e2d4acffd28be8
-  data.tar.gz: b861f941a2082d9c02119bb404e96dd121b739315df0188d31382adccf6810f85b57289c3675fcb1e07bc287387720a33df8892c1e02a13f6f524f76e0b41d97
+  metadata.gz: 8ce0bbb49b1c7207aa5d65958e9185dd2e28c762bf39304077b37d03c8e7a2e32b79f2b490d110a6223d1b1ca7df591f43ec82bbc7532f5f4a6c406107e55d72
+  data.tar.gz: 66849abf7520966907cece66a1f12fc3eb29384911ddda5f518ad23ecdf7249d589edebfec98c42f35f468c1dea7204e285a38ddb37e510610bec08807d6d154

data/README.md

@@ -4,7 +4,7 @@
 
 ### Web Interface
 
-Working web interface of is available at <https://yohasebe.com/rsyntaxtree>.
+See updates and a working web interface available at <https://yohasebe.com/rsyntaxtree>.
 
 ### Installation
 
@@ -25,7 +25,7 @@ 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: sans, serif, cjk (default: sans)
+      -n, --fontstyle=<s>     Font style: sans, serif, cjk, math (default: sans)
       -t, --font=<s>          Path to a ttf font used to generate tree (optional)
       -s, --fontsize=<i>      Size: 8-26 (default: 16)
       -c, --color=<s>         Color text and bars: on or off (default: on)

data/bin/rsyntaxtree

@@ -20,9 +20,9 @@ EOS
       :default => "./"
   opt :format, "Output format: png, gif, jpg, pdf, or svg",
       :default => "png"
-  opt :leafstyle, "visual style of tree leaves: auto, triangle, bar, or nothing", 
+  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, cjk",
+  opt :fontstyle, "Font style (available when ttf font is specified): sans, serif, cjk, math",
       :default => "sans"
   opt :font, "Path to a ttf font used to generate tree (optional)", :type => String
   opt :fontsize, "Size: 8-26",
@@ -32,17 +32,17 @@ EOS
   opt :vheight, "Connector Height: 0.5-2.0",
     :default => 1.0
   opt :color, "Color text and bars: on or off",
-      :default => "on" 
+      :default => "on"
   opt :symmetrize, "Generate symmetrical, balanced tree: on or off",
-      :default => "on" 
+      :default => "on"
   opt :autosub, "Put subscript numbers to nodes: on or off",
-      :default => "off"       
+      :default => "off"
 end
 
 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 :fontstyle, "must be sans, serif, cjk, math" unless /\A(sans|serif|cjk|math)\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]

data/lib/rsyntaxtree/graph.rb

@@ -62,7 +62,7 @@ class Graph
 
     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'
@@ -286,7 +286,7 @@ class Graph
 
   def get_txt_only(text)
     text = text.strip
-    if /\A([\+\-\=\*]+).+/ =~ text
+    if /\A([\+\-\=\*\~]+).+/ =~ text
       prefix = $1
       prefix_l = Regexp.escape(prefix)
       prefix_r = Regexp.escape(prefix.reverse)

data/lib/rsyntaxtree/string_parser.rb

@@ -17,18 +17,18 @@
 require 'elementlist'
 require 'element'
 
-def escape_high_ascii(string)
-  html = ""
-  string.length.times do |i|
-    ch = string[i]
-    if(ch < 127)
-      html += ch.chr
-    else
-      html += sprintf("&#%d;", ch)
-    end
-  end  
-  html
-end
+# def escape_high_ascii(string)
+#   html = ""
+#   string.length.times do |i|
+#     ch = string[i]
+#     if(ch < 127)
+#       html += ch.chr
+#     else
+#       html += sprintf("&#%d;", ch)
+#     end
+#   end  
+#   html
+# end
 
 class StringParser
 

data/lib/rsyntaxtree/svg_graph.rb

@@ -18,10 +18,11 @@ require 'graph'
 
 class SVGGraph < Graph
 
-  def initialize(e_list, metrics, symmetrize, color, leafstyle, multibyte, fontstyle, font_size)
+  def initialize(e_list, metrics, symmetrize, color, leafstyle, multibyte, fontstyle, font, font_size)
 
     # Store class-specific parameters
-    @font  = fontstyle == "sans" ? "sans-serif" : fontstyle
+    @fontstyle  = fontstyle
+    @font       = multibyte ? font_cjk : font
     @font_size  = font_size
 
     super(e_list, metrics, symmetrize, color, leafstyle, multibyte, @font, @font_size)
@@ -87,15 +88,12 @@ EOD
       sub  = ""
     end
 
-    if /\A\+(.+)\+\z/ =~ main
+    if /\A\=(.+)\=\z/ =~ main
       main = $1
       main_decoration= "overline"
     elsif /\A\-(.+)\-\z/ =~ main
       main = $1
       main_decoration= "underline"
-    elsif /\A\=(.+)\=\z/ =~ main
-      main = $1
-      main_decoration= "line-through"
     else
       main_decoration= ""
     end
@@ -124,15 +122,12 @@ EOD
     main_width = img_get_txt_width(main, @font, @font_size)
 
     if sub != ""
-      if /\A\+(.+)\+\z/ =~ sub
+      if /\A\=(.+)\=\z/ =~ sub
         sub = $1
         sub_decoration= "overline"
       elsif /\A\-(.+)\-\z/ =~ sub
         sub = $1
         sub_decoration= "underline"
-      elsif /\A\=(.+)\=\z/ =~ sub
-        sub = $1
-        sub_decoration= "line-through"
       else
         sub_decoration= ""
       end

data/lib/rsyntaxtree/tree_graph.rb

@@ -20,7 +20,7 @@ include Magick
 class TreeGraph < Graph
 
   def initialize(e_list, metrics, symmetrize, color, leafstyle, multibyte,
-                 fontstyle, font, font_it, font_bd, font_itbd, font_cjk, font_size,
+                 fontstyle, font, font_it, font_bd, font_itbd, font_math, font_cjk, font_size,
                  margin)
 
     # Store class-specific parameters
@@ -30,6 +30,7 @@ class TreeGraph < Graph
     @font_it    = font_it
     @font_bd    = font_bd
     @font_itbd  = font_itbd
+    @font_math  = font_math
     @font_cjk   = font_cjk
     @margin     = margin
 
@@ -62,10 +63,13 @@ class TreeGraph < Graph
   def to_blob(fileformat='PNG')
     draw
     @im.border!(@margin, @margin, "white")
-    return @im.to_blob do
-      self.format = fileformat
-      self.interlace = PlaneInterlace
-    end
+    # return @im.to_blob do
+    #   self.format = fileformat
+    #   self.interlace = PlaneInterlace
+    # end
+    @im.format = fileformat
+    @im.interlace = PlaneInterlace
+    return @im.to_blob
   end
 
   :private
@@ -94,19 +98,18 @@ class TreeGraph < Graph
       sub  = ""
     end
 
-    if /\A\+(.+)\+\z/ =~ main
+    if /\A\=(.+)\=\z/ =~ main
       main = $1
       main_decoration = OverlineDecoration
     elsif /\A\-(.+)\-\z/ =~ main
       main = $1
       main_decoration = UnderlineDecoration
-    elsif /\A\=(.+)\=\z/ =~ main
-      main = $1
-      main_decoration = LineThroughDecoration
     else
       main_decoration = NoDecoration
     end
 
+    main_font = @font
+
     if /\A\*\*\*(.+)\*\*\*\z/ =~ main
       main = $1
       if !@multibyte
@@ -122,32 +125,30 @@ class TreeGraph < Graph
       if !@multibyte
         main_font = @font_it
       end
-    else
-      main_font = @font
+    end
+
+    if /\A\~(.+)\~\z/ =~ main
+      main = $1
+      main_font = @font_math
     end
 
     # 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, main_font, @font_size)
 
-    if /\A\+(.+)\+\z/ =~ sub
+    if /\A\=(.+)\=\z/ =~ sub
       sub = $1
       sub_decoration = OverlineDecoration
     elsif /\A\-(.+)\-\z/ =~ sub
       sub = $1
       @gc.decorate(UnderlineDecoration)
       sub_decoration = UnderlineDecoration
-    elsif /\A\=(.+)\=\z/ =~ sub
-      sub = $1
-      sub_decoration = LineThroughDecoration
     else
       sub_decoration = NoDecoration
     end
 
     sub_font = @font
-
     if /\A\*\*\*(.+)\*\*\*\z/ =~ sub
       sub = $1
       if !@multibyte
@@ -163,8 +164,11 @@ class TreeGraph < Graph
       if !@multibyte
         sub_font = @font_it
       end
-    else
-      sub_font = @font
+    end
+
+    if /\A~(.+)~\z/ =~ sub
+      sub = $1
+      sub_font = @font_math
     end
 
     if sub != ""

data/lib/rsyntaxtree/version.rb

@@ -1,4 +1,4 @@
 module RSyntaxTree
-  VERSION = "0.7.7"
+  VERSION = "0.8.0"
 end
 

data/lib/rsyntaxtree.rb

@@ -62,6 +62,7 @@ class RSGenerator
           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_math] = FONT_DIR + "/NotoSansMath-Regular.ttf"
           new_params[:font_cjk] = FONT_DIR + "/NotoSansCJKjp-Regular.otf"
           new_params[:fontstyle] = "sans"
         elsif value == "noto-serif" || value == "serif"
@@ -69,6 +70,7 @@ class RSGenerator
           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_math] = FONT_DIR + "/NotoSansMath-Regular.ttf"
           new_params[:font_cjk] = FONT_DIR + "/NotoSerifCJKjp-Regular.otf"
           new_params[:fontstyle] = "serif"
         elsif value == "cjk zenhei" || value == "cjk"
@@ -76,14 +78,24 @@ class RSGenerator
           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_math] = FONT_DIR + "/NotoSansMath-Regular.ttf"
           new_params[:font_cjk] = FONT_DIR + "/wqy-zenhei.ttf"
           new_params[:fontstyle] = "sans"
+        elsif value == "modern-math" || value == "math"
+          new_params[:font] = FONT_DIR + "/latinmodern-math.otf" 
+          new_params[:font_it] = FONT_DIR + "/lmroman10-italic.otf" 
+          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[:fontstyle] = "math"
         end
       else
         new_params[key] = value
       end
     end
 
+    # defaults to the following
     @params = {
       :symmetrize => true,
       :color      => true,
@@ -100,6 +112,7 @@ class RSGenerator
       :font_it    => "/NotoSans-Italic.ttf",
       :font_bd    => "/NotoSans-Bold.ttf",
       :font_bdit  => "/NotoSans-BoldItalic.ttf",
+      :font_math  => "/NotoSansMath-Regular.ttf" 
     }
     @metrics = {
       :e_width  => 120,
@@ -149,7 +162,7 @@ class RSGenerator
     elist = sp.get_elementlist
     graph = SVGGraph.new(elist, @metrics,
       @params[:symmetrize], @params[:color], @params[:leafstyle], @params[:multibyte], 
-      @params[:fontstyle], @params[:fontsize],
+      @params[:fontstyle], @params[:font], @params[:fontsize],
     )
     graph.svg_data
   end
@@ -161,7 +174,7 @@ class RSGenerator
     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[:fontstyle], @params[:font], @params[:font_it], @params[:font_bd], @params[:font_bdit], @params[:font_math],
       @params[:font_cjk], @params[:fontsize], @params[:margin], 
     )
     graph.to_blob(@params[:format])

data/rsyntaxtree.gemspec

@@ -12,14 +12,11 @@ Gem::Specification.new do |s|
   s.summary     = %q{RSyntaxTree is a graphical syntax tree generator written in Ruby}
   s.description = %q{Yet another syntax tree generator made with Ruby and RMagick}
   s.licenses    = ["MIT"]
-
-  s.rubyforge_project = "rsyntaxtree"
-
   s.files         = `git ls-files`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_runtime_dependency("rmagick", '>= 2.16.0')
-  s.add_runtime_dependency("optimist")
+  s.add_runtime_dependency 'rmagick', '~> 4.2', '>= 4.2.3'
+  s.add_runtime_dependency 'optimist', '~> 3.0', '>= 3.0.1'
 end

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.0
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 4.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 4.2.3
 - !ruby/object:Gem::Dependency
   name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
 description: Yet another syntax tree generator made with Ruby and RMagick
 email:
 - yohasebe@gmail.com
@@ -56,11 +68,17 @@ files:
 - fonts/NotoSans-Italic.ttf
 - fonts/NotoSans-Regular.ttf
 - fonts/NotoSansCJKjp-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/latinmodern-math.otf
+- fonts/lmroman10-bold.otf
+- fonts/lmroman10-bolditalic.otf
+- fonts/lmroman10-italic.otf
+- fonts/lmroman10-regular.otf
 - fonts/wqy-zenhei.ttf
 - lib/rsyntaxtree.rb
 - lib/rsyntaxtree/element.rb
@@ -92,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.11
 signing_key:
 specification_version: 4
 summary: RSyntaxTree is a graphical syntax tree generator written in Ruby