rsyntaxtree 1.1.0 → 1.1.1

data/docs/assets/svg/020.svg

@@ -0,0 +1,99 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+  <svg width="1840.0" height="1232.9" viewBox="-20, -20, 1860.0, 1252.9" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <marker id="arrow" markerUnits="strokeWidth" markerWidth="11.200000000000001" markerHeight="11.200000000000001" viewBox="0 0 11.200000000000001 11.200000000000001" refX="5.6000000000000005" refY="0">
+      <polyline fill="none" stroke="purple" stroke-width="1" points="0,11.200000000000001,5.6000000000000005,0,11.200000000000001,11.200000000000001" />
+    </marker>
+    <pattern id="hatchBlack" x="10" y="10" width="10" height="10" patternUnits="userSpaceOnUse" patternTransform="rotate(45)">
+      <line x1="0" y="0" x2="0" y2="10" stroke="black" stroke-width="4"></line>
+    </pattern>
+    <pattern id="hatchForNode" x="10" y="10" width="10" height="10" patternUnits="userSpaceOnUse" patternTransform="rotate(45)">
+      <line x1="0" y="0" x2="0" y2="10" stroke="blue" stroke-width="4"></line>
+    </pattern>
+    <pattern id="hatchForLeaf" x="10" y="10" width="10" height="10" patternUnits="userSpaceOnUse" patternTransform="rotate(45)">
+      <line x1="0" y="0" x2="0" y2="10" stroke="green" stroke-width="4"></line>
+    </pattern>
+  </defs>
+<rect x="-20" y="-20" width="1860.0" height="1252.9" stroke="none" fill="white" />"
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='293.6875' y='118.5'><tspan x='293.6875' y='118.5' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">The<tspan style='fill:none;'>￭</tspan>umpires<tspan style='fill:none;'>￭</tspan>talked<tspan style='fill:none;'>￭</tspan>to<tspan style='fill:none;'>￭</tspan>the<tspan style='fill:none;'>￭</tspan>players</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='102.75' y='387.1'><tspan x='102.75' y='387.1' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">the<tspan style='fill:none;'>￭</tspan>umpires</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='28.0' y='655.7'><tspan x='28.0' y='655.7' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">the</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='61.5' y='924.3000000000001'><tspan x='61.5' y='924.3000000000001' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif"><tspan style='fill:none;'>￭</tspan></tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: green; font-size: 64px;' x='48.0' y='1192.9'><tspan x='48.0' y='1192.9' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">ði</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='358.0' y='655.7'><tspan x='358.0' y='655.7' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">umpires</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='251.5' y='924.3000000000001'><tspan x='251.5' y='924.3000000000001' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">umpire</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: green; font-size: 64px;' x='230.0' y='1192.9'><tspan x='230.0' y='1192.9' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">ʌ́mpaɪər</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='577.0' y='924.3000000000001'><tspan x='577.0' y='924.3000000000001' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">s</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: green; font-size: 64px;' x='580.0' y='1192.9'><tspan x='580.0' y='1192.9' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">z</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='981.625' y='387.1'><tspan x='981.625' y='387.1' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">talked<tspan style='fill:none;'>￭</tspan>to<tspan style='fill:none;'>￭</tspan>the<tspan style='fill:none;'>￭</tspan>players</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='786.0' y='655.7'><tspan x='786.0' y='655.7' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">talked</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='722.0' y='924.3000000000001'><tspan x='722.0' y='924.3000000000001' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">talk</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: green; font-size: 64px;' x='722.5' y='1192.9'><tspan x='722.5' y='1192.9' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">tɔːk</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='936.0' y='924.3000000000001'><tspan x='936.0' y='924.3000000000001' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">ed</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: green; font-size: 64px;' x='961.0' y='1192.9'><tspan x='961.0' y='1192.9' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">t</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='1118.0' y='655.7'><tspan x='1118.0' y='655.7' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">to</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='1134.0' y='924.3000000000001'><tspan x='1134.0' y='924.3000000000001' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif"><tspan style='fill:none;'>￭</tspan></tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: green; font-size: 64px;' x='1124.0' y='1192.9'><tspan x='1124.0' y='1192.9' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">tə</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='1285.0' y='655.7'><tspan x='1285.0' y='655.7' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">the</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='1318.5' y='924.3000000000001'><tspan x='1318.5' y='924.3000000000001' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif"><tspan style='fill:none;'>￭</tspan></tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: green; font-size: 64px;' x='1301.0' y='1192.9'><tspan x='1301.0' y='1192.9' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">ðə</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='1577.25' y='655.7'><tspan x='1577.25' y='655.7' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">players</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='1487.0' y='924.3000000000001'><tspan x='1487.0' y='924.3000000000001' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">player</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: green; font-size: 64px;' x='1495.0' y='1192.9'><tspan x='1495.0' y='1192.9' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">pléɪər</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: blue; font-size: 64px;' x='1767.0' y='924.3000000000001'><tspan x='1767.0' y='924.3000000000001' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">s</tspan>
+</text>
+<text white-space='pre' alignment-baseline='text-top' style='fill: green; font-size: 64px;' x='1770.0' y='1192.9'><tspan x='1770.0' y='1192.9' style="" text-decoration="" font-family="'WenQuanYi Zen Hei', 'Noto Sans', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', sans-serif">z</tspan>
+</text>
+<line style='stroke:black; stroke-width:2;' x1='271.75' y1='288.35' x2='773.1875' y2='167.875' />
+<line style='stroke:black; stroke-width:2;' x1='1274.625' y1='288.35' x2='773.1875' y2='167.875' />
+<line style='stroke:black; stroke-width:2;' x1='73.0' y1='556.95' x2='271.75' y2='436.475' />
+<line style='stroke:black; stroke-width:2;' x1='470.5' y1='556.95' x2='271.75' y2='436.475' />
+<line style='stroke:black; stroke-width:2;' x1='73.0' y1='825.5500000000001' x2='73.0' y2='705.075' />
+<line style='stroke:black; stroke-width:2;' x1='73.0' y1='1094.15' x2='73.0' y2='973.6750000000001' />
+<line style='stroke:black; stroke-width:2;' x1='347.5' y1='825.5500000000001' x2='470.5' y2='705.075' />
+<line style='stroke:black; stroke-width:2;' x1='593.5' y1='825.5500000000001' x2='470.5' y2='705.075' />
+<line style='stroke:black; stroke-width:2;' x1='347.5' y1='1094.15' x2='347.5' y2='973.6750000000001' />
+<line style='stroke:black; stroke-width:2;' x1='593.5' y1='1094.15' x2='593.5' y2='973.6750000000001' />
+<line style='stroke:black; stroke-width:2;' x1='872.0' y1='556.95' x2='1274.625' y2='436.475' />
+<line style='stroke:black; stroke-width:2;' x1='1145.5' y1='556.95' x2='1274.625' y2='436.475' />
+<line style='stroke:black; stroke-width:2;' x1='1330.0' y1='556.95' x2='1274.625' y2='436.475' />
+<line style='stroke:black; stroke-width:2;' x1='1677.25' y1='556.95' x2='1274.625' y2='436.475' />
+<line style='stroke:black; stroke-width:2;' x1='773.0' y1='825.5500000000001' x2='872.0' y2='705.075' />
+<line style='stroke:black; stroke-width:2;' x1='971.0' y1='825.5500000000001' x2='872.0' y2='705.075' />
+<line style='stroke:black; stroke-width:2;' x1='773.0' y1='1094.15' x2='773.0' y2='973.6750000000001' />
+<line style='stroke:black; stroke-width:2;' x1='971.0' y1='1094.15' x2='971.0' y2='973.6750000000001' />
+<line style='stroke:black; stroke-width:2;' x1='1145.5' y1='825.5500000000001' x2='1145.5' y2='705.075' />
+<line style='stroke:black; stroke-width:2;' x1='1145.5' y1='1094.15' x2='1145.5' y2='973.6750000000001' />
+<line style='stroke:black; stroke-width:2;' x1='1330.0' y1='825.5500000000001' x2='1330.0' y2='705.075' />
+<line style='stroke:black; stroke-width:2;' x1='1330.0' y1='1094.15' x2='1330.0' y2='973.6750000000001' />
+<line style='stroke:black; stroke-width:2;' x1='1571.0' y1='825.5500000000001' x2='1677.25' y2='705.075' />
+<line style='stroke:black; stroke-width:2;' x1='1783.5' y1='825.5500000000001' x2='1677.25' y2='705.075' />
+<line style='stroke:black; stroke-width:2;' x1='1571.0' y1='1094.15' x2='1571.0' y2='973.6750000000001' />
+<line style='stroke:black; stroke-width:2;' x1='1783.5' y1='1094.15' x2='1783.5' y2='973.6750000000001' />
+</svg>

