rsyntaxtree 1.2.5 → 1.2.6

data/docs/examples.html

@@ -8,14 +8,14 @@ layout: default
 {% assign categories =  all_examples | map: 'category' | join: ','  | split: ','  | group_by: category %}
 <ul>
   {%- for category in categories -%}
-    {%- if category.name != "Test" -%}
+    {%- if category.name != "Test" and category.name != "Error" -%}
       <li><a href="#category-{{ category.name | slugify }}">{{ category.name }}</a> [{{category.size}}]</li>
     {%- endif -%}
   {%- endfor -%}
 </ul>
 
 {%- for category in categories -%}
-  {%- if category.name != "Test" -%}
+  {%- if category.name != "Test" and category.name != "Error" -%}
     <hr />
     <h2 id="category-{{category.name | slugify }}"><b>{{ category.name }}</b></h2>
     {%- for example in all_examples -%}

data/lib/rsyntaxtree/element.rb

@@ -41,7 +41,7 @@ module RSyntaxTree
       if parsed[:status] == :success
         results = parsed[:results]
       else
-        error_text = "Error: input text contains an invalid string"
+        error_text = +"Error: input text contains an invalid string"
         error_text += "\n > " + content
         raise RSTError, error_text
       end
@@ -149,11 +149,6 @@ module RSyntaxTree
           total_height += elements_height.max
           content_width += row_width
         end
-        total_height += if @parent.zero? && @children.empty? && @enclosure != :none
-                          @global[:height_connector_to_text] / 4
-                        else
-                          @global[:height_connector_to_text]
-                        end
         total_width = content_width if total_width < content_width
       end
       @content_width = total_width

data/lib/rsyntaxtree/string_parser.rb

@@ -51,10 +51,10 @@ module RSyntaxTree
     end
 
     def self.valid?(data)
-      raise RSTError, "Error: input text is empty" if data.empty?
+      raise RSTError, +"Error: input text is empty" if data.empty?
 
       if /\[\s*\]/m =~ data
-        raise RSTError, "Error: inside the brackets is empty"
+        raise RSTError, +"Error: inside the brackets is empty"
       end
 
       text = data.strip
@@ -85,11 +85,11 @@ module RSyntaxTree
       end
 
       if open_br.empty? && close_br.empty?
-        raise RSTError, "Error: input text does not contain paired brackets"
+        raise RSTError, +"Error: input text does not contain paired brackets"
       elsif open_br.length == close_br.length
         true
       else
-        raise RSTError, "Error: open and close brackets do not match"
+        raise RSTError, +"Error: open and close brackets do not match"
       end
     end
 

data/lib/rsyntaxtree/svg_graph.rb

@@ -28,10 +28,10 @@ module RSyntaxTree
       @fontstyle = params[:fontstyle]
       @margin = params[:margin].to_i
       @polyline = params[:polyline]
-      @line_styles = "<line style='stroke:#{@col_line}; stroke-width:#{@linewidth + LINE_SCALING}; 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;'
+      @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"
+      @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;' points='X1 Y1 X2 Y2 X3 Y3' />\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"
       @tree_data = String.new
       @visited_x = {}
@@ -46,8 +46,8 @@ module RSyntaxTree
 
       x1 = 0 - @margin
       y1 = 0 - @margin
-      x2 = @width + @margin
-      y2 = @height + @margin
+      x2 = @width + @margin * 2
+      y2 = @height + @margin * 2
       extra_lines = @extra_lines.join("\n")
 
       as2 = @global[:h_gap_between_nodes] * 1.0
@@ -182,7 +182,7 @@ module RSyntaxTree
           when :bborder
             stroke_width = @linewidth + BLINE_SCALING
           end
-          @extra_lines << "<line style=\"stroke:#{col}; stroke-width:#{stroke_width}; \" x1=\"#{x1}\" y1=\"#{y1}\" x2=\"#{x2}\" y2=\"#{y2}\"></line>"
+          @extra_lines << "<line style=\"stroke:#{col}; 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
@@ -278,7 +278,7 @@ module RSyntaxTree
                              end
 
               if e[:decoration].include?(:box)
-                enc = "<rect style='stroke: #{col}; stroke-width:#{stroke_width};'
+                enc = "<rect style='stroke: #{col}; stroke-linejoin:round; stroke-width:#{stroke_width};'
                         x='#{enc_x}' y='#{enc_y}'
                         width='#{enc_width}' height='#{enc_height}'
                         fill='#{fill}' />\n"
@@ -293,7 +293,7 @@ module RSyntaxTree
                 x2 = enc_x + enc_width
                 y2 = y1
                 ar_hwidth = e[:width] / 4.0
-                bar = "<line style='stroke:#{col}; stroke-width:#{stroke_width};' x1='#{x1}' y1='#{y1}' x2='#{x2}' y2='#{y2}'></line>\n"
+                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"
                 @extra_lines << bar
 
                 if e[:decoration].include?(:arrow_to_l)
@@ -351,16 +351,16 @@ module RSyntaxTree
 
     def draw_rectangle(x1, y1, width, height, col, bline = false)
       swidth = bline ? @linewidth + BLINE_SCALING : @linewidth + LINE_SCALING
-      @extra_lines << "<polygon style='stroke:#{col}; stroke-width:#{swidth}; fill:none; stroke-linejoin:round;'
+      @extra_lines << "<polygon style='stroke:#{col}; stroke-width:#{swidth}; fill:none; stroke-linejoin:round; stroke-linecap:round;'
                             points='#{x1},#{y1} #{x1 + width},#{y1} #{x1 + width},#{y1 + height} #{x1},#{y1 + height}' />\n"
     end
 
     def draw_bracket(x1, y1, width, height, col, bline = false)
       swidth = bline ? @linewidth + BLINE_SCALING : @linewidth + LINE_SCALING
       slwidth = @global[:h_gap_between_nodes] / 2
-      @extra_lines << "<polyline style='stroke:#{col}; stroke-width:#{swidth}; fill:none; stroke-linejoin:round;'
+      @extra_lines << "<polyline style='stroke:#{col}; stroke-width:#{swidth}; fill:none; stroke-linejoin:round; stroke-linecap:round;'
                             points='#{x1 + slwidth},#{y1} #{x1},#{y1} #{x1},#{y1 + height} #{x1 + slwidth},#{y1 + height}' />\n"
-      @extra_lines << "<polyline style='stroke:#{col}; stroke-width:#{swidth}; fill:none; stroke-linejoin:round;'
+      @extra_lines << "<polyline style='stroke:#{col}; stroke-width:#{swidth}; fill:none; stroke-linejoin:round; stroke-linecap:round;'
                             points='#{x1 + width - slwidth},#{y1} #{x1 + width},#{y1} #{x1 + width},#{y1 + height} #{x1 + width - slwidth},#{y1 + height}' />\n"
     end
 
@@ -420,12 +420,12 @@ module RSyntaxTree
             path_pool_source[tr] = [x1, y1]
             path_flags << tr
           end
-          raise RSTError, "Error: input text contains a path having more than two ends:\n > #{tr}" if path_flags.tally.any? { |_k, v| v > 2 } || line_flags.tally.any? { |_k, v| v > 2 }
+          raise RSTError, +"Error: input text contains a path having more than two ends:\n > #{tr}" if path_flags.tally.any? { |_k, v| v > 2 } || line_flags.tally.any? { |_k, v| v > 2 }
         end
       end
 
       path_flags.tally.each do |k, v|
-        raise RSTError, "Error: input text contains a path having only one end:\n > #{k}" if v == 1
+        raise RSTError, +"Error: input text contains a path having only one end:\n > #{k}" if v == 1
       end
 
       path_pool_source.each do |k, v|

data/lib/rsyntaxtree/version.rb

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

data/lib/rsyntaxtree.rb

@@ -83,7 +83,7 @@ module RSyntaxTree
             fontset[:bolditalic] = FONT_DIR + "/NotoSansMono_SemiCondensed-Bold.ttf"
             fontset[:math] = FONT_DIR + "/latinmodern-math.otf"
             fontset[:cjk] = FONT_DIR + "/NotoSansJP-Regular.otf"
-            fontset[:emoji] = FONT_DIR + "/OpenMoji-black-glyf"
+            fontset[:emoji] = FONT_DIR + "/OpenMoji-black-glyf.ttf"
             new_params[:fontstyle] = "mono"
           when "noto-sans", "sans"
             fontset[:normal] = FONT_DIR + "/NotoSans-Regular.ttf"
@@ -151,7 +151,7 @@ module RSyntaxTree
     end
 
     def self.check_data(text)
-      raise RSTError, "Error: input text is empty" if text.to_s == ""
+      raise RSTError, +"Error: input text is empty" if text.to_s == ""
 
       StringParser.valid?(text)
     end
@@ -170,6 +170,8 @@ module RSyntaxTree
       else
         b.string
       end
+    rescue Cairo::InvalidSize
+      raise RSTError, +"Error: the result syntree is too big"
     end
 
     def draw_svg

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-05 00:00:00.000000000 Z
+date: 2023-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optimist
@@ -104,11 +104,12 @@ files:
 - ".rubocop.yml"
 - ".solargraph.yml"
 - ".tags"
+- Dockerfile
 - Gemfile
 - README.md
 - Rakefile
 - bin/rsyntaxtree
-- devel/generate_examples.rb
+- dev/generate_examples.rb
 - docs/.gitignore
 - docs/404.html
 - docs/Gemfile
@@ -159,6 +160,7 @@ files:
 - docs/_examples/043.md
 - docs/_examples/044.md
 - docs/_examples/045.md
+- docs/_examples/046.md
 - docs/_includes/box_and_circle_table.html
 - docs/_includes/escape_char_table.html
 - docs/_includes/social_media_links.html
@@ -179,7 +181,6 @@ files:
 - docs/assets/img/012.png
 - docs/assets/img/013.png
 - docs/assets/img/014.png
-- docs/assets/img/014_.png
 - docs/assets/img/015.png
 - docs/assets/img/016.png
 - docs/assets/img/017.png
@@ -211,6 +212,7 @@ files:
 - docs/assets/img/043.png
 - docs/assets/img/044.png
 - docs/assets/img/045.png
+- docs/assets/img/046.png
 - docs/assets/img/elements/circle.png
 - docs/assets/img/elements/circle_abc.png
 - docs/assets/img/elements/circle_bold.png
@@ -273,12 +275,11 @@ files:
 - docs/assets/svg/043.svg
 - docs/assets/svg/044.svg
 - docs/assets/svg/045.svg
+- docs/assets/svg/046.svg
 - docs/documentation.md
 - docs/documentation_ja.md
 - docs/examples.html
 - docs/index.html
-- fonts/NotoEmoji-Bold.ttf
-- fonts/NotoEmoji-Regular.ttf
 - fonts/NotoSans-Bold.ttf
 - fonts/NotoSans-BoldItalic.ttf
 - fonts/NotoSans-Italic.ttf
@@ -331,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: RSyntaxTree is a graphical syntax tree generator written in Ruby