rsyntaxtree 1.0.8 → 1.1.0

data/lib/rsyntaxtree/element.rb

@@ -1,179 +1,167 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-
-#==========================
-# element.rb
-#==========================
-#
-# Aa class that represents a basic tree element, either node or leaf.
-# Copyright (c) 2007-2021 Yoichiro Hasebe <yohasebe@gmail.com>
-
-require "markup_parser"
-require 'utils'
-
-module RSyntaxTree
-  class Element
-
-    attr_accessor :id,
-      :parent, :type, :level,
-      :width, :height,
-      :content, :content_width, :content_height,
-      :horizontal_indent, :vertical_indent,
-      :triangle, :enclosure, :children, :parent,
-      :font, :fontsize, :contains_phrase,
-      :path
-
-    def initialize(id, parent, content, level, fontset, fontsize)
-      @type = ETYPE_LEAF
-      @id = id                 # Unique element id
-      @parent = parent         # Parent element id
-      @children = []           # Child element ids
-      @type = type             # Element type
-      @level = level           # Element level in the tree (0=top etc...)
-      @width = 0               # Width of the part of the tree including itself and it governs
-      @content_width = 0       # Width of the content
-      @horizontal_indent = 0   # Drawing offset
-      @vertical_indent = 0     # Drawing offset
-      content = content.strip
-
-      if /.+?\^?((?:\+\>?\d+)+)\^?\z/m =~ content
-        @path = $1.sub(/\A\+/, "").split("+")
-      else
-        @path = []
-      end
-
-      @fontset = fontset
-      @fontsize = fontsize
-
-      parsed = Markup.parse(content)
-
-      if parsed[:status] == :success
-        results = parsed[:results]
-      else
-        error_text = "Error: input text contains an invalid string"
-        error_text += "\n > " + content
-        raise RSTError, error_text
-      end
-      @content = results[:contents]
-      @paths = results[:paths]
-      @enclosure = results[:enclosure]
-      @triangle = results[:triangle]
-
-      @contains_phrase = false
-      setup
-    end
-
-    def setup
-      total_width = 0
-      total_height = 0
-      @content.each_with_index do |content, idx|
-        content_width = 0
-        case content[:type]
-        when :border, :bborder
-          height = $single_line_height / 2
-          content[:height] = height
-          total_height += height
-        when :text
-          row_width = 0
-          elements_height = []
-          content[:elements].each do |e|
-            text = e[:text]
-            e[:text] = text.gsub(" ", WHITESPACE_BLOCK).gsub(">", '&#62;').gsub("<", '&#60;')
-
-
-            @contains_phrase = true if text.include?(" ")
-            decoration = e[:decoration]
-            fontsize = decoration.include?(:small) || decoration.include?(:small) ? @fontsize * SUBSCRIPT_CONST : @fontsize
-            fontsize = decoration.include?(:subscript) || decoration.include?(:superscript)  ? fontsize * SUBSCRIPT_CONST : fontsize
-            style    = decoration.include?(:italic) || decoration.include?(:bolditalic) ? :italic : :normal
-            weight   = decoration.include?(:bold) || decoration.include?(:bolditalic) ? :bold : :normal
-
-            # e[:cjk] = false
-            # if e[:decoration].include?(:math)
-            #   font = @fontset[:math]
-            # elsif text.contains_cjk?
-            #   font = @fontset[:cjk]
-            #   e[:cjk] = true
-            # elsif decoration.include? :bolditalic
-            if decoration.include? :bolditalic
-              font = @fontset[:bolditalic]
-            elsif decoration.include? :bold
-              font = @fontset[:bold]
-            elsif decoration.include? :italic
-              font = @fontset[:italic]
-            else
-              font = @fontset[:normal]
-            end
-
-            standard_metrics = FontMetrics.get_metrics('X', @fontset[:normal], fontsize, :normal, :normal)
-            height = standard_metrics.height
-            if /\A[\<\>]+\z/ =~ text
-              width = standard_metrics.width * text.size / 2
-            elsif text.contains_emoji?
-              segments = text.split_by_emoji
-              width = 0
-              segments.each do |seg|
-                if /\s/ =~ seg[:char]
-                  ch = 't'
-                else
-                  ch = seg[:char]
-                end
-                if seg[:type] == :emoji
-                  this_font = @fontset[:emoji]
-                  metrics = FontMetrics.get_metrics(ch, this_font, fontsize, style, weight)
-                  width += metrics.width
-                else
-                  this_font = font
-                  metrics = FontMetrics.get_metrics(ch, this_font, fontsize, style, weight)
-                  width += metrics.width
-                end
-              end
-            else
-              text.gsub!("\\\\", 'i')
-              text.gsub!("\\", "")
-              text.gsub!(" ", "x")
-              text.gsub!("%", "X")
-              metrics = FontMetrics.get_metrics(text, font, fontsize, style, weight)
-              width = metrics.width
-            end
-
-            if e[:decoration].include?(:box) || e[:decoration].include?(:circle) || e[:decoration].include?(:bar)
-              if e[:text].size == 1
-                e[:content_width] = width
-                width += (height - width)
-              else
-                e[:content_width] = width
-                width += $width_half_X
-              end
-            end
-
-            if e[:decoration].include?(:whitespace)
-              width = $width_half_X / 2 * e[:text].size / 4
-              e[:text] = ""
-            end
-
-            e[:height] = height
-            elements_height << height + $box_vertical_margin / 2
-
-            e[:width] = width
-            row_width += width
-          end
-
-          if @enclosure != :none
-            total_height += (elements_height.max + $height_connector_to_text)
-          else
-            total_height += elements_height.max
-          end
-          content_width += row_width
-        end
-        total_width = content_width if total_width < content_width
-      end
-      @content_width = total_width
-      @content_height = total_height
-    end
-
-    def add_child(child_id)
-      @children << child_id
-    end
-  end
-end
+# frozen_string_literal: true
+
+#==========================
+# element.rb
+#==========================
+#
+# Aa class that represents a basic tree element, either node or leaf.
+# Copyright (c) 2007-2023 Yoichiro Hasebe <yohasebe@gmail.com>
+
+require_relative "markup_parser"
+require_relative "utils"
+
+module RSyntaxTree
+  class Element
+    attr_accessor :id, :parent, :type, :level, :width, :height, :content, :content_width, :content_height, :horizontal_indent, :vertical_indent, :triangle, :enclosure, :children, :font, :fontsize, :contains_phrase, :path
+
+    def initialize(id, parent, content, level, fontset, fontsize, global)
+      @global = global
+      @type = ETYPE_LEAF
+      @id = id                 # Unique element id
+      @parent = parent         # Parent element id
+      @children = []           # Child element ids
+      @type = type             # Element type
+      @level = level           # Element level in the tree (0=top etc...)
+      @width = 0               # Width of the part of the tree including itself and it governs
+      @content_width = 0       # Width of the content
+      @horizontal_indent = 0   # Drawing offset
+      @vertical_indent = 0     # Drawing offset
+      content = content.strip
+
+      @path = if /.+?\^?((?:\+>?\d+)+)\^?\z/m =~ content
+                $1.sub(/\A\+/, "").split("+")
+              else
+                []
+              end
+
+      @fontset = fontset
+      @fontsize = fontsize
+
+      parsed = Markup.parse(content)
+
+      if parsed[:status] == :success
+        results = parsed[:results]
+      else
+        error_text = "Error: input text contains an invalid string"
+        error_text += "\n > " + content
+        raise RSTError, error_text
+      end
+      @content = results[:contents]
+      @paths = results[:paths]
+      @enclosure = results[:enclosure]
+      @triangle = results[:triangle]
+
+      @contains_phrase = false
+      setup
+    end
+
+    def setup
+      total_width = 0
+      total_height = 0
+      @content.each do |content|
+        content_width = 0
+        case content[:type]
+        when :border, :bborder
+          height = @global[:single_line_height] / 2
+          content[:height] = height
+          total_height += height
+        when :text
+          row_width = 0
+          elements_height = []
+          content[:elements].each do |e|
+            text = e[:text]
+            e[:text] = text.gsub(" ", WHITESPACE_BLOCK).gsub(">", '&#62;').gsub("<", '&#60;')
+
+            @contains_phrase = true if text.include?(" ")
+            decoration = e[:decoration]
+            fontsize = decoration.include?(:small) ? @fontsize * SUBSCRIPT_CONST : @fontsize
+            fontsize = decoration.include?(:subscript) || decoration.include?(:superscript) ? fontsize * SUBSCRIPT_CONST : fontsize
+            style    = decoration.include?(:italic) || decoration.include?(:bolditalic) ? :italic : :normal
+            weight   = decoration.include?(:bold) || decoration.include?(:bolditalic) ? :bold : :normal
+
+            # e[:cjk] = false
+            # if e[:decoration].include?(:math)
+            #   font = @fontset[:math]
+            # elsif text.contains_cjk?
+            #   font = @fontset[:cjk]
+            #   e[:cjk] = true
+            # elsif decoration.include? :bolditalic
+            font = if decoration.include? :bolditalic
+                     @fontset[:bolditalic]
+                   elsif decoration.include? :bold
+                     @fontset[:bold]
+                   elsif decoration.include? :italic
+                     @fontset[:italic]
+                   else
+                     @fontset[:normal]
+                   end
+
+            standard_metrics = FontMetrics.get_metrics('X', @fontset[:normal], fontsize, :normal, :normal)
+            height = standard_metrics.height
+            if /\A[<>]+\z/ =~ text
+              width = standard_metrics.width * text.size / 2
+            elsif text.contains_emoji?
+              segments = text.split_by_emoji
+              width = 0
+              segments.each do |seg|
+                ch = if /\s/ =~ seg[:char]
+                       't'
+                     else
+                       seg[:char]
+                     end
+                this_font = if seg[:type] == :emoji
+                              @fontset[:emoji]
+                            else
+                              font
+                            end
+                metrics = FontMetrics.get_metrics(ch, this_font, fontsize, style, weight)
+                width += metrics.width
+              end
+            else
+              text.gsub!("\\\\", 'i')
+              text.gsub!("\\", "")
+              text.gsub!(" ", "x")
+              text.gsub!("%", "X")
+              metrics = FontMetrics.get_metrics(text, font, fontsize, style, weight)
+              width = metrics.width
+            end
+
+            if e[:decoration].include?(:box) || e[:decoration].include?(:circle) || e[:decoration].include?(:bar)
+              e[:content_width] = width
+              width += if e[:text].size == 1
+                         height - width
+                       else
+                         @global[:width_half_x]
+                       end
+            end
+
+            if e[:decoration].include?(:whitespace)
+              width = @global[:width_half_x] / 2 * e[:text].size / 4
+              e[:text] = ""
+            end
+
+            e[:height] = height
+            elements_height << height + @global[:box_vertical_margin] / 2
+
+            e[:width] = width
+            row_width += width
+          end
+
+          total_height += if @enclosure != :none
+                            elements_height.max + @global[:height_connector_to_text]
+                          else
+                            elements_height.max
+                          end
+          content_width += row_width
+        end
+        total_width = content_width if total_width < content_width
+      end
+      @content_width = total_width
+      @content_height = total_height
+    end
+
+    def add_child(child_id)
+      @children << child_id
+    end
+  end
+end