data/lib/rsyntaxtree/base_graph.rb

@@ -78,7 +78,7 @@ module RSyntaxTree
         parent = @element_list.get_id(target.parent)
 
         vertical_indent = if !target.triangle &&
-                             @leafstyle == "nothing" &&
+                             (@leafstyle == "nothing" || @leafstyle == "none") &&
                              ETYPE_LEAF == target.type &&
                              parent.children.size == 1
                             parent.vertical_indent + parent.content_height
@@ -180,7 +180,7 @@ module RSyntaxTree
           else
             line_to_parent(parent, child)
           end
-        when "nothing"
+        when "nothing", "none"
           if child.triangle
             triangle_to_parent(parent, child)
           elsif ETYPE_LEAF != child.type

data/lib/rsyntaxtree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RSyntaxTree
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/rsyntaxtree.rb

@@ -72,7 +72,7 @@ module RSyntaxTree
             fontset[:cjk] = FONT_DIR + "/NotoSansJP-Regular.otf"
             fontset[:emoji] = FONT_DIR + "/OpenMoji-Black.ttf"
             new_params[:fontstyle] = "sans"
-          when "noto-serif", value == "serif"
+          when "noto-serif", "serif"
             fontset[:normal] = FONT_DIR + "/NotoSerif-Regular.ttf"
             fontset[:italic] = FONT_DIR + "/NotoSerif-Italic.ttf"
             fontset[:bold] = FONT_DIR + "/NotoSerif-Bold.ttf"
