ooxml_parser 0.1.1

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/docx_paragraph_run.rb

@@ -0,0 +1,388 @@
+# noinspection RubyTooManyInstanceVariablesInspection
+require_relative 'docx_paragraph_run/text_outline'
+require_relative 'docx_paragraph_run/text_fill'
+require_relative 'docx_paragraph_run/shape'
+
+module OoxmlParser
+  class DocxParagraphRun < OOXMLDocumentObject
+    attr_accessor :number, :font, :vertical_align, :size, :font_color, :background_color, :font_style, :text, :drawings,
+                  :link, :highlight, :shadow, :outline, :imprint, :emboss, :vanish, :effect, :caps, :w,
+                  :position, :rtl, :em, :cs, :spacing, :break, :touch, :shape, :footnote, :endnote, :fld_char, :style,
+                  :comments, :alternate_content, :page_number, :text_outline, :text_fill
+    # @return [String] type of instruction used for upper level of run
+    # http://officeopenxml.com/WPfieldInstructions.php
+    attr_accessor :instruction
+
+    def initialize
+      @number = 0
+      @font = 'Arial'
+      @vertical_align = :baseline
+      @size = 11
+      @font_color = Color.new
+      @background_color = nil
+      @font_style = FontStyle.new
+      @text = ''
+      @drawings = []
+      @link = nil
+      @highlight = nil
+      @shadow = nil
+      @outline = nil
+      @imprint = nil
+      @emboss = nil
+      @vanish = nil
+      @effect = nil
+      @caps = nil
+      @w = false
+      @position = 0.0
+      @rtl = false
+      @em = nil
+      @cs = false
+      @spacing = 0.0
+      @break = false
+      @touch = nil
+      @footnote = nil
+      @endnote = nil
+      @fld_char = nil
+      @style = nil
+      @comments = []
+      @alternate_content = nil
+      @page_number = false
+      @text_outline = nil
+      @text_fill = nil
+      @instruction = nil
+    end
+
+    def drawing
+      # TODO: Rewrite all tests without this methos
+      @drawings.empty? ? nil : drawings.first
+    end
+
+    def copy
+      character = DocxParagraphRun.new
+      character.number = number
+      character.font = font
+      character.vertical_align = vertical_align
+      character.size = size
+      character.font_color = font_color
+      character.background_color = @background_color
+      character.font_style = @font_style
+      character.text = @text
+      character.drawings = @drawings.clone
+      character.link = @link
+      character.highlight = @highlight
+      character.shadow = @shadow
+      character.outline = @outline
+      character.imprint = @imprint
+      character.emboss = @emboss
+      character.vanish = @vanish
+      character.effect = @effect
+      character.caps = @caps
+      character.w = @w
+      character.position = @position
+      character.rtl = @rtl
+      character.em = @em
+      character.cs = @cs
+      character.spacing = @spacing
+      character.cs = @cs
+      character.break = @break
+      character.touch = @touch
+      character.footnote = @footnote
+      character.endnote = @endnote
+      character.fld_char = @fld_char
+      character.style = @style
+      character.comments = @comments.clone
+      character.alternate_content = @alternate_content
+      character.page_number = @page_number
+      character.text_outline = @text_outline
+      character.text_fill = @text_fill
+      character.instruction = @instruction
+      character
+    end
+
+    def ==(other)
+      ignored_attributes = [:@number]
+      all_instance_variables = instance_variables
+      significan_attribues = all_instance_variables - ignored_attributes
+      significan_attribues.each do |current_attributes|
+        unless instance_variable_get(current_attributes) == other.instance_variable_get(current_attributes)
+          return false
+        end
+      end
+      true
+    end
+
+    def self.parse(character_pr_tag, character_style = DocxParagraphRun.new, default_character = @default_character)
+      character_style.font_style = FontStyle.new
+      character_pr_tag.xpath('w:rStyle').each do |r_style|
+        style = get_style_by_id(r_style.attribute('val').value)
+        break if style.nil?
+        style.xpath('w:rPr').each do |style_rpr|
+          character_style = parse(style_rpr, character_style, default_character)
+        end
+      end
+      character_pr_tag.xpath('w:rFonts').each do |r_font|
+        r_font.attributes.each do |font_attribute, value|
+          case font_attribute
+          when 'asciiTheme'
+            character_style.font = parse_font_by_theme(r_font.attribute('asciiTheme').value)
+          when 'ascii' # , 'hAnsi', 'eastAsia', 'cs'
+            character_style.font = value.value
+            break
+          end
+        end
+      end
+      character_pr_tag.xpath('w:highlight').each do |highlight|
+        character_style.highlight = highlight.attribute('val').value
+      end
+      character_pr_tag.xpath('w:vertAlign').each do |vertical_align|
+        character_style.vertical_align = vertical_align.attribute('val').value.to_sym
+      end
+      character_pr_tag.xpath('w:szCs').each do |sz|
+        character_style.size = sz.attribute('val').value.to_i / 2.0
+      end
+      character_pr_tag.xpath('w:sz').each do |sz|
+        character_style.size = sz.attribute('val').value.to_i / 2.0
+      end
+      character_pr_tag.xpath('w:color').each do |color|
+        color.attributes.each do |key, value|
+          case key
+          when 'val'
+            character_style.font_color = Color.from_int16(value.value)
+          when 'themeColor'
+            unless ThemeColors.list[value.value.to_sym].nil?
+              if value.value == 'text2' || value.value == 'background2' || value.value.include?('accent') # Don't know why. Just works
+                break
+              else
+                character_style.font_color = ThemeColors.list[value.value.to_sym].dup
+              end
+            end
+          when 'themeShade'
+            character_style.font_color.calculate_with_shade!(value.value.hex.to_f / 255.0)
+          when 'themeTint'
+            character_style.font_color.calculate_with_tint!(1.0 - (value.value.hex.to_f / 255.0))
+          end
+        end
+      end
+      character_pr_tag.xpath('w:shd').each do |shd|
+        character_style.background_color = shd.attribute('fill').value
+        unless shd.attribute('fill').value == 'auto' || shd.attribute('fill').value == '' || shd.attribute('fill').value == 'null'
+          character_style.background_color = Color.from_int16(shd.attribute('fill').value)
+        end
+      end
+      character_pr_tag.xpath('w:uCs').each do |u|
+        character_style.font_style.underlined = Underline.new
+        if !u.attribute('val').nil? && u.attribute('val').value != 'none' && u.attribute('val').value != false
+          character_style.font_style.underlined.style = u.attribute('val').value
+          unless u.attribute('color').nil?
+            character_style.font_style.underlined.color = Color.from_int16(u.attribute('color').value)
+          end
+        else
+          character_style.font_style.underlined = Underline.new
+        end
+      end
+      character_pr_tag.xpath('w:u').each do |u|
+        character_style.font_style.underlined = Underline.new
+        if !u.attribute('val').nil? && u.attribute('val').value != 'none' && u.attribute('val').value != false
+          character_style.font_style.underlined.style = u.attribute('val').value
+          unless u.attribute('color').nil?
+            character_style.font_style.underlined.color = Color.from_int16(u.attribute('color').value)
+          end
+        else
+          character_style.font_style.underlined = Underline.new
+        end
+      end
+      character_pr_tag.xpath('w:bCs').each do |b|
+        character_style.font_style.bold = if b.attribute('val').nil? || b.attribute('val').value != 'false'
+                                            true
+                                          else
+                                            false
+                                          end
+      end
+      character_pr_tag.xpath('w:b').each do |b|
+        character_style.font_style.bold = if b.attribute('val').nil? || b.attribute('val').value != 'false'
+                                            true
+                                          else
+                                            false
+                                          end
+      end
+      character_pr_tag.xpath('w:iCs').each do |i|
+        next if i.attribute('val').nil?
+        character_style.font_style.italic = if i.attribute('val').value != 'false'
+                                              true
+                                            else
+                                              false
+                                            end
+      end
+      character_pr_tag.xpath('w:i').each do |i|
+        character_style.font_style.italic = if i.attribute('val').nil? || i.attribute('val').value != 'false'
+                                              true
+                                            else
+                                              false
+                                            end
+      end
+      character_pr_tag.xpath('w:strike').each do |strike|
+        character_style.font_style.strike = if strike.attribute('val').nil? || strike.attribute('val').value != 'false' && strike.attribute('val').value != '0'
+                                              :single
+                                            else
+                                              :none
+                                            end
+      end
+      character_pr_tag.xpath('w:dstrike').each do |dstrike|
+        if dstrike.attribute('val').nil?
+          character_style.font_style.strike = :double
+        elsif dstrike.attribute('val').value == '0' || dstrike.attribute('val').value == 'false'
+        else
+          character_style.font_style.strike = :double
+        end
+      end
+      character_pr_tag.xpath('w:shadow').each do
+        character_style.shadow = true
+      end
+      character_pr_tag.xpath('w:outline').each do
+        character_style.outline = true
+      end
+      character_pr_tag.xpath('w:imprint').each do
+        character_style.imprint = true
+      end
+      character_pr_tag.xpath('w:emboss').each do
+        character_style.emboss = true
+      end
+      character_pr_tag.xpath('w:vanish').each do
+        character_style.vanish = true
+      end
+      character_pr_tag.xpath('w:effect').each do |effect|
+        character_style.effect = effect.attribute('val').value
+      end
+      character_pr_tag.xpath('w:caps').each do |caps|
+        if caps.attribute('val').nil?
+          character_style.caps = :caps
+        elsif caps.attribute('val').value == 'false'
+        else
+          character_style.caps = :caps
+        end
+      end
+      character_pr_tag.xpath('w:smallCaps').each do |small_caps|
+        if small_caps.attribute('val').nil?
+          character_style.caps = :small_caps
+        elsif small_caps.attribute('val').value == 'false'
+        else
+          character_style.caps = :small_caps
+        end
+      end
+      character_pr_tag.xpath('w:position').each do |position|
+        character_style.position = (position.attribute('val').value.to_f / (28.0 + 1.0 / 3.0) / 2.0).round(1)
+      end
+      character_pr_tag.xpath('w:rtl').each do |rtl|
+        character_style.rtl = OOXMLDocumentObject.option_enabled?(rtl)
+      end
+      character_pr_tag.xpath('w:em').each do |em|
+        character_style.em = em.attribute('val').value
+      end
+      character_pr_tag.xpath('w:cs').each do |cs|
+        character_style.cs = OOXMLDocumentObject.option_enabled?(cs)
+      end
+      character_pr_tag.xpath('w:spacing').each do |spacing|
+        character_style.spacing = (spacing.attribute('val').value.to_f / 566.9).round(1)
+      end
+      character_pr_tag.xpath('w14:textOutline', 'xmlns:w14' => 'http://schemas.microsoft.com/office/word/2010/wordml').each do |text_outline|
+        character_style.text_outline = TextOutline.parse(text_outline)
+        text_outline.xpath('w14:prstDash', 'xmlns:w14' => 'http://schemas.microsoft.com/office/word/2010/wordml').each do |outline_style|
+          character_style.touch = outline_style.attribute('val').value
+        end
+      end
+      character_pr_tag.xpath('w14:textFill', 'xmlns:w14' => 'http://schemas.microsoft.com/office/word/2010/wordml').each do |text_fill|
+        character_style.text_fill = TextFill.parse(text_fill)
+      end
+      character_style
+    end
+
+    def self.parse_character(r_tag, character_style, char_number)
+      r_tag.xpath('*').each do |r_node_child|
+        case r_node_child.name
+        when 'rPr'
+          DocxParagraphRun.parse(r_node_child, character_style, @default_character)
+        when 'instrText'
+          if r_node_child.text.include?('HYPERLINK')
+            hyperlink = Hyperlink.new(r_node_child.text.sub('HYPERLINK ', '').split(' \\o ').first, r_node_child.text.sub('HYPERLINK', '').split(' \\o ').last)
+            character_style.link = hyperlink
+          elsif r_node_child.text[/PAGE\s+\\\*/]
+            character_style.text = '*PAGE NUMBER*'
+          end
+        when 'fldChar'
+          character_style.fld_char = r_node_child.attribute('fldCharType').value.to_sym
+        when 't'
+          character_style.text += r_node_child.text
+        when 'noBreakHyphen'
+          character_style.text += '–'
+        when 'tab'
+          character_style.text += "\t"
+        when 'drawing'
+          character_style.drawings << DocxDrawing.parse(r_node_child)
+        when 'AlternateContent'
+          character_style.alternate_content = AlternateContent.parse(r_node_child)
+        when 'br'
+          if r_node_child.attribute('type').nil?
+            character_style.break = :line
+            character_style.text += "\r"
+          else
+            case r_node_child.attribute('type').value
+            when 'page', 'column'
+              character_style.break = r_node_child.attribute('type').value.to_sym
+            end
+          end
+        when 'footnoteReference'
+          character_style.footnote = HeaderFooter.new(:header)
+          character_style.footnote.id = r_node_child.attribute('id').value
+          character_style.footnote.parse('footnote', character_style.footnote.id, @default_paragraph, @default_character)
+        when 'endnoteReference'
+          character_style.endnote = HeaderFooter.new(:footer)
+          character_style.endnote.id = r_node_child.attribute('id').value
+          character_style.endnote.parse('endnote', character_style.endnote.id, @default_paragraph, @default_character)
+        when 'pict'
+          r_node_child.xpath('*').each do |pict_node_child|
+            case pict_node_child.name
+            when 'shape'
+              character_style.shape = Shape.parse(pict_node_child, :shape, OOXMLDocumentObject.path_to_folder)
+            when 'rect'
+              character_style.shape = Shape.parse(pict_node_child, :rectangle, OOXMLDocumentObject.path_to_folder)
+            when 'oval'
+              character_style.shape = Shape.parse(pict_node_child, :oval, OOXMLDocumentObject.path_to_folder)
+            when 'shapetype'
+            end
+          end
+        end
+      end
+      character_style.number = char_number
+      character_style
+    end
+
+    def self.parse_font_by_theme(theme)
+      doc = Nokogiri::XML(File.open("#{OOXMLDocumentObject.path_to_folder}/#{OOXMLDocumentObject.root_subfolder}/theme/theme1.xml"))
+      doc.search('//a:fontScheme').each do |font_scheme|
+        if theme.include?('major')
+          font_scheme.xpath('a:majorFont').each do |major_font|
+            major_font.xpath('a:latin').each do |latin|
+              return latin.attribute('typeface').value
+            end
+          end
+        elsif theme.include?('minor')
+          font_scheme.xpath('a:minorFont').each do |minor_font|
+            minor_font.xpath('a:latin').each do |latin|
+              return latin.attribute('typeface').value
+            end
+          end
+        end
+      end
+    end
+
+    def self.get_style_by_id(id)
+      doc = Nokogiri::XML(File.open("#{OOXMLDocumentObject.path_to_folder}/#{OOXMLDocumentObject.root_subfolder}/styles.xml"))
+      doc.search('//w:styles').each do |styles|
+        styles.xpath('w:style').each do |style|
+          return style if style.attribute('styleId').value == id
+        end
+      end
+      nil
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/frame_properties.rb