data/lib/rsyntaxtree/elementlist.rb

@@ -1,124 +1,105 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-
-#==========================
-# elementlist.rb
-#==========================
-#
-# Contains a list of unordered tree elements with a defined parent
-# Copyright (c) 2007-2021 Yoichiro Hasebe <yohasebe@gmail.com>
-
-require 'element'
-
-module RSyntaxTree
-  class ElementList
-
-    attr_accessor :elements, :iterator 
-    def initialize
-      @elements = Array.new # The element array
-      @iterator = -1 # Iterator index (used for get_first / get_next)
-    end
-
-    def set_hierarchy
-      @elements.each do |e|
-        get_id(e.parent).add_child(e.id) unless e.parent == 0
-      end
-    end
-
-    def add(element)
-      @elements << element
-      if(element.parent != 0)
-        parent = get_id(element.parent)
-        parent.type = ETYPE_NODE
-      end
-    end
-
-    def get_first
-      if(@elements.length == 0)
-        return nil
-      else
-        @iterator = 0
-        return @elements[@iterator]
-      end
-    end
-
-    def get_next
-      @iterator += 1
-      if @elements[@iterator]
-        return @elements[@iterator]
-      else
-        return nil
-      end
-    end
-
-    def get_id(id)
-      @elements.each do |element|
-        if(element.id == id)
-          return element 
-        end
-      end  
-      return nil;
-    end
-
-    def get_elements
-      @elements
-    end
-
-    def get_child_count(id)
-      get_children(id).length
-    end
-
-    def get_children(id)
-      children = Array.new
-      @elements.each do |element|
-        if(element.parent == id)
-          children << element.id
-        end
-      end
-      children
-    end
-
-    def get_element_width(id)
-      element = get_id(id)
-      if element
-        return element.width
-      else
-        return -1;
-      end
-    end
-
-    def set_element_width(id, width)
-      element = get_id(id)
-      if element
-        element.width = width
-      end
-    end
-
-    def get_indent(id)
-      element = get_id(id)
-      if element
-        return element.indent
-      else
-        return -1
-      end  
-    end
-
-    def set_indent(id, indent)
-      element = get_id(id)
-      if element
-        element.indent = indent
-      end
-    end
-
-    def get_level_height
-      maxlevel = 0
-      @elements.each do |element|
-        level = element.level
-        if(level > maxlevel)
-          maxlevel = level
-        end
-      end
-      return maxlevel + 1;
-    end
-  end
-end
+# frozen_string_literal: true
+
+#==========================
+# elementlist.rb
+#==========================
+#
+# Contains a list of unordered tree elements with a defined parent
+# Copyright (c) 2007-2023 Yoichiro Hasebe <yohasebe@gmail.com>
+
+require_relative "element"
+
+module RSyntaxTree
+  class ElementList
+    attr_accessor :elements, :iterator
+
+    def initialize
+      @elements = []
+      @iterator = -1 # Iterator index (used for get_first / get_next)
+    end
+
+    def set_hierarchy
+      @elements.each do |e|
+        get_id(e.parent).add_child(e.id) unless e.parent.zero?
+      end
+    end
+
+    def add(element)
+      @elements << element
+      return if element.parent.zero?
+
+      parent = get_id(element.parent)
+      parent.type = ETYPE_NODE
+    end
+
+    def get_first
+      return nil if @elements.length.empty?
+
+      @iterator = 0
+      @elements[@iterator]
+    end
+
+    def get_next
+      @iterator += 1
+      return @elements[@iterator] if @elements[@iterator]
+
+      nil
+    end
+
+    def get_id(id)
+      @elements.each do |element|
+        return element if element.id == id
+      end
+      nil
+    end
+
+    def get_elements
+      @elements
+    end
+
+    def get_child_count(id)
+      get_children(id).length
+    end
+
+    def get_children(id)
+      children = []
+      @elements.each do |element|
+        children << element.id if element.parent == id
+      end
+      children
+    end
+
+    def get_element_width(id)
+      element = get_id(id)
+      return element.width if element
+
+      -1;
+    end
+
+    def set_element_width(id, width)
+      element = get_id(id)
+      element.width = width if element
+    end
+
+    def get_indent(id)
+      element = get_id(id)
+      return element.indent if element
+
+      -1
+    end
+
+    def set_indent(id, indent)
+      element = get_id(id)
+      element.indent = indent if element
+    end
+
+    def get_level_height
+      maxlevel = 0
+      @elements.each do |element|
+        level = element.level
+        maxlevel = level if level > maxlevel
+      end
+      maxlevel + 1
+    end
+  end
+end