rsyntaxtree 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0586aec9488760401c729ef70db38c730883341e'
-  data.tar.gz: f9f95b8713cbcef850c3be737e5cd2cd2c3babe5
+  metadata.gz: f3943676da7a1329b22b9cc0eadd8e02f9386a2a
+  data.tar.gz: 85d11c50038206a19b0bcff9c2b644b9d9c6b36b
 SHA512:
-  metadata.gz: cbbe7a1e063d5098f40b0f67b1fe832b92ff58b3bb7d9b3823ccafae6979dd1930c7b7ac5f787b0cdf17eeda267c15faf5c2305b843576cff15b83f062bd6be3
-  data.tar.gz: dfa583dbcf971ccaab04ce2db7f3dd633e0110e575063ab82cf80b740e73348397d41afa6922595d2a12c0a709b717f48ac7949f626d0235a907eb14223f1e76
+  metadata.gz: a0e71eeff8ab7f0242059efb5e32a06bd0b53c08b1454bf60aaedbf4d60bdfd0d6aeb66ec5959ab0c63da33055597d8ae23f3bf5e262d42e322cf2cf927f85af
+  data.tar.gz: 422647a20c14a9f985a31e89de81e0a5159477dab18e4e09bb573fce7284d8e3ce91fb159995dceca12d604b49a7a22eac08a8ea92f90b70997d90695bad7678

data/README.md

@@ -45,6 +45,8 @@ 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):

data/lib/rsyntaxtree/string_parser.rb

@@ -203,8 +203,12 @@ class StringParser
 
         if spaceat
           parts[0] = token_r[0, spaceat].join
+          parts[0] = parts[0].gsub("<>", " ")
+
           tl =token_r.length
           parts[1] = token_r[spaceat, tl - spaceat].join
+          parts[1] = parts[1].gsub("<>", " ")
+
           element = Element.new(@id, parent, parts[0], @level)
           @id += 1
           @elist.add(element)
@@ -215,11 +219,12 @@ class StringParser
           @id += 1          
           @elist.add(element)
         else
-          element = Element.new(@id, parent, token_r.join, @level)
+          joined = token_r.join.gsub("<>", " ")
+          element = Element.new(@id, parent, joined, @level)
           @id += 1          
           newparent = element.id
           @elist.add(element)
-          count_node(token_r.join)
+          count_node(joined)
         end 
 
         @level += 1

data/lib/rsyntaxtree/tree_graph.rb

@@ -109,17 +109,17 @@ class TreeGraph < Graph
 
     if /\A\*\*\*(.+)\*\*\*\z/ =~ main
       main = $1
-      if !@multibyte || !main.contains_cjk?
+      if !@multibyte
         main_font = @font_itbd
       end
     elsif /\A\*\*(.+)\*\*\z/ =~ main
       main = $1
-      if !@multibyte || !main.contains_cjk?
+      if !@multibyte
         main_font = @font_bd
       end
     elsif /\A\*(.+)\*\z/ =~ main
       main = $1
-      if !@multibyte || !main.contains_cjk?
+      if !@multibyte
         main_font = @font_it
       end
     else
@@ -150,17 +150,17 @@ class TreeGraph < Graph
 
     if /\A\*\*\*(.+)\*\*\*\z/ =~ sub
       sub = $1
-      if !@multibyte || !sub.contains_cjk?
+      if !@multibyte
         sub_font = @font_itbd
       end
     elsif /\A\*\*(.+)\*\*\z/ =~ sub
       sub = $1
-      if !@multibyte || !sub.contains_cjk?
+      if !@multibyte
         sub_font = @font_bd
       end
     elsif /\A\*(.+)\*\z/ =~ sub
       sub = $1
-      if !@multibyte || !sub.contains_cjk?
+      if !@multibyte
         sub_font = @font_it
       end
     else

data/lib/rsyntaxtree/version.rb

@@ -1,4 +1,4 @@
 module RSyntaxTree
-  VERSION = "0.7.3"
+  VERSION = "0.7.5"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick