ooxml_parser 0.33.0 → 0.34.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a2c8bb2410020cc3dfcb2126b9888ef47530fbd761e6167bd917fffee6a1351
-  data.tar.gz: 8ae388b40aabe9e72995e1bb5fa747e73253cd4464e414a00db0dcd5a87b0b40
+  metadata.gz: 9dc34421044dd53e46d0d5c355dac61acfe6bbb825381cb4c1d0aca2b5b78daf
+  data.tar.gz: d7ef26c1cdc5d94a7c355ae64437f23663d5c1579d651427bbac0bf83a03964e
 SHA512:
-  metadata.gz: 3ce96605c0637a4b2865c96088c0c10ddc898e91e7b6d41234bf8da01b598b748416567aff90cfa33b6778b7f16b7bb9397d95e5dde75e551fe524ee6d72dbdb
-  data.tar.gz: eee336b02e4bc827de7771f46ebcf53907957af7505c7da806dad589fe79f5de56b56e89206bc0e2df1d523530a9a7b41cd7a2c22095da97e95bde953e7faaa9
+  metadata.gz: 358fb82db492d965faeb84fcb356d18db1e04c759bd17e2cb76398abe20b353e76fb7f4359c7235f2004f4acdc440c0b1fb8bddc8b0075c65f5832caca0d8c16
+  data.tar.gz: e1d817d32dc5de38bb6ae960a50300068405fc079eb63f14c266a4cf472840f706e54586996b45ba80cb4af16c6615a05eafc56889a55f1289ea32fa1a551c66

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/docx_drawing.rb

@@ -8,6 +8,8 @@ require_relative 'graphic/docx_graphic'
 module OoxmlParser
   # Class for parsing `graphic` tags
   class DocxDrawing < OOXMLDocumentObject
+    # @return [String] id of drawing
+    attr_reader :id
     attr_accessor :type, :properties, :graphic
     # @return [DocProperties] doc properties
     attr_accessor :doc_properties
@@ -23,6 +25,13 @@ module OoxmlParser
     # @param [Nokogiri::XML:Node] node with NumberingProperties
     # @return [DocxDrawing] result of parsing
     def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'id'
+          @id = value.value.to_s
+        end
+      end
+
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'anchor'

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/drawing_properties/docx_drawing_properties.rb

@@ -44,9 +44,13 @@ module OoxmlParser
       node.xpath('*').each do |content_node_child|
         case content_node_child.name
         when 'simplePos'
-          @simple_position = OOXMLCoordinates.parse(content_node_child)
+          @simple_position = OOXMLCoordinates.new(parent: self).parse(content_node_child)
         when 'extent'
-          @object_size = OOXMLCoordinates.parse(content_node_child, x_attr: 'cx', y_attr: 'cy', unit: :emu)
+          @object_size = OOXMLCoordinates.new(parent: self)
+                                         .parse(content_node_child,
+                                                x_attr: 'cx',
+                                                y_attr: 'cy',
+                                                unit: :emu)
         when 'positionV'
           @vertical_position = DocxDrawingPosition.new(parent: self).parse(content_node_child)
         when 'positionH'

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/drawing_properties/ooxml_coordinates.rb

@@ -2,10 +2,10 @@
 
 module OoxmlParser
   # Docx Coordinates
-  class OOXMLCoordinates
+  class OOXMLCoordinates < OOXMLDocumentObject
     attr_accessor :x, :y
 
-    def initialize(x_value, y_value)
+    def initialize(x_value = nil, y_value = nil, parent: nil)
       @x = if x_value.is_a?(OoxmlSize)
              x_value
            else
@@ -16,6 +16,7 @@ module OoxmlParser
            else
              OoxmlSize.new(y_value)
            end
+      super(parent: parent)
     end
 
     # @return [String] result of convert of object to string
@@ -25,22 +26,27 @@ module OoxmlParser
 
     # Compare two OOXMLCoordinates objects
     # @param other [OOXMLCoordinates] other object
-    # @return [True, False] result of comparasion
+    # @return [True, False] result of comparison
     def ==(other)
       x == other.x && y == other.y
     end
 
     # Parse OOXMLCoordinates object
-    # @param position_node [Nokogiri::XML:Element] node to parse
+    # @param node [Nokogiri::XML:Element] node to parse
     # @param x_attr [String] name of x attribute
     # @param y_attr [String] name of y attribute
     # @param unit [Symbol] unit in which data is stored
     # @return [OOXMLCoordinates] result of parsing
-    def self.parse(position_node, x_attr: 'x', y_attr: 'y', unit: :dxa)
-      return if position_node.attribute(x_attr).nil? || position_node.attribute(y_attr).nil?
-
-      OOXMLCoordinates.new(OoxmlSize.new(position_node.attribute(x_attr).value.to_f, unit),
-                           OoxmlSize.new(position_node.attribute(y_attr).value.to_f, unit))
+    def parse(node, x_attr: 'x', y_attr: 'y', unit: :dxa)
+      node.attributes.each do |key, value|
+        case key
+        when x_attr
+          @x = OoxmlSize.new(value.value.to_f, unit)
+        when y_attr
+          @y = OoxmlSize.new(value.value.to_f, unit)
+        end
+      end
+      self
     end
   end
 end

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/docx_graphic.rb

@@ -23,7 +23,8 @@ module OoxmlParser
           @data = DocxPicture.new(parent: self).parse(node_child)
         when 'chart'
           @type = :chart
-          root_object.add_to_xmls_stack("#{root_object.root_subfolder}/#{root_object.get_link_from_rels(node_child.attribute('id').value)}")
+          @chart_reference = ChartReference.new(parent: self).parse(node_child)
+          root_object.add_to_xmls_stack("#{root_object.root_subfolder}/#{root_object.get_link_from_rels(@chart_reference.id)}")
           @data = Chart.new(parent: self).parse
           root_object.xmls_stack.pop
         when 'wgp'

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/shape_properties/custom_geometry/docx_custom_geometry/docx_shape_line_path/docx_shape_line_element.rb

@@ -30,7 +30,7 @@ module OoxmlParser
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'pt'
-          @points << OOXMLCoordinates.parse(node_child)
+          @points << OOXMLCoordinates.new(parent: self).parse(node_child)
         end
       end
       self

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/shape_properties/docx_shape_size.rb

@@ -37,13 +37,13 @@ module OoxmlParser
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'off'
-          @offset = OOXMLCoordinates.parse(node_child, unit: :emu)
+          @offset = OOXMLCoordinates.new(parent: self).parse(node_child, unit: :emu)
         when 'ext'
-          @extent = OOXMLCoordinates.parse(node_child, x_attr: 'cx', y_attr: 'cy', unit: :emu)
+          @extent = OOXMLCoordinates.new(parent: self).parse(node_child, x_attr: 'cx', y_attr: 'cy', unit: :emu)
         when 'chOff'
-          @child_offset = OOXMLCoordinates.parse(node_child, unit: :emu)
+          @child_offset = OOXMLCoordinates.new(parent: self).parse(node_child, unit: :emu)
         when 'chExt'
-          @child_extent = OOXMLCoordinates.parse(node_child, x_attr: 'cx', y_attr: 'cy', unit: :emu)
+          @child_extent = OOXMLCoordinates.new(parent: self).parse(node_child, x_attr: 'cx', y_attr: 'cy', unit: :emu)
         end
       end
       self

data/lib/ooxml_parser/common_parser/common_data/borders_properties.rb

@@ -50,8 +50,6 @@ module OoxmlParser
     # @param [Nokogiri::XML:Element] node with BordersProperties
     # @return [BordersProperties] value of BordersProperties
     def parse(node)
-      return nil if node.attribute('val').value == 'nil'
-
       node.attributes.each do |key, value|
         case key
         when 'val'
@@ -67,6 +65,8 @@ module OoxmlParser
           @shadow = value.value
         end
       end
+      return nil if @val == :nil
+
       self
     end
   end

