ooxml_parser 0.3.0 → 0.6.0

data/lib/ooxml_parser/configuration.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module OoxmlParser
+  # Class for storing configuration
   class Configuration
     # @return [Integer] accuracy of digits in fraction part
     attr_accessor :accuracy

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

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # noinspection RubyInstanceMethodNamingConvention
-require_relative 'document_structure/comment'
+require_relative 'document_structure/comments'
 require_relative 'document_structure/comments_extended'
 require_relative 'document_structure/docx_paragraph'
 require_relative 'document_structure/document_background'
@@ -12,20 +14,23 @@ require_relative 'document_structure/page_properties/page_properties'
 require_relative 'document_structure/document_settings'
 require_relative 'document_structure/styles'
 module OoxmlParser
+  # Basic class for DocumentStructure
   class DocumentStructure < CommonDocumentStructure
     include DocumentStyleHelper
     include DocumentStructureHelpers
     attr_accessor :elements, :page_properties, :notes, :background, :document_properties, :comments
 
-    # @return [Array, DocumentStyle] array of document styles in current document
-    attr_accessor :document_styles
     # @return [Numbering] store numbering data
     attr_accessor :numbering
     # @return [Styles] styles of document
     attr_accessor :styles
-    attr_accessor :theme_colors
+    attr_accessor :theme
+    # @return [Relationships] relationships
+    attr_accessor :relationships
     # @return [DocumentSettings] settings
     attr_accessor :settings
+    # @return [CommentsDocument] comments of whole document
+    attr_accessor :comments_document
     # @return [CommentsExtended] extended comments
     attr_accessor :comments_extended
 
@@ -34,9 +39,11 @@ module OoxmlParser
       @notes = []
       @document_properties = DocumentProperties.new
       @comments = []
-      @document_styles = []
+      super
     end
 
+    alias theme_colors theme
+
     def ==(other)
       @elements == other.elements &&
         @page_properties == other.page_properties &&
@@ -46,10 +53,6 @@ module OoxmlParser
         @comments == other.comments
     end
 
-    def difference(other)
-      Hash.object_to_hash(self).diff(Hash.object_to_hash(other))
-    end
-
     def element_by_description(location: :canvas, type: :docx_paragraph)
       case location
       when :canvas
@@ -66,7 +69,7 @@ module OoxmlParser
       when :footer
         case type
         when :table
-          note_by_description(:footer1).elements[1].rows[0].cells[0].elements
+          note_by_description(:footer1).elements[0].rows[0].cells[0].elements
         when :docx_paragraph, :simple, :paragraph
           note_by_description(:footer1).elements
         when :shape
@@ -77,7 +80,7 @@ module OoxmlParser
       when :header
         case type
         when :table
-          note_by_description(:header1).elements[1].rows[0].cells[0].elements
+          note_by_description(:header1).elements[0].rows[0].cells[0].elements
         when :docx_paragraph, :simple, :paragraph
           note_by_description(:header1).elements
         when :shape
@@ -116,34 +119,25 @@ module OoxmlParser
       set
     end
 
+    # @return [Array<DocumentStyle>] style of documents
+    def document_styles
+      styles.styles
+    end
+
     def self.parse
       doc_structure = DocumentStructure.new
+      doc_structure.content_types = ContentTypes.new(parent: doc_structure).parse
       OOXMLDocumentObject.root_subfolder = 'word/'
       OOXMLDocumentObject.xmls_stack = []
       @comments = []
       DocumentStructure.default_paragraph_style = DocxParagraph.new
-      DocumentStructure.default_run_style = DocxParagraphRun.new
-      doc_structure.theme_colors = PresentationTheme.parse('word/theme/theme1.xml')
-      OOXMLDocumentObject.add_to_xmls_stack('word/styles.xml')
-      doc = Nokogiri::XML(File.open(OOXMLDocumentObject.current_xml))
-      # TODO: Remove this old way parsing in favor of doc_structure.styles.document_defaults
-      doc.search('//w:docDefaults').each do |doc_defaults|
-        doc_defaults.xpath('w:pPrDefault').each do |p_pr_defaults|
-          DocumentStructure.default_paragraph_style = DocxParagraph.new.parse(p_pr_defaults, 0)
-        end
-        doc_defaults.xpath('w:rPrDefault').each do |r_pr_defaults|
-          r_pr_defaults.xpath('w:rPr').each do |r_pr|
-            DocumentStructure.default_run_style = DocxParagraphRun.new.parse_properties(r_pr)
-          end
-        end
-      end
-      parse_default_style
-      doc_structure.numbering = Numbering.new(parent: doc_structure).parse
-      doc_structure.document_styles = DocumentStyle.parse_list(doc_structure)
-      doc_structure.styles = Styles.new(parent: doc_structure).parse
+      DocumentStructure.default_run_style = DocxParagraphRun.new(parent: doc_structure)
+      doc_structure.theme = PresentationTheme.parse('word/theme/theme1.xml')
+      doc_structure.relationships = Relationships.new(parent: self).parse_file("#{OOXMLDocumentObject.path_to_folder}word/_rels/document.xml.rels")
+      doc_structure.parse_styles
       number = 0
       OOXMLDocumentObject.add_to_xmls_stack('word/document.xml')
-      doc = Nokogiri::XML(File.open(OOXMLDocumentObject.current_xml))
+      doc = doc_structure.parse_xml(OOXMLDocumentObject.current_xml)
       doc.search('//w:document').each do |document|
         document.xpath('w:background').each do |background|
           doc_structure.background = DocumentBackground.new(parent: doc_structure).parse(background)
@@ -165,7 +159,7 @@ module OoxmlParser
               number += 1
               doc_structure.elements << table
             when 'sdt'
-              doc_structure.elements << StructuredDocumentTag.new(parent: self).parse(element)
+              doc_structure.elements << StructuredDocumentTag.new(parent: doc_structure).parse(element)
             end
           end
           body.xpath('w:sectPr').each do |sect_pr|
@@ -178,24 +172,34 @@ module OoxmlParser
       end
       OOXMLDocumentObject.xmls_stack.pop
       doc_structure.document_properties = DocumentProperties.new(parent: doc_structure).parse
-      doc_structure.comments = Comment.parse_list(parent: doc_structure)
+      doc_structure.comments = Comments.new(parent: doc_structure).parse
       doc_structure.comments_extended = CommentsExtended.new(parent: doc_structure).parse
+      doc_structure.comments_document = Comments.new(parent: doc_structure,
+                                                     file: "#{OOXMLDocumentObject.path_to_folder}word/#{doc_structure.relationships.target_by_type('commentsDocument').first}")
+                                                .parse
       doc_structure.settings = DocumentSettings.new(parent: doc_structure).parse
       doc_structure
     end
 
-    def self.parse_default_style
-      doc = Nokogiri::XML(File.open(OOXMLDocumentObject.path_to_folder + 'word/styles.xml'))
+    def parse_default_style
+      doc = parse_xml(OOXMLDocumentObject.path_to_folder + 'word/styles.xml')
       doc.search('//w:style').each do |style|
         next if style.attribute('default').nil?
-        if (style.attribute('default').value == '1' || style.attribute('default').value == 'on' || style.attribute('default').value == 'true') && style.attribute('type').value == 'paragraph'
+
+        if (style.attribute('default').value == '1' ||
+            style.attribute('default').value == 'on' ||
+            style.attribute('default').value == 'true') &&
+           style.attribute('type').value == 'paragraph'
           style.xpath('w:pPr').each do |paragraph_pr_tag|
             DocumentStructure.default_paragraph_style = DocxParagraph.new.parse_paragraph_style(paragraph_pr_tag, DocumentStructure.default_run_style)
           end
           style.xpath('w:rPr').each do |character_pr_tag|
             DocumentStructure.default_run_style.parse_properties(character_pr_tag, DocumentStructure.default_run_style)
           end
-        elsif (style.attribute('default').value == '1' || style.attribute('default').value == 'on' || style.attribute('default').value == 'true') && style.attribute('type').value == 'character'
+        elsif (style.attribute('default').value == '1' ||
+               style.attribute('default').value == 'on' ||
+               style.attribute('default').value == 'true') &&
+              style.attribute('type').value == 'character'
           style.xpath('w:rPr').each do |character_pr_tag|
             DocumentStructure.default_run_style.parse_properties(character_pr_tag, DocumentStructure.default_run_style)
           end
@@ -206,13 +210,44 @@ module OoxmlParser
       DocumentStructure.default_table_run_style = DocumentStructure.default_run_style.dup
       doc.search('//w:style').each do |style|
         next if style.attribute('default').nil?
-        next unless (style.attribute('default').value == '1' || style.attribute('default').value == 'on' || style.attribute('default').value == 'true') && style.attribute('type').value == 'table'
+        next unless (style.attribute('default').value == '1' ||
+                     style.attribute('default').value == 'on' ||
+                     style.attribute('default').value == 'true') &&
+                    style.attribute('type').value == 'table'
+
         style.xpath('w:rPr').each do |table_character_pr_tag|
           DocumentStructure.default_table_run_style.parse_properties(table_character_pr_tag, DocumentStructure.default_run_style)
         end
       end
     end
 
+    # Perform parsing styles.xml
+    def parse_styles
+      file = "#{OOXMLDocumentObject.path_to_folder}/word/styles.xml"
+      DocumentStructure.default_paragraph_style = DocxParagraph.new(parent: self)
+      DocumentStructure.default_table_paragraph_style = DocxParagraph.new(parent: self)
+      DocumentStructure.default_run_style = DocxParagraphRun.new(parent: self)
+      DocumentStructure.default_table_run_style = DocxParagraphRun.new(parent: self)
+
+      return unless File.exist?(file)
+
+      doc = parse_xml(file)
+      # TODO: Remove this old way parsing in favor of doc_structure.styles.document_defaults
+      doc.search('//w:docDefaults').each do |doc_defaults|
+        doc_defaults.xpath('w:pPrDefault').each do |p_pr_defaults|
+          DocumentStructure.default_paragraph_style = DocxParagraph.new(parent: self).parse(p_pr_defaults, 0)
+        end
+        doc_defaults.xpath('w:rPrDefault').each do |r_pr_defaults|
+          r_pr_defaults.xpath('w:rPr').each do |r_pr|
+            DocumentStructure.default_run_style = DocxParagraphRun.new(parent: self).parse_properties(r_pr)
+          end
+        end
+      end
+      parse_default_style
+      @numbering = Numbering.new(parent: self).parse
+      @styles = Styles.new(parent: self).parse
+    end
+
     class << self
       attr_accessor :default_table_run_style
       attr_accessor :default_table_paragraph_style

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/comments.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require_relative 'comments/comment'
+module OoxmlParser
+  # Class for parsing `comments.xml` file
+  class Comments < OOXMLDocumentObject
+    # @return [Array<Comment>] list of comments
+    attr_reader :comments_array
+
+    def initialize(params = {})
+      @comments_array = []
+      @parent = params[:parent]
+      @file = params.fetch(:file, OOXMLDocumentObject.path_to_folder + 'word/comments.xml')
+    end
+
+    # @return [Comment] accessor
+    def [](key)
+      @comments_array[key]
+    end
+
+    # Parse CommentsExtended object
+    # @return [Comments] result of parsing
+    def parse
+      return nil unless File.file?(@file)
+
+      doc = parse_xml(@file)
+      doc.xpath('w:comments/*').each do |node_child|
+        case node_child.name
+        when 'comment'
+          @comments_array << Comment.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/comments/comment.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Comment Data
+  class Comment < OOXMLDocumentObject
+    # @return [Integer] id of comment
+    attr_reader :id
+    # @return [Array<DocxParagraph>] array of paragraphs
+    attr_reader :paragraphs
+
+    def initialize(id = nil, paragraphs = [], parent: nil)
+      @id = id
+      @paragraphs = paragraphs
+      @parent = parent
+    end
+
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'id'
+          @id = value.value.to_i
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'p'
+          @paragraphs << DocxParagraph.new.parse(node_child, 0, parent: self)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/comments_extended.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'comments_extended/comment_extended'
 module OoxmlParser
   # Class for parsing `commentsExtended.xml` file
@@ -17,7 +19,8 @@ module OoxmlParser
     def parse
       file_to_parse = OOXMLDocumentObject.path_to_folder + 'word/commentsExtended.xml'
       return nil unless File.exist?(file_to_parse)
-      doc = Nokogiri::XML(File.open(file_to_parse))
+
+      doc = parse_xml(file_to_parse)
       doc.xpath('w15:commentsEx/*').each do |node_child|
         case node_child.name
         when 'commentEx'

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/comments_extended/comment_extended.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OoxmlParser
   # Class for parsing `w15:commentEx` tag
   class CommentExtended < OOXMLDocumentObject

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/document_background.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OoxmlParser
   # Class for describing Document Background `w:background`
   class DocumentBackground < OOXMLDocumentObject

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/document_properties.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OoxmlParser
   # Document Properties
   class DocumentProperties < OOXMLDocumentObject
@@ -11,7 +13,7 @@ module OoxmlParser
         warn "There is no 'docProps/app.xml' in docx. It may be some problem with it"
         return self
       end
-      node = Nokogiri::XML(File.open(properties_file))
+      node = parse_xml(properties_file)
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'Properties'

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/document_settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OoxmlParser
   # Class for parsing `settings.xml` file
   class DocumentSettings < OOXMLDocumentObject
@@ -7,7 +9,10 @@ module OoxmlParser
     # Parse Settings object
     # @return [DocumentSettings] result of parsing
     def parse
-      doc = Nokogiri::XML(File.open(OOXMLDocumentObject.path_to_folder + 'word/settings.xml'))
+      settings_path = OOXMLDocumentObject.path_to_folder + 'word/settings.xml'
+      return nil unless File.exist?(settings_path)
+
+      doc = parse_xml(settings_path)
       doc.xpath('w:settings/*').each do |node_child|
         case node_child.name
         when 'defaultTabStop'

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/document_structure_helpers.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 module OoxmlParser
   # method to help to work with DocumentStructure
   module DocumentStructureHelpers
     # @return [True, false] if structure contain any user data
     def with_data?
-      return true if @elements.length > 1
       @elements.each do |current_element|
         return true if current_element.with_data?
       end

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/document_style.rb

@@ -1,9 +1,14 @@
+# frozen_string_literal: true
+
 require_relative 'document_style/document_style_helper'
 module OoxmlParser
   # Class for describing styles containing in +styles.xml+
   class DocumentStyle < OOXMLDocumentObject
     include TableStylePropertiesHelper
     include DocumentStyleHelper
+
+    # @return [True, False] is style default
+    attr_reader :default
     # @return [Symbol] Type of style (+:paragraph+ or +:table+)
     attr_accessor :type
     # @return [FixNum] number of style
@@ -30,6 +35,7 @@ module OoxmlParser
     # Used to determine if current style is visible in style list in editors
     # According to http://www.wordarticles.com/Articles/WordStyles/LatentStyles.php
     attr_accessor :q_format
+
     alias visible? q_format
 
     def initialize(parent: nil)
@@ -55,6 +61,8 @@ module OoxmlParser
           @type = value.value.to_sym
         when 'styleId'
           @style_id = value.value
+        when 'default'
+          @default = attribute_enabled?(value.value)
         end
       end
       node.xpath('*').each do |subnode|
@@ -66,7 +74,7 @@ module OoxmlParser
         when 'next'
           @next_style = subnode.attribute('val').value
         when 'rPr'
-          @run_properties = DocxParagraphRun.new.parse_properties(subnode)
+          @run_properties = DocxParagraphRun.new(parent: self).parse_properties(subnode)
         when 'pPr'
           @paragraph_properties = ParagraphProperties.new(parent: self).parse(subnode)
         when 'tblPr'
@@ -84,16 +92,5 @@ module OoxmlParser
       fill_empty_table_styles
       self
     end
-
-    # Parse all document style list
-    # @return [Array, DocumentStyle]
-    def self.parse_list(parent)
-      styles_array = []
-      doc = Nokogiri::XML(File.open(OOXMLDocumentObject.path_to_folder + 'word/styles.xml'))
-      doc.search('//w:style').each do |style|
-        styles_array << DocumentStyle.new(parent: parent).parse(style)
-      end
-      styles_array
-    end
   end
 end

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/document_style/document_style_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OoxmlParser
   # Helper methods for working with Style List
   module DocumentStyleHelper

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

@@ -1,7 +1,13 @@
+# frozen_string_literal: true
+
 # noinspection RubyTooManyInstanceVariablesInspection
-require_relative 'docx_paragraph/bookmark'
+require_relative 'docx_paragraph/bookmark_start'
+require_relative 'docx_paragraph/bookmark_end'
+require_relative 'docx_paragraph/comment_range_end'
+require_relative 'docx_paragraph/comment_range_start'
 require_relative 'docx_paragraph/docx_paragraph_helper'
 require_relative 'docx_paragraph/docx_paragraph_run'
+require_relative 'docx_paragraph/field_simple'
 require_relative 'docx_paragraph/indents'
 require_relative 'docx_paragraph/inserted'
 require_relative 'docx_paragraph/structured_document_tag'
@@ -9,24 +15,27 @@ require_relative 'docx_paragraph/frame_properties'
 require_relative 'docx_paragraph/docx_formula'
 require_relative 'docx_paragraph/style_parametres'
 module OoxmlParser
+  # Class for data of DocxParagraph
   class DocxParagraph < OOXMLDocumentObject
     include DocxParagraphHelper
     attr_accessor :number, :bookmark_start, :bookmark_end, :align, :spacing, :background_color, :ind, :numbering,
-                  :character_style_array, :horizontal_line, :page_break, :kinoku, :borders, :keep_lines,
+                  :character_style_array, :page_break, :borders, :keep_lines,
                   :contextual_spacing, :sector_properties, :page_numbering, :section_break, :style, :keep_next,
-                  :orphan_control, :frame_properties
+                  :orphan_control
     # @return [Hyperlink] hyperlink in paragraph
     attr_reader :hyperlink
     # @return [ParagraphProperties] Properties of current paragraph
     attr_accessor :paragraph_properties
     # @return [Inserted] data inserted by review
     attr_accessor :inserted
+    # @return [FieldSimple] field simple
+    attr_reader :field_simple
     # @return [Integer] id of paragraph (for comment)
     attr_accessor :paragraph_id
+    # @return [MathParagraph] math paragraph
+    attr_reader :math_paragraph
     # @return [Integer] id of text (for comment)
     attr_accessor :text_id
-    # @return [StructuredDocumentTag] structured document tag data
-    attr_accessor :sdt
 
     def initialize(parent: nil)
       @number = 0
@@ -35,9 +44,7 @@ module OoxmlParser
       @align = 'left'
       @spacing = Spacing.new
       @ind = Indents.new
-      @kinoku = false
       @character_style_array = []
-      @horizontal_line = false
       @page_break = false
       @borders = Borders.new
       @keep_lines = false
@@ -48,6 +55,8 @@ module OoxmlParser
       @parent = parent
     end
 
+    alias elements character_style_array
+
     def initialize_copy(source)
       super
       @bookmark_start = source.bookmark_start.clone
@@ -58,16 +67,14 @@ module OoxmlParser
 
     def nonempty_runs
       @character_style_array.select do |cur_run|
-        if cur_run.is_a?(DocxParagraphRun)
-          (!cur_run.text.empty? ||
-              !cur_run.alternate_content.nil? ||
-              !cur_run.drawing.nil? ||
-              !cur_run.object.nil? ||
-              !cur_run.shape.nil? ||
-              !cur_run.footnote.nil? ||
-              !cur_run.endnote.nil?
-          )
-        elsif cur_run.is_a?(DocxFormula)
+        if cur_run.is_a?(DocxParagraphRun) || cur_run.is_a?(ParagraphRun)
+          !cur_run.empty?
+        elsif cur_run.is_a?(DocxFormula) ||
+              cur_run.is_a?(StructuredDocumentTag) ||
+              cur_run.is_a?(BookmarkStart) ||
+              cur_run.is_a?(BookmarkEnd) ||
+              cur_run.is_a?(CommentRangeStart) ||
+              cur_run.is_a?(CommentRangeEnd)
           true
         end
       end
@@ -77,14 +84,7 @@ module OoxmlParser
 
     # @return [True, false] if structure contain any user data
     def with_data?
-      !nonempty_runs.empty?
-    end
-
-    def remove_empty_runs
-      nonempty = nonempty_runs
-      @character_style_array.each do |cur_run|
-        @character_style_array.delete(cur_run) unless nonempty.include?(cur_run)
-      end
+      !nonempty_runs.empty? || paragraph_properties.section_properties
     end
 
     def ==(other)
@@ -98,10 +98,11 @@ module OoxmlParser
     end
 
     def parse(node, par_number = 0, default_character = DocxParagraphRun.new, parent: nil)
-      @parent = parent
+      @parent ||= parent
       default_character_style = default_character.dup
       character_styles_array = []
       custom_character_style = default_character_style.dup
+      custom_character_style.parent = self
       char_number = 0
       comments = []
       node.attributes.each do |key, value|
@@ -115,30 +116,20 @@ module OoxmlParser
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'bookmarkStart'
-          @bookmark_start << Bookmark.new(parent: self).parse(node_child)
+          character_styles_array << BookmarkStart.new(parent: self).parse(node_child)
         when 'bookmarkEnd'
-          @bookmark_end << Bookmark.new(parent: self).parse(node_child)
+          character_styles_array << BookmarkEnd.new(parent: self).parse(node_child)
         when 'pPr'
           parse_paragraph_style(node_child, custom_character_style)
-          node.xpath('w:pict').each do |pict|
-            pict.xpath('v:rect').each do
-              @horizontal_line = true
-            end
-          end
           @paragraph_properties = ParagraphProperties.new(parent: self).parse(node_child)
         when 'commentRangeStart'
-          comments << node_child.attribute('id').value
+          character_styles_array << CommentRangeStart.new(parent: self).parse(node_child)
+        when 'commentRangeEnd'
+          character_styles_array << CommentRangeEnd.new(parent: self).parse(node_child)
         when 'fldSimple'
-          instruction = node_child.attribute('instr').to_s
-          @page_numbering = true if instruction.include?('PAGE')
-          node_child.xpath('w:r').each do |r_tag|
-            character_style = default_character_style.dup
-            character_style.parse(r_tag, char_number, parent: parent)
-            character_style.page_number = @page_numbering
-            character_style.instruction = instruction
-            character_styles_array << character_style.dup
-            char_number += 1
-          end
+          @field_simple = FieldSimple.new(parent: self).parse(node_child)
+          @page_numbering = true if field_simple.page_numbering?
+          character_styles_array += field_simple.runs
         when 'r'
           character_style = custom_character_style.dup
           node_child.xpath('w:instrText').each do |insrt_text|
@@ -147,47 +138,33 @@ module OoxmlParser
           character_style.parse(node_child, char_number, parent: self)
           character_style.comments = comments.dup
           character_styles_array << character_style.dup
-          character_styles_array.last.shape = character_style.shape unless character_style.shape.nil?
+          character_styles_array.last.shape = character_style.shape if character_style.shape
           char_number += 1
         when 'hyperlink'
           @hyperlink = Hyperlink.new(parent: self).parse(node_child)
           character_style = default_character_style.dup
-          if !node_child.attribute('id').nil?
+          character_style.parent = self
+          if node_child.attribute('id')
             character_style.link = Hyperlink.new(parent: character_style).parse(node_child)
-          else
-            character_style.link = node_child.attribute('anchor').value unless node_child.attribute('anchor').nil?
+          elsif node_child.attribute('anchor')
+            character_style.link = node_child.attribute('anchor').value
           end
           node_child.xpath('w:r').each do |r_tag|
-            character_style.parse(r_tag, char_number, parent: parent)
+            character_style.parse(r_tag, char_number, parent: self)
             character_styles_array << character_style.dup
             char_number += 1
           end
           node_child.xpath('w:fldSimple').each do |simple_field|
-            instruction = simple_field.attribute('instr').to_s
-            @page_numbering = true if instruction.include?('PAGE')
-            simple_field.xpath('w:r').each do |r_tag|
-              character_style.parse(r_tag, char_number, parent: self)
-              character_style.page_number = @page_numbering
-              character_style.instruction = instruction
-              character_styles_array << character_style.dup
-              char_number += 1
-            end
+            hyperlink_field_simple = FieldSimple.new(parent: self).parse(simple_field)
+            character_styles_array += hyperlink_field_simple.runs
           end
         when 'oMathPara'