@@ -0,0 +1,46 @@
+module OoxmlParser
+  class FrameProperties
+    attr_accessor :drop_cap, :lines, :wrap, :vertical_anchor, :horizontal_anchor, :width, :height, :height_rule,
+                  :horizontal_align, :vertical_align, :anchor_lock, :vertical_space, :horizontal_space,
+                  :horizontal_position, :vertical_position
+
+    def self.parse(frame_pr_node)
+      frame_properties = FrameProperties.new
+      frame_pr_node.attributes.each do |key, value|
+        case key
+        when 'dropCap'
+          frame_properties.drop_cap = value.value.to_sym
+        when 'lines'
+          frame_properties.lines = value.value.to_i
+        when 'wrap'
+          frame_properties.lines = value.value.to_sym
+        when 'vAnchor'
+          frame_properties.vertical_anchor = value.value.to_sym
+        when 'hAnchor'
+          frame_properties.horizontal_anchor = value.value.to_sym
+        when 'w'
+          frame_properties.width = (value.value.to_f / 566.9).round(2)
+        when 'h'
+          frame_properties.height = (value.value.to_f / 566.9).round(2)
+        when 'hRule'
+          frame_properties.height_rule = value.value.to_s.sub('atLeast', 'at_least').to_sym
+        when 'xAlign'
+          frame_properties.horizontal_align = value.value.to_sym
+        when 'yAlign'
+          frame_properties.vertical_align = value.value.to_sym
+        when 'anchorLock'
+          frame_properties.anchor_lock = OOXMLDocumentObject.option_enabled?(frame_pr_node, anchorLock)
+        when 'vSpace'
+          frame_properties.vertical_space = (value.value.to_f / 566.9).round(2)
+        when 'hSpace'
+          frame_properties.horizontal_space = (value.value.to_f / 566.9).round(2)
+        when 'x'
+          frame_properties.horizontal_position = (value.value.to_f / 566.9).round(2)
+        when 'y'
+          frame_properties.vertical_position = (value.value.to_f / 566.9).round(2)
+        end
+      end
+      frame_properties
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/indents.rb

@@ -0,0 +1,87 @@
+module OoxmlParser
+  class Indents
+    attr_accessor :first_line_indent, :left_indent, :right_indent, :hanging_indent
+
+    def initialize(first_line_indent = 0.0, left_indent = 0.0, right_indent = 0.0, hanging_indent = nil)
+      @first_line_indent = first_line_indent
+      @left_indent = left_indent
+      @right_indent = right_indent
+      @hanging_indent = hanging_indent
+    end
+
+    def ==(other)
+      if self.class != NilClass && other.class != NilClass
+        if @first_line_indent.to_f == other.first_line_indent.to_f &&
+           @left_indent.to_f.round(2) == other.left_indent.to_f.round(2) &&
+           @right_indent.to_f.round(1) == other.right_indent.to_f.round(1)
+          return true if @hanging_indent.nil? || other.hanging_indent.nil?
+          @hanging_indent.to_f == other.hanging_indent.to_f
+        else
+          false
+        end
+      else
+        is_a?(NilClass) && other.is_a?(NilClass)
+      end
+    end
+
+    def equal_with_round(other, delta = 0.02)
+      if is_a?(NilClass) && other.is_a?(NilClass)
+        true
+      else
+        @first_line_indent.to_f.round(2) == other.first_line_indent.to_f.round(2) &&
+          @left_indent.to_f.round(2) == other.left_indent.to_f.round(2) &&
+          @right_indent.to_f.round(2) == other.right_indent.to_f.round(2) &&
+          (@hanging_indent.to_f.round(2) - other.hanging_indent.to_f.round(2)).to_f.abs < delta
+      end
+    end
+
+    def to_s
+      "first line indent: #{@first_line_indent}, left indent: #{@left_indent},
+     right indent: #{@right_indent}, hanging indent: #{@hanging_indent}"
+    end
+
+    # Parse hash with indents
+    # @return [Indents] parsed class
+    def self.parse_indents_hash(hash)
+      Indents.new(hash['first_line_indent'], hash['left_indent'], hash['right_indent'], hash['hanging_indent'])
+    end
+
+    # Increases indent, depending on clicks to "increase indent" button in canvas
+    # @param [Integer] count count of clicks (default = 1)
+    def increase_indent_by_button(count = 1)
+      count.times { @left_indent += 1.25 }
+    end
+
+    # @return [Indents
+    def copy
+      Indents.new(@first_line_indent, @left_indent, @right_indent, @hanging_indent)
+    end
+
+    def round(digits_after_dot = 0)
+      [:first_line_indent, :left_indent, :right_indent, :hanging_indent].each do |ind|
+        send("#{ind}=", send(ind).round(digits_after_dot)) unless send(ind).nil?
+      end
+      self
+    end
+
+    # Parse Indents
+    # @param [Nokogiri::XML:Element] node with Indents
+    # @return [Indents] value of Indents
+    def self.parse(node)
+      indents = Indents.new
+      unless node.attribute('firstLine').nil?
+        indents.first_line_indent = (node.attribute('firstLine').value.to_f / 566.9).round(2)
+      end
+      unless node.attribute('left').nil?
+        indents.left_indent = (node.attribute('left').value.to_f / 566.9).round(2)
+      end
+      unless node.attribute('right').nil?
+        indents.right_indent = (node.attribute('right').value.to_f / 566.9).round(2)
+      end
+      unless node.attribute('hanging').nil?
+        indents.hanging_indent = (node.attribute('hanging').value.to_f / 566.9).round(2)
+      end
+      indents
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/paragraph_style/bookmark.rb

@@ -0,0 +1,10 @@
+module OoxmlParser
+  class Bookmark
+    attr_accessor :id, :name
+
+    def initialize(id = nil, name = nil)
+      @id = id
+      @name = name
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/paragraph_style/paragraph_tab.rb

@@ -0,0 +1,19 @@
+module OoxmlParser
+  class ParagraphTab < OOXMLDocumentObject
+    attr_accessor :align, :position
+
+    def initialize(align, position)
+      @align = align
+      @position = position
+    end
+
+    def self.parse(tabs_node)
+      tabs = []
+      tabs_node.xpath('a:tab').each do |tab_node|
+        tabs << ParagraphTab.new(Alignment.parse(tab_node.attribute('algn')),
+                                 (tab_node.attribute('pos').value.to_f / 360_000.0).round(2))
+      end
+      tabs
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/paragraph_style/style_parametres.rb

@@ -0,0 +1,35 @@
+# Style Parameter Data
+module OoxmlParser
+  class StyleParametres
+    attr_accessor :q_format, :hidden, :name
+
+    def initialize(name = nil, q_format = false, hidden = false)
+      @name = name
+      @q_format = q_format
+      @hidden = hidden
+    end
+
+    def ==(other)
+      all_instance_variables = instance_variables
+      all_instance_variables.each do |current_attributes|
+        unless instance_variable_get(current_attributes) == other.instance_variable_get(current_attributes)
+          return false
+        end
+      end
+      true
+    end
+
+    def self.parse(style_tag)
+      style = StyleParametres.new
+      style_tag.xpath('w:name').each do |name|
+        style.name = name.attribute('val').value
+      end
+      style_tag.xpath('w:qFormat').each do |q_format|
+        next if q_format.attribute('val').nil?
+        next if q_format.attribute('val').value == false || q_format.attribute('val').value == 'off' || q_format.attribute('val').value == '0'
+        style.q_format = true
+      end
+      style
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/paragraph_style.rb