data/lib/ooxml_parser/common_parser/common_data/color/color_helper.rb

@@ -3,26 +3,27 @@
 module OoxmlParser
   # Helper methods for color
   module ColorHelper
+    # @return [String] value for auto string
+    AUTO_STRING_VALUE = 'auto'
+    # @return [Regexp] regexp for hex string with 3 digits
+    REGEXP_THREE_DIGITS = /(.)(.)(.)/.freeze
+    # @return [Regexp] regexp for hex string with 6 digits
+    REGEXP_SIX_DIGITS = /(..)(..)(..)/.freeze
+    # @return [Regexp] regexp for hex string with 8 digits
+    REGEXP_EIGHT_DIGITS = /(..)(..)(..)(..)/.freeze
+
     # Parse string in hex
     # @param [String] hex_string with or without alpha-channel
     def parse_hex_string(hex_string)
-      return self if %w[auto null].include?(hex_string)
+      return self if AUTO_STRING_VALUE == hex_string
 
-      char_array = hex_string.chars
-      case char_array.length
+      case hex_string.length
       when 3
-        @red = char_array[0].hex
-        @green = char_array[1].hex
-        @blue = char_array[2].hex
+        @red, @green, @blue = hex_string.match(REGEXP_THREE_DIGITS).captures.map(&:hex)
       when 6
-        @red = (char_array[0] + char_array[1]).hex
-        @green = (char_array[2] + char_array[3]).hex
-        @blue = (char_array[4] + char_array[5]).hex
+        @red, @green, @blue = hex_string.match(REGEXP_SIX_DIGITS).captures.map(&:hex)
       when 8
-        @alpha_channel = (char_array[0] + char_array[1]).hex
-        @red = (char_array[2] + char_array[3]).hex
-        @green = (char_array[4] + char_array[5]).hex
-        @blue = (char_array[6] + char_array[7]).hex
+        @alpha_channel, @red, @green, @blue = hex_string.match(REGEXP_EIGHT_DIGITS).captures.map(&:hex)
       end
       self
     end

data/lib/ooxml_parser/common_parser/common_data/color.rb

@@ -101,7 +101,7 @@ module OoxmlParser
 
     # Compare this object to other
     # @param other [Object] any other object
-    # @return [True, False] result of comparision
+    # @return [True, False] result of comparison
     def ==(other)
       if other.is_a?(Color)
         ((@red == other.red) && (@green == other.green) && (@blue == other.blue)) ||
@@ -117,7 +117,7 @@ module OoxmlParser
     # @param [Integer] delta max delta for each of specters
     def looks_like?(color_to_check = nil, delta = 8)
       color_to_check = color_to_check.converted_color if color_to_check.is_a?(SchemeColor)
-      color_to_check = color_to_check.pattern_fill.foreground_folor if color_to_check.is_a?(Fill)
+      color_to_check = color_to_check.pattern_fill.foreground_color if color_to_check.is_a?(Fill)
       color_to_check = color_to_check.color.converted_color if color_to_check.is_a?(PresentationFill)
       color_to_check = Color.parse(color_to_check) if color_to_check.is_a?(String)
       color_to_check = Color.parse(color_to_check.to_s) if color_to_check.is_a?(Symbol)
@@ -128,10 +128,9 @@ module OoxmlParser
       return false if !none? && color_to_check.none?
       return true if self == color_to_check
 
-      red = color_to_check.red
-      green = color_to_check.green
-      blue = color_to_check.blue
-      (self.red - red).abs < delta && (self.green - green).abs < delta && (self.blue - blue).abs < delta
+      (red - color_to_check.red).abs < delta &&
+        (green - color_to_check.green).abs < delta &&
+        (blue - color_to_check.blue).abs < delta
     end
 
     # Apply tint to color
@@ -156,7 +155,8 @@ module OoxmlParser
     # @param scheme_color_node [Nokogiri::XML:Element] node to parse
     # @return [Color] result of parsing
     def parse_scheme_color(scheme_color_node)