-          node_child.xpath('m:oMath').each do |o_math|
-            character_styles_array << DocxFormula.new(parent: self).parse(o_math)
-          end
-        when 'commentRangeEnd'
-          comments.each_with_index do |comment, index|
-            if comment == node_child.attribute('id').value
-              comments.delete_at(index)
-              break
-            end
-          end
+          @math_paragraph = MathParagraph.new(parent: self).parse(node_child)
+          character_styles_array << math_paragraph.math
         when 'ins'
           @inserted = Inserted.new(parent: self).parse(node_child)
         when 'sdt'
-          @sdt = StructuredDocumentTag.new(parent: self).parse(node_child)
+          character_styles_array << StructuredDocumentTag.new(parent: self).parse(node_child)
         end
       end
       @number = par_number
@@ -197,7 +174,7 @@ module OoxmlParser
       self
     end
 
-    def parse_paragraph_style(node, default_char_style = DocxParagraphRun.new)
+    def parse_paragraph_style(node, default_char_style = DocxParagraphRun.new(parent: self))
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'pageBreakBefore'
@@ -221,13 +198,9 @@ module OoxmlParser
           @background_color = Color.new(parent: self).parse_hex_string(background_color_string)
           @background_color.set_style(node_child.attribute('val').value.to_sym) unless node_child.attribute('val').nil?
         when 'pStyle'
-          DocxParagraph.parse_paragraph_style_xml(node_child.attribute('val').value, self, default_char_style)
+          parse_paragraph_style_xml(node_child.attribute('val').value, default_char_style)
         when 'ind'
           @ind = DocumentStructure.default_paragraph_style.ind.dup.parse(node_child)
-        when 'kinoku'
-          @kinoku = true
-        when 'framePr'
-          @frame_properties = FrameProperties.new(parent: self).parse(node_child)
         when 'numPr'
           @numbering = NumberingProperties.new(parent: self).parse(node_child)
         when 'jc'
@@ -245,8 +218,6 @@ module OoxmlParser
           @section_break = case @sector_properties.type
                            when 'oddPage'
                              'Odd page'
-                           when 'evenPage'
-                             'Even page'
                            when 'continuous'
                              'Current Page'
                            else
@@ -258,13 +229,14 @@ module OoxmlParser
       self
     end
 
-    def self.parse_paragraph_style_xml(id, paragraph_style, character_style)
-      doc = Nokogiri::XML(File.open(OOXMLDocumentObject.path_to_folder + 'word/styles.xml'))
+    def parse_paragraph_style_xml(id, character_style)
+      doc = parse_xml(OOXMLDocumentObject.path_to_folder + 'word/styles.xml')
       doc.search('//w:style').each do |style|
         next unless style.attribute('styleId').value == id
+
         style.xpath('w:pPr').each do |p_pr|
-          paragraph_style.parse_paragraph_style(p_pr, character_style)
-          paragraph_style.style = StyleParametres.new(parent: paragraph_style).parse(style)
+          parse_paragraph_style(p_pr, character_style)
+          @style = StyleParametres.new(parent: self).parse(style)
         end
         style.xpath('w:rPr').each do |r_pr|
           character_style.parse_properties(r_pr, DocumentStructure.default_run_style)
@@ -272,5 +244,23 @@ module OoxmlParser
         break
       end
     end
+
+    extend Gem::Deprecate
+    deprecate :page_numbering, 'field_simple.page_numbering?', 2020, 1
+
+    # @return [OoxmlParser::StructuredDocumentTag] Return first sdt element
+    def sdt
+      @character_style_array.each do |cur_element|
+        return cur_element if cur_element.is_a?(StructuredDocumentTag)
+      end
+      nil
+    end
+    deprecate :sdt, 'nonempty_runs[i]', 2020, 1
+
+    # @return [OoxmlParser::FrameProperties] Return frame properties
+    def frame_properties
+      paragraph_properties.frame_properties
+    end
+    deprecate :frame_properties, 'paragraph_properties.frame_properties', 2020, 1
   end
 end