rsyntaxtree 1.2.3 → 1.2.5

data/Rakefile

@@ -15,80 +15,5 @@ end
 
 desc "Generate SVG and PNG example images"
 task :generate do
-  examples_dir = File.expand_path(File.join(__dir__, "docs", "_examples"))
-  svg_dir = File.expand_path(File.join(__dir__, "docs", "assets", "svg"))
-  png_dir = File.expand_path(File.join(__dir__, "docs", "assets", "img"))
-  Dir.glob("*.md", base: examples_dir).map do |md|
-    md = File.join(examples_dir, md)
-    config = YAML.load_file(md)
-    rst = File.read(md).scan(/```([^`]+)```/m).last.first
-
-    opts = {
-      format: "png",
-      leafstyle: "auto",
-      fontstyle: "sans",
-      fontsize: 16,
-      margin: 1,
-      vheight: 2.0,
-      color: "modern",
-      symmetrize: "on",
-      transparent: "off",
-      polyline: "off",
-      hide_default_connectors: "off"
-    }
-    name = nil
-    config.each do |key, value|
-      next if value.to_s == ""
-
-      case key
-      when "name"
-        name = value
-        opts[:name] = name
-      when "color"
-        opts[:color] = case value
-                       when "modern", "on", "true"
-                         "modern"
-                       when "traditional"
-                         "traditional"
-                       else
-                         "off"
-                       end
-      when "polyline"
-        opts[:polyline] = value
-      when "hide_default_connectors"
-        opts[:hide_default_connectors] = value
-      when "symmetrization"
-        opts[:symmetrize] = value
-      when "connector"
-        opts[:leafstyle] = value
-      when "font"
-        opts[:fontstyle] = case value
-                           when /mono/i
-                             "mono"
-                           when /sans/i
-                             "sans"
-                           when /serif/i
-                             "serif"
-                           when /wqy/i
-                             "cjk"
-                           else
-                             "sans"
-                           end
-      end
-    end
-    opts[:data] = rst
-    rsg = RSyntaxTree::RSGenerator.new(opts)
-
-    File.open(File.join(svg_dir, "#{name}.svg"), "w") do |f|
-      puts "Creating svg file: #{name}.svg"
-      svg = rsg.draw_svg
-      f.write(svg)
-    end
-
-    File.open(File.join(png_dir, "#{name}.png"), "w") do |f|
-      puts "Creating png file: #{name}.png"
-      png = rsg.draw_png
-      f.write(png)
-    end
-  end
+  require_relative "devel/generate_examples"
 end

data/bin/rsyntaxtree

@@ -22,6 +22,7 @@ opts = Optimist.options do
   opt :fontstyle, "Font style (available when ttf font is specified): sans, serif, cjk, mono", default: "sans"
   opt :font, "Path to a ttf font used to generate tree (optional)", type: String
   opt :fontsize, "Size: 8-26", default: 16
+  opt :linewidth, "Size: 1-5", default: 1
   opt :margin, "Margin: 0-10", default: 1
   opt :vheight, "Connector Height: 0.5-5.0", default: 2.0
   opt :color, "Color text and bars: modern, traditional, or off", default: "modern"
@@ -37,6 +38,7 @@ Optimist.die :leafstyle, "must be auto, triangle, bar, or nothing" unless /\A(au
 Optimist.die :fontstyle, "must be sans, serif, cjk, or mono" unless /\A(sans|serif|cjk|mono)\z/ =~ opts[:fontstyle]
 Optimist.die :font, "must be path to an existing ttf font" if opts[:font] && !File.exist?(opts[:font])
 Optimist.die :fontsize, "must be in the range of 8-26" unless opts[:fontsize] >= 8 && opts[:fontsize] <= 26
+Optimist.die :linewidth, "must be in the range of 1-5" unless opts[:linewidth] >= 1 && opts[:linewidth] <= 5
 Optimist.die :color, "must be either modern, traditional, or off" unless /\A(modern|traditional|on|off|true|false)\z/ =~ opts[:color]
 Optimist.die :symmetrize, "must be either on or off" unless /\A(on|off|true|false)\z/ =~ opts[:symmetrize]
 Optimist.die :margin, "must be in the range of 0-10" if opts[:margin].negative? || opts[:margin] > 10

data/devel/generate_examples.rb

@@ -0,0 +1,91 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+examples_dir = File.expand_path(File.join(__dir__, "..", "docs", "_examples"))
+svg_dir = File.expand_path(File.join(__dir__, "..", "docs", "assets", "svg"))
+png_dir = File.expand_path(File.join(__dir__, "..", "docs", "assets", "img"))
+Dir.glob("*.md", base: examples_dir).map do |md|
+  md = File.join(examples_dir, md)
+  config = YAML.load_file(md)
+  rst = File.read(md).scan(/```([^`]+)```/m).last.first
+  begin
+    RSyntaxTree::RSGenerator.check_data(rst)
+  rescue StandardError => e
+    puts "Error detected in #{md}"
+    pp e
+    exit
+  end
+
+  opts = {
+    format: "png",
+    leafstyle: "auto",
+    fontstyle: "sans",
+    fontsize: 16,
+    linewidth: 1,
+    margin: 1,
+    vheight: 2.0,
+    color: "modern",
+    symmetrize: "on",
+    transparent: "off",
+    polyline: "off",
+    hide_default_connectors: "off"
+  }
+  name = nil
+  config.each do |key, value|
+    next if value.to_s == ""
+
+    case key
+    when "name"
+      name = value
+      opts[:name] = name
+    when "color"
+      opts[:color] = case value
+                     when "modern", "on", "true"
+                       "modern"
+                     when "traditional"
+                       "traditional"
+                     else
+                       "off"
+                     end
+    when "linewidth", "line_width"
+      opts[:linewidth] = value
+    when "polyline"
+      opts[:polyline] = value
+    when "hide_default_connectors"
+      opts[:hide_default_connectors] = value
+    when "connector_height"
+      opts[:vheight] = value
+    when "symmetrization"
+      opts[:symmetrize] = value
+    when "connector"
+      opts[:leafstyle] = value
+    when "font"
+      opts[:fontstyle] = case value
+                         when /mono/i
+                           "mono"
+                         when /sans/i
+                           "sans"
+                         when /serif/i
+                           "serif"
+                         when /wqy/i
+                           "cjk"
+                         else
+                           "sans"
+                         end
+    end
+  end
+  opts[:data] = rst
+  rsg = RSyntaxTree::RSGenerator.new(opts)
+
+  File.open(File.join(svg_dir, "#{name}.svg"), "w") do |f|
+    puts "Creating svg file: #{name}.svg"
+    svg = rsg.draw_svg
+    f.write(svg)
+  end
+
+  File.open(File.join(png_dir, "#{name}.png"), "w") do |f|
+    puts "Creating png file: #{name}.png"
+    png = rsg.draw_png
+    f.write(png)
+  end
+end

data/docs/_examples/000.md

@@ -6,8 +6,10 @@ category: "General"
 polyline: "off"
 symmetrization: "off"
 connector: "auto"
+connector_height: "1.5"
+linewidth: "1"
 hide_default_connectors: "off"
-font: "Noto Sans Mono"
+font: "Noto Sans"
 reference: 
 ---
 ```

data/docs/_examples/001.md

@@ -6,6 +6,8 @@ category: "General"
 polyline: "off"
 symmetrization: "off"
 connector: "auto"
+connector_height: "0.5"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference: 

data/docs/_examples/002.md

@@ -6,6 +6,8 @@ category: "Generative Grammar"
 polyline: "off"
 symmetrization: "off"
 connector: "auto"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference: "Chomsky 1995: 50"

data/docs/_examples/003.md

@@ -6,6 +6,8 @@ category: "Generative Grammar"
 polyline: "off"
 symmetrization: "off"
 connector: "auto"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference: "Chomsky 1995: 62"

data/docs/_examples/004.md

@@ -6,6 +6,8 @@ category: "Generative Grammar"
 polyline: "off"
 symmetrization: "off"
 connector: "auto"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference: "Chomsky 1995: 180"

data/docs/_examples/005.md

@@ -6,6 +6,8 @@ category: "Generative Grammar"
 polyline: "off"
 symmetrization: "off"
 connector: "none"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference: "Chomsky 1995: 355"

data/docs/_examples/006.md

@@ -6,6 +6,8 @@ category: "Generative Grammar"
 polyline: "off"
 symmetrization: "off"
 connector: "none"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference: "Chomsky 1995: 369"

data/docs/_examples/007.md

@@ -6,6 +6,8 @@ category: "Generative Grammar"
 polyline: "off"
 symmetrization: "off"
 connector: "bar"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference:

data/docs/_examples/008.md

@@ -6,6 +6,8 @@ category: "Generative Grammar"
 polyline: "off"
 symmetrization: "off"
 connector: "auto"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference:

data/docs/_examples/009.md

@@ -6,6 +6,8 @@ category: "Generative Grammar"
 polyline: "off"
 symmetrization: "off"
 connector: "auto"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference:

data/docs/_examples/010.md

@@ -5,6 +5,8 @@ polyline: "off"
 color: "modern"
 symmetrization: "off"
 connector: "none"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference: "Radford 2004"

data/docs/_examples/011.md

@@ -6,6 +6,8 @@ category: "Combinatory Categorial Grammar"
 polyline: "off"
 symmetrization: "off"
 connector: "none"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference:

data/docs/_examples/012.md

@@ -6,6 +6,8 @@ category: "Combinatory Categorial Grammar"
 polyline: "off"
 symmetrization: "off"
 connector: "none"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference:

data/docs/_examples/013.md

@@ -6,6 +6,8 @@ category: "Head-Driven Phrase Structure Grammar"
 polyline: "off"
 symmetrization: "off"
 connector: "bar"
+connector_height: "2"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference:

data/docs/_examples/014.md

@@ -6,6 +6,8 @@ category: "Cognitive Grammar"
 polyline: "off"
 symmetrization: "off"
 connector: "auto"
+connector_height: "1.5"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference:

data/docs/_examples/015.md

@@ -6,6 +6,8 @@ category: "Phonology"
 polyline: "off"
 symmetrization: "on"
 connector: "auto"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "WQY Zen Hei"
 reference:

data/docs/_examples/016.md

@@ -6,6 +6,8 @@ category: "Miscellaneous"
 polyline: "off"
 symmetrization: "off"
 connector: "bar"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "WQY Zen Hei"
 reference:

data/docs/_examples/017.md

@@ -6,6 +6,8 @@ category: "General"
 polyline: "on"
 symmetrization: "off"
 connector: "auto"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference: 

data/docs/_examples/018.md

@@ -6,6 +6,8 @@ polyline: "off"
 color: "modern"
 symmetrization: "off"
 connector: "auto"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference: "Langacker 1969: 175"

data/docs/_examples/019.md

@@ -6,6 +6,8 @@ category: "Computer Science"
 polyline: "on"
 symmetrization: "off"
 connector: "bar"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Sans Mono"
 reference: "Stuart 2014"

data/docs/_examples/020.md

@@ -6,6 +6,8 @@ category: "General"
 polyline: "off"
 symmetrization: "off"
 connector: "bar"
+connector_height: "2"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "WQY Zen Hei"
 reference: 
@@ -13,8 +15,8 @@ reference:
 ```
 [The<>umpires<>talked<>to<>the<>players
   [the<>umpires
-    [the 
-      [<> ði]
+    [the+-1
+      [<> ði+-1]
     ]
     [umpires
       [umpire ʌ́mpaɪər]
@@ -26,11 +28,11 @@ reference:
       [talk tɔːk]
       [ed t]
     ]
-    [to 
-      [<> tə]
+    [to+-2
+      [<> tə+-2]
     ]
-    [the 
-      [<> ðə]
+    [the+-3
+      [<> ðə+-3]
     ]
     [players
       [player pléɪər]

data/docs/_examples/021.md

@@ -6,6 +6,8 @@ category: "Pragmatics"
 polyline: "on"
 symmetrization: "off"
 connector: "bar"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference: "Zufferey, Moeschler, and Reboul 2014"

data/docs/_examples/022.md

@@ -6,6 +6,8 @@ category: "Computer Science"
 polyline: "on"
 symmetrization: "off"
 connector: "bar"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Sans Mono"
 reference: ""

data/docs/_examples/023.md

@@ -6,6 +6,8 @@ category: "Miscellaneous"
 polyline: "on"
 symmetrization: "off"
 connector: "bar"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Sans"
 reference: ""

data/docs/_examples/024.md

@@ -6,6 +6,8 @@ category: "Generative Grammar"
 polyline: "off"
 symmetrization: "off"
 connector: "none"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference:

data/docs/_examples/025.md

@@ -6,6 +6,8 @@ category: "Construction Grammar"
 polyline: "on"
 symmetrization: "off"
 connector: "bar"
+connector_height: "2"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference: "Goldberg 2006: 177"

data/docs/_examples/026.md

@@ -6,6 +6,8 @@ category: "Functional Grammar"
 polyline: "on"
 symmetrization: "off"
 connector: "bar"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference: "Halliday and Hasan 1976: 33"

data/docs/_examples/027.md

@@ -6,6 +6,8 @@ category: "Functional Grammar"
 polyline: "on"
 symmetrization: "off"
 connector: "bar"
+connector_height: "2"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference: "Halliday and Hasan 1976: 207"

data/docs/_examples/028.md

@@ -6,6 +6,8 @@ category: "General"
 polyline: "off"
 symmetrization: "off"
 connector: "auto"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference: 

data/docs/_examples/029.md

@@ -6,6 +6,8 @@ category: "Formal Concept Analysis"
 polyline: "off"
 symmetrization: "off"
 connector: "auto"
+connector_height: "3"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Sans Mono"
 reference: 

data/docs/_examples/030.md

@@ -6,6 +6,8 @@ category: "Construction Grammar"
 polyline: "off"
 symmetrization: "off"
 connector: "auto"
+connector_height: "2"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference: "Goldberg 1995: 109"

data/docs/_examples/031.md

@@ -6,6 +6,8 @@ category: "Formal Semantics"
 polyline: "off"
 symmetrization: "off"
 connector: "auto"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Sans Mono"
 reference: 

data/docs/_examples/032.md

@@ -6,6 +6,8 @@ polyline: "on"
 color: "modern"
 symmetrization: "off"
 connector: "none"
+connector_height: "2"
+linewidth: "5"
 hide_default_connectors: "off"
 font: "Noto Sans Mono"
 reference: ""

data/docs/_examples/033.md

@@ -6,6 +6,8 @@ polyline: "off"
 color: "modern"
 symmetrization: "off"
 connector: "auto"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference: ""

data/docs/_examples/034.md

@@ -6,6 +6,8 @@ category: "Construction Grammar"
 polyline: "off"
 symmetrization: "off"
 connector: "auto"
+connector_height: "2"
+linewidth: "1"
 hide_default_connectors: "off"
 font: "Noto Serif"
 reference: "Croft and Cruse 2004: 264"

data/docs/_examples/035.md

@@ -6,6 +6,8 @@ category: "Construction Grammar"
 polyline: "off"
 symmetrization: "on"
 connector: "auto"
+connector_height: "2"
+linewidth: "1"
 hide_default_connectors: "on"
 font: "Noto Serif"
 reference: "Goldberg 1995: 109"

data/docs/_examples/036.md

@@ -6,6 +6,8 @@ category: "Cognitive Grammar"
 polyline: "off"
 symmetrization: "on"
 connector: "auto"
+connector_height: "2"
+linewidth: "1"
 hide_default_connectors: "on"
 font: "Noto Serif"
 reference:

data/docs/_examples/037.md

@@ -1,18 +1,21 @@
 ---
 name: "037"
+caption: "Action chain"
 color: "modern"
-category: "Test"
+category: "Cognitive Grammar"
 polyline: "off"
 symmetrization: "on"
 connector: "auto"
+connector_height: "1"
+linewidth: "3"
 hide_default_connectors: "on"
 font: "Noto Serif"
-reference:
 ---
 ```
-[###{X}--|x|\
+[###John<>opened<>the<>door<>with<>the<>key\
     <>\
-    {Y}--|y|--*{a}*\
+    {}->{}->{}->\
     <>\
-    {Y}--|y|]
+    AGT<>\><>INST<>\><>PAT
+]
 ```

data/docs/_examples/038.md

@@ -2,10 +2,12 @@
 name: "038"
 caption: "Relations between WordNet senses"
 color: "none"
-category: "NLP"
+category: "Natural Language Processing"
 polyline: "off"
 symmetrization: "on"
 connector: "auto"
+connector_height: "2"
+linewidth: "1"
 hide_default_connectors: "on"
 font: "Noto Sans Mono"
 reference: "Jurafsky and Martin 2018"

data/docs/_examples/039.md

@@ -1,10 +1,13 @@
 ---
 name: "039"
+caption: ""
 color: "modern"
 category: "Test"
 polyline: "off"
 symmetrization: "on"
 connector: "auto"
+connector_height: "1"
+linewidth: "1"
 hide_default_connectors: "on"
 font: "Noto Serif"
 reference: