rsyntaxtree 1.2.7 → 1.2.9

data/docs/assets/svg/047.svg

@@ -0,0 +1,62 @@
+<?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="95.4" height="317.25" viewBox="-16.8, 0, 112.2, 328.5" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <marker id="arrow" markerUnits="userSpaceOnUse" viewBox="0 0 10 10" refX="10" refY="5" markerWidth="16.8" markerHeight="16.8" orient="auto">
+      <path d="M 0 0 L 10 5 L 0 10" fill="black"/>
+    </marker>
+    <marker id="arrowBackward" markerUnits="userSpaceOnUse" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="16.8" markerHeight="16.8" orient="auto">
+      <path d="M 0 0 L 10 5 L 0 10 z" fill="black"/>
+    </marker>
+    <marker id="arrowForward" markerUnits="userSpaceOnUse" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="16.8" markerHeight="16.8" orient="auto">
+      <path d="M 10 0 L 0 5 L 10 10 z" fill="black"/>
+    </marker>
+    <marker id="arrowBothways" markerUnits="userSpaceOnUse" viewBox="0 0 30 10" refX="15" refY="5" markerWidth="50.400000000000006" markerHeight="16.8" orient="auto">
+      <path d="M 0 5 L 10 0 L 10 5 L 20 5 L 20 0 L 30 5 L 20 10 L 20 5 L 10 5 L 10 10 z" fill="black"/>
+    </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="black" 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="black" stroke-width="4"></line>
+    </pattern>
+  </defs>
+<rect x="-16.8" y="0" width="112.2" height="328.5" stroke="none" fill="white" />"
+<text white-space='pre' alignment-baseline='text-top' style='fill: black; storoke-width: 0; font-size: 32px;' x='16.799999999999997' y='67.5'><tspan x='29.799999999999997' y='67.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">　</tspan>
+<tspan x='29.799999999999997' y='112.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">　</tspan>
+<tspan x='29.799999999999997' y='157.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">　</tspan>
+<tspan x='29.799999999999997' y='202.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">　</tspan>
+<tspan x='29.799999999999997' y='247.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">　</tspan>
+<tspan x='29.799999999999997' y='292.5' style="" text-decoration="" font-family="'Noto Serif', 'Noto Serif JP', OpenMoji, 'OpenMoji Color', 'OpenMoji Black', serif">　</tspan>
+</text>
+<line style='fill:none; stroke:black; stroke-linejoin:round; stroke-linecap:round; stroke-width:2;' x1='17.799999999999997' y1='54.0' x2='60.8' y2='54.0'></line>
+
+<polyline stroke-linejoin='round' stroke-linecap='round' fill='none' stroke='black' stroke-width='2' points='50.55,48.375 60.8,54.0 50.55,59.625' />
+
+<line style='fill:none; stroke:black; stroke-linejoin:round; stroke-linecap:round; stroke-width:3;' x1='17.799999999999997' y1='99.0' x2='60.8' y2='99.0'></line>
+
+<polyline stroke-linejoin='round' stroke-linecap='round' fill='none' stroke='black' stroke-width='3' points='50.55,93.375 60.8,99.0 50.55,104.625' />
+
+<line style='fill:none; stroke:black; stroke-linejoin:round; stroke-linecap:round; stroke-width:2;' x1='17.799999999999997' y1='144.0' x2='60.8' y2='144.0'></line>
+
+<polyline stroke-linejoin='round' stroke-linecap='round' fill='none' stroke='black' stroke-width='2' points='28.049999999999997,149.625 17.799999999999997,144.0 28.049999999999997,138.375' />
+
+<line style='fill:none; stroke:black; stroke-linejoin:round; stroke-linecap:round; stroke-width:3;' x1='17.799999999999997' y1='189.0' x2='60.8' y2='189.0'></line>
+
+<polyline stroke-linejoin='round' stroke-linecap='round' fill='none' stroke='black' stroke-width='3' points='28.049999999999997,194.625 17.799999999999997,189.0 28.049999999999997,183.375' />
+
+<line style='fill:none; stroke:black; stroke-linejoin:round; stroke-linecap:round; stroke-width:2;' x1='17.799999999999997' y1='234.0' x2='60.8' y2='234.0'></line>
+
+<polyline stroke-linejoin='round' stroke-linecap='round' fill='none' stroke='black' stroke-width='2' points='28.049999999999997,239.625 17.799999999999997,234.0 28.049999999999997,228.375' />
+
+<polyline stroke-linejoin='round' stroke-linecap='round' fill='none' stroke='black' stroke-width='2' points='50.55,228.375 60.8,234.0 50.55,239.625' />
+
+<line style='fill:none; stroke:black; stroke-linejoin:round; stroke-linecap:round; stroke-width:3;' x1='17.799999999999997' y1='279.0' x2='60.8' y2='279.0'></line>
+
+<polyline stroke-linejoin='round' stroke-linecap='round' fill='none' stroke='black' stroke-width='3' points='28.049999999999997,284.625 17.799999999999997,279.0 28.049999999999997,273.375' />
+
+<polyline stroke-linejoin='round' stroke-linecap='round' fill='none' stroke='black' stroke-width='3' points='50.55,273.375 60.8,279.0 50.55,284.625' />
+</svg>

data/docs/documentation.md

@@ -80,7 +80,7 @@ Note: Currently, overline is displayed in SVG, but not in PNG.
 |`normal_subscript_`    |normal<sub>subscript</sub>  |
 |`normal__superscript__`|normal<sup>superscript</sup>|
 
-#### Box and Circle
+#### Box, Circle, Bar, and Arrow
 
 {% include box_and_circle_table.html %}
 

data/docs/documentation_ja.md

@@ -103,7 +103,7 @@ SVG形式を用いる場合，期待通りの表示を得るためには，ご
 
 テキストと組み合わせてサークル○，ボックス□，水平線などを描画することができます．
 
-#### ボックスとサークル
+#### ボックス・サークル・水平線・矢印
 
 {% include box_and_circle_table.html %}
 

data/docs/examples.html

@@ -27,8 +27,8 @@ layout: default
           </button>
         </div>
         <div class='grid'>
-          <div style='margin-top: 0; margin-bottom: auto;'>
-            <div id="text-{{example.name}}" style='max-height: 600px; overflow-y: auto; margin-bottom: 20px;'>
+          <div style='margin-top: 0; margin-bottom: auto; '>
+            <div id="text-{{example.name}}" style='max-height: 600px; overflow-x: auto; overflow-y: auto; margin-bottom: 20px;'>
               {{ example.content | markdownify }}
             </div>
             <table style='line-height: 110%; font-size: 0.85em; margin-bottom: 20px;'>
@@ -36,6 +36,7 @@ layout: default
               <tbody>
                 <tr><td>Category</td><td>{{ example.category}}</td></tr>
                 <tr><td>Connector</td><td>{{ example.connector }}</td></tr>
+                <tr><td>Connector Height</td><td>{{ example.connector_height }}</td></tr>
                 <tr><td>Line Width</td><td>{{ example.linewidth }}</td></tr>
                 <tr><td>Hide Default Connectors</td><td>{{ example.hide_default_connectors }}</td></tr>
                 <tr><td>Polyline</td><td>{{ example.polyline }}</td></tr>
@@ -48,9 +49,9 @@ layout: default
               </tbody>
             </table>
           </div>
-          <div style='margin-top: 0; margin-bottom: auto;'>
+          <div style='margin-top: 0; padding: 10px; margin-bottom: auto;'>
             <a href='assets/img/{{ example.name }}.png' data-lightbox='{{ example.name }}'>
-              <img src='assets/img/{{ example.name}}.png'/>
+              <img src='assets/img/{{ example.name}}.png' />
             </a>
           </div>
         </div>

data/lib/rsyntaxtree/base_graph.rb

@@ -57,7 +57,8 @@ module RSyntaxTree
 
     def calculate_level
       @element_list.get_elements.select { |e| e.type == 2 }.each do |e|
-        e.level = @element_list.get_id(e.parent).level + 1
+        parent = @element_list.get_id(e.parent)
+        e.level = @element_list.get_id(e.parent).level + 1 if parent
       end
     end
 

data/lib/rsyntaxtree/svg_graph.rb

@@ -27,11 +27,11 @@ module RSyntaxTree
       @color = params[:color]
       @fontstyle = params[:fontstyle]
       @polyline = params[:polyline]
-      @line_styles = "<line style='stroke:#{@col_line}; stroke-width:#{@linewidth + LINE_SCALING}; stroke-linejoin:round; stroke-linecap:round;' x1='X1' y1='Y1' x2='X2' y2='Y2' />\n"
+      @line_styles = "<line style='fill: none; stroke:#{@col_line}; stroke-width:#{@linewidth + LINE_SCALING}; stroke-linejoin:round; stroke-linecap:round;' x1='X1' y1='Y1' x2='X2' y2='Y2' />\n"
       @polyline_styles = "<polyline style='stroke:#{@col_line}; stroke-width:#{@linewidth + LINE_SCALING}; fill:none; stroke-linejoin:round; stroke-linecap:round;'
                             points='CHIX CHIY MIDX1 MIDY1 MIDX2 MIDY2 PARX PARY' />\n"
       @polygon_styles = "<polygon style='fill: none; stroke: black; stroke-width:#{@linewidth + LINE_SCALING}; stroke-linejoin:round;stroke-linecap:round;' points='X1 Y1 X2 Y2 X3 Y3' />\n"
-      @text_styles = "<text white-space='pre' alignment-baseline='text-top' style='fill: COLOR; font-size: fontsize' x='X_VALUE' y='Y_VALUE'>CONTENT</text>\n"
+      @text_styles = "<text white-space='pre' alignment-baseline='text-top' style='fill: COLOR; storoke-width: 0; font-size: fontsize' x='X_VALUE' y='Y_VALUE'>CONTENT</text>\n"
       @tree_data = String.new
       @visited_x = {}
       @visited_y = {}
@@ -41,12 +41,12 @@ module RSyntaxTree
     def svg_data
       metrics = parse_list
 
+      @width = metrics[:width] + @global[:h_gap_between_nodes] * 2
       @height = metrics[:height] + @global[:height_connector_to_text] / 2
-      @width = metrics[:width] + @global[:h_gap_between_nodes] / 2
 
-      x1 = 0
+      x1 = 0 - @global[:h_gap_between_nodes]
       y1 = 0
-      x2 = @width + @global[:h_gap_between_nodes] / 2
+      x2 = @width + @global[:h_gap_between_nodes]
       y2 = @height + @global[:height_connector_to_text] / 2
 
       extra_lines = @extra_lines.join("\n")
@@ -183,7 +183,7 @@ module RSyntaxTree
           when :bborder
             stroke_width = @linewidth + BLINE_SCALING
           end
-          @extra_lines << "<line style=\"stroke:#{col}; stroke-linecap:round; stroke-width:#{stroke_width}; \" x1=\"#{x1}\" y1=\"#{y1}\" x2=\"#{x2}\" y2=\"#{y2}\"></line>"
+          @extra_lines << "<line style=\"stroke:#{col}; fill:none; stroke-linecap:round; stroke-width:#{stroke_width}; \" x1=\"#{x1}\" y1=\"#{y1}\" x2=\"#{x2}\" y2=\"#{y2}\"></line>"
         else
           if element.enclosure == :brackets
             this_x = txt_pos - element.content_width / 2
@@ -247,7 +247,7 @@ module RSyntaxTree
 
             if e[:decoration].include?(:box) || e[:decoration].include?(:circle) || e[:decoration].include?(:bar)
               enc_height = e[:height]
-              enc_y = this_y - e[:height] * 0.8 + FONT_SCALING
+              enc_y = this_y - e[:height] * 0.8
               enc_width = e[:width]
               enc_x = this_x
 
@@ -279,12 +279,12 @@ module RSyntaxTree
                              end
 
               if e[:decoration].include?(:box)
-                enc = "<rect style='stroke: #{col}; stroke-linejoin:round; stroke-width:#{stroke_width};'
+                enc = "<rect style='fill: none; stroke: #{col}; stroke-linejoin:round; stroke-width:#{stroke_width};'
                         x='#{enc_x}' y='#{enc_y}'
                         width='#{enc_width}' height='#{enc_height}'
                         fill='#{fill}' />\n"
               elsif e[:decoration].include?(:circle)
-                enc = "<rect style='stroke: #{col}; stroke-width:#{stroke_width};'
+                enc = "<rect style='fill: none; stroke: #{col}; stroke-width:#{stroke_width};'
                         x='#{enc_x}' y='#{enc_y}' rx='#{enc_height / 2}' ry='#{enc_height / 2}'
                         width='#{enc_width}' height='#{enc_height}'
                         fill='#{fill}' />\n"
@@ -294,7 +294,7 @@ module RSyntaxTree
                 x2 = enc_x + enc_width
                 y2 = y1
                 ar_hwidth = e[:width] / 4.0
-                bar = "<line style='stroke:#{col}; stroke-linejoin:round; stroke-linecap:round; stroke-width:#{stroke_width};' x1='#{x1}' y1='#{y1}' x2='#{x2 - stroke_width / 2}' y2='#{y2}'></line>\n"
+                bar = "<line style='fill:none; stroke:#{col}; stroke-linejoin:round; stroke-linecap:round; stroke-width:#{stroke_width};' x1='#{x1 + stroke_width / 2}' y1='#{y1}' x2='#{x2 - stroke_width / 2}' y2='#{y2}'></line>\n"
                 @extra_lines << bar
 
                 if e[:decoration].include?(:arrow_to_l)

data/lib/rsyntaxtree/version.rb

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

data/lib/rsyntaxtree.rb

@@ -13,9 +13,22 @@ ETYPE_NODE = 1
 ETYPE_LEAF = 2
 SUBSCRIPT_CONST = 0.7
 FONT_SCALING = 2
-LINE_SCALING = 2
-BLINE_SCALING = 5
+LINE_SCALING = 1
+BLINE_SCALING = 2
 WHITESPACE_BLOCK = "￭"