@@ -115,7 +115,6 @@ module RSyntaxTree
       @params[:fontsize]  = @params[:fontsize] * FONT_SCALING
       @params[:margin]    = @params[:margin] * FONT_SCALING
       @params[:fontset] = fontset
-
       single_x_metrics = FontMetrics.get_metrics("X", fontset[:normal], @params[:fontsize], :normal, :normal)
       @global = {}
       @global[:single_x_metrics] = single_x_metrics

data/rsyntaxtree.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "parslet"
   s.add_runtime_dependency "rmagick", "~> 4.2", ">= 4.2.3"
   s.add_runtime_dependency "rsvg2"
+
+  s.add_development_dependency "yaml"
 end

data/test/example_verify_test.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+require "minitest/autorun"
+require "minitest/pride"
+require "yaml"
+require_relative '../lib/rsyntaxtree'
+require_relative '../lib/rsyntaxtree/utils'
+
+class ExampleParserTest < Minitest::Test
+  examples_dir = File.expand_path(File.join(__dir__, "..", "docs", "_examples"))
+  svg_dir = File.expand_path(File.join(__dir__, "..", "docs", "assets", "svg"))
+
+  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: "on",
+      symmetrize: "on",
+      transparent: "off",
+      polyline: "off"
+    }
+    name = nil
+    config.each do |key, value|
+      next if value.to_s == ""
+
+      case key
+      when "name"
+        name = value
+      when "colorization"
+        opts[:color] = value
+      when "polyline"
+        opts[:polyline] = value
+      when "symmetrization"
+        opts[:symmetrize] = value
+      when "connector"
+        opts[:leafstyle] = value
+      when "font"
+        opts[:fontstyle] = case value
+                           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)
+
+    #################################
+    # To test SVG, run the code below
+    #################################
+    svg = rsg.draw_svg
+    opts[:svg] = svg
+    svg_path = File.join(svg_dir, "#{name}.svg")
+    svg_code = File.read(svg_path)
+    puts "Creating example SVG test case: #{name}"
+
+    define_method "test_#{name}" do
+      assert_equal svg_code, opts[:svg]
+    end
+
+    ##########################################
+    # To create SVG for the tests, comment-out
+    # above block and run the code below
+    ##########################################
+    # 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
+
+    ##########################################
+    # To create SVG for the documentation,
+    # comment-out above and run the code below
+    ##########################################
+    # png_dir = File.expand_path(File.join(__dir__, "..", "docs", "assets", "img"))
+    # 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
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-24 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optimist
@@ -78,6 +78,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Syntax tree generator made with Ruby
 email:
 - yohasebe@gmail.com
@@ -159,6 +173,26 @@ files:
 - docs/assets/img/favicon/favicon-16x16.png
 - docs/assets/img/favicon/favicon-32x32.png
 - docs/assets/img/favicon/favicon.ico
+- docs/assets/svg/001.svg
+- docs/assets/svg/002.svg
+- docs/assets/svg/003.svg
+- docs/assets/svg/004.svg
+- docs/assets/svg/005.svg
+- docs/assets/svg/006.svg
+- docs/assets/svg/007.svg
+- docs/assets/svg/008.svg
+- docs/assets/svg/009.svg
+- docs/assets/svg/010.svg
+- docs/assets/svg/011.svg
+- docs/assets/svg/012.svg
+- docs/assets/svg/013.svg
+- docs/assets/svg/014.svg
+- docs/assets/svg/015.svg
+- docs/assets/svg/016.svg
+- docs/assets/svg/017.svg
+- docs/assets/svg/018.svg
+- docs/assets/svg/019.svg
+- docs/assets/svg/020.svg
 - docs/documentation.md
 - docs/documentation_ja.md
 - docs/examples.html
@@ -193,6 +227,7 @@ files:
 - lib/rsyntaxtree/utils.rb
 - lib/rsyntaxtree/version.rb
 - rsyntaxtree.gemspec
+- test/example_verify_test.rb
 - test/markup_parser_test.rb
 homepage: http://github.com/yohasebe/rsyntaxtree
 licenses:
@@ -213,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.2
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: RSyntaxTree is a graphical syntax tree generator written in Ruby