@@ -0,0 +1,56 @@
+require_relative 'paragraph_style/bookmark'
+require_relative 'paragraph_style/style_parametres'
+require_relative 'paragraph_style/paragraph_tab'
+# Paragraph Style Data
+module OoxmlParser
+  class ParagraphStyle
+    attr_accessor :name,
+                  :font_name,
+                  :font_size,
+                  :font_style,
+                  :spacing,
+                  :indent,
+                  :borders,
+                  :background
+
+    def initialize(style_name = nil, font_name = nil, font_size = nil, font_style = nil, spacing = nil,
+                   indent = nil, borders = nil, background = nil)
+      @name = style_name if style_name
+      @font_name = font_name if font_name
+      @font_size = font_size if font_size
+      @font_style = font_style if font_style
+      @spacing = spacing if spacing
+      @indent = indent if indent
+      @borders = borders if borders
+      @background = background if background
+    end
+
+    def string_style_name
+      @name.to_s.tr('_', ' ')
+    end
+
+    def self.init_by_name(style_name, object = :docx_paragraph)
+      found_style = nil
+      AllTestData.paragraph_settings::PARAGRAPH_STYLE_DATA.each do |style|
+        found_style = style.clone if style.name == style_name
+      end
+
+      raise "Cannot find this style name - #{style_name}" if found_style.nil?
+
+      case object
+      when :table
+        found_style.spacing = Spacing.new(found_style.spacing.before, 0, 1, found_style.spacing.line_rule)
+      when :list
+        found_style.indent = Indents.new(-0.635, 1.27, 0)
+      end
+
+      found_style
+    end
+
+    def ==(other)
+      # FIXME, correct border comparision
+      @font_name == other.font_name && @font_size.to_f == other.font_size.to_f && @font_style == other.font_style &&
+        @spacing == other.spacing && @indent == other.indent && @background == other.background # && @border == other.border
+    end
+  end
+end