+DEFAULT_OPTS = {
+  format: "png",
+  leafstyle: "auto",
+  fontstyle: "sans",
+  fontsize: 16,
+  linewidth: 1,
+  vheight: 2.0,
+  color: "modern",
+  symmetrize: "on",
+  transparent: "off",
+  polyline: "off",
+  hide_default_connectors: "off"
+}.freeze
 
 class RSTError < StandardError
   def initialize(msg = "Error: something unexpected occurred")
@@ -67,7 +80,7 @@ module RSyntaxTree
                               "off"
                             end
         when :fontsize
-          new_params[key] = value.to_i * FONT_SCALING
+          new_params[key] = value.to_i
         when :linewidth
           new_params[key] = value.to_i
         when :vheight
@@ -117,21 +130,7 @@ module RSyntaxTree
       end
 
       # defaults to the following
-      @params = {
-        symmetrize: true,
-        color: "modern",
-        transparent: false,
-        fontsize: 16,
-        linewidth: 2,
-        format: "png",
-        leafstyle: "auto",
-        filename: "syntree",
-        data: "",
-        vheight: 1.0,
-        polyline: false,
-        hide_default_connectors: false
-      }
-
+      @params = DEFAULT_OPTS.dup
       @params.merge! new_params
       @params[:fontsize] = @params[:fontsize] * FONT_SCALING
       @params[:fontset] = fontset
@@ -170,6 +169,24 @@ module RSyntaxTree
       raise RSTError, +"Error: the result syntree is too big"
     end
 
+    def draw_pdf(binary = false)
+      b = StringIO.new
+      svg = draw_svg
+      rsvg = RSVG::Handle.new_from_data(svg)
+      dim = rsvg.dimensions
+      surface = Cairo::PDFSurface.new(b, dim.width, dim.height)
+      context = Cairo::Context.new(surface)
+      context.render_rsvg_handle(rsvg)
+      surface.finish
+      if binary
+        b
+      else
+        b.string
+      end
+    rescue Cairo::InvalidSize
+      raise RSTError, +"Error: the result syntree is too big"
+    end
+
     def draw_svg
       sp = StringParser.new(@params[:data].gsub('&', '&amp;'), @params[:fontset], @params[:fontsize], @global)
       sp.parse
@@ -177,17 +194,14 @@ module RSyntaxTree
       graph.svg_data
     end
 
+    # Currently not used
     def draw_tree
       svg = draw_svg
       image, _data = Magick::Image.from_blob(svg) do |im|
         im.format = 'svg'
       end
-      if @params[:format] == "png"
-        image = draw_png(false)
-      else
-        image.to_blob do |im|
-          im.format = @params[:format].upcase
-        end
+      image.to_blob do |im|
+        im.format = @params[:format].upcase
       end
       image
     end

data/test/example_verify_test.rb

@@ -15,19 +15,7 @@ class ExampleParserTest < Minitest::Test
     config = YAML.load_file(md)
     rst = File.read(md).scan(/```([^`]+)```/m).last.first
 
-    opts = {
-      format: "png",
-      leafstyle: "auto",
-      fontstyle: "sans",
-      fontsize: 16,
-      linewidth: 1,
-      vheight: 2.0,
-      color: "on",
-      symmetrize: "on",
-      transparent: "off",
-      polyline: "off",
-      hide_default_connectors: "off"
-    }
+    opts = DEFAULT_OPTS.dup
     name = nil
     config.each do |key, value|
       next if value.to_s == ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.9
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optimist
@@ -161,6 +161,7 @@ files:
 - docs/_examples/044.md
 - docs/_examples/045.md
 - docs/_examples/046.md
+- docs/_examples/047.md
 - docs/_includes/box_and_circle_table.html
 - docs/_includes/escape_char_table.html
 - docs/_includes/social_media_links.html
@@ -213,6 +214,13 @@ files:
 - docs/assets/img/044.png
 - docs/assets/img/045.png
 - docs/assets/img/046.png
+- docs/assets/img/047.png
+- docs/assets/img/elements/arrow_both.png
+- docs/assets/img/elements/arrow_both_bold.png
+- docs/assets/img/elements/arrow_left.png
+- docs/assets/img/elements/arrow_left_bold.png
+- docs/assets/img/elements/arrow_right.png
+- docs/assets/img/elements/arrow_right_bold.png
 - docs/assets/img/elements/circle.png
 - docs/assets/img/elements/circle_abc.png
 - docs/assets/img/elements/circle_bold.png
@@ -276,6 +284,7 @@ files:
 - docs/assets/svg/044.svg
 - docs/assets/svg/045.svg
 - docs/assets/svg/046.svg
+- docs/assets/svg/047.svg
 - docs/documentation.md
 - docs/documentation_ja.md
 - docs/examples.html
@@ -332,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.2
 signing_key:
 specification_version: 4
 summary: RSyntaxTree is a graphical syntax tree generator written in Ruby