-      color_scheme_color = root_object.theme.color_scheme[scheme_color_node.attribute('val').value.to_sym]
+      scheme_clr_object = ValuedChild.new(:symbol, parent: self).parse(scheme_color_node)
+      color_scheme_color = root_object.theme.color_scheme[scheme_clr_object.value]
       return unless color_scheme_color
 
       color = color_scheme_color.color
@@ -165,9 +165,11 @@ module OoxmlParser
       scheme_color_node.xpath('*').each do |scheme_color_node_child|
         case scheme_color_node_child.name
         when 'lumMod'
-          hls.l = hls.l * (scheme_color_node_child.attribute('val').value.to_f / 100_000.0)
+          luminance_modulation = ValuedChild.new(:float, parent: self).parse(scheme_color_node_child)
+          hls.l = hls.l * (luminance_modulation.value / 100_000.0)
         when 'lumOff'
-          hls.l = hls.l + (scheme_color_node_child.attribute('val').value.to_f / 100_000.0)
+          luminance_offset = ValuedChild.new(:float, parent: self).parse(scheme_color_node_child)
+          hls.l = hls.l + (luminance_offset.value / 100_000.0)
         end
       end
       scheme_color_node.attributes.each do |key, value|
@@ -180,7 +182,7 @@ module OoxmlParser
       @red = color.red
       @green = color.green
       @blue = color.blue
-      @alpha_channel = ColorAlphaChannel.parse(scheme_color_node)
+      @alpha_channel = ColorAlphaChannel.new(parent: self).parse(scheme_color_node).value
       @scheme = scheme_name
       self
     end
@@ -200,8 +202,9 @@ module OoxmlParser
         end
         case color_model_node.name
         when 'srgbClr'
-          color = Color.new.parse_hex_string(color_model_node.attribute('val').value)
-          color.alpha_channel = ColorAlphaChannel.parse(color_model_node)
+          valued_child = ValuedChild.new(:string, parent: self).parse(color_model_node)
+          color = Color.new.parse_hex_string(valued_child.value)
+          color.alpha_channel = ColorAlphaChannel.new(parent: self).parse(color_model_node).value
         when 'schemeClr'
           color = Color.new(parent: self).parse_scheme_color(color_model_node)
         end
@@ -230,7 +233,8 @@ module OoxmlParser
         color = SchemeColor.new(parent: parent)
         return ValuedChild.new(:string, parent: parent).parse(color_node) unless root_object.theme
 
-        color.value = root_object.theme.color_scheme[color_node.attribute('val').value.to_sym].color
+        scheme_clr_object = ValuedChild.new(:symbol, parent: self).parse(color_node)
+        color.value = root_object.theme.color_scheme[scheme_clr_object.value].color
         color.properties = ColorProperties.new(parent: color).parse(color_node)
         color.converted_color = Color.new(parent: self).parse_scheme_color(color_node)
         color.value.calculate_with_tint!(1.0 - color.properties.tint) if color.properties.tint

data/lib/ooxml_parser/common_parser/common_data/colors/color_alpha_channel.rb

@@ -2,16 +2,30 @@
 
 module OoxmlParser
   # Class for working with AlphaChannel
-  class ColorAlphaChannel
+  class ColorAlphaChannel < OOXMLDocumentObject
+    # @return [Integer] value of alpha channel
+    attr_reader :value
+
     # Parse AlphaChannel value
     # @param node [Nokogiri::XML::Element] node to parse
-    # @return [Fixnum] value of AlphaChannel
-    def self.parse(node)
+    # @return [ColorAlphaChannel] parsed object
+    def parse(node)
       alpha_channel_node = node.xpath('a:alpha', 'xmlns:a' => 'http://schemas.openxmlformats.org/drawingml/2006/main').first
       alpha_channel_node = node.xpath('w14:alpha', 'xmlns:w14' => 'http://schemas.microsoft.com/office/word/2010/wordml').first if alpha_channel_node.nil?
-      return 100.0 if alpha_channel_node.nil?
 
-      (alpha_channel_node.attribute('val').value.to_f / 1_000.0).round(0)
+      unless alpha_channel_node
+        @value = 100.0
+        return self
+      end
+
+      alpha_channel_node.attributes.each do |key, value|
+        case key
+        when 'val'
+          @value = (value.value.to_f / 1_000.0).round(0)
+        end
+      end
+
+      self
     end
   end
 end

data/lib/ooxml_parser/common_parser/common_data/colors/color_properties.rb

@@ -3,14 +3,14 @@
 module OoxmlParser
   # Class for color transformations
   class ColorProperties < OOXMLDocumentObject
-    # @return [Integer] alpha value of color
-    attr_reader :alpha
-    # @return [Float] luminance modulation value
-    attr_reader :luminance_modulation
-    # @return [Float] luminance offset value
-    attr_reader :luminance_offset
-    # @return [Float] tint value
-    attr_reader :tint
+    # @return [ValuedChild] alpha value of color object
+    attr_reader :alpha_object
+    # @return [ValuedChild] luminance modulation value object
+    attr_reader :luminance_modulation_object
+    # @return [ValuedChild] luminance offset value object
+    attr_reader :luminance_offset_object
+    # @return [ValuedChild] tint value object
+    attr_reader :tint_object
 
     # Parse ColorProperties object
     # @param node [Nokogiri::XML:Element] node to parse
@@ -19,16 +19,38 @@ module OoxmlParser
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'alpha'
-          @alpha = (node_child.attribute('val').value.to_f / 1_000.0).round
+          @alpha_object = ValuedChild.new(:float, parent: self).parse(node_child)
         when 'lumMod'
-          @luminance_modulation = node_child.attribute('val').value.to_f / 100_000.0
+          @luminance_modulation_object = ValuedChild.new(:float, parent: self).parse(node_child)
         when 'lumOff'
-          @luminance_offset = node_child.attribute('val').value.to_f / 100_000.0
+          @luminance_offset_object = ValuedChild.new(:float, parent: self).parse(node_child)
         when 'tint'
-          @tint = node_child.attribute('val').value.to_f / 100_000.0
+          @tint_object = ValuedChild.new(:float, parent: self).parse(node_child)
         end
       end
       self
     end
+
+    # @return [Integer] alpha value
+    def alpha
+      (@alpha_object.value / 1_000.0).round
+    end
+
+    # @return [Float] luminance modulation value
+    def luminance_modulation
+      @luminance_modulation_object.value / 100_000.0
+    end
+
+    # @return [Float] luminance offset value
+    def luminance_offset
+      @luminance_offset_object.value / 100_000.0
+    end
+
+    # @return [nil, Float] tint value
+    def tint
+      return nil unless @tint_object
+
+      @tint_object.value / 100_000.0
+    end
   end
 end

data/lib/ooxml_parser/common_parser/common_data/colors/image_fill.rb

@@ -22,8 +22,8 @@ module OoxmlParser
         when 'blip'
           @file_reference = FileReference.new(parent: self).parse(node_child)
         when 'tile'
-          @tile = Tile.new(OOXMLCoordinates.parse(node_child, x_attr: 'tx', y_attr: 'ty'),
-                           OOXMLCoordinates.parse(node_child, x_attr: 'sx', y_attr: 'sy'),
+          @tile = Tile.new(OOXMLCoordinates.new(parent: self).parse(node_child, x_attr: 'tx', y_attr: 'ty'),
+                           OOXMLCoordinates.new(parent: self).parse(node_child, x_attr: 'sx', y_attr: 'sy'),
                            parent: self).parse(node_child)
         end
       end

data/lib/ooxml_parser/common_parser/common_data/hyperlink.rb

@@ -3,6 +3,8 @@
 module OoxmlParser
   # Class for parsing `hlinkClick`, `hyperlink` tags
   class Hyperlink < OOXMLDocumentObject
+    # @return [String] anchor value
+    attr_reader :anchor
     # @return [OOXMLDocumentObject] url of hyperlink
     attr_accessor :url
     # @return [String] tooltip value
@@ -42,6 +44,8 @@ module OoxmlParser
     def parse(node)
       node.attributes.each do |key, value|
         case key
+        when 'anchor'
+          @anchor = value.value
         when 'location'
           @url = Coordinates.new.parse_string(value.value)
         when 'id'

data/lib/ooxml_parser/common_parser/common_data/ooxml_document_object.rb

@@ -40,14 +40,35 @@ module OoxmlParser
       true
     end
 
+    # @param [String, Nokogiri::XML:Attribute] value to check
+    # @return [True, False] value of attribute
+    def boolean_attribute_value(value)
+      return true if value.to_s == '1'
+      return true if value.to_s == 'true'
+      return false if value.to_s == '0'
+      return false if value.to_s == 'false'
+    end
+
     # @return [Nokogiri::XML::Document] result of parsing xml via nokogiri
     def parse_xml(xml_path)
       xml = Nokogiri::XML(File.open(xml_path), &:strict)
       unless xml.errors.empty?
         raise NokogiriParsingException,
-              "Nokogiri found errors in file: #{xml_path}. Errors: #{xml.errors}"
+              parse_error_message(xml_path, xml.errors)
       end
       xml
+    rescue  Nokogiri::XML::SyntaxError => e
+      raise NokogiriParsingException,
+            parse_error_message(xml_path, e)
+    end
+
+    private
+
+    # @param [String] xml_path path to xml
+    # @param [String] errors errors
+    # @return [String] error string
+    def parse_error_message(xml_path, errors)
+      "Nokogiri found errors in file: #{xml_path}. Errors: #{errors}"
     end
   end
 end

data/lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/numbering_properties.rb

@@ -3,16 +3,20 @@
 module OoxmlParser
   # Class for parsing `numPr` tags
   class NumberingProperties < OOXMLDocumentObject
-    attr_accessor :size, :font, :symbol, :start_at, :type, :image, :ilvl, :numbering_properties
+    attr_accessor :size, :font, :symbol, :start_at, :type, :image
+    # @return [ValuedChild] i level
+    attr_reader :i_level
+    # @return [ValuedChild] numbering id
+    attr_reader :num_id
 
     def initialize(ilvl = 0, parent: nil)
-      @ilvl = ilvl
+      @default_i_level = ilvl
       super(parent: parent)
     end
 
     # @return [AbstractNumbering] AbstractNumbering of current properties
     def abstruct_numbering
-      root_object.numbering.properties_by_num_id(@numbering_properties)
+      root_object.numbering.properties_by_num_id(numbering_properties)
     end
 
     # Parse NumberingProperties
@@ -22,18 +26,30 @@ module OoxmlParser
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'ilvl'
-          @ilvl = node_child.attribute('val').value.to_i
+          @i_level = ValuedChild.new(:integer, parent: self).parse(node_child)
         when 'numId'
-          @numbering_properties = node_child.attribute('val').value.to_i
+          @num_id = ValuedChild.new(:integer, parent: self).parse(node_child)
         end
       end
       self
     end
 
+    # @return [Integer] numbering properties
+    def numbering_properties
+      @num_id.value
+    end
+
+    # @return [Integer] i-level value
+    def ilvl
+      return @default_i_level unless @i_level
+
+      @i_level.value
+    end
+
     # @return [AbstractNumbering] level list of current numbering
     def numbering_level_current
       abstruct_numbering.level_list.each do |current_ilvl|
-        return current_ilvl if current_ilvl.ilvl == @ilvl
+        return current_ilvl if current_ilvl.ilvl == ilvl
       end
       nil
     end

data/lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties.rb

@@ -101,9 +101,11 @@ module OoxmlParser
         when 'spacing'
           @spacing = ParagraphSpacing.new(parent: self).parse(node_child)
         when 'jc'
-          @justification = value_to_symbol(node_child.attribute('val'))
+          @justification_object = ValuedChild.new(:string, parent: self).parse(node_child)
+          @justification = value_to_symbol(@justification_object)
         when 'contextualSpacing'
-          @contextual_spacing = option_enabled?(node_child)
+          contextual_spacing_object = ValuedChild.new(:boolean, parent: self).parse(node_child)
+          @contextual_spacing = contextual_spacing_object.value
         end
       end
       self

data/lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_run/run_properties/run_fonts.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `w:rFonts` object
+  class RunFonts < OOXMLDocumentObject
+    # @return [String] ascii font
+    attr_accessor :ascii
+    # @return [String] ascii theme value
+    attr_accessor :ascii_theme
+
+    # Parse RunFonts
+    # @param [Nokogiri::XML:Node] node with RunFonts
+    # @return [RunFonts] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'ascii'
+          @ascii = value.to_s
+        when 'asciiTheme'
+          @ascii_theme = value.to_s
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_run/run_properties.rb

@@ -2,10 +2,12 @@
 
 require_relative 'run_properties/outline'
 require_relative 'run_properties/position'
-require_relative 'run_properties/size'
+require_relative 'run_properties/run_fonts'
 require_relative 'run_properties/run_spacing'
 require_relative 'run_properties/run_style'
 require_relative 'run_properties/shade'
+require_relative 'run_properties/size'
+
 module OoxmlParser
   # Data about `rPr` object
   class RunProperties < OOXMLDocumentObject
@@ -49,6 +51,10 @@ module OoxmlParser
     attr_accessor :run_style
     # @return [ValuedChild] ligatures type
     attr_reader :ligatures
+    # @return [RunFonts] value of RunFonts
+    attr_reader :run_fonts
+    # @return [Nokogiri::XML:Element] raw node value
+    attr_reader :raw_node
 
     def initialize(params = {})
       @font_name = params.fetch(:font_name, '')
@@ -61,6 +67,7 @@ module OoxmlParser
     # @param node [Nokogiri::XML:Element] node to parse
     # @return [RunProperties] result of parsing
     def parse(node)
+      @raw_node = node
       @font_style = root_object.default_font_style.dup
       node.attributes.each do |key, value|
         case key
@@ -107,11 +114,12 @@ module OoxmlParser
         when 'u'
           @font_style.underlined = Underline.new(:single)
         when 'vertAlign'
-          @vertical_align = node_child.attribute('val').value.to_sym
+          @vertical_align_object = ValuedChild.new(:symbol, parent: self).parse(node_child)
+          @vertical_align = @vertical_align_object.value
         when 'rFont'
           @font_name = node_child.attribute('val').value
         when 'rFonts'
-          @font_name = node_child.attribute('ascii').value if node_child.attribute('ascii')
+          @run_fonts = RunFonts.new(parent: self).parse(node_child)
         when 'strike'
           @font_style.strike = option_enabled?(node_child)
         when 'hlinkClick'
@@ -142,6 +150,7 @@ module OoxmlParser
     # @return [String] name of font
     def font_name
       return @font_name unless @font_name.empty?
+      return @run_fonts.ascii if @run_fonts
 
       root_object.default_font_typeface
     end

data/lib/ooxml_parser/common_parser/common_data/table/margins/table_margins.rb

@@ -39,13 +39,13 @@ module OoxmlParser
       margin_node.xpath('*').each do |cell_margin_node|
         case cell_margin_node.name
         when 'left'
-          @left = OoxmlSize.new(cell_margin_node.attribute('w').value.to_f)
+          @left = OoxmlSize.new(parent: self).parse(cell_margin_node)
         when 'top'
-          @top = OoxmlSize.new(cell_margin_node.attribute('w').value.to_f)
+          @top = OoxmlSize.new(parent: self).parse(cell_margin_node)
         when 'right'
-          @right = OoxmlSize.new(cell_margin_node.attribute('w').value.to_f)
+          @right = OoxmlSize.new(parent: self).parse(cell_margin_node)
         when 'bottom'
-          @bottom = OoxmlSize.new(cell_margin_node.attribute('w').value.to_f)
+          @bottom = OoxmlSize.new(parent: self).parse(cell_margin_node)
         end
       end
       self